summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/share/po/zh_CN.po2270
1 files changed, 1145 insertions, 1125 deletions
diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index a88de1ac7..74ea68aa8 100644
--- a/perl-install/share/po/zh_CN.po
+++ b/perl-install/share/po/zh_CN.po
@@ -7,9 +7,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: DrakX 10.0\n"
-"POT-Creation-Date: 2004-03-19 14:32+0100\n"
-"PO-Revision-Date: 2004-03-23 12:57+0800\n"
+"Project-Id-Version: DrakX 10.1\n"
+"POT-Creation-Date: 2004-04-01 15:07+0200\n"
+"PO-Revision-Date: 2004-04-25 14:01+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: Mandrake i18n Team <cooker-i18n@linux-mandrake.com>\n"
"MIME-Version: 1.0\n"
@@ -99,7 +99,7 @@ msgstr ""
"请单击按钮重新启动计算机,拔出该密钥盘之后,去掉写保护后再插入,\n"
"然后再次调用 Mandrake Move。"
-#: ../move/move.pm:402 help.pm:418 install_steps_interactive.pm:1319
+#: ../move/move.pm:402 help.pm:418 install_steps_interactive.pm:1312
#, c-format
msgid "Reboot"
msgstr "重新启动"
@@ -148,11 +148,11 @@ msgstr "请稍候,正在检测并配置设备..."
#: diskdrake/interactive.pm:505 diskdrake/interactive.pm:510
#: diskdrake/smbnfs_gtk.pm:42 fsedit.pm:253 install_steps.pm:82
#: install_steps_interactive.pm:40 interactive/http.pm:118
-#: interactive/http.pm:119 network/netconnect.pm:929 network/netconnect.pm:932
-#: network/netconnect.pm:977 network/netconnect.pm:981
-#: network/netconnect.pm:1048 network/netconnect.pm:1098
-#: network/netconnect.pm:1103 network/netconnect.pm:1118
-#: network/netconnect.pm:1327 printer/printerdrake.pm:213
+#: interactive/http.pm:119 network/netconnect.pm:944 network/netconnect.pm:947
+#: network/netconnect.pm:992 network/netconnect.pm:996
+#: network/netconnect.pm:1063 network/netconnect.pm:1113
+#: network/netconnect.pm:1118 network/netconnect.pm:1133
+#: network/netconnect.pm:1336 printer/printerdrake.pm:213
#: printer/printerdrake.pm:220 printer/printerdrake.pm:245
#: printer/printerdrake.pm:393 printer/printerdrake.pm:398
#: printer/printerdrake.pm:411 printer/printerdrake.pm:421
@@ -173,27 +173,27 @@ msgstr "请稍候,正在检测并配置设备..."
#: printer/printerdrake.pm:3018 printer/printerdrake.pm:3421
#: printer/printerdrake.pm:3664 printer/printerdrake.pm:3677
#: printer/printerdrake.pm:3817 printer/printerdrake.pm:3909
-#: standalone/drakTermServ:415 standalone/drakTermServ:768
-#: standalone/drakTermServ:775 standalone/drakTermServ:970
-#: standalone/drakTermServ:1415 standalone/drakTermServ:1420
-#: standalone/drakTermServ:1427 standalone/drakTermServ:1438
-#: standalone/drakTermServ:1458 standalone/drakauth:36
+#: standalone/drakTermServ:416 standalone/drakTermServ:769
+#: standalone/drakTermServ:776 standalone/drakTermServ:971
+#: standalone/drakTermServ:1416 standalone/drakTermServ:1421
+#: standalone/drakTermServ:1428 standalone/drakTermServ:1439
+#: standalone/drakTermServ:1459 standalone/drakauth:36
#: standalone/drakbackup:581 standalone/drakbackup:694
#: standalone/drakbackup:1187 standalone/drakbackup:1220
#: standalone/drakbackup:1735 standalone/drakbackup:1898
#: standalone/drakbackup:2513 standalone/drakbackup:4286
-#: standalone/drakbackup:4509 standalone/drakboot:237 standalone/drakbug:267
+#: standalone/drakbackup:4509 standalone/drakboot:255 standalone/drakbug:267
#: standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:608
#: standalone/drakconnect:611 standalone/drakconnect:632
#: standalone/drakfloppy:301 standalone/drakfloppy:305
#: standalone/drakfloppy:311 standalone/drakfont:210 standalone/drakfont:223
#: standalone/drakfont:259 standalone/drakfont:600 standalone/draksplash:21
-#: standalone/logdrake:170 standalone/logdrake:467 standalone/logdrake:472
-#: standalone/scannerdrake:58 standalone/scannerdrake:200
-#: standalone/scannerdrake:259 standalone/scannerdrake:683
-#: standalone/scannerdrake:694 standalone/scannerdrake:833
-#: standalone/scannerdrake:844 standalone/scannerdrake:914 wizards.pm:95
-#: wizards.pm:99 wizards.pm:121
+#: standalone/drakxtv:105 standalone/logdrake:170 standalone/logdrake:467
+#: standalone/logdrake:472 standalone/scannerdrake:58
+#: standalone/scannerdrake:200 standalone/scannerdrake:259
+#: standalone/scannerdrake:683 standalone/scannerdrake:694
+#: standalone/scannerdrake:833 standalone/scannerdrake:844
+#: standalone/scannerdrake:914 wizards.pm:95 wizards.pm:99 wizards.pm:121
#, c-format
msgid "Error"
msgstr "错误"
@@ -442,7 +442,7 @@ msgstr ""
msgid "Xpmac (installation display driver)"
msgstr "Xpmac(安装显卡驱动)"
-#: Xconfig/main.pm:88 Xconfig/main.pm:89 Xconfig/monitor.pm:106 any.pm:823
+#: Xconfig/main.pm:88 Xconfig/main.pm:89 Xconfig/monitor.pm:106 any.pm:830
#, c-format
msgid "Custom"
msgstr "自定义"
@@ -605,17 +605,17 @@ msgstr "显示卡: %s"
#: standalone/drakbackup:4045 standalone/drakbackup:4075
#: standalone/drakbackup:4162 standalone/drakbackup:4175
#: standalone/drakbackup:4247 standalone/drakconnect:165
-#: standalone/drakconnect:776 standalone/drakconnect:863
-#: standalone/drakconnect:962 standalone/drakups:194
+#: standalone/drakconnect:786 standalone/drakconnect:873
+#: standalone/drakconnect:972 standalone/drakups:194
#: standalone/net_monitor:303 ugtk2.pm:413 ugtk2.pm:510 ugtk2.pm:1075
#: ugtk2.pm:1098
#, c-format
msgid "Ok"
msgstr "确定"
-#: Xconfig/resolution_and_depth.pm:289 any.pm:863 diskdrake/smbnfs_gtk.pm:81
-#: help.pm:197 help.pm:457 install_steps_gtk.pm:488
-#: install_steps_interactive.pm:788 interactive.pm:404 interactive/gtk.pm:763
+#: Xconfig/resolution_and_depth.pm:289 any.pm:870 diskdrake/smbnfs_gtk.pm:81
+#: help.pm:197 help.pm:457 install_steps_gtk.pm:490
+#: install_steps_interactive.pm:781 interactive.pm:404 interactive/gtk.pm:763
#: interactive/http.pm:104 interactive/http.pm:161 interactive/newt.pm:307
#: interactive/newt.pm:414 interactive/stdio.pm:39 interactive/stdio.pm:142
#: interactive/stdio.pm:176 printer/printerdrake.pm:3088
@@ -624,8 +624,8 @@ msgstr "确定"
#: standalone/drakbackup:4089 standalone/drakbackup:4113
#: standalone/drakbackup:4137 standalone/drakbackup:4189
#: standalone/drakbackup:4216 standalone/drakbackup:4241
-#: standalone/drakconnect:164 standalone/drakconnect:861
-#: standalone/drakconnect:961 standalone/drakfont:663 standalone/drakfont:740
+#: standalone/drakconnect:164 standalone/drakconnect:871
+#: standalone/drakconnect:971 standalone/drakfont:663 standalone/drakfont:740
#: standalone/drakups:201 standalone/logdrake:175 standalone/net_monitor:299
#: ugtk2.pm:407 ugtk2.pm:508 ugtk2.pm:517 ugtk2.pm:1075
#, c-format
@@ -633,7 +633,7 @@ msgid "Cancel"
msgstr "取消"
#: Xconfig/resolution_and_depth.pm:289 diskdrake/hd_gtk.pm:154
-#: install_steps_gtk.pm:267 install_steps_gtk.pm:668 interactive.pm:498
+#: install_steps_gtk.pm:269 install_steps_gtk.pm:670 interactive.pm:498
#: interactive/gtk.pm:623 interactive/gtk.pm:625 standalone/drakTermServ:316
#: standalone/drakbackup:4010 standalone/drakbackup:4039
#: standalone/drakbackup:4062 standalone/drakbackup:4093
@@ -787,7 +787,7 @@ msgstr "您的电视信号是什么制式?"
#: any.pm:103 harddrake/sound.pm:150 interactive.pm:441 standalone/drakbug:259
#: standalone/drakconnect:167 standalone/draksec:56 standalone/drakups:90
#: standalone/drakxtv:90 standalone/harddrake2:134
-#: standalone/service_harddrake:98
+#: standalone/service_harddrake:107
#, c-format
msgid "Please wait"
msgstr "请稍候"
@@ -852,70 +852,75 @@ msgstr "您希望启动引导程序安装到哪里?"
msgid "First sector of boot partition"
msgstr "引导分区的第一扇区"
-#: any.pm:208
+#: any.pm:209
#, c-format
msgid "Boot Style Configuration"
msgstr "启动风格配置"
-#: any.pm:210 any.pm:244
+#: any.pm:211 any.pm:248
#, c-format
msgid "Bootloader main options"
msgstr "引导程序的主要选项"
-#: any.pm:214
+#: any.pm:215
#, c-format
msgid "Give the ram size in MB"
msgstr "以兆为单位给出内存大小"
-#: any.pm:216
+#: any.pm:217
#, c-format
msgid ""
"Option ``Restrict command line options'' is of no use without a password"
msgstr "没有密码不能使用“限定命令行选项”"
-#: any.pm:217 any.pm:524 install_steps_interactive.pm:1163
+#: any.pm:218 any.pm:531 install_steps_interactive.pm:1156
#, c-format
msgid "The passwords do not match"
msgstr "两次密码不符"
-#: any.pm:217 any.pm:524 diskdrake/interactive.pm:1255
-#: install_steps_interactive.pm:1163
+#: any.pm:218 any.pm:531 diskdrake/interactive.pm:1255
+#: install_steps_interactive.pm:1156
#, c-format
msgid "Please try again"
msgstr "请再试一次"
-#: any.pm:222 any.pm:247 help.pm:768
+#: any.pm:223 any.pm:251 help.pm:768
#, c-format
msgid "Bootloader to use"
msgstr "要使用的引导程序"
-#: any.pm:224
+#: any.pm:225
#, c-format
msgid "Bootloader installation"
msgstr "引导程序安装"
-#: any.pm:226 any.pm:249 help.pm:768
+#: any.pm:227 any.pm:253 help.pm:768
#, c-format
msgid "Boot device"
msgstr "启动设备"
-#: any.pm:228
+#: any.pm:229
#, c-format
msgid "Delay before booting default image"
msgstr "启动默认映像前的延迟"
-#: any.pm:229 help.pm:768
+#: any.pm:230 help.pm:768
#, c-format
msgid "Enable ACPI"
msgstr "启用 ACPI"
-#: any.pm:230
+#: any.pm:232 help.pm:768
#, c-format
-msgid "Force No APIC"
+msgid "Force no APIC"
msgstr "强制无 APIC"
-#: any.pm:232 any.pm:551 diskdrake/smbnfs_gtk.pm:180
-#: install_steps_interactive.pm:1168 network/netconnect.pm:562
+#: any.pm:234
+#, c-format
+msgid "Force No Local APIC"
+msgstr "强制无本地 APIC"
+
+#: any.pm:236 any.pm:558 diskdrake/smbnfs_gtk.pm:180
+#: install_steps_interactive.pm:1161 network/netconnect.pm:575
#: printer/printerdrake.pm:1374 printer/printerdrake.pm:1494
#: standalone/drakbackup:1717 standalone/drakbackup:3592
#: standalone/drakups:278
@@ -923,158 +928,158 @@ msgstr "强制无 APIC"
msgid "Password"
msgstr "密码"
-#: any.pm:233 any.pm:552 install_steps_interactive.pm:1169
+#: any.pm:237 any.pm:559 install_steps_interactive.pm:1162
#, c-format
msgid "Password (again)"
msgstr "密码(请再输一次)"
-#: any.pm:234
+#: any.pm:238
#, c-format
msgid "Restrict command line options"
msgstr "限制命令行选项"
-#: any.pm:234
+#: any.pm:238
#, c-format
msgid "restrict"
msgstr "限制"
-#: any.pm:236
+#: any.pm:240
#, c-format
msgid "Clean /tmp at each boot"
msgstr "每次启动时清除 /tmp"
-#: any.pm:237
+#: any.pm:241
#, c-format
msgid "Precise RAM size if needed (found %d MB)"
msgstr "精确的内存大小(找到 %d MB)"
-#: any.pm:239
+#: any.pm:243
#, c-format
msgid "Enable multiple profiles"
msgstr "允许多种设置"
-#: any.pm:248
+#: any.pm:252
#, c-format
msgid "Init Message"
msgstr "初始信息"
-#: any.pm:250
+#: any.pm:254
#, c-format
msgid "Open Firmware Delay"
msgstr "开放固件延迟"
-#: any.pm:251
+#: any.pm:255
#, c-format
msgid "Kernel Boot Timeout"
msgstr "核心启动超时"
-#: any.pm:252
+#: any.pm:256
#, c-format
msgid "Enable CD Boot?"
msgstr "允许 CD 启动?"
-#: any.pm:253
+#: any.pm:257
#, c-format
msgid "Enable OF Boot?"
msgstr "启用 OF 启动?"
-#: any.pm:254
+#: any.pm:258
#, c-format
msgid "Default OS?"
msgstr "默认操作系统?"
-#: any.pm:295
+#: any.pm:302
#, c-format
msgid "Image"
msgstr "映像"
-#: any.pm:296 any.pm:305
+#: any.pm:303 any.pm:312
#, c-format
msgid "Root"
msgstr "根目录"
-#: any.pm:297 any.pm:318
+#: any.pm:304 any.pm:325
#, c-format
msgid "Append"
msgstr "追加"
-#: any.pm:299
+#: any.pm:306
#, c-format
msgid "Video mode"
msgstr "显示模式"
-#: any.pm:301
+#: any.pm:308
#, c-format
msgid "Initrd"
msgstr "Initrd"
-#: any.pm:310 any.pm:315 any.pm:317
+#: any.pm:317 any.pm:322 any.pm:324
#, c-format
msgid "Label"
msgstr "标签"
-#: any.pm:312 any.pm:322 harddrake/v4l.pm:236 standalone/drakfloppy:88
+#: any.pm:319 any.pm:329 harddrake/v4l.pm:255 standalone/drakfloppy:88
#: standalone/drakfloppy:94
#, c-format
msgid "Default"
msgstr "默认"
-#: any.pm:319
+#: any.pm:326
#, c-format
msgid "Initrd-size"
msgstr "Initrd 大小"
-#: any.pm:321
+#: any.pm:328
#, c-format
msgid "NoVideo"
msgstr "无视频"
-#: any.pm:332
+#: any.pm:339
#, c-format
msgid "Empty label not allowed"
msgstr "标签不能为空"
-#: any.pm:333
+#: any.pm:340
#, c-format
msgid "You must specify a kernel image"
msgstr "您必须指定一个内核映像"
-#: any.pm:333
+#: any.pm:340
#, c-format
msgid "You must specify a root partition"
msgstr "您必须指定根目录所在分区"
-#: any.pm:334
+#: any.pm:341
#, c-format
msgid "This label is already used"
msgstr "这个名字已经被使用"
-#: any.pm:347
+#: any.pm:354
#, c-format
msgid "Which type of entry do you want to add?"
msgstr "要添加的条目是什么类型?"
-#: any.pm:348
+#: any.pm:355
#, c-format
msgid "Linux"
msgstr "Linux"
-#: any.pm:348
+#: any.pm:355
#, c-format
msgid "Other OS (SunOS...)"
msgstr "其它操作系统(SunOS...)"
-#: any.pm:349
+#: any.pm:356
#, c-format
msgid "Other OS (MacOS...)"
msgstr "其它操作系统(MacOS...)"
-#: any.pm:349
+#: any.pm:356
#, c-format
msgid "Other OS (windows...)"
msgstr "其它操作系统(windows...)"
-#: any.pm:377
+#: any.pm:384
#, c-format
msgid ""
"Here are the entries on your boot menu so far.\n"
@@ -1083,73 +1088,73 @@ msgstr ""
"引导菜单中现有下列条目。\n"
"您可以创建额外的条目或是更改已存在的条目。"
-#: any.pm:509
+#: any.pm:516
#, c-format
msgid "access to X programs"
msgstr "允许使用 X 应用程序"
-#: any.pm:510
+#: any.pm:517
#, c-format
msgid "access to rpm tools"
msgstr "允许使用 rpm 工具"
-#: any.pm:511
+#: any.pm:518
#, c-format
msgid "allow \"su\""
msgstr "允许使用“su”指令"
-#: any.pm:512
+#: any.pm:519
#, c-format
msgid "access to administrative files"
msgstr "允许访问系统设置文件"
-#: any.pm:513
+#: any.pm:520
#, c-format
msgid "access to network tools"
msgstr "允许使用网络工具"
-#: any.pm:514
+#: any.pm:521
#, c-format
msgid "access to compilation tools"
msgstr "允许使用编译工具"
-#: any.pm:520
+#: any.pm:527
#, c-format
msgid "(already added %s)"
msgstr "(已经添加了 %s)"
-#: any.pm:525
+#: any.pm:532
#, c-format
msgid "This password is too simple"
msgstr "密码太简单"
-#: any.pm:526
+#: any.pm:533
#, c-format
msgid "Please give a user name"
msgstr "请给出用户名"
-#: any.pm:527
+#: any.pm:534
#, c-format
msgid ""
"The user name must contain only lower cased letters, numbers, `-' and `_'"
msgstr "用户名只能有小写字母、数字、“-”和“_”"
-#: any.pm:528
+#: any.pm:535
#, c-format
msgid "The user name is too long"
msgstr "该用户名太长"
-#: any.pm:529
+#: any.pm:536
#, c-format
msgid "This user name has already been added"
msgstr "该用户名已经存在"
-#: any.pm:533
+#: any.pm:540
#, c-format
msgid "Add user"
msgstr "添加用户"
-#: any.pm:534
+#: any.pm:541
#, c-format
msgid ""
"Enter a user\n"
@@ -1158,7 +1163,7 @@ msgstr ""
"请输入一个用户名\n"
"%s"
-#: any.pm:537 diskdrake/dav.pm:68 diskdrake/hd_gtk.pm:158
+#: any.pm:544 diskdrake/dav.pm:68 diskdrake/hd_gtk.pm:158
#: diskdrake/removable.pm:27 diskdrake/smbnfs_gtk.pm:82 help.pm:544
#: interactive/http.pm:152 printer/printerdrake.pm:165
#: printer/printerdrake.pm:352 printer/printerdrake.pm:4076
@@ -1168,63 +1173,63 @@ msgstr ""
msgid "Done"
msgstr "完成"
-#: any.pm:538 help.pm:52
+#: any.pm:545 help.pm:52
#, c-format
msgid "Accept user"
msgstr "接受该用户"
-#: any.pm:549
+#: any.pm:556
#, c-format
msgid "Real name"
msgstr "真实姓名"
-#: any.pm:550 help.pm:52 printer/printerdrake.pm:1373
+#: any.pm:557 help.pm:52 printer/printerdrake.pm:1373
#: printer/printerdrake.pm:1493
#, c-format
msgid "User name"
msgstr "用户名"
-#: any.pm:553
+#: any.pm:560
#, c-format
msgid "Shell"
msgstr "Shell"
-#: any.pm:555
+#: any.pm:562
#, c-format
msgid "Icon"
msgstr "图标"
-#: any.pm:596 security/l10n.pm:14
+#: any.pm:603 security/l10n.pm:14
#, c-format
msgid "Autologin"
msgstr "自动登录"
-#: any.pm:597
+#: any.pm:604
#, c-format
msgid "I can set up your computer to automatically log on one user."
msgstr "您可在此设定启动时自动以某用户的身份登入系统。"
-#: any.pm:598 help.pm:52
+#: any.pm:605 help.pm:52
#, c-format
msgid "Do you want to use this feature?"
msgstr "您要使用此特性吗?"
-#: any.pm:599
+#: any.pm:606
#, c-format
msgid "Choose the default user:"
msgstr "选择默认的用户: "
-#: any.pm:600
+#: any.pm:607
#, c-format
msgid "Choose the window manager to run:"
msgstr "选择要运行的窗口管理程序: "
-#: any.pm:612
+#: any.pm:619
#, c-format
msgid "Please choose a language to use."
msgstr "请选择要使用的语言。"
-#: any.pm:633
+#: any.pm:640
#, c-format
msgid ""
"Mandrakelinux can support multiple languages. Select\n"
@@ -1234,48 +1239,48 @@ msgstr ""
"Mandrakelinux 可以支持多种语言。请选择您想要安装的语言。\n"
"安装完成并重新启动系统后它们就可以使用。"
-#: any.pm:651 help.pm:660
+#: any.pm:658 help.pm:660
#, c-format
msgid "Use Unicode by default"
msgstr "默认使用 Unicode"
-#: any.pm:652 help.pm:660
+#: any.pm:659 help.pm:660
#, c-format
msgid "All languages"
msgstr "全部语言"
-#: any.pm:688 help.pm:581 help.pm:991 install_steps_interactive.pm:908
+#: any.pm:695 help.pm:581 help.pm:991 install_steps_interactive.pm:901
#, c-format
msgid "Country / Region"
msgstr "国家/地区"
-#: any.pm:689
+#: any.pm:696
#, c-format
msgid "Please choose your country."
msgstr "请选择您的国家/地区。"
-#: any.pm:691
+#: any.pm:698
#, c-format
msgid "Here is the full list of available countries"
msgstr "在此列出了可用的全部国家/地区"
-#: any.pm:692 diskdrake/interactive.pm:292 help.pm:544 help.pm:581 help.pm:621
+#: any.pm:699 diskdrake/interactive.pm:292 help.pm:544 help.pm:581 help.pm:621
#: help.pm:991 install_steps_interactive.pm:114
#, c-format
msgid "More"
msgstr "更多"
-#: any.pm:823
+#: any.pm:830
#, c-format
msgid "No sharing"
msgstr "禁止共享"
-#: any.pm:823
+#: any.pm:830
#, c-format
msgid "Allow all users"
msgstr "允许所有用户使用"
-#: any.pm:827
+#: any.pm:834
#, c-format
msgid ""
"Would you like to allow users to share some of their directories?\n"
@@ -1288,23 +1293,23 @@ msgstr ""
"在这里选择允许,用户将可以在 KDE 和 Gnome 的文件管理器中单击“共享”菜单项\n"
"“定制”允许按照不同用户细分设置。\n"
-#: any.pm:843
+#: any.pm:850
#, c-format
msgid ""
"You can export using NFS or Samba. Please select which you'd like to use."
msgstr "您可以使用 NFS 或 Samba 导出。请选择您想要使用的协议。"
-#: any.pm:851
+#: any.pm:858
#, c-format
msgid "The package %s is going to be removed."
msgstr "即将卸载 %s 软件包。"
-#: any.pm:863
+#: any.pm:870
#, c-format
msgid "Launch userdrake"
msgstr "运行“Drak 用户管理”"
-#: any.pm:865
+#: any.pm:872
#, c-format
msgid ""
"The per-user sharing uses the group \"fileshare\". \n"
@@ -1409,7 +1414,7 @@ msgid "Can't use broadcast with no NIS domain"
msgstr "没有 NIS 域无法广播"
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:533
+#: bootloader.pm:532
#, c-format
msgid ""
"Welcome to the operating system chooser!\n"
@@ -1424,56 +1429,56 @@ msgstr ""
"wait for default boot.\n"
"\n"
-#: bootloader.pm:665
+#: bootloader.pm:663
#, c-format
msgid "SILO"
msgstr "SILO"
-#: bootloader.pm:668 help.pm:768
+#: bootloader.pm:665 help.pm:768
#, c-format
msgid "LILO with graphical menu"
msgstr "图形菜单 LILO"
-#: bootloader.pm:670 help.pm:768
+#: bootloader.pm:666 help.pm:768
#, c-format
msgid "LILO with text menu"
msgstr "文本菜单 LILO"
-#: bootloader.pm:672
+#: bootloader.pm:668
#, c-format
msgid "Grub"
msgstr "Grub"
-#: bootloader.pm:674
+#: bootloader.pm:670
#, c-format
msgid "Yaboot"
msgstr "Yaboot"
-#: bootloader.pm:1147
+#: bootloader.pm:1143
#, c-format
msgid "not enough room in /boot"
msgstr "/boot 中没有足够空间"
-#: bootloader.pm:1175
+#: bootloader.pm:1171
#, c-format
msgid "You can't install the bootloader on a %s partition\n"
msgstr "%s 分区不能安装启动引导程序\n"
-#: bootloader.pm:1219
+#: bootloader.pm:1215
#, c-format
msgid ""
"Your bootloader configuration must be updated because partition has been "
"renumbered"
msgstr "必须更新您的启动引导程序配置,因为分区已经重新编号"
-#: bootloader.pm:1226
+#: bootloader.pm:1222
#, c-format
msgid ""
"The bootloader can't be installed correctly. You have to boot rescue and "
"choose \"%s\""
msgstr "无法正确安装启动引导程序。您需要以抢救方式启动并选择“%s”"
-#: bootloader.pm:1227
+#: bootloader.pm:1223
#, c-format
msgid "Re-install Boot Loader"
msgstr "重新安装启动引导程序"
@@ -1533,7 +1538,7 @@ msgstr "缺少 kdesu"
msgid "consolehelper missing"
msgstr "缺少 consolehelper"
-#: crypto.pm:14 crypto.pm:28 lang.pm:236 network/adsl_consts.pm:44
+#: crypto.pm:14 crypto.pm:28 lang.pm:238 network/adsl_consts.pm:44
#: network/adsl_consts.pm:55 network/adsl_consts.pm:65
#: network/adsl_consts.pm:75 network/adsl_consts.pm:86
#: network/adsl_consts.pm:97 network/adsl_consts.pm:107
@@ -1543,61 +1548,61 @@ msgstr "缺少 consolehelper"
msgid "France"
msgstr "法国"
-#: crypto.pm:15 lang.pm:212
+#: crypto.pm:15 lang.pm:214
#, c-format
msgid "Costa Rica"
msgstr "哥斯达黎加"
-#: crypto.pm:16 crypto.pm:29 lang.pm:184 network/adsl_consts.pm:26
+#: crypto.pm:16 crypto.pm:29 lang.pm:186 network/adsl_consts.pm:26
#: network/adsl_consts.pm:36 network/netconnect.pm:49
#, c-format
msgid "Belgium"
msgstr "比利时"
-#: crypto.pm:17 crypto.pm:30 lang.pm:217
+#: crypto.pm:17 crypto.pm:30 lang.pm:219
#, c-format
msgid "Czech Republic"
msgstr "捷克共和国"
-#: crypto.pm:18 crypto.pm:31 lang.pm:218 network/adsl_consts.pm:134
+#: crypto.pm:18 crypto.pm:31 lang.pm:220 network/adsl_consts.pm:134
#: network/adsl_consts.pm:142
#, c-format
msgid "Germany"
msgstr "德国"
-#: crypto.pm:19 crypto.pm:32 lang.pm:249
+#: crypto.pm:19 crypto.pm:32 lang.pm:251
#, c-format
msgid "Greece"
msgstr "希腊"
-#: crypto.pm:20 crypto.pm:33 lang.pm:322
+#: crypto.pm:20 crypto.pm:33 lang.pm:324
#, c-format
msgid "Norway"
msgstr "挪威"
-#: crypto.pm:21 crypto.pm:34 lang.pm:351 network/adsl_consts.pm:240
+#: crypto.pm:21 crypto.pm:34 lang.pm:353 network/adsl_consts.pm:240
#, c-format
msgid "Sweden"
msgstr "瑞典"
-#: crypto.pm:22 crypto.pm:36 lang.pm:321 network/adsl_consts.pm:178
+#: crypto.pm:22 crypto.pm:36 lang.pm:323 network/adsl_consts.pm:178
#: network/netconnect.pm:47
#, c-format
msgid "Netherlands"
msgstr "荷兰"
-#: crypto.pm:23 crypto.pm:37 lang.pm:269 network/adsl_consts.pm:158
-#: network/adsl_consts.pm:168 network/netconnect.pm:48 standalone/drakxtv:48
+#: crypto.pm:23 crypto.pm:37 lang.pm:271 network/adsl_consts.pm:158
+#: network/adsl_consts.pm:168 network/netconnect.pm:48 standalone/drakxtv:45
#, c-format
msgid "Italy"
msgstr "意大利"
-#: crypto.pm:24 crypto.pm:38 lang.pm:177
+#: crypto.pm:24 crypto.pm:38 lang.pm:179 network/adsl_consts.pm:20
#, c-format
msgid "Austria"
msgstr "奥地利"
-#: crypto.pm:35 crypto.pm:65 lang.pm:385 network/netconnect.pm:50
+#: crypto.pm:35 crypto.pm:65 lang.pm:387 network/netconnect.pm:50
#, c-format
msgid "United States"
msgstr "美国"
@@ -1714,7 +1719,7 @@ msgstr ""
msgid "Please click on a partition"
msgstr "请选中一个分区"
-#: diskdrake/hd_gtk.pm:209 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:475
+#: diskdrake/hd_gtk.pm:209 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:477
#: standalone/drakbackup:3040 standalone/drakbackup:3102
#, c-format
msgid "Details"
@@ -1755,7 +1760,7 @@ msgstr "HFS"
msgid "Windows"
msgstr "Windows"
-#: diskdrake/hd_gtk.pm:327 install_steps_gtk.pm:327 mouse.pm:167
+#: diskdrake/hd_gtk.pm:327 install_steps_gtk.pm:329 mouse.pm:167
#: services.pm:164 standalone/drakbackup:1673 standalone/drakperm:250
#, c-format
msgid "Other"
@@ -1927,18 +1932,18 @@ msgstr ""
"仍然继续吗?"
#: diskdrake/interactive.pm:378 harddrake/sound.pm:226 keyboard.pm:314
-#: network/netconnect.pm:438 network/netconnect.pm:457
-#: network/netconnect.pm:641 printer/printerdrake.pm:936
-#: printer/printerdrake.pm:1891 printer/printerdrake.pm:1953
-#: printer/printerdrake.pm:1987 printer/printerdrake.pm:2291
-#: printer/printerdrake.pm:3149 printer/printerdrake.pm:3426
-#: printer/printerdrake.pm:3545 printer/printerdrake.pm:4543
-#: standalone/drakTermServ:351 standalone/drakTermServ:1082
-#: standalone/drakTermServ:1138 standalone/drakTermServ:1801
-#: standalone/drakbackup:580 standalone/drakbackup:678 standalone/drakboot:138
-#: standalone/drakclock:204 standalone/drakconnect:898
-#: standalone/drakfloppy:295 standalone/drakups:27 standalone/scannerdrake:50
-#: standalone/scannerdrake:908
+#: network/netconnect.pm:338 network/netconnect.pm:451
+#: network/netconnect.pm:470 network/netconnect.pm:655
+#: printer/printerdrake.pm:936 printer/printerdrake.pm:1891
+#: printer/printerdrake.pm:1953 printer/printerdrake.pm:1987
+#: printer/printerdrake.pm:2291 printer/printerdrake.pm:3149
+#: printer/printerdrake.pm:3426 printer/printerdrake.pm:3545
+#: printer/printerdrake.pm:4543 standalone/drakTermServ:352
+#: standalone/drakTermServ:1083 standalone/drakTermServ:1139
+#: standalone/drakTermServ:1802 standalone/drakbackup:580
+#: standalone/drakbackup:678 standalone/drakboot:156 standalone/drakclock:212
+#: standalone/drakconnect:908 standalone/drakfloppy:295 standalone/drakups:27
+#: standalone/scannerdrake:50 standalone/scannerdrake:908
#, c-format
msgid "Warning"
msgstr "警告"
@@ -2328,7 +2333,7 @@ msgstr "DOS 下的盘符: %s(只是猜测)\n"
msgid "Type: "
msgstr "类型: "
-#: diskdrake/interactive.pm:1159 install_steps_gtk.pm:339
+#: diskdrake/interactive.pm:1159 install_steps_gtk.pm:341
#, c-format
msgid "Name: "
msgstr "名称: "
@@ -2495,7 +2500,7 @@ msgstr "这个加密密钥太简单了(至少要有 %d 个字符)"
msgid "The encryption keys do not match"
msgstr "两次加密密钥不符"
-#: diskdrake/interactive.pm:1258 network/netconnect.pm:972
+#: diskdrake/interactive.pm:1258 network/netconnect.pm:987
#: standalone/drakconnect:393
#, c-format
msgid "Encryption key"
@@ -2655,47 +2660,47 @@ msgstr "给普通用户以写权限"
msgid "Give read-only access to ordinary users"
msgstr "给普通用户以只读权限"
-#: fs.pm:580 fs.pm:590 fs.pm:594 fs.pm:598 fs.pm:602 fs.pm:606 swap.pm:12
+#: fs.pm:581 fs.pm:591 fs.pm:595 fs.pm:599 fs.pm:603 fs.pm:607 swap.pm:12
#, c-format
msgid "%s formatting of %s failed"
msgstr "%s 格式化 %s 失败"
-#: fs.pm:647
+#: fs.pm:648
#, c-format
msgid "I don't know how to format %s in type %s"
msgstr "不知道如何将 %s 格式化成 %s 类型"
-#: fs.pm:654 fs.pm:661
+#: fs.pm:655 fs.pm:662
#, c-format
msgid "Formatting partition %s"
msgstr "正在格式化分区 %s"
-#: fs.pm:658
+#: fs.pm:659
#, c-format
msgid "Creating and formatting file %s"
msgstr "正在创建和格式化文件 %s"
-#: fs.pm:718 fs.pm:771
+#: fs.pm:719 fs.pm:772
#, c-format
msgid "Mounting partition %s"
msgstr "正在挂载分区 %s"
-#: fs.pm:719 fs.pm:772
+#: fs.pm:720 fs.pm:773
#, c-format
msgid "mounting partition %s in directory %s failed"
msgstr "将分区 %s 挂载于目录 %s 失败"
-#: fs.pm:739 fs.pm:747
+#: fs.pm:740 fs.pm:748
#, c-format
msgid "Checking %s"
msgstr "正在检查 %s"
-#: fs.pm:788 partition_table.pm:638
+#: fs.pm:789 partition_table.pm:638
#, c-format
msgid "error unmounting %s: %s"
msgstr "卸载 %s 出错: %s"
-#: fs.pm:820
+#: fs.pm:821
#, c-format
msgid "Enabling swap partition %s"
msgstr "正在启用 swap 分区 %s"
@@ -2898,7 +2903,7 @@ msgstr "ISDN 适配器"
msgid "Ethernetcard"
msgstr "以太网卡"
-#: harddrake/data.pm:78 network/netconnect.pm:452 standalone/drakconnect:272
+#: harddrake/data.pm:78 network/netconnect.pm:465 standalone/drakconnect:272
#: standalone/drakconnect:292 standalone/drakconnect:472
#: standalone/drakconnect:473 standalone/drakconnect:576
#, c-format
@@ -2921,13 +2926,13 @@ msgid "Bridges and system controllers"
msgstr "桥接和系统控制器"
#: harddrake/data.pm:83 help.pm:203 help.pm:991
-#: install_steps_interactive.pm:940 printer/printerdrake.pm:687
+#: install_steps_interactive.pm:933 printer/printerdrake.pm:687
#: printer/printerdrake.pm:4175
#, c-format
msgid "Printer"
msgstr "打印机"
-#: harddrake/data.pm:85 help.pm:991 install_steps_interactive.pm:933
+#: harddrake/data.pm:85 help.pm:991 install_steps_interactive.pm:926
#, c-format
msgid "Mouse"
msgstr "鼠标"
@@ -3178,27 +3183,27 @@ msgstr ""
"\n"
"当前为您的声卡“%s”使用的是“%s”驱动程序 "
-#: harddrake/v4l.pm:14 harddrake/v4l.pm:66
+#: harddrake/v4l.pm:14
#, c-format
msgid "Auto-detect"
msgstr "自动检测"
-#: harddrake/v4l.pm:67 harddrake/v4l.pm:219
+#: harddrake/v4l.pm:69 harddrake/v4l.pm:227
#, c-format
msgid "Unknown|Generic"
msgstr "未知|通用"
-#: harddrake/v4l.pm:100
+#: harddrake/v4l.pm:102
#, c-format
msgid "Unknown|CPH05X (bt878) [many vendors]"
msgstr "未知|CPH05X (bt878) [很多厂家] "
-#: harddrake/v4l.pm:101
+#: harddrake/v4l.pm:103
#, c-format
msgid "Unknown|CPH06X (bt878) [many vendors]"
msgstr "未知|CPH06X (bt878) [很多厂家]"
-#: harddrake/v4l.pm:245
+#: harddrake/v4l.pm:289
#, c-format
msgid ""
"For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-"
@@ -3210,37 +3215,37 @@ msgstr ""
"如果自动检测不适合您的卡,您可以在这里强制设定正确的调协器及卡的类型。只有必"
"要时才设置电视卡参数。"
-#: harddrake/v4l.pm:248
+#: harddrake/v4l.pm:292
#, c-format
msgid "Card model:"
msgstr "卡的型号: "
-#: harddrake/v4l.pm:249
+#: harddrake/v4l.pm:293
#, c-format
msgid "Tuner type:"
msgstr "调谐器类型: "
-#: harddrake/v4l.pm:250
+#: harddrake/v4l.pm:294
#, c-format
msgid "Number of capture buffers:"
msgstr "捕获缓冲区数量: "
-#: harddrake/v4l.pm:250
+#: harddrake/v4l.pm:294
#, c-format
msgid "number of capture buffers for mmap'ed capture"
msgstr "用于 mmap 捕获的缓冲区数量"
-#: harddrake/v4l.pm:252
+#: harddrake/v4l.pm:296
#, c-format
msgid "PLL setting:"
msgstr "PLL 设置: "
-#: harddrake/v4l.pm:253
+#: harddrake/v4l.pm:297
#, c-format
msgid "Radio support:"
msgstr "无线电支持: "
-#: harddrake/v4l.pm:253
+#: harddrake/v4l.pm:297
#, c-format
msgid "enable radio support"
msgstr "启用无线电支持"
@@ -3255,12 +3260,12 @@ msgid ""
"terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
"will reboot your computer."
msgstr ""
-"在继续之前,您应该仔细阅读许可协议的条款。该许可适用于整个 Mandrakelinux"
-"发行版。如果您同意其中的全部条款,请选中\"%s\"框。如果不同意,单击\"%s\"按钮"
-"将重新启动您的计算机。"
+"在继续之前,您应该仔细阅读许可协议的条款。该许可适用于整个 Mandrakelinux发行"
+"版。如果您同意其中的全部条款,请选中\"%s\"框。如果不同意,单击\"%s\"按钮将重"
+"新启动您的计算机。"
-#: help.pm:14 install_steps_gtk.pm:596 install_steps_interactive.pm:88
-#: install_steps_interactive.pm:697 standalone/drakautoinst:216
+#: help.pm:14 install_steps_gtk.pm:598 install_steps_interactive.pm:88
+#: install_steps_interactive.pm:690 standalone/drakautoinst:216
#, c-format
msgid "Accept"
msgstr "接受"
@@ -3336,9 +3341,9 @@ msgstr ""
"和窗口管理器,然后单击\"%s\"。如果您对此特性不感兴趣,请不要选中\"%s\"框。"
#: help.pm:52 help.pm:197 help.pm:444 help.pm:691 help.pm:784 help.pm:1005
-#: install_steps_gtk.pm:275 interactive.pm:403 interactive/newt.pm:308
-#: network/netconnect.pm:262 network/tools.pm:206 printer/printerdrake.pm:3090
-#: standalone/drakTermServ:408 standalone/drakbackup:4199
+#: install_steps_gtk.pm:277 interactive.pm:403 interactive/newt.pm:308
+#: network/netconnect.pm:271 network/tools.pm:206 printer/printerdrake.pm:3090
+#: standalone/drakTermServ:409 standalone/drakbackup:4199
#: standalone/drakbackup:4229 standalone/drakbackup:4251 ugtk2.pm:510
#, c-format
msgid "Next"
@@ -3529,7 +3534,7 @@ msgstr "开发"
msgid "Graphical Environment"
msgstr "图形环境"
-#: help.pm:137 install_steps_interactive.pm:559
+#: help.pm:137 install_steps_interactive.pm:552
#, c-format
msgid "With X"
msgstr "安装 X"
@@ -3544,7 +3549,7 @@ msgstr "安装基础文档"
msgid "Truly minimal install"
msgstr "真正的最小安装"
-#: help.pm:137 install_steps_gtk.pm:270 install_steps_interactive.pm:605
+#: help.pm:137 install_steps_gtk.pm:272 install_steps_interactive.pm:598
#, c-format
msgid "Individual package selection"
msgstr "选择单个软件包"
@@ -3618,14 +3623,14 @@ msgstr ""
"多台计算机,此选项可能非常有用。单击此图标后,您需要插入上次安装结束后创建的"
"软盘。参看最后一步的第二条提示,其中描述了如何创建这样的软盘。"
-#: help.pm:172 help.pm:301 help.pm:329 help.pm:457 install_any.pm:420
+#: help.pm:172 help.pm:301 help.pm:329 help.pm:457 install_any.pm:413
#: interactive.pm:149 modules/interactive.pm:71 standalone/harddrake2:219
#: ugtk2.pm:1074 wizards.pm:156
#, c-format
msgid "No"
msgstr "否"
-#: help.pm:172 help.pm:301 help.pm:457 install_any.pm:420 interactive.pm:149
+#: help.pm:172 help.pm:301 help.pm:457 install_any.pm:413 interactive.pm:149
#: modules/interactive.pm:71 printer/printerdrake.pm:607 standalone/drakgw:288
#: standalone/drakgw:289 standalone/drakgw:297 standalone/drakgw:307
#: standalone/harddrake2:218 ugtk2.pm:1074 wizards.pm:156
@@ -3707,7 +3712,7 @@ msgstr ""
"节,其中详细描述了如何设置新打印机。那里给出的界面与安装时所用的界面大体相"
"同。"
-#: help.pm:203 help.pm:581 help.pm:991 install_steps_gtk.pm:646
+#: help.pm:203 help.pm:581 help.pm:991 install_steps_gtk.pm:648
#: standalone/drakbackup:2406 standalone/drakbackup:2414
#: standalone/drakbackup:2422 standalone/drakbackup:2430
#, c-format
@@ -3779,7 +3784,7 @@ msgstr ""
"Internet。最好选择地理位置离您较近的时间服务器。此选项还会自动安装时间服务"
"器,这样您局域网中的其它计算机都能够进行自动校时了。"
-#: help.pm:235 install_steps_interactive.pm:835
+#: help.pm:235 install_steps_interactive.pm:828
#, c-format
msgid "Hardware clock set to GMT"
msgstr "您的系统时钟设定为 GMT"
@@ -4190,17 +4195,17 @@ msgstr ""
msgid "Generate auto-install floppy"
msgstr "生成自动安装软盘"
-#: help.pm:418 install_steps_interactive.pm:1329
+#: help.pm:418 install_steps_interactive.pm:1322
#, c-format
msgid "Replay"
msgstr "重现"
-#: help.pm:418 install_steps_interactive.pm:1329
+#: help.pm:418 install_steps_interactive.pm:1322
#, c-format
msgid "Automated"
msgstr "自动"
-#: help.pm:418 install_steps_interactive.pm:1332
+#: help.pm:418 install_steps_interactive.pm:1325
#, c-format
msgid "Save packages selection"
msgstr "保存软件包选择"
@@ -4253,9 +4258,9 @@ msgstr ""
"\n"
"如果您想要选择要检测磁盘上的坏块,请单击单击\"%s\"。"
-#: help.pm:444 help.pm:1005 install_steps_gtk.pm:431 interactive.pm:404
+#: help.pm:444 help.pm:1005 install_steps_gtk.pm:433 interactive.pm:404
#: interactive/newt.pm:307 printer/printerdrake.pm:3088
-#: standalone/drakTermServ:387 standalone/drakbackup:4012
+#: standalone/drakTermServ:388 standalone/drakbackup:4012
#: standalone/drakbackup:4041 standalone/drakbackup:4095
#: standalone/drakbackup:4119 standalone/drakbackup:4143
#: standalone/drakbackup:4195 standalone/drakbackup:4225
@@ -4292,7 +4297,7 @@ msgstr ""
"度最快的一个,通常在您所在同一个国家会快一些。之后会出现一个可以下载的软件包"
"清单: 检查选项然后单击\"%s\"来获取并安装选中的软件包,要停止请单击\"%s\"。"
-#: help.pm:457 help.pm:602 install_steps_gtk.pm:430
+#: help.pm:457 help.pm:602 install_steps_gtk.pm:432
#: install_steps_interactive.pm:148 standalone/drakbackup:4279
#, c-format
msgid "Install"
@@ -4857,7 +4862,7 @@ msgid "authentication"
msgstr "认证"
#. -PO: keep this short or else the buttons will not fit in the window
-#: help.pm:733 install_steps_interactive.pm:1159
+#: help.pm:733 install_steps_interactive.pm:1152
#, c-format
msgid "No password"
msgstr "无密码"
@@ -4955,11 +4960,6 @@ msgstr "/dev/fd0"
msgid "Delay before booting the default image"
msgstr "启动默认映像前的延迟"
-#: help.pm:768
-#, c-format
-msgid "Force no APIC"
-msgstr "强制无 APIC"
-
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
#: help.pm:771
@@ -4996,7 +4996,7 @@ msgstr ""
#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
#: standalone/drakbackup:1604 standalone/drakfont:589 standalone/drakfont:655
#: standalone/drakups:280 standalone/drakups:329 standalone/drakups:349
-#: standalone/drakvpn:331 standalone/drakvpn:692
+#: standalone/drakvpn:333 standalone/drakvpn:694
#, c-format
msgid "Add"
msgstr "添加"
@@ -5008,7 +5008,7 @@ msgstr "修改"
#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
#: standalone/drakups:282 standalone/drakups:331 standalone/drakups:351
-#: standalone/drakvpn:331 standalone/drakvpn:692
+#: standalone/drakvpn:333 standalone/drakvpn:694
#, c-format
msgid "Remove"
msgstr "删除"
@@ -5308,8 +5308,8 @@ msgstr ""
"\"%s\": 如果在您的系统中检测到了声卡,则会在此处显示。如果您发现在此显示的声"
"卡与您系统中实际安装的声卡并不相同,您可以单击该按钮选择其它驱动程序。"
-#: help.pm:929 help.pm:991 install_steps_interactive.pm:967
-#: install_steps_interactive.pm:984
+#: help.pm:929 help.pm:991 install_steps_interactive.pm:960
+#: install_steps_interactive.pm:977
#, c-format
msgid "Sound card"
msgstr "声卡"
@@ -5431,12 +5431,12 @@ msgstr ""
"用作服务器,那么应该复查这一设置。"
#: help.pm:991 install_steps_interactive.pm:110
-#: install_steps_interactive.pm:900 standalone/keyboarddrake:23
+#: install_steps_interactive.pm:893 standalone/keyboarddrake:23
#, c-format
msgid "Keyboard"
msgstr "键盘"
-#: help.pm:991 install_steps_interactive.pm:926
+#: help.pm:991 install_steps_interactive.pm:919 standalone/drakclock:75
#, c-format
msgid "Timezone"
msgstr "时区"
@@ -5446,7 +5446,7 @@ msgstr "时区"
msgid "Graphical Interface"
msgstr "图形界面"
-#: help.pm:991 install_steps_interactive.pm:1000
+#: help.pm:991 install_steps_interactive.pm:993
#, c-format
msgid "TV card"
msgstr "电视卡"
@@ -5456,27 +5456,27 @@ msgstr "电视卡"
msgid "ISDN card"
msgstr "ISDN 卡"
-#: help.pm:991 install_steps_interactive.pm:1018 standalone/drakbackup:2101
+#: help.pm:991 install_steps_interactive.pm:1011 standalone/drakbackup:2101
#, c-format
msgid "Network"
msgstr "网络"
-#: help.pm:991 install_steps_interactive.pm:1044
+#: help.pm:991 install_steps_interactive.pm:1037
#, c-format
msgid "Security Level"
msgstr "安全级别"
-#: help.pm:991 install_steps_interactive.pm:1058
+#: help.pm:991 install_steps_interactive.pm:1051
#, c-format
msgid "Firewall"
msgstr "防火墙"
-#: help.pm:991 install_steps_interactive.pm:1072
+#: help.pm:991 install_steps_interactive.pm:1065
#, c-format
msgid "Bootloader"
msgstr "引导程序"
-#: help.pm:991 install_steps_interactive.pm:1082 services.pm:195
+#: help.pm:991 install_steps_interactive.pm:1075 services.pm:195
#, c-format
msgid "Services"
msgstr "服务"
@@ -5522,7 +5522,7 @@ msgstr ""
msgid "You must also format %s"
msgstr "您还必须格式化 %s"
-#: install_any.pm:411
+#: install_any.pm:404
#, c-format
msgid ""
"You have selected the following server(s): %s\n"
@@ -5538,13 +5538,13 @@ msgstr ""
"您选择了以下服务器: %s\n"
"\n"
"\n"
-"这些服务器默认会被激活。它们没有已知的安全问题,但可能发现新问题。"
-"如果那样,您一定要立即升级。\n"
+"这些服务器默认会被激活。它们没有已知的安全问题,但可能发现新问题。如果那样,"
+"您一定要立即升级。\n"
"\n"
"\n"
"您真要安装这些服务器吗?\n"
-#: install_any.pm:432
+#: install_any.pm:425
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -5557,29 +5557,29 @@ msgstr ""
"\n"
"您确定要删除这些软件包吗?\n"
-#: install_any.pm:827
+#: install_any.pm:820
#, c-format
msgid "Insert a FAT formatted floppy in drive %s"
msgstr "请在驱动器 %s 中插入一张 FAT 格式的软盘"
-#: install_any.pm:831
+#: install_any.pm:824
#, c-format
msgid "This floppy is not FAT formatted"
msgstr "该软盘不是 FAT 格式"
-#: install_any.pm:843
+#: install_any.pm:836
#, c-format
msgid ""
"To use this saved packages selection, boot installation with ``linux "
"defcfg=floppy''"
msgstr "使用保存的软件包选择,以“linux defcfg=floppy”启动"
-#: install_any.pm:871 partition_table.pm:847
+#: install_any.pm:864 partition_table.pm:847
#, c-format
msgid "Error reading file %s"
msgstr "请取文件 %s 出错"
-#: install_any.pm:995
+#: install_any.pm:988
#, c-format
msgid ""
"An error occurred - no valid devices were found on which to create new "
@@ -5723,12 +5723,11 @@ msgid ""
msgstr ""
"警告!\n"
"\n"
-"DrakX 现在要调整您的 Windows 分区的大小。请小心: 此操作十分危险。"
-"为安全起见,您应该先退出安装程序,在 Windows 的命令提示符状态下运"
-"行“chkdsk c:”(注意,只运行图形化程序“磁盘扫描程序”是不够的,"
-"请确定在命令提示符状态下使用“chkdsk”。)另外,还建议您运行磁盘碎片"
-"整理程序。然后重新启动本安装程序。您还应该备份您的数据。"
-"一切就绪后,请按“确定”。"
+"DrakX 现在要调整您的 Windows 分区的大小。请小心: 此操作十分危险。为安全起见,"
+"您应该先退出安装程序,在 Windows 的命令提示符状态下运行“chkdsk c:”(注意,只运"
+"行图形化程序“磁盘扫描程序”是不够的,请确定在命令提示符状态下使用“chkdsk”。)另"
+"外,还建议您运行磁盘碎片整理程序。然后重新启动本安装程序。您还应该备份您的数"
+"据。一切就绪后,请按“确定”。"
#: install_interactive.pm:176
#, c-format
@@ -5970,7 +5969,7 @@ msgstr ""
"的条款和条件。这些许可协议大多允许您使用, 复制, 修改或重新发表协议所覆盖的部"
"分。使用这些软件之前, 请仔细阅读有关许可协议的条款和条件。如果对任何部分的许"
"可协议有疑问, 应该与该部分的作者联系, Mandrakesoft 无法解答这些问题。由 "
-"MandrakeSoft S.A. 开发的各个程序受 GPL 许可协议保护。由 Mandrakesoft S.A. 创"
+"Mandrakesoft S.A. 开发的各个程序受 GPL 许可协议保护。由 Mandrakesoft S.A. 创"
"作的文档采用一个特别的许可协议。详细情况见有关的文档。\n"
"\n"
"\n"
@@ -6042,23 +6041,22 @@ msgstr ""
"\n"
"警告\n"
"\n"
-"请仔细阅读下列的条款。如果您不同意其中任何部分,您就不可以安装下一个光盘上"
-"的软件。选择“拒绝”将继续安装其它介质上的软件。\n"
+"请仔细阅读下列的条款。如果您不同意其中任何部分,您就不可以安装下一个光盘上的"
+"软件。选择“拒绝”将继续安装其它介质上的软件。\n"
"\n"
"\n"
-"下一个光盘的部分内容的许可协议不是 GPL 或类似的协议。每个这样的内容受到各"
-"自不同的条件和条款的限制。在您使用或重新分发该内容之前,请仔细阅读并遵守其"
-"特定的许可协议。\n"
-"通常这些协议会限制对该内容进行转换,复制(备份目的除外),再次分发,反向工"
-"程,反汇编,反编译或其它修改。如果违背任何协议的条款,协议赋予您的权利也立"
-"即终止。除非协议中有特定的条款赋予您相关权利,您通常不能在超过一台系统中安"
-"装该程序,或者把它应用在网络上。如果有疑问,请直接与该内容的发行者或作者联"
-"系。\n"
+"下一个光盘的部分内容的许可协议不是 GPL 或类似的协议。每个这样的内容受到各自不"
+"同的条件和条款的限制。在您使用或重新分发该内容之前,请仔细阅读并遵守其特定的"
+"许可协议。\n"
+"通常这些协议会限制对该内容进行转换,复制(备份目的除外),再次分发,反向工程,"
+"反汇编,反编译或其它修改。如果违背任何协议的条款,协议赋予您的权利也立即终"
+"止。除非协议中有特定的条款赋予您相关权利,您通常不能在超过一台系统中安装该程"
+"序,或者把它应用在网络上。如果有疑问,请直接与该内容的发行者或作者联系。\n"
"向第三方转让或复制这些内容,包括其文档通常是被禁止的。\n"
"\n"
"\n"
-"下一个光盘的内容的全部权利分别属于它们各自的作者,并受到可应用与软件程序的"
-"知识产权和版权法律的保护。\n"
+"下一个光盘的内容的全部权利分别属于它们各自的作者,并受到可应用与软件程序的知"
+"识产权和版权法律的保护。\n"
#: install_messages.pm:128
#, c-format
@@ -6134,93 +6132,93 @@ msgstr ""
"如果这样,您可以尝试文本模式的安装。\n"
"在从光盘启动后按“F1”键,然后输入“text”。"
-#: install_steps_gtk.pm:232 install_steps_interactive.pm:587
+#: install_steps_gtk.pm:232 install_steps_interactive.pm:580
#, c-format
msgid "Package Group Selection"
msgstr "程序组选择"
-#: install_steps_gtk.pm:292 install_steps_interactive.pm:519
+#: install_steps_gtk.pm:294 install_steps_interactive.pm:519
#, c-format
msgid "Total size: %d / %d MB"
msgstr "总共大小: %d / %d MB"
-#: install_steps_gtk.pm:338
+#: install_steps_gtk.pm:340
#, c-format
msgid "Bad package"
msgstr "有错的软件包"
-#: install_steps_gtk.pm:340
+#: install_steps_gtk.pm:342
#, c-format
msgid "Version: "
msgstr "版本: "
-#: install_steps_gtk.pm:341
+#: install_steps_gtk.pm:343
#, c-format
msgid "Size: "
msgstr "大小: "
-#: install_steps_gtk.pm:341
+#: install_steps_gtk.pm:343
#, c-format
msgid "%d KB\n"
msgstr "%d KB\n"
-#: install_steps_gtk.pm:342
+#: install_steps_gtk.pm:344
#, c-format
msgid "Importance: "
msgstr "重要程度: "
-#: install_steps_gtk.pm:375
+#: install_steps_gtk.pm:377
#, c-format
msgid "You can't select/unselect this package"
msgstr "您不能改变这个软件包的选定"
-#: install_steps_gtk.pm:379
+#: install_steps_gtk.pm:381
#, c-format
msgid "due to missing %s"
msgstr "由于缺少 %s"
-#: install_steps_gtk.pm:380
+#: install_steps_gtk.pm:382
#, c-format
msgid "due to unsatisfied %s"
msgstr "由于不满足的 %s"
-#: install_steps_gtk.pm:381
+#: install_steps_gtk.pm:383
#, c-format
msgid "trying to promote %s"
msgstr "尝试推广 %s"
-#: install_steps_gtk.pm:382
+#: install_steps_gtk.pm:384
#, c-format
msgid "in order to keep %s"
msgstr "为了保留 %s"
-#: install_steps_gtk.pm:387
+#: install_steps_gtk.pm:389
#, c-format
msgid ""
"You can't select this package as there is not enough space left to install it"
msgstr "您不可以选择这个软件包。没有足够空间安装它。"
-#: install_steps_gtk.pm:390
+#: install_steps_gtk.pm:392
#, c-format
msgid "The following packages are going to be installed"
msgstr "即将安装下列软件包"
-#: install_steps_gtk.pm:391
+#: install_steps_gtk.pm:393
#, c-format
msgid "The following packages are going to be removed"
msgstr "即将卸载下列软件包"
-#: install_steps_gtk.pm:415
+#: install_steps_gtk.pm:417
#, c-format
msgid "This is a mandatory package, it can't be unselected"
msgstr "这个软件包是必需的,不能取消选定"
-#: install_steps_gtk.pm:417
+#: install_steps_gtk.pm:419
#, c-format
msgid "You can't unselect this package. It is already installed"
msgstr "您不可以取消选择这个软件包。它已经安装过了"
-#: install_steps_gtk.pm:420
+#: install_steps_gtk.pm:422
#, c-format
msgid ""
"This package must be upgraded.\n"
@@ -6229,78 +6227,78 @@ msgstr ""
"这个软件包必须进行升级。\n"
"您真的要删除它吗?"
-#: install_steps_gtk.pm:423
+#: install_steps_gtk.pm:425
#, c-format
msgid "You can't unselect this package. It must be upgraded"
msgstr "您不能不选择这个软件包。它必须升级"
-#: install_steps_gtk.pm:428
+#: install_steps_gtk.pm:430
#, c-format
msgid "Show automatically selected packages"
msgstr "自动显示选中的软件包"
-#: install_steps_gtk.pm:433
+#: install_steps_gtk.pm:435
#, c-format
msgid "Load/Save on floppy"
msgstr "软盘载入/保存"
-#: install_steps_gtk.pm:434
+#: install_steps_gtk.pm:436
#, c-format
msgid "Updating package selection"
msgstr "更新软件包选择"
-#: install_steps_gtk.pm:439
+#: install_steps_gtk.pm:441
#, c-format
msgid "Minimal install"
msgstr "最小安装"
-#: install_steps_gtk.pm:453 install_steps_interactive.pm:427
+#: install_steps_gtk.pm:455 install_steps_interactive.pm:427
#, c-format
msgid "Choose the packages you want to install"
msgstr "选择您想要安装的软件包"
-#: install_steps_gtk.pm:469 install_steps_interactive.pm:673
+#: install_steps_gtk.pm:471 install_steps_interactive.pm:666
#, c-format
msgid "Installing"
msgstr "正在安装"
-#: install_steps_gtk.pm:475
+#: install_steps_gtk.pm:477
#, c-format
msgid "No details"
msgstr "不显示细节"
-#: install_steps_gtk.pm:476
+#: install_steps_gtk.pm:478
#, c-format
msgid "Estimating"
msgstr "正在估计"
-#: install_steps_gtk.pm:482
+#: install_steps_gtk.pm:484
#, c-format
msgid "Time remaining "
msgstr "剩余时间"
-#: install_steps_gtk.pm:494
+#: install_steps_gtk.pm:496
#, c-format
msgid "Please wait, preparing installation..."
msgstr "请稍候,正在准备安装..."
-#: install_steps_gtk.pm:555
+#: install_steps_gtk.pm:557
#, c-format
msgid "%d packages"
msgstr "%d 个软件包"
-#: install_steps_gtk.pm:560
+#: install_steps_gtk.pm:562
#, c-format
msgid "Installing package %s"
msgstr "正在安装软件包 %s"
-#: install_steps_gtk.pm:596 install_steps_interactive.pm:88
-#: install_steps_interactive.pm:697
+#: install_steps_gtk.pm:598 install_steps_interactive.pm:88
+#: install_steps_interactive.pm:690
#, c-format
msgid "Refuse"
msgstr "拒绝"
-#: install_steps_gtk.pm:597 install_steps_interactive.pm:698
+#: install_steps_gtk.pm:599 install_steps_interactive.pm:691
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -6314,24 +6312,24 @@ msgstr ""
"请在驱动器中插入标有“%s”的光盘,然后单击“确定”。\n"
"如果您没有这张光盘,请单击“取消”,放弃安装这张光盘上的软件。"
-#: install_steps_gtk.pm:612 install_steps_interactive.pm:710
+#: install_steps_gtk.pm:614 install_steps_interactive.pm:703
#, c-format
msgid "There was an error ordering packages:"
msgstr "排列软件包时出错: "
-#: install_steps_gtk.pm:612 install_steps_gtk.pm:616
-#: install_steps_interactive.pm:710 install_steps_interactive.pm:714
+#: install_steps_gtk.pm:614 install_steps_gtk.pm:618
+#: install_steps_interactive.pm:703 install_steps_interactive.pm:707
#, c-format
msgid "Go on anyway?"
msgstr "真的要继续?"
-#: install_steps_gtk.pm:616 install_steps_interactive.pm:714
+#: install_steps_gtk.pm:618 install_steps_interactive.pm:707
#, c-format
msgid "There was an error installing packages:"
msgstr "安装软件包时出错: "
-#: install_steps_gtk.pm:656 install_steps_interactive.pm:882
-#: install_steps_interactive.pm:1034
+#: install_steps_gtk.pm:658 install_steps_interactive.pm:875
+#: install_steps_interactive.pm:1027
#, c-format
msgid "not configured"
msgstr "未配置"
@@ -6447,8 +6445,8 @@ 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"
msgstr ""
-"无法创建启动空间(1MB)!安装将继续,但如需启动系统,您可用“Drak 磁盘管"
-"理”创建启动分区"
+"无法创建启动空间(1MB)!安装将继续,但如需启动系统,您可用“Drak 磁盘管理”创建"
+"启动分区"
#: install_steps_interactive.pm:325
#, c-format
@@ -6535,47 +6533,37 @@ msgstr "请插入包含软件包选择的软盘"
#: install_steps_interactive.pm:533
#, c-format
-msgid ""
-"Due to incompatibilities of the 2.6 series kernel with the LSB runtime\n"
-"tests, the 2.4 series kernel will be installed as the default to insure\n"
-"compliance under the \"LSB\" group selection."
-msgstr ""
-"由于 2.6 系列的内核与 LSB 运行时刻测试不兼容,我们将会把 2.4 系列内核\n"
-"作为默认值,以遵从“LSB”组选择。"
-
-#: install_steps_interactive.pm:540
-#, c-format
msgid "Selected size is larger than available space"
msgstr "您选择的超过可用空间"
-#: install_steps_interactive.pm:555
+#: install_steps_interactive.pm:548
#, c-format
msgid "Type of install"
msgstr "安装类型"
-#: install_steps_interactive.pm:556
+#: install_steps_interactive.pm:549
#, c-format
msgid ""
"You haven't selected any group of packages.\n"
"Please choose the minimal installation you want:"
msgstr "您没有选择任何的组件,请选择最小安装:"
-#: install_steps_interactive.pm:560
+#: install_steps_interactive.pm:553
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "安装基础文档(建议!)"
-#: install_steps_interactive.pm:561
+#: install_steps_interactive.pm:554
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "真正最小安装(注意没有 urpmi 包管理工具)"
-#: install_steps_interactive.pm:604 standalone/drakxtv:53
+#: install_steps_interactive.pm:597 standalone/drakxtv:50
#, c-format
msgid "All"
msgstr "全部"
-#: install_steps_interactive.pm:648
+#: install_steps_interactive.pm:641
#, c-format
msgid ""
"If you have all the CDs in the list below, click Ok.\n"
@@ -6586,17 +6574,17 @@ msgstr ""
"如果您没有其中任何一张,单击“取消”。\n"
"如果您缺少其中一张,清除它的选中标记,然后单击“确认”。"
-#: install_steps_interactive.pm:653
+#: install_steps_interactive.pm:646
#, c-format
msgid "Cd-Rom labeled \"%s\""
msgstr "标为 %s 的光盘"
-#: install_steps_interactive.pm:673
+#: install_steps_interactive.pm:666
#, c-format
msgid "Preparing installation"
msgstr "正在准备安装"
-#: install_steps_interactive.pm:682
+#: install_steps_interactive.pm:675
#, c-format
msgid ""
"Installing package %s\n"
@@ -6605,22 +6593,22 @@ msgstr ""
"正在安装软件包 %s \n"
"%d%%"
-#: install_steps_interactive.pm:728
+#: install_steps_interactive.pm:721
#, c-format
msgid "Post-install configuration"
msgstr "安装后的配置"
-#: install_steps_interactive.pm:734
+#: install_steps_interactive.pm:727
#, c-format
msgid "Please insert the Boot floppy used in drive %s"
msgstr "请在驱动器 %s 中插入启动盘"
-#: install_steps_interactive.pm:740
+#: install_steps_interactive.pm:733
#, c-format
msgid "Please insert the Update Modules floppy in drive %s"
msgstr "请在驱动器 %s 中插入一张更新模块软盘"
-#: install_steps_interactive.pm:761
+#: install_steps_interactive.pm:754
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -6639,176 +6627,176 @@ msgstr ""
"\n"
"您是否要安装升级包?"
-#: install_steps_interactive.pm:782
+#: install_steps_interactive.pm:775
#, c-format
msgid ""
"Contacting Mandrakelinux web site to get the list of available mirrors..."
msgstr "正在连接 Mandrakelinux 网站以获得镜像网站列表..."
-#: install_steps_interactive.pm:787
+#: install_steps_interactive.pm:780
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "选择一个镜像网站来取得程序"
-#: install_steps_interactive.pm:801
+#: install_steps_interactive.pm:794
#, c-format
msgid "Contacting the mirror to get the list of available packages..."
msgstr "正在连接镜像网站以取得可供安装程序的列表..."
-#: install_steps_interactive.pm:805
+#: install_steps_interactive.pm:798
#, c-format
msgid "Unable to contact mirror %s"
msgstr "无法连接镜像 %s"
-#: install_steps_interactive.pm:805
+#: install_steps_interactive.pm:798
#, c-format
msgid "Would you like to try again?"
msgstr "您是否想要再试一次?"
-#: install_steps_interactive.pm:831 standalone/drakclock:42
+#: install_steps_interactive.pm:824 standalone/drakclock:45
#, c-format
msgid "Which is your timezone?"
msgstr "您所在的时区?"
-#: install_steps_interactive.pm:836
+#: install_steps_interactive.pm:829
#, c-format
msgid "Automatic time synchronization (using NTP)"
msgstr "自动时间同步(使用 NTP)"
-#: install_steps_interactive.pm:844
+#: install_steps_interactive.pm:837
#, c-format
msgid "NTP Server"
msgstr "NTP 服务器"
-#: install_steps_interactive.pm:886 steps.pm:30
+#: install_steps_interactive.pm:879 steps.pm:30
#, c-format
msgid "Summary"
msgstr "概要"
-#: install_steps_interactive.pm:899 install_steps_interactive.pm:907
-#: install_steps_interactive.pm:925 install_steps_interactive.pm:932
-#: install_steps_interactive.pm:1081 services.pm:135
+#: install_steps_interactive.pm:892 install_steps_interactive.pm:900
+#: install_steps_interactive.pm:918 install_steps_interactive.pm:925
+#: install_steps_interactive.pm:1074 services.pm:135
#: standalone/drakbackup:1663
#, c-format
msgid "System"
msgstr "系统"
-#: install_steps_interactive.pm:939 install_steps_interactive.pm:966
-#: install_steps_interactive.pm:983 install_steps_interactive.pm:999
-#: install_steps_interactive.pm:1010
+#: install_steps_interactive.pm:932 install_steps_interactive.pm:959
+#: install_steps_interactive.pm:976 install_steps_interactive.pm:992
+#: install_steps_interactive.pm:1003
#, c-format
msgid "Hardware"
msgstr "硬件"
-#: install_steps_interactive.pm:945 install_steps_interactive.pm:954
+#: install_steps_interactive.pm:938 install_steps_interactive.pm:947
#, c-format
msgid "Remote CUPS server"
msgstr "远程 CUPS 服务器"
-#: install_steps_interactive.pm:945
+#: install_steps_interactive.pm:938
#, c-format
msgid "No printer"
msgstr "没有打印机"
-#: install_steps_interactive.pm:987
+#: install_steps_interactive.pm:980
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "您有 ISA 声卡吗?"
-#: install_steps_interactive.pm:989
+#: install_steps_interactive.pm:982
#, c-format
msgid "Run \"sndconfig\" after installation to configure your sound card"
msgstr "安装之后运行“sndconfig”来配置您的声卡"
-#: install_steps_interactive.pm:991
+#: install_steps_interactive.pm:984
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "没有检测到声卡。请在安装之后尝试“Drak 硬件配置”。"
-#: install_steps_interactive.pm:1011
+#: install_steps_interactive.pm:1004
#, c-format
msgid "Graphical interface"
msgstr "图形界面"
-#: install_steps_interactive.pm:1017 install_steps_interactive.pm:1032
+#: install_steps_interactive.pm:1010 install_steps_interactive.pm:1025
#, c-format
msgid "Network & Internet"
msgstr "网络和 Internet"
-#: install_steps_interactive.pm:1033
+#: install_steps_interactive.pm:1026
#, c-format
msgid "Proxies"
msgstr "代理服务器"
-#: install_steps_interactive.pm:1034
+#: install_steps_interactive.pm:1027
#, c-format
msgid "configured"
msgstr "已配置"
-#: install_steps_interactive.pm:1043 install_steps_interactive.pm:1057
+#: install_steps_interactive.pm:1036 install_steps_interactive.pm:1050
#: steps.pm:20
#, c-format
msgid "Security"
msgstr "安全"
-#: install_steps_interactive.pm:1062
+#: install_steps_interactive.pm:1055
#, c-format
msgid "activated"
msgstr "已激活"
-#: install_steps_interactive.pm:1062
+#: install_steps_interactive.pm:1055
#, c-format
msgid "disabled"
msgstr "已禁用"
-#: install_steps_interactive.pm:1071
+#: install_steps_interactive.pm:1064
#, c-format
msgid "Boot"
msgstr "启动"
#. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1075
+#: install_steps_interactive.pm:1068
#, c-format
msgid "%s on %s"
msgstr "位于 %2$s 上的 %1$s"
-#: install_steps_interactive.pm:1086 services.pm:177
+#: install_steps_interactive.pm:1079 services.pm:177
#, c-format
msgid "Services: %d activated for %d registered"
msgstr "服务: %2$d 项已注册,%1$d 项已激活"
-#: install_steps_interactive.pm:1096
+#: install_steps_interactive.pm:1089
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "您还没有配置过 X。您真的想要这样吗?"
-#: install_steps_interactive.pm:1154
+#: install_steps_interactive.pm:1147
#, c-format
msgid "Set root password and network authentication methods"
msgstr "设定 root 密码及网络认证方式"
-#: install_steps_interactive.pm:1155
+#: install_steps_interactive.pm:1148
#, c-format
msgid "Set root password"
msgstr "设定 root 密码"
-#: install_steps_interactive.pm:1165
+#: install_steps_interactive.pm:1158
#, c-format
msgid "This password is too short (it must be at least %d characters long)"
msgstr "这个密码太简单了(至少要有 %d 个字符)"
-#: install_steps_interactive.pm:1170 network/netconnect.pm:563
+#: install_steps_interactive.pm:1163 network/netconnect.pm:576
#: standalone/drakauth:26 standalone/drakconnect:451
#, c-format
msgid "Authentication"
msgstr "认证"
-#: install_steps_interactive.pm:1201
+#: install_steps_interactive.pm:1194
#, c-format
msgid "Preparing bootloader..."
msgstr "正在准备引导程序..."
-#: install_steps_interactive.pm:1211
+#: install_steps_interactive.pm:1204
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown\n"
@@ -6821,12 +6809,12 @@ msgstr ""
"安装将继续,不过您需要\n"
"使用 BootX 或其它方式启动您的机器"
-#: install_steps_interactive.pm:1217
+#: install_steps_interactive.pm:1210
#, c-format
msgid "Do you want to use aboot?"
msgstr "您要使用 aboot 吗?"
-#: install_steps_interactive.pm:1220
+#: install_steps_interactive.pm:1213
#, c-format
msgid ""
"Error installing aboot, \n"
@@ -6835,17 +6823,17 @@ msgstr ""
"安装 aboot 时出错,\n"
"强迫安装会毁坏第一个分区,要继续吗?"
-#: install_steps_interactive.pm:1231
+#: install_steps_interactive.pm:1224
#, c-format
msgid "Installing bootloader"
msgstr "安装引导程序"
-#: install_steps_interactive.pm:1238
+#: install_steps_interactive.pm:1231
#, c-format
msgid "Installation of bootloader failed. The following error occured:"
msgstr "安装系统引导程序失败,出现下列错误: "
-#: install_steps_interactive.pm:1243
+#: install_steps_interactive.pm:1236
#, c-format
msgid ""
"You may need to change your Open Firmware boot-device to\n"
@@ -6861,29 +6849,29 @@ msgstr ""
" 然后输入: shut-down\n"
"您将在下次开机时看到引导程序提示。"
-#: install_steps_interactive.pm:1256
+#: install_steps_interactive.pm:1249
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
msgstr "在此安全级别中,只有管理员才能访问 Windows 分区中的文件。"
-#: install_steps_interactive.pm:1288 standalone/drakautoinst:76
+#: install_steps_interactive.pm:1281 standalone/drakautoinst:76
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "请在驱动器 %s 中插入一张空白软盘"
-#: install_steps_interactive.pm:1293
+#: install_steps_interactive.pm:1286
#, c-format
msgid "Please insert another floppy for drivers disk"
msgstr "请插入另外一张软盘,作为驱动程序盘"
-#: install_steps_interactive.pm:1295
+#: install_steps_interactive.pm:1288
#, c-format
msgid "Creating auto install floppy..."
msgstr "正在创建自动安装软盘..."
-#: install_steps_interactive.pm:1307
+#: install_steps_interactive.pm:1300
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -6894,12 +6882,12 @@ msgstr ""
"\n"
"您真的要现在退出吗?"
-#: install_steps_interactive.pm:1322
+#: install_steps_interactive.pm:1315
#, c-format
msgid "Generate auto install floppy"
msgstr "生成自动安装软盘"
-#: install_steps_interactive.pm:1324
+#: install_steps_interactive.pm:1317
#, c-format
msgid ""
"The auto install can be fully automated if wanted,\n"
@@ -7595,1146 +7583,1146 @@ msgstr ""
"此设置将会在安装后激活。\n"
"在安装过程中,您需要使用右侧的 Ctrl 键切换不同的键盘布局。"
-#: lang.pm:149
+#: lang.pm:151
#, c-format
msgid "default:LTR"
msgstr "default:LTR"
-#: lang.pm:165
+#: lang.pm:167
#, c-format
msgid "Afghanistan"
msgstr "阿富汗"
-#: lang.pm:166
+#: lang.pm:168
#, c-format
msgid "Andorra"
msgstr "安道尔"
-#: lang.pm:167
+#: lang.pm:169
#, c-format
msgid "United Arab Emirates"
msgstr "阿拉伯联合酋长国"
-#: lang.pm:168
+#: lang.pm:170
#, c-format
msgid "Antigua and Barbuda"
msgstr "安提瓜和巴布达"
-#: lang.pm:169
+#: lang.pm:171
#, c-format
msgid "Anguilla"
msgstr "安圭拉"
-#: lang.pm:170
+#: lang.pm:172
#, c-format
msgid "Albania"
msgstr "阿尔巴尼亚"
-#: lang.pm:171
+#: lang.pm:173
#, c-format
msgid "Armenia"
msgstr "亚美尼亚"
-#: lang.pm:172
+#: lang.pm:174
#, c-format
msgid "Netherlands Antilles"
msgstr "荷属安的列斯"
-#: lang.pm:173
+#: lang.pm:175
#, c-format
msgid "Angola"
msgstr "安哥拉"
-#: lang.pm:174
+#: lang.pm:176
#, c-format
msgid "Antarctica"
msgstr "南极洲"
-#: lang.pm:175 standalone/drakxtv:51
+#: lang.pm:177 standalone/drakxtv:48
#, c-format
msgid "Argentina"
msgstr "阿根廷"
-#: lang.pm:176
+#: lang.pm:178
#, c-format
msgid "American Samoa"
msgstr "美属萨摩亚"
-#: lang.pm:178 network/adsl_consts.pm:20 standalone/drakxtv:49
+#: lang.pm:180 standalone/drakxtv:46
#, c-format
msgid "Australia"
msgstr "澳大利亚"
-#: lang.pm:179
+#: lang.pm:181
#, c-format
msgid "Aruba"
msgstr "阿鲁巴"
-#: lang.pm:180
+#: lang.pm:182
#, c-format
msgid "Azerbaijan"
msgstr "阿塞拜疆"
# ../drakfw_.c:
-#: lang.pm:181
+#: lang.pm:183
#, c-format
msgid "Bosnia and Herzegovina"
msgstr "波黑"
-#: lang.pm:182
+#: lang.pm:184
#, c-format
msgid "Barbados"
msgstr "巴巴多斯"
-#: lang.pm:183
+#: lang.pm:185
#, c-format
msgid "Bangladesh"
msgstr "孟加拉"
-#: lang.pm:185
+#: lang.pm:187
#, c-format
msgid "Burkina Faso"
msgstr "布基纳法索"
-#: lang.pm:186
+#: lang.pm:188
#, c-format
msgid "Bulgaria"
msgstr "保加利亚"
-#: lang.pm:187
+#: lang.pm:189
#, c-format
msgid "Bahrain"
msgstr "巴林"
-#: lang.pm:188
+#: lang.pm:190
#, c-format
msgid "Burundi"
msgstr "布隆迪"
-#: lang.pm:189
+#: lang.pm:191
#, c-format
msgid "Benin"
msgstr "贝宁"
-#: lang.pm:190
+#: lang.pm:192
#, c-format
msgid "Bermuda"
msgstr "百慕大"
-#: lang.pm:191
+#: lang.pm:193
#, c-format
msgid "Brunei Darussalam"
msgstr "文莱达鲁萨兰国"
-#: lang.pm:192
+#: lang.pm:194
#, c-format
msgid "Bolivia"
msgstr "玻利维亚"
-#: lang.pm:193
+#: lang.pm:195
#, c-format
msgid "Brazil"
msgstr "巴西"
-#: lang.pm:194
+#: lang.pm:196
#, c-format
msgid "Bahamas"
msgstr "巴哈马"
-#: lang.pm:195
+#: lang.pm:197
#, c-format
msgid "Bhutan"
msgstr "不丹"
-#: lang.pm:196
+#: lang.pm:198
#, c-format
msgid "Bouvet Island"
msgstr "布维岛"
-#: lang.pm:197
+#: lang.pm:199
#, c-format
msgid "Botswana"
msgstr "博茨瓦纳"
-#: lang.pm:198
+#: lang.pm:200
#, c-format
msgid "Belarus"
msgstr "白俄罗斯"
-#: lang.pm:199
+#: lang.pm:201
#, c-format
msgid "Belize"
msgstr "伯利兹"
-#: lang.pm:200
+#: lang.pm:202
#, c-format
msgid "Canada"
msgstr "加拿大"
-#: lang.pm:201
+#: lang.pm:203
#, c-format
msgid "Cocos (Keeling) Islands"
msgstr "科科斯群岛"
-#: lang.pm:202
+#: lang.pm:204
#, c-format
msgid "Congo (Kinshasa)"
msgstr "刚果(金沙萨)"
-#: lang.pm:203
+#: lang.pm:205
#, c-format
msgid "Central African Republic"
msgstr "中非共和国"
-#: lang.pm:204
+#: lang.pm:206
#, c-format
msgid "Congo (Brazzaville)"
msgstr "刚果(布拉柴维尔)"
-#: lang.pm:205
+#: lang.pm:207
#, c-format
msgid "Switzerland"
msgstr "瑞士"
-#: lang.pm:206
+#: lang.pm:208
#, c-format
msgid "Cote d'Ivoire"
msgstr "科特迪瓦"
-#: lang.pm:207
+#: lang.pm:209
#, c-format
msgid "Cook Islands"
msgstr "库克群岛"
-#: lang.pm:208
+#: lang.pm:210
#, c-format
msgid "Chile"
msgstr "智利"
-#: lang.pm:209
+#: lang.pm:211
#, c-format
msgid "Cameroon"
msgstr "喀麦隆"
-#: lang.pm:210
+#: lang.pm:212
#, c-format
msgid "China"
msgstr "中国"
-#: lang.pm:211
+#: lang.pm:213
#, c-format
msgid "Colombia"
msgstr "哥伦比亚"
-#: lang.pm:213
+#: lang.pm:215
#, c-format
msgid "Cuba"
msgstr "古巴"
-#: lang.pm:214
+#: lang.pm:216
#, c-format
msgid "Cape Verde"
msgstr "佛得角"
-#: lang.pm:215
+#: lang.pm:217
#, c-format
msgid "Christmas Island"
msgstr "圣诞岛"
-#: lang.pm:216
+#: lang.pm:218
#, c-format
msgid "Cyprus"
msgstr "塞浦路斯"
-#: lang.pm:219
+#: lang.pm:221
#, c-format
msgid "Djibouti"
msgstr "吉布提"
-#: lang.pm:220
+#: lang.pm:222
#, c-format
msgid "Denmark"
msgstr "丹麦"
-#: lang.pm:221
+#: lang.pm:223
#, c-format
msgid "Dominica"
msgstr "多米尼加"
-#: lang.pm:222
+#: lang.pm:224
#, c-format
msgid "Dominican Republic"
msgstr "多米尼加共和国"
-#: lang.pm:223
+#: lang.pm:225
#, c-format
msgid "Algeria"
msgstr "阿尔及利亚"
-#: lang.pm:224
+#: lang.pm:226
#, c-format
msgid "Ecuador"
msgstr "厄瓜多尔"
-#: lang.pm:225
+#: lang.pm:227
#, c-format
msgid "Estonia"
msgstr "爱沙尼亚"
-#: lang.pm:226
+#: lang.pm:228
#, c-format
msgid "Egypt"
msgstr "埃及"
-#: lang.pm:227
+#: lang.pm:229
#, c-format
msgid "Western Sahara"
msgstr "西撒哈拉"
-#: lang.pm:228
+#: lang.pm:230
#, c-format
msgid "Eritrea"
msgstr "厄立特里亚"
-#: lang.pm:229 network/adsl_consts.pm:202 network/adsl_consts.pm:210
+#: lang.pm:231 network/adsl_consts.pm:202 network/adsl_consts.pm:210
#: network/adsl_consts.pm:219 network/adsl_consts.pm:230
#, c-format
msgid "Spain"
msgstr "西班牙"
-#: lang.pm:230
+#: lang.pm:232
#, c-format
msgid "Ethiopia"
msgstr "埃塞俄比亚"
-#: lang.pm:231 network/adsl_consts.pm:127
+#: lang.pm:233 network/adsl_consts.pm:127
#, c-format
msgid "Finland"
msgstr "芬兰"
-#: lang.pm:232
+#: lang.pm:234
#, c-format
msgid "Fiji"
msgstr "斐济"
-#: lang.pm:233
+#: lang.pm:235
#, c-format
msgid "Falkland Islands (Malvinas)"
msgstr "福克兰群岛(马尔维纳斯)"
-#: lang.pm:234
+#: lang.pm:236
#, c-format
msgid "Micronesia"
msgstr "密克罗尼西亚"
-#: lang.pm:235
+#: lang.pm:237
#, c-format
msgid "Faroe Islands"
msgstr "法罗群岛"
-#: lang.pm:237
+#: lang.pm:239
#, c-format
msgid "Gabon"
msgstr "加蓬"
-#: lang.pm:238 network/adsl_consts.pm:247 network/adsl_consts.pm:255
+#: lang.pm:240 network/adsl_consts.pm:247 network/adsl_consts.pm:255
#: network/netconnect.pm:51
#, c-format
msgid "United Kingdom"
msgstr "英国"
-#: lang.pm:239
+#: lang.pm:241
#, c-format
msgid "Grenada"
msgstr "格林纳达"
-#: lang.pm:240
+#: lang.pm:242
#, c-format
msgid "Georgia"
msgstr "乔治亚"
-#: lang.pm:241
+#: lang.pm:243
#, c-format
msgid "French Guiana"
msgstr "法属圭亚那"
-#: lang.pm:242
+#: lang.pm:244
#, c-format
msgid "Ghana"
msgstr "加纳"
-#: lang.pm:243
+#: lang.pm:245
#, c-format
msgid "Gibraltar"
msgstr "直布罗陀"
-#: lang.pm:244
+#: lang.pm:246
#, c-format
msgid "Greenland"
msgstr "格陵兰"
-#: lang.pm:245
+#: lang.pm:247
#, c-format
msgid "Gambia"
msgstr "冈比亚"
-#: lang.pm:246
+#: lang.pm:248
#, c-format
msgid "Guinea"
msgstr "几内亚"
-#: lang.pm:247
+#: lang.pm:249
#, c-format
msgid "Guadeloupe"
msgstr "瓜德洛普"
-#: lang.pm:248
+#: lang.pm:250
#, c-format
msgid "Equatorial Guinea"
msgstr "赤道几内亚"
-#: lang.pm:250
+#: lang.pm:252
#, c-format
msgid "South Georgia and the South Sandwich Islands"
msgstr "南乔治亚岛和南桑德韦奇岛"
-#: lang.pm:251
+#: lang.pm:253
#, c-format
msgid "Guatemala"
msgstr "危地马拉"
-#: lang.pm:252
+#: lang.pm:254
#, c-format
msgid "Guam"
msgstr "关岛"
-#: lang.pm:253
+#: lang.pm:255
#, c-format
msgid "Guinea-Bissau"
msgstr "几内亚比绍"
-#: lang.pm:254
+#: lang.pm:256
#, c-format
msgid "Guyana"
msgstr "圭亚那"
-#: lang.pm:255
+#: lang.pm:257
#, c-format
msgid "China (Hong Kong)"
msgstr "中国香港"
-#: lang.pm:256
+#: lang.pm:258
#, c-format
msgid "Heard and McDonald Islands"
msgstr "赫德和麦克唐纳群岛"
-#: lang.pm:257
+#: lang.pm:259
#, c-format
msgid "Honduras"
msgstr "洪都拉斯"
-#: lang.pm:258
+#: lang.pm:260
#, c-format
msgid "Croatia"
msgstr "克罗地亚"
-#: lang.pm:259
+#: lang.pm:261
#, c-format
msgid "Haiti"
msgstr "海地"
-#: lang.pm:260 network/adsl_consts.pm:152
+#: lang.pm:262 network/adsl_consts.pm:152
#, c-format
msgid "Hungary"
msgstr "匈牙利"
-#: lang.pm:261
+#: lang.pm:263
#, c-format
msgid "Indonesia"
msgstr "印度尼西亚"
-#: lang.pm:262 standalone/drakxtv:48
+#: lang.pm:264 standalone/drakxtv:45
#, c-format
msgid "Ireland"
msgstr "爱尔兰"
-#: lang.pm:263
+#: lang.pm:265
#, c-format
msgid "Israel"
msgstr "以色列"
-#: lang.pm:264
+#: lang.pm:266
#, c-format
msgid "India"
msgstr "印度"
-#: lang.pm:265
+#: lang.pm:267
#, c-format
msgid "British Indian Ocean Territory"
msgstr "英属印度洋地区"
-#: lang.pm:266
+#: lang.pm:268
#, c-format
msgid "Iraq"
msgstr "伊拉克"
-#: lang.pm:267
+#: lang.pm:269
#, c-format
msgid "Iran"
msgstr "伊朗"
-#: lang.pm:268
+#: lang.pm:270
#, c-format
msgid "Iceland"
msgstr "冰岛"
-#: lang.pm:270
+#: lang.pm:272
#, c-format
msgid "Jamaica"
msgstr "牙买加"
-#: lang.pm:271
+#: lang.pm:273
#, c-format
msgid "Jordan"
msgstr "约旦"
-#: lang.pm:272
+#: lang.pm:274
#, c-format
msgid "Japan"
msgstr "日本"
-#: lang.pm:273
+#: lang.pm:275
#, c-format
msgid "Kenya"
msgstr "肯尼亚"
-#: lang.pm:274
+#: lang.pm:276
#, c-format
msgid "Kyrgyzstan"
msgstr "吉尔吉斯斯坦"
-#: lang.pm:275
+#: lang.pm:277
#, c-format
msgid "Cambodia"
msgstr "柬埔寨"
-#: lang.pm:276
+#: lang.pm:278
#, c-format
msgid "Kiribati"
msgstr "基里巴斯"
-#: lang.pm:277
+#: lang.pm:279
#, c-format
msgid "Comoros"
msgstr "科摩罗"
-#: lang.pm:278
+#: lang.pm:280
#, c-format
msgid "Saint Kitts and Nevis"
msgstr "圣基茨和尼维斯"
-#: lang.pm:279
+#: lang.pm:281
#, c-format
msgid "Korea (North)"
msgstr "朝鲜"
-#: lang.pm:280
+#: lang.pm:282
#, c-format
msgid "Korea"
msgstr "韩国"
-#: lang.pm:281
+#: lang.pm:283
#, c-format
msgid "Kuwait"
msgstr "科威特"
-#: lang.pm:282
+#: lang.pm:284
#, c-format
msgid "Cayman Islands"
msgstr "开曼群岛"
-#: lang.pm:283
+#: lang.pm:285
#, c-format
msgid "Kazakhstan"
msgstr "哈萨克斯坦"
-#: lang.pm:284
+#: lang.pm:286
#, c-format
msgid "Laos"
msgstr "老挝"
-#: lang.pm:285
+#: lang.pm:287
#, c-format
msgid "Lebanon"
msgstr "黎巴嫩"
-#: lang.pm:286
+#: lang.pm:288
#, c-format
msgid "Saint Lucia"
msgstr "圣卢西亚"
-#: lang.pm:287
+#: lang.pm:289
#, c-format
msgid "Liechtenstein"
msgstr "列支敦士登"
-#: lang.pm:288
+#: lang.pm:290
#, c-format
msgid "Sri Lanka"
msgstr "斯里兰卡"
-#: lang.pm:289
+#: lang.pm:291
#, c-format
msgid "Liberia"
msgstr "利比里亚"
-#: lang.pm:290
+#: lang.pm:292
#, c-format
msgid "Lesotho"
msgstr "莱索托"
-#: lang.pm:291
+#: lang.pm:293
#, c-format
msgid "Lithuania"
msgstr "立陶宛"
-#: lang.pm:292
+#: lang.pm:294
#, c-format
msgid "Luxembourg"
msgstr "卢森堡"
-#: lang.pm:293
+#: lang.pm:295
#, c-format
msgid "Latvia"
msgstr "拉脱维亚"
-#: lang.pm:294
+#: lang.pm:296
#, c-format
msgid "Libya"
msgstr "利比亚"
-#: lang.pm:295
+#: lang.pm:297
#, c-format
msgid "Morocco"
msgstr "摩洛哥"
-#: lang.pm:296
+#: lang.pm:298
#, c-format
msgid "Monaco"
msgstr "摩纳哥"
-#: lang.pm:297
+#: lang.pm:299
#, c-format
msgid "Moldova"
msgstr "摩尔多瓦"
-#: lang.pm:298
+#: lang.pm:300
#, c-format
msgid "Madagascar"
msgstr "马达加斯加"
-#: lang.pm:299
+#: lang.pm:301
#, c-format
msgid "Marshall Islands"
msgstr "马绍尔群岛"
# ../drakfwia"
-#: lang.pm:300
+#: lang.pm:302
#, c-format
msgid "Macedonia"
msgstr "马其顿"
-#: lang.pm:301
+#: lang.pm:303
#, c-format
msgid "Mali"
msgstr "马里"
-#: lang.pm:302
+#: lang.pm:304
#, c-format
msgid "Myanmar"
msgstr "缅甸"
-#: lang.pm:303
+#: lang.pm:305
#, c-format
msgid "Mongolia"
msgstr "蒙古"
-#: lang.pm:304
+#: lang.pm:306
#, c-format
msgid "Northern Mariana Islands"
msgstr "北马里亚那岛"
-#: lang.pm:305
+#: lang.pm:307
#, c-format
msgid "Martinique"
msgstr "马提尼克"
-#: lang.pm:306
+#: lang.pm:308
#, c-format
msgid "Mauritania"
msgstr "毛里塔尼亚"
-#: lang.pm:307
+#: lang.pm:309
#, c-format
msgid "Montserrat"
msgstr "蒙特塞拉特"
-#: lang.pm:308
+#: lang.pm:310
#, c-format
msgid "Malta"
msgstr "马耳他"
-#: lang.pm:309
+#: lang.pm:311
#, c-format
msgid "Mauritius"
msgstr "毛里求斯"
-#: lang.pm:310
+#: lang.pm:312
#, c-format
msgid "Maldives"
msgstr "马尔代夫"
-#: lang.pm:311
+#: lang.pm:313
#, c-format
msgid "Malawi"
msgstr "马拉维"
-#: lang.pm:312
+#: lang.pm:314
#, c-format
msgid "Mexico"
msgstr "墨西哥"
-#: lang.pm:313
+#: lang.pm:315
#, c-format
msgid "Malaysia"
msgstr "马来西亚"
-#: lang.pm:314
+#: lang.pm:316
#, c-format
msgid "Mozambique"
msgstr "莫桑比克"
-#: lang.pm:315
+#: lang.pm:317
#, c-format
msgid "Namibia"
msgstr "纳米比亚"
-#: lang.pm:316
+#: lang.pm:318
#, c-format
msgid "New Caledonia"
msgstr "新喀里多尼亚"
-#: lang.pm:317
+#: lang.pm:319
#, c-format
msgid "Niger"
msgstr "尼日尔"
-#: lang.pm:318
+#: lang.pm:320
#, c-format
msgid "Norfolk Island"
msgstr "诺福克岛"
-#: lang.pm:319
+#: lang.pm:321
#, c-format
msgid "Nigeria"
msgstr "尼日利亚"
-#: lang.pm:320
+#: lang.pm:322
#, c-format
msgid "Nicaragua"
msgstr "尼加拉瓜"
-#: lang.pm:323
+#: lang.pm:325
#, c-format
msgid "Nepal"
msgstr "尼泊尔"
-#: lang.pm:324
+#: lang.pm:326
#, c-format
msgid "Nauru"
msgstr "瑙鲁"
-#: lang.pm:325
+#: lang.pm:327
#, c-format
msgid "Niue"
msgstr "纽埃"
-#: lang.pm:326
+#: lang.pm:328
#, c-format
msgid "New Zealand"
msgstr "新西兰"
-#: lang.pm:327
+#: lang.pm:329
#, c-format
msgid "Oman"
msgstr "阿曼"
-#: lang.pm:328
+#: lang.pm:330
#, c-format
msgid "Panama"
msgstr "巴拿马"
-#: lang.pm:329
+#: lang.pm:331
#, c-format
msgid "Peru"
msgstr "秘鲁"
-#: lang.pm:330
+#: lang.pm:332
#, c-format
msgid "French Polynesia"
msgstr "法属玻利尼西亚"
-#: lang.pm:331
+#: lang.pm:333
#, c-format
msgid "Papua New Guinea"
msgstr "巴布亚新几内亚"
-#: lang.pm:332
+#: lang.pm:334
#, c-format
msgid "Philippines"
msgstr "菲律宾"
-#: lang.pm:333
+#: lang.pm:335
#, c-format
msgid "Pakistan"
msgstr "巴基斯坦"
-#: lang.pm:334 network/adsl_consts.pm:186
+#: lang.pm:336 network/adsl_consts.pm:186
#, c-format
msgid "Poland"
msgstr "波兰"
-#: lang.pm:335
+#: lang.pm:337
#, c-format
msgid "Saint Pierre and Miquelon"
msgstr "圣皮埃尔岛及密克隆岛"
-#: lang.pm:336
+#: lang.pm:338
#, c-format
msgid "Pitcairn"
msgstr "皮特克恩"
-#: lang.pm:337
+#: lang.pm:339
#, c-format
msgid "Puerto Rico"
msgstr "波多黎各"
-#: lang.pm:338
+#: lang.pm:340
#, c-format
msgid "Palestine"
msgstr "巴勒斯坦"
-#: lang.pm:339 network/adsl_consts.pm:196
+#: lang.pm:341 network/adsl_consts.pm:196
#, c-format
msgid "Portugal"
msgstr "葡萄牙"
-#: lang.pm:340
+#: lang.pm:342
#, c-format
msgid "Paraguay"
msgstr "巴拉圭"
-#: lang.pm:341
+#: lang.pm:343
#, c-format
msgid "Palau"
msgstr "帕劳"
-#: lang.pm:342
+#: lang.pm:344
#, c-format
msgid "Qatar"
msgstr "卡塔尔"
-#: lang.pm:343
+#: lang.pm:345
#, c-format
msgid "Reunion"
msgstr "留尼旺"
-#: lang.pm:344
+#: lang.pm:346
#, c-format
msgid "Romania"
msgstr "罗马尼亚"
-#: lang.pm:345
+#: lang.pm:347
#, c-format
msgid "Russia"
msgstr "俄罗斯"
-#: lang.pm:346
+#: lang.pm:348
#, c-format
msgid "Rwanda"
msgstr "卢旺达"
-#: lang.pm:347
+#: lang.pm:349
#, c-format
msgid "Saudi Arabia"
msgstr "沙特阿拉伯"
-#: lang.pm:348
+#: lang.pm:350
#, c-format
msgid "Solomon Islands"
msgstr "所罗门群岛"
-#: lang.pm:349
+#: lang.pm:351
#, c-format
msgid "Seychelles"
msgstr "塞舌尔"
-#: lang.pm:350
+#: lang.pm:352
#, c-format
msgid "Sudan"
msgstr "苏丹"
-#: lang.pm:352
+#: lang.pm:354
#, c-format
msgid "Singapore"
msgstr "新加坡"
-#: lang.pm:353
+#: lang.pm:355
#, c-format
msgid "Saint Helena"
msgstr "圣·海伦娜"
-#: lang.pm:354
+#: lang.pm:356
#, c-format
msgid "Slovenia"
msgstr "斯洛文尼亚"
-#: lang.pm:355
+#: lang.pm:357
#, c-format
msgid "Svalbard and Jan Mayen Islands"
msgstr "斯马尔巴特和扬马延岛"
-#: lang.pm:356
+#: lang.pm:358
#, c-format
msgid "Slovakia"
msgstr "斯洛伐克"
-#: lang.pm:357
+#: lang.pm:359
#, c-format
msgid "Sierra Leone"
msgstr "塞拉利昂"
-#: lang.pm:358
+#: lang.pm:360
#, c-format
msgid "San Marino"
msgstr "圣马力诺"
-#: lang.pm:359
+#: lang.pm:361
#, c-format
msgid "Senegal"
msgstr "塞内加尔"
-#: lang.pm:360
+#: lang.pm:362
#, c-format
msgid "Somalia"
msgstr "索马里"
-#: lang.pm:361
+#: lang.pm:363
#, c-format
msgid "Suriname"
msgstr "苏里南"
-#: lang.pm:362
+#: lang.pm:364
#, c-format
msgid "Sao Tome and Principe"
msgstr "圣多美和普林西比"
-#: lang.pm:363
+#: lang.pm:365
#, c-format
msgid "El Salvador"
msgstr "萨尔瓦多"
-#: lang.pm:364
+#: lang.pm:366
#, c-format
msgid "Syria"
msgstr "叙利亚"
-#: lang.pm:365
+#: lang.pm:367
#, c-format
msgid "Swaziland"
msgstr "斯威士兰"
-#: lang.pm:366
+#: lang.pm:368
#, c-format
msgid "Turks and Caicos Islands"
msgstr "特克斯和凯科斯群岛"
-#: lang.pm:367
+#: lang.pm:369
#, c-format
msgid "Chad"
msgstr "乍得"
-#: lang.pm:368
+#: lang.pm:370
#, c-format
msgid "French Southern Territories"
msgstr "法国南方属地"
-#: lang.pm:369
+#: lang.pm:371
#, c-format
msgid "Togo"
msgstr "多哥"
-#: lang.pm:370
+#: lang.pm:372
#, c-format
msgid "Thailand"
msgstr "泰国"
-#: lang.pm:371
+#: lang.pm:373
#, c-format
msgid "Tajikistan"
msgstr "塔吉克斯坦"
-#: lang.pm:372
+#: lang.pm:374
#, c-format
msgid "Tokelau"
msgstr "托克劳群岛"
-#: lang.pm:373
+#: lang.pm:375
#, c-format
msgid "East Timor"
msgstr "东帝汶"
-#: lang.pm:374
+#: lang.pm:376
#, c-format
msgid "Turkmenistan"
msgstr "土库曼斯坦"
-#: lang.pm:375
+#: lang.pm:377
#, c-format
msgid "Tunisia"
msgstr "突尼斯"
-#: lang.pm:376
+#: lang.pm:378
#, c-format
msgid "Tonga"
msgstr "汤加"
-#: lang.pm:377
+#: lang.pm:379
#, c-format
msgid "Turkey"
msgstr "土耳其"
-#: lang.pm:378
+#: lang.pm:380
#, c-format
msgid "Trinidad and Tobago"
msgstr "特立尼达和多巴哥岛"
-#: lang.pm:379
+#: lang.pm:381
#, c-format
msgid "Tuvalu"
msgstr "图瓦卢"
-#: lang.pm:380
+#: lang.pm:382
#, c-format
msgid "Taiwan"
msgstr "中国台湾"
-#: lang.pm:381
+#: lang.pm:383
#, c-format
msgid "Tanzania"
msgstr "坦桑尼亚"
-#: lang.pm:382
+#: lang.pm:384
#, c-format
msgid "Ukraine"
msgstr "乌克兰"
-#: lang.pm:383
+#: lang.pm:385
#, c-format
msgid "Uganda"
msgstr "乌干达"
-#: lang.pm:384
+#: lang.pm:386
#, c-format
msgid "United States Minor Outlying Islands"
msgstr "美属本土外岛屿"
-#: lang.pm:386
+#: lang.pm:388
#, c-format
msgid "Uruguay"
msgstr "乌拉圭"
-#: lang.pm:387
+#: lang.pm:389
#, c-format
msgid "Uzbekistan"
msgstr "乌兹别克斯坦"
-#: lang.pm:388
+#: lang.pm:390
#, c-format
msgid "Vatican"
msgstr "梵蒂冈"
-#: lang.pm:389
+#: lang.pm:391
#, c-format
msgid "Saint Vincent and the Grenadines"
msgstr "圣文森特和格林纳丁斯"
-#: lang.pm:390
+#: lang.pm:392
#, c-format
msgid "Venezuela"
msgstr "委内瑞拉"
-#: lang.pm:391
+#: lang.pm:393
#, c-format
msgid "Virgin Islands (British)"
msgstr "英属维京群岛"
-#: lang.pm:392
+#: lang.pm:394
#, c-format
msgid "Virgin Islands (U.S.)"
msgstr "美属维京群岛"
-#: lang.pm:393
+#: lang.pm:395
#, c-format
msgid "Vietnam"
msgstr "越南"
-#: lang.pm:394
+#: lang.pm:396
#, c-format
msgid "Vanuatu"
msgstr "瓦努阿图"
-#: lang.pm:395
+#: lang.pm:397
#, c-format
msgid "Wallis and Futuna"
msgstr "瓦利斯和富图纳群岛"
-#: lang.pm:396
+#: lang.pm:398
#, c-format
msgid "Samoa"
msgstr "萨摩亚"
-#: lang.pm:397
+#: lang.pm:399
#, c-format
msgid "Yemen"
msgstr "也门"
-#: lang.pm:398
+#: lang.pm:400
#, c-format
msgid "Mayotte"
msgstr "马约特岛"
-#: lang.pm:399
+#: lang.pm:401
#, c-format
msgid "Serbia & Montenegro"
msgstr "塞尔维亚和黑山"
-#: lang.pm:400 standalone/drakxtv:50
+#: lang.pm:402 standalone/drakxtv:47
#, c-format
msgid "South Africa"
msgstr "南非"
-#: lang.pm:401
+#: lang.pm:403
#, c-format
msgid "Zambia"
msgstr "赞比亚"
-#: lang.pm:402
+#: lang.pm:404
#, c-format
msgid "Zimbabwe"
msgstr "津巴布韦"
-#: lang.pm:983
+#: lang.pm:985
#, c-format
msgid "Welcome to %s"
msgstr "欢迎使用 %s"
@@ -8749,7 +8737,7 @@ msgstr "循环装载 %s\n"
msgid "Remove the logical volumes first\n"
msgstr "请先删除逻辑卷\n"
-#: modules/interactive.pm:21 standalone/drakconnect:959
+#: modules/interactive.pm:21 standalone/drakconnect:969
#, c-format
msgid "Parameters"
msgstr "参数"
@@ -8919,9 +8907,9 @@ msgstr "GlidePoint"
#: mouse.pm:36 network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
#: network/modem.pm:58 network/modem.pm:72 network/modem.pm:77
-#: network/modem.pm:108 network/netconnect.pm:574 network/netconnect.pm:579
-#: network/netconnect.pm:591 network/netconnect.pm:596
-#: network/netconnect.pm:612 network/netconnect.pm:614
+#: network/modem.pm:108 network/netconnect.pm:587 network/netconnect.pm:592
+#: network/netconnect.pm:604 network/netconnect.pm:609
+#: network/netconnect.pm:625 network/netconnect.pm:627
#, c-format
msgid "Automatic"
msgstr "自动"
@@ -9066,7 +9054,7 @@ msgstr "通用"
msgid "Any PS/2 & USB mice"
msgstr "任何 PS/2 或 USB 鼠标"
-#: mouse.pm:92 standalone/drakvpn:1138
+#: mouse.pm:92 standalone/drakvpn:1140
#, c-format
msgid "none"
msgstr "无"
@@ -9126,12 +9114,12 @@ msgstr "Sagem(使用 pppoa) USB"
msgid "Sagem (using dhcp) usb"
msgstr "Sagem(使用 dhcp) USB"
-#: network/adsl.pm:35 network/netconnect.pm:754
+#: network/adsl.pm:35 network/netconnect.pm:769
#, c-format
msgid "Connect to the Internet"
msgstr "连接到 Internet"
-#: network/adsl.pm:36 network/netconnect.pm:755
+#: network/adsl.pm:36 network/netconnect.pm:770
#, c-format
msgid ""
"The most common way to connect with adsl is pppoe.\n"
@@ -9142,7 +9130,7 @@ msgstr ""
"有一些利用 pptp,还有极少数利用 dhcp。\n"
"如果您没有把握,就选择“pppoe”"
-#: network/adsl.pm:41 network/netconnect.pm:759
+#: network/adsl.pm:41 network/netconnect.pm:774
#, c-format
msgid "ADSL connection type :"
msgstr "ADSL 连接类型: "
@@ -9270,41 +9258,41 @@ msgstr "全部(无防火墙)"
msgid "Other ports"
msgstr "其它端口"
-#: network/isdn.pm:113 network/netconnect.pm:424
+#: network/isdn.pm:115 network/netconnect.pm:437
#, c-format
msgid "Unlisted - edit manually"
msgstr "未列出 - 手动编辑"
-#: network/isdn.pm:156 network/netconnect.pm:376
+#: network/isdn.pm:157 network/netconnect.pm:389
#, c-format
msgid "ISA / PCMCIA"
msgstr "ISA / PCMCIA"
-#: network/isdn.pm:156 network/netconnect.pm:376
+#: network/isdn.pm:157 network/netconnect.pm:389
#, c-format
msgid "I don't know"
msgstr "我不知道"
-#: network/isdn.pm:157 network/netconnect.pm:376
+#: network/isdn.pm:158 network/netconnect.pm:389
#, c-format
msgid "PCI"
msgstr "PCI"
-#: network/isdn.pm:158 network/netconnect.pm:376
+#: network/isdn.pm:159 network/netconnect.pm:389
#, c-format
msgid "USB"
msgstr "USB"
#: network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
-#: network/netconnect.pm:579 network/netconnect.pm:596
-#: network/netconnect.pm:612
+#: network/netconnect.pm:592 network/netconnect.pm:609
+#: network/netconnect.pm:625
#, c-format
msgid "Manual"
msgstr "手动"
-#: network/netconnect.pm:88 network/netconnect.pm:453
-#: network/netconnect.pm:463 network/netconnect.pm:822
-#: network/netconnect.pm:827
+#: network/netconnect.pm:88 network/netconnect.pm:466
+#: network/netconnect.pm:476 network/netconnect.pm:837
+#: network/netconnect.pm:842
#, c-format
msgid "Manual choice"
msgstr "手动选择"
@@ -9479,63 +9467,63 @@ msgstr "CHAP"
msgid "PAP/CHAP"
msgstr "PAP/CHAP"
-#: network/netconnect.pm:219 standalone/drakconnect:55
+#: network/netconnect.pm:228 standalone/drakconnect:55
#, c-format
msgid "Network & Internet Configuration"
msgstr "网络和 Internet 配置"
-#: network/netconnect.pm:225
+#: network/netconnect.pm:234
#, c-format
msgid "(detected on port %s)"
msgstr "(在端口 %s 检测到)"
#. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:227
+#: network/netconnect.pm:236
#, c-format
msgid "(detected %s)"
msgstr "(检测到 %s)"
-#: network/netconnect.pm:227
+#: network/netconnect.pm:236
#, c-format
msgid "(detected)"
msgstr "(检测到)"
-#: network/netconnect.pm:229
+#: network/netconnect.pm:238
#, c-format
msgid "Modem connection"
msgstr "调制解调器连接"
-#: network/netconnect.pm:230
+#: network/netconnect.pm:239
#, c-format
msgid "ISDN connection"
msgstr "ISDN 连接"
-#: network/netconnect.pm:231
+#: network/netconnect.pm:240
#, c-format
msgid "ADSL connection"
msgstr "ADSL 连接"
-#: network/netconnect.pm:232
+#: network/netconnect.pm:241
#, c-format
msgid "Cable connection"
msgstr "有线电缆连接"
-#: network/netconnect.pm:233
+#: network/netconnect.pm:242
#, c-format
msgid "LAN connection"
msgstr "局域网连接"
-#: network/netconnect.pm:234 network/netconnect.pm:248
+#: network/netconnect.pm:243 network/netconnect.pm:257
#, c-format
msgid "Wireless connection"
msgstr "无线连接"
-#: network/netconnect.pm:244
+#: network/netconnect.pm:253
#, c-format
msgid "Choose the connection you want to configure"
msgstr "选择您想要配置的连接"
-#: network/netconnect.pm:261
+#: network/netconnect.pm:270
#, c-format
msgid ""
"We are now going to configure the %s connection.\n"
@@ -9548,136 +9536,136 @@ msgstr ""
"\n"
"按“%s”继续。"
-#: network/netconnect.pm:269 network/netconnect.pm:781
+#: network/netconnect.pm:278 network/netconnect.pm:796
#, c-format
msgid "Connection Configuration"
msgstr "连接配置"
-#: network/netconnect.pm:270 network/netconnect.pm:782
+#: network/netconnect.pm:279 network/netconnect.pm:797
#, c-format
msgid "Please fill or check the field below"
msgstr "请填写或选择下列项目"
-#: network/netconnect.pm:277 standalone/drakconnect:519
+#: network/netconnect.pm:286 standalone/drakconnect:519
#, c-format
msgid "Card IRQ"
msgstr "网卡的 IRQ"
-#: network/netconnect.pm:278 standalone/drakconnect:520
+#: network/netconnect.pm:287 standalone/drakconnect:520
#, c-format
msgid "Card mem (DMA)"
msgstr "网卡内存(DMA)"
-#: network/netconnect.pm:279 standalone/drakconnect:521
+#: network/netconnect.pm:288 standalone/drakconnect:521
#, c-format
msgid "Card IO"
msgstr "网卡 IO"
-#: network/netconnect.pm:280 standalone/drakconnect:522
+#: network/netconnect.pm:289 standalone/drakconnect:522
#, c-format
msgid "Card IO_0"
msgstr "网卡 IO_0"
-#: network/netconnect.pm:281
+#: network/netconnect.pm:290
#, c-format
msgid "Card IO_1"
msgstr "网卡 IO_1"
-#: network/netconnect.pm:282
+#: network/netconnect.pm:291
#, c-format
msgid "Your personal phone number"
msgstr "您自己的电话号码"
-#: network/netconnect.pm:283 network/netconnect.pm:785
+#: network/netconnect.pm:292 network/netconnect.pm:800
#, c-format
msgid "Provider name (ex provider.net)"
msgstr "服务商名称(如 provider.net)"
-#: network/netconnect.pm:284 standalone/drakconnect:463
+#: network/netconnect.pm:293 standalone/drakconnect:463
#, c-format
msgid "Provider phone number"
msgstr "服务商电话号码"
-#: network/netconnect.pm:285
+#: network/netconnect.pm:294
#, c-format
msgid "Provider DNS 1 (optional)"
msgstr "服务商 DNS 1(可选)"
-#: network/netconnect.pm:286
+#: network/netconnect.pm:295
#, c-format
msgid "Provider DNS 2 (optional)"
msgstr "服务商 DNS 2(可选)"
-#: network/netconnect.pm:287 standalone/drakconnect:419
+#: network/netconnect.pm:296 standalone/drakconnect:419
#, c-format
msgid "Dialing mode"
msgstr "拨号模式"
-#: network/netconnect.pm:288 standalone/drakconnect:424
+#: network/netconnect.pm:297 standalone/drakconnect:424
#: standalone/drakconnect:484
#, c-format
msgid "Connection speed"
msgstr "连接速率"
-#: network/netconnect.pm:289 standalone/drakconnect:429
+#: network/netconnect.pm:298 standalone/drakconnect:429
#, c-format
msgid "Connection timeout (in sec)"
msgstr "连接超时(秒)"
-#: network/netconnect.pm:292 network/netconnect.pm:788
+#: network/netconnect.pm:301 network/netconnect.pm:803
#: standalone/drakconnect:461
#, c-format
msgid "Account Login (user name)"
msgstr "账户登录(用户名)"
-#: network/netconnect.pm:293 network/netconnect.pm:789
+#: network/netconnect.pm:302 network/netconnect.pm:804
#: standalone/drakconnect:462
#, c-format
msgid "Account Password"
msgstr "账户密码"
-#: network/netconnect.pm:323 network/netconnect.pm:637
-#: network/netconnect.pm:820
+#: network/netconnect.pm:332 network/netconnect.pm:650
+#: network/netconnect.pm:835
#, c-format
msgid "Select the network interface to configure:"
msgstr "选择要配置的网卡: "
-#: network/netconnect.pm:323 network/netconnect.pm:457
-#: network/netconnect.pm:641 standalone/drakgw:113 standalone/drakvpn:49
-#, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
-msgstr "对不起,我们只支持 2.4 及以上版本的内核。"
-
-#: network/netconnect.pm:325 network/netconnect.pm:366
-#: network/netconnect.pm:638 network/netconnect.pm:822 network/shorewall.pm:84
-#: standalone/drakconnect:643 standalone/drakgw:225 standalone/drakvpn:219
+#: network/netconnect.pm:334 network/netconnect.pm:379
+#: network/netconnect.pm:651 network/netconnect.pm:837 network/shorewall.pm:84
+#: standalone/drakconnect:643 standalone/drakgw:225 standalone/drakvpn:221
#, c-format
msgid "Net Device"
msgstr "网络设备"
-#: network/netconnect.pm:326 network/netconnect.pm:334
+#: network/netconnect.pm:335 network/netconnect.pm:347
#, c-format
msgid "External ISDN modem"
msgstr "外置 ISDN 调制解调器"
-#: network/netconnect.pm:365 standalone/harddrake2:115
+#: network/netconnect.pm:338 network/netconnect.pm:470
+#: network/netconnect.pm:655 standalone/drakgw:113 standalone/drakvpn:51
+#, c-format
+msgid "Sorry, we support only 2.4 and above kernels."
+msgstr "对不起,我们只支持 2.4 及以上版本的内核。"
+
+#: network/netconnect.pm:378 standalone/harddrake2:115
#, c-format
msgid "Select a device !"
msgstr "请选择设备!"
-#: network/netconnect.pm:374 network/netconnect.pm:384
-#: network/netconnect.pm:394 network/netconnect.pm:410
-#: network/netconnect.pm:421
+#: network/netconnect.pm:387 network/netconnect.pm:397
+#: network/netconnect.pm:407 network/netconnect.pm:423
+#: network/netconnect.pm:434
#, c-format
msgid "ISDN Configuration"
msgstr "ISDN 配置"
-#: network/netconnect.pm:375
+#: network/netconnect.pm:388
#, c-format
msgid "What kind of card do you have?"
msgstr "请问您适配卡的种类?"
-#: network/netconnect.pm:385
+#: network/netconnect.pm:398
#, c-format
msgid ""
"\n"
@@ -9691,33 +9679,33 @@ msgstr ""
"\n"
"如果您的卡是 PCMCIA 卡,您必须知道它的“irq”和“io”。\n"
-#: network/netconnect.pm:389
+#: network/netconnect.pm:402
#, c-format
msgid "Continue"
msgstr "继续"
-#: network/netconnect.pm:389
+#: network/netconnect.pm:402
#, c-format
msgid "Abort"
msgstr "中止"
-#: network/netconnect.pm:395
+#: network/netconnect.pm:408
#, c-format
msgid "Which of the following is your ISDN card?"
msgstr "下列哪个是您的 ISDN 卡?"
-#: network/netconnect.pm:410
+#: network/netconnect.pm:423
#, c-format
msgid "Which protocol do you want to use?"
msgstr "您将使用哪种协议?"
-#: network/netconnect.pm:412 standalone/drakconnect:116
-#: standalone/drakconnect:527 standalone/drakvpn:1140
+#: network/netconnect.pm:425 standalone/drakconnect:116
+#: standalone/drakconnect:527 standalone/drakvpn:1142
#, c-format
msgid "Protocol"
msgstr "协议"
-#: network/netconnect.pm:421
+#: network/netconnect.pm:434
#, c-format
msgid ""
"Select your provider.\n"
@@ -9726,13 +9714,13 @@ msgstr ""
"选择您的提供商。\n"
"如果该提供商未被列出,请选择“未列出”。"
-#: network/netconnect.pm:423 network/netconnect.pm:529
-#: network/netconnect.pm:675
+#: network/netconnect.pm:436 network/netconnect.pm:542
+#: network/netconnect.pm:690
#, c-format
msgid "Provider:"
msgstr "服务商:"
-#: network/netconnect.pm:438
+#: network/netconnect.pm:451
#, c-format
msgid ""
"Your modem isn't supported by the system.\n"
@@ -9741,117 +9729,117 @@ msgstr ""
"您的调制解调器不被系统支持。\n"
"请看看 http://www.linmodems.org"
-#: network/netconnect.pm:450
+#: network/netconnect.pm:463
#, c-format
msgid "Select the modem to configure:"
msgstr "选择要配置的调制解调器:"
-#: network/netconnect.pm:498
+#: network/netconnect.pm:511
#, c-format
msgid "Please choose which serial port your modem is connected to."
msgstr "请选择您的调制解调器是连接到哪个串行端口。"
-#: network/netconnect.pm:527
+#: network/netconnect.pm:540
#, c-format
msgid "Select your provider:"
msgstr "选择您的服务商:"
-#: network/netconnect.pm:556
+#: network/netconnect.pm:569
#, c-format
msgid "Dialup: account options"
msgstr "拨号: 账户设置"
-#: network/netconnect.pm:559
+#: network/netconnect.pm:572
#, c-format
msgid "Connection name"
msgstr "连接名称"
-#: network/netconnect.pm:560
+#: network/netconnect.pm:573
#, c-format
msgid "Phone number"
msgstr "电话号码"
-#: network/netconnect.pm:561
+#: network/netconnect.pm:574
#, c-format
msgid "Login ID"
msgstr "登录 ID"
-#: network/netconnect.pm:576 network/netconnect.pm:609
+#: network/netconnect.pm:589 network/netconnect.pm:622
#, c-format
msgid "Dialup: IP parameters"
msgstr "拨号: IP 参数"
-#: network/netconnect.pm:579
+#: network/netconnect.pm:592
#, c-format
msgid "IP parameters"
msgstr "IP 参数"
-#: network/netconnect.pm:580 network/netconnect.pm:912
+#: network/netconnect.pm:593 network/netconnect.pm:927
#: printer/printerdrake.pm:431 standalone/drakconnect:116
-#: standalone/drakconnect:325 standalone/drakconnect:806
+#: standalone/drakconnect:325 standalone/drakconnect:816
#: standalone/drakups:266
#, c-format
msgid "IP address"
msgstr "IP 地址"
-#: network/netconnect.pm:581
+#: network/netconnect.pm:594
#, c-format
msgid "Subnet mask"
msgstr "子网掩码"
-#: network/netconnect.pm:593
+#: network/netconnect.pm:606
#, c-format
msgid "Dialup: DNS parameters"
msgstr "拨号: DNS 参数"
-#: network/netconnect.pm:596
+#: network/netconnect.pm:609
#, c-format
msgid "DNS"
msgstr "DNS"
-#: network/netconnect.pm:597
+#: network/netconnect.pm:610
#, c-format
msgid "Domain name"
msgstr "域名"
-#: network/netconnect.pm:598 network/netconnect.pm:786
-#: standalone/drakconnect:924
+#: network/netconnect.pm:611 network/netconnect.pm:801
+#: standalone/drakconnect:934
#, c-format
msgid "First DNS Server (optional)"
msgstr "首选 DNS 服务器(可选)"
-#: network/netconnect.pm:599 network/netconnect.pm:787
-#: standalone/drakconnect:925
+#: network/netconnect.pm:612 network/netconnect.pm:802
+#: standalone/drakconnect:935
#, c-format
msgid "Second DNS Server (optional)"
msgstr "备选 DNS 服务器(可选)"
-#: network/netconnect.pm:600
+#: network/netconnect.pm:613
#, c-format
msgid "Set hostname from IP"
msgstr "由 IP 设置主机名"
-#: network/netconnect.pm:612 standalone/drakconnect:336
+#: network/netconnect.pm:625 standalone/drakconnect:336
#, c-format
msgid "Gateway"
msgstr "网关"
-#: network/netconnect.pm:613
+#: network/netconnect.pm:626
#, c-format
msgid "Gateway IP address"
msgstr "网关 IP 地址"
-#: network/netconnect.pm:637
+#: network/netconnect.pm:650
#, c-format
msgid "ADSL configuration"
msgstr "ADSL 配置"
-#: network/netconnect.pm:673
+#: network/netconnect.pm:688
#, c-format
msgid "Please choose your ADSL provider"
msgstr "请选择您的 ADSL 提供商"
-#: network/netconnect.pm:691
+#: network/netconnect.pm:706
#, c-format
msgid ""
"You need the Alcatel microcode.\n"
@@ -9862,32 +9850,32 @@ msgstr ""
"您可以通过软盘或您的 Windows 分区提供该微代码,\n"
"或者现在跳过稍后再做。"
-#: network/netconnect.pm:695 network/netconnect.pm:700
+#: network/netconnect.pm:710 network/netconnect.pm:715
#, c-format
msgid "Use a floppy"
msgstr "使用软盘"
-#: network/netconnect.pm:695 network/netconnect.pm:704
+#: network/netconnect.pm:710 network/netconnect.pm:719
#, c-format
msgid "Use my Windows partition"
msgstr "使用我的 Windows 分区"
-#: network/netconnect.pm:695 network/netconnect.pm:708
+#: network/netconnect.pm:710 network/netconnect.pm:723
#, c-format
msgid "Do it later"
msgstr "稍后再做"
-#: network/netconnect.pm:715
+#: network/netconnect.pm:730
#, c-format
msgid "Firmware copy failed, file %s not found"
msgstr "固件复制失败,文件 %s 未找到"
-#: network/netconnect.pm:722
+#: network/netconnect.pm:737
#, c-format
msgid "Firmware copy succeeded"
msgstr "固件复制成功"
-#: network/netconnect.pm:737
+#: network/netconnect.pm:752
#, c-format
msgid ""
"You need the Alcatel microcode.\n"
@@ -9900,22 +9888,22 @@ msgstr ""
"%s\n"
"下载并将 mgmt.o 复制到 /usr/share/speedtouch"
-#: network/netconnect.pm:790
+#: network/netconnect.pm:805
#, c-format
msgid "Virtual Path ID (VPI):"
msgstr "虚拟路径 ID (VPI):"
-#: network/netconnect.pm:791
+#: network/netconnect.pm:806
#, c-format
msgid "Virtual Circuit ID (VCI):"
msgstr "虚拟电路 ID (VCI):"
-#: network/netconnect.pm:793
+#: network/netconnect.pm:808
#, c-format
msgid "Encapsulation :"
msgstr "封装: "
-#: network/netconnect.pm:810
+#: network/netconnect.pm:825
#, c-format
msgid ""
"The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -9927,7 +9915,7 @@ msgstr ""
"\n"
"您可以在此网站: http://eciadsl.flashtux.org/ 找到驱动程序。"
-#: network/netconnect.pm:837
+#: network/netconnect.pm:852
#, c-format
msgid ""
"WARNING: this device has been previously configured to connect to the "
@@ -9939,7 +9927,7 @@ msgstr ""
"要保留现有的配置只要选择确定。\n"
"修改以下的项目将覆盖此配置。"
-#: network/netconnect.pm:850 network/netconnect.pm:1222
+#: network/netconnect.pm:865 network/netconnect.pm:1231
#, c-format
msgid ""
"Congratulations, the network and Internet configuration is finished.\n"
@@ -9948,24 +9936,24 @@ msgstr ""
"恭喜,网络和 Internet 配置完成。\n"
"\n"
-#: network/netconnect.pm:864
+#: network/netconnect.pm:879
#, c-format
msgid "Zeroconf hostname resolution"
msgstr "Zeroconf 主机名解析"
-#: network/netconnect.pm:865 network/netconnect.pm:899
+#: network/netconnect.pm:880 network/netconnect.pm:914
#, c-format
msgid "Configuring network device %s (driver %s)"
msgstr "配置网络设备 %s(驱动程序 %s)"
-#: network/netconnect.pm:866
+#: network/netconnect.pm:881
#, c-format
msgid ""
"The following protocols can be used to configure an ethernet connection. "
"Please choose the one you want to use"
msgstr "可使用下列协议配置以太网连接。请选择您想要使用的协议。"
-#: network/netconnect.pm:900
+#: network/netconnect.pm:915
#, c-format
msgid ""
"Please enter the IP configuration for this machine.\n"
@@ -9976,89 +9964,89 @@ msgstr ""
"下列项目要求以句点分隔十进制格式输入的 IP 地址。\n"
"(例如,1.2.3.4)"
-#: network/netconnect.pm:907
+#: network/netconnect.pm:922
#, c-format
msgid "Assign host name from DHCP address"
msgstr "从 DHCP 地址指定主机名"
-#: network/netconnect.pm:908
+#: network/netconnect.pm:923
#, c-format
msgid "DHCP host name"
msgstr "DHCP 主机名"
-#: network/netconnect.pm:913 standalone/drakconnect:330
-#: standalone/drakconnect:807 standalone/drakgw:321
+#: network/netconnect.pm:928 standalone/drakconnect:330
+#: standalone/drakconnect:817 standalone/drakgw:321
#, c-format
msgid "Netmask"
msgstr "子网掩码"
-#: network/netconnect.pm:915 standalone/drakconnect:412
+#: network/netconnect.pm:930 standalone/drakconnect:412
#, c-format
msgid "Track network card id (useful for laptops)"
msgstr "跟踪网卡标志(用于笔记本电脑)"
-#: network/netconnect.pm:916 standalone/drakconnect:413
+#: network/netconnect.pm:931 standalone/drakconnect:413
#, c-format
msgid "Network Hotplugging"
msgstr "网络热插拔"
-#: network/netconnect.pm:917 standalone/drakconnect:407
+#: network/netconnect.pm:932 standalone/drakconnect:407
#, c-format
msgid "Start at boot"
msgstr "开机时启动"
-#: network/netconnect.pm:919 standalone/drakconnect:810
+#: network/netconnect.pm:934 standalone/drakconnect:820
#, c-format
msgid "DHCP client"
msgstr "DHCP 客户端"
-#: network/netconnect.pm:929 printer/printerdrake.pm:1383
+#: network/netconnect.pm:944 printer/printerdrake.pm:1383
#: standalone/drakconnect:608
#, c-format
msgid "IP address should be in format 1.2.3.4"
msgstr "IP 地址的格式应该是 1.2.3.4"
-#: network/netconnect.pm:932
+#: network/netconnect.pm:947
#, c-format
msgid "Warning : IP address %s is usually reserved !"
msgstr "警告: IP 地址 %s 通常是被保留的!"
-#: network/netconnect.pm:962 network/netconnect.pm:991
+#: network/netconnect.pm:977 network/netconnect.pm:1006
#, c-format
msgid "Please enter the wireless parameters for this card:"
msgstr "请选择此网卡的无线参数:"
-#: network/netconnect.pm:965 standalone/drakconnect:378
+#: network/netconnect.pm:980 standalone/drakconnect:378
#, c-format
msgid "Operating Mode"
msgstr "操作模式"
-#: network/netconnect.pm:967 standalone/drakconnect:379
+#: network/netconnect.pm:982 standalone/drakconnect:379
#, c-format
msgid "Network name (ESSID)"
msgstr "网络名称(ESSID)"
-#: network/netconnect.pm:968 standalone/drakconnect:380
+#: network/netconnect.pm:983 standalone/drakconnect:380
#, c-format
msgid "Network ID"
msgstr "网络 ID"
-#: network/netconnect.pm:969 standalone/drakconnect:381
+#: network/netconnect.pm:984 standalone/drakconnect:381
#, c-format
msgid "Operating frequency"
msgstr "运行频率"
-#: network/netconnect.pm:970 standalone/drakconnect:382
+#: network/netconnect.pm:985 standalone/drakconnect:382
#, c-format
msgid "Sensitivity threshold"
msgstr "灵敏度阀值"
-#: network/netconnect.pm:971 standalone/drakconnect:383
+#: network/netconnect.pm:986 standalone/drakconnect:383
#, c-format
msgid "Bitrate (in b/s)"
msgstr "比特率(每秒比特数,b/s)"
-#: network/netconnect.pm:977
+#: network/netconnect.pm:992
#, c-format
msgid ""
"Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -10067,19 +10055,19 @@ msgstr ""
"频率应该有后缀 k,M 或 G(如“2.46G”代表 2.46 GHz 频率),或者后带足够"
"的“0”(零)。"
-#: network/netconnect.pm:981
+#: network/netconnect.pm:996
#, c-format
msgid ""
"Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
"enough '0' (zeroes)."
msgstr "速度应该有后缀 k,M 或 G(如“11M”代表 11M),或者后带足够的“0”(零)。"
-#: network/netconnect.pm:994 standalone/drakconnect:394
+#: network/netconnect.pm:1009 standalone/drakconnect:394
#, c-format
msgid "RTS/CTS"
msgstr "RTS/CTS"
-#: network/netconnect.pm:995
+#: network/netconnect.pm:1010
#, c-format
msgid ""
"RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -10098,17 +10086,17 @@ msgstr ""
"包\n"
"的大小,一个等于中止计划的值的大小。您也可以设置这个值为自动、固定或者关闭。"
-#: network/netconnect.pm:1002 standalone/drakconnect:395
+#: network/netconnect.pm:1017 standalone/drakconnect:395
#, c-format
msgid "Fragmentation"
msgstr "块"
-#: network/netconnect.pm:1003 standalone/drakconnect:396
+#: network/netconnect.pm:1018 standalone/drakconnect:396
#, c-format
msgid "Iwconfig command extra arguments"
msgstr "Iwconfig 命令的额外参数"
-#: network/netconnect.pm:1004
+#: network/netconnect.pm:1019
#, c-format
msgid ""
"Here, one can configure some extra wireless parameters such as:\n"
@@ -10124,12 +10112,12 @@ msgstr ""
"请参看 iwpconfig(8) man page 中的更多信息。"
#. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: network/netconnect.pm:1011 standalone/drakconnect:397
+#: network/netconnect.pm:1026 standalone/drakconnect:397
#, c-format
msgid "Iwspy command extra arguments"
msgstr "Iwspy 命令的额外参数"
-#: network/netconnect.pm:1012
+#: network/netconnect.pm:1027
#, c-format
msgid ""
"Iwspy is used to set a list of addresses in a wireless network\n"
@@ -10147,12 +10135,12 @@ msgstr ""
"\n"
"请参看 iwpspy(8) man page 中的更多信息。"
-#: network/netconnect.pm:1020 standalone/drakconnect:398
+#: network/netconnect.pm:1035 standalone/drakconnect:398
#, c-format
msgid "Iwpriv command extra arguments"
msgstr "Iwpriv 命令的额外参数"
-#: network/netconnect.pm:1021
+#: network/netconnect.pm:1036
#, c-format
msgid ""
"Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10181,7 +10169,7 @@ msgstr ""
"\n"
"请参看 iwpriv(8) man page 中的更多信息。"
-#: network/netconnect.pm:1048
+#: network/netconnect.pm:1063
#, c-format
msgid ""
"No ethernet network adapter has been detected on your system.\n"
@@ -10190,18 +10178,18 @@ msgstr ""
"没有在您的系统里发现以太网卡。\n"
"无法设置这个连接类型。"
-#: network/netconnect.pm:1052 standalone/drakgw:261 standalone/drakpxe:142
+#: network/netconnect.pm:1067 standalone/drakgw:261 standalone/drakpxe:142
#, c-format
msgid "Choose the network interface"
msgstr "选择网卡"
-#: network/netconnect.pm:1053
+#: network/netconnect.pm:1068
#, c-format
msgid ""
"Please choose which network adapter you want to use to connect to Internet."
msgstr "请选择您想要使用哪块网卡来连接 Internet。"
-#: network/netconnect.pm:1074
+#: network/netconnect.pm:1089
#, c-format
msgid ""
"Please enter your host name.\n"
@@ -10213,67 +10201,67 @@ msgstr ""
"您的主机名称必需是个完全限定的名称,例如“mybox.mylab.myco.com”。\n"
"如果您有网关的话,也请输入其 IP 地址。"
-#: network/netconnect.pm:1078
+#: network/netconnect.pm:1093
#, c-format
msgid "Last but not least you can also type in your DNS server IP addresses."
msgstr "最后,您还应该至少输入您 DNS 服务器的 IP 地址。"
-#: network/netconnect.pm:1080 standalone/drakconnect:923
+#: network/netconnect.pm:1095 standalone/drakconnect:933
#, c-format
msgid "Host name (optional)"
msgstr "主机名(可选)"
-#: network/netconnect.pm:1080
+#: network/netconnect.pm:1095
#, c-format
msgid "Host name"
msgstr "主机名"
-#: network/netconnect.pm:1082
+#: network/netconnect.pm:1097
#, c-format
msgid "DNS server 1"
msgstr "DNS 服务器 1"
-#: network/netconnect.pm:1083
+#: network/netconnect.pm:1098
#, c-format
msgid "DNS server 2"
msgstr "DNS 服务器 2"
-#: network/netconnect.pm:1084
+#: network/netconnect.pm:1099
#, c-format
msgid "DNS server 3"
msgstr "DNS 服务器 3"
-#: network/netconnect.pm:1085
+#: network/netconnect.pm:1100
#, c-format
msgid "Search domain"
msgstr "搜索网域"
-#: network/netconnect.pm:1086
+#: network/netconnect.pm:1101
#, c-format
msgid "By default search domain will be set from the fully-qualified host name"
msgstr "默认情况下,搜索域名将会根据完全限定的主机名进行设定"
-#: network/netconnect.pm:1087
+#: network/netconnect.pm:1102
#, c-format
msgid "Gateway (e.g. %s)"
msgstr "网关(如 %s)"
-#: network/netconnect.pm:1089
+#: network/netconnect.pm:1104
#, c-format
msgid "Gateway device"
msgstr "网关设备"
-#: network/netconnect.pm:1098
+#: network/netconnect.pm:1113
#, c-format
msgid "DNS server address should be in format 1.2.3.4"
msgstr "DNS 服务器的格式应该是 1.2.3.4"
-#: network/netconnect.pm:1103 standalone/drakconnect:611
+#: network/netconnect.pm:1118 standalone/drakconnect:611
#, c-format
msgid "Gateway address should be in format 1.2.3.4"
msgstr "网关地址的格式应该是 1.2.3.4"
-#: network/netconnect.pm:1114
+#: network/netconnect.pm:1129
#, c-format
msgid ""
"Enter a Zeroconf host name which will be the one that your machine will get "
@@ -10282,17 +10270,17 @@ msgstr ""
"请输入一个 Zeroconf 主机名,您的计算机将会按照该主机中的说明来实现与网络中其"
"它计算机的互联:"
-#: network/netconnect.pm:1115
+#: network/netconnect.pm:1130
#, c-format
msgid "Zeroconf Host name"
msgstr "Zeroconf 主机名"
-#: network/netconnect.pm:1118
+#: network/netconnect.pm:1133
#, c-format
msgid "Zeroconf host name must not contain a ."
msgstr "Zeroconf 主机名不能包含“.”"
-#: network/netconnect.pm:1128
+#: network/netconnect.pm:1143
#, c-format
msgid ""
"You have configured multiple ways to connect to the Internet.\n"
@@ -10303,32 +10291,32 @@ msgstr ""
"选择您要使用的一种。\n"
"\n"
-#: network/netconnect.pm:1130
+#: network/netconnect.pm:1145
#, c-format
msgid "Internet connection"
msgstr "Internet 连接"
-#: network/netconnect.pm:1144
+#: network/netconnect.pm:1153
#, c-format
msgid "Configuration is complete, do you want to apply settings ?"
msgstr "配置完成,您想要应用设置吗?"
-#: network/netconnect.pm:1154
+#: network/netconnect.pm:1163
#, c-format
msgid "Do you want to start the connection at boot?"
msgstr "您是否希望一开机就启动连接?"
-#: network/netconnect.pm:1166
+#: network/netconnect.pm:1175
#, c-format
msgid "The network needs to be restarted. Do you want to restart it ?"
msgstr "网络需要重新启动。您要重新启动吗?"
-#: network/netconnect.pm:1173 network/netconnect.pm:1238
+#: network/netconnect.pm:1182 network/netconnect.pm:1247
#, c-format
msgid "Network Configuration"
msgstr "网络配置"
-#: network/netconnect.pm:1174
+#: network/netconnect.pm:1183
#, c-format
msgid ""
"A problem occured while restarting the network: \n"
@@ -10339,27 +10327,27 @@ msgstr ""
"\n"
"%s"
-#: network/netconnect.pm:1182
+#: network/netconnect.pm:1191
#, c-format
msgid "Do you want to try to connect to the Internet now?"
msgstr "您想要测试连接到 Internet 吗?"
-#: network/netconnect.pm:1190 standalone/drakconnect:955
+#: network/netconnect.pm:1199 standalone/drakconnect:965
#, c-format
msgid "Testing your connection..."
msgstr "正在测试您的连接..."
-#: network/netconnect.pm:1206
+#: network/netconnect.pm:1215
#, c-format
msgid "The system is now connected to the Internet."
msgstr "您的系统现在正连接到 Internet。"
-#: network/netconnect.pm:1207
+#: network/netconnect.pm:1216
#, c-format
msgid "For security reasons, it will be disconnected now."
msgstr "由于安全原因,现在将断开连接。"
-#: network/netconnect.pm:1208
+#: network/netconnect.pm:1217
#, c-format
msgid ""
"The system doesn't seem to be connected to the Internet.\n"
@@ -10368,14 +10356,14 @@ msgstr ""
"看来系统没有连接到 Internet。\n"
"请重新尝试配置您的连接。"
-#: network/netconnect.pm:1225
+#: network/netconnect.pm:1234
#, c-format
msgid ""
"After this is done, we recommend that you restart your X environment to "
"avoid any hostname-related problems."
-msgstr "建议重启动 X 环境以避免任何于主机名有关的问题。"
+msgstr "建议重启动 X 环境以避免任何与主机名有关的问题。"
-#: network/netconnect.pm:1226
+#: network/netconnect.pm:1235
#, c-format
msgid ""
"Problems occured during configuration.\n"
@@ -10386,7 +10374,7 @@ msgstr ""
"请从网络监视器或者控制中心测试您的连接。如果您的连接不工作,您可能想要重新配"
"置。"
-#: network/netconnect.pm:1239
+#: network/netconnect.pm:1248
#, c-format
msgid ""
"Because you are doing a network installation, your network is already "
@@ -10397,7 +10385,7 @@ msgstr ""
"由于您正在执行网络安装,您的网络已经配置好了。\n"
"单击“确定”保存配置,或“取消”重新配置网络。\n"
-#: network/netconnect.pm:1327
+#: network/netconnect.pm:1336
#, c-format
msgid ""
"An unexpected error has happened:\n"
@@ -10443,7 +10431,7 @@ msgid ""
"need some manual fixes after installation."
msgstr "警告!发现原来的配置利用了防火墙功能。您可能需要在安装之后手工修改。"
-#: network/shorewall.pm:77 standalone/drakgw:218 standalone/drakvpn:212
+#: network/shorewall.pm:77 standalone/drakgw:218 standalone/drakvpn:214
#, c-format
msgid ""
"Please enter the name of the interface connected to the internet.\n"
@@ -11792,9 +11780,9 @@ msgid "Remote printer name missing!"
msgstr "没有找到远程打印机!"
#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
-#: standalone/drakTermServ:465 standalone/drakTermServ:763
-#: standalone/drakTermServ:779 standalone/drakTermServ:1417
-#: standalone/drakTermServ:1425 standalone/drakTermServ:1436
+#: standalone/drakTermServ:466 standalone/drakTermServ:764
+#: standalone/drakTermServ:780 standalone/drakTermServ:1418
+#: standalone/drakTermServ:1426 standalone/drakTermServ:1437
#: standalone/drakbackup:582 standalone/drakbackup:687
#: standalone/drakbackup:722 standalone/drakbackup:840
#: standalone/drakconnect:263 standalone/drakconnect:298
@@ -12704,7 +12692,7 @@ msgstr "正在“%s”打印机上打印"
#: printer/printerdrake.pm:3293 printer/printerdrake.pm:3296
#: printer/printerdrake.pm:3297 printer/printerdrake.pm:3298
-#: printer/printerdrake.pm:4384 standalone/drakTermServ:324
+#: printer/printerdrake.pm:4384 standalone/drakTermServ:325
#: standalone/drakbackup:4265 standalone/drakbug:177 standalone/drakfont:500
#: standalone/drakfont:591 standalone/net_monitor:106
#: standalone/printerdrake:508
@@ -14584,7 +14572,7 @@ msgstr ""
#: share/advertising/ppp-09.pl:13 share/advertising/pwp-08.pl:13
#, c-format
msgid "<b>MandrakeStore</b>"
-msgstr "<b>MandrakeStore</b>"
+msgstr "<b>Mandrakestore</b>"
#: share/advertising/dis-09.pl:15 share/advertising/ppp-09.pl:15
#: share/advertising/pwp-08.pl:15
@@ -14593,7 +14581,7 @@ msgid ""
"Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our "
"full service e-commerce platform."
msgstr ""
-"在 <b>MandrakeStore</b> 中领略 MandrakeSoft 的全套产品和服务 - 它是我们全天候"
+"在 <b>Mandrakestore</b> 中领略 Mandrakesoft 的全套产品和服务 - 它是我们全天候"
"的电子商务平台。"
#: share/advertising/dis-09.pl:17 share/advertising/dwd-06.pl:19
@@ -14638,7 +14626,7 @@ msgstr "\t- 投票选出 Mandrakelinux 中的软件"
#: share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19
#, c-format
msgid "\t- Special discounts for products and services at MandrakeStore"
-msgstr "\t- 在 MandrakeStore 购买产品和服务的优惠折扣"
+msgstr "\t- 在 Mandrakestore 购买产品和服务的优惠折扣"
#: share/advertising/dis-10.pl:20 share/advertising/dwd-07.pl:20
#: share/advertising/ppp-04.pl:21 share/advertising/ppp-06.pl:19
@@ -14684,7 +14672,7 @@ msgid ""
"Mandrakelinux contributors."
msgstr ""
"Mandrakelinux 专注于开放源代码模型,并完全遵从 GPL 协议。您现在看到的最新版本"
-"就是 MandrakeSoft 开发者团队和来自世界各地 Mandrakelinux 贡献者社区共同努力的"
+"就是 Mandrakesoft 开发者团队和来自世界各地 Mandrakelinux 贡献者社区共同努力的"
"结果。"
#: share/advertising/dwd-02.pl:13
@@ -14819,7 +14807,7 @@ msgid ""
"Find all MandrakeSoft products at <b>MandrakeStore</b> -- our full service e-"
"commerce platform."
msgstr ""
-"在 <b>MandrakeStore</b> 中领略 MandrakeSoft 的全套产品 - 它是我们全天候的电子"
+"在 <b>Mandrakestore</b> 中领略 Mandrakesoft 的全套产品 - 它是我们全天候的电子"
"商务平台。"
#: share/advertising/dwd-06.pl:17
@@ -15072,7 +15060,7 @@ msgid ""
"between MandrakeSoft developers and Mandrakelinux contributors throughout "
"the world."
msgstr ""
-"您新的 Mandrakelinux 发行版是 MandrakeSoft 开发者和来自世界各地的 "
+"您新的 Mandrakelinux 发行版是 Mandrakesoft 开发者和来自世界各地的 "
"Mandrakelinux 贡献者共同努力的结果。"
#: share/advertising/pwp-01.pl:19
@@ -15095,7 +15083,7 @@ msgid ""
"includes thousands of applications - everything from the most popular to the "
"most technical."
msgstr ""
-"专家版是 MandrakeSoft 的金牌 Linux 桌面产品。除了时最易用最友好的 Linux 发行"
+"专家版是 Mandrakesoft 的金牌 Linux 桌面产品。除了是最易用最友好的 Linux 发行"
"版,专家版还包括了数千应用程序 - 从最流行程序到最专业的程序一应俱全。"
#: share/advertising/pwp-04.pl:13
@@ -15441,7 +15429,7 @@ msgstr "%s: %s 需要主机名...\n"
msgid "You must be root to read configuration file. \n"
msgstr "您必须是 root 才能读取配置文件。\n"
-#: standalone/drakTermServ:238 standalone/drakTermServ:511
+#: standalone/drakTermServ:238 standalone/drakTermServ:512
#: standalone/drakfont:575
#, c-format
msgid "OK"
@@ -15497,12 +15485,12 @@ msgstr "添加/删除客户"
msgid "First Time Wizard"
msgstr "初次使用向导"
-#: standalone/drakTermServ:351 standalone/drakTermServ:352
+#: standalone/drakTermServ:352 standalone/drakTermServ:353
#, c-format
msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
msgstr "%s 定义为 dm,将 gdm 用户添加到 /etc/passwd$$CLIENT$$"
-#: standalone/drakTermServ:358
+#: standalone/drakTermServ:359
#, c-format
msgid ""
"\n"
@@ -15539,22 +15527,22 @@ msgstr ""
" e) 要求您制作启动软盘。\n"
" f) 如果是瘦客户的话,询问您是否想要重新启动 K 登陆管理器(KDM)。\n"
-#: standalone/drakTermServ:403
+#: standalone/drakTermServ:404
#, c-format
msgid "Cancel Wizard"
msgstr "取消向导"
-#: standalone/drakTermServ:415
+#: standalone/drakTermServ:416
#, c-format
msgid "Please save dhcpd config!"
msgstr "请保存 dhcpd 配置!"
-#: standalone/drakTermServ:443
+#: standalone/drakTermServ:444
#, c-format
msgid "Use thin clients."
msgstr "使用瘦客户端。"
-#: standalone/drakTermServ:445
+#: standalone/drakTermServ:446
#, c-format
msgid ""
"Please select default client type.\n"
@@ -15566,45 +15554,45 @@ msgstr ""
" “瘦”客户端会使用服务器的 CPU/内存,只是使用客户端进行显示。\n"
" “胖”客户端将会使用自己的 CPU/内存,但会使用服务器的文件系统。"
-#: standalone/drakTermServ:457 standalone/drakTermServ:1071
+#: standalone/drakTermServ:458 standalone/drakTermServ:1072
#, c-format
msgid "Sync client X keyboard settings with server."
msgstr "将客户端的 X 键盘设置与服务器同步。"
-#: standalone/drakTermServ:464
+#: standalone/drakTermServ:465
#, c-format
msgid "Creating net boot images for all kernels"
msgstr "为全部内核创建网络引导映像"
-#: standalone/drakTermServ:465 standalone/drakTermServ:763
-#: standalone/drakTermServ:779
+#: standalone/drakTermServ:466 standalone/drakTermServ:764
+#: standalone/drakTermServ:780
#, c-format
msgid "This will take a few minutes."
msgstr "这将花费几分钟。"
-#: standalone/drakTermServ:469 standalone/drakTermServ:489
+#: standalone/drakTermServ:470 standalone/drakTermServ:490
#, c-format
msgid "Done!"
msgstr "完成!"
-#: standalone/drakTermServ:475
+#: standalone/drakTermServ:476
#, c-format
msgid "Syncing server user list with client list, including root."
msgstr "将服务器用户列表与客户列表同步,包括 root。"
-#: standalone/drakTermServ:495
+#: standalone/drakTermServ:496
#, c-format
msgid ""
"In order to enable changes made for thin clients, the display manager must "
"be restarted. Restart now?"
msgstr "为了要启用为瘦客户所作的更改,必须重新启动显示管理器。立即重新启动吗?"
-#: standalone/drakTermServ:530
+#: standalone/drakTermServ:531
#, c-format
msgid "Terminal Server Overview"
msgstr "终端服务器概览"
-#: standalone/drakTermServ:531
+#: standalone/drakTermServ:532
#, c-format
msgid ""
" - Create Etherboot Enabled Boot Images:\n"
@@ -15627,7 +15615,7 @@ msgstr ""
"etherboot-pcimap.include,与 dhcpd.conf 相关联,\n"
" \t您需要至少为一个完整的内核创建以太网启动镜像。"
-#: standalone/drakTermServ:537
+#: standalone/drakTermServ:538
#, c-format
msgid ""
" - Maintain /etc/dhcpd.conf:\n"
@@ -15659,7 +15647,7 @@ msgstr ""
"\t\t\t \n"
" \t\t一个可以支持无盘工作站典型的 dhcpd.conf 应该是这样:"
-#: standalone/drakTermServ:555
+#: standalone/drakTermServ:556
#, c-format
msgid ""
" While you can use a pool of IP addresses, rather than setup a "
@@ -15712,7 +15700,7 @@ msgstr ""
"\t\t\t\n"
"\t\t\t注意:在添加或更改客户端后您必须停止/启动服务器。"
-#: standalone/drakTermServ:575
+#: standalone/drakTermServ:576
#, c-format
msgid ""
" - Maintain /etc/exports:\n"
@@ -15741,7 +15729,7 @@ msgstr ""
"\t\t\t\n"
"\t\t\t这里的子网/掩码应该与您的网络相同。"
-#: standalone/drakTermServ:587
+#: standalone/drakTermServ:588
#, c-format
msgid ""
" - Maintain %s:\n"
@@ -15757,7 +15745,7 @@ msgstr ""
" \t\t除了要在 /etc/shadow 中之外,还应在 %s$\n"
" \t\t中存有副本。drakTermServ 能够帮助您完成这一过程。"
-#: standalone/drakTermServ:591
+#: standalone/drakTermServ:592
#, c-format
msgid ""
" - Per client %s:\n"
@@ -15774,7 +15762,7 @@ msgstr ""
"助您创建\n"
" \t\t这些文件。"
-#: standalone/drakTermServ:596
+#: standalone/drakTermServ:597
#, c-format
msgid ""
" - Per client system configuration files:\n"
@@ -15806,7 +15794,7 @@ msgstr ""
" 终端服务器这一特性。本地配置能够被关闭,但\n"
" 保留配置文件,只要客户端机器被配置了的话。"
-#: standalone/drakTermServ:605
+#: standalone/drakTermServ:606
#, c-format
msgid ""
" - /etc/xinetd.d/tftp:\n"
@@ -15858,7 +15846,7 @@ msgstr ""
"更改\n"
" \t\t为 /var/lib/tftpboot,这里正是 mkinitrd-net 存放映像的地点。"
-#: standalone/drakTermServ:626
+#: standalone/drakTermServ:627
#, c-format
msgid ""
" - Create etherboot floppies/CDs:\n"
@@ -15886,62 +15874,62 @@ msgstr ""
" \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
" \t\t/usr/lib/etherboot/lzrom/3c509.lzrom > /dev/fd0"
-#: standalone/drakTermServ:661
+#: standalone/drakTermServ:662
#, c-format
msgid "Boot Floppy"
msgstr "启动软盘"
-#: standalone/drakTermServ:663
+#: standalone/drakTermServ:664
#, c-format
msgid "Boot ISO"
msgstr "启动 ISO"
-#: standalone/drakTermServ:665
+#: standalone/drakTermServ:666
#, c-format
msgid "PXE Image"
msgstr "PXE 映像"
-#: standalone/drakTermServ:734
+#: standalone/drakTermServ:735
#, c-format
msgid "Default kernel version"
msgstr "默认内核版本"
-#: standalone/drakTermServ:761
+#: standalone/drakTermServ:762
#, c-format
msgid "Build Whole Kernel -->"
msgstr "建造整个内核 -->"
-#: standalone/drakTermServ:768
+#: standalone/drakTermServ:769
#, c-format
msgid "No kernel selected!"
msgstr "没有选择内核!"
-#: standalone/drakTermServ:771
+#: standalone/drakTermServ:772
#, c-format
msgid "Build Single NIC -->"
msgstr "建造单独的网卡 -->"
-#: standalone/drakTermServ:775
+#: standalone/drakTermServ:776
#, c-format
msgid "No NIC selected!"
msgstr "没有选择网卡!"
-#: standalone/drakTermServ:778
+#: standalone/drakTermServ:779
#, c-format
msgid "Build All Kernels -->"
msgstr "建造全部内核 -->"
-#: standalone/drakTermServ:786
+#: standalone/drakTermServ:787
#, c-format
msgid "<-- Delete"
msgstr "<-- 删除"
-#: standalone/drakTermServ:793
+#: standalone/drakTermServ:794
#, c-format
msgid "Delete All NBIs"
msgstr "删除所有 NBI"
-#: standalone/drakTermServ:880
+#: standalone/drakTermServ:881
#, c-format
msgid ""
"!!! Indicates the password in the system database is different than\n"
@@ -15951,94 +15939,94 @@ msgstr ""
"!!!表明系统数据库中的密码与终端服务器数据库中的密码不同。\n"
"请删除/在终端服务器中重新添加用户后才能登录。"
-#: standalone/drakTermServ:885
+#: standalone/drakTermServ:886
#, c-format
msgid "Add User -->"
msgstr "添加用户 -->"
-#: standalone/drakTermServ:891
+#: standalone/drakTermServ:892
#, c-format
msgid "<-- Del User"
msgstr "<-- 删除用户"
-#: standalone/drakTermServ:927
+#: standalone/drakTermServ:928
#, c-format
msgid "type: %s"
msgstr "类型: %s"
-#: standalone/drakTermServ:931
+#: standalone/drakTermServ:932
#, c-format
msgid "local config: %s"
msgstr "本地配置: %s"
-#: standalone/drakTermServ:961
+#: standalone/drakTermServ:962
#, c-format
msgid ""
"Allow local hardware\n"
"configuration."
msgstr "允许本地硬件配置。"
-#: standalone/drakTermServ:970
+#: standalone/drakTermServ:971
#, c-format
msgid "No net boot images created!"
msgstr "没有创建网络启动镜像!"
-#: standalone/drakTermServ:988
+#: standalone/drakTermServ:989
#, c-format
msgid "Thin Client"
msgstr "瘦客户端"
-#: standalone/drakTermServ:992
+#: standalone/drakTermServ:993
#, c-format
msgid "Allow Thin Clients"
msgstr "允许瘦客户端"
-#: standalone/drakTermServ:993
+#: standalone/drakTermServ:994
#, c-format
msgid "Add Client -->"
msgstr "添加客户 -->"
-#: standalone/drakTermServ:1007
+#: standalone/drakTermServ:1008
#, c-format
msgid "type: fat"
msgstr "类型: 胖"
-#: standalone/drakTermServ:1008
+#: standalone/drakTermServ:1009
#, c-format
msgid "type: thin"
msgstr "类型: 瘦"
-#: standalone/drakTermServ:1015
+#: standalone/drakTermServ:1016
#, c-format
msgid "local config: false"
msgstr "本机配置: 假"
-#: standalone/drakTermServ:1016
+#: standalone/drakTermServ:1017
#, c-format
msgid "local config: true"
msgstr "本地配置: 真"
-#: standalone/drakTermServ:1024
+#: standalone/drakTermServ:1025
#, c-format
msgid "<-- Edit Client"
msgstr "<-- 编辑客户"
-#: standalone/drakTermServ:1050
+#: standalone/drakTermServ:1051
#, c-format
msgid "Disable Local Config"
msgstr "禁用本地配置"
-#: standalone/drakTermServ:1057
+#: standalone/drakTermServ:1058
#, c-format
msgid "Delete Client"
msgstr "删除客户"
-#: standalone/drakTermServ:1066
+#: standalone/drakTermServ:1067
#, c-format
msgid "dhcpd Config..."
msgstr "dhcpd 配置..."
-#: standalone/drakTermServ:1082
+#: standalone/drakTermServ:1083
#, c-format
msgid ""
"Need to restart the Display Manager for full changes to take effect. \n"
@@ -16047,67 +16035,67 @@ msgstr ""
"需要重新启动显示管理器以便所有更改生效。\n"
"(service dm restart - 控制台上)"
-#: standalone/drakTermServ:1122
+#: standalone/drakTermServ:1123
#, c-format
msgid "Thin clients won't work with autologin. Disable autologin?"
msgstr "瘦客户无法使用自动登录。禁用自动登录吗?"
-#: standalone/drakTermServ:1138
+#: standalone/drakTermServ:1139
#, c-format
msgid "All clients will use %s"
msgstr "全部客户都使用 %s"
-#: standalone/drakTermServ:1168
+#: standalone/drakTermServ:1169
#, c-format
msgid "Subnet:"
msgstr "子网: "
-#: standalone/drakTermServ:1175
+#: standalone/drakTermServ:1176
#, c-format
msgid "Netmask:"
msgstr "子网掩码: "
-#: standalone/drakTermServ:1182
+#: standalone/drakTermServ:1183
#, c-format
msgid "Routers:"
msgstr "路由器: "
-#: standalone/drakTermServ:1189
+#: standalone/drakTermServ:1190
#, c-format
msgid "Subnet Mask:"
msgstr "子网掩码: "
-#: standalone/drakTermServ:1196
+#: standalone/drakTermServ:1197
#, c-format
msgid "Broadcast Address:"
msgstr "广播地址: "
-#: standalone/drakTermServ:1203
+#: standalone/drakTermServ:1204
#, c-format
msgid "Domain Name:"
msgstr "域名: "
-#: standalone/drakTermServ:1211
+#: standalone/drakTermServ:1212
#, c-format
msgid "Name Servers:"
msgstr "命名服务器: "
-#: standalone/drakTermServ:1222
+#: standalone/drakTermServ:1223
#, c-format
msgid "IP Range Start:"
msgstr "IP 范围起点: "
-#: standalone/drakTermServ:1223
+#: standalone/drakTermServ:1224
#, c-format
msgid "IP Range End:"
msgstr "IP 范围终点: "
-#: standalone/drakTermServ:1275
+#: standalone/drakTermServ:1276
#, c-format
msgid "dhcpd Server Configuration"
msgstr "dhcpd 服务器配置"
-#: standalone/drakTermServ:1276
+#: standalone/drakTermServ:1277
#, c-format
msgid ""
"Most of these values were extracted\n"
@@ -16117,113 +16105,113 @@ msgstr ""
"这些值中绝大多数会从您正在运行的系统\n"
"中提取。若需要您可以进行修改。"
-#: standalone/drakTermServ:1279
+#: standalone/drakTermServ:1280
#, c-format
msgid "Dynamic IP Address Pool:"
msgstr "动态 IP 地址池: "
-#: standalone/drakTermServ:1292
+#: standalone/drakTermServ:1293
#, c-format
msgid "Write Config"
msgstr "写入配置"
-#: standalone/drakTermServ:1411
+#: standalone/drakTermServ:1412
#, c-format
msgid "Please insert floppy disk:"
msgstr "请插入软盘: "
-#: standalone/drakTermServ:1415
+#: standalone/drakTermServ:1416
#, c-format
msgid "Couldn't access the floppy!"
msgstr "无法访问软盘!"
-#: standalone/drakTermServ:1417
+#: standalone/drakTermServ:1418
#, c-format
msgid "Floppy can be removed now"
msgstr "现在可以取出软盘了"
-#: standalone/drakTermServ:1420
+#: standalone/drakTermServ:1421
#, c-format
msgid "No floppy drive available!"
msgstr "没有可用的软盘驱动器!"
-#: standalone/drakTermServ:1425
+#: standalone/drakTermServ:1426
#, c-format
msgid "PXE image is %s/%s"
msgstr "PXE 镜像是 %s/%s"
-#: standalone/drakTermServ:1427
+#: standalone/drakTermServ:1428
#, c-format
msgid "Error writing %s/%s"
msgstr "写入 %s/%s 出错"
-#: standalone/drakTermServ:1436
+#: standalone/drakTermServ:1437
#, c-format
msgid "Etherboot ISO image is %s"
msgstr "Etherboot ISO 镜像是 %s"
-#: standalone/drakTermServ:1438
+#: standalone/drakTermServ:1439
#, c-format
msgid "Something went wrong! - Is mkisofs installed?"
msgstr "发生错误!- mkisofs 安装了吗?"
-#: standalone/drakTermServ:1458
+#: standalone/drakTermServ:1459
#, c-format
msgid "Need to create /etc/dhcpd.conf first!"
msgstr "需要先创建 /etc/dhcpd.conf 文件!"
-#: standalone/drakTermServ:1619
+#: standalone/drakTermServ:1620
#, c-format
msgid "%s passwd bad in Terminal Server - rewriting...\n"
msgstr "%s 的密码在中断服务器中无效 - 正在重写...\n"
-#: standalone/drakTermServ:1637
+#: standalone/drakTermServ:1638
#, c-format
msgid "%s is not a user..\n"
msgstr "%s 不是用户...\n"
-#: standalone/drakTermServ:1638
+#: standalone/drakTermServ:1639
#, c-format
msgid "%s is already a Terminal Server user\n"
msgstr "%s 已经是终端服务器用户了\n"
-#: standalone/drakTermServ:1640
+#: standalone/drakTermServ:1641
#, c-format
msgid "Addition of %s to Terminal Server failed!\n"
msgstr "将 %s 添加到终端服务器失败!\n"
-#: standalone/drakTermServ:1642
+#: standalone/drakTermServ:1643
#, c-format
msgid "%s added to Terminal Server\n"
msgstr "%s 已加入终端服务器\n"
-#: standalone/drakTermServ:1694
+#: standalone/drakTermServ:1695
#, c-format
msgid "Deleted %s...\n"
msgstr "已删除 %s...\n"
-#: standalone/drakTermServ:1696 standalone/drakTermServ:1773
+#: standalone/drakTermServ:1697 standalone/drakTermServ:1774
#, c-format
msgid "%s not found...\n"
msgstr "%s 未找到...\n"
-#: standalone/drakTermServ:1718 standalone/drakTermServ:1719
-#: standalone/drakTermServ:1720
+#: standalone/drakTermServ:1719 standalone/drakTermServ:1720
+#: standalone/drakTermServ:1721
#, c-format
msgid "%s already in use\n"
msgstr "%s 已经被使用了\n"
-#: standalone/drakTermServ:1744
+#: standalone/drakTermServ:1745
#, c-format
msgid "Can't open %s!"
msgstr "无法打开 %s!"
-#: standalone/drakTermServ:1801
+#: standalone/drakTermServ:1802
#, c-format
msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
msgstr "/etc/hosts.allow 和 /etc/hosts.deny 已经配置 - 无更改"
-#: standalone/drakTermServ:1958
+#: standalone/drakTermServ:1959
#, c-format
msgid "Configuration changed - restart clusternfs/dhcpd?"
msgstr "配置已更改 - 重新启动 clusternfs/dhcpd 吗?"
@@ -16317,7 +16305,7 @@ msgstr ""
"\n"
"左边列出了自动安装可用的选项"
-#: standalone/drakautoinst:252 standalone/drakgw:594 standalone/drakvpn:900
+#: standalone/drakautoinst:252 standalone/drakgw:598 standalone/drakvpn:902
#: standalone/scannerdrake:374
#, c-format
msgid "Congratulations!"
@@ -18029,50 +18017,50 @@ msgstr ""
msgid "Drakbackup"
msgstr "Drak 备份"
-#: standalone/drakboot:57
+#: standalone/drakboot:58
#, c-format
msgid "Graphical boot theme selection"
msgstr "图形化启动主题选择"
-#: standalone/drakboot:57
+#: standalone/drakboot:58
#, c-format
msgid "System mode"
msgstr "系统模式"
-#: standalone/drakboot:67 standalone/drakfloppy:46 standalone/harddrake2:97
+#: standalone/drakboot:68 standalone/drakfloppy:46 standalone/harddrake2:97
#: standalone/harddrake2:98 standalone/logdrake:71 standalone/printerdrake:150
#: standalone/printerdrake:151 standalone/printerdrake:152
#, c-format
msgid "/_File"
msgstr "/文件(_F)"
-#: standalone/drakboot:68 standalone/drakfloppy:47 standalone/logdrake:77
+#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/logdrake:77
#, c-format
msgid "/File/_Quit"
msgstr "/文件(F)/退出(_Q)"
-#: standalone/drakboot:68 standalone/drakfloppy:47 standalone/harddrake2:98
+#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/harddrake2:98
#: standalone/logdrake:77 standalone/printerdrake:152
#, c-format
msgid "<control>Q"
msgstr "<control>Q"
-#: standalone/drakboot:119
+#: standalone/drakboot:139
#, c-format
msgid "Install themes"
msgstr "安装主题"
-#: standalone/drakboot:120
+#: standalone/drakboot:140
#, c-format
msgid "Create new theme"
msgstr "创建新主题"
-#: standalone/drakboot:134
+#: standalone/drakboot:152
#, c-format
msgid "Use graphical boot"
msgstr "使用图形化引导"
-#: standalone/drakboot:139
+#: standalone/drakboot:157
#, c-format
msgid ""
"Your system bootloader is not in framebuffer mode. To activate graphical "
@@ -18081,12 +18069,12 @@ msgstr ""
"您的系统引导程序并不位于帧缓存模式。要激活图形化引导程序,请在引导程序配置工"
"具中选择图形视频模式。"
-#: standalone/drakboot:146
+#: standalone/drakboot:164
#, c-format
msgid "Theme"
msgstr "主题"
-#: standalone/drakboot:149
+#: standalone/drakboot:167
#, c-format
msgid ""
"Display theme\n"
@@ -18095,32 +18083,32 @@ msgstr ""
"在控制台\n"
"显示主题"
-#: standalone/drakboot:158
+#: standalone/drakboot:176
#, c-format
msgid "Launch the graphical environment when your system starts"
msgstr "系统启动时进入图形环境"
-#: standalone/drakboot:166
+#: standalone/drakboot:184
#, c-format
msgid "No, I don't want autologin"
msgstr "否,不要自动登录"
-#: standalone/drakboot:167
+#: standalone/drakboot:185
#, c-format
msgid "Yes, I want autologin with this (user, desktop)"
msgstr "是,以(用户,桌面)自动登录"
-#: standalone/drakboot:173
+#: standalone/drakboot:191
#, c-format
msgid "Default user"
msgstr "默认用户"
-#: standalone/drakboot:174
+#: standalone/drakboot:192
#, c-format
msgid "Default desktop"
msgstr "默认桌面"
-#: standalone/drakboot:238
+#: standalone/drakboot:256
#, c-format
msgid "Installation of %s failed. The following error occured:"
msgstr "安装 %s 失败,出现下列错误:"
@@ -18330,32 +18318,37 @@ msgstr "请输入概括性的文字。"
msgid "DrakClock"
msgstr "Drak 时间设置"
-#: standalone/drakclock:36
+#: standalone/drakclock:39
+#, c-format
+msgid "not defined"
+msgstr "未定义"
+
+#: standalone/drakclock:41
#, c-format
msgid "Change Time Zone"
msgstr "更改时区"
-#: standalone/drakclock:42
+#: standalone/drakclock:45
#, c-format
msgid "Timezone - DrakClock"
msgstr "时区 - Drak 时间设置"
-#: standalone/drakclock:44
+#: standalone/drakclock:47
#, c-format
msgid "GMT - DrakClock"
msgstr "GMT - Drak 时间设置"
-#: standalone/drakclock:44
+#: standalone/drakclock:47
#, c-format
msgid "Is your hardware clock set to GMT?"
msgstr "您的系统时钟是否为 GMT?"
-#: standalone/drakclock:71
+#: standalone/drakclock:79
#, c-format
msgid "Network Time Protocol"
msgstr "网络时间协议"
-#: standalone/drakclock:73
+#: standalone/drakclock:81
#, c-format
msgid ""
"Your computer can synchronize its clock\n"
@@ -18364,22 +18357,22 @@ msgstr ""
"您的计算机可以通过 NTP 协议与远程时间服\n"
"务器的时钟同步"
-#: standalone/drakclock:74
+#: standalone/drakclock:82
#, c-format
msgid "Enable Network Time Protocol"
msgstr "启用网络时间协议"
-#: standalone/drakclock:82
+#: standalone/drakclock:90
#, c-format
msgid "Server:"
msgstr "服务器: "
-#: standalone/drakclock:129 standalone/drakclock:141
+#: standalone/drakclock:137 standalone/drakclock:149
#, c-format
msgid "Reset"
msgstr "重置"
-#: standalone/drakclock:204
+#: standalone/drakclock:212
#, c-format
msgid ""
"We need to install ntp package\n"
@@ -18397,12 +18390,12 @@ msgstr ""
msgid "Network configuration (%d adapters)"
msgstr "网络配置(%d 网卡)"
-#: standalone/drakconnect:92 standalone/drakconnect:728
+#: standalone/drakconnect:92 standalone/drakconnect:738
#, c-format
msgid "Gateway:"
msgstr "网关: "
-#: standalone/drakconnect:92 standalone/drakconnect:728
+#: standalone/drakconnect:92 standalone/drakconnect:738
#, c-format
msgid "Interface:"
msgstr "网卡: "
@@ -18437,7 +18430,7 @@ msgstr "主机名: "
msgid "Configure hostname..."
msgstr "配置主机名..."
-#: standalone/drakconnect:149 standalone/drakconnect:769
+#: standalone/drakconnect:149 standalone/drakconnect:779
#, c-format
msgid "LAN configuration"
msgstr "局域网配置"
@@ -18586,7 +18579,7 @@ msgstr "删除网卡"
msgid "Select the network interface to remove:"
msgstr "选择要删除的网卡: "
-#: standalone/drakconnect:656
+#: standalone/drakconnect:666
#, c-format
msgid ""
"An error occured while deleting the \"%s\" network interface:\n"
@@ -18597,70 +18590,70 @@ msgstr ""
"\n"
"%s"
-#: standalone/drakconnect:658
+#: standalone/drakconnect:668
#, c-format
msgid ""
"Congratulations, the \"%s\" network interface has been succesfully deleted"
msgstr "恭喜,“%s”网卡已经成功删除"
-#: standalone/drakconnect:675
+#: standalone/drakconnect:685
#, c-format
msgid "No Ip"
msgstr "没有 IP"
-#: standalone/drakconnect:676
+#: standalone/drakconnect:686
#, c-format
msgid "No Mask"
msgstr "没有掩码"
-#: standalone/drakconnect:677 standalone/drakconnect:840
+#: standalone/drakconnect:687 standalone/drakconnect:850
#, c-format
msgid "up"
msgstr "上移"
-#: standalone/drakconnect:677 standalone/drakconnect:840
+#: standalone/drakconnect:687 standalone/drakconnect:850
#, c-format
msgid "down"
msgstr "下移"
-#: standalone/drakconnect:718 standalone/net_monitor:415
+#: standalone/drakconnect:728 standalone/net_monitor:415
#, c-format
msgid "Connected"
msgstr "已连接"
-#: standalone/drakconnect:718 standalone/net_monitor:415
+#: standalone/drakconnect:728 standalone/net_monitor:415
#, c-format
msgid "Not connected"
msgstr "未连接"
-#: standalone/drakconnect:720
+#: standalone/drakconnect:730
#, c-format
msgid "Disconnect..."
msgstr "断开连接..."
-#: standalone/drakconnect:720
+#: standalone/drakconnect:730
#, c-format
msgid "Connect..."
msgstr "连接..."
-#: standalone/drakconnect:749
+#: standalone/drakconnect:759
#, c-format
msgid ""
"Warning, another Internet connection has been detected, maybe using your "
"network"
msgstr "警告,检测到另外的 Internet 连接,可能是通过本地网络"
-#: standalone/drakconnect:765
+#: standalone/drakconnect:775
#, c-format
msgid "Deactivate now"
msgstr "立即禁用"
-#: standalone/drakconnect:765
+#: standalone/drakconnect:775
#, c-format
msgid "Activate now"
msgstr "立即激活"
-#: standalone/drakconnect:773
+#: standalone/drakconnect:783
#, c-format
msgid ""
"You don't have any configured interface.\n"
@@ -18669,27 +18662,27 @@ msgstr ""
"您没有配置好的网卡。\n"
"单击“配置”先配置网卡"
-#: standalone/drakconnect:787
+#: standalone/drakconnect:797
#, c-format
msgid "LAN Configuration"
msgstr "LAN 配置"
-#: standalone/drakconnect:799
+#: standalone/drakconnect:809
#, c-format
msgid "Adapter %s: %s"
msgstr "适配器 %s: %s"
-#: standalone/drakconnect:808
+#: standalone/drakconnect:818
#, c-format
msgid "Boot Protocol"
msgstr "启动协议"
-#: standalone/drakconnect:809
+#: standalone/drakconnect:819
#, c-format
msgid "Started on boot"
msgstr "开机时启动"
-#: standalone/drakconnect:845
+#: standalone/drakconnect:855
#, c-format
msgid ""
"This interface has not been configured yet.\n"
@@ -18698,7 +18691,7 @@ msgstr ""
"这块网卡还没有配置过。\n"
"请从“Mandrakelinux 控制中心”运行“添加网卡”助手"
-#: standalone/drakconnect:900
+#: standalone/drakconnect:910
#, c-format
msgid ""
"You don't have any configured Internet connection.\n"
@@ -18707,32 +18700,32 @@ msgstr ""
"您没有配置过 Internet 连接。\n"
"请在控制中心中运行“Internet 访问”。"
-#: standalone/drakconnect:908
+#: standalone/drakconnect:918
#, c-format
msgid "Internet connection configuration"
msgstr "Internet 连接配置"
-#: standalone/drakconnect:926
+#: standalone/drakconnect:936
#, c-format
msgid "Third DNS server (optional)"
msgstr "第三 DNS 服务器(可选)"
-#: standalone/drakconnect:948
+#: standalone/drakconnect:958
#, c-format
msgid "Internet Connection Configuration"
msgstr "Internet 连接配置"
-#: standalone/drakconnect:949
+#: standalone/drakconnect:959
#, c-format
msgid "Internet access"
msgstr "Internet 访问"
-#: standalone/drakconnect:951 standalone/net_monitor:87
+#: standalone/drakconnect:961 standalone/net_monitor:87
#, c-format
msgid "Connection type: "
msgstr "连接类型:"
-#: standalone/drakconnect:954
+#: standalone/drakconnect:964
#, c-format
msgid "Status:"
msgstr "状态: "
@@ -19024,7 +19017,7 @@ msgid ""
"\n"
" VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
msgstr ""
-"版权 (C) 2001-2002 由 MandrakeSoft 持有\n"
+"版权 (C) 2001-2002 由 Mandrakesoft 持有\n"
"\n"
"\n"
" DUPONT Sebastien (原始版本)\n"
@@ -19240,19 +19233,19 @@ msgstr ""
"\n"
"您要做什么?"
-#: standalone/drakgw:129 standalone/drakvpn:125
+#: standalone/drakgw:129 standalone/drakvpn:127
#, c-format
msgid "enable"
msgstr "启用"
-#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:99
-#: standalone/drakvpn:125
+#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakvpn:127
#, c-format
msgid "reconfigure"
msgstr "重新配置"
-#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:99
-#: standalone/drakvpn:125 standalone/drakvpn:374 standalone/drakvpn:733
+#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakvpn:127 standalone/drakvpn:376 standalone/drakvpn:735
#, c-format
msgid "dismiss"
msgstr "放弃"
@@ -19285,7 +19278,7 @@ msgstr ""
"\n"
"您要做什么?"
-#: standalone/drakgw:156 standalone/drakvpn:99
+#: standalone/drakgw:156 standalone/drakvpn:101
#, c-format
msgid "disable"
msgstr "禁用"
@@ -19522,12 +19515,12 @@ msgstr "正在配置..."
msgid "Configuring scripts, installing software, starting servers..."
msgstr "正在配置脚本,安装软件,启动服务程序 ..."
-#: standalone/drakgw:399 standalone/drakpxe:231 standalone/drakvpn:276
+#: standalone/drakgw:403 standalone/drakpxe:231 standalone/drakvpn:278
#, c-format
msgid "Problems installing package %s"
msgstr "安装 %s 软件包出现问题"
-#: standalone/drakgw:595
+#: standalone/drakgw:599
#, c-format
msgid ""
"Everything has been configured.\n"
@@ -19551,7 +19544,7 @@ msgid ""
"Usage: \n"
msgstr ""
" Drak 帮助 0.1\n"
-"版权 (C) 2003 MandrakeSoft.\n"
+"版权 (C) 2003 Mandrakesoft.\n"
"这是自由软件,可按照 GNU GPL 协议条款再发放。\n"
"\n"
"用法: \n"
@@ -19686,7 +19679,7 @@ msgid "Delete selected rule"
msgstr "删除选中的规则"
#: standalone/drakperm:125 standalone/drakups:281 standalone/drakups:330
-#: standalone/drakups:350 standalone/drakvpn:331 standalone/drakvpn:692
+#: standalone/drakups:350 standalone/drakvpn:333 standalone/drakvpn:694
#: standalone/printerdrake:229
#, c-format
msgid "Edit"
@@ -19766,7 +19759,7 @@ msgstr "Set-GID"
msgid "Use group id for execution"
msgstr "使用组 ID 执行"
-#: standalone/drakperm:283
+#: standalone/drakperm:283 standalone/drakxtv:87
#, c-format
msgid "User :"
msgstr "用户: "
@@ -19921,7 +19914,7 @@ msgstr "所有"
msgid "LOCAL"
msgstr "本地"
-#: standalone/draksec:44 standalone/drakvpn:1144
+#: standalone/draksec:44 standalone/drakvpn:1146
#, c-format
msgid "default"
msgstr "默认"
@@ -20317,7 +20310,8 @@ msgid ""
"\n"
"Do you prefer autodetect UPS devices connected to this machine or ?"
msgstr ""
-"现在即将添加 UPS 设备。\n\n"
+"现在即将添加 UPS 设备。\n"
+"\n"
"您是否想要自动检测连接到本机的 UPS 设备?"
#: standalone/drakups:82
@@ -20436,7 +20430,7 @@ msgstr "规则 "
msgid "Action"
msgstr "操作"
-#: standalone/drakups:278 standalone/drakvpn:1144 standalone/harddrake2:57
+#: standalone/drakups:278 standalone/drakvpn:1146 standalone/harddrake2:57
#, c-format
msgid "Level"
msgstr "级别"
@@ -20456,17 +20450,17 @@ msgstr "DrakUPS"
msgid "Welcome to the UPS configuration tools"
msgstr "欢迎使用 UPS 配置工具"
-#: standalone/drakvpn:71
+#: standalone/drakvpn:73
#, c-format
msgid "DrakVPN"
msgstr "DrakVPN"
-#: standalone/drakvpn:93
+#: standalone/drakvpn:95
#, c-format
msgid "The VPN connection is enabled."
msgstr "VPN 连接现已启用。"
-#: standalone/drakvpn:94
+#: standalone/drakvpn:96
#, c-format
msgid ""
"The setup of a VPN connection has already been done.\n"
@@ -20481,22 +20475,22 @@ msgstr ""
"\n"
"您要做什么?"
-#: standalone/drakvpn:103
+#: standalone/drakvpn:105
#, c-format
msgid "Disabling VPN..."
msgstr "正在禁用 VPN..."
-#: standalone/drakvpn:112
+#: standalone/drakvpn:114
#, c-format
msgid "The VPN connection is now disabled."
msgstr "VPN 连接现在被禁用了。"
-#: standalone/drakvpn:119
+#: standalone/drakvpn:121
#, c-format
msgid "VPN connection currently disabled"
msgstr "VPN 连接现在被禁用"
-#: standalone/drakvpn:120
+#: standalone/drakvpn:122
#, c-format
msgid ""
"The setup of a VPN connection has already been done.\n"
@@ -20511,22 +20505,22 @@ msgstr ""
"\n"
"您要做什么?"
-#: standalone/drakvpn:133
+#: standalone/drakvpn:135
#, c-format
msgid "Enabling VPN..."
msgstr "正在启用 VPN..."
-#: standalone/drakvpn:139
+#: standalone/drakvpn:141
#, c-format
msgid "The VPN connection is now enabled."
msgstr "VPN 连接现已启用。"
-#: standalone/drakvpn:153 standalone/drakvpn:181
+#: standalone/drakvpn:155 standalone/drakvpn:183
#, c-format
msgid "Simple VPN setup."
msgstr "简单的 VPN 设置。"
-#: standalone/drakvpn:154
+#: standalone/drakvpn:156
#, c-format
msgid ""
"You are about to configure your computer to use a VPN connection.\n"
@@ -20551,7 +20545,7 @@ msgstr ""
"在您继续进行之前,请先确定您已经通过“Drak 连接”配置了您的网络/Internet\n"
"访问。"
-#: standalone/drakvpn:182
+#: standalone/drakvpn:184
#, c-format
msgid ""
"VPN connection.\n"
@@ -20577,12 +20571,12 @@ msgstr ""
"\n"
"在继续进行之前,请至少阅读 ipsec-howto 文档。"
-#: standalone/drakvpn:194
+#: standalone/drakvpn:196
#, c-format
msgid "Kernel module."
msgstr "内核模块。"
-#: standalone/drakvpn:195
+#: standalone/drakvpn:197
#, c-format
msgid ""
"The kernel need to have ipsec support.\n"
@@ -20597,22 +20591,22 @@ msgstr ""
"\n"
"此内核拥有“%s”支持。"
-#: standalone/drakvpn:290
+#: standalone/drakvpn:292
#, c-format
msgid "Security Policies"
msgstr "安全策略"
-#: standalone/drakvpn:290
+#: standalone/drakvpn:292
#, c-format
msgid "IKE daemon racoon"
msgstr "IKE 守护程序 racoon"
-#: standalone/drakvpn:293 standalone/drakvpn:304
+#: standalone/drakvpn:295 standalone/drakvpn:306
#, c-format
msgid "Configuration file"
msgstr "配置文件"
-#: standalone/drakvpn:294
+#: standalone/drakvpn:296
#, c-format
msgid ""
"Configuration step !\n"
@@ -20630,7 +20624,7 @@ msgstr ""
"\n"
"您想要配置什么?\n"
-#: standalone/drakvpn:305
+#: standalone/drakvpn:307
#, c-format
msgid ""
"Next, we will configure the %s file.\n"
@@ -20643,12 +20637,12 @@ msgstr ""
"\n"
"只需点击下一步。\n"
-#: standalone/drakvpn:323 standalone/drakvpn:683
+#: standalone/drakvpn:325 standalone/drakvpn:685
#, c-format
msgid "%s entries"
msgstr "%s 项"
-#: standalone/drakvpn:324
+#: standalone/drakvpn:326
#, c-format
msgid ""
"The %s file contents\n"
@@ -20670,27 +20664,27 @@ msgstr ""
"\n"
"您想要做什么?\n"
-#: standalone/drakvpn:331 standalone/drakvpn:692
+#: standalone/drakvpn:333 standalone/drakvpn:694
#, c-format
msgid ""
"_:display here is a verb\n"
"Display"
msgstr "显示"
-#: standalone/drakvpn:331 standalone/drakvpn:692
+#: standalone/drakvpn:333 standalone/drakvpn:694
#, c-format
msgid "Commit"
msgstr "提交"
-#: standalone/drakvpn:345 standalone/drakvpn:349 standalone/drakvpn:707
-#: standalone/drakvpn:711
+#: standalone/drakvpn:347 standalone/drakvpn:351 standalone/drakvpn:709
+#: standalone/drakvpn:713
#, c-format
msgid ""
"_:display here is a verb\n"
"Display configuration"
msgstr "显示配置"
-#: standalone/drakvpn:350
+#: standalone/drakvpn:352
#, c-format
msgid ""
"The %s file does not exist.\n"
@@ -20705,12 +20699,12 @@ msgstr ""
"\n"
"您需要回退,并选择“添加”。\n"
-#: standalone/drakvpn:366
+#: standalone/drakvpn:368
#, c-format
msgid "ipsec.conf entries"
msgstr "ipsec.conf 项"
-#: standalone/drakvpn:367
+#: standalone/drakvpn:369
#, c-format
msgid ""
"The %s file contains different sections.\n"
@@ -20735,27 +20729,27 @@ msgstr ""
"\n"
"请选择您想要添加的区段。\n"
-#: standalone/drakvpn:374
+#: standalone/drakvpn:376
#, c-format
msgid "config setup"
msgstr "config setup"
-#: standalone/drakvpn:374
+#: standalone/drakvpn:376
#, c-format
msgid "conn %default"
msgstr "conn %default"
-#: standalone/drakvpn:374
+#: standalone/drakvpn:376
#, c-format
msgid "normal conn"
msgstr "normal conn"
-#: standalone/drakvpn:380 standalone/drakvpn:421 standalone/drakvpn:508
+#: standalone/drakvpn:382 standalone/drakvpn:423 standalone/drakvpn:510
#, c-format
msgid "Exists !"
msgstr "已经存在!"
-#: standalone/drakvpn:381 standalone/drakvpn:422
+#: standalone/drakvpn:383 standalone/drakvpn:424
#, c-format
msgid ""
"A section with this name already exists.\n"
@@ -20769,7 +20763,7 @@ msgstr ""
"\n"
"您应该回退并添加另外一个区段,或者更改其名称。\n"
-#: standalone/drakvpn:398
+#: standalone/drakvpn:400
#, c-format
msgid ""
"This section has to be on top of your\n"
@@ -20786,37 +20780,37 @@ msgstr ""
"\n"
"当您完成后,请选择继续。或者后退到上一步。\n"
-#: standalone/drakvpn:403
+#: standalone/drakvpn:405
#, c-format
msgid "interfaces"
msgstr "interfaces"
-#: standalone/drakvpn:404
+#: standalone/drakvpn:406
#, c-format
msgid "klipsdebug"
msgstr "klipsdebug"
-#: standalone/drakvpn:405
+#: standalone/drakvpn:407
#, c-format
msgid "plutodebug"
msgstr "plutodebug"
-#: standalone/drakvpn:406
+#: standalone/drakvpn:408
#, c-format
msgid "plutoload"
msgstr "plutoload"
-#: standalone/drakvpn:407
+#: standalone/drakvpn:409
#, c-format
msgid "plutostart"
msgstr "plutostart"
-#: standalone/drakvpn:408
+#: standalone/drakvpn:410
#, c-format
msgid "uniqueids"
msgstr "uniqueids"
-#: standalone/drakvpn:442
+#: standalone/drakvpn:444
#, c-format
msgid ""
"This is the first section after the config\n"
@@ -20834,52 +20828,52 @@ msgstr ""
"之后。剩下的设置都是可选的。如果您不想在此定义\n"
"全局定义,您还可以在每个区段中分别定义。\n"
-#: standalone/drakvpn:449
+#: standalone/drakvpn:451
#, c-format
msgid "PFS"
msgstr "PFS"
-#: standalone/drakvpn:450
+#: standalone/drakvpn:452
#, c-format
msgid "keyingtries"
msgstr "keyingtries"
-#: standalone/drakvpn:451
+#: standalone/drakvpn:453
#, c-format
msgid "compress"
msgstr "compress"
-#: standalone/drakvpn:452
+#: standalone/drakvpn:454
#, c-format
msgid "disablearrivalcheck"
msgstr "disablearrivalcheck"
-#: standalone/drakvpn:453 standalone/drakvpn:492
+#: standalone/drakvpn:455 standalone/drakvpn:494
#, c-format
msgid "left"
msgstr "left"
-#: standalone/drakvpn:454 standalone/drakvpn:493
+#: standalone/drakvpn:456 standalone/drakvpn:495
#, c-format
msgid "leftcert"
msgstr "leftcert"
-#: standalone/drakvpn:455 standalone/drakvpn:494
+#: standalone/drakvpn:457 standalone/drakvpn:496
#, c-format
msgid "leftrsasigkey"
msgstr "leftrsasigkey"
-#: standalone/drakvpn:456 standalone/drakvpn:495
+#: standalone/drakvpn:458 standalone/drakvpn:497
#, c-format
msgid "leftsubnet"
msgstr "leftsubnet"
-#: standalone/drakvpn:457 standalone/drakvpn:496
+#: standalone/drakvpn:459 standalone/drakvpn:498
#, c-format
msgid "leftnexthop"
msgstr "leftnexthop"
-#: standalone/drakvpn:486
+#: standalone/drakvpn:488
#, fuzzy, c-format
msgid ""
"Your %s file has several sections, or connections.\n"
@@ -20892,47 +20886,47 @@ msgstr ""
"您现在可以添加一个新的区段。\n"
"当您准备好写入数据后,请选择继续。\n"
-#: standalone/drakvpn:489
+#: standalone/drakvpn:491
#, c-format
msgid "section name"
msgstr "区段名称"
-#: standalone/drakvpn:490
+#: standalone/drakvpn:492
#, c-format
msgid "authby"
msgstr "authby"
-#: standalone/drakvpn:491
+#: standalone/drakvpn:493
#, c-format
msgid "auto"
msgstr "自动"
-#: standalone/drakvpn:497
+#: standalone/drakvpn:499
#, c-format
msgid "right"
msgstr "right"
-#: standalone/drakvpn:498
+#: standalone/drakvpn:500
#, c-format
msgid "rightcert"
msgstr "rightcert"
-#: standalone/drakvpn:499
+#: standalone/drakvpn:501
#, c-format
msgid "rightrsasigkey"
msgstr "rightrsasigkey"
-#: standalone/drakvpn:500
+#: standalone/drakvpn:502
#, c-format
msgid "rightsubnet"
msgstr "rightsubnet"
-#: standalone/drakvpn:501
+#: standalone/drakvpn:503
#, c-format
msgid "rightnexthop"
msgstr "rightnexthop"
-#: standalone/drakvpn:509
+#: standalone/drakvpn:511
#, c-format
msgid ""
"A section with this name already exists.\n"
@@ -20946,7 +20940,7 @@ msgstr ""
"\n"
"您应该回退并添加另外一个区段,或者更改其名称。\n"
-#: standalone/drakvpn:541
+#: standalone/drakvpn:543
#, fuzzy, c-format
msgid ""
"Add a Security Policy.\n"
@@ -20961,12 +20955,12 @@ msgstr ""
"\n"
"当您准备好写入数据后,请选择继续。\n"
-#: standalone/drakvpn:574 standalone/drakvpn:824
+#: standalone/drakvpn:576 standalone/drakvpn:826
#, c-format
msgid "Edit section"
msgstr "编辑选中项"
-#: standalone/drakvpn:575
+#: standalone/drakvpn:577
#, fuzzy, c-format
msgid ""
"Your %s file has several sections or connections.\n"
@@ -20978,18 +20972,18 @@ msgstr ""
"\n"
"您可以下面选择想要编辑的区段,然后点击下一步。\n"
-#: standalone/drakvpn:578 standalone/drakvpn:658 standalone/drakvpn:829
-#: standalone/drakvpn:875
+#: standalone/drakvpn:580 standalone/drakvpn:660 standalone/drakvpn:831
+#: standalone/drakvpn:877
#, c-format
msgid "Section names"
msgstr "区段名称"
-#: standalone/drakvpn:588
+#: standalone/drakvpn:590
#, c-format
msgid "Can't edit !"
msgstr "无法编辑!"
-#: standalone/drakvpn:589
+#: standalone/drakvpn:591
#, fuzzy, c-format
msgid ""
"You cannot edit this section.\n"
@@ -21004,7 +20998,7 @@ msgstr ""
"此区段是 Freswan 2.X 必须的。\n"
"您必须在 %s 文件顶部指定版本 2.0,并且"
-#: standalone/drakvpn:598
+#: standalone/drakvpn:600
#, c-format
msgid ""
"Your %s file has several sections.\n"
@@ -21013,7 +21007,7 @@ msgid ""
"Choose continue when you are done to write the data.\n"
msgstr ""
-#: standalone/drakvpn:609
+#: standalone/drakvpn:611
#, c-format
msgid ""
"Your %s file has several sections or connections.\n"
@@ -21022,7 +21016,7 @@ msgid ""
"Choose continue when you are done to write the data.\n"
msgstr ""
-#: standalone/drakvpn:622
+#: standalone/drakvpn:624
#, c-format
msgid ""
"Your %s file has several sections or connections.\n"
@@ -21032,7 +21026,7 @@ msgid ""
"Choose continue when you are done to write the data.\n"
msgstr ""
-#: standalone/drakvpn:643
+#: standalone/drakvpn:645
#, c-format
msgid ""
"Edit a Security Policy.\n"
@@ -21042,12 +21036,12 @@ msgid ""
"Choose continue when you are done to write the data.\n"
msgstr ""
-#: standalone/drakvpn:654 standalone/drakvpn:871
+#: standalone/drakvpn:656 standalone/drakvpn:873
#, c-format
msgid "Remove section"
msgstr "删除选中项"
-#: standalone/drakvpn:655 standalone/drakvpn:872
+#: standalone/drakvpn:657 standalone/drakvpn:874
#, c-format
msgid ""
"Your %s file has several sections or connections.\n"
@@ -21056,7 +21050,7 @@ msgid ""
"and then click on next.\n"
msgstr ""
-#: standalone/drakvpn:684
+#: standalone/drakvpn:686
#, c-format
msgid ""
"The racoon.conf file configuration.\n"
@@ -21070,7 +21064,7 @@ msgid ""
" - commit \t\t (writes the changes to the real file)"
msgstr ""
-#: standalone/drakvpn:712
+#: standalone/drakvpn:714
#, c-format
msgid ""
"The %s file does not exist\n"
@@ -21080,12 +21074,12 @@ msgid ""
"You'll have to go back and choose configure.\n"
msgstr ""
-#: standalone/drakvpn:726
+#: standalone/drakvpn:728
#, c-format
msgid "racoonf.conf entries"
msgstr "racoonf.conf 项"
-#: standalone/drakvpn:727
+#: standalone/drakvpn:729
#, c-format
msgid ""
"The 'add' sections step.\n"
@@ -21098,22 +21092,22 @@ msgid ""
"Choose the section you would like to add.\n"
msgstr ""
-#: standalone/drakvpn:733
+#: standalone/drakvpn:735
#, c-format
msgid "path"
msgstr "路径"
-#: standalone/drakvpn:733
+#: standalone/drakvpn:735
#, c-format
msgid "remote"
msgstr "远程"
-#: standalone/drakvpn:733
+#: standalone/drakvpn:735
#, c-format
msgid "sainfo"
msgstr "sainfo"
-#: standalone/drakvpn:741
+#: standalone/drakvpn:743
#, c-format
msgid ""
"The 'add path' section step.\n"
@@ -21123,12 +21117,12 @@ msgid ""
"Put your mouse over the certificate entry to obtain online help."
msgstr ""
-#: standalone/drakvpn:744
+#: standalone/drakvpn:746
#, c-format
msgid "path type"
msgstr "路径类型"
-#: standalone/drakvpn:748
+#: standalone/drakvpn:750
#, c-format
msgid ""
"path include path : specifies a path to include\n"
@@ -21152,12 +21146,12 @@ msgid ""
"Pre-shared key authentication method in phase 1."
msgstr ""
-#: standalone/drakvpn:768 standalone/drakvpn:861
+#: standalone/drakvpn:770 standalone/drakvpn:863
#, c-format
msgid "real file"
msgstr "真实文件"
-#: standalone/drakvpn:791
+#: standalone/drakvpn:793
#, c-format
msgid ""
"Make sure you already have the path sections\n"
@@ -21167,7 +21161,7 @@ msgid ""
"Choose continue or previous when you are done.\n"
msgstr ""
-#: standalone/drakvpn:808
+#: standalone/drakvpn:810
#, fuzzy, c-format
msgid ""
"Make sure you already have the path sections\n"
@@ -21182,7 +21176,7 @@ msgstr ""
"\n"
"当您完成后,请选择继续。或者后退到上一步。\n"
-#: standalone/drakvpn:825
+#: standalone/drakvpn:827
#, c-format
msgid ""
"Your %s file has several sections or connections.\n"
@@ -21191,7 +21185,7 @@ msgid ""
"to edit and then click on next.\n"
msgstr ""
-#: standalone/drakvpn:836
+#: standalone/drakvpn:838
#, c-format
msgid ""
"Your %s file has several sections.\n"
@@ -21202,7 +21196,7 @@ msgid ""
"Choose continue when you are done to write the data.\n"
msgstr ""
-#: standalone/drakvpn:845
+#: standalone/drakvpn:847
#, c-format
msgid ""
"Your %s file has several sections.\n"
@@ -21212,7 +21206,7 @@ msgid ""
"Choose continue when you are done to write the data."
msgstr ""
-#: standalone/drakvpn:853
+#: standalone/drakvpn:855
#, c-format
msgid ""
"This section has to be on top of your\n"
@@ -21226,12 +21220,12 @@ msgid ""
"Choose continue or previous when you are done.\n"
msgstr ""
-#: standalone/drakvpn:860
+#: standalone/drakvpn:862
#, c-format
msgid "path_type"
msgstr ""
-#: standalone/drakvpn:901
+#: standalone/drakvpn:903
#, c-format
msgid ""
"Everything has been configured.\n"
@@ -21243,12 +21237,12 @@ msgid ""
"section is configured."
msgstr ""
-#: standalone/drakvpn:921
+#: standalone/drakvpn:923
#, c-format
msgid "Sainfo source address"
msgstr "Sainfo 源地址"
-#: standalone/drakvpn:922
+#: standalone/drakvpn:924
#, c-format
msgid ""
"sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21271,12 +21265,12 @@ msgid ""
"\t172.16.1.0/24 is the source address"
msgstr ""
-#: standalone/drakvpn:939
+#: standalone/drakvpn:941
#, c-format
msgid "Sainfo source protocol"
msgstr "Sainfo 源协议"
-#: standalone/drakvpn:940
+#: standalone/drakvpn:942
#, c-format
msgid ""
"sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21296,12 +21290,12 @@ msgid ""
"\tthe first 'any' allows any protocol for the source"
msgstr ""
-#: standalone/drakvpn:954
+#: standalone/drakvpn:956
#, c-format
msgid "Sainfo destination address"
msgstr "Sainfo 目的地址"
-#: standalone/drakvpn:955
+#: standalone/drakvpn:957
#, c-format
msgid ""
"sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21324,12 +21318,12 @@ msgid ""
"\t172.16.2.0/24 is the destination address"
msgstr ""
-#: standalone/drakvpn:972
+#: standalone/drakvpn:974
#, c-format
msgid "Sainfo destination protocol"
msgstr "Sainfo 目的协议"
-#: standalone/drakvpn:973
+#: standalone/drakvpn:975
#, c-format
msgid ""
"sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21349,12 +21343,12 @@ msgid ""
"\tthe last 'any' allows any protocol for the destination"
msgstr ""
-#: standalone/drakvpn:987
+#: standalone/drakvpn:989
#, c-format
msgid "PFS group"
msgstr "PFS 组"
-#: standalone/drakvpn:989
+#: standalone/drakvpn:991
#, c-format
msgid ""
"define the group of Diffie-Hellman exponentiations.\n"
@@ -21364,12 +21358,12 @@ msgid ""
"Or you can define 1, 2, or 5 as the DH group number."
msgstr ""
-#: standalone/drakvpn:994
+#: standalone/drakvpn:996
#, fuzzy, c-format
msgid "Lifetime number"
msgstr "一个数字"
-#: standalone/drakvpn:995
+#: standalone/drakvpn:997
#, c-format
msgid ""
"define a lifetime of a certain time which will be pro-\n"
@@ -21390,12 +21384,12 @@ msgid ""
"So, here, the lifetime numbers are 1, 1, 30, 30, 60 and 12.\n"
msgstr ""
-#: standalone/drakvpn:1011
+#: standalone/drakvpn:1013
#, c-format
msgid "Lifetime unit"
msgstr ""
-#: standalone/drakvpn:1013
+#: standalone/drakvpn:1015
#, c-format
msgid ""
"define a lifetime of a certain time which will be pro-\n"
@@ -21417,32 +21411,32 @@ msgid ""
"'hour'.\n"
msgstr ""
-#: standalone/drakvpn:1029 standalone/drakvpn:1114
+#: standalone/drakvpn:1031 standalone/drakvpn:1116
#, c-format
msgid "Encryption algorithm"
msgstr "加密算法"
-#: standalone/drakvpn:1031
+#: standalone/drakvpn:1033
#, c-format
msgid "Authentication algorithm"
msgstr "身份认证算法"
-#: standalone/drakvpn:1033
+#: standalone/drakvpn:1035
#, c-format
msgid "Compression algorithm"
msgstr "压缩算法"
-#: standalone/drakvpn:1034
+#: standalone/drakvpn:1036
#, fuzzy, c-format
msgid "deflate"
msgstr "默认"
-#: standalone/drakvpn:1041
+#: standalone/drakvpn:1043
#, c-format
msgid "Remote"
msgstr "远程"
-#: standalone/drakvpn:1042
+#: standalone/drakvpn:1044
#, c-format
msgid ""
"remote (address | anonymous) [[port]] { statements }\n"
@@ -21457,12 +21451,12 @@ msgid ""
"remote ::1 [8000]"
msgstr ""
-#: standalone/drakvpn:1050
+#: standalone/drakvpn:1052
#, c-format
msgid "Exchange mode"
msgstr "交换模式"
-#: standalone/drakvpn:1052
+#: standalone/drakvpn:1054
#, c-format
msgid ""
"defines the exchange mode for phase 1 when racoon is the\n"
@@ -21473,22 +21467,22 @@ msgid ""
"racoon uses when it is the initiator.\n"
msgstr ""
-#: standalone/drakvpn:1058
+#: standalone/drakvpn:1060
#, c-format
msgid "Generate policy"
msgstr "生成策略"
-#: standalone/drakvpn:1059 standalone/drakvpn:1075 standalone/drakvpn:1088
+#: standalone/drakvpn:1061 standalone/drakvpn:1077 standalone/drakvpn:1090
#, c-format
msgid "off"
msgstr ""
-#: standalone/drakvpn:1059 standalone/drakvpn:1075 standalone/drakvpn:1088
+#: standalone/drakvpn:1061 standalone/drakvpn:1077 standalone/drakvpn:1090
#, fuzzy, c-format
msgid "on"
msgstr "下移"
-#: standalone/drakvpn:1060
+#: standalone/drakvpn:1062
#, c-format
msgid ""
"This directive is for the responder. Therefore you\n"
@@ -21507,12 +21501,12 @@ msgid ""
"the initiator case. The default value is off."
msgstr ""
-#: standalone/drakvpn:1074
+#: standalone/drakvpn:1076
#, c-format
msgid "Passive"
msgstr "被动"
-#: standalone/drakvpn:1076
+#: standalone/drakvpn:1078
#, c-format
msgid ""
"If you do not want to initiate the negotiation, set this\n"
@@ -21520,59 +21514,59 @@ msgid ""
"server."
msgstr ""
-#: standalone/drakvpn:1079
+#: standalone/drakvpn:1081
#, c-format
msgid "Certificate type"
msgstr "证书类型"
-#: standalone/drakvpn:1081
+#: standalone/drakvpn:1083
#, c-format
msgid "My certfile"
msgstr "我的证书"
-#: standalone/drakvpn:1082
+#: standalone/drakvpn:1084
#, c-format
msgid "Name of the certificate"
msgstr "证书名称"
-#: standalone/drakvpn:1083
+#: standalone/drakvpn:1085
#, c-format
msgid "My private key"
msgstr "我的私钥"
-#: standalone/drakvpn:1084
+#: standalone/drakvpn:1086
#, c-format
msgid "Name of the private key"
msgstr "私钥名称"
-#: standalone/drakvpn:1085
+#: standalone/drakvpn:1087
#, fuzzy, c-format
msgid "Peers certfile"
msgstr "选择文件"
-#: standalone/drakvpn:1086
+#: standalone/drakvpn:1088
#, c-format
msgid "Name of the peers certificate"
msgstr ""
-#: standalone/drakvpn:1087
+#: standalone/drakvpn:1089
#, c-format
msgid "Verify cert"
msgstr "校验证书"
-#: standalone/drakvpn:1089
+#: standalone/drakvpn:1091
#, c-format
msgid ""
"If you do not want to verify the peer's certificate for\n"
"some reason, set this to off. The default is on."
msgstr ""
-#: standalone/drakvpn:1091
+#: standalone/drakvpn:1093
#, c-format
msgid "My identifier"
msgstr ""
-#: standalone/drakvpn:1092
+#: standalone/drakvpn:1094
#, c-format
msgid ""
"specifies the identifier sent to the remote host and the\n"
@@ -21599,17 +21593,17 @@ msgid ""
"my_identifier user_fqdn \"myemail@mydomain.com\""
msgstr ""
-#: standalone/drakvpn:1112
+#: standalone/drakvpn:1114
#, fuzzy, c-format
msgid "Peers identifier"
msgstr "打印机"
-#: standalone/drakvpn:1113
+#: standalone/drakvpn:1115
#, fuzzy, c-format
msgid "Proposal"
msgstr "协议"
-#: standalone/drakvpn:1115
+#: standalone/drakvpn:1117
#, c-format
msgid ""
"specify the encryption algorithm used for the\n"
@@ -21621,37 +21615,37 @@ msgid ""
"For other transforms, this statement should not be used."
msgstr ""
-#: standalone/drakvpn:1122
+#: standalone/drakvpn:1124
#, c-format
msgid "Hash algorithm"
msgstr "哈希算法"
-#: standalone/drakvpn:1123
+#: standalone/drakvpn:1125
#, c-format
msgid "Authentication method"
msgstr "身份验证方式"
-#: standalone/drakvpn:1124
+#: standalone/drakvpn:1126
#, c-format
msgid "DH group"
msgstr "DH 组"
-#: standalone/drakvpn:1131
+#: standalone/drakvpn:1133
#, c-format
msgid "Command"
msgstr "命令"
-#: standalone/drakvpn:1132
+#: standalone/drakvpn:1134
#, c-format
msgid "Source IP range"
msgstr "源 IP 范围"
-#: standalone/drakvpn:1133
+#: standalone/drakvpn:1135
#, c-format
msgid "Destination IP range"
msgstr "目的 IP 范围"
-#: standalone/drakvpn:1134
+#: standalone/drakvpn:1136
#, c-format
msgid "Upper-layer protocol"
msgstr "上层协议"
@@ -21659,132 +21653,132 @@ msgstr "上层协议"
# ui/evolution-calendar.xml.h:11
# ui/evolution-calendar.xml.h:11
# ui/evolution-calendar.xml.h:11
-#: standalone/drakvpn:1134 standalone/drakvpn:1141
+#: standalone/drakvpn:1136 standalone/drakvpn:1143
#, c-format
msgid "any"
msgstr "any"
-#: standalone/drakvpn:1136
+#: standalone/drakvpn:1138
#, c-format
msgid "Flag"
msgstr "标志"
-#: standalone/drakvpn:1137
+#: standalone/drakvpn:1139
#, c-format
msgid "Direction"
msgstr "方向"
-#: standalone/drakvpn:1138
+#: standalone/drakvpn:1140
#, c-format
msgid "IPsec policy"
msgstr "IPsec 策略"
-#: standalone/drakvpn:1138
+#: standalone/drakvpn:1140
#, c-format
msgid "ipsec"
msgstr "ipsec"
-#: standalone/drakvpn:1138
+#: standalone/drakvpn:1140
#, c-format
msgid "discard"
msgstr "discard"
-#: standalone/drakvpn:1141
+#: standalone/drakvpn:1143
#, c-format
msgid "Mode"
msgstr "模式"
-#: standalone/drakvpn:1141
+#: standalone/drakvpn:1143
#, c-format
msgid "tunnel"
msgstr "tunnel"
-#: standalone/drakvpn:1141
+#: standalone/drakvpn:1143
#, c-format
msgid "transport"
msgstr "transport"
-#: standalone/drakvpn:1143
+#: standalone/drakvpn:1145
#, c-format
msgid "Source/destination"
msgstr "源/目的"
-#: standalone/drakvpn:1144
+#: standalone/drakvpn:1146
#, c-format
msgid "require"
msgstr "require"
-#: standalone/drakvpn:1144
+#: standalone/drakvpn:1146
#, c-format
msgid "use"
msgstr "use"
-#: standalone/drakvpn:1144
+#: standalone/drakvpn:1146
#, c-format
msgid "unique"
msgstr "unique"
-#: standalone/drakxtv:46
+#: standalone/drakxtv:43
#, c-format
msgid "USA (broadcast)"
msgstr "美国(广播)"
-#: standalone/drakxtv:46
+#: standalone/drakxtv:43
#, c-format
msgid "USA (cable)"
msgstr "美国(有线)"
-#: standalone/drakxtv:46
+#: standalone/drakxtv:43
#, c-format
msgid "USA (cable-hrc)"
msgstr "美国(cable-hrc)"
-#: standalone/drakxtv:46
+#: standalone/drakxtv:43
#, c-format
msgid "Canada (cable)"
msgstr "加拿大(有线)"
-#: standalone/drakxtv:47
+#: standalone/drakxtv:44
#, c-format
msgid "Japan (broadcast)"
msgstr "日本(广播)"
-#: standalone/drakxtv:47
+#: standalone/drakxtv:44
#, c-format
msgid "Japan (cable)"
msgstr "日本(有线)"
-#: standalone/drakxtv:47
+#: standalone/drakxtv:44
#, c-format
msgid "China (broadcast)"
msgstr "中国(广播)"
-#: standalone/drakxtv:48
+#: standalone/drakxtv:45
#, c-format
msgid "West Europe"
msgstr "西欧"
-#: standalone/drakxtv:48
+#: standalone/drakxtv:45
#, c-format
msgid "East Europe"
msgstr "东欧"
-#: standalone/drakxtv:48
+#: standalone/drakxtv:45
#, c-format
msgid "France [SECAM]"
msgstr "法国 [SECAM]"
-#: standalone/drakxtv:49
+#: standalone/drakxtv:46
#, c-format
msgid "Newzealand"
msgstr "新西兰"
-#: standalone/drakxtv:52
+#: standalone/drakxtv:49
#, c-format
msgid "Australian Optus cable TV"
msgstr "澳大利亚 Optus 光缆 TV"
-#: standalone/drakxtv:84
+#: standalone/drakxtv:83
#, c-format
msgid ""
"Please,\n"
@@ -21793,12 +21787,12 @@ msgstr ""
"现在,\n"
"请输入您的电视制式和国家或地区"
-#: standalone/drakxtv:86
+#: standalone/drakxtv:85
#, c-format
msgid "TV norm:"
msgstr "电视制式:"
-#: standalone/drakxtv:87
+#: standalone/drakxtv:86
#, c-format
msgid "Area:"
msgstr "地区:"
@@ -21818,27 +21812,22 @@ msgstr "搜索电视频道"
msgid "There was an error while scanning for TV channels"
msgstr "搜索电视频道时出错:"
-#: standalone/drakxtv:106
-#, c-format
-msgid "XawTV isn't installed!"
-msgstr "XawTV 没有安装!"
-
-#: standalone/drakxtv:109
+#: standalone/drakxtv:108
#, c-format
msgid "Have a nice day!"
msgstr "祝您愉快!"
-#: standalone/drakxtv:110
+#: standalone/drakxtv:109
#, c-format
msgid "Now, you can run xawtv (under X Window!) !\n"
msgstr "您现在可以在 X 中运行 xawtv 看电视了!\n"
-#: standalone/drakxtv:131
+#: standalone/drakxtv:132
#, c-format
msgid "No TV Card detected!"
msgstr "没有发现电视卡!"
-#: standalone/drakxtv:132
+#: standalone/drakxtv:133
#, c-format
msgid ""
"No TV Card has been detected on your machine. Please verify that a Linux-"
@@ -23351,21 +23340,41 @@ msgstr ""
msgid "Your scanner(s) will not be available on the network."
msgstr "您的扫描仪将不会在网络上出现。"
-#: standalone/service_harddrake:49
+#: standalone/service_harddrake:58
#, c-format
msgid "Some devices in the \"%s\" hardware class were removed:\n"
msgstr "删除了一些“%s”类别的设备:\n"
-#: standalone/service_harddrake:53
+#: standalone/service_harddrake:59
+#, c-format
+msgid "- %s was removed\n"
+msgstr "- %s 已删除\n"
+
+#: standalone/service_harddrake:62
#, c-format
msgid "Some devices were added: %s\n"
msgstr "添加了一些设备: %s\n"
-#: standalone/service_harddrake:98
+#: standalone/service_harddrake:63
+#, c-format
+msgid "- %s was added\n"
+msgstr "- %s 已添加\n"
+
+#: standalone/service_harddrake:107
#, c-format
msgid "Hardware probing in progress"
msgstr "硬件检测进行中"
+#: standalone/service_harddrake_confirm:7
+#, c-format
+msgid "Hardware changes in \"%s\" class (%s seconds to answer)"
+msgstr "在“%s”类别更改了硬件(还剩 %s 秒回答)"
+
+#: standalone/service_harddrake_confirm:8
+#, c-format
+msgid "Do you want to run the appropriate config tool ?"
+msgstr "您想要运行相应的配置工具吗?"
+
#: steps.pm:14
#, c-format
msgid "Language"
@@ -23643,6 +23652,17 @@ msgstr "NFS 服务器,SMB 服务器,代理服务器,SSH 服务器"
msgid "Set of tools to read and send mail and news and to browse the Web"
msgstr "一组上网工具,用于收发邮件和新闻,或者浏览网站"
+#~ msgid ""
+#~ "Due to incompatibilities of the 2.6 series kernel with the LSB runtime\n"
+#~ "tests, the 2.4 series kernel will be installed as the default to insure\n"
+#~ "compliance under the \"LSB\" group selection."
+#~ msgstr ""
+#~ "由于 2.6 系列的内核与 LSB 运行时刻测试不兼容,我们将会把 2.4 系列内核\n"
+#~ "作为默认值,以遵从“LSB”组选择。"
+
+#~ msgid "XawTV isn't installed!"
+#~ msgstr "XawTV 没有安装!"
+
#~ msgid "Provider dns 1 (optional)"
#~ msgstr "服务商 DNS 1(可选)"