summaryrefslogtreecommitdiffstats
path: root/perl-install/share/po/zh_CN.po
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>2002-07-31 15:03:31 +0000
committerPablo Saratxaga <pablo@mandriva.com>2002-07-31 15:03:31 +0000
commit3c9851fe7e252fd00e0cbcd71c1de3087212ae6e (patch)
tree8688207913410ec7782385944c70c9a6efd3fe44 /perl-install/share/po/zh_CN.po
parent572335cb7b3fabe2b87a9979d6a996debdb5ff2a (diff)
downloaddrakx-backup-do-not-use-3c9851fe7e252fd00e0cbcd71c1de3087212ae6e.tar
drakx-backup-do-not-use-3c9851fe7e252fd00e0cbcd71c1de3087212ae6e.tar.gz
drakx-backup-do-not-use-3c9851fe7e252fd00e0cbcd71c1de3087212ae6e.tar.bz2
drakx-backup-do-not-use-3c9851fe7e252fd00e0cbcd71c1de3087212ae6e.tar.xz
drakx-backup-do-not-use-3c9851fe7e252fd00e0cbcd71c1de3087212ae6e.zip
updated pot file
Diffstat (limited to 'perl-install/share/po/zh_CN.po')
-rw-r--r--perl-install/share/po/zh_CN.po5748
1 files changed, 3189 insertions, 2559 deletions
diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index 2bc437986..84843d4b6 100644
--- a/perl-install/share/po/zh_CN.po
+++ b/perl-install/share/po/zh_CN.po
@@ -1,46 +1,71 @@
-# DrakX messages for zh_CN locale
-# Copyright (C) 1999 Free Software Foundation, Inc.
-# Copyright (c) 1999 MandrakeSoft
+# drakbootdisk messages in Simplified Chinese
+# Copyright (C) 2000 Free Software Foundation, Inc.
#
# Jesse Kuang <kjx@mandrakesoft.com>
-# DU Xiaoming <dxiaoming@mandrakesoft.com>, 2001
#
-# Earlier translater:
-# Danny Zeng <zeng@synopsys.com>, 2000
-#
-# Earlier translaters:
-# Cheng Yuan-Chung <platin@ms31.hinet.net>, 1999
-# <c17@acer.17.o3.net>, 1999
+# Last translator
+# Danny Zeng <danny@zeng.com.cn>, 2000.
#
msgid ""
msgstr ""
-"Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2002-03-11 18:29+0100\n"
-"PO-Revision-Date: 2001-09-27 13:29+0800\n"
-"Last-Translator: DU Xiaoming <dxiaoming@mandrakesoft.com>\n"
-"Language-Team: future-cjk <future-cjk@mandrakesoft.com>\n"
+"Project-Id-Version: drakfloppy 0.30\n"
+"POT-Creation-Date: 2002-07-31 15:56+0200\n"
+"PO-Revision-Date: 2001-08-21 13:56+0800\n"
+"Last-Translator: Jesse Kuang <kjx@mandrakesoft.com>\n"
+"Language-Team: Chinese <future-cjk@mandrakesoft.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=gb2312\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../Xconfigurator.pm_.c:242
-msgid "Configure all heads independently"
-msgstr "配置所有显示器"
+#: ../../Xconfig/card.pm_.c:16
+msgid "256 kB"
+msgstr "256 kB"
-#: ../../Xconfigurator.pm_.c:243
-msgid "Use Xinerama extension"
-msgstr "使用 Xinerama 扩展"
+#: ../../Xconfig/card.pm_.c:17
+msgid "512 kB"
+msgstr "512 kB"
-#: ../../Xconfigurator.pm_.c:246
-#, c-format
-msgid "Configure only card \"%s\" (%s)"
-msgstr "配置显卡 \"%s\" (%s)"
+#: ../../Xconfig/card.pm_.c:18
+msgid "1 MB"
+msgstr "1 MB"
-#: ../../Xconfigurator.pm_.c:249
+#: ../../Xconfig/card.pm_.c:19
+msgid "2 MB"
+msgstr "2 MB"
+
+#: ../../Xconfig/card.pm_.c:20
+msgid "4 MB"
+msgstr "4 MB"
+
+#: ../../Xconfig/card.pm_.c:21
+msgid "8 MB"
+msgstr "8 MB"
+
+#: ../../Xconfig/card.pm_.c:22
+msgid "16 MB"
+msgstr "16 MB"
+
+#: ../../Xconfig/card.pm_.c:23
+msgid "32 MB"
+msgstr "32 MB"
+
+#: ../../Xconfig/card.pm_.c:24
+msgid "64 MB or more"
+msgstr "64 MB 或以上"
+
+#: ../../Xconfig/card.pm_.c:201
+msgid "Choose a X server"
+msgstr "请选择一种 X 服务器"
+
+#: ../../Xconfig/card.pm_.c:201
+msgid "X server"
+msgstr "X 服务器"
+
+#: ../../Xconfig/card.pm_.c:225
msgid "Multi-head configuration"
msgstr "多显示器配置"
-#: ../../Xconfigurator.pm_.c:250
+#: ../../Xconfig/card.pm_.c:226
msgid ""
"Your system support multiple head configuration.\n"
"What do you want to do?"
@@ -48,43 +73,44 @@ msgstr ""
"您的系统支持多显示器.\n"
"是否进行配置?"
-#: ../../Xconfigurator.pm_.c:261
-msgid "Graphic card"
-msgstr "显示卡"
+#: ../../Xconfig/card.pm_.c:280
+msgid "Select the memory size of your graphics card"
+msgstr "请选择您显示卡上内存的大小"
-#: ../../Xconfigurator.pm_.c:262
-msgid "Select a graphic card"
-msgstr "请选择一种显示卡"
+#: ../../Xconfig/card.pm_.c:341
+msgid "XFree configuration"
+msgstr "XFree 配置"
-#: ../../Xconfigurator.pm_.c:286
-msgid "Choose a X server"
-msgstr "请选择一种 X 服务器"
+#: ../../Xconfig/card.pm_.c:343
+msgid "Which configuration of XFree do you want to have?"
+msgstr "您希望拥有哪个 XFree 配置?"
-#: ../../Xconfigurator.pm_.c:286
-msgid "X server"
-msgstr "X 服务器"
+#: ../../Xconfig/card.pm_.c:374
+msgid "Configure all heads independently"
+msgstr "配置所有显示器"
-#: ../../Xconfigurator.pm_.c:293
-#, fuzzy
-msgid "Choose a X driver"
-msgstr "请选择一种 X 服务器"
+#: ../../Xconfig/card.pm_.c:375
+msgid "Use Xinerama extension"
+msgstr "使用 Xinerama 扩展"
-#: ../../Xconfigurator.pm_.c:293
-#, fuzzy
-msgid "X driver"
-msgstr "X 服务器"
+#: ../../Xconfig/card.pm_.c:379
+#, fuzzy, c-format
+msgid "Configure only card \"%s\"%s"
+msgstr "配置显卡 \"%s\" (%s)"
-#: ../../Xconfigurator.pm_.c:360 ../../Xconfigurator.pm_.c:366
-#: ../../Xconfigurator.pm_.c:416 ../../Xconfigurator.pm_.c:1507
+#: ../../Xconfig/card.pm_.c:393 ../../Xconfig/card.pm_.c:394
+#: ../../Xconfig/various.pm_.c:21
#, c-format
msgid "XFree %s"
msgstr "XFree %s"
-#: ../../Xconfigurator.pm_.c:363
-msgid "Which configuration of XFree do you want to have?"
-msgstr "您希望拥有哪个 XFree 配置?"
+#: ../../Xconfig/card.pm_.c:404 ../../Xconfig/card.pm_.c:429
+#: ../../Xconfig/various.pm_.c:21
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr "XFree %s 带有硬件 3D 加速的支持"
-#: ../../Xconfigurator.pm_.c:374
+#: ../../Xconfig/card.pm_.c:407
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support but only with XFree %s.\n"
@@ -93,32 +119,17 @@ msgstr ""
"使用 XFree %s, 您的显示卡可以得到 3D 硬件加速支持.\n"
"XFree %s 支持您的显示卡, 它能提供更好的 2D 支持."
-#: ../../Xconfigurator.pm_.c:376 ../../Xconfigurator.pm_.c:409
+#: ../../Xconfig/card.pm_.c:409 ../../Xconfig/card.pm_.c:431
#, c-format
msgid "Your card can have 3D hardware acceleration support with XFree %s."
msgstr "使用 XFree %s, 您的显示卡可以得到 3D 硬件加速支持."
-#: ../../Xconfigurator.pm_.c:378 ../../Xconfigurator.pm_.c:411
-#: ../../Xconfigurator.pm_.c:1507
-#, c-format
-msgid "XFree %s with 3D hardware acceleration"
-msgstr "XFree %s 带有硬件 3D 加速的支持"
-
-#: ../../Xconfigurator.pm_.c:386 ../../Xconfigurator.pm_.c:400
-#, c-format
-msgid ""
-"Your card can have 3D hardware acceleration support with XFree %s,\n"
-"NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
-msgstr ""
-"使用 XFree %s, 您的显示卡可以得到 3D 硬件加速支持.\n"
-"注意这是试验阶段的支持, 它可能会使您的电脑失去反应."
-
-#: ../../Xconfigurator.pm_.c:388 ../../Xconfigurator.pm_.c:402
+#: ../../Xconfig/card.pm_.c:416 ../../Xconfig/card.pm_.c:437
#, c-format
msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
msgstr "XFree %s 带有试验阶段的3D硬件加速支持"
-#: ../../Xconfigurator.pm_.c:397
+#: ../../Xconfig/card.pm_.c:419
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -129,31 +140,58 @@ msgstr ""
"注意这是试验阶段的支持, 它可能会使您的电脑失去反应\n"
"XFree %s 支持您的显示卡, 它能提供更好的 2D 支持."
-#: ../../Xconfigurator.pm_.c:417
+#: ../../Xconfig/card.pm_.c:422 ../../Xconfig/card.pm_.c:439
+#, c-format
+msgid ""
+"Your card can have 3D hardware acceleration support with XFree %s,\n"
+"NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
+msgstr ""
+"使用 XFree %s, 您的显示卡可以得到 3D 硬件加速支持.\n"
+"注意这是试验阶段的支持, 它可能会使您的电脑失去反应."
+
+#: ../../Xconfig/card.pm_.c:445
msgid "Xpmac (installation display driver)"
msgstr "Xpmac (安装显卡驱动)"
-#: ../../Xconfigurator.pm_.c:421
-msgid "XFree configuration"
-msgstr "XFree 配置"
-
-#: ../../Xconfigurator.pm_.c:496
-msgid "Select the memory size of your graphic card"
-msgstr "请选择您显示卡上内存的大小"
-
-#: ../../Xconfigurator.pm_.c:550
-msgid "Choose options for server"
-msgstr "请选择 X 服务器的参数"
+#: ../../Xconfig/main.pm_.c:60
+#, c-format
+msgid ""
+"Keep the changes?\n"
+"The current configuration is:\n"
+"\n"
+"%s"
+msgstr ""
+"保存修改?\n"
+"当前配置是:\n"
+"\n"
+"%s"
-#: ../../Xconfigurator.pm_.c:574
+#: ../../Xconfig/monitor.pm_.c:86
msgid "Choose a monitor"
msgstr "请选择一种显示器"
-#: ../../Xconfigurator.pm_.c:574
+#: ../../Xconfig/monitor.pm_.c:86
msgid "Monitor"
msgstr "显示器"
-#: ../../Xconfigurator.pm_.c:577
+#: ../../Xconfig/monitor.pm_.c:89 ../../any.pm_.c:973
+msgid "Custom"
+msgstr "定制"
+
+#: ../../Xconfig/monitor.pm_.c:90
+msgid "Plug'n Play"
+msgstr ""
+
+#: ../../Xconfig/monitor.pm_.c:91 ../../mouse.pm_.c:45
+msgid "Generic"
+msgstr "普通"
+
+#: ../../Xconfig/monitor.pm_.c:92 ../../harddrake/ui.pm_.c:43
+#, fuzzy
+msgid "Vendor"
+msgstr "撤销"
+
+#: ../../Xconfig/monitor.pm_.c:102
msgid ""
"The two critical parameters are the vertical refresh rate, which is the "
"rate\n"
@@ -174,510 +212,325 @@ msgstr ""
"不恰当的设置可能会损害您的显示器!\n"
"所以没把握时, 您可以选择保守的设定."
-#: ../../Xconfigurator.pm_.c:584
+#: ../../Xconfig/monitor.pm_.c:109
msgid "Horizontal refresh rate"
msgstr "水平更新频率"
-#: ../../Xconfigurator.pm_.c:585
+#: ../../Xconfig/monitor.pm_.c:110
msgid "Vertical refresh rate"
msgstr "垂直更新频率"
-#: ../../Xconfigurator.pm_.c:622
-msgid "Monitor not configured"
-msgstr "尚未完成显示器设定"
-
-#: ../../Xconfigurator.pm_.c:625
-msgid "Graphic card not configured yet"
-msgstr "尚未完成显示卡设定"
-
-#: ../../Xconfigurator.pm_.c:628
-msgid "Resolutions not chosen yet"
-msgstr "尚未选取要使用的分辨率"
-
-#: ../../Xconfigurator.pm_.c:646
-msgid "Do you want to test the configuration?"
-msgstr "您想要测试您的设定值吗 ?"
-
-#: ../../Xconfigurator.pm_.c:650
-msgid "Warning: testing this graphic card may freeze your computer"
-msgstr "小心! 显示卡的测试可能会锁定您的电脑"
-
-#: ../../Xconfigurator.pm_.c:653
-msgid "Test of the configuration"
-msgstr "测试设定值"
+#: ../../Xconfig/resolution_and_depth.pm_.c:12
+msgid "256 colors (8 bits)"
+msgstr "256 色 (8 位元)"
-#: ../../Xconfigurator.pm_.c:692 ../../Xconfigurator.pm_.c:704
-msgid ""
-"\n"
-"try to change some parameters"
-msgstr ""
-"\n"
-"尝试改变一些参数"
+#: ../../Xconfig/resolution_and_depth.pm_.c:13
+msgid "32 thousand colors (15 bits)"
+msgstr "3 万 2 千色 (15 位元)"
-#: ../../Xconfigurator.pm_.c:692 ../../Xconfigurator.pm_.c:704
-msgid "An error has occurred:"
-msgstr "发生错误∶"
+#: ../../Xconfig/resolution_and_depth.pm_.c:14
+msgid "65 thousand colors (16 bits)"
+msgstr "6 万 5 千色 (16 位元)"
-#: ../../Xconfigurator.pm_.c:731
-#, c-format
-msgid "Leaving in %d seconds"
-msgstr "(在 %d 秒钟后离开)"
+#: ../../Xconfig/resolution_and_depth.pm_.c:15
+msgid "16 million colors (24 bits)"
+msgstr "1 千 6 百万色 (24 位元)"
-#: ../../Xconfigurator.pm_.c:742
-msgid "Is this the correct setting?"
-msgstr "这样设定正确吗?"
+#: ../../Xconfig/resolution_and_depth.pm_.c:16
+msgid "4 billion colors (32 bits)"
+msgstr "4 亿色 (32 位元)"
-#: ../../Xconfigurator.pm_.c:751
-msgid "An error has occurred, try to change some parameters"
-msgstr "发生错误,请试着更改一些参数的值"
+#: ../../Xconfig/resolution_and_depth.pm_.c:121
+msgid "Resolutions"
+msgstr "解析度"
-#: ../../Xconfigurator.pm_.c:822
+#: ../../Xconfig/resolution_and_depth.pm_.c:197
msgid "Resolution"
msgstr "屏幕分辨率"
-#: ../../Xconfigurator.pm_.c:874
+#: ../../Xconfig/resolution_and_depth.pm_.c:235
msgid "Choose the resolution and the color depth"
msgstr "选取屏幕分辨率以及颜色深度"
-#: ../../Xconfigurator.pm_.c:876
+#: ../../Xconfig/resolution_and_depth.pm_.c:236
#, c-format
-msgid "Graphic card: %s"
+msgid "Graphics card: %s"
msgstr "显示卡: %s"
-#: ../../Xconfigurator.pm_.c:877
-#, c-format
-msgid "XFree86 server: %s"
-msgstr "XFree86 服务器: %s"
-
-#: ../../Xconfigurator.pm_.c:891 ../../diskdrake/interactive.pm_.c:259
-#: ../../install_steps_interactive.pm_.c:208
-msgid "More"
-msgstr "更多"
+#: ../../Xconfig/resolution_and_depth.pm_.c:249 ../../any.pm_.c:1014
+#: ../../bootlook.pm_.c:161 ../../diskdrake/smbnfs_gtk.pm_.c:87
+#: ../../install_steps_gtk.pm_.c:410 ../../install_steps_gtk.pm_.c:468
+#: ../../install_steps_interactive.pm_.c:577 ../../interactive.pm_.c:142
+#: ../../interactive.pm_.c:318 ../../interactive.pm_.c:350
+#: ../../interactive/stdio.pm_.c:141 ../../my_gtk.pm_.c:724
+#: ../../my_gtk.pm_.c:727 ../../my_gtk.pm_.c:1056
+#: ../../network/netconnect.pm_.c:46 ../../printerdrake.pm_.c:1610
+#: ../../standalone/drakautoinst_.c:204 ../../standalone/drakbackup_.c:2631
+#: ../../standalone/drakbackup_.c:2664 ../../standalone/drakbackup_.c:2685
+#: ../../standalone/drakbackup_.c:2706 ../../standalone/drakbackup_.c:2733
+#: ../../standalone/drakbackup_.c:2793 ../../standalone/drakbackup_.c:2820
+#: ../../standalone/drakbackup_.c:2846 ../../standalone/drakconnect_.c:116
+#: ../../standalone/drakconnect_.c:148 ../../standalone/drakconnect_.c:290
+#: ../../standalone/drakconnect_.c:538 ../../standalone/drakconnect_.c:680
+#: ../../standalone/drakfloppy_.c:235 ../../standalone/drakfloppy_.c:384
+#: ../../standalone/drakfont_.c:971 ../../standalone/drakgw_.c:600
+#: ../../standalone/logdrake_.c:225 ../../standalone/logdrake_.c:537
+#: ../../standalone/tinyfirewall_.c:65
+msgid "Cancel"
+msgstr "取消"
-#: ../../Xconfigurator.pm_.c:891 ../../install_gtk.pm_.c:84
-#: ../../install_steps_gtk.pm_.c:328 ../../interactive.pm_.c:127
-#: ../../interactive.pm_.c:142 ../../interactive.pm_.c:317
-#: ../../interactive.pm_.c:349 ../../interactive_http.pm_.c:104
-#: ../../interactive_newt.pm_.c:170 ../../interactive_stdio.pm_.c:141
-#: ../../interactive_stdio.pm_.c:142 ../../my_gtk.pm_.c:686
-#: ../../my_gtk.pm_.c:1019 ../../my_gtk.pm_.c:1041
-#: ../../standalone/drakbackup_.c:2298 ../../standalone/drakbackup_.c:2369
-#: ../../standalone/drakbackup_.c:2385
+#: ../../Xconfig/resolution_and_depth.pm_.c:249 ../../install_gtk.pm_.c:84
+#: ../../install_steps_gtk.pm_.c:279 ../../interactive.pm_.c:127
+#: ../../interactive.pm_.c:142 ../../interactive.pm_.c:318
+#: ../../interactive.pm_.c:350 ../../interactive/http.pm_.c:104
+#: ../../interactive/newt.pm_.c:170 ../../interactive/stdio.pm_.c:141
+#: ../../interactive/stdio.pm_.c:142 ../../my_gtk.pm_.c:723
+#: ../../my_gtk.pm_.c:1056 ../../my_gtk.pm_.c:1078
+#: ../../standalone/drakbackup_.c:2673 ../../standalone/drakbackup_.c:2761
+#: ../../standalone/drakbackup_.c:2780
msgid "Ok"
msgstr "确定"
-#: ../../Xconfigurator.pm_.c:893 ../../network/netconnect.pm_.c:169
-#: ../../printerdrake.pm_.c:2470 ../../standalone/draknet_.c:275
-#: ../../standalone/draknet_.c:278
-msgid "Expert Mode"
-msgstr "专家模式"
-
-#: ../../Xconfigurator.pm_.c:894
-msgid "Show all"
-msgstr "显示全部"
+#: ../../Xconfig/test.pm_.c:26
+msgid "Do you want to test the configuration?"
+msgstr "您想要测试您的设定值吗 ?"
-#: ../../Xconfigurator.pm_.c:939
-msgid "Resolutions"
-msgstr "解析度"
+#: ../../Xconfig/test.pm_.c:26
+msgid "Test of the configuration"
+msgstr "测试设定值"
-#: ../../Xconfigurator.pm_.c:1509
+#: ../../Xconfig/various.pm_.c:27
#, c-format
msgid "Keyboard layout: %s\n"
msgstr "键盘的布局: %s\n"
-#: ../../Xconfigurator.pm_.c:1510
+#: ../../Xconfig/various.pm_.c:28
#, c-format
msgid "Mouse type: %s\n"
msgstr "鼠标类型: %s\n"
-#: ../../Xconfigurator.pm_.c:1511
+#: ../../Xconfig/various.pm_.c:29
#, c-format
msgid "Mouse device: %s\n"
msgstr "鼠标连接设备: %s\n"
-#: ../../Xconfigurator.pm_.c:1512
+#: ../../Xconfig/various.pm_.c:30
#, c-format
msgid "Monitor: %s\n"
msgstr "显示器: %s\n"
-#: ../../Xconfigurator.pm_.c:1513
+#: ../../Xconfig/various.pm_.c:31
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr "显示器水平更新频率: %s\n"
-#: ../../Xconfigurator.pm_.c:1514
+#: ../../Xconfig/various.pm_.c:32
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr "显示器垂直更新频率: %s\n"
-#: ../../Xconfigurator.pm_.c:1515
-#, c-format
-msgid "Graphic card: %s\n"
-msgstr "显示卡: %s\n"
-
-#: ../../Xconfigurator.pm_.c:1516
+#: ../../Xconfig/various.pm_.c:33
#, c-format
-msgid "Graphic card identification: %s\n"
+msgid "Graphics card: %s\n"
msgstr "显示卡: %s\n"
-#: ../../Xconfigurator.pm_.c:1517
+#: ../../Xconfig/various.pm_.c:34
#, c-format
-msgid "Graphic memory: %s kB\n"
+msgid "Graphics memory: %s kB\n"
msgstr "显存: %s kB\n"
-#: ../../Xconfigurator.pm_.c:1519
+#: ../../Xconfig/various.pm_.c:36
#, c-format
msgid "Color depth: %s\n"
msgstr "彩色深度: %s\n"
-#: ../../Xconfigurator.pm_.c:1520
+#: ../../Xconfig/various.pm_.c:37
#, c-format
msgid "Resolution: %s\n"
msgstr "分辨率: %s\n"
-#: ../../Xconfigurator.pm_.c:1522
+#: ../../Xconfig/various.pm_.c:39
#, c-format
msgid "XFree86 server: %s\n"
msgstr "XFree86 服务器: %s\n"
-#: ../../Xconfigurator.pm_.c:1523
+#: ../../Xconfig/various.pm_.c:40
#, c-format
msgid "XFree86 driver: %s\n"
msgstr "XFree86 驱动程序: %s\n"
-#: ../../Xconfigurator.pm_.c:1541
-msgid "Preparing X-Window configuration"
-msgstr "正在准备 X-Window 的设定"
-
-#: ../../Xconfigurator.pm_.c:1561
-msgid "What do you want to do?"
-msgstr "您打算怎么作 ?"
-
-#: ../../Xconfigurator.pm_.c:1566
-msgid "Change Monitor"
-msgstr "改变显示器设定"
-
-#: ../../Xconfigurator.pm_.c:1567
-msgid "Change Graphic card"
-msgstr "改变显示卡"
-
-#: ../../Xconfigurator.pm_.c:1570
-msgid "Change Server options"
-msgstr "改变服务器程序的参数"
-
-#: ../../Xconfigurator.pm_.c:1571
-msgid "Change Resolution"
-msgstr "改变分辨率"
-
-#: ../../Xconfigurator.pm_.c:1572
-msgid "Show information"
-msgstr "显示所有信息"
-
-#: ../../Xconfigurator.pm_.c:1573
-msgid "Test again"
-msgstr "再次测试设定值"
-
-#: ../../Xconfigurator.pm_.c:1574 ../../printerdrake.pm_.c:2473
-#: ../../standalone/logdrake_.c:225
-msgid "Quit"
-msgstr "结束"
-
-#: ../../Xconfigurator.pm_.c:1582
-#, c-format
-msgid ""
-"Keep the changes?\n"
-"Current configuration is:\n"
-"\n"
-"%s"
-msgstr ""
-"保存修改?\n"
-"当前配置是:\n"
-"\n"
-"%s"
-
-#: ../../Xconfigurator.pm_.c:1603
-msgid "X at startup"
+#: ../../Xconfig/various.pm_.c:51
+msgid "Graphical interface at startup"
msgstr "开机时启动 X"
-#: ../../Xconfigurator.pm_.c:1604
+#: ../../Xconfig/various.pm_.c:52
msgid ""
-"I can set up your computer to automatically start X upon booting.\n"
-"Would you like X to start when you reboot?"
+"I can setup your computer to automatically start the graphical interface "
+"(XFree) upon booting.\n"
+"Would you like XFree to start when you reboot?"
msgstr ""
"我可以设定您的电脑在开机时自动进入 X Window 环境,\n"
"您希望这么做吗?"
-#: ../../Xconfigurator.pm_.c:1610
-#, c-format
-msgid "Please relog into %s to activate the changes"
-msgstr "请重新登录到 %s 使您所做的更改生效"
-
-#: ../../Xconfigurator.pm_.c:1625
-msgid "Please log out and then use Ctrl-Alt-BackSpace"
-msgstr "请退出, 然后同时按 Ctrl-Alt-BackSpace"
-
-#: ../../Xconfigurator_consts.pm_.c:6
-msgid "256 colors (8 bits)"
-msgstr "256 色 (8 位元)"
-
-#: ../../Xconfigurator_consts.pm_.c:7
-msgid "32 thousand colors (15 bits)"
-msgstr "3 万 2 千色 (15 位元)"
-
-#: ../../Xconfigurator_consts.pm_.c:8
-msgid "65 thousand colors (16 bits)"
-msgstr "6 万 5 千色 (16 位元)"
-
-#: ../../Xconfigurator_consts.pm_.c:9
-msgid "16 million colors (24 bits)"
-msgstr "1 千 6 百万色 (24 位元)"
-
-#: ../../Xconfigurator_consts.pm_.c:10
-msgid "4 billion colors (32 bits)"
-msgstr "4 亿色 (32 位元)"
-
-#: ../../Xconfigurator_consts.pm_.c:113
-msgid "256 kB"
-msgstr "256 kB"
-
-#: ../../Xconfigurator_consts.pm_.c:114
-msgid "512 kB"
-msgstr "512 kB"
-
-#: ../../Xconfigurator_consts.pm_.c:115
-msgid "1 MB"
-msgstr "1 MB"
-
-#: ../../Xconfigurator_consts.pm_.c:116
-msgid "2 MB"
-msgstr "2 MB"
-
-#: ../../Xconfigurator_consts.pm_.c:117
-msgid "4 MB"
-msgstr "4 MB"
-
-#: ../../Xconfigurator_consts.pm_.c:118
-msgid "8 MB"
-msgstr "8 MB"
-
-#: ../../Xconfigurator_consts.pm_.c:119
-msgid "16 MB"
-msgstr "16 MB"
-
-#: ../../Xconfigurator_consts.pm_.c:120
-msgid "32 MB"
-msgstr "32 MB"
-
-#: ../../Xconfigurator_consts.pm_.c:121
-msgid "64 MB or more"
-msgstr "64 MB 或以上"
-
-#: ../../Xconfigurator_consts.pm_.c:129
-msgid "Standard VGA, 640x480 at 60 Hz"
-msgstr "标准 VGA 模式, 640x480 at 60 Hz"
-
-#: ../../Xconfigurator_consts.pm_.c:130
-msgid "Super VGA, 800x600 at 56 Hz"
-msgstr "Super VGA, 800x600 at 56 Hz"
-
-#: ../../Xconfigurator_consts.pm_.c:131
-msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
-msgstr "8514 相容模式, 1024x768 at 87 Hz 隔行扫描 (no 800x600)"
-
-#: ../../Xconfigurator_consts.pm_.c:132
-msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
-msgstr "Super VGA, 1024x768 at 87 Hz 隔行扫描, 800x600 at 56 Hz"
-
-#: ../../Xconfigurator_consts.pm_.c:133
-msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
-msgstr "扩展 Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
-
-#: ../../Xconfigurator_consts.pm_.c:134
-msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
-msgstr "逐行扫描 SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
-
-#: ../../Xconfigurator_consts.pm_.c:135
-msgid "High Frequency SVGA, 1024x768 at 70 Hz"
-msgstr "高频率 SVGA, 1024x768 at 70 Hz"
-
-#: ../../Xconfigurator_consts.pm_.c:136
-msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
-msgstr "多频率, 最高达 1280x1024 at 60 Hz"
-
-#: ../../Xconfigurator_consts.pm_.c:137
-msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
-msgstr "多频率, 最高达 1280x1024 at 74 Hz"
-
-#: ../../Xconfigurator_consts.pm_.c:138
-msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
-msgstr "多频率, 最高达 1280x1024 at 76 Hz"
-
-#: ../../Xconfigurator_consts.pm_.c:139
-msgid "Monitor that can do 1600x1200 at 70 Hz"
-msgstr "您的显示器可使用 1600x1200 at 70 Hz"
-
-#: ../../Xconfigurator_consts.pm_.c:140
-msgid "Monitor that can do 1600x1200 at 76 Hz"
-msgstr "您的显示器可使用 1600x1200 at 76 Hz"
-
-#: ../../any.pm_.c:116 ../../any.pm_.c:141
+#: ../../any.pm_.c:117 ../../any.pm_.c:142
msgid "First sector of boot partition"
msgstr "开机分区的第一扇区"
-#: ../../any.pm_.c:116 ../../any.pm_.c:141 ../../any.pm_.c:218
+#: ../../any.pm_.c:117 ../../any.pm_.c:142 ../../any.pm_.c:219
msgid "First sector of drive (MBR)"
msgstr "硬盘的主引导区 (MBR)"
-#: ../../any.pm_.c:120
+#: ../../any.pm_.c:121
msgid "SILO Installation"
msgstr "SILO 安装"
-#: ../../any.pm_.c:121 ../../any.pm_.c:134
+#: ../../any.pm_.c:122 ../../any.pm_.c:135
msgid "Where do you want to install the bootloader?"
msgstr "您希望开机引导程序安装到哪里?"
-#: ../../any.pm_.c:133
+#: ../../any.pm_.c:134
msgid "LILO/grub Installation"
msgstr "LILO/grub 安装"
-#: ../../any.pm_.c:145 ../../any.pm_.c:159
+#: ../../any.pm_.c:146 ../../any.pm_.c:160
msgid "SILO"
msgstr "SILO"
-#: ../../any.pm_.c:147
+#: ../../any.pm_.c:148
msgid "LILO with text menu"
msgstr "文本菜单 LILO"
-#: ../../any.pm_.c:148 ../../any.pm_.c:159
+#: ../../any.pm_.c:149 ../../any.pm_.c:160
msgid "LILO with graphical menu"
msgstr "图形菜单 LILO"
-#: ../../any.pm_.c:151
+#: ../../any.pm_.c:152
msgid "Grub"
msgstr "Grub"
-#: ../../any.pm_.c:155
+#: ../../any.pm_.c:156
msgid "Boot from DOS/Windows (loadlin)"
msgstr "从DOS/Windows启动"
-#: ../../any.pm_.c:157 ../../any.pm_.c:159
+#: ../../any.pm_.c:158 ../../any.pm_.c:160
msgid "Yaboot"
msgstr "根分区"
-#: ../../any.pm_.c:166 ../../any.pm_.c:198
+#: ../../any.pm_.c:167 ../../any.pm_.c:199
msgid "Bootloader main options"
msgstr "开机引导程序的主要选项"
-#: ../../any.pm_.c:167 ../../any.pm_.c:199
+#: ../../any.pm_.c:168 ../../any.pm_.c:200
msgid "Bootloader to use"
msgstr "开机引导程序"
-#: ../../any.pm_.c:169
+#: ../../any.pm_.c:170
msgid "Bootloader installation"
msgstr "开机引导程序安装"
-#: ../../any.pm_.c:171 ../../any.pm_.c:201
+#: ../../any.pm_.c:172 ../../any.pm_.c:202
msgid "Boot device"
msgstr "开机引导设备"
-#: ../../any.pm_.c:172
+#: ../../any.pm_.c:173
msgid "LBA (doesn't work on old BIOSes)"
msgstr "LBA (在老旧的 BIOS 上不能工作)"
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:174
msgid "Compact"
msgstr "紧凑"
-#: ../../any.pm_.c:173
+#: ../../any.pm_.c:174
msgid "compact"
msgstr "紧凑"
-#: ../../any.pm_.c:174 ../../any.pm_.c:298
+#: ../../any.pm_.c:175 ../../any.pm_.c:299
msgid "Video mode"
msgstr "显示模式"
-#: ../../any.pm_.c:176
+#: ../../any.pm_.c:177
msgid "Delay before booting default image"
msgstr "开机等候时间"
-#: ../../any.pm_.c:178 ../../any.pm_.c:796
-#: ../../install_steps_interactive.pm_.c:1115 ../../network/modem.pm_.c:48
-#: ../../printerdrake.pm_.c:708 ../../printerdrake.pm_.c:806
-#: ../../standalone/draknet_.c:625
+#: ../../any.pm_.c:179 ../../any.pm_.c:794
+#: ../../diskdrake/smbnfs_gtk.pm_.c:179
+#: ../../install_steps_interactive.pm_.c:1110 ../../network/modem.pm_.c:48
+#: ../../printerdrake.pm_.c:732 ../../printerdrake.pm_.c:830
+#: ../../standalone/drakconnect_.c:625 ../../standalone/drakconnect_.c:650
msgid "Password"
msgstr "口令"
-#: ../../any.pm_.c:179 ../../any.pm_.c:797
-#: ../../install_steps_interactive.pm_.c:1116
+#: ../../any.pm_.c:180 ../../any.pm_.c:795
+#: ../../install_steps_interactive.pm_.c:1111
msgid "Password (again)"
msgstr "口令 (再一次)"
-#: ../../any.pm_.c:180
+#: ../../any.pm_.c:181
msgid "Restrict command line options"
msgstr "限制命令行选项"
-#: ../../any.pm_.c:180
+#: ../../any.pm_.c:181
msgid "restrict"
msgstr "限制"
-#: ../../any.pm_.c:182
+#: ../../any.pm_.c:183
msgid "Clean /tmp at each boot"
msgstr "每次开机时清除 /tmp"
-#: ../../any.pm_.c:183
+#: ../../any.pm_.c:184
#, c-format
msgid "Precise RAM size if needed (found %d MB)"
msgstr "精确的存储器大小 (找到 %dMB)"
-#: ../../any.pm_.c:185
+#: ../../any.pm_.c:186
msgid "Enable multi profiles"
msgstr "运行多种配置"
-#: ../../any.pm_.c:189
+#: ../../any.pm_.c:190
msgid "Give the ram size in MB"
msgstr "告诉我有多少 Mb 的内存"
-#: ../../any.pm_.c:191
+#: ../../any.pm_.c:192
msgid ""
"Option ``Restrict command line options'' is of no use without a password"
msgstr "没有口令不能使用 ``限定参数选项''"
-#: ../../any.pm_.c:192 ../../any.pm_.c:773
-#: ../../diskdrake/interactive.pm_.c:1135
-#: ../../install_steps_interactive.pm_.c:1110
+#: ../../any.pm_.c:193 ../../any.pm_.c:770
+#: ../../diskdrake/interactive.pm_.c:1178
+#: ../../install_steps_interactive.pm_.c:1105
msgid "Please try again"
msgstr "请再试一次"
-#: ../../any.pm_.c:192 ../../any.pm_.c:773
-#: ../../install_steps_interactive.pm_.c:1110
+#: ../../any.pm_.c:193 ../../any.pm_.c:770
+#: ../../install_steps_interactive.pm_.c:1105
msgid "The passwords do not match"
msgstr "两次口令不符"
-#: ../../any.pm_.c:200
+#: ../../any.pm_.c:201
msgid "Init Message"
msgstr "初始信息"
-#: ../../any.pm_.c:202
+#: ../../any.pm_.c:203
msgid "Open Firmware Delay"
msgstr "固件延迟"
-#: ../../any.pm_.c:203
+#: ../../any.pm_.c:204
msgid "Kernel Boot Timeout"
msgstr "核心启动超时"
-#: ../../any.pm_.c:204
+#: ../../any.pm_.c:205
msgid "Enable CD Boot?"
msgstr "CD 启动?"
-#: ../../any.pm_.c:205
+#: ../../any.pm_.c:206
msgid "Enable OF Boot?"
msgstr "OF 启动?"
-#: ../../any.pm_.c:206
+#: ../../any.pm_.c:207
msgid "Default OS?"
msgstr "缺省操作系统?"
-#: ../../any.pm_.c:240
+#: ../../any.pm_.c:241
msgid ""
"You decided to install the bootloader on a partition.\n"
"This implies you already have a bootloader on the hard drive you boot (eg: "
@@ -686,83 +539,83 @@ msgid ""
"On which drive are you booting?"
msgstr ""
-#: ../../any.pm_.c:255
+#: ../../any.pm_.c:256
msgid ""
-"Here are the different entries.\n"
+"Here are the entries on your boot menu so far.\n"
"You can add some more or change the existing ones."
msgstr ""
"现在有下列条目.\n"
"您可以增加或是更改已存在的条目"
-#: ../../any.pm_.c:265 ../../standalone/drakbackup_.c:752
-#: ../../standalone/drakbackup_.c:861 ../../standalone/drakfont_.c:789
-#: ../../standalone/drakfont_.c:826
+#: ../../any.pm_.c:266 ../../standalone/drakbackup_.c:1035
+#: ../../standalone/drakbackup_.c:1149 ../../standalone/drakfont_.c:1012
+#: ../../standalone/drakfont_.c:1055
msgid "Add"
msgstr "增加"
-#: ../../any.pm_.c:265 ../../any.pm_.c:784 ../../diskdrake/hd_gtk.pm_.c:153
-#: ../../diskdrake/removable.pm_.c:27 ../../diskdrake/smbnfs_gtk.pm_.c:86
-#: ../../interactive_http.pm_.c:153
+#: ../../any.pm_.c:266 ../../any.pm_.c:782 ../../diskdrake/hd_gtk.pm_.c:153
+#: ../../diskdrake/removable.pm_.c:27 ../../diskdrake/smbnfs_gtk.pm_.c:88
+#: ../../interactive/http.pm_.c:153
msgid "Done"
msgstr "完成"
-#: ../../any.pm_.c:265
+#: ../../any.pm_.c:266
msgid "Modify"
msgstr "修改"
-#: ../../any.pm_.c:273
+#: ../../any.pm_.c:274
msgid "Which type of entry do you want to add?"
msgstr "要增加的条目是什么类型?"
-#: ../../any.pm_.c:274 ../../standalone/drakbackup_.c:895
+#: ../../any.pm_.c:275 ../../standalone/drakbackup_.c:1183
msgid "Linux"
msgstr "Linux"
-#: ../../any.pm_.c:274
+#: ../../any.pm_.c:275
msgid "Other OS (SunOS...)"
msgstr "其他操作系统 (SunOS...)"
-#: ../../any.pm_.c:275
+#: ../../any.pm_.c:276
msgid "Other OS (MacOS...)"
msgstr "其他操作系统 (MacOS...)"
-#: ../../any.pm_.c:275
+#: ../../any.pm_.c:276
msgid "Other OS (windows...)"
msgstr "其他操作系统 (windows...)"
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:295
msgid "Image"
msgstr "映象文件"
-#: ../../any.pm_.c:295 ../../any.pm_.c:306
+#: ../../any.pm_.c:296 ../../any.pm_.c:307
msgid "Root"
msgstr "根目录所在分区"
-#: ../../any.pm_.c:296 ../../any.pm_.c:325
+#: ../../any.pm_.c:297 ../../any.pm_.c:325
msgid "Append"
msgstr "增加"
-#: ../../any.pm_.c:300
+#: ../../any.pm_.c:301
msgid "Initrd"
msgstr "Initrd"
-#: ../../any.pm_.c:301
+#: ../../any.pm_.c:302
msgid "Read-write"
msgstr "可读写"
-#: ../../any.pm_.c:308
+#: ../../any.pm_.c:309
msgid "Table"
msgstr "表格"
-#: ../../any.pm_.c:309
+#: ../../any.pm_.c:310
msgid "Unsafe"
msgstr "不安全"
-#: ../../any.pm_.c:316 ../../any.pm_.c:321 ../../any.pm_.c:324
+#: ../../any.pm_.c:317 ../../any.pm_.c:322 ../../any.pm_.c:324
msgid "Label"
msgstr "标签"
-#: ../../any.pm_.c:318 ../../any.pm_.c:329
+#: ../../any.pm_.c:319 ../../any.pm_.c:329 ../../harddrake/bttv.pm_.c:184
msgid "Default"
msgstr "缺省"
@@ -794,53 +647,75 @@ msgstr "您必须指定根目录所在分区"
msgid "This label is already used"
msgstr "这个名字已经被使用"
-#: ../../any.pm_.c:656
+#: ../../any.pm_.c:666
#, c-format
msgid "Found %s %s interfaces"
msgstr "找到 %s %s 接口"
-#: ../../any.pm_.c:657
+#: ../../any.pm_.c:667
msgid "Do you have another one?"
msgstr "您有其他的吗 ?"
-#: ../../any.pm_.c:658
+#: ../../any.pm_.c:668
#, c-format
msgid "Do you have any %s interfaces?"
msgstr "您还有其他 %s 接口吗 ?"
-#: ../../any.pm_.c:660 ../../any.pm_.c:832 ../../interactive.pm_.c:132
-#: ../../my_gtk.pm_.c:1018
+#: ../../any.pm_.c:670 ../../any.pm_.c:829 ../../interactive.pm_.c:132
+#: ../../my_gtk.pm_.c:1055
msgid "No"
msgstr "否"
-#: ../../any.pm_.c:660 ../../any.pm_.c:831 ../../interactive.pm_.c:132
-#: ../../my_gtk.pm_.c:1018
+#: ../../any.pm_.c:670 ../../any.pm_.c:828 ../../interactive.pm_.c:132
+#: ../../my_gtk.pm_.c:1055
msgid "Yes"
msgstr "是"
-#: ../../any.pm_.c:661
+#: ../../any.pm_.c:671
msgid "See hardware info"
msgstr "查看硬体信息"
#. -PO: the first %s is the card type (scsi, network, sound,...)
#. -PO: the second is the vendor+model name
-#: ../../any.pm_.c:695
+#: ../../any.pm_.c:687
#, c-format
msgid "Installing driver for %s card %s"
msgstr "正在安装 %s 卡 %s 的驱动程序"
-#: ../../any.pm_.c:696
+#: ../../any.pm_.c:688
#, c-format
msgid "(module %s)"
msgstr "(模块 %s)"
+#: ../../any.pm_.c:697
+#, c-format
+msgid ""
+"You may now provide its options to module %s.\n"
+"Note that any address should be entered with the prefix 0x like '0x123'"
+msgstr ""
+
+#: ../../any.pm_.c:703
+#, c-format
+msgid ""
+"You may now provide options to module %s.\n"
+"Options are in format ``name=value name2=value2 ...''.\n"
+"For instance, ``io=0x300 irq=7''"
+msgstr ""
+"现在给模块 %s 指定它的选项. \n"
+"选项的格式是 ``name=value name2=value2...'' \n"
+"例如, ``io=0x300 irq=7''"
+
+#: ../../any.pm_.c:705
+msgid "Module options:"
+msgstr "模块参数"
+
#. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../any.pm_.c:707
+#: ../../any.pm_.c:717
#, c-format
msgid "Which %s driver should I try?"
msgstr "尝试使用哪个 %s 驱动程序 ?"
-#: ../../any.pm_.c:715
+#: ../../any.pm_.c:726
#, c-format
msgid ""
"In some cases, the %s driver needs to have extra information to work\n"
@@ -856,37 +731,15 @@ msgstr ""
"确定需要的信息. 偶尔会发生机器在探测中停止反应, 不过这不会损坏什么. \n"
"您决定怎么做 ?"
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:730
msgid "Autoprobe"
msgstr "自动探测"
-#: ../../any.pm_.c:720
+#: ../../any.pm_.c:730
msgid "Specify options"
msgstr "指定参数"
-#: ../../any.pm_.c:725
-#, c-format
-msgid ""
-"You may now provide its options to module %s.\n"
-"Note that any address should be entered with the prefix 0x like '0x123'"
-msgstr ""
-
-#: ../../any.pm_.c:731
-#, c-format
-msgid ""
-"You may now provide its options to module %s.\n"
-"Options are in format ``name=value name2=value2 ...''.\n"
-"For instance, ``io=0x300 irq=7''"
-msgstr ""
-"现在给模块 %s 指定它的选项. \n"
-"选项的格式是 ``name=value name2=value2...'' \n"
-"例如, ``io=0x300 irq=7''"
-
-#: ../../any.pm_.c:734
-msgid "Module options:"
-msgstr "模块参数"
-
-#: ../../any.pm_.c:745
+#: ../../any.pm_.c:742
#, c-format
msgid ""
"Loading module %s failed.\n"
@@ -895,49 +748,54 @@ msgstr ""
"模块 %s 加载失败.\n"
"您要尝试其他的参数吗 ?"
-#: ../../any.pm_.c:761
+#: ../../any.pm_.c:758
msgid "access to X programs"
msgstr "允许使用 X Window 应用程序"
-#: ../../any.pm_.c:762
+#: ../../any.pm_.c:759
msgid "access to rpm tools"
msgstr "允许使用包管理工具"
-#: ../../any.pm_.c:763
+#: ../../any.pm_.c:760
msgid "allow \"su\""
msgstr "允许使用\"su\"指令"
-#: ../../any.pm_.c:764
+#: ../../any.pm_.c:761
msgid "access to administrative files"
msgstr "允许访问系统配置文件"
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:766
#, c-format
msgid "(already added %s)"
msgstr "(已经增加了 %s)"
-#: ../../any.pm_.c:774
+#: ../../any.pm_.c:771
msgid "This password is too simple"
msgstr "口令太简单"
-#: ../../any.pm_.c:775
+#: ../../any.pm_.c:772
msgid "Please give a user name"
msgstr "请给出有关用户名"
-#: ../../any.pm_.c:776
+#: ../../any.pm_.c:773
msgid ""
"The user name must contain only lower cased letters, numbers, `-' and `_'"
msgstr "用户名只能有小写字母、数字,`-' 和 `_'"
-#: ../../any.pm_.c:777
+#: ../../any.pm_.c:774
+#, fuzzy
+msgid "The user name is too long"
+msgstr "该用户名已经存在"
+
+#: ../../any.pm_.c:775
msgid "This user name is already added"
msgstr "该用户名已经存在"
-#: ../../any.pm_.c:781
+#: ../../any.pm_.c:779
msgid "Add user"
msgstr "增加新用户"
-#: ../../any.pm_.c:782
+#: ../../any.pm_.c:780
#, c-format
msgid ""
"Enter a user\n"
@@ -946,32 +804,32 @@ msgstr ""
"请输入一个用户名\n"
"%s"
-#: ../../any.pm_.c:783
+#: ../../any.pm_.c:781
msgid "Accept user"
msgstr "接受该用户"
-#: ../../any.pm_.c:794
+#: ../../any.pm_.c:792
msgid "Real name"
msgstr "用户真实姓名"
-#: ../../any.pm_.c:795 ../../printerdrake.pm_.c:707
-#: ../../printerdrake.pm_.c:805
+#: ../../any.pm_.c:793 ../../printerdrake.pm_.c:731
+#: ../../printerdrake.pm_.c:829
msgid "User name"
msgstr "用户登录名"
-#: ../../any.pm_.c:798
+#: ../../any.pm_.c:796
msgid "Shell"
msgstr "Shell"
-#: ../../any.pm_.c:800
+#: ../../any.pm_.c:798
msgid "Icon"
msgstr "图标"
-#: ../../any.pm_.c:828
+#: ../../any.pm_.c:825
msgid "Autologin"
msgstr "自动登录"
-#: ../../any.pm_.c:829
+#: ../../any.pm_.c:826
msgid ""
"I can set up your computer to automatically log on one user.\n"
"Do you want to use this feature?"
@@ -979,120 +837,100 @@ msgstr ""
"您可以在这里设定开机时自动以某用户的身份登入系统.\n"
"您希望使用这个特性吗 ?"
-#: ../../any.pm_.c:833
+#: ../../any.pm_.c:830
msgid "Choose the default user:"
msgstr "选择缺省的用户:"
-#: ../../any.pm_.c:834
+#: ../../any.pm_.c:831
msgid "Choose the window manager to run:"
msgstr "选择要运行的窗口管理程序:"
-#: ../../any.pm_.c:849
+#: ../../any.pm_.c:846
msgid "Please choose a language to use."
msgstr "请选择系统缺省使用的语言."
-#: ../../any.pm_.c:851
-msgid "You can choose other languages that will be available after install"
+#: ../../any.pm_.c:848
+msgid ""
+"Mandrake Linux can support multiple languages. Select\n"
+"the languages you would like to install. They will be available\n"
+"when your installation is complete and you restart your system."
msgstr "您可以在这里增加系统中其他可用的语言"
-#: ../../any.pm_.c:863 ../../install_steps_interactive.pm_.c:719
-#: ../../standalone/drakxtv_.c:54
+#: ../../any.pm_.c:862 ../../install_steps_interactive.pm_.c:709
+#: ../../standalone/drakxtv_.c:78
msgid "All"
msgstr "全部"
-#: ../../any.pm_.c:955
+#: ../../any.pm_.c:973
msgid "Allow all users"
msgstr "允许所有用户使用"
-#: ../../any.pm_.c:955 ../../install_steps_interactive.pm_.c:521
-msgid "Custom"
-msgstr "定制"
-
-#: ../../any.pm_.c:955
+#: ../../any.pm_.c:973
msgid "No sharing"
msgstr "禁止共享"
-#: ../../any.pm_.c:965 ../../network/smbnfs.pm_.c:45
+#: ../../any.pm_.c:983 ../../network/smbnfs.pm_.c:47
#, c-format
msgid "The package %s needs to be installed. Do you want to install it?"
msgstr ""
"需要安装软件包 %s .\n"
". 您同意安装吗 ?"
-#: ../../any.pm_.c:968
-msgid "You can export using NFS or Samba. Which one do you want"
+#: ../../any.pm_.c:986
+msgid ""
+"You can export using NFS or Samba. Please select which you'd like to use."
msgstr "您可以通过 NFS 或 Samba 来共享文件. 您希望使用哪一个? "
-#: ../../any.pm_.c:976 ../../network/smbnfs.pm_.c:49
+#: ../../any.pm_.c:994 ../../network/smbnfs.pm_.c:51
#, c-format
msgid "Mandatory package %s is missing"
msgstr "无法找到包文件 %s"
-#: ../../any.pm_.c:982
+#: ../../any.pm_.c:1000
msgid ""
-"Do you want to allow users to export some directories in their home?\n"
+"Would you like to allow users to share some of their directories?\n"
"Allowing this will permit users to simply click on \"Share\" in konqueror "
"and nautilus.\n"
"\n"
"\"Custom\" permit a per-user granularity.\n"
msgstr ""
-#: ../../any.pm_.c:996 ../../bootlook.pm_.c:161
-#: ../../diskdrake/smbnfs_gtk.pm_.c:85 ../../install_steps_gtk.pm_.c:464
-#: ../../install_steps_gtk.pm_.c:522 ../../install_steps_interactive.pm_.c:594
-#: ../../interactive.pm_.c:142 ../../interactive.pm_.c:317
-#: ../../interactive.pm_.c:349 ../../interactive_stdio.pm_.c:141
-#: ../../my_gtk.pm_.c:687 ../../my_gtk.pm_.c:690 ../../my_gtk.pm_.c:1019
-#: ../../network/netconnect.pm_.c:47 ../../printerdrake.pm_.c:1586
-#: ../../standalone/drakautoinst_.c:204 ../../standalone/drakbackup_.c:2264
-#: ../../standalone/drakbackup_.c:2289 ../../standalone/drakbackup_.c:2310
-#: ../../standalone/drakbackup_.c:2331 ../../standalone/drakbackup_.c:2349
-#: ../../standalone/drakbackup_.c:2397 ../../standalone/drakbackup_.c:2417
-#: ../../standalone/drakbackup_.c:2436 ../../standalone/drakfont_.c:767
-#: ../../standalone/drakgw_.c:721 ../../standalone/draknet_.c:116
-#: ../../standalone/draknet_.c:148 ../../standalone/draknet_.c:290
-#: ../../standalone/draknet_.c:538 ../../standalone/draknet_.c:680
-#: ../../standalone/logdrake_.c:225 ../../standalone/logdrake_.c:512
-#: ../../standalone/tinyfirewall_.c:65
-msgid "Cancel"
-msgstr "取消"
-
-#: ../../any.pm_.c:996
+#: ../../any.pm_.c:1014
msgid "Launch userdrake"
msgstr ""
-#: ../../any.pm_.c:998
+#: ../../any.pm_.c:1016
msgid ""
"The per-user sharing uses the group \"fileshare\". \n"
"You can use userdrake to add a user in this group."
msgstr ""
-#: ../../any.pm_.c:1035
+#: ../../any.pm_.c:1066 ../../security/msec.pm_.c:135
msgid "Welcome To Crackers"
msgstr "欢迎入侵者"
-#: ../../any.pm_.c:1036
+#: ../../any.pm_.c:1067 ../../security/msec.pm_.c:136
msgid "Poor"
msgstr "差"
-#: ../../any.pm_.c:1037 ../../mouse.pm_.c:31
+#: ../../any.pm_.c:1068 ../../mouse.pm_.c:31 ../../security/msec.pm_.c:137
msgid "Standard"
msgstr "标准"
-#: ../../any.pm_.c:1038
+#: ../../any.pm_.c:1069 ../../security/msec.pm_.c:138
msgid "High"
msgstr "高"
-#: ../../any.pm_.c:1039
+#: ../../any.pm_.c:1070 ../../security/msec.pm_.c:139
#, fuzzy
msgid "Higher"
msgstr "高"
-#: ../../any.pm_.c:1040
+#: ../../any.pm_.c:1071 ../../security/msec.pm_.c:140
msgid "Paranoid"
msgstr "苛刻"
-#: ../../any.pm_.c:1043
+#: ../../any.pm_.c:1074
msgid ""
"This level is to be used with care. It makes your system more easy to use,\n"
"but very sensitive: it must not be used for a machine connected to others\n"
@@ -1102,13 +940,13 @@ msgstr ""
"这一级别应慎重使用. 它是您的系统使用更简单, 然而也更脆弱:\n"
"假如这台机器将要和其他机器联网或者接入互联网, 绝对不要采用这个级别."
-#: ../../any.pm_.c:1046
+#: ../../any.pm_.c:1077 ../../security/msec.pm_.c:147
msgid ""
"Password are now enabled, but use as a networked computer is still not "
"recommended."
msgstr "开启了口令检查功能. 但是仍不建议用于联网的电脑."
-#: ../../any.pm_.c:1047
+#: ../../any.pm_.c:1078 ../../security/msec.pm_.c:148
#, fuzzy
msgid ""
"This is the standard security recommended for a computer that will be used "
@@ -1117,57 +955,58 @@ msgstr ""
"标准安全级别: 联网电脑和拨号用户推荐使用.\n"
"该级别应用了必要的安全检查措施."
-#: ../../any.pm_.c:1048
+#: ../../any.pm_.c:1079 ../../security/msec.pm_.c:149
msgid ""
"There are already some restrictions, and more automatic checks are run every "
"night."
msgstr ""
-#: ../../any.pm_.c:1049
+#: ../../any.pm_.c:1080
#, fuzzy
msgid ""
"With this security level, the use of this system as a server becomes "
"possible.\n"
-"The security is now high enough to use the system as a server which accept\n"
+"The security is now high enough to use the system as a server which can "
+"accept\n"
"connections from many clients. Note: if your machine is only a client on the "
-"Internet, you should better choose a lower level."
+"Internet, you should choose a lower level."
msgstr ""
"服务器推荐使用安全级别.\n"
"拥有足够的安全性, 系统可以作为服务器接受来自众多客户的连接."
-#: ../../any.pm_.c:1052
+#: ../../any.pm_.c:1083 ../../security/msec.pm_.c:153
#, fuzzy
msgid ""
-"Based on the previous level, but the system is entirely closed.\n"
-"Security features are at their maximum."
+"This is similar to the previous level, but the system is entirely closed and "
+"security features are at their maximum."
msgstr ""
"基于上一级安全级别, 不过系统处于完全封闭状态.\n"
"所有安全特性达到最大限度."
-#: ../../any.pm_.c:1058
-msgid "Choose security level"
-msgstr "选择安全级别"
-
-#: ../../any.pm_.c:1061
+#: ../../any.pm_.c:1093 ../../security/msec.pm_.c:164
msgid "Security level"
msgstr "安全级别"
-#: ../../any.pm_.c:1063
+#: ../../any.pm_.c:1095 ../../security/msec.pm_.c:166
msgid "Use libsafe for servers"
msgstr "服务器使用 libsafe"
-#: ../../any.pm_.c:1064
+#: ../../any.pm_.c:1096 ../../security/msec.pm_.c:167
msgid ""
"A library which defends against buffer overflow and format string attacks."
msgstr "防止缓冲溢出和串格式攻击"
+#: ../../any.pm_.c:1097 ../../security/msec.pm_.c:168
+msgid "Security Administrator (login or email)"
+msgstr ""
+
# NOTE: this message will be displayed at boot time; that is
# only the ascii charset will be available on most machines
# so use only 7bit for this message (and do transliteration or
# leave it in English, as it is the best for your language)
#
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:355
+#: ../../bootloader.pm_.c:356
#, c-format
msgid ""
"Welcome to %s the operating system chooser!\n"
@@ -1192,52 +1031,52 @@ msgstr ""
#
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:928
+#: ../../bootloader.pm_.c:912
msgid "Welcome to GRUB the operating system chooser!"
msgstr "Welcome to GRUB the operating system chooser!"
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:931
+#: ../../bootloader.pm_.c:915
#, c-format
msgid "Use the %c and %c keys for selecting which entry is highlighted."
msgstr "Use the %c and %c keys for selecting which entry is highlighted."
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:934
+#: ../../bootloader.pm_.c:918
msgid "Press enter to boot the selected OS, 'e' to edit the"
msgstr "Press enter to boot the selected OS, 'e' to edit the"
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:937
+#: ../../bootloader.pm_.c:921
msgid "commands before booting, or 'c' for a command-line."
msgstr "commands before booting, or 'c' for a command-line."
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:940
+#: ../../bootloader.pm_.c:924
#, c-format
msgid "The highlighted entry will be booted automatically in %d seconds."
msgstr "The highlighted entry will be booted automatically in %d seconds."
-#: ../../bootloader.pm_.c:944
+#: ../../bootloader.pm_.c:928
msgid "not enough room in /boot"
msgstr " /boot 中没有足够空间"
#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
#. -PO: so you may need to put them in English or in a different language if MS-windows doesn't exist in your language
-#: ../../bootloader.pm_.c:1044
+#: ../../bootloader.pm_.c:1028
msgid "Desktop"
msgstr "桌面"
#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:1046
+#: ../../bootloader.pm_.c:1030
msgid "Start Menu"
msgstr "开始菜单"
-#: ../../bootloader.pm_.c:1065
+#: ../../bootloader.pm_.c:1049
#, c-format
msgid "You can't install the bootloader on a %s partition\n"
msgstr "%s 分区不能安装开机引导程序\n"
@@ -1250,17 +1089,21 @@ msgstr "帮助功能未实现.\n"
msgid "Boot Style Configuration"
msgstr "启动配置"
-#: ../../bootlook.pm_.c:79 ../../standalone/logdrake_.c:101
+#: ../../bootlook.pm_.c:79 ../../harddrake/ui.pm_.c:11
+#: ../../harddrake/ui.pm_.c:12 ../../standalone/drakfloppy_.c:82
+#: ../../standalone/logdrake_.c:101
msgid "/_File"
-msgstr "/_F文件"
+msgstr "/_F 文件"
-#: ../../bootlook.pm_.c:80 ../../standalone/logdrake_.c:107
+#: ../../bootlook.pm_.c:80 ../../standalone/drakfloppy_.c:83
+#: ../../standalone/logdrake_.c:107
msgid "/File/_Quit"
-msgstr "/文件/_Q退出"
+msgstr "/F 文件/_Q 退出"
-#: ../../bootlook.pm_.c:80 ../../standalone/logdrake_.c:107
+#: ../../bootlook.pm_.c:80 ../../harddrake/ui.pm_.c:12
+#: ../../standalone/drakfloppy_.c:83 ../../standalone/logdrake_.c:107
msgid "<control>Q"
-msgstr "<控制>Q"
+msgstr "<control>Q"
#: ../../bootlook.pm_.c:91
msgid "NewStyle Categorizing Monitor"
@@ -1293,14 +1136,14 @@ msgstr "Yaboot模式"
#: ../../bootlook.pm_.c:104
#, c-format
msgid ""
-"You are currently using %s as Boot Manager.\n"
+"You are currently using %s as your boot manager.\n"
"Click on Configure to launch the setup wizard."
msgstr ""
"你目前使用 %s 作为开机程序管理器.\n"
"点击''配置''运行配置精灵."
-#: ../../bootlook.pm_.c:106 ../../standalone/drakbackup_.c:1467
-#: ../../standalone/drakbackup_.c:1478 ../../standalone/drakgw_.c:715
+#: ../../bootlook.pm_.c:106 ../../standalone/drakbackup_.c:1804
+#: ../../standalone/drakbackup_.c:1815 ../../standalone/drakgw_.c:594
#: ../../standalone/tinyfirewall_.c:59
msgid "Configure"
msgstr "配置"
@@ -1310,7 +1153,7 @@ msgid "System mode"
msgstr "系统模式"
#: ../../bootlook.pm_.c:143
-msgid "Launch the X-Window system at start"
+msgid "Launch the graphical environment when your system starts"
msgstr "启动时运行X窗口"
#: ../../bootlook.pm_.c:148
@@ -1321,14 +1164,16 @@ msgstr "不,不要自动录入"
msgid "Yes, I want autologin with this (user, desktop)"
msgstr "是, 以(用户,桌面)录入"
-#: ../../bootlook.pm_.c:160 ../../network/netconnect.pm_.c:102
-#: ../../standalone/drakbackup_.c:2441 ../../standalone/drakbackup_.c:3345
-#: ../../standalone/drakfont_.c:532 ../../standalone/drakfont_.c:655
-#: ../../standalone/drakfont_.c:719 ../../standalone/drakfont_.c:765
-#: ../../standalone/draknet_.c:109 ../../standalone/draknet_.c:141
-#: ../../standalone/draknet_.c:297 ../../standalone/draknet_.c:436
-#: ../../standalone/draknet_.c:522 ../../standalone/draknet_.c:565
-#: ../../standalone/draknet_.c:666 ../../standalone/logdrake_.c:505
+#: ../../bootlook.pm_.c:160 ../../network/netconnect.pm_.c:101
+#: ../../standalone/drakTermServ_.c:174 ../../standalone/drakTermServ_.c:301
+#: ../../standalone/drakTermServ_.c:403 ../../standalone/drakbackup_.c:2851
+#: ../../standalone/drakbackup_.c:3774 ../../standalone/drakconnect_.c:109
+#: ../../standalone/drakconnect_.c:141 ../../standalone/drakconnect_.c:297
+#: ../../standalone/drakconnect_.c:436 ../../standalone/drakconnect_.c:522
+#: ../../standalone/drakconnect_.c:565 ../../standalone/drakconnect_.c:668
+#: ../../standalone/drakfloppy_.c:377 ../../standalone/drakfont_.c:613
+#: ../../standalone/drakfont_.c:800 ../../standalone/drakfont_.c:877
+#: ../../standalone/drakfont_.c:964 ../../standalone/logdrake_.c:530
msgid "OK"
msgstr "确定"
@@ -1376,7 +1221,7 @@ msgstr "无法在分区完成之前进行屏幕捕捉"
msgid "Screenshots will be available after install in %s"
msgstr "您可以在安装到 %s 之后再使用屏幕捕捉功能"
-#: ../../crypto.pm_.c:12 ../../crypto.pm_.c:26 ../../standalone/drakxtv_.c:50
+#: ../../crypto.pm_.c:12 ../../crypto.pm_.c:26 ../../network/tools.pm_.c:113
msgid "France"
msgstr "法国"
@@ -1384,7 +1229,7 @@ msgstr "法国"
msgid "Costa Rica"
msgstr "哥斯达黎加"
-#: ../../crypto.pm_.c:14 ../../crypto.pm_.c:27
+#: ../../crypto.pm_.c:14 ../../crypto.pm_.c:27 ../../network/tools.pm_.c:116
msgid "Belgium"
msgstr "比利时"
@@ -1408,11 +1253,12 @@ msgstr "挪威"
msgid "Sweden"
msgstr "瑞典"
-#: ../../crypto.pm_.c:20 ../../crypto.pm_.c:34
+#: ../../crypto.pm_.c:20 ../../crypto.pm_.c:34 ../../network/tools.pm_.c:114
msgid "Netherlands"
msgstr "荷兰"
-#: ../../crypto.pm_.c:21 ../../crypto.pm_.c:35 ../../standalone/drakxtv_.c:50
+#: ../../crypto.pm_.c:21 ../../crypto.pm_.c:35 ../../network/tools.pm_.c:115
+#: ../../standalone/drakxtv_.c:74
msgid "Italy"
msgstr "意大利"
@@ -1420,7 +1266,7 @@ msgstr "意大利"
msgid "Austria"
msgstr "奥地利"
-#: ../../crypto.pm_.c:33 ../../crypto.pm_.c:67
+#: ../../crypto.pm_.c:33 ../../crypto.pm_.c:67 ../../network/tools.pm_.c:117
msgid "United States"
msgstr "美国"
@@ -1428,8 +1274,8 @@ msgstr "美国"
msgid "Please make a backup of your data first"
msgstr "请先备份您的数据"
-#: ../../diskdrake/hd_gtk.pm_.c:94 ../../diskdrake/interactive.pm_.c:891
-#: ../../diskdrake/interactive.pm_.c:900 ../../diskdrake/interactive.pm_.c:954
+#: ../../diskdrake/hd_gtk.pm_.c:94 ../../diskdrake/interactive.pm_.c:922
+#: ../../diskdrake/interactive.pm_.c:931 ../../diskdrake/interactive.pm_.c:997
msgid "Read carefully!"
msgstr "请仔细阅读!"
@@ -1442,11 +1288,12 @@ msgstr ""
"如果您计划采用 aboot, 请注意在磁盘的开头位置留下一段自由空间\n"
"( 2048 扇区就足够了)"
-#: ../../diskdrake/hd_gtk.pm_.c:116 ../../diskdrake/interactive.pm_.c:325
-#: ../../diskdrake/interactive.pm_.c:340 ../../diskdrake/smbnfs_gtk.pm_.c:45
+#: ../../diskdrake/hd_gtk.pm_.c:116 ../../diskdrake/interactive.pm_.c:335
+#: ../../diskdrake/interactive.pm_.c:350 ../../diskdrake/interactive.pm_.c:463
+#: ../../diskdrake/interactive.pm_.c:468 ../../diskdrake/smbnfs_gtk.pm_.c:45
#: ../../install_steps.pm_.c:75 ../../install_steps_interactive.pm_.c:67
-#: ../../install_steps_interactive.pm_.c:356 ../../interactive_http.pm_.c:119
-#: ../../interactive_http.pm_.c:120 ../../standalone/diskdrake_.c:84
+#: ../../install_steps_interactive.pm_.c:366 ../../interactive/http.pm_.c:119
+#: ../../interactive/http.pm_.c:120 ../../standalone/diskdrake_.c:84
msgid "Error"
msgstr "错误"
@@ -1454,11 +1301,11 @@ msgstr "错误"
msgid "Wizard"
msgstr "向导"
-#: ../../diskdrake/hd_gtk.pm_.c:181 ../../diskdrake/removable_gtk.pm_.c:24
+#: ../../diskdrake/hd_gtk.pm_.c:184 ../../diskdrake/removable_gtk.pm_.c:24
msgid "Choose action"
msgstr "选择操作"
-#: ../../diskdrake/hd_gtk.pm_.c:185
+#: ../../diskdrake/hd_gtk.pm_.c:188
msgid ""
"You have one big FAT partition\n"
"(generally used by MicroSoft Dos/Windows).\n"
@@ -1470,173 +1317,178 @@ msgstr ""
"建议您先重设这个分区的大小\n"
"(点中它,然后按 \"改变大小\")"
-#: ../../diskdrake/hd_gtk.pm_.c:188
+#: ../../diskdrake/hd_gtk.pm_.c:191
msgid "Please click on a partition"
msgstr "请选中一个分区"
-#: ../../diskdrake/hd_gtk.pm_.c:202 ../../diskdrake/smbnfs_gtk.pm_.c:67
-#: ../../install_steps_gtk.pm_.c:523
+#: ../../diskdrake/hd_gtk.pm_.c:205 ../../diskdrake/smbnfs_gtk.pm_.c:69
+#: ../../install_steps_gtk.pm_.c:469
msgid "Details"
msgstr "详细情况"
-#: ../../diskdrake/hd_gtk.pm_.c:320
+#: ../../diskdrake/hd_gtk.pm_.c:323
msgid "Ext2"
msgstr "Ext2"
-#: ../../diskdrake/hd_gtk.pm_.c:320
+#: ../../diskdrake/hd_gtk.pm_.c:323
msgid "FAT"
msgstr "FAT"
-#: ../../diskdrake/hd_gtk.pm_.c:320
+#: ../../diskdrake/hd_gtk.pm_.c:323
msgid "HFS"
msgstr "HFS"
-#: ../../diskdrake/hd_gtk.pm_.c:320
+#: ../../diskdrake/hd_gtk.pm_.c:323
msgid "Journalised FS"
msgstr "日志文件系统"
-#: ../../diskdrake/hd_gtk.pm_.c:320
+#: ../../diskdrake/hd_gtk.pm_.c:323
msgid "SunOS"
msgstr "SunOS"
-#: ../../diskdrake/hd_gtk.pm_.c:320
+#: ../../diskdrake/hd_gtk.pm_.c:323
msgid "Swap"
msgstr "交换分区"
-#: ../../diskdrake/hd_gtk.pm_.c:321 ../../diskdrake/interactive.pm_.c:1050
+#: ../../diskdrake/hd_gtk.pm_.c:324 ../../diskdrake/interactive.pm_.c:1093
msgid "Empty"
msgstr "空"
-#: ../../diskdrake/hd_gtk.pm_.c:321 ../../install_steps_gtk.pm_.c:379
-#: ../../install_steps_gtk.pm_.c:439 ../../mouse.pm_.c:162
-#: ../../services.pm_.c:157 ../../standalone/drakbackup_.c:944
+#: ../../diskdrake/hd_gtk.pm_.c:324 ../../install_steps_gtk.pm_.c:329
+#: ../../install_steps_gtk.pm_.c:387 ../../mouse.pm_.c:162
+#: ../../services.pm_.c:157 ../../standalone/drakbackup_.c:1232
msgid "Other"
msgstr "其他"
-#: ../../diskdrake/hd_gtk.pm_.c:325
+#: ../../diskdrake/hd_gtk.pm_.c:328
msgid "Filesystem types:"
msgstr "文件系统类型:"
-#: ../../diskdrake/hd_gtk.pm_.c:342 ../../diskdrake/interactive.pm_.c:386
+#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:396
msgid "Create"
msgstr "新建"
-#: ../../diskdrake/hd_gtk.pm_.c:342 ../../diskdrake/interactive.pm_.c:365
-#: ../../diskdrake/interactive.pm_.c:499 ../../diskdrake/removable.pm_.c:26
+#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:375
+#: ../../diskdrake/interactive.pm_.c:520 ../../diskdrake/removable.pm_.c:26
#: ../../diskdrake/removable.pm_.c:49 ../../diskdrake/removable_gtk.pm_.c:17
msgid "Type"
msgstr "类型"
-#: ../../diskdrake/hd_gtk.pm_.c:342 ../../diskdrake/hd_gtk.pm_.c:344
+#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/hd_gtk.pm_.c:347
#, c-format
msgid "Use ``%s'' instead"
msgstr "用 ``%s'' 代替"
-#: ../../diskdrake/hd_gtk.pm_.c:344 ../../diskdrake/interactive.pm_.c:374
+#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/interactive.pm_.c:384
msgid "Delete"
msgstr "删除"
-#: ../../diskdrake/hd_gtk.pm_.c:348
+#: ../../diskdrake/hd_gtk.pm_.c:351
msgid "Use ``Unmount'' first"
msgstr "请先做 ``Unmount'' "
-#: ../../diskdrake/hd_gtk.pm_.c:349 ../../diskdrake/interactive.pm_.c:491
+#: ../../diskdrake/hd_gtk.pm_.c:352 ../../diskdrake/interactive.pm_.c:512
#, c-format
msgid ""
"After changing type of partition %s, all data on this partition will be lost"
msgstr "在改变分区表 %s 的类型之后, 在这个分区上的所有资料将要被清除"
-#: ../../diskdrake/interactive.pm_.c:171
+#: ../../diskdrake/interactive.pm_.c:172
msgid "Choose a partition"
msgstr "选择分区"
-#: ../../diskdrake/interactive.pm_.c:171
+#: ../../diskdrake/interactive.pm_.c:172
msgid "Choose another partition"
msgstr "选择其他分区"
-#: ../../diskdrake/interactive.pm_.c:196
+#: ../../diskdrake/interactive.pm_.c:197
msgid "Exit"
msgstr "退出"
-#: ../../diskdrake/interactive.pm_.c:218
+#: ../../diskdrake/interactive.pm_.c:219
msgid "Toggle to expert mode"
msgstr "进入专家模式"
-#: ../../diskdrake/interactive.pm_.c:218
+#: ../../diskdrake/interactive.pm_.c:219
msgid "Toggle to normal mode"
msgstr "进入正常模式"
-#: ../../diskdrake/interactive.pm_.c:218
+#: ../../diskdrake/interactive.pm_.c:219
msgid "Undo"
msgstr "撤销"
-#: ../../diskdrake/interactive.pm_.c:237
+#: ../../diskdrake/interactive.pm_.c:238
msgid "Continue anyway?"
msgstr "冒险继续执行?"
-#: ../../diskdrake/interactive.pm_.c:242
+#: ../../diskdrake/interactive.pm_.c:243
msgid "Quit without saving"
msgstr "不保存改变就退出"
-#: ../../diskdrake/interactive.pm_.c:242
+#: ../../diskdrake/interactive.pm_.c:243
msgid "Quit without writing the partition table?"
msgstr "不写入分区表而退出?"
-#: ../../diskdrake/interactive.pm_.c:247
+#: ../../diskdrake/interactive.pm_.c:248
msgid "Do you want to save /etc/fstab modifications"
msgstr "您想要保存 /etc/fstab 修改吗 ?"
-#: ../../diskdrake/interactive.pm_.c:259
+#: ../../diskdrake/interactive.pm_.c:260
msgid "Auto allocate"
msgstr "自动分配"
-#: ../../diskdrake/interactive.pm_.c:259
+#: ../../diskdrake/interactive.pm_.c:260
msgid "Clear all"
msgstr "全部清除"
-#: ../../diskdrake/interactive.pm_.c:262
+#: ../../diskdrake/interactive.pm_.c:260
+#: ../../install_steps_interactive.pm_.c:216
+msgid "More"
+msgstr "更多"
+
+#: ../../diskdrake/interactive.pm_.c:263
msgid "Hard drive information"
msgstr "硬盘信息"
-#: ../../diskdrake/interactive.pm_.c:283
+#: ../../diskdrake/interactive.pm_.c:293
msgid "All primary partitions are used"
msgstr "主区数目已经满了"
-#: ../../diskdrake/interactive.pm_.c:284
+#: ../../diskdrake/interactive.pm_.c:294
msgid "I can't add any more partition"
msgstr "我无法再新增任何分区了"
-#: ../../diskdrake/interactive.pm_.c:285
+#: ../../diskdrake/interactive.pm_.c:295
msgid ""
"To have more partitions, please delete one to be able to create an extended "
"partition"
msgstr "如果需要更多的分区,请删除一个主分区以创建扩展分区"
-#: ../../diskdrake/interactive.pm_.c:295
+#: ../../diskdrake/interactive.pm_.c:305
msgid "Save partition table"
msgstr "保存分区表"
-#: ../../diskdrake/interactive.pm_.c:296
+#: ../../diskdrake/interactive.pm_.c:306
msgid "Restore partition table"
msgstr "正在尝试恢复分区表"
-#: ../../diskdrake/interactive.pm_.c:297
+#: ../../diskdrake/interactive.pm_.c:307
msgid "Rescue partition table"
msgstr "正在尝试修复分区表"
-#: ../../diskdrake/interactive.pm_.c:299
+#: ../../diskdrake/interactive.pm_.c:309
msgid "Reload partition table"
msgstr "重新读取分区表"
-#: ../../diskdrake/interactive.pm_.c:304
+#: ../../diskdrake/interactive.pm_.c:314
msgid "Removable media automounting"
msgstr "自动装载可移动介质"
-#: ../../diskdrake/interactive.pm_.c:313 ../../diskdrake/interactive.pm_.c:333
+#: ../../diskdrake/interactive.pm_.c:323 ../../diskdrake/interactive.pm_.c:343
msgid "Select file"
msgstr "选择文件"
-#: ../../diskdrake/interactive.pm_.c:320
+#: ../../diskdrake/interactive.pm_.c:330
msgid ""
"The backup partition table has not the same size\n"
"Still continue?"
@@ -1644,11 +1496,11 @@ msgstr ""
"备份分区表的大小和原来的不同\n"
"继续吗 ?"
-#: ../../diskdrake/interactive.pm_.c:334
+#: ../../diskdrake/interactive.pm_.c:344
msgid "Warning"
msgstr "警告"
-#: ../../diskdrake/interactive.pm_.c:335
+#: ../../diskdrake/interactive.pm_.c:345
msgid ""
"Insert a floppy in drive\n"
"All data on this floppy will be lost"
@@ -1656,122 +1508,129 @@ msgstr ""
"请在驱动器中插入一张软盘\n"
"这张软盘上所有的数据将要被清除"
-#: ../../diskdrake/interactive.pm_.c:346
+#: ../../diskdrake/interactive.pm_.c:356
msgid "Trying to rescue partition table"
msgstr "正在尝试恢复分区表"
-#: ../../diskdrake/interactive.pm_.c:352
+#: ../../diskdrake/interactive.pm_.c:362
msgid "Detailed information"
msgstr "详细信息"
-#: ../../diskdrake/interactive.pm_.c:364 ../../diskdrake/interactive.pm_.c:534
-#: ../../diskdrake/interactive.pm_.c:554 ../../diskdrake/removable.pm_.c:24
-#: ../../diskdrake/removable_gtk.pm_.c:15 ../../diskdrake/smbnfs_gtk.pm_.c:83
+#: ../../diskdrake/interactive.pm_.c:374 ../../diskdrake/interactive.pm_.c:557
+#: ../../diskdrake/interactive.pm_.c:584 ../../diskdrake/removable.pm_.c:24
+#: ../../diskdrake/removable_gtk.pm_.c:15 ../../diskdrake/smbnfs_gtk.pm_.c:85
msgid "Mount point"
msgstr "装载点"
-#: ../../diskdrake/interactive.pm_.c:366 ../../diskdrake/removable.pm_.c:25
-#: ../../diskdrake/removable_gtk.pm_.c:16 ../../diskdrake/smbnfs_gtk.pm_.c:84
+#: ../../diskdrake/interactive.pm_.c:376 ../../diskdrake/removable.pm_.c:25
+#: ../../diskdrake/removable_gtk.pm_.c:16 ../../diskdrake/smbnfs_gtk.pm_.c:86
msgid "Options"
msgstr "选项"
-#: ../../diskdrake/interactive.pm_.c:367 ../../diskdrake/interactive.pm_.c:621
+#: ../../diskdrake/interactive.pm_.c:377 ../../diskdrake/interactive.pm_.c:651
msgid "Resize"
msgstr "改变大小"
-#: ../../diskdrake/interactive.pm_.c:368 ../../diskdrake/interactive.pm_.c:674
+#: ../../diskdrake/interactive.pm_.c:378 ../../diskdrake/interactive.pm_.c:704
msgid "Move"
msgstr "移动"
-#: ../../diskdrake/interactive.pm_.c:369
+#: ../../diskdrake/interactive.pm_.c:379
msgid "Format"
msgstr "格式化"
-#: ../../diskdrake/interactive.pm_.c:370 ../../diskdrake/smbnfs_gtk.pm_.c:80
+#: ../../diskdrake/interactive.pm_.c:380 ../../diskdrake/smbnfs_gtk.pm_.c:82
msgid "Mount"
msgstr "装载"
-#: ../../diskdrake/interactive.pm_.c:371
+#: ../../diskdrake/interactive.pm_.c:381
msgid "Add to RAID"
msgstr "加入磁盘阵列"
-#: ../../diskdrake/interactive.pm_.c:372
+#: ../../diskdrake/interactive.pm_.c:382
msgid "Add to LVM"
msgstr "加入磁盘阵列"
-#: ../../diskdrake/interactive.pm_.c:373 ../../diskdrake/smbnfs_gtk.pm_.c:79
+#: ../../diskdrake/interactive.pm_.c:383 ../../diskdrake/smbnfs_gtk.pm_.c:81
msgid "Unmount"
msgstr "卸载"
-#: ../../diskdrake/interactive.pm_.c:375
+#: ../../diskdrake/interactive.pm_.c:385
msgid "Remove from RAID"
msgstr "从磁盘阵列中移出"
-#: ../../diskdrake/interactive.pm_.c:376
+#: ../../diskdrake/interactive.pm_.c:386
msgid "Remove from LVM"
msgstr "从磁盘阵列中移出"
-#: ../../diskdrake/interactive.pm_.c:377
+#: ../../diskdrake/interactive.pm_.c:387
msgid "Modify RAID"
msgstr "更改磁盘阵列设定"
-#: ../../diskdrake/interactive.pm_.c:378
+#: ../../diskdrake/interactive.pm_.c:388
msgid "Use for loopback"
msgstr "用于回环"
-#: ../../diskdrake/interactive.pm_.c:417
+#: ../../diskdrake/interactive.pm_.c:427
msgid "Create a new partition"
msgstr "创建一个新的分区"
-#: ../../diskdrake/interactive.pm_.c:420
+#: ../../diskdrake/interactive.pm_.c:430
msgid "Start sector: "
msgstr "开始扇区: "
-#: ../../diskdrake/interactive.pm_.c:422 ../../diskdrake/interactive.pm_.c:773
+#: ../../diskdrake/interactive.pm_.c:432 ../../diskdrake/interactive.pm_.c:803
msgid "Size in MB: "
msgstr "大小 (MB) "
-#: ../../diskdrake/interactive.pm_.c:423 ../../diskdrake/interactive.pm_.c:774
+#: ../../diskdrake/interactive.pm_.c:433 ../../diskdrake/interactive.pm_.c:804
msgid "Filesystem type: "
msgstr "文件系统类型: "
-#: ../../diskdrake/interactive.pm_.c:424
-#: ../../diskdrake/interactive.pm_.c:1034
-#: ../../diskdrake/interactive.pm_.c:1108
+#: ../../diskdrake/interactive.pm_.c:434
+#: ../../diskdrake/interactive.pm_.c:1077
+#: ../../diskdrake/interactive.pm_.c:1151
msgid "Mount point: "
msgstr "加载点:"
-#: ../../diskdrake/interactive.pm_.c:428
+#: ../../diskdrake/interactive.pm_.c:438
msgid "Preference: "
msgstr "偏好设定"
-#: ../../diskdrake/interactive.pm_.c:472
+#: ../../diskdrake/interactive.pm_.c:463
+msgid ""
+"You can't create a new partition\n"
+"(since you reached the maximal number of primary partitions).\n"
+"First remove a primary partition and create an extended partition."
+msgstr ""
+
+#: ../../diskdrake/interactive.pm_.c:493
msgid "Remove the loopback file?"
msgstr "删除回环(loopback)文件?"
-#: ../../diskdrake/interactive.pm_.c:497
+#: ../../diskdrake/interactive.pm_.c:518
msgid "Change partition type"
msgstr "改变分区类型"
-#: ../../diskdrake/interactive.pm_.c:498 ../../diskdrake/removable.pm_.c:48
+#: ../../diskdrake/interactive.pm_.c:519 ../../diskdrake/removable.pm_.c:48
msgid "Which filesystem do you want?"
msgstr "您希望使用哪种文件系统?"
-#: ../../diskdrake/interactive.pm_.c:502
+#: ../../diskdrake/interactive.pm_.c:525
msgid "Switching from ext2 to ext3"
msgstr "把ext2升级到ext3"
-#: ../../diskdrake/interactive.pm_.c:532
+#: ../../diskdrake/interactive.pm_.c:555
#, c-format
msgid "Where do you want to mount loopback file %s?"
msgstr "您想把回环(loopback)文件 %s 装载到哪里?"
-#: ../../diskdrake/interactive.pm_.c:533 ../../diskdrake/interactive.pm_.c:553
+#: ../../diskdrake/interactive.pm_.c:556 ../../diskdrake/interactive.pm_.c:583
#, c-format
msgid "Where do you want to mount device %s?"
msgstr "您想把设备 %s 装载到哪里?"
-#: ../../diskdrake/interactive.pm_.c:539
+#: ../../diskdrake/interactive.pm_.c:562
msgid ""
"Can't unset mount point as this partition is used for loop back.\n"
"Remove the loopback first"
@@ -1779,125 +1638,132 @@ msgstr ""
"无法取消设定的装载点, 这个分区正用于回环.\n"
"请先删除回环"
-#: ../../diskdrake/interactive.pm_.c:577
+#: ../../diskdrake/interactive.pm_.c:607
msgid "Computing FAT filesystem bounds"
msgstr "计算 FAT 文件系统的边界"
-#: ../../diskdrake/interactive.pm_.c:577 ../../diskdrake/interactive.pm_.c:636
-#: ../../install_interactive.pm_.c:130
+#: ../../diskdrake/interactive.pm_.c:607 ../../diskdrake/interactive.pm_.c:666
+#: ../../install_interactive.pm_.c:131
msgid "Resizing"
msgstr "正在改变大小"
-#: ../../diskdrake/interactive.pm_.c:609
+#: ../../diskdrake/interactive.pm_.c:639
msgid "This partition is not resizeable"
msgstr "不能改变这个分区的大小"
-#: ../../diskdrake/interactive.pm_.c:614
+#: ../../diskdrake/interactive.pm_.c:644
msgid "All data on this partition should be backed-up"
msgstr "应该先备份在这个分区上的所有数据"
-#: ../../diskdrake/interactive.pm_.c:616
+#: ../../diskdrake/interactive.pm_.c:646
#, c-format
msgid "After resizing partition %s, all data on this partition will be lost"
msgstr "改变分区 %s 的大小之后, 这个分区上现有的所有资料将被清除"
-#: ../../diskdrake/interactive.pm_.c:621
+#: ../../diskdrake/interactive.pm_.c:651
msgid "Choose the new size"
msgstr "选择新的大小"
-#: ../../diskdrake/interactive.pm_.c:622
+#: ../../diskdrake/interactive.pm_.c:652
msgid "New size in MB: "
msgstr "新大小 (MB): "
-#: ../../diskdrake/interactive.pm_.c:675
+#: ../../diskdrake/interactive.pm_.c:705
msgid "Which disk do you want to move it to?"
msgstr "您想移动到哪个盘 ?"
-#: ../../diskdrake/interactive.pm_.c:676
+#: ../../diskdrake/interactive.pm_.c:706
msgid "Sector"
msgstr "扇区"
-#: ../../diskdrake/interactive.pm_.c:677
+#: ../../diskdrake/interactive.pm_.c:707
msgid "Which sector do you want to move it to?"
msgstr "您想移动到哪个扇区 ?"
-#: ../../diskdrake/interactive.pm_.c:680
+#: ../../diskdrake/interactive.pm_.c:710
msgid "Moving"
msgstr "移动中"
-#: ../../diskdrake/interactive.pm_.c:680
+#: ../../diskdrake/interactive.pm_.c:710
msgid "Moving partition..."
msgstr "正在移动分区..."
-#: ../../diskdrake/interactive.pm_.c:697
+#: ../../diskdrake/interactive.pm_.c:727
msgid "Choose an existing RAID to add to"
msgstr "选择加入一个已存在的 RAID"
-#: ../../diskdrake/interactive.pm_.c:698 ../../diskdrake/interactive.pm_.c:716
+#: ../../diskdrake/interactive.pm_.c:728 ../../diskdrake/interactive.pm_.c:745
msgid "new"
msgstr "新建"
-#: ../../diskdrake/interactive.pm_.c:714
+#: ../../diskdrake/interactive.pm_.c:743
msgid "Choose an existing LVM to add to"
msgstr "选择加入一个已存在的 LVM"
-#: ../../diskdrake/interactive.pm_.c:719
+#: ../../diskdrake/interactive.pm_.c:748
msgid "LVM name?"
msgstr "LVM名称?"
-#: ../../diskdrake/interactive.pm_.c:759
+#: ../../diskdrake/interactive.pm_.c:789
msgid "This partition can't be used for loopback"
msgstr "这个分区不能被用于回环"
-#: ../../diskdrake/interactive.pm_.c:771
+#: ../../diskdrake/interactive.pm_.c:801
msgid "Loopback"
msgstr "回环"
-#: ../../diskdrake/interactive.pm_.c:772
+#: ../../diskdrake/interactive.pm_.c:802
msgid "Loopback file name: "
msgstr "回环文件名: "
-#: ../../diskdrake/interactive.pm_.c:777
+#: ../../diskdrake/interactive.pm_.c:807
msgid "Give a file name"
msgstr "文件名"
-#: ../../diskdrake/interactive.pm_.c:780
+#: ../../diskdrake/interactive.pm_.c:810
msgid "File already used by another loopback, choose another one"
msgstr "文件已经被另一个回环使用, 请选择其他"
-#: ../../diskdrake/interactive.pm_.c:781
+#: ../../diskdrake/interactive.pm_.c:811
msgid "File already exists. Use it?"
msgstr "文件已经存在. 使用现有的文件?"
-#: ../../diskdrake/interactive.pm_.c:804
+#: ../../diskdrake/interactive.pm_.c:834
msgid "Mount options"
msgstr "装载选项"
-#: ../../diskdrake/interactive.pm_.c:811
+#: ../../diskdrake/interactive.pm_.c:841
msgid "Various"
msgstr "变量"
-#: ../../diskdrake/interactive.pm_.c:874
+#: ../../diskdrake/interactive.pm_.c:905 ../../standalone/drakfloppy_.c:104
msgid "device"
msgstr "设备"
-#: ../../diskdrake/interactive.pm_.c:875
+#: ../../diskdrake/interactive.pm_.c:906
msgid "level"
msgstr "级别"
-#: ../../diskdrake/interactive.pm_.c:876
+#: ../../diskdrake/interactive.pm_.c:907
msgid "chunk size"
msgstr "组块大小"
-#: ../../diskdrake/interactive.pm_.c:891
+#: ../../diskdrake/interactive.pm_.c:922
msgid "Be careful: this operation is dangerous."
msgstr "小心: 这个操作有危险."
-#: ../../diskdrake/interactive.pm_.c:906
+#: ../../diskdrake/interactive.pm_.c:937
msgid "What type of partitioning?"
msgstr "请问您分区类型?"
-#: ../../diskdrake/interactive.pm_.c:924
+#: ../../diskdrake/interactive.pm_.c:953
+#, fuzzy, c-format
+msgid "The package %s is needed. Install it?"
+msgstr ""
+"需要安装软件包 %s .\n"
+". 您同意安装吗 ?"
+
+#: ../../diskdrake/interactive.pm_.c:967
msgid ""
"Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
"1024).\n"
@@ -1908,7 +1774,7 @@ msgstr ""
"如果您使用 LILO, 它没法正常工作; 假如您不使用 LILO, \n"
"则不需要创建 /boot 分区"
-#: ../../diskdrake/interactive.pm_.c:928
+#: ../../diskdrake/interactive.pm_.c:971
msgid ""
"The partition you've selected to add as root (/) is physically located "
"beyond\n"
@@ -1919,7 +1785,7 @@ msgstr ""
"并且您没有创建 /boot 分区.\n"
"如果您计划使用 LILO 启动管理程序, 请在适当位置加入 /boot 分区."
-#: ../../diskdrake/interactive.pm_.c:934
+#: ../../diskdrake/interactive.pm_.c:977
msgid ""
"You've selected a software RAID partition as root (/).\n"
"No bootloader is able to handle this without a /boot partition.\n"
@@ -1929,129 +1795,129 @@ msgstr ""
"如果没有 /boot 分区, 开机引导程序无法处理这种情况.\n"
"所以, 请增加一个 /boot 分区."
-#: ../../diskdrake/interactive.pm_.c:954
+#: ../../diskdrake/interactive.pm_.c:997
#, c-format
msgid "Partition table of drive %s is going to be written to disk!"
msgstr "驱动器 %s 的分区表将会写入磁盘中 !"
-#: ../../diskdrake/interactive.pm_.c:958
+#: ../../diskdrake/interactive.pm_.c:1001
msgid "You'll need to reboot before the modification can take place"
msgstr "您必需重新开机使您做的更动生效"
-#: ../../diskdrake/interactive.pm_.c:969
+#: ../../diskdrake/interactive.pm_.c:1012
#, c-format
msgid "After formatting partition %s, all data on this partition will be lost"
msgstr "格式化分区 %s 之后, 在这个分区上的所有资料将要被清除"
-#: ../../diskdrake/interactive.pm_.c:971
+#: ../../diskdrake/interactive.pm_.c:1014
msgid "Formatting"
msgstr "正在格式化"
-#: ../../diskdrake/interactive.pm_.c:972
+#: ../../diskdrake/interactive.pm_.c:1015
#, c-format
msgid "Formatting loopback file %s"
msgstr "正在格式化回环(loopback)文件 %s"
-#: ../../diskdrake/interactive.pm_.c:973
-#: ../../install_steps_interactive.pm_.c:465
+#: ../../diskdrake/interactive.pm_.c:1016
+#: ../../install_steps_interactive.pm_.c:477
#, c-format
msgid "Formatting partition %s"
msgstr "正在格式化分区 %s"
-#: ../../diskdrake/interactive.pm_.c:984
+#: ../../diskdrake/interactive.pm_.c:1027
msgid "Hide files"
msgstr "隐藏文件"
-#: ../../diskdrake/interactive.pm_.c:984
+#: ../../diskdrake/interactive.pm_.c:1027
msgid "Move files to the new partition"
msgstr "移动文件到新分区"
-#: ../../diskdrake/interactive.pm_.c:985
+#: ../../diskdrake/interactive.pm_.c:1028
#, c-format
msgid ""
-"Directory %s already contain some data\n"
+"Directory %s already contains data\n"
"(%s)"
msgstr ""
"目录 %s 已经包含数据\n"
"(%s)"
-#: ../../diskdrake/interactive.pm_.c:996
+#: ../../diskdrake/interactive.pm_.c:1039
msgid "Moving files to the new partition"
msgstr "正在移动文件到新分区"
-#: ../../diskdrake/interactive.pm_.c:1000
+#: ../../diskdrake/interactive.pm_.c:1043
#, c-format
msgid "Copying %s"
msgstr "拷贝 %s"
-#: ../../diskdrake/interactive.pm_.c:1004
+#: ../../diskdrake/interactive.pm_.c:1047
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
-#: ../../diskdrake/interactive.pm_.c:1014
+#: ../../diskdrake/interactive.pm_.c:1057
#, c-format
msgid "partition %s is now known as %s"
msgstr ""
-#: ../../diskdrake/interactive.pm_.c:1035
-#: ../../diskdrake/interactive.pm_.c:1094
+#: ../../diskdrake/interactive.pm_.c:1078
+#: ../../diskdrake/interactive.pm_.c:1137
msgid "Device: "
msgstr "设备: "
-#: ../../diskdrake/interactive.pm_.c:1036
+#: ../../diskdrake/interactive.pm_.c:1079
#, c-format
msgid "DOS drive letter: %s (just a guess)\n"
msgstr "DOS 下的盘符: %s ( 只是猜测 )\n"
-#: ../../diskdrake/interactive.pm_.c:1040
-#: ../../diskdrake/interactive.pm_.c:1048
-#: ../../diskdrake/interactive.pm_.c:1112
+#: ../../diskdrake/interactive.pm_.c:1083
+#: ../../diskdrake/interactive.pm_.c:1091
+#: ../../diskdrake/interactive.pm_.c:1155
msgid "Type: "
msgstr "类型: "
-#: ../../diskdrake/interactive.pm_.c:1044
+#: ../../diskdrake/interactive.pm_.c:1087
msgid "Name: "
msgstr "名称: "
-#: ../../diskdrake/interactive.pm_.c:1052
+#: ../../diskdrake/interactive.pm_.c:1095
#, c-format
msgid "Start: sector %s\n"
msgstr "开始: 第 %s 扇区\n"
-#: ../../diskdrake/interactive.pm_.c:1053
+#: ../../diskdrake/interactive.pm_.c:1096
#, c-format
msgid "Size: %s"
msgstr "大小: %s"
-#: ../../diskdrake/interactive.pm_.c:1055
+#: ../../diskdrake/interactive.pm_.c:1098
#, c-format
msgid ", %s sectors"
msgstr ", 第 %s 扇区"
-#: ../../diskdrake/interactive.pm_.c:1057
+#: ../../diskdrake/interactive.pm_.c:1100
#, fuzzy, c-format
msgid "Cylinder %d to %d\n"
msgstr "第 %d 柱面到第 %d 柱面\n"
-#: ../../diskdrake/interactive.pm_.c:1058
+#: ../../diskdrake/interactive.pm_.c:1101
msgid "Formatted\n"
msgstr "已格式化\n"
-#: ../../diskdrake/interactive.pm_.c:1059
+#: ../../diskdrake/interactive.pm_.c:1102
msgid "Not formatted\n"
msgstr "未格式化\n"
-#: ../../diskdrake/interactive.pm_.c:1060
+#: ../../diskdrake/interactive.pm_.c:1103
msgid "Mounted\n"
msgstr "已装载\n"
-#: ../../diskdrake/interactive.pm_.c:1061
+#: ../../diskdrake/interactive.pm_.c:1104
#, c-format
msgid "RAID md%s\n"
msgstr "磁盘阵列 (RAID) md%s\n"
-#: ../../diskdrake/interactive.pm_.c:1063
+#: ../../diskdrake/interactive.pm_.c:1106
#, c-format
msgid ""
"Loopback file(s):\n"
@@ -2060,7 +1926,7 @@ msgstr ""
"回环文件:\n"
" %s\n"
-#: ../../diskdrake/interactive.pm_.c:1064
+#: ../../diskdrake/interactive.pm_.c:1107
msgid ""
"Partition booted by default\n"
" (for MS-DOS boot, not for lilo)\n"
@@ -2068,27 +1934,27 @@ msgstr ""
"预设的开机分区\n"
" (给 MS-DOS 开机程序用的, 跟 lilo 无关)\n"
-#: ../../diskdrake/interactive.pm_.c:1066
+#: ../../diskdrake/interactive.pm_.c:1109
#, c-format
msgid "Level %s\n"
msgstr "级别 %s\n"
-#: ../../diskdrake/interactive.pm_.c:1067
+#: ../../diskdrake/interactive.pm_.c:1110
#, c-format
msgid "Chunk size %s\n"
msgstr "组块大小 %s\n"
-#: ../../diskdrake/interactive.pm_.c:1068
+#: ../../diskdrake/interactive.pm_.c:1111
#, c-format
msgid "RAID-disks %s\n"
msgstr "RAID 磁盘 %s\n"
-#: ../../diskdrake/interactive.pm_.c:1070
+#: ../../diskdrake/interactive.pm_.c:1113
#, c-format
msgid "Loopback file name: %s"
msgstr "回环文件名称: %s"
-#: ../../diskdrake/interactive.pm_.c:1073
+#: ../../diskdrake/interactive.pm_.c:1116
msgid ""
"\n"
"Chances are, this partition is\n"
@@ -2099,7 +1965,7 @@ msgstr ""
"本分区是驱动分区\n"
"请不要更改.\n"
-#: ../../diskdrake/interactive.pm_.c:1076
+#: ../../diskdrake/interactive.pm_.c:1119
msgid ""
"\n"
"This special Bootstrap\n"
@@ -2110,62 +1976,62 @@ msgstr ""
"该启动分区特别\n"
"是保留给双重启动系统\n"
-#: ../../diskdrake/interactive.pm_.c:1095
+#: ../../diskdrake/interactive.pm_.c:1138
#, c-format
msgid "Size: %s\n"
msgstr "大小: %s\n"
-#: ../../diskdrake/interactive.pm_.c:1096
+#: ../../diskdrake/interactive.pm_.c:1139
#, c-format
msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
msgstr "硬盘参数: %s 柱面, %s 磁头, %s 扇区\n"
-#: ../../diskdrake/interactive.pm_.c:1097
+#: ../../diskdrake/interactive.pm_.c:1140
msgid "Info: "
msgstr "信息: "
-#: ../../diskdrake/interactive.pm_.c:1098
+#: ../../diskdrake/interactive.pm_.c:1141
#, c-format
msgid "LVM-disks %s\n"
msgstr "LVM 磁盘 %s\n"
-#: ../../diskdrake/interactive.pm_.c:1099
+#: ../../diskdrake/interactive.pm_.c:1142
#, c-format
msgid "Partition table type: %s\n"
msgstr "分区表类型: %s\n"
-#: ../../diskdrake/interactive.pm_.c:1100
-#, c-format
-msgid "on bus %d id %d\n"
+#: ../../diskdrake/interactive.pm_.c:1143
+#, fuzzy, c-format
+msgid "on channel %d id %d\n"
msgstr "在总线 %d id %d 上\n"
-#: ../../diskdrake/interactive.pm_.c:1114
+#: ../../diskdrake/interactive.pm_.c:1157
#, c-format
msgid "Options: %s"
msgstr "选项: %s"
-#: ../../diskdrake/interactive.pm_.c:1130
+#: ../../diskdrake/interactive.pm_.c:1173
msgid "Filesystem encryption key"
msgstr "文件系统口令"
-#: ../../diskdrake/interactive.pm_.c:1131
+#: ../../diskdrake/interactive.pm_.c:1174
msgid "Choose your filesystem encryption key"
msgstr "请选择该文件系统的口令"
-#: ../../diskdrake/interactive.pm_.c:1134
+#: ../../diskdrake/interactive.pm_.c:1177
#, c-format
msgid "This encryption key is too simple (must be at least %d characters long)"
msgstr "这个口令太简单了 (至少要有 %d 个字符)"
-#: ../../diskdrake/interactive.pm_.c:1135
+#: ../../diskdrake/interactive.pm_.c:1178
msgid "The encryption keys do not match"
msgstr "两次口令不符"
-#: ../../diskdrake/interactive.pm_.c:1138
+#: ../../diskdrake/interactive.pm_.c:1181
msgid "Encryption key"
msgstr "口令"
-#: ../../diskdrake/interactive.pm_.c:1139
+#: ../../diskdrake/interactive.pm_.c:1182
msgid "Encryption key (again)"
msgstr "口令 (再一次)"
@@ -2174,36 +2040,66 @@ msgid "Change type"
msgstr "改变类型"
#: ../../diskdrake/removable_gtk.pm_.c:28
-msgid "Please click on a media"
+msgid "Please click on a medium"
msgstr "请选择介质"
-#: ../../diskdrake/smbnfs_gtk.pm_.c:165
+#: ../../diskdrake/smbnfs_gtk.pm_.c:162
+#, c-format
+msgid "Can't login using username %s (bad password?)"
+msgstr ""
+
+#: ../../diskdrake/smbnfs_gtk.pm_.c:166 ../../diskdrake/smbnfs_gtk.pm_.c:175
+#, fuzzy
+msgid "Domain Authentication Required"
+msgstr "认证"
+
+#: ../../diskdrake/smbnfs_gtk.pm_.c:167
+#, fuzzy
+msgid "Another one"
+msgstr "互联网"
+
+#: ../../diskdrake/smbnfs_gtk.pm_.c:167
+#, fuzzy
+msgid "Which username"
+msgstr "用户登录名"
+
+#: ../../diskdrake/smbnfs_gtk.pm_.c:176
+msgid ""
+"Please enter your username, password and domain name to access this host."
+msgstr ""
+
+#: ../../diskdrake/smbnfs_gtk.pm_.c:178
+#, fuzzy
+msgid "Username"
+msgstr "用户登录名"
+
+#: ../../diskdrake/smbnfs_gtk.pm_.c:180
+#, fuzzy
+msgid "Domain"
+msgstr "NIS 网域"
+
+#: ../../diskdrake/smbnfs_gtk.pm_.c:200
#, fuzzy
msgid "Search servers"
msgstr "DNS 服务器"
-#: ../../fs.pm_.c:485 ../../fs.pm_.c:495 ../../fs.pm_.c:499 ../../fs.pm_.c:503
-#: ../../fs.pm_.c:507 ../../fs.pm_.c:511
+#: ../../fs.pm_.c:551 ../../fs.pm_.c:561 ../../fs.pm_.c:565 ../../fs.pm_.c:569
+#: ../../fs.pm_.c:573 ../../fs.pm_.c:577
#, c-format
msgid "%s formatting of %s failed"
msgstr "%s, 格式化 %s 失败"
-#: ../../fs.pm_.c:548
+#: ../../fs.pm_.c:614
#, c-format
msgid "I don't know how to format %s in type %s"
msgstr "不知道如何格式化 %s 成 %s 类型"
-#: ../../fs.pm_.c:620 ../../fs.pm_.c:649 ../../fs.pm_.c:655
+#: ../../fs.pm_.c:686 ../../fs.pm_.c:726 ../../fs.pm_.c:732
#, c-format
msgid "mounting partition %s in directory %s failed"
msgstr ""
-#: ../../fs.pm_.c:640
-#, c-format
-msgid "fsck failed with exit code %d or signal %d"
-msgstr "fsck 失败, 退出码 %d 或 信号 %d"
-
-#: ../../fs.pm_.c:670 ../../partition_table.pm_.c:596
+#: ../../fs.pm_.c:747 ../../partition_table.pm_.c:602
#, c-format
msgid "error unmounting %s: %s"
msgstr "卸载 %s 失败: %s"
@@ -2220,66 +2116,320 @@ msgstr ""
msgid "server"
msgstr "服务器"
-#: ../../fsedit.pm_.c:467
+#: ../../fsedit.pm_.c:471
msgid "You can't use JFS for partitions smaller than 16MB"
msgstr "您不能把 JFS 用于小于 16 MB 的分区"
-#: ../../fsedit.pm_.c:468
+#: ../../fsedit.pm_.c:472
msgid "You can't use ReiserFS for partitions smaller than 32MB"
msgstr "您不能把 ReiserFS 用于小于 32 MB 的分区"
-#: ../../fsedit.pm_.c:477
+#: ../../fsedit.pm_.c:491
msgid "Mount points must begin with a leading /"
msgstr "载入点必需要以 / 为开头"
-#: ../../fsedit.pm_.c:478
+#: ../../fsedit.pm_.c:492
#, c-format
msgid "There is already a partition with mount point %s\n"
msgstr "已经有一个分区的装载点是 %s\n"
-#: ../../fsedit.pm_.c:482
+#: ../../fsedit.pm_.c:496
#, c-format
msgid "You can't use a LVM Logical Volume for mount point %s"
msgstr "不能用LVM逻辑卷做 %s 载入点"
-#: ../../fsedit.pm_.c:484
+#: ../../fsedit.pm_.c:498
msgid "This directory should remain within the root filesystem"
msgstr "这个目录应该保留在根分区内"
-#: ../../fsedit.pm_.c:486
-msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
+#: ../../fsedit.pm_.c:500
+#, fuzzy
+msgid ""
+"You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
+"point\n"
msgstr "这个加载点需要一个真正的文件系统(ext2, reiserfs)\n"
-#: ../../fsedit.pm_.c:488
+#: ../../fsedit.pm_.c:502
#, c-format
msgid "You can't use an encrypted file system for mount point %s"
msgstr "不能用加口令的文件系统做 %s 载入点"
-#: ../../fsedit.pm_.c:546
+#: ../../fsedit.pm_.c:560
msgid "Not enough free space for auto-allocating"
msgstr "没有足够的空闲空间供分配"
-#: ../../fsedit.pm_.c:548
+#: ../../fsedit.pm_.c:562
msgid "Nothing to do"
msgstr "已完成"
-#: ../../fsedit.pm_.c:612
+#: ../../fsedit.pm_.c:626
#, c-format
msgid "Error opening %s for writing: %s"
msgstr "在打开 %s 写入时发生错误: %s"
-#: ../../fsedit.pm_.c:697
+#: ../../fsedit.pm_.c:711
msgid ""
-"An error has occurred - no valid devices were found on which to create new "
+"An error occurred - no valid devices were found on which to create new "
"filesystems. Please check your hardware for the cause of this problem"
msgstr ""
"发生错误! 新建文件系统时找不到可用的设备。\n"
"请检查您的硬件以确定问题的原因 !"
-#: ../../fsedit.pm_.c:720
+#: ../../fsedit.pm_.c:734
msgid "You don't have any partitions!"
msgstr "您现在一个分区也没有!"
+#: ../../harddrake/bttv.pm_.c:15 ../../harddrake/bttv.pm_.c:63
+#, fuzzy
+msgid "Auto-detect"
+msgstr "使用自动检测"
+
+#: ../../harddrake/bttv.pm_.c:64
+#, fuzzy
+msgid "Unknown|Generic"
+msgstr "普通"
+
+#: ../../harddrake/bttv.pm_.c:96
+msgid "Unknown|CPH05X (bt878) [many vendors]"
+msgstr ""
+
+#: ../../harddrake/bttv.pm_.c:97
+msgid "Unknown|CPH06X (bt878) [many vendors]"
+msgstr ""
+
+#: ../../harddrake/bttv.pm_.c:193
+msgid ""
+"For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-"
+"detect the rights parameters.\n"
+"If your card is misdetected, you can force the right tuner and card types "
+"here. Just select your tv card parameters if needed"
+msgstr ""
+
+#: ../../harddrake/bttv.pm_.c:196
+#, fuzzy
+msgid "Card model :"
+msgstr "Card mem (DMA)"
+
+#: ../../harddrake/bttv.pm_.c:197
+#, fuzzy
+msgid "PLL setting :"
+msgstr "调入配置"
+
+#: ../../harddrake/bttv.pm_.c:198
+msgid "Number of capture buffers :"
+msgstr ""
+
+#: ../../harddrake/bttv.pm_.c:198
+msgid "number of capture buffers for mmap'ed capture"
+msgstr ""
+
+#: ../../harddrake/bttv.pm_.c:199
+#, fuzzy
+msgid "Tuner type :"
+msgstr "改变类型"
+
+#: ../../harddrake/bttv.pm_.c:200
+msgid "Radio support :"
+msgstr ""
+
+#: ../../harddrake/bttv.pm_.c:200
+msgid "enable radio support"
+msgstr ""
+
+#: ../../harddrake/ui.pm_.c:12
+#, fuzzy
+msgid "/_Quit"
+msgstr "结束"
+
+#: ../../harddrake/ui.pm_.c:13 ../../harddrake/ui.pm_.c:14
+#: ../../harddrake/ui.pm_.c:15 ../../standalone/logdrake_.c:110
+msgid "/_Help"
+msgstr "/_H 帮助"
+
+#: ../../harddrake/ui.pm_.c:14
+#, fuzzy
+msgid "/_Help..."
+msgstr "/_H 帮助"
+
+#: ../../harddrake/ui.pm_.c:15
+#, fuzzy
+msgid "/_About..."
+msgstr "/H 帮助/_A 关于..."
+
+#: ../../harddrake/ui.pm_.c:22
+#, fuzzy
+msgid "Model"
+msgstr "鼠标"
+
+#: ../../harddrake/ui.pm_.c:22
+#, fuzzy
+msgid "hard disk model"
+msgstr "Card mem (DMA)"
+
+#: ../../harddrake/ui.pm_.c:23
+#, fuzzy
+msgid "Channel"
+msgstr "取消"
+
+#: ../../harddrake/ui.pm_.c:23
+msgid "EIDE/SCSI channel"
+msgstr ""
+
+#: ../../harddrake/ui.pm_.c:25
+msgid "Bus"
+msgstr ""
+
+#: ../../harddrake/ui.pm_.c:26
+msgid ""
+"this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
+msgstr ""
+
+#: ../../harddrake/ui.pm_.c:27
+#, fuzzy
+msgid "Module"
+msgstr "鼠标"
+
+#: ../../harddrake/ui.pm_.c:27
+msgid "the module of the GNU/Linux kernel that handle that device"
+msgstr ""
+
+#: ../../harddrake/ui.pm_.c:28
+msgid "Media class"
+msgstr ""
+
+#: ../../harddrake/ui.pm_.c:28
+msgid "class of hardware device"
+msgstr ""
+
+#: ../../harddrake/ui.pm_.c:29 ../../printerdrake.pm_.c:1030
+msgid "Description"
+msgstr "描述"
+
+#: ../../harddrake/ui.pm_.c:29
+msgid "this field describe the device"
+msgstr ""
+
+#: ../../harddrake/ui.pm_.c:31
+#, fuzzy
+msgid "Bus identification"
+msgstr "认证"
+
+#: ../../harddrake/ui.pm_.c:32
+msgid ""
+"- PCI and USB devices : this list the vendor, device, subvendor and "
+"subdevice PCI/USB ids"
+msgstr ""
+
+#: ../../harddrake/ui.pm_.c:34
+msgid "Location on the bus"
+msgstr ""
+
+#: ../../harddrake/ui.pm_.c:35
+msgid ""
+"- pci devices: this gives the PCI slot, device and function of this card\n"
+"- eide devices: the device is either a slave or a master device\n"
+"- scsi devices: the scsi bus and the scsi device ids"
+msgstr ""
+
+#: ../../harddrake/ui.pm_.c:38
+#, fuzzy
+msgid "Old device file"
+msgstr "选择文件"
+
+#: ../../harddrake/ui.pm_.c:39
+msgid "old static device name used in dev package"
+msgstr ""
+
+#: ../../harddrake/ui.pm_.c:40
+#, fuzzy
+msgid "New devfs device"
+msgstr "网关设备"
+
+#: ../../harddrake/ui.pm_.c:41
+msgid "new dinamic device name generated by incore kernel devfs"
+msgstr ""
+
+#: ../../harddrake/ui.pm_.c:42
+#, fuzzy
+msgid "Number of buttons"
+msgstr "2 键"
+
+#: ../../harddrake/ui.pm_.c:43
+msgid "the vendor name of the device"
+msgstr ""
+
+#: ../../harddrake/ui.pm_.c:92
+#, fuzzy
+msgid "Harddrake2 version "
+msgstr "探测硬盘"
+
+#: ../../harddrake/ui.pm_.c:122
+#, fuzzy
+msgid "Detected hardware"
+msgstr "查看硬体信息"
+
+#: ../../harddrake/ui.pm_.c:136
+#, fuzzy
+msgid "Informations"
+msgstr "显示所有信息"
+
+#: ../../harddrake/ui.pm_.c:152
+msgid "Run config tool"
+msgstr ""
+
+#: ../../harddrake/ui.pm_.c:158
+#, fuzzy
+msgid "Configure module"
+msgstr "设定鼠标"
+
+#: ../../harddrake/ui.pm_.c:168
+#, fuzzy
+msgid "Detection in progress"
+msgstr "检测串口 %s"
+
+#: ../../harddrake/ui.pm_.c:168 ../../interactive.pm_.c:387
+msgid "Please wait"
+msgstr "请稍候"
+
+#: ../../harddrake/ui.pm_.c:217
+msgid "primary"
+msgstr ""
+
+#: ../../harddrake/ui.pm_.c:217
+#, fuzzy
+msgid "secondary"
+msgstr " %d 秒钟"
+
+#: ../../harddrake/ui.pm_.c:260
+#, fuzzy, c-format
+msgid "Running \"%s\" ..."
+msgstr "删除打印机\"%s\" ..."
+
+#: ../../harddrake/ui.pm_.c:279
+msgid "About Harddrake"
+msgstr ""
+
+#: ../../harddrake/ui.pm_.c:280
+msgid ""
+"This is HardDrake, a Mandrake hardware configuration tool.\n"
+"Version:"
+msgstr ""
+
+#: ../../harddrake/ui.pm_.c:281
+#, fuzzy
+msgid "Author:"
+msgstr "自动探测"
+
+#: ../../harddrake/ui.pm_.c:286
+msgid "Harddrake help"
+msgstr ""
+
+#: ../../harddrake/ui.pm_.c:287
+msgid ""
+"Description of the fields:\n"
+"\n"
+msgstr ""
+
#: ../../help.pm_.c:13
msgid ""
"GNU/Linux is a multiuser system, and this means that each user can have his\n"
@@ -2293,7 +2443,7 @@ msgid ""
"system would not work any more. If you make a serious mistake as a regular\n"
"user, you may only lose some information, but not the entire system.\n"
"\n"
-"First, you have to enter your real name. This is not mandatory, of course\n"
+"First, you have to enter your real name. This is not mandatory, of course -\n"
"as you can actually enter whatever you want. DrakX will then take the first\n"
"word you have entered in the box and will bring it over to the \"User\n"
"name\". This is the name this particular user will use to log onto the\n"
@@ -2378,9 +2528,8 @@ msgid ""
"Packages are sorted in groups corresponding to a particular use of your\n"
"machine. The groups themselves are sorted into four sections:\n"
"\n"
-" * \"Workstation\": if you plan to use your machine as a workstation, "
-"select\n"
-"one or more of the corresponding groups;\n"
+" * \"Workstation\": if you plan to use your machine as a workstation,\n"
+"select one or more of the corresponding groups;\n"
"\n"
" * \"Development\": if your machine is to be used for programming, choose\n"
"the desired group(s);\n"
@@ -2591,7 +2740,7 @@ msgstr "最后, 你会被问是否开机进入图形界面."
#: ../../help.pm_.c:256
msgid ""
-"The Mandrake LinuxCD-ROM has a built-in rescue mode. You can access it by\n"
+"The Mandrake Linux CD-ROM has a built-in rescue mode. You can access it by\n"
"booting from the CD-ROM, press the >>F1<< key at boot and type >>rescue<<\n"
"at the prompt. But in case your computer cannot boot from the CD-ROM, you\n"
"should come back to this step for help in at least two situations:\n"
@@ -2603,9 +2752,8 @@ msgid ""
"process will rewrite the boot sector, and then you will not be able to\n"
"start GNU/Linux!\n"
"\n"
-" * if a problem arises and you cannot start up GNU/Linux from the hard "
-"disk,\n"
-"this floppy disk will be the only means of starting up GNU/Linux. It\n"
+" * if a problem arises and you cannot start up GNU/Linux from the hard\n"
+"disk, this floppy disk will be the only means of starting up GNU/Linux. It\n"
"contains a fair number of system tools for restoring a system, which has\n"
"crashed due to a power failure, an unfortunate typing error, a typo in a\n"
"password, or any other reason.\n"
@@ -2652,21 +2800,20 @@ msgid ""
"Linux partitions on your hard drive. If you want to use them, choose this\n"
"option;\n"
"\n"
-" * \"Use the free space on the Windows; partition\": if MicrosoftWindows is\n"
-"installed on your hard drive and takes all the space available on it, you\n"
-"have to create free space for Linux data. To do so, you can delete your\n"
-"MicrosoftWindows partition and data (see ``Erase entire disk'' or ``Expert\n"
-"mode'' solutions) or resize your MicrosoftWindows partition. Resizing can\n"
+" * \"Use the free space on the Windows; partition\": if Microsoft Windows\n"
+"is installed on your hard drive and takes all the space available on it,\n"
+"you have to create free space for Linux data. To do so, you can delete your\n"
+"Microsoft Windows partition and data (see ``Erase entire disk'' or ``Expert\n"
+"mode'' solutions) or resize your Microsoft Windows partition. Resizing can\n"
"be performed without the loss of any data, provided you previously\n"
"defragment the Windows partition. Backing up your data won't hurt either..\n"
"This solution is recommended if you want to use both Mandrake Linux and\n"
-"MicrosoftWindows on the same computer.\n"
+"Microsoft Windows on the same computer.\n"
"\n"
-" Before choosing this option, please understand that after this "
-"procedure,\n"
-"the size of your MicrosoftWindows partition will be smaller than at the\n"
-"present time. You will have less free space under MicrosoftWindows to store\n"
-"your data or to install new software;\n"
+" Before choosing this option, please understand that after this\n"
+"procedure, the size of your Microsoft Windows partition will be smaller\n"
+"than at the present time. You will have less free space under Microsoft\n"
+"Windows to store your data or to install new software;\n"
"\n"
" * \"Erase entire disk\": if you want to delete all data and all partitions\n"
"present on your hard drive and replace them with your new Mandrake Linux\n"
@@ -2682,9 +2829,9 @@ msgid ""
" !! If you choose this option, all data on your disk will be lost. !!\n"
"\n"
" * \"Expert mode\": choose this option if you want to manually partition\n"
-"your hard drive. Be careful it is a powerful but dangerous choice. You can\n"
-"very easily lose all your data. Hence, do not choose this unless you know\n"
-"what you are doing."
+"your hard drive. Be careful - it is a powerful but dangerous choice. You\n"
+"can very easily lose all your data. Hence, do not choose this unless you\n"
+"know what you are doing."
msgstr ""
"这里, 您需要在硬盘上选择用来安装 Mandrake Linux 操作系统的位置.\n"
"如果磁盘是空的, 或者现存的操作系统使用了磁盘上的全部空间, 您需要\n"
@@ -2751,9 +2898,8 @@ msgid ""
" * \"Replay\". This is a partially automated installation as the\n"
"partitioning step (and only this one) remains interactive;\n"
"\n"
-" * \"Automated\". Fully automated installation: the hard disk is "
-"completely\n"
-"rewritten, all data is lost.\n"
+" * \"Automated\". Fully automated installation: the hard disk is\n"
+"completely rewritten, all data is lost.\n"
"\n"
" This feature is very handy when installing a great number of similar\n"
"machines. See the Auto install section on our web site;\n"
@@ -2879,38 +3025,32 @@ msgid ""
"\n"
" * \"More\": gives access to additional features:\n"
"\n"
-" * \"Save partition table\": saves the partition table to a floppy. "
-"Useful\n"
-"for later partition-table recovery if necessary. It is strongly recommended\n"
-"to perform this step;\n"
+" * \"Save partition table\": saves the partition table to a floppy.\n"
+"Useful for later partition-table recovery if necessary. It is strongly\n"
+"recommended to perform this step;\n"
"\n"
" * \"Restore partition table\": allows to restore a previously saved\n"
"partition table from floppy disk;\n"
"\n"
-" * \"Rescue partition table\": if your partition table is damaged, you "
-"can\n"
-"try to recover it using this option. Please be careful and remember that it\n"
-"can fail;\n"
+" * \"Rescue partition table\": if your partition table is damaged, you\n"
+"can try to recover it using this option. Please be careful and remember\n"
+"that it can fail;\n"
"\n"
-" * \"Reload partition table\": discards all changes and loads your "
-"initial\n"
-"partition table;\n"
+" * \"Reload partition table\": discards all changes and loads your\n"
+"initial partition table;\n"
"\n"
-" * \"Removable media automounting\": unchecking this option will force "
-"users\n"
-"to manually mount and unmount removable medias such as floppies and\n"
+" * \"Removable media automounting\": unchecking this option will force\n"
+"users to manually mount and unmount removable medias such as floppies and\n"
"CD-ROMs.\n"
"\n"
-" * \"Wizard\": use this option if you wish to use a wizard to partition "
-"your\n"
-"hard drive. This is recommended if you do not have a good knowledge of\n"
+" * \"Wizard\": use this option if you wish to use a wizard to partition\n"
+"your hard drive. This is recommended if you do not have a good knowledge of\n"
"partitioning;\n"
"\n"
" * \"Undo\": use this option to cancel your changes;\n"
"\n"
-" * \"Toggle to normal/expert mode\": allows additional actions on "
-"partitions\n"
-"(type, options, format) and gives more information;\n"
+" * \"Toggle to normal/expert mode\": allows additional actions on\n"
+"partitions (type, options, format) and gives more information;\n"
"\n"
" * \"Done\": when you are finished partitioning your hard drive, this will\n"
"save your changes back to disk.\n"
@@ -3032,11 +3172,11 @@ msgid ""
"what currently holds your machine, you will be able to keep some old (Linux\n"
"or other) partitions unchanged;\n"
"\n"
-" * \"Upgrade\": this installation class allows to simply update the "
-"packages\n"
-"currently installed on your Mandrake Linux system. It keeps the current\n"
-"partitions of your hard drives as well as user configurations. All other\n"
-"configuration steps remain available with respect to plain installation;\n"
+" * \"Upgrade\": this installation class allows to simply update the\n"
+"packages currently installed on your Mandrake Linux system. It keeps the\n"
+"current partitions of your hard drives as well as user configurations. All\n"
+"other configuration steps remain available with respect to plain\n"
+"installation;\n"
"\n"
" * \"Upgrade Packages Only\": this brand new class allows to upgrade an\n"
"existing Mandrake Linux system while keeping all system configurations\n"
@@ -3080,7 +3220,7 @@ msgstr ""
" 的了解, 您将很难回答某些问题.\n"
" 所以, 如果您不清楚会发生什么, 请不要选择这个级别."
-#: ../../help.pm_.c:583
+#: ../../help.pm_.c:584
msgid ""
"Normally, DrakX selects the right keyboard for you (depending on the\n"
"language you have chosen) and you won't even see this step. However, you\n"
@@ -3095,7 +3235,7 @@ msgid ""
"supported keyboards."
msgstr ""
-#: ../../help.pm_.c:596
+#: ../../help.pm_.c:597
msgid ""
"Please choose your preferred language for installation and system usage.\n"
"\n"
@@ -3110,7 +3250,7 @@ msgid ""
"additional locales, click the \"OK\" button to continue."
msgstr ""
-#: ../../help.pm_.c:609
+#: ../../help.pm_.c:610
msgid ""
"DrakX generally detects the number of buttons your mouse has. If not, it\n"
"assumes you have a two-button mouse and will set it up for third-button\n"
@@ -3126,7 +3266,7 @@ msgid ""
"to \"Cancel\" and choose again."
msgstr ""
-#: ../../help.pm_.c:623
+#: ../../help.pm_.c:624
msgid ""
"Please select the correct port. For example, the \"COM1\" port under\n"
"Windows is named \"ttyS0\" under GNU/Linux."
@@ -3134,23 +3274,23 @@ msgstr ""
"请选择正确的端口. 例如, \n"
"MS Windows 里的 COM1, 在 GNU/Linux 里面叫做 ttyS0."
-#: ../../help.pm_.c:627
+#: ../../help.pm_.c:628
msgid ""
"This is the most crucial decision point for the security of your GNU/Linux\n"
"system: you have to enter the \"root\" password. \"root\" is the system\n"
"administrator and is the only one authorized to make updates, add users,\n"
"change the overall system configuration, and so on. In short, \"root\" can\n"
"do everything! That is why you must choose a password that is difficult to\n"
-"guess DrakX will tell you if it is too easy. As you can see, you can choose\n"
-"not to enter a password, but we strongly advise you against this if only\n"
-"for one reason: do not think that because you booted GNU/Linux that your\n"
-"other operating systems are safe from mistakes. Since \"root\" can overcome\n"
-"all limitations and unintentionally erase all data on partitions by\n"
-"carelessly accessing the partitions themselves, it is important for it to\n"
-"be difficult to become \"root\".\n"
+"guess - DrakX will tell you if it is too easy. As you can see, you can\n"
+"choose not to enter a password, but we strongly advise you against this if\n"
+"only for one reason: do not think that because you booted GNU/Linux that\n"
+"your other operating systems are safe from mistakes. Since \"root\" can\n"
+"overcome all limitations and unintentionally erase all data on partitions\n"
+"by carelessly accessing the partitions themselves, it is important for it\n"
+"to be difficult to become \"root\".\n"
"\n"
"The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. Never write down the \"root\" password it makes it too\n"
+"characters long. Never write down the \"root\" password - it makes it too\n"
"easy to compromise a system.\n"
"\n"
"However, please do not make the password too long or complicated because\n"
@@ -3172,7 +3312,7 @@ msgid ""
"want to choose \"Local files\" for authentication."
msgstr ""
-#: ../../help.pm_.c:663
+#: ../../help.pm_.c:664
msgid ""
"LILO and grub are GNU/Linux bootloaders. This stage, normally, is totally\n"
"automated. In fact, DrakX analyzes the disk boot sector and acts\n"
@@ -3194,7 +3334,7 @@ msgid ""
" * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
"interface.\n"
"\n"
-" * \"LILO with text menu\": if you prefer LILO with its text menu "
+" * \"LILO with text menu\": if you prefer LILO with its text menu\n"
"interface.\n"
"\n"
" * \"Boot device\": in most cases, you will not change the default\n"
@@ -3202,7 +3342,7 @@ msgid ""
"second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\");\n"
"\n"
" * \"Delay before booting the default image\": when rebooting the computer,\n"
-"this is the delay granted to the user to choose in the bootloader menu,\n"
+"this is the delay granted to the user to choose - in the bootloader menu,\n"
"another boot entry than the default one.\n"
"\n"
"!! Beware that if you choose not to install a bootloader (by selecting\n"
@@ -3223,7 +3363,7 @@ msgid ""
"installation step."
msgstr ""
-#: ../../help.pm_.c:711
+#: ../../help.pm_.c:713
#, fuzzy
msgid ""
"LILO (the LInux LOader) and grub are bootloaders: they are able to boot\n"
@@ -3245,7 +3385,7 @@ msgstr ""
"您可能不希望让人使用这里列出的其他操作系统, 只要把有关的项目删除就好了.\n"
"可是您需要先准备开机软盘来引导它们."
-#: ../../help.pm_.c:722
+#: ../../help.pm_.c:724
msgid ""
"You must indicate where you wish to place the information required to boot\n"
"to GNU/Linux.\n"
@@ -3257,29 +3397,28 @@ msgstr ""
"\n"
"选择\"硬盘的第一个扇区 (MBR)\", 除非您清楚其它选择的后果."
-#: ../../help.pm_.c:729
+#: ../../help.pm_.c:731
msgid ""
"Here, we select a printing system for your computer. Other OSs may offer\n"
"you one, but Mandrake Linux offers three.\n"
"\n"
-" * \"pdq\" which means ``print, don't queue'', is the choice if you have a\n"
-"direct connection to your printer and you want to be able to panic out of\n"
+" * \"pdq\" - which means ``print, don't queue'', is the choice if you have\n"
+"a direct connection to your printer and you want to be able to panic out of\n"
"printer jams, and you do not have networked printers. It will handle only\n"
"very simple network cases and is somewhat slow for networks. Pick \"pdq\"\n"
"if this is your maiden voyage to GNU/Linux. You can change your choices\n"
"after installation by running PrinterDrake from the Mandrake Control Center\n"
"and clicking the expert button.\n"
"\n"
-" * \"CUPS\"``Common Unix Printing System'', is excellent at printing to "
-"your\n"
-"local printer and also halfway-around the planet. It is simple and can act\n"
-"as a server or a client for the ancient \"lpd\" printing system. Hence, it\n"
-"is compatible with the systems that went before. It can do many tricks, but\n"
-"the basic setup is almost as easy as \"pdq\". If you need this to emulate\n"
-"an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has\n"
+" * \"CUPS\" - ``Common Unix Printing System'', is excellent at printing to\n"
+"your local printer and also halfway-around the planet. It is simple and can\n"
+"act as a server or a client for the ancient \"lpd\" printing system. Hence,\n"
+"it is compatible with the systems that went before. It can do many tricks,\n"
+"but the basic setup is almost as easy as \"pdq\". If you need this to\n"
+"emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has\n"
"graphical front-ends for printing or choosing printer options.\n"
"\n"
-" * \"lprNG\"``line printer daemon New Generation''. This system can do\n"
+" * \"lprNG\" - ``line printer daemon New Generation''. This system can do\n"
"approximately the same things the others can do, but it will print to\n"
"printers mounted on a Novell Network, because it supports the IPX protocol,\n"
"and it can print directly to shell commands. If you have need of Novell or\n"
@@ -3288,7 +3427,8 @@ msgid ""
"networks."
msgstr ""
-#: ../../help.pm_.c:757
+#: ../../help.pm_.c:759
+#, fuzzy
msgid ""
"DrakX now detects any IDE device present in your computer. It will also\n"
"scan for one or more PCI SCSI card(s) on your system. If a SCSI card is\n"
@@ -3313,7 +3453,7 @@ msgid ""
"``User Guide'' (chapter 3, in the ``Collecting Information on Your\n"
"Hardware'' section) for hints on retrieving the parameters required from\n"
"hardware documentation, from the manufacturer's web site (if you have\n"
-"Internet access) or from MicrosoftWindows (if you used this hardware with\n"
+"Internet access) or from Microsoft Windows (if you used this hardware with\n"
"Windows on your system)."
msgstr ""
"DrakX 将要尝试寻找 IDE设备和 PCI SCSI 卡. \n"
@@ -3337,7 +3477,7 @@ msgstr ""
" 浏览制造商的网站 (如果您有办法上网)\n"
"或从 Windows 中获取有关的信息 (如果您的系统中有Windows)"
-#: ../../help.pm_.c:784
+#: ../../help.pm_.c:786
#, fuzzy
msgid ""
"You can add additional entries for yaboot, either for other operating\n"
@@ -3348,9 +3488,8 @@ msgid ""
"\n"
"For Linux, there are a few possible options:\n"
"\n"
-" * Label: this is simply the name you will have to type at the yaboot "
-"prompt\n"
-"to select this boot option;\n"
+" * Label: this is simply the name you will have to type at the yaboot\n"
+"prompt to select this boot option;\n"
"\n"
" * Image: this would be the name of the kernel to boot. Typically, vmlinux\n"
"or a variation of vmlinux with an extension;\n"
@@ -3362,7 +3501,7 @@ msgid ""
"button emulation for the often lacking 2nd and 3rd mouse buttons on a stock\n"
"Apple mouse. The following are some examples:\n"
"\n"
-" video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
+" video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
"hda=autotune\n"
"\n"
" video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
@@ -3388,7 +3527,7 @@ msgid ""
"selections."
msgstr "你可以输入Yaboot的附加信息."
-#: ../../help.pm_.c:830
+#: ../../help.pm_.c:833
#, fuzzy
msgid ""
"Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able to boot\n"
@@ -3416,9 +3555,8 @@ msgid ""
" * Enable CD Boot?: checking this option allows you to choose ``C'' for CD\n"
"at the first boot prompt;\n"
"\n"
-" * Enable OF Boot?: checking this option allows you to choose ``N'' for "
-"Open\n"
-"Firmware at the first boot prompt;\n"
+" * Enable OF Boot?: checking this option allows you to choose ``N'' for\n"
+"Open Firmware at the first boot prompt;\n"
"\n"
" * Default OS: you can select which OS will boot by default when the Open\n"
"Firmware Delay expires."
@@ -3446,10 +3584,10 @@ msgstr ""
" - 使能OF引导?: 'N' 固件引导.\n"
" - 却省操作系统: 固件却省引导的操作系统."
-#: ../../help.pm_.c:862
+#: ../../help.pm_.c:865
msgid ""
"Here are presented various parameters concerning your machine. Depending on\n"
-"your installed hardware, you may or not, see the following entries:\n"
+"your installed hardware, you may - or not, see the following entries:\n"
"\n"
" * \"Mouse\": check the current mouse configuration and click on the button\n"
"to change it if necessary;\n"
@@ -3457,12 +3595,11 @@ msgid ""
" * \"Keyboard\": check the current keyboard map configuration and click on\n"
"the button to change that if necessary;\n"
"\n"
-" * \"Timezone\": DrakX, by default, guesses your time zone from the "
-"language\n"
-"you have chosen. But here again, as for the choice of a keyboard, you may\n"
-"not be in the country for which the chosen language should correspond.\n"
-"Hence, you may need to click on the \"Timezone\" button in order to\n"
-"configure the clock according to the time zone you are in;\n"
+" * \"Timezone\": DrakX, by default, guesses your time zone from the\n"
+"language you have chosen. But here again, as for the choice of a keyboard,\n"
+"you may not be in the country for which the chosen language should\n"
+"correspond. Hence, you may need to click on the \"Timezone\" button in\n"
+"order to configure the clock according to the time zone you are in;\n"
"\n"
" * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
"configuration wizard;\n"
@@ -3478,7 +3615,7 @@ msgid ""
"associated with it."
msgstr ""
-#: ../../help.pm_.c:891
+#: ../../help.pm_.c:894
msgid ""
"Choose the hard drive you want to erase in order to install your new\n"
"Mandrake Linux partition. Be careful, all data present on it will be lost\n"
@@ -3487,7 +3624,7 @@ msgstr ""
"选择硬盘您准备清空来安装 Mandrake分区.\n"
"注意,所有数据将丢失并且无法恢复."
-#: ../../help.pm_.c:896
+#: ../../help.pm_.c:899
msgid ""
"Click on \"OK\" if you want to delete all data and partitions present on\n"
"this hard drive. Be careful, after clicking on \"OK\", you will not be able\n"
@@ -3503,7 +3640,7 @@ msgstr ""
"\n"
"点击 \"取消\"取消操作,数据及分区不会丢失."
-#: ../../install2.pm_.c:113
+#: ../../install2.pm_.c:114
#, c-format
msgid ""
"Can't access kernel modules corresponding to your kernel (file %s is "
@@ -3511,12 +3648,12 @@ msgid ""
"Installation medium (please create a newer boot floppy)"
msgstr ""
-#: ../../install2.pm_.c:169
+#: ../../install2.pm_.c:166
#, c-format
msgid "You must also format %s"
msgstr ""
-#: ../../install_any.pm_.c:411
+#: ../../install_any.pm_.c:418
#, c-format
msgid ""
"You have selected the following server(s): %s\n"
@@ -3539,26 +3676,26 @@ msgstr ""
"\n"
"果真安装这些服务?\n"
-#: ../../install_any.pm_.c:447
+#: ../../install_any.pm_.c:454
msgid "Can't use broadcast with no NIS domain"
msgstr "没有NIS域, 无法使用广播"
-#: ../../install_any.pm_.c:793
+#: ../../install_any.pm_.c:837
#, c-format
msgid "Insert a FAT formatted floppy in drive %s"
msgstr "请插入一张DOS软盘到驱动器 %s"
-#: ../../install_any.pm_.c:797
+#: ../../install_any.pm_.c:841
msgid "This floppy is not FAT formatted"
msgstr "不是DOS格式的软盘"
-#: ../../install_any.pm_.c:809
+#: ../../install_any.pm_.c:853
msgid ""
"To use this saved packages selection, boot installation with ``linux "
"defcfg=floppy''"
msgstr "使用保存的软件包选择, 以''linux defcfg=floppy''启动"
-#: ../../install_any.pm_.c:831 ../../partition_table.pm_.c:763
+#: ../../install_any.pm_.c:875 ../../partition_table.pm_.c:771
#, c-format
msgid "Error reading file %s"
msgstr "请取文件 %s 出错 "
@@ -3588,7 +3725,7 @@ msgstr "您必须有一个交换分区"
#: ../../install_interactive.pm_.c:64
msgid ""
-"You don't have a swap partition\n"
+"You don't have a swap partition.\n"
"\n"
"Continue anyway?"
msgstr ""
@@ -3596,59 +3733,59 @@ msgstr ""
"\n"
"要继续吗?"
-#: ../../install_interactive.pm_.c:67 ../../install_steps.pm_.c:163
+#: ../../install_interactive.pm_.c:67 ../../install_steps.pm_.c:164
msgid "You must have a FAT partition mounted in /boot/efi"
msgstr "您必须有一个FAT分区 载入 /boot/efi"
-#: ../../install_interactive.pm_.c:90
+#: ../../install_interactive.pm_.c:91
msgid "Use free space"
msgstr "使用空闲空间"
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:93
msgid "Not enough free space to allocate new partitions"
msgstr "没有足够空闲空间分配给新分区"
-#: ../../install_interactive.pm_.c:100
-msgid "Use existing partition"
+#: ../../install_interactive.pm_.c:101
+msgid "Use existing partitions"
msgstr "使用现存的分区"
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:103
msgid "There is no existing partition to use"
msgstr "现存的分区无法使用"
-#: ../../install_interactive.pm_.c:109
+#: ../../install_interactive.pm_.c:110
msgid "Use the Windows partition for loopback"
msgstr "利用 Windows 分区进行回送"
-#: ../../install_interactive.pm_.c:112
+#: ../../install_interactive.pm_.c:113
msgid "Which partition do you want to use for Linux4Win?"
msgstr "请问您要在哪一个分区里放 Linux4Win?"
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:115
msgid "Choose the sizes"
msgstr "选择大小"
-#: ../../install_interactive.pm_.c:115
+#: ../../install_interactive.pm_.c:116
msgid "Root partition size in MB: "
msgstr "根分区大小(MB): "
-#: ../../install_interactive.pm_.c:116
+#: ../../install_interactive.pm_.c:117
msgid "Swap partition size in MB: "
msgstr "交换分区大小 (MB): "
-#: ../../install_interactive.pm_.c:125
+#: ../../install_interactive.pm_.c:126
msgid "Use the free space on the Windows partition"
msgstr "使用在 Windows 分区上的空闲空间"
-#: ../../install_interactive.pm_.c:128
+#: ../../install_interactive.pm_.c:129
msgid "Which partition do you want to resize?"
msgstr "您需要改变哪个分区的大小?"
-#: ../../install_interactive.pm_.c:130
-msgid "Computing Windows filesystem bounds"
+#: ../../install_interactive.pm_.c:131
+msgid "Resizing Windows partition"
msgstr "计算 Windows 文件系统的边界"
-#: ../../install_interactive.pm_.c:133
+#: ../../install_interactive.pm_.c:134
#, c-format
msgid ""
"The FAT resizer is unable to handle your partition, \n"
@@ -3657,11 +3794,14 @@ msgstr ""
"改变 FAT 分区大小的程序无法处理这个分区, \n"
"发生了如下错误: %s"
-#: ../../install_interactive.pm_.c:136
-msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
+#: ../../install_interactive.pm_.c:137
+msgid ""
+"Your Windows partition is too fragmented. Please reboot your computer under "
+"Windows, run the ``defrag'' utility, then restart the Mandrake Linux "
+"installation."
msgstr "您的 Windows 分区有太多碎片, 请先运行 ``defrag''"
-#: ../../install_interactive.pm_.c:137
+#: ../../install_interactive.pm_.c:138
msgid ""
"WARNING!\n"
"\n"
@@ -3679,52 +3819,52 @@ msgstr ""
"准备, 然后重新开始安装.\n"
"一切就绪后, 请按 \"确定\"."
-#: ../../install_interactive.pm_.c:147
-msgid "Which size do you want to keep for windows on"
+#: ../../install_interactive.pm_.c:148
+msgid "Which size do you want to keep for Windows on"
msgstr "您将保留多少空间给 windows?"
-#: ../../install_interactive.pm_.c:148
+#: ../../install_interactive.pm_.c:149
#, c-format
msgid "partition %s"
msgstr "分区 %s"
-#: ../../install_interactive.pm_.c:155
+#: ../../install_interactive.pm_.c:156
#, c-format
msgid "FAT resizing failed: %s"
msgstr "自动调整大小失败: %s"
-#: ../../install_interactive.pm_.c:170
+#: ../../install_interactive.pm_.c:171
msgid ""
-"There is no FAT partitions to resize or to use as loopback (or not enough "
+"There is no FAT partition to resize or to use as loopback (or not enough "
"space left)"
msgstr "没有可以调整大小或者用作回环的 FAT 分区 (或者没有足够剩余空间)"
-#: ../../install_interactive.pm_.c:176
+#: ../../install_interactive.pm_.c:177
msgid "Erase entire disk"
msgstr "清除整个磁盘"
-#: ../../install_interactive.pm_.c:176
+#: ../../install_interactive.pm_.c:177
msgid "Remove Windows(TM)"
msgstr "删除 Windows(TM)"
-#: ../../install_interactive.pm_.c:179
+#: ../../install_interactive.pm_.c:180
msgid "You have more than one hard drive, which one do you install linux on?"
msgstr "您有不只一个硬盘, 您要在哪个上面安装 Linux?"
-#: ../../install_interactive.pm_.c:182
+#: ../../install_interactive.pm_.c:183
#, c-format
msgid "ALL existing partitions and their data will be lost on drive %s"
msgstr "磁盘 %s 上现存的所有分区及其资料将被清除"
-#: ../../install_interactive.pm_.c:190
+#: ../../install_interactive.pm_.c:191
msgid "Custom disk partitioning"
msgstr "定制分区"
-#: ../../install_interactive.pm_.c:194
+#: ../../install_interactive.pm_.c:195
msgid "Use fdisk"
msgstr "使用 fdisk"
-#: ../../install_interactive.pm_.c:197
+#: ../../install_interactive.pm_.c:198
#, c-format
msgid ""
"You can now partition %s.\n"
@@ -3733,11 +3873,11 @@ msgstr ""
"您现在可以在 %s 上做分区\n"
"做完之后, 不要忘记用 `w' 命令保存您的修改"
-#: ../../install_interactive.pm_.c:226
+#: ../../install_interactive.pm_.c:227
msgid "You don't have enough free space on your Windows partition"
msgstr "在 Windows 分区上没有足够的空闲空间"
-#: ../../install_interactive.pm_.c:242
+#: ../../install_interactive.pm_.c:243
msgid "I can't find any room for installing"
msgstr "我无法找到安装需要的空间"
@@ -3745,16 +3885,16 @@ msgstr "我无法找到安装需要的空间"
msgid "The DrakX Partitioning wizard found the following solutions:"
msgstr "DrakX 分区大师建议这些解决办法:"
-#: ../../install_interactive.pm_.c:251
+#: ../../install_interactive.pm_.c:250
#, c-format
msgid "Partitioning failed: %s"
msgstr "分区失败: %s"
-#: ../../install_interactive.pm_.c:261
+#: ../../install_interactive.pm_.c:260
msgid "Bringing up the network"
msgstr "网络正在启动"
-#: ../../install_interactive.pm_.c:266
+#: ../../install_interactive.pm_.c:265
msgid "Bringing down the network"
msgstr "正在禁用网络功能"
@@ -3766,12 +3906,12 @@ msgstr ""
"发生错误, 可是我不知道该怎样处理才好.\n"
"继续下去会怎样就看您的运气了."
-#: ../../install_steps.pm_.c:205
+#: ../../install_steps.pm_.c:206
#, c-format
msgid "Duplicate mount point %s"
msgstr "重复的装载点 %s"
-#: ../../install_steps.pm_.c:388
+#: ../../install_steps.pm_.c:392
msgid ""
"Some important packages didn't get installed properly.\n"
"Either your cdrom drive or your cdrom is defective.\n"
@@ -3782,12 +3922,12 @@ msgstr ""
"请在一台安装好的电脑上检查光盘, 命令是\n"
"\"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
-#: ../../install_steps.pm_.c:458
+#: ../../install_steps.pm_.c:464
#, c-format
msgid "Welcome to %s"
msgstr "欢迎来到 %s"
-#: ../../install_steps.pm_.c:513 ../../install_steps.pm_.c:755
+#: ../../install_steps.pm_.c:518 ../../install_steps.pm_.c:760
msgid "No floppy drive available"
msgstr "没有可用的软盘驱动器."
@@ -3797,9 +3937,9 @@ msgstr "没有可用的软盘驱动器."
msgid "Entering step `%s'\n"
msgstr "进入步骤 `%s'\n"
-#: ../../install_steps_gtk.pm_.c:148
+#: ../../install_steps_gtk.pm_.c:149
msgid ""
-"Your system is low on resource. You may have some problem installing\n"
+"Your system is low on resources. You may have some problem installing\n"
"Mandrake Linux. If that occurs, you can try a text install instead. For "
"this,\n"
"press `F1' when booting on CDROM, then enter `text'."
@@ -3808,197 +3948,152 @@ msgstr ""
"如果这样, 您可以尝试文本模式的安装. \n"
"在从光盘启动后按 'F1' 键, 然后输入 'text'."
-#: ../../install_steps_gtk.pm_.c:159 ../../install_steps_interactive.pm_.c:224
+#: ../../install_steps_gtk.pm_.c:160 ../../install_steps_interactive.pm_.c:232
msgid "Install Class"
msgstr "安装类别"
-#: ../../install_steps_gtk.pm_.c:162
+#: ../../install_steps_gtk.pm_.c:163
msgid "Please choose one of the following classes of installation:"
msgstr "请从下列安装类别里选择一个:"
-#: ../../install_steps_gtk.pm_.c:228
-#, c-format
-msgid ""
-"The total size for the groups you have selected is approximately %d MB.\n"
-msgstr "被选择的组件安装所需硬盘空间约为 %d MB.\n"
-
-#: ../../install_steps_gtk.pm_.c:230
-#, c-format
-msgid ""
-"If you wish to install less than this size,\n"
-"select the percentage of packages that you want to install.\n"
-"\n"
-"A low percentage will install only the most important packages;\n"
-"a percentage of 100%% will install all selected packages."
-msgstr ""
-"如果您想使用更少的空间来安装, \n"
-"请决定安装已经选定的软件包的百分比?\n"
-"\n"
-"选择较低的百分比就只安装最重要的软件; 选择 100 %% 就安装所选的\n"
-"全部软件."
-
-#: ../../install_steps_gtk.pm_.c:235
-#, c-format
-msgid ""
-"You have space on your disk for only %d%% of these packages.\n"
-"\n"
-"If you wish to install less than this,\n"
-"select the percentage of packages that you want to install.\n"
-"A low percentage will install only the most important packages;\n"
-"a percentage of %d%% will install as many packages as possible."
-msgstr ""
-"您的磁盘空间只够安装所有这些软件包的 %d%%.\n"
-"如果您想少安装一些, \n"
-"请决定安装已经选定的软件包的百分之几?\n"
-"\n"
-"选择较低的百分比就只安装最重要的软件; 选择 %d%% 就安装所选的\n"
-"全部软件."
-
-#: ../../install_steps_gtk.pm_.c:241
-msgid "You will be able to choose them more specifically in the next step."
-msgstr "在下一个步骤您将可以更仔细的选择"
-
-#: ../../install_steps_gtk.pm_.c:243
-msgid "Percentage of packages to install"
-msgstr "要安装软件包的百分比"
-
-#: ../../install_steps_gtk.pm_.c:291 ../../install_steps_interactive.pm_.c:705
+#: ../../install_steps_gtk.pm_.c:242 ../../install_steps_interactive.pm_.c:695
msgid "Package Group Selection"
msgstr "程序组选择"
-#: ../../install_steps_gtk.pm_.c:323 ../../install_steps_interactive.pm_.c:720
+#: ../../install_steps_gtk.pm_.c:274 ../../install_steps_interactive.pm_.c:710
msgid "Individual package selection"
msgstr "选择单个软件包"
-#: ../../install_steps_gtk.pm_.c:346 ../../install_steps_interactive.pm_.c:645
+#: ../../install_steps_gtk.pm_.c:297 ../../install_steps_interactive.pm_.c:634
#, c-format
msgid "Total size: %d / %d MB"
msgstr "总共大小: %d / %d MB"
-#: ../../install_steps_gtk.pm_.c:391
+#: ../../install_steps_gtk.pm_.c:339
msgid "Bad package"
msgstr "有错的软件包"
-#: ../../install_steps_gtk.pm_.c:392
+#: ../../install_steps_gtk.pm_.c:340
#, c-format
msgid "Name: %s\n"
msgstr "名称: %s\n"
-#: ../../install_steps_gtk.pm_.c:393
+#: ../../install_steps_gtk.pm_.c:341
#, c-format
msgid "Version: %s\n"
msgstr "版本: %s\n"
-#: ../../install_steps_gtk.pm_.c:394
+#: ../../install_steps_gtk.pm_.c:342
#, c-format
msgid "Size: %d KB\n"
msgstr "大小: %d KB\n"
-#: ../../install_steps_gtk.pm_.c:395
+#: ../../install_steps_gtk.pm_.c:343
#, c-format
msgid "Importance: %s\n"
msgstr "重要性: %s\n"
-#: ../../install_steps_gtk.pm_.c:417
+#: ../../install_steps_gtk.pm_.c:365
msgid ""
"You can't select this package as there is not enough space left to install it"
msgstr "您不可以选择这个软件包. 没有足够空间安装它."
-#: ../../install_steps_gtk.pm_.c:422
+#: ../../install_steps_gtk.pm_.c:370
msgid "The following packages are going to be installed"
msgstr "下列软件包将要被安装"
-#: ../../install_steps_gtk.pm_.c:423
+#: ../../install_steps_gtk.pm_.c:371
msgid "The following packages are going to be removed"
msgstr "下列软件包将要被卸载"
-#: ../../install_steps_gtk.pm_.c:435
+#: ../../install_steps_gtk.pm_.c:383
msgid "You can't select/unselect this package"
msgstr "您不能改变这个软件包的选定"
-#: ../../install_steps_gtk.pm_.c:447
+#: ../../install_steps_gtk.pm_.c:395
msgid "This is a mandatory package, it can't be unselected"
msgstr "这个软件包是必需的, 不能取消选定"
-#: ../../install_steps_gtk.pm_.c:449
+#: ../../install_steps_gtk.pm_.c:397
msgid "You can't unselect this package. It is already installed"
msgstr "您不可以取消选择这个软件包. 它已经安装过了."
-#: ../../install_steps_gtk.pm_.c:453
+#: ../../install_steps_gtk.pm_.c:400
msgid ""
-"This package must be upgraded\n"
+"This package must be upgraded.\n"
"Are you sure you want to deselect it?"
msgstr ""
"这个软件包必须进行升级.\n"
"您真的要删除它吗?"
-#: ../../install_steps_gtk.pm_.c:457
+#: ../../install_steps_gtk.pm_.c:403
msgid "You can't unselect this package. It must be upgraded"
msgstr "您不能不选择这个软件包, 它必须升级"
-#: ../../install_steps_gtk.pm_.c:462
+#: ../../install_steps_gtk.pm_.c:408
msgid "Show automatically selected packages"
msgstr "显示自动选中的软件包"
-#: ../../install_steps_gtk.pm_.c:463 ../../install_steps_interactive.pm_.c:246
-#: ../../install_steps_interactive.pm_.c:250
+#: ../../install_steps_gtk.pm_.c:409 ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:260
+#: ../../standalone/drakbackup_.c:2935
msgid "Install"
msgstr "安装"
-#: ../../install_steps_gtk.pm_.c:466
+#: ../../install_steps_gtk.pm_.c:412
msgid "Load/Save on floppy"
msgstr "软盘载入/保存"
-#: ../../install_steps_gtk.pm_.c:467
+#: ../../install_steps_gtk.pm_.c:413
msgid "Updating package selection"
msgstr "更新软件包选择"
-#: ../../install_steps_gtk.pm_.c:472
+#: ../../install_steps_gtk.pm_.c:418
msgid "Minimal install"
msgstr "最小安装"
-#: ../../install_steps_gtk.pm_.c:487 ../../install_steps_interactive.pm_.c:555
+#: ../../install_steps_gtk.pm_.c:433 ../../install_steps_interactive.pm_.c:539
msgid "Choose the packages you want to install"
msgstr "选择您要安装的软件包"
-#: ../../install_steps_gtk.pm_.c:503 ../../install_steps_interactive.pm_.c:787
+#: ../../install_steps_gtk.pm_.c:449 ../../install_steps_interactive.pm_.c:777
msgid "Installing"
msgstr "正在安装"
-#: ../../install_steps_gtk.pm_.c:509
+#: ../../install_steps_gtk.pm_.c:455
msgid "Estimating"
msgstr "正在估计"
-#: ../../install_steps_gtk.pm_.c:516
+#: ../../install_steps_gtk.pm_.c:462
msgid "Time remaining "
msgstr "剩余时间"
-#: ../../install_steps_gtk.pm_.c:528
-msgid "Please wait, preparing installation"
+#: ../../install_steps_gtk.pm_.c:474
+msgid "Please wait, preparing installation..."
msgstr "正在准备安装"
-#: ../../install_steps_gtk.pm_.c:611
+#: ../../install_steps_gtk.pm_.c:558
#, c-format
msgid "%d packages"
msgstr "%d 软件包"
-#: ../../install_steps_gtk.pm_.c:616
+#: ../../install_steps_gtk.pm_.c:563
#, c-format
msgid "Installing package %s"
msgstr "正在安装程序 %s"
-#: ../../install_steps_gtk.pm_.c:657 ../../install_steps_interactive.pm_.c:185
-#: ../../install_steps_interactive.pm_.c:811
+#: ../../install_steps_gtk.pm_.c:600 ../../install_steps_interactive.pm_.c:189
+#: ../../install_steps_interactive.pm_.c:801
#: ../../standalone/drakautoinst_.c:203
msgid "Accept"
msgstr "接受"
-#: ../../install_steps_gtk.pm_.c:657 ../../install_steps_interactive.pm_.c:185
-#: ../../install_steps_interactive.pm_.c:811
+#: ../../install_steps_gtk.pm_.c:600 ../../install_steps_interactive.pm_.c:189
+#: ../../install_steps_interactive.pm_.c:801
msgid "Refuse"
msgstr "拒绝"
-#: ../../install_steps_gtk.pm_.c:658 ../../install_steps_interactive.pm_.c:812
+#: ../../install_steps_gtk.pm_.c:601 ../../install_steps_interactive.pm_.c:802
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -4012,17 +4107,17 @@ msgstr ""
"请在驱动器中插入标有 \"%s\" 的光盘, 然后点击 '确定'.\n"
"如果您没有这张光盘, 请点击 '取消', 放弃安装这个光盘上的软件."
-#: ../../install_steps_gtk.pm_.c:672 ../../install_steps_gtk.pm_.c:676
-#: ../../install_steps_interactive.pm_.c:824
-#: ../../install_steps_interactive.pm_.c:828
+#: ../../install_steps_gtk.pm_.c:615 ../../install_steps_gtk.pm_.c:619
+#: ../../install_steps_interactive.pm_.c:814
+#: ../../install_steps_interactive.pm_.c:818
msgid "Go on anyway?"
msgstr "真的要继续"
-#: ../../install_steps_gtk.pm_.c:672 ../../install_steps_interactive.pm_.c:824
+#: ../../install_steps_gtk.pm_.c:615 ../../install_steps_interactive.pm_.c:814
msgid "There was an error ordering packages:"
msgstr "排列软件包时出错"
-#: ../../install_steps_gtk.pm_.c:676 ../../install_steps_interactive.pm_.c:828
+#: ../../install_steps_gtk.pm_.c:619 ../../install_steps_interactive.pm_.c:818
msgid "There was an error installing packages:"
msgstr "安装软件包时出错:"
@@ -4094,11 +4189,11 @@ msgstr "发生一个错误"
msgid "Do you really want to leave the installation?"
msgstr "您确定退出安装程序吗? "
-#: ../../install_steps_interactive.pm_.c:108
+#: ../../install_steps_interactive.pm_.c:112
msgid "License agreement"
msgstr "许可协议"
-#: ../../install_steps_interactive.pm_.c:109
+#: ../../install_steps_interactive.pm_.c:113
msgid ""
"Introduction\n"
"\n"
@@ -4113,7 +4208,7 @@ msgid ""
"\n"
"1. License Agreement\n"
"\n"
-"Please read carefully this document. This document is a license agreement "
+"Please read this document carefully. This document is a license agreement "
"between you and \n"
"MandrakeSoft S.A. which applies to the Software Products.\n"
"By installing, duplicating or using the Software Products in any manner, you "
@@ -4231,7 +4326,7 @@ msgstr ""
"\n"
"1. License Agreement\n"
"\n"
-"Please read carefully this document. This document is a license agreement "
+"Please read this document carefully. This document is a license agreement "
"between you and \n"
"MandrakeSoft S.A. which applies to the Software Products.\n"
"By installing, duplicating or using the Software Products in any manner, you "
@@ -4336,109 +4431,113 @@ msgstr ""
"Paris - France.\n"
"For any question on this document, please contact MandrakeSoft S.A. \n"
-#: ../../install_steps_interactive.pm_.c:205
-#: ../../install_steps_interactive.pm_.c:1045
+#: ../../install_steps_interactive.pm_.c:191
+msgid "Are you sure you refuse the licence?"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:213
+#: ../../install_steps_interactive.pm_.c:1037
#: ../../standalone/keyboarddrake_.c:28
msgid "Keyboard"
msgstr "键盘"
-#: ../../install_steps_interactive.pm_.c:206
+#: ../../install_steps_interactive.pm_.c:214
msgid "Please choose your keyboard layout."
msgstr "请选择您使用的键盘布局."
-#: ../../install_steps_interactive.pm_.c:207
+#: ../../install_steps_interactive.pm_.c:215
msgid "Here is the full list of keyboards available"
msgstr "键盘清单"
-#: ../../install_steps_interactive.pm_.c:224
+#: ../../install_steps_interactive.pm_.c:232
msgid "Which installation class do you want?"
msgstr "您想要做什么类别的安装?"
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_interactive.pm_.c:236
msgid "Install/Update"
msgstr "安装/升级"
-#: ../../install_steps_interactive.pm_.c:226
+#: ../../install_steps_interactive.pm_.c:236
msgid "Is this an install or an update?"
msgstr "要安装新系统还是升级原有系统?"
-#: ../../install_steps_interactive.pm_.c:235
+#: ../../install_steps_interactive.pm_.c:245
msgid "Recommended"
msgstr "推荐"
-#: ../../install_steps_interactive.pm_.c:238
-#: ../../install_steps_interactive.pm_.c:241
+#: ../../install_steps_interactive.pm_.c:248
+#: ../../install_steps_interactive.pm_.c:251
msgid "Expert"
msgstr "专家"
-#: ../../install_steps_interactive.pm_.c:246
-#: ../../install_steps_interactive.pm_.c:250
+#: ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:260
msgid "Upgrade"
msgstr "升级"
-#: ../../install_steps_interactive.pm_.c:246
-#: ../../install_steps_interactive.pm_.c:250
+#: ../../install_steps_interactive.pm_.c:256
+#: ../../install_steps_interactive.pm_.c:260
msgid "Upgrade packages only"
msgstr "只更新软件包"
-#: ../../install_steps_interactive.pm_.c:266
+#: ../../install_steps_interactive.pm_.c:276
msgid "Please choose the type of your mouse."
msgstr "请选择您的鼠标类型."
-#: ../../install_steps_interactive.pm_.c:272 ../../standalone/mousedrake_.c:65
+#: ../../install_steps_interactive.pm_.c:282 ../../standalone/mousedrake_.c:60
msgid "Mouse Port"
msgstr "鼠标端口"
-#: ../../install_steps_interactive.pm_.c:273 ../../standalone/mousedrake_.c:66
+#: ../../install_steps_interactive.pm_.c:283 ../../standalone/mousedrake_.c:61
msgid "Please choose on which serial port your mouse is connected to."
msgstr "请选择您的鼠标是连接到那个串行口 ?"
-#: ../../install_steps_interactive.pm_.c:281
+#: ../../install_steps_interactive.pm_.c:291
msgid "Buttons emulation"
msgstr "鼠标键模拟"
-#: ../../install_steps_interactive.pm_.c:283
+#: ../../install_steps_interactive.pm_.c:293
msgid "Button 2 Emulation"
msgstr "2键模拟"
-#: ../../install_steps_interactive.pm_.c:284
+#: ../../install_steps_interactive.pm_.c:294
msgid "Button 3 Emulation"
msgstr "3键模拟"
-#: ../../install_steps_interactive.pm_.c:305
+#: ../../install_steps_interactive.pm_.c:315
msgid "Configuring PCMCIA cards..."
msgstr "配置 PCMCIA 卡"
-#: ../../install_steps_interactive.pm_.c:305
+#: ../../install_steps_interactive.pm_.c:315
msgid "PCMCIA"
msgstr "PCMCIA"
-#: ../../install_steps_interactive.pm_.c:312
+#: ../../install_steps_interactive.pm_.c:322
msgid "Configuring IDE"
msgstr "正在配置 IDE"
-#: ../../install_steps_interactive.pm_.c:312
+#: ../../install_steps_interactive.pm_.c:322
msgid "IDE"
msgstr "IDE"
-#: ../../install_steps_interactive.pm_.c:327
-msgid "no available partitions"
+#: ../../install_steps_interactive.pm_.c:337
+msgid "No partition available"
msgstr "没有可用的硬盘分区"
-#: ../../install_steps_interactive.pm_.c:330
+#: ../../install_steps_interactive.pm_.c:340
msgid "Scanning partitions to find mount points"
msgstr "正在扫描各个分区以寻找装载点"
-#: ../../install_steps_interactive.pm_.c:338
+#: ../../install_steps_interactive.pm_.c:348
msgid "Choose the mount points"
msgstr "选择装载点"
-#: ../../install_steps_interactive.pm_.c:357
+#: ../../install_steps_interactive.pm_.c:367
#, c-format
msgid ""
"I can't read your partition table, it's too corrupted for me :(\n"
-"I can try to go on blanking bad partitions (ALL DATA will be lost!).\n"
-"The other solution is to disallow DrakX to modify the partition table.\n"
+"I can try to go on, erasing over bad partitions (ALL DATA will be lost!).\n"
+"The other solution is to not allow DrakX to modify the partition table.\n"
"(the error is %s)\n"
"\n"
"Do you agree to loose all the partitions?\n"
@@ -4450,7 +4549,7 @@ msgstr ""
"\n"
"您同意清除所有分区吗?\n"
-#: ../../install_steps_interactive.pm_.c:370
+#: ../../install_steps_interactive.pm_.c:380
msgid ""
"DiskDrake failed to read correctly the partition table.\n"
"Continue at your own risk!"
@@ -4458,7 +4557,7 @@ msgstr ""
"DiskDrake 无法正确读出分区表的内容.\n"
"继续下去会怎样就看您的运气了!"
-#: ../../install_steps_interactive.pm_.c:386
+#: ../../install_steps_interactive.pm_.c:397
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
"system, you'll need to create the bootstrap partition in DiskDrake"
@@ -4466,73 +4565,76 @@ msgstr ""
"无法创建开机启动空间(1MB)! 安装将继续, 但如需启动系统, 您可用DiskDrake创建启"
"动分区"
-#: ../../install_steps_interactive.pm_.c:395
+#: ../../install_steps_interactive.pm_.c:406
msgid "No root partition found to perform an upgrade"
msgstr "升级没有找到根目录分区"
-#: ../../install_steps_interactive.pm_.c:396
+#: ../../install_steps_interactive.pm_.c:407
msgid "Root Partition"
msgstr "根目录分区"
-#: ../../install_steps_interactive.pm_.c:397
+#: ../../install_steps_interactive.pm_.c:408
msgid "What is the root partition (/) of your system?"
msgstr "您的根目录分区(/)是哪一个 ?"
-#: ../../install_steps_interactive.pm_.c:411
+#: ../../install_steps_interactive.pm_.c:422
msgid "You need to reboot for the partition table modifications to take place"
msgstr "您将需要重新启动使改变生效"
-#: ../../install_steps_interactive.pm_.c:435
+#: ../../install_steps_interactive.pm_.c:446
msgid "Choose the partitions you want to format"
msgstr "请选择您要格式化的分区"
-#: ../../install_steps_interactive.pm_.c:436
+#: ../../install_steps_interactive.pm_.c:447
msgid "Check bad blocks?"
msgstr "是否检查坏磁块?"
-#: ../../install_steps_interactive.pm_.c:462
+#: ../../install_steps_interactive.pm_.c:474
msgid "Formatting partitions"
msgstr "正在格式化各个分区"
-#: ../../install_steps_interactive.pm_.c:464
+#: ../../install_steps_interactive.pm_.c:476
#, c-format
msgid "Creating and formatting file %s"
msgstr "正在创建和格式化文件 %s"
-#: ../../install_steps_interactive.pm_.c:467
-msgid "Not enough swap to fulfill installation, please add some"
+#: ../../install_steps_interactive.pm_.c:481
+#, c-format
+msgid ""
+"Failed to check filesystem %s. Do you want to repair the errors? (beware, "
+"you can loose data)"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:483
+msgid "Not enough swap space to fulfill installation, please add some"
msgstr "交换区太少, 无法完成安装, 请增加交换分区."
-#: ../../install_steps_interactive.pm_.c:473
-msgid "Looking for available packages"
+#: ../../install_steps_interactive.pm_.c:490
+#, fuzzy
+msgid "Looking for available packages and rebuilding rpm database..."
msgstr "寻找可安装的程序"
-#: ../../install_steps_interactive.pm_.c:479
-msgid "Finding packages to upgrade"
+#: ../../install_steps_interactive.pm_.c:491
+msgid "Looking for available packages..."
+msgstr "寻找可安装的程序"
+
+#: ../../install_steps_interactive.pm_.c:495
+msgid "Finding packages to upgrade..."
msgstr "寻找可升级的程序"
-#: ../../install_steps_interactive.pm_.c:496
+#: ../../install_steps_interactive.pm_.c:498
+#, fuzzy
+msgid "Looking at packages already installed..."
+msgstr "您不可以取消选择这个软件包. 它已经安装过了."
+
+#: ../../install_steps_interactive.pm_.c:516
#, c-format
msgid ""
-"Your system has not enough space left for installation or upgrade (%d > %d)"
+"Your system does not have enough space left for installation or upgrade (%d "
+"> %d)"
msgstr "您的系统所剩余的空间不够进行安装或升级 (%d > %d)"
-#: ../../install_steps_interactive.pm_.c:515
-#, c-format
-msgid "Complete (%dMB)"
-msgstr "完成 (%dMB)"
-
-#: ../../install_steps_interactive.pm_.c:515
-#, c-format
-msgid "Minimum (%dMB)"
-msgstr "最少 (%dMB)"
-
-#: ../../install_steps_interactive.pm_.c:515
-#, c-format
-msgid "Recommended (%dMB)"
-msgstr "建议 (%dMB)"
-
-#: ../../install_steps_interactive.pm_.c:568
+#: ../../install_steps_interactive.pm_.c:551
msgid ""
"Please choose load or save package selection on floppy.\n"
"The format is the same as auto_install generated floppies."
@@ -4540,53 +4642,53 @@ msgstr ""
"请在软盘载入或保存软件包选择信息.\n"
"格式与auto_install生成的软盘一样"
-#: ../../install_steps_interactive.pm_.c:571
+#: ../../install_steps_interactive.pm_.c:554
msgid "Load from floppy"
msgstr "从软盘载入"
-#: ../../install_steps_interactive.pm_.c:573
+#: ../../install_steps_interactive.pm_.c:556
msgid "Loading from floppy"
msgstr "正从软盘载入"
-#: ../../install_steps_interactive.pm_.c:573
+#: ../../install_steps_interactive.pm_.c:556
msgid "Package selection"
msgstr "软件包选择"
-#: ../../install_steps_interactive.pm_.c:578
+#: ../../install_steps_interactive.pm_.c:561
msgid "Insert a floppy containing package selection"
msgstr "请插入软件包选择软盘"
-#: ../../install_steps_interactive.pm_.c:590
+#: ../../install_steps_interactive.pm_.c:573
msgid "Save on floppy"
msgstr "保存入软盘"
-#: ../../install_steps_interactive.pm_.c:658
+#: ../../install_steps_interactive.pm_.c:647
msgid "Selected size is larger than available space"
msgstr "所选超过可用空间"
-#: ../../install_steps_interactive.pm_.c:671
+#: ../../install_steps_interactive.pm_.c:661
msgid "Type of install"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:672
+#: ../../install_steps_interactive.pm_.c:662
msgid ""
"You haven't selected any group of packages.\n"
"Please choose the minimal installation you want:"
msgstr "您没有选择任何的组件, 请选择最小安装"
-#: ../../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:665
msgid "With X"
msgstr "安装 X Window 系统"
-#: ../../install_steps_interactive.pm_.c:677
+#: ../../install_steps_interactive.pm_.c:667
msgid "With basic documentation (recommended!)"
msgstr "安装基础文档 (建议)"
-#: ../../install_steps_interactive.pm_.c:678
+#: ../../install_steps_interactive.pm_.c:668
msgid "Truly minimal install (especially no urpmi)"
msgstr "最小安装 (无包管理工具)"
-#: ../../install_steps_interactive.pm_.c:762
+#: ../../install_steps_interactive.pm_.c:752
msgid ""
"If you have all the CDs in the list below, click Ok.\n"
"If you have none of those CDs, click Cancel.\n"
@@ -4596,16 +4698,16 @@ msgstr ""
"如果您没有任何一张, 点击 取消.\n"
"如果您只缺其中一些, 不选中它, 然后点击 确认."
-#: ../../install_steps_interactive.pm_.c:767
+#: ../../install_steps_interactive.pm_.c:757
#, c-format
msgid "Cd-Rom labeled \"%s\""
msgstr "标号 %s 的CD-ROM "
-#: ../../install_steps_interactive.pm_.c:787
+#: ../../install_steps_interactive.pm_.c:777
msgid "Preparing installation"
msgstr "正在准备安装"
-#: ../../install_steps_interactive.pm_.c:796
+#: ../../install_steps_interactive.pm_.c:786
#, c-format
msgid ""
"Installing package %s\n"
@@ -4614,23 +4716,23 @@ msgstr ""
"正在安装软件包 %s \n"
"%d%%"
-#: ../../install_steps_interactive.pm_.c:842
+#: ../../install_steps_interactive.pm_.c:832
msgid "Post-install configuration"
msgstr "安装后的配置"
-#: ../../install_steps_interactive.pm_.c:848
+#: ../../install_steps_interactive.pm_.c:838
#, c-format
msgid "Please insert the Boot floppy used in drive %s"
msgstr "请插入一张启动软盘到驱动器 %s"
-#: ../../install_steps_interactive.pm_.c:854
+#: ../../install_steps_interactive.pm_.c:844
#, c-format
msgid "Please insert the Update Modules floppy in drive %s"
msgstr "请在驱动器 %s 中插入一张更新模块软盘"
-#: ../../install_steps_interactive.pm_.c:874
+#: ../../install_steps_interactive.pm_.c:864
msgid ""
-"You have now the possibility to download software aimed for encryption.\n"
+"You now have the opportunity to download encryption software.\n"
"\n"
"WARNING:\n"
"\n"
@@ -4691,158 +4793,189 @@ msgstr ""
"Altadena California 91001\n"
"USA"
-#: ../../install_steps_interactive.pm_.c:912
+#: ../../install_steps_interactive.pm_.c:903
msgid ""
-"You have now the possibility to download updated packages that have\n"
-"been released after the distribution has been made available.\n"
+"You now have the opportunity to download updated packages. These packages\n"
+"have been released after the distribution was released. They may\n"
+"contain security or bug fixes.\n"
"\n"
-"You will get security fixes or bug fixes, but you need to have an\n"
-"Internet connection configured to proceed.\n"
+"To download these packages, you will need to have a working Internet \n"
+"connection.\n"
"\n"
"Do you want to install the updates ?"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:926
-msgid "Contacting Mandrake Linux web site to get the list of available mirrors"
+#: ../../install_steps_interactive.pm_.c:918
+msgid ""
+"Contacting Mandrake Linux web site to get the list of available mirrors..."
msgstr "请访问 Mandrake Linux 网站以获得镜像网站列表"
-#: ../../install_steps_interactive.pm_.c:931
+#: ../../install_steps_interactive.pm_.c:923
msgid "Choose a mirror from which to get the packages"
msgstr "选择一个镜象网站来取得程序"
-#: ../../install_steps_interactive.pm_.c:940
-msgid "Contacting the mirror to get the list of available packages"
+#: ../../install_steps_interactive.pm_.c:932
+msgid "Contacting the mirror to get the list of available packages..."
msgstr "连接镜象网站以取得可供安装程序的列表"
-#: ../../install_steps_interactive.pm_.c:967
+#: ../../install_steps_interactive.pm_.c:959
msgid "Which is your timezone?"
msgstr "您处在的时区?"
-#: ../../install_steps_interactive.pm_.c:972
+#: ../../install_steps_interactive.pm_.c:964
msgid "Hardware clock set to GMT"
msgstr "您的系统时钟设定为 GMT"
-#: ../../install_steps_interactive.pm_.c:973
+#: ../../install_steps_interactive.pm_.c:965
msgid "Automatic time synchronization (using NTP)"
msgstr "自动时间同步(使用NTP)"
-#: ../../install_steps_interactive.pm_.c:980
+#: ../../install_steps_interactive.pm_.c:972
msgid "NTP Server"
msgstr "NTP 服务器"
+#: ../../install_steps_interactive.pm_.c:1006
#: ../../install_steps_interactive.pm_.c:1014
-#: ../../install_steps_interactive.pm_.c:1022
msgid "Remote CUPS server"
msgstr "远程 CUPS 服务器"
-#: ../../install_steps_interactive.pm_.c:1015
+#: ../../install_steps_interactive.pm_.c:1007
msgid "No printer"
msgstr "没有打印机"
-#: ../../install_steps_interactive.pm_.c:1032
+#: ../../install_steps_interactive.pm_.c:1024
#, fuzzy
msgid "Do you have an ISA sound card?"
msgstr "您有其他的吗 ?"
-#: ../../install_steps_interactive.pm_.c:1034
+#: ../../install_steps_interactive.pm_.c:1026
msgid "Run \"sndconfig\" after installation to configure your sound card"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1036
+#: ../../install_steps_interactive.pm_.c:1028
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1041 ../../steps.pm_.c:27
+#: ../../install_steps_interactive.pm_.c:1033 ../../steps.pm_.c:27
msgid "Summary"
msgstr "概要"
-#: ../../install_steps_interactive.pm_.c:1044
+#: ../../install_steps_interactive.pm_.c:1036
msgid "Mouse"
msgstr "鼠标"
-#: ../../install_steps_interactive.pm_.c:1046
+#: ../../install_steps_interactive.pm_.c:1038
msgid "Timezone"
msgstr "时区"
-#: ../../install_steps_interactive.pm_.c:1047 ../../printerdrake.pm_.c:2276
-#: ../../printerdrake.pm_.c:2354
+#: ../../install_steps_interactive.pm_.c:1039 ../../printerdrake.pm_.c:2347
+#: ../../printerdrake.pm_.c:2425
msgid "Printer"
msgstr "打印机"
-#: ../../install_steps_interactive.pm_.c:1049
+#: ../../install_steps_interactive.pm_.c:1041
msgid "ISDN card"
msgstr "内置 ISDN 卡"
-#: ../../install_steps_interactive.pm_.c:1052
-#: ../../install_steps_interactive.pm_.c:1054
+#: ../../install_steps_interactive.pm_.c:1044
+#: ../../install_steps_interactive.pm_.c:1046
msgid "Sound card"
msgstr "声卡"
-#: ../../install_steps_interactive.pm_.c:1056
+#: ../../install_steps_interactive.pm_.c:1048
msgid "TV card"
msgstr "TV 卡"
-#: ../../install_steps_interactive.pm_.c:1094
-#: ../../install_steps_interactive.pm_.c:1118
-#: ../../install_steps_interactive.pm_.c:1122
+#: ../../install_steps_interactive.pm_.c:1088
+#: ../../install_steps_interactive.pm_.c:1113
+#: ../../install_steps_interactive.pm_.c:1117
msgid "LDAP"
msgstr "LDAP"
-#: ../../install_steps_interactive.pm_.c:1095
-#: ../../install_steps_interactive.pm_.c:1118
-#: ../../install_steps_interactive.pm_.c:1131
+#: ../../install_steps_interactive.pm_.c:1089
+#: ../../install_steps_interactive.pm_.c:1113
+#: ../../install_steps_interactive.pm_.c:1126
msgid "NIS"
msgstr "使用NIS"
-#: ../../install_steps_interactive.pm_.c:1096
-#: ../../install_steps_interactive.pm_.c:1118
+#: ../../install_steps_interactive.pm_.c:1090
+#: ../../install_steps_interactive.pm_.c:1113
+#: ../../install_steps_interactive.pm_.c:1134
+#, fuzzy
+msgid "Windows PDC"
+msgstr "Windows(FAT32)"
+
+#: ../../install_steps_interactive.pm_.c:1091
+#: ../../install_steps_interactive.pm_.c:1113
msgid "Local files"
msgstr "本机文件"
-#: ../../install_steps_interactive.pm_.c:1105
-#: ../../install_steps_interactive.pm_.c:1106 ../../steps.pm_.c:24
+#: ../../install_steps_interactive.pm_.c:1100
+#: ../../install_steps_interactive.pm_.c:1101 ../../steps.pm_.c:24
msgid "Set root password"
msgstr "超级用户口令"
-#: ../../install_steps_interactive.pm_.c:1107
+#: ../../install_steps_interactive.pm_.c:1102
msgid "No password"
msgstr "没有口令"
-#: ../../install_steps_interactive.pm_.c:1112
+#: ../../install_steps_interactive.pm_.c:1107
#, c-format
-msgid "This password is too simple (must be at least %d characters long)"
+msgid "This password is too short (it must be at least %d characters long)"
msgstr "这个口令太简单了 (至少要有 %d 个字符)"
-#: ../../install_steps_interactive.pm_.c:1118 ../../network/modem.pm_.c:49
-#: ../../standalone/draknet_.c:626 ../../standalone/logdrake_.c:172
+#: ../../install_steps_interactive.pm_.c:1113 ../../network/modem.pm_.c:49
+#: ../../standalone/drakconnect_.c:626 ../../standalone/logdrake_.c:172
msgid "Authentication"
msgstr "认证"
-#: ../../install_steps_interactive.pm_.c:1126
+#: ../../install_steps_interactive.pm_.c:1121
msgid "Authentication LDAP"
msgstr "LDAP 认证"
-#: ../../install_steps_interactive.pm_.c:1127
+#: ../../install_steps_interactive.pm_.c:1122
msgid "LDAP Base dn"
msgstr "LDAP 基本目录名 dn"
-#: ../../install_steps_interactive.pm_.c:1128
+#: ../../install_steps_interactive.pm_.c:1123
msgid "LDAP Server"
msgstr "LDAP 服务器"
-#: ../../install_steps_interactive.pm_.c:1134
+#: ../../install_steps_interactive.pm_.c:1129
msgid "Authentication NIS"
msgstr "NIS 认证"
-#: ../../install_steps_interactive.pm_.c:1135
+#: ../../install_steps_interactive.pm_.c:1130
msgid "NIS Domain"
msgstr "NIS 网域"
-#: ../../install_steps_interactive.pm_.c:1136
+#: ../../install_steps_interactive.pm_.c:1131
msgid "NIS Server"
msgstr "NIS 服务器"
-#: ../../install_steps_interactive.pm_.c:1171
+#: ../../install_steps_interactive.pm_.c:1138
+#, fuzzy
+msgid "Authentication Windows PDC"
+msgstr "LDAP 认证"
+
+#: ../../install_steps_interactive.pm_.c:1139
+#, fuzzy
+msgid "Windows Domain"
+msgstr "引入 Windows 字库"
+
+#: ../../install_steps_interactive.pm_.c:1140
+#, fuzzy
+msgid "PDC Server Name"
+msgstr "NTP 服务器"
+
+#: ../../install_steps_interactive.pm_.c:1142
+msgid ""
+"For this to work for a W2K PDC, you will probably need to have the admin "
+"run: C:\\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /"
+"add and reboot the server"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:1176
msgid ""
"A custom bootdisk provides a way of booting into your Linux system without\n"
"depending on the normal bootloader. This is useful if you don't want to "
@@ -4866,19 +4999,19 @@ msgstr ""
"现在就给您的系统做一张开机软盘, 好吗? \n"
"在第一个软盘驱动器里放一片软盘, 然后按\"确定\""
-#: ../../install_steps_interactive.pm_.c:1187
+#: ../../install_steps_interactive.pm_.c:1192
msgid "First floppy drive"
msgstr "第一个软盘驱动器"
-#: ../../install_steps_interactive.pm_.c:1188
+#: ../../install_steps_interactive.pm_.c:1193
msgid "Second floppy drive"
msgstr "第二个软盘驱动器"
-#: ../../install_steps_interactive.pm_.c:1189 ../../printerdrake.pm_.c:1848
+#: ../../install_steps_interactive.pm_.c:1194 ../../printerdrake.pm_.c:1896
msgid "Skip"
msgstr "略过"
-#: ../../install_steps_interactive.pm_.c:1194
+#: ../../install_steps_interactive.pm_.c:1199
#, c-format
msgid ""
"A custom bootdisk provides a way of booting into your Linux system without\n"
@@ -4900,7 +5033,7 @@ msgstr ""
"现在就给您的系统做一张开机软盘, 好吗?\n"
"%s"
-#: ../../install_steps_interactive.pm_.c:1200
+#: ../../install_steps_interactive.pm_.c:1205
msgid ""
"\n"
"\n"
@@ -4909,28 +5042,28 @@ msgid ""
"because XFS needs a very large driver)."
msgstr ""
-#: ../../install_steps_interactive.pm_.c:1208
+#: ../../install_steps_interactive.pm_.c:1213
msgid "Sorry, no floppy drive available"
msgstr "抱歉,没有可用的软盘机"
-#: ../../install_steps_interactive.pm_.c:1212
+#: ../../install_steps_interactive.pm_.c:1217
msgid "Choose the floppy drive you want to use to make the bootdisk"
msgstr "选择您要制作开机软盘的软盘机"
-#: ../../install_steps_interactive.pm_.c:1216
+#: ../../install_steps_interactive.pm_.c:1221
#, c-format
msgid "Insert a floppy in %s"
msgstr "请插入一张软盘到驱动器 %s"
-#: ../../install_steps_interactive.pm_.c:1219
-msgid "Creating bootdisk"
+#: ../../install_steps_interactive.pm_.c:1224
+msgid "Creating bootdisk..."
msgstr "正在制作开机软盘"
-#: ../../install_steps_interactive.pm_.c:1226
-msgid "Preparing bootloader"
+#: ../../install_steps_interactive.pm_.c:1231
+msgid "Preparing bootloader..."
msgstr "准备开机引导程序"
-#: ../../install_steps_interactive.pm_.c:1237
+#: ../../install_steps_interactive.pm_.c:1242
msgid ""
"You appear to have an OldWorld or Unknown\n"
" machine, the yaboot bootloader will not work for you.\n"
@@ -4941,11 +5074,11 @@ msgstr ""
"yaboot无法开机启动.\n"
"安装继续, 你得使用BootX启动"
-#: ../../install_steps_interactive.pm_.c:1243
+#: ../../install_steps_interactive.pm_.c:1248
msgid "Do you want to use aboot?"
msgstr "您要使用 aboot 吗?"
-#: ../../install_steps_interactive.pm_.c:1246
+#: ../../install_steps_interactive.pm_.c:1251
msgid ""
"Error installing aboot, \n"
"try to force installation even if that destroys the first partition?"
@@ -4953,15 +5086,15 @@ msgstr ""
"安装 aboot 时出错, \n"
"强迫安装会毁坏第一个分区, 要继续吗?"
-#: ../../install_steps_interactive.pm_.c:1253
+#: ../../install_steps_interactive.pm_.c:1258
msgid "Installing bootloader"
msgstr "安装引导程序"
-#: ../../install_steps_interactive.pm_.c:1259
+#: ../../install_steps_interactive.pm_.c:1264
msgid "Installation of bootloader failed. The following error occured:"
msgstr "安装系统引导程序失败,出现下列错误:"
-#: ../../install_steps_interactive.pm_.c:1267
+#: ../../install_steps_interactive.pm_.c:1272
#, c-format
msgid ""
"You may need to change your Open Firmware boot-device to\n"
@@ -4977,18 +5110,17 @@ msgstr ""
" 然后输入: shut-down\n"
"你将在下次开机时看到引导程序提示."
-#: ../../install_steps_interactive.pm_.c:1311
+#: ../../install_steps_interactive.pm_.c:1306
#: ../../standalone/drakautoinst_.c:81
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "请在驱动器 %s 中插入一张空白软盘"
-#: ../../install_steps_interactive.pm_.c:1315
-#: ../../standalone/drakautoinst_.c:83
-msgid "Creating auto install floppy"
+#: ../../install_steps_interactive.pm_.c:1310
+msgid "Creating auto install floppy..."
msgstr "正在创建自动安装软盘"
-#: ../../install_steps_interactive.pm_.c:1326
+#: ../../install_steps_interactive.pm_.c:1321
msgid ""
"Some steps are not completed.\n"
"\n"
@@ -4998,7 +5130,8 @@ msgstr ""
"\n"
"您确信要现在退出吗?"
-#: ../../install_steps_interactive.pm_.c:1337
+#: ../../install_steps_interactive.pm_.c:1332
+#, c-format
msgid ""
"Congratulations, installation is complete.\n"
"Remove the boot media and press return to reboot.\n"
@@ -5009,7 +5142,7 @@ msgid ""
"consult the Errata available from:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/82errata.php3\n"
+"%s\n"
"\n"
"\n"
"Information on configuring your system is available in the post\n"
@@ -5023,16 +5156,20 @@ msgstr ""
"请访问我们的网站 \n"
"\n"
"\n"
-"http://www.linux-mandrake.com/en/82errata.php3\n"
+"%s\n"
"\n"
"\n"
"关于如何配置您的系统, 请查看 Mandrake Linux 用户手册."
-#: ../../install_steps_interactive.pm_.c:1354
+#: ../../install_steps_interactive.pm_.c:1345
+msgid "http://www.mandrakelinux.com/en/90errata.php3"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:1350
msgid "Generate auto install floppy"
msgstr "正在创建自动安装软盘"
-#: ../../install_steps_interactive.pm_.c:1356
+#: ../../install_steps_interactive.pm_.c:1352
msgid ""
"The auto install can be fully automated if wanted,\n"
"in that case it will take over the hard drive!!\n"
@@ -5041,15 +5178,15 @@ msgid ""
"You may prefer to replay the installation.\n"
msgstr "自动安装能全自动处理硬盘安装, 你可能愿意重现安装.\n"
-#: ../../install_steps_interactive.pm_.c:1361
+#: ../../install_steps_interactive.pm_.c:1357
msgid "Automated"
msgstr "自动"
-#: ../../install_steps_interactive.pm_.c:1361
+#: ../../install_steps_interactive.pm_.c:1357
msgid "Replay"
msgstr "重现"
-#: ../../install_steps_interactive.pm_.c:1364
+#: ../../install_steps_interactive.pm_.c:1360
msgid "Save packages selection"
msgstr "保存软件包选择"
@@ -5075,83 +5212,67 @@ msgstr ""
msgid "Choose a file"
msgstr "选择文件"
-#: ../../interactive.pm_.c:314
+#: ../../interactive.pm_.c:315
msgid "Advanced"
msgstr "高级"
-#: ../../interactive.pm_.c:315
+#: ../../interactive.pm_.c:316
msgid "Basic"
msgstr "基本"
-#: ../../interactive.pm_.c:386
-msgid "Please wait"
-msgstr "请稍候"
-
-#: ../../interactive_gtk.pm_.c:605 ../../services.pm_.c:222
-msgid "Info"
-msgstr "信息"
-
-#: ../../interactive_gtk.pm_.c:715
-msgid "Expand Tree"
-msgstr "展开分类树"
-
-#: ../../interactive_gtk.pm_.c:716
-msgid "Collapse Tree"
-msgstr "收缩分类树"
-
-#: ../../interactive_gtk.pm_.c:717
-msgid "Toggle between flat and group sorted"
-msgstr "切换平铺或分组排列"
-
-#: ../../interactive_stdio.pm_.c:29 ../../interactive_stdio.pm_.c:147
+#: ../../interactive/stdio.pm_.c:29 ../../interactive/stdio.pm_.c:147
msgid "Bad choice, try again\n"
msgstr "错误的选择,请重试\n"
-#: ../../interactive_stdio.pm_.c:30 ../../interactive_stdio.pm_.c:148
+#: ../../interactive/stdio.pm_.c:30 ../../interactive/stdio.pm_.c:148
#, c-format
msgid "Your choice? (default %s) "
msgstr "您的选择 ? (缺省 %s) "
-#: ../../interactive_stdio.pm_.c:52
+#: ../../interactive/stdio.pm_.c:52
#, c-format
msgid ""
"Entries you'll have to fill:\n"
"%s"
msgstr ""
-#: ../../interactive_stdio.pm_.c:68
+#: ../../interactive/stdio.pm_.c:68
#, c-format
msgid "Your choice? (0/1, default `%s') "
msgstr "您的选择 ? (0/1, 缺省 %s) "
-#: ../../interactive_stdio.pm_.c:93
+#: ../../interactive/stdio.pm_.c:93
#, c-format
msgid "Button `%s': %s"
msgstr "按钮: %s : %s"
#
-#: ../../interactive_stdio.pm_.c:94
-msgid "Do you want to click on this button? "
+#: ../../interactive/stdio.pm_.c:94
+msgid "Do you want to click on this button?"
msgstr "您希望点击此按钮吗?"
-#: ../../interactive_stdio.pm_.c:103
+#: ../../interactive/stdio.pm_.c:103
+msgid " enter `void' for void entry"
+msgstr ""
+
+#: ../../interactive/stdio.pm_.c:103
#, c-format
msgid "Your choice? (default `%s'%s) "
msgstr "您的选择 ? (缺省 `%s'%s) "
-#: ../../interactive_stdio.pm_.c:121
+#: ../../interactive/stdio.pm_.c:121
#, fuzzy, c-format
msgid "=> There are many things to choose from (%s).\n"
msgstr "=> 您可以从 (%s) 选择."
-#: ../../interactive_stdio.pm_.c:124
+#: ../../interactive/stdio.pm_.c:124
msgid ""
"Please choose the first number of the 10-range you wish to edit,\n"
"or just hit Enter to proceed.\n"
"Your choice? "
msgstr ""
-#: ../../interactive_stdio.pm_.c:137
+#: ../../interactive/stdio.pm_.c:137
#, c-format
msgid ""
"=> Notice, a label changed:\n"
@@ -5160,328 +5281,328 @@ msgstr ""
"=> 注意, 标签被更改:\n"
"%s"
-#: ../../interactive_stdio.pm_.c:144
+#: ../../interactive/stdio.pm_.c:144
msgid "Re-submit"
msgstr "重新提交"
-#: ../../keyboard.pm_.c:174 ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:165 ../../keyboard.pm_.c:196
msgid "Czech (QWERTZ)"
msgstr "捷克 (QWERTZ)"
-#: ../../keyboard.pm_.c:175 ../../keyboard.pm_.c:207
+#: ../../keyboard.pm_.c:166 ../../keyboard.pm_.c:198
msgid "German"
msgstr "德国"
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:167
msgid "Dvorak"
msgstr "Dvorak"
-#: ../../keyboard.pm_.c:177 ../../keyboard.pm_.c:214
+#: ../../keyboard.pm_.c:168 ../../keyboard.pm_.c:205
msgid "Spanish"
msgstr "西班牙"
-#: ../../keyboard.pm_.c:178 ../../keyboard.pm_.c:215
+#: ../../keyboard.pm_.c:169 ../../keyboard.pm_.c:206
msgid "Finnish"
msgstr "芬兰"
-#: ../../keyboard.pm_.c:179 ../../keyboard.pm_.c:216
+#: ../../keyboard.pm_.c:170 ../../keyboard.pm_.c:207
msgid "French"
msgstr "法国"
-#: ../../keyboard.pm_.c:180 ../../keyboard.pm_.c:241
+#: ../../keyboard.pm_.c:171 ../../keyboard.pm_.c:232
msgid "Norwegian"
msgstr "挪威"
-#: ../../keyboard.pm_.c:181
+#: ../../keyboard.pm_.c:172
msgid "Polish"
msgstr "波兰"
-#: ../../keyboard.pm_.c:182 ../../keyboard.pm_.c:249
+#: ../../keyboard.pm_.c:173 ../../keyboard.pm_.c:240
msgid "Russian"
msgstr "俄国"
-#: ../../keyboard.pm_.c:184 ../../keyboard.pm_.c:251
+#: ../../keyboard.pm_.c:175 ../../keyboard.pm_.c:242
msgid "Swedish"
msgstr "瑞典语"
-#: ../../keyboard.pm_.c:185 ../../keyboard.pm_.c:266
+#: ../../keyboard.pm_.c:176 ../../keyboard.pm_.c:257
msgid "UK keyboard"
msgstr "英国"
-#: ../../keyboard.pm_.c:186 ../../keyboard.pm_.c:267
+#: ../../keyboard.pm_.c:177 ../../keyboard.pm_.c:258
msgid "US keyboard"
msgstr "美国键盘"
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:179
msgid "Albanian"
msgstr "阿尔巴尼亚"
-#: ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:180
msgid "Armenian (old)"
msgstr "美国 (老式)"
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:181
msgid "Armenian (typewriter)"
msgstr "美国 (打字)"
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:182
msgid "Armenian (phonetic)"
msgstr "美国 (音标)"
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:187
msgid "Azerbaidjani (latin)"
msgstr "Azerbaidjani (latin)"
-#: ../../keyboard.pm_.c:198
+#: ../../keyboard.pm_.c:189
msgid "Belgian"
msgstr "比利时"
-#: ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:190
msgid "Bulgarian (phonetic)"
msgstr "保加利亚 (音标)"
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:191
msgid "Bulgarian (BDS)"
msgstr "保加利亚 (BDS)"
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:192
msgid "Brazilian (ABNT-2)"
msgstr "巴西 (ABNT-2)"
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:193
msgid "Belarusian"
msgstr "白俄罗斯"
-#: ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:194
msgid "Swiss (German layout)"
msgstr "瑞士 (德语布局)"
-#: ../../keyboard.pm_.c:204
+#: ../../keyboard.pm_.c:195
msgid "Swiss (French layout)"
msgstr "瑞士 (法语布局)"
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:197
msgid "Czech (QWERTY)"
msgstr "捷克 (QWERTY)"
-#: ../../keyboard.pm_.c:208
+#: ../../keyboard.pm_.c:199
msgid "German (no dead keys)"
msgstr "德国 (没有dead keys)"
-#: ../../keyboard.pm_.c:209
+#: ../../keyboard.pm_.c:200
msgid "Danish"
msgstr "丹麦"
-#: ../../keyboard.pm_.c:210
+#: ../../keyboard.pm_.c:201
msgid "Dvorak (US)"
msgstr "Dvorak (US)"
-#: ../../keyboard.pm_.c:211
+#: ../../keyboard.pm_.c:202
msgid "Dvorak (Norwegian)"
msgstr "Dvorak (Norwegian)"
-#: ../../keyboard.pm_.c:212
+#: ../../keyboard.pm_.c:203
msgid "Dvorak (Swedish)"
msgstr "Dvorak (Swedish)"
-#: ../../keyboard.pm_.c:213
+#: ../../keyboard.pm_.c:204
msgid "Estonian"
msgstr "埃斯托尼亚"
-#: ../../keyboard.pm_.c:217
+#: ../../keyboard.pm_.c:208
msgid "Georgian (\"Russian\" layout)"
msgstr "格鲁吉亚(\"俄语\"布局)"
-#: ../../keyboard.pm_.c:218
+#: ../../keyboard.pm_.c:209
msgid "Georgian (\"Latin\" layout)"
msgstr "格鲁吉亚(\"拉丁\" 布局)"
-#: ../../keyboard.pm_.c:219
+#: ../../keyboard.pm_.c:210
msgid "Greek"
msgstr "希腊"
-#: ../../keyboard.pm_.c:220
+#: ../../keyboard.pm_.c:211
msgid "Hungarian"
msgstr "匈牙利"
-#: ../../keyboard.pm_.c:221
+#: ../../keyboard.pm_.c:212
msgid "Croatian"
msgstr "克罗地亚"
-#: ../../keyboard.pm_.c:222
+#: ../../keyboard.pm_.c:213
msgid "Israeli"
msgstr "以色列"
-#: ../../keyboard.pm_.c:223
+#: ../../keyboard.pm_.c:214
msgid "Israeli (Phonetic)"
msgstr "以色列 (音标)"
-#: ../../keyboard.pm_.c:224
+#: ../../keyboard.pm_.c:215
msgid "Iranian"
msgstr "伊朗"
-#: ../../keyboard.pm_.c:225
+#: ../../keyboard.pm_.c:216
msgid "Icelandic"
msgstr "冰岛"
-#: ../../keyboard.pm_.c:226
+#: ../../keyboard.pm_.c:217
msgid "Italian"
msgstr "意大利"
-#: ../../keyboard.pm_.c:228
+#: ../../keyboard.pm_.c:219
msgid "Japanese 106 keys"
msgstr "日文106键盘"
-#: ../../keyboard.pm_.c:231
+#: ../../keyboard.pm_.c:222
msgid "Korean keyboard"
msgstr "韩国键盘"
-#: ../../keyboard.pm_.c:232
+#: ../../keyboard.pm_.c:223
msgid "Latin American"
msgstr "拉美键盘"
-#: ../../keyboard.pm_.c:233
+#: ../../keyboard.pm_.c:224
msgid "Lithuanian AZERTY (old)"
msgstr "立陶宛 AZERTY (老式)"
-#: ../../keyboard.pm_.c:235
+#: ../../keyboard.pm_.c:226
msgid "Lithuanian AZERTY (new)"
msgstr "立陶宛 AZERTY (新式)"
-#: ../../keyboard.pm_.c:236
+#: ../../keyboard.pm_.c:227
msgid "Lithuanian \"number row\" QWERTY"
msgstr "立陶宛 \"number row\" QWERTY"
-#: ../../keyboard.pm_.c:237
+#: ../../keyboard.pm_.c:228
msgid "Lithuanian \"phonetic\" QWERTY"
msgstr "立陶宛 \"phonetic\" QWERTY"
-#: ../../keyboard.pm_.c:238
+#: ../../keyboard.pm_.c:229
msgid "Latvian"
msgstr "拉脱维亚"
-#: ../../keyboard.pm_.c:239
+#: ../../keyboard.pm_.c:230
msgid "Macedonian"
msgstr "马其顿"
-#: ../../keyboard.pm_.c:240
+#: ../../keyboard.pm_.c:231
msgid "Dutch"
msgstr "荷兰"
-#: ../../keyboard.pm_.c:242
+#: ../../keyboard.pm_.c:233
msgid "Polish (qwerty layout)"
msgstr "波兰 (QWERTY 布局)"
-#: ../../keyboard.pm_.c:243
+#: ../../keyboard.pm_.c:234
msgid "Polish (qwertz layout)"
msgstr "波兰 (QWERTZ 布局)"
-#: ../../keyboard.pm_.c:244
+#: ../../keyboard.pm_.c:235
msgid "Portuguese"
msgstr "葡萄牙语"
-#: ../../keyboard.pm_.c:245
+#: ../../keyboard.pm_.c:236
msgid "Canadian (Quebec)"
msgstr "加拿大 (魁北克)"
-#: ../../keyboard.pm_.c:247
+#: ../../keyboard.pm_.c:238
msgid "Romanian (qwertz)"
msgstr "罗马尼亚 (QWERTZ 布局)"
-#: ../../keyboard.pm_.c:248
+#: ../../keyboard.pm_.c:239
msgid "Romanian (qwerty)"
msgstr "罗马尼亚 (QWERTY 布局)"
-#: ../../keyboard.pm_.c:250
+#: ../../keyboard.pm_.c:241
msgid "Russian (Yawerty)"
msgstr "俄语 (YAWERTY 布局)"
-#: ../../keyboard.pm_.c:252
+#: ../../keyboard.pm_.c:243
msgid "Slovenian"
msgstr "斯洛文尼亚"
-#: ../../keyboard.pm_.c:253
+#: ../../keyboard.pm_.c:244
msgid "Slovakian (QWERTZ)"
msgstr "斯洛伐克 (QWERTZ 布局)"
-#: ../../keyboard.pm_.c:254
+#: ../../keyboard.pm_.c:245
msgid "Slovakian (QWERTY)"
msgstr "斯洛伐克 (QWERTY 布局)"
-#: ../../keyboard.pm_.c:256
+#: ../../keyboard.pm_.c:247
msgid "Serbian (cyrillic)"
msgstr "赛尔维亚 (cyrillic)"
-#: ../../keyboard.pm_.c:258
+#: ../../keyboard.pm_.c:249
msgid "Tamil"
msgstr "坦米尔"
-#: ../../keyboard.pm_.c:259
+#: ../../keyboard.pm_.c:250
msgid "Thai keyboard"
msgstr "泰国键盘"
-#: ../../keyboard.pm_.c:261
+#: ../../keyboard.pm_.c:252
msgid "Tajik keyboard"
msgstr "泰国语"
-#: ../../keyboard.pm_.c:262
+#: ../../keyboard.pm_.c:253
msgid "Turkish (traditional \"F\" model)"
msgstr "土耳其 (传统 \"F\" 式)"
-#: ../../keyboard.pm_.c:263
+#: ../../keyboard.pm_.c:254
msgid "Turkish (modern \"Q\" model)"
msgstr "土耳其 (现代 \"Q\" 式)"
-#: ../../keyboard.pm_.c:265
+#: ../../keyboard.pm_.c:256
msgid "Ukrainian"
msgstr "乌克兰"
-#: ../../keyboard.pm_.c:268
+#: ../../keyboard.pm_.c:259
msgid "US keyboard (international)"
msgstr "美式键盘 (国际)"
-#: ../../keyboard.pm_.c:269
+#: ../../keyboard.pm_.c:260
msgid "Vietnamese \"numeric row\" QWERTY"
msgstr "越南键盘 \"number row\" QWERTY"
-#: ../../keyboard.pm_.c:270
+#: ../../keyboard.pm_.c:261
msgid "Yugoslavian (latin)"
msgstr "南斯拉夫 (拉丁)"
-#: ../../keyboard.pm_.c:278
+#: ../../keyboard.pm_.c:269
msgid "Right Alt key"
msgstr ""
-#: ../../keyboard.pm_.c:279
+#: ../../keyboard.pm_.c:270
msgid "Both Shift keys simultaneously"
msgstr ""
-#: ../../keyboard.pm_.c:280
+#: ../../keyboard.pm_.c:271
msgid "Control and Shift keys simultaneously"
msgstr ""
-#: ../../keyboard.pm_.c:281
+#: ../../keyboard.pm_.c:272
msgid "CapsLock key"
msgstr ""
-#: ../../keyboard.pm_.c:282
+#: ../../keyboard.pm_.c:273
msgid "Ctrl and Alt keys simultaneously"
msgstr ""
-#: ../../keyboard.pm_.c:283
+#: ../../keyboard.pm_.c:274
msgid "Alt and Shift keys simultaneously"
msgstr ""
-#: ../../keyboard.pm_.c:284
+#: ../../keyboard.pm_.c:275
msgid "\"Menu\" key"
msgstr ""
-#: ../../keyboard.pm_.c:285
+#: ../../keyboard.pm_.c:276
#, fuzzy
msgid "Left \"Windows\" key"
msgstr "引入 Windows 字库"
-#: ../../keyboard.pm_.c:286
+#: ../../keyboard.pm_.c:277
msgid "Right \"Windows\" key"
msgstr ""
@@ -5494,7 +5615,31 @@ msgstr "循环装载 %s\n"
msgid "Remove the logical volumes first\n"
msgstr "先拆卸逻辑卷\n"
-#: ../../modules.pm_.c:826
+#: ../../modparm.pm_.c:51
+#, fuzzy
+msgid "a number"
+msgstr "电话号码"
+
+#: ../../modparm.pm_.c:53
+#, c-format
+msgid "%d comma separated numbers"
+msgstr ""
+
+#: ../../modparm.pm_.c:53
+#, c-format
+msgid "%d comma separated strings"
+msgstr ""
+
+#: ../../modparm.pm_.c:55
+msgid "comma separated numbers"
+msgstr ""
+
+#: ../../modparm.pm_.c:55
+#, fuzzy
+msgid "comma separated strings"
+msgstr "格式化硬盘分区"
+
+#: ../../modules.pm_.c:283
msgid ""
"PCMCIA support no longer exist for 2.2 kernels. Please use a 2.4 kernel."
msgstr "2.2 的内核不支持 PCMCIA 设备, 请使用 2.4 的内核."
@@ -5535,10 +5680,6 @@ msgstr "单 键"
msgid "Generic 2 Button Mouse"
msgstr "普通 2 键鼠标"
-#: ../../mouse.pm_.c:45
-msgid "Generic"
-msgstr "普通"
-
#: ../../mouse.pm_.c:46
msgid "Wheel"
msgstr "滚轮"
@@ -5603,38 +5744,54 @@ msgstr "没有"
msgid "No mouse"
msgstr "没有鼠标"
-#: ../../mouse.pm_.c:499
+#: ../../mouse.pm_.c:447
msgid "Please test the mouse"
msgstr "请测试您的鼠标."
-#: ../../mouse.pm_.c:500
+#: ../../mouse.pm_.c:448
msgid "To activate the mouse,"
msgstr "要激活鼠标,"
-#: ../../mouse.pm_.c:501
+#: ../../mouse.pm_.c:449
msgid "MOVE YOUR WHEEL!"
msgstr "转动滚轮!"
-#: ../../my_gtk.pm_.c:651
+#: ../../my_gtk.pm_.c:688
msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../../my_gtk.pm_.c:686
+#: ../../my_gtk.pm_.c:723
msgid "Finish"
msgstr "完成"
-#: ../../my_gtk.pm_.c:686 ../../printerdrake.pm_.c:1588
+#: ../../my_gtk.pm_.c:723 ../../printerdrake.pm_.c:1612
msgid "Next ->"
msgstr "下一步 ->"
-#: ../../my_gtk.pm_.c:687 ../../printerdrake.pm_.c:1586
+#: ../../my_gtk.pm_.c:724 ../../printerdrake.pm_.c:1610
msgid "<- Previous"
msgstr "<-前一步"
-#: ../../my_gtk.pm_.c:1019
+#: ../../my_gtk.pm_.c:1056
msgid "Is this correct?"
msgstr "这样正确吗?"
+#: ../../my_gtk.pm_.c:1120 ../../services.pm_.c:222
+msgid "Info"
+msgstr "信息"
+
+#: ../../my_gtk.pm_.c:1141
+msgid "Expand Tree"
+msgstr "展开分类树"
+
+#: ../../my_gtk.pm_.c:1142
+msgid "Collapse Tree"
+msgstr "收缩分类树"
+
+#: ../../my_gtk.pm_.c:1143
+msgid "Toggle between flat and group sorted"
+msgstr "切换平铺或分组排列"
+
#: ../../network/adsl.pm_.c:19 ../../network/ethernet.pm_.c:36
msgid "Connect to the Internet"
msgstr "连接到互联网"
@@ -5681,7 +5838,7 @@ msgstr ""
"没有在您的系统里发现以太网卡. \n"
"无法设置这个连接类型."
-#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:252
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:249
msgid "Choose the network interface"
msgstr "选择网络接口"
@@ -5694,7 +5851,7 @@ msgstr "请选择用哪个网卡连接互联网."
msgid "no network card found"
msgstr "找不到网络卡"
-#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:360
+#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:364
msgid "Configuring network"
msgstr "正在配置网络"
@@ -5710,15 +5867,15 @@ msgstr ""
"您的主机名称必需是个完全限定主机名字,\n"
"例如 ``mybox.mylab.myco.com''"
-#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:365
+#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:369
msgid "Host name"
msgstr "主机名字"
#: ../../network/isdn.pm_.c:21 ../../network/isdn.pm_.c:44
-#: ../../network/netconnect.pm_.c:95 ../../network/netconnect.pm_.c:109
-#: ../../network/netconnect.pm_.c:164 ../../network/netconnect.pm_.c:175
-#: ../../network/netconnect.pm_.c:202 ../../network/netconnect.pm_.c:225
-#: ../../network/netconnect.pm_.c:233
+#: ../../network/netconnect.pm_.c:94 ../../network/netconnect.pm_.c:108
+#: ../../network/netconnect.pm_.c:163 ../../network/netconnect.pm_.c:178
+#: ../../network/netconnect.pm_.c:205 ../../network/netconnect.pm_.c:228
+#: ../../network/netconnect.pm_.c:236
msgid "Network Configuration Wizard"
msgstr "网络配置"
@@ -5769,7 +5926,7 @@ msgstr "ISDN 配置"
#: ../../network/isdn.pm_.c:170
msgid ""
"Select your provider.\n"
-" If it's not in the list, choose Unlisted"
+"If it isn't listed, choose Unlisted."
msgstr ""
"挑选您的提供商. \n"
"如果它不在列表里, 选择 Unlisted"
@@ -5788,14 +5945,14 @@ msgstr "其他地区协议"
#: ../../network/isdn.pm_.c:185
msgid ""
-"Protocol for the rest of the world \n"
-" no D-Channel (leased lines)"
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
msgstr ""
"其他地区 \n"
" 没有 D-信道(专线)"
#: ../../network/isdn.pm_.c:189
-msgid "Which protocol do you want to use ?"
+msgid "Which protocol do you want to use?"
msgstr "您将使用哪种协议?"
#: ../../network/isdn.pm_.c:199
@@ -5819,7 +5976,8 @@ msgid ""
"\n"
"If you have an ISA card, the values on the next screen should be right.\n"
"\n"
-"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+"If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your "
+"card.\n"
msgstr ""
"\n"
"如果您的卡是 ISA 卡, 下一屏幕显示的值应该是正确的.\n"
@@ -5835,13 +5993,13 @@ msgid "Continue"
msgstr "继续"
#: ../../network/isdn.pm_.c:216
-msgid "Which is your ISDN card ?"
+msgid "Which is your ISDN card?"
msgstr "您的 ISDN 卡是哪个?"
#: ../../network/isdn.pm_.c:235
msgid ""
-"I have detected an ISDN PCI Card, but I don't know the type. Please select "
-"one PCI card on the next screen."
+"I have detected an ISDN PCI card, but I don't know its type. Please select a "
+"PCI card on the next screen."
msgstr ""
"我探测到一块 ISDN PCI 卡, 不过无法识别它的型号. 请在下一屏幕里\n"
"选择您的 PCI 卡"
@@ -5858,47 +6016,47 @@ msgstr "请问您的调制解调器是连接到那个串行端口?"
msgid "Dialup options"
msgstr "拨号接入选项"
-#: ../../network/modem.pm_.c:45 ../../standalone/draknet_.c:622
+#: ../../network/modem.pm_.c:45 ../../standalone/drakconnect_.c:622
msgid "Connection name"
msgstr "连接名称"
-#: ../../network/modem.pm_.c:46 ../../standalone/draknet_.c:623
+#: ../../network/modem.pm_.c:46 ../../standalone/drakconnect_.c:623
msgid "Phone number"
msgstr "电话号码"
-#: ../../network/modem.pm_.c:47 ../../standalone/draknet_.c:624
+#: ../../network/modem.pm_.c:47 ../../standalone/drakconnect_.c:624
msgid "Login ID"
msgstr "登录帐号"
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:626
+#: ../../network/modem.pm_.c:49 ../../standalone/drakconnect_.c:626
msgid "CHAP"
msgstr "CHAP"
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:626
+#: ../../network/modem.pm_.c:49 ../../standalone/drakconnect_.c:626
msgid "PAP"
msgstr "PAP"
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:626
+#: ../../network/modem.pm_.c:49 ../../standalone/drakconnect_.c:626
msgid "Script-based"
msgstr "基于脚本登录"
-#: ../../network/modem.pm_.c:49 ../../standalone/draknet_.c:626
+#: ../../network/modem.pm_.c:49 ../../standalone/drakconnect_.c:626
msgid "Terminal-based"
msgstr "终端方式登录"
-#: ../../network/modem.pm_.c:50 ../../standalone/draknet_.c:627
+#: ../../network/modem.pm_.c:50 ../../standalone/drakconnect_.c:627
msgid "Domain name"
msgstr "网域名称"
-#: ../../network/modem.pm_.c:51 ../../standalone/draknet_.c:628
+#: ../../network/modem.pm_.c:51 ../../standalone/drakconnect_.c:628
msgid "First DNS Server (optional)"
msgstr "首选 DNS 服务器"
-#: ../../network/modem.pm_.c:52 ../../standalone/draknet_.c:629
+#: ../../network/modem.pm_.c:52 ../../standalone/drakconnect_.c:629
msgid "Second DNS Server (optional)"
msgstr "第二个 备选DNS 服务器"
-#: ../../network/netconnect.pm_.c:34
+#: ../../network/netconnect.pm_.c:33
msgid ""
"\n"
"You can disconnect or reconfigure your connection."
@@ -5906,7 +6064,7 @@ msgstr ""
"\n"
"您可以切断到互联网的连接,或重新配置网络连接"
-#: ../../network/netconnect.pm_.c:34 ../../network/netconnect.pm_.c:37
+#: ../../network/netconnect.pm_.c:33 ../../network/netconnect.pm_.c:36
msgid ""
"\n"
"You can reconfigure your connection."
@@ -5914,11 +6072,11 @@ msgstr ""
"\n"
"您可以重新配置互联网连接"
-#: ../../network/netconnect.pm_.c:34
+#: ../../network/netconnect.pm_.c:33
msgid "You are currently connected to internet."
msgstr "您现在正连接到互联网"
-#: ../../network/netconnect.pm_.c:37
+#: ../../network/netconnect.pm_.c:36
msgid ""
"\n"
"You can connect to Internet or reconfigure your connection."
@@ -5926,35 +6084,35 @@ msgstr ""
"\n"
"连接到互联网, 或重新配置网络连接"
-#: ../../network/netconnect.pm_.c:37
+#: ../../network/netconnect.pm_.c:36
msgid "You are not currently connected to Internet."
msgstr "您现在没有连接到互联网"
-#: ../../network/netconnect.pm_.c:41
+#: ../../network/netconnect.pm_.c:40
#, fuzzy
msgid "Connect"
msgstr "连接"
-#: ../../network/netconnect.pm_.c:43
+#: ../../network/netconnect.pm_.c:42
#, fuzzy
msgid "Disconnect"
msgstr "断开..."
-#: ../../network/netconnect.pm_.c:45
+#: ../../network/netconnect.pm_.c:44
#, fuzzy
msgid "Configure the connection"
msgstr "正在配置网络"
-#: ../../network/netconnect.pm_.c:50
+#: ../../network/netconnect.pm_.c:49
msgid "Internet connection & configuration"
msgstr "互联网连接和配置"
-#: ../../network/netconnect.pm_.c:100
+#: ../../network/netconnect.pm_.c:99
#, c-format
msgid "We are now going to configure the %s connection."
msgstr "现在配置%s网络连接."
-#: ../../network/netconnect.pm_.c:109
+#: ../../network/netconnect.pm_.c:108
#, c-format
msgid ""
"\n"
@@ -5973,12 +6131,12 @@ msgstr ""
"\n"
"按 完成 继续."
-#: ../../network/netconnect.pm_.c:138 ../../network/netconnect.pm_.c:252
-#: ../../network/netconnect.pm_.c:271 ../../network/tools.pm_.c:57
+#: ../../network/netconnect.pm_.c:137 ../../network/netconnect.pm_.c:255
+#: ../../network/netconnect.pm_.c:275 ../../network/tools.pm_.c:63
msgid "Network Configuration"
msgstr "网络配置"
-#: ../../network/netconnect.pm_.c:139
+#: ../../network/netconnect.pm_.c:138
msgid ""
"Because you are doing a network installation, your network is already "
"configured.\n"
@@ -5988,9 +6146,9 @@ msgstr ""
"你正在安装网络,你的网络已经配置好.\n"
"点击 确定 保存配置, 或 取消 重新配置网络.\n"
-#: ../../network/netconnect.pm_.c:165
+#: ../../network/netconnect.pm_.c:164
msgid ""
-"Welcome to The Network Configuration Wizard\n"
+"Welcome to The Network Configuration Wizard.\n"
"\n"
"We are about to configure your internet/network connection.\n"
"If you don't want to use the auto detection, deselect the checkbox.\n"
@@ -6000,66 +6158,72 @@ msgstr ""
"配置internet/网络连接.\n"
"如果你不想自动检测, 不选 检验盒.\n"
-#: ../../network/netconnect.pm_.c:167
+#: ../../network/netconnect.pm_.c:170
msgid "Choose the profile to configure"
msgstr "选择要配置的profile"
-#: ../../network/netconnect.pm_.c:168
+#: ../../network/netconnect.pm_.c:171
msgid "Use auto detection"
msgstr "使用自动检测"
-#: ../../network/netconnect.pm_.c:175
+#: ../../network/netconnect.pm_.c:172 ../../printerdrake.pm_.c:2541
+#: ../../standalone/drakconnect_.c:275 ../../standalone/drakconnect_.c:278
+#: ../../standalone/drakfloppy_.c:146
+msgid "Expert Mode"
+msgstr "专家模式"
+
+#: ../../network/netconnect.pm_.c:178 ../../printerdrake.pm_.c:231
msgid "Detecting devices..."
msgstr "正在探测设备..."
-#: ../../network/netconnect.pm_.c:186 ../../network/netconnect.pm_.c:195
+#: ../../network/netconnect.pm_.c:189 ../../network/netconnect.pm_.c:198
msgid "Normal modem connection"
msgstr "配置普通调制解调器连接"
-#: ../../network/netconnect.pm_.c:186 ../../network/netconnect.pm_.c:195
+#: ../../network/netconnect.pm_.c:189 ../../network/netconnect.pm_.c:198
#, c-format
msgid "detected on port %s"
msgstr "检测串口 %s"
-#: ../../network/netconnect.pm_.c:187 ../../network/netconnect.pm_.c:196
+#: ../../network/netconnect.pm_.c:190 ../../network/netconnect.pm_.c:199
msgid "ISDN connection"
msgstr "配置 ISDN 连接"
-#: ../../network/netconnect.pm_.c:187 ../../network/netconnect.pm_.c:196
+#: ../../network/netconnect.pm_.c:190 ../../network/netconnect.pm_.c:199
#, c-format
msgid "detected %s"
msgstr "检测 %s"
-#: ../../network/netconnect.pm_.c:188 ../../network/netconnect.pm_.c:197
+#: ../../network/netconnect.pm_.c:191 ../../network/netconnect.pm_.c:200
msgid "ADSL connection"
msgstr "ADSL连接"
-#: ../../network/netconnect.pm_.c:188 ../../network/netconnect.pm_.c:197
+#: ../../network/netconnect.pm_.c:191 ../../network/netconnect.pm_.c:200
#, c-format
msgid "detected on interface %s"
msgstr "网络接口卡 %s"
-#: ../../network/netconnect.pm_.c:189 ../../network/netconnect.pm_.c:198
+#: ../../network/netconnect.pm_.c:192 ../../network/netconnect.pm_.c:201
msgid "Cable connection"
msgstr "配置有线电缆连接"
-#: ../../network/netconnect.pm_.c:189 ../../network/netconnect.pm_.c:198
+#: ../../network/netconnect.pm_.c:192 ../../network/netconnect.pm_.c:201
msgid "cable connection detected"
msgstr "检测到有线电缆连接"
-#: ../../network/netconnect.pm_.c:190 ../../network/netconnect.pm_.c:199
+#: ../../network/netconnect.pm_.c:193 ../../network/netconnect.pm_.c:202
msgid "LAN connection"
msgstr "配置局域网连接"
-#: ../../network/netconnect.pm_.c:190 ../../network/netconnect.pm_.c:199
+#: ../../network/netconnect.pm_.c:193 ../../network/netconnect.pm_.c:202
msgid "ethernet card(s) detected"
msgstr "检测到网卡"
-#: ../../network/netconnect.pm_.c:202
+#: ../../network/netconnect.pm_.c:205
msgid "Choose the connection you want to configure"
msgstr "选择您想要配置的连接"
-#: ../../network/netconnect.pm_.c:226
+#: ../../network/netconnect.pm_.c:229
msgid ""
"You have configured multiple ways to connect to the Internet.\n"
"Choose the one you want to use.\n"
@@ -6069,23 +6233,23 @@ msgstr ""
"选择你要使用的一种.\n"
"\n"
-#: ../../network/netconnect.pm_.c:227
+#: ../../network/netconnect.pm_.c:230
msgid "Internet connection"
msgstr "共享互联网连接"
-#: ../../network/netconnect.pm_.c:233
+#: ../../network/netconnect.pm_.c:236
msgid "Do you want to start the connection at boot?"
msgstr "您是否希望一开机就启动连接?"
-#: ../../network/netconnect.pm_.c:247
+#: ../../network/netconnect.pm_.c:250
msgid "Network configuration"
msgstr "网络配置"
-#: ../../network/netconnect.pm_.c:248
+#: ../../network/netconnect.pm_.c:251
msgid "The network needs to be restarted"
msgstr "网络需要重新启动"
-#: ../../network/netconnect.pm_.c:252
+#: ../../network/netconnect.pm_.c:255
#, c-format
msgid ""
"A problem occured while restarting the network: \n"
@@ -6096,29 +6260,29 @@ msgstr ""
"\n"
"%s"
-#: ../../network/netconnect.pm_.c:261
+#: ../../network/netconnect.pm_.c:265
msgid ""
"Congratulations, the network and Internet configuration is finished.\n"
"The configuration will now be applied to your system.\n"
"\n"
msgstr "祝贺,网络和internet配置完成.\n"
-#: ../../network/netconnect.pm_.c:265
+#: ../../network/netconnect.pm_.c:269
msgid ""
"After this is done, we recommend that you restart your X environment to "
"avoid any hostname-related problems."
msgstr "建议重启动X"
-#: ../../network/netconnect.pm_.c:266
+#: ../../network/netconnect.pm_.c:270
msgid ""
"Problems occured during configuration.\n"
"Test your connection via net_monitor or mcc. If your connection doesn't "
-"work, you might want to relaunch the configuration"
+"work, you might want to relaunch the configuration."
msgstr ""
-#: ../../network/network.pm_.c:292
+#: ../../network/network.pm_.c:293
msgid ""
-"WARNING: This device has been previously configured to connect to the "
+"WARNING: this device has been previously configured to connect to the "
"Internet.\n"
"Simply accept to keep this device configured.\n"
"Modifying the fields below will override this configuration."
@@ -6127,7 +6291,7 @@ msgstr ""
"要保留现有的配置只要选择 确定.\n"
"修改以下的项目将覆盖原有的设定.."
-#: ../../network/network.pm_.c:297
+#: ../../network/network.pm_.c:298
msgid ""
"Please enter the IP configuration for this machine.\n"
"Each item should be entered as an IP address in dotted-decimal\n"
@@ -6137,38 +6301,43 @@ msgstr ""
"下列项目要求输入以句点分隔十进制格式表示的 IP 地址.\n"
" (例如 192.168.1.1) "
-#: ../../network/network.pm_.c:306 ../../network/network.pm_.c:307
+#: ../../network/network.pm_.c:308 ../../network/network.pm_.c:309
#, c-format
msgid "Configuring network device %s"
msgstr "正在配置网络设备 %s"
-#: ../../network/network.pm_.c:307
+#: ../../network/network.pm_.c:309
#, c-format
msgid " (driver %s)"
msgstr "(驱动 %s)"
-#: ../../network/network.pm_.c:309 ../../standalone/draknet_.c:232
-#: ../../standalone/draknet_.c:468
+#: ../../network/network.pm_.c:311 ../../standalone/drakconnect_.c:232
+#: ../../standalone/drakconnect_.c:468
msgid "IP address"
msgstr "IP 地址"
-#: ../../network/network.pm_.c:310 ../../standalone/draknet_.c:469
+#: ../../network/network.pm_.c:312 ../../standalone/drakconnect_.c:469
msgid "Netmask"
msgstr "子网掩码:"
-#: ../../network/network.pm_.c:311
+#: ../../network/network.pm_.c:313
msgid "(bootp/dhcp)"
msgstr "(bootp/dhcp)"
-#: ../../network/network.pm_.c:311
+#: ../../network/network.pm_.c:313
msgid "Automatic IP"
msgstr "自动设置 IP"
-#: ../../network/network.pm_.c:332 ../../printerdrake.pm_.c:712
+#: ../../network/network.pm_.c:314
+#, fuzzy
+msgid "Start at boot"
+msgstr "开机时启动"
+
+#: ../../network/network.pm_.c:335 ../../printerdrake.pm_.c:736
msgid "IP address should be in format 1.2.3.4"
msgstr "IP 地址的格式应该是 1.2.3.4"
-#: ../../network/network.pm_.c:361
+#: ../../network/network.pm_.c:365
msgid ""
"Please enter your host name.\n"
"Your host name should be a fully-qualified host name,\n"
@@ -6179,64 +6348,64 @@ msgstr ""
"您的主机名称必需是个完全限定的名称,例如 ``mybox.mylab.myco.com''\n"
"如果您有网关的话,也请输入其 IP 地址"
-#: ../../network/network.pm_.c:366
+#: ../../network/network.pm_.c:370
msgid "DNS server"
msgstr "DNS 服务器"
-#: ../../network/network.pm_.c:367
+#: ../../network/network.pm_.c:371
#, c-format
msgid "Gateway (e.g. %s)"
msgstr ""
-#: ../../network/network.pm_.c:369
+#: ../../network/network.pm_.c:373
msgid "Gateway device"
msgstr "网关设备"
-#: ../../network/network.pm_.c:381
+#: ../../network/network.pm_.c:385
msgid "Proxies configuration"
msgstr "代理服务器配置"
-#: ../../network/network.pm_.c:382
+#: ../../network/network.pm_.c:386
msgid "HTTP proxy"
msgstr "HTTP 代理服务器"
-#: ../../network/network.pm_.c:383
+#: ../../network/network.pm_.c:387
msgid "FTP proxy"
msgstr "FTP 代理服务器"
-#: ../../network/network.pm_.c:384
-msgid "Track network card id (usefull for laptops)"
+#: ../../network/network.pm_.c:388
+msgid "Track network card id (useful for laptops)"
msgstr "记录网卡标志"
-#: ../../network/network.pm_.c:387
+#: ../../network/network.pm_.c:391
msgid "Proxy should be http://..."
msgstr "代理服务器应该是象 http://..."
-#: ../../network/network.pm_.c:388
+#: ../../network/network.pm_.c:392
msgid "Proxy should be ftp://..."
msgstr "代理服务器应该是象 ftp://..."
-#: ../../network/tools.pm_.c:39
+#: ../../network/tools.pm_.c:41
msgid "Internet configuration"
msgstr "互联网设定"
-#: ../../network/tools.pm_.c:40
+#: ../../network/tools.pm_.c:42
msgid "Do you want to try to connect to the Internet now?"
msgstr "您想要测试连接到互联网吗?"
-#: ../../network/tools.pm_.c:44 ../../standalone/draknet_.c:197
+#: ../../network/tools.pm_.c:46 ../../standalone/drakconnect_.c:197
msgid "Testing your connection..."
msgstr "正在测试连接..."
-#: ../../network/tools.pm_.c:50
+#: ../../network/tools.pm_.c:56
msgid "The system is now connected to Internet."
msgstr "您现在正连接到互联网"
-#: ../../network/tools.pm_.c:51
-msgid "For Security reason, it will be disconnected now."
+#: ../../network/tools.pm_.c:57
+msgid "For security reason, it will be disconnected now."
msgstr "为了安全, 断开联接"
-#: ../../network/tools.pm_.c:52
+#: ../../network/tools.pm_.c:58
msgid ""
"The system doesn't seem to be connected to internet.\n"
"Try to reconfigure your connection."
@@ -6244,110 +6413,115 @@ msgstr ""
"系统没有连接到互联网.\n"
"请重新尝试配置您的连接."
-#: ../../network/tools.pm_.c:76
+#: ../../network/tools.pm_.c:82
msgid "Connection Configuration"
msgstr "连接配置"
-#: ../../network/tools.pm_.c:77
+#: ../../network/tools.pm_.c:83
msgid "Please fill or check the field below"
msgstr "请填写或选择下列项目"
-#: ../../network/tools.pm_.c:79 ../../standalone/draknet_.c:608
+#: ../../network/tools.pm_.c:85 ../../standalone/drakconnect_.c:608
msgid "Card IRQ"
msgstr "网卡的 IRQ中断"
-#: ../../network/tools.pm_.c:80 ../../standalone/draknet_.c:609
+#: ../../network/tools.pm_.c:86 ../../standalone/drakconnect_.c:609
msgid "Card mem (DMA)"
msgstr "Card mem (DMA)"
-#: ../../network/tools.pm_.c:81 ../../standalone/draknet_.c:610
+#: ../../network/tools.pm_.c:87 ../../standalone/drakconnect_.c:610
msgid "Card IO"
msgstr "Card IO"
-#: ../../network/tools.pm_.c:82 ../../standalone/draknet_.c:611
+#: ../../network/tools.pm_.c:88 ../../standalone/drakconnect_.c:611
msgid "Card IO_0"
msgstr "Card IO_0"
-#: ../../network/tools.pm_.c:83 ../../standalone/draknet_.c:612
+#: ../../network/tools.pm_.c:89 ../../standalone/drakconnect_.c:612
msgid "Card IO_1"
msgstr "Card IO_1"
-#: ../../network/tools.pm_.c:84 ../../standalone/draknet_.c:613
+#: ../../network/tools.pm_.c:90 ../../standalone/drakconnect_.c:613
msgid "Your personal phone number"
msgstr "您自己的电话号码"
-#: ../../network/tools.pm_.c:85 ../../standalone/draknet_.c:614
+#: ../../network/tools.pm_.c:91 ../../standalone/drakconnect_.c:614
msgid "Provider name (ex provider.net)"
msgstr "服务商名称 (如 provider.net)"
-#: ../../network/tools.pm_.c:86 ../../standalone/draknet_.c:615
+#: ../../network/tools.pm_.c:92 ../../standalone/drakconnect_.c:615
msgid "Provider phone number"
msgstr "服务商电话号码"
-#: ../../network/tools.pm_.c:87 ../../standalone/draknet_.c:616
+#: ../../network/tools.pm_.c:93 ../../standalone/drakconnect_.c:616
msgid "Provider dns 1 (optional)"
msgstr "服务商 dns 1"
-#: ../../network/tools.pm_.c:88 ../../standalone/draknet_.c:617
+#: ../../network/tools.pm_.c:94 ../../standalone/drakconnect_.c:617
msgid "Provider dns 2 (optional)"
msgstr "服务商 dns 2"
-#: ../../network/tools.pm_.c:89
+#: ../../network/tools.pm_.c:95
msgid "Choose your country"
msgstr "选择国家"
-#: ../../network/tools.pm_.c:90 ../../standalone/draknet_.c:620
+#: ../../network/tools.pm_.c:96 ../../standalone/drakconnect_.c:620
msgid "Dialing mode"
msgstr "拨号模式"
-#: ../../network/tools.pm_.c:91 ../../standalone/draknet_.c:632
+#: ../../network/tools.pm_.c:97 ../../standalone/drakconnect_.c:632
msgid "Connection speed"
msgstr "连接速率"
-#: ../../network/tools.pm_.c:92 ../../standalone/draknet_.c:633
+#: ../../network/tools.pm_.c:98 ../../standalone/drakconnect_.c:633
msgid "Connection timeout (in sec)"
msgstr "连接超时(秒)"
-#: ../../network/tools.pm_.c:93 ../../standalone/draknet_.c:618
+#: ../../network/tools.pm_.c:99 ../../standalone/drakconnect_.c:618
msgid "Account Login (user name)"
msgstr "帐户名称"
-#: ../../network/tools.pm_.c:94 ../../standalone/draknet_.c:619
+#: ../../network/tools.pm_.c:100 ../../standalone/drakconnect_.c:619
+#: ../../standalone/drakconnect_.c:650
msgid "Account Password"
msgstr "帐户口令"
-#: ../../partition_table.pm_.c:600
+#: ../../network/tools.pm_.c:118
+msgid "United Kingdom"
+msgstr ""
+
+#: ../../partition_table.pm_.c:606
msgid "mount failed: "
msgstr "装载失败: "
-#: ../../partition_table.pm_.c:664
+#: ../../partition_table.pm_.c:670
msgid "Extended partition not supported on this platform"
msgstr "这个平台上不支持扩展分区"
-#: ../../partition_table.pm_.c:682
+#: ../../partition_table.pm_.c:688
msgid ""
"You have a hole in your partition table but I can't use it.\n"
"The only solution is to move your primary partitions to have the hole next "
-"to the extended partitions"
+"to the extended partitions."
msgstr ""
"分区表里有一段是空的, 可是我没法使用它.\n"
"唯一的办法是移动您的主分区, 把空闲部分换到与扩展分区相邻的位置."
-#: ../../partition_table.pm_.c:770
+#: ../../partition_table.pm_.c:778
#, c-format
msgid "Restoring from file %s failed: %s"
msgstr "从文件 %s 恢复失败: %s"
-#: ../../partition_table.pm_.c:772
+#: ../../partition_table.pm_.c:780
msgid "Bad backup file"
msgstr "错误的备份文件"
-#: ../../partition_table.pm_.c:794
+#: ../../partition_table.pm_.c:802
#, c-format
msgid "Error writing to file %s"
msgstr "写入文件 %s 失败"
-#: ../../partition_table_raw.pm_.c:186
+#: ../../partition_table/raw.pm_.c:186
msgid ""
"Something bad is happening on your drive. \n"
"A test to check the integrity of data has failed. \n"
@@ -6356,186 +6530,186 @@ msgstr ""
"你的硬盘有错.\n"
"完整性检查失败."
-#: ../../pkgs.pm_.c:24
+#: ../../pkgs.pm_.c:26
msgid "must have"
msgstr "必须拥有"
-#: ../../pkgs.pm_.c:25
+#: ../../pkgs.pm_.c:27
msgid "important"
msgstr "重要"
-#: ../../pkgs.pm_.c:26
+#: ../../pkgs.pm_.c:28
msgid "very nice"
msgstr "非常好"
-#: ../../pkgs.pm_.c:27
+#: ../../pkgs.pm_.c:29
msgid "nice"
msgstr "不错"
-#: ../../pkgs.pm_.c:28
+#: ../../pkgs.pm_.c:30
msgid "maybe"
msgstr "或许有用"
-#: ../../printer.pm_.c:23
+#: ../../printer.pm_.c:26
msgid "CUPS - Common Unix Printing System"
msgstr "CUPS - 普通Unix打印系统"
-#: ../../printer.pm_.c:24
+#: ../../printer.pm_.c:27
msgid "LPRng - LPR New Generation"
msgstr "LPRng - 新一代LPR"
-#: ../../printer.pm_.c:25
+#: ../../printer.pm_.c:28
msgid "LPD - Line Printer Daemon"
msgstr "LPD - 行式打印精灵"
-#: ../../printer.pm_.c:26
+#: ../../printer.pm_.c:29
msgid "PDQ - Print, Don't Queue"
msgstr "PDQ - 打印, 不排队列"
-#: ../../printer.pm_.c:32 ../../printer.pm_.c:871
+#: ../../printer.pm_.c:35 ../../printer.pm_.c:874
msgid "CUPS"
msgstr "CUPS"
-#: ../../printer.pm_.c:33
+#: ../../printer.pm_.c:36
msgid "LPRng"
msgstr "LPRng"
-#: ../../printer.pm_.c:34
+#: ../../printer.pm_.c:37
msgid "LPD"
msgstr "LPD"
-#: ../../printer.pm_.c:35
+#: ../../printer.pm_.c:38
msgid "PDQ"
msgstr "PDQ"
-#: ../../printer.pm_.c:47
+#: ../../printer.pm_.c:50
msgid "Local printer"
msgstr "本机打印机"
-#: ../../printer.pm_.c:48
+#: ../../printer.pm_.c:51
msgid "Remote printer"
msgstr "远程打印机"
-#: ../../printer.pm_.c:49
+#: ../../printer.pm_.c:52
msgid "Printer on remote CUPS server"
msgstr "远程 CUPS 服务器的打印机"
-#: ../../printer.pm_.c:50 ../../printerdrake.pm_.c:734
+#: ../../printer.pm_.c:53 ../../printerdrake.pm_.c:758
msgid "Printer on remote lpd server"
msgstr "远端 lpd 服务器的打印机"
-#: ../../printer.pm_.c:51
+#: ../../printer.pm_.c:54
msgid "Network printer (TCP/Socket)"
msgstr "网络打印机 (TCP/Socket)"
-#: ../../printer.pm_.c:52
+#: ../../printer.pm_.c:55
msgid "Printer on SMB/Windows 95/98/NT server"
msgstr "SMB/Windows 95/98/NT上的打印机"
-#: ../../printer.pm_.c:53
+#: ../../printer.pm_.c:56
msgid "Printer on NetWare server"
msgstr "Novell服务器打印机"
-#: ../../printer.pm_.c:54 ../../printerdrake.pm_.c:738
+#: ../../printer.pm_.c:57 ../../printerdrake.pm_.c:762
msgid "Enter a printer device URI"
msgstr "打印机设备URI"
-#: ../../printer.pm_.c:55
+#: ../../printer.pm_.c:58
msgid "Pipe job into a command"
msgstr "作业pipe定向到命令"
-#: ../../printer.pm_.c:504 ../../printer.pm_.c:695 ../../printer.pm_.c:1017
-#: ../../printerdrake.pm_.c:1665 ../../printerdrake.pm_.c:2730
+#: ../../printer.pm_.c:507 ../../printer.pm_.c:698 ../../printer.pm_.c:1020
+#: ../../printerdrake.pm_.c:1690 ../../printerdrake.pm_.c:2801
msgid "Unknown model"
msgstr "未知模式"
-#: ../../printer.pm_.c:532
+#: ../../printer.pm_.c:535
msgid "Local Printers"
msgstr "本机打印机"
-#: ../../printer.pm_.c:534 ../../printer.pm_.c:872
+#: ../../printer.pm_.c:537 ../../printer.pm_.c:875
msgid "Remote Printers"
msgstr "远程打印机"
-#: ../../printer.pm_.c:541 ../../printerdrake.pm_.c:248
+#: ../../printer.pm_.c:544 ../../printerdrake.pm_.c:244
#, c-format
msgid " on parallel port \\/*%s"
msgstr " 并行口 \\/*%s"
-#: ../../printer.pm_.c:544 ../../printerdrake.pm_.c:250
+#: ../../printer.pm_.c:547 ../../printerdrake.pm_.c:246
#, c-format
msgid ", USB printer \\/*%s"
msgstr ", USB 打印机 \\/*%s"
-#: ../../printer.pm_.c:549
+#: ../../printer.pm_.c:552
#, c-format
msgid ", multi-function device on parallel port \\/*%s"
msgstr ""
-#: ../../printer.pm_.c:552
+#: ../../printer.pm_.c:555
msgid ", multi-function device on USB"
msgstr ""
-#: ../../printer.pm_.c:554
+#: ../../printer.pm_.c:557
msgid ", multi-function device on HP JetDirect"
msgstr ""
-#: ../../printer.pm_.c:556
+#: ../../printer.pm_.c:559
msgid ", multi-function device"
msgstr ""
-#: ../../printer.pm_.c:559
+#: ../../printer.pm_.c:562
#, c-format
msgid ", printing to %s"
msgstr ", 打印到 %s"
-#: ../../printer.pm_.c:561
+#: ../../printer.pm_.c:564
#, c-format
msgid "on LPD server \"%s\", printer \"%s\""
msgstr " LPD 服务器 \"%s\", 打印机 \"%s\""
-#: ../../printer.pm_.c:563
+#: ../../printer.pm_.c:566
#, c-format
msgid ", TCP/IP host \"%s\", port %s"
msgstr ", TCP/IP 主机 \"%s\", 端口 %s"
-#: ../../printer.pm_.c:567
+#: ../../printer.pm_.c:570
#, c-format
msgid "on Windows server \"%s\", share \"%s\""
msgstr "Windows 打印服务器 \"%s\", 共享名 \"%s\""
-#: ../../printer.pm_.c:571
+#: ../../printer.pm_.c:574
#, c-format
msgid "on Novell server \"%s\", printer \"%s\""
msgstr "Novell 打印服务器 \"%s\", 打印机 \"%s\""
-#: ../../printer.pm_.c:573
+#: ../../printer.pm_.c:576
#, c-format
msgid ", using command %s"
msgstr ", 使用命令 %s"
-#: ../../printer.pm_.c:692 ../../printerdrake.pm_.c:1136
+#: ../../printer.pm_.c:695 ../../printerdrake.pm_.c:1160
msgid "Raw printer (No driver)"
msgstr "直接打印输出 (不使用驱动程序)"
-#: ../../printer.pm_.c:841
+#: ../../printer.pm_.c:844
#, c-format
msgid "(on %s)"
msgstr "(在 %s)"
-#: ../../printer.pm_.c:843
+#: ../../printer.pm_.c:846
msgid "(on this machine)"
msgstr "(在该机器上)"
-#: ../../printer.pm_.c:868
+#: ../../printer.pm_.c:871
#, c-format
msgid "On CUPS server \"%s\""
msgstr "在 CUPS 服务器 \"%s\""
-#: ../../printer.pm_.c:874 ../../printerdrake.pm_.c:2391
-#: ../../printerdrake.pm_.c:2402 ../../printerdrake.pm_.c:2618
-#: ../../printerdrake.pm_.c:2670 ../../printerdrake.pm_.c:2697
-#: ../../printerdrake.pm_.c:2867 ../../printerdrake.pm_.c:2869
+#: ../../printer.pm_.c:877 ../../printerdrake.pm_.c:2462
+#: ../../printerdrake.pm_.c:2473 ../../printerdrake.pm_.c:2689
+#: ../../printerdrake.pm_.c:2741 ../../printerdrake.pm_.c:2768
+#: ../../printerdrake.pm_.c:2938 ../../printerdrake.pm_.c:2940
msgid " (Default)"
msgstr " (缺省)"
@@ -6556,12 +6730,12 @@ msgstr ""
"\n"
"您不需要配置远程的 CUPS 服务器;它们会被自动探测到."
-#: ../../printerdrake.pm_.c:69 ../../printerdrake.pm_.c:2454
+#: ../../printerdrake.pm_.c:69 ../../printerdrake.pm_.c:2525
#, fuzzy
msgid "CUPS configuration"
msgstr "配置"
-#: ../../printerdrake.pm_.c:70 ../../printerdrake.pm_.c:2455
+#: ../../printerdrake.pm_.c:70 ../../printerdrake.pm_.c:2526
#, fuzzy
msgid "Specify CUPS server"
msgstr "远程 CUPS 服务器"
@@ -6600,7 +6774,7 @@ msgstr ""
msgid "The IP address should look like 192.168.1.20"
msgstr "IP 地址的格式应该是象 1.2.3.4"
-#: ../../printerdrake.pm_.c:80 ../../printerdrake.pm_.c:862
+#: ../../printerdrake.pm_.c:80 ../../printerdrake.pm_.c:886
msgid "The port number should be an integer!"
msgstr "端口须为数字!"
@@ -6608,7 +6782,7 @@ msgstr "端口须为数字!"
msgid "CUPS server IP"
msgstr "CUPS 服务器 IP"
-#: ../../printerdrake.pm_.c:88 ../../printerdrake.pm_.c:855
+#: ../../printerdrake.pm_.c:88 ../../printerdrake.pm_.c:879
msgid "Port"
msgstr "端口"
@@ -6616,20 +6790,12 @@ msgstr "端口"
msgid "Automatic CUPS configuration"
msgstr "CUPS自动步骤配置"
-#: ../../printerdrake.pm_.c:145 ../../standalone/scannerdrake_.c:42
-msgid "Detecting devices ..."
-msgstr "正在探测设备..."
-
-#: ../../printerdrake.pm_.c:145 ../../standalone/scannerdrake_.c:42
-msgid "Test ports"
-msgstr "测试端口"
-
-#: ../../printerdrake.pm_.c:167 ../../printerdrake.pm_.c:2437
-#: ../../printerdrake.pm_.c:2556
+#: ../../printerdrake.pm_.c:162 ../../printerdrake.pm_.c:2508
+#: ../../printerdrake.pm_.c:2628
msgid "Add a new printer"
msgstr "增加打印机"
-#: ../../printerdrake.pm_.c:168
+#: ../../printerdrake.pm_.c:163
msgid ""
"\n"
"Welcome to the Printer Setup Wizard\n"
@@ -6642,13 +6808,13 @@ msgid ""
"connection types."
msgstr ""
-#: ../../printerdrake.pm_.c:176 ../../printerdrake.pm_.c:203
-#: ../../printerdrake.pm_.c:378 ../../printerdrake.pm_.c:393
-#: ../../printerdrake.pm_.c:403 ../../printerdrake.pm_.c:466
+#: ../../printerdrake.pm_.c:171 ../../printerdrake.pm_.c:198
+#: ../../printerdrake.pm_.c:374 ../../printerdrake.pm_.c:389
+#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:462
msgid "Local Printer"
msgstr "本机打印机"
-#: ../../printerdrake.pm_.c:177
+#: ../../printerdrake.pm_.c:172
msgid ""
"\n"
"Welcome to the Printer Setup Wizard\n"
@@ -6666,12 +6832,12 @@ msgid ""
"printing on a remote printer if printerdrake does not list it automatically."
msgstr ""
-#: ../../printerdrake.pm_.c:186
+#: ../../printerdrake.pm_.c:181
#, fuzzy
msgid "Auto-detect printers"
msgstr "自动探测打印机"
-#: ../../printerdrake.pm_.c:204
+#: ../../printerdrake.pm_.c:199
msgid ""
"\n"
"Congratulations, your printer is now installed and configured!\n"
@@ -6685,11 +6851,11 @@ msgid ""
"Center."
msgstr ""
-#: ../../printerdrake.pm_.c:223
+#: ../../printerdrake.pm_.c:218
msgid "Auto-Detection of Printers"
msgstr "自动探测打印机"
-#: ../../printerdrake.pm_.c:224
+#: ../../printerdrake.pm_.c:219
msgid ""
"Printerdrake is able to auto-detect your locally connected parallel and USB "
"printers for you, but note that on some systems the auto-detection CAN "
@@ -6699,35 +6865,39 @@ msgid ""
"Do you really want to get your printers auto-detected?"
msgstr ""
-#: ../../printerdrake.pm_.c:227 ../../printerdrake.pm_.c:229
-#: ../../printerdrake.pm_.c:230
+#: ../../printerdrake.pm_.c:222 ../../printerdrake.pm_.c:224
+#: ../../printerdrake.pm_.c:225
#, fuzzy
msgid "Do auto-detection"
msgstr "使用自动检测"
-#: ../../printerdrake.pm_.c:228
+#: ../../printerdrake.pm_.c:223
#, fuzzy
msgid "Set up printer manually"
msgstr "手工选择用户"
-#: ../../printerdrake.pm_.c:256
+#: ../../printerdrake.pm_.c:231 ../../standalone/scannerdrake_.c:42
+msgid "Test ports"
+msgstr "测试端口"
+
+#: ../../printerdrake.pm_.c:252
#, c-format
msgid "Detected %s"
msgstr "检测到 %s"
-#: ../../printerdrake.pm_.c:260 ../../printerdrake.pm_.c:287
-#: ../../printerdrake.pm_.c:306
+#: ../../printerdrake.pm_.c:256 ../../printerdrake.pm_.c:283
+#: ../../printerdrake.pm_.c:302
#, c-format
msgid "Printer on parallel port \\/*%s"
msgstr "并行端口打印机 \\/*%s"
-#: ../../printerdrake.pm_.c:262 ../../printerdrake.pm_.c:289
-#: ../../printerdrake.pm_.c:311
+#: ../../printerdrake.pm_.c:258 ../../printerdrake.pm_.c:285
+#: ../../printerdrake.pm_.c:307
#, c-format
msgid "USB printer \\/*%s"
msgstr "USB 打印机 \\/*%s"
-#: ../../printerdrake.pm_.c:379
+#: ../../printerdrake.pm_.c:375
msgid ""
"No local printer found! To manually install a printer enter a device name/"
"file name in the input line (Parallel Ports: /dev/lp0, /dev/lp1, ..., "
@@ -6735,44 +6905,44 @@ msgid ""
"printer: /dev/usb/lp1, ...)."
msgstr ""
-#: ../../printerdrake.pm_.c:383
+#: ../../printerdrake.pm_.c:379
msgid "You must enter a device or file name!"
msgstr "您需要输入打印机设备名或一文件名!"
-#: ../../printerdrake.pm_.c:394
+#: ../../printerdrake.pm_.c:390
#, fuzzy
msgid ""
"No local printer found!\n"
"\n"
msgstr "无本机打印机"
-#: ../../printerdrake.pm_.c:395
+#: ../../printerdrake.pm_.c:391
msgid ""
"Network printers can only be installed after the installation. Choose "
"\"Hardware\" and then \"Printer\" in the Mandrake Control Center."
msgstr ""
-#: ../../printerdrake.pm_.c:396
+#: ../../printerdrake.pm_.c:392
msgid ""
"To install network printers, click \"Cancel\", switch to the \"Expert Mode"
"\", and click \"Add a new printer\" again."
msgstr ""
-#: ../../printerdrake.pm_.c:407
+#: ../../printerdrake.pm_.c:403
#, fuzzy
msgid ""
"The following printer was auto-detected, if it is not the one you want to "
"configure, enter a device name/file name in the input line"
msgstr "请选择您打印机使用的端口或输入栏内填入一合法设备或文件"
-#: ../../printerdrake.pm_.c:408
+#: ../../printerdrake.pm_.c:404
#, fuzzy
msgid ""
"Here is a list of all auto-detected printers. Please choose the printer you "
"want to set up or enter a device name/file name in the input line"
msgstr "请选择您打印机使用的端口或输入栏内填入一合法设备或文件"
-#: ../../printerdrake.pm_.c:410
+#: ../../printerdrake.pm_.c:406
msgid ""
"The following printer was auto-detected. The configuration of the printer "
"will work fully automatically. If your printer was not correctly detected or "
@@ -6780,7 +6950,7 @@ msgid ""
"configuration\"."
msgstr ""
-#: ../../printerdrake.pm_.c:411
+#: ../../printerdrake.pm_.c:407
msgid ""
"Here is a list of all auto-detected printers. Please choose the printer you "
"want to set up. The configuration of the printer will work fully "
@@ -6788,17 +6958,17 @@ msgid ""
"customized printer configuration, turn on \"Manual configuration\"."
msgstr ""
-#: ../../printerdrake.pm_.c:413
+#: ../../printerdrake.pm_.c:409
msgid ""
"Please choose the port where your printer is connected to or enter a device "
"name/file name in the input line"
msgstr "请选择您打印机使用的端口或输入栏内填入一合法设备或文件"
-#: ../../printerdrake.pm_.c:414
+#: ../../printerdrake.pm_.c:410
msgid "Please choose the port where your printer is connected to."
msgstr "请问您的打印机是连接到那个端口?"
-#: ../../printerdrake.pm_.c:416
+#: ../../printerdrake.pm_.c:412
msgid ""
" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
"1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
@@ -6806,53 +6976,63 @@ msgstr ""
" (并行口: /dev/lp0, /dev/lp1, ..., 相当于 LPT1:, LPT2:, ..., 第一个 USB 设备"
"口: /dev/usb/lp0, 第二个 USB 设备口: /dev/usb/lp1, ...)."
-#: ../../printerdrake.pm_.c:421
+#: ../../printerdrake.pm_.c:417
msgid "You must choose/enter a printer/device!"
msgstr "您需要配置一台打印机设备"
-#: ../../printerdrake.pm_.c:441
+#: ../../printerdrake.pm_.c:437
#, fuzzy
msgid "Manual configuration"
msgstr "互联网设定"
-#: ../../printerdrake.pm_.c:467
+#: ../../printerdrake.pm_.c:463
msgid ""
-"Is your printer a multi-function device from HP (OfficeJet, PSC, PhotoSmart, "
-"LaserJet 1100/1200/1220/3200/3300 with scanner)?"
+"Is your printer a multi-function device from HP (OfficeJet, PSC, LaserJet "
+"1100/1200/1220/3200/3300 with scanner), an HP PhotoSmart or an HP LaserJet "
+"2200?"
msgstr ""
-#: ../../printerdrake.pm_.c:482
+#: ../../printerdrake.pm_.c:480
#, fuzzy
msgid "Installing HPOJ package..."
msgstr "正在安装程序 ..."
-#: ../../printerdrake.pm_.c:487
-msgid "Checking device and configuring HPOJ ..."
+#: ../../printerdrake.pm_.c:485
+msgid "Checking device and configuring HPOJ..."
msgstr ""
-#: ../../printerdrake.pm_.c:505
+#: ../../printerdrake.pm_.c:504
+#, fuzzy
+msgid "Installing SANE packages..."
+msgstr "正在安装程序 ..."
+
+#: ../../printerdrake.pm_.c:524
#, fuzzy
-msgid "Installing SANE package..."
+msgid "Installing mtools packages..."
msgstr "正在安装程序 ..."
-#: ../../printerdrake.pm_.c:517
+#: ../../printerdrake.pm_.c:535
msgid "Scanning on your HP multi-function device"
msgstr ""
-#: ../../printerdrake.pm_.c:534
-msgid "Making printer port available for CUPS ..."
+#: ../../printerdrake.pm_.c:541
+msgid "Photo memory card access on your HP multi-function device"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:558
+msgid "Making printer port available for CUPS..."
msgstr "输出打印机端口到 CUPS ..."
-#: ../../printerdrake.pm_.c:544 ../../printerdrake.pm_.c:1018
-#: ../../printerdrake.pm_.c:1132
-msgid "Reading printer database ..."
+#: ../../printerdrake.pm_.c:568 ../../printerdrake.pm_.c:1042
+#: ../../printerdrake.pm_.c:1156
+msgid "Reading printer database..."
msgstr "读取打印机数据库..."
-#: ../../printerdrake.pm_.c:624
+#: ../../printerdrake.pm_.c:648
msgid "Remote lpd Printer Options"
msgstr "远端 lpd 打印机选项"
-#: ../../printerdrake.pm_.c:625
+#: ../../printerdrake.pm_.c:649
msgid ""
"To use a remote lpd printer, you need to supply the hostname of the printer "
"server and the printer name on that server."
@@ -6860,27 +7040,27 @@ msgstr ""
"要使用一个远端的 lpd 打印队列, 您需要指定打印服务器的\n"
"主机名和打印任务要送往的打印队列的名字."
-#: ../../printerdrake.pm_.c:626
+#: ../../printerdrake.pm_.c:650
msgid "Remote host name"
msgstr "远端主机名"
-#: ../../printerdrake.pm_.c:627
+#: ../../printerdrake.pm_.c:651
msgid "Remote printer name"
msgstr "远程打印机名"
-#: ../../printerdrake.pm_.c:630
+#: ../../printerdrake.pm_.c:654
msgid "Remote host name missing!"
msgstr "未找到远端主机!"
-#: ../../printerdrake.pm_.c:634
+#: ../../printerdrake.pm_.c:658
msgid "Remote printer name missing!"
msgstr "没有找到远端打印机!"
-#: ../../printerdrake.pm_.c:702
+#: ../../printerdrake.pm_.c:726
msgid "SMB (Windows 9x/NT) Printer Options"
msgstr "SMB (Windows 9x/NT) 打印机选项"
-#: ../../printerdrake.pm_.c:703
+#: ../../printerdrake.pm_.c:727
msgid ""
"To print to a SMB printer, you need to provide the SMB host name (Note! It "
"may be different from its TCP/IP hostname!) and possibly the IP address of "
@@ -6892,35 +7072,35 @@ msgstr ""
"邻居里看到的主机名, 可能与它的 TCP/IP 主机名不同,), 可能还需要它的 IP 地址,\n"
"以及有权访问打印机的用户名, 工作组和口令, 当然还有打印机的共享名. "
-#: ../../printerdrake.pm_.c:704
+#: ../../printerdrake.pm_.c:728
msgid "SMB server host"
msgstr "SMB 服务器主机"
-#: ../../printerdrake.pm_.c:705
+#: ../../printerdrake.pm_.c:729
msgid "SMB server IP"
msgstr "SMB 服务器 IP"
-#: ../../printerdrake.pm_.c:706
+#: ../../printerdrake.pm_.c:730
msgid "Share name"
msgstr "共享名"
-#: ../../printerdrake.pm_.c:709
+#: ../../printerdrake.pm_.c:733
msgid "Workgroup"
msgstr "工作组"
-#: ../../printerdrake.pm_.c:716
+#: ../../printerdrake.pm_.c:740
msgid "Either the server name or the server's IP must be given!"
msgstr "输入服务器名或服务器的IP"
-#: ../../printerdrake.pm_.c:720
+#: ../../printerdrake.pm_.c:744
msgid "Samba share name missing!"
msgstr "Samba共享名 没有找到"
-#: ../../printerdrake.pm_.c:725
+#: ../../printerdrake.pm_.c:749
msgid "SECURITY WARNING!"
msgstr ""
-#: ../../printerdrake.pm_.c:726
+#: ../../printerdrake.pm_.c:750
#, c-format
msgid ""
"You are about to set up printing to a Windows account with password. Due to "
@@ -6944,7 +7124,7 @@ msgid ""
"\n"
msgstr ""
-#: ../../printerdrake.pm_.c:736
+#: ../../printerdrake.pm_.c:760
#, c-format
msgid ""
"Set up your Windows server to make the printer available under the IPP "
@@ -6953,7 +7133,7 @@ msgid ""
"\n"
msgstr ""
-#: ../../printerdrake.pm_.c:739
+#: ../../printerdrake.pm_.c:763
msgid ""
"Connect your printer to a Linux server and let your Windows machine(s) "
"connect to it as a client.\n"
@@ -6961,11 +7141,11 @@ msgid ""
"Do you really want to continue setting up this printer as you are doing now?"
msgstr ""
-#: ../../printerdrake.pm_.c:801
+#: ../../printerdrake.pm_.c:825
msgid "NetWare Printer Options"
msgstr "NetWare 打印机选项"
-#: ../../printerdrake.pm_.c:802
+#: ../../printerdrake.pm_.c:826
msgid ""
"To print on a NetWare printer, you need to provide the NetWare print server "
"name (Note! it may be different from its TCP/IP hostname!) as well as the "
@@ -6976,27 +7156,27 @@ msgstr ""
"可能与它的 TCP/IP 主机名不同), 以及有权访问打印机的用户名和口令, \n"
"当然还有打印机的打印队列名. "
-#: ../../printerdrake.pm_.c:803
+#: ../../printerdrake.pm_.c:827
msgid "Printer Server"
msgstr "打印服务器"
-#: ../../printerdrake.pm_.c:804
+#: ../../printerdrake.pm_.c:828
msgid "Print Queue Name"
msgstr "打印队列名"
-#: ../../printerdrake.pm_.c:809
+#: ../../printerdrake.pm_.c:833
msgid "NCP server name missing!"
msgstr "NCP 服务器未找到"
-#: ../../printerdrake.pm_.c:813
+#: ../../printerdrake.pm_.c:837
msgid "NCP queue name missing!"
msgstr "NCP 队列名未找到"
-#: ../../printerdrake.pm_.c:852
+#: ../../printerdrake.pm_.c:876
msgid "TCP/Socket Printer Options"
msgstr "TCP/Socket 打印机选项"
-#: ../../printerdrake.pm_.c:853
+#: ../../printerdrake.pm_.c:877
msgid ""
"To print to a TCP or socket printer, you need to provide the host name of "
"the printer and optionally the port number. On HP JetDirect servers the port "
@@ -7007,19 +7187,19 @@ msgstr ""
"打印机的主机名和可选的端口号码.\n"
"HP JetDirect通常用端口9100."
-#: ../../printerdrake.pm_.c:854
+#: ../../printerdrake.pm_.c:878
msgid "Printer host name"
msgstr "打印机主机名"
-#: ../../printerdrake.pm_.c:858
+#: ../../printerdrake.pm_.c:882
msgid "Printer host name missing!"
msgstr "没有打印机主机名!"
-#: ../../printerdrake.pm_.c:887 ../../printerdrake.pm_.c:889
+#: ../../printerdrake.pm_.c:911 ../../printerdrake.pm_.c:913
msgid "Printer Device URI"
msgstr "打印机设备 URI"
-#: ../../printerdrake.pm_.c:888
+#: ../../printerdrake.pm_.c:912
msgid ""
"You can specify directly the URI to access the printer. The URI must fulfill "
"either the CUPS or the Foomatic specifications. Note that not all URI types "
@@ -7028,11 +7208,11 @@ msgstr ""
"你可以直接使用 URI 访问打印机. URI 必须符合CUPS 或 Foomatic 规定.但注意不是所"
"有的打印队列 (spooler) 都支持 URI."
-#: ../../printerdrake.pm_.c:903
+#: ../../printerdrake.pm_.c:927
msgid "A valid URI must be entered!"
msgstr "必须是有效的URI!"
-#: ../../printerdrake.pm_.c:1004
+#: ../../printerdrake.pm_.c:1028
msgid ""
"Every printer needs a name (for example \"printer\"). The Description and "
"Location fields do not need to be filled in. They are comments for the users."
@@ -7040,28 +7220,24 @@ msgstr ""
"每台打印机需要一个名字(如 \"printer\").\n"
"打印机描述和位置是可选项."
-#: ../../printerdrake.pm_.c:1005
+#: ../../printerdrake.pm_.c:1029
msgid "Name of printer"
msgstr "打印机名字"
-#: ../../printerdrake.pm_.c:1006
-msgid "Description"
-msgstr "描述"
-
-#: ../../printerdrake.pm_.c:1007
+#: ../../printerdrake.pm_.c:1031
msgid "Location"
msgstr "位置"
-#: ../../printerdrake.pm_.c:1021
-msgid "Preparing printer database ..."
+#: ../../printerdrake.pm_.c:1045
+msgid "Preparing printer database..."
msgstr "准备打印机数据..."
-#: ../../printerdrake.pm_.c:1112
+#: ../../printerdrake.pm_.c:1136
#, fuzzy
msgid "Your printer model"
msgstr "远程打印机名"
-#: ../../printerdrake.pm_.c:1113
+#: ../../printerdrake.pm_.c:1137
#, c-format
msgid ""
"Printerdrake has compared the model name resulting from the printer auto-"
@@ -7076,26 +7252,26 @@ msgid ""
"%s"
msgstr ""
-#: ../../printerdrake.pm_.c:1118 ../../printerdrake.pm_.c:1121
+#: ../../printerdrake.pm_.c:1142 ../../printerdrake.pm_.c:1145
#, fuzzy
msgid "The model is correct"
msgstr "这样正确吗?"
-#: ../../printerdrake.pm_.c:1119 ../../printerdrake.pm_.c:1120
-#: ../../printerdrake.pm_.c:1123
+#: ../../printerdrake.pm_.c:1143 ../../printerdrake.pm_.c:1144
+#: ../../printerdrake.pm_.c:1147
#, fuzzy
msgid "Select model manually"
msgstr "手工选择用户"
-#: ../../printerdrake.pm_.c:1139
+#: ../../printerdrake.pm_.c:1163
msgid "Printer model selection"
msgstr "打印机选择"
-#: ../../printerdrake.pm_.c:1140
+#: ../../printerdrake.pm_.c:1164
msgid "Which printer model do you have?"
msgstr "请问您打印机的型号 ?"
-#: ../../printerdrake.pm_.c:1141
+#: ../../printerdrake.pm_.c:1165
msgid ""
"\n"
"\n"
@@ -7104,17 +7280,17 @@ msgid ""
"standing on a wrong model or on \"Raw printer\"."
msgstr ""
-#: ../../printerdrake.pm_.c:1144
+#: ../../printerdrake.pm_.c:1168
msgid ""
"If your printer is not listed, choose a compatible (see printer manual) or a "
"similar one."
msgstr ""
-#: ../../printerdrake.pm_.c:1220
+#: ../../printerdrake.pm_.c:1244
msgid "OKI winprinter configuration"
msgstr "OKI winprinter 打印机配置"
-#: ../../printerdrake.pm_.c:1221
+#: ../../printerdrake.pm_.c:1245
msgid ""
"You are configuring an OKI laser winprinter. These printers\n"
"use a very special communication protocol and therefore they work only when "
@@ -7124,11 +7300,11 @@ msgid ""
"not work. Your connection type setting will be ignored by the driver."
msgstr "你正在配置OKI win打印机, 因其使用特别的通讯协议, 只能连在第一个打印口."
-#: ../../printerdrake.pm_.c:1264 ../../printerdrake.pm_.c:1291
+#: ../../printerdrake.pm_.c:1288 ../../printerdrake.pm_.c:1315
msgid "Lexmark inkjet configuration"
msgstr "利盟(Lexmark)喷墨打印机设定"
-#: ../../printerdrake.pm_.c:1265
+#: ../../printerdrake.pm_.c:1289
msgid ""
"The inkjet printer drivers provided by Lexmark only support local printers, "
"no printers on remote machines or print server boxes. Please connect your "
@@ -7136,7 +7312,7 @@ msgid ""
"to."
msgstr "利盟喷墨打印机仅仅支持本地打印."
-#: ../../printerdrake.pm_.c:1292
+#: ../../printerdrake.pm_.c:1316
msgid ""
"To be able to print with your Lexmark inkjet and this configuration, you "
"need the inkjet printer drivers provided by Lexmark (http://www.lexmark."
@@ -7151,7 +7327,7 @@ msgstr ""
"配置利盟喷墨打印机需要从利盟网站(http://www.lexmark.com/)\n"
"下载\"Linux\"驱动."
-#: ../../printerdrake.pm_.c:1508
+#: ../../printerdrake.pm_.c:1532
msgid ""
"Printer default settings\n"
"\n"
@@ -7163,22 +7339,22 @@ msgstr ""
"打印机缺省设置\n"
"如纸张大小、墨水类型等等."
-#: ../../printerdrake.pm_.c:1517
+#: ../../printerdrake.pm_.c:1541
#, c-format
msgid "Option %s must be an integer number!"
msgstr "选项 %s 必须是整数!"
-#: ../../printerdrake.pm_.c:1521
+#: ../../printerdrake.pm_.c:1545
#, c-format
msgid "Option %s must be a number!"
msgstr "选项 %s 必须是数字!"
-#: ../../printerdrake.pm_.c:1526
+#: ../../printerdrake.pm_.c:1550
#, c-format
msgid "Option %s out of range!"
msgstr "选项 %s 超出范围!"
-#: ../../printerdrake.pm_.c:1565
+#: ../../printerdrake.pm_.c:1589
#, c-format
msgid ""
"Do you want to set this printer (\"%s\")\n"
@@ -7187,11 +7363,11 @@ msgstr ""
"你希望设置打印机(\"%s\")\n"
"成为缺省打印机?"
-#: ../../printerdrake.pm_.c:1582
+#: ../../printerdrake.pm_.c:1606
msgid "Test pages"
msgstr "测试页"
-#: ../../printerdrake.pm_.c:1583
+#: ../../printerdrake.pm_.c:1607
msgid ""
"Please select the test pages you want to print.\n"
"Note: the photo test page can take a rather long time to get printed and on "
@@ -7202,40 +7378,40 @@ msgstr ""
"注意: 在某些打印机上打印照片可能要花相当长的时间.\n"
"一般请选择标准测试页."
-#: ../../printerdrake.pm_.c:1587
+#: ../../printerdrake.pm_.c:1611
msgid "No test pages"
msgstr "没有测试页"
-#: ../../printerdrake.pm_.c:1588
+#: ../../printerdrake.pm_.c:1612
msgid "Print"
msgstr "打印"
-#: ../../printerdrake.pm_.c:1590
+#: ../../printerdrake.pm_.c:1614
msgid "Standard test page"
msgstr "标准测试页"
-#: ../../printerdrake.pm_.c:1593
+#: ../../printerdrake.pm_.c:1617
msgid "Alternative test page (Letter)"
msgstr "可换测试页(信纸)"
-#: ../../printerdrake.pm_.c:1596
+#: ../../printerdrake.pm_.c:1620
msgid "Alternative test page (A4)"
msgstr "替换测试页 (A4)"
-#: ../../printerdrake.pm_.c:1598
+#: ../../printerdrake.pm_.c:1622
msgid "Photo test page"
msgstr "照片测试页"
-#: ../../printerdrake.pm_.c:1602
+#: ../../printerdrake.pm_.c:1626
#, fuzzy
msgid "Do not print any test page"
msgstr "打印测试页"
-#: ../../printerdrake.pm_.c:1610 ../../printerdrake.pm_.c:1747
+#: ../../printerdrake.pm_.c:1634 ../../printerdrake.pm_.c:1786
msgid "Printing test page(s)..."
msgstr "正在打印测试页..."
-#: ../../printerdrake.pm_.c:1635
+#: ../../printerdrake.pm_.c:1659
#, c-format
msgid ""
"Test page(s) have been sent to the printer.\n"
@@ -7249,21 +7425,21 @@ msgstr ""
"%s\n"
"\n"
-#: ../../printerdrake.pm_.c:1639
+#: ../../printerdrake.pm_.c:1663
msgid ""
"Test page(s) have been sent to the printer.\n"
"It may take some time before the printer starts.\n"
msgstr "测试页已经发送到打印机后台程序. 过一少段时间打印机将开始工作.\n"
-#: ../../printerdrake.pm_.c:1646
+#: ../../printerdrake.pm_.c:1670
msgid "Did it work properly?"
msgstr "工作正常?"
-#: ../../printerdrake.pm_.c:1667 ../../printerdrake.pm_.c:2732
+#: ../../printerdrake.pm_.c:1692 ../../printerdrake.pm_.c:2803
msgid "Raw printer"
msgstr "裸打印机"
-#: ../../printerdrake.pm_.c:1685
+#: ../../printerdrake.pm_.c:1718
#, c-format
msgid ""
"To print a file from the command line (terminal window) you can either use "
@@ -7274,15 +7450,15 @@ msgstr ""
"命令行打印可使用命令\"%s <文件>\" 或图形打印工具: \"xpp <文件>\" 或 "
"\"kprinter <文件>\".\n"
-#: ../../printerdrake.pm_.c:1687
+#: ../../printerdrake.pm_.c:1720
msgid ""
"These commands you can also use in the \"Printing command\" field of the "
"printing dialogs of many applications, but here do not supply the file name "
"because the file to print is provided by the application.\n"
msgstr "该命令你可用在许多应用的打印对话框的\"打印命令\"项.\n"
-#: ../../printerdrake.pm_.c:1690 ../../printerdrake.pm_.c:1706
-#: ../../printerdrake.pm_.c:1716
+#: ../../printerdrake.pm_.c:1723 ../../printerdrake.pm_.c:1740
+#: ../../printerdrake.pm_.c:1750
#, c-format
msgid ""
"\n"
@@ -7293,17 +7469,17 @@ msgstr ""
"\n"
"\"%s\"命令也可用来修改打印作业的选项, 例如: \"%s <file>\". "
-#: ../../printerdrake.pm_.c:1693 ../../printerdrake.pm_.c:1732
+#: ../../printerdrake.pm_.c:1726 ../../printerdrake.pm_.c:1766
#, fuzzy, c-format
msgid ""
"To know about the options available for the current printer read either the "
-"list shown below or click on the \"Print option list\" button.%s\n"
+"list shown below or click on the \"Print option list\" button.%s%s\n"
"\n"
msgstr ""
"点击\"打印选项\"列举打印机的选项.\n"
"\n"
-#: ../../printerdrake.pm_.c:1696
+#: ../../printerdrake.pm_.c:1730
#, fuzzy
msgid ""
"Here is a list of the available printing options for the current printer:\n"
@@ -7312,22 +7488,22 @@ msgstr ""
"以下是可用于当前打印机的一些参数: \n"
"\n"
-#: ../../printerdrake.pm_.c:1701 ../../printerdrake.pm_.c:1711
+#: ../../printerdrake.pm_.c:1735 ../../printerdrake.pm_.c:1745
#, c-format
msgid ""
"To print a file from the command line (terminal window) use the command \"%s "
"<file>\".\n"
msgstr "命令行打印文件使用命令\"%s <文件>\".\n"
-#: ../../printerdrake.pm_.c:1703 ../../printerdrake.pm_.c:1713
-#: ../../printerdrake.pm_.c:1723
+#: ../../printerdrake.pm_.c:1737 ../../printerdrake.pm_.c:1747
+#: ../../printerdrake.pm_.c:1757
msgid ""
"This command you can also use in the \"Printing command\" field of the "
"printing dialogs of many applications. But here do not supply the file name "
"because the file to print is provided by the application.\n"
msgstr "该命令你可用在许多应用的打印对话框的\"打印命令\"项.\n"
-#: ../../printerdrake.pm_.c:1708 ../../printerdrake.pm_.c:1718
+#: ../../printerdrake.pm_.c:1742 ../../printerdrake.pm_.c:1752
#, fuzzy
msgid ""
"To get a list of the options available for the current printer click on the "
@@ -7336,14 +7512,14 @@ msgstr ""
"点击\"打印选项\"列举打印机的选项.\n"
"\n"
-#: ../../printerdrake.pm_.c:1721
+#: ../../printerdrake.pm_.c:1755
#, c-format
msgid ""
"To print a file from the command line (terminal window) use the command \"%s "
"<file>\" or \"%s <file>\".\n"
msgstr "用命令\"%s <文件>\"或\"%s <文件>\"打印文件.\n"
-#: ../../printerdrake.pm_.c:1725
+#: ../../printerdrake.pm_.c:1759
msgid ""
"You can also use the graphical interface \"xpdq\" for setting options and "
"handling printing jobs.\n"
@@ -7355,7 +7531,7 @@ msgstr ""
"你可以用图形接口\"xpdq\"设置打印选项和处理打印作业.\n"
"如果你使用KDE, 桌面上有\"停止打印机!\"按钮用于取消打印作业.\n"
-#: ../../printerdrake.pm_.c:1729
+#: ../../printerdrake.pm_.c:1763
#, c-format
msgid ""
"\n"
@@ -7366,29 +7542,40 @@ msgstr ""
"\n"
"\"%s\"和\"%s\"命令允许修改打印作业的选项, 例如: \"%s <file>\".\n"
-#: ../../printerdrake.pm_.c:1738 ../../printerdrake.pm_.c:1744
-#: ../../printerdrake.pm_.c:1745 ../../printerdrake.pm_.c:1746
-#: ../../printerdrake.pm_.c:2716 ../../standalone/drakbackup_.c:754
-#: ../../standalone/drakbackup_.c:2458 ../../standalone/drakfont_.c:577
-#: ../../standalone/drakfont_.c:791
-msgid "Close"
-msgstr "关闭"
+#: ../../printerdrake.pm_.c:1773
+#, fuzzy, c-format
+msgid "Printing/Scanning/Photo Cards on \"%s\""
+msgstr "正在\"%s\"打印机上打印"
-#: ../../printerdrake.pm_.c:1741 ../../printerdrake.pm_.c:1753
+#: ../../printerdrake.pm_.c:1774
#, fuzzy, c-format
msgid "Printing/Scanning on \"%s\""
msgstr "正在\"%s\"打印机上打印"
-#: ../../printerdrake.pm_.c:1742 ../../printerdrake.pm_.c:1754
+#: ../../printerdrake.pm_.c:1776
+#, fuzzy, c-format
+msgid "Printing/Photo Card Access on \"%s\""
+msgstr "正在\"%s\"打印机上打印"
+
+#: ../../printerdrake.pm_.c:1777
#, c-format
msgid "Printing on the printer \"%s\""
msgstr "正在\"%s\"打印机上打印"
-#: ../../printerdrake.pm_.c:1744
+#: ../../printerdrake.pm_.c:1780 ../../printerdrake.pm_.c:1783
+#: ../../printerdrake.pm_.c:1784 ../../printerdrake.pm_.c:1785
+#: ../../printerdrake.pm_.c:2787 ../../standalone/drakTermServ_.c:249
+#: ../../standalone/drakbackup_.c:1037 ../../standalone/drakbackup_.c:2868
+#: ../../standalone/drakbug_.c:107 ../../standalone/drakfont_.c:706
+#: ../../standalone/drakfont_.c:1015
+msgid "Close"
+msgstr "关闭"
+
+#: ../../printerdrake.pm_.c:1783
msgid "Print option list"
msgstr "打印机选项"
-#: ../../printerdrake.pm_.c:1766
+#: ../../printerdrake.pm_.c:1802
#, c-format
msgid ""
"Your HP multi-function device was configured automatically to be able to "
@@ -7396,36 +7583,36 @@ msgid ""
"the scanner when you have more than one) from the command line or with the "
"graphical interfaces \"xscanimage\" or \"xsane\". If you are using the GIMP, "
"you can also scan by choosing the appropriate point in the \"File\"/\"Acquire"
-"\" menu. Call also \"man scanimage\" and \"man sane-hp\" on the command line "
-"to get more information.\n"
+"\" menu. Call also \"man scanimage\" on the command line to get more "
+"information.\n"
"\n"
"Do not use \"scannerdrake\" for this device!"
msgstr ""
-#: ../../printerdrake.pm_.c:1772
-#, c-format
+#: ../../printerdrake.pm_.c:1821
msgid ""
-"Your HP multi-function device was configured automatically to be able to "
-"scan. Now you can scan from the command line with \"ptal-hp %s scan ...\". "
-"Scanning via a graphical interface or from the GIMP is not supported yet for "
-"your device. More information you will find in the \"/usr/share/doc/hpoj-0.8/"
-"ptal-hp-scan.html\" file on your system. If you have an HP LaserJet 1100 or "
-"1200 you can only scan when you have the scanner option installed.\n"
-"\n"
-"Do not use \"scannerdrake\" for this device!"
+"Your HP printer was configured automatically to give you access to the photo "
+"card drives from your PC. Now you can access your photo cards using the "
+"graphical program \"MtoolsFM\" (Menu: \"Applications\" -> \"File tools\" -> "
+"\"MTools File Manager\") or the command line utilities \"mtools\" (enter "
+"\"man mtools\" on the command line for more info). You find the card's file "
+"system under the drive letter \"p:\", or subsequent drive letters when you "
+"have more than one HP printer with photo card drives. In \"MtoolsFM\" you "
+"can switch between drive letters with the field at the upper-right corners "
+"of the file lists."
msgstr ""
-#: ../../printerdrake.pm_.c:1794 ../../printerdrake.pm_.c:2221
-#: ../../printerdrake.pm_.c:2485 ../../standalone/printerdrake_.c:49
-msgid "Reading printer data ..."
+#: ../../printerdrake.pm_.c:1842 ../../printerdrake.pm_.c:2292
+#: ../../printerdrake.pm_.c:2556
+msgid "Reading printer data..."
msgstr "读取打印机数据..."
-#: ../../printerdrake.pm_.c:1814 ../../printerdrake.pm_.c:1842
-#: ../../printerdrake.pm_.c:1877
+#: ../../printerdrake.pm_.c:1862 ../../printerdrake.pm_.c:1890
+#: ../../printerdrake.pm_.c:1925
msgid "Transfer printer configuration"
msgstr "传送打印机配置"
-#: ../../printerdrake.pm_.c:1815
+#: ../../printerdrake.pm_.c:1863
#, c-format
msgid ""
"You can copy the printer configuration which you have done for the spooler %"
@@ -7438,23 +7625,23 @@ msgstr ""
"所有配置数据将被覆盖,打印作业不会传送.\n"
"由于以下原因某些打印作业不会被传送:\n"
-#: ../../printerdrake.pm_.c:1818
+#: ../../printerdrake.pm_.c:1866
msgid ""
"CUPS does not support printers on Novell servers or printers sending the "
"data into a free-formed command.\n"
msgstr "CUPS不支持Novell服务器上的打印机及发送数据到无格式命令的打印机.\n"
-#: ../../printerdrake.pm_.c:1820
+#: ../../printerdrake.pm_.c:1868
msgid ""
"PDQ only supports local printers, remote LPD printers, and Socket/TCP "
"printers.\n"
msgstr "PDQ只支持本地打印机,远程LPD打印机, 和 Socket/TCP 打印机.\n"
-#: ../../printerdrake.pm_.c:1822
+#: ../../printerdrake.pm_.c:1870
msgid "LPD and LPRng do not support IPP printers.\n"
msgstr "LPD 和 LPRng不支持IPP打印机.\n"
-#: ../../printerdrake.pm_.c:1824
+#: ../../printerdrake.pm_.c:1872
msgid ""
"In addition, queues not created with this program or \"foomatic-configure\" "
"cannot be transferred."
@@ -7462,7 +7649,7 @@ msgstr ""
"该程序没有建立队列或\n"
"\"foomatic 配置\"无法传送"
-#: ../../printerdrake.pm_.c:1825
+#: ../../printerdrake.pm_.c:1873
msgid ""
"\n"
"Also printers configured with the PPD files provided by their manufacturers "
@@ -7471,7 +7658,7 @@ msgstr ""
"\n"
"打印机产商提供的 PPD 或打印机的 CUPS 驱动程序无法传送."
-#: ../../printerdrake.pm_.c:1826
+#: ../../printerdrake.pm_.c:1874
msgid ""
"\n"
"Mark the printers which you want to transfer and click \n"
@@ -7480,15 +7667,15 @@ msgstr ""
"\n"
"选择你要传送的打印机并点击\"传送\"."
-#: ../../printerdrake.pm_.c:1829
+#: ../../printerdrake.pm_.c:1877
msgid "Do not transfer printers"
msgstr "不传送打印机"
-#: ../../printerdrake.pm_.c:1830 ../../printerdrake.pm_.c:1847
+#: ../../printerdrake.pm_.c:1878 ../../printerdrake.pm_.c:1895
msgid "Transfer"
msgstr "传送"
-#: ../../printerdrake.pm_.c:1843
+#: ../../printerdrake.pm_.c:1891
#, c-format
msgid ""
"A printer named \"%s\" already exists under %s. \n"
@@ -7499,11 +7686,11 @@ msgstr ""
"点击 \"传送\" 覆盖配置.\n"
"你也可以选择新的名称或略过该打印机."
-#: ../../printerdrake.pm_.c:1851
+#: ../../printerdrake.pm_.c:1899
msgid "Name of printer should contain only letters, numbers and the underscore"
msgstr "打印机名称可以包含字母, 数字 和 下划线"
-#: ../../printerdrake.pm_.c:1856
+#: ../../printerdrake.pm_.c:1904
#, c-format
msgid ""
"The printer \"%s\" already exists,\n"
@@ -7512,16 +7699,16 @@ msgstr ""
"打印机 \"%s\"已经存在,\n"
"真的覆盖配置?"
-#: ../../printerdrake.pm_.c:1864
+#: ../../printerdrake.pm_.c:1912
msgid "New printer name"
msgstr "新打印机名称"
-#: ../../printerdrake.pm_.c:1867
+#: ../../printerdrake.pm_.c:1915
#, c-format
-msgid "Transferring %s ..."
+msgid "Transferring %s..."
msgstr "传送 %s ..."
-#: ../../printerdrake.pm_.c:1878
+#: ../../printerdrake.pm_.c:1926
#, c-format
msgid ""
"You have transferred your former default printer (\"%s\"), Should it be also "
@@ -7530,29 +7717,29 @@ msgstr ""
"你已经传送以前系统中的缺省打印机(\"%s\"),\n"
"是否设置为新打印系统的缺省打印机 %s?"
-#: ../../printerdrake.pm_.c:1887
-msgid "Refreshing printer data ..."
+#: ../../printerdrake.pm_.c:1935
+msgid "Refreshing printer data..."
msgstr "刷新打印机数据..."
-#: ../../printerdrake.pm_.c:1895 ../../printerdrake.pm_.c:1966
-#: ../../printerdrake.pm_.c:1978
+#: ../../printerdrake.pm_.c:1943 ../../printerdrake.pm_.c:2014
+#: ../../printerdrake.pm_.c:2026
msgid "Configuration of a remote printer"
msgstr "配置远程打印机"
-#: ../../printerdrake.pm_.c:1896
-msgid "Starting network ..."
+#: ../../printerdrake.pm_.c:1944
+msgid "Starting network..."
msgstr "正在启动网络..."
-#: ../../printerdrake.pm_.c:1930 ../../printerdrake.pm_.c:1934
-#: ../../printerdrake.pm_.c:1936
+#: ../../printerdrake.pm_.c:1978 ../../printerdrake.pm_.c:1982
+#: ../../printerdrake.pm_.c:1984
msgid "Configure the network now"
msgstr "正在配置网络"
-#: ../../printerdrake.pm_.c:1931
+#: ../../printerdrake.pm_.c:1979
msgid "Network functionality not configured"
msgstr "尚未完成网络配置"
-#: ../../printerdrake.pm_.c:1932
+#: ../../printerdrake.pm_.c:1980
msgid ""
"You are going to configure a remote printer. This needs working network "
"access, but your network is not configured yet. If you go on without network "
@@ -7562,11 +7749,11 @@ msgstr ""
"你在配置远程打印机. 配置远程打印需要网络访问,\n"
"但你还没有配置网络. 继续吗?"
-#: ../../printerdrake.pm_.c:1935
+#: ../../printerdrake.pm_.c:1983
msgid "Go on without configuring the network"
msgstr "略过网络配置"
-#: ../../printerdrake.pm_.c:1968
+#: ../../printerdrake.pm_.c:2016
msgid ""
"The network configuration done during the installation cannot be started "
"now. Please check whether the network gets accessable after booting your "
@@ -7579,7 +7766,7 @@ msgstr ""
"开机后检查网络或用 Mandrake 配置中心修改,节 \"网络和因特网\"/\"连接\", 然后用"
"\"硬件\"/\"打印机\"配置打印机"
-#: ../../printerdrake.pm_.c:1969
+#: ../../printerdrake.pm_.c:2017
msgid ""
"The network access was not running and could not be started. Please check "
"your configuration and your hardware. Then try to configure your remote "
@@ -7588,24 +7775,24 @@ msgstr ""
"网络访问出现错误.\n"
"请检查硬件击配置. 然后再配置远程打印."
-#: ../../printerdrake.pm_.c:1979
-msgid "Restarting printing system ..."
+#: ../../printerdrake.pm_.c:2027
+msgid "Restarting printing system..."
msgstr "重新启动打印机系统 ..."
-#: ../../printerdrake.pm_.c:2017
+#: ../../printerdrake.pm_.c:2065
msgid "high"
msgstr "高"
-#: ../../printerdrake.pm_.c:2017
+#: ../../printerdrake.pm_.c:2065
msgid "paranoid"
msgstr "严格"
-#: ../../printerdrake.pm_.c:2018
+#: ../../printerdrake.pm_.c:2066
#, c-format
msgid "Installing a printing system in the %s security level"
msgstr "在 %s 安全级别上安装打印系统"
-#: ../../printerdrake.pm_.c:2019
+#: ../../printerdrake.pm_.c:2067
#, c-format
msgid ""
"You are about to install the printing system %s on a system running in the %"
@@ -7627,11 +7814,11 @@ msgstr ""
"\n"
"你要配置打印吗?"
-#: ../../printerdrake.pm_.c:2051
+#: ../../printerdrake.pm_.c:2099
msgid "Starting the printing system at boot time"
msgstr "开机时启动打印系统"
-#: ../../printerdrake.pm_.c:2052
+#: ../../printerdrake.pm_.c:2100
#, c-format
msgid ""
"The printing system (%s) will not be started automatically when the machine "
@@ -7648,65 +7835,65 @@ msgstr ""
"\n"
"你希望让打印系统自动启动吗?"
-#: ../../printerdrake.pm_.c:2075 ../../printerdrake.pm_.c:2113
-#: ../../printerdrake.pm_.c:2143 ../../printerdrake.pm_.c:2176
-#: ../../printerdrake.pm_.c:2281
+#: ../../printerdrake.pm_.c:2123 ../../printerdrake.pm_.c:2163
+#: ../../printerdrake.pm_.c:2200 ../../printerdrake.pm_.c:2240
+#: ../../printerdrake.pm_.c:2352
msgid "Checking installed software..."
msgstr "检查已经安装的软件..."
-#: ../../printerdrake.pm_.c:2117
+#: ../../printerdrake.pm_.c:2167
msgid "Removing LPRng..."
msgstr "删除 LPRng..."
-#: ../../printerdrake.pm_.c:2147
+#: ../../printerdrake.pm_.c:2204
msgid "Removing LPD..."
msgstr "删除 LPD ..."
-#: ../../printerdrake.pm_.c:2205
+#: ../../printerdrake.pm_.c:2276
msgid "Select Printer Spooler"
msgstr "选择打印机"
-#: ../../printerdrake.pm_.c:2206
+#: ../../printerdrake.pm_.c:2277
msgid "Which printing system (spooler) do you want to use?"
msgstr "您需要使用哪种打印系统?"
-#: ../../printerdrake.pm_.c:2239
-#, c-format
-msgid "Configuring printer \"%s\" ..."
+#: ../../printerdrake.pm_.c:2310
+#, fuzzy, c-format
+msgid "Configuring printer \"%s\"..."
msgstr "设定打印机\"%s\" ..."
-#: ../../printerdrake.pm_.c:2252
+#: ../../printerdrake.pm_.c:2323
#, fuzzy
-msgid "Installing Foomatic ..."
+msgid "Installing Foomatic..."
msgstr "正在安装程序 ..."
-#: ../../printerdrake.pm_.c:2309 ../../printerdrake.pm_.c:2348
-#: ../../printerdrake.pm_.c:2733 ../../printerdrake.pm_.c:2803
+#: ../../printerdrake.pm_.c:2380 ../../printerdrake.pm_.c:2419
+#: ../../printerdrake.pm_.c:2804 ../../printerdrake.pm_.c:2874
msgid "Printer options"
msgstr "打印机选项"
-#: ../../printerdrake.pm_.c:2318
-msgid "Preparing PrinterDrake ..."
+#: ../../printerdrake.pm_.c:2389
+msgid "Preparing PrinterDrake..."
msgstr "准备打印机配置向导..."
-#: ../../printerdrake.pm_.c:2335 ../../printerdrake.pm_.c:2890
+#: ../../printerdrake.pm_.c:2406 ../../printerdrake.pm_.c:2961
#, fuzzy
msgid "Configuring applications..."
msgstr "设定打印机\"%s\" ..."
-#: ../../printerdrake.pm_.c:2355
+#: ../../printerdrake.pm_.c:2426
msgid "Would you like to configure printing?"
msgstr "您想要配置打印机吗 ?"
-#: ../../printerdrake.pm_.c:2367
+#: ../../printerdrake.pm_.c:2438
msgid "Printing system: "
msgstr "打印系统:"
-#: ../../printerdrake.pm_.c:2415
+#: ../../printerdrake.pm_.c:2486
msgid "Printerdrake"
msgstr "打印机配置向导"
-#: ../../printerdrake.pm_.c:2419
+#: ../../printerdrake.pm_.c:2490
#, fuzzy
msgid ""
"The following printers are configured. Double-click on a printer to change "
@@ -7718,7 +7905,7 @@ msgstr ""
"点击去修改或读取信息,\n"
"点击\"增加打印机\"增加新的打印机."
-#: ../../printerdrake.pm_.c:2420
+#: ../../printerdrake.pm_.c:2491
msgid ""
"The following printers are configured. Double-click on a printer to change "
"its settings; to make it the default printer; or to view information about "
@@ -7728,29 +7915,33 @@ msgstr ""
"点击去修改或读取信息,\n"
"点击\"增加打印机\"增加新的打印机."
-#: ../../printerdrake.pm_.c:2446
+#: ../../printerdrake.pm_.c:2517
msgid "Refresh printer list (to display all available remote CUPS printers)"
msgstr "更新列表 (显示远程 CUPS 打印服务器)"
-#: ../../printerdrake.pm_.c:2464
+#: ../../printerdrake.pm_.c:2535
#, fuzzy
msgid "Change the printing system"
msgstr "配置打印系统"
-#: ../../printerdrake.pm_.c:2469 ../../standalone/draknet_.c:278
+#: ../../printerdrake.pm_.c:2540 ../../standalone/drakconnect_.c:278
msgid "Normal Mode"
msgstr "普通模式"
-#: ../../printerdrake.pm_.c:2625 ../../printerdrake.pm_.c:2675
-#: ../../printerdrake.pm_.c:2884
+#: ../../printerdrake.pm_.c:2544 ../../standalone/logdrake_.c:225
+msgid "Quit"
+msgstr "结束"
+
+#: ../../printerdrake.pm_.c:2696 ../../printerdrake.pm_.c:2746
+#: ../../printerdrake.pm_.c:2955
msgid "Do you want to configure another printer?"
msgstr "您想要配置其他打印机吗 ?"
-#: ../../printerdrake.pm_.c:2711
+#: ../../printerdrake.pm_.c:2782
msgid "Modify printer configuration"
msgstr "修改打印机配置"
-#: ../../printerdrake.pm_.c:2713
+#: ../../printerdrake.pm_.c:2784
#, c-format
msgid ""
"Printer %s\n"
@@ -7759,103 +7950,103 @@ msgstr ""
"打印机 %s\n"
"要修改吗?"
-#: ../../printerdrake.pm_.c:2717
+#: ../../printerdrake.pm_.c:2788
msgid "Do it!"
msgstr "执行!"
-#: ../../printerdrake.pm_.c:2722 ../../printerdrake.pm_.c:2777
+#: ../../printerdrake.pm_.c:2793 ../../printerdrake.pm_.c:2848
msgid "Printer connection type"
msgstr "打印机连接类型"
-#: ../../printerdrake.pm_.c:2723 ../../printerdrake.pm_.c:2781
+#: ../../printerdrake.pm_.c:2794 ../../printerdrake.pm_.c:2852
msgid "Printer name, description, location"
msgstr "打印机名称, 描述, 位置"
-#: ../../printerdrake.pm_.c:2725 ../../printerdrake.pm_.c:2796
+#: ../../printerdrake.pm_.c:2796 ../../printerdrake.pm_.c:2867
msgid "Printer manufacturer, model, driver"
msgstr "打印机厂家, 型号, 驱动"
-#: ../../printerdrake.pm_.c:2726 ../../printerdrake.pm_.c:2797
+#: ../../printerdrake.pm_.c:2797 ../../printerdrake.pm_.c:2868
msgid "Printer manufacturer, model"
msgstr "打印机厂家, 型号"
-#: ../../printerdrake.pm_.c:2735 ../../printerdrake.pm_.c:2807
+#: ../../printerdrake.pm_.c:2806 ../../printerdrake.pm_.c:2878
msgid "Set this printer as the default"
msgstr "设置该打印机为却省"
-#: ../../printerdrake.pm_.c:2737 ../../printerdrake.pm_.c:2812
+#: ../../printerdrake.pm_.c:2808 ../../printerdrake.pm_.c:2883
msgid "Add this printer to Star Office/OpenOffice.org"
msgstr ""
-#: ../../printerdrake.pm_.c:2738 ../../printerdrake.pm_.c:2821
+#: ../../printerdrake.pm_.c:2809 ../../printerdrake.pm_.c:2892
msgid "Remove this printer from Star Office/OpenOffice.org"
msgstr ""
-#: ../../printerdrake.pm_.c:2739 ../../printerdrake.pm_.c:2830
+#: ../../printerdrake.pm_.c:2810 ../../printerdrake.pm_.c:2901
msgid "Print test pages"
msgstr "打印测试页"
-#: ../../printerdrake.pm_.c:2740 ../../printerdrake.pm_.c:2832
+#: ../../printerdrake.pm_.c:2811 ../../printerdrake.pm_.c:2903
#, fuzzy
msgid "Know how to use this printer"
msgstr "知道怎样用该打印机打印"
-#: ../../printerdrake.pm_.c:2742 ../../printerdrake.pm_.c:2834
+#: ../../printerdrake.pm_.c:2813 ../../printerdrake.pm_.c:2905
msgid "Remove printer"
msgstr "删除打印机"
-#: ../../printerdrake.pm_.c:2786
-#, c-format
-msgid "Removing old printer \"%s\" ..."
+#: ../../printerdrake.pm_.c:2857
+#, fuzzy, c-format
+msgid "Removing old printer \"%s\"..."
msgstr "删除旧打印机数据\"%s\" ..."
-#: ../../printerdrake.pm_.c:2810
+#: ../../printerdrake.pm_.c:2881
msgid "Default printer"
msgstr "缺省打印机"
-#: ../../printerdrake.pm_.c:2811
+#: ../../printerdrake.pm_.c:2882
#, c-format
msgid "The printer \"%s\" is set as the default printer now."
msgstr "打印机 \"%s\" 设为却省打印机."
-#: ../../printerdrake.pm_.c:2815 ../../printerdrake.pm_.c:2818
+#: ../../printerdrake.pm_.c:2886 ../../printerdrake.pm_.c:2889
msgid "Adding printer to Star Office/OpenOffice.org"
msgstr ""
-#: ../../printerdrake.pm_.c:2816
+#: ../../printerdrake.pm_.c:2887
#, c-format
msgid ""
"The printer \"%s\" was successfully added to Star Office/OpenOffice.org."
msgstr ""
-#: ../../printerdrake.pm_.c:2819
+#: ../../printerdrake.pm_.c:2890
#, c-format
msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org."
msgstr ""
-#: ../../printerdrake.pm_.c:2824 ../../printerdrake.pm_.c:2827
+#: ../../printerdrake.pm_.c:2895 ../../printerdrake.pm_.c:2898
msgid "Removing printer from Star Office/OpenOffice.org"
msgstr ""
-#: ../../printerdrake.pm_.c:2825
+#: ../../printerdrake.pm_.c:2896
#, c-format
msgid ""
"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org."
msgstr ""
-#: ../../printerdrake.pm_.c:2828
+#: ../../printerdrake.pm_.c:2899
#, c-format
msgid "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org."
msgstr ""
-#: ../../printerdrake.pm_.c:2836
+#: ../../printerdrake.pm_.c:2907
#, c-format
msgid "Do you really want to remove the printer \"%s\"?"
msgstr "真的删除打印机\"%s\"?"
-#: ../../printerdrake.pm_.c:2838
-#, c-format
-msgid "Removing printer \"%s\" ..."
+#: ../../printerdrake.pm_.c:2909
+#, fuzzy, c-format
+msgid "Removing printer \"%s\"..."
msgstr "删除打印机\"%s\" ..."
#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
@@ -7934,24 +8125,58 @@ msgstr "两次口令不符.重试!"
msgid "Can't add a partition to _formatted_ RAID md%d"
msgstr "无法加入一个分区到已经格式化的硬盘阵列 md%d"
-#: ../../raid.pm_.c:111
+#: ../../raid.pm_.c:108
#, c-format
msgid "Can't write file %s"
msgstr "无法写入 %s 文件"
-#: ../../raid.pm_.c:136
+#: ../../raid.pm_.c:137
msgid "mkraid failed"
msgstr "mkraid 失败"
-#: ../../raid.pm_.c:136
+#: ../../raid.pm_.c:137
msgid "mkraid failed (maybe raidtools are missing?)"
msgstr "mkraid 失败 (可能缺少 raidtools ?)"
-#: ../../raid.pm_.c:152
+#: ../../raid.pm_.c:153
#, c-format
msgid "Not enough partitions for RAID level %d\n"
msgstr "没有足够的分区建立 %d 级的硬盘阵列\n"
+#: ../../security/msec.pm_.c:144
+#, fuzzy
+msgid ""
+"This level is to be used with care. It makes your system more easy to use,\n"
+" but very sensitive: it must not be used for a machine "
+"connected to others\n"
+" or to the Internet. There is no password access."
+msgstr ""
+"无口令检查!\n"
+"这一级别应慎重使用. 它是您的系统使用更简单, 然而也更脆弱:\n"
+"假如这台机器将要和其他机器联网或者接入互联网, 绝对不要采用这个级别."
+
+#: ../../security/msec.pm_.c:150
+#, fuzzy
+msgid ""
+"With this security level, the use of this system as a server becomes "
+"possible.\n"
+" The security is now high enough to use the system as a "
+"server which can accept\n"
+" connections from many clients. Note: if your machine is only "
+"a client on the Internet, you should choose a lower level."
+msgstr ""
+"服务器推荐使用安全级别.\n"
+"拥有足够的安全性, 系统可以作为服务器接受来自众多客户的连接."
+
+#: ../../security/msec.pm_.c:169 ../../standalone/drakfont_.c:680
+msgid "Advanced Options"
+msgstr "高级选项"
+
+#: ../../security/msec.pm_.c:199
+#, fuzzy
+msgid "Basic Options"
+msgstr "选项"
+
#: ../../services.pm_.c:14
msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
msgstr "启动ALSA语音系统"
@@ -8006,7 +8231,7 @@ msgstr ""
"魔力硬盘HardDrake进行硬件检测,以及选项配置\n"
"新增/修改硬件"
-#: ../../services.pm_.c:28 ../../standalone/logdrake_.c:412
+#: ../../services.pm_.c:28
msgid ""
"Apache is a World Wide Web server. It is used to serve HTML files and CGI."
msgstr ""
@@ -8075,7 +8300,7 @@ msgid ""
"available server."
msgstr "Linux虚拟服务器, 用来构架高效和高可用系统"
-#: ../../services.pm_.c:47 ../../standalone/logdrake_.c:413
+#: ../../services.pm_.c:47
msgid ""
"named (BIND) is a Domain Name Server (DNS) that is used to resolve host "
"names to IP addresses."
@@ -8132,7 +8357,7 @@ msgid ""
"which act as servers for protocols which make use of the RPC mechanism."
msgstr ""
-#: ../../services.pm_.c:66 ../../standalone/logdrake_.c:415
+#: ../../services.pm_.c:66
msgid ""
"Postfix is a Mail Transport Agent, which is the program that moves mail from "
"one machine to another."
@@ -8219,7 +8444,7 @@ msgstr "互联网"
msgid "File sharing"
msgstr "文件共享"
-#: ../../services.pm_.c:128 ../../standalone/drakbackup_.c:934
+#: ../../services.pm_.c:128 ../../standalone/drakbackup_.c:1222
msgid "System"
msgstr "系统"
@@ -8334,6 +8559,7 @@ msgid ""
msgstr ""
#: ../../share/advertising/05-contcenter.pl_.c:9
+#: ../../standalone/drakbug_.c:49
#, fuzzy
msgid "Mandrake Control Center"
msgstr "控制中心"
@@ -8436,6 +8662,15 @@ msgstr ""
msgid "Installing packages..."
msgstr "正在安装程序 ..."
+#: ../../standalone/XFdrake_.c:131
+msgid "Please log out and then use Ctrl-Alt-BackSpace"
+msgstr "请退出, 然后同时按 Ctrl-Alt-BackSpace"
+
+#: ../../standalone/XFdrake_.c:135
+#, c-format
+msgid "Please relog into %s to activate the changes"
+msgstr "请重新登录到 %s 使您所做的更改生效"
+
#: ../../standalone/diskdrake_.c:85
msgid ""
"I can't read your partition table, it's too corrupted for me :(\n"
@@ -8444,6 +8679,160 @@ msgstr ""
"我读不出分区表, 这个分区表破坏得太严重了 :(\n"
"我现在尝试清除坏分区."
+#: ../../standalone/drakTermServ_.c:189
+#, fuzzy
+msgid "Mandrake Terminal Server Configuration"
+msgstr "传送打印机配置"
+
+#: ../../standalone/drakTermServ_.c:204
+#, fuzzy
+msgid "Enable Server"
+msgstr "数据库服务器"
+
+#: ../../standalone/drakTermServ_.c:211
+#, fuzzy
+msgid "Disable Server"
+msgstr "数据库服务器"
+
+#: ../../standalone/drakTermServ_.c:219
+#, fuzzy
+msgid "Start Server"
+msgstr "NIS 服务器"
+
+#: ../../standalone/drakTermServ_.c:226
+#, fuzzy
+msgid "Stop Server"
+msgstr "NIS 服务器"
+
+#: ../../standalone/drakTermServ_.c:234
+msgid "Etherboot Floppy/ISO"
+msgstr ""
+
+#: ../../standalone/drakTermServ_.c:236
+msgid "Net Boot Images"
+msgstr ""
+
+#: ../../standalone/drakTermServ_.c:240
+#, fuzzy
+msgid "Add/Del Users"
+msgstr "增加新用户"
+
+#: ../../standalone/drakTermServ_.c:242
+#, fuzzy
+msgid "Add/Del Clients"
+msgstr "DHCP客户端"
+
+#: ../../standalone/drakTermServ_.c:247 ../../standalone/drakbackup_.c:2635
+#: ../../standalone/drakbackup_.c:2666 ../../standalone/drakbackup_.c:2687
+#: ../../standalone/drakbackup_.c:2710 ../../standalone/drakbackup_.c:2737
+#: ../../standalone/drakbackup_.c:2776 ../../standalone/drakbackup_.c:2797
+#: ../../standalone/drakbackup_.c:2824 ../../standalone/drakbackup_.c:2848
+#: ../../standalone/drakbackup_.c:2870 ../../standalone/drakfont_.c:701
+msgid "Help"
+msgstr ""
+
+#: ../../standalone/drakTermServ_.c:434
+msgid "Boot Floppy"
+msgstr ""
+
+#: ../../standalone/drakTermServ_.c:436
+msgid "Boot ISO"
+msgstr ""
+
+#: ../../standalone/drakTermServ_.c:505
+msgid "Build Whole Kernel -->"
+msgstr ""
+
+#: ../../standalone/drakTermServ_.c:507 ../../standalone/drakTermServ_.c:537
+msgid "This will take a few minutes."
+msgstr ""
+
+#: ../../standalone/drakTermServ_.c:519
+msgid "No kernel selected!"
+msgstr ""
+
+#: ../../standalone/drakTermServ_.c:522
+msgid "Build Single NIC -->"
+msgstr ""
+
+#: ../../standalone/drakTermServ_.c:533
+#, fuzzy
+msgid "No nic selected!"
+msgstr "未连接"
+
+#: ../../standalone/drakTermServ_.c:536
+msgid "Build All Kernels -->"
+msgstr ""
+
+#: ../../standalone/drakTermServ_.c:550
+#, fuzzy
+msgid "<-- Delete"
+msgstr "删除"
+
+#: ../../standalone/drakTermServ_.c:557
+#, fuzzy
+msgid "Delete All NBIs"
+msgstr "选择所有"
+
+#: ../../standalone/drakTermServ_.c:619
+#, fuzzy
+msgid "Add User -->"
+msgstr "增加新用户"
+
+#: ../../standalone/drakTermServ_.c:627
+msgid "<-- Del User"
+msgstr ""
+
+#: ../../standalone/drakTermServ_.c:701
+msgid "Add Client -->"
+msgstr ""
+
+#: ../../standalone/drakTermServ_.c:733
+#, fuzzy
+msgid "<-- Del Client"
+msgstr "DHCP客户端"
+
+#: ../../standalone/drakTermServ_.c:739
+#, fuzzy
+msgid "dhcpd Config..."
+msgstr "正在配置..."
+
+#: ../../standalone/drakTermServ_.c:886
+#, fuzzy
+msgid "Write Config"
+msgstr "重新配置"
+
+#: ../../standalone/drakTermServ_.c:944
+#, fuzzy
+msgid "Please insert floppy disk:"
+msgstr "请插入一张启动软盘到驱动器 %s"
+
+#: ../../standalone/drakTermServ_.c:948
+msgid "Couldn't access the floppy!"
+msgstr ""
+
+#: ../../standalone/drakTermServ_.c:950
+msgid "Floppy can be removed now"
+msgstr ""
+
+#: ../../standalone/drakTermServ_.c:953
+#, fuzzy
+msgid "No floppy drive available!"
+msgstr "没有可用的软盘驱动器."
+
+#: ../../standalone/drakTermServ_.c:962
+#, c-format
+msgid "Etherboot ISO image is %s"
+msgstr ""
+
+#: ../../standalone/drakTermServ_.c:964
+msgid "Something went wrong! - Is mkisofs installed?"
+msgstr ""
+
+#: ../../standalone/drakTermServ_.c:983
+msgid "Need to create /etc/dhcpd.conf first!"
+msgstr ""
+
#: ../../standalone/drakautoinst_.c:45
msgid "Error!"
msgstr "错误!"
@@ -8489,6 +8878,11 @@ msgid ""
"will be manual"
msgstr "选择要重复的每一步安装, 否则手工"
+#: ../../standalone/drakautoinst_.c:83
+#, fuzzy
+msgid "Creating auto install floppy"
+msgstr "正在创建自动安装软盘"
+
#: ../../standalone/drakautoinst_.c:145
msgid ""
"\n"
@@ -8497,12 +8891,12 @@ msgid ""
"The parameters of the auto-install are available in the sections on the left"
msgstr ""
-#: ../../standalone/drakautoinst_.c:243 ../../standalone/drakgw_.c:671
+#: ../../standalone/drakautoinst_.c:240 ../../standalone/drakgw_.c:550
#: ../../standalone/scannerdrake_.c:106
msgid "Congratulations!"
msgstr "恭喜!"
-#: ../../standalone/drakautoinst_.c:244
+#: ../../standalone/drakautoinst_.c:241
msgid ""
"The floppy has been successfully generated.\n"
"You may now replay your installation."
@@ -8510,26 +8904,19 @@ msgstr ""
"软盘成功生成.\n"
"你可以重复安装."
-#: ../../standalone/drakautoinst_.c:282
+#: ../../standalone/drakautoinst_.c:279
msgid "Auto Install"
msgstr "自动安装"
-#: ../../standalone/drakautoinst_.c:352
+#: ../../standalone/drakautoinst_.c:349
msgid "Add an item"
msgstr "增加条目"
-#: ../../standalone/drakautoinst_.c:359
+#: ../../standalone/drakautoinst_.c:356
msgid "Remove the last item"
msgstr "删除最后一项吗?"
-#: ../../standalone/drakbackup_.c:448 ../../standalone/drakbackup_.c:451
-#: ../../standalone/drakbackup_.c:455
-msgid ""
-"***********************************************************************\n"
-"\n"
-msgstr ""
-
-#: ../../standalone/drakbackup_.c:449
+#: ../../standalone/drakbackup_.c:599
msgid ""
"\n"
" DrakBackup Report \n"
@@ -8539,7 +8926,7 @@ msgstr ""
" 备份向导报告 \n"
"\n"
-#: ../../standalone/drakbackup_.c:450
+#: ../../standalone/drakbackup_.c:600
msgid ""
"\n"
" DrakBackup Daemon Report\n"
@@ -8551,15 +8938,7 @@ msgstr ""
"\n"
"\n"
-#: ../../standalone/drakbackup_.c:453
-msgid ""
-"\n"
-"\n"
-"***********************************************************************\n"
-"\n"
-msgstr ""
-
-#: ../../standalone/drakbackup_.c:454
+#: ../../standalone/drakbackup_.c:604
msgid ""
"\n"
" DrakBackup Report Details\n"
@@ -8571,163 +8950,180 @@ msgstr ""
"\n"
"\n"
-#: ../../standalone/drakbackup_.c:476
+#: ../../standalone/drakbackup_.c:626 ../../standalone/drakbackup_.c:642
msgid "total progess"
msgstr "进度"
-#: ../../standalone/drakbackup_.c:555 ../../standalone/drakbackup_.c:602
+#: ../../standalone/drakbackup_.c:751 ../../standalone/drakbackup_.c:795
msgid "Backup system files..."
msgstr "备份系统文件..."
-#: ../../standalone/drakbackup_.c:603 ../../standalone/drakbackup_.c:667
+#: ../../standalone/drakbackup_.c:796 ../../standalone/drakbackup_.c:858
msgid "Hard Disk Backup files..."
msgstr "备份硬盘文件..."
-#: ../../standalone/drakbackup_.c:615
+#: ../../standalone/drakbackup_.c:808
msgid "Backup User files..."
msgstr "备份用户文件..."
-#: ../../standalone/drakbackup_.c:616
+#: ../../standalone/drakbackup_.c:809
msgid "Hard Disk Backup Progress..."
msgstr "硬盘文件备份进度..."
-#: ../../standalone/drakbackup_.c:666
+#: ../../standalone/drakbackup_.c:857
msgid "Backup Other files..."
msgstr "备份其它文件..."
-#: ../../standalone/drakbackup_.c:674
+#: ../../standalone/drakbackup_.c:871 ../../standalone/drakbackup_.c:895
#, c-format
msgid ""
-"file list send by FTP : %s\n"
+"\n"
+"Drakbackup activities via %s:\n"
+"\n"
+msgstr ""
+
+#: ../../standalone/drakbackup_.c:880
+#, c-format
+msgid ""
+"file list sent by FTP : %s\n"
" "
msgstr ""
-#: ../../standalone/drakbackup_.c:677
+#: ../../standalone/drakbackup_.c:883
+#, fuzzy
msgid ""
"\n"
-"(!) FTP connexion problem: It was not possible to send your backup files by "
+" FTP connection problem: It was not possible to send your backup files by "
"FTP.\n"
msgstr ""
"\n"
"(!) FTP 联接错误: 无法传送文件.\n"
-#: ../../standalone/drakbackup_.c:687
-msgid "(!) Error during mail sending. \n"
+#: ../../standalone/drakbackup_.c:900
+msgid ""
+"\n"
+"Drakbackup activities via CD:\n"
+"\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:728 ../../standalone/drakbackup_.c:739
-#: ../../standalone/drakbackup_.c:750 ../../standalone/drakfont_.c:787
+#: ../../standalone/drakbackup_.c:905
+msgid ""
+"\n"
+"Drakbackup activities via tape:\n"
+"\n"
+msgstr ""
+
+#: ../../standalone/drakbackup_.c:914
+#, fuzzy
+msgid " Error during mail sending. \n"
+msgstr "请取文件 %s 出错 "
+
+#: ../../standalone/drakbackup_.c:1011 ../../standalone/drakbackup_.c:1022
+#: ../../standalone/drakbackup_.c:1033 ../../standalone/drakfont_.c:1005
msgid "File Selection"
msgstr "选择文件"
-#: ../../standalone/drakbackup_.c:755
+#: ../../standalone/drakbackup_.c:1038
msgid "Select the files or directories and click on 'Add'"
msgstr "选择文件或目录, 然后点击 '增加'"
-#: ../../standalone/drakbackup_.c:790
+#: ../../standalone/drakbackup_.c:1078
msgid ""
"\n"
"Please check all options that you need.\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:791
+#: ../../standalone/drakbackup_.c:1079
msgid ""
"These options can backup and restore all files in your /etc directory.\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:792
+#: ../../standalone/drakbackup_.c:1080
msgid "Backup your System files. ( /etc directory )"
msgstr ""
-#: ../../standalone/drakbackup_.c:793
+#: ../../standalone/drakbackup_.c:1081
msgid "Use incremental backup (do not replace old backups)"
msgstr ""
-#: ../../standalone/drakbackup_.c:794
+#: ../../standalone/drakbackup_.c:1082
msgid "Do not include critical files (passwd, group, fstab)"
msgstr ""
-#: ../../standalone/drakbackup_.c:795
+#: ../../standalone/drakbackup_.c:1083
msgid ""
"With this option you will be able to restore any version\n"
" of your /etc directory."
msgstr ""
-#: ../../standalone/drakbackup_.c:812
+#: ../../standalone/drakbackup_.c:1100
msgid "Please check all users that you want to include in your backup."
msgstr "请选择您希望备份的用户"
-#: ../../standalone/drakbackup_.c:839
+#: ../../standalone/drakbackup_.c:1127
msgid "Do not include the browser cache"
msgstr ""
-#: ../../standalone/drakbackup_.c:840 ../../standalone/drakbackup_.c:864
+#: ../../standalone/drakbackup_.c:1128 ../../standalone/drakbackup_.c:1152
msgid "Use Incremental Backups (do not replace old backups)"
msgstr "增量备份"
-#: ../../standalone/drakbackup_.c:862 ../../standalone/drakfont_.c:827
+#: ../../standalone/drakbackup_.c:1150 ../../standalone/drakfont_.c:1059
msgid "Remove Selected"
msgstr "移除选择"
-#: ../../standalone/drakbackup_.c:900
+#: ../../standalone/drakbackup_.c:1188
msgid "Windows (FAT32)"
msgstr "Windows(FAT32)"
-#: ../../standalone/drakbackup_.c:939
+#: ../../standalone/drakbackup_.c:1227
msgid "Users"
msgstr "用户"
-#: ../../standalone/drakbackup_.c:964
-msgid "Use FTP connection to backup"
+#: ../../standalone/drakbackup_.c:1257
+#, fuzzy
+msgid "Use network connection to backup"
msgstr "使用 FTP 备份"
-#: ../../standalone/drakbackup_.c:967
+#: ../../standalone/drakbackup_.c:1264
msgid "Please enter the host name or IP."
msgstr "请输入主机名或 IP 地址."
-#: ../../standalone/drakbackup_.c:972
+#: ../../standalone/drakbackup_.c:1269
msgid ""
-"Please enter the directory to\n"
+"Please enter the directory (or module) to\n"
" put the backup on this host."
msgstr ""
-#: ../../standalone/drakbackup_.c:977
+#: ../../standalone/drakbackup_.c:1274
msgid "Please enter your login"
msgstr "请输入您的登录名"
-#: ../../standalone/drakbackup_.c:982
+#: ../../standalone/drakbackup_.c:1279
msgid "Please enter your password"
msgstr "请输入您的口令"
-#: ../../standalone/drakbackup_.c:988
+#: ../../standalone/drakbackup_.c:1285
msgid "Remember this password"
msgstr "记住口令"
-#: ../../standalone/drakbackup_.c:1052 ../../standalone/drakbackup_.c:2048
-msgid "FTP Connection"
-msgstr "FTP 连接"
-
-#: ../../standalone/drakbackup_.c:1059 ../../standalone/drakbackup_.c:2056
-msgid "Secure Connection"
-msgstr "加密连接"
-
-#: ../../standalone/drakbackup_.c:1085 ../../standalone/drakbackup_.c:2889
+#: ../../standalone/drakbackup_.c:1360 ../../standalone/drakbackup_.c:3295
msgid "Use CD/DVDROM to backup"
msgstr "使用 CD/DVDROM 备份"
-#: ../../standalone/drakbackup_.c:1088 ../../standalone/drakbackup_.c:2893
+#: ../../standalone/drakbackup_.c:1363 ../../standalone/drakbackup_.c:3299
msgid "Please choose your CD space"
msgstr "请选择您使用的 CD 空间大小."
-#: ../../standalone/drakbackup_.c:1094 ../../standalone/drakbackup_.c:2905
+#: ../../standalone/drakbackup_.c:1369 ../../standalone/drakbackup_.c:3311
msgid "Please check if you are using CDRW media"
msgstr "请选中这里, 如果您使用 CDRW 设备"
-#: ../../standalone/drakbackup_.c:1100 ../../standalone/drakbackup_.c:2911
+#: ../../standalone/drakbackup_.c:1375 ../../standalone/drakbackup_.c:3317
msgid "Please check if you want to erase your CDRW before"
msgstr ""
-#: ../../standalone/drakbackup_.c:1106
+#: ../../standalone/drakbackup_.c:1382
msgid ""
"Please check if you want to include\n"
" install boot on your CD."
@@ -8735,193 +9131,226 @@ msgstr ""
"请选中这里, 如果您希望制作启动光盘\n"
"该光盘可自启动."
-#: ../../standalone/drakbackup_.c:1112
+#: ../../standalone/drakbackup_.c:1388
msgid ""
"Please enter your CD Writer device name\n"
" ex: 0,1,0"
msgstr ""
-#: ../../standalone/drakbackup_.c:1153
+#: ../../standalone/drakbackup_.c:1437
msgid "Use tape to backup"
msgstr "使用磁带备份"
-#: ../../standalone/drakbackup_.c:1156
+#: ../../standalone/drakbackup_.c:1440
msgid "Please enter the device name to use for backup"
msgstr ""
-#: ../../standalone/drakbackup_.c:1162 ../../standalone/drakbackup_.c:1203
-#: ../../standalone/drakbackup_.c:2013
+#: ../../standalone/drakbackup_.c:1446
+#, fuzzy
+msgid "Please check if you want to erase your tape before the backup."
+msgstr "请选择您希望备份的用户"
+
+#: ../../standalone/drakbackup_.c:1452 ../../standalone/drakbackup_.c:1505
+#: ../../standalone/drakbackup_.c:2381
msgid ""
"Please enter the maximum size\n"
" allowed for Drakbackup"
msgstr ""
-#: ../../standalone/drakbackup_.c:1195 ../../standalone/drakbackup_.c:2005
-msgid "Please enter the directory to save:"
+#: ../../standalone/drakbackup_.c:1497
+#, fuzzy
+msgid "Please enter the directory to save to:"
msgstr "请输入目录名:"
-#: ../../standalone/drakbackup_.c:1209 ../../standalone/drakbackup_.c:2019
+#: ../../standalone/drakbackup_.c:1511 ../../standalone/drakbackup_.c:2387
msgid "Use quota for backup files."
msgstr "备份文件磁盘限额"
-#: ../../standalone/drakbackup_.c:1267
+#: ../../standalone/drakbackup_.c:1580
msgid "Network"
msgstr "网络"
-#: ../../standalone/drakbackup_.c:1272
+#: ../../standalone/drakbackup_.c:1585
msgid "CDROM / DVDROM"
msgstr ""
-#: ../../standalone/drakbackup_.c:1277
+#: ../../standalone/drakbackup_.c:1590
msgid "HardDrive / NFS"
msgstr ""
-#: ../../standalone/drakbackup_.c:1297 ../../standalone/drakbackup_.c:1301
-#: ../../standalone/drakbackup_.c:1305
+#: ../../standalone/drakbackup_.c:1595
+#, fuzzy
+msgid "Tape"
+msgstr "类型"
+
+#: ../../standalone/drakbackup_.c:1609 ../../standalone/drakbackup_.c:1613
+#: ../../standalone/drakbackup_.c:1617
msgid "hourly"
msgstr "每小时"
-#: ../../standalone/drakbackup_.c:1298 ../../standalone/drakbackup_.c:1302
-#: ../../standalone/drakbackup_.c:1305
+#: ../../standalone/drakbackup_.c:1610 ../../standalone/drakbackup_.c:1614
+#: ../../standalone/drakbackup_.c:1617
msgid "daily"
msgstr "每日"
-#: ../../standalone/drakbackup_.c:1299 ../../standalone/drakbackup_.c:1303
-#: ../../standalone/drakbackup_.c:1305
+#: ../../standalone/drakbackup_.c:1611 ../../standalone/drakbackup_.c:1615
+#: ../../standalone/drakbackup_.c:1617
msgid "weekly"
msgstr "每周"
-#: ../../standalone/drakbackup_.c:1300 ../../standalone/drakbackup_.c:1304
-#: ../../standalone/drakbackup_.c:1305
+#: ../../standalone/drakbackup_.c:1612 ../../standalone/drakbackup_.c:1616
+#: ../../standalone/drakbackup_.c:1617
msgid "monthly"
msgstr "每月"
-#: ../../standalone/drakbackup_.c:1312
+#: ../../standalone/drakbackup_.c:1630
msgid "Use daemon"
msgstr "使用守护进程"
-#: ../../standalone/drakbackup_.c:1317
+#: ../../standalone/drakbackup_.c:1635
msgid ""
"Please choose the time \n"
"interval between each backup"
msgstr "请选择您希望备份时间间隔"
-#: ../../standalone/drakbackup_.c:1323
+#: ../../standalone/drakbackup_.c:1641
msgid ""
"Please choose the\n"
"media for backup."
msgstr "请选择备份介质."
-#: ../../standalone/drakbackup_.c:1327
-msgid "Use Hard Drive with daemon"
-msgstr "使用硬盘"
-
-#: ../../standalone/drakbackup_.c:1329
-msgid "Use FTP with daemon"
-msgstr "使用 FTP"
-
-#: ../../standalone/drakbackup_.c:1333
-msgid "Please be sure that the cron daemon is included in your services."
+#: ../../standalone/drakbackup_.c:1648
+msgid ""
+"Please be sure that the cron daemon is included in your services. \n"
+"\n"
+"Note that currently all 'net' medias also use the hard drive."
msgstr ""
-#: ../../standalone/drakbackup_.c:1369
+#: ../../standalone/drakbackup_.c:1706
msgid "Send mail report after each backup to :"
msgstr ""
-#: ../../standalone/drakbackup_.c:1411
+#: ../../standalone/drakbackup_.c:1748
msgid "What"
msgstr ""
-#: ../../standalone/drakbackup_.c:1416
+#: ../../standalone/drakbackup_.c:1753
msgid "Where"
msgstr "位置"
-#: ../../standalone/drakbackup_.c:1421
+#: ../../standalone/drakbackup_.c:1758
msgid "When"
msgstr "时间"
-#: ../../standalone/drakbackup_.c:1426
+#: ../../standalone/drakbackup_.c:1763
msgid "More Options"
msgstr "参数"
-#: ../../standalone/drakbackup_.c:1445 ../../standalone/drakbackup_.c:2801
+#: ../../standalone/drakbackup_.c:1782 ../../standalone/drakbackup_.c:3207
msgid "Drakbackup Configuration"
msgstr "DrakBackup 配置"
-#: ../../standalone/drakbackup_.c:1463
+#: ../../standalone/drakbackup_.c:1800
msgid "Please choose where you want to backup"
msgstr "请选择您希望备份文件到哪里"
-#: ../../standalone/drakbackup_.c:1465
+#: ../../standalone/drakbackup_.c:1802
msgid "on Hard Drive"
msgstr ""
-#: ../../standalone/drakbackup_.c:1476
+#: ../../standalone/drakbackup_.c:1813
msgid "across Network"
msgstr ""
-#: ../../standalone/drakbackup_.c:1540
+#: ../../standalone/drakbackup_.c:1877
msgid "Please choose what you want to backup"
msgstr "请选择您要备份的文件"
-#: ../../standalone/drakbackup_.c:1541
+#: ../../standalone/drakbackup_.c:1878
msgid "Backup system"
msgstr "备份系统"
-#: ../../standalone/drakbackup_.c:1542
+#: ../../standalone/drakbackup_.c:1879
msgid "Backup Users"
msgstr "备份用户"
-#: ../../standalone/drakbackup_.c:1545
+#: ../../standalone/drakbackup_.c:1882
msgid "Select user manually"
msgstr "手工选择用户"
-#: ../../standalone/drakbackup_.c:1627
+#: ../../standalone/drakbackup_.c:1964
msgid ""
"\n"
"Backup Sources: \n"
msgstr ""
-#: ../../standalone/drakbackup_.c:1628
+#: ../../standalone/drakbackup_.c:1965
msgid ""
"\n"
"- System Files:\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:1630
+#: ../../standalone/drakbackup_.c:1967
msgid ""
"\n"
"- User Files:\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:1632
+#: ../../standalone/drakbackup_.c:1969
msgid ""
"\n"
"- Other Files:\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:1634
+#: ../../standalone/drakbackup_.c:1971
#, c-format
msgid ""
"\n"
"- Save on Hard drive on path : %s\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:1635
+#: ../../standalone/drakbackup_.c:1976
+msgid ""
+"\n"
+"- Burn to CD"
+msgstr ""
+
+#: ../../standalone/drakbackup_.c:1977
+msgid "RW"
+msgstr ""
+
+#: ../../standalone/drakbackup_.c:1978
+#, fuzzy, c-format
+msgid " on device : %s"
+msgstr "鼠标连接设备: %s\n"
+
+#: ../../standalone/drakbackup_.c:1979
#, c-format
msgid ""
"\n"
-"- Save on FTP on host : %s\n"
+"- Save to Tape on device : %s"
+msgstr ""
+
+#: ../../standalone/drakbackup_.c:1980
+#, c-format
+msgid "\t\tErase=%s"
msgstr ""
-#: ../../standalone/drakbackup_.c:1636
+#: ../../standalone/drakbackup_.c:1983
+#, c-format
+msgid ""
+"\n"
+"- Save via %s on host : %s\n"
+msgstr ""
+
+#: ../../standalone/drakbackup_.c:1984
#, c-format
msgid ""
"\t\t user name: %s\n"
"\t\t on path: %s \n"
msgstr ""
-#: ../../standalone/drakbackup_.c:1637
+#: ../../standalone/drakbackup_.c:1985
msgid ""
"\n"
"- Options:\n"
@@ -8929,301 +9358,319 @@ msgstr ""
"\n"
"- 选项:\n"
-#: ../../standalone/drakbackup_.c:1638
+#: ../../standalone/drakbackup_.c:1986
msgid "\tDo not include System Files\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:1639
+#: ../../standalone/drakbackup_.c:1989
msgid "\tBackups use tar and bzip2\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:1640
+#: ../../standalone/drakbackup_.c:1991
msgid "\tBackups use tar and gzip\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:1641
+#: ../../standalone/drakbackup_.c:1994
#, c-format
msgid ""
"\n"
"- Daemon (%s) include :\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:1642
+#: ../../standalone/drakbackup_.c:1995
msgid "\t-Hard drive.\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:1643
+#: ../../standalone/drakbackup_.c:1996
msgid "\t-CDROM.\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:1644
+#: ../../standalone/drakbackup_.c:1997
+msgid "\t-Tape \n"
+msgstr ""
+
+#: ../../standalone/drakbackup_.c:1998
msgid "\t-Network by FTP.\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:1645
+#: ../../standalone/drakbackup_.c:1999
msgid "\t-Network by SSH.\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:1647
+#: ../../standalone/drakbackup_.c:2000
+msgid "\t-Network by rsync.\n"
+msgstr ""
+
+#: ../../standalone/drakbackup_.c:2001
+msgid "\t-Network by webdav.\n"
+msgstr ""
+
+#: ../../standalone/drakbackup_.c:2003
msgid "No configuration, please click Wizard or Advanced.\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:1652
+#: ../../standalone/drakbackup_.c:2009
msgid ""
"List of data to restore:\n"
"\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:1753
+#: ../../standalone/drakbackup_.c:2113
msgid ""
"List of data corrupted:\n"
"\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:1755
+#: ../../standalone/drakbackup_.c:2115
msgid "Please uncheck or remove it on next time."
msgstr "请取消选择并删除它."
-#: ../../standalone/drakbackup_.c:1765
+#: ../../standalone/drakbackup_.c:2125
msgid "Backup files are corrupted"
msgstr "备份文件损坏了"
-#: ../../standalone/drakbackup_.c:1786
+#: ../../standalone/drakbackup_.c:2146
msgid " All your selectionned data have been "
msgstr ""
-#: ../../standalone/drakbackup_.c:1787
+#: ../../standalone/drakbackup_.c:2147
#, c-format
msgid " Successfuly Restored on %s "
msgstr ""
-#: ../../standalone/drakbackup_.c:1886
+#: ../../standalone/drakbackup_.c:2254
msgid " Restore Configuration "
msgstr " 恢复更改 "
-#: ../../standalone/drakbackup_.c:1904
+#: ../../standalone/drakbackup_.c:2272
msgid "OK to restore the other files."
msgstr ""
-#: ../../standalone/drakbackup_.c:1922
+#: ../../standalone/drakbackup_.c:2290
msgid "User list to restore (only the most recent date per user is important)"
msgstr ""
-#: ../../standalone/drakbackup_.c:1972
+#: ../../standalone/drakbackup_.c:2340
msgid "Backup the system files before:"
msgstr "备份系统文件之前:"
-#: ../../standalone/drakbackup_.c:1974
+#: ../../standalone/drakbackup_.c:2342
msgid "please choose the date to restore"
msgstr "请选择需要恢复的数据"
-#: ../../standalone/drakbackup_.c:2002
+#: ../../standalone/drakbackup_.c:2370
msgid "Use Hard Disk to backup"
msgstr "使用硬盘备份文件"
-#: ../../standalone/drakbackup_.c:2083
+#: ../../standalone/drakbackup_.c:2373
+msgid "Please enter the directory to save:"
+msgstr "请输入目录名:"
+
+#: ../../standalone/drakbackup_.c:2416
+msgid "FTP Connection"
+msgstr "FTP 连接"
+
+#: ../../standalone/drakbackup_.c:2424
+msgid "Secure Connection"
+msgstr "加密连接"
+
+#: ../../standalone/drakbackup_.c:2451
msgid "Restore from Hard Disk."
msgstr "从硬盘恢复"
-#: ../../standalone/drakbackup_.c:2085
+#: ../../standalone/drakbackup_.c:2453
msgid "Please enter the directory where backups are stored"
msgstr ""
-#: ../../standalone/drakbackup_.c:2143
+#: ../../standalone/drakbackup_.c:2512
msgid "Select another media to restore from"
msgstr "请选择另一载体"
-#: ../../standalone/drakbackup_.c:2145
+#: ../../standalone/drakbackup_.c:2514
msgid "Other Media"
msgstr "载体"
-#: ../../standalone/drakbackup_.c:2151
+#: ../../standalone/drakbackup_.c:2520
msgid "Restore system"
msgstr "恢复系统"
-#: ../../standalone/drakbackup_.c:2152
+#: ../../standalone/drakbackup_.c:2521
msgid "Restore Users"
msgstr "恢复用户文件"
-#: ../../standalone/drakbackup_.c:2153
+#: ../../standalone/drakbackup_.c:2522
msgid "Restore Other"
msgstr "恢复其它文件"
-#: ../../standalone/drakbackup_.c:2155
+#: ../../standalone/drakbackup_.c:2524
msgid "select path to restore (instead of / )"
msgstr ""
-#: ../../standalone/drakbackup_.c:2159
+#: ../../standalone/drakbackup_.c:2528
msgid "Do new backup before restore (only for incremental backups.)"
msgstr ""
-#: ../../standalone/drakbackup_.c:2160
+#: ../../standalone/drakbackup_.c:2529
msgid "Remove user directories before restore."
msgstr ""
-#: ../../standalone/drakbackup_.c:2217
+#: ../../standalone/drakbackup_.c:2586
msgid "Restore all backups"
msgstr ""
-#: ../../standalone/drakbackup_.c:2225
+#: ../../standalone/drakbackup_.c:2594
msgid "Custom Restore"
msgstr "定制"
-#: ../../standalone/drakbackup_.c:2266 ../../standalone/drakbackup_.c:2291
-#: ../../standalone/drakbackup_.c:2312 ../../standalone/drakbackup_.c:2333
-#: ../../standalone/drakbackup_.c:2351 ../../standalone/drakbackup_.c:2383
-#: ../../standalone/drakbackup_.c:2399 ../../standalone/drakbackup_.c:2419
-#: ../../standalone/drakbackup_.c:2438 ../../standalone/drakbackup_.c:2460
-#: ../../standalone/drakfont_.c:575
-msgid "Help"
-msgstr ""
-
-#: ../../standalone/drakbackup_.c:2269 ../../standalone/drakbackup_.c:2296
-#: ../../standalone/drakbackup_.c:2315 ../../standalone/drakbackup_.c:2336
-#: ../../standalone/drakbackup_.c:2354 ../../standalone/drakbackup_.c:2402
-#: ../../standalone/drakbackup_.c:2422 ../../standalone/drakbackup_.c:2441
+#: ../../standalone/drakbackup_.c:2640 ../../standalone/drakbackup_.c:2671
+#: ../../standalone/drakbackup_.c:2690 ../../standalone/drakbackup_.c:2715
+#: ../../standalone/drakbackup_.c:2742 ../../standalone/drakbackup_.c:2802
+#: ../../standalone/drakbackup_.c:2829 ../../standalone/drakbackup_.c:2851
msgid "Previous"
msgstr "前一步"
-#: ../../standalone/drakbackup_.c:2271 ../../standalone/drakbackup_.c:2338
+#: ../../standalone/drakbackup_.c:2644 ../../standalone/drakbackup_.c:2719
#: ../../standalone/logdrake_.c:224
msgid "Save"
msgstr "保存"
-#: ../../standalone/drakbackup_.c:2317
+#: ../../standalone/drakbackup_.c:2692
msgid "Build Backup"
msgstr "正在备份"
-#: ../../standalone/drakbackup_.c:2356 ../../standalone/drakbackup_.c:3033
+#: ../../standalone/drakbackup_.c:2746 ../../standalone/drakbackup_.c:3458
msgid "Restore"
msgstr "恢复"
-#: ../../standalone/drakbackup_.c:2404 ../../standalone/drakbackup_.c:2424
-#: ../../standalone/drakbackup_.c:2445
+#: ../../standalone/drakbackup_.c:2806 ../../standalone/drakbackup_.c:2833
+#: ../../standalone/drakbackup_.c:2855
msgid "Next"
msgstr "下一步"
-#: ../../standalone/drakbackup_.c:2478
+#: ../../standalone/drakbackup_.c:2888
msgid ""
"Please Build backup before to restore it...\n"
" or verify that your path to save is correct."
msgstr ""
-#: ../../standalone/drakbackup_.c:2499
+#: ../../standalone/drakbackup_.c:2909
msgid ""
"Error durind sendmail\n"
" your report mail was not sent\n"
" Please configure sendmail"
msgstr ""
-#: ../../standalone/drakbackup_.c:2522
-msgid "Package List to Install"
-msgstr "选择软件包"
+#: ../../standalone/drakbackup_.c:2933
+#, fuzzy
+msgid ""
+"The following packages need to be installed:\n"
+" @list_of_rpm_to_install"
+msgstr "下列软件包将要被安装"
-#: ../../standalone/drakbackup_.c:2550
+#: ../../standalone/drakbackup_.c:2956
msgid ""
-"Error durind sending file via FTP.\n"
+"Error during sending file via FTP.\n"
" Please correct your FTP configuration."
msgstr ""
-#: ../../standalone/drakbackup_.c:2573
+#: ../../standalone/drakbackup_.c:2979
msgid "Please select data to restore..."
msgstr "请选择要恢复的数据..."
-#: ../../standalone/drakbackup_.c:2594
+#: ../../standalone/drakbackup_.c:3000
msgid "Please select media for backup..."
msgstr "请选择使用的载体..."
-#: ../../standalone/drakbackup_.c:2616
+#: ../../standalone/drakbackup_.c:3022
msgid "Please select data to backup..."
msgstr "请选择需备份的数据..."
-#: ../../standalone/drakbackup_.c:2638
+#: ../../standalone/drakbackup_.c:3044
msgid ""
"No configuration file found \n"
"please click Wizard or Advanced."
msgstr ""
-#: ../../standalone/drakbackup_.c:2659
+#: ../../standalone/drakbackup_.c:3065
msgid "Under Devel ... please wait."
msgstr ""
-#: ../../standalone/drakbackup_.c:2739
+#: ../../standalone/drakbackup_.c:3145
#, fuzzy
msgid "Backup system files"
msgstr "错误的备份文件"
-#: ../../standalone/drakbackup_.c:2741
+#: ../../standalone/drakbackup_.c:3147
#, fuzzy
msgid "Backup user files"
msgstr "错误的备份文件"
-#: ../../standalone/drakbackup_.c:2743
+#: ../../standalone/drakbackup_.c:3149
#, fuzzy
msgid "Backup other files"
msgstr "错误的备份文件"
-#: ../../standalone/drakbackup_.c:2745 ../../standalone/drakbackup_.c:2776
+#: ../../standalone/drakbackup_.c:3151 ../../standalone/drakbackup_.c:3182
msgid "Total Progress"
msgstr ""
-#: ../../standalone/drakbackup_.c:2767
+#: ../../standalone/drakbackup_.c:3173
msgid "files sending by FTP"
msgstr ""
-#: ../../standalone/drakbackup_.c:2771
+#: ../../standalone/drakbackup_.c:3177
#, fuzzy
msgid "Sending files..."
msgstr "正在探测设备..."
-#: ../../standalone/drakbackup_.c:2841
+#: ../../standalone/drakbackup_.c:3247
msgid "Data list to include on CDROM."
msgstr ""
-#: ../../standalone/drakbackup_.c:2899
+#: ../../standalone/drakbackup_.c:3305
#, fuzzy
msgid "Please enter the cd writer speed"
msgstr "请测试您的鼠标."
-#: ../../standalone/drakbackup_.c:2917
+#: ../../standalone/drakbackup_.c:3323
msgid "Please enter your CD Writer device name (ex: 0,1,0)"
msgstr ""
-#: ../../standalone/drakbackup_.c:2923
+#: ../../standalone/drakbackup_.c:3329
#, fuzzy
msgid "Please check if you want to include install boot on your CD."
msgstr "请选择您要安装的软件包"
-#: ../../standalone/drakbackup_.c:2989
+#: ../../standalone/drakbackup_.c:3409
#, fuzzy
msgid "Backup Now from configuration file"
msgstr "网络配置"
-#: ../../standalone/drakbackup_.c:2999
+#: ../../standalone/drakbackup_.c:3419
#, fuzzy
msgid "View Backup Configuration."
msgstr "网络配置"
-#: ../../standalone/drakbackup_.c:3020
+#: ../../standalone/drakbackup_.c:3440
#, fuzzy
msgid "Wizard Configuration"
msgstr "配置"
-#: ../../standalone/drakbackup_.c:3024
+#: ../../standalone/drakbackup_.c:3445
#, fuzzy
msgid "Advanced Configuration"
msgstr "LAN 配置"
-#: ../../standalone/drakbackup_.c:3028
+#: ../../standalone/drakbackup_.c:3450
#, fuzzy
msgid "Backup Now"
msgstr "设定文件系统"
-#: ../../standalone/drakbackup_.c:3053
+#: ../../standalone/drakbackup_.c:3480
msgid "Drakbackup"
msgstr ""
-#: ../../standalone/drakbackup_.c:3104
+#: ../../standalone/drakbackup_.c:3529
msgid ""
"options description:\n"
"\n"
@@ -9255,7 +9702,7 @@ msgid ""
"\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:3134
+#: ../../standalone/drakbackup_.c:3559
msgid ""
"\n"
" Some errors during sendmail are caused by \n"
@@ -9264,7 +9711,7 @@ msgid ""
"\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:3142
+#: ../../standalone/drakbackup_.c:3567
msgid ""
"options description:\n"
"\n"
@@ -9305,7 +9752,7 @@ msgid ""
"\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:3181
+#: ../../standalone/drakbackup_.c:3606
msgid ""
"restore description:\n"
" \n"
@@ -9333,12 +9780,17 @@ msgid ""
"\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:3207 ../../standalone/drakbackup_.c:3282
+#: ../../standalone/drakbackup_.c:3632 ../../standalone/drakbackup_.c:3709
msgid ""
" Copyright (C) 2001 MandrakeSoft by DUPONT Sebastien <dupont_s\\@epita.fr>"
msgstr ""
-#: ../../standalone/drakbackup_.c:3209 ../../standalone/drakbackup_.c:3284
+#: ../../standalone/drakbackup_.c:3634 ../../standalone/drakbackup_.c:3711
+msgid ""
+" updates 2002 MandrakeSoft by Stew Benedict <sbenedict\\@mandrakesoft.com>"
+msgstr ""
+
+#: ../../standalone/drakbackup_.c:3636 ../../standalone/drakbackup_.c:3713
msgid ""
" This program is free software; you can redistribute it and/or modify\n"
" it under the terms of the GNU General Public License as published by\n"
@@ -9355,7 +9807,7 @@ msgid ""
" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
msgstr ""
-#: ../../standalone/drakbackup_.c:3223
+#: ../../standalone/drakbackup_.c:3650
msgid ""
"Description:\n"
"\n"
@@ -9395,7 +9847,7 @@ msgid ""
"\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:3261
+#: ../../standalone/drakbackup_.c:3688
msgid ""
"options description:\n"
"\n"
@@ -9406,7 +9858,7 @@ msgid ""
"\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:3270
+#: ../../standalone/drakbackup_.c:3697
msgid ""
"\n"
"Restore Backup Problems:\n"
@@ -9419,7 +9871,7 @@ msgid ""
"backup data files by hand.\n"
msgstr ""
-#: ../../standalone/drakbackup_.c:3298
+#: ../../standalone/drakbackup_.c:3727
msgid ""
"Description:\n"
"\n"
@@ -9463,99 +9915,524 @@ msgstr ""
msgid "Installation of %s failed. The following error occured:"
msgstr "安装 %s 失败,出现下列错误:"
-#: ../../standalone/drakfont_.c:229
+#: ../../standalone/drakbug_.c:40
+msgid "Mandrake Bug Report Tool"
+msgstr ""
+
+#: ../../standalone/drakbug_.c:50
+msgid "First Time Wizard"
+msgstr ""
+
+#: ../../standalone/drakbug_.c:51
+msgid "Synchronization tool"
+msgstr ""
+
+#: ../../standalone/drakbug_.c:52 ../../standalone/drakbug_.c:65
+#, fuzzy
+msgid "Standalone Tools"
+msgstr "控制台工具"
+
+#: ../../standalone/drakbug_.c:53
+msgid "HardDrake"
+msgstr ""
+
+#: ../../standalone/drakbug_.c:54
+#, fuzzy
+msgid "Mandrake Online"
+msgstr "控制中心"
+
+#: ../../standalone/drakbug_.c:55
+#, fuzzy
+msgid "Menudrake"
+msgstr "专家"
+
+#: ../../standalone/drakbug_.c:56
+#, fuzzy
+msgid "Msec"
+msgstr "鼠标"
+
+#: ../../standalone/drakbug_.c:57
+#, fuzzy
+msgid "Remote Control"
+msgstr "远程打印机"
+
+#: ../../standalone/drakbug_.c:58
+#, fuzzy
+msgid "Software Manager"
+msgstr "共享名"
+
+#: ../../standalone/drakbug_.c:59
+msgid "Urpmi"
+msgstr ""
+
+#: ../../standalone/drakbug_.c:60
+msgid "Windows Migration tool"
+msgstr ""
+
+#: ../../standalone/drakbug_.c:61
+#, fuzzy
+msgid "Userdrake"
+msgstr "打印机配置向导"
+
+#: ../../standalone/drakbug_.c:62
+#, fuzzy
+msgid "Configuration Wizards"
+msgstr "网络配置"
+
+#: ../../standalone/drakbug_.c:71
+#, fuzzy
+msgid "Application:"
+msgstr "认证"
+
+#: ../../standalone/drakbug_.c:75
+#, fuzzy
+msgid "Package: "
+msgstr "软件包选择"
+
+#: ../../standalone/drakbug_.c:79
+msgid "Kernel:"
+msgstr ""
+
+#: ../../standalone/drakbug_.c:83
+#, fuzzy
+msgid "Release: "
+msgstr "请稍候"
+
+#: ../../standalone/drakbug_.c:87
+msgid ""
+"\n"
+"\n"
+"To submit a bug report, click on the button report.\n"
+"This will open a web browser window on https://www.bugzilla.com\n"
+" where you'll find a form to fill in.The information displayed above will "
+"be \n"
+"transferred to that server\n"
+"\n"
+msgstr ""
+
+#: ../../standalone/drakbug_.c:101
+#, fuzzy
+msgid "Not installed"
+msgstr "删除后的设定"
+
+#: ../../standalone/drakbug_.c:110
+#, fuzzy
+msgid "Report"
+msgstr "端口"
+
+#: ../../standalone/drakbug_.c:123
+msgid "connecting to Bugzilla wizard ..."
+msgstr ""
+
+#: ../../standalone/drakbug_.c:129
+#, fuzzy
+msgid "No browser available! Please install one"
+msgstr "您可以在安装到 %s 之后再使用屏幕捕捉功能"
+
+#: ../../standalone/drakconnect_.c:80
+#, c-format
+msgid "Network configuration (%d adapters)"
+msgstr "网络配置(%d 网卡)"
+
+#: ../../standalone/drakconnect_.c:87 ../../standalone/drakconnect_.c:595
+msgid "Profile: "
+msgstr "Profile: "
+
+#: ../../standalone/drakconnect_.c:95
+msgid "Del profile..."
+msgstr "删除profile..."
+
+#: ../../standalone/drakconnect_.c:101
+msgid "Profile to delete:"
+msgstr "要删除的profile:"
+
+#: ../../standalone/drakconnect_.c:129
+msgid "New profile..."
+msgstr "新建profile..."
+
+#: ../../standalone/drakconnect_.c:135
+msgid ""
+"Name of the profile to create (the new profile is created as a copy of the "
+"current one) :"
+msgstr "新建profile名:"
+
+#: ../../standalone/drakconnect_.c:161
+msgid "Hostname: "
+msgstr "主机名字:"
+
+#: ../../standalone/drakconnect_.c:168
+msgid "Internet access"
+msgstr "互联网访问"
+
+#: ../../standalone/drakconnect_.c:181
+msgid "Type:"
+msgstr "类型: "
+
+#: ../../standalone/drakconnect_.c:184 ../../standalone/drakconnect_.c:376
+msgid "Gateway:"
+msgstr "网关:"
+
+#: ../../standalone/drakconnect_.c:184 ../../standalone/drakconnect_.c:376
+msgid "Interface:"
+msgstr "网卡:"
+
+#: ../../standalone/drakconnect_.c:195
+msgid "Status:"
+msgstr "状态:"
+
+#: ../../standalone/drakconnect_.c:202
+msgid "Wait please"
+msgstr ""
+
+#: ../../standalone/drakconnect_.c:220
+msgid "Configure Internet Access..."
+msgstr "设定因特网访问服务"
+
+#: ../../standalone/drakconnect_.c:227 ../../standalone/drakconnect_.c:449
+msgid "LAN configuration"
+msgstr "局域网配置"
+
+#: ../../standalone/drakconnect_.c:232
+msgid "Driver"
+msgstr "驱动程序"
+
+#: ../../standalone/drakconnect_.c:232
+msgid "Interface"
+msgstr "接口"
+
+#: ../../standalone/drakconnect_.c:232
+msgid "Protocol"
+msgstr "协议"
+
+#: ../../standalone/drakconnect_.c:232
+msgid "State"
+msgstr "状态"
+
+#: ../../standalone/drakconnect_.c:244
+msgid "Configure Local Area Network..."
+msgstr "配置局域网络..."
+
+#: ../../standalone/drakconnect_.c:256
+msgid "Click here to launch the wizard ->"
+msgstr "点击该处启动精灵 ->"
+
+#: ../../standalone/drakconnect_.c:257
+msgid "Wizard..."
+msgstr "向导..."
+
+#: ../../standalone/drakconnect_.c:283
+msgid "Apply"
+msgstr "应用"
+
+#: ../../standalone/drakconnect_.c:302
+msgid "Please Wait... Applying the configuration"
+msgstr "请等待...设定配置"
+
+#: ../../standalone/drakconnect_.c:384 ../../standalone/drakconnect_.c:407
+msgid "Connected"
+msgstr "连接"
+
+#: ../../standalone/drakconnect_.c:384 ../../standalone/drakconnect_.c:407
+msgid "Not connected"
+msgstr "未连接"
+
+#: ../../standalone/drakconnect_.c:385 ../../standalone/drakconnect_.c:408
+msgid "Connect..."
+msgstr "连接..."
+
+#: ../../standalone/drakconnect_.c:385 ../../standalone/drakconnect_.c:408
+msgid "Disconnect..."
+msgstr "断开..."
+
+#: ../../standalone/drakconnect_.c:404
+msgid ""
+"Warning, another Internet connection has been detected, maybe using your "
+"network"
+msgstr ""
+
+#: ../../standalone/drakconnect_.c:431
+msgid ""
+"You don't have any configured interface.\n"
+"Configure them first by clicking on 'Configure'"
+msgstr ""
+"你没有配置好的接口.\n"
+"点击 '配置' 先配置接口"
+
+#: ../../standalone/drakconnect_.c:453
+msgid "LAN Configuration"
+msgstr "LAN 配置"
+
+#: ../../standalone/drakconnect_.c:464
+#, c-format
+msgid "Adapter %s: %s"
+msgstr "适配器 %s: %s"
+
+#: ../../standalone/drakconnect_.c:470
+msgid "Boot Protocol"
+msgstr "启动协议"
+
+#: ../../standalone/drakconnect_.c:471
+msgid "Started on boot"
+msgstr "开机时启动"
+
+#: ../../standalone/drakconnect_.c:472
+msgid "DHCP client"
+msgstr "DHCP客户端"
+
+#: ../../standalone/drakconnect_.c:497 ../../standalone/drakconnect_.c:500
+msgid "activate now"
+msgstr "现在激活"
+
+#: ../../standalone/drakconnect_.c:497 ../../standalone/drakconnect_.c:500
+msgid "deactivate now"
+msgstr "现在禁用"
+
+#: ../../standalone/drakconnect_.c:503
+msgid ""
+"This interface has not been configured yet.\n"
+"Launch the configuration wizard in the main window"
+msgstr ""
+
+#: ../../standalone/drakconnect_.c:560
+msgid ""
+"You don't have any internet connection.\n"
+"Create one first by clicking on 'Configure'"
+msgstr ""
+"你没有因特网联接.\n"
+"点击 '配置' 先建立联接"
+
+#: ../../standalone/drakconnect_.c:584
+msgid "Internet connection configuration"
+msgstr "互联网连接配置"
+
+#: ../../standalone/drakconnect_.c:588
+msgid "Internet Connection Configuration"
+msgstr "互联网连接配置"
+
+#: ../../standalone/drakconnect_.c:597
+msgid "Connection type: "
+msgstr "连接类型:"
+
+#: ../../standalone/drakconnect_.c:603
+msgid "Parameters"
+msgstr "参数"
+
+#: ../../standalone/drakconnect_.c:621
+msgid "Gateway"
+msgstr "网关"
+
+#: ../../standalone/drakconnect_.c:630
+msgid "Ethernet Card"
+msgstr "网卡"
+
+#: ../../standalone/drakconnect_.c:631
+msgid "DHCP Client"
+msgstr "DHCP客户端"
+
+#: ../../standalone/drakfloppy_.c:64
+msgid "usage: drakfloppy\n"
+msgstr "用法: drakfloppy\n"
+
+#: ../../standalone/drakfloppy_.c:68
+msgid "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
+msgstr "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
+
+#: ../../standalone/drakfloppy_.c:69
+msgid "Module name"
+msgstr "模块"
+
+#: ../../standalone/drakfloppy_.c:69
+msgid "Size"
+msgstr "大小"
+
+#: ../../standalone/drakfloppy_.c:74 ../../standalone/drakfloppy_.c:373
+msgid "drakfloppy"
+msgstr "魔力软盘"
+
+#: ../../standalone/drakfloppy_.c:91
+msgid "boot disk creation"
+msgstr "创建开机磁盘的工具"
+
+#: ../../standalone/drakfloppy_.c:99 ../../standalone/drakfloppy_.c:112
+msgid "default"
+msgstr "缺省"
+
+#: ../../standalone/drakfloppy_.c:115
+#, c-format
+msgid "DrakFloppy Error: %s"
+msgstr "DrakFloppy 错误: %s"
+
+#: ../../standalone/drakfloppy_.c:126
+msgid "kernel version"
+msgstr "内核版本"
+
+#: ../../standalone/drakfloppy_.c:132
+msgid "General"
+msgstr "常规"
+
+#: ../../standalone/drakfloppy_.c:137
+msgid "Expert Area"
+msgstr "专家"
+
+#: ../../standalone/drakfloppy_.c:140
+msgid "mkinitrd optional arguments"
+msgstr "mkinitrd选项"
+
+#: ../../standalone/drakfloppy_.c:141
+msgid "Add a module"
+msgstr "增加模块"
+
+#: ../../standalone/drakfloppy_.c:161
+msgid "force"
+msgstr "强迫"
+
+#: ../../standalone/drakfloppy_.c:162
+msgid "if needed"
+msgstr "当需要时"
+
+#: ../../standalone/drakfloppy_.c:163
+msgid "omit scsi modules"
+msgstr "省略 scsi 模块"
+
+#: ../../standalone/drakfloppy_.c:164
+msgid "omit raid modules"
+msgstr "省略 RAID 模块"
+
+#: ../../standalone/drakfloppy_.c:200
+msgid "Remove a module"
+msgstr "卸载模块"
+
+#: ../../standalone/drakfloppy_.c:222
+msgid "Output"
+msgstr "输出"
+
+#: ../../standalone/drakfloppy_.c:234
+msgid "Build the disk"
+msgstr "制作开机启动盘"
+
+#: ../../standalone/drakfloppy_.c:422
+#, c-format
+msgid "Be sure a media is present for the device %s"
+msgstr "确定设备 %s 的介质存在"
+
+#: ../../standalone/drakfloppy_.c:427
+#, fuzzy, c-format
+msgid ""
+"There is no medium or it is write-protected for device %s.\n"
+"Please insert one."
+msgstr ""
+"设备 %s 介质不存在.\n"
+"请插入介质"
+
+#: ../../standalone/drakfloppy_.c:429
+#, c-format
+msgid "Unable to fork: %s"
+msgstr "无法创建进程: %s"
+
+#: ../../standalone/drakfloppy_.c:433
+#, c-format
+msgid ""
+"Unable to close properly mkbootdisk: \n"
+" %s \n"
+" %s"
+msgstr ""
+"无法正确关闭 mkbootdisk: \n"
+"%s \n"
+"%s"
+
+#: ../../standalone/drakfont_.c:232
msgid "Search installed fonts"
msgstr "查找已安装的字体"
-#: ../../standalone/drakfont_.c:231
+#: ../../standalone/drakfont_.c:234
msgid "Unselect fonts installed"
msgstr "不选已安装的文件"
-#: ../../standalone/drakfont_.c:252
+#: ../../standalone/drakfont_.c:258
msgid "parse all fonts"
msgstr "分析所有字体"
-#: ../../standalone/drakfont_.c:253
+#: ../../standalone/drakfont_.c:261
msgid "no fonts found"
msgstr "找不到字库文件"
-#: ../../standalone/drakfont_.c:261 ../../standalone/drakfont_.c:303
-#: ../../standalone/drakfont_.c:352 ../../standalone/drakfont_.c:410
-#: ../../standalone/drakfont_.c:417 ../../standalone/drakfont_.c:443
-#: ../../standalone/drakfont_.c:455 ../../standalone/drakfont_.c:468
+#: ../../standalone/drakfont_.c:270 ../../standalone/drakfont_.c:324
+#: ../../standalone/drakfont_.c:380 ../../standalone/drakfont_.c:469
+#: ../../standalone/drakfont_.c:480 ../../standalone/drakfont_.c:507
+#: ../../standalone/drakfont_.c:521 ../../standalone/drakfont_.c:538
msgid "done"
msgstr "完成"
-#: ../../standalone/drakfont_.c:265
+#: ../../standalone/drakfont_.c:276
msgid "could not find any font in your mounted partitions"
msgstr "在分区中找不到任何字库"
-#: ../../standalone/drakfont_.c:301
+#: ../../standalone/drakfont_.c:322
msgid "Reselect correct fonts"
msgstr ""
-#: ../../standalone/drakfont_.c:304
+#: ../../standalone/drakfont_.c:326
msgid "could not find any font.\n"
msgstr "找不到任何字库\n"
-#: ../../standalone/drakfont_.c:327
+#: ../../standalone/drakfont_.c:350
msgid "Search fonts in installed list"
msgstr "在安装记录中查找字库"
-#: ../../standalone/drakfont_.c:350
+#: ../../standalone/drakfont_.c:378
msgid "Fonts copy"
msgstr "拷贝字库"
-#: ../../standalone/drakfont_.c:353
+#: ../../standalone/drakfont_.c:382
msgid "True Type fonts installation"
msgstr "安装 TTF 字库"
-#: ../../standalone/drakfont_.c:357
+#: ../../standalone/drakfont_.c:390
msgid "please wait during ttmkfdir..."
msgstr "正在运行 ttmkfdir..."
-#: ../../standalone/drakfont_.c:359
+#: ../../standalone/drakfont_.c:395
msgid "True Type install done"
msgstr "TTF 字库安装完成"
-#: ../../standalone/drakfont_.c:366 ../../standalone/drakfont_.c:382
+#: ../../standalone/drakfont_.c:404 ../../standalone/drakfont_.c:430
msgid "Fonts conversion"
msgstr "转换字库"
-#: ../../standalone/drakfont_.c:370 ../../standalone/drakfont_.c:386
-#: ../../standalone/drakfont_.c:406
+#: ../../standalone/drakfont_.c:410 ../../standalone/drakfont_.c:434
+#: ../../standalone/drakfont_.c:465
msgid "type1inst building"
msgstr "正在构造 type1inst"
-#: ../../standalone/drakfont_.c:375 ../../standalone/drakfont_.c:390
+#: ../../standalone/drakfont_.c:420 ../../standalone/drakfont_.c:443
msgid "Ghostscript referencing"
msgstr "Ghostscript 引用"
-#: ../../standalone/drakfont_.c:397
+#: ../../standalone/drakfont_.c:453
msgid "ttf fonts conversion"
msgstr "ttf 字库转换"
-#: ../../standalone/drakfont_.c:401
+#: ../../standalone/drakfont_.c:460
msgid "pfm fonts conversion"
msgstr "pfm 字库转换"
-#: ../../standalone/drakfont_.c:411
+#: ../../standalone/drakfont_.c:471
msgid "Suppress temporary Files"
msgstr "删除临时文件"
-#: ../../standalone/drakfont_.c:414
+#: ../../standalone/drakfont_.c:474
msgid "Restart XFS"
msgstr "重新启动 XFS"
-#: ../../standalone/drakfont_.c:453 ../../standalone/drakfont_.c:463
+#: ../../standalone/drakfont_.c:519 ../../standalone/drakfont_.c:533
msgid "Suppress Fonts Files"
msgstr "删除字库文件"
-#: ../../standalone/drakfont_.c:465
+#: ../../standalone/drakfont_.c:535
msgid "xfs restart"
msgstr "xfs restart"
-#: ../../standalone/drakfont_.c:472 ../../standalone/drakfont_.c:760
+#: ../../standalone/drakfont_.c:543 ../../standalone/drakfont_.c:952
msgid ""
"Before installing any fonts, be sure that you have the right to use and "
"install them on your system.\n"
@@ -9564,107 +10441,107 @@ msgid ""
"may hang up your X Server."
msgstr ""
-#: ../../standalone/drakfont_.c:547
+#: ../../standalone/drakfont_.c:631
msgid "Fonts Importation"
msgstr "引入字库"
-#: ../../standalone/drakfont_.c:562
+#: ../../standalone/drakfont_.c:661
msgid "Get Windows Fonts"
msgstr "引入 Windows 字库"
-#: ../../standalone/drakfont_.c:564
+#: ../../standalone/drakfont_.c:669
msgid "Uninstall Fonts"
msgstr "卸载字库"
-#: ../../standalone/drakfont_.c:568
-msgid "Advanced Options"
-msgstr "高级选项"
-
-#: ../../standalone/drakfont_.c:570
+#: ../../standalone/drakfont_.c:688
msgid "Font List"
msgstr "所有字库"
-#: ../../standalone/drakfont_.c:739
+#: ../../standalone/drakfont_.c:910
msgid "Choose the applications that will support the fonts :"
msgstr "请选择使用新字体的应用程序 :"
-#: ../../standalone/drakfont_.c:743
+#: ../../standalone/drakfont_.c:919
msgid "Ghostscript"
msgstr ""
-#: ../../standalone/drakfont_.c:747
+#: ../../standalone/drakfont_.c:926
msgid "StarOffice"
msgstr "StarOffice"
-#: ../../standalone/drakfont_.c:751
+#: ../../standalone/drakfont_.c:933
msgid "Abiword"
msgstr "Abiword"
-#: ../../standalone/drakfont_.c:755
+#: ../../standalone/drakfont_.c:940
msgid "Generic Printers"
msgstr "基本打印"
-#: ../../standalone/drakfont_.c:792
+#: ../../standalone/drakfont_.c:1017
msgid "Select the font file or directory and click on 'Add'"
msgstr ""
-#: ../../standalone/drakfont_.c:828
+#: ../../standalone/drakfont_.c:1064
msgid "Install List"
msgstr "安装列表"
-#: ../../standalone/drakfont_.c:858
+#: ../../standalone/drakfont_.c:1107
msgid "click here if you are sure."
msgstr "确认"
-#: ../../standalone/drakfont_.c:860
+#: ../../standalone/drakfont_.c:1114
msgid "here if no."
msgstr "放弃"
-#: ../../standalone/drakfont_.c:897
+#: ../../standalone/drakfont_.c:1175
msgid "Unselected All"
msgstr "取消选择"
-#: ../../standalone/drakfont_.c:899
+#: ../../standalone/drakfont_.c:1179
msgid "Selected All"
msgstr "选择所有"
-#: ../../standalone/drakfont_.c:901
+#: ../../standalone/drakfont_.c:1183
msgid "Remove List"
msgstr "删除列表"
-#: ../../standalone/drakfont_.c:919 ../../standalone/drakfont_.c:939
+#: ../../standalone/drakfont_.c:1205 ../../standalone/drakfont_.c:1238
msgid "Initials tests"
msgstr "初始测试"
-#: ../../standalone/drakfont_.c:920
+#: ../../standalone/drakfont_.c:1208
msgid "Copy fonts on your system"
msgstr "拷贝字库"
-#: ../../standalone/drakfont_.c:921
+#: ../../standalone/drakfont_.c:1212
msgid "Install & convert Fonts"
msgstr "安装并转换字库"
-#: ../../standalone/drakfont_.c:922
+#: ../../standalone/drakfont_.c:1216
msgid "Post Install"
msgstr "安装后的设定"
-#: ../../standalone/drakfont_.c:940
+#: ../../standalone/drakfont_.c:1241
msgid "Remove fonts on your system"
msgstr "删除字库"
-#: ../../standalone/drakfont_.c:941
+#: ../../standalone/drakfont_.c:1245
msgid "Post Uninstall"
msgstr "删除后的设定"
-#: ../../standalone/drakgw_.c:43 ../../standalone/drakgw_.c:200
+#: ../../standalone/drakgw_.c:44 ../../standalone/drakgw_.c:197
msgid "Internet Connection Sharing"
msgstr "共享互联网连接"
-#: ../../standalone/drakgw_.c:138
+#: ../../standalone/drakgw_.c:123
+msgid "Sorry, we support only 2.4 kernels."
+msgstr ""
+
+#: ../../standalone/drakgw_.c:135
msgid "Internet Connection Sharing currently enabled"
msgstr "互联网连接共享现在已经激活"
-#: ../../standalone/drakgw_.c:139
+#: ../../standalone/drakgw_.c:136
msgid ""
"The setup of Internet connection sharing has already been done.\n"
"It's currently enabled.\n"
@@ -9676,31 +10553,31 @@ msgstr ""
"\n"
"您要做什么?"
-#: ../../standalone/drakgw_.c:143
+#: ../../standalone/drakgw_.c:140
msgid "disable"
msgstr "禁止"
-#: ../../standalone/drakgw_.c:143 ../../standalone/drakgw_.c:168
+#: ../../standalone/drakgw_.c:140 ../../standalone/drakgw_.c:165
msgid "dismiss"
msgstr "离开"
-#: ../../standalone/drakgw_.c:143 ../../standalone/drakgw_.c:168
+#: ../../standalone/drakgw_.c:140 ../../standalone/drakgw_.c:165
msgid "reconfigure"
msgstr "重新配置"
-#: ../../standalone/drakgw_.c:146
+#: ../../standalone/drakgw_.c:143
msgid "Disabling servers..."
msgstr "停止服务..."
-#: ../../standalone/drakgw_.c:154
+#: ../../standalone/drakgw_.c:151
msgid "Internet connection sharing is now disabled."
msgstr "互联网连接共享现在被禁止了"
-#: ../../standalone/drakgw_.c:163
+#: ../../standalone/drakgw_.c:160
msgid "Internet Connection Sharing currently disabled"
msgstr "互联网连接共享现在被禁止"
-#: ../../standalone/drakgw_.c:164
+#: ../../standalone/drakgw_.c:161
msgid ""
"The setup of Internet connection sharing has already been done.\n"
"It's currently disabled.\n"
@@ -9712,19 +10589,19 @@ msgstr ""
"\n"
"您要做什么?"
-#: ../../standalone/drakgw_.c:168
+#: ../../standalone/drakgw_.c:165
msgid "enable"
msgstr "启动"
-#: ../../standalone/drakgw_.c:175
+#: ../../standalone/drakgw_.c:172
msgid "Enabling servers..."
msgstr "启动服务..."
-#: ../../standalone/drakgw_.c:180
+#: ../../standalone/drakgw_.c:177
msgid "Internet connection sharing is now enabled."
msgstr "互联网连接共享现在已经激活"
-#: ../../standalone/drakgw_.c:201
+#: ../../standalone/drakgw_.c:198
msgid ""
"You are about to configure your computer to share its Internet connection.\n"
"With that feature, other computers on your local network will be able to use "
@@ -9737,31 +10614,31 @@ msgstr ""
"\n"
"注意: 您需要有局域网(LAN)使用的网卡."
-#: ../../standalone/drakgw_.c:227
+#: ../../standalone/drakgw_.c:224
#, c-format
msgid "Interface %s (using module %s)"
msgstr "网卡 %s (使用 %s 模块)"
-#: ../../standalone/drakgw_.c:228
+#: ../../standalone/drakgw_.c:225
#, c-format
msgid "Interface %s"
msgstr "网卡 %s"
-#: ../../standalone/drakgw_.c:236
+#: ../../standalone/drakgw_.c:233
msgid "No network adapter on your system!"
msgstr "您系统中没有网络卡!"
-#: ../../standalone/drakgw_.c:237
+#: ../../standalone/drakgw_.c:234
msgid ""
"No ethernet network adapter has been detected on your system. Please run the "
"hardware configuration tool."
msgstr "您的系统里没有配置以太网卡. 请运行硬件配置工具."
-#: ../../standalone/drakgw_.c:243
+#: ../../standalone/drakgw_.c:240
msgid "Network interface"
msgstr "网络接口卡"
-#: ../../standalone/drakgw_.c:244
+#: ../../standalone/drakgw_.c:241
#, c-format
msgid ""
"There is only one configured network adapter on your system:\n"
@@ -9776,17 +10653,17 @@ msgstr ""
"\n"
"对这块网卡配置您的局域网."
-#: ../../standalone/drakgw_.c:253
+#: ../../standalone/drakgw_.c:250
msgid ""
"Please choose what network adapter will be connected to your Local Area "
"Network."
msgstr "请选择哪个网卡将连接您的局域网."
-#: ../../standalone/drakgw_.c:271
+#: ../../standalone/drakgw_.c:268
msgid "Network interface already configured"
msgstr "已完成网络配置"
-#: ../../standalone/drakgw_.c:272
+#: ../../standalone/drakgw_.c:269
#, c-format
msgid ""
"Warning, the network adapter (%s) is already configured.\n"
@@ -9796,15 +10673,15 @@ msgid ""
"You can do it manually but you need to know what you're doing."
msgstr ""
-#: ../../standalone/drakgw_.c:277
+#: ../../standalone/drakgw_.c:274
msgid "Automatic reconfiguration"
msgstr "自动重新配置"
-#: ../../standalone/drakgw_.c:278
+#: ../../standalone/drakgw_.c:275
msgid "Show current interface configuration"
msgstr "修改当前网络界面的配置"
-#: ../../standalone/drakgw_.c:280
+#: ../../standalone/drakgw_.c:277
#, c-format
msgid ""
"Current configuration of `%s':\n"
@@ -9821,7 +10698,7 @@ msgstr ""
"IP 属性: %s\n"
"其它: %s"
-#: ../../standalone/drakgw_.c:292
+#: ../../standalone/drakgw_.c:289
msgid ""
"I can keep your current configuration and assume you already set up a DHCP "
"server; in that case please verify I correctly read the C-Class Network that "
@@ -9833,32 +10710,32 @@ msgid ""
"\n"
msgstr ""
-#: ../../standalone/drakgw_.c:297
+#: ../../standalone/drakgw_.c:294
msgid "C-Class Local Network"
msgstr "C 级局域网"
-#: ../../standalone/drakgw_.c:298
+#: ../../standalone/drakgw_.c:295
msgid "(This) DHCP Server IP"
msgstr "DHCP 服务器 IP"
-#: ../../standalone/drakgw_.c:299
+#: ../../standalone/drakgw_.c:296
msgid "Re-configure interface and DHCP server"
msgstr "重新配置网络界面和 DHCP "
-#: ../../standalone/drakgw_.c:306
+#: ../../standalone/drakgw_.c:303
msgid "The Local Network did not finish with `.0', bailing out."
msgstr ""
-#: ../../standalone/drakgw_.c:317
+#: ../../standalone/drakgw_.c:314
#, c-format
msgid "Potential LAN address conflict found in current config of %s!\n"
msgstr "在当前的 %s 配置中发现可能的 LAN 地址冲突! \n"
-#: ../../standalone/drakgw_.c:325 ../../standalone/drakgw_.c:331
+#: ../../standalone/drakgw_.c:322
msgid "Firewalling configuration detected!"
msgstr "发现防火墙配置!"
-#: ../../standalone/drakgw_.c:326 ../../standalone/drakgw_.c:332
+#: ../../standalone/drakgw_.c:323
msgid ""
"Warning! An existing firewalling configuration has been detected. You may "
"need some manual fix after installation."
@@ -9866,20 +10743,20 @@ msgstr ""
"警告! 发现原来的配置利用了防火墙功能.\n"
"您需要在安装之后手工修改."
-#: ../../standalone/drakgw_.c:340
+#: ../../standalone/drakgw_.c:330
msgid "Configuring..."
msgstr "正在配置..."
-#: ../../standalone/drakgw_.c:341
+#: ../../standalone/drakgw_.c:331
msgid "Configuring scripts, installing software, starting servers..."
msgstr "正在配置脚本, 安装软件, 启动服务程序 ..."
-#: ../../standalone/drakgw_.c:378
+#: ../../standalone/drakgw_.c:367
#, c-format
msgid "Problems installing package %s"
msgstr "安装 %s 软件包出现问题"
-#: ../../standalone/drakgw_.c:672
+#: ../../standalone/drakgw_.c:551
msgid ""
"Everything has been configured.\n"
"You may now share Internet connection with other computers on your Local "
@@ -9889,23 +10766,23 @@ msgstr ""
"您现在可以利用自动网络设置 (DHCP).让您的局域网上其它的电脑共享您的互联网连接"
"了."
-#: ../../standalone/drakgw_.c:689
+#: ../../standalone/drakgw_.c:568
msgid "The setup has already been done, but it's currently disabled."
msgstr "配置已经完成.它当前已经被禁止."
-#: ../../standalone/drakgw_.c:690
+#: ../../standalone/drakgw_.c:569
msgid "The setup has already been done, and it's currently enabled."
msgstr "配置已经完成.它当前已经被启动."
-#: ../../standalone/drakgw_.c:691
+#: ../../standalone/drakgw_.c:570
msgid "No Internet Connection Sharing has ever been configured."
msgstr "互联网连接共享没有配置"
-#: ../../standalone/drakgw_.c:696
+#: ../../standalone/drakgw_.c:575
msgid "Internet connection sharing configuration"
msgstr "互联网连接共享配置"
-#: ../../standalone/drakgw_.c:703
+#: ../../standalone/drakgw_.c:582
#, c-format
msgid ""
"Welcome to the Internet Connection Sharing utility!\n"
@@ -9920,210 +10797,6 @@ msgstr ""
"\n"
"点击''配置''运行配置精灵."
-#: ../../standalone/draknet_.c:80
-#, c-format
-msgid "Network configuration (%d adapters)"
-msgstr "网络配置(%d 网卡)"
-
-#: ../../standalone/draknet_.c:87 ../../standalone/draknet_.c:595
-msgid "Profile: "
-msgstr "Profile: "
-
-#: ../../standalone/draknet_.c:95
-msgid "Del profile..."
-msgstr "删除profile..."
-
-#: ../../standalone/draknet_.c:101
-msgid "Profile to delete:"
-msgstr "要删除的profile:"
-
-#: ../../standalone/draknet_.c:129
-msgid "New profile..."
-msgstr "新建profile..."
-
-#: ../../standalone/draknet_.c:135
-msgid ""
-"Name of the profile to create (the new profile is created as a copy of the "
-"current one) :"
-msgstr "新建profile名:"
-
-#: ../../standalone/draknet_.c:161
-msgid "Hostname: "
-msgstr "主机名字:"
-
-#: ../../standalone/draknet_.c:168
-msgid "Internet access"
-msgstr "互联网访问"
-
-#: ../../standalone/draknet_.c:181
-msgid "Type:"
-msgstr "类型: "
-
-#: ../../standalone/draknet_.c:184 ../../standalone/draknet_.c:376
-msgid "Gateway:"
-msgstr "网关:"
-
-#: ../../standalone/draknet_.c:184 ../../standalone/draknet_.c:376
-msgid "Interface:"
-msgstr "网卡:"
-
-#: ../../standalone/draknet_.c:195
-msgid "Status:"
-msgstr "状态:"
-
-#: ../../standalone/draknet_.c:202
-msgid "Wait please"
-msgstr ""
-
-#: ../../standalone/draknet_.c:220
-msgid "Configure Internet Access..."
-msgstr "设定因特网访问服务"
-
-#: ../../standalone/draknet_.c:227 ../../standalone/draknet_.c:449
-msgid "LAN configuration"
-msgstr "局域网配置"
-
-#: ../../standalone/draknet_.c:232
-msgid "Driver"
-msgstr "驱动程序"
-
-#: ../../standalone/draknet_.c:232
-msgid "Interface"
-msgstr "接口"
-
-#: ../../standalone/draknet_.c:232
-msgid "Protocol"
-msgstr "协议"
-
-#: ../../standalone/draknet_.c:232
-msgid "State"
-msgstr "状态"
-
-#: ../../standalone/draknet_.c:244
-msgid "Configure Local Area Network..."
-msgstr "配置局域网络..."
-
-#: ../../standalone/draknet_.c:256
-msgid "Click here to launch the wizard ->"
-msgstr "点击该处启动精灵 ->"
-
-#: ../../standalone/draknet_.c:257
-msgid "Wizard..."
-msgstr "向导..."
-
-#: ../../standalone/draknet_.c:283
-msgid "Apply"
-msgstr "应用"
-
-#: ../../standalone/draknet_.c:302
-msgid "Please Wait... Applying the configuration"
-msgstr "请等待...设定配置"
-
-#: ../../standalone/draknet_.c:384 ../../standalone/draknet_.c:407
-msgid "Connected"
-msgstr "连接"
-
-#: ../../standalone/draknet_.c:384 ../../standalone/draknet_.c:407
-msgid "Not connected"
-msgstr "未连接"
-
-#: ../../standalone/draknet_.c:385 ../../standalone/draknet_.c:408
-msgid "Connect..."
-msgstr "连接..."
-
-#: ../../standalone/draknet_.c:385 ../../standalone/draknet_.c:408
-msgid "Disconnect..."
-msgstr "断开..."
-
-#: ../../standalone/draknet_.c:404
-msgid ""
-"Warning, another Internet connection has been detected, maybe using your "
-"network"
-msgstr ""
-
-#: ../../standalone/draknet_.c:431
-msgid ""
-"You don't have any configured interface.\n"
-"Configure them first by clicking on 'Configure'"
-msgstr ""
-"你没有配置好的接口.\n"
-"点击 '配置' 先配置接口"
-
-#: ../../standalone/draknet_.c:453
-msgid "LAN Configuration"
-msgstr "LAN 配置"
-
-#: ../../standalone/draknet_.c:464
-#, c-format
-msgid "Adapter %s: %s"
-msgstr "适配器 %s: %s"
-
-#: ../../standalone/draknet_.c:470
-msgid "Boot Protocol"
-msgstr "启动协议"
-
-#: ../../standalone/draknet_.c:471
-msgid "Started on boot"
-msgstr "开机时启动"
-
-#: ../../standalone/draknet_.c:472
-msgid "DHCP client"
-msgstr "DHCP客户端"
-
-#: ../../standalone/draknet_.c:497 ../../standalone/draknet_.c:500
-msgid "activate now"
-msgstr "现在激活"
-
-#: ../../standalone/draknet_.c:497 ../../standalone/draknet_.c:500
-msgid "deactivate now"
-msgstr "现在禁用"
-
-#: ../../standalone/draknet_.c:503
-msgid ""
-"This interface has not been configured yet.\n"
-"Launch the configuration wizard in the main window"
-msgstr ""
-
-#: ../../standalone/draknet_.c:560
-msgid ""
-"You don't have any internet connection.\n"
-"Create one first by clicking on 'Configure'"
-msgstr ""
-"你没有因特网联接.\n"
-"点击 '配置' 先建立联接"
-
-#: ../../standalone/draknet_.c:584
-msgid "Internet connection configuration"
-msgstr "互联网连接配置"
-
-#: ../../standalone/draknet_.c:588
-msgid "Internet Connection Configuration"
-msgstr "互联网连接配置"
-
-#: ../../standalone/draknet_.c:597
-msgid "Connection type: "
-msgstr "连接类型:"
-
-#: ../../standalone/draknet_.c:603
-msgid "Parameters"
-msgstr "参数"
-
-#: ../../standalone/draknet_.c:621
-msgid "Gateway"
-msgstr "网关"
-
-#: ../../standalone/draknet_.c:630
-msgid "Ethernet Card"
-msgstr "网卡"
-
-#: ../../standalone/draknet_.c:631
-msgid "DHCP Client"
-msgstr "DHCP客户端"
-
-#: ../../standalone/draksec_.c:31
-msgid "Setting security level"
-msgstr "设定安全级别"
-
#: ../../standalone/drakxconf_.c:47
msgid "Control Center"
msgstr "控制中心"
@@ -10132,93 +10805,129 @@ msgstr "控制中心"
msgid "Choose the tool you want to use"
msgstr "选择您想要的工具"
-#: ../../standalone/drakxtv_.c:48
+#: ../../standalone/drakxtv_.c:55
+msgid ""
+"XawTV isn't installed!\n"
+"\n"
+"\n"
+"If you do have a TV card but DrakX has neither detected it (no bttv\n"
+"module in \"/etc/modules\") nor installed xawtv, please send the\n"
+"results of \"lspcidrake -v -f\" to \"install\\@mandrakesoft.com\"\n"
+"with subject \"undetected TV card\".\n"
+"\n"
+"\n"
+"You can install it by typing \"urpmi xawtv\" as root, in a console."
+msgstr ""
+
+#: ../../standalone/drakxtv_.c:72
#, fuzzy
msgid "Canada (cable)"
msgstr "加拿大 (魁北克)"
-#: ../../standalone/drakxtv_.c:48
-msgid "USA (bcast)"
+#: ../../standalone/drakxtv_.c:72
+msgid "USA (broadcast)"
msgstr ""
-#: ../../standalone/drakxtv_.c:48
+#: ../../standalone/drakxtv_.c:72
msgid "USA (cable)"
msgstr ""
-#: ../../standalone/drakxtv_.c:48
+#: ../../standalone/drakxtv_.c:72
msgid "USA (cable-hrc)"
msgstr ""
-#: ../../standalone/drakxtv_.c:49
-msgid "China (bcast)"
+#: ../../standalone/drakxtv_.c:73
+msgid "China (broadcast)"
msgstr ""
-#: ../../standalone/drakxtv_.c:49
-msgid "Japan (bcast)"
+#: ../../standalone/drakxtv_.c:73
+msgid "Japan (broadcast)"
msgstr ""
-#: ../../standalone/drakxtv_.c:49
+#: ../../standalone/drakxtv_.c:73
msgid "Japan (cable)"
msgstr ""
-#: ../../standalone/drakxtv_.c:50
+#: ../../standalone/drakxtv_.c:74
msgid "East Europe"
msgstr ""
-#: ../../standalone/drakxtv_.c:50
+#: ../../standalone/drakxtv_.c:74
+#, fuzzy
+msgid "France [SECAM]"
+msgstr "法国"
+
+#: ../../standalone/drakxtv_.c:74
#, fuzzy
msgid "Ireland"
msgstr "冰岛"
-#: ../../standalone/drakxtv_.c:50
+#: ../../standalone/drakxtv_.c:74
msgid "West Europe"
msgstr ""
-#: ../../standalone/drakxtv_.c:51
+#: ../../standalone/drakxtv_.c:75
#, fuzzy
msgid "Australia"
msgstr "奥地利"
-#: ../../standalone/drakxtv_.c:51
+#: ../../standalone/drakxtv_.c:75
#, fuzzy
msgid "Newzealand"
msgstr "荷兰"
-#: ../../standalone/drakxtv_.c:52
+#: ../../standalone/drakxtv_.c:76
msgid "South Africa"
msgstr ""
-#: ../../standalone/drakxtv_.c:53
+#: ../../standalone/drakxtv_.c:77
msgid "Argentina"
msgstr ""
-#: ../../standalone/drakxtv_.c:58
+#: ../../standalone/drakxtv_.c:112
msgid ""
"Please,\n"
"type in your tv norm and country"
msgstr ""
-#: ../../standalone/drakxtv_.c:60
+#: ../../standalone/drakxtv_.c:114
msgid "TV norm :"
msgstr ""
-#: ../../standalone/drakxtv_.c:61
+#: ../../standalone/drakxtv_.c:115
msgid "Area :"
msgstr ""
-#: ../../standalone/drakxtv_.c:65
+#: ../../standalone/drakxtv_.c:119
msgid "Scanning for TV channels in progress ..."
msgstr ""
-#: ../../standalone/drakxtv_.c:72
+#: ../../standalone/drakxtv_.c:127
msgid "Scanning for TV channels"
msgstr ""
-#: ../../standalone/drakxtv_.c:83
+#: ../../standalone/drakxtv_.c:130
+#, fuzzy
+msgid "There was an error while scanning for TV channels"
+msgstr "安装软件包时出错:"
+
+#: ../../standalone/drakxtv_.c:131
+msgid "XawTV isn't installed!"
+msgstr ""
+
+#: ../../standalone/drakxtv_.c:134
+msgid "Have a nice day!"
+msgstr ""
+
+#: ../../standalone/drakxtv_.c:135
+msgid "Now, you can run xawtv (under X Window!) !\n"
+msgstr ""
+
+#: ../../standalone/drakxtv_.c:153
msgid "No TV Card detected!"
msgstr ""
-#: ../../standalone/drakxtv_.c:84
+#: ../../standalone/drakxtv_.c:154
msgid ""
"No TV Card has been detected on your machine. Please verify that a Linux-"
"supported Video/TV Card is correctly plugged in.\n"
@@ -10262,7 +10971,7 @@ msgstr "无法开始 live upgrade !!!\n"
msgid "The change is done, but to be effective you must logout"
msgstr ""
-#: ../../standalone/logdrake_.c:85 ../../standalone/logdrake_.c:501
+#: ../../standalone/logdrake_.c:85 ../../standalone/logdrake_.c:526
msgid "logdrake"
msgstr "logdrake"
@@ -10272,7 +10981,7 @@ msgstr "仅显示被选择的日期"
#: ../../standalone/logdrake_.c:102
msgid "/File/_New"
-msgstr "/文件(F)/新建(_N)"
+msgstr "/F 文件/_N 新的"
#: ../../standalone/logdrake_.c:102
msgid "<control>N"
@@ -10280,7 +10989,7 @@ msgstr "<control>N"
#: ../../standalone/logdrake_.c:103
msgid "/File/_Open"
-msgstr "/文件(F)/打开(_O)"
+msgstr "/F 文件/_O打开"
#: ../../standalone/logdrake_.c:103
msgid "<control>O"
@@ -10288,7 +10997,7 @@ msgstr "<control>O"
#: ../../standalone/logdrake_.c:104
msgid "/File/_Save"
-msgstr "/文件(F)/保存(_S)"
+msgstr "/F 文件/_S保存"
#: ../../standalone/logdrake_.c:104
msgid "<control>S"
@@ -10296,27 +11005,23 @@ msgstr "<control>S"
#: ../../standalone/logdrake_.c:105
msgid "/File/Save _As"
-msgstr "/文件(F)/另存为(_A)"
+msgstr "/F 文件/_A 另存为"
#: ../../standalone/logdrake_.c:106
msgid "/File/-"
-msgstr "/文件(F)/-"
+msgstr "/F 文件/-"
#: ../../standalone/logdrake_.c:108
msgid "/_Options"
-msgstr "/选项(_O)"
+msgstr "/_O选项"
#: ../../standalone/logdrake_.c:109
msgid "/Options/Test"
-msgstr "/选项(O)/测试"
-
-#: ../../standalone/logdrake_.c:110
-msgid "/_Help"
-msgstr "/帮助(_H)"
+msgstr "/O选项/T测试"
#: ../../standalone/logdrake_.c:111
msgid "/Help/_About..."
-msgstr "/帮助(H)/关于(_A)..."
+msgstr "/H 帮助/_A 关于..."
#: ../../standalone/logdrake_.c:118
msgid "-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-*,*"
@@ -10374,7 +11079,7 @@ msgstr "日历"
msgid "Content of the file"
msgstr "文件内容"
-#: ../../standalone/logdrake_.c:215 ../../standalone/logdrake_.c:390
+#: ../../standalone/logdrake_.c:215 ../../standalone/logdrake_.c:392
msgid "Mail/SMS alert"
msgstr ""
@@ -10383,12 +11088,12 @@ msgstr ""
msgid "please wait, parsing file: %s"
msgstr "请等待, 分析文件: %s"
-#: ../../standalone/logdrake_.c:405
+#: ../../standalone/logdrake_.c:409
#, fuzzy
msgid "Mail/SMS alert configuration"
msgstr "互联网设定"
-#: ../../standalone/logdrake_.c:406
+#: ../../standalone/logdrake_.c:410
msgid ""
"Welcome to the mail/SMS configuration utility.\n"
"\n"
@@ -10398,64 +11103,96 @@ msgstr ""
"\n"
"在这里您可以你配置以下服务 \n"
-#: ../../standalone/logdrake_.c:414
-msgid "proftpd"
-msgstr "proftpd"
-
#: ../../standalone/logdrake_.c:417
-msgid "sshd"
-msgstr "sshd"
+msgid "Apache World Wide Web Server"
+msgstr ""
#: ../../standalone/logdrake_.c:418
-msgid "webmin"
-msgstr "webmin"
+#, fuzzy
+msgid "Domain Name Resolver"
+msgstr "网域名称"
#: ../../standalone/logdrake_.c:419
-msgid "xinetd"
-msgstr "xinetd"
+#, fuzzy
+msgid "Ftp Server"
+msgstr "NIS 服务器"
+
+#: ../../standalone/logdrake_.c:420
+#, fuzzy
+msgid "Postfix Mail Server"
+msgstr "Postfix邮件服务, Inn 新闻组服务"
+
+#: ../../standalone/logdrake_.c:421
+#, fuzzy
+msgid "Samba Server"
+msgstr "NIS 服务器"
#: ../../standalone/logdrake_.c:422
+#, fuzzy
+msgid "SSH Server"
+msgstr "NIS 服务器"
+
+#: ../../standalone/logdrake_.c:423
+#, fuzzy
+msgid "Webmin Service"
+msgstr "服务"
+
+#: ../../standalone/logdrake_.c:424
+#, fuzzy
+msgid "Xinetd Service"
+msgstr "打印服务器"
+
+#: ../../standalone/logdrake_.c:431
msgid "service setting"
msgstr "服务配置"
-#: ../../standalone/logdrake_.c:423
+#: ../../standalone/logdrake_.c:432
msgid ""
"You will receive an alert if one of the selected service is no more running"
msgstr ""
-#: ../../standalone/logdrake_.c:433
+#: ../../standalone/logdrake_.c:445
msgid "load setting"
msgstr "调入配置"
-#: ../../standalone/logdrake_.c:434
+#: ../../standalone/logdrake_.c:446
msgid "You will receive an alert if the load is higher than this value"
msgstr ""
-#: ../../standalone/logdrake_.c:447
+#: ../../standalone/logdrake_.c:459
#, fuzzy
msgid "alert configuration"
msgstr "互联网设定"
-#: ../../standalone/logdrake_.c:448
+#: ../../standalone/logdrake_.c:460
msgid "Configure the way the system will alert you"
msgstr ""
-#: ../../standalone/logdrake_.c:478
+#: ../../standalone/logdrake_.c:503
msgid "Save as.."
msgstr "另存为..."
-#: ../../standalone/mousedrake_.c:49
+#: ../../standalone/mousedrake_.c:44
msgid "Please, choose the type of your mouse."
msgstr "请选择您的鼠标是那一种类型."
-#: ../../standalone/mousedrake_.c:59
+#: ../../standalone/mousedrake_.c:54
msgid "no serial_usb found\n"
msgstr "找不到 serial_usb\n"
-#: ../../standalone/mousedrake_.c:63
+#: ../../standalone/mousedrake_.c:58
msgid "Emulate third button?"
msgstr "模拟三键"
+#: ../../standalone/printerdrake_.c:49
+#, fuzzy
+msgid "Reading printer data ..."
+msgstr "读取打印机数据..."
+
+#: ../../standalone/scannerdrake_.c:42
+msgid "Detecting devices ..."
+msgstr "正在探测设备..."
+
#: ../../standalone/scannerdrake_.c:53
#, c-format
msgid "%s found on %s, configure it ?"
@@ -10498,6 +11235,18 @@ msgid ""
"applications menu."
msgstr ""
+#: ../../standalone/service_harddrake_.c:57
+#, c-format
+msgid "Some devices in the \"%s\" hardware class were removed:\n"
+msgstr ""
+
+#: ../../standalone/service_harddrake_.c:61
+#, c-format
+msgid ""
+"\n"
+"Some devices in the %s class were added:\n"
+msgstr ""
+
#: ../../standalone/tinyfirewall_.c:31
msgid "Firewalling Configuration"
msgstr "配置防火墙"
@@ -10869,10 +11618,6 @@ msgid "Multimedia - Sound"
msgstr "多媒体 - 声音"
#: ../../share/compssUsers:999
-msgid "Utilities"
-msgstr "应用工具"
-
-#: ../../share/compssUsers:999
msgid "Documentation"
msgstr "文档"
@@ -10973,10 +11718,6 @@ msgid ""
msgstr "上网工具, 如收发电子邮件及新闻组 (pine, mutt, tin..) , 浏览网站."
#: ../../share/compssUsers:999
-msgid "Archiving, emulators, monitoring"
-msgstr "存档,仿真,监控"
-
-#: ../../share/compssUsers:999
msgid "Personal Finance"
msgstr "个人财务"
@@ -11022,290 +11763,179 @@ msgstr "多媒体 - 烧录光盘"
msgid "Scientific Workstation"
msgstr "科学计算工作站"
-#~ msgid "About"
-#~ msgstr "中止"
-
-#~ msgid " Help "
-#~ msgstr " 帮助 "
-
-#~ msgid "-adobe-utopia-medium-r-normal-*-12-*-*-*-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-utopia-medium-r-normal-*-12-*-*-*-p-*-iso8859-*,*-r-*"
+#~ msgid "fsck failed with exit code %d or signal %d"
+#~ msgstr "fsck 失败, 退出码 %d 或 信号 %d"
-#~ msgid ""
-#~ "Can't access kernel modules corresponding to your kernel (file %s is "
-#~ "missing)"
-#~ msgstr "无法访问相应核心的核心模块(找不到 %s文件)"
-
-#~ msgid "$f-$g %s)"
-#~ msgstr "$f-$g %s)"
-
-#~ msgid "None"
-#~ msgstr "没有"
+#~ msgid "Graphics card identification: %s\n"
+#~ msgstr "显示卡: %s\n"
-#~ msgid "Choose a default printer!"
-#~ msgstr "选择缺省的用户!"
+#~ msgid "Choose options for server"
+#~ msgstr "请选择 X 服务器的参数"
-#~ msgid "Apply/Re-read printers"
-#~ msgstr "应用/重读打印机"
+#~ msgid "Monitor not configured"
+#~ msgstr "尚未完成显示器设定"
-#~ msgid "You may now provide its options to module %s."
-#~ msgstr "请指定模块 %s 的参数"
+#~ msgid "Graphics card not configured yet"
+#~ msgstr "尚未完成显示卡设定"
-#~ msgid "mount failed"
-#~ msgstr "装载失败"
-
-#~ msgid "Low"
-#~ msgstr "低"
-
-#~ msgid "Medium"
-#~ msgstr "中"
+#~ msgid "Resolutions not chosen yet"
+#~ msgstr "尚未选取要使用的分辨率"
#~ msgid ""
-#~ "Few improvements for this security level, the main one is that there are\n"
-#~ "more security warnings and checks."
-#~ msgstr ""
-#~ "这个安全级别于上一个基本相同, \n"
-#~ "但增加了更多的有关安全性的警告和检验."
-
-#, fuzzy
-#~ msgid ""
-#~ "To know about the options available for the current printer read either "
-#~ "the list shown below or click on the \"Print option list\" button. %s\n"
#~ "\n"
+#~ "try to change some parameters"
#~ msgstr ""
-#~ "点击\"打印选项\"列举打印机的选项.\n"
#~ "\n"
+#~ "尝试改变一些参数"
-#~ msgid "Boot mode"
-#~ msgstr "开机引导模式"
-
-#~ msgid "Export"
-#~ msgstr "输出"
-
-#~ msgid "click here"
-#~ msgstr "点击这里"
-
-#~ msgid ""
-#~ "This %s scanner uses parallel port, which is unsupported for the moment"
-#~ msgstr "扫描仪 %s 使用并行端口, 暂时不支持"
-
-#~ msgid ""
-#~ "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it in\n"
-#~ "local time according to the time zone you selected."
-#~ msgstr ""
-#~ "GNU/Linux 内部使用 GMT (格林尼治标准时间), 然后根据您选择的时区转换成当地"
-#~ "时间."
-
-#~ msgid "Connect to Internet"
-#~ msgstr "连接到互联网"
-
-#~ msgid "Disconnect from Internet"
-#~ msgstr "断开到互联网的连接"
-
-#~ msgid "Configure network connection (LAN or Internet)"
-#~ msgstr "网络连接配置(LAN 或互联网)"
+#~ msgid "An error occurred:"
+#~ msgstr "发生错误∶"
-#~ msgid "Detected %s, do you want to set it up?"
-#~ msgstr "探测到 %s, 您希望配置它吗 ?"
-
-#~ msgid "Here is a list of all auto-detected printers. "
-#~ msgstr "这里是被自动探测到的打印机的列表. "
-
-#~ msgid "Please choose the printer you want to set up."
-#~ msgstr "请选择您要安装的打印机."
-
-#, fuzzy
-#~ msgid "Infos"
-#~ msgstr "信息"
-
-#, fuzzy
-#~ msgid "Windows Importation"
-#~ msgstr "Gnome工作站"
-
-#~ msgid "authentification"
-#~ msgstr "鉴别"
-
-#~ msgid "user"
-#~ msgstr "用户"
-
-#, fuzzy
-#~ msgid ""
-#~ "Please choose the desired printer/printer port.\n"
-#~ "\n"
-#~ msgstr "请选择您的鼠标是那一种类型."
+#~ msgid "Leaving in %d seconds"
+#~ msgstr "(在 %d 秒钟后离开)"
-#~ msgid "Scanning available nfs shared resource"
-#~ msgstr "扫描有效的NFS共享资源"
+#~ msgid "Is this the correct setting?"
+#~ msgstr "这样设定正确吗?"
-#~ msgid "Scanning available nfs shared resource of server %s"
-#~ msgstr "扫描服务器 %s 的有效的NFS共享资源"
+#~ msgid "An error occurred, try to change some parameters"
+#~ msgstr "发生错误,请试着更改一些参数的值"
-#~ msgid "Scanning available samba shared resource"
-#~ msgstr "扫描有效的samba共享资源"
+#~ msgid "XFree86 server: %s"
+#~ msgstr "XFree86 服务器: %s"
-#~ msgid "Scanning available samba shared resource of server %s"
-#~ msgstr "扫描服务器 %s 的有效的samba共享资源"
+#~ msgid "Show all"
+#~ msgstr "显示全部"
-#, fuzzy
-#~ msgid "\\@quit"
-#~ msgstr "退出"
+#~ msgid "Preparing X-Window configuration"
+#~ msgstr "正在准备 X-Window 的设定"
-#~ msgid "Removable media"
-#~ msgstr "可移动介质"
+#~ msgid "What do you want to do?"
+#~ msgstr "您打算怎么作 ?"
-#~ msgid "Active"
-#~ msgstr "可启动"
+#~ msgid "Change Monitor"
+#~ msgstr "改变显示器设定"
-#, fuzzy
-#~ msgid "No X"
-#~ msgstr "否"
+#~ msgid "Change Graphics card"
+#~ msgstr "改变显示卡"
-#~ msgid "A printer, model \"%s\", has been detected on "
-#~ msgstr "找到一台打印机, 型号是 \"%s\". "
+#~ msgid "Change Server options"
+#~ msgstr "改变服务器程序的参数"
-#~ msgid "Local Printer Device"
-#~ msgstr "本机打印设备"
+#~ msgid "Change Resolution"
+#~ msgstr "改变分辨率"
-#~ msgid "Printer Device"
-#~ msgstr "打印机设备"
+#~ msgid "Show information"
+#~ msgstr "显示所有信息"
-#~ msgid "Device/file name missing!"
-#~ msgstr "设备/文件名 没有找到"
+#~ msgid "Test again"
+#~ msgstr "再次测试设定值"
-#~ msgid "Printer(s) on remote CUPS server(s)"
-#~ msgstr "远程 CUPS 服务器的打印机"
+#~ msgid "Use Hard Drive with daemon"
+#~ msgstr "使用硬盘"
-#~ msgid "Printer(s) on remote server(s)"
-#~ msgstr "远程 CUPS 服务器的打印机"
+#~ msgid "Use FTP with daemon"
+#~ msgstr "使用 FTP"
-#, fuzzy
-#~ msgid " Linux "
-#~ msgstr "Linux"
+#~ msgid "Package List to Install"
+#~ msgstr "选择软件包"
-#, fuzzy
-#~ msgid " System "
-#~ msgstr "系统"
+#~ msgid "proftpd"
+#~ msgstr "proftpd"
-#, fuzzy
-#~ msgid " Other "
-#~ msgstr "其他"
+#~ msgid "sshd"
+#~ msgstr "sshd"
-#, fuzzy
-#~ msgid "please choose your CD space"
-#~ msgstr "请选择您使用的键盘布局."
+#~ msgid "webmin"
+#~ msgstr "webmin"
-#, fuzzy
-#~ msgid " Please check if you are using CDRW media"
-#~ msgstr "请选中一个介质"
+#~ msgid "xinetd"
+#~ msgstr "xinetd"
-#, fuzzy
-#~ msgid " Tape "
-#~ msgstr "类型: "
+#~ msgid "Setting security level"
+#~ msgstr "设定安全级别"
-#, fuzzy
-#~ msgid " Use .backupignore files"
-#~ msgstr "错误的备份文件"
+#~ msgid "Graphics card"
+#~ msgstr "显示卡"
-#, fuzzy
-#~ msgid "Configure it"
-#~ msgstr "配置 X"
+#~ msgid "Select a graphics card"
+#~ msgstr "请选择一种显示卡"
-#, fuzzy
-#~ msgid "on Tape Device"
-#~ msgstr "打印机设备"
+#~ msgid "Warning: testing this graphics card may freeze your computer"
+#~ msgstr "小心! 显示卡的测试可能会锁定您的电脑"
-#, fuzzy
-#~ msgid " Cancel "
-#~ msgstr "取消"
+#~ msgid "Standard VGA, 640x480 at 60 Hz"
+#~ msgstr "标准 VGA 模式, 640x480 at 60 Hz"
-#, fuzzy
-#~ msgid " Ok "
-#~ msgstr "确定"
+#~ msgid "Super VGA, 800x600 at 56 Hz"
+#~ msgstr "Super VGA, 800x600 at 56 Hz"
-#, fuzzy
-#~ msgid "close"
-#~ msgstr "关闭"
+#~ msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
+#~ msgstr "8514 相容模式, 1024x768 at 87 Hz 隔行扫描 (no 800x600)"
-#~ msgid "Starting your connection..."
-#~ msgstr "正在尝试连接..."
+#~ msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
+#~ msgstr "Super VGA, 1024x768 at 87 Hz 隔行扫描, 800x600 at 56 Hz"
-#~ msgid "Closing your connection..."
-#~ msgstr "正在断开连接..."
+#~ msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
+#~ msgstr "扩展 Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
-#~ msgid ""
-#~ "The connection is not closed.\n"
-#~ "Try to do it manually by running\n"
-#~ "/etc/sysconfig/network-scripts/net_cnx_down\n"
-#~ "in root."
-#~ msgstr ""
-#~ "连接未断开.\n"
-#~ "运行\n"
-#~ "/etc/sysconfig/network-script/net_cnx_down\n"
-#~ "断开连接."
+#~ msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
+#~ msgstr "逐行扫描 SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
-#~ msgid "The system is now disconnected."
-#~ msgstr "您现在没有连接到互联网"
+#~ msgid "High Frequency SVGA, 1024x768 at 70 Hz"
+#~ msgstr "高频率 SVGA, 1024x768 at 70 Hz"
-#~ msgid "Choose the size you want to install"
-#~ msgstr "要安装软件包的空间"
+#~ msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
+#~ msgstr "多频率, 最高达 1280x1024 at 60 Hz"
-#~ msgid "Total size: "
-#~ msgstr "总共大小:"
+#~ msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
+#~ msgstr "多频率, 最高达 1280x1024 at 74 Hz"
-#~ msgid "Please wait, "
-#~ msgstr "请稍候, "
+#~ msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
+#~ msgstr "多频率, 最高达 1280x1024 at 76 Hz"
-#~ msgid "Total time "
-#~ msgstr "总共时间"
+#~ msgid "Monitor that can do 1600x1200 at 70 Hz"
+#~ msgstr "您的显示器可使用 1600x1200 at 70 Hz"
-#~ msgid "Use existing configuration for X11?"
-#~ msgstr "对 X11 使用现有的配置?"
+#~ msgid "Monitor that can do 1600x1200 at 76 Hz"
+#~ msgstr "您的显示器可使用 1600x1200 at 76 Hz"
#~ msgid ""
-#~ "What device is your printer connected to \n"
-#~ "(note that /dev/lp0 is equivalent to LPT1:)?\n"
-#~ msgstr ""
-#~ "您的打印机连接在哪个设备端口\n"
-#~ "(请注意 /dev/lp0 相当于 LPT1)?\n"
-
-#~ msgid "%s"
-#~ msgstr "%s"
+#~ "The total size for the groups you have selected is approximately %d MB.\n"
+#~ msgstr "被选择的组件安装所需硬盘空间约为 %d MB.\n"
#~ msgid ""
-#~ "Warning, the network adapter is already configured. I will reconfigure it."
+#~ "If you wish to install less than this size,\n"
+#~ "select the percentage of packages that you want to install.\n"
+#~ "\n"
+#~ "A low percentage will install only the most important packages;\n"
+#~ "a percentage of 100%% will install all selected packages."
#~ msgstr ""
-#~ "警告, 这个网卡已经配置过了.\n"
-#~ "要重新配置."
-
-#~ msgid "New"
-#~ msgstr "新建"
-
-#~ msgid "Remote"
-#~ msgstr "远端"
+#~ "如果您想使用更少的空间来安装, \n"
+#~ "请决定安装已经选定的软件包的百分比?\n"
+#~ "\n"
+#~ "选择较低的百分比就只安装最重要的软件; 选择 100 %% 就安装所选的\n"
+#~ "全部软件."
#~ msgid ""
-#~ "Please click on a button above\n"
+#~ "You have space on your disk for only %d%% of these packages.\n"
#~ "\n"
-#~ "Or use \"New\""
+#~ "If you wish to install less than this,\n"
+#~ "select the percentage of packages that you want to install.\n"
+#~ "A low percentage will install only the most important packages;\n"
+#~ "a percentage of %d%% will install as many packages as possible."
#~ msgstr ""
-#~ "请点击以上的按钮\n"
+#~ "您的磁盘空间只够安装所有这些软件包的 %d%%.\n"
+#~ "如果您想少安装一些, \n"
+#~ "请决定安装已经选定的软件包的百分之几?\n"
#~ "\n"
-#~ "或使用 \"新建\""
-
-#~ msgid "Use \"New\""
-#~ msgstr "使用 \"新建\""
-
-#~ msgid "If the list above doesn't contain the wanted entry, enter it here:"
-#~ msgstr "如果上述列表中没有你要的项, 请输入:"
-
-#~ msgid "Shared resource"
-#~ msgstr "共享资源"
+#~ "选择较低的百分比就只安装最重要的软件; 选择 %d%% 就安装所选的\n"
+#~ "全部软件."
-#~ msgid "Ambiguity (%s), be more precise\n"
-#~ msgstr "我不明白您的意思 (%s) ,请更明确的指定\n"
+#~ msgid "You will be able to choose them more specifically in the next step."
+#~ msgstr "在下一个步骤您将可以更仔细的选择"
-#~ msgid " ? (default %s) "
-#~ msgstr "? (缺省 %s) "
+#~ msgid "Percentage of packages to install"
+#~ msgstr "要安装软件包的百分比"
-#~ msgid "Your choice? (default %s enter `none' for none) "
-#~ msgstr "您的选择 ? (缺省 %s 如果没有 输入 `none') "
+#~ msgid "Please choose the desired security level."
+#~ msgstr "选择安全级别"