summaryrefslogtreecommitdiffstats
path: root/perl-install/share/po
diff options
context:
space:
mode:
authorFunda Wang <fwang@mandriva.org>2004-03-23 16:39:45 +0000
committerFunda Wang <fwang@mandriva.org>2004-03-23 16:39:45 +0000
commit53181b8b178891787b2c7cb8f9603a0d6b9b41b3 (patch)
tree1a6e8495bb0c95753c3f7ae16b2f12a015485a2d /perl-install/share/po
parentb56f937956796438f369af9234f2b2b18217e375 (diff)
downloaddrakx-backup-do-not-use-53181b8b178891787b2c7cb8f9603a0d6b9b41b3.tar
drakx-backup-do-not-use-53181b8b178891787b2c7cb8f9603a0d6b9b41b3.tar.gz
drakx-backup-do-not-use-53181b8b178891787b2c7cb8f9603a0d6b9b41b3.tar.bz2
drakx-backup-do-not-use-53181b8b178891787b2c7cb8f9603a0d6b9b41b3.tar.xz
drakx-backup-do-not-use-53181b8b178891787b2c7cb8f9603a0d6b9b41b3.zip
Updated Simplified Chinese translation
Diffstat (limited to 'perl-install/share/po')
-rw-r--r--perl-install/share/po/zh_CN.po6371
1 files changed, 3325 insertions, 3046 deletions
diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index 7e6b6f065..a88de1ac7 100644
--- a/perl-install/share/po/zh_CN.po
+++ b/perl-install/share/po/zh_CN.po
@@ -8,8 +8,8 @@
msgid ""
msgstr ""
"Project-Id-Version: DrakX 10.0\n"
-"POT-Creation-Date: 2004-02-19 18:02+0100\n"
-"PO-Revision-Date: 2004-02-19 00:44+0800\n"
+"POT-Creation-Date: 2004-03-19 14:32+0100\n"
+"PO-Revision-Date: 2004-03-23 12:57+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:1310
+#: ../move/move.pm:402 help.pm:418 install_steps_interactive.pm:1319
#, c-format
msgid "Reboot"
msgstr "重新启动"
@@ -148,44 +148,51 @@ 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:753 network/netconnect.pm:846
-#: network/netconnect.pm:849 network/netconnect.pm:894
-#: network/netconnect.pm:898 network/netconnect.pm:965
-#: network/netconnect.pm:1014 network/netconnect.pm:1019
-#: network/netconnect.pm:1034 printer/printerdrake.pm:213
+#: 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
#: printer/printerdrake.pm:220 printer/printerdrake.pm:245
#: printer/printerdrake.pm:393 printer/printerdrake.pm:398
#: printer/printerdrake.pm:411 printer/printerdrake.pm:421
-#: printer/printerdrake.pm:1052 printer/printerdrake.pm:1099
-#: printer/printerdrake.pm:1174 printer/printerdrake.pm:1178
-#: printer/printerdrake.pm:1349 printer/printerdrake.pm:1353
-#: printer/printerdrake.pm:1357 printer/printerdrake.pm:1457
-#: printer/printerdrake.pm:1461 printer/printerdrake.pm:1578
-#: printer/printerdrake.pm:1582 printer/printerdrake.pm:1668
-#: printer/printerdrake.pm:1755 printer/printerdrake.pm:2153
-#: printer/printerdrake.pm:2419 printer/printerdrake.pm:2425
-#: printer/printerdrake.pm:2842 printer/printerdrake.pm:2846
-#: printer/printerdrake.pm:2850 printer/printerdrake.pm:3241
-#: standalone/drakTermServ:399 standalone/drakTermServ:730
-#: standalone/drakTermServ:737 standalone/drakTermServ:931
-#: standalone/drakTermServ:1330 standalone/drakTermServ:1335
-#: standalone/drakTermServ:1342 standalone/drakTermServ:1353
-#: standalone/drakTermServ:1372 standalone/drakauth:36
-#: standalone/drakbackup:766 standalone/drakbackup:881
-#: standalone/drakbackup:1455 standalone/drakbackup:1488
-#: standalone/drakbackup:2004 standalone/drakbackup:2177
-#: standalone/drakbackup:2738 standalone/drakbackup:2805
-#: standalone/drakbackup:4826 standalone/drakboot:235 standalone/drakbug:267
-#: standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:569
-#: standalone/drakconnect:571 standalone/drakconnect:587
+#: printer/printerdrake.pm:1067 printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1151 printer/printerdrake.pm:1195
+#: printer/printerdrake.pm:1199 printer/printerdrake.pm:1213
+#: printer/printerdrake.pm:1303 printer/printerdrake.pm:1383
+#: printer/printerdrake.pm:1387 printer/printerdrake.pm:1391
+#: printer/printerdrake.pm:1440 printer/printerdrake.pm:1497
+#: printer/printerdrake.pm:1501 printer/printerdrake.pm:1515
+#: printer/printerdrake.pm:1625 printer/printerdrake.pm:1629
+#: printer/printerdrake.pm:1666 printer/printerdrake.pm:1731
+#: printer/printerdrake.pm:1749 printer/printerdrake.pm:1758
+#: printer/printerdrake.pm:1767 printer/printerdrake.pm:1778
+#: printer/printerdrake.pm:1840 printer/printerdrake.pm:2285
+#: printer/printerdrake.pm:2551 printer/printerdrake.pm:2557
+#: printer/printerdrake.pm:3010 printer/printerdrake.pm:3014
+#: 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/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/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:208 standalone/drakfont:221
-#: standalone/drakfont:257 standalone/drakfont:597 standalone/draksplash:21
-#: standalone/logdrake:171 standalone/logdrake:415 standalone/logdrake:420
-#: standalone/scannerdrake:52 standalone/scannerdrake:194
-#: standalone/scannerdrake:253 standalone/scannerdrake:676
-#: standalone/scannerdrake:687 standalone/scannerdrake:826
-#: standalone/scannerdrake:837 standalone/scannerdrake:902 wizards.pm:95
+#: 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
#, c-format
msgid "Error"
@@ -435,15 +442,16 @@ msgstr ""
msgid "Xpmac (installation display driver)"
msgstr "Xpmac(安装显卡驱动)"
-#: Xconfig/main.pm:88 Xconfig/main.pm:89 Xconfig/monitor.pm:106 any.pm:818
+#: Xconfig/main.pm:88 Xconfig/main.pm:89 Xconfig/monitor.pm:106 any.pm:823
#, c-format
msgid "Custom"
msgstr "自定义"
#: Xconfig/main.pm:113 diskdrake/dav.pm:28 help.pm:14
-#: install_steps_interactive.pm:83 printer/printerdrake.pm:3871
-#: standalone/draksplash:114 standalone/harddrake2:187 standalone/logdrake:176
-#: standalone/scannerdrake:438
+#: install_steps_interactive.pm:83 printer/printerdrake.pm:608
+#: printer/printerdrake.pm:4076 standalone/draksplash:120
+#: standalone/harddrake2:188 standalone/logdrake:175
+#: standalone/scannerdrake:445
#, c-format
msgid "Quit"
msgstr "退出"
@@ -470,11 +478,11 @@ msgstr "测试"
#: Xconfig/main.pm:131 diskdrake/dav.pm:67 diskdrake/interactive.pm:410
#: diskdrake/removable.pm:25 diskdrake/smbnfs_gtk.pm:80
-#: standalone/drakconnect:254 standalone/drakconnect:263
-#: standalone/drakconnect:277 standalone/drakconnect:283
-#: standalone/drakconnect:381 standalone/drakconnect:382
-#: standalone/drakconnect:540 standalone/drakfont:491 standalone/drakfont:551
-#: standalone/harddrake2:184
+#: standalone/drakconnect:263 standalone/drakconnect:272
+#: standalone/drakconnect:292 standalone/drakconnect:298
+#: standalone/drakconnect:404 standalone/drakconnect:405
+#: standalone/drakconnect:576 standalone/drakfont:494 standalone/drakfont:554
+#: standalone/harddrake2:185
#, c-format
msgid "Options"
msgstr "选项"
@@ -507,7 +515,7 @@ msgstr "即插即用"
msgid "Generic"
msgstr "通用"
-#: Xconfig/monitor.pm:109 standalone/drakconnect:520 standalone/harddrake2:68
+#: Xconfig/monitor.pm:109 standalone/drakconnect:556 standalone/harddrake2:68
#: standalone/harddrake2:69
#, c-format
msgid "Vendor"
@@ -591,52 +599,51 @@ msgid "Graphics card: %s"
msgstr "显示卡: %s"
#: Xconfig/resolution_and_depth.pm:289 interactive.pm:403
-#: interactive/gtk.pm:734 interactive/http.pm:103 interactive/http.pm:157
+#: interactive/gtk.pm:759 interactive/http.pm:103 interactive/http.pm:157
#: interactive/newt.pm:308 interactive/newt.pm:410 interactive/stdio.pm:39
#: interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172
-#: standalone/drakbackup:4320 standalone/drakbackup:4352
-#: standalone/drakbackup:4445 standalone/drakbackup:4462
-#: standalone/drakbackup:4563 standalone/drakconnect:162
-#: standalone/drakconnect:734 standalone/drakconnect:821
-#: standalone/drakconnect:964 standalone/net_monitor:303 ugtk2.pm:412
-#: ugtk2.pm:509 ugtk2.pm:1047 ugtk2.pm:1070
+#: 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/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:858 diskdrake/smbnfs_gtk.pm:81
+#: 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:787 interactive.pm:404 interactive/gtk.pm:738
+#: install_steps_interactive.pm:788 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:2920
-#: standalone/drakautoinst:200 standalone/drakbackup:4284
-#: standalone/drakbackup:4311 standalone/drakbackup:4336
-#: standalone/drakbackup:4369 standalone/drakbackup:4395
-#: standalone/drakbackup:4421 standalone/drakbackup:4478
-#: standalone/drakbackup:4504 standalone/drakbackup:4534
-#: standalone/drakbackup:4558 standalone/drakconnect:161
-#: standalone/drakconnect:819 standalone/drakconnect:973
-#: standalone/drakfont:657 standalone/drakfont:734 standalone/logdrake:176
-#: standalone/net_monitor:299 ugtk2.pm:406 ugtk2.pm:507 ugtk2.pm:516
-#: ugtk2.pm:1047
+#: interactive/stdio.pm:176 printer/printerdrake.pm:3088
+#: standalone/drakautoinst:217 standalone/drakbackup:4009
+#: standalone/drakbackup:4035 standalone/drakbackup:4058
+#: 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/drakups:201 standalone/logdrake:175 standalone/net_monitor:299
+#: ugtk2.pm:407 ugtk2.pm:508 ugtk2.pm:517 ugtk2.pm:1075
#, c-format
msgid "Cancel"
msgstr "取消"
#: Xconfig/resolution_and_depth.pm:289 diskdrake/hd_gtk.pm:154
-#: install_steps_gtk.pm:267 install_steps_gtk.pm:667 interactive.pm:498
-#: interactive/gtk.pm:620 interactive/gtk.pm:622 standalone/drakTermServ:313
-#: standalone/drakbackup:4281 standalone/drakbackup:4308
-#: standalone/drakbackup:4333 standalone/drakbackup:4366
-#: standalone/drakbackup:4392 standalone/drakbackup:4418
-#: standalone/drakbackup:4459 standalone/drakbackup:4475
-#: standalone/drakbackup:4501 standalone/drakbackup:4530
-#: standalone/drakbackup:4555 standalone/drakbackup:4580
-#: standalone/drakbug:157 standalone/drakconnect:157
-#: standalone/drakconnect:227 standalone/drakfont:509 standalone/drakperm:134
-#: standalone/draksec:285 standalone/harddrake2:183 ugtk2.pm:1160
-#: ugtk2.pm:1161
+#: install_steps_gtk.pm:267 install_steps_gtk.pm:668 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
+#: standalone/drakbackup:4117 standalone/drakbackup:4141
+#: standalone/drakbackup:4174 standalone/drakbackup:4193
+#: standalone/drakbackup:4220 standalone/drakbackup:4245
+#: standalone/drakbackup:4264 standalone/drakbug:157
+#: standalone/drakconnect:160 standalone/drakconnect:236
+#: standalone/drakfont:512 standalone/drakperm:134 standalone/draksec:296
+#: standalone/harddrake2:184 ugtk2.pm:1188 ugtk2.pm:1189
#, c-format
msgid "Help"
msgstr "帮助"
@@ -777,19 +784,20 @@ msgstr ""
msgid "What norm is your TV using?"
msgstr "您的电视信号是什么制式？"
-#: any.pm:98 harddrake/sound.pm:150 interactive.pm:441 standalone/drakbug:259
-#: standalone/drakconnect:164 standalone/drakxtv:90 standalone/harddrake2:133
-#: standalone/service_harddrake:94
+#: 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
#, c-format
msgid "Please wait"
msgstr "请稍候"
-#: any.pm:98
+#: any.pm:103
#, c-format
msgid "Bootloader installation in progress"
msgstr "启动引导程序安装中"
-#: any.pm:137
+#: any.pm:142
#, c-format
msgid ""
"You decided to install the bootloader on a partition.\n"
@@ -804,269 +812,269 @@ msgstr ""
"\n"
"您要用哪个硬盘启动？"
-#: any.pm:160 any.pm:192 help.pm:800
+#: any.pm:165 any.pm:197 help.pm:800
#, c-format
msgid "First sector of drive (MBR)"
msgstr "硬盘的第一扇区(MBR)"
-#: any.pm:161
+#: any.pm:166
#, c-format
msgid "First sector of the root partition"
msgstr "根分区的第一扇区"
-#: any.pm:163
+#: any.pm:168
#, c-format
msgid "On Floppy"
msgstr "在软盘上"
-#: any.pm:165 help.pm:768 help.pm:800 printer/printerdrake.pm:3238
+#: any.pm:170 help.pm:768 help.pm:800 printer/printerdrake.pm:3418
#, c-format
msgid "Skip"
msgstr "跳过"
-#: any.pm:170
+#: any.pm:175
#, c-format
msgid "SILO Installation"
msgstr "SILO 安装"
-#: any.pm:170
+#: any.pm:175
#, c-format
msgid "LILO/grub Installation"
msgstr "LILO/grub 安装"
-#: any.pm:171
+#: any.pm:176
#, c-format
msgid "Where do you want to install the bootloader?"
msgstr "您希望启动引导程序安装到哪里？"
-#: any.pm:192
+#: any.pm:197
#, c-format
msgid "First sector of boot partition"
msgstr "引导分区的第一扇区"
-#: any.pm:204 any.pm:239
-#, c-format
-msgid "Bootloader main options"
-msgstr "引导程序的主要选项"
-
-#: any.pm:205
+#: any.pm:208
#, c-format
msgid "Boot Style Configuration"
msgstr "启动风格配置"
-#: any.pm:209
+#: any.pm:210 any.pm:244
+#, c-format
+msgid "Bootloader main options"
+msgstr "引导程序的主要选项"
+
+#: any.pm:214
#, c-format
msgid "Give the ram size in MB"
msgstr "以兆为单位给出内存大小"
-#: any.pm:211
+#: any.pm:216
#, c-format
msgid ""
"Option ``Restrict command line options'' is of no use without a password"
msgstr "没有密码不能使用“限定命令行选项”"
-#: any.pm:212 any.pm:519 install_steps_interactive.pm:1158
+#: any.pm:217 any.pm:524 install_steps_interactive.pm:1163
#, c-format
msgid "The passwords do not match"
msgstr "两次密码不符"
-#: any.pm:212 any.pm:519 diskdrake/interactive.pm:1255
-#: install_steps_interactive.pm:1158
+#: any.pm:217 any.pm:524 diskdrake/interactive.pm:1255
+#: install_steps_interactive.pm:1163
#, c-format
msgid "Please try again"
msgstr "请再试一次"
-#: any.pm:217 any.pm:242 help.pm:768
+#: any.pm:222 any.pm:247 help.pm:768
#, c-format
msgid "Bootloader to use"
msgstr "要使用的引导程序"
-#: any.pm:219
+#: any.pm:224
#, c-format
msgid "Bootloader installation"
msgstr "引导程序安装"
-#: any.pm:221 any.pm:244 help.pm:768
+#: any.pm:226 any.pm:249 help.pm:768
#, c-format
msgid "Boot device"
msgstr "启动设备"
-#: any.pm:223
+#: any.pm:228
#, c-format
msgid "Delay before booting default image"
msgstr "启动默认映像前的延迟"
-#: any.pm:224 help.pm:768
+#: any.pm:229 help.pm:768
#, c-format
msgid "Enable ACPI"
msgstr "启用 ACPI"
-#: any.pm:225
+#: any.pm:230
#, c-format
msgid "Force No APIC"
msgstr "强制无 APIC"
-#: any.pm:227 any.pm:546 diskdrake/smbnfs_gtk.pm:180
-#: install_steps_interactive.pm:1163 network/netconnect.pm:491
-#: printer/printerdrake.pm:1340 printer/printerdrake.pm:1454
-#: standalone/drakbackup:1990 standalone/drakbackup:3875
-#: standalone/drakconnect:916 standalone/drakconnect:944
+#: any.pm:232 any.pm:551 diskdrake/smbnfs_gtk.pm:180
+#: install_steps_interactive.pm:1168 network/netconnect.pm:562
+#: printer/printerdrake.pm:1374 printer/printerdrake.pm:1494
+#: standalone/drakbackup:1717 standalone/drakbackup:3592
+#: standalone/drakups:278
#, c-format
msgid "Password"
msgstr "密码"
-#: any.pm:228 any.pm:547 install_steps_interactive.pm:1164
+#: any.pm:233 any.pm:552 install_steps_interactive.pm:1169
#, c-format
msgid "Password (again)"
msgstr "密码(请再输一次)"
-#: any.pm:229
+#: any.pm:234
#, c-format
msgid "Restrict command line options"
msgstr "限制命令行选项"
-#: any.pm:229
+#: any.pm:234
#, c-format
msgid "restrict"
msgstr "限制"
-#: any.pm:231
+#: any.pm:236
#, c-format
msgid "Clean /tmp at each boot"
msgstr "每次启动时清除 /tmp"
-#: any.pm:232
+#: any.pm:237
#, c-format
msgid "Precise RAM size if needed (found %d MB)"
msgstr "精确的内存大小(找到 %d MB)"
-#: any.pm:234
+#: any.pm:239
#, c-format
msgid "Enable multiple profiles"
msgstr "允许多种设置"
-#: any.pm:243
+#: any.pm:248
#, c-format
msgid "Init Message"
msgstr "初始信息"
-#: any.pm:245
+#: any.pm:250
#, c-format
msgid "Open Firmware Delay"
msgstr "开放固件延迟"
-#: any.pm:246
+#: any.pm:251
#, c-format
msgid "Kernel Boot Timeout"
msgstr "核心启动超时"
-#: any.pm:247
+#: any.pm:252
#, c-format
msgid "Enable CD Boot?"
msgstr "允许 CD 启动？"
-#: any.pm:248
+#: any.pm:253
#, c-format
msgid "Enable OF Boot?"
msgstr "启用 OF 启动？"
-#: any.pm:249
+#: any.pm:254
#, c-format
msgid "Default OS?"
msgstr "默认操作系统？"
-#: any.pm:290
+#: any.pm:295
#, c-format
msgid "Image"
msgstr "映像"
-#: any.pm:291 any.pm:300
+#: any.pm:296 any.pm:305
#, c-format
msgid "Root"
msgstr "根目录"
-#: any.pm:292 any.pm:313
+#: any.pm:297 any.pm:318
#, c-format
msgid "Append"
msgstr "追加"
-#: any.pm:294
+#: any.pm:299
#, c-format
msgid "Video mode"
msgstr "显示模式"
-#: any.pm:296
+#: any.pm:301
#, c-format
msgid "Initrd"
msgstr "Initrd"
-#: any.pm:305 any.pm:310 any.pm:312
+#: any.pm:310 any.pm:315 any.pm:317
#, c-format
msgid "Label"
msgstr "标签"
-#: any.pm:307 any.pm:317 harddrake/v4l.pm:236 standalone/drakfloppy:88
+#: any.pm:312 any.pm:322 harddrake/v4l.pm:236 standalone/drakfloppy:88
#: standalone/drakfloppy:94
#, c-format
msgid "Default"
msgstr "默认"
-#: any.pm:314
+#: any.pm:319
#, c-format
msgid "Initrd-size"
msgstr "Initrd 大小"
-#: any.pm:316
+#: any.pm:321
#, c-format
msgid "NoVideo"
msgstr "无视频"
-#: any.pm:327
+#: any.pm:332
#, c-format
msgid "Empty label not allowed"
msgstr "标签不能为空"
-#: any.pm:328
+#: any.pm:333
#, c-format
msgid "You must specify a kernel image"
msgstr "您必须指定一个内核映像"
-#: any.pm:328
+#: any.pm:333
#, c-format
msgid "You must specify a root partition"
msgstr "您必须指定根目录所在分区"
-#: any.pm:329
+#: any.pm:334
#, c-format
msgid "This label is already used"
msgstr "这个名字已经被使用"
-#: any.pm:342
+#: any.pm:347
#, c-format
msgid "Which type of entry do you want to add?"
msgstr "要添加的条目是什么类型？"
-#: any.pm:343 standalone/drakbackup:1904
+#: any.pm:348
#, c-format
msgid "Linux"
msgstr "Linux"
-#: any.pm:343
+#: any.pm:348
#, c-format
msgid "Other OS (SunOS...)"
msgstr "其它操作系统(SunOS...)"
-#: any.pm:344
+#: any.pm:349
#, c-format
msgid "Other OS (MacOS...)"
msgstr "其它操作系统(MacOS...)"
-#: any.pm:344
+#: any.pm:349
#, c-format
msgid "Other OS (windows...)"
msgstr "其它操作系统(windows...)"
-#: any.pm:372
+#: any.pm:377
#, c-format
msgid ""
"Here are the entries on your boot menu so far.\n"
@@ -1075,73 +1083,73 @@ msgstr ""
"引导菜单中现有下列条目。\n"
"您可以创建额外的条目或是更改已存在的条目。"
-#: any.pm:504
+#: any.pm:509
#, c-format
msgid "access to X programs"
msgstr "允许使用 X 应用程序"
-#: any.pm:505
+#: any.pm:510
#, c-format
msgid "access to rpm tools"
msgstr "允许使用 rpm 工具"
-#: any.pm:506
+#: any.pm:511
#, c-format
msgid "allow \"su\""
msgstr "允许使用“su”指令"
-#: any.pm:507
+#: any.pm:512
#, c-format
msgid "access to administrative files"
msgstr "允许访问系统设置文件"
-#: any.pm:508
+#: any.pm:513
#, c-format
msgid "access to network tools"
msgstr "允许使用网络工具"
-#: any.pm:509
+#: any.pm:514
#, c-format
msgid "access to compilation tools"
msgstr "允许使用编译工具"
-#: any.pm:515
+#: any.pm:520
#, c-format
msgid "(already added %s)"
msgstr "(已经添加了 %s)"
-#: any.pm:520
+#: any.pm:525
#, c-format
msgid "This password is too simple"
msgstr "密码太简单"
-#: any.pm:521
+#: any.pm:526
#, c-format
msgid "Please give a user name"
msgstr "请给出用户名"
-#: any.pm:522
+#: any.pm:527
#, c-format
msgid ""
"The user name must contain only lower cased letters, numbers, `-' and `_'"
msgstr "用户名只能有小写字母、数字、“-”和“_”"
-#: any.pm:523
+#: any.pm:528
#, c-format
msgid "The user name is too long"
msgstr "该用户名太长"
-#: any.pm:524
+#: any.pm:529
#, c-format
msgid "This user name has already been added"
msgstr "该用户名已经存在"
-#: any.pm:528
+#: any.pm:533
#, c-format
msgid "Add user"
msgstr "添加用户"
-#: any.pm:529
+#: any.pm:534
#, c-format
msgid ""
"Enter a user\n"
@@ -1150,124 +1158,124 @@ msgstr ""
"请输入一个用户名\n"
"%s"
-#: any.pm:532 diskdrake/dav.pm:68 diskdrake/hd_gtk.pm:158
+#: any.pm:537 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:3871
-#: standalone/drakbackup:3094 standalone/scannerdrake:629
-#: standalone/scannerdrake:779
+#: printer/printerdrake.pm:352 printer/printerdrake.pm:4076
+#: standalone/drakbackup:2802 standalone/scannerdrake:636
+#: standalone/scannerdrake:786
#, c-format
msgid "Done"
msgstr "完成"
-#: any.pm:533 help.pm:52
+#: any.pm:538 help.pm:52
#, c-format
msgid "Accept user"
msgstr "接受该用户"
-#: any.pm:544
+#: any.pm:549
#, c-format
msgid "Real name"
msgstr "真实姓名"
-#: any.pm:545 help.pm:52 printer/printerdrake.pm:1339
-#: printer/printerdrake.pm:1453
+#: any.pm:550 help.pm:52 printer/printerdrake.pm:1373
+#: printer/printerdrake.pm:1493
#, c-format
msgid "User name"
msgstr "用户名"
-#: any.pm:548
+#: any.pm:553
#, c-format
msgid "Shell"
msgstr "Shell"
-#: any.pm:550
+#: any.pm:555
#, c-format
msgid "Icon"
msgstr "图标"
-#: any.pm:591 security/l10n.pm:14
+#: any.pm:596 security/l10n.pm:14
#, c-format
msgid "Autologin"
msgstr "自动登录"
-#: any.pm:592
+#: any.pm:597
#, c-format
msgid "I can set up your computer to automatically log on one user."
msgstr "您可在此设定启动时自动以某用户的身份登入系统。"
-#: any.pm:593 help.pm:52
+#: any.pm:598 help.pm:52
#, c-format
msgid "Do you want to use this feature?"
msgstr "您要使用此特性吗？"
-#: any.pm:594
+#: any.pm:599
#, c-format
msgid "Choose the default user:"
msgstr "选择默认的用户: "
-#: any.pm:595
+#: any.pm:600
#, c-format
msgid "Choose the window manager to run:"
msgstr "选择要运行的窗口管理程序: "
-#: any.pm:607
+#: any.pm:612
#, c-format
msgid "Please choose a language to use."
msgstr "请选择要使用的语言。"
-#: any.pm:628
+#: any.pm:633
#, c-format
msgid ""
-"Mandrake Linux can support multiple languages. Select\n"
+"Mandrakelinux can support multiple languages. Select\n"
"the languages you would like to install. They will be available\n"
"when your installation is complete and you restart your system."
msgstr ""
-"Mandrake Linux 可以支持多种语言。请选择您想要安装的语言。\n"
+"Mandrakelinux 可以支持多种语言。请选择您想要安装的语言。\n"
"安装完成并重新启动系统后它们就可以使用。"
-#: any.pm:646 help.pm:660
+#: any.pm:651 help.pm:660
#, c-format
msgid "Use Unicode by default"
msgstr "默认使用 Unicode"
-#: any.pm:647 help.pm:660
+#: any.pm:652 help.pm:660
#, c-format
msgid "All languages"
msgstr "全部语言"
-#: any.pm:683 help.pm:581 help.pm:991 install_steps_interactive.pm:907
+#: any.pm:688 help.pm:581 help.pm:991 install_steps_interactive.pm:908
#, c-format
msgid "Country / Region"
-msgstr "国家或地区"
+msgstr "国家/地区"
-#: any.pm:684
+#: any.pm:689
#, c-format
msgid "Please choose your country."
msgstr "请选择您的国家/地区。"
-#: any.pm:686
+#: any.pm:691
#, c-format
msgid "Here is the full list of available countries"
msgstr "在此列出了可用的全部国家/地区"
-#: any.pm:687 diskdrake/interactive.pm:292 help.pm:544 help.pm:581 help.pm:621
+#: any.pm:692 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:818
+#: any.pm:823
#, c-format
msgid "No sharing"
msgstr "禁止共享"
-#: any.pm:818
+#: any.pm:823
#, c-format
msgid "Allow all users"
msgstr "允许所有用户使用"
-#: any.pm:822
+#: any.pm:827
#, c-format
msgid ""
"Would you like to allow users to share some of their directories?\n"
@@ -1280,23 +1288,23 @@ msgstr ""
"在这里选择允许，用户将可以在 KDE 和 Gnome 的文件管理器中单击“共享”菜单项\n"
"“定制”允许按照不同用户细分设置。\n"
-#: any.pm:838
+#: any.pm:843
#, c-format
msgid ""
"You can export using NFS or Samba. Please select which you'd like to use."
msgstr "您可以使用 NFS 或 Samba 导出。请选择您想要使用的协议。"
-#: any.pm:846
+#: any.pm:851
#, c-format
msgid "The package %s is going to be removed."
msgstr "即将卸载 %s 软件包。"
-#: any.pm:858
+#: any.pm:863
#, c-format
msgid "Launch userdrake"
msgstr "运行“Drak 用户管理”"
-#: any.pm:860
+#: any.pm:865
#, c-format
msgid ""
"The per-user sharing uses the group \"fileshare\". \n"
@@ -1401,7 +1409,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:542
+#: bootloader.pm:533
#, c-format
msgid ""
"Welcome to the operating system chooser!\n"
@@ -1416,56 +1424,56 @@ msgstr ""
"wait for default boot.\n"
"\n"
-#: bootloader.pm:674
+#: bootloader.pm:665
#, c-format
msgid "SILO"
msgstr "SILO"
-#: bootloader.pm:676 help.pm:768
+#: bootloader.pm:668 help.pm:768
#, c-format
msgid "LILO with graphical menu"
msgstr "图形菜单 LILO"
-#: bootloader.pm:677 help.pm:768
+#: bootloader.pm:670 help.pm:768
#, c-format
msgid "LILO with text menu"
msgstr "文本菜单 LILO"
-#: bootloader.pm:679
+#: bootloader.pm:672
#, c-format
msgid "Grub"
msgstr "Grub"
-#: bootloader.pm:681
+#: bootloader.pm:674
#, c-format
msgid "Yaboot"
msgstr "Yaboot"
-#: bootloader.pm:1150
+#: bootloader.pm:1147
#, c-format
msgid "not enough room in /boot"
msgstr "/boot 中没有足够空间"
-#: bootloader.pm:1178
+#: bootloader.pm:1175
#, c-format
msgid "You can't install the bootloader on a %s partition\n"
msgstr "%s 分区不能安装启动引导程序\n"
-#: bootloader.pm:1218
+#: bootloader.pm:1219
#, c-format
msgid ""
"Your bootloader configuration must be updated because partition has been "
"renumbered"
msgstr "必须更新您的启动引导程序配置，因为分区已经重新编号"
-#: bootloader.pm:1225
+#: bootloader.pm:1226
#, c-format
msgid ""
"The bootloader can't be installed correctly. You have to boot rescue and "
"choose \"%s\""
msgstr "无法正确安装启动引导程序。您需要以抢救方式启动并选择“%s”"
-#: bootloader.pm:1226
+#: bootloader.pm:1227
#, c-format
msgid "Re-install Boot Loader"
msgstr "重新安装启动引导程序"
@@ -1505,90 +1513,91 @@ msgstr "1 分"
msgid "%d seconds"
msgstr "%d 秒"
-#: common.pm:196
+#: common.pm:197
#, c-format
msgid "Can't make screenshots before partitioning"
msgstr "无法在分区完成之前进行屏幕捕捉"
-#: common.pm:203
+#: common.pm:204
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "安装完成后，所有的屏幕抓图都会保存到 %s 之中"
-#: common.pm:268
+#: common.pm:269
#, c-format
msgid "kdesu missing"
msgstr "缺少 kdesu"
-#: common.pm:271
+#: common.pm:272
#, c-format
msgid "consolehelper missing"
msgstr "缺少 consolehelper"
-#: crypto.pm:14 crypto.pm:28 lang.pm:231 network/adsl_consts.pm:37
-#: network/adsl_consts.pm:48 network/adsl_consts.pm:58
-#: network/adsl_consts.pm:68 network/adsl_consts.pm:79
-#: network/adsl_consts.pm:90 network/adsl_consts.pm:100
-#: network/adsl_consts.pm:110 network/netconnect.pm:46
+#: crypto.pm:14 crypto.pm:28 lang.pm:236 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
+#: network/adsl_consts.pm:117 network/adsl_consts.pm:264
+#: network/netconnect.pm:46
#, c-format
msgid "France"
msgstr "法国"
-#: crypto.pm:15 lang.pm:207
+#: crypto.pm:15 lang.pm:212
#, c-format
msgid "Costa Rica"
msgstr "哥斯达黎加"
-#: crypto.pm:16 crypto.pm:29 lang.pm:179 network/adsl_consts.pm:20
-#: network/adsl_consts.pm:30 network/netconnect.pm:49
+#: crypto.pm:16 crypto.pm:29 lang.pm:184 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:212
+#: crypto.pm:17 crypto.pm:30 lang.pm:217
#, c-format
msgid "Czech Republic"
msgstr "捷克共和国"
-#: crypto.pm:18 crypto.pm:31 lang.pm:213 network/adsl_consts.pm:126
-#: network/adsl_consts.pm:134
+#: crypto.pm:18 crypto.pm:31 lang.pm:218 network/adsl_consts.pm:134
+#: network/adsl_consts.pm:142
#, c-format
msgid "Germany"
msgstr "德国"
-#: crypto.pm:19 crypto.pm:32 lang.pm:244
+#: crypto.pm:19 crypto.pm:32 lang.pm:249
#, c-format
msgid "Greece"
msgstr "希腊"
-#: crypto.pm:20 crypto.pm:33 lang.pm:317
+#: crypto.pm:20 crypto.pm:33 lang.pm:322
#, c-format
msgid "Norway"
msgstr "挪威"
-#: crypto.pm:21 crypto.pm:34 lang.pm:346 network/adsl_consts.pm:230
+#: crypto.pm:21 crypto.pm:34 lang.pm:351 network/adsl_consts.pm:240
#, c-format
msgid "Sweden"
msgstr "瑞典"
-#: crypto.pm:22 crypto.pm:36 lang.pm:316 network/adsl_consts.pm:170
+#: crypto.pm:22 crypto.pm:36 lang.pm:321 network/adsl_consts.pm:178
#: network/netconnect.pm:47
#, c-format
msgid "Netherlands"
msgstr "荷兰"
-#: crypto.pm:23 crypto.pm:37 lang.pm:264 network/adsl_consts.pm:150
-#: network/adsl_consts.pm:160 network/netconnect.pm:48 standalone/drakxtv:48
+#: 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
#, c-format
msgid "Italy"
msgstr "意大利"
-#: crypto.pm:24 crypto.pm:38 lang.pm:172
+#: crypto.pm:24 crypto.pm:38 lang.pm:177
#, c-format
msgid "Austria"
msgstr "奥地利"
-#: crypto.pm:35 crypto.pm:61 lang.pm:380 network/netconnect.pm:50
+#: crypto.pm:35 crypto.pm:65 lang.pm:385 network/netconnect.pm:50
#, c-format
msgid "United States"
msgstr "美国"
@@ -1672,7 +1681,7 @@ msgstr "请事先备份您的数据"
#: diskdrake/hd_gtk.pm:99
#, c-format
msgid ""
-"If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
+"If you plan to use aboot, be careful to leave a free space (2048 sectors is "
"enough)\n"
"at the beginning of the disk"
msgstr ""
@@ -1706,6 +1715,7 @@ msgid "Please click on a partition"
msgstr "请选中一个分区"
#: diskdrake/hd_gtk.pm:209 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:475
+#: standalone/drakbackup:3040 standalone/drakbackup:3102
#, c-format
msgid "Details"
msgstr "细节"
@@ -1746,7 +1756,7 @@ msgid "Windows"
msgstr "Windows"
#: diskdrake/hd_gtk.pm:327 install_steps_gtk.pm:327 mouse.pm:167
-#: services.pm:164 standalone/drakbackup:1947 standalone/drakperm:250
+#: services.pm:164 standalone/drakbackup:1673 standalone/drakperm:250
#, c-format
msgid "Other"
msgstr "其它"
@@ -1867,7 +1877,7 @@ msgstr "主分区数目已经满了"
#: diskdrake/interactive.pm:330
#, c-format
-msgid "I can't add any more partition"
+msgid "I can't add any more partitions"
msgstr "我无法再添加任何分区了"
#: diskdrake/interactive.pm:331
@@ -1916,13 +1926,19 @@ msgstr ""
"备份分区表的大小和原来的有所不同\n"
"仍然继续吗？"
-#: diskdrake/interactive.pm:378 harddrake/sound.pm:222 keyboard.pm:311
-#: network/netconnect.pm:353 printer/printerdrake.pm:2159
-#: printer/printerdrake.pm:3246 printer/printerdrake.pm:3365
-#: printer/printerdrake.pm:4338 standalone/drakTermServ:1040
-#: standalone/drakTermServ:1715 standalone/drakbackup:765
-#: standalone/drakbackup:865 standalone/drakboot:137 standalone/drakclock:200
-#: standalone/drakconnect:856 standalone/drakfloppy:295
+#: 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
#, c-format
msgid "Warning"
msgstr "警告"
@@ -2479,8 +2495,8 @@ msgstr "这个加密密钥太简单了(至少要有 %d 个字符)"
msgid "The encryption keys do not match"
msgstr "两次加密密钥不符"
-#: diskdrake/interactive.pm:1258 network/netconnect.pm:889
-#: standalone/drakconnect:370
+#: diskdrake/interactive.pm:1258 network/netconnect.pm:972
+#: standalone/drakconnect:393
#, c-format
msgid "Encryption key"
msgstr "加密密钥"
@@ -2521,7 +2537,7 @@ msgid ""
"Please enter your username, password and domain name to access this host."
msgstr "要访问此主机，请输入您的用户名，密码和域名"
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3874
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3591
#, c-format
msgid "Username"
msgstr "用户名"
@@ -2551,17 +2567,17 @@ msgstr "需要安装软件包 %s。您同意安装吗？"
msgid "Mandatory package %s is missing"
msgstr "无法找到必需的软件包 %s"
-#: do_pkgs.pm:136
+#: do_pkgs.pm:143
#, c-format
msgid "Installing packages..."
msgstr "正在安装软件包..."
-#: do_pkgs.pm:210
+#: do_pkgs.pm:217
#, c-format
msgid "Removing packages..."
msgstr "正在删除软件包..."
-#: fs.pm:399
+#: fs.pm:409
#, c-format
msgid ""
"Do not update inode access times on this file system\n"
@@ -2570,7 +2586,7 @@ msgstr ""
"不在此文件系统更新 inode 访问次数\n"
"(例如，为了加速对新闻服务器的新闻池的访问)"
-#: fs.pm:402
+#: fs.pm:412
#, c-format
msgid ""
"Can only be mounted explicitly (i.e.,\n"
@@ -2579,12 +2595,12 @@ msgstr ""
"只能显式装载。\n"
"(即，-a 选项将不会装载文件系统)"
-#: fs.pm:405
+#: fs.pm:415
#, c-format
msgid "Do not interpret character or block special devices on the file system."
msgstr "不解释文件系统中的字符或特殊块设备。"
-#: fs.pm:407
+#: fs.pm:417
#, c-format
msgid ""
"Do not allow execution of any binaries on the mounted\n"
@@ -2595,7 +2611,7 @@ msgstr ""
"此选项对于特定服务器可能非常有用，比如服务器所包含的文件系统中包含其它\n"
"架构的二进制文件。"
-#: fs.pm:411
+#: fs.pm:421
#, c-format
msgid ""
"Do not allow set-user-identifier or set-group-identifier\n"
@@ -2605,17 +2621,17 @@ msgstr ""
"不允许 set-user-identifier 或 set-group-identifier 位生效。\n"
"(这可能比较安全，如果您安装了 suidperl(1) 则不太安全。)"
-#: fs.pm:415
+#: fs.pm:425
#, c-format
msgid "Mount the file system read-only."
msgstr "以只读装载文件系统。"
-#: fs.pm:417
+#: fs.pm:427
#, c-format
msgid "All I/O to the file system should be done synchronously."
msgstr "所有到文件系统的输入/输出都应该是同步完成的。"
-#: fs.pm:421
+#: fs.pm:431
#, c-format
msgid ""
"Allow an ordinary user to mount the file system. The\n"
@@ -2629,52 +2645,57 @@ msgstr ""
"再次拆卸文件系统。此选项意味着选项 noexec，nosuid 以及 nodev(除非在选项\n"
"行中用单独的选项 user，exec，dev，suid 加以覆盖)。"
-#: fs.pm:429
+#: fs.pm:439
#, c-format
msgid "Give write access to ordinary users"
msgstr "给普通用户以写权限"
-#: fs.pm:565 fs.pm:575 fs.pm:579 fs.pm:583 fs.pm:587 fs.pm:591 swap.pm:12
+#: fs.pm:441
+#, c-format
+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
#, c-format
msgid "%s formatting of %s failed"
msgstr "%s 格式化 %s 失败"
-#: fs.pm:628
+#: fs.pm:647
#, c-format
msgid "I don't know how to format %s in type %s"
msgstr "不知道如何将 %s 格式化成 %s 类型"
-#: fs.pm:635 fs.pm:642
+#: fs.pm:654 fs.pm:661
#, c-format
msgid "Formatting partition %s"
msgstr "正在格式化分区 %s"
-#: fs.pm:639
+#: fs.pm:658
#, c-format
msgid "Creating and formatting file %s"
msgstr "正在创建和格式化文件 %s"
-#: fs.pm:705 fs.pm:758
+#: fs.pm:718 fs.pm:771
#, c-format
msgid "Mounting partition %s"
msgstr "正在挂载分区 %s"
-#: fs.pm:706 fs.pm:759
+#: fs.pm:719 fs.pm:772
#, c-format
msgid "mounting partition %s in directory %s failed"
msgstr "将分区 %s 挂载于目录 %s 失败"
-#: fs.pm:726 fs.pm:734
+#: fs.pm:739 fs.pm:747
#, c-format
msgid "Checking %s"
msgstr "正在检查 %s"
-#: fs.pm:775 partition_table.pm:636
+#: fs.pm:788 partition_table.pm:638
#, c-format
msgid "error unmounting %s: %s"
-msgstr "卸载 %s 出错:%s"
+msgstr "卸载 %s 出错: %s"
-#: fs.pm:807
+#: fs.pm:820
#, c-format
msgid "Enabling swap partition %s"
msgstr "正在启用 swap 分区 %s"
@@ -2705,38 +2726,38 @@ msgid ""
"Do you agree to lose all the partitions?\n"
msgstr ""
"我无法读取设备 %s 的分区表，这个分区表破坏得太严重了 :(\n"
-"我可以尝试清除坏分区(所有的数据将被清除！)，然后继续。\n"
+"我可以尝试清除坏分区(所有的数据将被清除!)，然后继续。\n"
"另外一个解决办法是禁止 DrakX 修改分区表。\n"
"(错误是 %s)\n"
"\n"
"您同意清除所有分区吗？\n"
-#: fsedit.pm:514
+#: fsedit.pm:513
#, c-format
msgid "You can't use JFS for partitions smaller than 16MB"
msgstr "您不能把 JFS(日志文件系统)用于小于 16 MB 的分区"
-#: fsedit.pm:515
+#: fsedit.pm:514
#, c-format
msgid "You can't use ReiserFS for partitions smaller than 32MB"
msgstr "您不能把 ReiserFS 用于小于 32 MB 的分区"
-#: fsedit.pm:534
+#: fsedit.pm:533
#, c-format
msgid "Mount points must begin with a leading /"
msgstr "挂载点必需要以 / 为开头"
-#: fsedit.pm:535
+#: fsedit.pm:534
#, c-format
msgid "Mount points should contain only alphanumerical characters"
msgstr "挂载点只能包含字母和数字"
-#: fsedit.pm:536
+#: fsedit.pm:535
#, c-format
msgid "There is already a partition with mount point %s\n"
msgstr "已经有一个分区的挂载点是 %s\n"
-#: fsedit.pm:538
+#: fsedit.pm:537
#, c-format
msgid ""
"You've selected a software RAID partition as root (/).\n"
@@ -2747,46 +2768,57 @@ msgstr ""
"如果没有一个 /boot 分区，各种启动引导程序都无法处理这种情况。\n"
"所以，请增加一个 /boot 分区。"
-#: fsedit.pm:541
+#: fsedit.pm:540
#, c-format
msgid "You can't use a LVM Logical Volume for mount point %s"
msgstr "不能用 LVM 逻辑卷做 %s 挂载点"
-#: fsedit.pm:543
+#: fsedit.pm:542
+#, c-format
+msgid ""
+"You've selected a LVM Logical Volume as root (/).\n"
+"The bootloader is not able to handle this without a /boot partition.\n"
+"Please be sure to add a /boot partition"
+msgstr ""
+"您选择了把 LVM 卷作为根(/)。\n"
+"如果没有一个 /boot 分区，各种启动引导程序都无法处理这种情况。\n"
+"所以，请增加一个 /boot 分区。"
+
+#: fsedit.pm:545
#, c-format
msgid ""
"You may not be able to install lilo (since lilo doesn't handle a LV on "
"multiple PVs)"
msgstr "您可能无法安装 lilo(因为 lilo 不能处理多轨道的启动光盘)"
-#: fsedit.pm:546 fsedit.pm:548
+#: fsedit.pm:548 fsedit.pm:550
#, c-format
msgid "This directory should remain within the root filesystem"
msgstr "这个目录应该保留在根文件系统中"
-#: fsedit.pm:550
+#: fsedit.pm:552
#, c-format
msgid ""
"You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
"point\n"
msgstr "这个挂载点需要一个真正的文件系统(ext2/ext3、reiserfs、xfs 或 jfs)\n"
-#: fsedit.pm:552
+#: fsedit.pm:554
#, c-format
msgid "You can't use an encrypted file system for mount point %s"
msgstr "挂载点 %s 不能使用用加密的文件系统"
-#: fsedit.pm:613
+#: fsedit.pm:615
#, c-format
msgid "Not enough free space for auto-allocating"
msgstr "没有足够的空闲空间供自动分配"
-#: fsedit.pm:615
+#: fsedit.pm:617
#, c-format
msgid "Nothing to do"
msgstr "不做任何事"
-#: fsedit.pm:711
+#: fsedit.pm:713
#, c-format
msgid "Error opening %s for writing: %s"
msgstr "在打开 %s 写入时发生错误:%s"
@@ -2821,7 +2853,7 @@ msgstr "CD/DVD 刻录机"
msgid "DVD-ROM"
msgstr "DVD-ROM"
-#: harddrake/data.pm:59 standalone/drakbackup:2409
+#: harddrake/data.pm:59 standalone/drakbackup:2116
#, c-format
msgid "Tape"
msgstr "磁带机"
@@ -2861,36 +2893,41 @@ msgstr "处理器"
msgid "ISDN adapters"
msgstr "ISDN 适配器"
-#: harddrake/data.pm:71
+#: harddrake/data.pm:70
#, c-format
msgid "Ethernetcard"
msgstr "以太网卡"
-#: harddrake/data.pm:79 network/netconnect.pm:366 standalone/drakconnect:277
-#: standalone/drakconnect:447 standalone/drakconnect:448
-#: standalone/drakconnect:540
+#: harddrake/data.pm:78 network/netconnect.pm:452 standalone/drakconnect:272
+#: standalone/drakconnect:292 standalone/drakconnect:472
+#: standalone/drakconnect:473 standalone/drakconnect:576
#, c-format
msgid "Modem"
msgstr "调制解调器"
-#: harddrake/data.pm:80
+#: harddrake/data.pm:79
#, c-format
msgid "ADSL adapters"
msgstr "ADSL 适配器"
+#: harddrake/data.pm:81
+#, c-format
+msgid "AGP controllers"
+msgstr "AGP 控制器"
+
#: harddrake/data.pm:82
#, c-format
msgid "Bridges and system controllers"
msgstr "桥接和系统控制器"
#: harddrake/data.pm:83 help.pm:203 help.pm:991
-#: install_steps_interactive.pm:935 printer/printerdrake.pm:680
-#: printer/printerdrake.pm:3970
+#: install_steps_interactive.pm:940 printer/printerdrake.pm:687
+#: printer/printerdrake.pm:4175
#, c-format
msgid "Printer"
msgstr "打印机"
-#: harddrake/data.pm:85 help.pm:991 install_steps_interactive.pm:928
+#: harddrake/data.pm:85 help.pm:991 install_steps_interactive.pm:933
#, c-format
msgid "Mouse"
msgstr "鼠标"
@@ -2905,64 +2942,64 @@ msgstr "游戏杆"
msgid "(E)IDE/ATA controllers"
msgstr "(E)IDE/ATA 控制器"
-#: harddrake/data.pm:93
+#: harddrake/data.pm:94
#, c-format
msgid "Firewire controllers"
msgstr "火线控制器"
-#: harddrake/data.pm:94
+#: harddrake/data.pm:95
#, c-format
msgid "SCSI controllers"
msgstr "SCSI 控制器"
-#: harddrake/data.pm:95
+#: harddrake/data.pm:96
#, c-format
msgid "USB controllers"
msgstr "USB 控制器"
-#: harddrake/data.pm:96
+#: harddrake/data.pm:97
#, c-format
msgid "SMBus controllers"
msgstr "SMBus 控制器"
-#: harddrake/data.pm:97
+#: harddrake/data.pm:98
#, c-format
msgid "Scanner"
msgstr "扫描仪"
-#: harddrake/data.pm:99 standalone/harddrake2:315
+#: harddrake/data.pm:100 standalone/harddrake2:319
#, c-format
msgid "Unknown/Others"
msgstr "未知/其它"
-#: harddrake/data.pm:113
+#: harddrake/data.pm:114
#, c-format
msgid "cpu # "
msgstr "CPU # "
-#: harddrake/sound.pm:150 standalone/drakconnect:166
+#: harddrake/sound.pm:150 standalone/drakconnect:169
#, c-format
msgid "Please Wait... Applying the configuration"
msgstr "请稍候...正在应用配置"
-#: harddrake/sound.pm:182
+#: harddrake/sound.pm:186
#, c-format
msgid "No alternative driver"
msgstr "没有替代的驱动程序"
-#: harddrake/sound.pm:183
+#: harddrake/sound.pm:187
#, c-format
msgid ""
"There's no known OSS/ALSA alternative driver for your sound card (%s) which "
"currently uses \"%s\""
msgstr "没有已知的 OSS/ALSA 替代驱动程序可以用在您的声卡(%s)上，现正使用“%s”"
-#: harddrake/sound.pm:189
+#: harddrake/sound.pm:193
#, c-format
msgid "Sound configuration"
msgstr "声音配置"
-#: harddrake/sound.pm:191
+#: harddrake/sound.pm:195
#, c-format
msgid ""
"Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -2970,7 +3007,7 @@ msgid ""
msgstr ""
"您可以在这里配置可以用在您的声卡(%s)上的替代驱动程序(可以选择 OSS 或 ALSA)。"
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:197
#, c-format
msgid ""
"\n"
@@ -2982,7 +3019,7 @@ msgstr ""
"\n"
"您的声卡现在正在使用 %s“%s”驱动程序(其默认驱动程序为“%s”)"
-#: harddrake/sound.pm:195
+#: harddrake/sound.pm:199
#, c-format
msgid ""
"OSS (Open Sound System) was the first sound API. It's an OS independent "
@@ -3014,17 +3051,17 @@ msgstr ""
"- 与旧的 OSS 兼容的 API\n"
"- 新的 ALSA API 带来许多增强特性，但这需要使用 ALSA 库。\n"
-#: harddrake/sound.pm:209 harddrake/sound.pm:289
+#: harddrake/sound.pm:213 harddrake/sound.pm:293 standalone/drakups:134
#, c-format
msgid "Driver:"
msgstr "驱动程序: "
-#: harddrake/sound.pm:214
+#: harddrake/sound.pm:218
#, c-format
msgid "Trouble shooting"
msgstr "疑难解答"
-#: harddrake/sound.pm:222
+#: harddrake/sound.pm:226
#, c-format
msgid ""
"The old \"%s\" driver is blacklisted.\n"
@@ -3039,12 +3076,12 @@ msgstr ""
"\n"
"新的“%s”驱动程序仅会在下此启动时使用。"
-#: harddrake/sound.pm:230
+#: harddrake/sound.pm:234
#, c-format
msgid "No open source driver"
msgstr "没有开放源代码的驱动程序"
-#: harddrake/sound.pm:231
+#: harddrake/sound.pm:235
#, c-format
msgid ""
"There's no free driver for your sound card (%s), but there's a proprietary "
@@ -3053,32 +3090,32 @@ msgstr ""
"没有已知的 OSS/ALSA 替代驱动程序可以用在您的(%s)声卡上，不过在“%s”有一个专有"
"的驱动程序。"
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:238
#, c-format
msgid "No known driver"
msgstr "没有已知驱动程序"
-#: harddrake/sound.pm:235
+#: harddrake/sound.pm:239
#, c-format
msgid "There's no known driver for your sound card (%s)"
msgstr "没有已知的驱动程序可以用在您的声卡(%s)上"
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:243
#, c-format
msgid "Unknown driver"
msgstr "未知的驱动程序"
-#: harddrake/sound.pm:240
+#: harddrake/sound.pm:244
#, c-format
msgid "Error: The \"%s\" driver for your sound card is unlisted"
msgstr "错误: 您的“%s”声卡驱动程序未被列出"
-#: harddrake/sound.pm:253
+#: harddrake/sound.pm:257
#, c-format
msgid "Sound trouble shooting"
msgstr "声音疑难解决"
-#: harddrake/sound.pm:254
+#: harddrake/sound.pm:258
#, c-format
msgid ""
"The classic bug sound tester is to run the following commands:\n"
@@ -3117,17 +3154,17 @@ msgstr ""
"\n"
"- “/sbin/fuser -v /dev/dsp”将会告诉您哪个程序使用声卡。\n"
-#: harddrake/sound.pm:280
+#: harddrake/sound.pm:284
#, c-format
msgid "Let me pick any driver"
msgstr "让我挑选任意驱动"
-#: harddrake/sound.pm:283
+#: harddrake/sound.pm:287
#, c-format
msgid "Choosing an arbitrary driver"
msgstr "选择其它驱动"
-#: harddrake/sound.pm:284
+#: harddrake/sound.pm:288
#, c-format
msgid ""
"If you really think that you know which driver is the right one for your "
@@ -3214,16 +3251,16 @@ msgstr "启用无线电支持"
#, c-format
msgid ""
"Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrake Linux distribution. If you do agree with all the\n"
+"covers the entire Mandrakelinux distribution. If you do agree with all the\n"
"terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
"will reboot your computer."
msgstr ""
-"在继续之前，您应该仔细阅读许可协议的条款。该许可适用于整个 Mandrake Linux\n"
+"在继续之前，您应该仔细阅读许可协议的条款。该许可适用于整个 Mandrakelinux"
"发行版。如果您同意其中的全部条款，请选中\"%s\"框。如果不同意，单击\"%s\"按钮"
"将重新启动您的计算机。"
#: help.pm:14 install_steps_gtk.pm:596 install_steps_interactive.pm:88
-#: install_steps_interactive.pm:697 standalone/drakautoinst:199
+#: install_steps_interactive.pm:697 standalone/drakautoinst:216
#, c-format
msgid "Accept"
msgstr "接受"
@@ -3300,10 +3337,9 @@ msgstr ""
#: 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:242 network/tools.pm:208 printer/printerdrake.pm:2922
-#: standalone/drakTermServ:392 standalone/drakbackup:4487
-#: standalone/drakbackup:4513 standalone/drakbackup:4543
-#: standalone/drakbackup:4567 ugtk2.pm:509
+#: network/netconnect.pm:262 network/tools.pm:206 printer/printerdrake.pm:3090
+#: standalone/drakTermServ:408 standalone/drakbackup:4199
+#: standalone/drakbackup:4229 standalone/drakbackup:4251 ugtk2.pm:510
#, c-format
msgid "Next"
msgstr "下一步"
@@ -3381,11 +3417,11 @@ msgstr ""
#: help.pm:86
#, c-format
msgid ""
-"The Mandrake Linux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
"selected package is located on another CD-ROM, DrakX will eject the current\n"
"CD and ask you to insert the correct CD as required."
msgstr ""
-"Mandrake Linux 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM，"
+"Mandrakelinux 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM，"
"DrakX 将弹出当前\n"
"CD，并要求您插入所需的正确 CD。"
@@ -3395,12 +3431,12 @@ msgstr ""
#, c-format
msgid ""
"It is now time to specify which programs you wish to install on your\n"
-"system. There are thousands of packages available for Mandrake Linux, and\n"
+"system. There are thousands of packages available for Mandrakelinux, and\n"
"to make it simpler to manage the packages have been placed into groups of\n"
"similar applications.\n"
"\n"
"Packages are sorted into groups corresponding to a particular use of your\n"
-"machine. Mandrake Linux sorts packages groups in four categories. You can\n"
+"machine. Mandrakelinux sorts packages groups in four categories. You can\n"
"mix and match applications from the various categories, so a\n"
"``Workstation'' installation can still have applications from the\n"
"``Development'' category installed.\n"
@@ -3442,11 +3478,11 @@ msgid ""
"to avoid installing any new package. This is useful for repairing or\n"
"updating an existing system."
msgstr ""
-"现在该指定要在您的系统中安装哪些程序了。Mandrake Linux\n"
+"现在该指定要在您的系统中安装哪些程序了。Mandrakelinux\n"
"为您准备了数千个软件包。而为了使管理软件包更加容易，软件包已经按组重新进行了"
"分配。\n"
"\n"
-"软件包已经根据您计算机的不同用途被分成了不同的组。Mandrake Linux\n"
+"软件包已经根据您计算机的不同用途被分成了不同的组。Mandrakelinux\n"
"将软件包组分成了四个类别。您可以从不同的类别混合选择应用程序。也就是说，``工"
"作站''中也可以选择安装``开发''分类中的应用程序。\n"
"\n"
@@ -3534,10 +3570,10 @@ msgid ""
"!! If a server package has been selected, either because you specifically\n"
"chose the individual package or because it was part of a group of packages,\n"
"you will be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrake Linux will automatically start any installed\n"
+"installed. By default Mandrakelinux will automatically start any installed\n"
"services at boot time. Even if they are safe and have no known issues at\n"
"the time the distribution was shipped, it is entirely possible that that\n"
-"security holes were discovered after this version of Mandrake Linux was\n"
+"security holes were discovered after this version of Mandrakelinux was\n"
"finalized. If you do not know what a particular service is supposed to do\n"
"or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
"install the listed services and they will be started automatically by\n"
@@ -3564,9 +3600,9 @@ msgstr ""
"只要您在左侧的树中选择了软件包，右侧就会出现该软件包用途的描述。\n"
"\n"
"!! 如果选择了服务器软件包，不管是您特意选中的，还是因为该软件包是某组的成员，"
-"您都需要确认是否真的想要安装这些服务器。默认情况下，Mandrake\n"
-"Linux 会在启动时自动启动所有安装的服务。尽管在发行版送出时这些服务是安全的，"
-"但完全有可能在此版本 Mandrake Linux\n"
+"您都需要确认是否真的想要安装这些服务器。默认情况下，Mandrakelinux\n"
+"会在启动时自动启动所有安装的服务。尽管在发行版送出时这些服务是安全的，但完全"
+"有可能在此版本 Mandrakelinux\n"
"完成后发现了相应软件的安全漏洞。如果您并不知道特定服务的用途，或者不知道为什"
"么要安装这些服务，请单击\"%s\"。单击\"%s\"将安装列出的服务，并且在默认启动时"
"这些服务会被自动启动。\n"
@@ -3582,17 +3618,17 @@ msgstr ""
"多台计算机，此选项可能非常有用。单击此图标后，您需要插入上次安装结束后创建的"
"软盘。参看最后一步的第二条提示，其中描述了如何创建这样的软盘。"
-#: help.pm:172 help.pm:301 help.pm:329 help.pm:457 install_any.pm:422
-#: interactive.pm:149 modules/interactive.pm:71 standalone/harddrake2:218
-#: ugtk2.pm:1046 wizards.pm:156
+#: help.pm:172 help.pm:301 help.pm:329 help.pm:457 install_any.pm:420
+#: 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:422 interactive.pm:149
-#: modules/interactive.pm:71 standalone/drakgw:280 standalone/drakgw:281
-#: standalone/drakgw:289 standalone/drakgw:299 standalone/harddrake2:217
-#: ugtk2.pm:1046 wizards.pm:156
+#: help.pm:172 help.pm:301 help.pm:457 install_any.pm:420 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
#, c-format
msgid "Yes"
msgstr "是"
@@ -3609,7 +3645,7 @@ msgstr "自动依赖性"
msgid ""
"You will now set up your Internet/network connection. If you wish to\n"
"connect your computer to the Internet or to a local network, click \"%s\".\n"
-"Mandrake Linux will attempt to auto-detect network devices and modems. If\n"
+"Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
"this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
"configure the network, or to do it later, in which case clicking the \"%s\"\n"
"button will take you to the next step.\n"
@@ -3624,7 +3660,7 @@ msgid ""
"\n"
"About Winmodem Connection. Winmodems are special integrated low-end modems\n"
"that require additional software to work compared to Normal modems. Some of\n"
-"those modems actually work under Mandrake Linux, some others do not. You\n"
+"those modems actually work under Mandrakelinux, some others do not. You\n"
"can consult the list of supported modems at LinModems.\n"
"\n"
"You can consult the ``Starter Guide'' chapter about Internet connections\n"
@@ -3632,22 +3668,22 @@ msgid ""
"installed and use the program described there to configure your connection."
msgstr ""
"现在您可以设置您的 Internet/局域网连接。如果您希望把您的电脑连接到 Internet "
-"或者局域网，请单击\"%s\"。Mandrake\n"
-"Linux 会尝试自动检测网络设备和调制解调器。如果检测失败，请清除\n"
+"或者局域网，请单击\"%s\"。Mandrakelinux\n"
+"会尝试自动检测网络设备和调制解调器。如果检测失败，请清除\n"
"\"%s\"框然后再试一次。您也可以不配置网络，或者以后再进行这一步骤，这时请按\"%"
"s\"按钮跳过这一步。\n"
"\n"
"在进行网络配置的过程中，目前支持的连接方式有: 普通调制解调器连接，软猫连接，"
"ISDN 调制解调器，ADSL\n"
-"连接，有线电视调制解调器，以及最简单的LAN 连接(以太网)。\n"
+"连接，有线电视调制解调器，以及最简单的 LAN 连接(以太网)。\n"
"\n"
"我们不在这里详细讨论每种连接方式 - 只要保证您从您的互联网服务商或者系统管理员"
"那里得到了所有必要的参数即可，其中可能包括 IP\n"
"地址、默认网关、DNS 服务器等参数。\n"
"\n"
"关于软猫连接。软猫是特殊的集成性低端调制解调器，需要额外的软件才能像普通调制"
-"解调器那样工作。这些调制解调器的其中一些可以在 Mandrake\n"
-"Linux 下工作，而其他一些不行。您可以在 LinModems 上找到所支持的软猫列表。\n"
+"解调器那样工作。这些调制解调器的其中一些可以在 Mandrakelinux\n"
+"下工作，而其他一些不行。您可以在 LinModems 上找到所支持的软猫列表。\n"
"\n"
"您可以参阅“初学者指南”中关于 Internet 连接配置的详细内容，或者只是等到系统安"
"装完了，使用那里描述的程序配置您的连接。"
@@ -3672,8 +3708,8 @@ msgstr ""
"同。"
#: help.pm:203 help.pm:581 help.pm:991 install_steps_gtk.pm:646
-#: standalone/drakbackup:2688 standalone/drakbackup:2696
-#: standalone/drakbackup:2704 standalone/drakbackup:2712
+#: standalone/drakbackup:2406 standalone/drakbackup:2414
+#: standalone/drakbackup:2422 standalone/drakbackup:2430
#, c-format
msgid "Configure"
msgstr "配置"
@@ -3743,7 +3779,7 @@ msgstr ""
"Internet。最好选择地理位置离您较近的时间服务器。此选项还会自动安装时间服务"
"器，这样您局域网中的其它计算机都能够进行自动校时了。"
-#: help.pm:235 install_steps_interactive.pm:834
+#: help.pm:235 install_steps_interactive.pm:835
#, c-format
msgid "Hardware clock set to GMT"
msgstr "您的系统时钟设定为 GMT"
@@ -3783,7 +3819,7 @@ msgstr ""
msgid ""
"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
"on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrake Linux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
"\n"
"You will be presented with a list of different parameters to change to get\n"
"an optimal graphical display: Graphic Card\n"
@@ -3835,7 +3871,7 @@ msgid ""
"\"%s\" if your machine is to act as a server, or if you were not successful\n"
"in getting the display configured."
msgstr ""
-"X(代表 X 窗口系统)是 GNU/Linux 图形界面的核心部分。Mandrake Linux\n"
+"X(代表 X 窗口系统)是 GNU/Linux 图形界面的核心部分。Mandrakelinux\n"
"附带的所有图形环境(KDE、GNOME、AfterStep、WindowMaker 等)都依赖于该系统。\n"
"\n"
"您将会看到不同的参数列表，以便进行图形显示选项的更改来达到最佳状态。其中包"
@@ -3953,7 +3989,7 @@ msgid ""
"if an existing operating system is using all the available space you will\n"
"have to partition the drive. Basically, partitioning a hard drive consists\n"
"of logically dividing it to create the space needed to install your new\n"
-"Mandrake Linux system.\n"
+"Mandrakelinux system.\n"
"\n"
"Because the process of partitioning a hard drive is usually irreversible\n"
"and can lead to lost data if there is an existing operating system already\n"
@@ -3980,7 +4016,7 @@ msgid ""
"FAT or NTFS partition. Resizing can be performed without the loss of any\n"
"data, provided you have previously defragmented the Windows partition.\n"
"Backing up your data is strongly recommended.. Using this option is\n"
-"recommended if you want to use both Mandrake Linux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
"the same computer.\n"
"\n"
" Before choosing this option, please understand that after this\n"
@@ -3989,7 +4025,7 @@ msgid ""
"Windows to store your data or to install new software.\n"
"\n"
" * \"%s\": if you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrake Linux system,\n"
+"your hard drive and replace them with your new Mandrakelinux system,\n"
"choose this option. Be careful, because you will not be able to undo your\n"
"choice after you confirm.\n"
"\n"
@@ -4007,11 +4043,11 @@ msgid ""
"experience. For more instructions on how to use the DiskDrake utility,\n"
"refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
msgstr ""
-"在这一步里，您需要决定您想要将 Mandrake Linux\n"
+"在这一步里，您需要决定您想要将 Mandrakelinux\n"
"操作系统安装到硬盘的何处。如果您的硬盘完全是空的，或者已有操作系统使用了所有"
"的空间，您就必须要对硬盘进行分区。粗略的说，对硬盘进行分区就是将其划分成几个"
"逻辑上不同的部分，以便创建安装您新的\n"
-"Mandrake Linux 系统所需的空间。\n"
+"Mandrakelinux 系统所需的空间。\n"
"\n"
"\n"
"对硬盘进行分区通常是不可恢复的。并且，如果在该硬盘上已经安装了操作系统的话，"
@@ -4037,7 +4073,7 @@ msgstr ""
"Microsoft Windows FAT 或 NTFS 分区的大小。更改分区大小通常不会造成任何数据丢"
"失，但您必须事先对 Windows\n"
"分区进行了磁盘碎片整理。我们强烈推荐您事先备份您的数据。如果您想要在同一台计"
-"算机上使用 Mandrake Linux 和 Microsoft\n"
+"算机上使用 Mandrakelinux 和 Microsoft\n"
"Windows，则推荐使用此选项。\n"
"\n"
" 注意，在执行这一过程之后，您原有的 Microsoft Windows 分区将会被先前小一"
@@ -4045,7 +4081,7 @@ msgstr ""
"下可用来存储数据或安装新软件的剩余空间也会变少。\n"
"\n"
" * \"%s\": 如果您想要删除硬盘上的全部数据和全部分区，并将其替换为全新的 "
-"Mandrake Linux\n"
+"Mandrakelinux\n"
"系统，请选择此选项。请额外小心，因为在您确认之后，此操作无法撤销。\n"
"\n"
" !! 如果您选择了此选项，您硬盘上的全部数据都将被删除。 !!\n"
@@ -4060,7 +4096,7 @@ msgstr ""
"分强大，但也很危险，您可能在不经意之间毁掉您的全部数据。这也正是为什么我们只"
"对那些以前执行过类似操作并有些经验的用户才推荐此选项的原因。要获得关于如何使"
"用\n"
-"“Drak 硬盘管理”工具的更多说明，请参阅 “初学者指南” 一书中的 “管理您的分区”一"
+"“Drak 磁盘管理”工具的更多说明，请参阅“初学者指南” 一书中的“管理您的分区”一"
"节。"
#: help.pm:389 install_interactive.pm:95
@@ -4154,17 +4190,17 @@ msgstr ""
msgid "Generate auto-install floppy"
msgstr "生成自动安装软盘"
-#: help.pm:418 install_steps_interactive.pm:1320
+#: help.pm:418 install_steps_interactive.pm:1329
#, c-format
msgid "Replay"
msgstr "重现"
-#: help.pm:418 install_steps_interactive.pm:1320
+#: help.pm:418 install_steps_interactive.pm:1329
#, c-format
msgid "Automated"
msgstr "自动"
-#: help.pm:418 install_steps_interactive.pm:1323
+#: help.pm:418 install_steps_interactive.pm:1332
#, c-format
msgid "Save packages selection"
msgstr "保存软件包选择"
@@ -4194,7 +4230,7 @@ msgid ""
"Click on \"%s\" when you are ready to format the partitions.\n"
"\n"
"Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrake Linux operating system installation.\n"
+"Mandrakelinux operating system installation.\n"
"\n"
"Click on \"%s\" if you wish to select partitions that will be checked for\n"
"bad blocks on the disk."
@@ -4213,17 +4249,17 @@ msgstr ""
"\n"
"如果您准备好格式化分区了，请单击 \"%s\"。\n"
"\n"
-"如果您想要选择其它分区用于安装 Mandrake Linux 操作系统，请单击\"%s\"。\n"
+"如果您想要选择其它分区用于安装 Mandrakelinux 操作系统，请单击\"%s\"。\n"
"\n"
"如果您想要选择要检测磁盘上的坏块，请单击单击\"%s\"。"
#: help.pm:444 help.pm:1005 install_steps_gtk.pm:431 interactive.pm:404
-#: interactive/newt.pm:307 printer/printerdrake.pm:2920
-#: standalone/drakTermServ:371 standalone/drakbackup:4288
-#: standalone/drakbackup:4316 standalone/drakbackup:4374
-#: standalone/drakbackup:4400 standalone/drakbackup:4426
-#: standalone/drakbackup:4483 standalone/drakbackup:4509
-#: standalone/drakbackup:4539 standalone/drakbackup:4563 ugtk2.pm:507
+#: interactive/newt.pm:307 printer/printerdrake.pm:3088
+#: standalone/drakTermServ:387 standalone/drakbackup:4012
+#: standalone/drakbackup:4041 standalone/drakbackup:4095
+#: standalone/drakbackup:4119 standalone/drakbackup:4143
+#: standalone/drakbackup:4195 standalone/drakbackup:4225
+#: standalone/drakbackup:4247 ugtk2.pm:508
#, c-format
msgid "Previous"
msgstr "上一步"
@@ -4233,7 +4269,7 @@ msgstr "上一步"
#: help.pm:447
#, c-format
msgid ""
-"At the time you are installing Mandrake Linux, it is likely that some\n"
+"At the time you are installing Mandrakelinux, it is likely that some\n"
"packages will have been updated since the initial release. Bugs may have\n"
"been fixed, security issues resolved. To allow you to benefit from these\n"
"updates, you are now able to download them from the Internet. Check \"%s\"\n"
@@ -4245,7 +4281,7 @@ msgid ""
"appear: review the selection, and press \"%s\" to retrieve and install the\n"
"selected package(s), or \"%s\" to abort."
msgstr ""
-"在您安装 Mandrake Linux\n"
+"在您安装 Mandrakelinux\n"
"的这个时候，很可能有些软件包在发行之后已经更新。有些故障已经被修正，有些问题"
"已经被解决。为了利用这些更新，您最好从 Internet\n"
"上下载它们。如果您的 Internet 连接已经可以使用，请选择\"%s\"。如果您愿意以后"
@@ -4257,7 +4293,7 @@ msgstr ""
"清单: 检查选项然后单击\"%s\"来获取并安装选中的软件包，要停止请单击\"%s\"。"
#: help.pm:457 help.pm:602 install_steps_gtk.pm:430
-#: install_steps_interactive.pm:148 standalone/drakbackup:4602
+#: install_steps_interactive.pm:148 standalone/drakbackup:4279
#, c-format
msgid "Install"
msgstr "安装"
@@ -4285,8 +4321,8 @@ msgstr ""
"包含关键数据，或者将直接暴露于 Internet\n"
"之下，则应该设置较高的安全级别。较高的安全级别通常以损失易用性作为代价。\n"
"\n"
-"如果您不知道要选择什么，请保持默认选项。您可以稍后从“Mandrake 控制中心”中通"
-"过“Drak 安全管理”来更改安全级别。\n"
+"如果您不知道要选择什么，请保持默认选项。您可以稍后从“Mandrakelinux 控制中"
+"心”中通过“Drak 安全管理”来更改安全级别。\n"
"\n"
"\"%s\"域可以告知系统哪位用户要负责本机的安全。安全信息将被发送到该地址。"
@@ -4301,7 +4337,7 @@ msgstr "安全管理员"
#, c-format
msgid ""
"At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrake Linux system. If partitions have already been\n"
+"installation of your Mandrakelinux system. If partitions have already been\n"
"defined, either from a previous installation of GNU/Linux or by another\n"
"partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
"partitions must be defined.\n"
@@ -4371,8 +4407,8 @@ msgid ""
"may find it a useful place to store a spare kernel and ramdisk images for\n"
"emergency boot situations."
msgstr ""
-"在这一步中，您需要选择要使用哪个或哪些分区来安装您的 Mandrake Linux 系统。如"
-"果已经定义了分区，不管是先前安装的 GNU/Linux\n"
+"在这一步中，您需要选择要使用哪个或哪些分区来安装您的 Mandrakelinux 系统。如果"
+"已经定义了分区，不管是先前安装的 GNU/Linux\n"
"还是由其它分区工具划分的，您都可以使用已有的分区。否则，必须对硬盘分区进行定"
"义。\n"
"\n"
@@ -4445,7 +4481,7 @@ msgstr "在正常/专家模式间切换"
msgid ""
"More than one Microsoft partition has been detected on your hard drive.\n"
"Please choose the one which you want to resize in order to install your new\n"
-"Mandrake Linux operating system.\n"
+"Mandrakelinux operating system.\n"
"\n"
"Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
"\"Capacity\".\n"
@@ -4474,7 +4510,7 @@ msgid ""
"disk or partition is called \"C:\")."
msgstr ""
"在硬盘上检测到了多个 Microsoft 分区。请选择一个分区改变大小，以便安装您新\n"
-"的 Mandrake Linux 操作系统。\n"
+"的 Mandrakelinux 操作系统。\n"
"\n"
"每个分区都是按“Linux 名称”、“Windows 名称”、“容量”顺序列出的。\n"
"\n"
@@ -4521,7 +4557,7 @@ msgid ""
"found on your machine.\n"
"\n"
"DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrake Linux system:\n"
+"of an existing Mandrakelinux system:\n"
"\n"
" * \"%s\": For the most part, this completely wipes out the old system. If\n"
"you wish to change how your hard drives are partitioned, or change the file\n"
@@ -4529,31 +4565,30 @@ msgid ""
"scheme, you can prevent some of your existing data from being over-written.\n"
"\n"
" * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrake Linux system. Your current\n"
+"currently installed on your Mandrakelinux system. Your current\n"
"partitioning scheme and user data is not altered. Most of other\n"
"configuration steps remain available, similar to a standard installation.\n"
"\n"
-"Using the ``Upgrade'' option should work fine on Mandrake Linux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
"running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
-"to Mandrake Linux version \"8.1\" is not recommended."
+"to Mandrakelinux version \"8.1\" is not recommended."
msgstr ""
"仅当在您的计算机上发现了已有的 GNU/Linux 分区，才会激活这一步骤。\n"
"\n"
-"DrakX 现在需要知道您是想要执行全新安装，还是升级已有的 Mandrake Linux 系"
-"统: \n"
+"DrakX 现在需要知道您是想要执行全新安装，还是升级已有的 Mandrakelinux 系统: \n"
"\n"
" *\n"
"\"%s\": 总体来说，这将完全销毁旧系统。如果您想要更改硬盘的分区方案，或者更该"
"文件系统，您就应该使用此选项。但是，根据您选择的分区方案，您可以让现有的数据"
"免于覆盖。\n"
"\n"
-" * \"%s\": 这一安装级别允许您更新目前安装在您 Mandrake Linux\n"
+" * \"%s\": 这一安装级别允许您更新目前安装在您 Mandrakelinux\n"
"系统上的软件包。您的分区方案和用户数据都不会被破坏。绝大多数配置步骤仍然可"
"用，与标准安装类似。\n"
"\n"
-"使用“升级”选项应该在 \"8.1\" 或更新版本的 Mandrake Linux 系统上工作正常。不推"
+"使用“升级”选项应该在 \"8.1\" 或更新版本的 Mandrakelinux 系统上工作正常。不推"
"荐在先于 \"8.1\" 版本的\n"
-"Mandrake Linux 系统上执行升级。"
+"Mandrakelinux 系统上执行升级。"
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
@@ -4609,7 +4644,7 @@ msgid ""
"\n"
"About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
"cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrake Linux will be using it\n"
+"still under development. For that reason, Mandrakelinux will be using it\n"
"or not depending on the user choices:\n"
"\n"
" * If you choose a languages with a strong legacy encoding (latin1\n"
@@ -4645,7 +4680,7 @@ msgstr ""
"\n"
"关于 UTF-8(Unicode)支持: Unicode 是一种新的字符编码，该编码可支持所有现存的语"
"言。但是，在 GNU/Linux 下完全支持\n"
-"Unicode，仍然在开发和完善中。由此原因，Mandrake Linux 会根据用户的选择是否使"
+"Unicode，仍然在开发和完善中。由此原因，Mandrakelinux 会根据用户的选择是否使"
"用 UTF-8: \n"
"\n"
" * 如果您所选的语言自身有强制性的编码(latin1 语言、俄语、日语、中文、朝鲜语、"
@@ -4822,7 +4857,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:1154
+#: help.pm:733 install_steps_interactive.pm:1159
#, c-format
msgid "No password"
msgstr "无密码"
@@ -4859,7 +4894,7 @@ msgid ""
"checking this box.\n"
"\n"
"!! Be aware that if you choose not to install a bootloader (by selecting\n"
-"\"%s\"), you must ensure that you have a way to boot your Mandrake Linux\n"
+"\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"
"system! Be sure you know what you are doing before changing any of the\n"
"options. !!\n"
"\n"
@@ -4890,7 +4925,7 @@ msgstr ""
"选中此框来试着禁用 APIC。\n"
"\n"
"!! 注意: 如果您在这里选择不安装开机引导程序(选择\"%s\")，您必须保证您可以通过"
-"其它方法引导您的 Mandrake Linux\n"
+"其它方法引导您的 Mandrakelinux\n"
"系统！不管修改任何选项，一定要清楚您在做什么。!!\n"
"\n"
"单击此对话框中的\"%s\"按钮可为专家用户提供高级的选项。"
@@ -4959,8 +4994,9 @@ msgstr ""
"启动盘才能在需要的时候引导其它操作系统！"
#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#: standalone/drakbackup:1843 standalone/drakfont:586 standalone/drakfont:649
-#: standalone/drakvpn:329 standalone/drakvpn:690
+#: standalone/drakbackup:1604 standalone/drakfont:589 standalone/drakfont:655
+#: standalone/drakups:280 standalone/drakups:329 standalone/drakups:349
+#: standalone/drakvpn:331 standalone/drakvpn:692
#, c-format
msgid "Add"
msgstr "添加"
@@ -4971,7 +5007,8 @@ msgid "Modify"
msgstr "修改"
#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#: standalone/drakvpn:329 standalone/drakvpn:690
+#: standalone/drakups:282 standalone/drakups:331 standalone/drakups:351
+#: standalone/drakvpn:331 standalone/drakvpn:692
#, c-format
msgid "Remove"
msgstr "删除"
@@ -5015,7 +5052,7 @@ msgstr ""
#, c-format
msgid ""
"Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrake Linux offers two. Each of the printing systems\n"
+"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
"is best suited to particular types of configuration.\n"
"\n"
" * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
@@ -5040,7 +5077,7 @@ msgid ""
"Center and clicking the expert button."
msgstr ""
"现在，应该为您的计算机选择打印系统了。其它的操作系统也许只提供了一种选择，但 "
-"Mandrake Linux\n"
+"Mandrakelinux\n"
"提供了两种。每种打印系统都能够在不同的配置中大展身手。\n"
"\n"
" * \"%s\" --\n"
@@ -5059,7 +5096,7 @@ msgstr ""
"还包括一个图形界面，可用来打印或选择打印机选项，以及管理打印机。\n"
"\n"
"如果您现在进行了选择，但稍后又发现您并不喜欢所选择的打印系统，可以轻松修改。"
-"只需从“Mandrake 控制中心”中选择\n"
+"只需从“Mandrakelinux 控制中心”中选择\n"
"“Drak 打印机”，然后单击专家按钮。"
#: help.pm:826
@@ -5067,7 +5104,7 @@ msgstr ""
msgid "pdq"
msgstr "pdq"
-#: help.pm:826 printer/cups.pm:99 printer/data.pm:82
+#: help.pm:826 printer/cups.pm:115 printer/data.pm:83
#, c-format
msgid "CUPS"
msgstr "CUPS"
@@ -5271,8 +5308,8 @@ msgstr ""
"\"%s\": 如果在您的系统中检测到了声卡，则会在此处显示。如果您发现在此显示的声"
"卡与您系统中实际安装的声卡并不相同，您可以单击该按钮选择其它驱动程序。"
-#: help.pm:929 help.pm:991 install_steps_interactive.pm:962
-#: install_steps_interactive.pm:979
+#: help.pm:929 help.pm:991 install_steps_interactive.pm:967
+#: install_steps_interactive.pm:984
#, c-format
msgid "Sound card"
msgstr "声卡"
@@ -5394,12 +5431,12 @@ msgstr ""
"用作服务器，那么应该复查这一设置。"
#: help.pm:991 install_steps_interactive.pm:110
-#: install_steps_interactive.pm:899 standalone/keyboarddrake:23
+#: install_steps_interactive.pm:900 standalone/keyboarddrake:23
#, c-format
msgid "Keyboard"
msgstr "键盘"
-#: help.pm:991 install_steps_interactive.pm:921
+#: help.pm:991 install_steps_interactive.pm:926
#, c-format
msgid "Timezone"
msgstr "时区"
@@ -5409,7 +5446,7 @@ msgstr "时区"
msgid "Graphical Interface"
msgstr "图形界面"
-#: help.pm:991 install_steps_interactive.pm:995
+#: help.pm:991 install_steps_interactive.pm:1000
#, c-format
msgid "TV card"
msgstr "电视卡"
@@ -5419,27 +5456,27 @@ msgstr "电视卡"
msgid "ISDN card"
msgstr "ISDN 卡"
-#: help.pm:991 install_steps_interactive.pm:1013 standalone/drakbackup:2394
+#: help.pm:991 install_steps_interactive.pm:1018 standalone/drakbackup:2101
#, c-format
msgid "Network"
msgstr "网络"
-#: help.pm:991 install_steps_interactive.pm:1039
+#: help.pm:991 install_steps_interactive.pm:1044
#, c-format
msgid "Security Level"
msgstr "安全级别"
-#: help.pm:991 install_steps_interactive.pm:1053
+#: help.pm:991 install_steps_interactive.pm:1058
#, c-format
msgid "Firewall"
msgstr "防火墙"
-#: help.pm:991 install_steps_interactive.pm:1067
+#: help.pm:991 install_steps_interactive.pm:1072
#, c-format
msgid "Bootloader"
msgstr "引导程序"
-#: help.pm:991 install_steps_interactive.pm:1077 services.pm:195
+#: help.pm:991 install_steps_interactive.pm:1082 services.pm:195
#, c-format
msgid "Services"
msgstr "服务"
@@ -5448,10 +5485,10 @@ msgstr "服务"
#, c-format
msgid ""
"Choose the hard drive you want to erase in order to install your new\n"
-"Mandrake Linux partition. Be careful, all data on this drive will be lost\n"
+"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
"and will not be recoverable!"
msgstr ""
-"请选择您为了安装新的 Mandrake Linux 分区想要删除的硬盘分区。\n"
+"请选择您为了安装新的 Mandrakelinux 分区想要删除的硬盘分区。\n"
"注意，该硬盘分区上的所有数据将丢失并且无法恢复！"
#: help.pm:999
@@ -5485,7 +5522,7 @@ msgstr ""
msgid "You must also format %s"
msgstr "您还必须格式化 %s"
-#: install_any.pm:413
+#: install_any.pm:411
#, c-format
msgid ""
"You have selected the following server(s): %s\n"
@@ -5501,13 +5538,13 @@ msgstr ""
"您选择了以下服务器: %s\n"
"\n"
"\n"
-"这些服务器默认会被激活。它们没有已知的安全问题，但可能发现新问题。\n"
+"这些服务器默认会被激活。它们没有已知的安全问题，但可能发现新问题。"
"如果那样，您一定要立即升级。\n"
"\n"
"\n"
"您真要安装这些服务器吗？\n"
-#: install_any.pm:434
+#: install_any.pm:432
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -5520,29 +5557,29 @@ msgstr ""
"\n"
"您确定要删除这些软件包吗？\n"
-#: install_any.pm:812
+#: install_any.pm:827
#, c-format
msgid "Insert a FAT formatted floppy in drive %s"
msgstr "请在驱动器 %s 中插入一张 FAT 格式的软盘"
-#: install_any.pm:816
+#: install_any.pm:831
#, c-format
msgid "This floppy is not FAT formatted"
msgstr "该软盘不是 FAT 格式"
-#: install_any.pm:828
+#: install_any.pm:843
#, c-format
msgid ""
"To use this saved packages selection, boot installation with ``linux "
"defcfg=floppy''"
msgstr "使用保存的软件包选择，以“linux defcfg=floppy”启动"
-#: install_any.pm:856 partition_table.pm:845
+#: install_any.pm:871 partition_table.pm:847
#, c-format
msgid "Error reading file %s"
msgstr "请取文件 %s 出错"
-#: install_any.pm:973
+#: install_any.pm:995
#, c-format
msgid ""
"An error occurred - no valid devices were found on which to create new "
@@ -5664,11 +5701,11 @@ msgstr "正在计算 Windows 分区的大小"
#, c-format
msgid ""
"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrake Linux "
+"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
"installation."
msgstr ""
"您的 Windows 分区有太多碎片，请重新启动，进入 Windows，运行磁盘碎片整理程序，"
-"然后重新开始安装 Mandrake Linux"
+"然后重新开始安装 Mandrakelinux"
#: install_interactive.pm:164
#, c-format
@@ -5686,11 +5723,11 @@ msgid ""
msgstr ""
"警告!\n"
"\n"
-"DrakX 现在要调整您的 Windows 分区的大小。请小心: 此操作十分危险。\n"
-"为安全起见，您应该先退出安装程序，在 Windows 的命令提示符状态下运\n"
-"行“chkdsk c:”(注意，只运行图形化程序“磁盘扫描程序”是不够的，\n"
-"请确定在命令提示符状态下使用“chkdsk”。)另外，还建议您运行磁盘碎片\n"
-"整理程序。然后重新启动本安装程序。您还应该备份您的数据。\n"
+"DrakX 现在要调整您的 Windows 分区的大小。请小心: 此操作十分危险。"
+"为安全起见，您应该先退出安装程序，在 Windows 的命令提示符状态下运"
+"行“chkdsk c:”(注意，只运行图形化程序“磁盘扫描程序”是不够的，"
+"请确定在命令提示符状态下使用“chkdsk”。)另外，还建议您运行磁盘碎片"
+"整理程序。然后重新启动本安装程序。您还应该备份您的数据。"
"一切就绪后，请按“确定”。"
#: install_interactive.pm:176
@@ -5777,13 +5814,13 @@ msgstr "正在禁用网络"
msgid ""
"Introduction\n"
"\n"
-"The operating system and the different components available in the Mandrake "
-"Linux distribution \n"
+"The operating system and the different components available in the "
+"Mandrakelinux distribution \n"
"shall be called the \"Software Products\" hereafter. The Software Products "
"include, but are not \n"
"restricted to, the set of programs, methods, rules and documentation related "
"to the operating \n"
-"system and the different components of the Mandrake Linux distribution.\n"
+"system and the different components of the Mandrakelinux distribution.\n"
"\n"
"\n"
"1. License Agreement\n"
@@ -5837,7 +5874,7 @@ msgid ""
"loss) arising out \n"
"of the possession and use of software components or arising out of "
"downloading software components \n"
-"from one of Mandrake Linux sites which are prohibited or restricted in some "
+"from one of Mandrakelinux sites which are prohibited or restricted in some "
"countries by local laws.\n"
"This limited liability applies to, but is not restricted to, the strong "
"cryptography components \n"
@@ -5874,7 +5911,7 @@ msgid ""
"MandrakeSoft S.A. reserves its rights to modify or adapt the Software "
"Products, as a whole or in \n"
"parts, by all means and for all purposes.\n"
-"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of "
+"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "
"MandrakeSoft S.A. \n"
"\n"
"\n"
@@ -5895,76 +5932,62 @@ msgid ""
msgstr ""
"简介\n"
"\n"
-"Mandrake Linux 发行版中提供的操作系统和各种程序 \n"
-"在此后简称为“本软件产品”。本软件产品包括但不限于，\n"
-"与 Mandrake Linux 发行版的操作系统和各个部分有关的程序、方法、规则和文档。\n"
+"Mandrakelinux 发行版中提供的操作系统和各种程序在此后简称为“本软件产品”。本软"
+"件产品包括但不限于与 Mandrakelinux 发行版的操作系统和各个部分有关的程序、方"
+"法、规则和文档。\n"
"\n"
"\n"
"1. 许可协议\n"
"\n"
-"请仔细阅读此文档。此文档文档是您与 MandrakeSoft S.A. 之间关于本软件产品的一个"
-"许可协议。\n"
-"如果您安装, 复制, 或使用本软件产品, 即表明您接受并完全同意遵守本许可协议的内"
-"容和条件。\n"
-"如果您不同意本许可协议中的任何部分, 您将无权安装, 复制, 或使用本软件产品\n"
-"任何试图不遵守本许可协议的内容和条件, 而安装, 复制, 或使用本软件产品的行为\n"
-"都是非法的, 并将导致本许可协议赋予您的各种权利立即作废, \n"
-"根据许可协议的条款, 您将必须立即销毁本软件产品的任何副本。\n"
-"\n"
+"请仔细阅读此文档。此文档文档是您与 Mandrakesoft S.A. 之间关于本软件产品的一个"
+"许可协议。如果您安装, 复制, 或使用本软件产品, 即表明您接受并完全同意遵守本许"
+"可协议的内容和条件。如果您不同意本许可协议中的任何部分, 您将无权安装, 复制, "
+"或使用本软件产品任何试图不遵守本许可协议的内容和条件, 而安装, 复制, 或使用本"
+"软件产品的行为都是非法的, 并将导致本许可协议赋予您的各种权利立即作废, 根据许"
+"可协议的条款, 您将必须立即销毁本软件产品的任何副本。\n"
"\n"
"2. 有限担保\n"
"\n"
"本软件产品和附带的文档是一经发表即“不再修改”, 在法律允许的范围内没有任何担"
-"保。\n"
-"在法律允许的范围内 MandrakeSoft S.A. 对因使用或不能使用本软件产品而引起的, \n"
-"特定的, 偶然的, 直接的, 间接的无论任何损失 (包括但不限于\n"
-"生意的丧失, 生意的中断, 财务损失, 因法院裁决产生的法律费用和处罚\n"
-"或其他因此产生的损失)将不承担责任, 即使 MandrakeSoft S.A. 已经被告知有发生这"
-"种损失的可能性。\n"
+"保。在法律允许的范围内 Mandrakesoft S.A. 对因使用或不能使用本软件产品而引起"
+"的,特定的, 偶然的, 直接的, 间接的无论任何损失 (包括但不限于生意的丧失, 生意的"
+"中断, 财务损失, 因法院裁决产生的法律费用和处罚或其他因此产生的损失)将不承担责"
+"任, 即使 Mandrakesoft S.A. 已经被告知有发生这种损失的可能性。\n"
"\n"
"在某些国家中关于拥有和使用被禁止的软件的有限责任\n"
"\n"
-"在法律允许的范围内MandrakeSoft S.A. 或其分销者对因拥有或使用, \n"
-"或从任何Mandrake Linux 的网站下载在某些国家中被当地法律禁止或限制的软件而引起"
-"的, \n"
-"特定的, 偶然的, 直接的, 间接的无论任何损失 (包括但不限于\n"
-"生意的丧失, 生意的中断, 财务损失, 因法院裁决产生的法律费用和处罚\n"
-"或其他因此产生的损失)将不承担责任。\n"
-"这种有限责任适用但不限于本软件产品所包括的强大数据加密组件。 \n"
+"在法律允许的范围内 Mandrakesoft S.A. 或其分销者对因拥有或使用, 或从任何 "
+"Mandrakelinux 的网站下载在某些国家中被当地法律禁止或限制的软件而引起的, 特定"
+"的、偶然的、直接的、间接的无论任何损失 (包括但不限于生意的丧失, 生意的中断, "
+"财务损失, 因法院裁决产生的法律费用和处罚或其他因此产生的损失)将不承担责任。这"
+"种有限责任适用但不限于本软件产品所包括的强大数据加密组件。 \n"
"\n"
"\n"
"3. GPL 许可协议和其它有关协议\n"
"\n"
-"本软件产品由不同个人或组织所创作的各部分组成。这些部分基本上\n"
-"都采用 GNU 通用公共许可协议(GNU General Public Licence), 此后简称为“GPL”, 或"
-"其它类似的许可协议的条款和条件。这些许可协议大多允许您使用, 复制, \n"
-"修改或重新发表协议所覆盖的部分。使用这些软件之前, 请仔细阅读有关许可协议的条"
-"款和条件。\n"
-"如果对任何部分的许可协议有疑问, 应该与该部分的作者联系, MandrakeSoft 无法解答"
-"这些问题。\n"
-"由 MandrakeSoft S.A. 开发的各个程序受 GPL 许可协议保护。 由 MandrakeSoft S."
-"A. 创作的文档采用一个特别的许可协议。 详细情况 \n"
-"见有关的文档。\n"
+"本软件产品由不同个人或组织所创作的各部分组成。这些部分基本上都采用 GNU 通用公"
+"共许可协议(GNU General Public Licence), 此后简称为“GPL”, 或其它类似的许可协议"
+"的条款和条件。这些许可协议大多允许您使用, 复制, 修改或重新发表协议所覆盖的部"
+"分。使用这些软件之前, 请仔细阅读有关许可协议的条款和条件。如果对任何部分的许"
+"可协议有疑问, 应该与该部分的作者联系, Mandrakesoft 无法解答这些问题。由 "
+"MandrakeSoft S.A. 开发的各个程序受 GPL 许可协议保护。由 Mandrakesoft S.A. 创"
+"作的文档采用一个特别的许可协议。详细情况见有关的文档。\n"
"\n"
"\n"
"4. 知识产权\n"
"\n"
-"本软件产品的各个组件的所有权利属于它们各自的作者, 并受到所有可适用于软件程"
-"序\n"
-"的知识产权和版权法律的保护。\n"
-"MandrakeSoft S.A. 保留对本软件产品进行全面或部分的更改或调整的权利, \n"
-"不论采用任何方法, 不论出于任何目的。\n"
-"“Mandrake”, “Mandrake Linux”和相关的图样是 MandrakeSoft S.A. 的注册商标。\n"
+"本软件产品的各个组件的所有权利属于它们各自的作者, 并受到所有可适用于软件程序"
+"的知识产权和版权法律的保护。Mandrakesoft S.A. 保留对本软件产品进行全面或部分"
+"的更改或调整的权利, 不论采用任何方法, 不论出于任何目的。\n"
+"“Mandrake”, “Mandrakelinux”和相关的图样是 Mandrakesoft S.A. 的注册商标。\n"
"\n"
"\n"
-"5. 适用法律 \n"
+"5. 适用法律\n"
"\n"
-"如果本协议的任何部分被法院裁定为无效, 非法或不适用, \n"
-"该部分将被排除在本协议之外。 您仍然需要遵守本协议的其它可使用的部分。\n"
-"本协议的内容和条件受法国法律管辖。\n"
-"有关本协议的任何争议最好在法庭外解决。作为最后的手段, 争议将被提交\n"
-"法国巴黎适当的法院审理。\n"
-"对本文档有任何疑问, 请联系 MandrakeSoft S.A.\n"
+"如果本协议的任何部分被法院裁定为无效, 非法或不适用, 该部分将被排除在本协议之"
+"外。您仍然需要遵守本协议的其它可使用的部分。本协议的内容和条件受法国法律管"
+"辖。有关本协议的任何争议最好在法庭外解决。作为最后的手段, 争议将被提交法国巴"
+"黎适当的法院审理。对本文档有任何疑问, 请联系 Mandrakesoft S.A.\n"
"\n"
"以上中文翻译仅为方便您理解, 不能作为法律用途, 请以协议英文文本为准。\n"
@@ -6019,22 +6042,22 @@ msgstr ""
"\n"
"警告\n"
"\n"
-"请仔细阅读下列的条款。如果您不同意其中任何部分，您就不可以安装下一个光盘上\n"
+"请仔细阅读下列的条款。如果您不同意其中任何部分，您就不可以安装下一个光盘上"
"的软件。选择“拒绝”将继续安装其它介质上的软件。\n"
"\n"
"\n"
-"下一个光盘的部分内容的许可协议不是 GPL 或类似的协议。每个这样的内容受到各\n"
-"自不同的条件和条款的限制。在您使用或重新分发该内容之前，请仔细阅读并遵守其\n"
+"下一个光盘的部分内容的许可协议不是 GPL 或类似的协议。每个这样的内容受到各"
+"自不同的条件和条款的限制。在您使用或重新分发该内容之前，请仔细阅读并遵守其"
"特定的许可协议。\n"
-"通常这些协议会限制对该内容进行转换，复制(备份目的除外)，再次分发，反向工\n"
-"程，反汇编，反编译或其它修改。如果违背任何协议的条款，协议赋予您的权利也立\n"
-"即终止。除非协议中有特定的条款赋予您相关权利，您通常不能在超过一台系统中安\n"
-"装该程序，或者把它应用在网络上。如果有疑问，请直接与该内容的发行者或作者联\n"
+"通常这些协议会限制对该内容进行转换，复制(备份目的除外)，再次分发，反向工"
+"程，反汇编，反编译或其它修改。如果违背任何协议的条款，协议赋予您的权利也立"
+"即终止。除非协议中有特定的条款赋予您相关权利，您通常不能在超过一台系统中安"
+"装该程序，或者把它应用在网络上。如果有疑问，请直接与该内容的发行者或作者联"
"系。\n"
"向第三方转让或复制这些内容，包括其文档通常是被禁止的。\n"
"\n"
"\n"
-"下一个光盘的内容的全部权利分别属于它们各自的作者，并受到可应用与软件程序的\n"
+"下一个光盘的内容的全部权利分别属于它们各自的作者，并受到可应用与软件程序的"
"知识产权和版权法律的保护。\n"
#: install_messages.pm:128
@@ -6044,8 +6067,8 @@ msgid ""
"Remove the boot media and press return to reboot.\n"
"\n"
"\n"
-"For information on fixes which are available for this release of Mandrake "
-"Linux,\n"
+"For information on fixes which are available for this release of "
+"Mandrakelinux,\n"
"consult the Errata available from:\n"
"\n"
"\n"
@@ -6053,20 +6076,19 @@ msgid ""
"\n"
"\n"
"Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrake Linux User's Guide."
+"install chapter of the Official Mandrakelinux User's Guide."
msgstr ""
"恭喜。安装完成了。\n"
-"取出开机的光盘或软盘，然后按 ENTER，重新启动您的系统。\n"
+"请取出启动介质，然后按 ENTER 重新启动。\n"
"\n"
"\n"
-"要了解 Mandrake Linux 的修改和更新，\n"
-"请访问我们的网站: \n"
+"要了解此版本 Mandrakelinux 的修订，请访问以下勘误表: \n"
"\n"
"\n"
"%s\n"
"\n"
"\n"
-"关于安装后如何配置您的系统，请查看 Mandrake Linux 用户手册。"
+"关于安装后如何配置您的系统，请查看 Mandrakelinux 官方用户手册。"
#: install_messages.pm:141
#, c-format
@@ -6078,7 +6100,7 @@ msgstr "http://www.mandrakelinux.com/en/100errata.php3"
msgid "Duplicate mount point %s"
msgstr "重复的挂载点 %s"
-#: install_steps.pm:410
+#: install_steps.pm:406
#, c-format
msgid ""
"Some important packages didn't get installed properly.\n"
@@ -6090,7 +6112,7 @@ msgstr ""
"您的光盘或者驱动器可能有缺陷。\n"
"请在一台安装好的电脑上检查光盘，命令是“rpm -qpl Mandrake/RPMS/*.rpm”\n"
-#: install_steps.pm:541
+#: install_steps.pm:535
#, c-format
msgid "No floppy drive available"
msgstr "没有可用的软盘驱动器"
@@ -6104,11 +6126,11 @@ msgstr "进入步骤“%s”\n"
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
-"Mandrake Linux. If that occurs, you can try a text install instead. For "
+"Mandrakelinux. If that occurs, you can try a text install instead. For "
"this,\n"
"press `F1' when booting on CDROM, then enter `text'."
msgstr ""
-"您的系统资源不足。您在安装 Mandrake Linux 时可能遇到问题。\n"
+"您的系统资源不足。您在安装 Mandrakelinux 时可能遇到问题。\n"
"如果这样，您可以尝试文本模式的安装。\n"
"在从光盘启动后按“F1”键，然后输入“text”。"
@@ -6290,7 +6312,7 @@ msgstr ""
"请换另一片光盘！\n"
"\n"
"请在驱动器中插入标有“%s”的光盘，然后单击“确定”。\n"
-"如果您没有这张光盘，请单击“取消”，放弃安装这个光盘上的软件。"
+"如果您没有这张光盘，请单击“取消”，放弃安装这张光盘上的软件。"
#: install_steps_gtk.pm:612 install_steps_interactive.pm:710
#, c-format
@@ -6308,8 +6330,8 @@ msgstr "真的要继续？"
msgid "There was an error installing packages:"
msgstr "安装软件包时出错: "
-#: install_steps_gtk.pm:656 install_steps_interactive.pm:881
-#: install_steps_interactive.pm:1029
+#: install_steps_gtk.pm:656 install_steps_interactive.pm:882
+#: install_steps_interactive.pm:1034
#, c-format
msgid "not configured"
msgstr "未配置"
@@ -6404,7 +6426,7 @@ msgstr "IDE"
msgid "Configuring IDE"
msgstr "配置 IDE"
-#: install_steps_interactive.pm:248 network/tools.pm:197
+#: install_steps_interactive.pm:248 network/tools.pm:195
#, c-format
msgid "No partition available"
msgstr "没有可用的硬盘分区"
@@ -6425,7 +6447,7 @@ 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
@@ -6541,7 +6563,7 @@ msgstr "您没有选择任何的组件，请选择最小安装:"
#: install_steps_interactive.pm:560
#, c-format
msgid "With basic documentation (recommended!)"
-msgstr "安装基础文档(建议！)"
+msgstr "安装基础文档(建议!)"
#: install_steps_interactive.pm:561
#, c-format
@@ -6620,174 +6642,173 @@ msgstr ""
#: install_steps_interactive.pm:782
#, c-format
msgid ""
-"Contacting Mandrake Linux web site to get the list of available mirrors..."
-msgstr "正在连接 Mandrake Linux 网站以获得镜像网站列表..."
+"Contacting Mandrakelinux web site to get the list of available mirrors..."
+msgstr "正在连接 Mandrakelinux 网站以获得镜像网站列表..."
-#: install_steps_interactive.pm:786
+#: install_steps_interactive.pm:787
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "选择一个镜像网站来取得程序"
-#: install_steps_interactive.pm:800
+#: install_steps_interactive.pm:801
#, c-format
msgid "Contacting the mirror to get the list of available packages..."
msgstr "正在连接镜像网站以取得可供安装程序的列表..."
-#: install_steps_interactive.pm:804
+#: install_steps_interactive.pm:805
#, c-format
msgid "Unable to contact mirror %s"
msgstr "无法连接镜像 %s"
-#: install_steps_interactive.pm:804
+#: install_steps_interactive.pm:805
#, c-format
msgid "Would you like to try again?"
msgstr "您是否想要再试一次？"
-#: install_steps_interactive.pm:830 standalone/drakclock:42
+#: install_steps_interactive.pm:831 standalone/drakclock:42
#, c-format
msgid "Which is your timezone?"
msgstr "您所在的时区？"
-#: install_steps_interactive.pm:835
+#: install_steps_interactive.pm:836
#, c-format
msgid "Automatic time synchronization (using NTP)"
msgstr "自动时间同步(使用 NTP)"
-#: install_steps_interactive.pm:843
+#: install_steps_interactive.pm:844
#, c-format
msgid "NTP Server"
msgstr "NTP 服务器"
-#: install_steps_interactive.pm:885 steps.pm:30
+#: install_steps_interactive.pm:886 steps.pm:30
#, c-format
msgid "Summary"
msgstr "概要"
-#: install_steps_interactive.pm:898 install_steps_interactive.pm:906
-#: install_steps_interactive.pm:920 install_steps_interactive.pm:927
-#: install_steps_interactive.pm:1076 services.pm:135
-#: standalone/drakbackup:1937
+#: 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
+#: standalone/drakbackup:1663
#, c-format
msgid "System"
msgstr "系统"
-#: install_steps_interactive.pm:934 install_steps_interactive.pm:961
-#: install_steps_interactive.pm:978 install_steps_interactive.pm:994
-#: install_steps_interactive.pm:1005
+#: 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
#, c-format
msgid "Hardware"
msgstr "硬件"
-#: install_steps_interactive.pm:940 install_steps_interactive.pm:949
+#: install_steps_interactive.pm:945 install_steps_interactive.pm:954
#, c-format
msgid "Remote CUPS server"
msgstr "远程 CUPS 服务器"
-#: install_steps_interactive.pm:940
+#: install_steps_interactive.pm:945
#, c-format
msgid "No printer"
msgstr "没有打印机"
-#: install_steps_interactive.pm:982
+#: install_steps_interactive.pm:987
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "您有 ISA 声卡吗？"
-#: install_steps_interactive.pm:984
+#: install_steps_interactive.pm:989
#, c-format
msgid "Run \"sndconfig\" after installation to configure your sound card"
msgstr "安装之后运行“sndconfig”来配置您的声卡"
-#: install_steps_interactive.pm:986
+#: install_steps_interactive.pm:991
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "没有检测到声卡。请在安装之后尝试“Drak 硬件配置”。"
-#: install_steps_interactive.pm:1006
+#: install_steps_interactive.pm:1011
#, c-format
msgid "Graphical interface"
msgstr "图形界面"
-#: install_steps_interactive.pm:1012 install_steps_interactive.pm:1027
+#: install_steps_interactive.pm:1017 install_steps_interactive.pm:1032
#, c-format
msgid "Network & Internet"
msgstr "网络和 Internet"
-#: install_steps_interactive.pm:1028
+#: install_steps_interactive.pm:1033
#, c-format
msgid "Proxies"
msgstr "代理服务器"
-#: install_steps_interactive.pm:1029
+#: install_steps_interactive.pm:1034
#, c-format
msgid "configured"
msgstr "已配置"
-#: install_steps_interactive.pm:1038 install_steps_interactive.pm:1052
+#: install_steps_interactive.pm:1043 install_steps_interactive.pm:1057
#: steps.pm:20
#, c-format
msgid "Security"
msgstr "安全"
-#: install_steps_interactive.pm:1057
+#: install_steps_interactive.pm:1062
#, c-format
msgid "activated"
msgstr "已激活"
-#: install_steps_interactive.pm:1057
+#: install_steps_interactive.pm:1062
#, c-format
msgid "disabled"
msgstr "已禁用"
-#: install_steps_interactive.pm:1066
+#: install_steps_interactive.pm:1071
#, c-format
msgid "Boot"
msgstr "启动"
#. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1070
+#: install_steps_interactive.pm:1075
#, c-format
msgid "%s on %s"
msgstr "位于 %2$s 上的 %1$s"
-#: install_steps_interactive.pm:1081 services.pm:177
+#: install_steps_interactive.pm:1086 services.pm:177
#, c-format
msgid "Services: %d activated for %d registered"
msgstr "服务: %2$d 项已注册，%1$d 项已激活"
-#: install_steps_interactive.pm:1091
+#: install_steps_interactive.pm:1096
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "您还没有配置过 X。您真的想要这样吗？"
-#: install_steps_interactive.pm:1149
+#: install_steps_interactive.pm:1154
#, c-format
msgid "Set root password and network authentication methods"
msgstr "设定 root 密码及网络认证方式"
-#: install_steps_interactive.pm:1150
+#: install_steps_interactive.pm:1155
#, c-format
msgid "Set root password"
msgstr "设定 root 密码"
-#: install_steps_interactive.pm:1160
+#: install_steps_interactive.pm:1165
#, c-format
msgid "This password is too short (it must be at least %d characters long)"
msgstr "这个密码太简单了(至少要有 %d 个字符)"
-#: install_steps_interactive.pm:1165 network/netconnect.pm:492
-#: standalone/drakauth:26 standalone/drakconnect:428
-#: standalone/drakconnect:917
+#: install_steps_interactive.pm:1170 network/netconnect.pm:563
+#: standalone/drakauth:26 standalone/drakconnect:451
#, c-format
msgid "Authentication"
msgstr "认证"
-#: install_steps_interactive.pm:1196
+#: install_steps_interactive.pm:1201
#, c-format
msgid "Preparing bootloader..."
msgstr "正在准备引导程序..."
-#: install_steps_interactive.pm:1206
+#: install_steps_interactive.pm:1211
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown\n"
@@ -6800,12 +6821,12 @@ msgstr ""
"安装将继续，不过您需要\n"
"使用 BootX 或其它方式启动您的机器"
-#: install_steps_interactive.pm:1212
+#: install_steps_interactive.pm:1217
#, c-format
msgid "Do you want to use aboot?"
msgstr "您要使用 aboot 吗？"
-#: install_steps_interactive.pm:1215
+#: install_steps_interactive.pm:1220
#, c-format
msgid ""
"Error installing aboot, \n"
@@ -6814,17 +6835,17 @@ msgstr ""
"安装 aboot 时出错，\n"
"强迫安装会毁坏第一个分区，要继续吗？"
-#: install_steps_interactive.pm:1226
+#: install_steps_interactive.pm:1231
#, c-format
msgid "Installing bootloader"
msgstr "安装引导程序"
-#: install_steps_interactive.pm:1233
+#: install_steps_interactive.pm:1238
#, c-format
msgid "Installation of bootloader failed. The following error occured:"
msgstr "安装系统引导程序失败，出现下列错误: "
-#: install_steps_interactive.pm:1238
+#: install_steps_interactive.pm:1243
#, c-format
msgid ""
"You may need to change your Open Firmware boot-device to\n"
@@ -6840,24 +6861,29 @@ msgstr ""
" 然后输入: shut-down\n"
"您将在下次开机时看到引导程序提示。"
-#: install_steps_interactive.pm:1251
+#: install_steps_interactive.pm:1256
#, 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:1283 standalone/drakautoinst:75
+#: install_steps_interactive.pm:1288 standalone/drakautoinst:76
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "请在驱动器 %s 中插入一张空白软盘"
-#: install_steps_interactive.pm:1287
+#: install_steps_interactive.pm:1293
+#, c-format
+msgid "Please insert another floppy for drivers disk"
+msgstr "请插入另外一张软盘，作为驱动程序盘"
+
+#: install_steps_interactive.pm:1295
#, c-format
msgid "Creating auto install floppy..."
msgstr "正在创建自动安装软盘..."
-#: install_steps_interactive.pm:1298
+#: install_steps_interactive.pm:1307
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -6868,12 +6894,12 @@ msgstr ""
"\n"
"您真的要现在退出吗？"
-#: install_steps_interactive.pm:1313
+#: install_steps_interactive.pm:1322
#, c-format
msgid "Generate auto install floppy"
msgstr "生成自动安装软盘"
-#: install_steps_interactive.pm:1315
+#: install_steps_interactive.pm:1324
#, c-format
msgid ""
"The auto install can be fully automated if wanted,\n"
@@ -6890,8 +6916,8 @@ msgstr ""
#: install_steps_newt.pm:20
#, c-format
-msgid "Mandrake Linux Installation %s"
-msgstr "Mandrake Linux 安装 %s"
+msgid "Mandrakelinux Installation %s"
+msgstr "Mandrakelinux 安装 %s"
#: install_steps_newt.pm:33
#, c-format
@@ -6909,7 +6935,7 @@ msgstr "选择文件"
msgid "Basic"
msgstr "基本"
-#: interactive.pm:403 interactive/newt.pm:308 ugtk2.pm:509
+#: interactive.pm:403 interactive/newt.pm:308 ugtk2.pm:510
#, c-format
msgid "Finish"
msgstr "完成"
@@ -7023,7 +7049,7 @@ msgstr "芬兰"
msgid "French"
msgstr "法国"
-#: keyboard.pm:143 keyboard.pm:217
+#: keyboard.pm:143 keyboard.pm:220
#, c-format
msgid "Norwegian"
msgstr "挪威"
@@ -7033,22 +7059,22 @@ msgstr "挪威"
msgid "Polish"
msgstr "波兰"
-#: keyboard.pm:145 keyboard.pm:226
+#: keyboard.pm:145 keyboard.pm:229
#, c-format
msgid "Russian"
msgstr "俄国"
-#: keyboard.pm:147 keyboard.pm:230
+#: keyboard.pm:147 keyboard.pm:233
#, c-format
msgid "Swedish"
msgstr "瑞典语"
-#: keyboard.pm:148 keyboard.pm:249
+#: keyboard.pm:148 keyboard.pm:252
#, c-format
msgid "UK keyboard"
msgstr "英国"
-#: keyboard.pm:149 keyboard.pm:250
+#: keyboard.pm:149 keyboard.pm:253
#, c-format
msgid "US keyboard"
msgstr "美国键盘"
@@ -7243,312 +7269,312 @@ msgstr "意大利"
msgid "Inuktitut"
msgstr "因纽特"
-#: keyboard.pm:197
+#: keyboard.pm:200
#, c-format
msgid "Japanese 106 keys"
msgstr "日文 106 键盘"
-#: keyboard.pm:198
+#: keyboard.pm:201
#, c-format
msgid "Kannada"
msgstr "埃纳德"
-#: keyboard.pm:201
+#: keyboard.pm:204
#, c-format
msgid "Korean keyboard"
msgstr "韩国键盘"
-#: keyboard.pm:202
+#: keyboard.pm:205
#, c-format
msgid "Latin American"
msgstr "拉丁美洲"
-#: keyboard.pm:203
+#: keyboard.pm:206
#, c-format
msgid "Laotian"
msgstr "老挝"
-#: keyboard.pm:204
+#: keyboard.pm:207
#, c-format
msgid "Lithuanian AZERTY (old)"
msgstr "立陶宛 AZERTY(老式)"
-#: keyboard.pm:206
+#: keyboard.pm:209
#, c-format
msgid "Lithuanian AZERTY (new)"
msgstr "立陶宛 AZERTY(新式)"
-#: keyboard.pm:207
+#: keyboard.pm:210
#, c-format
msgid "Lithuanian \"number row\" QWERTY"
msgstr "立陶宛“顺排”QWERTY"
-#: keyboard.pm:208
+#: keyboard.pm:211
#, c-format
msgid "Lithuanian \"phonetic\" QWERTY"
msgstr "立陶宛“同音”QWERTY"
-#: keyboard.pm:209
+#: keyboard.pm:212
#, c-format
msgid "Latvian"
msgstr "拉脱维亚"
-#: keyboard.pm:210
+#: keyboard.pm:213
#, c-format
msgid "Malayalam"
msgstr "德拉维"
-#: keyboard.pm:211
+#: keyboard.pm:214
#, c-format
msgid "Macedonian"
msgstr "马其顿"
-#: keyboard.pm:212
+#: keyboard.pm:215
#, c-format
msgid "Myanmar (Burmese)"
msgstr "缅甸"
-#: keyboard.pm:213
+#: keyboard.pm:216
#, c-format
msgid "Mongolian (cyrillic)"
msgstr "蒙古(西里尔)"
-#: keyboard.pm:214
+#: keyboard.pm:217
#, c-format
msgid "Maltese (UK)"
msgstr "马耳他(英国)"
-#: keyboard.pm:215
+#: keyboard.pm:218
#, c-format
msgid "Maltese (US)"
msgstr "马耳他(美国)"
-#: keyboard.pm:216
+#: keyboard.pm:219
#, c-format
msgid "Dutch"
msgstr "荷兰"
-#: keyboard.pm:218
+#: keyboard.pm:221
#, c-format
msgid "Oriya"
msgstr "奥里雅"
-#: keyboard.pm:219
+#: keyboard.pm:222
#, c-format
msgid "Polish (qwerty layout)"
msgstr "波兰(QWERTY 布局)"
-#: keyboard.pm:220
+#: keyboard.pm:223
#, c-format
msgid "Polish (qwertz layout)"
msgstr "波兰(QWERTZ 布局)"
-#: keyboard.pm:221
+#: keyboard.pm:224
#, c-format
msgid "Portuguese"
msgstr "葡萄牙语"
-#: keyboard.pm:222
+#: keyboard.pm:225
#, c-format
msgid "Canadian (Quebec)"
msgstr "加拿大(魁北克)"
-#: keyboard.pm:224
+#: keyboard.pm:227
#, c-format
msgid "Romanian (qwertz)"
msgstr "罗马尼亚(QWERTZ 布局)"
-#: keyboard.pm:225
+#: keyboard.pm:228
#, c-format
msgid "Romanian (qwerty)"
msgstr "罗马尼亚(QWERTY 布局)"
-#: keyboard.pm:227
+#: keyboard.pm:230
#, c-format
msgid "Russian (Phonetic)"
msgstr "俄语(音标)"
-#: keyboard.pm:228
+#: keyboard.pm:231
#, c-format
msgid "Saami (norwegian)"
msgstr "Saami(挪威)"
-#: keyboard.pm:229
+#: keyboard.pm:232
#, c-format
msgid "Saami (swedish/finnish)"
msgstr "北部沙米语(瑞典/芬兰)"
-#: keyboard.pm:231
+#: keyboard.pm:234
#, c-format
msgid "Slovenian"
msgstr "斯洛文尼亚"
-#: keyboard.pm:232
+#: keyboard.pm:235
#, c-format
msgid "Slovakian (QWERTZ)"
msgstr "斯洛伐克(QWERTZ 布局)"
-#: keyboard.pm:233
+#: keyboard.pm:236
#, c-format
msgid "Slovakian (QWERTY)"
msgstr "斯洛伐克(QWERTY 布局)"
-#: keyboard.pm:235
+#: keyboard.pm:238
#, c-format
msgid "Serbian (cyrillic)"
msgstr "赛尔维亚(西里尔字母)"
-#: keyboard.pm:236
+#: keyboard.pm:239
#, c-format
msgid "Syriac"
msgstr "叙利亚"
-#: keyboard.pm:237
+#: keyboard.pm:240
#, c-format
msgid "Syriac (phonetic)"
msgstr "叙利亚(音标)"
-#: keyboard.pm:238
+#: keyboard.pm:241
#, c-format
msgid "Telugu"
msgstr "泰卢固"
-#: keyboard.pm:240
+#: keyboard.pm:243
#, c-format
msgid "Tamil (ISCII-layout)"
msgstr "泰米尔(ISCII-布局)"
-#: keyboard.pm:241
+#: keyboard.pm:244
#, c-format
msgid "Tamil (Typewriter-layout)"
msgstr "泰米尔(打字机布局)"
-#: keyboard.pm:242
+#: keyboard.pm:245
#, c-format
msgid "Thai keyboard"
msgstr "泰国语键盘"
-#: keyboard.pm:244
+#: keyboard.pm:247
#, c-format
msgid "Tajik keyboard"
msgstr "塔吉克键盘"
-#: keyboard.pm:245
+#: keyboard.pm:248
#, c-format
msgid "Turkish (traditional \"F\" model)"
msgstr "土耳其(传统“F”式)"
-#: keyboard.pm:246
+#: keyboard.pm:249
#, c-format
msgid "Turkish (modern \"Q\" model)"
msgstr "土耳其(现代“Q”式)"
-#: keyboard.pm:248
+#: keyboard.pm:251
#, c-format
msgid "Ukrainian"
msgstr "乌克兰"
-#: keyboard.pm:251
+#: keyboard.pm:254
#, c-format
msgid "US keyboard (international)"
-msgstr "美式键盘(国际)"
+msgstr "美国键盘(国际)"
-#: keyboard.pm:252
+#: keyboard.pm:255
#, c-format
msgid "Uzbek (cyrillic)"
msgstr "乌兹别克(西里尔)"
-#: keyboard.pm:253
+#: keyboard.pm:256
#, c-format
msgid "Vietnamese \"numeric row\" QWERTY"
msgstr "越南键盘“顺排”QWERTY"
-#: keyboard.pm:254
+#: keyboard.pm:257
#, c-format
msgid "Yugoslavian (latin)"
msgstr "南斯拉夫(拉丁)"
-#: keyboard.pm:261
+#: keyboard.pm:264
#, c-format
msgid "Right Alt key"
msgstr "右边的 ALT 键"
-#: keyboard.pm:262
+#: keyboard.pm:265
#, c-format
msgid "Both Shift keys simultaneously"
msgstr "同时按两个 Shift 键"
-#: keyboard.pm:263
+#: keyboard.pm:266
#, c-format
msgid "Control and Shift keys simultaneously"
msgstr "同时按 Ctrl 和 Shift 键"
-#: keyboard.pm:264
+#: keyboard.pm:267
#, c-format
msgid "CapsLock key"
msgstr "CapsLock 键"
-#: keyboard.pm:265
+#: keyboard.pm:268
#, c-format
msgid "Ctrl and Alt keys simultaneously"
msgstr "同时按 Ctrl 和 Alt 键"
-#: keyboard.pm:266
+#: keyboard.pm:269
#, c-format
msgid "Alt and Shift keys simultaneously"
msgstr "同时按 Alt 和 Shift 键"
-#: keyboard.pm:267
+#: keyboard.pm:270
#, c-format
msgid "\"Menu\" key"
msgstr "“菜单”键"
-#: keyboard.pm:268
+#: keyboard.pm:271
#, c-format
msgid "Left \"Windows\" key"
msgstr "左侧“Windows”键"
-#: keyboard.pm:269
+#: keyboard.pm:272
#, c-format
msgid "Right \"Windows\" key"
msgstr "右侧“Windows”键"
-#: keyboard.pm:270
+#: keyboard.pm:273
#, c-format
msgid "Both Control keys simultaneously"
msgstr "同时按两个 Ctrl 键"
-#: keyboard.pm:271
+#: keyboard.pm:274
#, c-format
msgid "Both Alt keys simultaneously"
msgstr "同时按两个 Alt 键"
-#: keyboard.pm:272
+#: keyboard.pm:275
#, c-format
msgid "Left Shift key"
msgstr "左侧 Shift 键"
-#: keyboard.pm:273
+#: keyboard.pm:276
#, c-format
msgid "Right Shift key"
msgstr "右侧 Shift 键"
-#: keyboard.pm:274
+#: keyboard.pm:277
#, c-format
msgid "Left Alt key"
msgstr "左侧的 Alt 键"
-#: keyboard.pm:275
+#: keyboard.pm:278
#, c-format
msgid "Left Control key"
msgstr "左侧 Ctrl 键"
-#: keyboard.pm:276
+#: keyboard.pm:279
#, c-format
msgid "Right Control key"
msgstr "右侧 Ctrl 键"
-#: keyboard.pm:307
+#: keyboard.pm:310
#, c-format
msgid ""
"Here you can choose the key or key combination that will \n"
@@ -7559,7 +7585,7 @@ msgstr ""
"来在不同的键盘布局之间切换\n"
"(例如，英文和中文)"
-#: keyboard.pm:312
+#: keyboard.pm:315
#, c-format
msgid ""
"This setting will be activated after the installation.\n"
@@ -7569,1146 +7595,1146 @@ msgstr ""
"此设置将会在安装后激活。\n"
"在安装过程中，您需要使用右侧的 Ctrl 键切换不同的键盘布局。"
-#: lang.pm:144
+#: lang.pm:149
#, c-format
msgid "default:LTR"
msgstr "default:LTR"
-#: lang.pm:160
+#: lang.pm:165
#, c-format
msgid "Afghanistan"
msgstr "阿富汗"
-#: lang.pm:161
+#: lang.pm:166
#, c-format
msgid "Andorra"
msgstr "安道尔"
-#: lang.pm:162
+#: lang.pm:167
#, c-format
msgid "United Arab Emirates"
msgstr "阿拉伯联合酋长国"
-#: lang.pm:163
+#: lang.pm:168
#, c-format
msgid "Antigua and Barbuda"
msgstr "安提瓜和巴布达"
-#: lang.pm:164
+#: lang.pm:169
#, c-format
msgid "Anguilla"
msgstr "安圭拉"
-#: lang.pm:165
+#: lang.pm:170
#, c-format
msgid "Albania"
msgstr "阿尔巴尼亚"
-#: lang.pm:166
+#: lang.pm:171
#, c-format
msgid "Armenia"
msgstr "亚美尼亚"
-#: lang.pm:167
+#: lang.pm:172
#, c-format
msgid "Netherlands Antilles"
msgstr "荷属安的列斯"
-#: lang.pm:168
+#: lang.pm:173
#, c-format
msgid "Angola"
msgstr "安哥拉"
-#: lang.pm:169
+#: lang.pm:174
#, c-format
msgid "Antarctica"
msgstr "南极洲"
-#: lang.pm:170 standalone/drakxtv:51
+#: lang.pm:175 standalone/drakxtv:51
#, c-format
msgid "Argentina"
msgstr "阿根廷"
-#: lang.pm:171
+#: lang.pm:176
#, c-format
msgid "American Samoa"
msgstr "美属萨摩亚"
-#: lang.pm:173 standalone/drakxtv:49
+#: lang.pm:178 network/adsl_consts.pm:20 standalone/drakxtv:49
#, c-format
msgid "Australia"
msgstr "澳大利亚"
-#: lang.pm:174
+#: lang.pm:179
#, c-format
msgid "Aruba"
msgstr "阿鲁巴"
-#: lang.pm:175
+#: lang.pm:180
#, c-format
msgid "Azerbaijan"
msgstr "阿塞拜疆"
# ../drakfw_.c:
-#: lang.pm:176
+#: lang.pm:181
#, c-format
msgid "Bosnia and Herzegovina"
msgstr "波黑"
-#: lang.pm:177
+#: lang.pm:182
#, c-format
msgid "Barbados"
msgstr "巴巴多斯"
-#: lang.pm:178
+#: lang.pm:183
#, c-format
msgid "Bangladesh"
msgstr "孟加拉"
-#: lang.pm:180
+#: lang.pm:185
#, c-format
msgid "Burkina Faso"
msgstr "布基纳法索"
-#: lang.pm:181
+#: lang.pm:186
#, c-format
msgid "Bulgaria"
msgstr "保加利亚"
-#: lang.pm:182
+#: lang.pm:187
#, c-format
msgid "Bahrain"
msgstr "巴林"
-#: lang.pm:183
+#: lang.pm:188
#, c-format
msgid "Burundi"
msgstr "布隆迪"
-#: lang.pm:184
+#: lang.pm:189
#, c-format
msgid "Benin"
msgstr "贝宁"
-#: lang.pm:185
+#: lang.pm:190
#, c-format
msgid "Bermuda"
msgstr "百慕大"
-#: lang.pm:186
+#: lang.pm:191
#, c-format
msgid "Brunei Darussalam"
msgstr "文莱达鲁萨兰国"
-#: lang.pm:187
+#: lang.pm:192
#, c-format
msgid "Bolivia"
msgstr "玻利维亚"
-#: lang.pm:188
+#: lang.pm:193
#, c-format
msgid "Brazil"
msgstr "巴西"
-#: lang.pm:189
+#: lang.pm:194
#, c-format
msgid "Bahamas"
msgstr "巴哈马"
-#: lang.pm:190
+#: lang.pm:195
#, c-format
msgid "Bhutan"
msgstr "不丹"
-#: lang.pm:191
+#: lang.pm:196
#, c-format
msgid "Bouvet Island"
msgstr "布维岛"
-#: lang.pm:192
+#: lang.pm:197
#, c-format
msgid "Botswana"
msgstr "博茨瓦纳"
-#: lang.pm:193
+#: lang.pm:198
#, c-format
msgid "Belarus"
msgstr "白俄罗斯"
-#: lang.pm:194
+#: lang.pm:199
#, c-format
msgid "Belize"
msgstr "伯利兹"
-#: lang.pm:195
+#: lang.pm:200
#, c-format
msgid "Canada"
msgstr "加拿大"
-#: lang.pm:196
+#: lang.pm:201
#, c-format
msgid "Cocos (Keeling) Islands"
msgstr "科科斯群岛"
-#: lang.pm:197
+#: lang.pm:202
#, c-format
msgid "Congo (Kinshasa)"
msgstr "刚果(金沙萨)"
-#: lang.pm:198
+#: lang.pm:203
#, c-format
msgid "Central African Republic"
msgstr "中非共和国"
-#: lang.pm:199
+#: lang.pm:204
#, c-format
msgid "Congo (Brazzaville)"
msgstr "刚果(布拉柴维尔)"
-#: lang.pm:200
+#: lang.pm:205
#, c-format
msgid "Switzerland"
msgstr "瑞士"
-#: lang.pm:201
+#: lang.pm:206
#, c-format
msgid "Cote d'Ivoire"
msgstr "科特迪瓦"
-#: lang.pm:202
+#: lang.pm:207
#, c-format
msgid "Cook Islands"
msgstr "库克群岛"
-#: lang.pm:203
+#: lang.pm:208
#, c-format
msgid "Chile"
msgstr "智利"
-#: lang.pm:204
+#: lang.pm:209
#, c-format
msgid "Cameroon"
msgstr "喀麦隆"
-#: lang.pm:205
+#: lang.pm:210
#, c-format
msgid "China"
msgstr "中国"
-#: lang.pm:206
+#: lang.pm:211
#, c-format
msgid "Colombia"
msgstr "哥伦比亚"
-#: lang.pm:208
+#: lang.pm:213
#, c-format
msgid "Cuba"
msgstr "古巴"
-#: lang.pm:209
+#: lang.pm:214
#, c-format
msgid "Cape Verde"
msgstr "佛得角"
-#: lang.pm:210
+#: lang.pm:215
#, c-format
msgid "Christmas Island"
msgstr "圣诞岛"
-#: lang.pm:211
+#: lang.pm:216
#, c-format
msgid "Cyprus"
msgstr "塞浦路斯"
-#: lang.pm:214
+#: lang.pm:219
#, c-format
msgid "Djibouti"
msgstr "吉布提"
-#: lang.pm:215
+#: lang.pm:220
#, c-format
msgid "Denmark"
msgstr "丹麦"
-#: lang.pm:216
+#: lang.pm:221
#, c-format
msgid "Dominica"
msgstr "多米尼加"
-#: lang.pm:217
+#: lang.pm:222
#, c-format
msgid "Dominican Republic"
msgstr "多米尼加共和国"
-#: lang.pm:218
+#: lang.pm:223
#, c-format
msgid "Algeria"
msgstr "阿尔及利亚"
-#: lang.pm:219
+#: lang.pm:224
#, c-format
msgid "Ecuador"
msgstr "厄瓜多尔"
-#: lang.pm:220
+#: lang.pm:225
#, c-format
msgid "Estonia"
msgstr "爱沙尼亚"
-#: lang.pm:221
+#: lang.pm:226
#, c-format
msgid "Egypt"
msgstr "埃及"
-#: lang.pm:222
+#: lang.pm:227
#, c-format
msgid "Western Sahara"
msgstr "西撒哈拉"
-#: lang.pm:223
+#: lang.pm:228
#, c-format
msgid "Eritrea"
msgstr "厄立特里亚"
-#: lang.pm:224 network/adsl_consts.pm:193 network/adsl_consts.pm:200
-#: network/adsl_consts.pm:209 network/adsl_consts.pm:220
+#: lang.pm:229 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:225
+#: lang.pm:230
#, c-format
msgid "Ethiopia"
msgstr "埃塞俄比亚"
-#: lang.pm:226 network/adsl_consts.pm:119
+#: lang.pm:231 network/adsl_consts.pm:127
#, c-format
msgid "Finland"
msgstr "芬兰"
-#: lang.pm:227
+#: lang.pm:232
#, c-format
msgid "Fiji"
msgstr "斐济"
-#: lang.pm:228
+#: lang.pm:233
#, c-format
msgid "Falkland Islands (Malvinas)"
msgstr "福克兰群岛(马尔维纳斯)"
-#: lang.pm:229
+#: lang.pm:234
#, c-format
msgid "Micronesia"
msgstr "密克罗尼西亚"
-#: lang.pm:230
+#: lang.pm:235
#, c-format
msgid "Faroe Islands"
msgstr "法罗群岛"
-#: lang.pm:232
+#: lang.pm:237
#, c-format
msgid "Gabon"
msgstr "加蓬"
-#: lang.pm:233 network/adsl_consts.pm:237 network/adsl_consts.pm:244
+#: lang.pm:238 network/adsl_consts.pm:247 network/adsl_consts.pm:255
#: network/netconnect.pm:51
#, c-format
msgid "United Kingdom"
msgstr "英国"
-#: lang.pm:234
+#: lang.pm:239
#, c-format
msgid "Grenada"
msgstr "格林纳达"
-#: lang.pm:235
+#: lang.pm:240
#, c-format
msgid "Georgia"
msgstr "乔治亚"
-#: lang.pm:236
+#: lang.pm:241
#, c-format
msgid "French Guiana"
msgstr "法属圭亚那"
-#: lang.pm:237
+#: lang.pm:242
#, c-format
msgid "Ghana"
msgstr "加纳"
-#: lang.pm:238
+#: lang.pm:243
#, c-format
msgid "Gibraltar"
msgstr "直布罗陀"
-#: lang.pm:239
+#: lang.pm:244
#, c-format
msgid "Greenland"
msgstr "格陵兰"
-#: lang.pm:240
+#: lang.pm:245
#, c-format
msgid "Gambia"
msgstr "冈比亚"
-#: lang.pm:241
+#: lang.pm:246
#, c-format
msgid "Guinea"
msgstr "几内亚"
-#: lang.pm:242
+#: lang.pm:247
#, c-format
msgid "Guadeloupe"
msgstr "瓜德洛普"
-#: lang.pm:243
+#: lang.pm:248
#, c-format
msgid "Equatorial Guinea"
msgstr "赤道几内亚"
-#: lang.pm:245
+#: lang.pm:250
#, c-format
msgid "South Georgia and the South Sandwich Islands"
msgstr "南乔治亚岛和南桑德韦奇岛"
-#: lang.pm:246
+#: lang.pm:251
#, c-format
msgid "Guatemala"
msgstr "危地马拉"
-#: lang.pm:247
+#: lang.pm:252
#, c-format
msgid "Guam"
msgstr "关岛"
-#: lang.pm:248
+#: lang.pm:253
#, c-format
msgid "Guinea-Bissau"
msgstr "几内亚比绍"
-#: lang.pm:249
+#: lang.pm:254
#, c-format
msgid "Guyana"
msgstr "圭亚那"
-#: lang.pm:250
+#: lang.pm:255
#, c-format
msgid "China (Hong Kong)"
msgstr "中国香港"
-#: lang.pm:251
+#: lang.pm:256
#, c-format
msgid "Heard and McDonald Islands"
msgstr "赫德和麦克唐纳群岛"
-#: lang.pm:252
+#: lang.pm:257
#, c-format
msgid "Honduras"
msgstr "洪都拉斯"
-#: lang.pm:253
+#: lang.pm:258
#, c-format
msgid "Croatia"
msgstr "克罗地亚"
-#: lang.pm:254
+#: lang.pm:259
#, c-format
msgid "Haiti"
msgstr "海地"
-#: lang.pm:255 network/adsl_consts.pm:144
+#: lang.pm:260 network/adsl_consts.pm:152
#, c-format
msgid "Hungary"
msgstr "匈牙利"
-#: lang.pm:256
+#: lang.pm:261
#, c-format
msgid "Indonesia"
msgstr "印度尼西亚"
-#: lang.pm:257 standalone/drakxtv:48
+#: lang.pm:262 standalone/drakxtv:48
#, c-format
msgid "Ireland"
msgstr "爱尔兰"
-#: lang.pm:258
+#: lang.pm:263
#, c-format
msgid "Israel"
msgstr "以色列"
-#: lang.pm:259
+#: lang.pm:264
#, c-format
msgid "India"
msgstr "印度"
-#: lang.pm:260
+#: lang.pm:265
#, c-format
msgid "British Indian Ocean Territory"
msgstr "英属印度洋地区"
-#: lang.pm:261
+#: lang.pm:266
#, c-format
msgid "Iraq"
msgstr "伊拉克"
-#: lang.pm:262
+#: lang.pm:267
#, c-format
msgid "Iran"
msgstr "伊朗"
-#: lang.pm:263
+#: lang.pm:268
#, c-format
msgid "Iceland"
msgstr "冰岛"
-#: lang.pm:265
+#: lang.pm:270
#, c-format
msgid "Jamaica"
msgstr "牙买加"
-#: lang.pm:266
+#: lang.pm:271
#, c-format
msgid "Jordan"
msgstr "约旦"
-#: lang.pm:267
+#: lang.pm:272
#, c-format
msgid "Japan"
msgstr "日本"
-#: lang.pm:268
+#: lang.pm:273
#, c-format
msgid "Kenya"
msgstr "肯尼亚"
-#: lang.pm:269
+#: lang.pm:274
#, c-format
msgid "Kyrgyzstan"
msgstr "吉尔吉斯斯坦"
-#: lang.pm:270
+#: lang.pm:275
#, c-format
msgid "Cambodia"
msgstr "柬埔寨"
-#: lang.pm:271
+#: lang.pm:276
#, c-format
msgid "Kiribati"
msgstr "基里巴斯"
-#: lang.pm:272
+#: lang.pm:277
#, c-format
msgid "Comoros"
msgstr "科摩罗"
-#: lang.pm:273
+#: lang.pm:278
#, c-format
msgid "Saint Kitts and Nevis"
msgstr "圣基茨和尼维斯"
-#: lang.pm:274
+#: lang.pm:279
#, c-format
msgid "Korea (North)"
msgstr "朝鲜"
-#: lang.pm:275
+#: lang.pm:280
#, c-format
msgid "Korea"
msgstr "韩国"
-#: lang.pm:276
+#: lang.pm:281
#, c-format
msgid "Kuwait"
msgstr "科威特"
-#: lang.pm:277
+#: lang.pm:282
#, c-format
msgid "Cayman Islands"
msgstr "开曼群岛"
-#: lang.pm:278
+#: lang.pm:283
#, c-format
msgid "Kazakhstan"
msgstr "哈萨克斯坦"
-#: lang.pm:279
+#: lang.pm:284
#, c-format
msgid "Laos"
msgstr "老挝"
-#: lang.pm:280
+#: lang.pm:285
#, c-format
msgid "Lebanon"
msgstr "黎巴嫩"
-#: lang.pm:281
+#: lang.pm:286
#, c-format
msgid "Saint Lucia"
msgstr "圣卢西亚"
-#: lang.pm:282
+#: lang.pm:287
#, c-format
msgid "Liechtenstein"
msgstr "列支敦士登"
-#: lang.pm:283
+#: lang.pm:288
#, c-format
msgid "Sri Lanka"
msgstr "斯里兰卡"
-#: lang.pm:284
+#: lang.pm:289
#, c-format
msgid "Liberia"
msgstr "利比里亚"
-#: lang.pm:285
+#: lang.pm:290
#, c-format
msgid "Lesotho"
msgstr "莱索托"
-#: lang.pm:286
+#: lang.pm:291
#, c-format
msgid "Lithuania"
msgstr "立陶宛"
-#: lang.pm:287
+#: lang.pm:292
#, c-format
msgid "Luxembourg"
msgstr "卢森堡"
-#: lang.pm:288
+#: lang.pm:293
#, c-format
msgid "Latvia"
msgstr "拉脱维亚"
-#: lang.pm:289
+#: lang.pm:294
#, c-format
msgid "Libya"
msgstr "利比亚"
-#: lang.pm:290
+#: lang.pm:295
#, c-format
msgid "Morocco"
msgstr "摩洛哥"
-#: lang.pm:291
+#: lang.pm:296
#, c-format
msgid "Monaco"
msgstr "摩纳哥"
-#: lang.pm:292
+#: lang.pm:297
#, c-format
msgid "Moldova"
msgstr "摩尔多瓦"
-#: lang.pm:293
+#: lang.pm:298
#, c-format
msgid "Madagascar"
msgstr "马达加斯加"
-#: lang.pm:294
+#: lang.pm:299
#, c-format
msgid "Marshall Islands"
msgstr "马绍尔群岛"
# ../drakfwia"
-#: lang.pm:295
+#: lang.pm:300
#, c-format
msgid "Macedonia"
msgstr "马其顿"
-#: lang.pm:296
+#: lang.pm:301
#, c-format
msgid "Mali"
msgstr "马里"
-#: lang.pm:297
+#: lang.pm:302
#, c-format
msgid "Myanmar"
msgstr "缅甸"
-#: lang.pm:298
+#: lang.pm:303
#, c-format
msgid "Mongolia"
msgstr "蒙古"
-#: lang.pm:299
+#: lang.pm:304
#, c-format
msgid "Northern Mariana Islands"
msgstr "北马里亚那岛"
-#: lang.pm:300
+#: lang.pm:305
#, c-format
msgid "Martinique"
msgstr "马提尼克"
-#: lang.pm:301
+#: lang.pm:306
#, c-format
msgid "Mauritania"
msgstr "毛里塔尼亚"
-#: lang.pm:302
+#: lang.pm:307
#, c-format
msgid "Montserrat"
msgstr "蒙特塞拉特"
-#: lang.pm:303
+#: lang.pm:308
#, c-format
msgid "Malta"
msgstr "马耳他"
-#: lang.pm:304
+#: lang.pm:309
#, c-format
msgid "Mauritius"
msgstr "毛里求斯"
-#: lang.pm:305
+#: lang.pm:310
#, c-format
msgid "Maldives"
msgstr "马尔代夫"
-#: lang.pm:306
+#: lang.pm:311
#, c-format
msgid "Malawi"
msgstr "马拉维"
-#: lang.pm:307
+#: lang.pm:312
#, c-format
msgid "Mexico"
msgstr "墨西哥"
-#: lang.pm:308
+#: lang.pm:313
#, c-format
msgid "Malaysia"
msgstr "马来西亚"
-#: lang.pm:309
+#: lang.pm:314
#, c-format
msgid "Mozambique"
msgstr "莫桑比克"
-#: lang.pm:310
+#: lang.pm:315
#, c-format
msgid "Namibia"
msgstr "纳米比亚"
-#: lang.pm:311
+#: lang.pm:316
#, c-format
msgid "New Caledonia"
msgstr "新喀里多尼亚"
-#: lang.pm:312
+#: lang.pm:317
#, c-format
msgid "Niger"
msgstr "尼日尔"
-#: lang.pm:313
+#: lang.pm:318
#, c-format
msgid "Norfolk Island"
msgstr "诺福克岛"
-#: lang.pm:314
+#: lang.pm:319
#, c-format
msgid "Nigeria"
msgstr "尼日利亚"
-#: lang.pm:315
+#: lang.pm:320
#, c-format
msgid "Nicaragua"
msgstr "尼加拉瓜"
-#: lang.pm:318
+#: lang.pm:323
#, c-format
msgid "Nepal"
msgstr "尼泊尔"
-#: lang.pm:319
+#: lang.pm:324
#, c-format
msgid "Nauru"
msgstr "瑙鲁"
-#: lang.pm:320
+#: lang.pm:325
#, c-format
msgid "Niue"
msgstr "纽埃"
-#: lang.pm:321
+#: lang.pm:326
#, c-format
msgid "New Zealand"
msgstr "新西兰"
-#: lang.pm:322
+#: lang.pm:327
#, c-format
msgid "Oman"
msgstr "阿曼"
-#: lang.pm:323
+#: lang.pm:328
#, c-format
msgid "Panama"
msgstr "巴拿马"
-#: lang.pm:324
+#: lang.pm:329
#, c-format
msgid "Peru"
msgstr "秘鲁"
-#: lang.pm:325
+#: lang.pm:330
#, c-format
msgid "French Polynesia"
msgstr "法属玻利尼西亚"
-#: lang.pm:326
+#: lang.pm:331
#, c-format
msgid "Papua New Guinea"
msgstr "巴布亚新几内亚"
-#: lang.pm:327
+#: lang.pm:332
#, c-format
msgid "Philippines"
msgstr "菲律宾"
-#: lang.pm:328
+#: lang.pm:333
#, c-format
msgid "Pakistan"
msgstr "巴基斯坦"
-#: lang.pm:329 network/adsl_consts.pm:177
+#: lang.pm:334 network/adsl_consts.pm:186
#, c-format
msgid "Poland"
msgstr "波兰"
-#: lang.pm:330
+#: lang.pm:335
#, c-format
msgid "Saint Pierre and Miquelon"
msgstr "圣皮埃尔岛及密克隆岛"
-#: lang.pm:331
+#: lang.pm:336
#, c-format
msgid "Pitcairn"
msgstr "皮特克恩"
-#: lang.pm:332
+#: lang.pm:337
#, c-format
msgid "Puerto Rico"
msgstr "波多黎各"
-#: lang.pm:333
+#: lang.pm:338
#, c-format
msgid "Palestine"
msgstr "巴勒斯坦"
-#: lang.pm:334 network/adsl_consts.pm:187
+#: lang.pm:339 network/adsl_consts.pm:196
#, c-format
msgid "Portugal"
msgstr "葡萄牙"
-#: lang.pm:335
+#: lang.pm:340
#, c-format
msgid "Paraguay"
msgstr "巴拉圭"
-#: lang.pm:336
+#: lang.pm:341
#, c-format
msgid "Palau"
msgstr "帕劳"
-#: lang.pm:337
+#: lang.pm:342
#, c-format
msgid "Qatar"
msgstr "卡塔尔"
-#: lang.pm:338
+#: lang.pm:343
#, c-format
msgid "Reunion"
msgstr "留尼旺"
-#: lang.pm:339
+#: lang.pm:344
#, c-format
msgid "Romania"
msgstr "罗马尼亚"
-#: lang.pm:340
+#: lang.pm:345
#, c-format
msgid "Russia"
msgstr "俄罗斯"
-#: lang.pm:341
+#: lang.pm:346
#, c-format
msgid "Rwanda"
msgstr "卢旺达"
-#: lang.pm:342
+#: lang.pm:347
#, c-format
msgid "Saudi Arabia"
msgstr "沙特阿拉伯"
-#: lang.pm:343
+#: lang.pm:348
#, c-format
msgid "Solomon Islands"
msgstr "所罗门群岛"
-#: lang.pm:344
+#: lang.pm:349
#, c-format
msgid "Seychelles"
msgstr "塞舌尔"
-#: lang.pm:345
+#: lang.pm:350
#, c-format
msgid "Sudan"
msgstr "苏丹"
-#: lang.pm:347
+#: lang.pm:352
#, c-format
msgid "Singapore"
msgstr "新加坡"
-#: lang.pm:348
+#: lang.pm:353
#, c-format
msgid "Saint Helena"
msgstr "圣·海伦娜"
-#: lang.pm:349
+#: lang.pm:354
#, c-format
msgid "Slovenia"
msgstr "斯洛文尼亚"
-#: lang.pm:350
+#: lang.pm:355
#, c-format
msgid "Svalbard and Jan Mayen Islands"
msgstr "斯马尔巴特和扬马延岛"
-#: lang.pm:351
+#: lang.pm:356
#, c-format
msgid "Slovakia"
msgstr "斯洛伐克"
-#: lang.pm:352
+#: lang.pm:357
#, c-format
msgid "Sierra Leone"
msgstr "塞拉利昂"
-#: lang.pm:353
+#: lang.pm:358
#, c-format
msgid "San Marino"
msgstr "圣马力诺"
-#: lang.pm:354
+#: lang.pm:359
#, c-format
msgid "Senegal"
msgstr "塞内加尔"
-#: lang.pm:355
+#: lang.pm:360
#, c-format
msgid "Somalia"
msgstr "索马里"
-#: lang.pm:356
+#: lang.pm:361
#, c-format
msgid "Suriname"
msgstr "苏里南"
-#: lang.pm:357
+#: lang.pm:362
#, c-format
msgid "Sao Tome and Principe"
msgstr "圣多美和普林西比"
-#: lang.pm:358
+#: lang.pm:363
#, c-format
msgid "El Salvador"
msgstr "萨尔瓦多"
-#: lang.pm:359
+#: lang.pm:364
#, c-format
msgid "Syria"
msgstr "叙利亚"
-#: lang.pm:360
+#: lang.pm:365
#, c-format
msgid "Swaziland"
msgstr "斯威士兰"
-#: lang.pm:361
+#: lang.pm:366
#, c-format
msgid "Turks and Caicos Islands"
msgstr "特克斯和凯科斯群岛"
-#: lang.pm:362
+#: lang.pm:367
#, c-format
msgid "Chad"
msgstr "乍得"
-#: lang.pm:363
+#: lang.pm:368
#, c-format
msgid "French Southern Territories"
msgstr "法国南方属地"
-#: lang.pm:364
+#: lang.pm:369
#, c-format
msgid "Togo"
msgstr "多哥"
-#: lang.pm:365
+#: lang.pm:370
#, c-format
msgid "Thailand"
msgstr "泰国"
-#: lang.pm:366
+#: lang.pm:371
#, c-format
msgid "Tajikistan"
msgstr "塔吉克斯坦"
-#: lang.pm:367
+#: lang.pm:372
#, c-format
msgid "Tokelau"
msgstr "托克劳群岛"
-#: lang.pm:368
+#: lang.pm:373
#, c-format
msgid "East Timor"
msgstr "东帝汶"
-#: lang.pm:369
+#: lang.pm:374
#, c-format
msgid "Turkmenistan"
msgstr "土库曼斯坦"
-#: lang.pm:370
+#: lang.pm:375
#, c-format
msgid "Tunisia"
msgstr "突尼斯"
-#: lang.pm:371
+#: lang.pm:376
#, c-format
msgid "Tonga"
msgstr "汤加"
-#: lang.pm:372
+#: lang.pm:377
#, c-format
msgid "Turkey"
msgstr "土耳其"
-#: lang.pm:373
+#: lang.pm:378
#, c-format
msgid "Trinidad and Tobago"
msgstr "特立尼达和多巴哥岛"
-#: lang.pm:374
+#: lang.pm:379
#, c-format
msgid "Tuvalu"
msgstr "图瓦卢"
-#: lang.pm:375
+#: lang.pm:380
#, c-format
msgid "Taiwan"
msgstr "中国台湾"
-#: lang.pm:376
+#: lang.pm:381
#, c-format
msgid "Tanzania"
msgstr "坦桑尼亚"
-#: lang.pm:377
+#: lang.pm:382
#, c-format
msgid "Ukraine"
msgstr "乌克兰"
-#: lang.pm:378
+#: lang.pm:383
#, c-format
msgid "Uganda"
msgstr "乌干达"
-#: lang.pm:379
+#: lang.pm:384
#, c-format
msgid "United States Minor Outlying Islands"
msgstr "美属本土外岛屿"
-#: lang.pm:381
+#: lang.pm:386
#, c-format
msgid "Uruguay"
msgstr "乌拉圭"
-#: lang.pm:382
+#: lang.pm:387
#, c-format
msgid "Uzbekistan"
msgstr "乌兹别克斯坦"
-#: lang.pm:383
+#: lang.pm:388
#, c-format
msgid "Vatican"
msgstr "梵蒂冈"
-#: lang.pm:384
+#: lang.pm:389
#, c-format
msgid "Saint Vincent and the Grenadines"
msgstr "圣文森特和格林纳丁斯"
-#: lang.pm:385
+#: lang.pm:390
#, c-format
msgid "Venezuela"
msgstr "委内瑞拉"
-#: lang.pm:386
+#: lang.pm:391
#, c-format
msgid "Virgin Islands (British)"
msgstr "英属维京群岛"
-#: lang.pm:387
+#: lang.pm:392
#, c-format
msgid "Virgin Islands (U.S.)"
msgstr "美属维京群岛"
-#: lang.pm:388
+#: lang.pm:393
#, c-format
msgid "Vietnam"
msgstr "越南"
-#: lang.pm:389
+#: lang.pm:394
#, c-format
msgid "Vanuatu"
msgstr "瓦努阿图"
-#: lang.pm:390
+#: lang.pm:395
#, c-format
msgid "Wallis and Futuna"
msgstr "瓦利斯和富图纳群岛"
-#: lang.pm:391
+#: lang.pm:396
#, c-format
msgid "Samoa"
msgstr "萨摩亚"
-#: lang.pm:392
+#: lang.pm:397
#, c-format
msgid "Yemen"
msgstr "也门"
-#: lang.pm:393
+#: lang.pm:398
#, c-format
msgid "Mayotte"
msgstr "马约特岛"
-#: lang.pm:394
+#: lang.pm:399
#, c-format
msgid "Serbia & Montenegro"
msgstr "塞尔维亚和黑山"
-#: lang.pm:395 standalone/drakxtv:50
+#: lang.pm:400 standalone/drakxtv:50
#, c-format
msgid "South Africa"
msgstr "南非"
-#: lang.pm:396
+#: lang.pm:401
#, c-format
msgid "Zambia"
msgstr "赞比亚"
-#: lang.pm:397
+#: lang.pm:402
#, c-format
msgid "Zimbabwe"
msgstr "津巴布韦"
-#: lang.pm:966
+#: lang.pm:983
#, c-format
msgid "Welcome to %s"
msgstr "欢迎使用 %s"
@@ -8723,7 +8749,7 @@ msgstr "循环装载 %s\n"
msgid "Remove the logical volumes first\n"
msgstr "请先删除逻辑卷\n"
-#: modules/interactive.pm:21 standalone/drakconnect:962
+#: modules/interactive.pm:21 standalone/drakconnect:959
#, c-format
msgid "Parameters"
msgstr "参数"
@@ -8891,12 +8917,11 @@ msgstr "普通 PS2 滚轮鼠标"
msgid "GlidePoint"
msgstr "GlidePoint"
-#: mouse.pm:36 network/modem.pm:23 network/modem.pm:37 network/modem.pm:42
-#: network/modem.pm:73 network/netconnect.pm:481 network/netconnect.pm:482
-#: network/netconnect.pm:483 network/netconnect.pm:503
-#: network/netconnect.pm:508 network/netconnect.pm:520
-#: network/netconnect.pm:525 network/netconnect.pm:541
-#: network/netconnect.pm:543
+#: 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
#, c-format
msgid "Automatic"
msgstr "自动"
@@ -9041,7 +9066,7 @@ msgstr "通用"
msgid "Any PS/2 & USB mice"
msgstr "任何 PS/2 或 USB 鼠标"
-#: mouse.pm:92
+#: mouse.pm:92 standalone/drakvpn:1138
#, c-format
msgid "none"
msgstr "无"
@@ -9101,12 +9126,12 @@ msgstr "Sagem(使用 pppoa) USB"
msgid "Sagem (using dhcp) usb"
msgstr "Sagem(使用 dhcp) USB"
-#: network/adsl.pm:35 network/netconnect.pm:679
+#: network/adsl.pm:35 network/netconnect.pm:754
#, c-format
msgid "Connect to the Internet"
msgstr "连接到 Internet"
-#: network/adsl.pm:36 network/netconnect.pm:680
+#: network/adsl.pm:36 network/netconnect.pm:755
#, c-format
msgid ""
"The most common way to connect with adsl is pppoe.\n"
@@ -9117,7 +9142,7 @@ msgstr ""
"有一些利用 pptp，还有极少数利用 dhcp。\n"
"如果您没有把握，就选择“pppoe”"
-#: network/adsl.pm:41 network/netconnect.pm:684
+#: network/adsl.pm:41 network/netconnect.pm:759
#, c-format
msgid "ADSL connection type :"
msgstr "ADSL 连接类型: "
@@ -9182,13 +9207,13 @@ msgstr "没有网卡"
msgid ""
"drakfirewall configurator\n"
"\n"
-"This configures a personal firewall for this Mandrake Linux machine.\n"
+"This configures a personal firewall for this Mandrakelinux machine.\n"
"For a powerful and dedicated firewall solution, please look to the\n"
"specialized MandrakeSecurity Firewall distribution."
msgstr ""
"“Drak 防火墙”配置\n"
"\n"
-"此程序可为您的 Mandrake Linux 机器配置个人防火墙。\n"
+"此程序可为您的 Mandrakelinux 机器配置个人防火墙。\n"
"如果要配置强大的专用防火墙，请考虑使用专门的\n"
"MandrakeSecurity 防火墙发行版。"
@@ -9213,11 +9238,11 @@ msgstr "您想要允许 Internet 连接到哪些服务？"
#, c-format
msgid ""
"You can enter miscellaneous ports. \n"
-"Valid examples are: 139/tcp 139/udp.\n"
+"Valid examples are: 139/tcp 139/udp 600:610/tcp 600:610/udp.\n"
"Have a look at /etc/services for information."
msgstr ""
"您可以输入各种端口。\n"
-"例如，可以这样: 139/tcp 139/udp。\n"
+"例如，可以这样: 139/tcp 139/udp 600:610/tcp 600:610/udp。\n"
"请参考 /etc/services 文件。"
#: network/drakfirewall.pm:176
@@ -9245,321 +9270,272 @@ msgstr "全部(无防火墙)"
msgid "Other ports"
msgstr "其它端口"
-#: network/isdn.pm:127 network/isdn.pm:145 network/isdn.pm:157
-#: network/isdn.pm:163 network/isdn.pm:173 network/isdn.pm:183
-#: network/netconnect.pm:332
-#, c-format
-msgid "ISDN Configuration"
-msgstr "ISDN 配置"
-
-#: network/isdn.pm:127
-#, c-format
-msgid ""
-"Select your provider.\n"
-"If it isn't listed, choose Unlisted."
-msgstr ""
-"选择您的提供商。\n"
-"如果该提供商未被列出，请选择“未列出”。"
-
-#: network/isdn.pm:140 standalone/drakconnect:503
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "欧洲协议(EDSS1)"
-
-#: network/isdn.pm:140
+#: network/isdn.pm:113 network/netconnect.pm:424
#, c-format
-msgid "European protocol"
-msgstr "欧洲协议"
+msgid "Unlisted - edit manually"
+msgstr "未列出 - 手动编辑"
-#: network/isdn.pm:142 standalone/drakconnect:504
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"世界其它地区的协议\n"
-"没有 D-信道(专线)"
-
-#: network/isdn.pm:142
-#, c-format
-msgid "Protocol for the rest of the world"
-msgstr "世界其它地区的协议"
-
-#: network/isdn.pm:146
-#, c-format
-msgid "Which protocol do you want to use?"
-msgstr "您将使用哪种协议？"
-
-#: network/isdn.pm:157
-#, c-format
-msgid "Found \"%s\" interface do you want to use it ?"
-msgstr "找到了“%s”接口，您想要使用吗？"
-
-#: network/isdn.pm:164
-#, c-format
-msgid "What kind of card do you have?"
-msgstr "请问您适配卡的种类？"
-
-#: network/isdn.pm:165
+#: network/isdn.pm:156 network/netconnect.pm:376
#, c-format
msgid "ISA / PCMCIA"
msgstr "ISA / PCMCIA"
-#: network/isdn.pm:165
+#: network/isdn.pm:156 network/netconnect.pm:376
+#, c-format
+msgid "I don't know"
+msgstr "我不知道"
+
+#: network/isdn.pm:157 network/netconnect.pm:376
#, c-format
msgid "PCI"
msgstr "PCI"
-#: network/isdn.pm:165
+#: network/isdn.pm:158 network/netconnect.pm:376
#, c-format
msgid "USB"
msgstr "USB"
-#: network/isdn.pm:165
-#, c-format
-msgid "I don't know"
-msgstr "我不知道"
-
-#: network/isdn.pm:174
-#, c-format
-msgid ""
-"\n"
-"If you have an ISA card, the values on the next screen should be right.\n"
-"\n"
-"If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your "
-"card.\n"
-msgstr ""
-"\n"
-"如果您的卡是 ISA 卡，下一屏幕显示的值应该是正确的。\n"
-"\n"
-"如果您的卡是 PCMCIA 卡，您必须知道它的“irq”和“io”。\n"
-
-#: network/isdn.pm:178
+#: network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
+#: network/netconnect.pm:579 network/netconnect.pm:596
+#: network/netconnect.pm:612
#, c-format
-msgid "Continue"
-msgstr "继续"
+msgid "Manual"
+msgstr "手动"
-#: network/isdn.pm:178
+#: network/netconnect.pm:88 network/netconnect.pm:453
+#: network/netconnect.pm:463 network/netconnect.pm:822
+#: network/netconnect.pm:827
#, c-format
-msgid "Abort"
-msgstr "中止"
+msgid "Manual choice"
+msgstr "手动选择"
-#: network/isdn.pm:184
+#: network/netconnect.pm:88
#, c-format
-msgid "Which of the following is your ISDN card?"
-msgstr "下列哪个是您的 ISDN 卡？"
+msgid "Internal ISDN card"
+msgstr "内置 ISDN 卡"
-#: network/netconnect.pm:95
+#: network/netconnect.pm:97
#, c-format
msgid "Ad-hoc"
msgstr "Ad-hoc"
-#: network/netconnect.pm:96
+#: network/netconnect.pm:98
#, c-format
msgid "Managed"
msgstr "受控的"
-#: network/netconnect.pm:97
+#: network/netconnect.pm:99
#, c-format
msgid "Master"
msgstr "主要的"
-#: network/netconnect.pm:98
+#: network/netconnect.pm:100
#, c-format
msgid "Repeater"
msgstr "转发器"
-#: network/netconnect.pm:99
+#: network/netconnect.pm:101
#, c-format
msgid "Secondary"
msgstr "次要的"
-#: network/netconnect.pm:100
+#: network/netconnect.pm:102
#, c-format
msgid "Auto"
msgstr "自动"
-#: network/netconnect.pm:103 printer/printerdrake.pm:1118
+#: network/netconnect.pm:105 printer/printerdrake.pm:1133
+#: standalone/drakups:64
#, c-format
msgid "Manual configuration"
msgstr "手工配置"
-#: network/netconnect.pm:104
+#: network/netconnect.pm:106
#, c-format
msgid "Automatic IP (BOOTP/DHCP)"
msgstr "自动 IP(BOOTP/DHCP)"
-#: network/netconnect.pm:106
+#: network/netconnect.pm:108
#, c-format
msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
msgstr "自动 IP(BOOTP/DHCP/Zeroconf)"
-#: network/netconnect.pm:156
+#: network/netconnect.pm:111
+#, c-format
+msgid "Protocol for the rest of the world"
+msgstr "世界其它地区的协议"
+
+#: network/netconnect.pm:113 standalone/drakconnect:528
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "欧洲协议(EDSS1)"
+
+#: network/netconnect.pm:114 standalone/drakconnect:529
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"世界其它地区的协议\n"
+"没有 D-信道(专线)"
+
+#: network/netconnect.pm:146
#, c-format
msgid "Alcatel speedtouch USB modem"
msgstr "阿尔卡特 Speedtouch USB 调制解调器"
-#: network/netconnect.pm:157
+#: network/netconnect.pm:147
#, c-format
msgid "Sagem USB modem"
msgstr "Sagem USB 调制解调器"
-#: network/netconnect.pm:158
-#, c-format
-msgid "Bewan USB modem"
-msgstr "Bewan USB 调制解调器"
-
-#: network/netconnect.pm:159
+#: network/netconnect.pm:148
#, c-format
-msgid "Bewan PCI modem"
-msgstr "Bewan PCI 调制解调器"
+msgid "Bewan modem"
+msgstr "Bewan 调制解调器"
-#: network/netconnect.pm:160
+#: network/netconnect.pm:149
#, c-format
msgid "ECI Hi-Focus modem"
msgstr "ECI Hi-Focus 调制解调器"
-#: network/netconnect.pm:164
+#: network/netconnect.pm:153
#, c-format
msgid "Dynamic Host Configuration Protocol (DHCP)"
msgstr "动态主机配置协议(DHCP)"
-#: network/netconnect.pm:165
+#: network/netconnect.pm:154
#, c-format
msgid "Manual TCP/IP configuration"
msgstr "手工配置 TCP/IP"
-#: network/netconnect.pm:166
+#: network/netconnect.pm:155
#, c-format
msgid "Point to Point Tunneling Protocol (PPTP)"
msgstr "点对点隧道协议(PPTP)"
-#: network/netconnect.pm:167
+#: network/netconnect.pm:156
#, c-format
msgid "PPP over Ethernet (PPPoE)"
msgstr "以太网上的点对点协议(PPPoE)"
-#: network/netconnect.pm:168
+#: network/netconnect.pm:157
#, c-format
msgid "PPP over ATM (PPPoA)"
msgstr "异步传输模式下的点对点协议(PPPoA)"
-#: network/netconnect.pm:172
+#: network/netconnect.pm:161
#, c-format
msgid "Bridged Ethernet LLC"
msgstr "桥接以太网 LLC"
-#: network/netconnect.pm:173
+#: network/netconnect.pm:162
#, c-format
msgid "Bridged Ethernet VC"
msgstr "桥接以太网 VC"
-#: network/netconnect.pm:174
+#: network/netconnect.pm:163
#, c-format
msgid "Routed IP LLC"
msgstr "路由 IP LLC"
-#: network/netconnect.pm:175
+#: network/netconnect.pm:164
#, c-format
msgid "Routed IP VC"
msgstr "路由 IP VC"
-#: network/netconnect.pm:176
+#: network/netconnect.pm:165
#, c-format
msgid "PPPOA LLC"
msgstr "PPPOA LLC"
-#: network/netconnect.pm:177
+#: network/netconnect.pm:166
#, c-format
msgid "PPPOA VC"
msgstr "PPPOA VC"
-#: network/netconnect.pm:181 standalone/drakconnect:443
-#: standalone/drakconnect:917
+#: network/netconnect.pm:170 standalone/drakconnect:466
#, c-format
msgid "Script-based"
msgstr "基于脚本登录"
-#: network/netconnect.pm:182 standalone/drakconnect:443
-#: standalone/drakconnect:917
+#: network/netconnect.pm:171 standalone/drakconnect:466
#, c-format
msgid "PAP"
msgstr "PAP"
-#: network/netconnect.pm:183 standalone/drakconnect:443
-#: standalone/drakconnect:917
+#: network/netconnect.pm:172 standalone/drakconnect:466
#, c-format
msgid "Terminal-based"
msgstr "基于终端"
-#: network/netconnect.pm:184 standalone/drakconnect:443
-#: standalone/drakconnect:917
+#: network/netconnect.pm:173 standalone/drakconnect:466
#, c-format
msgid "CHAP"
msgstr "CHAP"
-#: network/netconnect.pm:185
+#: network/netconnect.pm:174 standalone/drakconnect:466
#, c-format
msgid "PAP/CHAP"
msgstr "PAP/CHAP"
-#: network/netconnect.pm:199 standalone/drakconnect:54
+#: network/netconnect.pm:219 standalone/drakconnect:55
#, c-format
msgid "Network & Internet Configuration"
msgstr "网络和 Internet 配置"
-#: network/netconnect.pm:205
+#: network/netconnect.pm:225
#, c-format
msgid "(detected on port %s)"
msgstr "(在端口 %s 检测到)"
#. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:207
+#: network/netconnect.pm:227
#, c-format
msgid "(detected %s)"
msgstr "(检测到 %s)"
-#: network/netconnect.pm:207
+#: network/netconnect.pm:227
#, c-format
msgid "(detected)"
msgstr "(检测到)"
-#: network/netconnect.pm:209
+#: network/netconnect.pm:229
#, c-format
msgid "Modem connection"
msgstr "调制解调器连接"
-#: network/netconnect.pm:210
+#: network/netconnect.pm:230
#, c-format
msgid "ISDN connection"
msgstr "ISDN 连接"
-#: network/netconnect.pm:211
+#: network/netconnect.pm:231
#, c-format
msgid "ADSL connection"
msgstr "ADSL 连接"
-#: network/netconnect.pm:212
+#: network/netconnect.pm:232
#, c-format
msgid "Cable connection"
msgstr "有线电缆连接"
-#: network/netconnect.pm:213
+#: network/netconnect.pm:233
#, c-format
msgid "LAN connection"
msgstr "局域网连接"
-#: network/netconnect.pm:214 network/netconnect.pm:228
+#: network/netconnect.pm:234 network/netconnect.pm:248
#, c-format
msgid "Wireless connection"
msgstr "无线连接"
-#: network/netconnect.pm:224
+#: network/netconnect.pm:244
#, c-format
msgid "Choose the connection you want to configure"
msgstr "选择您想要配置的连接"
-#: network/netconnect.pm:241
+#: network/netconnect.pm:261
#, c-format
msgid ""
"We are now going to configure the %s connection.\n"
@@ -9572,138 +9548,191 @@ msgstr ""
"\n"
"按“%s”继续。"
-#: network/netconnect.pm:249 network/netconnect.pm:710
+#: network/netconnect.pm:269 network/netconnect.pm:781
#, c-format
msgid "Connection Configuration"
msgstr "连接配置"
-#: network/netconnect.pm:250 network/netconnect.pm:711
+#: network/netconnect.pm:270 network/netconnect.pm:782
#, c-format
msgid "Please fill or check the field below"
msgstr "请填写或选择下列项目"
-#: network/netconnect.pm:256 standalone/drakconnect:494
-#: standalone/drakconnect:899
+#: network/netconnect.pm:277 standalone/drakconnect:519
#, c-format
msgid "Card IRQ"
msgstr "网卡的 IRQ"
-#: network/netconnect.pm:257 standalone/drakconnect:495
-#: standalone/drakconnect:900
+#: network/netconnect.pm:278 standalone/drakconnect:520
#, c-format
msgid "Card mem (DMA)"
msgstr "网卡内存(DMA)"
-#: network/netconnect.pm:258 standalone/drakconnect:496
-#: standalone/drakconnect:901
+#: network/netconnect.pm:279 standalone/drakconnect:521
#, c-format
msgid "Card IO"
msgstr "网卡 IO"
-#: network/netconnect.pm:259 standalone/drakconnect:497
-#: standalone/drakconnect:902
+#: network/netconnect.pm:280 standalone/drakconnect:522
#, c-format
msgid "Card IO_0"
msgstr "网卡 IO_0"
-#: network/netconnect.pm:260 standalone/drakconnect:903
+#: network/netconnect.pm:281
#, c-format
msgid "Card IO_1"
msgstr "网卡 IO_1"
-#: network/netconnect.pm:261 standalone/drakconnect:904
+#: network/netconnect.pm:282
#, c-format
msgid "Your personal phone number"
msgstr "您自己的电话号码"
-#: network/netconnect.pm:262 network/netconnect.pm:714
-#: standalone/drakconnect:905
+#: network/netconnect.pm:283 network/netconnect.pm:785
#, c-format
msgid "Provider name (ex provider.net)"
msgstr "服务商名称(如 provider.net)"
-#: network/netconnect.pm:263 standalone/drakconnect:440
-#: standalone/drakconnect:906
+#: network/netconnect.pm:284 standalone/drakconnect:463
#, c-format
msgid "Provider phone number"
msgstr "服务商电话号码"
-#: network/netconnect.pm:264
+#: network/netconnect.pm:285
#, c-format
msgid "Provider DNS 1 (optional)"
msgstr "服务商 DNS 1(可选)"
-#: network/netconnect.pm:265
+#: network/netconnect.pm:286
#, c-format
msgid "Provider DNS 2 (optional)"
msgstr "服务商 DNS 2(可选)"
-#: network/netconnect.pm:266 standalone/drakconnect:396
-#: standalone/drakconnect:462 standalone/drakconnect:911
+#: network/netconnect.pm:287 standalone/drakconnect:419
#, c-format
msgid "Dialing mode"
msgstr "拨号模式"
-#: network/netconnect.pm:267 standalone/drakconnect:401
-#: standalone/drakconnect:459 standalone/drakconnect:923
+#: network/netconnect.pm:288 standalone/drakconnect:424
+#: standalone/drakconnect:484
#, c-format
msgid "Connection speed"
msgstr "连接速率"
-#: network/netconnect.pm:268 standalone/drakconnect:406
-#: standalone/drakconnect:924
+#: network/netconnect.pm:289 standalone/drakconnect:429
#, c-format
msgid "Connection timeout (in sec)"
msgstr "连接超时(秒)"
-#: network/netconnect.pm:271 network/netconnect.pm:717
-#: standalone/drakconnect:438 standalone/drakconnect:909
+#: network/netconnect.pm:292 network/netconnect.pm:788
+#: standalone/drakconnect:461
#, c-format
msgid "Account Login (user name)"
msgstr "账户登录(用户名)"
-#: network/netconnect.pm:272 network/netconnect.pm:718
-#: standalone/drakconnect:439 standalone/drakconnect:910
-#: standalone/drakconnect:944
+#: network/netconnect.pm:293 network/netconnect.pm:789
+#: standalone/drakconnect:462
#, c-format
msgid "Account Password"
msgstr "账户密码"
-#: network/netconnect.pm:300
+#: network/netconnect.pm:323 network/netconnect.pm:637
+#: network/netconnect.pm:820
#, c-format
-msgid "What kind is your ISDN connection?"
-msgstr "您的 ISDN 连接是什么类型？"
+msgid "Select the network interface to configure:"
+msgstr "选择要配置的网卡: "
-#: network/netconnect.pm:301
+#: network/netconnect.pm:323 network/netconnect.pm:457
+#: network/netconnect.pm:641 standalone/drakgw:113 standalone/drakvpn:49
#, c-format
-msgid "Internal ISDN card"
-msgstr "内置 ISDN 卡"
+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
+#, c-format
+msgid "Net Device"
+msgstr "网络设备"
-#: network/netconnect.pm:301
+#: network/netconnect.pm:326 network/netconnect.pm:334
#, c-format
msgid "External ISDN modem"
msgstr "外置 ISDN 调制解调器"
-#: network/netconnect.pm:332
+#: network/netconnect.pm:365 standalone/harddrake2:115
#, c-format
-msgid "Do you want to start a new configuration ?"
-msgstr "您想要开始新配置吗？"
+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
+#, c-format
+msgid "ISDN Configuration"
+msgstr "ISDN 配置"
+
+#: network/netconnect.pm:375
+#, c-format
+msgid "What kind of card do you have?"
+msgstr "请问您适配卡的种类？"
+
+#: network/netconnect.pm:385
+#, c-format
+msgid ""
+"\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
+"\n"
+"If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your "
+"card.\n"
+msgstr ""
+"\n"
+"如果您的卡是 ISA 卡，下一屏幕显示的值应该是正确的。\n"
+"\n"
+"如果您的卡是 PCMCIA 卡，您必须知道它的“irq”和“io”。\n"
+
+#: network/netconnect.pm:389
+#, c-format
+msgid "Continue"
+msgstr "继续"
+
+#: network/netconnect.pm:389
+#, c-format
+msgid "Abort"
+msgstr "中止"
+
+#: network/netconnect.pm:395
+#, c-format
+msgid "Which of the following is your ISDN card?"
+msgstr "下列哪个是您的 ISDN 卡？"
+
+#: network/netconnect.pm:410
+#, c-format
+msgid "Which protocol do you want to use?"
+msgstr "您将使用哪种协议？"
+
+#: network/netconnect.pm:412 standalone/drakconnect:116
+#: standalone/drakconnect:527 standalone/drakvpn:1140
+#, c-format
+msgid "Protocol"
+msgstr "协议"
-#: network/netconnect.pm:335
+#: network/netconnect.pm:421
#, c-format
msgid ""
-"I have detected an ISDN PCI card, but I don't know its type. Please select a "
-"PCI card on the next screen."
+"Select your provider.\n"
+"If it isn't listed, choose Unlisted."
msgstr ""
-"我检测到一块 ISDN PCI 卡，不过无法识别它的型号。请在下一屏幕里选择您的 PCI "
-"卡。"
+"选择您的提供商。\n"
+"如果该提供商未被列出，请选择“未列出”。"
-#: network/netconnect.pm:344
+#: network/netconnect.pm:423 network/netconnect.pm:529
+#: network/netconnect.pm:675
#, c-format
-msgid "No ISDN PCI card found. Please select one on the next screen."
-msgstr "没有探测到 ISDN PCI 卡。请在下一屏幕里挑选一种。"
+msgid "Provider:"
+msgstr "服务商:"
-#: network/netconnect.pm:353
+#: network/netconnect.pm:438
#, c-format
msgid ""
"Your modem isn't supported by the system.\n"
@@ -9712,140 +9741,117 @@ msgstr ""
"您的调制解调器不被系统支持。\n"
"请看看 http://www.linmodems.org"
-#: network/netconnect.pm:364
+#: network/netconnect.pm:450
#, c-format
msgid "Select the modem to configure:"
msgstr "选择要配置的调制解调器:"
-#: network/netconnect.pm:403
+#: network/netconnect.pm:498
#, c-format
msgid "Please choose which serial port your modem is connected to."
msgstr "请选择您的调制解调器是连接到哪个串行端口。"
-#: network/netconnect.pm:427
+#: network/netconnect.pm:527
#, c-format
msgid "Select your provider:"
msgstr "选择您的服务商:"
-#: network/netconnect.pm:429 network/netconnect.pm:599
-#, c-format
-msgid "Provider:"
-msgstr "服务商:"
-
-#: network/netconnect.pm:481 network/netconnect.pm:482
-#: network/netconnect.pm:483 network/netconnect.pm:508
-#: network/netconnect.pm:525 network/netconnect.pm:541
-#, c-format
-msgid "Manual"
-msgstr "手动"
-
-#: network/netconnect.pm:485
+#: network/netconnect.pm:556
#, c-format
msgid "Dialup: account options"
msgstr "拨号: 账户设置"
-#: network/netconnect.pm:488 standalone/drakconnect:913
+#: network/netconnect.pm:559
#, c-format
msgid "Connection name"
msgstr "连接名称"
-#: network/netconnect.pm:489 standalone/drakconnect:914
+#: network/netconnect.pm:560
#, c-format
msgid "Phone number"
msgstr "电话号码"
-#: network/netconnect.pm:490 standalone/drakconnect:915
+#: network/netconnect.pm:561
#, c-format
msgid "Login ID"
msgstr "登录 ID"
-#: network/netconnect.pm:505 network/netconnect.pm:538
+#: network/netconnect.pm:576 network/netconnect.pm:609
#, c-format
msgid "Dialup: IP parameters"
msgstr "拨号: IP 参数"
-#: network/netconnect.pm:508
+#: network/netconnect.pm:579
#, c-format
msgid "IP parameters"
msgstr "IP 参数"
-#: network/netconnect.pm:509 network/netconnect.pm:829
-#: printer/printerdrake.pm:431 standalone/drakconnect:113
-#: standalone/drakconnect:306 standalone/drakconnect:764
+#: network/netconnect.pm:580 network/netconnect.pm:912
+#: printer/printerdrake.pm:431 standalone/drakconnect:116
+#: standalone/drakconnect:325 standalone/drakconnect:806
+#: standalone/drakups:266
#, c-format
msgid "IP address"
msgstr "IP 地址"
-#: network/netconnect.pm:510
+#: network/netconnect.pm:581
#, c-format
msgid "Subnet mask"
msgstr "子网掩码"
-#: network/netconnect.pm:522
+#: network/netconnect.pm:593
#, c-format
msgid "Dialup: DNS parameters"
msgstr "拨号: DNS 参数"
-#: network/netconnect.pm:525
+#: network/netconnect.pm:596
#, c-format
msgid "DNS"
msgstr "DNS"
-#: network/netconnect.pm:526 standalone/drakconnect:918
+#: network/netconnect.pm:597
#, c-format
msgid "Domain name"
msgstr "域名"
-#: network/netconnect.pm:527 network/netconnect.pm:715
-#: standalone/drakconnect:919
+#: network/netconnect.pm:598 network/netconnect.pm:786
+#: standalone/drakconnect:924
#, c-format
msgid "First DNS Server (optional)"
msgstr "首选 DNS 服务器(可选)"
-#: network/netconnect.pm:528 network/netconnect.pm:716
-#: standalone/drakconnect:920
+#: network/netconnect.pm:599 network/netconnect.pm:787
+#: standalone/drakconnect:925
#, c-format
msgid "Second DNS Server (optional)"
msgstr "备选 DNS 服务器(可选)"
-#: network/netconnect.pm:529
+#: network/netconnect.pm:600
#, c-format
msgid "Set hostname from IP"
msgstr "由 IP 设置主机名"
-#: network/netconnect.pm:541 standalone/drakconnect:317
-#: standalone/drakconnect:912
+#: network/netconnect.pm:612 standalone/drakconnect:336
#, c-format
msgid "Gateway"
msgstr "网关"
-#: network/netconnect.pm:542
+#: network/netconnect.pm:613
#, c-format
msgid "Gateway IP address"
msgstr "网关 IP 地址"
-#: network/netconnect.pm:567
+#: network/netconnect.pm:637
#, c-format
msgid "ADSL configuration"
msgstr "ADSL 配置"
-#: network/netconnect.pm:567 network/netconnect.pm:746
-#, c-format
-msgid "Select the network interface to configure:"
-msgstr "选择要配置的网卡: "
-
-#: network/netconnect.pm:568 network/netconnect.pm:748 network/shorewall.pm:77
-#: standalone/drakconnect:602 standalone/drakgw:218 standalone/drakvpn:217
-#, c-format
-msgid "Net Device"
-msgstr "网络设备"
-
-#: network/netconnect.pm:597
+#: network/netconnect.pm:673
#, c-format
msgid "Please choose your ADSL provider"
msgstr "请选择您的 ADSL 提供商"
-#: network/netconnect.pm:616
+#: network/netconnect.pm:691
#, c-format
msgid ""
"You need the Alcatel microcode.\n"
@@ -9856,32 +9862,32 @@ msgstr ""
"您可以通过软盘或您的 Windows 分区提供该微代码,\n"
"或者现在跳过稍后再做。"
-#: network/netconnect.pm:620 network/netconnect.pm:625
+#: network/netconnect.pm:695 network/netconnect.pm:700
#, c-format
msgid "Use a floppy"
msgstr "使用软盘"
-#: network/netconnect.pm:620 network/netconnect.pm:629
+#: network/netconnect.pm:695 network/netconnect.pm:704
#, c-format
msgid "Use my Windows partition"
msgstr "使用我的 Windows 分区"
-#: network/netconnect.pm:620 network/netconnect.pm:633
+#: network/netconnect.pm:695 network/netconnect.pm:708
#, c-format
msgid "Do it later"
msgstr "稍后再做"
-#: network/netconnect.pm:640
+#: network/netconnect.pm:715
#, c-format
msgid "Firmware copy failed, file %s not found"
msgstr "固件复制失败，文件 %s 未找到"
-#: network/netconnect.pm:647
+#: network/netconnect.pm:722
#, c-format
msgid "Firmware copy succeeded"
msgstr "固件复制成功"
-#: network/netconnect.pm:662
+#: network/netconnect.pm:737
#, c-format
msgid ""
"You need the Alcatel microcode.\n"
@@ -9894,22 +9900,22 @@ msgstr ""
"%s\n"
"下载并将 mgmt.o 复制到 /usr/share/speedtouch"
-#: network/netconnect.pm:719
+#: network/netconnect.pm:790
#, c-format
msgid "Virtual Path ID (VPI):"
msgstr "虚拟路径 ID (VPI):"
-#: network/netconnect.pm:720
+#: network/netconnect.pm:791
#, c-format
msgid "Virtual Circuit ID (VCI):"
msgstr "虚拟电路 ID (VCI):"
-#: network/netconnect.pm:721
+#: network/netconnect.pm:793
#, c-format
msgid "Encapsulation :"
msgstr "封装: "
-#: network/netconnect.pm:736
+#: network/netconnect.pm:810
#, c-format
msgid ""
"The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -9921,17 +9927,7 @@ msgstr ""
"\n"
"您可以在此网站: http://eciadsl.flashtux.org/ 找到驱动程序。"
-#: network/netconnect.pm:753
-#, c-format
-msgid "No wireless network adapter on your system!"
-msgstr "您系统中没有无线网卡！"
-
-#: network/netconnect.pm:754 standalone/drakgw:240 standalone/drakpxe:137
-#, c-format
-msgid "No network adapter on your system!"
-msgstr "您系统中没有网卡！"
-
-#: network/netconnect.pm:766
+#: network/netconnect.pm:837
#, c-format
msgid ""
"WARNING: this device has been previously configured to connect to the "
@@ -9943,24 +9939,33 @@ msgstr ""
"要保留现有的配置只要选择确定。\n"
"修改以下的项目将覆盖此配置。"
-#: network/netconnect.pm:784
+#: network/netconnect.pm:850 network/netconnect.pm:1222
+#, c-format
+msgid ""
+"Congratulations, the network and Internet configuration is finished.\n"
+"\n"
+msgstr ""
+"恭喜，网络和 Internet 配置完成。\n"
+"\n"
+
+#: network/netconnect.pm:864
#, c-format
msgid "Zeroconf hostname resolution"
msgstr "Zeroconf 主机名解析"
-#: network/netconnect.pm:785 network/netconnect.pm:816
+#: network/netconnect.pm:865 network/netconnect.pm:899
#, c-format
msgid "Configuring network device %s (driver %s)"
msgstr "配置网络设备 %s(驱动程序 %s)"
-#: network/netconnect.pm:786
+#: network/netconnect.pm:866
#, 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:817
+#: network/netconnect.pm:900
#, c-format
msgid ""
"Please enter the IP configuration for this machine.\n"
@@ -9971,89 +9976,89 @@ msgstr ""
"下列项目要求以句点分隔十进制格式输入的 IP 地址。\n"
"(例如，1.2.3.4)"
-#: network/netconnect.pm:824
+#: network/netconnect.pm:907
#, c-format
msgid "Assign host name from DHCP address"
msgstr "从 DHCP 地址指定主机名"
-#: network/netconnect.pm:825
+#: network/netconnect.pm:908
#, c-format
msgid "DHCP host name"
msgstr "DHCP 主机名"
-#: network/netconnect.pm:830 standalone/drakconnect:311
-#: standalone/drakconnect:765 standalone/drakgw:313
+#: network/netconnect.pm:913 standalone/drakconnect:330
+#: standalone/drakconnect:807 standalone/drakgw:321
#, c-format
msgid "Netmask"
msgstr "子网掩码"
-#: network/netconnect.pm:832 standalone/drakconnect:389
+#: network/netconnect.pm:915 standalone/drakconnect:412
#, c-format
msgid "Track network card id (useful for laptops)"
msgstr "跟踪网卡标志(用于笔记本电脑)"
-#: network/netconnect.pm:833 standalone/drakconnect:390
+#: network/netconnect.pm:916 standalone/drakconnect:413
#, c-format
msgid "Network Hotplugging"
msgstr "网络热插拔"
-#: network/netconnect.pm:834 standalone/drakconnect:384
+#: network/netconnect.pm:917 standalone/drakconnect:407
#, c-format
msgid "Start at boot"
msgstr "开机时启动"
-#: network/netconnect.pm:836 standalone/drakconnect:768
+#: network/netconnect.pm:919 standalone/drakconnect:810
#, c-format
msgid "DHCP client"
msgstr "DHCP 客户端"
-#: network/netconnect.pm:846 printer/printerdrake.pm:1349
-#: standalone/drakconnect:569
+#: network/netconnect.pm:929 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:849
+#: network/netconnect.pm:932
#, c-format
msgid "Warning : IP address %s is usually reserved !"
msgstr "警告: IP 地址 %s 通常是被保留的！"
-#: network/netconnect.pm:879 network/netconnect.pm:908
+#: network/netconnect.pm:962 network/netconnect.pm:991
#, c-format
msgid "Please enter the wireless parameters for this card:"
msgstr "请选择此网卡的无线参数:"
-#: network/netconnect.pm:882 standalone/drakconnect:355
+#: network/netconnect.pm:965 standalone/drakconnect:378
#, c-format
msgid "Operating Mode"
msgstr "操作模式"
-#: network/netconnect.pm:884 standalone/drakconnect:356
+#: network/netconnect.pm:967 standalone/drakconnect:379
#, c-format
msgid "Network name (ESSID)"
msgstr "网络名称(ESSID)"
-#: network/netconnect.pm:885 standalone/drakconnect:357
+#: network/netconnect.pm:968 standalone/drakconnect:380
#, c-format
msgid "Network ID"
msgstr "网络 ID"
-#: network/netconnect.pm:886 standalone/drakconnect:358
+#: network/netconnect.pm:969 standalone/drakconnect:381
#, c-format
msgid "Operating frequency"
msgstr "运行频率"
-#: network/netconnect.pm:887 standalone/drakconnect:359
+#: network/netconnect.pm:970 standalone/drakconnect:382
#, c-format
msgid "Sensitivity threshold"
msgstr "灵敏度阀值"
-#: network/netconnect.pm:888 standalone/drakconnect:360
+#: network/netconnect.pm:971 standalone/drakconnect:383
#, c-format
msgid "Bitrate (in b/s)"
msgstr "比特率(每秒比特数，b/s)"
-#: network/netconnect.pm:894
+#: network/netconnect.pm:977
#, c-format
msgid ""
"Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -10062,19 +10067,19 @@ msgstr ""
"频率应该有后缀 k，M 或 G(如“2.46G”代表 2.46 GHz 频率)，或者后带足够"
"的“0”(零)。"
-#: network/netconnect.pm:898
+#: network/netconnect.pm:981
#, 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:911 standalone/drakconnect:371
+#: network/netconnect.pm:994 standalone/drakconnect:394
#, c-format
msgid "RTS/CTS"
msgstr "RTS/CTS"
-#: network/netconnect.pm:912
+#: network/netconnect.pm:995
#, c-format
msgid ""
"RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -10093,17 +10098,17 @@ msgstr ""
"包\n"
"的大小，一个等于中止计划的值的大小。您也可以设置这个值为自动、固定或者关闭。"
-#: network/netconnect.pm:919 standalone/drakconnect:372
+#: network/netconnect.pm:1002 standalone/drakconnect:395
#, c-format
msgid "Fragmentation"
msgstr "块"
-#: network/netconnect.pm:920 standalone/drakconnect:373
+#: network/netconnect.pm:1003 standalone/drakconnect:396
#, c-format
msgid "Iwconfig command extra arguments"
msgstr "Iwconfig 命令的额外参数"
-#: network/netconnect.pm:921
+#: network/netconnect.pm:1004
#, c-format
msgid ""
"Here, one can configure some extra wireless parameters such as:\n"
@@ -10119,12 +10124,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:928 standalone/drakconnect:374
+#: network/netconnect.pm:1011 standalone/drakconnect:397
#, c-format
msgid "Iwspy command extra arguments"
msgstr "Iwspy 命令的额外参数"
-#: network/netconnect.pm:929
+#: network/netconnect.pm:1012
#, c-format
msgid ""
"Iwspy is used to set a list of addresses in a wireless network\n"
@@ -10142,12 +10147,12 @@ msgstr ""
"\n"
"请参看 iwpspy(8) man page 中的更多信息。"
-#: network/netconnect.pm:937 standalone/drakconnect:375
+#: network/netconnect.pm:1020 standalone/drakconnect:398
#, c-format
msgid "Iwpriv command extra arguments"
msgstr "Iwpriv 命令的额外参数"
-#: network/netconnect.pm:938
+#: network/netconnect.pm:1021
#, c-format
msgid ""
"Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10176,7 +10181,7 @@ msgstr ""
"\n"
"请参看 iwpriv(8) man page 中的更多信息。"
-#: network/netconnect.pm:965
+#: network/netconnect.pm:1048
#, c-format
msgid ""
"No ethernet network adapter has been detected on your system.\n"
@@ -10185,18 +10190,18 @@ msgstr ""
"没有在您的系统里发现以太网卡。\n"
"无法设置这个连接类型。"
-#: network/netconnect.pm:969 standalone/drakgw:254 standalone/drakpxe:142
+#: network/netconnect.pm:1052 standalone/drakgw:261 standalone/drakpxe:142
#, c-format
msgid "Choose the network interface"
msgstr "选择网卡"
-#: network/netconnect.pm:970
+#: network/netconnect.pm:1053
#, c-format
msgid ""
"Please choose which network adapter you want to use to connect to Internet."
msgstr "请选择您想要使用哪块网卡来连接 Internet。"
-#: network/netconnect.pm:991
+#: network/netconnect.pm:1074
#, c-format
msgid ""
"Please enter your host name.\n"
@@ -10208,67 +10213,67 @@ msgstr ""
"您的主机名称必需是个完全限定的名称，例如“mybox.mylab.myco.com”。\n"
"如果您有网关的话，也请输入其 IP 地址。"
-#: network/netconnect.pm:995
+#: network/netconnect.pm:1078
#, c-format
msgid "Last but not least you can also type in your DNS server IP addresses."
msgstr "最后，您还应该至少输入您 DNS 服务器的 IP 地址。"
-#: network/netconnect.pm:997
+#: network/netconnect.pm:1080 standalone/drakconnect:923
#, c-format
msgid "Host name (optional)"
msgstr "主机名(可选)"
-#: network/netconnect.pm:997
+#: network/netconnect.pm:1080
#, c-format
msgid "Host name"
msgstr "主机名"
-#: network/netconnect.pm:998
+#: network/netconnect.pm:1082
#, c-format
msgid "DNS server 1"
msgstr "DNS 服务器 1"
-#: network/netconnect.pm:999
+#: network/netconnect.pm:1083
#, c-format
msgid "DNS server 2"
msgstr "DNS 服务器 2"
-#: network/netconnect.pm:1000
+#: network/netconnect.pm:1084
#, c-format
msgid "DNS server 3"
msgstr "DNS 服务器 3"
-#: network/netconnect.pm:1001
+#: network/netconnect.pm:1085
#, c-format
msgid "Search domain"
msgstr "搜索网域"
-#: network/netconnect.pm:1002
+#: network/netconnect.pm:1086
#, c-format
msgid "By default search domain will be set from the fully-qualified host name"
msgstr "默认情况下，搜索域名将会根据完全限定的主机名进行设定"
-#: network/netconnect.pm:1003
+#: network/netconnect.pm:1087
#, c-format
msgid "Gateway (e.g. %s)"
msgstr "网关(如 %s)"
-#: network/netconnect.pm:1005
+#: network/netconnect.pm:1089
#, c-format
msgid "Gateway device"
msgstr "网关设备"
-#: network/netconnect.pm:1014
+#: network/netconnect.pm:1098
#, c-format
msgid "DNS server address should be in format 1.2.3.4"
msgstr "DNS 服务器的格式应该是 1.2.3.4"
-#: network/netconnect.pm:1019 standalone/drakconnect:571
+#: network/netconnect.pm:1103 standalone/drakconnect:611
#, c-format
msgid "Gateway address should be in format 1.2.3.4"
msgstr "网关地址的格式应该是 1.2.3.4"
-#: network/netconnect.pm:1030
+#: network/netconnect.pm:1114
#, c-format
msgid ""
"Enter a Zeroconf host name which will be the one that your machine will get "
@@ -10277,17 +10282,17 @@ msgstr ""
"请输入一个 Zeroconf 主机名，您的计算机将会按照该主机中的说明来实现与网络中其"
"它计算机的互联:"
-#: network/netconnect.pm:1031
+#: network/netconnect.pm:1115
#, c-format
msgid "Zeroconf Host name"
msgstr "Zeroconf 主机名"
-#: network/netconnect.pm:1034
+#: network/netconnect.pm:1118
#, c-format
msgid "Zeroconf host name must not contain a ."
msgstr "Zeroconf 主机名不能包含“.”"
-#: network/netconnect.pm:1044
+#: network/netconnect.pm:1128
#, c-format
msgid ""
"You have configured multiple ways to connect to the Internet.\n"
@@ -10298,32 +10303,32 @@ msgstr ""
"选择您要使用的一种。\n"
"\n"
-#: network/netconnect.pm:1046
+#: network/netconnect.pm:1130
#, c-format
msgid "Internet connection"
msgstr "Internet 连接"
-#: network/netconnect.pm:1054
+#: network/netconnect.pm:1144
#, c-format
msgid "Configuration is complete, do you want to apply settings ?"
msgstr "配置完成，您想要应用设置吗？"
-#: network/netconnect.pm:1070
+#: network/netconnect.pm:1154
#, c-format
msgid "Do you want to start the connection at boot?"
msgstr "您是否希望一开机就启动连接？"
-#: network/netconnect.pm:1094
+#: network/netconnect.pm:1166
#, c-format
msgid "The network needs to be restarted. Do you want to restart it ?"
msgstr "网络需要重新启动。您要重新启动吗？"
-#: network/netconnect.pm:1100 network/netconnect.pm:1165
+#: network/netconnect.pm:1173 network/netconnect.pm:1238
#, c-format
msgid "Network Configuration"
msgstr "网络配置"
-#: network/netconnect.pm:1101
+#: network/netconnect.pm:1174
#, c-format
msgid ""
"A problem occured while restarting the network: \n"
@@ -10334,27 +10339,27 @@ msgstr ""
"\n"
"%s"
-#: network/netconnect.pm:1110
+#: network/netconnect.pm:1182
#, c-format
msgid "Do you want to try to connect to the Internet now?"
msgstr "您想要测试连接到 Internet 吗？"
-#: network/netconnect.pm:1118 standalone/drakconnect:958
+#: network/netconnect.pm:1190 standalone/drakconnect:955
#, c-format
msgid "Testing your connection..."
msgstr "正在测试您的连接..."
-#: network/netconnect.pm:1134
+#: network/netconnect.pm:1206
#, c-format
msgid "The system is now connected to the Internet."
msgstr "您的系统现在正连接到 Internet。"
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1207
#, c-format
msgid "For security reasons, it will be disconnected now."
msgstr "由于安全原因，现在将断开连接。"
-#: network/netconnect.pm:1136
+#: network/netconnect.pm:1208
#, c-format
msgid ""
"The system doesn't seem to be connected to the Internet.\n"
@@ -10363,23 +10368,14 @@ msgstr ""
"看来系统没有连接到 Internet。\n"
"请重新尝试配置您的连接。"
-#: network/netconnect.pm:1150
-#, c-format
-msgid ""
-"Congratulations, the network and Internet configuration is finished.\n"
-"\n"
-msgstr ""
-"恭喜，网络和 Internet 配置完成。\n"
-"\n"
-
-#: network/netconnect.pm:1153
+#: network/netconnect.pm:1225
#, c-format
msgid ""
"After this is done, we recommend that you restart your X environment to "
"avoid any hostname-related problems."
msgstr "建议重启动 X 环境以避免任何于主机名有关的问题。"
-#: network/netconnect.pm:1154
+#: network/netconnect.pm:1226
#, c-format
msgid ""
"Problems occured during configuration.\n"
@@ -10390,7 +10386,7 @@ msgstr ""
"请从网络监视器或者控制中心测试您的连接。如果您的连接不工作，您可能想要重新配"
"置。"
-#: network/netconnect.pm:1166
+#: network/netconnect.pm:1239
#, c-format
msgid ""
"Because you are doing a network installation, your network is already "
@@ -10401,67 +10397,75 @@ msgstr ""
"由于您正在执行网络安装，您的网络已经配置好了。\n"
"单击“确定”保存配置，或“取消”重新配置网络。\n"
-#: network/network.pm:314
+#: network/netconnect.pm:1327
+#, c-format
+msgid ""
+"An unexpected error has happened:\n"
+"%s"
+msgstr ""
+"发生了意外错误: \n"
+"%s"
+
+#: network/network.pm:315
#, c-format
msgid "Proxies configuration"
msgstr "代理服务器配置"
-#: network/network.pm:315
+#: network/network.pm:316
#, c-format
msgid "HTTP proxy"
msgstr "HTTP 代理服务器"
-#: network/network.pm:316
+#: network/network.pm:317
#, c-format
msgid "FTP proxy"
msgstr "FTP 代理服务器"
-#: network/network.pm:319
+#: network/network.pm:320
#, c-format
msgid "Proxy should be http://..."
msgstr "代理服务器应该是 http://..."
-#: network/network.pm:320
+#: network/network.pm:321
#, c-format
msgid "URL should begin with 'ftp:' or 'http:'"
msgstr "URL 应该是以“ftp:”或“http:”开头"
-#: network/shorewall.pm:26
+#: network/shorewall.pm:28
#, c-format
msgid "Firewalling configuration detected!"
msgstr "发现防火墙配置！"
-#: network/shorewall.pm:27
+#: network/shorewall.pm:29
#, c-format
msgid ""
"Warning! An existing firewalling configuration has been detected. You may "
"need some manual fixes after installation."
msgstr "警告！发现原来的配置利用了防火墙功能。您可能需要在安装之后手工修改。"
-#: network/shorewall.pm:70
+#: network/shorewall.pm:77 standalone/drakgw:218 standalone/drakvpn:212
#, c-format
msgid ""
-"Please enter the name of the interface connected to the "
-"internet. \n"
-" \n"
+"Please enter the name of the interface connected to the internet.\n"
+"\n"
"Examples:\n"
-" ppp+ for modem or DSL connections, \n"
-" eth0, or eth1 for cable connection, \n"
-" ippp+ for a isdn connection.\n"
+"\t\tppp+ for modem or DSL connections, \n"
+"\t\teth0, or eth1 for cable connection, \n"
+"\t\tippp+ for a isdn connection.\n"
msgstr ""
"请输入连接到互联网的网卡名称。\n"
"\n"
"例如:\n"
-" ppp+ 代表调制解调器或 DSL 连接，\n"
-" eth0 或 eth1 代表有线电视连接，\n"
-" ippp+ 代表 ISDN 连接。\n"
+"\t\tppp+ 代表调制解调器或 DSL 连接，\n"
+"\t\teth0 或 eth1 代表有线电视连接，\n"
+"\t\tippp+ 代表 ISDN 连接。\n"
-#: network/tools.pm:207
+#: network/tools.pm:205
#, c-format
msgid "Insert floppy"
msgstr "插入软盘"
-#: network/tools.pm:208
+#: network/tools.pm:206
#, c-format
msgid ""
"Insert a FAT formatted floppy in drive %s with %s in root directory and "
@@ -10470,22 +10474,22 @@ msgstr ""
"请在驱动器 %s 中插入一张 FAT 格式的软盘，该软盘要求在根目录有 %s。然后，请按 "
"%s"
-#: network/tools.pm:209
+#: network/tools.pm:207
#, c-format
msgid "Floppy access error, unable to mount device %s"
msgstr "软驱访问错误，无法挂载 %s"
-#: partition_table.pm:642
+#: partition_table.pm:644
#, c-format
msgid "mount failed: "
msgstr "挂载失败: "
-#: partition_table.pm:747
+#: partition_table.pm:749
#, c-format
msgid "Extended partition not supported on this platform"
msgstr "这个平台上不支持扩展分区"
-#: partition_table.pm:765
+#: partition_table.pm:767
#, c-format
msgid ""
"You have a hole in your partition table but I can't use it.\n"
@@ -10495,22 +10499,22 @@ msgstr ""
"分区表里有一段是空的，可是我没法使用它。\n"
"唯一的办法是移动您的主分区，把空闲部分换到与扩展分区相邻的位置。"
-#: partition_table.pm:852
+#: partition_table.pm:854
#, c-format
msgid "Restoring from file %s failed: %s"
msgstr "从文件 %s 恢复失败: %s"
-#: partition_table.pm:854
+#: partition_table.pm:856
#, c-format
msgid "Bad backup file"
msgstr "错误的备份文件"
-#: partition_table.pm:874
+#: partition_table.pm:876
#, c-format
msgid "Error writing to file %s"
msgstr "写入文件 %s 出错"
-#: partition_table/raw.pm:181
+#: partition_table/raw.pm:187
#, c-format
msgid ""
"Something bad is happening on your drive. \n"
@@ -10547,70 +10551,70 @@ msgstr "一般"
msgid "maybe"
msgstr "或许有用"
-#: printer/cups.pm:87
+#: printer/cups.pm:103
#, c-format
msgid "(on %s)"
msgstr "(在 %s)"
-#: printer/cups.pm:87
+#: printer/cups.pm:103
#, c-format
msgid "(on this machine)"
msgstr "(在本机上)"
-#: printer/cups.pm:99 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:197
#, c-format
msgid "Configured on other machines"
msgstr "已在其它计算机上配置"
-#: printer/cups.pm:101
+#: printer/cups.pm:117
#, c-format
msgid "On CUPS server \"%s\""
msgstr "在 CUPS 服务器“%s”"
-#: printer/cups.pm:101 printer/printerdrake.pm:3784
-#: printer/printerdrake.pm:3793 printer/printerdrake.pm:3934
-#: printer/printerdrake.pm:3945 printer/printerdrake.pm:4157
+#: printer/cups.pm:117 printer/printerdrake.pm:3989
+#: printer/printerdrake.pm:3998 printer/printerdrake.pm:4139
+#: printer/printerdrake.pm:4150 printer/printerdrake.pm:4362
#, c-format
msgid " (Default)"
msgstr "(默认)"
-#: printer/data.pm:21
+#: printer/data.pm:22
#, c-format
msgid "PDQ - Print, Don't Queue"
msgstr "PDQ - 打印，不排队"
-#: printer/data.pm:22
+#: printer/data.pm:23
#, c-format
msgid "PDQ"
msgstr "PDQ"
-#: printer/data.pm:33
+#: printer/data.pm:34
#, c-format
msgid "LPD - Line Printer Daemon"
msgstr "LPD - 行式打印向导"
-#: printer/data.pm:34
+#: printer/data.pm:35
#, c-format
msgid "LPD"
msgstr "LPD"
-#: printer/data.pm:55
+#: printer/data.pm:56
#, c-format
msgid "LPRng - LPR New Generation"
msgstr "LPRng - 新一代 LPR"
-#: printer/data.pm:56
+#: printer/data.pm:57
#, c-format
msgid "LPRng"
msgstr "LPRng"
-#: printer/data.pm:81
+#: printer/data.pm:82
#, c-format
msgid "CUPS - Common Unix Printing System"
msgstr "CUPS - 公共 Unix 打印系统"
#: printer/detect.pm:148 printer/detect.pm:226 printer/detect.pm:428
-#: printer/detect.pm:465 printer/printerdrake.pm:679
+#: printer/detect.pm:465 printer/printerdrake.pm:686
#, c-format
msgid "Unknown Model"
msgstr "未知型号"
@@ -10630,7 +10634,7 @@ msgstr "远程打印机"
msgid "Printer on remote CUPS server"
msgstr "远程 CUPS 服务器的打印机"
-#: printer/main.pm:31 printer/printerdrake.pm:1372
+#: printer/main.pm:31 printer/printerdrake.pm:1406
#, c-format
msgid "Printer on remote lpd server"
msgstr "远程 lpd 服务器的打印机"
@@ -10650,7 +10654,7 @@ msgstr "SMB/Windows 95/98/NT 服务器上的打印机"
msgid "Printer on NetWare server"
msgstr "NetWare 服务器上的打印机"
-#: printer/main.pm:35 printer/printerdrake.pm:1376
+#: printer/main.pm:35 printer/printerdrake.pm:1410
#, c-format
msgid "Enter a printer device URI"
msgstr "输入打印机设备 URI"
@@ -10661,8 +10665,8 @@ msgid "Pipe job into a command"
msgstr "作业管道定向到命令"
#: printer/main.pm:306 printer/main.pm:574 printer/main.pm:1544
-#: printer/main.pm:2217 printer/printerdrake.pm:1781
-#: printer/printerdrake.pm:4191
+#: printer/main.pm:2228 printer/main.pm:2239 printer/printerdrake.pm:1866
+#: printer/printerdrake.pm:4396
#, c-format
msgid "Unknown model"
msgstr "未知型号"
@@ -10672,12 +10676,12 @@ msgstr "未知型号"
msgid "Configured on this machine"
msgstr "已在本机上配置"
-#: printer/main.pm:337 printer/printerdrake.pm:948
+#: printer/main.pm:337 printer/printerdrake.pm:963
#, c-format
msgid " on parallel port #%s"
msgstr " 位于并行口 #%s"
-#: printer/main.pm:340 printer/printerdrake.pm:950
+#: printer/main.pm:340 printer/printerdrake.pm:965
#, c-format
msgid ", USB printer #%s"
msgstr "，USB 打印机 #%s"
@@ -10747,8 +10751,8 @@ msgstr "，使用命令 %s"
msgid "Parallel port #%s"
msgstr "并行端口 #%s"
-#: printer/main.pm:391 printer/printerdrake.pm:964 printer/printerdrake.pm:987
-#: printer/printerdrake.pm:1005
+#: printer/main.pm:391 printer/printerdrake.pm:979
+#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1020
#, c-format
msgid "USB printer #%s"
msgstr "USB 打印机 #%s"
@@ -10818,8 +10822,8 @@ msgstr "使用命令 %s"
msgid "URI: %s"
msgstr "URI: %s"
-#: printer/main.pm:571 printer/printerdrake.pm:725
-#: printer/printerdrake.pm:2331
+#: printer/main.pm:571 printer/printerdrake.pm:732
+#: printer/printerdrake.pm:2463
#, c-format
msgid "Raw printer (No driver)"
msgstr "直接打印输出(不使用驱动程序)"
@@ -10876,7 +10880,7 @@ msgstr "CUPS 打印机配置"
#, c-format
msgid ""
"Here you can choose whether the printers connected to this machine should be "
-"accessable by remote machines and by which remote machines."
+"accessible by remote machines and by which remote machines."
msgstr ""
"您可以在此选择是否将连接到本机的打印机共享给远程计算机，以及共享给哪些计算"
"机。"
@@ -10908,8 +10912,8 @@ msgstr "在主机/网络上共享打印机:"
msgid "Custom configuration"
msgstr "自定义配置"
-#: printer/printerdrake.pm:78 standalone/scannerdrake:554
-#: standalone/scannerdrake:571
+#: printer/printerdrake.pm:78 standalone/scannerdrake:561
+#: standalone/scannerdrake:578
#, c-format
msgid "No remote machines"
msgstr "没有远程计算机"
@@ -11106,7 +11110,7 @@ msgstr "缺少服务器 IP！"
msgid "The entered IP is not correct.\n"
msgstr "输入的 IP 不正确。\n"
-#: printer/printerdrake.pm:411 printer/printerdrake.pm:1582
+#: printer/printerdrake.pm:411 printer/printerdrake.pm:1629
#, c-format
msgid "The port number should be an integer!"
msgstr "端口须为数字！"
@@ -11116,36 +11120,37 @@ msgstr "端口须为数字！"
msgid "This server is already in the list, it cannot be added again.\n"
msgstr "此服务器已经位于列表中，无法再次添加。\n"
-#: printer/printerdrake.pm:433 printer/printerdrake.pm:1603
-#: standalone/harddrake2:64
+#: printer/printerdrake.pm:433 printer/printerdrake.pm:1650
+#: standalone/drakups:233 standalone/harddrake2:64
#, c-format
msgid "Port"
msgstr "端口"
#: printer/printerdrake.pm:478 printer/printerdrake.pm:545
-#: printer/printerdrake.pm:605 printer/printerdrake.pm:621
-#: printer/printerdrake.pm:704 printer/printerdrake.pm:761
-#: printer/printerdrake.pm:787 printer/printerdrake.pm:1800
-#: printer/printerdrake.pm:1808 printer/printerdrake.pm:1830
-#: printer/printerdrake.pm:1857 printer/printerdrake.pm:1892
-#: printer/printerdrake.pm:1929 printer/printerdrake.pm:1939
-#: printer/printerdrake.pm:2182 printer/printerdrake.pm:2187
-#: printer/printerdrake.pm:2326 printer/printerdrake.pm:2436
-#: printer/printerdrake.pm:2901 printer/printerdrake.pm:2966
-#: printer/printerdrake.pm:3000 printer/printerdrake.pm:3003
-#: printer/printerdrake.pm:3122 printer/printerdrake.pm:3184
-#: printer/printerdrake.pm:3256 printer/printerdrake.pm:3277
-#: printer/printerdrake.pm:3286 printer/printerdrake.pm:3377
-#: printer/printerdrake.pm:3475 printer/printerdrake.pm:3481
-#: printer/printerdrake.pm:3488 printer/printerdrake.pm:3534
-#: printer/printerdrake.pm:3574 printer/printerdrake.pm:3586
-#: printer/printerdrake.pm:3597 printer/printerdrake.pm:3606
-#: printer/printerdrake.pm:3619 printer/printerdrake.pm:3689
-#: printer/printerdrake.pm:3740 printer/printerdrake.pm:3805
-#: printer/printerdrake.pm:4065 printer/printerdrake.pm:4108
-#: printer/printerdrake.pm:4254 printer/printerdrake.pm:4312
-#: printer/printerdrake.pm:4341 standalone/printerdrake:65
-#: standalone/printerdrake:85 standalone/printerdrake:515
+#: printer/printerdrake.pm:610 printer/printerdrake.pm:628
+#: printer/printerdrake.pm:711 printer/printerdrake.pm:768
+#: printer/printerdrake.pm:794 printer/printerdrake.pm:1703
+#: printer/printerdrake.pm:1886 printer/printerdrake.pm:1902
+#: printer/printerdrake.pm:1945 printer/printerdrake.pm:1982
+#: printer/printerdrake.pm:2024 printer/printerdrake.pm:2061
+#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2314
+#: printer/printerdrake.pm:2319 printer/printerdrake.pm:2458
+#: printer/printerdrake.pm:2568 printer/printerdrake.pm:3069
+#: printer/printerdrake.pm:3134 printer/printerdrake.pm:3177
+#: printer/printerdrake.pm:3180 printer/printerdrake.pm:3299
+#: printer/printerdrake.pm:3364 printer/printerdrake.pm:3436
+#: printer/printerdrake.pm:3457 printer/printerdrake.pm:3466
+#: printer/printerdrake.pm:3557 printer/printerdrake.pm:3655
+#: printer/printerdrake.pm:3661 printer/printerdrake.pm:3674
+#: printer/printerdrake.pm:3726 printer/printerdrake.pm:3766
+#: printer/printerdrake.pm:3778 printer/printerdrake.pm:3789
+#: printer/printerdrake.pm:3798 printer/printerdrake.pm:3811
+#: printer/printerdrake.pm:3888 printer/printerdrake.pm:3945
+#: printer/printerdrake.pm:4010 printer/printerdrake.pm:4270
+#: printer/printerdrake.pm:4313 printer/printerdrake.pm:4459
+#: printer/printerdrake.pm:4517 printer/printerdrake.pm:4546
+#: standalone/printerdrake:65 standalone/printerdrake:85
+#: standalone/printerdrake:515
#, c-format
msgid "Printerdrake"
msgstr "Drak 打印机"
@@ -11175,35 +11180,38 @@ msgstr ""
"\n"
"不需要在这里配置远程的 CUPS 服务器上的打印机；这些打印机会被自动探测到。"
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:3807
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
#, c-format
msgid ""
"\n"
"WARNING: No local network connection active, remote printers can neither be "
"detected nor tested!"
msgstr ""
+"\n"
+"警告：没有激活的局域网连接，远程打印机既没法检测也没法测试！"
#: printer/printerdrake.pm:515
#, c-format
-msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
-msgstr "打印机自动检测(本地，TCP/Socket 和 SMB 打印机)"
+msgid ""
+"Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
+msgstr "打印机自动检测(本地，TCP/Socket、SMB 打印机和设备 URI)"
#: printer/printerdrake.pm:545
#, c-format
msgid "Checking your system..."
msgstr "正在检查您的系统..."
-#: printer/printerdrake.pm:560
+#: printer/printerdrake.pm:561
#, c-format
msgid "and one unknown printer"
msgstr "和一台未知的打印机"
-#: printer/printerdrake.pm:562
+#: printer/printerdrake.pm:563
#, c-format
msgid "and %d unknown printers"
msgstr "和 %d 台未知的打印机"
-#: printer/printerdrake.pm:566
+#: printer/printerdrake.pm:567
#, c-format
msgid ""
"The following printers\n"
@@ -11216,7 +11224,7 @@ msgstr ""
"%s%s\n"
"直接连接在您的系统"
-#: printer/printerdrake.pm:568
+#: printer/printerdrake.pm:569
#, c-format
msgid ""
"The following printer\n"
@@ -11229,7 +11237,7 @@ msgstr ""
"%s%s\n"
"直接连接在您的系统"
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:570
#, c-format
msgid ""
"The following printer\n"
@@ -11242,7 +11250,7 @@ msgstr ""
"%s%s\n"
"直接连接在您的系统"
-#: printer/printerdrake.pm:573
+#: printer/printerdrake.pm:574
#, c-format
msgid ""
"\n"
@@ -11251,7 +11259,7 @@ msgstr ""
"\n"
"有一个未知的打印机直接连接在您的系统"
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:575
#, c-format
msgid ""
"\n"
@@ -11260,40 +11268,40 @@ msgstr ""
"\n"
"有 %d 个未知的打印机直接连接在您的系统"
-#: printer/printerdrake.pm:577
+#: printer/printerdrake.pm:578
#, c-format
msgid ""
"There are no printers found which are directly connected to your machine"
msgstr "没有发现打印机直接连接在您的机器上"
-#: printer/printerdrake.pm:580
+#: printer/printerdrake.pm:581
#, c-format
msgid " (Make sure that all your printers are connected and turned on).\n"
msgstr "(请确认您的打印机已经连接好并且接通了电源)。\n"
-#: printer/printerdrake.pm:593
+#: printer/printerdrake.pm:594
#, c-format
msgid ""
"Do you want to enable printing on the printers mentioned above or on "
"printers in the local network?\n"
msgstr "您想激活上述打印机的打印功能，还是要使用本地网络的打印机来打印？\n"
-#: printer/printerdrake.pm:594
+#: printer/printerdrake.pm:595
#, c-format
msgid "Do you want to enable printing on printers in the local network?\n"
msgstr "您想使用本地网络的打印机来打印吗？\n"
-#: printer/printerdrake.pm:596
+#: printer/printerdrake.pm:597
#, c-format
msgid "Do you want to enable printing on the printers mentioned above?\n"
msgstr "您是否希望在上述的打印机上进行打印？\n"
-#: printer/printerdrake.pm:597
+#: printer/printerdrake.pm:598
#, c-format
msgid "Are you sure that you want to set up printing on this machine?\n"
msgstr "您确定要在这台机器上设置打印吗？\n"
-#: printer/printerdrake.pm:598
+#: printer/printerdrake.pm:599
#, c-format
msgid ""
"NOTE: Depending on the printer model and the printing system up to %d MB of "
@@ -11302,48 +11310,48 @@ msgstr ""
"注意:根据不同的打印机型号和打印系统，需要安装附加的软件，最多会需要 %d MB 空"
"间。"
-#: printer/printerdrake.pm:622
+#: printer/printerdrake.pm:629
#, c-format
msgid "Searching for new printers..."
msgstr "正在搜索新的打印机..."
-#: printer/printerdrake.pm:706
+#: printer/printerdrake.pm:713
#, c-format
msgid "Configuring printer ..."
msgstr "正在配置打印机..."
-#: printer/printerdrake.pm:707 printer/printerdrake.pm:762
-#: printer/printerdrake.pm:3598
+#: printer/printerdrake.pm:714 printer/printerdrake.pm:769
+#: printer/printerdrake.pm:3790
#, c-format
msgid "Configuring printer \"%s\"..."
msgstr "正在配置打印机“%s”..."
-#: printer/printerdrake.pm:727
+#: printer/printerdrake.pm:734
#, c-format
msgid "("
msgstr "("
-#: printer/printerdrake.pm:728
+#: printer/printerdrake.pm:735
#, c-format
msgid " on "
msgstr " 位于 "
-#: printer/printerdrake.pm:729 standalone/scannerdrake:130
+#: printer/printerdrake.pm:736 standalone/scannerdrake:136
#, c-format
msgid ")"
msgstr ")"
-#: printer/printerdrake.pm:734 printer/printerdrake.pm:2338
+#: printer/printerdrake.pm:741 printer/printerdrake.pm:2470
#, c-format
msgid "Printer model selection"
msgstr "打印机型号选择"
-#: printer/printerdrake.pm:735 printer/printerdrake.pm:2339
+#: printer/printerdrake.pm:742 printer/printerdrake.pm:2471
#, c-format
msgid "Which printer model do you have?"
msgstr "您的打印机的型号是什么？"
-#: printer/printerdrake.pm:736
+#: printer/printerdrake.pm:743
#, c-format
msgid ""
"\n"
@@ -11355,28 +11363,28 @@ msgstr ""
"\n"
"“Drak 打印机”无法确定您的打印机 %s 是什么型号的。请从列表中选择正确的型号。"
-#: printer/printerdrake.pm:739 printer/printerdrake.pm:2344
+#: printer/printerdrake.pm:746 printer/printerdrake.pm:2476
#, c-format
msgid ""
"If your printer is not listed, choose a compatible (see printer manual) or a "
"similar one."
msgstr "如果您的打印机不在列表中，请选择兼容的(参考打印机手册)或类似的型号。"
-#: printer/printerdrake.pm:788 printer/printerdrake.pm:3587
-#: printer/printerdrake.pm:3741 printer/printerdrake.pm:4066
-#: printer/printerdrake.pm:4109 printer/printerdrake.pm:4313
+#: printer/printerdrake.pm:795 printer/printerdrake.pm:3779
+#: printer/printerdrake.pm:3946 printer/printerdrake.pm:4271
+#: printer/printerdrake.pm:4314 printer/printerdrake.pm:4518
#, c-format
msgid "Configuring applications..."
msgstr "正在配置应用程序..."
-#: printer/printerdrake.pm:824 printer/printerdrake.pm:836
-#: printer/printerdrake.pm:894 printer/printerdrake.pm:1787
-#: printer/printerdrake.pm:3823 printer/printerdrake.pm:4006
+#: printer/printerdrake.pm:831 printer/printerdrake.pm:843
+#: printer/printerdrake.pm:901 printer/printerdrake.pm:1872
+#: printer/printerdrake.pm:4028 printer/printerdrake.pm:4211
#, c-format
msgid "Add a new printer"
msgstr "添加新打印机"
-#: printer/printerdrake.pm:825
+#: printer/printerdrake.pm:832
#, c-format
msgid ""
"\n"
@@ -11397,7 +11405,7 @@ msgstr ""
"它会询问所有必要的信息以进行打印机设置，并允许您访问所有可用的打印机驱动程"
"序、驱动程序选项和打印机连接类型。"
-#: printer/printerdrake.pm:838
+#: printer/printerdrake.pm:845
#, c-format
msgid ""
"\n"
@@ -11432,7 +11440,7 @@ msgstr ""
"\n"
"一切准备就绪后请单击“下一步”。如果您不想现在设置打印机，请单击“取消”。"
-#: printer/printerdrake.pm:847
+#: printer/printerdrake.pm:854
#, c-format
msgid ""
"\n"
@@ -11456,7 +11464,7 @@ msgstr ""
"\n"
"一切准备就绪后请单击“下一步”。如果您不想现在设置打印机，请单击“取消”。"
-#: printer/printerdrake.pm:855
+#: printer/printerdrake.pm:862
#, c-format
msgid ""
"\n"
@@ -11490,7 +11498,7 @@ msgstr ""
"\n"
"一切准备就绪后请单击“下一步”。如果您不想现在设置打印机，请单击“取消”。"
-#: printer/printerdrake.pm:864
+#: printer/printerdrake.pm:871
#, c-format
msgid ""
"\n"
@@ -11515,22 +11523,22 @@ msgstr ""
"\n"
"准备好就单击“下一步”，如果您不想现在配置打印机就单击“取消”。"
-#: printer/printerdrake.pm:873
+#: printer/printerdrake.pm:880
#, c-format
msgid "Auto-detect printers connected to this machine"
msgstr "自动探测这台机器连接的打印机"
-#: printer/printerdrake.pm:876
+#: printer/printerdrake.pm:883
#, c-format
msgid "Auto-detect printers connected directly to the local network"
msgstr "自动探测直接连接到本地网络的打印机"
-#: printer/printerdrake.pm:879
+#: printer/printerdrake.pm:886
#, c-format
msgid "Auto-detect printers connected to machines running Microsoft Windows"
msgstr "自动探测运行 Microsoft Windows 的机器连接的打印机"
-#: printer/printerdrake.pm:895
+#: printer/printerdrake.pm:902
#, c-format
msgid ""
"\n"
@@ -11551,54 +11559,70 @@ msgstr ""
"如果以后要添加、删除打印机，改变打印机名字，或者需要修改默认打印参数(送纸器、"
"输出质量等)，请在“%s 控制中心”的“硬件”部分选择“打印机”。"
-#: printer/printerdrake.pm:930 printer/printerdrake.pm:1060
-#: printer/printerdrake.pm:1276 printer/printerdrake.pm:1516
+#: printer/printerdrake.pm:937 printer/printerdrake.pm:1152
+#: printer/printerdrake.pm:1214 printer/printerdrake.pm:1304
+#: printer/printerdrake.pm:1441 printer/printerdrake.pm:1516
+#: printer/printerdrake.pm:1667 printer/printerdrake.pm:1750
+#: printer/printerdrake.pm:1759 printer/printerdrake.pm:1768
+#: printer/printerdrake.pm:1779 printer/printerdrake.pm:1892
+#: printer/printerdrake.pm:1954 printer/printerdrake.pm:1988
+#, c-format
+msgid "Could not install the %s packages!"
+msgstr "无法安装 %s 软件包!"
+
+#: printer/printerdrake.pm:939
+#, c-format
+msgid "Skipping Windows/SMB server auto-detection"
+msgstr "跳过 Windows/SMB 服务器自动检测"
+
+#: printer/printerdrake.pm:945 printer/printerdrake.pm:1075
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
#, c-format
msgid "Printer auto-detection"
msgstr "打印机自动检测"
-#: printer/printerdrake.pm:930
+#: printer/printerdrake.pm:945
#, c-format
msgid "Detecting devices..."
msgstr "正在检测设备..."
-#: printer/printerdrake.pm:952
+#: printer/printerdrake.pm:967
#, c-format
msgid ", network printer \"%s\", port %s"
msgstr "，网络打印机“%s”，端口 %s"
-#: printer/printerdrake.pm:954
+#: printer/printerdrake.pm:969
#, c-format
msgid ", printer \"%s\" on SMB/Windows server \"%s\""
msgstr ", 打印机“%s”在 SMB/Windows 服务器“%s” 上"
-#: printer/printerdrake.pm:958
+#: printer/printerdrake.pm:973
#, c-format
msgid "Detected %s"
msgstr "检测到 %s"
-#: printer/printerdrake.pm:962 printer/printerdrake.pm:985
-#: printer/printerdrake.pm:1002
+#: printer/printerdrake.pm:977 printer/printerdrake.pm:1000
+#: printer/printerdrake.pm:1017
#, c-format
msgid "Printer on parallel port #%s"
msgstr "并行端口打印机 #%s"
-#: printer/printerdrake.pm:966
+#: printer/printerdrake.pm:981
#, c-format
msgid "Network printer \"%s\", port %s"
msgstr "网络打印机“%s”，端口 %s"
-#: printer/printerdrake.pm:968
+#: printer/printerdrake.pm:983
#, c-format
msgid "Printer \"%s\" on SMB/Windows server \"%s\""
msgstr "打印机“%s”在 SMB/Windows 服务器打印机“%s”上"
-#: printer/printerdrake.pm:1047
+#: printer/printerdrake.pm:1062
#, c-format
msgid "Local Printer"
msgstr "本机打印机"
-#: printer/printerdrake.pm:1048
+#: printer/printerdrake.pm:1063
#, c-format
msgid ""
"No local printer found! To manually install a printer enter a device name/"
@@ -11610,64 +11634,64 @@ msgstr ""
"lp0，/dev/lp1，...，相当于 LPT1:，LPT2:，...，第一个 USB 打印机:/dev/usb/"
"lp0，第二个 USB 打印机:/dev/usb/lp1，...)。"
-#: printer/printerdrake.pm:1052
+#: printer/printerdrake.pm:1067
#, c-format
msgid "You must enter a device or file name!"
msgstr "您需要输入打印机设备名或一文件名！"
-#: printer/printerdrake.pm:1061
+#: printer/printerdrake.pm:1076
#, c-format
msgid "No printer found!"
msgstr "没有发现打印机！"
-#: printer/printerdrake.pm:1069
+#: printer/printerdrake.pm:1084
#, c-format
msgid "Local Printers"
msgstr "本机打印机"
-#: printer/printerdrake.pm:1070
+#: printer/printerdrake.pm:1085
#, c-format
msgid "Available printers"
msgstr "可用打印机"
-#: printer/printerdrake.pm:1074 printer/printerdrake.pm:1083
+#: printer/printerdrake.pm:1089 printer/printerdrake.pm:1098
#, c-format
msgid "The following printer was auto-detected. "
msgstr "下列打印机被自动检测到了。"
-#: printer/printerdrake.pm:1076
+#: printer/printerdrake.pm:1091
#, c-format
msgid ""
"If it is not the one you want to configure, enter a device name/file name in "
"the input line"
msgstr "如果您要使用的打印机不在其中，请在输入栏输入一个设备名或文件名"
-#: printer/printerdrake.pm:1077
+#: printer/printerdrake.pm:1092
#, c-format
msgid ""
"Alternatively, you can specify a device name/file name in the input line"
msgstr "或者，您可以在输入行指定一个设备名/文件名"
-#: printer/printerdrake.pm:1078 printer/printerdrake.pm:1087
+#: printer/printerdrake.pm:1093 printer/printerdrake.pm:1102
#, c-format
msgid "Here is a list of all auto-detected printers. "
msgstr "下面所列为自动检测到的打印机"
-#: printer/printerdrake.pm:1080
+#: printer/printerdrake.pm:1095
#, c-format
msgid ""
"Please choose the printer you want to set up or enter a device name/file "
"name in the input line"
msgstr "请选择要设置的打印机或输入一个设备名或文件名到输入栏"
-#: printer/printerdrake.pm:1081
+#: printer/printerdrake.pm:1096
#, c-format
msgid ""
"Please choose the printer to which the print jobs should go or enter a "
"device name/file name in the input line"
msgstr "请选择打印机的任务，或者输入一个设备名或文件名到输入栏"
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1100
#, c-format
msgid ""
"The configuration of the printer will work fully automatically. If your "
@@ -11677,12 +11701,12 @@ msgstr ""
"打印机的设置会完全自动工作。如果您的打印机没有被正确检测或者您想定制打印机设"
"置，选择“手工设置”。"
-#: printer/printerdrake.pm:1086
+#: printer/printerdrake.pm:1101
#, c-format
msgid "Currently, no alternative possibility is available"
msgstr "现在，没有两种供选择的选项"
-#: printer/printerdrake.pm:1089
+#: printer/printerdrake.pm:1104
#, c-format
msgid ""
"Please choose the printer you want to set up. The configuration of the "
@@ -11693,24 +11717,24 @@ msgstr ""
"请选择您希望设置的打印机。设置打印机将完全自动工作。如果您的打印机没有被正确"
"检测或者您想定制打印机设置，选择“手工设置”。"
-#: printer/printerdrake.pm:1090
+#: printer/printerdrake.pm:1105
#, c-format
msgid "Please choose the printer to which the print jobs should go."
msgstr "请选择将执行任务的打印机。"
-#: printer/printerdrake.pm:1092
+#: printer/printerdrake.pm:1107
#, c-format
msgid ""
"Please choose the port that your printer is connected to or enter a device "
"name/file name in the input line"
msgstr "请选择您打印机使用的端口或输入栏内填入一合法设备或文件"
-#: printer/printerdrake.pm:1093
+#: printer/printerdrake.pm:1108
#, c-format
msgid "Please choose the port that your printer is connected to."
msgstr "请选择您的打印机是连接到哪个端口。"
-#: printer/printerdrake.pm:1095
+#: printer/printerdrake.pm:1110
#, c-format
msgid ""
" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -11719,17 +11743,26 @@ msgstr ""
"(并行口: /dev/lp0，/dev/lp1，...，相当于 LPT1:，LPT2:，...，第一个 USB 设备"
"口: /dev/usb/lp0，第二个 USB 设备口: /dev/usb/lp1，...)。"
-#: printer/printerdrake.pm:1099
+#: printer/printerdrake.pm:1114
#, c-format
msgid "You must choose/enter a printer/device!"
msgstr "您必须选择/输入一台打印机/设备！"
-#: printer/printerdrake.pm:1168
+#: printer/printerdrake.pm:1154 printer/printerdrake.pm:1216
+#: printer/printerdrake.pm:1306 printer/printerdrake.pm:1443
+#: printer/printerdrake.pm:1518 printer/printerdrake.pm:1669
+#: printer/printerdrake.pm:1752 printer/printerdrake.pm:1761
+#: printer/printerdrake.pm:1770 printer/printerdrake.pm:1781
+#, c-format
+msgid "Aborting"
+msgstr "中止"
+
+#: printer/printerdrake.pm:1189
#, c-format
msgid "Remote lpd Printer Options"
msgstr "远程 lpd 打印机选项"
-#: printer/printerdrake.pm:1169
+#: printer/printerdrake.pm:1190
#, c-format
msgid ""
"To use a remote lpd printer, you need to supply the hostname of the printer "
@@ -11738,66 +11771,65 @@ msgstr ""
"要使用一个远程的 lpd 打印队列，您需要指定打印服务器的\n"
"主机名和打印任务要送往的打印队列的名字。"
-#: printer/printerdrake.pm:1170
+#: printer/printerdrake.pm:1191
#, c-format
msgid "Remote host name"
msgstr "远程主机名"
-#: printer/printerdrake.pm:1171
+#: printer/printerdrake.pm:1192
#, c-format
msgid "Remote printer name"
msgstr "远程打印机名"
-#: printer/printerdrake.pm:1174
+#: printer/printerdrake.pm:1195
#, c-format
msgid "Remote host name missing!"
msgstr "未找到远程主机！"
-#: printer/printerdrake.pm:1178
+#: printer/printerdrake.pm:1199
#, c-format
msgid "Remote printer name missing!"
msgstr "没有找到远程打印机！"
-#: printer/printerdrake.pm:1200 printer/printerdrake.pm:1714
-#: standalone/drakTermServ:442 standalone/drakTermServ:725
-#: standalone/drakTermServ:741 standalone/drakTermServ:1332
-#: standalone/drakTermServ:1340 standalone/drakTermServ:1351
-#: standalone/drakbackup:767 standalone/drakbackup:874
-#: standalone/drakbackup:908 standalone/drakbackup:1027
-#: standalone/drakbackup:1891 standalone/drakbackup:1895
-#: standalone/drakconnect:254 standalone/drakconnect:283
-#: standalone/drakconnect:512 standalone/drakconnect:516
-#: standalone/drakconnect:540 standalone/harddrake2:159
+#: 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/drakbackup:582 standalone/drakbackup:687
+#: standalone/drakbackup:722 standalone/drakbackup:840
+#: standalone/drakconnect:263 standalone/drakconnect:298
+#: standalone/drakconnect:542 standalone/drakconnect:552
+#: standalone/drakconnect:576 standalone/harddrake2:160
#, c-format
msgid "Information"
msgstr "信息"
-#: printer/printerdrake.pm:1200 printer/printerdrake.pm:1714
+#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
#, c-format
msgid "Detected model: %s %s"
msgstr "检测到型号: %s %s"
-#: printer/printerdrake.pm:1276 printer/printerdrake.pm:1516
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
#, c-format
msgid "Scanning network..."
msgstr "正在扫描网络..."
-#: printer/printerdrake.pm:1287 printer/printerdrake.pm:1308
+#: printer/printerdrake.pm:1321 printer/printerdrake.pm:1342
#, c-format
msgid ", printer \"%s\" on server \"%s\""
msgstr "，打印机“%s”在服务器“%s”上"
-#: printer/printerdrake.pm:1290 printer/printerdrake.pm:1311
+#: printer/printerdrake.pm:1324 printer/printerdrake.pm:1345
#, c-format
msgid "Printer \"%s\" on server \"%s\""
msgstr "服务器“%2$s”上的打印机“%1$s”"
-#: printer/printerdrake.pm:1332
+#: printer/printerdrake.pm:1366
#, c-format
msgid "SMB (Windows 9x/NT) Printer Options"
msgstr "SMB(Windows 9x/NT)打印机选项"
-#: printer/printerdrake.pm:1333
+#: printer/printerdrake.pm:1367
#, c-format
msgid ""
"To print to a SMB printer, you need to provide the SMB host name (Note! It "
@@ -11811,7 +11843,7 @@ msgstr ""
"址，\n"
"以及有权访问打印机的用户名，工作组和密码，当然还有打印机的共享名。"
-#: printer/printerdrake.pm:1334
+#: printer/printerdrake.pm:1368
#, c-format
msgid ""
" If the desired printer was auto-detected, simply choose it from the list "
@@ -11820,47 +11852,47 @@ msgstr ""
"如果自动检测发现了想要的打印机，只要从列表中选择它，然后添加用户名、密码，以"
"及可能需要的网络组名。"
-#: printer/printerdrake.pm:1336
+#: printer/printerdrake.pm:1370
#, c-format
msgid "SMB server host"
msgstr "SMB 服务器主机"
-#: printer/printerdrake.pm:1337
+#: printer/printerdrake.pm:1371
#, c-format
msgid "SMB server IP"
msgstr "SMB 服务器 IP"
-#: printer/printerdrake.pm:1338
+#: printer/printerdrake.pm:1372
#, c-format
msgid "Share name"
msgstr "共享名"
-#: printer/printerdrake.pm:1341
+#: printer/printerdrake.pm:1375
#, c-format
msgid "Workgroup"
msgstr "工作组"
-#: printer/printerdrake.pm:1343
+#: printer/printerdrake.pm:1377
#, c-format
msgid "Auto-detected"
msgstr "自动检测到"
-#: printer/printerdrake.pm:1353
+#: printer/printerdrake.pm:1387
#, c-format
msgid "Either the server name or the server's IP must be given!"
msgstr "输入服务器名或服务器的IP！"
-#: printer/printerdrake.pm:1357
+#: printer/printerdrake.pm:1391
#, c-format
msgid "Samba share name missing!"
msgstr "缺少 Samba 共享名！"
-#: printer/printerdrake.pm:1363
+#: printer/printerdrake.pm:1397
#, c-format
msgid "SECURITY WARNING!"
msgstr "安全警告！"
-#: printer/printerdrake.pm:1364
+#: printer/printerdrake.pm:1398
#, c-format
msgid ""
"You are about to set up printing to a Windows account with password. Due to "
@@ -11897,7 +11929,7 @@ msgstr ""
"向导按照“%s”连接方式配置打印机。\n"
"\n"
-#: printer/printerdrake.pm:1374
+#: printer/printerdrake.pm:1408
#, c-format
msgid ""
"Set up your Windows server to make the printer available under the IPP "
@@ -11909,7 +11941,7 @@ msgstr ""
"向导按照“%s”连接方式配置打印机。\n"
"\n"
-#: printer/printerdrake.pm:1377
+#: printer/printerdrake.pm:1411
#, c-format
msgid ""
"Connect your printer to a Linux server and let your Windows machine(s) "
@@ -11921,12 +11953,12 @@ msgstr ""
"\n"
"您坚持要继续这样配置打印机吗？"
-#: printer/printerdrake.pm:1449
+#: printer/printerdrake.pm:1489
#, c-format
msgid "NetWare Printer Options"
msgstr "NetWare 打印机选项"
-#: printer/printerdrake.pm:1450
+#: printer/printerdrake.pm:1490
#, c-format
msgid ""
"To print on a NetWare printer, you need to provide the NetWare print server "
@@ -11938,42 +11970,42 @@ msgstr ""
"与它的 TCP/IP 主机名不同！)，以及有权访问打印机的用户名和密码，当然还有打\n"
"印机的打印队列名。"
-#: printer/printerdrake.pm:1451
+#: printer/printerdrake.pm:1491
#, c-format
msgid "Printer Server"
msgstr "打印机服务器"
-#: printer/printerdrake.pm:1452
+#: printer/printerdrake.pm:1492
#, c-format
msgid "Print Queue Name"
msgstr "打印队列名"
-#: printer/printerdrake.pm:1457
+#: printer/printerdrake.pm:1497
#, c-format
msgid "NCP server name missing!"
msgstr "NCP 服务器未找到"
-#: printer/printerdrake.pm:1461
+#: printer/printerdrake.pm:1501
#, c-format
msgid "NCP queue name missing!"
msgstr "NCP 队列名未找到！"
-#: printer/printerdrake.pm:1527 printer/printerdrake.pm:1547
+#: printer/printerdrake.pm:1574 printer/printerdrake.pm:1594
#, c-format
msgid ", host \"%s\", port %s"
msgstr "，主机“%s”，端口 %s"
-#: printer/printerdrake.pm:1530 printer/printerdrake.pm:1550
+#: printer/printerdrake.pm:1577 printer/printerdrake.pm:1597
#, c-format
msgid "Host \"%s\", port %s"
msgstr "主机“%s”，端口 %s"
-#: printer/printerdrake.pm:1571
+#: printer/printerdrake.pm:1618
#, c-format
msgid "TCP/Socket Printer Options"
msgstr "TCP/Socket 打印机选项"
-#: printer/printerdrake.pm:1573
+#: printer/printerdrake.pm:1620
#, c-format
msgid ""
"Choose one of the auto-detected printers from the list or enter the hostname "
@@ -11982,7 +12014,7 @@ msgstr ""
"从自动检测到的打印机列表中选择一个，或者在输入域中输入主机名或 IP，以及可选的"
"端口号(默认是 9100)。"
-#: printer/printerdrake.pm:1574
+#: printer/printerdrake.pm:1621
#, c-format
msgid ""
"To print to a TCP or socket printer, you need to provide the host name or IP "
@@ -11994,22 +12026,27 @@ msgstr ""
"(默认是 9100)。HP JetDirect 打印服务器通常用端口 9100，其它服务器可能用其它的"
"端口。请查阅您的硬件手册。"
-#: printer/printerdrake.pm:1578
+#: printer/printerdrake.pm:1625
#, c-format
msgid "Printer host name or IP missing!"
msgstr "缺少打印机主机名或 IP 地址！"
-#: printer/printerdrake.pm:1601
+#: printer/printerdrake.pm:1648
#, c-format
msgid "Printer host name or IP"
msgstr "打印机主机名或 IP 地址"
-#: printer/printerdrake.pm:1649 printer/printerdrake.pm:1651
+#: printer/printerdrake.pm:1704
+#, c-format
+msgid "Refreshing Device URI list..."
+msgstr "正在刷新设备 URI 列表..."
+
+#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
#, c-format
msgid "Printer Device URI"
msgstr "打印机设备 URI"
-#: printer/printerdrake.pm:1650
+#: printer/printerdrake.pm:1708
#, c-format
msgid ""
"You can specify directly the URI to access the printer. The URI must fulfill "
@@ -12019,17 +12056,17 @@ msgstr ""
"您可以直接使用 URI 访问打印机。URI 必须符合 CUPS 或 Foomatic 规定。但注意不是"
"所有的打印队列(spooler)都支持 URI。"
-#: printer/printerdrake.pm:1668
+#: printer/printerdrake.pm:1731
#, c-format
msgid "A valid URI must be entered!"
msgstr "必须输入有效的 URI！"
-#: printer/printerdrake.pm:1749
+#: printer/printerdrake.pm:1834
#, c-format
msgid "Pipe into command"
msgstr "管道命令"
-#: printer/printerdrake.pm:1750
+#: printer/printerdrake.pm:1835
#, c-format
msgid ""
"Here you can specify any arbitrary command line into which the job should be "
@@ -12037,17 +12074,17 @@ msgid ""
msgstr ""
"您可在此指定任意的命令行，打印任务将通过该命令行构成的管道再送到打印机。"
-#: printer/printerdrake.pm:1751
+#: printer/printerdrake.pm:1836
#, c-format
msgid "Command line"
msgstr "命令行"
-#: printer/printerdrake.pm:1755
+#: printer/printerdrake.pm:1840
#, c-format
msgid "A command line must be entered!"
msgstr "必须输入命令行！"
-#: printer/printerdrake.pm:1788
+#: printer/printerdrake.pm:1873
#, c-format
msgid ""
"Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -12058,58 +12095,73 @@ msgstr ""
"1100/1200/1220/3200/3300，DeskJet 450, Sony IJP-V100)，惠普 PhotoSmart 或 HP "
"LaserJet 2200？"
-#: printer/printerdrake.pm:1801
+#: printer/printerdrake.pm:1887
#, c-format
msgid "Installing HPOJ package..."
msgstr "正在安装 HPOJ 包..."
-#: printer/printerdrake.pm:1809 printer/printerdrake.pm:1893
+#: printer/printerdrake.pm:1894
+#, c-format
+msgid "Only printing will be possible on the %s."
+msgstr "打印将只能在 %s 上进行。"
+
+#: printer/printerdrake.pm:1903 printer/printerdrake.pm:2025
#, c-format
msgid "Checking device and configuring HPOJ..."
msgstr "正在检查并配置 HPOJ..."
-#: printer/printerdrake.pm:1831
+#: printer/printerdrake.pm:1946
#, c-format
msgid "Installing SANE packages..."
msgstr "正在安装 SANE 包..."
-#: printer/printerdrake.pm:1858
+#: printer/printerdrake.pm:1956
+#, c-format
+msgid "Scanning on the %s will not be possible."
+msgstr "不可能在 %s 上扫描。"
+
+#: printer/printerdrake.pm:1983
#, c-format
msgid "Installing mtools packages..."
msgstr "正在安装 mtools 包..."
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1990
+#, c-format
+msgid "Photo memory card access on the %s will not be possible."
+msgstr "%s 上的照片存储卡不可能访问。"
+
+#: printer/printerdrake.pm:2005
#, c-format
msgid "Scanning on your HP multi-function device"
msgstr "正在扫描您的惠普一体机"
-#: printer/printerdrake.pm:1881
+#: printer/printerdrake.pm:2013
#, c-format
msgid "Photo memory card access on your HP multi-function device"
msgstr "您的惠普一体机的照片存储卡访问"
-#: printer/printerdrake.pm:1930
+#: printer/printerdrake.pm:2062
#, c-format
msgid "Making printer port available for CUPS..."
msgstr "正在配置打印机端口适用于 CUPS..."
-#: printer/printerdrake.pm:1939 printer/printerdrake.pm:2183
-#: printer/printerdrake.pm:2327
+#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2315
+#: printer/printerdrake.pm:2459
#, c-format
msgid "Reading printer database..."
msgstr "正在读取打印机数据库..."
-#: printer/printerdrake.pm:2149
+#: printer/printerdrake.pm:2281
#, c-format
msgid "Enter Printer Name and Comments"
msgstr "输入打印机名称和注释"
-#: printer/printerdrake.pm:2153 printer/printerdrake.pm:3241
+#: printer/printerdrake.pm:2285 printer/printerdrake.pm:3421
#, c-format
msgid "Name of printer should contain only letters, numbers and the underscore"
msgstr "打印机名称可以包含字母、数字和下划线"
-#: printer/printerdrake.pm:2159 printer/printerdrake.pm:3246
+#: printer/printerdrake.pm:2291 printer/printerdrake.pm:3426
#, c-format
msgid ""
"The printer \"%s\" already exists,\n"
@@ -12118,7 +12170,7 @@ msgstr ""
"打印机“%s”已经存在，\n"
"您真的想要覆盖其配置吗？"
-#: printer/printerdrake.pm:2168
+#: printer/printerdrake.pm:2300
#, c-format
msgid ""
"Every printer needs a name (for example \"printer\"). The Description and "
@@ -12127,35 +12179,35 @@ msgstr ""
"每台打印机需要一个名字(如“printer”)。\n"
"打印机描述和位置是可选项，它们仅仅供用户识别之用。"
-#: printer/printerdrake.pm:2169
+#: printer/printerdrake.pm:2301
#, c-format
msgid "Name of printer"
msgstr "打印机名称"
-#: printer/printerdrake.pm:2170 standalone/drakconnect:521
+#: printer/printerdrake.pm:2302 standalone/drakconnect:557
#: standalone/harddrake2:40 standalone/printerdrake:212
#: standalone/printerdrake:219
#, c-format
msgid "Description"
msgstr "描述"
-#: printer/printerdrake.pm:2171 standalone/printerdrake:212
+#: printer/printerdrake.pm:2303 standalone/printerdrake:212
#: standalone/printerdrake:219
#, c-format
msgid "Location"
msgstr "位置"
-#: printer/printerdrake.pm:2188
+#: printer/printerdrake.pm:2320
#, c-format
msgid "Preparing printer database..."
msgstr "正在准备打印机数据..."
-#: printer/printerdrake.pm:2306
+#: printer/printerdrake.pm:2438
#, c-format
msgid "Your printer model"
msgstr "您的打印机型号"
-#: printer/printerdrake.pm:2307
+#: printer/printerdrake.pm:2439
#, c-format
msgid ""
"Printerdrake has compared the model name resulting from the printer auto-"
@@ -12178,18 +12230,18 @@ msgstr ""
"\n"
"%s"
-#: printer/printerdrake.pm:2312 printer/printerdrake.pm:2315
+#: printer/printerdrake.pm:2444 printer/printerdrake.pm:2447
#, c-format
msgid "The model is correct"
msgstr "型号正确"
-#: printer/printerdrake.pm:2313 printer/printerdrake.pm:2314
-#: printer/printerdrake.pm:2317
+#: printer/printerdrake.pm:2445 printer/printerdrake.pm:2446
+#: printer/printerdrake.pm:2449
#, c-format
msgid "Select model manually"
msgstr "手工选择型号"
-#: printer/printerdrake.pm:2340
+#: printer/printerdrake.pm:2472
#, c-format
msgid ""
"\n"
@@ -12203,12 +12255,12 @@ msgstr ""
"请检查“Drak 打印机”用自动检测选择的型号是否与您的打印机一致。如果选中的是不正"
"确的型号或“原始打印机”，请从列表中选择正确的型号。"
-#: printer/printerdrake.pm:2359
+#: printer/printerdrake.pm:2491
#, c-format
msgid "Install a manufacturer-supplied PPD file"
msgstr "安装制造商提供的 PPD 文件"
-#: printer/printerdrake.pm:2390
+#: printer/printerdrake.pm:2522
#, c-format
msgid ""
"Every PostScript printer is delivered with a PPD file which describes the "
@@ -12217,19 +12269,19 @@ msgstr ""
"每台 PostScript 打印机都随机赠送了一个 PPD 文件，其中描述了打印机的选项和特"
"性。"
-#: printer/printerdrake.pm:2391
+#: printer/printerdrake.pm:2523
#, c-format
msgid ""
"This file is usually somewhere on the CD with the Windows and Mac drivers "
"delivered with the printer."
msgstr "此文件通常位于随机的赠送的 Windows 和 Mac 驱动程序光盘中。"
-#: printer/printerdrake.pm:2392
+#: printer/printerdrake.pm:2524
#, c-format
msgid "You can find the PPD files also on the manufacturer's web sites."
msgstr "您还可以在制造商的网站找到 PPD 文件。"
-#: printer/printerdrake.pm:2393
+#: printer/printerdrake.pm:2525
#, c-format
msgid ""
"If you have Windows installed on your machine, you can find the PPD file on "
@@ -12237,7 +12289,7 @@ msgid ""
msgstr ""
"如果您的计算机上安装了 Windows，您也可以在您的 Windows 分区上找到 PPD 文件。"
-#: printer/printerdrake.pm:2394
+#: printer/printerdrake.pm:2526
#, c-format
msgid ""
"Installing the printer's PPD file and using it when setting up the printer "
@@ -12247,65 +12299,65 @@ msgstr ""
"在设置打印机时安装打印机的 PPD 文件并使用该文件，可充分发挥打印机硬件所提供的"
"全部功能"
-#: printer/printerdrake.pm:2395
+#: printer/printerdrake.pm:2527
#, c-format
msgid ""
"Here you can choose the PPD file to be installed on your machine, it will "
"then be used for the setup of your printer."
msgstr "您可在此选择要安装到您计算机的 PPD 文件，该文件将用于设置打印机。"
-#: printer/printerdrake.pm:2397
+#: printer/printerdrake.pm:2529
#, c-format
msgid "Install PPD file from"
msgstr "安装 PPD 文件的来源"
-#: printer/printerdrake.pm:2399 printer/printerdrake.pm:2406
-#: standalone/scannerdrake:174 standalone/scannerdrake:182
-#: standalone/scannerdrake:233 standalone/scannerdrake:240
+#: printer/printerdrake.pm:2531 printer/printerdrake.pm:2538
+#: standalone/scannerdrake:180 standalone/scannerdrake:188
+#: standalone/scannerdrake:239 standalone/scannerdrake:246
#, c-format
msgid "CD-ROM"
msgstr "CD-ROM"
-#: printer/printerdrake.pm:2400 printer/printerdrake.pm:2408
-#: standalone/scannerdrake:175 standalone/scannerdrake:184
-#: standalone/scannerdrake:234 standalone/scannerdrake:242
+#: printer/printerdrake.pm:2532 printer/printerdrake.pm:2540
+#: standalone/scannerdrake:181 standalone/scannerdrake:190
+#: standalone/scannerdrake:240 standalone/scannerdrake:248
#, c-format
msgid "Floppy Disk"
msgstr "软盘"
-#: printer/printerdrake.pm:2401 printer/printerdrake.pm:2410
-#: standalone/scannerdrake:176 standalone/scannerdrake:186
-#: standalone/scannerdrake:235 standalone/scannerdrake:244
+#: printer/printerdrake.pm:2533 printer/printerdrake.pm:2542
+#: standalone/scannerdrake:182 standalone/scannerdrake:192
+#: standalone/scannerdrake:241 standalone/scannerdrake:250
#, c-format
msgid "Other place"
msgstr "其它位置"
-#: printer/printerdrake.pm:2416
+#: printer/printerdrake.pm:2548
#, c-format
msgid "Select PPD file"
msgstr "选择 PPD 文件"
-#: printer/printerdrake.pm:2420
+#: printer/printerdrake.pm:2552
#, c-format
msgid "The PPD file %s does not exist or is unreadable!"
msgstr "PPD 文件 %s 不存在或者不可读！"
-#: printer/printerdrake.pm:2426
+#: printer/printerdrake.pm:2558
#, c-format
msgid "The PPD file %s does not conform with the PPD specifications!"
msgstr "PPD 文件 %s 不遵从 PPD 规范！"
-#: printer/printerdrake.pm:2437
+#: printer/printerdrake.pm:2569
#, c-format
msgid "Installing PPD file..."
msgstr "正在安装 PPD 文件..."
-#: printer/printerdrake.pm:2539
+#: printer/printerdrake.pm:2682
#, c-format
msgid "OKI winprinter configuration"
msgstr "OKI winprinter 打印机配置"
-#: printer/printerdrake.pm:2540
+#: printer/printerdrake.pm:2683
#, c-format
msgid ""
"You are configuring an OKI laser winprinter. These printers\n"
@@ -12320,12 +12372,12 @@ msgstr ""
"连接到第一个并行口上。否则，该打印机将不会工作。您的连接类型设置将会被驱动程"
"序忽略。"
-#: printer/printerdrake.pm:2564 printer/printerdrake.pm:2593
+#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
#, c-format
msgid "Lexmark inkjet configuration"
msgstr "利盟喷墨打印机设定"
-#: printer/printerdrake.pm:2565
+#: printer/printerdrake.pm:2708
#, c-format
msgid ""
"The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -12336,7 +12388,7 @@ msgstr ""
"利盟提供的喷墨打印机驱动程序仅仅支持本地打印机，而非远程主机或打印服务箱上的"
"打印机。请把打印机连接到您的本机端口，或者在连接了打印机的电脑上进行配置。"
-#: printer/printerdrake.pm:2594
+#: printer/printerdrake.pm:2737
#, c-format
msgid ""
"To be able to print with your Lexmark inkjet and this configuration, you "
@@ -12354,12 +12406,28 @@ msgstr ""
"图形界面的安装程序。在许可协议之后直接按取消。用“lexmarkmaintain”命令打印喷头"
"对齐测试页，然后用这个程序调节喷头对齐。"
-#: printer/printerdrake.pm:2597
+#: printer/printerdrake.pm:2746
+#, c-format
+msgid "Lexmark X125 configuration"
+msgstr "利盟 X125 配置"
+
+#: printer/printerdrake.pm:2747
+#, c-format
+msgid ""
+"The driver for this printer only supports printers locally connected via "
+"USB, no printers on remote machines or print server boxes. Please connect "
+"your printer to a local USB port or configure it on the machine where it is "
+"connected to."
+msgstr ""
+"此打印的驱动程序只支持通过 USB 连接到本地的打印机，而非远程主机或打印服务器上"
+"的打印机。请把打印机连接到您的 USB 端口，或者在连接了打印机的电脑上进行配置。"
+
+#: printer/printerdrake.pm:2765
#, c-format
msgid "Firmware-Upload for HP LaserJet 1000"
msgstr "惠普 LaserJet 1000 的固件上载"
-#: printer/printerdrake.pm:2710
+#: printer/printerdrake.pm:2878
#, c-format
msgid ""
"Printer default settings\n"
@@ -12374,27 +12442,27 @@ msgstr ""
"您应该确定页面大小和墨水类型/打印模式(若可用)和激光打印机的硬件配置(内存，双"
"工单元，托纸盘)设置正确。注意超高质量/分辨率打印可能会变得很慢。"
-#: printer/printerdrake.pm:2835
+#: printer/printerdrake.pm:3003
#, c-format
msgid "Printer default settings"
msgstr "打印机默认设置"
-#: printer/printerdrake.pm:2842
+#: printer/printerdrake.pm:3010
#, c-format
msgid "Option %s must be an integer number!"
msgstr "选项 %s 必须是整数！"
-#: printer/printerdrake.pm:2846
+#: printer/printerdrake.pm:3014
#, c-format
msgid "Option %s must be a number!"
msgstr "选项 %s 必须是数字！"
-#: printer/printerdrake.pm:2850
+#: printer/printerdrake.pm:3018
#, c-format
msgid "Option %s out of range!"
msgstr "选项 %s 超出范围！"
-#: printer/printerdrake.pm:2901
+#: printer/printerdrake.pm:3069
#, c-format
msgid ""
"Do you want to set this printer (\"%s\")\n"
@@ -12403,12 +12471,12 @@ msgstr ""
"您希望设置这个打印机(“%s”)\n"
"作为默认打印机吗？"
-#: printer/printerdrake.pm:2916
+#: printer/printerdrake.pm:3084
#, c-format
msgid "Test pages"
msgstr "测试页"
-#: printer/printerdrake.pm:2917
+#: printer/printerdrake.pm:3085
#, c-format
msgid ""
"Please select the test pages you want to print.\n"
@@ -12420,47 +12488,57 @@ msgstr ""
"注意:在某些打印机上打印照片可能要花相当长的时间。\n"
"一般请选择标准测试页。"
-#: printer/printerdrake.pm:2921
+#: printer/printerdrake.pm:3089
#, c-format
msgid "No test pages"
msgstr "没有测试页"
-#: printer/printerdrake.pm:2922
+#: printer/printerdrake.pm:3090
#, c-format
msgid "Print"
msgstr "打印"
-#: printer/printerdrake.pm:2947
+#: printer/printerdrake.pm:3115
#, c-format
msgid "Standard test page"
msgstr "标准测试页"
-#: printer/printerdrake.pm:2950
+#: printer/printerdrake.pm:3118
#, c-format
msgid "Alternative test page (Letter)"
msgstr "可换测试页(信纸)"
-#: printer/printerdrake.pm:2953
+#: printer/printerdrake.pm:3121
#, c-format
msgid "Alternative test page (A4)"
msgstr "替换测试页 (A4)"
-#: printer/printerdrake.pm:2955
+#: printer/printerdrake.pm:3123
#, c-format
msgid "Photo test page"
msgstr "照片测试页"
-#: printer/printerdrake.pm:2959
+#: printer/printerdrake.pm:3127
#, c-format
msgid "Do not print any test page"
msgstr "不打印任何测试页"
-#: printer/printerdrake.pm:2967 printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
#, c-format
msgid "Printing test page(s)..."
msgstr "正在打印测试页..."
-#: printer/printerdrake.pm:2992
+#: printer/printerdrake.pm:3150
+#, c-format
+msgid "Could not install the %s package!"
+msgstr "无法安装 %s 软件包!"
+
+#: printer/printerdrake.pm:3152
+#, c-format
+msgid "Skipping photo test page."
+msgstr "跳过照片测试页。"
+
+#: printer/printerdrake.pm:3169
#, c-format
msgid ""
"Test page(s) have been sent to the printer.\n"
@@ -12474,7 +12552,7 @@ msgstr ""
"%s\n"
"\n"
-#: printer/printerdrake.pm:2996
+#: printer/printerdrake.pm:3173
#, c-format
msgid ""
"Test page(s) have been sent to the printer.\n"
@@ -12483,17 +12561,17 @@ msgstr ""
"测试页已经发送到打印机。\n"
"打印机开始工作之前可能要等一段时间。\n"
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3180
#, c-format
msgid "Did it work properly?"
msgstr "工作正常？"
-#: printer/printerdrake.pm:3024 printer/printerdrake.pm:4192
+#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
#, c-format
msgid "Raw printer"
msgstr "原始打印机"
-#: printer/printerdrake.pm:3054
+#: printer/printerdrake.pm:3231
#, c-format
msgid ""
"To print a file from the command line (terminal window) you can either use "
@@ -12504,7 +12582,7 @@ msgstr ""
"要从命令行打印文件可使用命令“%s <文件>”或图形打印工具:“xpp <文件"
">”或“kprinter <文件>”。图形工具让您比较容易的选择打印机和修改打印选项。\n"
-#: printer/printerdrake.pm:3056
+#: printer/printerdrake.pm:3233
#, c-format
msgid ""
"These commands you can also use in the \"Printing command\" field of the "
@@ -12514,8 +12592,8 @@ msgstr ""
"该命令您可用在许多应用的打印对话框的“打印命令”中，因为应用程序会提供要打印的"
"文件，所以那里不用写文件名。\n"
-#: printer/printerdrake.pm:3059 printer/printerdrake.pm:3076
-#: printer/printerdrake.pm:3086
+#: printer/printerdrake.pm:3236 printer/printerdrake.pm:3253
+#: printer/printerdrake.pm:3263
#, c-format
msgid ""
"\n"
@@ -12527,7 +12605,7 @@ msgstr ""
"“%s”命令也可用来修改特殊打印作业的选项。只需简单地往命令行中加入想要的设置，"
"例如:“%s <file>”。"
-#: printer/printerdrake.pm:3062 printer/printerdrake.pm:3102
+#: printer/printerdrake.pm:3239 printer/printerdrake.pm:3279
#, c-format
msgid ""
"To know about the options available for the current printer read either the "
@@ -12538,7 +12616,7 @@ msgstr ""
"s\n"
"\n"
-#: printer/printerdrake.pm:3066
+#: printer/printerdrake.pm:3243
#, c-format
msgid ""
"Here is a list of the available printing options for the current printer:\n"
@@ -12547,15 +12625,15 @@ msgstr ""
"以下是可用于当前打印机的一些打印选项: \n"
"\n"
-#: printer/printerdrake.pm:3071 printer/printerdrake.pm:3081
+#: printer/printerdrake.pm:3248 printer/printerdrake.pm:3258
#, c-format
msgid ""
"To print a file from the command line (terminal window) use the command \"%s "
"<file>\".\n"
msgstr "要从命令行(终端窗口)打印文件，请使用命令“%s <文件>”。\n"
-#: printer/printerdrake.pm:3073 printer/printerdrake.pm:3083
-#: printer/printerdrake.pm:3093
+#: printer/printerdrake.pm:3250 printer/printerdrake.pm:3260
+#: printer/printerdrake.pm:3270
#, c-format
msgid ""
"This command you can also use in the \"Printing command\" field of the "
@@ -12565,21 +12643,21 @@ msgstr ""
"该命令您可用在许多应用的打印对话框的“打印命令”项。但是此处并不提供文件名，因"
"为要打印的文件由应用程序提供。\n"
-#: printer/printerdrake.pm:3078 printer/printerdrake.pm:3088
+#: printer/printerdrake.pm:3255 printer/printerdrake.pm:3265
#, c-format
msgid ""
"To get a list of the options available for the current printer click on the "
"\"Print option list\" button."
msgstr "要获得当前打印机的可用选项列表，请单击“打印选项列表”按钮。"
-#: printer/printerdrake.pm:3091
+#: printer/printerdrake.pm:3268
#, c-format
msgid ""
"To print a file from the command line (terminal window) use the command \"%s "
"<file>\" or \"%s <file>\".\n"
msgstr "用命令“%s <文件>”或“%s <文件>”打印文件。\n"
-#: printer/printerdrake.pm:3095
+#: printer/printerdrake.pm:3272
#, c-format
msgid ""
"You can also use the graphical interface \"xpdq\" for setting options and "
@@ -12593,7 +12671,7 @@ msgstr ""
"如果您使用 KDE，桌面上有“停止打印机！”图标，当您点击它时，打印作业将立即停"
"止。例如，它可以用在纸张堵塞时。\n"
-#: printer/printerdrake.pm:3099
+#: printer/printerdrake.pm:3276
#, c-format
msgid ""
"\n"
@@ -12604,42 +12682,42 @@ msgstr ""
"\n"
"“%s”和“%s”命令允许修改打印作业的选项，例如:“%s <file>”。\n"
-#: printer/printerdrake.pm:3109
+#: printer/printerdrake.pm:3286
#, c-format
msgid "Printing/Scanning/Photo Cards on \"%s\""
msgstr "在“%s”打印机上的打印/扫描/照片卡"
-#: printer/printerdrake.pm:3110
+#: printer/printerdrake.pm:3287
#, c-format
msgid "Printing/Scanning on \"%s\""
msgstr "在“%s”打印机上打印/扫描"
-#: printer/printerdrake.pm:3112
+#: printer/printerdrake.pm:3289
#, c-format
msgid "Printing/Photo Card Access on \"%s\""
msgstr "“%s”打印机上的打印/照片卡访问"
-#: printer/printerdrake.pm:3113
+#: printer/printerdrake.pm:3290
#, c-format
msgid "Printing on the printer \"%s\""
msgstr "正在“%s”打印机上打印"
-#: printer/printerdrake.pm:3116 printer/printerdrake.pm:3119
-#: printer/printerdrake.pm:3120 printer/printerdrake.pm:3121
-#: printer/printerdrake.pm:4179 standalone/drakTermServ:321
-#: standalone/drakbackup:4583 standalone/drakbug:177 standalone/drakfont:497
-#: standalone/drakfont:588 standalone/net_monitor:106
+#: printer/printerdrake.pm:3293 printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3297 printer/printerdrake.pm:3298
+#: printer/printerdrake.pm:4384 standalone/drakTermServ:324
+#: standalone/drakbackup:4265 standalone/drakbug:177 standalone/drakfont:500
+#: standalone/drakfont:591 standalone/net_monitor:106
#: standalone/printerdrake:508
#, c-format
msgid "Close"
msgstr "关闭"
-#: printer/printerdrake.pm:3119
+#: printer/printerdrake.pm:3296
#, c-format
msgid "Print option list"
msgstr "打印机选项列表"
-#: printer/printerdrake.pm:3140
+#: printer/printerdrake.pm:3317
#, c-format
msgid ""
"Your multi-function device was configured automatically to be able to scan. "
@@ -12659,7 +12737,7 @@ msgstr ""
"\n"
"不要对这个设备使用“Drak 扫描仪”配置工具！"
-#: printer/printerdrake.pm:3163
+#: printer/printerdrake.pm:3343
#, c-format
msgid ""
"Your printer was configured automatically to give you access to the photo "
@@ -12678,18 +12756,18 @@ msgstr ""
"盘符“p:”中发现卡上的文件系统，如果您有多于一个支持照片卡的 HP 打印机可以查看"
"后续的盘符。在“MtoolsFM”中，您可以在文件列表的右上角切换盘符。"
-#: printer/printerdrake.pm:3185 printer/printerdrake.pm:3575
+#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
#, c-format
msgid "Reading printer data..."
msgstr "正在读取打印机数据..."
-#: printer/printerdrake.pm:3205 printer/printerdrake.pm:3232
-#: printer/printerdrake.pm:3267
+#: printer/printerdrake.pm:3385 printer/printerdrake.pm:3412
+#: printer/printerdrake.pm:3447
#, c-format
msgid "Transfer printer configuration"
msgstr "传送打印机配置"
-#: printer/printerdrake.pm:3206
+#: printer/printerdrake.pm:3386
#, c-format
msgid ""
"You can copy the printer configuration which you have done for the spooler %"
@@ -12702,26 +12780,26 @@ msgstr ""
"覆盖，但是打印作业不会迁移。\n"
"由于以下原因，某些打印队列无法迁移:\n"
-#: printer/printerdrake.pm:3209
+#: printer/printerdrake.pm:3389
#, c-format
msgid ""
"CUPS does not support printers on Novell servers or printers sending the "
"data into a free-formed command.\n"
msgstr "CUPS 不支持 Novell 服务器上的打印机及发送数据到无格式命令的打印机。\n"
-#: printer/printerdrake.pm:3211
+#: printer/printerdrake.pm:3391
#, c-format
msgid ""
"PDQ only supports local printers, remote LPD printers, and Socket/TCP "
"printers.\n"
msgstr "PDQ 只支持本地打印机、远程LPD打印机和 Socket/TCP 打印机。\n"
-#: printer/printerdrake.pm:3213
+#: printer/printerdrake.pm:3393
#, c-format
msgid "LPD and LPRng do not support IPP printers.\n"
msgstr "LPD 和 LPRng 不支持IPP打印机。\n"
-#: printer/printerdrake.pm:3215
+#: printer/printerdrake.pm:3395
#, c-format
msgid ""
"In addition, queues not created with this program or \"foomatic-configure\" "
@@ -12729,7 +12807,7 @@ msgid ""
msgstr ""
"另外，如果队列不是由这个程序或者“foomatic-configure”所创建，就无法传送。"
-#: printer/printerdrake.pm:3216
+#: printer/printerdrake.pm:3396
#, c-format
msgid ""
"\n"
@@ -12740,7 +12818,7 @@ msgstr ""
"而且，如果打印机需要使用厂商提供的 PPD 文件配置，或打印机带有内置的 CUPS 驱动"
"程序，它将无法传送。"
-#: printer/printerdrake.pm:3217
+#: printer/printerdrake.pm:3397
#, c-format
msgid ""
"\n"
@@ -12750,17 +12828,17 @@ msgstr ""
"\n"
"标记您要迁移的打印机并单击“传送”。"
-#: printer/printerdrake.pm:3220
+#: printer/printerdrake.pm:3400
#, c-format
msgid "Do not transfer printers"
msgstr "不传送打印机"
-#: printer/printerdrake.pm:3221 printer/printerdrake.pm:3237
+#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
#, c-format
msgid "Transfer"
msgstr "传送"
-#: printer/printerdrake.pm:3233
+#: printer/printerdrake.pm:3413
#, c-format
msgid ""
"A printer named \"%s\" already exists under %s. \n"
@@ -12771,17 +12849,17 @@ msgstr ""
"单击“传送”覆盖配置。\n"
"您也可以选择新的名称或跳过该打印机。"
-#: printer/printerdrake.pm:3254
+#: printer/printerdrake.pm:3434
#, c-format
msgid "New printer name"
msgstr "新打印机名称"
-#: printer/printerdrake.pm:3257
+#: printer/printerdrake.pm:3437
#, c-format
msgid "Transferring %s..."
msgstr "正在传送 %s ..."
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3448
#, c-format
msgid ""
"You have transferred your former default printer (\"%s\"), Should it be also "
@@ -12789,28 +12867,28 @@ msgid ""
msgstr ""
"您已经传送以前系统中的默认打印机(“%s”)，是否设置为新打印系统的默认打印机 %s？"
-#: printer/printerdrake.pm:3278
+#: printer/printerdrake.pm:3458
#, c-format
msgid "Refreshing printer data..."
msgstr "正在刷新打印机数据..."
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3467
#, c-format
msgid "Starting network..."
msgstr "正在启动网络..."
-#: printer/printerdrake.pm:3328 printer/printerdrake.pm:3332
-#: printer/printerdrake.pm:3334
+#: printer/printerdrake.pm:3508 printer/printerdrake.pm:3512
+#: printer/printerdrake.pm:3514
#, c-format
msgid "Configure the network now"
msgstr "立即配置网络"
-#: printer/printerdrake.pm:3329
+#: printer/printerdrake.pm:3509
#, c-format
msgid "Network functionality not configured"
msgstr "尚未完成网络配置"
-#: printer/printerdrake.pm:3330
+#: printer/printerdrake.pm:3510
#, c-format
msgid ""
"You are going to configure a remote printer. This needs working network "
@@ -12821,16 +12899,16 @@ msgstr ""
"您在配置远程打印机。配置远程打印需要网络访问，但您还没有配置网络。如果您仍\n"
"旧不进行网络配置的话，您将不能使用您现在正在配置的打印机。您希望怎样继续？"
-#: printer/printerdrake.pm:3333
+#: printer/printerdrake.pm:3513
#, c-format
msgid "Go on without configuring the network"
msgstr "跳过网络配置继续"
-#: printer/printerdrake.pm:3367
+#: printer/printerdrake.pm:3547
#, c-format
msgid ""
"The network configuration done during the installation cannot be started "
-"now. Please check whether the network is accessable after booting your "
+"now. Please check whether the network is accessible after booting your "
"system and correct the configuration using the %s Control Center, section "
"\"Network & Internet\"/\"Connection\", and afterwards set up the printer, "
"also using the %s Control Center, section \"Hardware\"/\"Printer\""
@@ -12839,7 +12917,7 @@ msgstr ""
"控制中心的“网络和 Internet”/“连接”一节纠正配置，然后再使用 %s 控制中心的“硬"
"件”/“打印机”设置打印机"
-#: printer/printerdrake.pm:3368
+#: printer/printerdrake.pm:3548
#, c-format
msgid ""
"The network access was not running and could not be started. Please check "
@@ -12848,34 +12926,34 @@ msgid ""
msgstr ""
"网络访问未运行，也无法启动。请检查您的配置和您的硬件。然后再次配置远程打印。"
-#: printer/printerdrake.pm:3378
+#: printer/printerdrake.pm:3558
#, c-format
msgid "Restarting printing system..."
msgstr "重新启动打印系统..."
-#: printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3597
#, c-format
msgid "high"
msgstr "高"
-#: printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3597
#, c-format
msgid "paranoid"
msgstr "严格"
-#: printer/printerdrake.pm:3418
+#: printer/printerdrake.pm:3598
#, c-format
msgid "Installing a printing system in the %s security level"
msgstr "在 %s 安全级别上安装打印系统"
-#: printer/printerdrake.pm:3419
+#: printer/printerdrake.pm:3599
#, c-format
msgid ""
"You are about to install the printing system %s on a system running in the %"
"s security level.\n"
"\n"
"This printing system runs a daemon (background process) which waits for "
-"print jobs and handles them. This daemon is also accessable by remote "
+"print jobs and handles them. This daemon is also accessible by remote "
"machines through the network and so it is a possible point for attacks. "
"Therefore only a few selected daemons are started by default in this "
"security level.\n"
@@ -12889,12 +12967,12 @@ msgstr ""
"\n"
"您要配置打印吗？"
-#: printer/printerdrake.pm:3453
+#: printer/printerdrake.pm:3633
#, c-format
msgid "Starting the printing system at boot time"
msgstr "开机时启动打印系统"
-#: printer/printerdrake.pm:3454
+#: printer/printerdrake.pm:3634
#, c-format
msgid ""
"The printing system (%s) will not be started automatically when the machine "
@@ -12914,48 +12992,68 @@ msgstr ""
"\n"
"您希望让打印系统自动启动吗？"
-#: printer/printerdrake.pm:3475 printer/printerdrake.pm:3690
+#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
#, c-format
msgid "Checking installed software..."
msgstr "正在检查已经安装的软件..."
-#: printer/printerdrake.pm:3481
+#: printer/printerdrake.pm:3661
#, c-format
msgid "Removing %s ..."
msgstr "正在删除 %s..."
-#: printer/printerdrake.pm:3488
+#: printer/printerdrake.pm:3665
+#, c-format
+msgid "Could not remove the %s printing system!"
+msgstr "无法删除 %s 打印系统!"
+
+#: printer/printerdrake.pm:3674
#, c-format
msgid "Installing %s ..."
msgstr "正在安装 %s..."
-#: printer/printerdrake.pm:3535
+#: printer/printerdrake.pm:3678
+#, c-format
+msgid "Could not install the %s printing system!"
+msgstr "无法安装 %s 打印系统!"
+
+#: printer/printerdrake.pm:3727
#, c-format
msgid "Setting Default Printer..."
msgstr "正在设置默认打印机..."
-#: printer/printerdrake.pm:3555
+#: printer/printerdrake.pm:3747
#, c-format
msgid "Select Printer Spooler"
msgstr "选择打印机系统"
-#: printer/printerdrake.pm:3556
+#: printer/printerdrake.pm:3748
#, c-format
msgid "Which printing system (spooler) do you want to use?"
msgstr "您需要使用哪种打印系统？"
-#: printer/printerdrake.pm:3607
+#: printer/printerdrake.pm:3799
#, c-format
msgid "Failed to configure printer \"%s\"!"
msgstr "配置打印机“%s”失败"
-#: printer/printerdrake.pm:3620
+#: printer/printerdrake.pm:3812
#, c-format
msgid "Installing Foomatic..."
msgstr "正在安装 Foomatic..."
-#: printer/printerdrake.pm:3806
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3818
+#, c-format
+msgid "Could not install %s packages, %s cannot be started!"
+msgstr "无法安装 %s 软件包，%s 无法启动!"
+
+#: printer/printerdrake.pm:3910
+#, c-format
+msgid "Could not install necessary packages, %s cannot be started!"
+msgstr "无法安装所需的软件包，%s 无法启动!"
+
+#: printer/printerdrake.pm:4011
+#, c-format
msgid ""
"The following printers are configured. Double-click on a printer to change "
"its settings; to make it the default printer; or to view information about "
@@ -12964,48 +13062,48 @@ msgstr ""
"下列打印机已配置。双击打印机可更改其设置、将其设为默认打印机；或者查看相关信"
"息。"
-#: printer/printerdrake.pm:3834
+#: printer/printerdrake.pm:4039
#, c-format
msgid "Display all available remote CUPS printers"
msgstr "显示可用的全部远程 CUPS 打印机"
-#: printer/printerdrake.pm:3835
+#: printer/printerdrake.pm:4040
#, c-format
msgid "Refresh printer list (to display all available remote CUPS printers)"
msgstr "更新打印列表(显示所有可用的远程 CUPS 打印机)"
-#: printer/printerdrake.pm:3845
+#: printer/printerdrake.pm:4050
#, c-format
msgid "CUPS configuration"
msgstr "CUPS 配置"
-#: printer/printerdrake.pm:3857
+#: printer/printerdrake.pm:4062
#, c-format
msgid "Change the printing system"
msgstr "更改打印系统"
-#: printer/printerdrake.pm:3866
+#: printer/printerdrake.pm:4071
#, c-format
msgid "Normal Mode"
msgstr "普通模式"
-#: printer/printerdrake.pm:3867
+#: printer/printerdrake.pm:4072
#, c-format
msgid "Expert Mode"
msgstr "专家模式"
-#: printer/printerdrake.pm:4138 printer/printerdrake.pm:4193
-#: printer/printerdrake.pm:4274 printer/printerdrake.pm:4284
+#: printer/printerdrake.pm:4343 printer/printerdrake.pm:4398
+#: printer/printerdrake.pm:4479 printer/printerdrake.pm:4489
#, c-format
msgid "Printer options"
msgstr "打印机选项"
-#: printer/printerdrake.pm:4174
+#: printer/printerdrake.pm:4379
#, c-format
msgid "Modify printer configuration"
msgstr "修改打印机配置"
-#: printer/printerdrake.pm:4176
+#: printer/printerdrake.pm:4381
#, c-format
msgid ""
"Printer %s\n"
@@ -13014,116 +13112,116 @@ msgstr ""
"打印机 %s\n"
"真的要修改吗？"
-#: printer/printerdrake.pm:4180
+#: printer/printerdrake.pm:4385
#, c-format
msgid "Do it!"
msgstr "执行！"
-#: printer/printerdrake.pm:4185 printer/printerdrake.pm:4243
+#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
#, c-format
msgid "Printer connection type"
msgstr "打印机连接类型"
-#: printer/printerdrake.pm:4186 printer/printerdrake.pm:4247
+#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
#, c-format
msgid "Printer name, description, location"
msgstr "打印机名称、描述、位置"
-#: printer/printerdrake.pm:4188 printer/printerdrake.pm:4266
+#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
#, c-format
msgid "Printer manufacturer, model, driver"
msgstr "打印机厂家，型号，驱动"
-#: printer/printerdrake.pm:4189 printer/printerdrake.pm:4267
+#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
#, c-format
msgid "Printer manufacturer, model"
msgstr "打印机厂家，型号"
-#: printer/printerdrake.pm:4195 printer/printerdrake.pm:4278
+#: printer/printerdrake.pm:4400 printer/printerdrake.pm:4483
#, c-format
msgid "Set this printer as the default"
msgstr "设置该打印机为默认"
-#: printer/printerdrake.pm:4197 printer/printerdrake.pm:4285
+#: printer/printerdrake.pm:4402 printer/printerdrake.pm:4490
#, c-format
msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
msgstr "把这个打印机添加到 Star Office/OpenOffice.org/GIMP"
-#: printer/printerdrake.pm:4198 printer/printerdrake.pm:4290
+#: printer/printerdrake.pm:4403 printer/printerdrake.pm:4495
#, c-format
msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
msgstr "从 Star Office/OpenOffice.org/GIMP 删除这个打印机"
-#: printer/printerdrake.pm:4199 printer/printerdrake.pm:4295
+#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
#, c-format
msgid "Print test pages"
msgstr "打印测试页"
-#: printer/printerdrake.pm:4200 printer/printerdrake.pm:4297
+#: printer/printerdrake.pm:4405 printer/printerdrake.pm:4502
#, c-format
msgid "Learn how to use this printer"
msgstr "了解怎样使用此打印机"
-#: printer/printerdrake.pm:4201 printer/printerdrake.pm:4299
+#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
#, c-format
msgid "Remove printer"
msgstr "删除打印机"
-#: printer/printerdrake.pm:4255
+#: printer/printerdrake.pm:4460
#, c-format
msgid "Removing old printer \"%s\"..."
msgstr "删除旧打印机“%s”..."
-#: printer/printerdrake.pm:4286
+#: printer/printerdrake.pm:4491
#, c-format
msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
msgstr "添加打印机到 Star Office/OpenOffice.org/GIMP"
-#: printer/printerdrake.pm:4288
+#: printer/printerdrake.pm:4493
#, c-format
msgid ""
"The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
msgstr "打印机“%s”成功添加到 Star Office/OpenOffice.org/GIMP"
-#: printer/printerdrake.pm:4289
+#: printer/printerdrake.pm:4494
#, c-format
msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
msgstr "未能添加打印机“%s”到 Star Office/OpenOffice.org/GIMP"
-#: printer/printerdrake.pm:4291
+#: printer/printerdrake.pm:4496
#, c-format
msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
msgstr "从 Star Office/OpenOffice.org/GIMP 删除打印机"
-#: printer/printerdrake.pm:4293
+#: printer/printerdrake.pm:4498
#, c-format
msgid ""
"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
"GIMP."
msgstr "成功的从 Star Office/OpenOffice.org/GIMP 删除打印机“%s”。"
-#: printer/printerdrake.pm:4294
+#: printer/printerdrake.pm:4499
#, c-format
msgid ""
"Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
msgstr "未能从 Star Office/OpenOffice.org/GIMP 删除打印机“%s”。"
-#: printer/printerdrake.pm:4338
+#: printer/printerdrake.pm:4543
#, c-format
msgid "Do you really want to remove the printer \"%s\"?"
msgstr "真的要删除打印机“%s”？"
-#: printer/printerdrake.pm:4342
+#: printer/printerdrake.pm:4547
#, c-format
msgid "Removing printer \"%s\"..."
msgstr "正在删除打印机“%s”..."
-#: printer/printerdrake.pm:4366
+#: printer/printerdrake.pm:4571
#, c-format
msgid "Default printer"
msgstr "默认打印机"
-#: printer/printerdrake.pm:4367
+#: printer/printerdrake.pm:4572
#, c-format
msgid "The printer \"%s\" is set as the default printer now."
msgstr "打印机“%s”设为缺省打印机。"
@@ -13153,31 +13251,36 @@ msgstr "没有足够的分区建立 %d 级的硬盘阵列\n"
msgid "Could not create directory /usr/share/sane/firmware!"
msgstr "无法创建目录 /usr/share/sane/firmware!"
-#: scanner.pm:102
+#: scanner.pm:107
+#, c-format
+msgid "Could not create link /usr/share/sane/%s!"
+msgstr "无法创建链接 /usr/share/sane/%s!"
+
+#: scanner.pm:114
#, c-format
msgid "Could not copy firmware file %s to /usr/share/sane/firmware!"
msgstr "无法将固件文件 %s 复制到 /usr/share/sane/firmware!"
-#: scanner.pm:109
+#: scanner.pm:121
#, c-format
msgid "Could not set permissions of firmware file %s!"
msgstr "无法设定固件文件 %s 的权限!"
-#: scanner.pm:188 standalone/scannerdrake:59 standalone/scannerdrake:63
-#: standalone/scannerdrake:71 standalone/scannerdrake:333
-#: standalone/scannerdrake:407 standalone/scannerdrake:451
-#: standalone/scannerdrake:455 standalone/scannerdrake:477
-#: standalone/scannerdrake:542
+#: scanner.pm:200 standalone/scannerdrake:65 standalone/scannerdrake:69
+#: standalone/scannerdrake:77 standalone/scannerdrake:339
+#: standalone/scannerdrake:414 standalone/scannerdrake:458
+#: standalone/scannerdrake:462 standalone/scannerdrake:484
+#: standalone/scannerdrake:549
#, c-format
msgid "Scannerdrake"
msgstr "Drak 扫描仪"
-#: scanner.pm:189 standalone/scannerdrake:903
+#: scanner.pm:201 standalone/scannerdrake:915
#, c-format
msgid "Could not install the packages needed to share your scanner(s)."
msgstr "无法安装共享您的扫描仪所需的软件包。"
-#: scanner.pm:190
+#: scanner.pm:202
#, c-format
msgid "Your scanner(s) will not be available for non-root users."
msgstr "您的扫描仪将无法被非 root 用户使用。"
@@ -14254,7 +14357,7 @@ msgid ""
"about this service, sorry."
msgstr "没有该服务的附加信息。"
-#: services.pm:226 ugtk2.pm:1139
+#: services.pm:226 ugtk2.pm:1167
#, c-format
msgid "Info"
msgstr "信息"
@@ -14282,8 +14385,8 @@ msgstr "停止"
#: share/advertising/dis-01.pl:13 share/advertising/dwd-01.pl:13
#: share/advertising/ppp-01.pl:13 share/advertising/pwp-01.pl:13
#, c-format
-msgid "<b>Congratulations for choosing Mandrake Linux!</b>"
-msgstr "<b>感谢您选择 Mandrake Linux!</b>"
+msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
+msgstr "<b>感谢您选择 Mandrakelinux!</b>"
#: share/advertising/dis-01.pl:15 share/advertising/dwd-01.pl:15
#: share/advertising/ppp-01.pl:15 share/advertising/pwp-01.pl:15
@@ -14294,12 +14397,12 @@ msgstr "欢迎进入开放源代码世界!"
#: share/advertising/dis-01.pl:17
#, c-format
msgid ""
-"Your new Mandrake Linux operating system and its many applications is the "
-"result of collaborative efforts between MandrakeSoft developers and Mandrake "
-"Linux contributors throughout the world."
+"Your new Mandrakelinux operating system and its many applications is the "
+"result of collaborative efforts between MandrakeSoft developers and "
+"Mandrakelinux contributors throughout the world."
msgstr ""
-"您新的 Mandrake Linux 操作系统以及其中所含的许多应用程序都得益于 "
-"MandrakeSoft 开发者和来自世界各地的 Mandrake Linux 贡献者的共同努力。"
+"您新的 Mandrakelinux 操作系统以及其中所含的许多应用程序都得益于 Mandrakesoft "
+"开发者和来自世界各地的 Mandrakelinux 贡献者的共同努力。"
#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
#: share/advertising/ppp-01.pl:19
@@ -14452,7 +14555,7 @@ msgstr "用 <b>GQView</b> 和 <b>Gimp</b> 查看并编辑图像和照片!"
#: share/advertising/pwp-07.pl:13
#, c-format
msgid "<b>Mandrake Control Center</b>"
-msgstr "<b>Mandrake 控制中心</b>"
+msgstr "<b>Mandrakelinux 控制中心</b>"
#: share/advertising/dis-08.pl:15 share/advertising/ppp-08.pl:15
#: share/advertising/pwp-07.pl:15
@@ -14461,7 +14564,8 @@ msgid ""
"The Mandrake Control Center is an essential collection of Mandrake-specific "
"utilities for simplifying the configuration of your computer."
msgstr ""
-"Mandrake 控制中心是 Mandrake 特有工具的大集合，它可显著简化对计算机的配置。"
+"Mandrakelinux 控制中心是 Mandrakelinux 特有工具的大集合，它可显著简化对计算机"
+"的配置。"
#: share/advertising/dis-08.pl:17 share/advertising/ppp-08.pl:17
#: share/advertising/pwp-07.pl:17
@@ -14502,7 +14606,7 @@ msgstr "驻足 <b>www.mandrakestore.com</b>"
#: share/advertising/pwp-09.pl:13
#, c-format
msgid "Become a <b>MandrakeClub</b> member!"
-msgstr "成为 <b>MandrakeClub</b> 会员!"
+msgstr "成为 <b>Mandrakeclub</b> 会员!"
#: share/advertising/dis-10.pl:15 share/advertising/ppp-10.pl:15
#: share/advertising/pwp-09.pl:15
@@ -14510,7 +14614,7 @@ msgstr "成为 <b>MandrakeClub</b> 会员!"
msgid ""
"Take advantage of valuable benefits, products and services by joining "
"MandrakeClub, such as:"
-msgstr "加入 MandrakeClub，您可充分享受各项超值回馈、产品和服务，例如:"
+msgstr "加入 Mandrakeclub，您可充分享受各项超值回馈、产品和服务，例如:"
#: share/advertising/dis-10.pl:16 share/advertising/dwd-07.pl:16
#: share/advertising/ppp-10.pl:17 share/advertising/pwp-09.pl:16
@@ -14522,13 +14626,13 @@ msgstr "\t- 完全访问商业应用程序"
#: share/advertising/ppp-10.pl:18 share/advertising/pwp-09.pl:17
#, c-format
msgid "\t- Special download mirror list exclusively for MandrakeClub Members"
-msgstr "\t- 专为 MandrakeClub 会员提供的下载镜像服务器"
+msgstr "\t- 专为 Mandrakeclub 会员提供的下载镜像服务器"
#: share/advertising/dis-10.pl:18 share/advertising/dwd-07.pl:18
#: share/advertising/ppp-10.pl:19 share/advertising/pwp-09.pl:18
#, c-format
-msgid "\t- Voting for software to put in Mandrake Linux"
-msgstr "\t- 投票选出 Mandrake Linux 中的软件"
+msgid "\t- Voting for software to put in Mandrakelinux"
+msgstr "\t- 投票选出 Mandrakelinux 中的软件"
#: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19
#: share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19
@@ -14574,19 +14678,19 @@ msgstr ""
#: share/advertising/dwd-01.pl:17
#, c-format
msgid ""
-"Mandrake Linux is committed to the Open Source Model and fully respects the "
+"Mandrakelinux is committed to the Open Source Model and fully respects the "
"General Public License. This new release is the result of collaboration "
"between MandrakeSoft's team of developers and the worldwide community of "
-"Mandrake Linux contributors."
+"Mandrakelinux contributors."
msgstr ""
-"Mandrake Linux 专注于开放源代码模型，并完全遵从 GPL 协议。您现在看到的最新版"
-"本就是 MandrakeSoft 开发者团队和来自世界各地 Mandrake Linux 贡献者社区共同努"
-"力的结果。"
+"Mandrakelinux 专注于开放源代码模型，并完全遵从 GPL 协议。您现在看到的最新版本"
+"就是 MandrakeSoft 开发者团队和来自世界各地 Mandrakelinux 贡献者社区共同努力的"
+"结果。"
#: share/advertising/dwd-02.pl:13
#, c-format
-msgid "<b>Join the Mandrake Linux community!</b>"
-msgstr "<b>加入 Mandrake Linux 社区!</b>"
+msgid "<b>Join the Mandrakelinux community!</b>"
+msgstr "<b>加入 Mandrakelinux 社区!</b>"
#: share/advertising/dwd-02.pl:15
#, c-format
@@ -14607,35 +14711,35 @@ msgstr ""
#: share/advertising/dwd-03.pl:13
#, c-format
-msgid "<b>What is Mandrake Linux?</b>"
-msgstr "<b>何为 Mandrake Linux?</b>"
+msgid "<b>What is Mandrakelinux?</b>"
+msgstr "<b>何为 Mandrakelinux?</b>"
#: share/advertising/dwd-03.pl:15
#, c-format
msgid ""
-"Mandrake Linux is an Open Source distribution created with thousands of the "
-"choicest applications from the Free Software world. Mandrake Linux is one of "
+"Mandrakelinux is an Open Source distribution created with thousands of the "
+"choicest applications from the Free Software world. Mandrakelinux is one of "
"the most widely used Linux distributions worldwide!"
msgstr ""
-"Mandrake Linux 是一份开放源代码的发行版，它有机结合了自由软件世界中的数千精选"
-"软件。Mandrake Linux 是世界上使用最为广泛的 Linux 发行版之一!"
+"Mandrakelinux 是一份开放源代码的发行版，它有机结合了自由软件世界中的数千精选"
+"软件。Mandrakelinux 是世界上使用最为广泛的 Linux 发行版之一!"
#: share/advertising/dwd-03.pl:17
#, c-format
msgid ""
-"Mandrake Linux includes the famous graphical desktops KDE and GNOME, plus "
-"the latest versions of the most popular Open Source applications."
+"Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus the "
+"latest versions of the most popular Open Source applications."
msgstr ""
-"Mandrake Linux 包含了著名的桌面环境 KDE 和 GNOME，以及最流行的开源应用程序的"
-"最新版本。"
+"Mandrakelinux 包含了著名的桌面环境 KDE 和 GNOME，以及最流行的开源应用程序的最"
+"新版本。"
#: share/advertising/dwd-04.pl:13
#, c-format
msgid ""
-"Mandrake Linux is widely known as the most user-friendly and the easiest to "
+"Mandrakelinux is widely known as the most user-friendly and the easiest to "
"install and easy to use Linux distribution."
msgstr ""
-"Mandrake Linux 因其友好易用的用户界面和简单方便的安装和使用过程而广受赞誉。"
+"Mandrakelinux 因其友好易用的用户界面和简单方便的安装和使用过程而广受赞誉。"
#: share/advertising/dwd-04.pl:15
#, c-format
@@ -14644,8 +14748,9 @@ msgstr "了解一下我们的<b>个人解决方案</b>: "
#: share/advertising/dwd-04.pl:16
#, c-format
-msgid "\t- Find out Mandrake Linux on a bootable CD with <b>MandrakeMove</b>"
-msgstr "\t- 在一张可启动的光盘上探索 Mandrake Linux，您正需要 MandrakeMove"
+msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+msgstr ""
+"\t- 在一张可启动的光盘上探索 Mandrakelinux，您正需要 <b>MandrakeMove</b>"
#: share/advertising/dwd-04.pl:17
#, c-format
@@ -14702,11 +14807,11 @@ msgstr ""
#, c-format
msgid ""
"<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined "
-"with the stability and easy-of-use of the world-famous Mandrake Linux "
+"with the stability and easy-of-use of the world-famous Mandrakelinux "
"distribution. A unique blend for incomparable HPC performance."
msgstr ""
"<b>MandrakeClustering</b>: Linux 集群计算的力量和速度，以稳定和易用驰名世界"
-"的 Mandrake Linux 发行版，这二者结合的产物必能为您带来无与伦比的 HPC 性能。"
+"的 Mandrakelinux 发行版，这二者结合的产物必能为您带来无与伦比的 HPC 性能。"
#: share/advertising/dwd-06.pl:15
#, c-format
@@ -14730,14 +14835,14 @@ msgstr ""
#: share/advertising/dwd-07.pl:13
#, c-format
msgid "<b>Become a MandrakeClub member!</b>"
-msgstr "<b>成为 MandrakeClub 会员!</b>"
+msgstr "<b>成为 Mandrakeclub 会员!</b>"
#: share/advertising/dwd-07.pl:15
#, c-format
msgid ""
"Take advantage of valuable benefits, products and services by joining "
"Mandrake Club, such as:"
-msgstr "加入 MandrakeClub，您可充分享受各项超值回馈、产品和服务，例如: "
+msgstr "加入 Mandrakeclub，您可充分享受各项超值回馈、产品和服务，例如: "
#: share/advertising/dwd-08.pl:14 share/advertising/ppp-11.pl:13
#: share/advertising/pwp-10.pl:13
@@ -14752,11 +14857,11 @@ msgstr "<b>注意</b>"
#: share/advertising/dwd-09.pl:18
#, c-format
-msgid "This is the Mandrake Linux <b>Download version</b>."
-msgstr "这是 Mandrake Linux 的<b>下载版本</b>。"
+msgid "This is the Mandrakelinux <b>Download version</b>."
+msgstr "这是 Mandrakelinux 的<b>下载版本</b>。"
#: share/advertising/dwd-09.pl:20
-#, fuzzy, c-format
+#, c-format
msgid ""
"The free download version does not include commercial software, and "
"therefore may not work with certain modems (such as some ADSL and RTC) and "
@@ -14768,12 +14873,12 @@ msgstr ""
#: share/advertising/ppp-01.pl:17
#, c-format
msgid ""
-"Your new Mandrake Linux distribution and its many applications are the "
-"result of collaborative efforts between MandrakeSoft developers and Mandrake "
-"Linux contributors throughout the world."
+"Your new Mandrakelinux distribution and its many applications are the result "
+"of collaborative efforts between MandrakeSoft developers and Mandrakelinux "
+"contributors throughout the world."
msgstr ""
-"您新的 Mandrake Linux 操作系统以及其中所含的许多应用程序，是 MandrakeSoft 开"
-"发者和来自世界各地的 Mandrake Linux 贡献者共同努力的结果。"
+"您新的 Mandrakelinux 操作系统以及其中所含的许多应用程序，是 Mandrakesoft 开发"
+"者和来自世界各地的 Mandrakelinux 贡献者共同努力的结果。"
#: share/advertising/ppp-02.pl:13
#, c-format
@@ -14793,8 +14898,8 @@ msgstr ""
#: share/advertising/ppp-02.pl:17
#, c-format
msgid ""
-"It is the only Mandrake Linux product that includes the groupware solution."
-msgstr "该版本是 Mandrake Linux 产品中唯一包含群件解决方案的。"
+"It is the only Mandrakelinux product that includes the groupware solution."
+msgstr "该版本是 Mandrakelinux 产品中唯一包含群件解决方案的。"
#: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
#, c-format
@@ -14804,19 +14909,19 @@ msgstr "<b>选择您的图形桌面环境!</b>"
#: share/advertising/ppp-03.pl:15 share/advertising/pwp-03.pl:15
#, c-format
msgid ""
-"When you log into your Mandrake Linux system for the first time, you can "
+"When you log into your Mandrakelinux system for the first time, you can "
"choose between several popular graphical desktops environments, including: "
"KDE, GNOME, WindowMaker, IceWM, and others."
msgstr ""
-"当您第一次登录到您的 Mandrake Linux 系统时，您可以选择几种流行的图形桌面环境"
-"之一，其中包括: KDE、GNOME、WindowMaker、IceWM 等等。"
+"当您第一次登录到您的 Mandrakelinux 系统时，您可以选择几种流行的图形桌面环境之"
+"一，其中包括: KDE、GNOME、WindowMaker、IceWM 等等。"
#: share/advertising/ppp-04.pl:13
#, c-format
msgid ""
-"In the Mandrake Linux menu you will find easy-to-use applications for all "
+"In the Mandrakelinux menu you will find easy-to-use applications for all "
"tasks:"
-msgstr "在 Mandrake Linux 菜单中，您可轻而易举的找到完成各种任务的应用程序: "
+msgstr "在 Mandrakelinux 菜单中，您可轻而易举的找到完成各种任务的应用程序: "
#: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
#, c-format
@@ -14963,12 +15068,12 @@ msgstr "\t- 以及其它"
#: share/advertising/pwp-01.pl:17
#, c-format
msgid ""
-"Your new Mandrake Linux distribution is the result of collaborative efforts "
-"between MandrakeSoft developers and Mandrake Linux contributors throughout "
+"Your new Mandrakelinux distribution is the result of collaborative efforts "
+"between MandrakeSoft developers and Mandrakelinux contributors throughout "
"the world."
msgstr ""
-"您新的 Mandrake Linux 发行版是 MandrakeSoft 开发者和来自世界各地的 Mandrake "
-"Linux 贡献者共同努力的结果。"
+"您新的 Mandrakelinux 发行版是 MandrakeSoft 开发者和来自世界各地的 "
+"Mandrakelinux 贡献者共同努力的结果。"
#: share/advertising/pwp-01.pl:19
#, c-format
@@ -14996,9 +15101,9 @@ msgstr ""
#: share/advertising/pwp-04.pl:13
#, c-format
msgid ""
-"In the Mandrake Linux menu you will find easy-to-use applications for all of "
+"In the Mandrakelinux menu you will find easy-to-use applications for all of "
"your tasks:"
-msgstr "在 Mandrake Linux 菜单中，您可轻而易举的找到完成各种任务的应用程序: "
+msgstr "在 Mandrakelinux 菜单中，您可轻而易举的找到完成各种任务的应用程序: "
#: share/advertising/pwp-04.pl:16
#, c-format
@@ -15132,8 +15237,8 @@ msgstr ""
"\n"
"选项:\n"
" --help - 打印此帮助信息。\n"
-" --report - 程序应该是 Mandrake 工具之一\n"
-" --incident - 程序应该是 Mandrake 工具之一"
+" --report - 程序应该是 Mandrakelinux 工具之一\n"
+" --incident - 程序应该是 Mandrakelinux 工具之一"
#: standalone.pm:63
#, c-format
@@ -15201,7 +15306,7 @@ msgid ""
"IP, nbi image name)"
msgstr ""
"[选项]...\n"
-"Mandrake 终端服务器配置\n"
+"Mandrakelinux 终端服务器配置\n"
"--enable :启用 MTS\n"
"--disable :禁用 MTS\n"
"--start :启动 MTS\n"
@@ -15307,17 +15412,17 @@ msgstr "请注销，然后同时按 Ctrl-Alt-BackSpace"
msgid "You need to log out and back in again for changes to take effect"
msgstr "您需要注销后重新登录才能让更改生效"
-#: standalone/drakTermServ:71
+#: standalone/drakTermServ:77
#, c-format
msgid "Useless without Terminal Server"
msgstr "没有终端服务器就无用"
-#: standalone/drakTermServ:101 standalone/drakTermServ:108
+#: standalone/drakTermServ:114 standalone/drakTermServ:121
#, c-format
msgid "%s: %s requires a username...\n"
msgstr "%s: %s 需要用户名...\n"
-#: standalone/drakTermServ:121
+#: standalone/drakTermServ:134
#, c-format
msgid ""
"%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -15326,78 +15431,78 @@ msgstr ""
"%s: %s 需要主机名、MAC 地址、IP、nbi-image、代表瘦客户端的 0/1、代表本地配置"
"的 0/1...\n"
-#: standalone/drakTermServ:128
+#: standalone/drakTermServ:141
#, c-format
msgid "%s: %s requires hostname...\n"
msgstr "%s: %s 需要主机名...\n"
-#: standalone/drakTermServ:140
+#: standalone/drakTermServ:153
#, c-format
msgid "You must be root to read configuration file. \n"
msgstr "您必须是 root 才能读取配置文件。\n"
-#: standalone/drakTermServ:219 standalone/drakTermServ:488
-#: standalone/drakfont:572
+#: standalone/drakTermServ:238 standalone/drakTermServ:511
+#: standalone/drakfont:575
#, c-format
msgid "OK"
msgstr "确定"
-#: standalone/drakTermServ:235
+#: standalone/drakTermServ:249 standalone/drakTermServ:252
#, c-format
msgid "Terminal Server Configuration"
msgstr "终端服务器配置"
-#: standalone/drakTermServ:240
-#, c-format
-msgid "DrakTermServ"
-msgstr "Drak 终端服务"
-
-#: standalone/drakTermServ:264
+#: standalone/drakTermServ:267
#, c-format
msgid "Enable Server"
msgstr "启用服务器"
-#: standalone/drakTermServ:270
+#: standalone/drakTermServ:273
#, c-format
msgid "Disable Server"
msgstr "禁用服务器"
-#: standalone/drakTermServ:278
+#: standalone/drakTermServ:281
#, c-format
msgid "Start Server"
msgstr "启动服务器"
-#: standalone/drakTermServ:284
+#: standalone/drakTermServ:287
#, c-format
msgid "Stop Server"
msgstr "停止服务器"
-#: standalone/drakTermServ:292
+#: standalone/drakTermServ:295
#, c-format
msgid "Etherboot Floppy/ISO"
msgstr "Etherboot 软盘/ISO"
-#: standalone/drakTermServ:296
+#: standalone/drakTermServ:299
#, c-format
msgid "Net Boot Images"
msgstr "网络启动磁盘镜像"
-#: standalone/drakTermServ:302
+#: standalone/drakTermServ:305
#, c-format
msgid "Add/Del Users"
msgstr "添加/删除用户"
-#: standalone/drakTermServ:306
+#: standalone/drakTermServ:309
#, c-format
msgid "Add/Del Clients"
-msgstr "增加/删除客户"
+msgstr "添加/删除客户"
-#: standalone/drakTermServ:317 standalone/drakbug:54
+#: standalone/drakTermServ:320 standalone/drakbug:54
#, c-format
msgid "First Time Wizard"
msgstr "初次使用向导"
-#: standalone/drakTermServ:342
+#: standalone/drakTermServ:351 standalone/drakTermServ:352
+#, c-format
+msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
+msgstr "%s 定义为 dm，将 gdm 用户添加到 /etc/passwd$$CLIENT$$"
+
+#: standalone/drakTermServ:358
#, c-format
msgid ""
"\n"
@@ -15434,67 +15539,72 @@ msgstr ""
" e) 要求您制作启动软盘。\n"
" f) 如果是瘦客户的话，询问您是否想要重新启动 K 登陆管理器(KDM)。\n"
-#: standalone/drakTermServ:387
+#: standalone/drakTermServ:403
#, c-format
msgid "Cancel Wizard"
msgstr "取消向导"
-#: standalone/drakTermServ:399
+#: standalone/drakTermServ:415
#, c-format
msgid "Please save dhcpd config!"
msgstr "请保存 dhcpd 配置!"
-#: standalone/drakTermServ:427
+#: standalone/drakTermServ:443
+#, c-format
+msgid "Use thin clients."
+msgstr "使用瘦客户端。"
+
+#: standalone/drakTermServ:445
#, c-format
msgid ""
-"Please select client type.\n"
+"Please select default client type.\n"
" 'Thin' clients run everything off the server's CPU/RAM, using the client "
"display.\n"
" 'Fat' clients use their own CPU/RAM but the server's filesystem."
msgstr ""
-"请选择客户端类型。\n"
-" “瘦”客户端会使用服务器的 CPU/内存/存储设备，只是使用客户端进行显示。\n"
+"请选择默认客户端类型。\n"
+" “瘦”客户端会使用服务器的 CPU/内存，只是使用客户端进行显示。\n"
" “胖”客户端将会使用自己的 CPU/内存，但会使用服务器的文件系统。"
-#: standalone/drakTermServ:433
+#: standalone/drakTermServ:457 standalone/drakTermServ:1071
#, c-format
-msgid "Allow thin clients."
-msgstr "允许瘦客户端。"
+msgid "Sync client X keyboard settings with server."
+msgstr "将客户端的 X 键盘设置与服务器同步。"
-#: standalone/drakTermServ:441
+#: standalone/drakTermServ:464
#, c-format
msgid "Creating net boot images for all kernels"
msgstr "为全部内核创建网络引导映像"
-#: standalone/drakTermServ:442 standalone/drakTermServ:725
-#: standalone/drakTermServ:741
+#: standalone/drakTermServ:465 standalone/drakTermServ:763
+#: standalone/drakTermServ:779
#, c-format
msgid "This will take a few minutes."
msgstr "这将花费几分钟。"
-#: standalone/drakTermServ:446 standalone/drakTermServ:466
+#: standalone/drakTermServ:469 standalone/drakTermServ:489
#, c-format
msgid "Done!"
msgstr "完成！"
-#: standalone/drakTermServ:452
+#: standalone/drakTermServ:475
#, c-format
msgid "Syncing server user list with client list, including root."
msgstr "将服务器用户列表与客户列表同步，包括 root。"
-#: standalone/drakTermServ:472
+#: standalone/drakTermServ:495
#, c-format
msgid ""
"In order to enable changes made for thin clients, the display manager must "
"be restarted. Restart now?"
msgstr "为了要启用为瘦客户所作的更改，必须重新启动显示管理器。立即重新启动吗？"
-#: standalone/drakTermServ:507
+#: standalone/drakTermServ:530
#, c-format
-msgid "drakTermServ Overview"
-msgstr "“Drak 终端服务”概览"
+msgid "Terminal Server Overview"
+msgstr "终端服务器概览"
-#: standalone/drakTermServ:508
+#: standalone/drakTermServ:531
#, c-format
msgid ""
" - Create Etherboot Enabled Boot Images:\n"
@@ -15517,7 +15627,7 @@ msgstr ""
"etherboot-pcimap.include，与 dhcpd.conf 相关联，\n"
" \t您需要至少为一个完整的内核创建以太网启动镜像。"
-#: standalone/drakTermServ:514
+#: standalone/drakTermServ:537
#, c-format
msgid ""
" - Maintain /etc/dhcpd.conf:\n"
@@ -15549,7 +15659,7 @@ msgstr ""
"\t\t\t \n"
" \t\t一个可以支持无盘工作站典型的 dhcpd.conf 应该是这样:"
-#: standalone/drakTermServ:532
+#: standalone/drakTermServ:555
#, c-format
msgid ""
" While you can use a pool of IP addresses, rather than setup a "
@@ -15602,7 +15712,7 @@ msgstr ""
"\t\t\t\n"
"\t\t\t注意:在添加或更改客户端后您必须停止/启动服务器。"
-#: standalone/drakTermServ:552
+#: standalone/drakTermServ:575
#, c-format
msgid ""
" - Maintain /etc/exports:\n"
@@ -15631,7 +15741,7 @@ msgstr ""
"\t\t\t\n"
"\t\t\t这里的子网/掩码应该与您的网络相同。"
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:587
#, c-format
msgid ""
" - Maintain %s:\n"
@@ -15647,7 +15757,7 @@ msgstr ""
" \t\t除了要在 /etc/shadow 中之外，还应在 %s$\n"
" \t\t中存有副本。drakTermServ 能够帮助您完成这一过程。"
-#: standalone/drakTermServ:568
+#: standalone/drakTermServ:591
#, c-format
msgid ""
" - Per client %s:\n"
@@ -15664,7 +15774,7 @@ msgstr ""
"助您创建\n"
" \t\t这些文件。"
-#: standalone/drakTermServ:573
+#: standalone/drakTermServ:596
#, c-format
msgid ""
" - Per client system configuration files:\n"
@@ -15696,7 +15806,7 @@ msgstr ""
" 终端服务器这一特性。本地配置能够被关闭，但\n"
" 保留配置文件，只要客户端机器被配置了的话。"
-#: standalone/drakTermServ:582
+#: standalone/drakTermServ:605
#, c-format
msgid ""
" - /etc/xinetd.d/tftp:\n"
@@ -15748,7 +15858,7 @@ msgstr ""
"更改\n"
" \t\t为 /var/lib/tftpboot，这里正是 mkinitrd-net 存放映像的地点。"
-#: standalone/drakTermServ:603
+#: standalone/drakTermServ:626
#, c-format
msgid ""
" - Create etherboot floppies/CDs:\n"
@@ -15776,57 +15886,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:638
+#: standalone/drakTermServ:661
#, c-format
msgid "Boot Floppy"
msgstr "启动软盘"
-#: standalone/drakTermServ:640
+#: standalone/drakTermServ:663
#, c-format
msgid "Boot ISO"
msgstr "启动 ISO"
-#: standalone/drakTermServ:642
+#: standalone/drakTermServ:665
#, c-format
msgid "PXE Image"
msgstr "PXE 映像"
-#: standalone/drakTermServ:723
+#: standalone/drakTermServ:734
+#, c-format
+msgid "Default kernel version"
+msgstr "默认内核版本"
+
+#: standalone/drakTermServ:761
#, c-format
msgid "Build Whole Kernel -->"
msgstr "建造整个内核 -->"
-#: standalone/drakTermServ:730
+#: standalone/drakTermServ:768
#, c-format
msgid "No kernel selected!"
msgstr "没有选择内核！"
-#: standalone/drakTermServ:733
+#: standalone/drakTermServ:771
#, c-format
msgid "Build Single NIC -->"
msgstr "建造单独的网卡 -->"
-#: standalone/drakTermServ:737
+#: standalone/drakTermServ:775
#, c-format
msgid "No NIC selected!"
msgstr "没有选择网卡！"
-#: standalone/drakTermServ:740
+#: standalone/drakTermServ:778
#, c-format
msgid "Build All Kernels -->"
msgstr "建造全部内核 -->"
-#: standalone/drakTermServ:747
+#: standalone/drakTermServ:786
#, c-format
msgid "<-- Delete"
msgstr "<-- 删除"
-#: standalone/drakTermServ:754
+#: standalone/drakTermServ:793
#, c-format
msgid "Delete All NBIs"
msgstr "删除所有 NBI"
-#: standalone/drakTermServ:841
+#: standalone/drakTermServ:880
#, c-format
msgid ""
"!!! Indicates the password in the system database is different than\n"
@@ -15836,94 +15951,94 @@ msgstr ""
"！！！表明系统数据库中的密码与终端服务器数据库中的密码不同。\n"
"请删除/在终端服务器中重新添加用户后才能登录。"
-#: standalone/drakTermServ:846
+#: standalone/drakTermServ:885
#, c-format
msgid "Add User -->"
msgstr "添加用户 -->"
-#: standalone/drakTermServ:852
+#: standalone/drakTermServ:891
#, c-format
msgid "<-- Del User"
msgstr "<-- 删除用户"
-#: standalone/drakTermServ:888
+#: standalone/drakTermServ:927
#, c-format
msgid "type: %s"
msgstr "类型: %s"
-#: standalone/drakTermServ:892
+#: standalone/drakTermServ:931
#, c-format
msgid "local config: %s"
msgstr "本地配置: %s"
-#: standalone/drakTermServ:922
+#: standalone/drakTermServ:961
#, c-format
msgid ""
"Allow local hardware\n"
"configuration."
msgstr "允许本地硬件配置。"
-#: standalone/drakTermServ:931
+#: standalone/drakTermServ:970
#, c-format
msgid "No net boot images created!"
msgstr "没有创建网络启动镜像！"
-#: standalone/drakTermServ:949
+#: standalone/drakTermServ:988
#, c-format
msgid "Thin Client"
msgstr "瘦客户端"
-#: standalone/drakTermServ:953
+#: standalone/drakTermServ:992
#, c-format
msgid "Allow Thin Clients"
msgstr "允许瘦客户端"
-#: standalone/drakTermServ:954
+#: standalone/drakTermServ:993
#, c-format
msgid "Add Client -->"
msgstr "添加客户 -->"
-#: standalone/drakTermServ:968
+#: standalone/drakTermServ:1007
#, c-format
msgid "type: fat"
msgstr "类型: 胖"
-#: standalone/drakTermServ:969
+#: standalone/drakTermServ:1008
#, c-format
msgid "type: thin"
msgstr "类型: 瘦"
-#: standalone/drakTermServ:976
+#: standalone/drakTermServ:1015
#, c-format
msgid "local config: false"
msgstr "本机配置: 假"
-#: standalone/drakTermServ:977
+#: standalone/drakTermServ:1016
#, c-format
msgid "local config: true"
msgstr "本地配置: 真"
-#: standalone/drakTermServ:985
+#: standalone/drakTermServ:1024
#, c-format
msgid "<-- Edit Client"
msgstr "<-- 编辑客户"
-#: standalone/drakTermServ:1011
+#: standalone/drakTermServ:1050
#, c-format
msgid "Disable Local Config"
msgstr "禁用本地配置"
-#: standalone/drakTermServ:1018
+#: standalone/drakTermServ:1057
#, c-format
msgid "Delete Client"
msgstr "删除客户"
-#: standalone/drakTermServ:1027
+#: standalone/drakTermServ:1066
#, c-format
msgid "dhcpd Config..."
msgstr "dhcpd 配置..."
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1082
#, c-format
msgid ""
"Need to restart the Display Manager for full changes to take effect. \n"
@@ -15932,57 +16047,67 @@ msgstr ""
"需要重新启动显示管理器以便所有更改生效。\n"
"(service dm restart - 控制台上)"
-#: standalone/drakTermServ:1084
+#: standalone/drakTermServ:1122
+#, c-format
+msgid "Thin clients won't work with autologin. Disable autologin?"
+msgstr "瘦客户无法使用自动登录。禁用自动登录吗？"
+
+#: standalone/drakTermServ:1138
+#, c-format
+msgid "All clients will use %s"
+msgstr "全部客户都使用 %s"
+
+#: standalone/drakTermServ:1168
#, c-format
msgid "Subnet:"
msgstr "子网: "
-#: standalone/drakTermServ:1091
+#: standalone/drakTermServ:1175
#, c-format
msgid "Netmask:"
msgstr "子网掩码: "
-#: standalone/drakTermServ:1098
+#: standalone/drakTermServ:1182
#, c-format
msgid "Routers:"
msgstr "路由器: "
-#: standalone/drakTermServ:1105
+#: standalone/drakTermServ:1189
#, c-format
msgid "Subnet Mask:"
msgstr "子网掩码: "
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1196
#, c-format
msgid "Broadcast Address:"
msgstr "广播地址: "
-#: standalone/drakTermServ:1119
+#: standalone/drakTermServ:1203
#, c-format
msgid "Domain Name:"
msgstr "域名: "
-#: standalone/drakTermServ:1127
+#: standalone/drakTermServ:1211
#, c-format
msgid "Name Servers:"
msgstr "命名服务器: "
-#: standalone/drakTermServ:1138
+#: standalone/drakTermServ:1222
#, c-format
msgid "IP Range Start:"
msgstr "IP 范围起点: "
-#: standalone/drakTermServ:1139
+#: standalone/drakTermServ:1223
#, c-format
msgid "IP Range End:"
msgstr "IP 范围终点: "
-#: standalone/drakTermServ:1191
+#: standalone/drakTermServ:1275
#, c-format
msgid "dhcpd Server Configuration"
msgstr "dhcpd 服务器配置"
-#: standalone/drakTermServ:1192
+#: standalone/drakTermServ:1276
#, c-format
msgid ""
"Most of these values were extracted\n"
@@ -15992,133 +16117,133 @@ msgstr ""
"这些值中绝大多数会从您正在运行的系统\n"
"中提取。若需要您可以进行修改。"
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1279
#, c-format
msgid "Dynamic IP Address Pool:"
msgstr "动态 IP 地址池: "
-#: standalone/drakTermServ:1208
+#: standalone/drakTermServ:1292
#, c-format
msgid "Write Config"
msgstr "写入配置"
-#: standalone/drakTermServ:1326
+#: standalone/drakTermServ:1411
#, c-format
msgid "Please insert floppy disk:"
msgstr "请插入软盘: "
-#: standalone/drakTermServ:1330
+#: standalone/drakTermServ:1415
#, c-format
msgid "Couldn't access the floppy!"
msgstr "无法访问软盘！"
-#: standalone/drakTermServ:1332
+#: standalone/drakTermServ:1417
#, c-format
msgid "Floppy can be removed now"
msgstr "现在可以取出软盘了"
-#: standalone/drakTermServ:1335
+#: standalone/drakTermServ:1420
#, c-format
msgid "No floppy drive available!"
msgstr "没有可用的软盘驱动器！"
-#: standalone/drakTermServ:1340
+#: standalone/drakTermServ:1425
#, c-format
msgid "PXE image is %s/%s"
msgstr "PXE 镜像是 %s/%s"
-#: standalone/drakTermServ:1342
+#: standalone/drakTermServ:1427
#, c-format
msgid "Error writing %s/%s"
msgstr "写入 %s/%s 出错"
-#: standalone/drakTermServ:1351
+#: standalone/drakTermServ:1436
#, c-format
msgid "Etherboot ISO image is %s"
msgstr "Etherboot ISO 镜像是 %s"
-#: standalone/drakTermServ:1353
+#: standalone/drakTermServ:1438
#, c-format
msgid "Something went wrong! - Is mkisofs installed?"
msgstr "发生错误！- mkisofs 安装了吗？"
-#: standalone/drakTermServ:1372
+#: standalone/drakTermServ:1458
#, c-format
msgid "Need to create /etc/dhcpd.conf first!"
msgstr "需要先创建 /etc/dhcpd.conf 文件！"
-#: standalone/drakTermServ:1533
+#: standalone/drakTermServ:1619
#, c-format
msgid "%s passwd bad in Terminal Server - rewriting...\n"
msgstr "%s 的密码在中断服务器中无效 - 正在重写...\n"
-#: standalone/drakTermServ:1551
+#: standalone/drakTermServ:1637
#, c-format
msgid "%s is not a user..\n"
msgstr "%s 不是用户...\n"
-#: standalone/drakTermServ:1552
+#: standalone/drakTermServ:1638
#, c-format
msgid "%s is already a Terminal Server user\n"
msgstr "%s 已经是终端服务器用户了\n"
-#: standalone/drakTermServ:1554
+#: standalone/drakTermServ:1640
#, c-format
msgid "Addition of %s to Terminal Server failed!\n"
msgstr "将 %s 添加到终端服务器失败！\n"
-#: standalone/drakTermServ:1556
+#: standalone/drakTermServ:1642
#, c-format
msgid "%s added to Terminal Server\n"
msgstr "%s 已加入终端服务器\n"
-#: standalone/drakTermServ:1608
+#: standalone/drakTermServ:1694
#, c-format
msgid "Deleted %s...\n"
msgstr "已删除 %s...\n"
-#: standalone/drakTermServ:1610 standalone/drakTermServ:1687
+#: standalone/drakTermServ:1696 standalone/drakTermServ:1773
#, c-format
msgid "%s not found...\n"
msgstr "%s 未找到...\n"
-#: standalone/drakTermServ:1632 standalone/drakTermServ:1633
-#: standalone/drakTermServ:1634
+#: standalone/drakTermServ:1718 standalone/drakTermServ:1719
+#: standalone/drakTermServ:1720
#, c-format
msgid "%s already in use\n"
msgstr "%s 已经被使用了\n"
-#: standalone/drakTermServ:1658
+#: standalone/drakTermServ:1744
#, c-format
msgid "Can't open %s!"
msgstr "无法打开 %s！"
-#: standalone/drakTermServ:1715
+#: standalone/drakTermServ:1801
#, c-format
msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
msgstr "/etc/hosts.allow 和 /etc/hosts.deny 已经配置 - 无更改"
-#: standalone/drakTermServ:1872
+#: standalone/drakTermServ:1958
#, c-format
msgid "Configuration changed - restart clusternfs/dhcpd?"
msgstr "配置已更改 - 重新启动 clusternfs/dhcpd 吗？"
-#: standalone/drakautoinst:37
+#: standalone/drakautoinst:38
#, c-format
msgid "Error!"
msgstr "错误！"
-#: standalone/drakautoinst:38
+#: standalone/drakautoinst:39
#, c-format
msgid "I can't find needed image file `%s'."
msgstr "无法找到映像文件“%s”。"
-#: standalone/drakautoinst:40
+#: standalone/drakautoinst:41
#, c-format
msgid "Auto Install Configurator"
msgstr "自动安装配置程序"
-#: standalone/drakautoinst:41
+#: standalone/drakautoinst:42
#, c-format
msgid ""
"You are about to configure an Auto Install floppy. This feature is somewhat "
@@ -16141,34 +16266,45 @@ msgstr ""
"\n"
"请点击确定继续。"
-#: standalone/drakautoinst:59
+#: standalone/drakautoinst:60
#, c-format
msgid "replay"
msgstr "重放"
-#: standalone/drakautoinst:59 standalone/drakautoinst:68
+#: standalone/drakautoinst:60 standalone/drakautoinst:69
#, c-format
msgid "manual"
msgstr "手动"
-#: standalone/drakautoinst:63
+#: standalone/drakautoinst:64
#, c-format
msgid "Automatic Steps Configuration"
msgstr "自动步骤配置"
-#: standalone/drakautoinst:64
+#: standalone/drakautoinst:65
#, c-format
msgid ""
"Please choose for each step whether it will replay like your install, or it "
"will be manual"
msgstr "请指定安装的每一步骤，是要按照本次安装重放，还是手工完成"
-#: standalone/drakautoinst:76 standalone/drakautoinst:77
+#: standalone/drakautoinst:77 standalone/drakautoinst:78
+#: standalone/drakautoinst:92
#, c-format
msgid "Creating auto install floppy"
msgstr "创建自动安装软盘"
-#: standalone/drakautoinst:141
+#: standalone/drakautoinst:90
+#, c-format
+msgid "Insert another blank floppy in drive %s (for drivers disk)"
+msgstr "请在驱动器 %s 中插入一张空白软盘(驱动程序盘)"
+
+#: standalone/drakautoinst:91
+#, c-format
+msgid "Creating auto install floppy (drivers disk)"
+msgstr "创建自动安装软盘(驱动程序盘)"
+
+#: standalone/drakautoinst:158
#, c-format
msgid ""
"\n"
@@ -16181,13 +16317,13 @@ msgstr ""
"\n"
"左边列出了自动安装可用的选项"
-#: standalone/drakautoinst:235 standalone/drakgw:583 standalone/drakvpn:898
-#: standalone/scannerdrake:367
+#: standalone/drakautoinst:252 standalone/drakgw:594 standalone/drakvpn:900
+#: standalone/scannerdrake:374
#, c-format
msgid "Congratulations!"
msgstr "恭喜！"
-#: standalone/drakautoinst:236
+#: standalone/drakautoinst:253
#, c-format
msgid ""
"The floppy has been successfully generated.\n"
@@ -16196,86 +16332,77 @@ msgstr ""
"您的软盘已经成功生成。\n"
"您可以用它重现这次安装。"
-#: standalone/drakautoinst:272
+#: standalone/drakautoinst:289
#, c-format
msgid "Auto Install"
msgstr "自动安装"
-#: standalone/drakautoinst:341
+#: standalone/drakautoinst:358
#, c-format
msgid "Add an item"
msgstr "添加项目"
-#: standalone/drakautoinst:348
+#: standalone/drakautoinst:365
#, c-format
msgid "Remove the last item"
msgstr "删除最后一项"
-#: standalone/drakbackup:87
+#: standalone/drakbackup:88
#, c-format
msgid "hd"
msgstr "硬盘"
-#: standalone/drakbackup:87
+#: standalone/drakbackup:88
#, c-format
msgid "tape"
msgstr "磁带机"
-#: standalone/drakbackup:158
+#: standalone/drakbackup:112
#, c-format
msgid "No devices found"
msgstr "没有发现设备"
-#: standalone/drakbackup:196
+#: standalone/drakbackup:154
#, c-format
msgid ""
"Expect is an extension to the Tcl scripting language that allows interactive "
"sessions without user intervention."
msgstr "异常是 Tcl 脚本语言的一种扩展，允许免打扰的交互式会话。"
-#: standalone/drakbackup:197
+#: standalone/drakbackup:155
#, c-format
msgid "Store the password for this system in drakbackup configuration."
msgstr "在“Drak 备份”的配置中存储此系统的密码。"
-#: standalone/drakbackup:198
+#: standalone/drakbackup:156
#, c-format
msgid ""
"For a multisession CD, only the first session will erase the cdrw. Otherwise "
"the cdrw is erased before each backup."
msgstr "对于多轨道 CD，仅仅第一段会删除 cdrw。否则会在每次备份时删除 cdrw。"
-#: standalone/drakbackup:199
-#, c-format
-msgid ""
-"This uses the same syntax as the command line program 'cdrecord'. 'cdrecord -"
-"scanbus' would also show you the device number."
-msgstr ""
-"这里所用的语法和命令行程序“cdrecord”相同。“cdrecord - scanbus”还会给您显示设"
-"备编号。"
-
-#: standalone/drakbackup:200
+#: standalone/drakbackup:157
#, c-format
msgid ""
"This option will save files that have changed. Exact behavior depends on "
"whether incremental or differential mode is used."
msgstr "此选项将保存已经更改的文件。具体的行为依赖于所用的是增量还是差异模式。"
-#: standalone/drakbackup:201
+#: standalone/drakbackup:158
#, c-format
msgid ""
"Incremental backups only save files that have changed or are new since the "
"last backup."
msgstr "增量备份只备份那些自上次备份后更改或新建的文件。"
-#: standalone/drakbackup:202
+#: standalone/drakbackup:159
#, c-format
msgid ""
"Differential backups only save files that have changed or are new since the "
"original 'base' backup."
msgstr "差异备份只保存自上次“基本”备份后更改或新建的文件。"
-#: standalone/drakbackup:203
+#: standalone/drakbackup:160
#, c-format
msgid ""
"This should be a local user or email addresse that you want the backup "
@@ -16284,7 +16411,7 @@ msgstr ""
"这应该是以逗号分隔的本地用户或电子邮件列表，备份结果将会发送给这些人。您还需"
"要能够正常工作的邮件服务器。"
-#: standalone/drakbackup:204
+#: standalone/drakbackup:161
#, c-format
msgid ""
"Files or wildcards listed in a .backupignore file at the top of a directory "
@@ -16292,7 +16419,7 @@ msgid ""
msgstr ""
"在目录树顶层列出的 .backupignore 文件中列出的文件或通配符表将不会备份。"
-#: standalone/drakbackup:205
+#: standalone/drakbackup:162
#, c-format
msgid ""
"For backups to other media, files are still created on the hard drive, then "
@@ -16302,7 +16429,7 @@ msgstr ""
"对于备份到其它介质，文件仍然会先在硬盘上创建，然后移动到其它介质。启用此选项"
"将在备份完成后删除硬盘上的 tar 文件。"
-#: standalone/drakbackup:206
+#: standalone/drakbackup:163
#, c-format
msgid ""
"Some protocols, like rsync, may be configured at the server end. Rather "
@@ -16312,7 +16439,7 @@ msgstr ""
"某些协议，如 rsync，可以在服务器后端配置。除了使用目录路径，您还可以使用服务"
"器路径的“模块”名。"
-#: standalone/drakbackup:207
+#: standalone/drakbackup:164
#, c-format
msgid ""
"Custom allows you to specify your own day and time. The other options use "
@@ -16321,17 +16448,27 @@ msgstr ""
"自定义允许您指定您自己的天和时间。其它选项将使用 /etc/crontab 中的 run-"
"parts。"
-#: standalone/drakbackup:604
+#: standalone/drakbackup:396
+#, c-format
+msgid "No media selected for cron operation."
+msgstr "没有为 cron 操作选择介质。"
+
+#: standalone/drakbackup:400
+#, c-format
+msgid "No interval selected for cron operation."
+msgstr "没有为 cron 操作选择间隔。"
+
+#: standalone/drakbackup:447
#, c-format
msgid "Interval cron not available as non-root"
msgstr "非 root 用户还不能使用间隔 cron"
-#: standalone/drakbackup:715 standalone/logdrake:415
+#: standalone/drakbackup:532 standalone/logdrake:467
#, c-format
msgid "\"%s\" neither is a valid email nor is an existing local user!"
msgstr "“%s”既不是有效的电子邮件，也不是已存在的本地用户!"
-#: standalone/drakbackup:719 standalone/logdrake:420
+#: standalone/drakbackup:536 standalone/logdrake:472
#, c-format
msgid ""
"\"%s\" is a local user, but you did not select a local smtp, so you must use "
@@ -16339,22 +16476,22 @@ msgid ""
msgstr ""
"“%s”是本地用户，但是您没有选择本地 SMTP，所以您必须使用完整的电子邮件地址!"
-#: standalone/drakbackup:728
+#: standalone/drakbackup:545
#, c-format
msgid "Valid user list changed, rewriting config file."
msgstr "有效用户列表已经更改，重写配置文件。"
-#: standalone/drakbackup:730
+#: standalone/drakbackup:547
#, c-format
msgid "Old user list:\n"
msgstr "旧用户列表:\n"
-#: standalone/drakbackup:732
+#: standalone/drakbackup:549
#, c-format
msgid "New user list:\n"
msgstr "新用户列表:\n"
-#: standalone/drakbackup:779
+#: standalone/drakbackup:594
#, c-format
msgid ""
"\n"
@@ -16363,7 +16500,7 @@ msgstr ""
"\n"
" “Drak 备份”报告 \n"
-#: standalone/drakbackup:780
+#: standalone/drakbackup:595
#, c-format
msgid ""
"\n"
@@ -16372,7 +16509,7 @@ msgstr ""
"\n"
" “Drak 备份”守护进程报告\n"
-#: standalone/drakbackup:786
+#: standalone/drakbackup:601
#, c-format
msgid ""
"\n"
@@ -16384,13 +16521,13 @@ msgstr ""
" “Drak 备份”报告细节\n"
"\n"
-#: standalone/drakbackup:810 standalone/drakbackup:883
-#: standalone/drakbackup:939
+#: standalone/drakbackup:625 standalone/drakbackup:696
+#: standalone/drakbackup:752
#, c-format
msgid "Total progress"
msgstr "总进度"
-#: standalone/drakbackup:865
+#: standalone/drakbackup:678
#, c-format
msgid ""
"%s exists, delete?\n"
@@ -16403,42 +16540,42 @@ msgstr ""
"如果您曾经做过这个步骤，您可能需要\n"
"从服务器的的 authorized_keys 删除该项目。"
-#: standalone/drakbackup:874
+#: standalone/drakbackup:687
#, c-format
msgid "This may take a moment to generate the keys."
msgstr "生成密钥需要一些时间。"
-#: standalone/drakbackup:881
+#: standalone/drakbackup:694
#, c-format
msgid "Cannot spawn %s."
msgstr "无法 spawn %s。"
-#: standalone/drakbackup:898
+#: standalone/drakbackup:711
#, c-format
msgid "No password prompt on %s at port %s"
msgstr "%s 上的端口 %s 没有密码提示"
-#: standalone/drakbackup:899
+#: standalone/drakbackup:712
#, c-format
msgid "Bad password on %s"
msgstr "%s 密码无效"
-#: standalone/drakbackup:900
+#: standalone/drakbackup:713
#, c-format
msgid "Permission denied transferring %s to %s"
msgstr "没有权限把 %s 迁移到 %s"
-#: standalone/drakbackup:901
+#: standalone/drakbackup:714
#, c-format
msgid "Can't find %s on %s"
msgstr "没有 %s 在 %s 上"
-#: standalone/drakbackup:904
+#: standalone/drakbackup:718
#, c-format
msgid "%s not responding"
msgstr "%s 没有响应"
-#: standalone/drakbackup:908
+#: standalone/drakbackup:722
#, c-format
msgid ""
"Transfer successful\n"
@@ -16455,47 +16592,47 @@ msgstr ""
"\n"
"这样不会提问密码。"
-#: standalone/drakbackup:953
+#: standalone/drakbackup:766
#, c-format
msgid "WebDAV remote site already in sync!"
msgstr "WebDAV 远程站点已经同步！"
-#: standalone/drakbackup:957
+#: standalone/drakbackup:770
#, c-format
msgid "WebDAV transfer failed!"
msgstr "WebDAV 传输失败！"
-#: standalone/drakbackup:978
+#: standalone/drakbackup:791
#, c-format
msgid "No CD-R/DVD-R in drive!"
msgstr "驱动器里没有 CDR/DVDR"
-#: standalone/drakbackup:982
+#: standalone/drakbackup:795
#, c-format
msgid "Does not appear to be recordable media!"
msgstr "介质不像是可以写入的！"
-#: standalone/drakbackup:986
+#: standalone/drakbackup:799
#, c-format
msgid "Not erasable media!"
msgstr "不可清除的介质！"
-#: standalone/drakbackup:1027
+#: standalone/drakbackup:840
#, c-format
msgid "This may take a moment to erase the media."
msgstr "清空介质需要一些时间。"
-#: standalone/drakbackup:1103
+#: standalone/drakbackup:898
#, c-format
msgid "Permission problem accessing CD."
msgstr "没有适当的权限读写 CD。"
-#: standalone/drakbackup:1130
+#: standalone/drakbackup:925
#, c-format
msgid "No tape in %s!"
msgstr "%s 里没有磁带！"
-#: standalone/drakbackup:1232
+#: standalone/drakbackup:1025
#, c-format
msgid ""
"Backup quota exceeded!\n"
@@ -16504,37 +16641,37 @@ msgstr ""
"达到了备份限额！\n"
"使用了 %d MB，而分配了 %d MB。"
-#: standalone/drakbackup:1251 standalone/drakbackup:1305
+#: standalone/drakbackup:1044 standalone/drakbackup:1077
#, c-format
msgid "Backup system files..."
msgstr "备份系统文件..."
-#: standalone/drakbackup:1306 standalone/drakbackup:1368
+#: standalone/drakbackup:1078 standalone/drakbackup:1119
#, c-format
msgid "Hard Disk Backup files..."
msgstr "备份硬盘文件..."
-#: standalone/drakbackup:1367
+#: standalone/drakbackup:1118
#, c-format
msgid "Backup User files..."
msgstr "备份用户文件..."
-#: standalone/drakbackup:1421
+#: standalone/drakbackup:1153
#, c-format
msgid "Backup Other files..."
msgstr "备份其它文件..."
-#: standalone/drakbackup:1422
+#: standalone/drakbackup:1154
#, c-format
msgid "Hard Disk Backup Progress..."
msgstr "硬盘文件备份进度..."
-#: standalone/drakbackup:1427
+#: standalone/drakbackup:1159
#, c-format
msgid "No changes to backup!"
msgstr "没有需要备份的修改！"
-#: standalone/drakbackup:1445 standalone/drakbackup:1469
+#: standalone/drakbackup:1177 standalone/drakbackup:1201
#, c-format
msgid ""
"\n"
@@ -16545,7 +16682,7 @@ msgstr ""
"“Drak 备份”使用 %s: \n"
"\n"
-#: standalone/drakbackup:1454
+#: standalone/drakbackup:1186
#, c-format
msgid ""
"\n"
@@ -16555,18 +16692,18 @@ msgstr ""
"\n"
"FTP 连接错误: 无法通过 FTP 传送您的备份文件。\n"
-#: standalone/drakbackup:1455
+#: standalone/drakbackup:1187
#, c-format
msgid ""
"Error during sending file via FTP. Please correct your FTP configuration."
msgstr "通过 FTP 发送文件出错。请更正您的 FTP 配置。"
-#: standalone/drakbackup:1457
+#: standalone/drakbackup:1189
#, c-format
msgid "file list sent by FTP: %s\n"
msgstr "通过 FTP 发送的文件列表: %s\n"
-#: standalone/drakbackup:1474
+#: standalone/drakbackup:1206
#, c-format
msgid ""
"\n"
@@ -16577,7 +16714,7 @@ msgstr ""
"“Drak 备份”的光盘操作: \n"
"\n"
-#: standalone/drakbackup:1479
+#: standalone/drakbackup:1211
#, c-format
msgid ""
"\n"
@@ -16588,38 +16725,27 @@ msgstr ""
"“Drak 备份”的磁带操作: \n"
"\n"
-#: standalone/drakbackup:1488
+#: standalone/drakbackup:1220
#, c-format
msgid "Error sending mail. Your report mail was not sent."
msgstr "发送邮件出错。您的报告邮件没有发出。"
-#: standalone/drakbackup:1489
+#: standalone/drakbackup:1221
#, c-format
msgid " Error while sending mail. \n"
msgstr "发送电子邮件出错。\n"
-#: standalone/drakbackup:1518
+#: standalone/drakbackup:1249
#, c-format
msgid "Can't create catalog!"
msgstr "无法创建 catalog！"
-#: standalone/drakbackup:1639
-#, c-format
-msgid "Can't create log file!"
-msgstr "无法创建日志文件！"
-
-#: standalone/drakbackup:1656 standalone/drakbackup:1667
-#: standalone/drakfont:584
-#, c-format
-msgid "File Selection"
-msgstr "选择文件"
-
-#: standalone/drakbackup:1695
+#: standalone/drakbackup:1455
#, c-format
msgid "Select the files or directories and click on 'OK'"
msgstr "选择文件或目录，然后单击“确定”"
-#: standalone/drakbackup:1723
+#: standalone/drakbackup:1484
#, c-format
msgid ""
"\n"
@@ -16628,227 +16754,213 @@ msgstr ""
"\n"
"请选中您需要的所有选项。\n"
-#: standalone/drakbackup:1724
+#: standalone/drakbackup:1485
#, c-format
msgid ""
"These options can backup and restore all files in your /etc directory.\n"
msgstr "这些选项将备份和恢复您的 /etc 目录中的全部文件。\n"
-#: standalone/drakbackup:1725
+#: standalone/drakbackup:1486
#, c-format
msgid "Backup your System files. (/etc directory)"
msgstr "备份系统文件。(/etc 目录)"
-#: standalone/drakbackup:1726 standalone/drakbackup:1790
-#: standalone/drakbackup:1856
+#: standalone/drakbackup:1487 standalone/drakbackup:1551
+#: standalone/drakbackup:1617
#, c-format
msgid "Use Incremental/Differential Backups (do not replace old backups)"
msgstr "使用增量/差异备份(不破坏老备份)"
-#: standalone/drakbackup:1728 standalone/drakbackup:1792
-#: standalone/drakbackup:1858
+#: standalone/drakbackup:1489 standalone/drakbackup:1553
+#: standalone/drakbackup:1619
#, c-format
msgid "Use Incremental Backups"
msgstr "使用增量备份"
-#: standalone/drakbackup:1728 standalone/drakbackup:1792
-#: standalone/drakbackup:1858
+#: standalone/drakbackup:1489 standalone/drakbackup:1553
+#: standalone/drakbackup:1619
#, c-format
msgid "Use Differential Backups"
msgstr "使用差异备份"
-#: standalone/drakbackup:1730
+#: standalone/drakbackup:1491
#, c-format
msgid "Do not include critical files (passwd, group, fstab)"
msgstr "不包括关键文件(passwd，group，fstab)"
-#: standalone/drakbackup:1731
+#: standalone/drakbackup:1492
#, c-format
msgid ""
"With this option you will be able to restore any version\n"
" of your /etc directory."
msgstr "使用此选项您可把 /etc 目录恢复到任何以前的版本。"
-#: standalone/drakbackup:1762
+#: standalone/drakbackup:1523
#, c-format
msgid "Please check all users that you want to include in your backup."
msgstr "请选择您希望备份的用户。"
-#: standalone/drakbackup:1789
+#: standalone/drakbackup:1550
#, c-format
msgid "Do not include the browser cache"
msgstr "不包括浏览器缓存"
-#: standalone/drakbackup:1844 standalone/drakfont:650
+#: standalone/drakbackup:1605 standalone/drakfont:656
#, c-format
msgid "Remove Selected"
msgstr "删除选中的"
-#: standalone/drakbackup:1891 standalone/drakbackup:1895
-#, c-format
-msgid "Under Devel ... please wait."
-msgstr "开发中...请等待新版本。"
-
-#: standalone/drakbackup:1909
-#, c-format
-msgid "Windows (FAT32)"
-msgstr "Windows (FAT32)"
-
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1668
#, c-format
msgid "Users"
msgstr "用户"
-#: standalone/drakbackup:1961
+#: standalone/drakbackup:1688
#, c-format
msgid "Use network connection to backup"
msgstr "使用网络连接作备份"
-#: standalone/drakbackup:1963
+#: standalone/drakbackup:1690
#, c-format
msgid "Net Method:"
msgstr "网络方法:"
-#: standalone/drakbackup:1967
+#: standalone/drakbackup:1694
#, c-format
msgid "Use Expect for SSH"
msgstr "把 Expect 用于 SSH"
-#: standalone/drakbackup:1968
+#: standalone/drakbackup:1695
#, c-format
msgid "Create/Transfer backup keys for SSH"
msgstr "创建/传送 SSH 的备份密钥"
-#: standalone/drakbackup:1970
+#: standalone/drakbackup:1697
#, c-format
msgid "Transfer Now"
msgstr "现在传送"
-#: standalone/drakbackup:1972
+#: standalone/drakbackup:1699
#, c-format
msgid "Other (not drakbackup) keys in place already"
msgstr "其它(不是“Drak 备份”)密钥已经有了"
-#: standalone/drakbackup:1975
+#: standalone/drakbackup:1702
#, c-format
msgid "Host name or IP."
msgstr "主机名或 IP。"
-#: standalone/drakbackup:1980
+#: standalone/drakbackup:1707
#, c-format
msgid "Directory (or module) to put the backup on this host."
msgstr "将备份放在该主机的目录(或模块)。"
-#: standalone/drakbackup:1985
+#: standalone/drakbackup:1712
#, c-format
msgid "Login name"
msgstr "登录名"
-#: standalone/drakbackup:1992
+#: standalone/drakbackup:1719
#, c-format
msgid "Remember this password"
msgstr "记住密码"
-#: standalone/drakbackup:2004
+#: standalone/drakbackup:1735
#, c-format
msgid "Need hostname, username and password!"
msgstr "需要主机名、用户名和密码！"
-#: standalone/drakbackup:2106
+#: standalone/drakbackup:1833
#, c-format
msgid "Use CD-R/DVD-R to backup"
msgstr "使用 CD/DVDROM 备份"
-#: standalone/drakbackup:2109
+#: standalone/drakbackup:1836
#, c-format
msgid "Choose your CD/DVD device"
msgstr "请选择您的 CD/DVD 设备"
-#: standalone/drakbackup:2114
+#: standalone/drakbackup:1841
#, c-format
msgid "Choose your CD/DVD media size"
msgstr "请选择您的 CD/DVD 介质大小"
-#: standalone/drakbackup:2121
+#: standalone/drakbackup:1848
#, c-format
msgid "Multisession CD"
msgstr "多轨道 CD"
-#: standalone/drakbackup:2123
+#: standalone/drakbackup:1850
#, c-format
msgid "CDRW media"
msgstr "CDRW 介质"
-#: standalone/drakbackup:2128
+#: standalone/drakbackup:1856
#, c-format
msgid "Erase your RW media (1st Session)"
msgstr "清除您的 RW 介质(第一节)"
-#: standalone/drakbackup:2129
+#: standalone/drakbackup:1857
#, c-format
msgid " Erase Now "
msgstr " 立即清除 "
-#: standalone/drakbackup:2136
+#: standalone/drakbackup:1863
#, c-format
msgid "DVD+RW media"
msgstr "DVD+RW 介质"
-#: standalone/drakbackup:2138
+#: standalone/drakbackup:1865
#, c-format
msgid "DVD-R media"
msgstr "DVD-R 介质"
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:1867
#, c-format
msgid "DVDRAM device"
msgstr "DVDRAM 设备"
-#: standalone/drakbackup:2145
-#, c-format
-msgid ""
-"Enter your CD Writer device name\n"
-" ex: 0,1,0"
-msgstr ""
-"请输入您的刻录机设备名\n"
-" 如: 0,1,0"
-
-#: standalone/drakbackup:2177
+#: standalone/drakbackup:1898
#, c-format
msgid "No CD device defined!"
msgstr "没有发现 CD 设备！"
-#: standalone/drakbackup:2227
+#: standalone/drakbackup:1945
#, c-format
msgid "Use tape to backup"
msgstr "使用磁带备份"
-#: standalone/drakbackup:2230
+#: standalone/drakbackup:1948
#, c-format
msgid "Device name to use for backup"
msgstr "用于备份的设备名"
-#: standalone/drakbackup:2237
+#: standalone/drakbackup:1954
#, c-format
msgid "Don't rewind tape after backup"
msgstr "在备份后不倒带"
-#: standalone/drakbackup:2243
+#: standalone/drakbackup:1960
#, c-format
msgid "Erase tape before backup"
msgstr "备份前清空磁带"
-#: standalone/drakbackup:2249
+#: standalone/drakbackup:1966
#, c-format
msgid "Eject tape after the backup"
msgstr "备份后弹出磁带"
-#: standalone/drakbackup:2317
+#: standalone/drakbackup:2033
#, c-format
msgid "Enter the directory to save to:"
msgstr "请输入要保存的目录:"
-#: standalone/drakbackup:2326
+#: standalone/drakbackup:2037
+#, c-format
+msgid "Directory to save to"
+msgstr "要保存的目录"
+
+#: standalone/drakbackup:2042
#, c-format
msgid ""
"Maximum size\n"
@@ -16857,42 +16969,42 @@ msgstr ""
"允许“Drak 备份”\n"
" 使用的最大空间(Mb)"
-#: standalone/drakbackup:2399
+#: standalone/drakbackup:2106
#, c-format
msgid "CD-R / DVD-R"
msgstr "CDROM / DVDROM"
-#: standalone/drakbackup:2404
+#: standalone/drakbackup:2111
#, c-format
msgid "HardDrive / NFS"
msgstr "硬盘 / NFS"
-#: standalone/drakbackup:2420 standalone/drakbackup:2425
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2127 standalone/drakbackup:2132
+#: standalone/drakbackup:2137
#, c-format
msgid "hourly"
msgstr "每小时"
-#: standalone/drakbackup:2421 standalone/drakbackup:2426
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2128 standalone/drakbackup:2133
+#: standalone/drakbackup:2137
#, c-format
msgid "daily"
msgstr "每日"
-#: standalone/drakbackup:2422 standalone/drakbackup:2427
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2129 standalone/drakbackup:2134
+#: standalone/drakbackup:2137
#, c-format
msgid "weekly"
msgstr "每周"
-#: standalone/drakbackup:2423 standalone/drakbackup:2428
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2130 standalone/drakbackup:2135
+#: standalone/drakbackup:2137
#, c-format
msgid "monthly"
msgstr "每月"
-#: standalone/drakbackup:2424 standalone/drakbackup:2429
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2131 standalone/drakbackup:2136
+#: standalone/drakbackup:2137
#, c-format
msgid "custom"
msgstr "定制"
@@ -16900,7 +17012,7 @@ msgstr "定制"
# calendar/gui/goto-dialog.glade.h:7
# calendar/gui/goto-dialog.glade.h:7
# calendar/gui/goto-dialog.glade.h:7
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
#, c-format
msgid "January"
msgstr "一月"
@@ -16908,7 +17020,7 @@ msgstr "一月"
# calendar/gui/goto-dialog.glade.h:4
# calendar/gui/goto-dialog.glade.h:4
# calendar/gui/goto-dialog.glade.h:4
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
#, c-format
msgid "February"
msgstr "二月"
@@ -16916,7 +17028,7 @@ msgstr "二月"
# calendar/gui/goto-dialog.glade.h:10
# calendar/gui/goto-dialog.glade.h:10
# calendar/gui/goto-dialog.glade.h:10
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
#, c-format
msgid "March"
msgstr "三月"
@@ -16924,7 +17036,7 @@ msgstr "三月"
# calendar/gui/goto-dialog.glade.h:1
# calendar/gui/goto-dialog.glade.h:1
# calendar/gui/goto-dialog.glade.h:1
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
#, c-format
msgid "April"
msgstr "四月"
@@ -16932,7 +17044,7 @@ msgstr "四月"
# calendar/gui/goto-dialog.glade.h:11
# calendar/gui/goto-dialog.glade.h:11
# calendar/gui/goto-dialog.glade.h:11
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
#, c-format
msgid "May"
msgstr "五月"
@@ -16940,7 +17052,7 @@ msgstr "五月"
# calendar/gui/goto-dialog.glade.h:9
# calendar/gui/goto-dialog.glade.h:9
# calendar/gui/goto-dialog.glade.h:9
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
#, c-format
msgid "June"
msgstr "六月"
@@ -16948,7 +17060,7 @@ msgstr "六月"
# calendar/gui/goto-dialog.glade.h:8
# calendar/gui/goto-dialog.glade.h:8
# calendar/gui/goto-dialog.glade.h:8
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
#, c-format
msgid "July"
msgstr "七月"
@@ -16956,7 +17068,7 @@ msgstr "七月"
# calendar/gui/goto-dialog.glade.h:2
# calendar/gui/goto-dialog.glade.h:2
# calendar/gui/goto-dialog.glade.h:2
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
#, c-format
msgid "August"
msgstr "八月"
@@ -16964,7 +17076,7 @@ msgstr "八月"
# calendar/gui/goto-dialog.glade.h:14
# calendar/gui/goto-dialog.glade.h:14
# calendar/gui/goto-dialog.glade.h:14
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
#, c-format
msgid "September"
msgstr "九月"
@@ -16972,7 +17084,7 @@ msgstr "九月"
# calendar/gui/goto-dialog.glade.h:13
# calendar/gui/goto-dialog.glade.h:13
# calendar/gui/goto-dialog.glade.h:13
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
#, c-format
msgid "October"
msgstr "十月"
@@ -16980,7 +17092,7 @@ msgstr "十月"
# calendar/gui/goto-dialog.glade.h:12
# calendar/gui/goto-dialog.glade.h:12
# calendar/gui/goto-dialog.glade.h:12
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
#, c-format
msgid "November"
msgstr "十一月"
@@ -16988,7 +17100,7 @@ msgstr "十一月"
# calendar/gui/goto-dialog.glade.h:3
# calendar/gui/goto-dialog.glade.h:3
# calendar/gui/goto-dialog.glade.h:3
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
#, c-format
msgid "December"
msgstr "十二月"
@@ -16999,7 +17111,7 @@ msgstr "十二月"
# calendar/gui/dialogs/recurrence-page.c:965
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
# calendar/gui/dialogs/recurrence-page.c:965
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
#, c-format
msgid "Sunday"
msgstr "星期日"
@@ -17010,7 +17122,7 @@ msgstr "星期日"
# calendar/gui/dialogs/recurrence-page.c:959
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
# calendar/gui/dialogs/recurrence-page.c:959
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
#, c-format
msgid "Monday"
msgstr "星期一"
@@ -17021,7 +17133,7 @@ msgstr "星期一"
# calendar/gui/dialogs/recurrence-page.c:960
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
# calendar/gui/dialogs/recurrence-page.c:960
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
#, c-format
msgid "Tuesday"
msgstr "星期二"
@@ -17032,7 +17144,7 @@ msgstr "星期二"
# calendar/gui/dialogs/recurrence-page.c:961
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
# calendar/gui/dialogs/recurrence-page.c:961
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
#, c-format
msgid "Wednesday"
msgstr "星期三"
@@ -17043,7 +17155,7 @@ msgstr "星期三"
# calendar/gui/dialogs/recurrence-page.c:962
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
# calendar/gui/dialogs/recurrence-page.c:962
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
#, c-format
msgid "Thursday"
msgstr "星期四"
@@ -17054,7 +17166,7 @@ msgstr "星期四"
# calendar/gui/dialogs/recurrence-page.c:963
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
# calendar/gui/dialogs/recurrence-page.c:963
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
#, c-format
msgid "Friday"
msgstr "星期五"
@@ -17065,22 +17177,22 @@ msgstr "星期五"
# calendar/gui/dialogs/recurrence-page.c:964
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
# calendar/gui/dialogs/recurrence-page.c:964
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
#, c-format
msgid "Saturday"
msgstr "星期六"
-#: standalone/drakbackup:2478
+#: standalone/drakbackup:2185
#, c-format
msgid "Use daemon"
msgstr "使用守护进程"
-#: standalone/drakbackup:2483
+#: standalone/drakbackup:2190
#, c-format
msgid "Please choose the time interval between each backup"
msgstr "请选择每次备份的时间间隔"
-#: standalone/drakbackup:2489
+#: standalone/drakbackup:2196
#, c-format
msgid "Custom setup/crontab entry:"
msgstr "自定义 setup/crontab 项: "
@@ -17088,7 +17200,7 @@ msgstr "自定义 setup/crontab 项: "
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2201
#, c-format
msgid "Minute"
msgstr "分钟"
@@ -17096,7 +17208,7 @@ msgstr "分钟"
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2205
#, c-format
msgid "Hour"
msgstr "小时"
@@ -17104,7 +17216,7 @@ msgstr "小时"
# ui/evolution-calendar.xml.h:11
# ui/evolution-calendar.xml.h:11
# ui/evolution-calendar.xml.h:11
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2209
#, c-format
msgid "Day"
msgstr "天"
@@ -17112,7 +17224,7 @@ msgstr "天"
# ui/evolution-calendar.xml.h:20
# ui/evolution-calendar.xml.h:20
# ui/evolution-calendar.xml.h:20
-#: standalone/drakbackup:2506
+#: standalone/drakbackup:2213
#, c-format
msgid "Month"
msgstr "月"
@@ -17123,142 +17235,137 @@ msgstr "月"
# calendar/gui/dialogs/recurrence-page.c:961
# calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
# calendar/gui/dialogs/recurrence-page.c:961
-#: standalone/drakbackup:2510
+#: standalone/drakbackup:2217
#, c-format
msgid "Weekday"
msgstr "平日"
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2223
#, c-format
msgid "Please choose the media for backup."
msgstr "请选择备份使用的介质。"
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2230
#, c-format
msgid "Please be sure that the cron daemon is included in your services."
msgstr "请确认 cron 守护程序包含在您的服务中。"
-#: standalone/drakbackup:2524
+#: standalone/drakbackup:2231
#, c-format
msgid "Note that currently all 'net' media also use the hard drive."
msgstr "请注意目前所有的“网络”介质都还要使用硬盘。"
-#: standalone/drakbackup:2571
+#: standalone/drakbackup:2281
#, c-format
-msgid "Use tar and bzip2 (rather than tar and gzip)"
-msgstr "使用 tar 和 bzip2(而不是 tar 和 gzip)"
+msgid "Please choose the compression type"
+msgstr "请选择压缩类型"
-#: standalone/drakbackup:2572
+#: standalone/drakbackup:2285
#, c-format
msgid "Use .backupignore files"
msgstr "使用 .backupignore 文件"
-#: standalone/drakbackup:2574
+#: standalone/drakbackup:2287
#, c-format
msgid "Send mail report after each backup to:"
msgstr "在每次备份后发送邮件报告给:"
-#: standalone/drakbackup:2580
+#: standalone/drakbackup:2293
#, c-format
msgid "SMTP server for mail:"
msgstr "邮件的 SMTP 服务器:"
-#: standalone/drakbackup:2585
+#: standalone/drakbackup:2298
#, c-format
msgid "Delete Hard Drive tar files after backup to other media."
msgstr "备份到其它介质之后删除硬盘上的 tar 文件。"
-#: standalone/drakbackup:2624
+#: standalone/drakbackup:2338
#, c-format
msgid "What"
msgstr "内容"
-#: standalone/drakbackup:2629
+#: standalone/drakbackup:2343
#, c-format
msgid "Where"
msgstr "位置"
-#: standalone/drakbackup:2634
+#: standalone/drakbackup:2348
#, c-format
msgid "When"
msgstr "时间"
-#: standalone/drakbackup:2639
+#: standalone/drakbackup:2353
#, c-format
msgid "More Options"
msgstr "更多选项"
-#: standalone/drakbackup:2651
-#, fuzzy, c-format
+#: standalone/drakbackup:2366
+#, c-format
msgid "Backup destination not configured..."
-msgstr "尚未完成网络配置"
+msgstr "备份目的未配置..."
-#: standalone/drakbackup:2667 standalone/drakbackup:4731
+#: standalone/drakbackup:2385 standalone/drakbackup:4413
#, c-format
msgid "Drakbackup Configuration"
msgstr "“Drak 备份”配置"
-#: standalone/drakbackup:2684
+#: standalone/drakbackup:2402
#, c-format
msgid "Please choose where you want to backup"
msgstr "请选择您希望备份何处"
-#: standalone/drakbackup:2686
+#: standalone/drakbackup:2404
#, c-format
msgid "Hard Drive used to prepare backups for all media"
msgstr "用于准备全部介质备份的硬盘驱动器"
-#: standalone/drakbackup:2694
+#: standalone/drakbackup:2412
#, c-format
msgid "Across Network"
msgstr "通过网络"
-#: standalone/drakbackup:2702
+#: standalone/drakbackup:2420
#, c-format
msgid "On CD-R"
msgstr "在 CD-R 上"
-#: standalone/drakbackup:2710
+#: standalone/drakbackup:2428
#, c-format
msgid "On Tape Device"
msgstr "在磁带机上"
-#: standalone/drakbackup:2738
-#, c-format
-msgid "Please select media for backup..."
-msgstr "请选择使用的介质..."
-
-#: standalone/drakbackup:2760
+#: standalone/drakbackup:2468
#, c-format
msgid "Backup Users"
msgstr "备份用户"
-#: standalone/drakbackup:2761
+#: standalone/drakbackup:2469
#, c-format
msgid " (Default is all users)"
msgstr "(默认是所有用户)"
-#: standalone/drakbackup:2773
+#: standalone/drakbackup:2481
#, c-format
msgid "Please choose what you want to backup"
msgstr "请选择您要备份的文件"
-#: standalone/drakbackup:2774
+#: standalone/drakbackup:2482
#, c-format
msgid "Backup System"
msgstr "备份系统"
-#: standalone/drakbackup:2776
+#: standalone/drakbackup:2484
#, c-format
msgid "Select user manually"
msgstr "手工选择用户"
-#: standalone/drakbackup:2805
+#: standalone/drakbackup:2513
#, c-format
msgid "Please select data to backup..."
msgstr "请选择需备份的数据..."
-#: standalone/drakbackup:2879
+#: standalone/drakbackup:2585
#, c-format
msgid ""
"\n"
@@ -17267,7 +17374,7 @@ msgstr ""
"\n"
"备份来源: \n"
-#: standalone/drakbackup:2880
+#: standalone/drakbackup:2586
#, c-format
msgid ""
"\n"
@@ -17276,7 +17383,7 @@ msgstr ""
"\n"
"- 系统文件: \n"
-#: standalone/drakbackup:2882
+#: standalone/drakbackup:2588
#, c-format
msgid ""
"\n"
@@ -17285,7 +17392,7 @@ msgstr ""
"\n"
"- 用户文件: \n"
-#: standalone/drakbackup:2884
+#: standalone/drakbackup:2590
#, c-format
msgid ""
"\n"
@@ -17294,7 +17401,7 @@ msgstr ""
"\n"
"- 其它文件: \n"
-#: standalone/drakbackup:2886
+#: standalone/drakbackup:2592
#, c-format
msgid ""
"\n"
@@ -17303,12 +17410,12 @@ msgstr ""
"\n"
"- 保存在硬盘路径: %s\n"
-#: standalone/drakbackup:2887
+#: standalone/drakbackup:2593
#, c-format
msgid "\tLimit disk usage to %s MB\n"
msgstr "\t限制磁盘使用为 %s MB\n"
-#: standalone/drakbackup:2890
+#: standalone/drakbackup:2596
#, c-format
msgid ""
"\n"
@@ -17317,17 +17424,17 @@ msgstr ""
"\n"
"- 备份后删除硬盘的 tar 文件。\n"
-#: standalone/drakbackup:2894
+#: standalone/drakbackup:2600
#, c-format
msgid "NO"
msgstr "否"
-#: standalone/drakbackup:2895
+#: standalone/drakbackup:2601
#, c-format
msgid "YES"
msgstr "是"
-#: standalone/drakbackup:2896
+#: standalone/drakbackup:2602
#, c-format
msgid ""
"\n"
@@ -17336,22 +17443,22 @@ msgstr ""
"\n"
"- 刻录光盘"
-#: standalone/drakbackup:2897
+#: standalone/drakbackup:2603
#, c-format
msgid "RW"
msgstr "RW"
-#: standalone/drakbackup:2898
+#: standalone/drakbackup:2604
#, c-format
msgid " on device: %s"
msgstr " 使用设备: %s"
-#: standalone/drakbackup:2899
+#: standalone/drakbackup:2605
#, c-format
msgid " (multi-session)"
msgstr "(多轨道)"
-#: standalone/drakbackup:2900
+#: standalone/drakbackup:2606
#, c-format
msgid ""
"\n"
@@ -17360,12 +17467,12 @@ msgstr ""
"\n"
"- 保存到磁带设备: %s"
-#: standalone/drakbackup:2901
+#: standalone/drakbackup:2607
#, c-format
msgid "\t\tErase=%s"
msgstr "\t\t删除=%s"
-#: standalone/drakbackup:2904
+#: standalone/drakbackup:2610
#, c-format
msgid ""
"\n"
@@ -17374,7 +17481,7 @@ msgstr ""
"\n"
"- 通过 %s 保存到主机: %s\n"
-#: standalone/drakbackup:2905
+#: standalone/drakbackup:2611
#, c-format
msgid ""
"\t\t user name: %s\n"
@@ -17383,7 +17490,7 @@ msgstr ""
"\t\t 用户名: %s\n"
"\t\t 路径: %s \n"
-#: standalone/drakbackup:2906
+#: standalone/drakbackup:2612
#, c-format
msgid ""
"\n"
@@ -17392,37 +17499,42 @@ msgstr ""
"\n"
"- 选项: \n"
-#: standalone/drakbackup:2907
+#: standalone/drakbackup:2613
#, c-format
msgid "\tDo not include System Files\n"
msgstr "\t不包括系统文件\n"
-#: standalone/drakbackup:2910
+#: standalone/drakbackup:2615
#, c-format
msgid "\tBackups use tar and bzip2\n"
msgstr "\t使用 tar 和 bzip2 备份\n"
-#: standalone/drakbackup:2912
+#: standalone/drakbackup:2616
#, c-format
msgid "\tBackups use tar and gzip\n"
msgstr "\t使用 tar 和 gzip 备份\n"
-#: standalone/drakbackup:2915
+#: standalone/drakbackup:2617
+#, c-format
+msgid "\tBackups use tar only\n"
+msgstr "\t只使用 tar 备份\n"
+
+#: standalone/drakbackup:2619
#, c-format
msgid "\tUse .backupignore files\n"
msgstr "\t使用 .backupignore 文件\n"
-#: standalone/drakbackup:2916
+#: standalone/drakbackup:2620
#, c-format
msgid "\tSend mail to %s\n"
msgstr "\t发送邮件到 %s\n"
-#: standalone/drakbackup:2917
+#: standalone/drakbackup:2621
#, c-format
msgid "\tUsing SMTP server %s\n"
msgstr "\t使用 SMTP 服务器 %s\n"
-#: standalone/drakbackup:2919
+#: standalone/drakbackup:2623
#, c-format
msgid ""
"\n"
@@ -17431,47 +17543,47 @@ msgstr ""
"\n"
"- 守护进程，%s 通过: \n"
-#: standalone/drakbackup:2920
+#: standalone/drakbackup:2624
#, c-format
msgid "\t-Hard drive.\n"
msgstr "\t-硬盘。\n"
-#: standalone/drakbackup:2921
+#: standalone/drakbackup:2625
#, c-format
msgid "\t-CD-R.\n"
msgstr "\t-CD-R。\n"
-#: standalone/drakbackup:2922
+#: standalone/drakbackup:2626
#, c-format
msgid "\t-Tape \n"
msgstr "\t-磁带\n"
-#: standalone/drakbackup:2923
+#: standalone/drakbackup:2627
#, c-format
msgid "\t-Network by FTP.\n"
msgstr "\t-网络通过 FTP。\n"
-#: standalone/drakbackup:2924
+#: standalone/drakbackup:2628
#, c-format
msgid "\t-Network by SSH.\n"
msgstr "\t-网络通过 SSH。\n"
-#: standalone/drakbackup:2925
+#: standalone/drakbackup:2629
#, c-format
msgid "\t-Network by rsync.\n"
msgstr "\t-网络通过 rsync。\n"
-#: standalone/drakbackup:2926
+#: standalone/drakbackup:2630
#, c-format
msgid "\t-Network by webdav.\n"
msgstr "\t-通过 webdav 的网络。\n"
-#: standalone/drakbackup:2928
+#: standalone/drakbackup:2632
#, c-format
msgid "No configuration, please click Wizard or Advanced.\n"
msgstr "没有配置，请选择向导或高级。\n"
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2637
#, c-format
msgid ""
"List of data to restore:\n"
@@ -17480,27 +17592,27 @@ msgstr ""
"要恢复数据的清单: \n"
"\n"
-#: standalone/drakbackup:2935
+#: standalone/drakbackup:2639
#, c-format
msgid "- Restore System Files.\n"
msgstr "- 恢复系统文件。\n"
-#: standalone/drakbackup:2937 standalone/drakbackup:2947
+#: standalone/drakbackup:2641 standalone/drakbackup:2651
#, c-format
msgid " - from date: %s %s\n"
msgstr " - 从日期: %s %s\n"
-#: standalone/drakbackup:2940
+#: standalone/drakbackup:2644
#, c-format
msgid "- Restore User Files: \n"
msgstr "- 恢复用户文件: \n"
-#: standalone/drakbackup:2945
+#: standalone/drakbackup:2649
#, c-format
msgid "- Restore Other Files: \n"
msgstr "- 恢复其它文件: \n"
-#: standalone/drakbackup:3121
+#: standalone/drakbackup:2830
#, c-format
msgid ""
"List of data corrupted:\n"
@@ -17509,117 +17621,127 @@ msgstr ""
"已毁坏数据的清单: \n"
"\n"
-#: standalone/drakbackup:3123
+#: standalone/drakbackup:2832
#, c-format
msgid "Please uncheck or remove it on next time."
msgstr "请取消选择并删除它。"
-#: standalone/drakbackup:3133
+#: standalone/drakbackup:2842
#, c-format
msgid "Backup files are corrupted"
msgstr "备份文件损坏了"
-#: standalone/drakbackup:3154
+#: standalone/drakbackup:2863
#, c-format
msgid " All of your selected data have been "
msgstr " 您选择的全部数据已经 "
-#: standalone/drakbackup:3155
+#: standalone/drakbackup:2864
#, c-format
msgid " Successfuly Restored on %s "
msgstr " 成功的恢复到 %s "
-#: standalone/drakbackup:3270
+#: standalone/drakbackup:2987
#, c-format
msgid " Restore Configuration "
msgstr " 恢复配置 "
-#: standalone/drakbackup:3298
+#: standalone/drakbackup:3015
#, c-format
msgid "OK to restore the other files."
msgstr "即将恢复其它文件。"
-#: standalone/drakbackup:3316
+#: standalone/drakbackup:3031
#, c-format
msgid "User list to restore (only the most recent date per user is important)"
msgstr "可恢复的用户清单(每个用户最近的数据是最重要的)"
-#: standalone/drakbackup:3382
+#: standalone/drakbackup:3098
#, c-format
msgid "Please choose the date to restore:"
msgstr "请选择需要恢复的日期:"
-#: standalone/drakbackup:3420
+#: standalone/drakbackup:3135
#, c-format
msgid "Restore from Hard Disk."
msgstr "从硬盘恢复"
-#: standalone/drakbackup:3422
+#: standalone/drakbackup:3137
#, c-format
msgid "Enter the directory where backups are stored"
msgstr "请输入存储备份的目录"
-#: standalone/drakbackup:3478
+#: standalone/drakbackup:3141
+#, c-format
+msgid "Directory with backups"
+msgstr "存有备份的目录"
+
+#: standalone/drakbackup:3194
#, c-format
msgid "Select another media to restore from"
msgstr "请选择另外的介质用以恢复"
-#: standalone/drakbackup:3480
+#: standalone/drakbackup:3196
#, c-format
msgid "Other Media"
msgstr "其它介质"
-#: standalone/drakbackup:3485
+#: standalone/drakbackup:3201
#, c-format
msgid "Restore system"
msgstr "恢复系统"
-#: standalone/drakbackup:3486
+#: standalone/drakbackup:3202
#, c-format
msgid "Restore Users"
msgstr "恢复用户文件"
-#: standalone/drakbackup:3487
+#: standalone/drakbackup:3203
#, c-format
msgid "Restore Other"
msgstr "恢复其它文件"
-#: standalone/drakbackup:3489
+#: standalone/drakbackup:3205
#, c-format
-msgid "select path to restore (instead of /)"
+msgid "Select path to restore (instead of /)"
msgstr "选择将要恢复到的路径(/ 除外)"
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3209 standalone/drakbackup:3490
+#, c-format
+msgid "Path To Restore To"
+msgstr "恢复到的路径"
+
+#: standalone/drakbackup:3212
#, c-format
msgid "Do new backup before restore (only for incremental backups.)"
msgstr "恢复前做新的备份(只适用于增量备份。)"
-#: standalone/drakbackup:3495
+#: standalone/drakbackup:3214
#, c-format
msgid "Remove user directories before restore."
msgstr "恢复前删除用户目录。"
-#: standalone/drakbackup:3575
+#: standalone/drakbackup:3298
#, c-format
msgid "Filename text substring to search for (empty string matches all):"
msgstr "要搜索的文件名文字(空字符串将匹配全部): "
-#: standalone/drakbackup:3578
+#: standalone/drakbackup:3301
#, c-format
msgid "Search Backups"
msgstr "搜索备份"
-#: standalone/drakbackup:3597
+#: standalone/drakbackup:3320
#, c-format
msgid "No matches found..."
msgstr "没有发现匹配项..."
-#: standalone/drakbackup:3601
+#: standalone/drakbackup:3324
#, c-format
msgid "Restore Selected"
msgstr "恢复选中文件"
-#: standalone/drakbackup:3735
+#: standalone/drakbackup:3458
#, c-format
msgid ""
"Click date/time to see backup files.\n"
@@ -17628,7 +17750,7 @@ msgstr ""
"点击日期/时间可查看备份文件。\n"
"Ctrl+单击文件可选择多个文件。"
-#: standalone/drakbackup:3741
+#: standalone/drakbackup:3464
#, c-format
msgid ""
"Restore Selected\n"
@@ -17637,7 +17759,7 @@ msgstr ""
"恢复选中的\n"
"目录项"
-#: standalone/drakbackup:3750
+#: standalone/drakbackup:3473
#, c-format
msgid ""
"Restore Selected\n"
@@ -17646,26 +17768,17 @@ msgstr ""
"恢复选中的\n"
"文件"
-#: standalone/drakbackup:3766
-#, c-format
-msgid ""
-"Change\n"
-"Restore Path"
-msgstr ""
-"修改\n"
-"恢复路径"
-
-#: standalone/drakbackup:3833
+#: standalone/drakbackup:3550
#, c-format
msgid "Backup files not found at %s."
msgstr "在 %s 没有发现备份文件。"
-#: standalone/drakbackup:3846
+#: standalone/drakbackup:3563
#, c-format
msgid "Restore From CD"
msgstr "从光盘恢复"
-#: standalone/drakbackup:3846
+#: standalone/drakbackup:3563
#, c-format
msgid ""
"Insert the CD with volume label %s\n"
@@ -17674,230 +17787,235 @@ msgstr ""
"请把卷标为 %s 的光盘插入\n"
"到加载于 /mnt/cdrom 的光盘驱动器"
-#: standalone/drakbackup:3848
+#: standalone/drakbackup:3565
#, c-format
msgid "Not the correct CD label. Disk is labelled %s."
msgstr "光盘卷标不对。这张盘的卷标是 %s。"
-#: standalone/drakbackup:3858
+#: standalone/drakbackup:3575
#, c-format
msgid "Restore From Tape"
msgstr "从磁带恢复"
-#: standalone/drakbackup:3858
+#: standalone/drakbackup:3575
#, c-format
msgid ""
"Insert the tape with volume label %s\n"
" in the tape drive device %s"
msgstr "请把卷标为 %s 的磁带装进磁带机 %s"
-#: standalone/drakbackup:3860
+#: standalone/drakbackup:3577
#, c-format
msgid "Not the correct tape label. Tape is labelled %s."
msgstr "磁带卷标不对。这盘磁带的卷标是 %s。"
-#: standalone/drakbackup:3871
+#: standalone/drakbackup:3588
#, c-format
msgid "Restore Via Network"
msgstr "通过网络恢复"
-#: standalone/drakbackup:3871
+#: standalone/drakbackup:3588
#, c-format
msgid "Restore Via Network Protocol: %s"
msgstr "恢复使用的网络协议: %s"
-#: standalone/drakbackup:3872
+#: standalone/drakbackup:3589
#, c-format
msgid "Host Name"
msgstr "主机名"
-#: standalone/drakbackup:3873
+#: standalone/drakbackup:3590
#, c-format
msgid "Host Path or Module"
msgstr "主机路径和模块"
-#: standalone/drakbackup:3880
+#: standalone/drakbackup:3597
#, c-format
msgid "Password required"
msgstr "需要密码"
-#: standalone/drakbackup:3886
+#: standalone/drakbackup:3603
#, c-format
msgid "Username required"
msgstr "需要用户名"
-#: standalone/drakbackup:3889
+#: standalone/drakbackup:3606
#, c-format
msgid "Hostname required"
msgstr "需要主机名"
-#: standalone/drakbackup:3894
+#: standalone/drakbackup:3611
#, c-format
msgid "Path or Module required"
msgstr "要求提供路径或模块"
-#: standalone/drakbackup:3907
+#: standalone/drakbackup:3624
#, c-format
msgid "Files Restored..."
msgstr "文件已恢复..."
-#: standalone/drakbackup:3910
+#: standalone/drakbackup:3627
#, c-format
msgid "Restore Failed..."
msgstr "恢复失败..."
-#: standalone/drakbackup:4015 standalone/drakbackup:4031
+#: standalone/drakbackup:3737 standalone/drakbackup:3754
#, c-format
msgid "%s not retrieved..."
msgstr "%s 未获取..."
-#: standalone/drakbackup:4155 standalone/drakbackup:4228
+#: standalone/drakbackup:3880 standalone/drakbackup:3953
#, c-format
msgid "Search for files to restore"
msgstr "搜索要恢复的文件"
-#: standalone/drakbackup:4160
+#: standalone/drakbackup:3885
#, c-format
msgid "Restore all backups"
msgstr "恢复所有备份"
-#: standalone/drakbackup:4169
+#: standalone/drakbackup:3894
#, c-format
msgid "Custom Restore"
msgstr "定制恢复"
-#: standalone/drakbackup:4174 standalone/drakbackup:4224
+#: standalone/drakbackup:3899 standalone/drakbackup:3949
#, c-format
msgid "Restore From Catalog"
msgstr "从目录恢复"
-#: standalone/drakbackup:4196
+#: standalone/drakbackup:3921
#, c-format
msgid "Unable to find backups to restore...\n"
msgstr "无法找到要恢复的数据...\n"
-#: standalone/drakbackup:4197
+#: standalone/drakbackup:3922
#, c-format
msgid "Verify that %s is the correct path"
msgstr "查证得 %s 是正确的路径"
-#: standalone/drakbackup:4198
+#: standalone/drakbackup:3923
#, c-format
msgid " and the CD is in the drive"
msgstr " 而且 CD 盘在驱动器中"
-#: standalone/drakbackup:4200
+#: standalone/drakbackup:3925
#, c-format
msgid "Backups on unmountable media - Use Catalog to restore"
msgstr "备份在未加载的介质中 - 使用目录来恢复"
-#: standalone/drakbackup:4216
+#: standalone/drakbackup:3941
#, c-format
msgid "CD in place - continue."
msgstr "光盘就绪 - 继续。"
-#: standalone/drakbackup:4221
+#: standalone/drakbackup:3946
#, c-format
msgid "Browse to new restore repository."
msgstr "浏览新的恢复仓库。"
-#: standalone/drakbackup:4258
+#: standalone/drakbackup:3947
+#, c-format
+msgid "Directory To Restore From"
+msgstr "恢复来自目录"
+
+#: standalone/drakbackup:3986
#, c-format
msgid "Restore Progress"
msgstr "恢复进展"
-#: standalone/drakbackup:4292 standalone/drakbackup:4404
-#: standalone/logdrake:175
+#: standalone/drakbackup:4016 standalone/drakbackup:4123
+#: standalone/logdrake:174
#, c-format
msgid "Save"
msgstr "保存"
-#: standalone/drakbackup:4378
+#: standalone/drakbackup:4099
#, c-format
msgid "Build Backup"
msgstr "创建备份"
-#: standalone/drakbackup:4430 standalone/drakbackup:4829
+#: standalone/drakbackup:4147 standalone/drakbackup:4512
#, c-format
msgid "Restore"
msgstr "恢复"
-#: standalone/drakbackup:4600
+#: standalone/drakbackup:4277
#, c-format
msgid "The following packages need to be installed:\n"
msgstr "下列软件包需要安装: \n"
-#: standalone/drakbackup:4622
+#: standalone/drakbackup:4304
#, c-format
msgid "Please select data to restore..."
msgstr "请选择要恢复的数据..."
-#: standalone/drakbackup:4662
+#: standalone/drakbackup:4344
#, c-format
msgid "Backup system files"
msgstr "备份系统文件"
-#: standalone/drakbackup:4665
+#: standalone/drakbackup:4347
#, c-format
msgid "Backup user files"
msgstr "备份用户文件"
-#: standalone/drakbackup:4668
+#: standalone/drakbackup:4350
#, c-format
msgid "Backup other files"
msgstr "备份其它文件"
-#: standalone/drakbackup:4671 standalone/drakbackup:4707
+#: standalone/drakbackup:4353 standalone/drakbackup:4389
#, c-format
msgid "Total Progress"
msgstr "总进展"
-#: standalone/drakbackup:4699
+#: standalone/drakbackup:4381
#, c-format
msgid "Sending files by FTP"
msgstr "通过 FTP 发送文件"
-#: standalone/drakbackup:4702
+#: standalone/drakbackup:4384
#, c-format
msgid "Sending files..."
msgstr "正在发送文件..."
-#: standalone/drakbackup:4772
+#: standalone/drakbackup:4455
#, c-format
msgid "Backup Now from configuration file"
msgstr "现在从配置文件备份"
-#: standalone/drakbackup:4777
+#: standalone/drakbackup:4460
#, c-format
msgid "View Backup Configuration."
msgstr "查看备份配置。"
-#: standalone/drakbackup:4803
+#: standalone/drakbackup:4486
#, c-format
msgid "Wizard Configuration"
msgstr "向导配置"
-#: standalone/drakbackup:4808
+#: standalone/drakbackup:4491
#, c-format
msgid "Advanced Configuration"
msgstr "高级配置"
-#: standalone/drakbackup:4813
+#: standalone/drakbackup:4496
#, c-format
msgid "View Configuration"
msgstr "查看配置"
-#: standalone/drakbackup:4817
+#: standalone/drakbackup:4500
#, c-format
msgid "View Last Log"
msgstr "查看上次的日志"
-#: standalone/drakbackup:4822
+#: standalone/drakbackup:4505
#, c-format
msgid "Backup Now"
msgstr "立即备份"
-#: standalone/drakbackup:4826
+#: standalone/drakbackup:4509
#, c-format
msgid ""
"No configuration file found \n"
@@ -17906,55 +18024,55 @@ msgstr ""
"没有找到配置文件\n"
"请单击向导或高级。"
-#: standalone/drakbackup:4858 standalone/drakbackup:4865
+#: standalone/drakbackup:4530 standalone/drakbackup:4533
#, c-format
msgid "Drakbackup"
msgstr "Drak 备份"
-#: standalone/drakboot:56
+#: standalone/drakboot:57
#, c-format
msgid "Graphical boot theme selection"
msgstr "图形化启动主题选择"
-#: standalone/drakboot:56
+#: standalone/drakboot:57
#, c-format
msgid "System mode"
msgstr "系统模式"
-#: standalone/drakboot:66 standalone/drakfloppy:46 standalone/harddrake2:97
-#: standalone/harddrake2:98 standalone/logdrake:70 standalone/printerdrake:150
+#: standalone/drakboot:67 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:67 standalone/drakfloppy:47 standalone/logdrake:76
+#: standalone/drakboot:68 standalone/drakfloppy:47 standalone/logdrake:77
#, c-format
msgid "/File/_Quit"
msgstr "/文件(F)/退出(_Q)"
-#: standalone/drakboot:67 standalone/drakfloppy:47 standalone/harddrake2:98
-#: standalone/logdrake:76 standalone/printerdrake:152
+#: standalone/drakboot:68 standalone/drakfloppy:47 standalone/harddrake2:98
+#: standalone/logdrake:77 standalone/printerdrake:152
#, c-format
msgid "<control>Q"
msgstr "<control>Q"
-#: standalone/drakboot:118
+#: standalone/drakboot:119
#, c-format
msgid "Install themes"
msgstr "安装主题"
-#: standalone/drakboot:119
+#: standalone/drakboot:120
#, c-format
msgid "Create new theme"
msgstr "创建新主题"
-#: standalone/drakboot:133
+#: standalone/drakboot:134
#, c-format
msgid "Use graphical boot"
msgstr "使用图形化引导"
-#: standalone/drakboot:138
+#: standalone/drakboot:139
#, c-format
msgid ""
"Your system bootloader is not in framebuffer mode. To activate graphical "
@@ -17963,12 +18081,12 @@ msgstr ""
"您的系统引导程序并不位于帧缓存模式。要激活图形化引导程序，请在引导程序配置工"
"具中选择图形视频模式。"
-#: standalone/drakboot:145
+#: standalone/drakboot:146
#, c-format
msgid "Theme"
msgstr "主题"
-#: standalone/drakboot:147
+#: standalone/drakboot:149
#, c-format
msgid ""
"Display theme\n"
@@ -17977,32 +18095,32 @@ msgstr ""
"在控制台\n"
"显示主题"
-#: standalone/drakboot:156
+#: standalone/drakboot:158
#, c-format
msgid "Launch the graphical environment when your system starts"
msgstr "系统启动时进入图形环境"
-#: standalone/drakboot:164
-#, c-format
-msgid "Yes, I want autologin with this (user, desktop)"
-msgstr "是，以(用户，桌面)自动登录"
-
-#: standalone/drakboot:165
+#: standalone/drakboot:166
#, c-format
msgid "No, I don't want autologin"
msgstr "否，不要自动登录"
-#: standalone/drakboot:171
+#: standalone/drakboot:167
+#, c-format
+msgid "Yes, I want autologin with this (user, desktop)"
+msgstr "是，以(用户，桌面)自动登录"
+
+#: standalone/drakboot:173
#, c-format
msgid "Default user"
msgstr "默认用户"
-#: standalone/drakboot:172
+#: standalone/drakboot:174
#, c-format
msgid "Default desktop"
msgstr "默认桌面"
-#: standalone/drakboot:236
+#: standalone/drakboot:238
#, c-format
msgid "Installation of %s failed. The following error occured:"
msgstr "安装 %s 失败，出现下列错误:"
@@ -18023,12 +18141,12 @@ msgstr ""
#: standalone/drakbug:48
#, c-format
msgid "Mandrake Bug Report Tool"
-msgstr "Mandrake 故障报告工具"
+msgstr "Mandrakelinux 故障报告工具"
#: standalone/drakbug:53
#, c-format
msgid "Mandrake Control Center"
-msgstr "Mandrake 控制中心"
+msgstr "Mandrakelinux 控制中心"
#: standalone/drakbug:55
#, c-format
@@ -18049,7 +18167,7 @@ msgstr "Drak 硬盘管理"
#: standalone/drakbug:58
#, c-format
msgid "Mandrake Online"
-msgstr "Mandrake 在线"
+msgstr "Mandrakeonline"
#: standalone/drakbug:59
#, c-format
@@ -18256,12 +18374,12 @@ msgstr "启用网络时间协议"
msgid "Server:"
msgstr "服务器: "
-#: standalone/drakclock:125 standalone/drakclock:137
+#: standalone/drakclock:129 standalone/drakclock:141
#, c-format
msgid "Reset"
msgstr "重置"
-#: standalone/drakclock:200
+#: standalone/drakclock:204
#, c-format
msgid ""
"We need to install ntp package\n"
@@ -18274,214 +18392,201 @@ msgstr ""
"\n"
"您是否想要安装 ntp？"
-#: standalone/drakconnect:78
+#: standalone/drakconnect:81
#, c-format
msgid "Network configuration (%d adapters)"
msgstr "网络配置(%d 网卡)"
-#: standalone/drakconnect:89 standalone/drakconnect:686
+#: standalone/drakconnect:92 standalone/drakconnect:728
#, c-format
msgid "Gateway:"
msgstr "网关: "
-#: standalone/drakconnect:89 standalone/drakconnect:686
+#: standalone/drakconnect:92 standalone/drakconnect:728
#, c-format
msgid "Interface:"
msgstr "网卡: "
-#: standalone/drakconnect:93 standalone/net_monitor:105
+#: standalone/drakconnect:96 standalone/net_monitor:105
#, c-format
msgid "Wait please"
msgstr "请稍候"
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116
#, c-format
msgid "Interface"
msgstr "网卡"
-#: standalone/drakconnect:113 standalone/drakconnect:502
-#: standalone/drakvpn:1136
-#, c-format
-msgid "Protocol"
-msgstr "协议"
-
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116 standalone/drakups:233
#, c-format
msgid "Driver"
msgstr "驱动程序"
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116
#, c-format
msgid "State"
msgstr "状态"
-#: standalone/drakconnect:130
+#: standalone/drakconnect:133
#, c-format
msgid "Hostname: "
msgstr "主机名: "
-#: standalone/drakconnect:132
+#: standalone/drakconnect:135
#, c-format
msgid "Configure hostname..."
msgstr "配置主机名..."
-#: standalone/drakconnect:146 standalone/drakconnect:727
+#: standalone/drakconnect:149 standalone/drakconnect:769
#, c-format
msgid "LAN configuration"
msgstr "局域网配置"
-#: standalone/drakconnect:151
+#: standalone/drakconnect:154
#, c-format
msgid "Configure Local Area Network..."
msgstr "配置局域网..."
-#: standalone/drakconnect:159 standalone/drakconnect:228
-#: standalone/drakconnect:232
+#: standalone/drakconnect:162 standalone/drakconnect:237
+#: standalone/drakconnect:241
#, c-format
msgid "Apply"
msgstr "应用"
-#: standalone/drakconnect:254 standalone/drakconnect:263
-#: standalone/drakconnect:277 standalone/drakconnect:283
-#: standalone/drakconnect:293 standalone/drakconnect:294
-#: standalone/drakconnect:540
+#: standalone/drakconnect:197
+#, c-format
+msgid "Manage connections"
+msgstr "管理连接"
+
+#: standalone/drakconnect:263 standalone/drakconnect:272
+#: standalone/drakconnect:292 standalone/drakconnect:298
+#: standalone/drakconnect:308 standalone/drakconnect:309
+#: standalone/drakconnect:576
#, c-format
msgid "TCP/IP"
msgstr "TCP/IP"
-#: standalone/drakconnect:254 standalone/drakconnect:263
-#: standalone/drakconnect:277 standalone/drakconnect:421
-#: standalone/drakconnect:425 standalone/drakconnect:540
+#: standalone/drakconnect:263 standalone/drakconnect:272
+#: standalone/drakconnect:292 standalone/drakconnect:444
+#: standalone/drakconnect:448 standalone/drakconnect:576
#, c-format
msgid "Account"
msgstr "帐户"
-#: standalone/drakconnect:283 standalone/drakconnect:347
-#: standalone/drakconnect:348 standalone/drakconnect:540
+#: standalone/drakconnect:298 standalone/drakconnect:370
+#: standalone/drakconnect:371 standalone/drakconnect:576
#, c-format
msgid "Wireless"
msgstr "无线"
-#: standalone/drakconnect:325
+#: standalone/drakconnect:344
#, c-format
msgid "DNS servers"
msgstr "DNS 服务器"
-#: standalone/drakconnect:332
+#: standalone/drakconnect:351
#, c-format
msgid "Search Domain"
msgstr "搜索域"
-#: standalone/drakconnect:338
+#: standalone/drakconnect:359
#, c-format
msgid "static"
msgstr "静态"
-#: standalone/drakconnect:338
+#: standalone/drakconnect:359
#, c-format
-msgid "dhcp"
+msgid "DHCP"
msgstr "DHCP"
-#: standalone/drakconnect:457
+#: standalone/drakconnect:482
#, c-format
msgid "Flow control"
msgstr "流控制"
-#: standalone/drakconnect:458
+#: standalone/drakconnect:483
#, c-format
msgid "Line termination"
msgstr "挂线"
-#: standalone/drakconnect:463
-#, c-format
-msgid "Tone dialing"
-msgstr "双音频拨号"
-
-#: standalone/drakconnect:463
-#, c-format
-msgid "Pulse dialing"
-msgstr "脉冲拨号"
-
-#: standalone/drakconnect:468
+#: standalone/drakconnect:493
#, c-format
msgid "Use lock file"
msgstr "使用锁定文件"
-#: standalone/drakconnect:471
+#: standalone/drakconnect:496
#, c-format
msgid "Modem timeout"
msgstr "调制解调器超时"
-#: standalone/drakconnect:475
+#: standalone/drakconnect:500
#, c-format
msgid "Wait for dialup tone before dialing"
msgstr "在拨号前等候拨号音"
-#: standalone/drakconnect:478
+#: standalone/drakconnect:503
#, c-format
msgid "Busy wait"
msgstr "遇忙等待"
-#: standalone/drakconnect:482
+#: standalone/drakconnect:507
#, c-format
msgid "Modem sound"
msgstr "调制解调器声音"
-#: standalone/drakconnect:483
+#: standalone/drakconnect:508
#, c-format
msgid "Enable"
msgstr "启用"
-#: standalone/drakconnect:483
+#: standalone/drakconnect:508
#, c-format
msgid "Disable"
msgstr "禁用"
-#: standalone/drakconnect:522 standalone/harddrake2:58
+#: standalone/drakconnect:558 standalone/harddrake2:58
#, c-format
msgid "Media class"
msgstr "介质类别"
-#: standalone/drakconnect:523 standalone/drakfloppy:140
+#: standalone/drakconnect:559 standalone/drakfloppy:140
#, c-format
msgid "Module name"
msgstr "模块名"
-#: standalone/drakconnect:524
+#: standalone/drakconnect:560
#, c-format
msgid "Mac Address"
msgstr "Mac 地址"
-#: standalone/drakconnect:525 standalone/harddrake2:21
+#: standalone/drakconnect:561 standalone/harddrake2:21
#, c-format
msgid "Bus"
msgstr "总线"
-#: standalone/drakconnect:526 standalone/harddrake2:29
+#: standalone/drakconnect:562 standalone/harddrake2:29
#, c-format
msgid "Location on the bus"
msgstr "在总线上的位置"
-#: standalone/drakconnect:587
+#: standalone/drakconnect:632 standalone/drakgw:248 standalone/drakpxe:138
#, c-format
msgid ""
-"An unexpected error has happened:\n"
-"%s"
-msgstr ""
-"发生了意外错误: \n"
-"%s"
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr "您的系统里没有配置以太网卡。请运行硬件配置工具。"
-#: standalone/drakconnect:597
+#: standalone/drakconnect:638
#, c-format
msgid "Remove a network interface"
msgstr "删除网卡"
-#: standalone/drakconnect:601
+#: standalone/drakconnect:642
#, c-format
msgid "Select the network interface to remove:"
msgstr "选择要删除的网卡: "
-#: standalone/drakconnect:617
+#: standalone/drakconnect:656
#, c-format
msgid ""
"An error occured while deleting the \"%s\" network interface:\n"
@@ -18492,70 +18597,70 @@ msgstr ""
"\n"
"%s"
-#: standalone/drakconnect:619
+#: standalone/drakconnect:658
#, c-format
msgid ""
"Congratulations, the \"%s\" network interface has been succesfully deleted"
msgstr "恭喜，“%s”网卡已经成功删除"
-#: standalone/drakconnect:636
+#: standalone/drakconnect:675
#, c-format
msgid "No Ip"
msgstr "没有 IP"
-#: standalone/drakconnect:637
+#: standalone/drakconnect:676
#, c-format
msgid "No Mask"
msgstr "没有掩码"
-#: standalone/drakconnect:638 standalone/drakconnect:798
+#: standalone/drakconnect:677 standalone/drakconnect:840
#, c-format
msgid "up"
msgstr "上移"
-#: standalone/drakconnect:638 standalone/drakconnect:798
+#: standalone/drakconnect:677 standalone/drakconnect:840
#, c-format
msgid "down"
msgstr "下移"
-#: standalone/drakconnect:677 standalone/net_monitor:415
+#: standalone/drakconnect:718 standalone/net_monitor:415
#, c-format
msgid "Connected"
msgstr "已连接"
-#: standalone/drakconnect:677 standalone/net_monitor:415
+#: standalone/drakconnect:718 standalone/net_monitor:415
#, c-format
msgid "Not connected"
msgstr "未连接"
-#: standalone/drakconnect:678
+#: standalone/drakconnect:720
#, c-format
msgid "Disconnect..."
msgstr "断开连接..."
-#: standalone/drakconnect:678
+#: standalone/drakconnect:720
#, c-format
msgid "Connect..."
msgstr "连接..."
-#: standalone/drakconnect:707
+#: standalone/drakconnect:749
#, c-format
msgid ""
"Warning, another Internet connection has been detected, maybe using your "
"network"
msgstr "警告，检测到另外的 Internet 连接，可能是通过本地网络"
-#: standalone/drakconnect:723
+#: standalone/drakconnect:765
#, c-format
msgid "Deactivate now"
msgstr "立即禁用"
-#: standalone/drakconnect:723
+#: standalone/drakconnect:765
#, c-format
msgid "Activate now"
msgstr "立即激活"
-#: standalone/drakconnect:731
+#: standalone/drakconnect:773
#, c-format
msgid ""
"You don't have any configured interface.\n"
@@ -18564,36 +18669,36 @@ msgstr ""
"您没有配置好的网卡。\n"
"单击“配置”先配置网卡"
-#: standalone/drakconnect:745
+#: standalone/drakconnect:787
#, c-format
msgid "LAN Configuration"
msgstr "LAN 配置"
-#: standalone/drakconnect:757
+#: standalone/drakconnect:799
#, c-format
msgid "Adapter %s: %s"
msgstr "适配器 %s: %s"
-#: standalone/drakconnect:766
+#: standalone/drakconnect:808
#, c-format
msgid "Boot Protocol"
msgstr "启动协议"
-#: standalone/drakconnect:767
+#: standalone/drakconnect:809
#, c-format
msgid "Started on boot"
msgstr "开机时启动"
-#: standalone/drakconnect:803
+#: standalone/drakconnect:845
#, c-format
msgid ""
"This interface has not been configured yet.\n"
"Run the \"Add an interface\" assistant from the Mandrake Control Center"
msgstr ""
"这块网卡还没有配置过。\n"
-"请从“Mandrake 控制中心”运行“添加网卡”助手"
+"请从“Mandrakelinux 控制中心”运行“添加网卡”助手"
-#: standalone/drakconnect:858
+#: standalone/drakconnect:900
#, c-format
msgid ""
"You don't have any configured Internet connection.\n"
@@ -18602,47 +18707,32 @@ msgstr ""
"您没有配置过 Internet 连接。\n"
"请在控制中心中运行“Internet 访问”。"
-#: standalone/drakconnect:866
+#: standalone/drakconnect:908
#, c-format
msgid "Internet connection configuration"
msgstr "Internet 连接配置"
-#: standalone/drakconnect:907
-#, c-format
-msgid "Provider dns 1 (optional)"
-msgstr "服务商 DNS 1(可选)"
-
-#: standalone/drakconnect:908
-#, c-format
-msgid "Provider dns 2 (optional)"
-msgstr "服务商 DNS 2(可选)"
-
-#: standalone/drakconnect:921
-#, c-format
-msgid "Ethernet Card"
-msgstr "以太网卡"
-
-#: standalone/drakconnect:922
+#: standalone/drakconnect:926
#, c-format
-msgid "DHCP Client"
-msgstr "DHCP 客户端"
+msgid "Third DNS server (optional)"
+msgstr "第三 DNS 服务器(可选)"
-#: standalone/drakconnect:951
+#: standalone/drakconnect:948
#, c-format
msgid "Internet Connection Configuration"
msgstr "Internet 连接配置"
-#: standalone/drakconnect:952
+#: standalone/drakconnect:949
#, c-format
msgid "Internet access"
msgstr "Internet 访问"
-#: standalone/drakconnect:954 standalone/net_monitor:87
+#: standalone/drakconnect:951 standalone/net_monitor:87
#, c-format
msgid "Connection type: "
msgstr "连接类型:"
-#: standalone/drakconnect:957
+#: standalone/drakconnect:954
#, c-format
msgid "Status:"
msgstr "状态: "
@@ -18782,109 +18872,109 @@ msgstr ""
"\n"
"<span foreground=\"Red\"><tt>%s</tt></span>"
-#: standalone/drakfont:181
+#: standalone/drakfont:183
#, c-format
msgid "Search installed fonts"
msgstr "搜索已安装的字体"
-#: standalone/drakfont:183
+#: standalone/drakfont:185
#, c-format
msgid "Unselect fonts installed"
msgstr "不选已安装的文件"
-#: standalone/drakfont:206
+#: standalone/drakfont:208
#, c-format
msgid "parse all fonts"
msgstr "分析所有字体"
-#: standalone/drakfont:208
+#: standalone/drakfont:210
#, c-format
msgid "No fonts found"
msgstr "找不到字体"
-#: standalone/drakfont:216 standalone/drakfont:256 standalone/drakfont:323
-#: standalone/drakfont:356 standalone/drakfont:364 standalone/drakfont:390
-#: standalone/drakfont:408 standalone/drakfont:422
+#: standalone/drakfont:218 standalone/drakfont:258 standalone/drakfont:325
+#: standalone/drakfont:358 standalone/drakfont:366 standalone/drakfont:392
+#: standalone/drakfont:410 standalone/drakfont:424
#, c-format
msgid "done"
msgstr "完成"
-#: standalone/drakfont:221
+#: standalone/drakfont:223
#, c-format
msgid "Could not find any font in your mounted partitions"
msgstr "在已挂载的分区中找不到任何字体"
-#: standalone/drakfont:254
+#: standalone/drakfont:256
#, c-format
msgid "Reselect correct fonts"
msgstr "重新选择正确字体"
-#: standalone/drakfont:257
+#: standalone/drakfont:259
#, c-format
msgid "Could not find any font.\n"
msgstr "找不到任何字体。\n"
-#: standalone/drakfont:267
+#: standalone/drakfont:269
#, c-format
msgid "Search for fonts in installed list"
msgstr "在安装记录中查找字体"
-#: standalone/drakfont:292
+#: standalone/drakfont:294
#, c-format
msgid "%s fonts conversion"
msgstr "%s 字体转换"
-#: standalone/drakfont:321
+#: standalone/drakfont:323
#, c-format
msgid "Fonts copy"
msgstr "复制字体"
-#: standalone/drakfont:324
+#: standalone/drakfont:326
#, c-format
msgid "True Type fonts installation"
msgstr "TrueType 字体安装"
-#: standalone/drakfont:331
+#: standalone/drakfont:333
#, c-format
msgid "please wait during ttmkfdir..."
msgstr "正在运行 ttmkfdir，请稍候..."
-#: standalone/drakfont:332
+#: standalone/drakfont:334
#, c-format
msgid "True Type install done"
msgstr "TrueType 字体安装完成"
-#: standalone/drakfont:338 standalone/drakfont:353
+#: standalone/drakfont:340 standalone/drakfont:355
#, c-format
msgid "type1inst building"
msgstr "正在构造 type1inst"
-#: standalone/drakfont:347
+#: standalone/drakfont:349
#, c-format
msgid "Ghostscript referencing"
msgstr "Ghostscript 引用"
-#: standalone/drakfont:357
+#: standalone/drakfont:359
#, c-format
msgid "Suppress Temporary Files"
msgstr "删除临时文件"
-#: standalone/drakfont:360
+#: standalone/drakfont:362
#, c-format
msgid "Restart XFS"
msgstr "重新启动 XFS"
-#: standalone/drakfont:406 standalone/drakfont:416
+#: standalone/drakfont:408 standalone/drakfont:418
#, c-format
msgid "Suppress Fonts Files"
msgstr "删除字体文件"
-#: standalone/drakfont:418
+#: standalone/drakfont:420
#, c-format
msgid "xfs restart"
msgstr "重新启动 xfs"
-#: standalone/drakfont:426
+#: standalone/drakfont:428
#, c-format
msgid ""
"Before installing any fonts, be sure that you have the right to use and "
@@ -18897,32 +18987,32 @@ msgstr ""
"\n"
"-通常字体安装可以正常进行。但有罕见的例外，有问题的字体会使 X 挂住。"
-#: standalone/drakfont:474 standalone/drakfont:483
+#: standalone/drakfont:477 standalone/drakfont:486
#, c-format
msgid "DrakFont"
msgstr "Drak 字体"
-#: standalone/drakfont:484
+#: standalone/drakfont:487
#, c-format
msgid "Font List"
msgstr "字体列表"
-#: standalone/drakfont:490
+#: standalone/drakfont:493
#, c-format
msgid "About"
msgstr "关于"
-#: standalone/drakfont:492 standalone/drakfont:681 standalone/drakfont:719
+#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
#, c-format
msgid "Uninstall"
msgstr "卸载"
-#: standalone/drakfont:493
+#: standalone/drakfont:496
#, c-format
msgid "Import"
msgstr "导入"
-#: standalone/drakfont:509
+#: standalone/drakfont:512
#, c-format
msgid ""
"Copyright (C) 2001-2002 by MandrakeSoft \n"
@@ -18943,7 +19033,7 @@ msgstr ""
"\n"
" VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
-#: standalone/drakfont:518
+#: standalone/drakfont:521
#, c-format
msgid ""
"This program is free software; you can redistribute it and/or modify\n"
@@ -18973,7 +19063,7 @@ msgstr ""
"有，请写信给自由软件基金会，地址是 Free Software Foundation, Inc., 59 \n"
"Temple Place - Suite 330, Boston, MA 02111-1307, USA."
-#: standalone/drakfont:534
+#: standalone/drakfont:537
#, c-format
msgid ""
"Thanks:\n"
@@ -19004,12 +19094,12 @@ msgstr ""
"\t Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin 编写: \n"
" 转换 ttf 字体文件为 afm 和 pfb 字体。\n"
-#: standalone/drakfont:553
+#: standalone/drakfont:556
#, c-format
msgid "Choose the applications that will support the fonts:"
msgstr "请选择支持字体的应用程序: "
-#: standalone/drakfont:554
+#: standalone/drakfont:557
#, c-format
msgid ""
"Before installing any fonts, be sure that you have the right to use and "
@@ -19022,195 +19112,195 @@ msgstr ""
"\n"
"通常字体安装可以正常进行。但有罕见的例外，有问题的字体会使 X 挂住。"
-#: standalone/drakfont:564
+#: standalone/drakfont:567
#, c-format
msgid "Ghostscript"
msgstr "Ghostscript"
-#: standalone/drakfont:565
+#: standalone/drakfont:568
#, c-format
msgid "StarOffice"
msgstr "StarOffice"
-#: standalone/drakfont:566
+#: standalone/drakfont:569
#, c-format
msgid "Abiword"
msgstr "Abiword"
-#: standalone/drakfont:567
+#: standalone/drakfont:570
#, c-format
msgid "Generic Printers"
msgstr "通用打印机"
-#: standalone/drakfont:583
+#: standalone/drakfont:586
#, c-format
msgid "Select the font file or directory and click on 'Add'"
msgstr "选择字体文件或目录，然后单击“添加”"
-#: standalone/drakfont:597
+#: standalone/drakfont:587
+#, c-format
+msgid "File Selection"
+msgstr "选择文件"
+
+#: standalone/drakfont:600
#, c-format
msgid "You've not selected any font"
msgstr "您未选中任何字体"
-#: standalone/drakfont:646
+#: standalone/drakfont:652
#, c-format
msgid "Import fonts"
msgstr "导入字体"
-#: standalone/drakfont:651
+#: standalone/drakfont:657
#, c-format
msgid "Install fonts"
msgstr "安装字体"
-#: standalone/drakfont:686
+#: standalone/drakfont:692
#, c-format
msgid "click here if you are sure."
msgstr "如果您确定，请点击这儿。"
-#: standalone/drakfont:688
+#: standalone/drakfont:694
#, c-format
msgid "here if no."
msgstr "如果要放弃，点击这儿."
-#: standalone/drakfont:727
+#: standalone/drakfont:733
#, c-format
msgid "Unselected All"
msgstr "全部不选"
-#: standalone/drakfont:730
+#: standalone/drakfont:736
#, c-format
msgid "Selected All"
msgstr "全部选中"
-#: standalone/drakfont:733
+#: standalone/drakfont:739
#, c-format
msgid "Remove List"
msgstr "删除列表"
-#: standalone/drakfont:744 standalone/drakfont:763
+#: standalone/drakfont:750 standalone/drakfont:769
#, c-format
msgid "Importing fonts"
msgstr "导入字体"
-#: standalone/drakfont:748 standalone/drakfont:768
+#: standalone/drakfont:754 standalone/drakfont:774
#, c-format
msgid "Initial tests"
msgstr "初始测试"
-#: standalone/drakfont:749
+#: standalone/drakfont:755
#, c-format
msgid "Copy fonts on your system"
msgstr "复制系统中的字体"
-#: standalone/drakfont:750
+#: standalone/drakfont:756
#, c-format
msgid "Install & convert Fonts"
msgstr "安装并转换字体"
-#: standalone/drakfont:751
+#: standalone/drakfont:757
#, c-format
msgid "Post Install"
msgstr "安装后的设置"
-#: standalone/drakfont:769
+#: standalone/drakfont:775
#, c-format
msgid "Remove fonts on your system"
msgstr "删除系统中的字体"
-#: standalone/drakfont:770
+#: standalone/drakfont:776
#, c-format
msgid "Post Uninstall"
msgstr "删除后"
-#: standalone/drakgw:59 standalone/drakgw:190
+#: standalone/drakgw:58 standalone/drakgw:193
#, c-format
msgid "Internet Connection Sharing"
msgstr "共享互联网连接"
-#: standalone/drakgw:117 standalone/drakvpn:49
-#, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
-msgstr "对不起，我们只支持 2.4 及以上版本的内核。"
-
-#: standalone/drakgw:128
+#: standalone/drakgw:124
#, c-format
-msgid "Internet Connection Sharing currently enabled"
-msgstr "Internet 连接共享现在已经启用"
+msgid "Internet Connection Sharing currently disabled"
+msgstr "Internet 连接共享现在被禁用"
-#: standalone/drakgw:129
+#: standalone/drakgw:125
#, c-format
msgid ""
-"The setup of Internet Connection Sharing has already been done.\n"
-"It's currently enabled.\n"
+"The setup of Internet connection sharing has already been done.\n"
+"It's currently disabled.\n"
"\n"
"What would you like to do?"
msgstr ""
-"Internet 连接共享的设置已经完成。\n"
-"它当前已经被启用。\n"
+"Internet 连接共享的设定已经完成。\n"
+"它当前已经被禁用。\n"
"\n"
"您要做什么？"
-#: standalone/drakgw:133 standalone/drakvpn:99
+#: standalone/drakgw:129 standalone/drakvpn:125
#, c-format
-msgid "disable"
-msgstr "禁用"
+msgid "enable"
+msgstr "启用"
-#: standalone/drakgw:133 standalone/drakgw:162 standalone/drakvpn:99
+#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:99
#: standalone/drakvpn:125
#, c-format
msgid "reconfigure"
msgstr "重新配置"
-#: standalone/drakgw:133 standalone/drakgw:162 standalone/drakvpn:99
-#: standalone/drakvpn:125 standalone/drakvpn:372 standalone/drakvpn:731
+#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:99
+#: standalone/drakvpn:125 standalone/drakvpn:374 standalone/drakvpn:733
#, c-format
msgid "dismiss"
msgstr "放弃"
#: standalone/drakgw:136
#, c-format
-msgid "Disabling servers..."
-msgstr "正在禁用服务器..."
+msgid "Enabling servers..."
+msgstr "正在启用服务器..."
-#: standalone/drakgw:150
+#: standalone/drakgw:148
#, c-format
-msgid "Internet Connection Sharing is now disabled."
-msgstr "Internet 连接共享现在被禁用了。"
+msgid "Internet Connection Sharing is now enabled."
+msgstr "Internet 连接共享现已启用。"
-#: standalone/drakgw:157
+#: standalone/drakgw:151
#, c-format
-msgid "Internet Connection Sharing currently disabled"
-msgstr "Internet 连接共享现在被禁用"
+msgid "Internet Connection Sharing currently enabled"
+msgstr "Internet 连接共享现在已经启用"
-#: standalone/drakgw:158
+#: standalone/drakgw:152
#, c-format
msgid ""
-"The setup of Internet connection sharing has already been done.\n"
-"It's currently disabled.\n"
+"The setup of Internet Connection Sharing has already been done.\n"
+"It's currently enabled.\n"
"\n"
"What would you like to do?"
msgstr ""
-"Internet 连接共享的设定已经完成。\n"
-"它当前已经被禁用。\n"
+"Internet 连接共享的设置已经完成。\n"
+"它当前已经被启用。\n"
"\n"
"您要做什么？"
-#: standalone/drakgw:162 standalone/drakvpn:125
+#: standalone/drakgw:156 standalone/drakvpn:99
#, c-format
-msgid "enable"
-msgstr "启用"
+msgid "disable"
+msgstr "禁用"
-#: standalone/drakgw:169
+#: standalone/drakgw:159
#, c-format
-msgid "Enabling servers..."
-msgstr "正在启用服务器..."
+msgid "Disabling servers..."
+msgstr "正在禁用服务器..."
-#: standalone/drakgw:175
+#: standalone/drakgw:174
#, c-format
-msgid "Internet Connection Sharing is now enabled."
-msgstr "Internet 连接共享现已启用。"
+msgid "Internet Connection Sharing is now disabled."
+msgstr "Internet 连接共享现在被禁用了。"
-#: standalone/drakgw:191
+#: standalone/drakgw:194
#, c-format
msgid ""
"You are about to configure your computer to share its Internet connection.\n"
@@ -19230,46 +19320,27 @@ msgstr ""
"\n"
"注意: 您另外需要一块专用的网卡来设置局域网(LAN)。"
-#: standalone/drakgw:211 standalone/drakvpn:210
-#, c-format
-msgid ""
-"Please enter the name of the interface connected to the internet.\n"
-"\n"
-"Examples:\n"
-"\t\tppp+ for modem or DSL connections, \n"
-"\t\teth0, or eth1 for cable connection, \n"
-"\t\tippp+ for a isdn connection.\n"
-msgstr ""
-"请输入连接到互联网的网卡名称。\n"
-"\n"
-"例如:\n"
-"\t\tppp+ 代表调制解调器或 DSL 连接，\n"
-"\t\teth0 或 eth1 代表有线电视连接，\n"
-"\t\tippp+ 代表 ISDN 连接。\n"
-
-#: standalone/drakgw:230
+#: standalone/drakgw:237
#, c-format
msgid "Interface %s (using module %s)"
msgstr "网卡 %s(使用 %s 模块)"
-#: standalone/drakgw:231
+#: standalone/drakgw:238
#, c-format
msgid "Interface %s"
msgstr "网卡 %s"
-#: standalone/drakgw:241 standalone/drakpxe:138
+#: standalone/drakgw:247 standalone/drakpxe:137
#, c-format
-msgid ""
-"No ethernet network adapter has been detected on your system. Please run the "
-"hardware configuration tool."
-msgstr "您的系统里没有配置以太网卡。请运行硬件配置工具。"
+msgid "No network adapter on your system!"
+msgstr "您系统中没有网卡！"
-#: standalone/drakgw:247
+#: standalone/drakgw:254
#, c-format
msgid "Network interface"
msgstr "网卡"
-#: standalone/drakgw:248
+#: standalone/drakgw:255
#, c-format
msgid ""
"There is only one configured network adapter on your system:\n"
@@ -19284,19 +19355,19 @@ msgstr ""
"\n"
"对这块网卡配置您的局域网。"
-#: standalone/drakgw:255
+#: standalone/drakgw:262
#, c-format
msgid ""
"Please choose what network adapter will be connected to your Local Area "
"Network."
msgstr "请选择您将使用哪张网卡连接您的局域网。"
-#: standalone/drakgw:283
+#: standalone/drakgw:291
#, c-format
msgid "Network interface already configured"
msgstr "已完成网络配置"
-#: standalone/drakgw:284
+#: standalone/drakgw:292
#, c-format
msgid ""
"Warning, the network adapter (%s) is already configured.\n"
@@ -19311,27 +19382,27 @@ msgstr ""
"\n"
"如果您知道怎样做，也可以手工配置。"
-#: standalone/drakgw:289
+#: standalone/drakgw:297
#, c-format
msgid "Automatic reconfiguration"
msgstr "自动重新配置"
-#: standalone/drakgw:289
+#: standalone/drakgw:297
#, c-format
msgid "No (experts only)"
msgstr "无(仅对专家)"
-#: standalone/drakgw:290
+#: standalone/drakgw:298
#, c-format
msgid "Show current interface configuration"
msgstr "修改当前网络接口的配置"
-#: standalone/drakgw:291
+#: standalone/drakgw:299
#, c-format
msgid "Current interface configuration"
msgstr "当前接口配置"
-#: standalone/drakgw:292
+#: standalone/drakgw:300
#, c-format
msgid ""
"Current configuration of `%s':\n"
@@ -19348,7 +19419,7 @@ msgstr ""
"IP 属性: %s\n"
"其它: %s"
-#: standalone/drakgw:305
+#: standalone/drakgw:313
#, c-format
msgid ""
"I can keep your current configuration and assume you already set up a DHCP "
@@ -19373,12 +19444,12 @@ msgstr ""
"否则，我就会重新配置您的接口并重新为您配置 DHCP 服务器。\n"
"\n"
-#: standalone/drakgw:312
+#: standalone/drakgw:320
#, c-format
msgid "Local Network adress"
msgstr "本地网络地址"
-#: standalone/drakgw:316
+#: standalone/drakgw:324
#, c-format
msgid ""
"DHCP Server Configuration.\n"
@@ -19391,72 +19462,72 @@ msgstr ""
"在此您可以选择 DHCP 服务器配置的不同选项。\n"
"如果您不知道选项的含义，那么就不管它，不必进行修改。"
-#: standalone/drakgw:320
+#: standalone/drakgw:328
#, c-format
msgid "(This) DHCP Server IP"
msgstr "(此)DHCP 服务器 IP"
-#: standalone/drakgw:321
+#: standalone/drakgw:329
#, c-format
msgid "The DNS Server IP"
msgstr "DNS 服务器 IP"
-#: standalone/drakgw:322
+#: standalone/drakgw:330
#, c-format
msgid "The internal domain name"
msgstr "内部域名"
-#: standalone/drakgw:323
+#: standalone/drakgw:331
#, c-format
msgid "The DHCP start range"
msgstr "DHCP 起始范围"
-#: standalone/drakgw:324
+#: standalone/drakgw:332
#, c-format
msgid "The DHCP end range"
msgstr "DHCP 终止范围"
-#: standalone/drakgw:325
+#: standalone/drakgw:333
#, c-format
msgid "The default lease (in seconds)"
msgstr "默认租期(以秒为单位)"
-#: standalone/drakgw:326
+#: standalone/drakgw:334
#, c-format
msgid "The maximum lease (in seconds)"
msgstr "最长租期(以秒为单位)"
-#: standalone/drakgw:327
+#: standalone/drakgw:335
#, c-format
msgid "Re-configure interface and DHCP server"
msgstr "重新配置网卡和 DHCP 服务器"
-#: standalone/drakgw:334
+#: standalone/drakgw:342
#, c-format
msgid "The Local Network did not finish with `.0', bailing out."
msgstr "本地网络没有以“.0”结束，已经修改。"
-#: standalone/drakgw:344
+#: standalone/drakgw:352
#, c-format
msgid "Potential LAN address conflict found in current config of %s!\n"
msgstr "在当前的 %s 配置中发现可能的 LAN 地址冲突！\n"
-#: standalone/drakgw:354
+#: standalone/drakgw:362
#, c-format
msgid "Configuring..."
msgstr "正在配置..."
-#: standalone/drakgw:355
+#: standalone/drakgw:363
#, c-format
msgid "Configuring scripts, installing software, starting servers..."
msgstr "正在配置脚本，安装软件，启动服务程序 ..."
-#: standalone/drakgw:391 standalone/drakpxe:231 standalone/drakvpn:274
+#: standalone/drakgw:399 standalone/drakpxe:231 standalone/drakvpn:276
#, c-format
msgid "Problems installing package %s"
msgstr "安装 %s 软件包出现问题"
-#: standalone/drakgw:584
+#: standalone/drakgw:595
#, c-format
msgid ""
"Everything has been configured.\n"
@@ -19539,7 +19610,7 @@ msgstr "自定义和系统设置"
msgid "Editable"
msgstr "可编辑"
-#: standalone/drakperm:48 standalone/drakperm:315
+#: standalone/drakperm:48 standalone/drakperm:314
#, c-format
msgid "Path"
msgstr "路径"
@@ -19554,7 +19625,7 @@ msgstr "用户"
msgid "Group"
msgstr "组"
-#: standalone/drakperm:48 standalone/drakperm:327
+#: standalone/drakperm:48 standalone/drakperm:326
#, c-format
msgid "Permissions"
msgstr "权限"
@@ -19614,7 +19685,8 @@ msgstr "在末尾添加新的规则"
msgid "Delete selected rule"
msgstr "删除选中的规则"
-#: standalone/drakperm:125 standalone/drakvpn:329 standalone/drakvpn:690
+#: standalone/drakperm:125 standalone/drakups:281 standalone/drakups:330
+#: standalone/drakups:350 standalone/drakvpn:331 standalone/drakvpn:692
#: standalone/printerdrake:229
#, c-format
msgid "Edit"
@@ -19714,12 +19786,12 @@ msgstr "当前用户"
msgid "When checked, owner and group won't be changed"
msgstr "选中后，无法更改所有者和组"
-#: standalone/drakperm:301
+#: standalone/drakperm:300
#, c-format
msgid "Path selection"
msgstr "选择路径"
-#: standalone/drakperm:321
+#: standalone/drakperm:320
#, c-format
msgid "Property"
msgstr "属性"
@@ -19849,7 +19921,7 @@ msgstr "所有"
msgid "LOCAL"
msgstr "本地"
-#: standalone/draksec:44
+#: standalone/draksec:44 standalone/drakvpn:1144
#, c-format
msgid "default"
msgstr "默认"
@@ -19869,7 +19941,7 @@ msgstr "否"
msgid "yes"
msgstr "是"
-#: standalone/draksec:70
+#: standalone/draksec:81
#, c-format
msgid ""
"Here, you can setup the security level and administrator of your machine.\n"
@@ -19959,32 +20031,32 @@ msgstr ""
"乎\n"
"完全封闭，安全特性达到最高"
-#: standalone/draksec:118
+#: standalone/draksec:129
#, c-format
msgid "(default value: %s)"
msgstr "(默认值: %s)"
-#: standalone/draksec:159
+#: standalone/draksec:170
#, c-format
msgid "Security Level:"
msgstr "安全级别: "
-#: standalone/draksec:162
+#: standalone/draksec:173
#, c-format
msgid "Security Alerts:"
msgstr "安全警告: "
-#: standalone/draksec:166
+#: standalone/draksec:177
#, c-format
msgid "Security Administrator:"
msgstr "安全管理员: "
-#: standalone/draksec:168
+#: standalone/draksec:179
#, c-format
msgid "Basic options"
msgstr "基本选项"
-#: standalone/draksec:181
+#: standalone/draksec:192
#, c-format
msgid ""
"The following options can be set to customize your\n"
@@ -19993,27 +20065,27 @@ msgstr ""
"可以设置下列选项以自定义您的系统安全级别。如果您需要解释的话，请看一下帮"
"助。\n"
-#: standalone/draksec:183
+#: standalone/draksec:194
#, c-format
msgid "Network Options"
msgstr "网络选项"
-#: standalone/draksec:183
+#: standalone/draksec:194
#, c-format
msgid "System Options"
msgstr "系统选项"
-#: standalone/draksec:229
+#: standalone/draksec:240
#, c-format
msgid "Periodic Checks"
msgstr "定期检查"
-#: standalone/draksec:247
+#: standalone/draksec:258
#, c-format
msgid "Please wait, setting security level..."
msgstr "请稍候，正在设置安全级别..."
-#: standalone/draksec:253
+#: standalone/draksec:264
#, c-format
msgid "Please wait, setting security options..."
msgstr "请稍候，正在设置安全选项..."
@@ -20068,155 +20140,322 @@ msgstr ""
"要正常工作需要软件包 ImageMagick。\n"
"请单击“确定”安装 ImageMagick 或“取消”退出"
-#: standalone/draksplash:67
+#: standalone/draksplash:68
#, c-format
msgid "first step creation"
msgstr "第一步创建"
-#: standalone/draksplash:70
+#: standalone/draksplash:71
#, c-format
msgid "final resolution"
msgstr "最终分辨率"
-#: standalone/draksplash:71 standalone/draksplash:165
+#: standalone/draksplash:72
#, c-format
msgid "choose image file"
msgstr "选择图像文件"
-#: standalone/draksplash:72
+#: standalone/draksplash:73
#, c-format
msgid "Theme name"
msgstr "主题名称"
-#: standalone/draksplash:77
+#: standalone/draksplash:78
#, c-format
msgid "Browse"
msgstr "浏览"
-#: standalone/draksplash:87 standalone/draksplash:153
+#: standalone/draksplash:93 standalone/draksplash:158
#, c-format
msgid "Configure bootsplash picture"
msgstr "配置开机画面图片"
-#: standalone/draksplash:90
+#: standalone/draksplash:96
#, c-format
msgid ""
"x coordinate of text box\n"
"in number of characters"
msgstr "文本框的 X 坐标，按字符数计算"
-#: standalone/draksplash:91
+#: standalone/draksplash:97
#, c-format
msgid ""
"y coordinate of text box\n"
"in number of characters"
msgstr "文本框的 Y 坐标，按字符数计算"
-#: standalone/draksplash:92
+#: standalone/draksplash:98
#, c-format
msgid "text width"
msgstr "文本宽度"
-#: standalone/draksplash:93
+#: standalone/draksplash:99
#, c-format
msgid "text box height"
msgstr "文本框高度"
-#: standalone/draksplash:94
+#: standalone/draksplash:100
#, c-format
msgid ""
"the progress bar x coordinate\n"
"of its upper left corner"
msgstr "进度条的左上角的 X 坐标"
-#: standalone/draksplash:95
+#: standalone/draksplash:101
#, c-format
msgid ""
"the progress bar y coordinate\n"
"of its upper left corner"
msgstr "进度条的左上角的 Y 坐标"
-#: standalone/draksplash:96
+#: standalone/draksplash:102
#, c-format
msgid "the width of the progress bar"
msgstr "进度条的宽度"
-#: standalone/draksplash:97
+#: standalone/draksplash:103
#, c-format
msgid "the height of the progress bar"
msgstr "进度条的高度"
-#: standalone/draksplash:98
+#: standalone/draksplash:104
#, c-format
msgid "the color of the progress bar"
msgstr "进度条的颜色"
-#: standalone/draksplash:113
+#: standalone/draksplash:119
#, c-format
msgid "Preview"
msgstr "预览"
-#: standalone/draksplash:115
+#: standalone/draksplash:121
#, c-format
msgid "Save theme"
msgstr "保存主题"
-#: standalone/draksplash:116
+#: standalone/draksplash:122
#, c-format
msgid "Choose color"
msgstr "选择颜色"
-#: standalone/draksplash:119
+#: standalone/draksplash:125
#, c-format
msgid "Display logo on Console"
msgstr "在控制台显示 LOGO"
-#: standalone/draksplash:120
+#: standalone/draksplash:126
#, c-format
msgid "Make kernel message quiet by default"
msgstr "默认设定内核消息不显示"
-#: standalone/draksplash:156 standalone/draksplash:320
-#: standalone/draksplash:448
+#: standalone/draksplash:161 standalone/draksplash:319
+#: standalone/draksplash:462
#, c-format
msgid "Notice"
msgstr "注意"
-#: standalone/draksplash:156 standalone/draksplash:320
+#: standalone/draksplash:161 standalone/draksplash:319
#, c-format
msgid "This theme does not yet have a bootsplash in %s !"
msgstr "这个主题的 %s 里面还没有任何开机画面！"
-#: standalone/draksplash:162
+#: standalone/draksplash:167
#, c-format
msgid "choose image"
msgstr "选择图像"
-#: standalone/draksplash:204
+#: standalone/draksplash:209
#, c-format
msgid "saving Bootsplash theme..."
msgstr "保存开机画面主题..."
-#: standalone/draksplash:428
+#: standalone/draksplash:443
#, c-format
msgid "ProgressBar color selection"
msgstr "进度条颜色选择"
-#: standalone/draksplash:448
+#: standalone/draksplash:462
#, c-format
msgid "You must choose an image file first!"
msgstr "您必须先选择一个图像文件！"
-#: standalone/draksplash:453
+#: standalone/draksplash:467
#, c-format
msgid "Generating preview ..."
msgstr "正在生成预览..."
-#: standalone/draksplash:499
+#: standalone/draksplash:512
#, c-format
msgid "%s BootSplash (%s) preview"
msgstr "%s 启动画面(%s)预览"
+#: standalone/drakups:63
+#, c-format
+msgid "Connected through a serial port or an usb cable"
+msgstr "通过串口或 USB 电缆连接"
+
+#: standalone/drakups:69
+#, c-format
+msgid "Add an UPS device"
+msgstr "添加 UPS 设备"
+
+#: standalone/drakups:72
+#, c-format
+msgid ""
+"Welcome to the UPS configuration utility.\n"
+"\n"
+"Here, you'll be add a new UPS to your system.\n"
+msgstr ""
+"欢迎使用 UPS 配置工具。\n"
+"\n"
+"在这里您可以为系统添加一台新的 UPS。\n"
+
+#: standalone/drakups:79
+#, c-format
+msgid ""
+"We're going to add an UPS device.\n"
+"\n"
+"Do you prefer autodetect UPS devices connected to this machine or ?"
+msgstr ""
+"现在即将添加 UPS 设备。\n\n"
+"您是否想要自动检测连接到本机的 UPS 设备？"
+
+#: standalone/drakups:82
+#, c-format
+msgid "Autodetection"
+msgstr "自动检测"
+
+#: standalone/drakups:90 standalone/harddrake2:134
+#, c-format
+msgid "Detection in progress"
+msgstr "检测进行中"
+
+#: standalone/drakups:108 standalone/drakups:144 standalone/logdrake:479
+#: standalone/logdrake:485
+#, c-format
+msgid "Congratulations"
+msgstr "恭喜"
+
+#: standalone/drakups:109
+#, c-format
+msgid "The wizard successfully added the following UPS devices:"
+msgstr "向导已经成功添加了下列 UPS 设备:"
+
+#: standalone/drakups:111
+#, c-format
+msgid "No new UPS devices was found"
+msgstr "没有发现新的 UPS 设备"
+
+#: standalone/drakups:116 standalone/drakups:128
+#, c-format
+msgid "UPS driver configuration"
+msgstr "UPS 驱动程序配置"
+
+#: standalone/drakups:116
+#, c-format
+msgid "Please select your UPS model."
+msgstr "请选择您 UPS 的型号。"
+
+#: standalone/drakups:117
+#, c-format
+msgid "Manufacturer / Model:"
+msgstr "厂家/型号:"
+
+#: standalone/drakups:128
+#, c-format
+msgid ""
+"We are configuring the \"%s\" UPS from \"%s\".\n"
+"Please fill in its name, its driver and its port."
+msgstr ""
+"正在配置“%2$s”的“%1$s”。\n"
+"请填入其名称，其驱动程序和其端口。"
+
+#: standalone/drakups:133
+#, c-format
+msgid "Name:"
+msgstr "名称:"
+
+#: standalone/drakups:133
+#, c-format
+msgid "The name of your ups"
+msgstr "UPS 的名称"
+
+#: standalone/drakups:134
+#, c-format
+msgid "The driver that manage your ups"
+msgstr "管理您 UPS 的驱动程序"
+
+#: standalone/drakups:135
+#, c-format
+msgid "Port:"
+msgstr "端口:"
+
+#: standalone/drakups:137
+#, c-format
+msgid "The port on which is connected your ups"
+msgstr "连接您 UPS 的端口"
+
+#: standalone/drakups:144
+#, c-format
+msgid "The wizard successfully configured the new \"%s\" UPS device."
+msgstr "向导已经成功配置了“%s”UPS 设备。"
+
+#: standalone/drakups:232
+#, c-format
+msgid "UPS devices"
+msgstr "UPS 服务"
+
+#: standalone/drakups:233 standalone/drakups:251 standalone/drakups:266
+#: standalone/harddrake2:63
+#, c-format
+msgid "Name"
+msgstr "名称"
+
+#: standalone/drakups:250
+#, c-format
+msgid "UPS users"
+msgstr "UPS 用户"
+
+#: standalone/drakups:265
+#, c-format
+msgid "Access Control Lists"
+msgstr "访问控制列表"
+
+#: standalone/drakups:266
+#, c-format
+msgid "IP mask"
+msgstr "IP 掩码"
+
+#: standalone/drakups:277
+#, c-format
+msgid "Rules"
+msgstr "规则 "
+
+#: standalone/drakups:278
+#, c-format
+msgid "Action"
+msgstr "操作"
+
+#: standalone/drakups:278 standalone/drakvpn:1144 standalone/harddrake2:57
+#, c-format
+msgid "Level"
+msgstr "级别"
+
+#: standalone/drakups:278
+#, c-format
+msgid "ACL name"
+msgstr "ACL 名称"
+
+#: standalone/drakups:297 standalone/drakups:301 standalone/drakups:310
+#, c-format
+msgid "DrakUPS"
+msgstr "DrakUPS"
+
+#: standalone/drakups:307
+#, c-format
+msgid "Welcome to the UPS configuration tools"
+msgstr "欢迎使用 UPS 配置工具"
+
#: standalone/drakvpn:71
#, c-format
msgid "DrakVPN"
@@ -20282,7 +20521,7 @@ msgstr "正在启用 VPN..."
msgid "The VPN connection is now enabled."
msgstr "VPN 连接现已启用。"
-#: standalone/drakvpn:153 standalone/drakvpn:179
+#: standalone/drakvpn:153 standalone/drakvpn:181
#, c-format
msgid "Simple VPN setup."
msgstr "简单的 VPN 设置。"
@@ -20312,7 +20551,7 @@ msgstr ""
"在您继续进行之前，请先确定您已经通过“Drak 连接”配置了您的网络/Internet\n"
"访问。"
-#: standalone/drakvpn:180
+#: standalone/drakvpn:182
#, c-format
msgid ""
"VPN connection.\n"
@@ -20338,12 +20577,12 @@ msgstr ""
"\n"
"在继续进行之前，请至少阅读 ipsec-howto 文档。"
-#: standalone/drakvpn:192
+#: standalone/drakvpn:194
#, c-format
msgid "Kernel module."
msgstr "内核模块。"
-#: standalone/drakvpn:193
+#: standalone/drakvpn:195
#, c-format
msgid ""
"The kernel need to have ipsec support.\n"
@@ -20358,22 +20597,22 @@ msgstr ""
"\n"
"此内核拥有“%s”支持。"
-#: standalone/drakvpn:288
+#: standalone/drakvpn:290
#, c-format
msgid "Security Policies"
msgstr "安全策略"
-#: standalone/drakvpn:288
+#: standalone/drakvpn:290
#, c-format
msgid "IKE daemon racoon"
msgstr "IKE 守护程序 racoon"
-#: standalone/drakvpn:291 standalone/drakvpn:302
+#: standalone/drakvpn:293 standalone/drakvpn:304
#, c-format
msgid "Configuration file"
msgstr "配置文件"
-#: standalone/drakvpn:292
+#: standalone/drakvpn:294
#, c-format
msgid ""
"Configuration step !\n"
@@ -20391,7 +20630,7 @@ msgstr ""
"\n"
"您想要配置什么？\n"
-#: standalone/drakvpn:303
+#: standalone/drakvpn:305
#, c-format
msgid ""
"Next, we will configure the %s file.\n"
@@ -20404,12 +20643,12 @@ msgstr ""
"\n"
"只需点击下一步。\n"
-#: standalone/drakvpn:321 standalone/drakvpn:681
+#: standalone/drakvpn:323 standalone/drakvpn:683
#, c-format
msgid "%s entries"
msgstr "%s 项"
-#: standalone/drakvpn:322
+#: standalone/drakvpn:324
#, c-format
msgid ""
"The %s file contents\n"
@@ -20431,23 +20670,27 @@ msgstr ""
"\n"
"您想要做什么?\n"
-#: standalone/drakvpn:329 standalone/drakvpn:690
+#: standalone/drakvpn:331 standalone/drakvpn:692
#, c-format
-msgid "Display"
+msgid ""
+"_:display here is a verb\n"
+"Display"
msgstr "显示"
-#: standalone/drakvpn:329 standalone/drakvpn:690
+#: standalone/drakvpn:331 standalone/drakvpn:692
#, c-format
msgid "Commit"
msgstr "提交"
-#: standalone/drakvpn:343 standalone/drakvpn:347 standalone/drakvpn:705
-#: standalone/drakvpn:709
+#: standalone/drakvpn:345 standalone/drakvpn:349 standalone/drakvpn:707
+#: standalone/drakvpn:711
#, c-format
-msgid "Display configuration"
+msgid ""
+"_:display here is a verb\n"
+"Display configuration"
msgstr "显示配置"
-#: standalone/drakvpn:348
+#: standalone/drakvpn:350
#, c-format
msgid ""
"The %s file does not exist.\n"
@@ -20462,12 +20705,12 @@ msgstr ""
"\n"
"您需要回退，并选择“添加”。\n"
-#: standalone/drakvpn:364
+#: standalone/drakvpn:366
#, c-format
msgid "ipsec.conf entries"
msgstr "ipsec.conf 项"
-#: standalone/drakvpn:365
+#: standalone/drakvpn:367
#, c-format
msgid ""
"The %s file contains different sections.\n"
@@ -20481,28 +20724,38 @@ msgid ""
"\n"
"Choose the section you would like to add.\n"
msgstr ""
+"%s 文件包含不同的区段。\n"
+"\n"
+"这里仅仅是其中之一：\t'config setup' \n"
+"\t\t\t\t\t'conn default' \n"
+"\t\t\t\t\t'normal1'\n"
+"\t\t\t\t\t'normal2' \n"
+"\n"
+"您现在可以添加这些区段之一。\n"
+"\n"
+"请选择您想要添加的区段。\n"
-#: standalone/drakvpn:372
+#: standalone/drakvpn:374
#, c-format
msgid "config setup"
-msgstr "配置设置"
+msgstr "config setup"
-#: standalone/drakvpn:372
-#, fuzzy, c-format
+#: standalone/drakvpn:374
+#, c-format
msgid "conn %default"
-msgstr "默认"
+msgstr "conn %default"
-#: standalone/drakvpn:372
+#: standalone/drakvpn:374
#, c-format
msgid "normal conn"
-msgstr "普通连接"
+msgstr "normal conn"
-#: standalone/drakvpn:378 standalone/drakvpn:419 standalone/drakvpn:506
+#: standalone/drakvpn:380 standalone/drakvpn:421 standalone/drakvpn:508
#, c-format
msgid "Exists !"
msgstr "已经存在!"
-#: standalone/drakvpn:379 standalone/drakvpn:420
+#: standalone/drakvpn:381 standalone/drakvpn:422
#, c-format
msgid ""
"A section with this name already exists.\n"
@@ -20516,7 +20769,7 @@ msgstr ""
"\n"
"您应该回退并添加另外一个区段，或者更改其名称。\n"
-#: standalone/drakvpn:396
+#: standalone/drakvpn:398
#, c-format
msgid ""
"This section has to be on top of your\n"
@@ -20533,37 +20786,37 @@ msgstr ""
"\n"
"当您完成后，请选择继续。或者后退到上一步。\n"
-#: standalone/drakvpn:401
-#, fuzzy, c-format
+#: standalone/drakvpn:403
+#, c-format
msgid "interfaces"
-msgstr "网卡"
+msgstr "interfaces"
-#: standalone/drakvpn:402
+#: standalone/drakvpn:404
#, c-format
msgid "klipsdebug"
-msgstr ""
+msgstr "klipsdebug"
-#: standalone/drakvpn:403
+#: standalone/drakvpn:405
#, c-format
msgid "plutodebug"
-msgstr ""
+msgstr "plutodebug"
-#: standalone/drakvpn:404
+#: standalone/drakvpn:406
#, c-format
msgid "plutoload"
-msgstr ""
+msgstr "plutoload"
-#: standalone/drakvpn:405
+#: standalone/drakvpn:407
#, c-format
msgid "plutostart"
-msgstr ""
+msgstr "plutostart"
-#: standalone/drakvpn:406
+#: standalone/drakvpn:408
#, c-format
msgid "uniqueids"
-msgstr ""
+msgstr "uniqueids"
-#: standalone/drakvpn:440
+#: standalone/drakvpn:442
#, c-format
msgid ""
"This is the first section after the config\n"
@@ -20575,102 +20828,111 @@ msgid ""
"them here, globally, you can define them in each\n"
"section.\n"
msgstr ""
+"这是 config setup 区段后的第一个区段。\n"
+"\n"
+"您可在此定义默认设置。所有其它区段都跟在此区段\n"
+"之后。剩下的设置都是可选的。如果您不想在此定义\n"
+"全局定义，您还可以在每个区段中分别定义。\n"
-#: standalone/drakvpn:447
+#: standalone/drakvpn:449
#, c-format
-msgid "pfs"
-msgstr ""
+msgid "PFS"
+msgstr "PFS"
-#: standalone/drakvpn:448
+#: standalone/drakvpn:450
#, c-format
msgid "keyingtries"
-msgstr ""
+msgstr "keyingtries"
-#: standalone/drakvpn:449
+#: standalone/drakvpn:451
#, c-format
msgid "compress"
-msgstr ""
+msgstr "compress"
-#: standalone/drakvpn:450
+#: standalone/drakvpn:452
#, c-format
msgid "disablearrivalcheck"
-msgstr ""
+msgstr "disablearrivalcheck"
-#: standalone/drakvpn:451 standalone/drakvpn:490
-#, fuzzy, c-format
+#: standalone/drakvpn:453 standalone/drakvpn:492
+#, c-format
msgid "left"
-msgstr "删除"
+msgstr "left"
-#: standalone/drakvpn:452 standalone/drakvpn:491
+#: standalone/drakvpn:454 standalone/drakvpn:493
#, c-format
msgid "leftcert"
-msgstr ""
+msgstr "leftcert"
-#: standalone/drakvpn:453 standalone/drakvpn:492
+#: standalone/drakvpn:455 standalone/drakvpn:494
#, c-format
msgid "leftrsasigkey"
-msgstr ""
+msgstr "leftrsasigkey"
-#: standalone/drakvpn:454 standalone/drakvpn:493
+#: standalone/drakvpn:456 standalone/drakvpn:495
#, c-format
msgid "leftsubnet"
-msgstr ""
+msgstr "leftsubnet"
-#: standalone/drakvpn:455 standalone/drakvpn:494
+#: standalone/drakvpn:457 standalone/drakvpn:496
#, c-format
msgid "leftnexthop"
-msgstr ""
+msgstr "leftnexthop"
-#: standalone/drakvpn:484
-#, c-format
+#: standalone/drakvpn:486
+#, fuzzy, c-format
msgid ""
"Your %s file has several sections, or connections.\n"
"\n"
"You can now add a new section.\n"
"Choose continue when you are done to write the data.\n"
msgstr ""
+"您的 %s 文件已经有几个区段或连接了。\n"
+"\n"
+"您现在可以添加一个新的区段。\n"
+"当您准备好写入数据后，请选择继续。\n"
-#: standalone/drakvpn:487
-#, fuzzy, c-format
+#: standalone/drakvpn:489
+#, c-format
msgid "section name"
-msgstr "连接名称"
+msgstr "区段名称"
-#: standalone/drakvpn:488
-#, fuzzy, c-format
+#: standalone/drakvpn:490
+#, c-format
msgid "authby"
-msgstr "路径"
+msgstr "authby"
-#: standalone/drakvpn:489
-#, fuzzy, c-format
+#: standalone/drakvpn:491
+#, c-format
msgid "auto"
msgstr "自动"
-#: standalone/drakvpn:495
-#, fuzzy, c-format
+#: standalone/drakvpn:497
+#, c-format
msgid "right"
-msgstr "高"
+msgstr "right"
-#: standalone/drakvpn:496
-#, fuzzy, c-format
+#: standalone/drakvpn:498
+#, c-format
msgid "rightcert"
-msgstr "更高"
+msgstr "rightcert"
-#: standalone/drakvpn:497
+#: standalone/drakvpn:499
#, c-format
msgid "rightrsasigkey"
-msgstr ""
+msgstr "rightrsasigkey"
-#: standalone/drakvpn:498
+#: standalone/drakvpn:500
#, c-format
msgid "rightsubnet"
-msgstr ""
+msgstr "rightsubnet"
-#: standalone/drakvpn:499
+#: standalone/drakvpn:501
#, c-format
msgid "rightnexthop"
-msgstr ""
+msgstr "rightnexthop"
-#: standalone/drakvpn:507
+#: standalone/drakvpn:509
#, c-format
msgid ""
"A section with this name already exists.\n"
@@ -20679,9 +20941,13 @@ msgid ""
"You'll have to go back and add another section\n"
"or change the name of the section.\n"
msgstr ""
+"已经存在此名称的区段。\n"
+"名称区段应该唯一。\n"
+"\n"
+"您应该回退并添加另外一个区段，或者更改其名称。\n"
-#: standalone/drakvpn:539
-#, c-format
+#: standalone/drakvpn:541
+#, fuzzy, c-format
msgid ""
"Add a Security Policy.\n"
"\n"
@@ -20689,34 +20955,42 @@ msgid ""
"\n"
"Choose continue when you are done to write the data.\n"
msgstr ""
+"添加安全策略。\n"
+"\n"
+"您现在可以添加安全策略。\n"
+"\n"
+"当您准备好写入数据后，请选择继续。\n"
-#: standalone/drakvpn:572 standalone/drakvpn:822
+#: standalone/drakvpn:574 standalone/drakvpn:824
#, c-format
msgid "Edit section"
msgstr "编辑选中项"
-#: standalone/drakvpn:573
-#, c-format
+#: standalone/drakvpn:575
+#, fuzzy, c-format
msgid ""
"Your %s file has several sections or connections.\n"
"\n"
"You can choose here below the one you want to edit \n"
"and then click on next.\n"
msgstr ""
+"您的 %s 文件已经有几个区段或连接了。\n"
+"\n"
+"您可以下面选择想要编辑的区段，然后点击下一步。\n"
-#: standalone/drakvpn:576 standalone/drakvpn:656 standalone/drakvpn:827
-#: standalone/drakvpn:873
+#: standalone/drakvpn:578 standalone/drakvpn:658 standalone/drakvpn:829
+#: standalone/drakvpn:875
#, c-format
msgid "Section names"
msgstr "区段名称"
-#: standalone/drakvpn:586
+#: standalone/drakvpn:588
#, c-format
msgid "Can't edit !"
msgstr "无法编辑！"
-#: standalone/drakvpn:587
-#, c-format
+#: standalone/drakvpn:589
+#, fuzzy, c-format
msgid ""
"You cannot edit this section.\n"
"\n"
@@ -20725,8 +20999,12 @@ msgid ""
"of the %s file, and eventually, disable or\n"
"enable the oportunistic encryption.\n"
msgstr ""
+"您不能编辑此区段。\n"
+"\n"
+"此区段是 Freswan 2.X 必须的。\n"
+"您必须在 %s 文件顶部指定版本 2.0，并且"
-#: standalone/drakvpn:596
+#: standalone/drakvpn:598
#, c-format
msgid ""
"Your %s file has several sections.\n"
@@ -20735,7 +21013,7 @@ msgid ""
"Choose continue when you are done to write the data.\n"
msgstr ""
-#: standalone/drakvpn:607
+#: standalone/drakvpn:609
#, c-format
msgid ""
"Your %s file has several sections or connections.\n"
@@ -20744,7 +21022,7 @@ msgid ""
"Choose continue when you are done to write the data.\n"
msgstr ""
-#: standalone/drakvpn:620
+#: standalone/drakvpn:622
#, c-format
msgid ""
"Your %s file has several sections or connections.\n"
@@ -20754,7 +21032,7 @@ msgid ""
"Choose continue when you are done to write the data.\n"
msgstr ""
-#: standalone/drakvpn:641
+#: standalone/drakvpn:643
#, c-format
msgid ""
"Edit a Security Policy.\n"
@@ -20764,12 +21042,12 @@ msgid ""
"Choose continue when you are done to write the data.\n"
msgstr ""
-#: standalone/drakvpn:652 standalone/drakvpn:869
+#: standalone/drakvpn:654 standalone/drakvpn:871
#, c-format
msgid "Remove section"
msgstr "删除选中项"
-#: standalone/drakvpn:653 standalone/drakvpn:870
+#: standalone/drakvpn:655 standalone/drakvpn:872
#, c-format
msgid ""
"Your %s file has several sections or connections.\n"
@@ -20778,7 +21056,7 @@ msgid ""
"and then click on next.\n"
msgstr ""
-#: standalone/drakvpn:682
+#: standalone/drakvpn:684
#, c-format
msgid ""
"The racoon.conf file configuration.\n"
@@ -20792,7 +21070,7 @@ msgid ""
" - commit \t\t (writes the changes to the real file)"
msgstr ""
-#: standalone/drakvpn:710
+#: standalone/drakvpn:712
#, c-format
msgid ""
"The %s file does not exist\n"
@@ -20802,12 +21080,12 @@ msgid ""
"You'll have to go back and choose configure.\n"
msgstr ""
-#: standalone/drakvpn:724
+#: standalone/drakvpn:726
#, c-format
msgid "racoonf.conf entries"
msgstr "racoonf.conf 项"
-#: standalone/drakvpn:725
+#: standalone/drakvpn:727
#, c-format
msgid ""
"The 'add' sections step.\n"
@@ -20820,22 +21098,22 @@ msgid ""
"Choose the section you would like to add.\n"
msgstr ""
-#: standalone/drakvpn:731
+#: standalone/drakvpn:733
#, c-format
msgid "path"
msgstr "路径"
-#: standalone/drakvpn:731
+#: standalone/drakvpn:733
#, c-format
msgid "remote"
msgstr "远程"
-#: standalone/drakvpn:731
-#, fuzzy, c-format
+#: standalone/drakvpn:733
+#, c-format
msgid "sainfo"
-msgstr "西班牙"
+msgstr "sainfo"
-#: standalone/drakvpn:739
+#: standalone/drakvpn:741
#, c-format
msgid ""
"The 'add path' section step.\n"
@@ -20845,12 +21123,12 @@ msgid ""
"Put your mouse over the certificate entry to obtain online help."
msgstr ""
-#: standalone/drakvpn:742
+#: standalone/drakvpn:744
#, c-format
msgid "path type"
msgstr "路径类型"
-#: standalone/drakvpn:746
+#: standalone/drakvpn:748
#, c-format
msgid ""
"path include path : specifies a path to include\n"
@@ -20874,12 +21152,12 @@ msgid ""
"Pre-shared key authentication method in phase 1."
msgstr ""
-#: standalone/drakvpn:766
+#: standalone/drakvpn:768 standalone/drakvpn:861
#, c-format
msgid "real file"
-msgstr "实际文件"
+msgstr "真实文件"
-#: standalone/drakvpn:789
+#: standalone/drakvpn:791
#, c-format
msgid ""
"Make sure you already have the path sections\n"
@@ -20889,7 +21167,7 @@ msgid ""
"Choose continue or previous when you are done.\n"
msgstr ""
-#: standalone/drakvpn:806
+#: standalone/drakvpn:808
#, fuzzy, c-format
msgid ""
"Make sure you already have the path sections\n"
@@ -20904,7 +21182,7 @@ msgstr ""
"\n"
"当您完成后，请选择继续。或者后退到上一步。\n"
-#: standalone/drakvpn:823
+#: standalone/drakvpn:825
#, c-format
msgid ""
"Your %s file has several sections or connections.\n"
@@ -20913,7 +21191,7 @@ msgid ""
"to edit and then click on next.\n"
msgstr ""
-#: standalone/drakvpn:834
+#: standalone/drakvpn:836
#, c-format
msgid ""
"Your %s file has several sections.\n"
@@ -20924,7 +21202,7 @@ msgid ""
"Choose continue when you are done to write the data.\n"
msgstr ""
-#: standalone/drakvpn:843
+#: standalone/drakvpn:845
#, c-format
msgid ""
"Your %s file has several sections.\n"
@@ -20934,7 +21212,7 @@ msgid ""
"Choose continue when you are done to write the data."
msgstr ""
-#: standalone/drakvpn:851
+#: standalone/drakvpn:853
#, c-format
msgid ""
"This section has to be on top of your\n"
@@ -20948,17 +21226,12 @@ msgid ""
"Choose continue or previous when you are done.\n"
msgstr ""
-#: standalone/drakvpn:858
+#: standalone/drakvpn:860
#, c-format
msgid "path_type"
msgstr ""
-#: standalone/drakvpn:859
-#, fuzzy, c-format
-msgid "real_file"
-msgstr "选择文件"
-
-#: standalone/drakvpn:899
+#: standalone/drakvpn:901
#, c-format
msgid ""
"Everything has been configured.\n"
@@ -20970,12 +21243,12 @@ msgid ""
"section is configured."
msgstr ""
-#: standalone/drakvpn:919
+#: standalone/drakvpn:921
#, c-format
msgid "Sainfo source address"
-msgstr ""
+msgstr "Sainfo 源地址"
-#: standalone/drakvpn:920
+#: standalone/drakvpn:922
#, c-format
msgid ""
"sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -20998,12 +21271,12 @@ msgid ""
"\t172.16.1.0/24 is the source address"
msgstr ""
-#: standalone/drakvpn:937
-#, fuzzy, c-format
+#: standalone/drakvpn:939
+#, c-format
msgid "Sainfo source protocol"
-msgstr "欧洲协议"
+msgstr "Sainfo 源协议"
-#: standalone/drakvpn:938
+#: standalone/drakvpn:940
#, c-format
msgid ""
"sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21023,12 +21296,12 @@ msgid ""
"\tthe first 'any' allows any protocol for the source"
msgstr ""
-#: standalone/drakvpn:952
+#: standalone/drakvpn:954
#, c-format
msgid "Sainfo destination address"
-msgstr ""
+msgstr "Sainfo 目的地址"
-#: standalone/drakvpn:953
+#: standalone/drakvpn:955
#, c-format
msgid ""
"sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21051,12 +21324,12 @@ msgid ""
"\t172.16.2.0/24 is the destination address"
msgstr ""
-#: standalone/drakvpn:970
-#, fuzzy, c-format
+#: standalone/drakvpn:972
+#, c-format
msgid "Sainfo destination protocol"
-msgstr "Windows 迁移工具"
+msgstr "Sainfo 目的协议"
-#: standalone/drakvpn:971
+#: standalone/drakvpn:973
#, c-format
msgid ""
"sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21076,12 +21349,12 @@ msgid ""
"\tthe last 'any' allows any protocol for the destination"
msgstr ""
-#: standalone/drakvpn:985
+#: standalone/drakvpn:987
#, c-format
msgid "PFS group"
-msgstr ""
+msgstr "PFS 组"
-#: standalone/drakvpn:987
+#: standalone/drakvpn:989
#, c-format
msgid ""
"define the group of Diffie-Hellman exponentiations.\n"
@@ -21091,12 +21364,12 @@ msgid ""
"Or you can define 1, 2, or 5 as the DH group number."
msgstr ""
-#: standalone/drakvpn:992
+#: standalone/drakvpn:994
#, fuzzy, c-format
msgid "Lifetime number"
msgstr "一个数字"
-#: standalone/drakvpn:993
+#: standalone/drakvpn:995
#, c-format
msgid ""
"define a lifetime of a certain time which will be pro-\n"
@@ -21117,12 +21390,12 @@ msgid ""
"So, here, the lifetime numbers are 1, 1, 30, 30, 60 and 12.\n"
msgstr ""
-#: standalone/drakvpn:1009
+#: standalone/drakvpn:1011
#, c-format
msgid "Lifetime unit"
msgstr ""
-#: standalone/drakvpn:1011
+#: standalone/drakvpn:1013
#, c-format
msgid ""
"define a lifetime of a certain time which will be pro-\n"
@@ -21144,27 +21417,32 @@ msgid ""
"'hour'.\n"
msgstr ""
-#: standalone/drakvpn:1027 standalone/drakvpn:1112
+#: standalone/drakvpn:1029 standalone/drakvpn:1114
#, c-format
msgid "Encryption algorithm"
msgstr "加密算法"
-#: standalone/drakvpn:1029
+#: standalone/drakvpn:1031
#, c-format
msgid "Authentication algorithm"
msgstr "身份认证算法"
-#: standalone/drakvpn:1031
+#: standalone/drakvpn:1033
#, c-format
msgid "Compression algorithm"
-msgstr ""
+msgstr "压缩算法"
-#: standalone/drakvpn:1039
+#: standalone/drakvpn:1034
#, fuzzy, c-format
+msgid "deflate"
+msgstr "默认"
+
+#: standalone/drakvpn:1041
+#, c-format
msgid "Remote"
-msgstr "删除"
+msgstr "远程"
-#: standalone/drakvpn:1040
+#: standalone/drakvpn:1042
#, c-format
msgid ""
"remote (address | anonymous) [[port]] { statements }\n"
@@ -21179,12 +21457,12 @@ msgid ""
"remote ::1 [8000]"
msgstr ""
-#: standalone/drakvpn:1048
-#, fuzzy, c-format
+#: standalone/drakvpn:1050
+#, c-format
msgid "Exchange mode"
-msgstr "拨号模式"
+msgstr "交换模式"
-#: standalone/drakvpn:1050
+#: standalone/drakvpn:1052
#, c-format
msgid ""
"defines the exchange mode for phase 1 when racoon is the\n"
@@ -21195,12 +21473,22 @@ msgid ""
"racoon uses when it is the initiator.\n"
msgstr ""
-#: standalone/drakvpn:1056
-#, fuzzy, c-format
+#: standalone/drakvpn:1058
+#, c-format
msgid "Generate policy"
-msgstr "安全"
+msgstr "生成策略"
-#: standalone/drakvpn:1058
+#: standalone/drakvpn:1059 standalone/drakvpn:1075 standalone/drakvpn:1088
+#, c-format
+msgid "off"
+msgstr ""
+
+#: standalone/drakvpn:1059 standalone/drakvpn:1075 standalone/drakvpn:1088
+#, fuzzy, c-format
+msgid "on"
+msgstr "下移"
+
+#: standalone/drakvpn:1060
#, c-format
msgid ""
"This directive is for the responder. Therefore you\n"
@@ -21219,12 +21507,12 @@ msgid ""
"the initiator case. The default value is off."
msgstr ""
-#: standalone/drakvpn:1072
-#, fuzzy, c-format
+#: standalone/drakvpn:1074
+#, c-format
msgid "Passive"
-msgstr "巴勒斯坦"
+msgstr "被动"
-#: standalone/drakvpn:1074
+#: standalone/drakvpn:1076
#, c-format
msgid ""
"If you do not want to initiate the negotiation, set this\n"
@@ -21232,59 +21520,59 @@ msgid ""
"server."
msgstr ""
-#: standalone/drakvpn:1077
+#: standalone/drakvpn:1079
#, c-format
msgid "Certificate type"
-msgstr ""
+msgstr "证书类型"
-#: standalone/drakvpn:1079
-#, fuzzy, c-format
+#: standalone/drakvpn:1081
+#, c-format
msgid "My certfile"
-msgstr "选择文件"
+msgstr "我的证书"
-#: standalone/drakvpn:1080
-#, fuzzy, c-format
+#: standalone/drakvpn:1082
+#, c-format
msgid "Name of the certificate"
-msgstr "打印机名称"
+msgstr "证书名称"
-#: standalone/drakvpn:1081
+#: standalone/drakvpn:1083
#, c-format
msgid "My private key"
-msgstr ""
+msgstr "我的私钥"
-#: standalone/drakvpn:1082
-#, fuzzy, c-format
+#: standalone/drakvpn:1084
+#, c-format
msgid "Name of the private key"
-msgstr "打印机名称"
+msgstr "私钥名称"
-#: standalone/drakvpn:1083
+#: standalone/drakvpn:1085
#, fuzzy, c-format
msgid "Peers certfile"
msgstr "选择文件"
-#: standalone/drakvpn:1084
+#: standalone/drakvpn:1086
#, c-format
msgid "Name of the peers certificate"
msgstr ""
-#: standalone/drakvpn:1085
-#, fuzzy, c-format
+#: standalone/drakvpn:1087
+#, c-format
msgid "Verify cert"
-msgstr "比较重要"
+msgstr "校验证书"
-#: standalone/drakvpn:1087
+#: standalone/drakvpn:1089
#, 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:1089
+#: standalone/drakvpn:1091
#, c-format
msgid "My identifier"
msgstr ""
-#: standalone/drakvpn:1090
+#: standalone/drakvpn:1092
#, c-format
msgid ""
"specifies the identifier sent to the remote host and the\n"
@@ -21311,17 +21599,17 @@ msgid ""
"my_identifier user_fqdn \"myemail@mydomain.com\""
msgstr ""
-#: standalone/drakvpn:1110
+#: standalone/drakvpn:1112
#, fuzzy, c-format
msgid "Peers identifier"
msgstr "打印机"
-#: standalone/drakvpn:1111
+#: standalone/drakvpn:1113
#, fuzzy, c-format
msgid "Proposal"
msgstr "协议"
-#: standalone/drakvpn:1113
+#: standalone/drakvpn:1115
#, c-format
msgid ""
"specify the encryption algorithm used for the\n"
@@ -21333,70 +21621,108 @@ msgid ""
"For other transforms, this statement should not be used."
msgstr ""
-#: standalone/drakvpn:1120
+#: standalone/drakvpn:1122
#, c-format
msgid "Hash algorithm"
msgstr "哈希算法"
-#: standalone/drakvpn:1121
+#: standalone/drakvpn:1123
#, c-format
msgid "Authentication method"
msgstr "身份验证方式"
-#: standalone/drakvpn:1122
+#: standalone/drakvpn:1124
#, c-format
msgid "DH group"
msgstr "DH 组"
-#: standalone/drakvpn:1129
+#: standalone/drakvpn:1131
#, c-format
msgid "Command"
msgstr "命令"
-#: standalone/drakvpn:1130
+#: standalone/drakvpn:1132
#, c-format
msgid "Source IP range"
-msgstr ""
+msgstr "源 IP 范围"
-#: standalone/drakvpn:1131
+#: standalone/drakvpn:1133
#, c-format
msgid "Destination IP range"
-msgstr ""
+msgstr "目的 IP 范围"
-#: standalone/drakvpn:1132
-#, fuzzy, c-format
+#: standalone/drakvpn:1134
+#, c-format
msgid "Upper-layer protocol"
-msgstr "欧洲协议"
+msgstr "上层协议"
-#: standalone/drakvpn:1133
+# ui/evolution-calendar.xml.h:11
+# ui/evolution-calendar.xml.h:11
+# ui/evolution-calendar.xml.h:11
+#: standalone/drakvpn:1134 standalone/drakvpn:1141
+#, c-format
+msgid "any"
+msgstr "any"
+
+#: standalone/drakvpn:1136
#, c-format
msgid "Flag"
msgstr "标志"
-#: standalone/drakvpn:1134
+#: standalone/drakvpn:1137
#, c-format
msgid "Direction"
msgstr "方向"
-#: standalone/drakvpn:1135
+#: standalone/drakvpn:1138
#, c-format
msgid "IPsec policy"
-msgstr ""
+msgstr "IPsec 策略"
-#: standalone/drakvpn:1137
+#: standalone/drakvpn:1138
+#, c-format
+msgid "ipsec"
+msgstr "ipsec"
+
+#: standalone/drakvpn:1138
+#, c-format
+msgid "discard"
+msgstr "discard"
+
+#: standalone/drakvpn:1141
#, c-format
msgid "Mode"
msgstr "模式"
-#: standalone/drakvpn:1138
+#: standalone/drakvpn:1141
+#, c-format
+msgid "tunnel"
+msgstr "tunnel"
+
+#: standalone/drakvpn:1141
+#, c-format
+msgid "transport"
+msgstr "transport"
+
+#: standalone/drakvpn:1143
#, c-format
msgid "Source/destination"
msgstr "源/目的"
-#: standalone/drakvpn:1139 standalone/harddrake2:57
+#: standalone/drakvpn:1144
#, c-format
-msgid "Level"
-msgstr "级别"
+msgid "require"
+msgstr "require"
+
+#: standalone/drakvpn:1144
+#, c-format
+msgid "use"
+msgstr "use"
+
+#: standalone/drakvpn:1144
+#, c-format
+msgid "unique"
+msgstr "unique"
#: standalone/drakxtv:46
#, c-format
@@ -21530,7 +21856,7 @@ msgstr ""
"请您访问我们的硬件数据库:\n"
"\n"
"\n"
-"http://www.linux-mandrake.com/zh_CN/hardware.php3"
+"http://www.mandarkelinux.com/zh_CN/hardware.php3"
#: standalone/harddrake2:18
#, c-format
@@ -21821,11 +22147,6 @@ msgstr "鼠标按钮数"
#: standalone/harddrake2:63
#, c-format
-msgid "Name"
-msgstr "名称"
-
-#: standalone/harddrake2:63
-#, c-format
msgid "the name of the CPU"
msgstr "CPU 名称"
@@ -21884,13 +22205,13 @@ msgstr ""
"CPU 中 CRO 寄存器的 WP 标志位强制在内存页面级别进行写保护，这使得处理器可以避"
"免未检查的内核访问用户内存(不过此防护有 bug)"
-#: standalone/harddrake2:84 standalone/logdrake:77 standalone/printerdrake:146
+#: standalone/harddrake2:84 standalone/logdrake:78 standalone/printerdrake:146
#: standalone/printerdrake:159
#, c-format
msgid "/_Options"
msgstr "/选项(_O)"
-#: standalone/harddrake2:85 standalone/harddrake2:106 standalone/logdrake:79
+#: standalone/harddrake2:85 standalone/harddrake2:106 standalone/logdrake:80
#: standalone/printerdrake:171 standalone/printerdrake:172
#: standalone/printerdrake:173 standalone/printerdrake:174
#, c-format
@@ -21938,11 +22259,6 @@ msgstr ""
#: standalone/harddrake2:115
#, c-format
-msgid "Select a device !"
-msgstr "请选择设备！"
-
-#: standalone/harddrake2:115
-#, c-format
msgid ""
"Once you've selected a device, you'll be able to see the device information "
"in fields displayed on the right frame (\"Information\")"
@@ -21972,69 +22288,64 @@ msgid ""
"tvignaud@mandrakesoft.com&gt;\n"
"\n"
msgstr ""
-"这是“Drak 硬件设置”，Mandrake 的硬件设置工具。\n"
+"这是“Drak 硬件设置”，Mandrakelinux 的硬件设置工具。\n"
"<span foreground=\"royalblue3\">版本:</span> %s\n"
"<span foreground=\"royalblue3\">作者:</span> Thierry Vignaud &lt;"
"tvignaud@mandrakesoft.com&gt;\n"
"\n"
-#: standalone/harddrake2:133
-#, c-format
-msgid "Detection in progress"
-msgstr "检测进行中"
-
-#: standalone/harddrake2:140
+#: standalone/harddrake2:141
#, c-format
msgid "Harddrake2 version %s"
msgstr "Drak 硬件配置 2 版本 %s"
-#: standalone/harddrake2:156
+#: standalone/harddrake2:157
#, c-format
msgid "Detected hardware"
msgstr "检测到的硬件"
-#: standalone/harddrake2:161
+#: standalone/harddrake2:162
#, c-format
msgid "Configure module"
msgstr "配置模块"
-#: standalone/harddrake2:168
+#: standalone/harddrake2:169
#, c-format
msgid "Run config tool"
msgstr "运行配置工具"
-#: standalone/harddrake2:215
+#: standalone/harddrake2:216
#, c-format
msgid "unknown"
msgstr "未知"
-#: standalone/harddrake2:216
+#: standalone/harddrake2:217
#, c-format
msgid "Unknown"
msgstr "未知"
-#: standalone/harddrake2:234
+#: standalone/harddrake2:235
#, c-format
msgid ""
"Click on a device in the left tree in order to display its information here."
msgstr "单击左侧树中的设备，就可在此显示其信息。"
-#: standalone/harddrake2:282
+#: standalone/harddrake2:286
#, c-format
msgid "secondary"
msgstr "次要"
-#: standalone/harddrake2:282
+#: standalone/harddrake2:286
#, c-format
msgid "primary"
msgstr "主"
-#: standalone/harddrake2:290
+#: standalone/harddrake2:294
#, c-format
msgid "burner"
msgstr "刻录机"
-#: standalone/harddrake2:290
+#: standalone/harddrake2:294
#, c-format
msgid "DVD"
msgstr "DVD"
@@ -22054,210 +22365,210 @@ msgstr "您是否想要 BackSpace 在控制台起 Delete 的作用？"
msgid "The change is done, but to be effective you must logout"
msgstr "修改已经完成，不过您必须退出登录修改才会生效"
-#: standalone/logdrake:50
+#: standalone/logdrake:51
#, c-format
-msgid "Mandrake Tools Explanation"
-msgstr "Mandrake 工具的解释"
+msgid "Mandrake Tools Logs"
+msgstr "Mandrakelinux 工具日志"
-#: standalone/logdrake:51
+#: standalone/logdrake:52
#, c-format
msgid "Logdrake"
msgstr "Drak 日志管理"
-#: standalone/logdrake:64
+#: standalone/logdrake:65
#, c-format
msgid "Show only for the selected day"
msgstr "仅显示被选择的日期"
-#: standalone/logdrake:71
+#: standalone/logdrake:72
#, c-format
msgid "/File/_New"
msgstr "/文件(F)/新建(_N)"
-#: standalone/logdrake:71
+#: standalone/logdrake:72
#, c-format
msgid "<control>N"
msgstr "<control>N"
-#: standalone/logdrake:72
+#: standalone/logdrake:73
#, c-format
msgid "/File/_Open"
msgstr "/文件(F)/打开(_O)"
-#: standalone/logdrake:72
+#: standalone/logdrake:73
#, c-format
msgid "<control>O"
msgstr "<control>O"
-#: standalone/logdrake:73
+#: standalone/logdrake:74
#, c-format
msgid "/File/_Save"
msgstr "/文件(F)/保存(_S)"
-#: standalone/logdrake:73
+#: standalone/logdrake:74
#, c-format
msgid "<control>S"
msgstr "<control>S"
-#: standalone/logdrake:74
+#: standalone/logdrake:75
#, c-format
msgid "/File/Save _As"
msgstr "/文件(F)/另存为(_A)"
-#: standalone/logdrake:75
+#: standalone/logdrake:76
#, c-format
msgid "/File/-"
msgstr "/文件(F)/-"
-#: standalone/logdrake:78
+#: standalone/logdrake:79
#, c-format
msgid "/Options/Test"
msgstr "/选项(O)/测试"
-#: standalone/logdrake:80
+#: standalone/logdrake:81
#, c-format
msgid "/Help/_About..."
msgstr "/帮助(H)/关于(_A)..."
-#: standalone/logdrake:111
+#: standalone/logdrake:110
#, c-format
msgid ""
"_:this is the auth.log log file\n"
"Authentication"
msgstr "身份认证"
-#: standalone/logdrake:112
+#: standalone/logdrake:111
#, c-format
msgid ""
"_:this is the user.log log file\n"
"User"
msgstr "用户"
-#: standalone/logdrake:113
+#: standalone/logdrake:112
#, c-format
msgid ""
"_:this is the /var/log/messages log file\n"
"Messages"
msgstr "消息"
-#: standalone/logdrake:114
+#: standalone/logdrake:113
#, c-format
msgid ""
"_:this is the /var/log/syslog log file\n"
"Syslog"
msgstr "系统日志"
-#: standalone/logdrake:118
+#: standalone/logdrake:117
#, c-format
msgid "search"
msgstr "搜索"
-#: standalone/logdrake:130
+#: standalone/logdrake:129
#, c-format
msgid "A tool to monitor your logs"
msgstr "日志监视工具"
-#: standalone/logdrake:131 standalone/net_monitor:85
+#: standalone/logdrake:130 standalone/net_monitor:85
#, c-format
msgid "Settings"
msgstr "设置"
-#: standalone/logdrake:136
+#: standalone/logdrake:135
#, c-format
msgid "Matching"
msgstr "匹配"
-#: standalone/logdrake:137
+#: standalone/logdrake:136
#, c-format
msgid "but not matching"
msgstr "不匹配"
-#: standalone/logdrake:141
+#: standalone/logdrake:140
#, c-format
msgid "Choose file"
msgstr "选择文件"
-#: standalone/logdrake:150
+#: standalone/logdrake:149
#, c-format
msgid "Calendar"
msgstr "日历"
-#: standalone/logdrake:160
+#: standalone/logdrake:159
#, c-format
msgid "Content of the file"
msgstr "文件内容"
-#: standalone/logdrake:164 standalone/logdrake:377
+#: standalone/logdrake:163 standalone/logdrake:429
#, c-format
msgid "Mail alert"
msgstr "邮件提醒"
-#: standalone/logdrake:171
+#: standalone/logdrake:170
#, c-format
msgid "The alert wizard had unexpectly failled:"
msgstr "提醒向导意外失败:"
-#: standalone/logdrake:219
+#: standalone/logdrake:221
#, c-format
msgid "please wait, parsing file: %s"
msgstr "请等待，正在分析文件:%s"
-#: standalone/logdrake:355
+#: standalone/logdrake:406
#, c-format
msgid "Apache World Wide Web Server"
msgstr "Apache WWW 服务器"
-#: standalone/logdrake:356
+#: standalone/logdrake:407
#, c-format
msgid "Domain Name Resolver"
msgstr "域名解析器"
-#: standalone/logdrake:357
+#: standalone/logdrake:408
#, c-format
msgid "Ftp Server"
msgstr "FTP 服务器"
-#: standalone/logdrake:358
+#: standalone/logdrake:409
#, c-format
msgid "Postfix Mail Server"
msgstr "Postfix 邮件服务"
-#: standalone/logdrake:359
+#: standalone/logdrake:410
#, c-format
msgid "Samba Server"
msgstr "Samba 服务器"
-#: standalone/logdrake:360
+#: standalone/logdrake:411
#, c-format
msgid "SSH Server"
msgstr "SSH 服务器"
-#: standalone/logdrake:361
+#: standalone/logdrake:412
#, c-format
msgid "Webmin Service"
msgstr "Webmin 服务"
-#: standalone/logdrake:362
+#: standalone/logdrake:413
#, c-format
msgid "Xinetd Service"
msgstr "Xinetd 服务"
-#: standalone/logdrake:372
+#: standalone/logdrake:424
#, c-format
msgid "Configure the mail alert system"
msgstr "配置邮件提醒系统"
-#: standalone/logdrake:373
+#: standalone/logdrake:425
#, c-format
msgid "Stop the mail alert system"
msgstr "停止邮件提醒系统"
-#: standalone/logdrake:380
+#: standalone/logdrake:432
#, c-format
msgid "Mail alert configuration"
msgstr "邮件提醒设定"
-#: standalone/logdrake:381
+#: standalone/logdrake:433
#, c-format
msgid ""
"Welcome to the mail configuration utility.\n"
@@ -22266,73 +22577,68 @@ msgid ""
msgstr ""
"欢迎使用电子邮件配置工具。\n"
"\n"
-"在这里您可以您配置提醒。\n"
+"您可以在这里配置提醒。\n"
-#: standalone/logdrake:384
+#: standalone/logdrake:436
#, c-format
msgid "What do you want to do?"
msgstr "您想做什么？"
-#: standalone/logdrake:391
+#: standalone/logdrake:443
#, c-format
msgid "Services settings"
msgstr "服务设置"
-#: standalone/logdrake:392
+#: standalone/logdrake:444
#, c-format
msgid ""
"You will receive an alert if one of the selected services is no longer "
"running"
msgstr "如果选中的服务中有任何一个停止运行，您将收到提醒"
-#: standalone/logdrake:399
+#: standalone/logdrake:451
#, c-format
msgid "Load setting"
msgstr "负载设置"
-#: standalone/logdrake:400
+#: standalone/logdrake:452
#, c-format
msgid "You will receive an alert if the load is higher than this value"
msgstr "当负载超过这个值时您会收到一个警报"
-#: standalone/logdrake:401
+#: standalone/logdrake:453
#, c-format
msgid ""
"_: load here is a noun, the load of the system\n"
"Load"
msgstr "负载"
-#: standalone/logdrake:406
+#: standalone/logdrake:458
#, c-format
msgid "Alert configuration"
msgstr "提醒配置"
-#: standalone/logdrake:407
+#: standalone/logdrake:459
#, c-format
msgid "Please enter your email address below "
msgstr "请在下面输入您的电子邮件地址 "
-#: standalone/logdrake:408
+#: standalone/logdrake:460
#, c-format
msgid "and enter the name (or the IP) of the SMTP server you whish to use"
msgstr "请输入您想使用的 SMTP 服务器的名称(或 IP 地址)"
-#: standalone/logdrake:427 standalone/logdrake:433
-#, c-format
-msgid "Congratulations"
-msgstr "恭喜"
-
-#: standalone/logdrake:427
+#: standalone/logdrake:479
#, c-format
msgid "The wizard successfully configured the mail alert."
msgstr "向导已经成功配置了邮件提醒。"
-#: standalone/logdrake:433
+#: standalone/logdrake:485
#, c-format
msgid "The wizard successfully disabled the mail alert."
msgstr "向导已经成功禁用了邮件提醒。"
-#: standalone/logdrake:492
+#: standalone/logdrake:544
#, c-format
msgid "Save as.."
msgstr "另存为..."
@@ -22441,7 +22747,7 @@ msgid ""
"Verify your configuration in the Mandrake Control Center."
msgstr ""
"连接失败。\n"
-"请在 Mandrake 控制中心中检查您的配置。"
+"请在 Mandrakelinux 控制中心中检查您的配置。"
#: standalone/net_monitor:295
#, c-format
@@ -22647,103 +22953,119 @@ msgstr "作者: "
msgid "Printer Management \n"
msgstr "打印机管理\n"
-#: standalone/scannerdrake:53
+#: standalone/scannerdrake:50
+#, c-format
+msgid ""
+"SANE packages need to be installed to use scanners.\n"
+"\n"
+"Do you want to install the SANE packages?"
+msgstr ""
+"要使用扫描仪，需要安装 SANE 软件包。\n"
+"\n"
+"您想要安装 SANE 软件包吗？"
+
+#: standalone/scannerdrake:54
+#, c-format
+msgid "Aborting Scannerdrake."
+msgstr "终止 Drak 扫描仪。"
+
+#: standalone/scannerdrake:59
#, c-format
msgid ""
"Could not install the packages needed to set up a scanner with Scannerdrake."
msgstr "无法安装用“Drak 扫描仪”设置扫描仪所需的软件包。"
-#: standalone/scannerdrake:54
+#: standalone/scannerdrake:60
#, c-format
msgid "Scannerdrake will not be started now."
msgstr "“Drak 扫描仪”现在不会启动。"
-#: standalone/scannerdrake:60 standalone/scannerdrake:452
+#: standalone/scannerdrake:66 standalone/scannerdrake:459
#, c-format
msgid "Searching for configured scanners ..."
msgstr "正在搜索已配置的扫描仪..."
-#: standalone/scannerdrake:64 standalone/scannerdrake:456
+#: standalone/scannerdrake:70 standalone/scannerdrake:463
#, c-format
msgid "Searching for new scanners ..."
msgstr "正在搜索新的扫描仪..."
-#: standalone/scannerdrake:72 standalone/scannerdrake:478
+#: standalone/scannerdrake:78 standalone/scannerdrake:485
#, c-format
msgid "Re-generating list of configured scanners ..."
msgstr "正在重新生成已配置的扫描仪清单..."
-#: standalone/scannerdrake:94 standalone/scannerdrake:135
-#: standalone/scannerdrake:149
+#: standalone/scannerdrake:100 standalone/scannerdrake:141
+#: standalone/scannerdrake:155
#, c-format
msgid "The %s is not supported by this version of %s."
msgstr "%2$s 版本不支持 %1$s。"
-#: standalone/scannerdrake:97
+#: standalone/scannerdrake:103
#, c-format
msgid "%s found on %s, configure it automatically?"
msgstr "发现 %s 连接在 %s 上，是否自动配置它？"
-#: standalone/scannerdrake:109
+#: standalone/scannerdrake:115
#, c-format
msgid "%s is not in the scanner database, configure it manually?"
msgstr "扫描仪数据库中没有 %s，要手工配置它吗？"
-#: standalone/scannerdrake:124
+#: standalone/scannerdrake:130
#, c-format
msgid "Select a scanner model"
msgstr "选择扫描仪型号"
-#: standalone/scannerdrake:125
+#: standalone/scannerdrake:131
#, c-format
msgid " ("
msgstr " ("
-#: standalone/scannerdrake:126
+#: standalone/scannerdrake:132
#, c-format
msgid "Detected model: %s"
msgstr "检测到型号:%s"
-#: standalone/scannerdrake:128
+#: standalone/scannerdrake:134
#, c-format
msgid ", "
msgstr ", "
-#: standalone/scannerdrake:129
+#: standalone/scannerdrake:135
#, c-format
msgid "Port: %s"
msgstr "端口: %s"
-#: standalone/scannerdrake:155
+#: standalone/scannerdrake:161
#, c-format
msgid "The %s is not known by this version of Scannerdrake."
msgstr "这个版本的“Drak 扫描仪”不支持 %s。"
-#: standalone/scannerdrake:163 standalone/scannerdrake:177
+#: standalone/scannerdrake:169 standalone/scannerdrake:183
#, c-format
msgid "Do not install firmware file"
msgstr "不安装固件文件"
-#: standalone/scannerdrake:167 standalone/scannerdrake:219
+#: standalone/scannerdrake:173 standalone/scannerdrake:225
#, c-format
msgid ""
"It is possible that your %s needs its firmware to be uploaded everytime when "
"it is turned on."
msgstr "很有可能您的 %s 需要每次它们启动时都上载它们的固件。"
-#: standalone/scannerdrake:168 standalone/scannerdrake:220
+#: standalone/scannerdrake:174 standalone/scannerdrake:226
#, c-format
msgid "If this is the case, you can make this be done automatically."
msgstr "如果是这样的话，您可以让它自动完成。"
-#: standalone/scannerdrake:169 standalone/scannerdrake:223
+#: standalone/scannerdrake:175 standalone/scannerdrake:229
#, c-format
msgid ""
"To do so, you need to supply the firmware file for your scanner so that it "
"can be installed."
msgstr "要这样做的话，您需要提供您扫描仪的固件文件，这样它就可以被安装了。"
-#: standalone/scannerdrake:170 standalone/scannerdrake:224
+#: standalone/scannerdrake:176 standalone/scannerdrake:230
#, c-format
msgid ""
"You find the file on the CD or floppy coming with the scanner, on the "
@@ -22752,36 +23074,36 @@ msgstr ""
"您可能需要在随同扫描仪的 CD 或者软盘、制造商的网站或者您的 Windows 分区中寻找"
"它。"
-#: standalone/scannerdrake:172 standalone/scannerdrake:231
+#: standalone/scannerdrake:178 standalone/scannerdrake:237
#, c-format
msgid "Install firmware file from"
msgstr "从这儿安装固件"
-#: standalone/scannerdrake:192
+#: standalone/scannerdrake:198
#, c-format
msgid "Select firmware file"
msgstr "选择固件文件"
-#: standalone/scannerdrake:195 standalone/scannerdrake:254
+#: standalone/scannerdrake:201 standalone/scannerdrake:260
#, c-format
msgid "The firmware file %s does not exist or is unreadable!"
msgstr "固件文件 %s 不存在或无法访问！"
-#: standalone/scannerdrake:218
+#: standalone/scannerdrake:224
#, c-format
msgid ""
"It is possible that your scanners need their firmware to be uploaded "
"everytime when they are turned on."
msgstr "很有可能您的扫描仪需要每次它们启动时都上载它们的固件。"
-#: standalone/scannerdrake:222
+#: standalone/scannerdrake:228
#, c-format
msgid ""
"To do so, you need to supply the firmware files for your scanners so that it "
"can be installed."
msgstr "要这样做的话，您需要提供您扫描仪的固件文件，这样它就可以被安装了。"
-#: standalone/scannerdrake:225
+#: standalone/scannerdrake:231
#, c-format
msgid ""
"If you have already installed your scanner's firmware you can update the "
@@ -22790,27 +23112,27 @@ msgstr ""
"如果您已经安装了您扫描仪的固件，您也可以通过在这里提供新固件的方式来升级固"
"件。"
-#: standalone/scannerdrake:227
+#: standalone/scannerdrake:233
#, c-format
msgid "Install firmware for the"
msgstr "为它安装固件"
-#: standalone/scannerdrake:250
+#: standalone/scannerdrake:256
#, c-format
msgid "Select firmware file for the %s"
msgstr "选择 %s 的固件文件"
-#: standalone/scannerdrake:276
+#: standalone/scannerdrake:282
#, c-format
msgid "The firmware file for your %s was successfully installed."
msgstr "您 %s 的固件文件已经成功安装。"
-#: standalone/scannerdrake:286
+#: standalone/scannerdrake:292
#, c-format
msgid "The %s is unsupported"
msgstr "扫描仪 %s 不被支持"
-#: standalone/scannerdrake:291
+#: standalone/scannerdrake:297
#, c-format
msgid ""
"The %s must be configured by printerdrake.\n"
@@ -22819,43 +23141,43 @@ msgstr ""
"这个 %s 必须使用“Drak 打印机”来配置。\n"
"您可以在“%s 控制中心”的“硬件”部分打开“Drak 打印机”。"
-#: standalone/scannerdrake:295 standalone/scannerdrake:302
-#: standalone/scannerdrake:332
+#: standalone/scannerdrake:301 standalone/scannerdrake:308
+#: standalone/scannerdrake:338
#, c-format
msgid "Auto-detect available ports"
msgstr "自动检测可用的端口"
-#: standalone/scannerdrake:297 standalone/scannerdrake:343
+#: standalone/scannerdrake:303 standalone/scannerdrake:349
#, c-format
msgid "Please select the device where your %s is attached"
msgstr "请选择您的 %s 所连接的设备。"
-#: standalone/scannerdrake:298
+#: standalone/scannerdrake:304
#, c-format
msgid "(Note: Parallel ports cannot be auto-detected)"
msgstr "(注意: 并行端口无法自动检测)"
-#: standalone/scannerdrake:300 standalone/scannerdrake:345
+#: standalone/scannerdrake:306 standalone/scannerdrake:351
#, c-format
msgid "choose device"
msgstr "选择设备"
-#: standalone/scannerdrake:334
+#: standalone/scannerdrake:340
#, c-format
msgid "Searching for scanners ..."
msgstr "正在搜索扫描仪..."
-#: standalone/scannerdrake:368
+#: standalone/scannerdrake:375
#, c-format
msgid ""
"Your %s has been configured.\n"
-"You may now scan documents using \"XSane\" from Multimedia/Graphics in the "
-"applications menu."
+"You may now scan documents using \"XSane\" or \"Kooka\" from Multimedia/"
+"Graphics in the applications menu."
msgstr ""
"您的 %s 已经配置好了。\n"
-"现在您可以从应用程序菜单的“多媒体/图像”中使用“XSane”来扫描文档。"
+"现在您可以从应用程序菜单的“多媒体/图像”中使用“XSane”或“Kooka”来扫描文档。"
-#: standalone/scannerdrake:392
+#: standalone/scannerdrake:399
#, c-format
msgid ""
"The following scanners\n"
@@ -22868,7 +23190,7 @@ msgstr ""
"%s\n"
"直接连接在您的系统。\n"
-#: standalone/scannerdrake:393
+#: standalone/scannerdrake:400
#, c-format
msgid ""
"The following scanner\n"
@@ -22881,139 +23203,150 @@ msgstr ""
"%s\n"
"直接连接在您的系统。\n"
-#: standalone/scannerdrake:396 standalone/scannerdrake:399
+#: standalone/scannerdrake:403 standalone/scannerdrake:406
#, c-format
msgid "There are no scanners found which are available on your system.\n"
msgstr "没有发现扫描仪直接连接在您的机器上。\n"
-#: standalone/scannerdrake:413
+#: standalone/scannerdrake:420
#, c-format
msgid "Search for new scanners"
msgstr "搜索新扫描仪"
-#: standalone/scannerdrake:419
+#: standalone/scannerdrake:426
#, c-format
msgid "Add a scanner manually"
msgstr "手动添加扫描仪"
-#: standalone/scannerdrake:426
+#: standalone/scannerdrake:433
#, c-format
msgid "Install/Update firmware files"
msgstr "安装/更新固件文件"
-#: standalone/scannerdrake:432
+#: standalone/scannerdrake:439
#, c-format
msgid "Scanner sharing"
msgstr "扫描仪共享"
-#: standalone/scannerdrake:491 standalone/scannerdrake:656
+#: standalone/scannerdrake:498 standalone/scannerdrake:663
#, c-format
msgid "All remote machines"
msgstr "全部远程计算机"
-#: standalone/scannerdrake:503 standalone/scannerdrake:806
+#: standalone/scannerdrake:510 standalone/scannerdrake:813
#, c-format
msgid "This machine"
msgstr "本机"
-#: standalone/scannerdrake:543
+#: standalone/scannerdrake:550
#, c-format
msgid ""
"Here you can choose whether the scanners connected to this machine should be "
-"accessable by remote machines and by which remote machines."
+"accessible by remote machines and by which remote machines."
msgstr ""
"您可以在此选择是否将连接到本机的扫描仪共享给远程计算机，以及共享给哪些计算"
"机。"
-#: standalone/scannerdrake:544
+#: standalone/scannerdrake:551
#, c-format
msgid ""
"You can also decide here whether scanners on remote machines should be made "
"available on this machine."
msgstr "您还可以在此决定是否要将远程的扫描仪自动安装为本机所用。"
-#: standalone/scannerdrake:547
+#: standalone/scannerdrake:554
#, c-format
msgid "The scanners on this machine are available to other computers"
msgstr "此计算机上的扫描仪可共享给计算机"
-#: standalone/scannerdrake:549
+#: standalone/scannerdrake:556
#, c-format
msgid "Scanner sharing to hosts: "
msgstr "在主机上共享扫描仪:"
-#: standalone/scannerdrake:563
+#: standalone/scannerdrake:570
#, c-format
msgid "Use scanners on remote computers"
msgstr "在远程计算机上使用扫描仪"
-#: standalone/scannerdrake:566
+#: standalone/scannerdrake:573
#, c-format
msgid "Use the scanners on hosts: "
msgstr "在下列主机上使用扫描仪:"
-#: standalone/scannerdrake:593 standalone/scannerdrake:665
-#: standalone/scannerdrake:815
+#: standalone/scannerdrake:600 standalone/scannerdrake:672
+#: standalone/scannerdrake:822
#, c-format
msgid "Sharing of local scanners"
msgstr "共享本地扫描仪"
-#: standalone/scannerdrake:594
+#: standalone/scannerdrake:601
#, c-format
msgid ""
"These are the machines on which the locally connected scanner(s) should be "
"available:"
msgstr "下面是本地连接的扫描仪要开放的计算机:"
-#: standalone/scannerdrake:605 standalone/scannerdrake:755
+#: standalone/scannerdrake:612 standalone/scannerdrake:762
#, c-format
msgid "Add host"
msgstr "添加主机"
-#: standalone/scannerdrake:611 standalone/scannerdrake:761
+#: standalone/scannerdrake:618 standalone/scannerdrake:768
#, c-format
msgid "Edit selected host"
msgstr "编辑选中的主机"
-#: standalone/scannerdrake:620 standalone/scannerdrake:770
+#: standalone/scannerdrake:627 standalone/scannerdrake:777
#, c-format
msgid "Remove selected host"
msgstr "删除选中的主机"
-#: standalone/scannerdrake:644 standalone/scannerdrake:652
-#: standalone/scannerdrake:657 standalone/scannerdrake:703
-#: standalone/scannerdrake:794 standalone/scannerdrake:802
-#: standalone/scannerdrake:807 standalone/scannerdrake:853
+#: standalone/scannerdrake:651 standalone/scannerdrake:659
+#: standalone/scannerdrake:664 standalone/scannerdrake:710
+#: standalone/scannerdrake:801 standalone/scannerdrake:809
+#: standalone/scannerdrake:814 standalone/scannerdrake:860
#, c-format
msgid "Name/IP address of host:"
msgstr "主机的名称/IP 地址:"
-#: standalone/scannerdrake:666 standalone/scannerdrake:816
+#: standalone/scannerdrake:673 standalone/scannerdrake:823
#, c-format
msgid "Choose the host on which the local scanners should be made available:"
msgstr "选择本地扫描仪适用的网络或主机:"
-#: standalone/scannerdrake:677 standalone/scannerdrake:827
+#: standalone/scannerdrake:684 standalone/scannerdrake:834
#, c-format
msgid "You must enter a host name or an IP address.\n"
msgstr "您必须输入主机名或 IP 地址。\n"
-#: standalone/scannerdrake:688 standalone/scannerdrake:838
+#: standalone/scannerdrake:695 standalone/scannerdrake:845
#, c-format
msgid "This host is already in the list, it cannot be added again.\n"
msgstr "此主机已经位于列表中，无法再次添加。\n"
-#: standalone/scannerdrake:743
+#: standalone/scannerdrake:750
#, c-format
msgid "Usage of remote scanners"
msgstr "远程扫描仪使用情况"
-#: standalone/scannerdrake:744
+#: standalone/scannerdrake:751
#, c-format
msgid "These are the machines from which the scanners should be used:"
msgstr "下面是要使用扫描仪的计算机:"
-#: standalone/scannerdrake:904
+#: standalone/scannerdrake:908
+#, c-format
+msgid ""
+"saned needs to be installed to share the local scanner(s).\n"
+"\n"
+"Do you want to install the saned package?"
+msgstr ""
+"要共享本地打印机，必须安装 saned。\n"
+"\n"
+"您是否想要安装 saned 软件包？"
+
+#: standalone/scannerdrake:912 standalone/scannerdrake:916
#, c-format
msgid "Your scanner(s) will not be available on the network."
msgstr "您的扫描仪将不会在网络上出现。"
@@ -23028,7 +23361,7 @@ msgstr "删除了一些“%s”类别的设备:\n"
msgid "Some devices were added: %s\n"
msgstr "添加了一些设备: %s\n"
-#: standalone/service_harddrake:94
+#: standalone/service_harddrake:98
#, c-format
msgid "Hardware probing in progress"
msgstr "硬件检测进行中"
@@ -23123,22 +23456,22 @@ msgstr "安装更新"
msgid "Exit install"
msgstr "退出安装"
-#: ugtk2.pm:1047
+#: ugtk2.pm:1075
#, c-format
msgid "Is this correct?"
msgstr "这样正确吗？"
-#: ugtk2.pm:1175
+#: ugtk2.pm:1203
#, c-format
msgid "Expand Tree"
msgstr "展开树"
-#: ugtk2.pm:1176
+#: ugtk2.pm:1204
#, c-format
msgid "Collapse Tree"
msgstr "折叠树"
-#: ugtk2.pm:1177
+#: ugtk2.pm:1205
#, c-format
msgid "Toggle between flat and group sorted"
msgstr "切换清单显示/按组排序"
@@ -23157,265 +23490,211 @@ msgstr ""
msgid "Installation failed"
msgstr "安装失败"
-#~ msgid "Configuration of a remote printer"
-#~ msgstr "配置远程打印机"
-
-#~ msgid "configure %s"
-#~ msgstr "配置 %s"
-
-#, fuzzy
-#~ msgid "protocol = "
-#~ msgstr "协议"
-
-#, fuzzy
-#~ msgid "level = "
-#~ msgstr "级别"
+#: ../../share/compssUsers:999
+msgid "Office Workstation"
+msgstr "办公工作站"
-#~ msgid "Office Workstation"
-#~ msgstr "办公工作站"
-
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "办公程序:字处理(kword、abiword)，电子表格(kspread、gnumeric)、pdf 阅读器等"
-
-#~ msgid "Game station"
-#~ msgstr "游戏机"
-
-#~ msgid "Amusement programs: arcade, boards, strategy, etc"
-#~ msgstr "游戏程序: 街机、棋盘、战略等等"
-
-#~ msgid "Multimedia station"
-#~ msgstr "多媒体工作站"
-
-#~ msgid "Sound and video playing/editing programs"
-#~ msgstr "声音和视频播放/编辑程序"
-
-#~ msgid "Internet station"
-#~ msgstr "Internet 工作站"
+#: ../../share/compssUsers:999
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"办公程序: 字处理(kword、abiword)，电子表格(kspread、gnumeric)、pdf 阅读器等"
-#~ msgid ""
-#~ "Set of tools to read and send mail and news (mutt, tin..) and to browse "
-#~ "the Web"
-#~ msgstr "一组工具，用于收发电子邮件及新闻组(mutt，tin..)，浏览网站"
+#: ../../share/compssUsers:999
+msgid "Game station"
+msgstr "游戏机"
-#~ msgid "Network Computer (client)"
-#~ msgstr "网络计算机(客户端)"
+#: ../../share/compssUsers:999
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "游戏程序: 街机、棋盘、战略等等"
-#~ msgid "Clients for different protocols including ssh"
-#~ msgstr "SSH 等不同协议客户端"
+#: ../../share/compssUsers:999
+msgid "Multimedia station"
+msgstr "多媒体工作站"
-#~ msgid "Configuration"
-#~ msgstr "配置"
+#: ../../share/compssUsers:999
+msgid "Sound and video playing/editing programs"
+msgstr "声音和视频播放/编辑程序"
-#~ msgid "Tools to ease the configuration of your computer"
-#~ msgstr "简化计算机配置的工具"
+#: ../../share/compssUsers:999
+msgid "Internet station"
+msgstr "Internet 工作站"
-#~ msgid "Scientific Workstation"
-#~ msgstr "科学计算工作站"
+#: ../../share/compssUsers:999
+msgid ""
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
+msgstr "一组工具，用于收发电子邮件及新闻组(mutt，tin..)，浏览网站"
-#~ msgid "Scientific applications such as gnuplot"
-#~ msgstr "像 gnuplot 这样的科学应用程序"
+#: ../../share/compssUsers:999
+msgid "Network Computer (client)"
+msgstr "网络计算机(客户端)"
-#~ msgid "Console Tools"
-#~ msgstr "控制台工具"
+#: ../../share/compssUsers:999
+msgid "Clients for different protocols including ssh"
+msgstr "SSH 等不同协议客户端"
-#~ msgid "Editors, shells, file tools, terminals"
-#~ msgstr "编辑器，shell，文件工具，终端"
+#: ../../share/compssUsers:999
+msgid "Configuration"
+msgstr "配置"
-#~ msgid "KDE Workstation"
-#~ msgstr "KDE 工作站"
+#: ../../share/compssUsers:999
+msgid "Tools to ease the configuration of your computer"
+msgstr "简化计算机配置的工具"
-#~ msgid ""
-#~ "The K Desktop Environment, the basic graphical environment with a "
-#~ "collection of accompanying tools"
-#~ msgstr "KDE 桌面环境，基本的图形环境和一组配套的工具"
+#: ../../share/compssUsers:999
+msgid "Console Tools"
+msgstr "控制台工具"
-#~ msgid "Gnome Workstation"
-#~ msgstr "Gnome 工作站"
+#: ../../share/compssUsers:999
+msgid "Editors, shells, file tools, terminals"
+msgstr "编辑器，shell，文件工具，终端"
-#~ msgid ""
-#~ "A graphical environment with user-friendly set of applications and "
-#~ "desktop tools"
-#~ msgstr "配备了用户友善的应用程序与桌面工具的图形环境"
+#: ../../share/compssUsers:999
+msgid "KDE Workstation"
+msgstr "KDE 工作站"
-#~ msgid "Other Graphical Desktops"
-#~ msgstr "其它图形桌面"
+#: ../../share/compssUsers:999
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr "KDE 桌面环境，基本的图形环境和一组配套的工具"
-#~ msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-#~ msgstr "Icewm，Window Maker，Enlightenment, Fvwm 等"
+#: ../../share/compssUsers:999
+msgid "GNOME Workstation"
+msgstr "GNOME 工作站"
-#~ msgid "C and C++ development libraries, programs and include files"
-#~ msgstr "C 和 C++ 开发库，程序及头文件"
+#: ../../share/compssUsers:999
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "配备了用户友善的应用程序与桌面工具的图形环境"
-#~ msgid "Documentation"
-#~ msgstr "文档"
+#: ../../share/compssUsers:999
+msgid "Other Graphical Desktops"
+msgstr "其它图形桌面"
-#~ msgid "Books and Howto's on Linux and Free Software"
-#~ msgstr "有关 Linux 和自由软件的书籍和指南"
+#: ../../share/compssUsers:999
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm，Window Maker，Enlightenment, Fvwm 等"
-#~ msgid "LSB"
-#~ msgstr "LSB"
+#: ../../share/compssUsers:999
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C 和 C++ 开发库，程序及头文件"
-#~ msgid "Linux Standard Base. Third party applications support"
-#~ msgstr "Linux Standard Base。第三方应用程序支持"
+#: ../../share/compssUsers:999
+msgid "Documentation"
+msgstr "文档"
-#~ msgid "Web/FTP"
-#~ msgstr "Web/FTP"
+#: ../../share/compssUsers:999
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "有关 Linux 和自由软件的书籍和指南"
-#~ msgid "Apache, Pro-ftpd"
-#~ msgstr "Apache 和 Pro-ftpd"
+#: ../../share/compssUsers:999
+msgid "LSB"
+msgstr "LSB"
-#~ msgid "Mail"
-#~ msgstr "邮件"
+#: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base。第三方应用程序支持"
-#~ msgid "Postfix mail server"
-#~ msgstr "Postfix 邮件服务器"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Web/FTP"
-#~ msgid "Database"
-#~ msgstr "数据库"
+#: ../../share/compssUsers:999
+msgid "Apache, Pro-ftpd"
+msgstr "Apache 和 Pro-ftpd"
-#~ msgid "PostgreSQL or MySQL database server"
-#~ msgstr "PostgreSQL 或 MySQL 数据库服务"
+#: ../../share/compssUsers:999
+msgid "Mail"
+msgstr "邮件"
-#~ msgid "Firewall/Router"
-#~ msgstr "防火墙/路由器"
+#: ../../share/compssUsers:999
+msgid "Postfix mail server"
+msgstr "Postfix 邮件服务器"
-#~ msgid "Internet gateway"
-#~ msgstr "Internet 网关"
+#: ../../share/compssUsers:999
+msgid "Database"
+msgstr "数据库"
-#~ msgid "DNS/NIS "
-#~ msgstr "DNS/NIS"
+#: ../../share/compssUsers:999
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL 或 MySQL 数据库服务"
-#~ msgid "Domain Name and Network Information Server"
-#~ msgstr "域名和网络信息服务器 DNS/NIS"
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "防火墙/路由器"
-#~ msgid "Network Computer server"
-#~ msgstr "网络计算机服务器"
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Internet 网关"
-#~ msgid "NFS server, SMB server, Proxy server, ssh server"
-#~ msgstr "NFS 服务器，SMB 服务器，代理服务器，SSH 服务器"
+#: ../../share/compssUsers:999
+msgid "Network Computer server"
+msgstr "网络计算机服务器"
-#~ msgid "Set of tools to read and send mail and news and to browse the Web"
-#~ msgstr "一组上网工具，用于收发邮件和新闻，或者浏览网站"
+#: ../../share/compssUsers:999
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS 服务器，SMB 服务器，代理服务器，SSH 服务器"
-#~ msgid "%s="
-#~ msgstr "%s="
+#: ../../share/compssUsers:999
+msgid "Set of tools to read and send mail and news and to browse the Web"
+msgstr "一组上网工具，用于收发邮件和新闻，或者浏览网站"
-#~ msgid "add"
-#~ msgstr "添加"
+#~ msgid "Provider dns 1 (optional)"
+#~ msgstr "服务商 DNS 1(可选)"
-#~ msgid "edit"
-#~ msgstr "编辑"
+#~ msgid "Provider dns 2 (optional)"
+#~ msgstr "服务商 DNS 2(可选)"
-#~ msgid "remove"
-#~ msgstr "删除"
+#~ msgid "Ethernet Card"
+#~ msgstr "以太网卡"
-#~ msgid ""
-#~ "The free download version does not include commercial software, and "
-#~ "therefore may not work with certain proprietary network cards and video "
-#~ "cards such as NVIDIA® nForce. To avoid possible compatibiity issues with "
-#~ "these devices, we recommend the purchase of one of our retail products "
-#~ "that includes commercial drivers and additional software."
-#~ msgstr ""
-#~ "免费下载的版本中不包含商业软件，因此可能无法与特定的网卡、显卡(如 NVidia"
-#~ "(R) nForce)很好的配合工作。为了避免这些设备带来的兼容性问，我们建议您购买"
-#~ "我们的零售产品，其中附带了商业驱动程序和额外的软件。"
+#~ msgid "DHCP Client"
+#~ msgstr "DHCP 客户端"
-#~ msgid "Connected through a serial port or an usb cable"
-#~ msgstr "通过串口或 USB 连线连接"
+#~ msgid "Display"
+#~ msgstr "显示"
-#~ msgid "Add an UPS device"
-#~ msgstr "添加 UPS 设备"
+#~ msgid "Display configuration"
+#~ msgstr "显示配置"
-#~ msgid ""
-#~ "Welcome to the UPS configuration utility.\n"
-#~ "\n"
-#~ "Here, you'll be add a new UPS to your system.\n"
-#~ msgstr ""
-#~ "欢迎使用 UPS 配置工具。\n"
-#~ "\n"
-#~ "您可以在此处向系统中添加新的 UPS。\n"
+#~ msgid "Use tar and bzip2 (rather than tar and gzip)"
+#~ msgstr "使用 tar 和 bzip2(而不是 tar 和 gzip)"
#~ msgid ""
-#~ "We're going to add an UPS device.\n"
-#~ "\n"
-#~ "Do you prefer autodetect UPS devices connected to this machine or ?"
+#~ "Change\n"
+#~ "Restore Path"
#~ msgstr ""
-#~ "即将添加 UPS 设备。\n"
-#~ "\n"
-#~ "您是愿意自动检测连接到本机的 UPS 设备还是 ?"
+#~ "修改\n"
+#~ "恢复路径"
-#~ msgid "Autodetection"
-#~ msgstr "自动检测"
+#~ msgid "European protocol"
+#~ msgstr "欧洲协议"
-#~ msgid "The wizard successfully added the following UPS devices:"
-#~ msgstr "向导已经成功添加了下列 UPS 设备: "
+#~ msgid "Found \"%s\" interface do you want to use it ?"
+#~ msgstr "找到了“%s”接口，您想要使用吗？"
-#~ msgid "No new UPS devices was found"
-#~ msgstr "没有发现新的 UPS 设备"
+#~ msgid "Bewan USB modem"
+#~ msgstr "Bewan USB 调制解调器"
-#~ msgid "UPS driver configuration"
-#~ msgstr "UPS 驱动程序配置"
+#~ msgid "ISDN configuration has not yet be ported to new wizard layer"
+#~ msgstr "ISDN 配置尚未移植到新向导层"
-#~ msgid "Please select your UPS model."
-#~ msgstr "请选择您 UPS 的型号。"
+#~ msgid "What kind is your ISDN connection?"
+#~ msgstr "您的 ISDN 连接是什么类型？"
-#~ msgid "Manufacturer / Model:"
-#~ msgstr "制造商/型号: "
+#~ msgid "Do you want to start a new configuration ?"
+#~ msgstr "您想要开始新配置吗？"
#~ msgid ""
-#~ "We are configuring the \"%s\" UPS from \"%s\".\n"
-#~ "Please fill in its name, its driver and its port."
+#~ "I have detected an ISDN PCI card, but I don't know its type. Please "
+#~ "select a PCI card on the next screen."
#~ msgstr ""
-#~ "现在正在配置“%2$s”中的 UPS“%1$s”。\n"
-#~ "请填入其名称、驱动程序及端口。"
-
-#~ msgid "Name:"
-#~ msgstr "名称: "
-
-#~ msgid "The name of your ups"
-#~ msgstr "您 UPS 的名称"
-
-#~ msgid "The driver that manage your ups"
-#~ msgstr "管理您 UPS 的驱动程序"
-
-#~ msgid "Port:"
-#~ msgstr "端口: "
-
-#~ msgid "The port on which is connected your ups"
-#~ msgstr "请选择您 UPS 所连接的端口"
-
-#~ msgid "The wizard successfully configured the new \"%s\" UPS device."
-#~ msgstr "向导已经成功配置了“%s”UPS 设备。"
-
-#~ msgid "UPS devices"
-#~ msgstr "UPS 设备"
-
-#~ msgid "UPS users"
-#~ msgstr "UPS 用户"
-
-#~ msgid "Access Control Lists"
-#~ msgstr "访问控制列表"
-
-#~ msgid "IP mask"
-#~ msgstr "IP 掩码"
-
-#~ msgid "Rules"
-#~ msgstr "规则"
-
-#~ msgid "Action"
-#~ msgstr "操作"
-
-#~ msgid "ACL name"
-#~ msgstr "ACL 名称"
-
-#~ msgid "Welcome to the UPS configuration tools"
-#~ msgstr "欢迎使用 UPS 配置工具"
-
-#~ msgid "Running \"%s\" ..."
-#~ msgstr "正在运行“%s”..."
+#~ "我检测到一块 ISDN PCI 卡，不过无法识别它的型号。请在下一屏幕里选择您的 "
+#~ "PCI 卡。"
-#~ msgid "utopia 25"
-#~ msgstr "utopia 25"
+#~ msgid "No ISDN PCI card found. Please select one on the next screen."
+#~ msgstr "没有探测到 ISDN PCI 卡。请在下一屏幕里挑选一种。"
generated by cgit v1.2.1 (git 2.21.0) at 2024-12-27 09:30:38 +0000