summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFunda Wang <fwang@mandriva.org>2004-06-30 21:37:48 +0000
committerFunda Wang <fwang@mandriva.org>2004-06-30 21:37:48 +0000
commit17f55e9df711f3c56296fa2dc92783931e2214de (patch)
tree906066a16d1f20bb994586680bb8102ff553339c /perl-install
parent6356c58596d5560a3be94fdd458a9e25cde8eca5 (diff)
downloaddrakx-backup-do-not-use-17f55e9df711f3c56296fa2dc92783931e2214de.tar
drakx-backup-do-not-use-17f55e9df711f3c56296fa2dc92783931e2214de.tar.gz
drakx-backup-do-not-use-17f55e9df711f3c56296fa2dc92783931e2214de.tar.bz2
drakx-backup-do-not-use-17f55e9df711f3c56296fa2dc92783931e2214de.tar.xz
drakx-backup-do-not-use-17f55e9df711f3c56296fa2dc92783931e2214de.zip
update
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/share/po/zh_CN.po3963
1 files changed, 1973 insertions, 1990 deletions
diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index 74ea68aa8..5d65416e4 100644
--- a/perl-install/share/po/zh_CN.po
+++ b/perl-install/share/po/zh_CN.po
@@ -8,15 +8,15 @@
msgid ""
msgstr ""
"Project-Id-Version: DrakX 10.1\n"
-"POT-Creation-Date: 2004-04-01 15:07+0200\n"
-"PO-Revision-Date: 2004-04-25 14:01+0800\n"
+"POT-Creation-Date: 2004-06-14 15:48+0200\n"
+"PO-Revision-Date: 2004-06-15 14:53+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"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../move/move.pm:359
+#: ../move/move.pm:402
#, c-format
msgid ""
"Your USB key doesn't have any valid Windows (FAT) partitions.\n"
@@ -39,7 +39,7 @@ msgstr ""
"没有 USB 密钥盘,您当然也可以继续 - 您仍然可以像普通的 Mandrake\n"
"操作系统一样使用 Mandrake Move。"
-#: ../move/move.pm:369
+#: ../move/move.pm:412
#, c-format
msgid ""
"We didn't detect any USB key on your system. If you\n"
@@ -63,27 +63,27 @@ msgstr ""
"没有 USB 密钥盘,您当然也可以继续 - 您仍然可以像普通的 Mandrake\n"
"操作系统一样使用 Mandrake Move。"
-#: ../move/move.pm:380
+#: ../move/move.pm:423
#, c-format
msgid "Need a key to save your data"
msgstr "需要密钥盘保存您的数据"
-#: ../move/move.pm:382
+#: ../move/move.pm:425
#, c-format
msgid "Detect USB key again"
msgstr "再次检测 USB 密钥盘"
-#: ../move/move.pm:383 ../move/move.pm:413
+#: ../move/move.pm:426 ../move/move.pm:456
#, c-format
msgid "Continue without USB key"
msgstr "不使用 USB 密钥盘"
-#: ../move/move.pm:394 ../move/move.pm:408
+#: ../move/move.pm:437 ../move/move.pm:451
#, c-format
msgid "Key isn't writable"
msgstr "密钥盘写保护"
-#: ../move/move.pm:396
+#: ../move/move.pm:439
#, c-format
msgid ""
"The USB key seems to have write protection enabled, but we can't safely\n"
@@ -99,60 +99,60 @@ msgstr ""
"请单击按钮重新启动计算机,拔出该密钥盘之后,去掉写保护后再插入,\n"
"然后再次调用 Mandrake Move。"
-#: ../move/move.pm:402 help.pm:418 install_steps_interactive.pm:1312
+#: ../move/move.pm:445 help.pm:418 install_steps_interactive.pm:1306
#, c-format
msgid "Reboot"
msgstr "重新启动"
-#: ../move/move.pm:410
+#: ../move/move.pm:453
#, c-format
msgid ""
"The USB key seems to have write protection enabled. Please\n"
"unplug it, remove write protection, and then plug it again."
msgstr "USB 密钥盘好像启用了写保护。请拔出该密钥盘,去掉写保护,然后重新插入。"
-#: ../move/move.pm:412
+#: ../move/move.pm:455
#, c-format
msgid "Retry"
msgstr "重试"
-#: ../move/move.pm:423
+#: ../move/move.pm:466
#, c-format
msgid "Setting up USB key"
msgstr "设置 USB 密钥盘"
-#: ../move/move.pm:423
+#: ../move/move.pm:466
#, c-format
msgid "Please wait, setting up system configuration files on USB key..."
msgstr "请稍候,正在 USB 密钥盘上设置系统配置文件..."
-#: ../move/move.pm:445
+#: ../move/move.pm:488
#, c-format
msgid "Enter your user information, password will be used for screensaver"
msgstr "请输入您的信息,密码将会用于屏幕保护程序"
-#: ../move/move.pm:455
+#: ../move/move.pm:498
#, c-format
msgid "Auto configuration"
msgstr "自动配置"
-#: ../move/move.pm:455
+#: ../move/move.pm:498
#, c-format
msgid "Please wait, detecting and configuring devices..."
msgstr "请稍候,正在检测并配置设备..."
-#: ../move/move.pm:502 ../move/move.pm:559 ../move/move.pm:563
+#: ../move/move.pm:545 ../move/move.pm:601 ../move/move.pm:605
#: ../move/tree/mdk_totem:86 diskdrake/dav.pm:77 diskdrake/hd_gtk.pm:117
-#: diskdrake/interactive.pm:215 diskdrake/interactive.pm:228
-#: diskdrake/interactive.pm:369 diskdrake/interactive.pm:384
-#: diskdrake/interactive.pm:505 diskdrake/interactive.pm:510
-#: diskdrake/smbnfs_gtk.pm:42 fsedit.pm:253 install_steps.pm:82
+#: diskdrake/interactive.pm:220 diskdrake/interactive.pm:233
+#: diskdrake/interactive.pm:374 diskdrake/interactive.pm:389
+#: diskdrake/interactive.pm:510 diskdrake/interactive.pm:515
+#: diskdrake/smbnfs_gtk.pm:42 fsedit.pm:262 install_steps.pm:82
#: install_steps_interactive.pm:40 interactive/http.pm:118
-#: interactive/http.pm:119 network/netconnect.pm:944 network/netconnect.pm:947
-#: network/netconnect.pm:992 network/netconnect.pm:996
-#: network/netconnect.pm:1063 network/netconnect.pm:1113
-#: network/netconnect.pm:1118 network/netconnect.pm:1133
-#: network/netconnect.pm:1336 printer/printerdrake.pm:213
+#: interactive/http.pm:119 network/netconnect.pm:936 network/netconnect.pm:939
+#: network/netconnect.pm:984 network/netconnect.pm:988
+#: network/netconnect.pm:1055 network/netconnect.pm:1105
+#: network/netconnect.pm:1110 network/netconnect.pm:1125
+#: network/netconnect.pm:1333 printer/printerdrake.pm:213
#: printer/printerdrake.pm:220 printer/printerdrake.pm:245
#: printer/printerdrake.pm:393 printer/printerdrake.pm:398
#: printer/printerdrake.pm:411 printer/printerdrake.pm:421
@@ -173,32 +173,32 @@ msgstr "请稍候,正在检测并配置设备..."
#: printer/printerdrake.pm:3018 printer/printerdrake.pm:3421
#: printer/printerdrake.pm:3664 printer/printerdrake.pm:3677
#: printer/printerdrake.pm:3817 printer/printerdrake.pm:3909
-#: standalone/drakTermServ:416 standalone/drakTermServ:769
-#: standalone/drakTermServ:776 standalone/drakTermServ:971
-#: standalone/drakTermServ:1416 standalone/drakTermServ:1421
-#: standalone/drakTermServ:1428 standalone/drakTermServ:1439
-#: standalone/drakTermServ:1459 standalone/drakauth:36
-#: standalone/drakbackup:581 standalone/drakbackup:694
-#: standalone/drakbackup:1187 standalone/drakbackup:1220
-#: standalone/drakbackup:1735 standalone/drakbackup:1898
-#: standalone/drakbackup:2513 standalone/drakbackup:4286
-#: standalone/drakbackup:4509 standalone/drakboot:255 standalone/drakbug:267
-#: standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:608
-#: standalone/drakconnect:611 standalone/drakconnect:632
-#: standalone/drakfloppy:301 standalone/drakfloppy:305
-#: standalone/drakfloppy:311 standalone/drakfont:210 standalone/drakfont:223
+#: standalone/drakTermServ:404 standalone/drakTermServ:758
+#: standalone/drakTermServ:765 standalone/drakTermServ:960
+#: standalone/drakTermServ:1430 standalone/drakTermServ:1435
+#: standalone/drakTermServ:1442 standalone/drakTermServ:1453
+#: standalone/drakTermServ:1475 standalone/drakauth:36
+#: standalone/drakbackup:511 standalone/drakbackup:625
+#: standalone/drakbackup:1118 standalone/drakbackup:1151
+#: standalone/drakbackup:1644 standalone/drakbackup:1807
+#: standalone/drakbackup:2419 standalone/drakbackup:4084
+#: standalone/drakbackup:4304 standalone/drakboot:255 standalone/drakbug:267
+#: standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:621
+#: standalone/drakconnect:624 standalone/drakconnect:645
+#: standalone/drakfloppy:302 standalone/drakfloppy:306
+#: standalone/drakfloppy:312 standalone/drakfont:210 standalone/drakfont:223
#: standalone/drakfont:259 standalone/drakfont:600 standalone/draksplash:21
#: standalone/drakxtv:105 standalone/logdrake:170 standalone/logdrake:467
#: standalone/logdrake:472 standalone/scannerdrake:58
#: standalone/scannerdrake:200 standalone/scannerdrake:259
-#: standalone/scannerdrake:683 standalone/scannerdrake:694
-#: standalone/scannerdrake:833 standalone/scannerdrake:844
-#: standalone/scannerdrake:914 wizards.pm:95 wizards.pm:99 wizards.pm:121
+#: standalone/scannerdrake:688 standalone/scannerdrake:699
+#: standalone/scannerdrake:838 standalone/scannerdrake:849
+#: standalone/scannerdrake:919 wizards.pm:95 wizards.pm:99 wizards.pm:121
#, c-format
msgid "Error"
msgstr "错误"
-#: ../move/move.pm:503 install_steps.pm:83
+#: ../move/move.pm:546 install_steps.pm:83
#, c-format
msgid ""
"An error occurred, but I don't know how to handle it nicely.\n"
@@ -207,12 +207,12 @@ msgstr ""
"发生错误,可是我不知道该怎样处理才好。\n"
"继续下去会怎样就看您的运气了。"
-#: ../move/move.pm:559 install_steps_interactive.pm:40
+#: ../move/move.pm:601 install_steps_interactive.pm:40
#, c-format
msgid "An error occurred"
msgstr "发生了一个错误"
-#: ../move/move.pm:565
+#: ../move/move.pm:607
#, c-format
msgid ""
"An error occurred:\n"
@@ -245,12 +245,12 @@ msgstr ""
"其中的内容,甚至想要看看 #3 和 #4 控制台中的日志文件,以便试着检\n"
"查究竟是哪里出了问题。"
-#: ../move/move.pm:580
+#: ../move/move.pm:622
#, c-format
msgid "Remove system config files"
msgstr "删除系统配置文件"
-#: ../move/move.pm:581
+#: ../move/move.pm:623
#, c-format
msgid "Simply reboot"
msgstr "只是重新启动"
@@ -284,67 +284,67 @@ msgstr ""
msgid "Copying to memory to allow removing the CDROM"
msgstr "复制到内存以便允许移去 CDROM"
-#: Xconfig/card.pm:16
+#: Xconfig/card.pm:13
#, c-format
msgid "256 kB"
msgstr "256 kB"
-#: Xconfig/card.pm:17
+#: Xconfig/card.pm:14
#, c-format
msgid "512 kB"
msgstr "512 kB"
-#: Xconfig/card.pm:18
+#: Xconfig/card.pm:15
#, c-format
msgid "1 MB"
msgstr "1 MB"
-#: Xconfig/card.pm:19
+#: Xconfig/card.pm:16
#, c-format
msgid "2 MB"
msgstr "2 MB"
-#: Xconfig/card.pm:20
+#: Xconfig/card.pm:17
#, c-format
msgid "4 MB"
msgstr "4 MB"
-#: Xconfig/card.pm:21
+#: Xconfig/card.pm:18
#, c-format
msgid "8 MB"
msgstr "8 MB"
-#: Xconfig/card.pm:22
+#: Xconfig/card.pm:19
#, c-format
msgid "16 MB"
msgstr "16 MB"
-#: Xconfig/card.pm:23
+#: Xconfig/card.pm:20
#, c-format
msgid "32 MB"
msgstr "32 MB"
-#: Xconfig/card.pm:24
+#: Xconfig/card.pm:21
#, c-format
msgid "64 MB or more"
msgstr "64 MB 或更多"
-#: Xconfig/card.pm:211
+#: Xconfig/card.pm:151
#, c-format
msgid "X server"
msgstr "X 服务器"
-#: Xconfig/card.pm:212
+#: Xconfig/card.pm:152
#, c-format
msgid "Choose an X server"
msgstr "选择 X 服务器"
-#: Xconfig/card.pm:244
+#: Xconfig/card.pm:184
#, c-format
msgid "Multi-head configuration"
msgstr "多显示器配置"
-#: Xconfig/card.pm:245
+#: Xconfig/card.pm:185
#, c-format
msgid ""
"Your system supports multiple head configuration.\n"
@@ -353,82 +353,62 @@ msgstr ""
"您的系统支持多显示器。\n"
"是否进行设置?"
-#: Xconfig/card.pm:312
+#: Xconfig/card.pm:251
#, c-format
msgid "Can't install XFree package: %s"
msgstr "无法安装 XFree 软件包: %s"
-#: Xconfig/card.pm:322
+#: Xconfig/card.pm:261
#, c-format
msgid "Select the memory size of your graphics card"
msgstr "请选择您显示卡上内存的大小"
-#: Xconfig/card.pm:398
+#: Xconfig/card.pm:332
#, c-format
msgid "XFree configuration"
msgstr "XFree 配置"
-#: Xconfig/card.pm:400
+#: Xconfig/card.pm:334
#, c-format
msgid "Which configuration of XFree do you want to have?"
msgstr "您希望拥有哪个 XFree 配置?"
-#: Xconfig/card.pm:434
+#: Xconfig/card.pm:367
#, c-format
msgid "Configure all heads independently"
msgstr "独立配置所有头"
-#: Xconfig/card.pm:435
+#: Xconfig/card.pm:368
#, c-format
msgid "Use Xinerama extension"
msgstr "使用 Xinerama 扩展"
-#: Xconfig/card.pm:440
+#: Xconfig/card.pm:373
#, c-format
msgid "Configure only card \"%s\"%s"
msgstr "只配置“%s”%s 卡"
-#: Xconfig/card.pm:454 Xconfig/card.pm:456 Xconfig/various.pm:23
+#: Xconfig/card.pm:385 Xconfig/various.pm:23
#, c-format
msgid "XFree %s"
msgstr "XFree %s"
-#: Xconfig/card.pm:467 Xconfig/card.pm:493 Xconfig/various.pm:23
+#: Xconfig/card.pm:392 Xconfig/various.pm:22
#, c-format
msgid "XFree %s with 3D hardware acceleration"
msgstr "XFree %s 带有硬件 3D 加速的支持"
-#: Xconfig/card.pm:470
-#, c-format
-msgid ""
-"Your card can have 3D hardware acceleration support but only with XFree %s.\n"
-"Your card is supported by XFree %s which may have a better support in 2D."
-msgstr ""
-"使用 XFree %s,您的显示卡可以得到 3D 硬件加速支持。\n"
-"XFree %s 支持您的显示卡,它能提供更好的 2D 支持。"
-
-#: Xconfig/card.pm:472 Xconfig/card.pm:495
+#: Xconfig/card.pm:394
#, c-format
msgid "Your card can have 3D hardware acceleration support with XFree %s."
msgstr "使用 XFree %s,您的显示卡可以得到 3D 硬件加速支持。"
-#: Xconfig/card.pm:480 Xconfig/card.pm:501
+#: Xconfig/card.pm:400
#, c-format
msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
msgstr "XFree %s 带有试验阶段的 3D 硬件加速支持"
-#: Xconfig/card.pm:483
-#, c-format
-msgid ""
-"Your card can have 3D hardware acceleration support but only with XFree %s,\n"
-"NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.\n"
-"Your card is supported by XFree %s which may have a better support in 2D."
-msgstr ""
-"只有使用 XFree %s,您的显示卡才可以得到 3D 硬件加速支持。\n"
-"注意这是试验阶段的支持,它可能会使您的电脑失去反应。\n"
-"XFree %s 支持您的显示卡,它能提供更好的 2D 支持。"
-
-#: Xconfig/card.pm:486 Xconfig/card.pm:503
+#: Xconfig/card.pm:402
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support with XFree %s,\n"
@@ -437,57 +417,48 @@ msgstr ""
"使用 XFree %s,您的显示卡可以得到 3D 硬件加速支持。\n"
"注意这是试验阶段的支持,它可能会使您的电脑失去反应。"
-#: Xconfig/card.pm:509
-#, c-format
-msgid "Xpmac (installation display driver)"
-msgstr "Xpmac(安装显卡驱动)"
-
-#: Xconfig/main.pm:88 Xconfig/main.pm:89 Xconfig/monitor.pm:106 any.pm:830
+#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:112 any.pm:833
#, c-format
msgid "Custom"
msgstr "自定义"
-#: Xconfig/main.pm:113 diskdrake/dav.pm:28 help.pm:14
+#: Xconfig/main.pm:115 diskdrake/dav.pm:28 help.pm:14
#: 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
+#: standalone/harddrake2:194 standalone/logdrake:175
+#: standalone/scannerdrake:450
#, c-format
msgid "Quit"
msgstr "退出"
-#: Xconfig/main.pm:115
+#: Xconfig/main.pm:117
#, c-format
msgid "Graphic Card"
msgstr "显示卡"
-#: Xconfig/main.pm:118 Xconfig/monitor.pm:100
+#: Xconfig/main.pm:120 Xconfig/monitor.pm:106
#, c-format
msgid "Monitor"
msgstr "显示器"
-#: Xconfig/main.pm:121 Xconfig/resolution_and_depth.pm:228
+#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:217
#, c-format
msgid "Resolution"
msgstr "分辨率"
-#: Xconfig/main.pm:126
+#: Xconfig/main.pm:128
#, c-format
msgid "Test"
msgstr "测试"
-#: Xconfig/main.pm:131 diskdrake/dav.pm:67 diskdrake/interactive.pm:410
+#: Xconfig/main.pm:133 diskdrake/dav.pm:67 diskdrake/interactive.pm:415
#: diskdrake/removable.pm:25 diskdrake/smbnfs_gtk.pm:80
-#: 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
+#: standalone/drakfont:494 standalone/drakfont:554 standalone/harddrake2:191
#, c-format
msgid "Options"
msgstr "选项"
-#: Xconfig/main.pm:180
+#: Xconfig/main.pm:177
#, c-format
msgid ""
"Keep the changes?\n"
@@ -500,33 +471,38 @@ msgstr ""
"\n"
"%s"
-#: Xconfig/monitor.pm:101
+#: Xconfig/monitor.pm:107
+#, c-format
+msgid "Choose a monitor for head #%d"
+msgstr "选择显示头 %d 的显示器"
+
+#: Xconfig/monitor.pm:107
#, c-format
msgid "Choose a monitor"
msgstr "选择显示器"
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:113
#, c-format
msgid "Plug'n Play"
msgstr "即插即用"
-#: Xconfig/monitor.pm:108 mouse.pm:49
+#: Xconfig/monitor.pm:114 mouse.pm:49
#, c-format
msgid "Generic"
msgstr "通用"
-#: Xconfig/monitor.pm:109 standalone/drakconnect:556 standalone/harddrake2:68
-#: standalone/harddrake2:69
+#: Xconfig/monitor.pm:115 standalone/drakconnect:569 standalone/harddrake2:73
+#: standalone/harddrake2:74
#, c-format
msgid "Vendor"
msgstr "厂家"
-#: Xconfig/monitor.pm:119
+#: Xconfig/monitor.pm:125
#, c-format
msgid "Plug'n Play probing failed. Please select the correct monitor"
msgstr "即插即用检测失败。请明确选择一个显示器"
-#: Xconfig/monitor.pm:124
+#: Xconfig/monitor.pm:130
#, c-format
msgid ""
"The two critical parameters are the vertical refresh rate, which is the "
@@ -548,12 +524,12 @@ msgstr ""
"不恰当的设置可能会损害您的显示器!\n"
"所以没把握时,您可以选择保守的设置。"
-#: Xconfig/monitor.pm:131
+#: Xconfig/monitor.pm:137
#, c-format
msgid "Horizontal refresh rate"
msgstr "水平刷新率"
-#: Xconfig/monitor.pm:132
+#: Xconfig/monitor.pm:138
#, c-format
msgid "Vertical refresh rate"
msgstr "垂直刷新率"
@@ -578,72 +554,58 @@ msgstr "6 万 5 千色(16 位)"
msgid "16 million colors (24 bits)"
msgstr "1 千 6 百万色(24 位)"
-#: Xconfig/resolution_and_depth.pm:16
-#, c-format
-msgid "4 billion colors (32 bits)"
-msgstr "40 亿色(32 位)"
-
-#: Xconfig/resolution_and_depth.pm:141
+#: Xconfig/resolution_and_depth.pm:130
#, c-format
msgid "Resolutions"
msgstr "分辨率"
-#: Xconfig/resolution_and_depth.pm:275
+#: Xconfig/resolution_and_depth.pm:264
#, c-format
msgid "Choose the resolution and the color depth"
msgstr "选择屏幕分辨率以及颜色深度"
-#: Xconfig/resolution_and_depth.pm:276
+#: Xconfig/resolution_and_depth.pm:265
#, c-format
msgid "Graphics card: %s"
msgstr "显示卡: %s"
-#: Xconfig/resolution_and_depth.pm:289 interactive.pm:403
-#: interactive/gtk.pm:759 interactive/http.pm:103 interactive/http.pm:157
+#: Xconfig/resolution_and_depth.pm:278 interactive.pm:403
+#: interactive/gtk.pm:760 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:4045 standalone/drakbackup:4075
-#: standalone/drakbackup:4162 standalone/drakbackup:4175
-#: standalone/drakbackup:4247 standalone/drakconnect:165
-#: standalone/drakconnect:786 standalone/drakconnect:873
-#: standalone/drakconnect:972 standalone/drakups:194
-#: standalone/net_monitor:303 ugtk2.pm:413 ugtk2.pm:510 ugtk2.pm:1075
-#: ugtk2.pm:1098
+#: standalone/drakbackup:3941 standalone/drakbackup:4001
+#: standalone/drakbackup:4045 standalone/drakconnect:165
+#: standalone/drakconnect:799 standalone/drakconnect:886
+#: standalone/drakconnect:985 standalone/drakups:194
+#: standalone/net_monitor:307 ugtk2.pm:413 ugtk2.pm:510 ugtk2.pm:1084
+#: ugtk2.pm:1107
#, c-format
msgid "Ok"
msgstr "确定"
-#: Xconfig/resolution_and_depth.pm:289 any.pm:870 diskdrake/smbnfs_gtk.pm:81
+#: Xconfig/resolution_and_depth.pm:278 any.pm:883 diskdrake/smbnfs_gtk.pm:81
#: help.pm:197 help.pm:457 install_steps_gtk.pm:490
-#: install_steps_interactive.pm:781 interactive.pm:404 interactive/gtk.pm:763
+#: install_steps_interactive.pm:775 interactive.pm:404 interactive/gtk.pm:764
#: interactive/http.pm:104 interactive/http.pm:161 interactive/newt.pm:307
#: interactive/newt.pm:414 interactive/stdio.pm:39 interactive/stdio.pm:142
#: interactive/stdio.pm:176 printer/printerdrake.pm:3088
-#: 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:871
-#: standalone/drakconnect:971 standalone/drakfont:663 standalone/drakfont:740
-#: standalone/drakups:201 standalone/logdrake:175 standalone/net_monitor:299
-#: ugtk2.pm:407 ugtk2.pm:508 ugtk2.pm:517 ugtk2.pm:1075
+#: standalone/drakautoinst:217 standalone/drakbackup:3871
+#: standalone/drakbackup:3929 standalone/drakconnect:164
+#: standalone/drakconnect:884 standalone/drakconnect:984
+#: standalone/drakfont:663 standalone/drakfont:740 standalone/drakups:201
+#: standalone/logdrake:175 standalone/net_monitor:303 ugtk2.pm:407
+#: ugtk2.pm:508 ugtk2.pm:517 ugtk2.pm:1084
#, c-format
msgid "Cancel"
msgstr "取消"
-#: Xconfig/resolution_and_depth.pm:289 diskdrake/hd_gtk.pm:154
+#: Xconfig/resolution_and_depth.pm:278 diskdrake/hd_gtk.pm:154
#: install_steps_gtk.pm:269 install_steps_gtk.pm:670 interactive.pm:498
-#: interactive/gtk.pm:623 interactive/gtk.pm:625 standalone/drakTermServ:316
-#: standalone/drakbackup:4010 standalone/drakbackup:4039
-#: standalone/drakbackup:4062 standalone/drakbackup:4093
-#: 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
+#: interactive/gtk.pm:624 interactive/gtk.pm:626 standalone/drakTermServ:304
+#: standalone/drakbackup:3867 standalone/drakbug:157
+#: standalone/drakconnect:160 standalone/drakconnect:239
#: standalone/drakfont:512 standalone/drakperm:134 standalone/draksec:296
-#: standalone/harddrake2:184 ugtk2.pm:1188 ugtk2.pm:1189
+#: standalone/harddrake2:190 ugtk2.pm:1197 ugtk2.pm:1198
#, c-format
msgid "Help"
msgstr "帮助"
@@ -663,7 +625,7 @@ msgstr "您想要测试您的配置吗?"
msgid "Warning: testing this graphic card may freeze your computer"
msgstr "警告: 测试这个图形卡可能会锁定您的电脑"
-#: Xconfig/test.pm:71
+#: Xconfig/test.pm:69
#, c-format
msgid ""
"An error occurred:\n"
@@ -674,12 +636,12 @@ msgstr ""
"%s\n"
"试着更改某些参数"
-#: Xconfig/test.pm:149
+#: Xconfig/test.pm:133
#, c-format
msgid "Leaving in %d seconds"
msgstr "即将于 %d 秒后离开"
-#: Xconfig/test.pm:149
+#: Xconfig/test.pm:133
#, c-format
msgid "Is this the correct setting?"
msgstr "这样正确吗?"
@@ -699,57 +661,52 @@ msgstr "鼠标类型: %s\n"
msgid "Mouse device: %s\n"
msgstr "鼠标设备: %s\n"
-#: Xconfig/various.pm:32
+#: Xconfig/various.pm:33
#, c-format
msgid "Monitor: %s\n"
msgstr "显示器: %s\n"
-#: Xconfig/various.pm:33
+#: Xconfig/various.pm:34
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr "显示器水平刷新率: %s\n"
-#: Xconfig/various.pm:34
+#: Xconfig/various.pm:35
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr "显示器垂直刷新率: %s\n"
-#: Xconfig/various.pm:35
+#: Xconfig/various.pm:37
#, c-format
msgid "Graphics card: %s\n"
msgstr "显示卡: %s\n"
-#: Xconfig/various.pm:36
+#: Xconfig/various.pm:38
#, c-format
msgid "Graphics memory: %s kB\n"
msgstr "显存: %s kB\n"
-#: Xconfig/various.pm:38
+#: Xconfig/various.pm:40
#, c-format
msgid "Color depth: %s\n"
msgstr "颜色深度: %s\n"
-#: Xconfig/various.pm:39
+#: Xconfig/various.pm:41
#, c-format
msgid "Resolution: %s\n"
msgstr "分辨率: %s\n"
-#: Xconfig/various.pm:41
-#, c-format
-msgid "XFree86 server: %s\n"
-msgstr "XFree86 服务器: %s\n"
-
-#: Xconfig/various.pm:42
+#: Xconfig/various.pm:43
#, c-format
msgid "XFree86 driver: %s\n"
msgstr "XFree86 驱动程序: %s\n"
-#: Xconfig/various.pm:71
+#: Xconfig/various.pm:72
#, c-format
msgid "Graphical interface at startup"
msgstr "启动时进入图形界面"
-#: Xconfig/various.pm:73
+#: Xconfig/various.pm:74
#, c-format
msgid ""
"I can setup your computer to automatically start the graphical interface "
@@ -759,7 +716,7 @@ msgstr ""
"我可以设定您的电脑在开机时自动进入 XFree 图形界面。\n"
"您希望这么做吗?"
-#: Xconfig/various.pm:86
+#: Xconfig/various.pm:87
#, c-format
msgid ""
"Your graphic card seems to have a TV-OUT connector.\n"
@@ -779,15 +736,15 @@ msgstr ""
"\n"
"您是否要使用此特性?"
-#: Xconfig/various.pm:98
+#: Xconfig/various.pm:99
#, c-format
msgid "What norm is your TV using?"
msgstr "您的电视信号是什么制式?"
#: any.pm:103 harddrake/sound.pm:150 interactive.pm:441 standalone/drakbug:259
#: standalone/drakconnect:167 standalone/draksec:56 standalone/drakups:90
-#: standalone/drakxtv:90 standalone/harddrake2:134
-#: standalone/service_harddrake:107
+#: standalone/drakxtv:90 standalone/harddrake2:140
+#: standalone/service_harddrake:126
#, c-format
msgid "Please wait"
msgstr "请稍候"
@@ -873,13 +830,13 @@ msgid ""
"Option ``Restrict command line options'' is of no use without a password"
msgstr "没有密码不能使用“限定命令行选项”"
-#: any.pm:218 any.pm:531 install_steps_interactive.pm:1156
+#: any.pm:218 any.pm:531 install_steps_interactive.pm:1150
#, c-format
msgid "The passwords do not match"
msgstr "两次密码不符"
-#: any.pm:218 any.pm:531 diskdrake/interactive.pm:1255
-#: install_steps_interactive.pm:1156
+#: any.pm:218 any.pm:531 diskdrake/interactive.pm:1262
+#: install_steps_interactive.pm:1150
#, c-format
msgid "Please try again"
msgstr "请再试一次"
@@ -920,15 +877,15 @@ msgid "Force No Local APIC"
msgstr "强制无本地 APIC"
#: any.pm:236 any.pm:558 diskdrake/smbnfs_gtk.pm:180
-#: install_steps_interactive.pm:1161 network/netconnect.pm:575
+#: install_steps_interactive.pm:1155 network/netconnect.pm:574
#: printer/printerdrake.pm:1374 printer/printerdrake.pm:1494
-#: standalone/drakbackup:1717 standalone/drakbackup:3592
+#: standalone/drakbackup:1626 standalone/drakbackup:3496
#: standalone/drakups:278
#, c-format
msgid "Password"
msgstr "密码"
-#: any.pm:237 any.pm:559 install_steps_interactive.pm:1162
+#: any.pm:237 any.pm:559 install_steps_interactive.pm:1156
#, c-format
msgid "Password (again)"
msgstr "密码(请再输一次)"
@@ -1018,8 +975,8 @@ msgstr "Initrd"
msgid "Label"
msgstr "标签"
-#: any.pm:319 any.pm:329 harddrake/v4l.pm:255 standalone/drakfloppy:88
-#: standalone/drakfloppy:94
+#: any.pm:319 any.pm:329 harddrake/v4l.pm:275 standalone/drakfloppy:89
+#: standalone/drakfloppy:95
#, c-format
msgid "Default"
msgstr "默认"
@@ -1076,8 +1033,8 @@ msgstr "其它操作系统(MacOS...)"
#: any.pm:356
#, c-format
-msgid "Other OS (windows...)"
-msgstr "其它操作系统(windows...)"
+msgid "Other OS (Windows...)"
+msgstr "其它操作系统(Windows...)"
#: any.pm:384
#, c-format
@@ -1167,8 +1124,8 @@ msgstr ""
#: diskdrake/removable.pm:27 diskdrake/smbnfs_gtk.pm:82 help.pm:544
#: interactive/http.pm:152 printer/printerdrake.pm:165
#: printer/printerdrake.pm:352 printer/printerdrake.pm:4076
-#: standalone/drakbackup:2802 standalone/scannerdrake:636
-#: standalone/scannerdrake:786
+#: standalone/drakbackup:2708 standalone/scannerdrake:641
+#: standalone/scannerdrake:791
#, c-format
msgid "Done"
msgstr "完成"
@@ -1249,38 +1206,38 @@ msgstr "默认使用 Unicode"
msgid "All languages"
msgstr "全部语言"
-#: any.pm:695 help.pm:581 help.pm:991 install_steps_interactive.pm:901
+#: any.pm:698 help.pm:581 help.pm:991 install_steps_interactive.pm:895
#, c-format
msgid "Country / Region"
msgstr "国家/地区"
-#: any.pm:696
+#: any.pm:699
#, c-format
msgid "Please choose your country."
msgstr "请选择您的国家/地区。"
-#: any.pm:698
+#: any.pm:701
#, c-format
msgid "Here is the full list of available countries"
msgstr "在此列出了可用的全部国家/地区"
-#: any.pm:699 diskdrake/interactive.pm:292 help.pm:544 help.pm:581 help.pm:621
+#: any.pm:702 diskdrake/interactive.pm:297 help.pm:544 help.pm:581 help.pm:621
#: help.pm:991 install_steps_interactive.pm:114
#, c-format
msgid "More"
msgstr "更多"
-#: any.pm:830
+#: any.pm:833
#, c-format
msgid "No sharing"
msgstr "禁止共享"
-#: any.pm:830
+#: any.pm:833
#, c-format
msgid "Allow all users"
msgstr "允许所有用户使用"
-#: any.pm:834
+#: any.pm:837
#, c-format
msgid ""
"Would you like to allow users to share some of their directories?\n"
@@ -1293,23 +1250,32 @@ msgstr ""
"在这里选择允许,用户将可以在 KDE 和 Gnome 的文件管理器中单击“共享”菜单项\n"
"“定制”允许按照不同用户细分设置。\n"
-#: any.pm:850
+#: any.pm:849
#, c-format
msgid ""
-"You can export using NFS or Samba. Please select which you'd like to use."
-msgstr "您可以使用 NFS 或 Samba 导出。请选择您想要使用的协议。"
+"NFS: the traditional Unix file sharing system, with less support on Mac and "
+"Windows."
+msgstr "NFS: 传统的 Unix 文件共享系统,Mac 和 Windows 上支持较少。"
+
+#: any.pm:852
+#, c-format
+msgid ""
+"SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
+"systems."
+msgstr "SMB: Windows、MacOS X 和其它现代 Linux 系统所用的文件共享系统。"
-#: any.pm:858
+#: any.pm:860
#, c-format
-msgid "The package %s is going to be removed."
-msgstr "即将卸载 %s 软件包。"
+msgid ""
+"You can export using NFS or SMB. Please select which you would like to use."
+msgstr "您可以使用 NFS 或 Samba 导出。请选择您想要使用的协议。"
-#: any.pm:870
+#: any.pm:883
#, c-format
msgid "Launch userdrake"
msgstr "运行“Drak 用户管理”"
-#: any.pm:872
+#: any.pm:885
#, c-format
msgid ""
"The per-user sharing uses the group \"fileshare\". \n"
@@ -1333,42 +1299,77 @@ msgstr "LDAP"
msgid "NIS"
msgstr "NIS"
-#: authentication.pm:12 authentication.pm:50
+#: authentication.pm:12 authentication.pm:72
#, c-format
msgid "Windows Domain"
msgstr "Windows 域"
-#: authentication.pm:33
+#: authentication.pm:12
+#, c-format
+msgid "Active Directory"
+msgstr "活动目录"
+
+#: authentication.pm:38
#, c-format
msgid "Authentication LDAP"
msgstr "LDAP 认证"
-#: authentication.pm:34
+#: authentication.pm:39
#, c-format
msgid "LDAP Base dn"
msgstr "LDAP 基 DN"
-#: authentication.pm:35
+#: authentication.pm:40
#, c-format
msgid "LDAP Server"
msgstr "LDAP 服务器"
-#: authentication.pm:40
+#: authentication.pm:50
+#, c-format
+msgid "Authentication Active Directory"
+msgstr "验证活动目录"
+
+#: authentication.pm:51 diskdrake/smbnfs_gtk.pm:181
+#, c-format
+msgid "Domain"
+msgstr "域"
+
+#: authentication.pm:52 diskdrake/dav.pm:65 help.pm:137
+#, c-format
+msgid "Server"
+msgstr "服务器"
+
+#: authentication.pm:53
+#, c-format
+msgid "LDAP users database"
+msgstr "LDAP 用户数据库"
+
+#: authentication.pm:54
+#, c-format
+msgid "LDAP user allowed to browse the Active Directory"
+msgstr "允许浏览活动目录的 LDAP 用户"
+
+#: authentication.pm:55
+#, c-format
+msgid "Password for user"
+msgstr "用户的密码"
+
+#: authentication.pm:62
#, c-format
msgid "Authentication NIS"
msgstr "NIS 认证"
-#: authentication.pm:41
+#: authentication.pm:63
#, c-format
msgid "NIS Domain"
msgstr "NIS 网域"
-#: authentication.pm:42
+#: authentication.pm:64
#, c-format
msgid "NIS Server"
msgstr "NIS 服务器"
-#: authentication.pm:47
+#: authentication.pm:69
#, c-format
msgid ""
"For this to work for a W2K PDC, you will probably need to have the admin "
@@ -1393,22 +1394,22 @@ msgstr ""
"域名 -U 用户%%密码”填入您的 Windows(tm) 域名和管理员的用户名/密码。\n"
"命令“wbinfo -t”会测试您的认证密码是否完好。"
-#: authentication.pm:49
+#: authentication.pm:71
#, c-format
msgid "Authentication Windows Domain"
msgstr "Windows 域认证"
-#: authentication.pm:51
+#: authentication.pm:73
#, c-format
msgid "Domain Admin User Name"
msgstr "域管理员用户名"
-#: authentication.pm:52
+#: authentication.pm:74
#, c-format
msgid "Domain Admin Password"
msgstr "域管理员密码"
-#: authentication.pm:83
+#: authentication.pm:149
#, c-format
msgid "Can't use broadcast with no NIS domain"
msgstr "没有 NIS 域无法广播"
@@ -1454,31 +1455,31 @@ msgstr "Grub"
msgid "Yaboot"
msgstr "Yaboot"
-#: bootloader.pm:1143
+#: bootloader.pm:1142
#, c-format
msgid "not enough room in /boot"
msgstr "/boot 中没有足够空间"
-#: bootloader.pm:1171
+#: bootloader.pm:1170
#, c-format
msgid "You can't install the bootloader on a %s partition\n"
msgstr "%s 分区不能安装启动引导程序\n"
-#: bootloader.pm:1215
+#: bootloader.pm:1214
#, c-format
msgid ""
"Your bootloader configuration must be updated because partition has been "
"renumbered"
msgstr "必须更新您的启动引导程序配置,因为分区已经重新编号"
-#: bootloader.pm:1222
+#: bootloader.pm:1221
#, c-format
msgid ""
"The bootloader can't be installed correctly. You have to boot rescue and "
"choose \"%s\""
msgstr "无法正确安装启动引导程序。您需要以抢救方式启动并选择“%s”"
-#: bootloader.pm:1223
+#: bootloader.pm:1222
#, c-format
msgid "Re-install Boot Loader"
msgstr "重新安装启动引导程序"
@@ -1538,7 +1539,7 @@ msgstr "缺少 kdesu"
msgid "consolehelper missing"
msgstr "缺少 consolehelper"
-#: crypto.pm:14 crypto.pm:28 lang.pm:238 network/adsl_consts.pm:44
+#: crypto.pm:14 crypto.pm:28 lang.pm:240 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
@@ -1548,61 +1549,61 @@ msgstr "缺少 consolehelper"
msgid "France"
msgstr "法国"
-#: crypto.pm:15 lang.pm:214
+#: crypto.pm:15 lang.pm:216
#, c-format
msgid "Costa Rica"
msgstr "哥斯达黎加"
-#: crypto.pm:16 crypto.pm:29 lang.pm:186 network/adsl_consts.pm:26
+#: crypto.pm:16 crypto.pm:29 lang.pm:188 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:219
+#: crypto.pm:17 crypto.pm:30 lang.pm:221
#, c-format
msgid "Czech Republic"
msgstr "捷克共和国"
-#: crypto.pm:18 crypto.pm:31 lang.pm:220 network/adsl_consts.pm:134
+#: crypto.pm:18 crypto.pm:31 lang.pm:222 network/adsl_consts.pm:134
#: network/adsl_consts.pm:142
#, c-format
msgid "Germany"
msgstr "德国"
-#: crypto.pm:19 crypto.pm:32 lang.pm:251
+#: crypto.pm:19 crypto.pm:32 lang.pm:253
#, c-format
msgid "Greece"
msgstr "希腊"
-#: crypto.pm:20 crypto.pm:33 lang.pm:324
+#: crypto.pm:20 crypto.pm:33 lang.pm:326
#, c-format
msgid "Norway"
msgstr "挪威"
-#: crypto.pm:21 crypto.pm:34 lang.pm:353 network/adsl_consts.pm:240
+#: crypto.pm:21 crypto.pm:34 lang.pm:355 network/adsl_consts.pm:240
#, c-format
msgid "Sweden"
msgstr "瑞典"
-#: crypto.pm:22 crypto.pm:36 lang.pm:323 network/adsl_consts.pm:178
+#: crypto.pm:22 crypto.pm:36 lang.pm:325 network/adsl_consts.pm:178
#: network/netconnect.pm:47
#, c-format
msgid "Netherlands"
msgstr "荷兰"
-#: crypto.pm:23 crypto.pm:37 lang.pm:271 network/adsl_consts.pm:158
+#: crypto.pm:23 crypto.pm:37 lang.pm:273 network/adsl_consts.pm:158
#: network/adsl_consts.pm:168 network/netconnect.pm:48 standalone/drakxtv:45
#, c-format
msgid "Italy"
msgstr "意大利"
-#: crypto.pm:24 crypto.pm:38 lang.pm:179 network/adsl_consts.pm:20
+#: crypto.pm:24 crypto.pm:38 lang.pm:181 network/adsl_consts.pm:20
#, c-format
msgid "Austria"
msgstr "奥地利"
-#: crypto.pm:35 crypto.pm:65 lang.pm:387 network/netconnect.pm:50
+#: crypto.pm:35 crypto.pm:65 lang.pm:389 network/netconnect.pm:50
#, c-format
msgid "United States"
msgstr "美国"
@@ -1624,23 +1625,18 @@ msgstr ""
msgid "New"
msgstr "新建"
-#: diskdrake/dav.pm:63 diskdrake/interactive.pm:417 diskdrake/smbnfs_gtk.pm:75
+#: diskdrake/dav.pm:63 diskdrake/interactive.pm:422 diskdrake/smbnfs_gtk.pm:75
#, c-format
msgid "Unmount"
msgstr "卸载"
-#: diskdrake/dav.pm:64 diskdrake/interactive.pm:414 diskdrake/smbnfs_gtk.pm:76
+#: diskdrake/dav.pm:64 diskdrake/interactive.pm:419 diskdrake/smbnfs_gtk.pm:76
#, c-format
msgid "Mount"
msgstr "挂载"
-#: diskdrake/dav.pm:65 help.pm:137
-#, c-format
-msgid "Server"
-msgstr "服务器"
-
-#: diskdrake/dav.pm:66 diskdrake/interactive.pm:408
-#: diskdrake/interactive.pm:616 diskdrake/interactive.pm:635
+#: diskdrake/dav.pm:66 diskdrake/interactive.pm:413
+#: diskdrake/interactive.pm:621 diskdrake/interactive.pm:640
#: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:79
#, c-format
msgid "Mount point"
@@ -1661,19 +1657,19 @@ msgstr "URL 应该是以 http:// 或 https:// 开头"
msgid "Server: "
msgstr "服务器: "
-#: diskdrake/dav.pm:112 diskdrake/interactive.pm:469
-#: diskdrake/interactive.pm:1149 diskdrake/interactive.pm:1225
+#: diskdrake/dav.pm:112 diskdrake/interactive.pm:474
+#: diskdrake/interactive.pm:1154 diskdrake/interactive.pm:1232
#, c-format
msgid "Mount point: "
msgstr "挂载点: "
-#: diskdrake/dav.pm:113 diskdrake/interactive.pm:1233
+#: diskdrake/dav.pm:113 diskdrake/interactive.pm:1240
#, c-format
msgid "Options: %s"
msgstr "选项: %s"
-#: diskdrake/hd_gtk.pm:96 diskdrake/interactive.pm:995
-#: diskdrake/interactive.pm:1005 diskdrake/interactive.pm:1065
+#: diskdrake/hd_gtk.pm:96 diskdrake/interactive.pm:1000
+#: diskdrake/interactive.pm:1010 diskdrake/interactive.pm:1070
#, c-format
msgid "Read carefully!"
msgstr "请仔细阅读!"
@@ -1720,7 +1716,7 @@ msgid "Please click on a partition"
msgstr "请选中一个分区"
#: diskdrake/hd_gtk.pm:209 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:477
-#: standalone/drakbackup:3040 standalone/drakbackup:3102
+#: standalone/drakbackup:2942 standalone/drakbackup:3004
#, c-format
msgid "Details"
msgstr "细节"
@@ -1761,12 +1757,12 @@ msgid "Windows"
msgstr "Windows"
#: diskdrake/hd_gtk.pm:327 install_steps_gtk.pm:329 mouse.pm:167
-#: services.pm:164 standalone/drakbackup:1673 standalone/drakperm:250
+#: services.pm:164 standalone/drakbackup:1582 standalone/drakperm:254
#, c-format
msgid "Other"
msgstr "其它"
-#: diskdrake/hd_gtk.pm:327 diskdrake/interactive.pm:1165
+#: diskdrake/hd_gtk.pm:327 diskdrake/interactive.pm:1172
#, c-format
msgid "Empty"
msgstr "空"
@@ -1782,20 +1778,21 @@ msgid "Use ``%s'' instead"
msgstr "用“%s”代替"
#: diskdrake/hd_gtk.pm:348 diskdrake/hd_gtk.pm:353
-#: diskdrake/interactive.pm:409 diskdrake/interactive.pm:569
+#: diskdrake/interactive.pm:414 diskdrake/interactive.pm:574
#: diskdrake/removable.pm:26 diskdrake/removable.pm:49
-#: standalone/harddrake2:67
+#: standalone/harddrake2:72
#, c-format
msgid "Type"
msgstr "类型"
-#: diskdrake/hd_gtk.pm:348 diskdrake/interactive.pm:431
+#: diskdrake/hd_gtk.pm:348 diskdrake/interactive.pm:436
#, c-format
msgid "Create"
msgstr "新建"
-#: diskdrake/hd_gtk.pm:350 diskdrake/interactive.pm:418
-#: standalone/drakperm:124 standalone/printerdrake:231
+#. -PO: "Delete" is a button text and the translation has to be AS SHORT AS POSSIBLE
+#: diskdrake/hd_gtk.pm:350 diskdrake/interactive.pm:423
+#: standalone/drakperm:124 standalone/printerdrake:236
#, c-format
msgid "Delete"
msgstr "删除"
@@ -1805,124 +1802,124 @@ msgstr "删除"
msgid "Use ``Unmount'' first"
msgstr "请先“Unmount”"
-#: diskdrake/interactive.pm:179
+#: diskdrake/interactive.pm:184
#, c-format
msgid "Choose another partition"
msgstr "选择其它分区"
-#: diskdrake/interactive.pm:179
+#: diskdrake/interactive.pm:184
#, c-format
msgid "Choose a partition"
msgstr "选择分区"
-#: diskdrake/interactive.pm:208
+#: diskdrake/interactive.pm:213
#, c-format
msgid "Exit"
msgstr "退出"
-#: diskdrake/interactive.pm:241 help.pm:544
+#: diskdrake/interactive.pm:246 help.pm:544
#, c-format
msgid "Undo"
msgstr "撤消"
-#: diskdrake/interactive.pm:241
+#: diskdrake/interactive.pm:246
#, c-format
msgid "Toggle to normal mode"
msgstr "切换到正常模式"
-#: diskdrake/interactive.pm:241
+#: diskdrake/interactive.pm:246
#, c-format
msgid "Toggle to expert mode"
msgstr "切换到专家模式"
-#: diskdrake/interactive.pm:260
+#: diskdrake/interactive.pm:265
#, c-format
msgid "Continue anyway?"
msgstr "仍然继续吗?"
-#: diskdrake/interactive.pm:265
+#: diskdrake/interactive.pm:270
#, c-format
msgid "Quit without saving"
msgstr "退出而不保存更改"
-#: diskdrake/interactive.pm:265
+#: diskdrake/interactive.pm:270
#, c-format
msgid "Quit without writing the partition table?"
msgstr "退出而不保存分区表吗?"
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:275
#, c-format
msgid "Do you want to save /etc/fstab modifications"
msgstr "您想要保存 /etc/fstab 修改吗?"
-#: diskdrake/interactive.pm:277 install_steps_interactive.pm:301
+#: diskdrake/interactive.pm:282 install_steps_interactive.pm:301
#, c-format
msgid "You need to reboot for the partition table modifications to take place"
msgstr "对分区表的更改要等到重新启动后才能生效"
-#: diskdrake/interactive.pm:290 help.pm:544
+#: diskdrake/interactive.pm:295 help.pm:544
#, c-format
msgid "Clear all"
msgstr "全部清除"
-#: diskdrake/interactive.pm:291 help.pm:544
+#: diskdrake/interactive.pm:296 help.pm:544
#, c-format
msgid "Auto allocate"
msgstr "自动分配"
-#: diskdrake/interactive.pm:297
+#: diskdrake/interactive.pm:302
#, c-format
msgid "Hard drive information"
msgstr "硬盘信息"
-#: diskdrake/interactive.pm:329
+#: diskdrake/interactive.pm:334
#, c-format
msgid "All primary partitions are used"
msgstr "主分区数目已经满了"
-#: diskdrake/interactive.pm:330
+#: diskdrake/interactive.pm:335
#, c-format
msgid "I can't add any more partitions"
msgstr "我无法再添加任何分区了"
-#: diskdrake/interactive.pm:331
+#: diskdrake/interactive.pm:336
#, c-format
msgid ""
"To have more partitions, please delete one to be able to create an extended "
"partition"
msgstr "如果需要更多的分区,请删除一个主分区以创建扩展分区"
-#: diskdrake/interactive.pm:342 help.pm:544
+#: diskdrake/interactive.pm:347 help.pm:544
#, c-format
msgid "Save partition table"
msgstr "保存分区表"
-#: diskdrake/interactive.pm:343 help.pm:544
+#: diskdrake/interactive.pm:348 help.pm:544
#, c-format
msgid "Restore partition table"
msgstr "恢复分区表"
-#: diskdrake/interactive.pm:344 help.pm:544
+#: diskdrake/interactive.pm:349 help.pm:544
#, c-format
msgid "Rescue partition table"
msgstr "抢救分区表"
-#: diskdrake/interactive.pm:346 help.pm:544
+#: diskdrake/interactive.pm:351 help.pm:544
#, c-format
msgid "Reload partition table"
msgstr "重新读取分区表"
-#: diskdrake/interactive.pm:348
+#: diskdrake/interactive.pm:353
#, c-format
msgid "Removable media automounting"
msgstr "自动装载可移动介质"
-#: diskdrake/interactive.pm:357 diskdrake/interactive.pm:377
+#: diskdrake/interactive.pm:362 diskdrake/interactive.pm:382
#, c-format
msgid "Select file"
msgstr "选择文件"
-#: diskdrake/interactive.pm:364
+#: diskdrake/interactive.pm:369
#, c-format
msgid ""
"The backup partition table has not the same size\n"
@@ -1931,24 +1928,23 @@ msgstr ""
"备份分区表的大小和原来的有所不同\n"
"仍然继续吗?"
-#: diskdrake/interactive.pm:378 harddrake/sound.pm:226 keyboard.pm:314
-#: network/netconnect.pm:338 network/netconnect.pm:451
-#: network/netconnect.pm:470 network/netconnect.pm:655
+#: diskdrake/interactive.pm:383 harddrake/sound.pm:226 keyboard.pm:340
+#: network/netconnect.pm:450 network/netconnect.pm:469
#: printer/printerdrake.pm:936 printer/printerdrake.pm:1891
#: printer/printerdrake.pm:1953 printer/printerdrake.pm:1987
#: printer/printerdrake.pm:2291 printer/printerdrake.pm:3149
#: printer/printerdrake.pm:3426 printer/printerdrake.pm:3545
-#: printer/printerdrake.pm:4543 standalone/drakTermServ:352
-#: standalone/drakTermServ:1083 standalone/drakTermServ:1139
-#: standalone/drakTermServ:1802 standalone/drakbackup:580
-#: standalone/drakbackup:678 standalone/drakboot:156 standalone/drakclock:212
-#: standalone/drakconnect:908 standalone/drakfloppy:295 standalone/drakups:27
-#: standalone/scannerdrake:50 standalone/scannerdrake:908
+#: printer/printerdrake.pm:4543 standalone/drakTermServ:340
+#: standalone/drakTermServ:1072 standalone/drakTermServ:1128
+#: standalone/drakTermServ:1801 standalone/drakbackup:510
+#: standalone/drakbackup:609 standalone/drakboot:156 standalone/drakclock:214
+#: standalone/drakconnect:921 standalone/drakfloppy:296 standalone/drakups:27
+#: standalone/scannerdrake:50 standalone/scannerdrake:913
#, c-format
msgid "Warning"
msgstr "警告"
-#: diskdrake/interactive.pm:379
+#: diskdrake/interactive.pm:384
#, c-format
msgid ""
"Insert a floppy in drive\n"
@@ -1957,92 +1953,92 @@ msgstr ""
"请在驱动器中插入一张软盘\n"
"这张软盘上所有的数据都将丢失"
-#: diskdrake/interactive.pm:390
+#: diskdrake/interactive.pm:395
#, c-format
msgid "Trying to rescue partition table"
msgstr "正在尝试恢复分区表"
-#: diskdrake/interactive.pm:396
+#: diskdrake/interactive.pm:401
#, c-format
msgid "Detailed information"
msgstr "详细信息"
-#: diskdrake/interactive.pm:411 diskdrake/interactive.pm:706
+#: diskdrake/interactive.pm:416 diskdrake/interactive.pm:711
#, c-format
msgid "Resize"
msgstr "改变大小"
-#: diskdrake/interactive.pm:412 diskdrake/interactive.pm:774
+#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:779
#, c-format
msgid "Move"
msgstr "移动"
-#: diskdrake/interactive.pm:413
+#: diskdrake/interactive.pm:418
#, c-format
msgid "Format"
msgstr "格式化"
-#: diskdrake/interactive.pm:415
+#: diskdrake/interactive.pm:420
#, c-format
msgid "Add to RAID"
msgstr "加入 RAID"
-#: diskdrake/interactive.pm:416
+#: diskdrake/interactive.pm:421
#, c-format
msgid "Add to LVM"
msgstr "加入 LVM"
-#: diskdrake/interactive.pm:419
+#: diskdrake/interactive.pm:424
#, c-format
msgid "Remove from RAID"
msgstr "从 RAID 中移除"
-#: diskdrake/interactive.pm:420
+#: diskdrake/interactive.pm:425
#, c-format
msgid "Remove from LVM"
msgstr "从 LVM 中移除"
-#: diskdrake/interactive.pm:421
+#: diskdrake/interactive.pm:426
#, c-format
msgid "Modify RAID"
msgstr "修改 RAID"
-#: diskdrake/interactive.pm:422
+#: diskdrake/interactive.pm:427
#, c-format
msgid "Use for loopback"
msgstr "用于回环"
-#: diskdrake/interactive.pm:462
+#: diskdrake/interactive.pm:467
#, c-format
msgid "Create a new partition"
msgstr "创建一个新分区"
-#: diskdrake/interactive.pm:465
+#: diskdrake/interactive.pm:470
#, c-format
msgid "Start sector: "
msgstr "开始扇区: "
-#: diskdrake/interactive.pm:467 diskdrake/interactive.pm:876
+#: diskdrake/interactive.pm:472 diskdrake/interactive.pm:881
#, c-format
msgid "Size in MB: "
msgstr "大小(MB): "
-#: diskdrake/interactive.pm:468 diskdrake/interactive.pm:877
+#: diskdrake/interactive.pm:473 diskdrake/interactive.pm:882
#, c-format
msgid "Filesystem type: "
msgstr "文件系统类型: "
-#: diskdrake/interactive.pm:473
+#: diskdrake/interactive.pm:478
#, c-format
msgid "Preference: "
msgstr "首选项: "
-#: diskdrake/interactive.pm:476
+#: diskdrake/interactive.pm:481
#, c-format
msgid "Logical volume name "
msgstr "逻辑卷标"
-#: diskdrake/interactive.pm:505
+#: diskdrake/interactive.pm:510
#, c-format
msgid ""
"You can't create a new partition\n"
@@ -2053,43 +2049,43 @@ msgstr ""
"(您超过了允许的主分区数量)。\n"
"请先删除一个主分区,然后创建一个扩展分区。"
-#: diskdrake/interactive.pm:535
+#: diskdrake/interactive.pm:540
#, c-format
msgid "Remove the loopback file?"
msgstr "删除回环(loopback)文件?"
-#: diskdrake/interactive.pm:554
+#: diskdrake/interactive.pm:559
#, c-format
msgid ""
"After changing type of partition %s, all data on this partition will be lost"
msgstr "在改变分区表 %s 的类型之后,在这个分区上的所有资料将要被清除"
-#: diskdrake/interactive.pm:565
+#: diskdrake/interactive.pm:570
#, c-format
msgid "Change partition type"
msgstr "更改分区类型"
-#: diskdrake/interactive.pm:566 diskdrake/removable.pm:48
+#: diskdrake/interactive.pm:571 diskdrake/removable.pm:48
#, c-format
msgid "Which filesystem do you want?"
msgstr "您希望使用哪种文件系统?"
-#: diskdrake/interactive.pm:574
+#: diskdrake/interactive.pm:579
#, c-format
msgid "Switching from ext2 to ext3"
msgstr "把 ext2 升级到 ext3"
-#: diskdrake/interactive.pm:603
+#: diskdrake/interactive.pm:608
#, c-format
msgid "Where do you want to mount the loopback file %s?"
msgstr "您想把回环(loopback)文件 %s 挂载到哪里?"
-#: diskdrake/interactive.pm:604
+#: diskdrake/interactive.pm:609
#, c-format
msgid "Where do you want to mount device %s?"
msgstr "您想把设备 %s 挂载到哪里?"
-#: diskdrake/interactive.pm:609
+#: diskdrake/interactive.pm:614
#, c-format
msgid ""
"Can't unset mount point as this partition is used for loop back.\n"
@@ -2098,48 +2094,48 @@ msgstr ""
"无法取消设定的挂载点,因为该分区正用于回环。\n"
"请先删除回环"
-#: diskdrake/interactive.pm:634
+#: diskdrake/interactive.pm:639
#, c-format
msgid "Where do you want to mount %s?"
msgstr "您想把 %s 挂载到哪里?"
-#: diskdrake/interactive.pm:658 diskdrake/interactive.pm:738
+#: diskdrake/interactive.pm:663 diskdrake/interactive.pm:743
#: install_interactive.pm:156 install_interactive.pm:186
#, c-format
msgid "Resizing"
msgstr "改变大小"
-#: diskdrake/interactive.pm:658
+#: diskdrake/interactive.pm:663
#, c-format
msgid "Computing FAT filesystem bounds"
msgstr "计算 FAT 文件系统的边界"
-#: diskdrake/interactive.pm:694
+#: diskdrake/interactive.pm:699
#, c-format
msgid "This partition is not resizeable"
msgstr "无法更改此分区的大小"
-#: diskdrake/interactive.pm:699
+#: diskdrake/interactive.pm:704
#, c-format
msgid "All data on this partition should be backed-up"
msgstr "应该先备份在这个分区上的所有数据"
-#: diskdrake/interactive.pm:701
+#: diskdrake/interactive.pm:706
#, c-format
msgid "After resizing partition %s, all data on this partition will be lost"
msgstr "改变分区 %s 的大小之后,这个分区上现有的所有资料将被清除"
-#: diskdrake/interactive.pm:706
+#: diskdrake/interactive.pm:711
#, c-format
msgid "Choose the new size"
msgstr "选择新的大小"
-#: diskdrake/interactive.pm:707
+#: diskdrake/interactive.pm:712
#, c-format
msgid "New size in MB: "
msgstr "新大小(MB): "
-#: diskdrake/interactive.pm:751 install_interactive.pm:194
+#: diskdrake/interactive.pm:756 install_interactive.pm:194
#, c-format
msgid ""
"To ensure data integrity after resizing the partition(s), \n"
@@ -2148,147 +2144,147 @@ msgstr ""
"为了保证更改分区大小之后的数据完整性,在您下次启动进入 Windows(TM) 时可能\n"
"会自动运行文件系统检查。"
-#: diskdrake/interactive.pm:775
+#: diskdrake/interactive.pm:780
#, c-format
msgid "Which disk do you want to move it to?"
msgstr "您想移动它到哪个盘?"
-#: diskdrake/interactive.pm:776
+#: diskdrake/interactive.pm:781
#, c-format
msgid "Sector"
msgstr "扇区"
-#: diskdrake/interactive.pm:777
+#: diskdrake/interactive.pm:782
#, c-format
msgid "Which sector do you want to move it to?"
msgstr "您想移动它到哪个扇区?"
-#: diskdrake/interactive.pm:780
+#: diskdrake/interactive.pm:785
#, c-format
msgid "Moving"
msgstr "移动中"
-#: diskdrake/interactive.pm:780
+#: diskdrake/interactive.pm:785
#, c-format
msgid "Moving partition..."
msgstr "正在移动分区..."
-#: diskdrake/interactive.pm:802
+#: diskdrake/interactive.pm:807
#, c-format
msgid "Choose an existing RAID to add to"
msgstr "选择加入一个已存在的 RAID"
-#: diskdrake/interactive.pm:803 diskdrake/interactive.pm:820
+#: diskdrake/interactive.pm:808 diskdrake/interactive.pm:825
#, c-format
msgid "new"
msgstr "新建"
-#: diskdrake/interactive.pm:818
+#: diskdrake/interactive.pm:823
#, c-format
msgid "Choose an existing LVM to add to"
msgstr "选择加入一个已存在的 LVM"
-#: diskdrake/interactive.pm:824
+#: diskdrake/interactive.pm:829
#, c-format
msgid "LVM name?"
msgstr "LVM 名称?"
-#: diskdrake/interactive.pm:861
+#: diskdrake/interactive.pm:866
#, c-format
msgid "This partition can't be used for loopback"
msgstr "这个分区不能被用于回环"
-#: diskdrake/interactive.pm:874
+#: diskdrake/interactive.pm:879
#, c-format
msgid "Loopback"
msgstr "回环"
-#: diskdrake/interactive.pm:875
+#: diskdrake/interactive.pm:880
#, c-format
msgid "Loopback file name: "
msgstr "回环文件名: "
-#: diskdrake/interactive.pm:880
+#: diskdrake/interactive.pm:885
#, c-format
msgid "Give a file name"
msgstr "给一个文件名"
-#: diskdrake/interactive.pm:883
+#: diskdrake/interactive.pm:888
#, c-format
msgid "File is already used by another loopback, choose another one"
msgstr "文件已经被另一个回环使用,请另外选择一个"
-#: diskdrake/interactive.pm:884
+#: diskdrake/interactive.pm:889
#, c-format
msgid "File already exists. Use it?"
msgstr "文件已经存在。使用现有的文件吗?"
-#: diskdrake/interactive.pm:907
+#: diskdrake/interactive.pm:912
#, c-format
msgid "Mount options"
msgstr "挂载选项"
-#: diskdrake/interactive.pm:914
+#: diskdrake/interactive.pm:919
#, c-format
msgid "Various"
msgstr "杂项"
-#: diskdrake/interactive.pm:978
+#: diskdrake/interactive.pm:983
#, c-format
msgid "device"
msgstr "设备"
-#: diskdrake/interactive.pm:979
+#: diskdrake/interactive.pm:984
#, c-format
msgid "level"
msgstr "级别"
-#: diskdrake/interactive.pm:980
+#: diskdrake/interactive.pm:985
#, c-format
msgid "chunk size"
msgstr "组块大小"
-#: diskdrake/interactive.pm:996
+#: diskdrake/interactive.pm:1001
#, c-format
msgid "Be careful: this operation is dangerous."
msgstr "小心: 该操作有危险。"
-#: diskdrake/interactive.pm:1011
+#: diskdrake/interactive.pm:1016
#, c-format
msgid "What type of partitioning?"
msgstr "何种分区类型?"
-#: diskdrake/interactive.pm:1027
+#: diskdrake/interactive.pm:1032
#, c-format
msgid "The package %s is needed. Install it?"
msgstr "需要安装软件包 %s。您同意安装吗?"
-#: diskdrake/interactive.pm:1056
+#: diskdrake/interactive.pm:1061
#, c-format
msgid "You'll need to reboot before the modification can take place"
msgstr "修改要等到重新启动后才能生效"
-#: diskdrake/interactive.pm:1065
+#: diskdrake/interactive.pm:1070
#, c-format
msgid "Partition table of drive %s is going to be written to disk!"
msgstr "驱动器 %s 的分区表将会写入磁盘中!"
-#: diskdrake/interactive.pm:1078
+#: diskdrake/interactive.pm:1083
#, c-format
msgid "After formatting partition %s, all data on this partition will be lost"
msgstr "格式化分区 %s 之后,该分区上的所有数据都将丢失"
-#: diskdrake/interactive.pm:1095
+#: diskdrake/interactive.pm:1100
#, c-format
msgid "Move files to the new partition"
msgstr "移动文件到新分区"
-#: diskdrake/interactive.pm:1095
+#: diskdrake/interactive.pm:1100
#, c-format
msgid "Hide files"
msgstr "隐藏文件"
-#: diskdrake/interactive.pm:1096
+#: diskdrake/interactive.pm:1101
#, c-format
msgid ""
"Directory %s already contains data\n"
@@ -2297,93 +2293,103 @@ msgstr ""
"目录 %s 已经包含数据\n"
"(%s)"
-#: diskdrake/interactive.pm:1107
+#: diskdrake/interactive.pm:1112
#, c-format
msgid "Moving files to the new partition"
msgstr "移动文件到新分区"
-#: diskdrake/interactive.pm:1111
+#: diskdrake/interactive.pm:1116
#, c-format
msgid "Copying %s"
msgstr "复制 %s"
-#: diskdrake/interactive.pm:1115
+#: diskdrake/interactive.pm:1120
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
-#: diskdrake/interactive.pm:1129
+#: diskdrake/interactive.pm:1134
#, c-format
msgid "partition %s is now known as %s"
msgstr "分区 %s 现在被识别为 %s"
-#: diskdrake/interactive.pm:1150 diskdrake/interactive.pm:1210
+#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1217
#, c-format
msgid "Device: "
msgstr "设备: "
-#: diskdrake/interactive.pm:1151
+#: diskdrake/interactive.pm:1156
+#, c-format
+msgid "Devfs name: "
+msgstr "Devfs 名称: "
+
+#: diskdrake/interactive.pm:1157
+#, c-format
+msgid "Volume label: "
+msgstr "卷标: "
+
+#: diskdrake/interactive.pm:1158
#, c-format
msgid "DOS drive letter: %s (just a guess)\n"
msgstr "DOS 下的盘符: %s(只是猜测)\n"
-#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1163
-#: diskdrake/interactive.pm:1229
+#: diskdrake/interactive.pm:1162 diskdrake/interactive.pm:1170
+#: diskdrake/interactive.pm:1236
#, c-format
msgid "Type: "
msgstr "类型: "
-#: diskdrake/interactive.pm:1159 install_steps_gtk.pm:341
+#: diskdrake/interactive.pm:1166 install_steps_gtk.pm:341
#, c-format
msgid "Name: "
msgstr "名称: "
-#: diskdrake/interactive.pm:1167
+#: diskdrake/interactive.pm:1174
#, c-format
msgid "Start: sector %s\n"
msgstr "开始: 第 %s 扇区\n"
-#: diskdrake/interactive.pm:1168
+#: diskdrake/interactive.pm:1175
#, c-format
msgid "Size: %s"
msgstr "大小: %s"
-#: diskdrake/interactive.pm:1170
+#: diskdrake/interactive.pm:1177
#, c-format
msgid ", %s sectors"
msgstr ",%s 扇区"
-#: diskdrake/interactive.pm:1172
+#: diskdrake/interactive.pm:1179
#, c-format
msgid "Cylinder %d to %d\n"
msgstr "柱面 %d 到 %d\n"
-#: diskdrake/interactive.pm:1173
+#: diskdrake/interactive.pm:1180
#, c-format
msgid "Number of logical extents: %d"
msgstr "逻辑扩展分区数: %d"
-#: diskdrake/interactive.pm:1174
+#: diskdrake/interactive.pm:1181
#, c-format
msgid "Formatted\n"
msgstr "已格式化\n"
-#: diskdrake/interactive.pm:1175
+#: diskdrake/interactive.pm:1182
#, c-format
msgid "Not formatted\n"
msgstr "未格式化\n"
-#: diskdrake/interactive.pm:1176
+#: diskdrake/interactive.pm:1183
#, c-format
msgid "Mounted\n"
msgstr "已挂载\n"
-#: diskdrake/interactive.pm:1177
+#: diskdrake/interactive.pm:1184
#, c-format
msgid "RAID md%s\n"
msgstr "RAID md%s\n"
-#: diskdrake/interactive.pm:1179
+#: diskdrake/interactive.pm:1186
#, c-format
msgid ""
"Loopback file(s):\n"
@@ -2392,7 +2398,7 @@ msgstr ""
"回环文件: \n"
" %s\n"
-#: diskdrake/interactive.pm:1180
+#: diskdrake/interactive.pm:1187
#, c-format
msgid ""
"Partition booted by default\n"
@@ -2401,27 +2407,27 @@ msgstr ""
"预设的启动分区\n"
" (给 MS-DOS 启动用的,跟 lilo 无关)\n"
-#: diskdrake/interactive.pm:1182
+#: diskdrake/interactive.pm:1189
#, c-format
msgid "Level %s\n"
msgstr "级别 %s\n"
-#: diskdrake/interactive.pm:1183
+#: diskdrake/interactive.pm:1190
#, c-format
msgid "Chunk size %s\n"
msgstr "组块大小 %s\n"
-#: diskdrake/interactive.pm:1184
+#: diskdrake/interactive.pm:1191
#, c-format
msgid "RAID-disks %s\n"
msgstr "RAID 磁盘 %s\n"
-#: diskdrake/interactive.pm:1186
+#: diskdrake/interactive.pm:1193
#, c-format
msgid "Loopback file name: %s"
msgstr "回环文件名称: %s"
-#: diskdrake/interactive.pm:1189
+#: diskdrake/interactive.pm:1196
#, c-format
msgid ""
"\n"
@@ -2433,7 +2439,7 @@ msgstr ""
"此分区很可能是驱动器分区。\n"
"您最好请不要更改它。\n"
-#: diskdrake/interactive.pm:1192
+#: diskdrake/interactive.pm:1199
#, c-format
msgid ""
"\n"
@@ -2445,68 +2451,68 @@ msgstr ""
"该 Bootstrap 分区特别\n"
"是保留给双重启动系统。\n"
-#: diskdrake/interactive.pm:1211
+#: diskdrake/interactive.pm:1218
#, c-format
msgid "Read-only"
msgstr "只读"
-#: diskdrake/interactive.pm:1212
+#: diskdrake/interactive.pm:1219
#, c-format
msgid "Size: %s\n"
msgstr "大小: %s\n"
-#: diskdrake/interactive.pm:1213
+#: diskdrake/interactive.pm:1220
#, c-format
msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
msgstr "硬盘参数: %s 柱面,%s 磁头,%s 扇区\n"
-#: diskdrake/interactive.pm:1214
+#: diskdrake/interactive.pm:1221
#, c-format
msgid "Info: "
msgstr "信息: "
-#: diskdrake/interactive.pm:1215
+#: diskdrake/interactive.pm:1222
#, c-format
msgid "LVM-disks %s\n"
msgstr "LVM 磁盘 %s\n"
-#: diskdrake/interactive.pm:1216
+#: diskdrake/interactive.pm:1223
#, c-format
msgid "Partition table type: %s\n"
msgstr "分区表类型: %s\n"
-#: diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1224
#, c-format
msgid "on channel %d id %d\n"
msgstr "通道 %d id %d\n"
-#: diskdrake/interactive.pm:1250
+#: diskdrake/interactive.pm:1257
#, c-format
msgid "Filesystem encryption key"
msgstr "文件系统加密密钥"
-#: diskdrake/interactive.pm:1251
+#: diskdrake/interactive.pm:1258
#, c-format
msgid "Choose your filesystem encryption key"
msgstr "选择该文件系统的加密密钥"
-#: diskdrake/interactive.pm:1254
+#: diskdrake/interactive.pm:1261
#, c-format
msgid "This encryption key is too simple (must be at least %d characters long)"
msgstr "这个加密密钥太简单了(至少要有 %d 个字符)"
-#: diskdrake/interactive.pm:1255
+#: diskdrake/interactive.pm:1262
#, c-format
msgid "The encryption keys do not match"
msgstr "两次加密密钥不符"
-#: diskdrake/interactive.pm:1258 network/netconnect.pm:987
-#: standalone/drakconnect:393
+#: diskdrake/interactive.pm:1265 network/netconnect.pm:979
+#: standalone/drakconnect:404
#, c-format
msgid "Encryption key"
msgstr "加密密钥"
-#: diskdrake/interactive.pm:1259
+#: diskdrake/interactive.pm:1266
#, c-format
msgid "Encryption key (again)"
msgstr "加密密钥(再输入一次)"
@@ -2542,16 +2548,11 @@ msgid ""
"Please enter your username, password and domain name to access this host."
msgstr "要访问此主机,请输入您的用户名,密码和域名"
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3591
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3495
#, c-format
msgid "Username"
msgstr "用户名"
-#: diskdrake/smbnfs_gtk.pm:181
-#, c-format
-msgid "Domain"
-msgstr "域"
-
#: diskdrake/smbnfs_gtk.pm:205
#, c-format
msgid "Search servers"
@@ -2582,7 +2583,7 @@ msgstr "正在安装软件包..."
msgid "Removing packages..."
msgstr "正在删除软件包..."
-#: fs.pm:409
+#: fs.pm:416
#, c-format
msgid ""
"Do not update inode access times on this file system\n"
@@ -2591,7 +2592,7 @@ msgstr ""
"不在此文件系统更新 inode 访问次数\n"
"(例如,为了加速对新闻服务器的新闻池的访问)"
-#: fs.pm:412
+#: fs.pm:419
#, c-format
msgid ""
"Can only be mounted explicitly (i.e.,\n"
@@ -2600,12 +2601,12 @@ msgstr ""
"只能显式装载。\n"
"(即,-a 选项将不会装载文件系统)"
-#: fs.pm:415
+#: fs.pm:422
#, c-format
msgid "Do not interpret character or block special devices on the file system."
msgstr "不解释文件系统中的字符或特殊块设备。"
-#: fs.pm:417
+#: fs.pm:424
#, c-format
msgid ""
"Do not allow execution of any binaries on the mounted\n"
@@ -2616,7 +2617,7 @@ msgstr ""
"此选项对于特定服务器可能非常有用,比如服务器所包含的文件系统中包含其它\n"
"架构的二进制文件。"
-#: fs.pm:421
+#: fs.pm:428
#, c-format
msgid ""
"Do not allow set-user-identifier or set-group-identifier\n"
@@ -2626,17 +2627,17 @@ msgstr ""
"不允许 set-user-identifier 或 set-group-identifier 位生效。\n"
"(这可能比较安全,如果您安装了 suidperl(1) 则不太安全。)"
-#: fs.pm:425
+#: fs.pm:432
#, c-format
msgid "Mount the file system read-only."
msgstr "以只读装载文件系统。"
-#: fs.pm:427
+#: fs.pm:434
#, c-format
msgid "All I/O to the file system should be done synchronously."
msgstr "所有到文件系统的输入/输出都应该是同步完成的。"
-#: fs.pm:431
+#: fs.pm:438
#, c-format
msgid ""
"Allow an ordinary user to mount the file system. The\n"
@@ -2650,57 +2651,57 @@ msgstr ""
"再次拆卸文件系统。此选项意味着选项 noexec,nosuid 以及 nodev(除非在选项\n"
"行中用单独的选项 user,exec,dev,suid 加以覆盖)。"
-#: fs.pm:439
+#: fs.pm:446
#, c-format
msgid "Give write access to ordinary users"
msgstr "给普通用户以写权限"
-#: fs.pm:441
+#: fs.pm:448
#, c-format
msgid "Give read-only access to ordinary users"
msgstr "给普通用户以只读权限"
-#: fs.pm:581 fs.pm:591 fs.pm:595 fs.pm:599 fs.pm:603 fs.pm:607 swap.pm:12
+#: fs.pm:588 fs.pm:598 fs.pm:602 fs.pm:606 fs.pm:610 fs.pm:614 swap.pm:12
#, c-format
msgid "%s formatting of %s failed"
msgstr "%s 格式化 %s 失败"
-#: fs.pm:648
+#: fs.pm:655
#, c-format
msgid "I don't know how to format %s in type %s"
msgstr "不知道如何将 %s 格式化成 %s 类型"
-#: fs.pm:655 fs.pm:662
+#: fs.pm:662 fs.pm:669
#, c-format
msgid "Formatting partition %s"
msgstr "正在格式化分区 %s"
-#: fs.pm:659
+#: fs.pm:666
#, c-format
msgid "Creating and formatting file %s"
msgstr "正在创建和格式化文件 %s"
-#: fs.pm:719 fs.pm:772
+#: fs.pm:726 fs.pm:775
#, c-format
msgid "Mounting partition %s"
msgstr "正在挂载分区 %s"
-#: fs.pm:720 fs.pm:773
+#: fs.pm:727 fs.pm:776
#, c-format
msgid "mounting partition %s in directory %s failed"
msgstr "将分区 %s 挂载于目录 %s 失败"
-#: fs.pm:740 fs.pm:748
+#: fs.pm:747 fs.pm:754
#, c-format
msgid "Checking %s"
msgstr "正在检查 %s"
-#: fs.pm:789 partition_table.pm:638
+#: fs.pm:792 partition_table.pm:639
#, c-format
msgid "error unmounting %s: %s"
msgstr "卸载 %s 出错: %s"
-#: fs.pm:821
+#: fs.pm:824
#, c-format
msgid "Enabling swap partition %s"
msgstr "正在启用 swap 分区 %s"
@@ -2720,7 +2721,7 @@ msgstr "有 /usr"
msgid "server"
msgstr "服务器"
-#: fsedit.pm:254
+#: fsedit.pm:263
#, c-format
msgid ""
"I can't read the partition table of device %s, it's too corrupted for me :(\n"
@@ -2737,32 +2738,32 @@ msgstr ""
"\n"
"您同意清除所有分区吗?\n"
-#: fsedit.pm:513
+#: fsedit.pm:524
#, c-format
msgid "You can't use JFS for partitions smaller than 16MB"
msgstr "您不能把 JFS(日志文件系统)用于小于 16 MB 的分区"
-#: fsedit.pm:514
+#: fsedit.pm:525
#, c-format
msgid "You can't use ReiserFS for partitions smaller than 32MB"
msgstr "您不能把 ReiserFS 用于小于 32 MB 的分区"
-#: fsedit.pm:533
+#: fsedit.pm:544
#, c-format
msgid "Mount points must begin with a leading /"
msgstr "挂载点必需要以 / 为开头"
-#: fsedit.pm:534
+#: fsedit.pm:545
#, c-format
msgid "Mount points should contain only alphanumerical characters"
msgstr "挂载点只能包含字母和数字"
-#: fsedit.pm:535
+#: fsedit.pm:546
#, c-format
msgid "There is already a partition with mount point %s\n"
msgstr "已经有一个分区的挂载点是 %s\n"
-#: fsedit.pm:537
+#: fsedit.pm:548
#, c-format
msgid ""
"You've selected a software RAID partition as root (/).\n"
@@ -2773,12 +2774,12 @@ msgstr ""
"如果没有一个 /boot 分区,各种启动引导程序都无法处理这种情况。\n"
"所以,请增加一个 /boot 分区。"
-#: fsedit.pm:540
+#: fsedit.pm:551
#, c-format
msgid "You can't use a LVM Logical Volume for mount point %s"
msgstr "不能用 LVM 逻辑卷做 %s 挂载点"
-#: fsedit.pm:542
+#: fsedit.pm:553
#, c-format
msgid ""
"You've selected a LVM Logical Volume as root (/).\n"
@@ -2789,195 +2790,203 @@ msgstr ""
"如果没有一个 /boot 分区,各种启动引导程序都无法处理这种情况。\n"
"所以,请增加一个 /boot 分区。"
-#: fsedit.pm:545
+#: fsedit.pm:556
#, 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:548 fsedit.pm:550
+#: fsedit.pm:559 fsedit.pm:561
#, c-format
msgid "This directory should remain within the root filesystem"
msgstr "这个目录应该保留在根文件系统中"
-#: fsedit.pm:552
+#: fsedit.pm:563 fsedit.pm:565
#, 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:554
+#: fsedit.pm:567
#, c-format
msgid "You can't use an encrypted file system for mount point %s"
msgstr "挂载点 %s 不能使用用加密的文件系统"
-#: fsedit.pm:615
+#: fsedit.pm:628
#, c-format
msgid "Not enough free space for auto-allocating"
msgstr "没有足够的空闲空间供自动分配"
-#: fsedit.pm:617
+#: fsedit.pm:630
#, c-format
msgid "Nothing to do"
msgstr "不做任何事"
-#: fsedit.pm:713
+#: fsedit.pm:726
#, c-format
msgid "Error opening %s for writing: %s"
msgstr "在打开 %s 写入时发生错误:%s"
-#: harddrake/data.pm:53
+#: harddrake/data.pm:55
#, c-format
msgid "Floppy"
msgstr "软盘"
-#: harddrake/data.pm:54
+#: harddrake/data.pm:65
#, c-format
msgid "Zip"
msgstr "Zip"
-#: harddrake/data.pm:55
+#: harddrake/data.pm:75
#, c-format
msgid "Disk"
msgstr "磁盘"
-#: harddrake/data.pm:56
+#: harddrake/data.pm:84
#, c-format
msgid "CDROM"
msgstr "CDROM"
-#: harddrake/data.pm:57
+#: harddrake/data.pm:94
#, c-format
msgid "CD/DVD burners"
msgstr "CD/DVD 刻录机"
-#: harddrake/data.pm:58
+#: harddrake/data.pm:104
#, c-format
msgid "DVD-ROM"
msgstr "DVD-ROM"
-#: harddrake/data.pm:59 standalone/drakbackup:2116
+#: harddrake/data.pm:114 standalone/drakbackup:2025
#, c-format
msgid "Tape"
msgstr "磁带机"
-#: harddrake/data.pm:60
+#: harddrake/data.pm:123
#, c-format
msgid "Videocard"
msgstr "显示卡"
-#: harddrake/data.pm:61
+#: harddrake/data.pm:133
#, c-format
msgid "Tvcard"
msgstr "电视卡"
-#: harddrake/data.pm:62
+#: harddrake/data.pm:142
#, c-format
msgid "Other MultiMedia devices"
msgstr "其它多媒体设备"
-#: harddrake/data.pm:63
+#: harddrake/data.pm:151
#, c-format
msgid "Soundcard"
msgstr "声卡"
-#: harddrake/data.pm:64
+#: harddrake/data.pm:160
#, c-format
msgid "Webcam"
msgstr "摄像头"
-#: harddrake/data.pm:68
+#: harddrake/data.pm:174
#, c-format
msgid "Processors"
msgstr "处理器"
-#: harddrake/data.pm:69
+#: harddrake/data.pm:183
#, c-format
msgid "ISDN adapters"
msgstr "ISDN 适配器"
-#: harddrake/data.pm:70
+#: harddrake/data.pm:192
#, c-format
msgid "Ethernetcard"
msgstr "以太网卡"
-#: harddrake/data.pm:78 network/netconnect.pm:465 standalone/drakconnect:272
-#: standalone/drakconnect:292 standalone/drakconnect:472
-#: standalone/drakconnect:473 standalone/drakconnect:576
+#: harddrake/data.pm:208 network/netconnect.pm:464
#, c-format
msgid "Modem"
msgstr "调制解调器"
-#: harddrake/data.pm:79
+#: harddrake/data.pm:217
#, c-format
msgid "ADSL adapters"
msgstr "ADSL 适配器"
-#: harddrake/data.pm:81
+#: harddrake/data.pm:230
#, c-format
msgid "AGP controllers"
msgstr "AGP 控制器"
-#: harddrake/data.pm:82
+#: harddrake/data.pm:239
#, c-format
msgid "Bridges and system controllers"
msgstr "桥接和系统控制器"
-#: harddrake/data.pm:83 help.pm:203 help.pm:991
-#: install_steps_interactive.pm:933 printer/printerdrake.pm:687
+#: harddrake/data.pm:248 help.pm:203 help.pm:991
+#: install_steps_interactive.pm:927 printer/printerdrake.pm:687
#: printer/printerdrake.pm:4175
#, c-format
msgid "Printer"
msgstr "打印机"
-#: harddrake/data.pm:85 help.pm:991 install_steps_interactive.pm:926
+#: harddrake/data.pm:257 help.pm:991 install_steps_interactive.pm:920
#, c-format
msgid "Mouse"
msgstr "鼠标"
-#: harddrake/data.pm:90
+#: harddrake/data.pm:271
#, c-format
msgid "Joystick"
msgstr "游戏杆"
-#: harddrake/data.pm:92
+#: harddrake/data.pm:281
#, c-format
msgid "(E)IDE/ATA controllers"
msgstr "(E)IDE/ATA 控制器"
-#: harddrake/data.pm:94
+#: harddrake/data.pm:290
+#, c-format
+msgid "SATA controllers"
+msgstr "SATA 控制器"
+
+#: harddrake/data.pm:299
#, c-format
msgid "Firewire controllers"
msgstr "火线控制器"
-#: harddrake/data.pm:95
+#: harddrake/data.pm:308
#, c-format
msgid "SCSI controllers"
msgstr "SCSI 控制器"
-#: harddrake/data.pm:96
+#: harddrake/data.pm:317
#, c-format
msgid "USB controllers"
msgstr "USB 控制器"
-#: harddrake/data.pm:97
+#: harddrake/data.pm:326
+#, c-format
+msgid "USB ports"
+msgstr "USB 端口"
+
+#: harddrake/data.pm:335
#, c-format
msgid "SMBus controllers"
msgstr "SMBus 控制器"
-#: harddrake/data.pm:98
+#: harddrake/data.pm:344
#, c-format
msgid "Scanner"
msgstr "扫描仪"
-#: harddrake/data.pm:100 standalone/harddrake2:319
+#: harddrake/data.pm:354 standalone/harddrake2:336
#, c-format
msgid "Unknown/Others"
msgstr "未知/其它"
-#: harddrake/data.pm:114
+#: harddrake/data.pm:374
#, c-format
msgid "cpu # "
msgstr "CPU # "
@@ -3188,22 +3197,22 @@ msgstr ""
msgid "Auto-detect"
msgstr "自动检测"
-#: harddrake/v4l.pm:69 harddrake/v4l.pm:227
+#: harddrake/v4l.pm:72 harddrake/v4l.pm:235
#, c-format
msgid "Unknown|Generic"
msgstr "未知|通用"
-#: harddrake/v4l.pm:102
+#: harddrake/v4l.pm:105
#, c-format
msgid "Unknown|CPH05X (bt878) [many vendors]"
msgstr "未知|CPH05X (bt878) [很多厂家] "
-#: harddrake/v4l.pm:103
+#: harddrake/v4l.pm:106
#, c-format
msgid "Unknown|CPH06X (bt878) [many vendors]"
msgstr "未知|CPH06X (bt878) [很多厂家]"
-#: harddrake/v4l.pm:289
+#: harddrake/v4l.pm:309
#, c-format
msgid ""
"For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-"
@@ -3215,37 +3224,37 @@ msgstr ""
"如果自动检测不适合您的卡,您可以在这里强制设定正确的调协器及卡的类型。只有必"
"要时才设置电视卡参数。"
-#: harddrake/v4l.pm:292
+#: harddrake/v4l.pm:312
#, c-format
msgid "Card model:"
msgstr "卡的型号: "
-#: harddrake/v4l.pm:293
+#: harddrake/v4l.pm:313
#, c-format
msgid "Tuner type:"
msgstr "调谐器类型: "
-#: harddrake/v4l.pm:294
+#: harddrake/v4l.pm:314
#, c-format
msgid "Number of capture buffers:"
msgstr "捕获缓冲区数量: "
-#: harddrake/v4l.pm:294
+#: harddrake/v4l.pm:314
#, c-format
msgid "number of capture buffers for mmap'ed capture"
msgstr "用于 mmap 捕获的缓冲区数量"
-#: harddrake/v4l.pm:296
+#: harddrake/v4l.pm:316
#, c-format
msgid "PLL setting:"
msgstr "PLL 设置: "
-#: harddrake/v4l.pm:297
+#: harddrake/v4l.pm:317
#, c-format
msgid "Radio support:"
msgstr "无线电支持: "
-#: harddrake/v4l.pm:297
+#: harddrake/v4l.pm:317
#, c-format
msgid "enable radio support"
msgstr "启用无线电支持"
@@ -3342,9 +3351,10 @@ msgstr ""
#: help.pm:52 help.pm:197 help.pm:444 help.pm:691 help.pm:784 help.pm:1005
#: install_steps_gtk.pm:277 interactive.pm:403 interactive/newt.pm:308
-#: network/netconnect.pm:271 network/tools.pm:206 printer/printerdrake.pm:3090
-#: standalone/drakTermServ:409 standalone/drakbackup:4199
-#: standalone/drakbackup:4229 standalone/drakbackup:4251 ugtk2.pm:510
+#: network/netconnect.pm:271 network/tools.pm:166 printer/printerdrake.pm:3090
+#: standalone/drakTermServ:397 standalone/drakbackup:3920
+#: standalone/drakbackup:4014 standalone/drakbackup:4031
+#: standalone/drakbackup:4049 ugtk2.pm:510
#, c-format
msgid "Next"
msgstr "下一步"
@@ -3623,17 +3633,17 @@ msgstr ""
"多台计算机,此选项可能非常有用。单击此图标后,您需要插入上次安装结束后创建的"
"软盘。参看最后一步的第二条提示,其中描述了如何创建这样的软盘。"
-#: help.pm:172 help.pm:301 help.pm:329 help.pm:457 install_any.pm:413
-#: interactive.pm:149 modules/interactive.pm:71 standalone/harddrake2:219
-#: ugtk2.pm:1074 wizards.pm:156
+#: help.pm:172 help.pm:301 help.pm:329 help.pm:457 install_any.pm:411
+#: interactive.pm:149 modules/interactive.pm:71 standalone/harddrake2:225
+#: ugtk2.pm:1083 wizards.pm:156
#, c-format
msgid "No"
msgstr "否"
-#: help.pm:172 help.pm:301 help.pm:457 install_any.pm:413 interactive.pm:149
+#: help.pm:172 help.pm:301 help.pm:457 install_any.pm:411 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
+#: standalone/harddrake2:224 ugtk2.pm:1083 wizards.pm:156
#, c-format
msgid "Yes"
msgstr "是"
@@ -3713,8 +3723,8 @@ msgstr ""
"同。"
#: help.pm:203 help.pm:581 help.pm:991 install_steps_gtk.pm:648
-#: standalone/drakbackup:2406 standalone/drakbackup:2414
-#: standalone/drakbackup:2422 standalone/drakbackup:2430
+#: standalone/drakbackup:2313 standalone/drakbackup:2321
+#: standalone/drakbackup:2329 standalone/drakbackup:2337
#, c-format
msgid "Configure"
msgstr "配置"
@@ -3784,7 +3794,7 @@ msgstr ""
"Internet。最好选择地理位置离您较近的时间服务器。此选项还会自动安装时间服务"
"器,这样您局域网中的其它计算机都能够进行自动校时了。"
-#: help.pm:235 install_steps_interactive.pm:828
+#: help.pm:235 install_steps_interactive.pm:822
#, c-format
msgid "Hardware clock set to GMT"
msgstr "您的系统时钟设定为 GMT"
@@ -4195,17 +4205,17 @@ msgstr ""
msgid "Generate auto-install floppy"
msgstr "生成自动安装软盘"
-#: help.pm:418 install_steps_interactive.pm:1322
+#: help.pm:418 install_steps_interactive.pm:1316
#, c-format
msgid "Replay"
msgstr "重现"
-#: help.pm:418 install_steps_interactive.pm:1322
+#: help.pm:418 install_steps_interactive.pm:1316
#, c-format
msgid "Automated"
msgstr "自动"
-#: help.pm:418 install_steps_interactive.pm:1325
+#: help.pm:418 install_steps_interactive.pm:1319
#, c-format
msgid "Save packages selection"
msgstr "保存软件包选择"
@@ -4260,11 +4270,9 @@ msgstr ""
#: help.pm:444 help.pm:1005 install_steps_gtk.pm:433 interactive.pm:404
#: interactive/newt.pm:307 printer/printerdrake.pm:3088
-#: standalone/drakTermServ:388 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
+#: standalone/drakTermServ:376 standalone/drakbackup:3880
+#: standalone/drakbackup:3919 standalone/drakbackup:4030
+#: standalone/drakbackup:4045 ugtk2.pm:508
#, c-format
msgid "Previous"
msgstr "上一步"
@@ -4298,7 +4306,7 @@ msgstr ""
"清单: 检查选项然后单击\"%s\"来获取并安装选中的软件包,要停止请单击\"%s\"。"
#: help.pm:457 help.pm:602 install_steps_gtk.pm:432
-#: install_steps_interactive.pm:148 standalone/drakbackup:4279
+#: install_steps_interactive.pm:148 standalone/drakbackup:4077
#, c-format
msgid "Install"
msgstr "安装"
@@ -4862,7 +4870,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:1152
+#: help.pm:733 install_steps_interactive.pm:1146
#, c-format
msgid "No password"
msgstr "无密码"
@@ -4994,7 +5002,7 @@ msgstr ""
"启动盘才能在需要的时候引导其它操作系统!"
#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#: standalone/drakbackup:1604 standalone/drakfont:589 standalone/drakfont:655
+#: standalone/drakbackup:1513 standalone/drakfont:589 standalone/drakfont:655
#: standalone/drakups:280 standalone/drakups:329 standalone/drakups:349
#: standalone/drakvpn:333 standalone/drakvpn:694
#, c-format
@@ -5308,8 +5316,8 @@ msgstr ""
"\"%s\": 如果在您的系统中检测到了声卡,则会在此处显示。如果您发现在此显示的声"
"卡与您系统中实际安装的声卡并不相同,您可以单击该按钮选择其它驱动程序。"
-#: help.pm:929 help.pm:991 install_steps_interactive.pm:960
-#: install_steps_interactive.pm:977
+#: help.pm:929 help.pm:991 install_steps_interactive.pm:954
+#: install_steps_interactive.pm:971
#, c-format
msgid "Sound card"
msgstr "声卡"
@@ -5431,12 +5439,12 @@ msgstr ""
"用作服务器,那么应该复查这一设置。"
#: help.pm:991 install_steps_interactive.pm:110
-#: install_steps_interactive.pm:893 standalone/keyboarddrake:23
+#: install_steps_interactive.pm:887 standalone/keyboarddrake:23
#, c-format
msgid "Keyboard"
msgstr "键盘"
-#: help.pm:991 install_steps_interactive.pm:919 standalone/drakclock:75
+#: help.pm:991 install_steps_interactive.pm:913 standalone/drakclock:75
#, c-format
msgid "Timezone"
msgstr "时区"
@@ -5446,7 +5454,7 @@ msgstr "时区"
msgid "Graphical Interface"
msgstr "图形界面"
-#: help.pm:991 install_steps_interactive.pm:993
+#: help.pm:991 install_steps_interactive.pm:987
#, c-format
msgid "TV card"
msgstr "电视卡"
@@ -5456,27 +5464,27 @@ msgstr "电视卡"
msgid "ISDN card"
msgstr "ISDN 卡"
-#: help.pm:991 install_steps_interactive.pm:1011 standalone/drakbackup:2101
+#: help.pm:991 install_steps_interactive.pm:1005 standalone/drakbackup:2010
#, c-format
msgid "Network"
msgstr "网络"
-#: help.pm:991 install_steps_interactive.pm:1037
+#: help.pm:991 install_steps_interactive.pm:1031
#, c-format
msgid "Security Level"
msgstr "安全级别"
-#: help.pm:991 install_steps_interactive.pm:1051
+#: help.pm:991 install_steps_interactive.pm:1045
#, c-format
msgid "Firewall"
msgstr "防火墙"
-#: help.pm:991 install_steps_interactive.pm:1065
+#: help.pm:991 install_steps_interactive.pm:1059
#, c-format
msgid "Bootloader"
msgstr "引导程序"
-#: help.pm:991 install_steps_interactive.pm:1075 services.pm:195
+#: help.pm:991 install_steps_interactive.pm:1069 services.pm:195
#, c-format
msgid "Services"
msgstr "服务"
@@ -5522,7 +5530,7 @@ msgstr ""
msgid "You must also format %s"
msgstr "您还必须格式化 %s"
-#: install_any.pm:404
+#: install_any.pm:402
#, c-format
msgid ""
"You have selected the following server(s): %s\n"
@@ -5544,7 +5552,7 @@ msgstr ""
"\n"
"您真要安装这些服务器吗?\n"
-#: install_any.pm:425
+#: install_any.pm:423
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -5557,29 +5565,29 @@ msgstr ""
"\n"
"您确定要删除这些软件包吗?\n"
-#: install_any.pm:820
+#: install_any.pm:818
#, c-format
msgid "Insert a FAT formatted floppy in drive %s"
msgstr "请在驱动器 %s 中插入一张 FAT 格式的软盘"
-#: install_any.pm:824
+#: install_any.pm:822
#, c-format
msgid "This floppy is not FAT formatted"
msgstr "该软盘不是 FAT 格式"
-#: install_any.pm:836
+#: install_any.pm:834
#, c-format
msgid ""
"To use this saved packages selection, boot installation with ``linux "
"defcfg=floppy''"
msgstr "使用保存的软件包选择,以“linux defcfg=floppy”启动"
-#: install_any.pm:864 partition_table.pm:847
+#: install_any.pm:862 partition_table.pm:848
#, c-format
msgid "Error reading file %s"
msgstr "请取文件 %s 出错"
-#: install_any.pm:988
+#: install_any.pm:987
#, c-format
msgid ""
"An error occurred - no valid devices were found on which to create new "
@@ -5628,7 +5636,7 @@ msgstr ""
"\n"
"要继续吗?"
-#: install_interactive.pm:70 install_steps.pm:206
+#: install_interactive.pm:70 install_steps.pm:207
#, c-format
msgid "You must have a FAT partition mounted in /boot/efi"
msgstr "您必须有一个FAT分区载入 /boot/efi"
@@ -6093,12 +6101,12 @@ msgstr ""
msgid "http://www.mandrakelinux.com/en/100errata.php3"
msgstr "http://www.mandrakelinux.com/en/100errata.php3"
-#: install_steps.pm:241
+#: install_steps.pm:242
#, c-format
msgid "Duplicate mount point %s"
msgstr "重复的挂载点 %s"
-#: install_steps.pm:406
+#: install_steps.pm:407
#, c-format
msgid ""
"Some important packages didn't get installed properly.\n"
@@ -6110,7 +6118,7 @@ msgstr ""
"您的光盘或者驱动器可能有缺陷。\n"
"请在一台安装好的电脑上检查光盘,命令是“rpm -qpl Mandrake/RPMS/*.rpm”\n"
-#: install_steps.pm:535
+#: install_steps.pm:533
#, c-format
msgid "No floppy drive available"
msgstr "没有可用的软盘驱动器"
@@ -6328,8 +6336,8 @@ msgstr "真的要继续?"
msgid "There was an error installing packages:"
msgstr "安装软件包时出错: "
-#: install_steps_gtk.pm:658 install_steps_interactive.pm:875
-#: install_steps_interactive.pm:1027
+#: install_steps_gtk.pm:658 install_steps_interactive.pm:869
+#: install_steps_interactive.pm:1021
#, c-format
msgid "not configured"
msgstr "未配置"
@@ -6351,7 +6359,7 @@ msgstr "请选择您使用的键盘布局。"
#: install_steps_interactive.pm:113
#, c-format
-msgid "Here is the full list of keyboards available"
+msgid "Here is the full list of available keyboards"
msgstr "在此列出了可用的全部键盘"
#: install_steps_interactive.pm:143
@@ -6424,7 +6432,7 @@ msgstr "IDE"
msgid "Configuring IDE"
msgstr "配置 IDE"
-#: install_steps_interactive.pm:248 network/tools.pm:195
+#: install_steps_interactive.pm:248 network/tools.pm:155
#, c-format
msgid "No partition available"
msgstr "没有可用的硬盘分区"
@@ -6600,15 +6608,10 @@ msgstr "安装后的配置"
#: install_steps_interactive.pm:727
#, c-format
-msgid "Please insert the Boot floppy used in drive %s"
-msgstr "请在驱动器 %s 中插入启动盘"
-
-#: install_steps_interactive.pm:733
-#, c-format
msgid "Please insert the Update Modules floppy in drive %s"
msgstr "请在驱动器 %s 中插入一张更新模块软盘"
-#: install_steps_interactive.pm:754
+#: install_steps_interactive.pm:748
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -6627,176 +6630,178 @@ msgstr ""
"\n"
"您是否要安装升级包?"
-#: install_steps_interactive.pm:775
+#: install_steps_interactive.pm:769
#, c-format
msgid ""
"Contacting Mandrakelinux web site to get the list of available mirrors..."
msgstr "正在连接 Mandrakelinux 网站以获得镜像网站列表..."
-#: install_steps_interactive.pm:780
+#: install_steps_interactive.pm:774
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "选择一个镜像网站来取得程序"
-#: install_steps_interactive.pm:794
+#: install_steps_interactive.pm:788
#, c-format
msgid "Contacting the mirror to get the list of available packages..."
msgstr "正在连接镜像网站以取得可供安装程序的列表..."
-#: install_steps_interactive.pm:798
+#: install_steps_interactive.pm:792
#, c-format
msgid "Unable to contact mirror %s"
msgstr "无法连接镜像 %s"
-#: install_steps_interactive.pm:798
+#: install_steps_interactive.pm:792
#, c-format
msgid "Would you like to try again?"
msgstr "您是否想要再试一次?"
-#: install_steps_interactive.pm:824 standalone/drakclock:45
+#: install_steps_interactive.pm:818 standalone/drakclock:45
#, c-format
msgid "Which is your timezone?"
msgstr "您所在的时区?"
-#: install_steps_interactive.pm:829
+#: install_steps_interactive.pm:823
#, c-format
msgid "Automatic time synchronization (using NTP)"
msgstr "自动时间同步(使用 NTP)"
-#: install_steps_interactive.pm:837
+#: install_steps_interactive.pm:831
#, c-format
msgid "NTP Server"
msgstr "NTP 服务器"
-#: install_steps_interactive.pm:879 steps.pm:30
+#: install_steps_interactive.pm:873 steps.pm:30
#, c-format
msgid "Summary"
msgstr "概要"
-#: install_steps_interactive.pm:892 install_steps_interactive.pm:900
-#: install_steps_interactive.pm:918 install_steps_interactive.pm:925
-#: install_steps_interactive.pm:1074 services.pm:135
-#: standalone/drakbackup:1663
+#: install_steps_interactive.pm:886 install_steps_interactive.pm:894
+#: install_steps_interactive.pm:912 install_steps_interactive.pm:919
+#: install_steps_interactive.pm:1068 services.pm:135
+#: standalone/drakbackup:1572
#, c-format
msgid "System"
msgstr "系统"
-#: install_steps_interactive.pm:932 install_steps_interactive.pm:959
-#: install_steps_interactive.pm:976 install_steps_interactive.pm:992
-#: install_steps_interactive.pm:1003
+#: install_steps_interactive.pm:926 install_steps_interactive.pm:953
+#: install_steps_interactive.pm:970 install_steps_interactive.pm:986
+#: install_steps_interactive.pm:997
#, c-format
msgid "Hardware"
msgstr "硬件"
-#: install_steps_interactive.pm:938 install_steps_interactive.pm:947
+#: install_steps_interactive.pm:932 install_steps_interactive.pm:941
#, c-format
msgid "Remote CUPS server"
msgstr "远程 CUPS 服务器"
-#: install_steps_interactive.pm:938
+#: install_steps_interactive.pm:932
#, c-format
msgid "No printer"
msgstr "没有打印机"
-#: install_steps_interactive.pm:980
+#: install_steps_interactive.pm:974
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "您有 ISA 声卡吗?"
-#: install_steps_interactive.pm:982
+#: install_steps_interactive.pm:976
#, c-format
-msgid "Run \"sndconfig\" after installation to configure your sound card"
-msgstr "安装之后运行“sndconfig”来配置您的声卡"
+msgid ""
+"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
+"card"
+msgstr "安装之后运行“alsaconf”或“sndconfig”来配置您的声卡"
-#: install_steps_interactive.pm:984
+#: install_steps_interactive.pm:978
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "没有检测到声卡。请在安装之后尝试“Drak 硬件配置”。"
-#: install_steps_interactive.pm:1004
+#: install_steps_interactive.pm:998
#, c-format
msgid "Graphical interface"
msgstr "图形界面"
-#: install_steps_interactive.pm:1010 install_steps_interactive.pm:1025
+#: install_steps_interactive.pm:1004 install_steps_interactive.pm:1019
#, c-format
msgid "Network & Internet"
msgstr "网络和 Internet"
-#: install_steps_interactive.pm:1026
+#: install_steps_interactive.pm:1020
#, c-format
msgid "Proxies"
msgstr "代理服务器"
-#: install_steps_interactive.pm:1027
+#: install_steps_interactive.pm:1021
#, c-format
msgid "configured"
msgstr "已配置"
-#: install_steps_interactive.pm:1036 install_steps_interactive.pm:1050
+#: install_steps_interactive.pm:1030 install_steps_interactive.pm:1044
#: steps.pm:20
#, c-format
msgid "Security"
msgstr "安全"
-#: install_steps_interactive.pm:1055
+#: install_steps_interactive.pm:1049
#, c-format
msgid "activated"
msgstr "已激活"
-#: install_steps_interactive.pm:1055
+#: install_steps_interactive.pm:1049
#, c-format
msgid "disabled"
msgstr "已禁用"
-#: install_steps_interactive.pm:1064
+#: install_steps_interactive.pm:1058
#, c-format
msgid "Boot"
msgstr "启动"
#. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1068
+#: install_steps_interactive.pm:1062
#, c-format
msgid "%s on %s"
msgstr "位于 %2$s 上的 %1$s"
-#: install_steps_interactive.pm:1079 services.pm:177
+#: install_steps_interactive.pm:1073 services.pm:177
#, c-format
msgid "Services: %d activated for %d registered"
msgstr "服务: %2$d 项已注册,%1$d 项已激活"
-#: install_steps_interactive.pm:1089
+#: install_steps_interactive.pm:1083
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "您还没有配置过 X。您真的想要这样吗?"
-#: install_steps_interactive.pm:1147
+#: install_steps_interactive.pm:1141
#, c-format
msgid "Set root password and network authentication methods"
msgstr "设定 root 密码及网络认证方式"
-#: install_steps_interactive.pm:1148
+#: install_steps_interactive.pm:1142
#, c-format
msgid "Set root password"
msgstr "设定 root 密码"
-#: install_steps_interactive.pm:1158
+#: install_steps_interactive.pm:1152
#, c-format
msgid "This password is too short (it must be at least %d characters long)"
msgstr "这个密码太简单了(至少要有 %d 个字符)"
-#: install_steps_interactive.pm:1163 network/netconnect.pm:576
-#: standalone/drakauth:26 standalone/drakconnect:451
+#: install_steps_interactive.pm:1157 network/netconnect.pm:575
+#: standalone/drakauth:26 standalone/drakconnect:461
#, c-format
msgid "Authentication"
msgstr "认证"
-#: install_steps_interactive.pm:1194
+#: install_steps_interactive.pm:1188
#, c-format
msgid "Preparing bootloader..."
msgstr "正在准备引导程序..."
-#: install_steps_interactive.pm:1204
+#: install_steps_interactive.pm:1198
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown\n"
@@ -6809,12 +6814,12 @@ msgstr ""
"安装将继续,不过您需要\n"
"使用 BootX 或其它方式启动您的机器"
-#: install_steps_interactive.pm:1210
+#: install_steps_interactive.pm:1204
#, c-format
msgid "Do you want to use aboot?"
msgstr "您要使用 aboot 吗?"
-#: install_steps_interactive.pm:1213
+#: install_steps_interactive.pm:1207
#, c-format
msgid ""
"Error installing aboot, \n"
@@ -6823,17 +6828,17 @@ msgstr ""
"安装 aboot 时出错,\n"
"强迫安装会毁坏第一个分区,要继续吗?"
-#: install_steps_interactive.pm:1224
+#: install_steps_interactive.pm:1218
#, c-format
msgid "Installing bootloader"
msgstr "安装引导程序"
-#: install_steps_interactive.pm:1231
+#: install_steps_interactive.pm:1225
#, c-format
msgid "Installation of bootloader failed. The following error occured:"
msgstr "安装系统引导程序失败,出现下列错误: "
-#: install_steps_interactive.pm:1236
+#: install_steps_interactive.pm:1230
#, c-format
msgid ""
"You may need to change your Open Firmware boot-device to\n"
@@ -6849,29 +6854,29 @@ msgstr ""
" 然后输入: shut-down\n"
"您将在下次开机时看到引导程序提示。"
-#: install_steps_interactive.pm:1249
+#: install_steps_interactive.pm:1243
#, 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:1281 standalone/drakautoinst:76
+#: install_steps_interactive.pm:1275 standalone/drakautoinst:76
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "请在驱动器 %s 中插入一张空白软盘"
-#: install_steps_interactive.pm:1286
+#: install_steps_interactive.pm:1280
#, c-format
msgid "Please insert another floppy for drivers disk"
msgstr "请插入另外一张软盘,作为驱动程序盘"
-#: install_steps_interactive.pm:1288
+#: install_steps_interactive.pm:1282
#, c-format
msgid "Creating auto install floppy..."
msgstr "正在创建自动安装软盘..."
-#: install_steps_interactive.pm:1300
+#: install_steps_interactive.pm:1294
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -6882,12 +6887,12 @@ msgstr ""
"\n"
"您真的要现在退出吗?"
-#: install_steps_interactive.pm:1315
+#: install_steps_interactive.pm:1309
#, c-format
msgid "Generate auto install floppy"
msgstr "生成自动安装软盘"
-#: install_steps_interactive.pm:1317
+#: install_steps_interactive.pm:1311
#, c-format
msgid ""
"The auto install can be fully automated if wanted,\n"
@@ -7007,562 +7012,572 @@ msgstr ""
msgid "Re-submit"
msgstr "重新提交"
-#: keyboard.pm:137 keyboard.pm:169
+#: keyboard.pm:161 keyboard.pm:193
#, c-format
msgid "Czech (QWERTZ)"
msgstr "捷克(QWERTZ)"
-#: keyboard.pm:138 keyboard.pm:171
+#: keyboard.pm:162 keyboard.pm:195
#, c-format
msgid "German"
msgstr "德国"
-#: keyboard.pm:139
+#: keyboard.pm:163
#, c-format
msgid "Dvorak"
msgstr "Dvorak"
-#: keyboard.pm:140 keyboard.pm:179
+#: keyboard.pm:164 keyboard.pm:204
#, c-format
msgid "Spanish"
msgstr "西班牙"
-#: keyboard.pm:141 keyboard.pm:180
+#: keyboard.pm:165 keyboard.pm:205
#, c-format
msgid "Finnish"
msgstr "芬兰"
-#: keyboard.pm:142 keyboard.pm:181
+#: keyboard.pm:166 keyboard.pm:206
#, c-format
msgid "French"
msgstr "法国"
-#: keyboard.pm:143 keyboard.pm:220
+#: keyboard.pm:167 keyboard.pm:246
#, c-format
msgid "Norwegian"
msgstr "挪威"
-#: keyboard.pm:144
+#: keyboard.pm:168
#, c-format
msgid "Polish"
msgstr "波兰"
-#: keyboard.pm:145 keyboard.pm:229
+#: keyboard.pm:169 keyboard.pm:255
#, c-format
msgid "Russian"
msgstr "俄国"
-#: keyboard.pm:147 keyboard.pm:233
+#: keyboard.pm:171 keyboard.pm:259
#, c-format
msgid "Swedish"
msgstr "瑞典语"
-#: keyboard.pm:148 keyboard.pm:252
+#: keyboard.pm:172 keyboard.pm:278
#, c-format
msgid "UK keyboard"
msgstr "英国"
-#: keyboard.pm:149 keyboard.pm:253
+#: keyboard.pm:173 keyboard.pm:279
#, c-format
msgid "US keyboard"
msgstr "美国键盘"
-#: keyboard.pm:151
+#: keyboard.pm:175
#, c-format
msgid "Albanian"
msgstr "阿尔巴尼亚"
-#: keyboard.pm:152
+#: keyboard.pm:176
#, c-format
msgid "Armenian (old)"
msgstr "美国(老式)"
-#: keyboard.pm:153
+#: keyboard.pm:177
#, c-format
msgid "Armenian (typewriter)"
msgstr "美国(打字机)"
-#: keyboard.pm:154
+#: keyboard.pm:178
#, c-format
msgid "Armenian (phonetic)"
msgstr "美国(音标)"
-#: keyboard.pm:155
+#: keyboard.pm:179
#, c-format
msgid "Arabic"
msgstr "阿拉伯"
-#: keyboard.pm:156
+#: keyboard.pm:180
#, c-format
msgid "Azerbaidjani (latin)"
msgstr "阿塞拜疆(拉丁)"
-#: keyboard.pm:158
+#: keyboard.pm:182
#, c-format
msgid "Belgian"
msgstr "比利时"
-#: keyboard.pm:159
+#: keyboard.pm:183
#, c-format
msgid "Bengali"
msgstr "孟加拉"
-#: keyboard.pm:160
+#: keyboard.pm:184
#, c-format
msgid "Bulgarian (phonetic)"
msgstr "保加利亚(音标)"
-#: keyboard.pm:161
+#: keyboard.pm:185
#, c-format
msgid "Bulgarian (BDS)"
msgstr "保加利亚(BDS)"
-#: keyboard.pm:162
+#: keyboard.pm:186
#, c-format
msgid "Brazilian (ABNT-2)"
msgstr "巴西(ABNT-2)"
-#: keyboard.pm:165
+#: keyboard.pm:189
#, c-format
msgid "Bosnian"
msgstr "波斯尼亚"
-#: keyboard.pm:166
+#: keyboard.pm:190
#, c-format
msgid "Belarusian"
msgstr "白俄罗斯"
-#: keyboard.pm:167
+#: keyboard.pm:191
#, c-format
msgid "Swiss (German layout)"
msgstr "瑞士(德语布局)"
-#: keyboard.pm:168
+#: keyboard.pm:192
#, c-format
msgid "Swiss (French layout)"
msgstr "瑞士(法语布局)"
-#: keyboard.pm:170
+#: keyboard.pm:194
#, c-format
msgid "Czech (QWERTY)"
msgstr "捷克(QWERTY)"
-#: keyboard.pm:172
+#: keyboard.pm:196
#, c-format
msgid "German (no dead keys)"
msgstr "德国(没有 dead keys)"
-#: keyboard.pm:173
+#: keyboard.pm:197
#, c-format
msgid "Devanagari"
msgstr "梵文"
-#: keyboard.pm:174
+#: keyboard.pm:198
#, c-format
msgid "Danish"
msgstr "丹麦"
-#: keyboard.pm:175
+#: keyboard.pm:199
#, c-format
msgid "Dvorak (US)"
msgstr "Dvorak(美国)"
-#: keyboard.pm:176
+#: keyboard.pm:200
+#, fuzzy, c-format
+msgid "Dvorak (Esperanto)"
+msgstr "Dvorak(挪威)"
+
+#: keyboard.pm:201
#, c-format
msgid "Dvorak (Norwegian)"
msgstr "Dvorak(挪威)"
-#: keyboard.pm:177
+#: keyboard.pm:202
#, c-format
msgid "Dvorak (Swedish)"
msgstr "Dvorak(瑞典)"
-#: keyboard.pm:178
+#: keyboard.pm:203
#, c-format
msgid "Estonian"
msgstr "爱沙尼亚"
-#: keyboard.pm:182
+#: keyboard.pm:207
#, c-format
msgid "Georgian (\"Russian\" layout)"
msgstr "格鲁吉亚(“俄语”布局)"
-#: keyboard.pm:183
+#: keyboard.pm:208
#, c-format
msgid "Georgian (\"Latin\" layout)"
msgstr "格鲁吉亚(“拉丁”布局)"
-#: keyboard.pm:184
+#: keyboard.pm:209
#, c-format
msgid "Greek"
msgstr "希腊"
-#: keyboard.pm:185
+#: keyboard.pm:210
#, c-format
msgid "Greek (polytonic)"
msgstr "希腊语(polytonic)"
-#: keyboard.pm:186
+#: keyboard.pm:211
#, c-format
msgid "Gujarati"
msgstr "古吉拉特"
-#: keyboard.pm:187
+#: keyboard.pm:212
#, c-format
msgid "Gurmukhi"
msgstr "旁遮普"
-#: keyboard.pm:188
+#: keyboard.pm:213
#, c-format
msgid "Hungarian"
msgstr "匈牙利"
-#: keyboard.pm:189
+#: keyboard.pm:214
#, c-format
msgid "Croatian"
msgstr "克罗地亚"
-#: keyboard.pm:190
+#: keyboard.pm:215
#, c-format
msgid "Irish"
msgstr "爱尔兰"
-#: keyboard.pm:191
+#: keyboard.pm:216
#, c-format
msgid "Israeli"
msgstr "以色列"
-#: keyboard.pm:192
+#: keyboard.pm:217
#, c-format
msgid "Israeli (Phonetic)"
msgstr "以色列(音标)"
-#: keyboard.pm:193
+#: keyboard.pm:218
#, c-format
msgid "Iranian"
msgstr "伊朗"
-#: keyboard.pm:194
+#: keyboard.pm:219
#, c-format
msgid "Icelandic"
msgstr "冰岛"
-#: keyboard.pm:195
+#: keyboard.pm:220
#, c-format
msgid "Italian"
msgstr "意大利"
-#: keyboard.pm:196
+#: keyboard.pm:221
#, c-format
msgid "Inuktitut"
msgstr "因纽特"
-#: keyboard.pm:200
+#: keyboard.pm:225
#, c-format
msgid "Japanese 106 keys"
msgstr "日文 106 键盘"
-#: keyboard.pm:201
+#: keyboard.pm:226
#, c-format
msgid "Kannada"
msgstr "埃纳德"
-#: keyboard.pm:204
+#: keyboard.pm:229
#, c-format
msgid "Korean keyboard"
msgstr "韩国键盘"
-#: keyboard.pm:205
+#: keyboard.pm:230
+#, fuzzy, c-format
+msgid "Kyrgyz keyboard"
+msgstr "英国"
+
+#: keyboard.pm:231
#, c-format
msgid "Latin American"
msgstr "拉丁美洲"
-#: keyboard.pm:206
+#: keyboard.pm:232
#, c-format
msgid "Laotian"
msgstr "老挝"
-#: keyboard.pm:207
+#: keyboard.pm:233
#, c-format
msgid "Lithuanian AZERTY (old)"
msgstr "立陶宛 AZERTY(老式)"
-#: keyboard.pm:209
+#: keyboard.pm:235
#, c-format
msgid "Lithuanian AZERTY (new)"
msgstr "立陶宛 AZERTY(新式)"
-#: keyboard.pm:210
+#: keyboard.pm:236
#, c-format
msgid "Lithuanian \"number row\" QWERTY"
msgstr "立陶宛“顺排”QWERTY"
-#: keyboard.pm:211
+#: keyboard.pm:237
#, c-format
msgid "Lithuanian \"phonetic\" QWERTY"
msgstr "立陶宛“同音”QWERTY"
-#: keyboard.pm:212
+#: keyboard.pm:238
#, c-format
msgid "Latvian"
msgstr "拉脱维亚"
-#: keyboard.pm:213
+#: keyboard.pm:239
#, c-format
msgid "Malayalam"
msgstr "德拉维"
-#: keyboard.pm:214
+#: keyboard.pm:240
#, c-format
msgid "Macedonian"
msgstr "马其顿"
-#: keyboard.pm:215
+#: keyboard.pm:241
#, c-format
msgid "Myanmar (Burmese)"
msgstr "缅甸"
-#: keyboard.pm:216
+#: keyboard.pm:242
#, c-format
msgid "Mongolian (cyrillic)"
msgstr "蒙古(西里尔)"
-#: keyboard.pm:217
+#: keyboard.pm:243
#, c-format
msgid "Maltese (UK)"
msgstr "马耳他(英国)"
-#: keyboard.pm:218
+#: keyboard.pm:244
#, c-format
msgid "Maltese (US)"
msgstr "马耳他(美国)"
-#: keyboard.pm:219
+#: keyboard.pm:245
#, c-format
msgid "Dutch"
msgstr "荷兰"
-#: keyboard.pm:221
+#: keyboard.pm:247
#, c-format
msgid "Oriya"
msgstr "奥里雅"
-#: keyboard.pm:222
+#: keyboard.pm:248
#, c-format
msgid "Polish (qwerty layout)"
msgstr "波兰(QWERTY 布局)"
-#: keyboard.pm:223
+#: keyboard.pm:249
#, c-format
msgid "Polish (qwertz layout)"
msgstr "波兰(QWERTZ 布局)"
-#: keyboard.pm:224
+#: keyboard.pm:250
#, c-format
msgid "Portuguese"
msgstr "葡萄牙语"
-#: keyboard.pm:225
+#: keyboard.pm:251
#, c-format
msgid "Canadian (Quebec)"
msgstr "加拿大(魁北克)"
-#: keyboard.pm:227
+#: keyboard.pm:253
#, c-format
msgid "Romanian (qwertz)"
msgstr "罗马尼亚(QWERTZ 布局)"
-#: keyboard.pm:228
+#: keyboard.pm:254
#, c-format
msgid "Romanian (qwerty)"
msgstr "罗马尼亚(QWERTY 布局)"
-#: keyboard.pm:230
+#: keyboard.pm:256
#, c-format
msgid "Russian (Phonetic)"
msgstr "俄语(音标)"
-#: keyboard.pm:231
+#: keyboard.pm:257
#, c-format
msgid "Saami (norwegian)"
msgstr "Saami(挪威)"
-#: keyboard.pm:232
+#: keyboard.pm:258
#, c-format
msgid "Saami (swedish/finnish)"
msgstr "北部沙米语(瑞典/芬兰)"
-#: keyboard.pm:234
+#: keyboard.pm:260
#, c-format
msgid "Slovenian"
msgstr "斯洛文尼亚"
-#: keyboard.pm:235
+#: keyboard.pm:261
#, c-format
msgid "Slovakian (QWERTZ)"
msgstr "斯洛伐克(QWERTZ 布局)"
-#: keyboard.pm:236
+#: keyboard.pm:262
#, c-format
msgid "Slovakian (QWERTY)"
msgstr "斯洛伐克(QWERTY 布局)"
-#: keyboard.pm:238
+#: keyboard.pm:264
#, c-format
msgid "Serbian (cyrillic)"
msgstr "赛尔维亚(西里尔字母)"
-#: keyboard.pm:239
+#: keyboard.pm:265
#, c-format
msgid "Syriac"
msgstr "叙利亚"
-#: keyboard.pm:240
+#: keyboard.pm:266
#, c-format
msgid "Syriac (phonetic)"
msgstr "叙利亚(音标)"
-#: keyboard.pm:241
+#: keyboard.pm:267
#, c-format
msgid "Telugu"
msgstr "泰卢固"
-#: keyboard.pm:243
+#: keyboard.pm:269
#, c-format
msgid "Tamil (ISCII-layout)"
msgstr "泰米尔(ISCII-布局)"
-#: keyboard.pm:244
+#: keyboard.pm:270
#, c-format
msgid "Tamil (Typewriter-layout)"
msgstr "泰米尔(打字机布局)"
-#: keyboard.pm:245
+#: keyboard.pm:271
#, c-format
msgid "Thai keyboard"
msgstr "泰国语键盘"
-#: keyboard.pm:247
+#: keyboard.pm:273
#, c-format
msgid "Tajik keyboard"
msgstr "塔吉克键盘"
-#: keyboard.pm:248
+#: keyboard.pm:274
#, c-format
msgid "Turkish (traditional \"F\" model)"
msgstr "土耳其(传统“F”式)"
-#: keyboard.pm:249
+#: keyboard.pm:275
#, c-format
msgid "Turkish (modern \"Q\" model)"
msgstr "土耳其(现代“Q”式)"
-#: keyboard.pm:251
+#: keyboard.pm:277
#, c-format
msgid "Ukrainian"
msgstr "乌克兰"
-#: keyboard.pm:254
+#: keyboard.pm:280
#, c-format
msgid "US keyboard (international)"
msgstr "美国键盘(国际)"
-#: keyboard.pm:255
+#: keyboard.pm:281
#, c-format
msgid "Uzbek (cyrillic)"
msgstr "乌兹别克(西里尔)"
-#: keyboard.pm:256
+#: keyboard.pm:282
#, c-format
msgid "Vietnamese \"numeric row\" QWERTY"
msgstr "越南键盘“顺排”QWERTY"
-#: keyboard.pm:257
+#: keyboard.pm:283
#, c-format
msgid "Yugoslavian (latin)"
msgstr "南斯拉夫(拉丁)"
-#: keyboard.pm:264
+#: keyboard.pm:290
#, c-format
msgid "Right Alt key"
msgstr "右边的 ALT 键"
-#: keyboard.pm:265
+#: keyboard.pm:291
#, c-format
msgid "Both Shift keys simultaneously"
msgstr "同时按两个 Shift 键"
-#: keyboard.pm:266
+#: keyboard.pm:292
#, c-format
msgid "Control and Shift keys simultaneously"
msgstr "同时按 Ctrl 和 Shift 键"
-#: keyboard.pm:267
+#: keyboard.pm:293
#, c-format
msgid "CapsLock key"
msgstr "CapsLock 键"
-#: keyboard.pm:268
+#: keyboard.pm:294
#, c-format
msgid "Ctrl and Alt keys simultaneously"
msgstr "同时按 Ctrl 和 Alt 键"
-#: keyboard.pm:269
+#: keyboard.pm:295
#, c-format
msgid "Alt and Shift keys simultaneously"
msgstr "同时按 Alt 和 Shift 键"
-#: keyboard.pm:270
+#: keyboard.pm:296
#, c-format
msgid "\"Menu\" key"
msgstr "“菜单”键"
-#: keyboard.pm:271
+#: keyboard.pm:297
#, c-format
msgid "Left \"Windows\" key"
msgstr "左侧“Windows”键"
-#: keyboard.pm:272
+#: keyboard.pm:298
#, c-format
msgid "Right \"Windows\" key"
msgstr "右侧“Windows”键"
-#: keyboard.pm:273
+#: keyboard.pm:299
#, c-format
msgid "Both Control keys simultaneously"
msgstr "同时按两个 Ctrl 键"
-#: keyboard.pm:274
+#: keyboard.pm:300
#, c-format
msgid "Both Alt keys simultaneously"
msgstr "同时按两个 Alt 键"
-#: keyboard.pm:275
+#: keyboard.pm:301
#, c-format
msgid "Left Shift key"
msgstr "左侧 Shift 键"
-#: keyboard.pm:276
+#: keyboard.pm:302
#, c-format
msgid "Right Shift key"
msgstr "右侧 Shift 键"
-#: keyboard.pm:277
+#: keyboard.pm:303
#, c-format
msgid "Left Alt key"
msgstr "左侧的 Alt 键"
-#: keyboard.pm:278
+#: keyboard.pm:304
#, c-format
msgid "Left Control key"
msgstr "左侧 Ctrl 键"
-#: keyboard.pm:279
+#: keyboard.pm:305
#, c-format
msgid "Right Control key"
msgstr "右侧 Ctrl 键"
-#: keyboard.pm:310
+#: keyboard.pm:336
#, c-format
msgid ""
"Here you can choose the key or key combination that will \n"
@@ -7573,7 +7588,7 @@ msgstr ""
"来在不同的键盘布局之间切换\n"
"(例如,英文和中文)"
-#: keyboard.pm:315
+#: keyboard.pm:341
#, c-format
msgid ""
"This setting will be activated after the installation.\n"
@@ -7583,1146 +7598,1146 @@ msgstr ""
"此设置将会在安装后激活。\n"
"在安装过程中,您需要使用右侧的 Ctrl 键切换不同的键盘布局。"
-#: lang.pm:151
+#: lang.pm:153
#, c-format
msgid "default:LTR"
msgstr "default:LTR"
-#: lang.pm:167
+#: lang.pm:169
#, c-format
msgid "Afghanistan"
msgstr "阿富汗"
-#: lang.pm:168
+#: lang.pm:170
#, c-format
msgid "Andorra"
msgstr "安道尔"
-#: lang.pm:169
+#: lang.pm:171
#, c-format
msgid "United Arab Emirates"
msgstr "阿拉伯联合酋长国"
-#: lang.pm:170
+#: lang.pm:172
#, c-format
msgid "Antigua and Barbuda"
msgstr "安提瓜和巴布达"
-#: lang.pm:171
+#: lang.pm:173
#, c-format
msgid "Anguilla"
msgstr "安圭拉"
-#: lang.pm:172
+#: lang.pm:174
#, c-format
msgid "Albania"
msgstr "阿尔巴尼亚"
-#: lang.pm:173
+#: lang.pm:175
#, c-format
msgid "Armenia"
msgstr "亚美尼亚"
-#: lang.pm:174
+#: lang.pm:176
#, c-format
msgid "Netherlands Antilles"
msgstr "荷属安的列斯"
-#: lang.pm:175
+#: lang.pm:177
#, c-format
msgid "Angola"
msgstr "安哥拉"
-#: lang.pm:176
+#: lang.pm:178
#, c-format
msgid "Antarctica"
msgstr "南极洲"
-#: lang.pm:177 standalone/drakxtv:48
+#: lang.pm:179 standalone/drakxtv:48
#, c-format
msgid "Argentina"
msgstr "阿根廷"
-#: lang.pm:178
+#: lang.pm:180
#, c-format
msgid "American Samoa"
msgstr "美属萨摩亚"
-#: lang.pm:180 standalone/drakxtv:46
+#: lang.pm:182 standalone/drakxtv:46
#, c-format
msgid "Australia"
msgstr "澳大利亚"
-#: lang.pm:181
+#: lang.pm:183
#, c-format
msgid "Aruba"
msgstr "阿鲁巴"
-#: lang.pm:182
+#: lang.pm:184
#, c-format
msgid "Azerbaijan"
msgstr "阿塞拜疆"
# ../drakfw_.c:
-#: lang.pm:183
+#: lang.pm:185
#, c-format
msgid "Bosnia and Herzegovina"
msgstr "波黑"
-#: lang.pm:184
+#: lang.pm:186
#, c-format
msgid "Barbados"
msgstr "巴巴多斯"
-#: lang.pm:185
+#: lang.pm:187
#, c-format
msgid "Bangladesh"
msgstr "孟加拉"
-#: lang.pm:187
+#: lang.pm:189
#, c-format
msgid "Burkina Faso"
msgstr "布基纳法索"
-#: lang.pm:188
+#: lang.pm:190
#, c-format
msgid "Bulgaria"
msgstr "保加利亚"
-#: lang.pm:189
+#: lang.pm:191
#, c-format
msgid "Bahrain"
msgstr "巴林"
-#: lang.pm:190
+#: lang.pm:192
#, c-format
msgid "Burundi"
msgstr "布隆迪"
-#: lang.pm:191
+#: lang.pm:193
#, c-format
msgid "Benin"
msgstr "贝宁"
-#: lang.pm:192
+#: lang.pm:194
#, c-format
msgid "Bermuda"
msgstr "百慕大"
-#: lang.pm:193
+#: lang.pm:195
#, c-format
msgid "Brunei Darussalam"
msgstr "文莱达鲁萨兰国"
-#: lang.pm:194
+#: lang.pm:196
#, c-format
msgid "Bolivia"
msgstr "玻利维亚"
-#: lang.pm:195
+#: lang.pm:197
#, c-format
msgid "Brazil"
msgstr "巴西"
-#: lang.pm:196
+#: lang.pm:198
#, c-format
msgid "Bahamas"
msgstr "巴哈马"
-#: lang.pm:197
+#: lang.pm:199
#, c-format
msgid "Bhutan"
msgstr "不丹"
-#: lang.pm:198
+#: lang.pm:200
#, c-format
msgid "Bouvet Island"
msgstr "布维岛"
-#: lang.pm:199
+#: lang.pm:201
#, c-format
msgid "Botswana"
msgstr "博茨瓦纳"
-#: lang.pm:200
+#: lang.pm:202
#, c-format
msgid "Belarus"
msgstr "白俄罗斯"
-#: lang.pm:201
+#: lang.pm:203
#, c-format
msgid "Belize"
msgstr "伯利兹"
-#: lang.pm:202
+#: lang.pm:204
#, c-format
msgid "Canada"
msgstr "加拿大"
-#: lang.pm:203
+#: lang.pm:205
#, c-format
msgid "Cocos (Keeling) Islands"
msgstr "科科斯群岛"
-#: lang.pm:204
+#: lang.pm:206
#, c-format
msgid "Congo (Kinshasa)"
msgstr "刚果(金沙萨)"
-#: lang.pm:205
+#: lang.pm:207
#, c-format
msgid "Central African Republic"
msgstr "中非共和国"
-#: lang.pm:206
+#: lang.pm:208
#, c-format
msgid "Congo (Brazzaville)"
msgstr "刚果(布拉柴维尔)"
-#: lang.pm:207
+#: lang.pm:209
#, c-format
msgid "Switzerland"
msgstr "瑞士"
-#: lang.pm:208
+#: lang.pm:210
#, c-format
msgid "Cote d'Ivoire"
msgstr "科特迪瓦"
-#: lang.pm:209
+#: lang.pm:211
#, c-format
msgid "Cook Islands"
msgstr "库克群岛"
-#: lang.pm:210
+#: lang.pm:212
#, c-format
msgid "Chile"
msgstr "智利"
-#: lang.pm:211
+#: lang.pm:213
#, c-format
msgid "Cameroon"
msgstr "喀麦隆"
-#: lang.pm:212
+#: lang.pm:214
#, c-format
msgid "China"
msgstr "中国"
-#: lang.pm:213
+#: lang.pm:215
#, c-format
msgid "Colombia"
msgstr "哥伦比亚"
-#: lang.pm:215
+#: lang.pm:217
#, c-format
msgid "Cuba"
msgstr "古巴"
-#: lang.pm:216
+#: lang.pm:218
#, c-format
msgid "Cape Verde"
msgstr "佛得角"
-#: lang.pm:217
+#: lang.pm:219
#, c-format
msgid "Christmas Island"
msgstr "圣诞岛"
-#: lang.pm:218
+#: lang.pm:220
#, c-format
msgid "Cyprus"
msgstr "塞浦路斯"
-#: lang.pm:221
+#: lang.pm:223
#, c-format
msgid "Djibouti"
msgstr "吉布提"
-#: lang.pm:222
+#: lang.pm:224
#, c-format
msgid "Denmark"
msgstr "丹麦"
-#: lang.pm:223
+#: lang.pm:225
#, c-format
msgid "Dominica"
msgstr "多米尼加"
-#: lang.pm:224
+#: lang.pm:226
#, c-format
msgid "Dominican Republic"
msgstr "多米尼加共和国"
-#: lang.pm:225
+#: lang.pm:227
#, c-format
msgid "Algeria"
msgstr "阿尔及利亚"
-#: lang.pm:226
+#: lang.pm:228
#, c-format
msgid "Ecuador"
msgstr "厄瓜多尔"
-#: lang.pm:227
+#: lang.pm:229
#, c-format
msgid "Estonia"
msgstr "爱沙尼亚"
-#: lang.pm:228
+#: lang.pm:230
#, c-format
msgid "Egypt"
msgstr "埃及"
-#: lang.pm:229
+#: lang.pm:231
#, c-format
msgid "Western Sahara"
msgstr "西撒哈拉"
-#: lang.pm:230
+#: lang.pm:232
#, c-format
msgid "Eritrea"
msgstr "厄立特里亚"
-#: lang.pm:231 network/adsl_consts.pm:202 network/adsl_consts.pm:210
+#: lang.pm:233 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:232
+#: lang.pm:234
#, c-format
msgid "Ethiopia"
msgstr "埃塞俄比亚"
-#: lang.pm:233 network/adsl_consts.pm:127
+#: lang.pm:235 network/adsl_consts.pm:127
#, c-format
msgid "Finland"
msgstr "芬兰"
-#: lang.pm:234
+#: lang.pm:236
#, c-format
msgid "Fiji"
msgstr "斐济"
-#: lang.pm:235
+#: lang.pm:237
#, c-format
msgid "Falkland Islands (Malvinas)"
msgstr "福克兰群岛(马尔维纳斯)"
-#: lang.pm:236
+#: lang.pm:238
#, c-format
msgid "Micronesia"
msgstr "密克罗尼西亚"
-#: lang.pm:237
+#: lang.pm:239
#, c-format
msgid "Faroe Islands"
msgstr "法罗群岛"
-#: lang.pm:239
+#: lang.pm:241
#, c-format
msgid "Gabon"
msgstr "加蓬"
-#: lang.pm:240 network/adsl_consts.pm:247 network/adsl_consts.pm:255
+#: lang.pm:242 network/adsl_consts.pm:247 network/adsl_consts.pm:255
#: network/netconnect.pm:51
#, c-format
msgid "United Kingdom"
msgstr "英国"
-#: lang.pm:241
+#: lang.pm:243
#, c-format
msgid "Grenada"
msgstr "格林纳达"
-#: lang.pm:242
+#: lang.pm:244
#, c-format
msgid "Georgia"
msgstr "乔治亚"
-#: lang.pm:243
+#: lang.pm:245
#, c-format
msgid "French Guiana"
msgstr "法属圭亚那"
-#: lang.pm:244
+#: lang.pm:246
#, c-format
msgid "Ghana"
msgstr "加纳"
-#: lang.pm:245
+#: lang.pm:247
#, c-format
msgid "Gibraltar"
msgstr "直布罗陀"
-#: lang.pm:246
+#: lang.pm:248
#, c-format
msgid "Greenland"
msgstr "格陵兰"
-#: lang.pm:247
+#: lang.pm:249
#, c-format
msgid "Gambia"
msgstr "冈比亚"
-#: lang.pm:248
+#: lang.pm:250
#, c-format
msgid "Guinea"
msgstr "几内亚"
-#: lang.pm:249
+#: lang.pm:251
#, c-format
msgid "Guadeloupe"
msgstr "瓜德洛普"
-#: lang.pm:250
+#: lang.pm:252
#, c-format
msgid "Equatorial Guinea"
msgstr "赤道几内亚"
-#: lang.pm:252
+#: lang.pm:254
#, c-format
msgid "South Georgia and the South Sandwich Islands"
msgstr "南乔治亚岛和南桑德韦奇岛"
-#: lang.pm:253
+#: lang.pm:255
#, c-format
msgid "Guatemala"
msgstr "危地马拉"
-#: lang.pm:254
+#: lang.pm:256
#, c-format
msgid "Guam"
msgstr "关岛"
-#: lang.pm:255
+#: lang.pm:257
#, c-format
msgid "Guinea-Bissau"
msgstr "几内亚比绍"
-#: lang.pm:256
+#: lang.pm:258
#, c-format
msgid "Guyana"
msgstr "圭亚那"
-#: lang.pm:257
+#: lang.pm:259
#, c-format
msgid "China (Hong Kong)"
msgstr "中国香港"
-#: lang.pm:258
+#: lang.pm:260
#, c-format
msgid "Heard and McDonald Islands"
msgstr "赫德和麦克唐纳群岛"
-#: lang.pm:259
+#: lang.pm:261
#, c-format
msgid "Honduras"
msgstr "洪都拉斯"
-#: lang.pm:260
+#: lang.pm:262
#, c-format
msgid "Croatia"
msgstr "克罗地亚"
-#: lang.pm:261
+#: lang.pm:263
#, c-format
msgid "Haiti"
msgstr "海地"
-#: lang.pm:262 network/adsl_consts.pm:152
+#: lang.pm:264 network/adsl_consts.pm:152
#, c-format
msgid "Hungary"
msgstr "匈牙利"
-#: lang.pm:263
+#: lang.pm:265
#, c-format
msgid "Indonesia"
msgstr "印度尼西亚"
-#: lang.pm:264 standalone/drakxtv:45
+#: lang.pm:266 standalone/drakxtv:45
#, c-format
msgid "Ireland"
msgstr "爱尔兰"
-#: lang.pm:265
+#: lang.pm:267
#, c-format
msgid "Israel"
msgstr "以色列"
-#: lang.pm:266
+#: lang.pm:268
#, c-format
msgid "India"
msgstr "印度"
-#: lang.pm:267
+#: lang.pm:269
#, c-format
msgid "British Indian Ocean Territory"
msgstr "英属印度洋地区"
-#: lang.pm:268
+#: lang.pm:270
#, c-format
msgid "Iraq"
msgstr "伊拉克"
-#: lang.pm:269
+#: lang.pm:271
#, c-format
msgid "Iran"
msgstr "伊朗"
-#: lang.pm:270
+#: lang.pm:272
#, c-format
msgid "Iceland"
msgstr "冰岛"
-#: lang.pm:272
+#: lang.pm:274
#, c-format
msgid "Jamaica"
msgstr "牙买加"
-#: lang.pm:273
+#: lang.pm:275
#, c-format
msgid "Jordan"
msgstr "约旦"
-#: lang.pm:274
+#: lang.pm:276
#, c-format
msgid "Japan"
msgstr "日本"
-#: lang.pm:275
+#: lang.pm:277
#, c-format
msgid "Kenya"
msgstr "肯尼亚"
-#: lang.pm:276
+#: lang.pm:278
#, c-format
msgid "Kyrgyzstan"
msgstr "吉尔吉斯斯坦"
-#: lang.pm:277
+#: lang.pm:279
#, c-format
msgid "Cambodia"
msgstr "柬埔寨"
-#: lang.pm:278
+#: lang.pm:280
#, c-format
msgid "Kiribati"
msgstr "基里巴斯"
-#: lang.pm:279
+#: lang.pm:281
#, c-format
msgid "Comoros"
msgstr "科摩罗"
-#: lang.pm:280
+#: lang.pm:282
#, c-format
msgid "Saint Kitts and Nevis"
msgstr "圣基茨和尼维斯"
-#: lang.pm:281
+#: lang.pm:283
#, c-format
msgid "Korea (North)"
msgstr "朝鲜"
-#: lang.pm:282
+#: lang.pm:284
#, c-format
msgid "Korea"
msgstr "韩国"
-#: lang.pm:283
+#: lang.pm:285
#, c-format
msgid "Kuwait"
msgstr "科威特"
-#: lang.pm:284
+#: lang.pm:286
#, c-format
msgid "Cayman Islands"
msgstr "开曼群岛"
-#: lang.pm:285
+#: lang.pm:287
#, c-format
msgid "Kazakhstan"
msgstr "哈萨克斯坦"
-#: lang.pm:286
+#: lang.pm:288
#, c-format
msgid "Laos"
msgstr "老挝"
-#: lang.pm:287
+#: lang.pm:289
#, c-format
msgid "Lebanon"
msgstr "黎巴嫩"
-#: lang.pm:288
+#: lang.pm:290
#, c-format
msgid "Saint Lucia"
msgstr "圣卢西亚"
-#: lang.pm:289
+#: lang.pm:291
#, c-format
msgid "Liechtenstein"
msgstr "列支敦士登"
-#: lang.pm:290
+#: lang.pm:292
#, c-format
msgid "Sri Lanka"
msgstr "斯里兰卡"
-#: lang.pm:291
+#: lang.pm:293
#, c-format
msgid "Liberia"
msgstr "利比里亚"
-#: lang.pm:292
+#: lang.pm:294
#, c-format
msgid "Lesotho"
msgstr "莱索托"
-#: lang.pm:293
+#: lang.pm:295
#, c-format
msgid "Lithuania"
msgstr "立陶宛"
-#: lang.pm:294
+#: lang.pm:296
#, c-format
msgid "Luxembourg"
msgstr "卢森堡"
-#: lang.pm:295
+#: lang.pm:297
#, c-format
msgid "Latvia"
msgstr "拉脱维亚"
-#: lang.pm:296
+#: lang.pm:298
#, c-format
msgid "Libya"
msgstr "利比亚"
-#: lang.pm:297
+#: lang.pm:299
#, c-format
msgid "Morocco"
msgstr "摩洛哥"
-#: lang.pm:298
+#: lang.pm:300
#, c-format
msgid "Monaco"
msgstr "摩纳哥"
-#: lang.pm:299
+#: lang.pm:301
#, c-format
msgid "Moldova"
msgstr "摩尔多瓦"
-#: lang.pm:300
+#: lang.pm:302
#, c-format
msgid "Madagascar"
msgstr "马达加斯加"
-#: lang.pm:301
+#: lang.pm:303
#, c-format
msgid "Marshall Islands"
msgstr "马绍尔群岛"
# ../drakfwia"
-#: lang.pm:302
+#: lang.pm:304
#, c-format
msgid "Macedonia"
msgstr "马其顿"
-#: lang.pm:303
+#: lang.pm:305
#, c-format
msgid "Mali"
msgstr "马里"
-#: lang.pm:304
+#: lang.pm:306
#, c-format
msgid "Myanmar"
msgstr "缅甸"
-#: lang.pm:305
+#: lang.pm:307
#, c-format
msgid "Mongolia"
msgstr "蒙古"
-#: lang.pm:306
+#: lang.pm:308
#, c-format
msgid "Northern Mariana Islands"
msgstr "北马里亚那岛"
-#: lang.pm:307
+#: lang.pm:309
#, c-format
msgid "Martinique"
msgstr "马提尼克"
-#: lang.pm:308
+#: lang.pm:310
#, c-format
msgid "Mauritania"
msgstr "毛里塔尼亚"
-#: lang.pm:309
+#: lang.pm:311
#, c-format
msgid "Montserrat"
msgstr "蒙特塞拉特"
-#: lang.pm:310
+#: lang.pm:312
#, c-format
msgid "Malta"
msgstr "马耳他"
-#: lang.pm:311
+#: lang.pm:313
#, c-format
msgid "Mauritius"
msgstr "毛里求斯"
-#: lang.pm:312
+#: lang.pm:314
#, c-format
msgid "Maldives"
msgstr "马尔代夫"
-#: lang.pm:313
+#: lang.pm:315
#, c-format
msgid "Malawi"
msgstr "马拉维"
-#: lang.pm:314
+#: lang.pm:316
#, c-format
msgid "Mexico"
msgstr "墨西哥"
-#: lang.pm:315
+#: lang.pm:317
#, c-format
msgid "Malaysia"
msgstr "马来西亚"
-#: lang.pm:316
+#: lang.pm:318
#, c-format
msgid "Mozambique"
msgstr "莫桑比克"
-#: lang.pm:317
+#: lang.pm:319
#, c-format
msgid "Namibia"
msgstr "纳米比亚"
-#: lang.pm:318
+#: lang.pm:320
#, c-format
msgid "New Caledonia"
msgstr "新喀里多尼亚"
-#: lang.pm:319
+#: lang.pm:321
#, c-format
msgid "Niger"
msgstr "尼日尔"
-#: lang.pm:320
+#: lang.pm:322
#, c-format
msgid "Norfolk Island"
msgstr "诺福克岛"
-#: lang.pm:321
+#: lang.pm:323
#, c-format
msgid "Nigeria"
msgstr "尼日利亚"
-#: lang.pm:322
+#: lang.pm:324
#, c-format
msgid "Nicaragua"
msgstr "尼加拉瓜"
-#: lang.pm:325
+#: lang.pm:327
#, c-format
msgid "Nepal"
msgstr "尼泊尔"
-#: lang.pm:326
+#: lang.pm:328
#, c-format
msgid "Nauru"
msgstr "瑙鲁"
-#: lang.pm:327
+#: lang.pm:329
#, c-format
msgid "Niue"
msgstr "纽埃"
-#: lang.pm:328
+#: lang.pm:330
#, c-format
msgid "New Zealand"
msgstr "新西兰"
-#: lang.pm:329
+#: lang.pm:331
#, c-format
msgid "Oman"
msgstr "阿曼"
-#: lang.pm:330
+#: lang.pm:332
#, c-format
msgid "Panama"
msgstr "巴拿马"
-#: lang.pm:331
+#: lang.pm:333
#, c-format
msgid "Peru"
msgstr "秘鲁"
-#: lang.pm:332
+#: lang.pm:334
#, c-format
msgid "French Polynesia"
msgstr "法属玻利尼西亚"
-#: lang.pm:333
+#: lang.pm:335
#, c-format
msgid "Papua New Guinea"
msgstr "巴布亚新几内亚"
-#: lang.pm:334
+#: lang.pm:336
#, c-format
msgid "Philippines"
msgstr "菲律宾"
-#: lang.pm:335
+#: lang.pm:337
#, c-format
msgid "Pakistan"
msgstr "巴基斯坦"
-#: lang.pm:336 network/adsl_consts.pm:186
+#: lang.pm:338 network/adsl_consts.pm:186
#, c-format
msgid "Poland"
msgstr "波兰"
-#: lang.pm:337
+#: lang.pm:339
#, c-format
msgid "Saint Pierre and Miquelon"
msgstr "圣皮埃尔岛及密克隆岛"
-#: lang.pm:338
+#: lang.pm:340
#, c-format
msgid "Pitcairn"
msgstr "皮特克恩"
-#: lang.pm:339
+#: lang.pm:341
#, c-format
msgid "Puerto Rico"
msgstr "波多黎各"
-#: lang.pm:340
+#: lang.pm:342
#, c-format
msgid "Palestine"
msgstr "巴勒斯坦"
-#: lang.pm:341 network/adsl_consts.pm:196
+#: lang.pm:343 network/adsl_consts.pm:196
#, c-format
msgid "Portugal"
msgstr "葡萄牙"
-#: lang.pm:342
+#: lang.pm:344
#, c-format
msgid "Paraguay"
msgstr "巴拉圭"
-#: lang.pm:343
+#: lang.pm:345
#, c-format
msgid "Palau"
msgstr "帕劳"
-#: lang.pm:344
+#: lang.pm:346
#, c-format
msgid "Qatar"
msgstr "卡塔尔"
-#: lang.pm:345
+#: lang.pm:347
#, c-format
msgid "Reunion"
msgstr "留尼旺"
-#: lang.pm:346
+#: lang.pm:348
#, c-format
msgid "Romania"
msgstr "罗马尼亚"
-#: lang.pm:347
+#: lang.pm:349
#, c-format
msgid "Russia"
msgstr "俄罗斯"
-#: lang.pm:348
+#: lang.pm:350
#, c-format
msgid "Rwanda"
msgstr "卢旺达"
-#: lang.pm:349
+#: lang.pm:351
#, c-format
msgid "Saudi Arabia"
msgstr "沙特阿拉伯"
-#: lang.pm:350
+#: lang.pm:352
#, c-format
msgid "Solomon Islands"
msgstr "所罗门群岛"
-#: lang.pm:351
+#: lang.pm:353
#, c-format
msgid "Seychelles"
msgstr "塞舌尔"
-#: lang.pm:352
+#: lang.pm:354
#, c-format
msgid "Sudan"
msgstr "苏丹"
-#: lang.pm:354
+#: lang.pm:356
#, c-format
msgid "Singapore"
msgstr "新加坡"
-#: lang.pm:355
+#: lang.pm:357
#, c-format
msgid "Saint Helena"
msgstr "圣·海伦娜"
-#: lang.pm:356
+#: lang.pm:358
#, c-format
msgid "Slovenia"
msgstr "斯洛文尼亚"
-#: lang.pm:357
+#: lang.pm:359
#, c-format
msgid "Svalbard and Jan Mayen Islands"
msgstr "斯马尔巴特和扬马延岛"
-#: lang.pm:358
+#: lang.pm:360
#, c-format
msgid "Slovakia"
msgstr "斯洛伐克"
-#: lang.pm:359
+#: lang.pm:361
#, c-format
msgid "Sierra Leone"
msgstr "塞拉利昂"
-#: lang.pm:360
+#: lang.pm:362
#, c-format
msgid "San Marino"
msgstr "圣马力诺"
-#: lang.pm:361
+#: lang.pm:363
#, c-format
msgid "Senegal"
msgstr "塞内加尔"
-#: lang.pm:362
+#: lang.pm:364
#, c-format
msgid "Somalia"
msgstr "索马里"
-#: lang.pm:363
+#: lang.pm:365
#, c-format
msgid "Suriname"
msgstr "苏里南"
-#: lang.pm:364
+#: lang.pm:366
#, c-format
msgid "Sao Tome and Principe"
msgstr "圣多美和普林西比"
-#: lang.pm:365
+#: lang.pm:367
#, c-format
msgid "El Salvador"
msgstr "萨尔瓦多"
-#: lang.pm:366
+#: lang.pm:368
#, c-format
msgid "Syria"
msgstr "叙利亚"
-#: lang.pm:367
+#: lang.pm:369
#, c-format
msgid "Swaziland"
msgstr "斯威士兰"
-#: lang.pm:368
+#: lang.pm:370
#, c-format
msgid "Turks and Caicos Islands"
msgstr "特克斯和凯科斯群岛"
-#: lang.pm:369
+#: lang.pm:371
#, c-format
msgid "Chad"
msgstr "乍得"
-#: lang.pm:370
+#: lang.pm:372
#, c-format
msgid "French Southern Territories"
msgstr "法国南方属地"
-#: lang.pm:371
+#: lang.pm:373
#, c-format
msgid "Togo"
msgstr "多哥"
-#: lang.pm:372
+#: lang.pm:374
#, c-format
msgid "Thailand"
msgstr "泰国"
-#: lang.pm:373
+#: lang.pm:375
#, c-format
msgid "Tajikistan"
msgstr "塔吉克斯坦"
-#: lang.pm:374
+#: lang.pm:376
#, c-format
msgid "Tokelau"
msgstr "托克劳群岛"
-#: lang.pm:375
+#: lang.pm:377
#, c-format
msgid "East Timor"
msgstr "东帝汶"
-#: lang.pm:376
+#: lang.pm:378
#, c-format
msgid "Turkmenistan"
msgstr "土库曼斯坦"
-#: lang.pm:377
+#: lang.pm:379
#, c-format
msgid "Tunisia"
msgstr "突尼斯"
-#: lang.pm:378
+#: lang.pm:380
#, c-format
msgid "Tonga"
msgstr "汤加"
-#: lang.pm:379
+#: lang.pm:381
#, c-format
msgid "Turkey"
msgstr "土耳其"
-#: lang.pm:380
+#: lang.pm:382
#, c-format
msgid "Trinidad and Tobago"
msgstr "特立尼达和多巴哥岛"
-#: lang.pm:381
+#: lang.pm:383
#, c-format
msgid "Tuvalu"
msgstr "图瓦卢"
-#: lang.pm:382
+#: lang.pm:384
#, c-format
msgid "Taiwan"
msgstr "中国台湾"
-#: lang.pm:383
+#: lang.pm:385
#, c-format
msgid "Tanzania"
msgstr "坦桑尼亚"
-#: lang.pm:384
+#: lang.pm:386
#, c-format
msgid "Ukraine"
msgstr "乌克兰"
-#: lang.pm:385
+#: lang.pm:387
#, c-format
msgid "Uganda"
msgstr "乌干达"
-#: lang.pm:386
+#: lang.pm:388
#, c-format
msgid "United States Minor Outlying Islands"
msgstr "美属本土外岛屿"
-#: lang.pm:388
+#: lang.pm:390
#, c-format
msgid "Uruguay"
msgstr "乌拉圭"
-#: lang.pm:389
+#: lang.pm:391
#, c-format
msgid "Uzbekistan"
msgstr "乌兹别克斯坦"
-#: lang.pm:390
+#: lang.pm:392
#, c-format
msgid "Vatican"
msgstr "梵蒂冈"
-#: lang.pm:391
+#: lang.pm:393
#, c-format
msgid "Saint Vincent and the Grenadines"
msgstr "圣文森特和格林纳丁斯"
-#: lang.pm:392
+#: lang.pm:394
#, c-format
msgid "Venezuela"
msgstr "委内瑞拉"
-#: lang.pm:393
+#: lang.pm:395
#, c-format
msgid "Virgin Islands (British)"
msgstr "英属维京群岛"
-#: lang.pm:394
+#: lang.pm:396
#, c-format
msgid "Virgin Islands (U.S.)"
msgstr "美属维京群岛"
-#: lang.pm:395
+#: lang.pm:397
#, c-format
msgid "Vietnam"
msgstr "越南"
-#: lang.pm:396
+#: lang.pm:398
#, c-format
msgid "Vanuatu"
msgstr "瓦努阿图"
-#: lang.pm:397
+#: lang.pm:399
#, c-format
msgid "Wallis and Futuna"
msgstr "瓦利斯和富图纳群岛"
-#: lang.pm:398
+#: lang.pm:400
#, c-format
msgid "Samoa"
msgstr "萨摩亚"
-#: lang.pm:399
+#: lang.pm:401
#, c-format
msgid "Yemen"
msgstr "也门"
-#: lang.pm:400
+#: lang.pm:402
#, c-format
msgid "Mayotte"
msgstr "马约特岛"
-#: lang.pm:401
+#: lang.pm:403
#, c-format
msgid "Serbia & Montenegro"
msgstr "塞尔维亚和黑山"
-#: lang.pm:402 standalone/drakxtv:47
+#: lang.pm:404 standalone/drakxtv:47
#, c-format
msgid "South Africa"
msgstr "南非"
-#: lang.pm:403
+#: lang.pm:405
#, c-format
msgid "Zambia"
msgstr "赞比亚"
-#: lang.pm:404
+#: lang.pm:406
#, c-format
msgid "Zimbabwe"
msgstr "津巴布韦"
-#: lang.pm:985
+#: lang.pm:1004
#, c-format
msgid "Welcome to %s"
msgstr "欢迎使用 %s"
@@ -8737,7 +8752,7 @@ msgstr "循环装载 %s\n"
msgid "Remove the logical volumes first\n"
msgstr "请先删除逻辑卷\n"
-#: modules/interactive.pm:21 standalone/drakconnect:969
+#: modules/interactive.pm:21 standalone/drakconnect:982
#, c-format
msgid "Parameters"
msgstr "参数"
@@ -8907,9 +8922,9 @@ msgstr "GlidePoint"
#: mouse.pm:36 network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
#: network/modem.pm:58 network/modem.pm:72 network/modem.pm:77
-#: network/modem.pm:108 network/netconnect.pm:587 network/netconnect.pm:592
-#: network/netconnect.pm:604 network/netconnect.pm:609
-#: network/netconnect.pm:625 network/netconnect.pm:627
+#: network/modem.pm:108 network/netconnect.pm:586 network/netconnect.pm:591
+#: network/netconnect.pm:603 network/netconnect.pm:608
+#: network/netconnect.pm:624 network/netconnect.pm:626
#, c-format
msgid "Automatic"
msgstr "自动"
@@ -9064,17 +9079,17 @@ msgstr "无"
msgid "No mouse"
msgstr "无鼠标"
-#: mouse.pm:515
+#: mouse.pm:514
#, c-format
msgid "Please test the mouse"
msgstr "请测试您的鼠标"
-#: mouse.pm:517
+#: mouse.pm:516
#, c-format
msgid "To activate the mouse,"
msgstr "要激活鼠标,"
-#: mouse.pm:518
+#: mouse.pm:517
#, c-format
msgid "MOVE YOUR WHEEL!"
msgstr "请移动您的滚轮!"
@@ -9114,12 +9129,12 @@ msgstr "Sagem(使用 pppoa) USB"
msgid "Sagem (using dhcp) usb"
msgstr "Sagem(使用 dhcp) USB"
-#: network/adsl.pm:35 network/netconnect.pm:769
+#: network/adsl.pm:35 network/netconnect.pm:761
#, c-format
msgid "Connect to the Internet"
msgstr "连接到 Internet"
-#: network/adsl.pm:36 network/netconnect.pm:770
+#: network/adsl.pm:36 network/netconnect.pm:762
#, c-format
msgid ""
"The most common way to connect with adsl is pppoe.\n"
@@ -9130,7 +9145,7 @@ msgstr ""
"有一些利用 pptp,还有极少数利用 dhcp。\n"
"如果您没有把握,就选择“pppoe”"
-#: network/adsl.pm:41 network/netconnect.pm:774
+#: network/adsl.pm:41 network/netconnect.pm:766
#, c-format
msgid "ADSL connection type :"
msgstr "ADSL 连接类型: "
@@ -9185,12 +9200,17 @@ msgstr "CUPS 服务器"
msgid "Echo request (ping)"
msgstr "回显请求(ping)"
-#: network/drakfirewall.pm:125
+#: network/drakfirewall.pm:65
+#, c-format
+msgid "BitTorrent"
+msgstr "BitTorrent"
+
+#: network/drakfirewall.pm:131
#, c-format
msgid "No network card"
msgstr "没有网卡"
-#: network/drakfirewall.pm:146
+#: network/drakfirewall.pm:152
#, c-format
msgid ""
"drakfirewall configurator\n"
@@ -9205,7 +9225,7 @@ msgstr ""
"如果要配置强大的专用防火墙,请考虑使用专门的\n"
"MandrakeSecurity 防火墙发行版。"
-#: network/drakfirewall.pm:152
+#: network/drakfirewall.pm:158
#, c-format
msgid ""
"drakfirewall configurator\n"
@@ -9217,12 +9237,12 @@ msgstr ""
"\n"
"请确定您在继续任何操作前已经用“Drak 连接”配置了您的局域网/Internet 访问。"
-#: network/drakfirewall.pm:169
+#: network/drakfirewall.pm:175
#, c-format
msgid "Which services would you like to allow the Internet to connect to?"
msgstr "您想要允许 Internet 连接到哪些服务?"
-#: network/drakfirewall.pm:170
+#: network/drakfirewall.pm:176
#, c-format
msgid ""
"You can enter miscellaneous ports. \n"
@@ -9233,7 +9253,7 @@ msgstr ""
"例如,可以这样: 139/tcp 139/udp 600:610/tcp 600:610/udp。\n"
"请参考 /etc/services 文件。"
-#: network/drakfirewall.pm:176
+#: network/drakfirewall.pm:182
#, c-format
msgid ""
"Invalid port given: %s.\n"
@@ -9248,51 +9268,50 @@ msgstr ""
"\n"
"您也可以给出端口范围(如: 24300:24350/udp)"
-#: network/drakfirewall.pm:186
+#: network/drakfirewall.pm:192
#, c-format
msgid "Everything (no firewall)"
msgstr "全部(无防火墙)"
-#: network/drakfirewall.pm:188
+#: network/drakfirewall.pm:194
#, c-format
msgid "Other ports"
msgstr "其它端口"
-#: network/isdn.pm:115 network/netconnect.pm:437
+#: network/isdn.pm:109 network/netconnect.pm:436
#, c-format
msgid "Unlisted - edit manually"
msgstr "未列出 - 手动编辑"
-#: network/isdn.pm:157 network/netconnect.pm:389
+#: network/isdn.pm:151 network/netconnect.pm:385
#, c-format
msgid "ISA / PCMCIA"
msgstr "ISA / PCMCIA"
-#: network/isdn.pm:157 network/netconnect.pm:389
+#: network/isdn.pm:151 network/netconnect.pm:385
#, c-format
msgid "I don't know"
msgstr "我不知道"
-#: network/isdn.pm:158 network/netconnect.pm:389
+#: network/isdn.pm:152 network/netconnect.pm:385
#, c-format
msgid "PCI"
msgstr "PCI"
-#: network/isdn.pm:159 network/netconnect.pm:389
+#: network/isdn.pm:153 network/netconnect.pm:385
#, c-format
msgid "USB"
msgstr "USB"
#: network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
-#: network/netconnect.pm:592 network/netconnect.pm:609
-#: network/netconnect.pm:625
+#: network/netconnect.pm:591 network/netconnect.pm:608
+#: network/netconnect.pm:624
#, c-format
msgid "Manual"
msgstr "手动"
-#: network/netconnect.pm:88 network/netconnect.pm:466
-#: network/netconnect.pm:476 network/netconnect.pm:837
-#: network/netconnect.pm:842
+#: network/netconnect.pm:88 network/netconnect.pm:465
+#: network/netconnect.pm:475
#, c-format
msgid "Manual choice"
msgstr "手动选择"
@@ -9353,12 +9372,12 @@ msgstr "自动 IP(BOOTP/DHCP/Zeroconf)"
msgid "Protocol for the rest of the world"
msgstr "世界其它地区的协议"
-#: network/netconnect.pm:113 standalone/drakconnect:528
+#: network/netconnect.pm:113 standalone/drakconnect:541
#, c-format
msgid "European protocol (EDSS1)"
msgstr "欧洲协议(EDSS1)"
-#: network/netconnect.pm:114 standalone/drakconnect:529
+#: network/netconnect.pm:114 standalone/drakconnect:542
#, c-format
msgid ""
"Protocol for the rest of the world\n"
@@ -9367,102 +9386,102 @@ msgstr ""
"世界其它地区的协议\n"
"没有 D-信道(专线)"
-#: network/netconnect.pm:146
+#: network/netconnect.pm:147
#, c-format
msgid "Alcatel speedtouch USB modem"
msgstr "阿尔卡特 Speedtouch USB 调制解调器"
-#: network/netconnect.pm:147
+#: network/netconnect.pm:148
#, c-format
msgid "Sagem USB modem"
msgstr "Sagem USB 调制解调器"
-#: network/netconnect.pm:148
+#: network/netconnect.pm:149
#, c-format
msgid "Bewan modem"
msgstr "Bewan 调制解调器"
-#: network/netconnect.pm:149
+#: network/netconnect.pm:150
#, c-format
msgid "ECI Hi-Focus modem"
msgstr "ECI Hi-Focus 调制解调器"
-#: network/netconnect.pm:153
+#: network/netconnect.pm:154
#, c-format
msgid "Dynamic Host Configuration Protocol (DHCP)"
msgstr "动态主机配置协议(DHCP)"
-#: network/netconnect.pm:154
+#: network/netconnect.pm:155
#, c-format
msgid "Manual TCP/IP configuration"
msgstr "手工配置 TCP/IP"
-#: network/netconnect.pm:155
+#: network/netconnect.pm:156
#, c-format
msgid "Point to Point Tunneling Protocol (PPTP)"
msgstr "点对点隧道协议(PPTP)"
-#: network/netconnect.pm:156
+#: network/netconnect.pm:157
#, c-format
msgid "PPP over Ethernet (PPPoE)"
msgstr "以太网上的点对点协议(PPPoE)"
-#: network/netconnect.pm:157
+#: network/netconnect.pm:158
#, c-format
msgid "PPP over ATM (PPPoA)"
msgstr "异步传输模式下的点对点协议(PPPoA)"
-#: network/netconnect.pm:161
+#: network/netconnect.pm:162
#, c-format
msgid "Bridged Ethernet LLC"
msgstr "桥接以太网 LLC"
-#: network/netconnect.pm:162
+#: network/netconnect.pm:163
#, c-format
msgid "Bridged Ethernet VC"
msgstr "桥接以太网 VC"
-#: network/netconnect.pm:163
+#: network/netconnect.pm:164
#, c-format
msgid "Routed IP LLC"
msgstr "路由 IP LLC"
-#: network/netconnect.pm:164
+#: network/netconnect.pm:165
#, c-format
msgid "Routed IP VC"
msgstr "路由 IP VC"
-#: network/netconnect.pm:165
+#: network/netconnect.pm:166
#, c-format
msgid "PPPOA LLC"
msgstr "PPPOA LLC"
-#: network/netconnect.pm:166
+#: network/netconnect.pm:167
#, c-format
msgid "PPPOA VC"
msgstr "PPPOA VC"
-#: network/netconnect.pm:170 standalone/drakconnect:466
+#: network/netconnect.pm:171 standalone/drakconnect:477
#, c-format
msgid "Script-based"
msgstr "基于脚本登录"
-#: network/netconnect.pm:171 standalone/drakconnect:466
+#: network/netconnect.pm:172 standalone/drakconnect:477
#, c-format
msgid "PAP"
msgstr "PAP"
-#: network/netconnect.pm:172 standalone/drakconnect:466
+#: network/netconnect.pm:173 standalone/drakconnect:477
#, c-format
msgid "Terminal-based"
msgstr "基于终端"
-#: network/netconnect.pm:173 standalone/drakconnect:466
+#: network/netconnect.pm:174 standalone/drakconnect:477
#, c-format
msgid "CHAP"
msgstr "CHAP"
-#: network/netconnect.pm:174 standalone/drakconnect:466
+#: network/netconnect.pm:175 standalone/drakconnect:477
#, c-format
msgid "PAP/CHAP"
msgstr "PAP/CHAP"
@@ -9536,32 +9555,32 @@ msgstr ""
"\n"
"按“%s”继续。"
-#: network/netconnect.pm:278 network/netconnect.pm:796
+#: network/netconnect.pm:278 network/netconnect.pm:788
#, c-format
msgid "Connection Configuration"
msgstr "连接配置"
-#: network/netconnect.pm:279 network/netconnect.pm:797
+#: network/netconnect.pm:279 network/netconnect.pm:789
#, c-format
msgid "Please fill or check the field below"
msgstr "请填写或选择下列项目"
-#: network/netconnect.pm:286 standalone/drakconnect:519
+#: network/netconnect.pm:286 standalone/drakconnect:532
#, c-format
msgid "Card IRQ"
msgstr "网卡的 IRQ"
-#: network/netconnect.pm:287 standalone/drakconnect:520
+#: network/netconnect.pm:287 standalone/drakconnect:533
#, c-format
msgid "Card mem (DMA)"
msgstr "网卡内存(DMA)"
-#: network/netconnect.pm:288 standalone/drakconnect:521
+#: network/netconnect.pm:288 standalone/drakconnect:534
#, c-format
msgid "Card IO"
msgstr "网卡 IO"
-#: network/netconnect.pm:289 standalone/drakconnect:522
+#: network/netconnect.pm:289 standalone/drakconnect:535
#, c-format
msgid "Card IO_0"
msgstr "网卡 IO_0"
@@ -9576,12 +9595,12 @@ msgstr "网卡 IO_1"
msgid "Your personal phone number"
msgstr "您自己的电话号码"
-#: network/netconnect.pm:292 network/netconnect.pm:800
+#: network/netconnect.pm:292 network/netconnect.pm:792
#, c-format
msgid "Provider name (ex provider.net)"
msgstr "服务商名称(如 provider.net)"
-#: network/netconnect.pm:293 standalone/drakconnect:463
+#: network/netconnect.pm:293 standalone/drakconnect:473
#, c-format
msgid "Provider phone number"
msgstr "服务商电话号码"
@@ -9596,76 +9615,71 @@ msgstr "服务商 DNS 1(可选)"
msgid "Provider DNS 2 (optional)"
msgstr "服务商 DNS 2(可选)"
-#: network/netconnect.pm:296 standalone/drakconnect:419
+#: network/netconnect.pm:296 standalone/drakconnect:429
#, c-format
msgid "Dialing mode"
msgstr "拨号模式"
-#: network/netconnect.pm:297 standalone/drakconnect:424
-#: standalone/drakconnect:484
+#: network/netconnect.pm:297 standalone/drakconnect:434
+#: standalone/drakconnect:495
#, c-format
msgid "Connection speed"
msgstr "连接速率"
-#: network/netconnect.pm:298 standalone/drakconnect:429
+#: network/netconnect.pm:298 standalone/drakconnect:439
#, c-format
msgid "Connection timeout (in sec)"
msgstr "连接超时(秒)"
-#: network/netconnect.pm:301 network/netconnect.pm:803
-#: standalone/drakconnect:461
+#: network/netconnect.pm:301 network/netconnect.pm:795
+#: standalone/drakconnect:471
#, c-format
msgid "Account Login (user name)"
msgstr "账户登录(用户名)"
-#: network/netconnect.pm:302 network/netconnect.pm:804
-#: standalone/drakconnect:462
+#: network/netconnect.pm:302 network/netconnect.pm:796
+#: standalone/drakconnect:472
#, c-format
msgid "Account Password"
msgstr "账户密码"
-#: network/netconnect.pm:332 network/netconnect.pm:650
-#: network/netconnect.pm:835
+#: network/netconnect.pm:332 network/netconnect.pm:649
+#: network/netconnect.pm:827
#, c-format
msgid "Select the network interface to configure:"
msgstr "选择要配置的网卡: "
-#: network/netconnect.pm:334 network/netconnect.pm:379
-#: network/netconnect.pm:651 network/netconnect.pm:837 network/shorewall.pm:84
-#: standalone/drakconnect:643 standalone/drakgw:225 standalone/drakvpn:221
+#: network/netconnect.pm:334 network/netconnect.pm:375
+#: network/netconnect.pm:650 network/netconnect.pm:829 network/shorewall.pm:84
+#: standalone/drakconnect:656 standalone/drakgw:225 standalone/drakvpn:221
#, c-format
msgid "Net Device"
msgstr "网络设备"
-#: network/netconnect.pm:335 network/netconnect.pm:347
+#: network/netconnect.pm:335 network/netconnect.pm:343
#, c-format
msgid "External ISDN modem"
msgstr "外置 ISDN 调制解调器"
-#: network/netconnect.pm:338 network/netconnect.pm:470
-#: network/netconnect.pm:655 standalone/drakgw:113 standalone/drakvpn:51
-#, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
-msgstr "对不起,我们只支持 2.4 及以上版本的内核。"
-
-#: network/netconnect.pm:378 standalone/harddrake2:115
+#. -PO: Do not alter the <span ..> and </span> tags
+#: network/netconnect.pm:374 standalone/harddrake2:121
#, c-format
msgid "Select a device !"
msgstr "请选择设备!"
-#: network/netconnect.pm:387 network/netconnect.pm:397
-#: network/netconnect.pm:407 network/netconnect.pm:423
-#: network/netconnect.pm:434
+#: network/netconnect.pm:383 network/netconnect.pm:393
+#: network/netconnect.pm:403 network/netconnect.pm:419
+#: network/netconnect.pm:433
#, c-format
msgid "ISDN Configuration"
msgstr "ISDN 配置"
-#: network/netconnect.pm:388
+#: network/netconnect.pm:384
#, c-format
msgid "What kind of card do you have?"
msgstr "请问您适配卡的种类?"
-#: network/netconnect.pm:398
+#: network/netconnect.pm:394
#, c-format
msgid ""
"\n"
@@ -9679,33 +9693,34 @@ msgstr ""
"\n"
"如果您的卡是 PCMCIA 卡,您必须知道它的“irq”和“io”。\n"
-#: network/netconnect.pm:402
+#: network/netconnect.pm:398
#, c-format
msgid "Continue"
msgstr "继续"
-#: network/netconnect.pm:402
+#: network/netconnect.pm:398
#, c-format
msgid "Abort"
msgstr "中止"
-#: network/netconnect.pm:408
+#: network/netconnect.pm:404
#, c-format
msgid "Which of the following is your ISDN card?"
msgstr "下列哪个是您的 ISDN 卡?"
-#: network/netconnect.pm:423
+#: network/netconnect.pm:419
#, c-format
msgid "Which protocol do you want to use?"
msgstr "您将使用哪种协议?"
-#: network/netconnect.pm:425 standalone/drakconnect:116
-#: standalone/drakconnect:527 standalone/drakvpn:1142
+#: network/netconnect.pm:421 standalone/drakconnect:116
+#: standalone/drakconnect:318 standalone/drakconnect:540
+#: standalone/drakvpn:1142
#, c-format
msgid "Protocol"
msgstr "协议"
-#: network/netconnect.pm:434
+#: network/netconnect.pm:433
#, c-format
msgid ""
"Select your provider.\n"
@@ -9714,13 +9729,13 @@ msgstr ""
"选择您的提供商。\n"
"如果该提供商未被列出,请选择“未列出”。"
-#: network/netconnect.pm:436 network/netconnect.pm:542
-#: network/netconnect.pm:690
+#: network/netconnect.pm:435 network/netconnect.pm:541
+#: network/netconnect.pm:683
#, c-format
msgid "Provider:"
msgstr "服务商:"
-#: network/netconnect.pm:451
+#: network/netconnect.pm:450
#, c-format
msgid ""
"Your modem isn't supported by the system.\n"
@@ -9729,117 +9744,122 @@ msgstr ""
"您的调制解调器不被系统支持。\n"
"请看看 http://www.linmodems.org"
-#: network/netconnect.pm:463
+#: network/netconnect.pm:462
#, c-format
msgid "Select the modem to configure:"
msgstr "选择要配置的调制解调器:"
-#: network/netconnect.pm:511
+#: network/netconnect.pm:469 standalone/drakgw:113 standalone/drakvpn:51
+#, c-format
+msgid "Sorry, we support only 2.4 and above kernels."
+msgstr "对不起,我们只支持 2.4 及以上版本的内核。"
+
+#: network/netconnect.pm:510
#, c-format
msgid "Please choose which serial port your modem is connected to."
msgstr "请选择您的调制解调器是连接到哪个串行端口。"
-#: network/netconnect.pm:540
+#: network/netconnect.pm:539
#, c-format
msgid "Select your provider:"
msgstr "选择您的服务商:"
-#: network/netconnect.pm:569
+#: network/netconnect.pm:568
#, c-format
msgid "Dialup: account options"
msgstr "拨号: 账户设置"
-#: network/netconnect.pm:572
+#: network/netconnect.pm:571
#, c-format
msgid "Connection name"
msgstr "连接名称"
-#: network/netconnect.pm:573
+#: network/netconnect.pm:572
#, c-format
msgid "Phone number"
msgstr "电话号码"
-#: network/netconnect.pm:574
+#: network/netconnect.pm:573
#, c-format
msgid "Login ID"
msgstr "登录 ID"
-#: network/netconnect.pm:589 network/netconnect.pm:622
+#: network/netconnect.pm:588 network/netconnect.pm:621
#, c-format
msgid "Dialup: IP parameters"
msgstr "拨号: IP 参数"
-#: network/netconnect.pm:592
+#: network/netconnect.pm:591
#, c-format
msgid "IP parameters"
msgstr "IP 参数"
-#: network/netconnect.pm:593 network/netconnect.pm:927
+#: network/netconnect.pm:592 network/netconnect.pm:919
#: printer/printerdrake.pm:431 standalone/drakconnect:116
-#: standalone/drakconnect:325 standalone/drakconnect:816
+#: standalone/drakconnect:332 standalone/drakconnect:829
#: standalone/drakups:266
#, c-format
msgid "IP address"
msgstr "IP 地址"
-#: network/netconnect.pm:594
+#: network/netconnect.pm:593
#, c-format
msgid "Subnet mask"
msgstr "子网掩码"
-#: network/netconnect.pm:606
+#: network/netconnect.pm:605
#, c-format
msgid "Dialup: DNS parameters"
msgstr "拨号: DNS 参数"
-#: network/netconnect.pm:609
+#: network/netconnect.pm:608
#, c-format
msgid "DNS"
msgstr "DNS"
-#: network/netconnect.pm:610
+#: network/netconnect.pm:609
#, c-format
msgid "Domain name"
msgstr "域名"
-#: network/netconnect.pm:611 network/netconnect.pm:801
-#: standalone/drakconnect:934
+#: network/netconnect.pm:610 network/netconnect.pm:793
+#: standalone/drakconnect:947
#, c-format
msgid "First DNS Server (optional)"
msgstr "首选 DNS 服务器(可选)"
-#: network/netconnect.pm:612 network/netconnect.pm:802
-#: standalone/drakconnect:935
+#: network/netconnect.pm:611 network/netconnect.pm:794
+#: standalone/drakconnect:948
#, c-format
msgid "Second DNS Server (optional)"
msgstr "备选 DNS 服务器(可选)"
-#: network/netconnect.pm:613
+#: network/netconnect.pm:612
#, c-format
msgid "Set hostname from IP"
msgstr "由 IP 设置主机名"
-#: network/netconnect.pm:625 standalone/drakconnect:336
+#: network/netconnect.pm:624 standalone/drakconnect:343
#, c-format
msgid "Gateway"
msgstr "网关"
-#: network/netconnect.pm:626
+#: network/netconnect.pm:625
#, c-format
msgid "Gateway IP address"
msgstr "网关 IP 地址"
-#: network/netconnect.pm:650
+#: network/netconnect.pm:649
#, c-format
msgid "ADSL configuration"
msgstr "ADSL 配置"
-#: network/netconnect.pm:688
+#: network/netconnect.pm:681
#, c-format
msgid "Please choose your ADSL provider"
msgstr "请选择您的 ADSL 提供商"
-#: network/netconnect.pm:706
+#: network/netconnect.pm:699
#, c-format
msgid ""
"You need the Alcatel microcode.\n"
@@ -9850,32 +9870,32 @@ msgstr ""
"您可以通过软盘或您的 Windows 分区提供该微代码,\n"
"或者现在跳过稍后再做。"
-#: network/netconnect.pm:710 network/netconnect.pm:715
+#: network/netconnect.pm:703 network/netconnect.pm:708
#, c-format
msgid "Use a floppy"
msgstr "使用软盘"
-#: network/netconnect.pm:710 network/netconnect.pm:719
+#: network/netconnect.pm:703 network/netconnect.pm:712
#, c-format
msgid "Use my Windows partition"
msgstr "使用我的 Windows 分区"
-#: network/netconnect.pm:710 network/netconnect.pm:723
+#: network/netconnect.pm:703 network/netconnect.pm:715
#, c-format
msgid "Do it later"
msgstr "稍后再做"
-#: network/netconnect.pm:730
+#: network/netconnect.pm:722
#, c-format
msgid "Firmware copy failed, file %s not found"
msgstr "固件复制失败,文件 %s 未找到"
-#: network/netconnect.pm:737
+#: network/netconnect.pm:729
#, c-format
msgid "Firmware copy succeeded"
msgstr "固件复制成功"
-#: network/netconnect.pm:752
+#: network/netconnect.pm:744
#, c-format
msgid ""
"You need the Alcatel microcode.\n"
@@ -9888,22 +9908,22 @@ msgstr ""
"%s\n"
"下载并将 mgmt.o 复制到 /usr/share/speedtouch"
-#: network/netconnect.pm:805
+#: network/netconnect.pm:797
#, c-format
msgid "Virtual Path ID (VPI):"
msgstr "虚拟路径 ID (VPI):"
-#: network/netconnect.pm:806
+#: network/netconnect.pm:798
#, c-format
msgid "Virtual Circuit ID (VCI):"
msgstr "虚拟电路 ID (VCI):"
-#: network/netconnect.pm:808
+#: network/netconnect.pm:800
#, c-format
msgid "Encapsulation :"
msgstr "封装: "
-#: network/netconnect.pm:825
+#: network/netconnect.pm:817
#, c-format
msgid ""
"The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -9915,7 +9935,12 @@ msgstr ""
"\n"
"您可以在此网站: http://eciadsl.flashtux.org/ 找到驱动程序。"
-#: network/netconnect.pm:852
+#: network/netconnect.pm:829
+#, c-format
+msgid "Manually load a driver"
+msgstr "手动装入驱动程序"
+
+#: network/netconnect.pm:844
#, c-format
msgid ""
"WARNING: this device has been previously configured to connect to the "
@@ -9927,7 +9952,7 @@ msgstr ""
"要保留现有的配置只要选择确定。\n"
"修改以下的项目将覆盖此配置。"
-#: network/netconnect.pm:865 network/netconnect.pm:1231
+#: network/netconnect.pm:857 network/netconnect.pm:1228
#, c-format
msgid ""
"Congratulations, the network and Internet configuration is finished.\n"
@@ -9936,24 +9961,24 @@ msgstr ""
"恭喜,网络和 Internet 配置完成。\n"
"\n"
-#: network/netconnect.pm:879
+#: network/netconnect.pm:871
#, c-format
msgid "Zeroconf hostname resolution"
msgstr "Zeroconf 主机名解析"
-#: network/netconnect.pm:880 network/netconnect.pm:914
+#: network/netconnect.pm:872 network/netconnect.pm:906
#, c-format
msgid "Configuring network device %s (driver %s)"
msgstr "配置网络设备 %s(驱动程序 %s)"
-#: network/netconnect.pm:881
+#: network/netconnect.pm:873
#, 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:915
+#: network/netconnect.pm:907
#, c-format
msgid ""
"Please enter the IP configuration for this machine.\n"
@@ -9964,89 +9989,89 @@ msgstr ""
"下列项目要求以句点分隔十进制格式输入的 IP 地址。\n"
"(例如,1.2.3.4)"
-#: network/netconnect.pm:922
+#: network/netconnect.pm:914
#, c-format
msgid "Assign host name from DHCP address"
msgstr "从 DHCP 地址指定主机名"
-#: network/netconnect.pm:923
+#: network/netconnect.pm:915
#, c-format
msgid "DHCP host name"
msgstr "DHCP 主机名"
-#: network/netconnect.pm:928 standalone/drakconnect:330
-#: standalone/drakconnect:817 standalone/drakgw:321
+#: network/netconnect.pm:920 standalone/drakconnect:337
+#: standalone/drakconnect:830 standalone/drakgw:321
#, c-format
msgid "Netmask"
msgstr "子网掩码"
-#: network/netconnect.pm:930 standalone/drakconnect:412
+#: network/netconnect.pm:922 standalone/drakconnect:422
#, c-format
msgid "Track network card id (useful for laptops)"
msgstr "跟踪网卡标志(用于笔记本电脑)"
-#: network/netconnect.pm:931 standalone/drakconnect:413
+#: network/netconnect.pm:923 standalone/drakconnect:423
#, c-format
msgid "Network Hotplugging"
msgstr "网络热插拔"
-#: network/netconnect.pm:932 standalone/drakconnect:407
+#: network/netconnect.pm:924 standalone/drakconnect:417
#, c-format
msgid "Start at boot"
msgstr "开机时启动"
-#: network/netconnect.pm:934 standalone/drakconnect:820
+#: network/netconnect.pm:926 standalone/drakconnect:833
#, c-format
msgid "DHCP client"
msgstr "DHCP 客户端"
-#: network/netconnect.pm:944 printer/printerdrake.pm:1383
-#: standalone/drakconnect:608
+#: network/netconnect.pm:936 printer/printerdrake.pm:1383
+#: standalone/drakconnect:621
#, c-format
msgid "IP address should be in format 1.2.3.4"
msgstr "IP 地址的格式应该是 1.2.3.4"
-#: network/netconnect.pm:947
+#: network/netconnect.pm:939
#, c-format
msgid "Warning : IP address %s is usually reserved !"
msgstr "警告: IP 地址 %s 通常是被保留的!"
-#: network/netconnect.pm:977 network/netconnect.pm:1006
+#: network/netconnect.pm:969 network/netconnect.pm:998
#, c-format
msgid "Please enter the wireless parameters for this card:"
msgstr "请选择此网卡的无线参数:"
-#: network/netconnect.pm:980 standalone/drakconnect:378
+#: network/netconnect.pm:972 standalone/drakconnect:389
#, c-format
msgid "Operating Mode"
msgstr "操作模式"
-#: network/netconnect.pm:982 standalone/drakconnect:379
+#: network/netconnect.pm:974 standalone/drakconnect:390
#, c-format
msgid "Network name (ESSID)"
msgstr "网络名称(ESSID)"
-#: network/netconnect.pm:983 standalone/drakconnect:380
+#: network/netconnect.pm:975 standalone/drakconnect:391
#, c-format
msgid "Network ID"
msgstr "网络 ID"
-#: network/netconnect.pm:984 standalone/drakconnect:381
+#: network/netconnect.pm:976 standalone/drakconnect:392
#, c-format
msgid "Operating frequency"
msgstr "运行频率"
-#: network/netconnect.pm:985 standalone/drakconnect:382
+#: network/netconnect.pm:977 standalone/drakconnect:393
#, c-format
msgid "Sensitivity threshold"
msgstr "灵敏度阀值"
-#: network/netconnect.pm:986 standalone/drakconnect:383
+#: network/netconnect.pm:978 standalone/drakconnect:394
#, c-format
msgid "Bitrate (in b/s)"
msgstr "比特率(每秒比特数,b/s)"
-#: network/netconnect.pm:992
+#: network/netconnect.pm:984
#, c-format
msgid ""
"Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -10055,19 +10080,19 @@ msgstr ""
"频率应该有后缀 k,M 或 G(如“2.46G”代表 2.46 GHz 频率),或者后带足够"
"的“0”(零)。"
-#: network/netconnect.pm:996
+#: network/netconnect.pm:988
#, 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:1009 standalone/drakconnect:394
+#: network/netconnect.pm:1001 standalone/drakconnect:405
#, c-format
msgid "RTS/CTS"
msgstr "RTS/CTS"
-#: network/netconnect.pm:1010
+#: network/netconnect.pm:1002
#, c-format
msgid ""
"RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -10086,17 +10111,17 @@ msgstr ""
"包\n"
"的大小,一个等于中止计划的值的大小。您也可以设置这个值为自动、固定或者关闭。"
-#: network/netconnect.pm:1017 standalone/drakconnect:395
+#: network/netconnect.pm:1009 standalone/drakconnect:406
#, c-format
msgid "Fragmentation"
msgstr "块"
-#: network/netconnect.pm:1018 standalone/drakconnect:396
+#: network/netconnect.pm:1010 standalone/drakconnect:407
#, c-format
msgid "Iwconfig command extra arguments"
msgstr "Iwconfig 命令的额外参数"
-#: network/netconnect.pm:1019
+#: network/netconnect.pm:1011
#, c-format
msgid ""
"Here, one can configure some extra wireless parameters such as:\n"
@@ -10112,12 +10137,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:1026 standalone/drakconnect:397
+#: network/netconnect.pm:1018 standalone/drakconnect:408
#, c-format
msgid "Iwspy command extra arguments"
msgstr "Iwspy 命令的额外参数"
-#: network/netconnect.pm:1027
+#: network/netconnect.pm:1019
#, c-format
msgid ""
"Iwspy is used to set a list of addresses in a wireless network\n"
@@ -10135,12 +10160,12 @@ msgstr ""
"\n"
"请参看 iwpspy(8) man page 中的更多信息。"
-#: network/netconnect.pm:1035 standalone/drakconnect:398
+#: network/netconnect.pm:1027 standalone/drakconnect:409
#, c-format
msgid "Iwpriv command extra arguments"
msgstr "Iwpriv 命令的额外参数"
-#: network/netconnect.pm:1036
+#: network/netconnect.pm:1028
#, c-format
msgid ""
"Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10169,7 +10194,7 @@ msgstr ""
"\n"
"请参看 iwpriv(8) man page 中的更多信息。"
-#: network/netconnect.pm:1063
+#: network/netconnect.pm:1055
#, c-format
msgid ""
"No ethernet network adapter has been detected on your system.\n"
@@ -10178,18 +10203,18 @@ msgstr ""
"没有在您的系统里发现以太网卡。\n"
"无法设置这个连接类型。"
-#: network/netconnect.pm:1067 standalone/drakgw:261 standalone/drakpxe:142
+#: network/netconnect.pm:1059 standalone/drakgw:261 standalone/drakpxe:142
#, c-format
msgid "Choose the network interface"
msgstr "选择网卡"
-#: network/netconnect.pm:1068
+#: network/netconnect.pm:1060
#, c-format
msgid ""
"Please choose which network adapter you want to use to connect to Internet."
msgstr "请选择您想要使用哪块网卡来连接 Internet。"
-#: network/netconnect.pm:1089
+#: network/netconnect.pm:1081
#, c-format
msgid ""
"Please enter your host name.\n"
@@ -10201,67 +10226,67 @@ msgstr ""
"您的主机名称必需是个完全限定的名称,例如“mybox.mylab.myco.com”。\n"
"如果您有网关的话,也请输入其 IP 地址。"
-#: network/netconnect.pm:1093
+#: network/netconnect.pm:1085
#, c-format
msgid "Last but not least you can also type in your DNS server IP addresses."
msgstr "最后,您还应该至少输入您 DNS 服务器的 IP 地址。"
-#: network/netconnect.pm:1095 standalone/drakconnect:933
+#: network/netconnect.pm:1087 standalone/drakconnect:946
#, c-format
msgid "Host name (optional)"
msgstr "主机名(可选)"
-#: network/netconnect.pm:1095
+#: network/netconnect.pm:1087
#, c-format
msgid "Host name"
msgstr "主机名"
-#: network/netconnect.pm:1097
+#: network/netconnect.pm:1089
#, c-format
msgid "DNS server 1"
msgstr "DNS 服务器 1"
-#: network/netconnect.pm:1098
+#: network/netconnect.pm:1090
#, c-format
msgid "DNS server 2"
msgstr "DNS 服务器 2"
-#: network/netconnect.pm:1099
+#: network/netconnect.pm:1091
#, c-format
msgid "DNS server 3"
msgstr "DNS 服务器 3"
-#: network/netconnect.pm:1100
+#: network/netconnect.pm:1092
#, c-format
msgid "Search domain"
msgstr "搜索网域"
-#: network/netconnect.pm:1101
+#: network/netconnect.pm:1093
#, c-format
msgid "By default search domain will be set from the fully-qualified host name"
msgstr "默认情况下,搜索域名将会根据完全限定的主机名进行设定"
-#: network/netconnect.pm:1102
+#: network/netconnect.pm:1094
#, c-format
msgid "Gateway (e.g. %s)"
msgstr "网关(如 %s)"
-#: network/netconnect.pm:1104
+#: network/netconnect.pm:1096
#, c-format
msgid "Gateway device"
msgstr "网关设备"
-#: network/netconnect.pm:1113
+#: network/netconnect.pm:1105
#, c-format
msgid "DNS server address should be in format 1.2.3.4"
msgstr "DNS 服务器的格式应该是 1.2.3.4"
-#: network/netconnect.pm:1118 standalone/drakconnect:611
+#: network/netconnect.pm:1110 standalone/drakconnect:624
#, c-format
msgid "Gateway address should be in format 1.2.3.4"
msgstr "网关地址的格式应该是 1.2.3.4"
-#: network/netconnect.pm:1129
+#: network/netconnect.pm:1121
#, c-format
msgid ""
"Enter a Zeroconf host name which will be the one that your machine will get "
@@ -10270,17 +10295,17 @@ msgstr ""
"请输入一个 Zeroconf 主机名,您的计算机将会按照该主机中的说明来实现与网络中其"
"它计算机的互联:"
-#: network/netconnect.pm:1130
+#: network/netconnect.pm:1122
#, c-format
msgid "Zeroconf Host name"
msgstr "Zeroconf 主机名"
-#: network/netconnect.pm:1133
+#: network/netconnect.pm:1125
#, c-format
msgid "Zeroconf host name must not contain a ."
msgstr "Zeroconf 主机名不能包含“.”"
-#: network/netconnect.pm:1143
+#: network/netconnect.pm:1135
#, c-format
msgid ""
"You have configured multiple ways to connect to the Internet.\n"
@@ -10291,32 +10316,32 @@ msgstr ""
"选择您要使用的一种。\n"
"\n"
-#: network/netconnect.pm:1145
+#: network/netconnect.pm:1137
#, c-format
msgid "Internet connection"
msgstr "Internet 连接"
-#: network/netconnect.pm:1153
+#: network/netconnect.pm:1145
#, c-format
msgid "Configuration is complete, do you want to apply settings ?"
msgstr "配置完成,您想要应用设置吗?"
-#: network/netconnect.pm:1163
+#: network/netconnect.pm:1155
#, c-format
msgid "Do you want to start the connection at boot?"
msgstr "您是否希望一开机就启动连接?"
-#: network/netconnect.pm:1175
+#: network/netconnect.pm:1172
#, c-format
msgid "The network needs to be restarted. Do you want to restart it ?"
msgstr "网络需要重新启动。您要重新启动吗?"
-#: network/netconnect.pm:1182 network/netconnect.pm:1247
+#: network/netconnect.pm:1179 network/netconnect.pm:1244
#, c-format
msgid "Network Configuration"
msgstr "网络配置"
-#: network/netconnect.pm:1183
+#: network/netconnect.pm:1180
#, c-format
msgid ""
"A problem occured while restarting the network: \n"
@@ -10327,27 +10352,27 @@ msgstr ""
"\n"
"%s"
-#: network/netconnect.pm:1191
+#: network/netconnect.pm:1188
#, c-format
msgid "Do you want to try to connect to the Internet now?"
msgstr "您想要测试连接到 Internet 吗?"
-#: network/netconnect.pm:1199 standalone/drakconnect:965
+#: network/netconnect.pm:1196 standalone/drakconnect:978
#, c-format
msgid "Testing your connection..."
msgstr "正在测试您的连接..."
-#: network/netconnect.pm:1215
+#: network/netconnect.pm:1212
#, c-format
msgid "The system is now connected to the Internet."
msgstr "您的系统现在正连接到 Internet。"
-#: network/netconnect.pm:1216
+#: network/netconnect.pm:1213
#, c-format
msgid "For security reasons, it will be disconnected now."
msgstr "由于安全原因,现在将断开连接。"
-#: network/netconnect.pm:1217
+#: network/netconnect.pm:1214
#, c-format
msgid ""
"The system doesn't seem to be connected to the Internet.\n"
@@ -10356,14 +10381,14 @@ msgstr ""
"看来系统没有连接到 Internet。\n"
"请重新尝试配置您的连接。"
-#: network/netconnect.pm:1234
+#: network/netconnect.pm:1231
#, 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:1235
+#: network/netconnect.pm:1232
#, c-format
msgid ""
"Problems occured during configuration.\n"
@@ -10374,7 +10399,7 @@ msgstr ""
"请从网络监视器或者控制中心测试您的连接。如果您的连接不工作,您可能想要重新配"
"置。"
-#: network/netconnect.pm:1248
+#: network/netconnect.pm:1245
#, c-format
msgid ""
"Because you are doing a network installation, your network is already "
@@ -10385,7 +10410,7 @@ msgstr ""
"由于您正在执行网络安装,您的网络已经配置好了。\n"
"单击“确定”保存配置,或“取消”重新配置网络。\n"
-#: network/netconnect.pm:1336
+#: network/netconnect.pm:1333
#, c-format
msgid ""
"An unexpected error has happened:\n"
@@ -10448,12 +10473,12 @@ msgstr ""
"\t\teth0 或 eth1 代表有线电视连接,\n"
"\t\tippp+ 代表 ISDN 连接。\n"
-#: network/tools.pm:205
+#: network/tools.pm:165
#, c-format
msgid "Insert floppy"
msgstr "插入软盘"
-#: network/tools.pm:206
+#: network/tools.pm:166
#, c-format
msgid ""
"Insert a FAT formatted floppy in drive %s with %s in root directory and "
@@ -10462,22 +10487,22 @@ msgstr ""
"请在驱动器 %s 中插入一张 FAT 格式的软盘,该软盘要求在根目录有 %s。然后,请按 "
"%s"
-#: network/tools.pm:207
+#: network/tools.pm:167
#, c-format
msgid "Floppy access error, unable to mount device %s"
msgstr "软驱访问错误,无法挂载 %s"
-#: partition_table.pm:644
+#: partition_table.pm:645
#, c-format
msgid "mount failed: "
msgstr "挂载失败: "
-#: partition_table.pm:749
+#: partition_table.pm:750
#, c-format
msgid "Extended partition not supported on this platform"
msgstr "这个平台上不支持扩展分区"
-#: partition_table.pm:767
+#: partition_table.pm:768
#, c-format
msgid ""
"You have a hole in your partition table but I can't use it.\n"
@@ -10487,17 +10512,17 @@ msgstr ""
"分区表里有一段是空的,可是我没法使用它。\n"
"唯一的办法是移动您的主分区,把空闲部分换到与扩展分区相邻的位置。"
-#: partition_table.pm:854
+#: partition_table.pm:855
#, c-format
msgid "Restoring from file %s failed: %s"
msgstr "从文件 %s 恢复失败: %s"
-#: partition_table.pm:856
+#: partition_table.pm:857
#, c-format
msgid "Bad backup file"
msgstr "错误的备份文件"
-#: partition_table.pm:876
+#: partition_table.pm:877
#, c-format
msgid "Error writing to file %s"
msgstr "写入文件 %s 出错"
@@ -10601,243 +10626,243 @@ msgstr "LPRng"
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:686
+#: printer/detect.pm:149 printer/detect.pm:227 printer/detect.pm:429
+#: printer/detect.pm:466 printer/printerdrake.pm:686
#, c-format
msgid "Unknown Model"
msgstr "未知型号"
-#: printer/main.pm:28
+#: printer/main.pm:29
#, c-format
msgid "Local printer"
msgstr "本机打印机"
-#: printer/main.pm:29
+#: printer/main.pm:30
#, c-format
msgid "Remote printer"
msgstr "远程打印机"
-#: printer/main.pm:30
+#: printer/main.pm:31
#, c-format
msgid "Printer on remote CUPS server"
msgstr "远程 CUPS 服务器的打印机"
-#: printer/main.pm:31 printer/printerdrake.pm:1406
+#: printer/main.pm:32 printer/printerdrake.pm:1406
#, c-format
msgid "Printer on remote lpd server"
msgstr "远程 lpd 服务器的打印机"
-#: printer/main.pm:32
+#: printer/main.pm:33
#, c-format
msgid "Network printer (TCP/Socket)"
msgstr "网络打印机(TCP/Socket)"
-#: printer/main.pm:33
+#: printer/main.pm:34
#, c-format
msgid "Printer on SMB/Windows 95/98/NT server"
msgstr "SMB/Windows 95/98/NT 服务器上的打印机"
-#: printer/main.pm:34
+#: printer/main.pm:35
#, c-format
msgid "Printer on NetWare server"
msgstr "NetWare 服务器上的打印机"
-#: printer/main.pm:35 printer/printerdrake.pm:1410
+#: printer/main.pm:36 printer/printerdrake.pm:1410
#, c-format
msgid "Enter a printer device URI"
msgstr "输入打印机设备 URI"
-#: printer/main.pm:36
+#: printer/main.pm:37
#, c-format
msgid "Pipe job into a command"
msgstr "作业管道定向到命令"
-#: printer/main.pm:306 printer/main.pm:574 printer/main.pm:1544
-#: printer/main.pm:2228 printer/main.pm:2239 printer/printerdrake.pm:1866
+#: printer/main.pm:307 printer/main.pm:575 printer/main.pm:1545
+#: printer/main.pm:2229 printer/main.pm:2240 printer/printerdrake.pm:1866
#: printer/printerdrake.pm:4396
#, c-format
msgid "Unknown model"
msgstr "未知型号"
-#: printer/main.pm:331 standalone/printerdrake:196
+#: printer/main.pm:332 standalone/printerdrake:196
#, c-format
msgid "Configured on this machine"
msgstr "已在本机上配置"
-#: printer/main.pm:337 printer/printerdrake.pm:963
+#: printer/main.pm:338 printer/printerdrake.pm:963
#, c-format
msgid " on parallel port #%s"
msgstr " 位于并行口 #%s"
-#: printer/main.pm:340 printer/printerdrake.pm:965
+#: printer/main.pm:341 printer/printerdrake.pm:965
#, c-format
msgid ", USB printer #%s"
msgstr ",USB 打印机 #%s"
-#: printer/main.pm:342
+#: printer/main.pm:343
#, c-format
msgid ", USB printer"
msgstr ",USB 打印机"
-#: printer/main.pm:347
+#: printer/main.pm:348
#, c-format
msgid ", multi-function device on parallel port #%s"
msgstr ",并行端口上的一体机 #%s"
-#: printer/main.pm:350
+#: printer/main.pm:351
#, c-format
msgid ", multi-function device on a parallel port"
msgstr ",并行端口上的一体机"
-#: printer/main.pm:352
+#: printer/main.pm:353
#, c-format
msgid ", multi-function device on USB"
msgstr ",USB 端口上的一体机"
-#: printer/main.pm:354
+#: printer/main.pm:355
#, c-format
msgid ", multi-function device on HP JetDirect"
msgstr ",HP JetDirect 上的一体机"
-#: printer/main.pm:356
+#: printer/main.pm:357
#, c-format
msgid ", multi-function device"
msgstr ",一体机"
-#: printer/main.pm:359
+#: printer/main.pm:360
#, c-format
msgid ", printing to %s"
msgstr ",打印到 %s"
-#: printer/main.pm:361
+#: printer/main.pm:362
#, c-format
msgid " on LPD server \"%s\", printer \"%s\""
msgstr "LPD 服务器“%s”上的打印机“%s”"
-#: printer/main.pm:363
+#: printer/main.pm:364
#, c-format
msgid ", TCP/IP host \"%s\", port %s"
msgstr ",TCP/IP 主机“%s”,端口 %s"
-#: printer/main.pm:367
+#: printer/main.pm:368
#, c-format
msgid " on SMB/Windows server \"%s\", share \"%s\""
msgstr "SMB/Windows 服务器“%s”上的共享“%s”"
-#: printer/main.pm:371
+#: printer/main.pm:372
#, c-format
msgid " on Novell server \"%s\", printer \"%s\""
msgstr "Novell 打印服务器“%s”上的打印机“%s”"
-#: printer/main.pm:373
+#: printer/main.pm:374
#, c-format
msgid ", using command %s"
msgstr ",使用命令 %s"
-#: printer/main.pm:388
+#: printer/main.pm:389
#, c-format
msgid "Parallel port #%s"
msgstr "并行端口 #%s"
-#: printer/main.pm:391 printer/printerdrake.pm:979
+#: printer/main.pm:392 printer/printerdrake.pm:979
#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1020
#, c-format
msgid "USB printer #%s"
msgstr "USB 打印机 #%s"
-#: printer/main.pm:393
+#: printer/main.pm:394
#, c-format
msgid "USB printer"
msgstr "USB 打印机"
-#: printer/main.pm:398
+#: printer/main.pm:399
#, c-format
msgid "Multi-function device on parallel port #%s"
msgstr "并行端口 #%s 上的一体机"
-#: printer/main.pm:401
+#: printer/main.pm:402
#, c-format
msgid "Multi-function device on a parallel port"
msgstr "并行端口上的一体机"
-#: printer/main.pm:403
+#: printer/main.pm:404
#, c-format
msgid "Multi-function device on USB"
msgstr "USB 端口上的一体机"
-#: printer/main.pm:405
+#: printer/main.pm:406
#, c-format
msgid "Multi-function device on HP JetDirect"
msgstr "HP JetDirect 上的一体机"
-#: printer/main.pm:407
+#: printer/main.pm:408
#, c-format
msgid "Multi-function device"
msgstr "一体机"
-#: printer/main.pm:410
+#: printer/main.pm:411
#, c-format
msgid "Prints into %s"
msgstr "打印到 %s"
-#: printer/main.pm:412
+#: printer/main.pm:413
#, c-format
msgid "LPD server \"%s\", printer \"%s\""
msgstr "LPD 服务器“%s”上的打印机“%s”"
-#: printer/main.pm:414
+#: printer/main.pm:415
#, c-format
msgid "TCP/IP host \"%s\", port %s"
msgstr "TCP/IP 主机“%s”,端口 %s"
-#: printer/main.pm:418
+#: printer/main.pm:419
#, c-format
msgid "SMB/Windows server \"%s\", share \"%s\""
msgstr "SMB/Windows 服务器“%s”上的共享“%s”"
-#: printer/main.pm:422
+#: printer/main.pm:423
#, c-format
msgid "Novell server \"%s\", printer \"%s\""
msgstr "Novell 服务器“%s”上的打印机“%s”"
-#: printer/main.pm:424
+#: printer/main.pm:425
#, c-format
msgid "Uses command %s"
msgstr "使用命令 %s"
-#: printer/main.pm:426
+#: printer/main.pm:427
#, c-format
msgid "URI: %s"
msgstr "URI: %s"
-#: printer/main.pm:571 printer/printerdrake.pm:732
+#: printer/main.pm:572 printer/printerdrake.pm:732
#: printer/printerdrake.pm:2463
#, c-format
msgid "Raw printer (No driver)"
msgstr "直接打印输出(不使用驱动程序)"
-#: printer/main.pm:1085 printer/printerdrake.pm:179
+#: printer/main.pm:1086 printer/printerdrake.pm:179
#: printer/printerdrake.pm:191
#, c-format
msgid "Local network(s)"
msgstr "局域网"
-#: printer/main.pm:1087 printer/printerdrake.pm:195
+#: printer/main.pm:1088 printer/printerdrake.pm:195
#, c-format
msgid "Interface \"%s\""
msgstr "网卡“%s”"
-#: printer/main.pm:1089
+#: printer/main.pm:1090
#, c-format
msgid "Network %s"
msgstr "网络 %s"
-#: printer/main.pm:1091
+#: printer/main.pm:1092
#, c-format
msgid "Host %s"
msgstr "主机 %s"
-#: printer/main.pm:1120
+#: printer/main.pm:1121
#, c-format
msgid "%s (Port %s)"
msgstr "%s(端口 %s)"
@@ -10900,8 +10925,8 @@ msgstr "在主机/网络上共享打印机:"
msgid "Custom configuration"
msgstr "自定义配置"
-#: printer/printerdrake.pm:78 standalone/scannerdrake:561
-#: standalone/scannerdrake:578
+#: printer/printerdrake.pm:78 standalone/scannerdrake:566
+#: standalone/scannerdrake:583
#, c-format
msgid "No remote machines"
msgstr "没有远程计算机"
@@ -11109,7 +11134,7 @@ msgid "This server is already in the list, it cannot be added again.\n"
msgstr "此服务器已经位于列表中,无法再次添加。\n"
#: printer/printerdrake.pm:433 printer/printerdrake.pm:1650
-#: standalone/drakups:233 standalone/harddrake2:64
+#: standalone/drakups:233 standalone/harddrake2:68
#, c-format
msgid "Port"
msgstr "端口"
@@ -11138,7 +11163,7 @@ msgstr "端口"
#: 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
+#: standalone/printerdrake:522
#, c-format
msgid "Printerdrake"
msgstr "Drak 打印机"
@@ -11780,14 +11805,12 @@ msgid "Remote printer name missing!"
msgstr "没有找到远程打印机!"
#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
-#: standalone/drakTermServ:466 standalone/drakTermServ:764
-#: standalone/drakTermServ:780 standalone/drakTermServ:1418
-#: standalone/drakTermServ:1426 standalone/drakTermServ:1437
-#: standalone/drakbackup:582 standalone/drakbackup:687
-#: standalone/drakbackup:722 standalone/drakbackup:840
-#: standalone/drakconnect:263 standalone/drakconnect:298
-#: standalone/drakconnect:542 standalone/drakconnect:552
-#: standalone/drakconnect:576 standalone/harddrake2:160
+#: standalone/drakTermServ:454 standalone/drakTermServ:753
+#: standalone/drakTermServ:769 standalone/drakTermServ:1432
+#: standalone/drakTermServ:1440 standalone/drakTermServ:1451
+#: standalone/drakbackup:512 standalone/drakbackup:618
+#: standalone/drakbackup:653 standalone/drakbackup:771
+#: standalone/harddrake2:166
#, c-format
msgid "Information"
msgstr "信息"
@@ -12172,8 +12195,8 @@ msgstr ""
msgid "Name of printer"
msgstr "打印机名称"
-#: printer/printerdrake.pm:2302 standalone/drakconnect:557
-#: standalone/harddrake2:40 standalone/printerdrake:212
+#: printer/printerdrake.pm:2302 standalone/drakconnect:570
+#: standalone/harddrake2:41 standalone/printerdrake:212
#: standalone/printerdrake:219
#, c-format
msgid "Description"
@@ -12692,10 +12715,10 @@ msgstr "正在“%s”打印机上打印"
#: printer/printerdrake.pm:3293 printer/printerdrake.pm:3296
#: printer/printerdrake.pm:3297 printer/printerdrake.pm:3298
-#: printer/printerdrake.pm:4384 standalone/drakTermServ:325
-#: standalone/drakbackup:4265 standalone/drakbug:177 standalone/drakfont:500
-#: standalone/drakfont:591 standalone/net_monitor:106
-#: standalone/printerdrake:508
+#: printer/printerdrake.pm:4384 standalone/drakTermServ:313
+#: standalone/drakbackup:4063 standalone/drakbug:177 standalone/drakfont:500
+#: standalone/drakfont:591 standalone/net_monitor:107
+#: standalone/printerdrake:515
#, c-format
msgid "Close"
msgstr "关闭"
@@ -13255,15 +13278,15 @@ msgid "Could not set permissions of firmware file %s!"
msgstr "无法设定固件文件 %s 的权限!"
#: 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
+#: standalone/scannerdrake:77 standalone/scannerdrake:344
+#: standalone/scannerdrake:419 standalone/scannerdrake:463
+#: standalone/scannerdrake:467 standalone/scannerdrake:489
+#: standalone/scannerdrake:554
#, c-format
msgid "Scannerdrake"
msgstr "Drak 扫描仪"
-#: scanner.pm:201 standalone/scannerdrake:915
+#: scanner.pm:201 standalone/scannerdrake:920
#, c-format
msgid "Could not install the packages needed to share your scanner(s)."
msgstr "无法安装共享您的扫描仪所需的软件包。"
@@ -14345,7 +14368,7 @@ msgid ""
"about this service, sorry."
msgstr "没有该服务的附加信息。"
-#: services.pm:226 ugtk2.pm:1167
+#: services.pm:226 ugtk2.pm:1176
#, c-format
msgid "Info"
msgstr "信息"
@@ -14596,8 +14619,8 @@ msgstr "驻足 <b>www.mandrakestore.com</b>"
msgid "Become a <b>MandrakeClub</b> member!"
msgstr "成为 <b>Mandrakeclub</b> 会员!"
-#: share/advertising/dis-10.pl:15 share/advertising/ppp-10.pl:15
-#: share/advertising/pwp-09.pl:15
+#: share/advertising/dis-10.pl:15 share/advertising/dwd-07.pl:15
+#: share/advertising/ppp-10.pl:15 share/advertising/pwp-09.pl:15
#, c-format
msgid ""
"Take advantage of valuable benefits, products and services by joining "
@@ -14825,13 +14848,6 @@ msgstr ""
msgid "<b>Become a MandrakeClub member!</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,您可充分享受各项超值回馈、产品和服务,例如: "
-
#: share/advertising/dwd-08.pl:14 share/advertising/ppp-11.pl:13
#: share/advertising/pwp-10.pl:13
#, c-format
@@ -15400,17 +15416,17 @@ msgstr "请注销,然后同时按 Ctrl-Alt-BackSpace"
msgid "You need to log out and back in again for changes to take effect"
msgstr "您需要注销后重新登录才能让更改生效"
-#: standalone/drakTermServ:77
+#: standalone/drakTermServ:79
#, c-format
msgid "Useless without Terminal Server"
msgstr "没有终端服务器就无用"
-#: standalone/drakTermServ:114 standalone/drakTermServ:121
+#: standalone/drakTermServ:116 standalone/drakTermServ:123
#, c-format
msgid "%s: %s requires a username...\n"
msgstr "%s: %s 需要用户名...\n"
-#: standalone/drakTermServ:134
+#: standalone/drakTermServ:136
#, c-format
msgid ""
"%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -15419,78 +15435,73 @@ msgstr ""
"%s: %s 需要主机名、MAC 地址、IP、nbi-image、代表瘦客户端的 0/1、代表本地配置"
"的 0/1...\n"
-#: standalone/drakTermServ:141
+#: standalone/drakTermServ:143
#, c-format
msgid "%s: %s requires hostname...\n"
msgstr "%s: %s 需要主机名...\n"
-#: standalone/drakTermServ:153
-#, c-format
-msgid "You must be root to read configuration file. \n"
-msgstr "您必须是 root 才能读取配置文件。\n"
-
-#: standalone/drakTermServ:238 standalone/drakTermServ:512
+#: standalone/drakTermServ:226 standalone/drakTermServ:500
#: standalone/drakfont:575
#, c-format
msgid "OK"
msgstr "确定"
-#: standalone/drakTermServ:249 standalone/drakTermServ:252
+#: standalone/drakTermServ:237 standalone/drakTermServ:240
#, c-format
msgid "Terminal Server Configuration"
msgstr "终端服务器配置"
-#: standalone/drakTermServ:267
+#: standalone/drakTermServ:255
#, c-format
msgid "Enable Server"
msgstr "启用服务器"
-#: standalone/drakTermServ:273
+#: standalone/drakTermServ:261
#, c-format
msgid "Disable Server"
msgstr "禁用服务器"
-#: standalone/drakTermServ:281
+#: standalone/drakTermServ:269
#, c-format
msgid "Start Server"
msgstr "启动服务器"
-#: standalone/drakTermServ:287
+#: standalone/drakTermServ:275
#, c-format
msgid "Stop Server"
msgstr "停止服务器"
-#: standalone/drakTermServ:295
+#: standalone/drakTermServ:283
#, c-format
msgid "Etherboot Floppy/ISO"
msgstr "Etherboot 软盘/ISO"
-#: standalone/drakTermServ:299
+#: standalone/drakTermServ:287
#, c-format
msgid "Net Boot Images"
msgstr "网络启动磁盘镜像"
-#: standalone/drakTermServ:305
+#: standalone/drakTermServ:293
#, c-format
msgid "Add/Del Users"
msgstr "添加/删除用户"
-#: standalone/drakTermServ:309
+#: standalone/drakTermServ:297
#, c-format
msgid "Add/Del Clients"
msgstr "添加/删除客户"
-#: standalone/drakTermServ:320 standalone/drakbug:54
+#: standalone/drakTermServ:308 standalone/drakbug:54
#, c-format
msgid "First Time Wizard"
msgstr "初次使用向导"
-#: standalone/drakTermServ:352 standalone/drakTermServ:353
+#: standalone/drakTermServ:340 standalone/drakTermServ:341
#, c-format
msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
msgstr "%s 定义为 dm,将 gdm 用户添加到 /etc/passwd$$CLIENT$$"
-#: standalone/drakTermServ:359
+#: standalone/drakTermServ:347
#, c-format
msgid ""
"\n"
@@ -15527,22 +15538,22 @@ msgstr ""
" e) 要求您制作启动软盘。\n"
" f) 如果是瘦客户的话,询问您是否想要重新启动 K 登陆管理器(KDM)。\n"
-#: standalone/drakTermServ:404
+#: standalone/drakTermServ:392
#, c-format
msgid "Cancel Wizard"
msgstr "取消向导"
-#: standalone/drakTermServ:416
+#: standalone/drakTermServ:404
#, c-format
msgid "Please save dhcpd config!"
msgstr "请保存 dhcpd 配置!"
-#: standalone/drakTermServ:444
+#: standalone/drakTermServ:432
#, c-format
msgid "Use thin clients."
msgstr "使用瘦客户端。"
-#: standalone/drakTermServ:446
+#: standalone/drakTermServ:434
#, c-format
msgid ""
"Please select default client type.\n"
@@ -15554,45 +15565,45 @@ msgstr ""
" “瘦”客户端会使用服务器的 CPU/内存,只是使用客户端进行显示。\n"
" “胖”客户端将会使用自己的 CPU/内存,但会使用服务器的文件系统。"
-#: standalone/drakTermServ:458 standalone/drakTermServ:1072
+#: standalone/drakTermServ:446 standalone/drakTermServ:1061
#, c-format
msgid "Sync client X keyboard settings with server."
msgstr "将客户端的 X 键盘设置与服务器同步。"
-#: standalone/drakTermServ:465
+#: standalone/drakTermServ:453
#, c-format
msgid "Creating net boot images for all kernels"
msgstr "为全部内核创建网络引导映像"
-#: standalone/drakTermServ:466 standalone/drakTermServ:764
-#: standalone/drakTermServ:780
+#: standalone/drakTermServ:454 standalone/drakTermServ:753
+#: standalone/drakTermServ:769
#, c-format
msgid "This will take a few minutes."
msgstr "这将花费几分钟。"
-#: standalone/drakTermServ:470 standalone/drakTermServ:490
+#: standalone/drakTermServ:458 standalone/drakTermServ:478
#, c-format
msgid "Done!"
msgstr "完成!"
-#: standalone/drakTermServ:476
+#: standalone/drakTermServ:464
#, c-format
msgid "Syncing server user list with client list, including root."
msgstr "将服务器用户列表与客户列表同步,包括 root。"
-#: standalone/drakTermServ:496
+#: standalone/drakTermServ:484
#, c-format
msgid ""
"In order to enable changes made for thin clients, the display manager must "
"be restarted. Restart now?"
msgstr "为了要启用为瘦客户所作的更改,必须重新启动显示管理器。立即重新启动吗?"
-#: standalone/drakTermServ:531
+#: standalone/drakTermServ:519
#, c-format
msgid "Terminal Server Overview"
msgstr "终端服务器概览"
-#: standalone/drakTermServ:532
+#: standalone/drakTermServ:520
#, c-format
msgid ""
" - Create Etherboot Enabled Boot Images:\n"
@@ -15615,7 +15626,7 @@ msgstr ""
"etherboot-pcimap.include,与 dhcpd.conf 相关联,\n"
" \t您需要至少为一个完整的内核创建以太网启动镜像。"
-#: standalone/drakTermServ:538
+#: standalone/drakTermServ:526
#, c-format
msgid ""
" - Maintain /etc/dhcpd.conf:\n"
@@ -15647,7 +15658,7 @@ msgstr ""
"\t\t\t \n"
" \t\t一个可以支持无盘工作站典型的 dhcpd.conf 应该是这样:"
-#: standalone/drakTermServ:556
+#: standalone/drakTermServ:544
#, c-format
msgid ""
" While you can use a pool of IP addresses, rather than setup a "
@@ -15700,7 +15711,7 @@ msgstr ""
"\t\t\t\n"
"\t\t\t注意:在添加或更改客户端后您必须停止/启动服务器。"
-#: standalone/drakTermServ:576
+#: standalone/drakTermServ:564
#, c-format
msgid ""
" - Maintain /etc/exports:\n"
@@ -15729,7 +15740,7 @@ msgstr ""
"\t\t\t\n"
"\t\t\t这里的子网/掩码应该与您的网络相同。"
-#: standalone/drakTermServ:588
+#: standalone/drakTermServ:576
#, c-format
msgid ""
" - Maintain %s:\n"
@@ -15745,7 +15756,7 @@ msgstr ""
" \t\t除了要在 /etc/shadow 中之外,还应在 %s$\n"
" \t\t中存有副本。drakTermServ 能够帮助您完成这一过程。"
-#: standalone/drakTermServ:592
+#: standalone/drakTermServ:580
#, c-format
msgid ""
" - Per client %s:\n"
@@ -15762,7 +15773,7 @@ msgstr ""
"助您创建\n"
" \t\t这些文件。"
-#: standalone/drakTermServ:597
+#: standalone/drakTermServ:585
#, c-format
msgid ""
" - Per client system configuration files:\n"
@@ -15794,7 +15805,7 @@ msgstr ""
" 终端服务器这一特性。本地配置能够被关闭,但\n"
" 保留配置文件,只要客户端机器被配置了的话。"
-#: standalone/drakTermServ:606
+#: standalone/drakTermServ:594
#, c-format
msgid ""
" - /etc/xinetd.d/tftp:\n"
@@ -15846,7 +15857,7 @@ msgstr ""
"更改\n"
" \t\t为 /var/lib/tftpboot,这里正是 mkinitrd-net 存放映像的地点。"
-#: standalone/drakTermServ:627
+#: standalone/drakTermServ:615
#, c-format
msgid ""
" - Create etherboot floppies/CDs:\n"
@@ -15874,62 +15885,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:662
+#: standalone/drakTermServ:650
#, c-format
msgid "Boot Floppy"
msgstr "启动软盘"
-#: standalone/drakTermServ:664
+#: standalone/drakTermServ:652
#, c-format
msgid "Boot ISO"
msgstr "启动 ISO"
-#: standalone/drakTermServ:666
+#: standalone/drakTermServ:654
#, c-format
msgid "PXE Image"
msgstr "PXE 映像"
-#: standalone/drakTermServ:735
+#: standalone/drakTermServ:723
#, c-format
msgid "Default kernel version"
msgstr "默认内核版本"
-#: standalone/drakTermServ:762
+#: standalone/drakTermServ:751
#, c-format
msgid "Build Whole Kernel -->"
msgstr "建造整个内核 -->"
-#: standalone/drakTermServ:769
+#: standalone/drakTermServ:758
#, c-format
msgid "No kernel selected!"
msgstr "没有选择内核!"
-#: standalone/drakTermServ:772
+#: standalone/drakTermServ:761
#, c-format
msgid "Build Single NIC -->"
msgstr "建造单独的网卡 -->"
-#: standalone/drakTermServ:776
+#: standalone/drakTermServ:765
#, c-format
msgid "No NIC selected!"
msgstr "没有选择网卡!"
-#: standalone/drakTermServ:779
+#: standalone/drakTermServ:768
#, c-format
msgid "Build All Kernels -->"
msgstr "建造全部内核 -->"
-#: standalone/drakTermServ:787
+#: standalone/drakTermServ:776
#, c-format
msgid "<-- Delete"
msgstr "<-- 删除"
-#: standalone/drakTermServ:794
+#: standalone/drakTermServ:783
#, c-format
msgid "Delete All NBIs"
msgstr "删除所有 NBI"
-#: standalone/drakTermServ:881
+#: standalone/drakTermServ:870
#, c-format
msgid ""
"!!! Indicates the password in the system database is different than\n"
@@ -15939,94 +15950,94 @@ msgstr ""
"!!!表明系统数据库中的密码与终端服务器数据库中的密码不同。\n"
"请删除/在终端服务器中重新添加用户后才能登录。"
-#: standalone/drakTermServ:886
+#: standalone/drakTermServ:875
#, c-format
msgid "Add User -->"
msgstr "添加用户 -->"
-#: standalone/drakTermServ:892
+#: standalone/drakTermServ:881
#, c-format
msgid "<-- Del User"
msgstr "<-- 删除用户"
-#: standalone/drakTermServ:928
+#: standalone/drakTermServ:917
#, c-format
msgid "type: %s"
msgstr "类型: %s"
-#: standalone/drakTermServ:932
+#: standalone/drakTermServ:921
#, c-format
msgid "local config: %s"
msgstr "本地配置: %s"
-#: standalone/drakTermServ:962
+#: standalone/drakTermServ:951
#, c-format
msgid ""
"Allow local hardware\n"
"configuration."
msgstr "允许本地硬件配置。"
-#: standalone/drakTermServ:971
+#: standalone/drakTermServ:960
#, c-format
msgid "No net boot images created!"
msgstr "没有创建网络启动镜像!"
-#: standalone/drakTermServ:989
+#: standalone/drakTermServ:978
#, c-format
msgid "Thin Client"
msgstr "瘦客户端"
-#: standalone/drakTermServ:993
+#: standalone/drakTermServ:982
#, c-format
msgid "Allow Thin Clients"
msgstr "允许瘦客户端"
-#: standalone/drakTermServ:994
+#: standalone/drakTermServ:983
#, c-format
msgid "Add Client -->"
msgstr "添加客户 -->"
-#: standalone/drakTermServ:1008
+#: standalone/drakTermServ:997
#, c-format
msgid "type: fat"
msgstr "类型: 胖"
-#: standalone/drakTermServ:1009
+#: standalone/drakTermServ:998
#, c-format
msgid "type: thin"
msgstr "类型: 瘦"
-#: standalone/drakTermServ:1016
+#: standalone/drakTermServ:1005
#, c-format
msgid "local config: false"
msgstr "本机配置: 假"
-#: standalone/drakTermServ:1017
+#: standalone/drakTermServ:1006
#, c-format
msgid "local config: true"
msgstr "本地配置: 真"
-#: standalone/drakTermServ:1025
+#: standalone/drakTermServ:1014
#, c-format
msgid "<-- Edit Client"
msgstr "<-- 编辑客户"
-#: standalone/drakTermServ:1051
+#: standalone/drakTermServ:1040
#, c-format
msgid "Disable Local Config"
msgstr "禁用本地配置"
-#: standalone/drakTermServ:1058
+#: standalone/drakTermServ:1047
#, c-format
msgid "Delete Client"
msgstr "删除客户"
-#: standalone/drakTermServ:1067
+#: standalone/drakTermServ:1056
#, c-format
msgid "dhcpd Config..."
msgstr "dhcpd 配置..."
-#: standalone/drakTermServ:1083
+#: standalone/drakTermServ:1072
#, c-format
msgid ""
"Need to restart the Display Manager for full changes to take effect. \n"
@@ -16035,67 +16046,77 @@ msgstr ""
"需要重新启动显示管理器以便所有更改生效。\n"
"(service dm restart - 控制台上)"
-#: standalone/drakTermServ:1123
+#: standalone/drakTermServ:1112
#, c-format
msgid "Thin clients won't work with autologin. Disable autologin?"
msgstr "瘦客户无法使用自动登录。禁用自动登录吗?"
-#: standalone/drakTermServ:1139
+#: standalone/drakTermServ:1128
#, c-format
msgid "All clients will use %s"
msgstr "全部客户都使用 %s"
-#: standalone/drakTermServ:1169
+#: standalone/drakTermServ:1160
#, c-format
msgid "Subnet:"
msgstr "子网: "
-#: standalone/drakTermServ:1176
+#: standalone/drakTermServ:1167
#, c-format
msgid "Netmask:"
msgstr "子网掩码: "
-#: standalone/drakTermServ:1183
+#: standalone/drakTermServ:1174
#, c-format
msgid "Routers:"
msgstr "路由器: "
-#: standalone/drakTermServ:1190
+#: standalone/drakTermServ:1181
#, c-format
msgid "Subnet Mask:"
msgstr "子网掩码: "
-#: standalone/drakTermServ:1197
+#: standalone/drakTermServ:1188
#, c-format
msgid "Broadcast Address:"
msgstr "广播地址: "
-#: standalone/drakTermServ:1204
+#: standalone/drakTermServ:1195
#, c-format
msgid "Domain Name:"
msgstr "域名: "
-#: standalone/drakTermServ:1212
+#: standalone/drakTermServ:1203
#, c-format
msgid "Name Servers:"
msgstr "命名服务器: "
-#: standalone/drakTermServ:1223
+#: standalone/drakTermServ:1214
#, c-format
msgid "IP Range Start:"
msgstr "IP 范围起点: "
-#: standalone/drakTermServ:1224
+#: standalone/drakTermServ:1215
#, c-format
msgid "IP Range End:"
msgstr "IP 范围终点: "
-#: standalone/drakTermServ:1276
+#: standalone/drakTermServ:1257
+#, c-format
+msgid "Append TS Includes To Existing Config"
+msgstr ""
+
+#: standalone/drakTermServ:1259
+#, c-format
+msgid "Write Config"
+msgstr "写入配置"
+
+#: standalone/drakTermServ:1275
#, c-format
msgid "dhcpd Server Configuration"
msgstr "dhcpd 服务器配置"
-#: standalone/drakTermServ:1277
+#: standalone/drakTermServ:1276
#, c-format
msgid ""
"Most of these values were extracted\n"
@@ -16105,113 +16126,103 @@ msgstr ""
"这些值中绝大多数会从您正在运行的系统\n"
"中提取。若需要您可以进行修改。"
-#: standalone/drakTermServ:1280
+#: standalone/drakTermServ:1279
#, c-format
msgid "Dynamic IP Address Pool:"
msgstr "动态 IP 地址池: "
-#: standalone/drakTermServ:1293
-#, c-format
-msgid "Write Config"
-msgstr "写入配置"
-
-#: standalone/drakTermServ:1412
+#: standalone/drakTermServ:1426
#, c-format
msgid "Please insert floppy disk:"
msgstr "请插入软盘: "
-#: standalone/drakTermServ:1416
+#: standalone/drakTermServ:1430
#, c-format
msgid "Couldn't access the floppy!"
msgstr "无法访问软盘!"
-#: standalone/drakTermServ:1418
+#: standalone/drakTermServ:1432
#, c-format
msgid "Floppy can be removed now"
msgstr "现在可以取出软盘了"
-#: standalone/drakTermServ:1421
+#: standalone/drakTermServ:1435
#, c-format
msgid "No floppy drive available!"
msgstr "没有可用的软盘驱动器!"
-#: standalone/drakTermServ:1426
+#: standalone/drakTermServ:1440
#, c-format
msgid "PXE image is %s/%s"
msgstr "PXE 镜像是 %s/%s"
-#: standalone/drakTermServ:1428
+#: standalone/drakTermServ:1442
#, c-format
msgid "Error writing %s/%s"
msgstr "写入 %s/%s 出错"
-#: standalone/drakTermServ:1437
+#: standalone/drakTermServ:1451
#, c-format
msgid "Etherboot ISO image is %s"
msgstr "Etherboot ISO 镜像是 %s"
-#: standalone/drakTermServ:1439
+#: standalone/drakTermServ:1453
#, c-format
msgid "Something went wrong! - Is mkisofs installed?"
msgstr "发生错误!- mkisofs 安装了吗?"
-#: standalone/drakTermServ:1459
+#: standalone/drakTermServ:1475
#, c-format
msgid "Need to create /etc/dhcpd.conf first!"
msgstr "需要先创建 /etc/dhcpd.conf 文件!"
-#: standalone/drakTermServ:1620
+#: standalone/drakTermServ:1634
#, c-format
msgid "%s passwd bad in Terminal Server - rewriting...\n"
msgstr "%s 的密码在中断服务器中无效 - 正在重写...\n"
-#: standalone/drakTermServ:1638
+#: standalone/drakTermServ:1647
#, c-format
msgid "%s is not a user..\n"
msgstr "%s 不是用户...\n"
-#: standalone/drakTermServ:1639
+#: standalone/drakTermServ:1648
#, c-format
msgid "%s is already a Terminal Server user\n"
msgstr "%s 已经是终端服务器用户了\n"
-#: standalone/drakTermServ:1641
+#: standalone/drakTermServ:1650
#, c-format
msgid "Addition of %s to Terminal Server failed!\n"
msgstr "将 %s 添加到终端服务器失败!\n"
-#: standalone/drakTermServ:1643
+#: standalone/drakTermServ:1652
#, c-format
msgid "%s added to Terminal Server\n"
msgstr "%s 已加入终端服务器\n"
-#: standalone/drakTermServ:1695
+#: standalone/drakTermServ:1698
#, c-format
msgid "Deleted %s...\n"
msgstr "已删除 %s...\n"
-#: standalone/drakTermServ:1697 standalone/drakTermServ:1774
+#: standalone/drakTermServ:1700 standalone/drakTermServ:1773
#, c-format
msgid "%s not found...\n"
msgstr "%s 未找到...\n"
-#: standalone/drakTermServ:1719 standalone/drakTermServ:1720
-#: standalone/drakTermServ:1721
+#: standalone/drakTermServ:1722 standalone/drakTermServ:1723
+#: standalone/drakTermServ:1724
#, c-format
msgid "%s already in use\n"
msgstr "%s 已经被使用了\n"
-#: standalone/drakTermServ:1745
-#, c-format
-msgid "Can't open %s!"
-msgstr "无法打开 %s!"
-
-#: standalone/drakTermServ:1802
+#: 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:1959
+#: standalone/drakTermServ:1953
#, c-format
msgid "Configuration changed - restart clusternfs/dhcpd?"
msgstr "配置已更改 - 重新启动 clusternfs/dhcpd 吗?"
@@ -16306,7 +16317,7 @@ msgstr ""
"左边列出了自动安装可用的选项"
#: standalone/drakautoinst:252 standalone/drakgw:598 standalone/drakvpn:902
-#: standalone/scannerdrake:374
+#: standalone/scannerdrake:379
#, c-format
msgid "Congratulations!"
msgstr "恭喜!"
@@ -16350,47 +16361,47 @@ msgstr "磁带机"
msgid "No devices found"
msgstr "没有发现设备"
-#: standalone/drakbackup:154
+#: standalone/drakbackup:152
#, c-format
msgid ""
"Expect is an extension to the Tcl scripting language that allows interactive "
"sessions without user intervention."
msgstr "异常是 Tcl 脚本语言的一种扩展,允许免打扰的交互式会话。"
-#: standalone/drakbackup:155
+#: standalone/drakbackup:153
#, c-format
msgid "Store the password for this system in drakbackup configuration."
msgstr "在“Drak 备份”的配置中存储此系统的密码。"
-#: standalone/drakbackup:156
+#: standalone/drakbackup:154
#, 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:157
+#: standalone/drakbackup:155
#, 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:158
+#: standalone/drakbackup:156
#, c-format
msgid ""
"Incremental backups only save files that have changed or are new since the "
"last backup."
msgstr "增量备份只备份那些自上次备份后更改或新建的文件。"
-#: standalone/drakbackup:159
+#: standalone/drakbackup:157
#, c-format
msgid ""
"Differential backups only save files that have changed or are new since the "
"original 'base' backup."
msgstr "差异备份只保存自上次“基本”备份后更改或新建的文件。"
-#: standalone/drakbackup:160
+#: standalone/drakbackup:158
#, c-format
msgid ""
"This should be a local user or email addresse that you want the backup "
@@ -16399,7 +16410,7 @@ msgstr ""
"这应该是以逗号分隔的本地用户或电子邮件列表,备份结果将会发送给这些人。您还需"
"要能够正常工作的邮件服务器。"
-#: standalone/drakbackup:161
+#: standalone/drakbackup:159
#, c-format
msgid ""
"Files or wildcards listed in a .backupignore file at the top of a directory "
@@ -16407,7 +16418,7 @@ msgid ""
msgstr ""
"在目录树顶层列出的 .backupignore 文件中列出的文件或通配符表将不会备份。"
-#: standalone/drakbackup:162
+#: standalone/drakbackup:160
#, c-format
msgid ""
"For backups to other media, files are still created on the hard drive, then "
@@ -16417,7 +16428,7 @@ msgstr ""
"对于备份到其它介质,文件仍然会先在硬盘上创建,然后移动到其它介质。启用此选项"
"将在备份完成后删除硬盘上的 tar 文件。"
-#: standalone/drakbackup:163
+#: standalone/drakbackup:161
#, c-format
msgid ""
"Some protocols, like rsync, may be configured at the server end. Rather "
@@ -16427,7 +16438,7 @@ msgstr ""
"某些协议,如 rsync,可以在服务器后端配置。除了使用目录路径,您还可以使用服务"
"器路径的“模块”名。"
-#: standalone/drakbackup:164
+#: standalone/drakbackup:162
#, c-format
msgid ""
"Custom allows you to specify your own day and time. The other options use "
@@ -16436,27 +16447,27 @@ msgstr ""
"自定义允许您指定您自己的天和时间。其它选项将使用 /etc/crontab 中的 run-"
"parts。"
-#: standalone/drakbackup:396
+#: standalone/drakbackup:326
#, c-format
msgid "No media selected for cron operation."
msgstr "没有为 cron 操作选择介质。"
-#: standalone/drakbackup:400
+#: standalone/drakbackup:330
#, c-format
msgid "No interval selected for cron operation."
msgstr "没有为 cron 操作选择间隔。"
-#: standalone/drakbackup:447
+#: standalone/drakbackup:377
#, c-format
msgid "Interval cron not available as non-root"
msgstr "非 root 用户还不能使用间隔 cron"
-#: standalone/drakbackup:532 standalone/logdrake:467
+#: standalone/drakbackup:462 standalone/logdrake:467
#, c-format
msgid "\"%s\" neither is a valid email nor is an existing local user!"
msgstr "“%s”既不是有效的电子邮件,也不是已存在的本地用户!"
-#: standalone/drakbackup:536 standalone/logdrake:472
+#: standalone/drakbackup:466 standalone/logdrake:472
#, c-format
msgid ""
"\"%s\" is a local user, but you did not select a local smtp, so you must use "
@@ -16464,22 +16475,22 @@ msgid ""
msgstr ""
"“%s”是本地用户,但是您没有选择本地 SMTP,所以您必须使用完整的电子邮件地址!"
-#: standalone/drakbackup:545
+#: standalone/drakbackup:475
#, c-format
msgid "Valid user list changed, rewriting config file."
msgstr "有效用户列表已经更改,重写配置文件。"
-#: standalone/drakbackup:547
+#: standalone/drakbackup:477
#, c-format
msgid "Old user list:\n"
msgstr "旧用户列表:\n"
-#: standalone/drakbackup:549
+#: standalone/drakbackup:479
#, c-format
msgid "New user list:\n"
msgstr "新用户列表:\n"
-#: standalone/drakbackup:594
+#: standalone/drakbackup:524
#, c-format
msgid ""
"\n"
@@ -16488,7 +16499,7 @@ msgstr ""
"\n"
" “Drak 备份”报告 \n"
-#: standalone/drakbackup:595
+#: standalone/drakbackup:525
#, c-format
msgid ""
"\n"
@@ -16497,7 +16508,7 @@ msgstr ""
"\n"
" “Drak 备份”守护进程报告\n"
-#: standalone/drakbackup:601
+#: standalone/drakbackup:531
#, c-format
msgid ""
"\n"
@@ -16509,13 +16520,13 @@ msgstr ""
" “Drak 备份”报告细节\n"
"\n"
-#: standalone/drakbackup:625 standalone/drakbackup:696
-#: standalone/drakbackup:752
+#: standalone/drakbackup:556 standalone/drakbackup:627
+#: standalone/drakbackup:683
#, c-format
msgid "Total progress"
msgstr "总进度"
-#: standalone/drakbackup:678
+#: standalone/drakbackup:609
#, c-format
msgid ""
"%s exists, delete?\n"
@@ -16528,42 +16539,42 @@ msgstr ""
"如果您曾经做过这个步骤,您可能需要\n"
"从服务器的的 authorized_keys 删除该项目。"
-#: standalone/drakbackup:687
+#: standalone/drakbackup:618
#, c-format
msgid "This may take a moment to generate the keys."
msgstr "生成密钥需要一些时间。"
-#: standalone/drakbackup:694
+#: standalone/drakbackup:625
#, c-format
msgid "Cannot spawn %s."
msgstr "无法 spawn %s。"
-#: standalone/drakbackup:711
+#: standalone/drakbackup:642
#, c-format
msgid "No password prompt on %s at port %s"
msgstr "%s 上的端口 %s 没有密码提示"
-#: standalone/drakbackup:712
+#: standalone/drakbackup:643
#, c-format
msgid "Bad password on %s"
msgstr "%s 密码无效"
-#: standalone/drakbackup:713
+#: standalone/drakbackup:644
#, c-format
msgid "Permission denied transferring %s to %s"
msgstr "没有权限把 %s 迁移到 %s"
-#: standalone/drakbackup:714
+#: standalone/drakbackup:645
#, c-format
msgid "Can't find %s on %s"
msgstr "没有 %s 在 %s 上"
-#: standalone/drakbackup:718
+#: standalone/drakbackup:649
#, c-format
msgid "%s not responding"
msgstr "%s 没有响应"
-#: standalone/drakbackup:722
+#: standalone/drakbackup:653
#, c-format
msgid ""
"Transfer successful\n"
@@ -16580,47 +16591,47 @@ msgstr ""
"\n"
"这样不会提问密码。"
-#: standalone/drakbackup:766
+#: standalone/drakbackup:697
#, c-format
msgid "WebDAV remote site already in sync!"
msgstr "WebDAV 远程站点已经同步!"
-#: standalone/drakbackup:770
+#: standalone/drakbackup:701
#, c-format
msgid "WebDAV transfer failed!"
msgstr "WebDAV 传输失败!"
-#: standalone/drakbackup:791
+#: standalone/drakbackup:722
#, c-format
msgid "No CD-R/DVD-R in drive!"
msgstr "驱动器里没有 CDR/DVDR"
-#: standalone/drakbackup:795
+#: standalone/drakbackup:726
#, c-format
msgid "Does not appear to be recordable media!"
msgstr "介质不像是可以写入的!"
-#: standalone/drakbackup:799
+#: standalone/drakbackup:730
#, c-format
msgid "Not erasable media!"
msgstr "不可清除的介质!"
-#: standalone/drakbackup:840
+#: standalone/drakbackup:771
#, c-format
msgid "This may take a moment to erase the media."
msgstr "清空介质需要一些时间。"
-#: standalone/drakbackup:898
+#: standalone/drakbackup:829
#, c-format
msgid "Permission problem accessing CD."
msgstr "没有适当的权限读写 CD。"
-#: standalone/drakbackup:925
+#: standalone/drakbackup:856
#, c-format
msgid "No tape in %s!"
msgstr "%s 里没有磁带!"
-#: standalone/drakbackup:1025
+#: standalone/drakbackup:956
#, c-format
msgid ""
"Backup quota exceeded!\n"
@@ -16629,37 +16640,37 @@ msgstr ""
"达到了备份限额!\n"
"使用了 %d MB,而分配了 %d MB。"
-#: standalone/drakbackup:1044 standalone/drakbackup:1077
+#: standalone/drakbackup:975 standalone/drakbackup:1008
#, c-format
msgid "Backup system files..."
msgstr "备份系统文件..."
-#: standalone/drakbackup:1078 standalone/drakbackup:1119
+#: standalone/drakbackup:1009 standalone/drakbackup:1050
#, c-format
msgid "Hard Disk Backup files..."
msgstr "备份硬盘文件..."
-#: standalone/drakbackup:1118
+#: standalone/drakbackup:1049
#, c-format
msgid "Backup User files..."
msgstr "备份用户文件..."
-#: standalone/drakbackup:1153
+#: standalone/drakbackup:1084
#, c-format
msgid "Backup Other files..."
msgstr "备份其它文件..."
-#: standalone/drakbackup:1154
+#: standalone/drakbackup:1085
#, c-format
msgid "Hard Disk Backup Progress..."
msgstr "硬盘文件备份进度..."
-#: standalone/drakbackup:1159
+#: standalone/drakbackup:1090
#, c-format
msgid "No changes to backup!"
msgstr "没有需要备份的修改!"
-#: standalone/drakbackup:1177 standalone/drakbackup:1201
+#: standalone/drakbackup:1108 standalone/drakbackup:1132
#, c-format
msgid ""
"\n"
@@ -16670,7 +16681,7 @@ msgstr ""
"“Drak 备份”使用 %s: \n"
"\n"
-#: standalone/drakbackup:1186
+#: standalone/drakbackup:1117
#, c-format
msgid ""
"\n"
@@ -16680,18 +16691,18 @@ msgstr ""
"\n"
"FTP 连接错误: 无法通过 FTP 传送您的备份文件。\n"
-#: standalone/drakbackup:1187
+#: standalone/drakbackup:1118
#, c-format
msgid ""
"Error during sending file via FTP. Please correct your FTP configuration."
msgstr "通过 FTP 发送文件出错。请更正您的 FTP 配置。"
-#: standalone/drakbackup:1189
+#: standalone/drakbackup:1120
#, c-format
msgid "file list sent by FTP: %s\n"
msgstr "通过 FTP 发送的文件列表: %s\n"
-#: standalone/drakbackup:1206
+#: standalone/drakbackup:1137
#, c-format
msgid ""
"\n"
@@ -16702,7 +16713,7 @@ msgstr ""
"“Drak 备份”的光盘操作: \n"
"\n"
-#: standalone/drakbackup:1211
+#: standalone/drakbackup:1142
#, c-format
msgid ""
"\n"
@@ -16713,27 +16724,22 @@ msgstr ""
"“Drak 备份”的磁带操作: \n"
"\n"
-#: standalone/drakbackup:1220
+#: standalone/drakbackup:1151
#, c-format
msgid "Error sending mail. Your report mail was not sent."
msgstr "发送邮件出错。您的报告邮件没有发出。"
-#: standalone/drakbackup:1221
+#: standalone/drakbackup:1152
#, c-format
msgid " Error while sending mail. \n"
msgstr "发送电子邮件出错。\n"
-#: standalone/drakbackup:1249
+#: standalone/drakbackup:1180
#, c-format
msgid "Can't create catalog!"
msgstr "无法创建 catalog!"
-#: standalone/drakbackup:1455
-#, c-format
-msgid "Select the files or directories and click on 'OK'"
-msgstr "选择文件或目录,然后单击“确定”"
-
-#: standalone/drakbackup:1484
+#: standalone/drakbackup:1393
#, c-format
msgid ""
"\n"
@@ -16742,213 +16748,218 @@ msgstr ""
"\n"
"请选中您需要的所有选项。\n"
-#: standalone/drakbackup:1485
+#: standalone/drakbackup:1394
#, c-format
msgid ""
"These options can backup and restore all files in your /etc directory.\n"
msgstr "这些选项将备份和恢复您的 /etc 目录中的全部文件。\n"
-#: standalone/drakbackup:1486
+#: standalone/drakbackup:1395
#, c-format
msgid "Backup your System files. (/etc directory)"
msgstr "备份系统文件。(/etc 目录)"
-#: standalone/drakbackup:1487 standalone/drakbackup:1551
-#: standalone/drakbackup:1617
+#: standalone/drakbackup:1396 standalone/drakbackup:1460
+#: standalone/drakbackup:1526
#, c-format
msgid "Use Incremental/Differential Backups (do not replace old backups)"
msgstr "使用增量/差异备份(不破坏老备份)"
-#: standalone/drakbackup:1489 standalone/drakbackup:1553
-#: standalone/drakbackup:1619
+#: standalone/drakbackup:1398 standalone/drakbackup:1462
+#: standalone/drakbackup:1528
#, c-format
msgid "Use Incremental Backups"
msgstr "使用增量备份"
-#: standalone/drakbackup:1489 standalone/drakbackup:1553
-#: standalone/drakbackup:1619
+#: standalone/drakbackup:1398 standalone/drakbackup:1462
+#: standalone/drakbackup:1528
#, c-format
msgid "Use Differential Backups"
msgstr "使用差异备份"
-#: standalone/drakbackup:1491
+#: standalone/drakbackup:1400
#, c-format
msgid "Do not include critical files (passwd, group, fstab)"
msgstr "不包括关键文件(passwd,group,fstab)"
-#: standalone/drakbackup:1492
+#: standalone/drakbackup:1401
#, c-format
msgid ""
"With this option you will be able to restore any version\n"
" of your /etc directory."
msgstr "使用此选项您可把 /etc 目录恢复到任何以前的版本。"
-#: standalone/drakbackup:1523
+#: standalone/drakbackup:1432
#, c-format
msgid "Please check all users that you want to include in your backup."
msgstr "请选择您希望备份的用户。"
-#: standalone/drakbackup:1550
+#: standalone/drakbackup:1459
#, c-format
msgid "Do not include the browser cache"
msgstr "不包括浏览器缓存"
-#: standalone/drakbackup:1605 standalone/drakfont:656
+#: standalone/drakbackup:1513
+#, c-format
+msgid "Select the files or directories and click on 'OK'"
+msgstr "选择文件或目录,然后单击“确定”"
+
+#: standalone/drakbackup:1514 standalone/drakfont:656
#, c-format
msgid "Remove Selected"
msgstr "删除选中的"
-#: standalone/drakbackup:1668
+#: standalone/drakbackup:1577
#, c-format
msgid "Users"
msgstr "用户"
-#: standalone/drakbackup:1688
+#: standalone/drakbackup:1597
#, c-format
msgid "Use network connection to backup"
msgstr "使用网络连接作备份"
-#: standalone/drakbackup:1690
+#: standalone/drakbackup:1599
#, c-format
msgid "Net Method:"
msgstr "网络方法:"
-#: standalone/drakbackup:1694
+#: standalone/drakbackup:1603
#, c-format
msgid "Use Expect for SSH"
msgstr "把 Expect 用于 SSH"
-#: standalone/drakbackup:1695
+#: standalone/drakbackup:1604
#, c-format
msgid "Create/Transfer backup keys for SSH"
msgstr "创建/传送 SSH 的备份密钥"
-#: standalone/drakbackup:1697
+#: standalone/drakbackup:1606
#, c-format
msgid "Transfer Now"
msgstr "现在传送"
-#: standalone/drakbackup:1699
+#: standalone/drakbackup:1608
#, c-format
msgid "Other (not drakbackup) keys in place already"
msgstr "其它(不是“Drak 备份”)密钥已经有了"
-#: standalone/drakbackup:1702
+#: standalone/drakbackup:1611
#, c-format
msgid "Host name or IP."
msgstr "主机名或 IP。"
-#: standalone/drakbackup:1707
+#: standalone/drakbackup:1616
#, c-format
msgid "Directory (or module) to put the backup on this host."
msgstr "将备份放在该主机的目录(或模块)。"
-#: standalone/drakbackup:1712
+#: standalone/drakbackup:1621
#, c-format
msgid "Login name"
msgstr "登录名"
-#: standalone/drakbackup:1719
+#: standalone/drakbackup:1628
#, c-format
msgid "Remember this password"
msgstr "记住密码"
-#: standalone/drakbackup:1735
+#: standalone/drakbackup:1644
#, c-format
msgid "Need hostname, username and password!"
msgstr "需要主机名、用户名和密码!"
-#: standalone/drakbackup:1833
+#: standalone/drakbackup:1742
#, c-format
msgid "Use CD-R/DVD-R to backup"
msgstr "使用 CD/DVDROM 备份"
-#: standalone/drakbackup:1836
+#: standalone/drakbackup:1745
#, c-format
msgid "Choose your CD/DVD device"
msgstr "请选择您的 CD/DVD 设备"
-#: standalone/drakbackup:1841
+#: standalone/drakbackup:1750
#, c-format
msgid "Choose your CD/DVD media size"
msgstr "请选择您的 CD/DVD 介质大小"
-#: standalone/drakbackup:1848
+#: standalone/drakbackup:1757
#, c-format
msgid "Multisession CD"
msgstr "多轨道 CD"
-#: standalone/drakbackup:1850
+#: standalone/drakbackup:1759
#, c-format
msgid "CDRW media"
msgstr "CDRW 介质"
-#: standalone/drakbackup:1856
+#: standalone/drakbackup:1765
#, c-format
msgid "Erase your RW media (1st Session)"
msgstr "清除您的 RW 介质(第一节)"
-#: standalone/drakbackup:1857
+#: standalone/drakbackup:1766
#, c-format
msgid " Erase Now "
msgstr " 立即清除 "
-#: standalone/drakbackup:1863
+#: standalone/drakbackup:1772
#, c-format
msgid "DVD+RW media"
msgstr "DVD+RW 介质"
-#: standalone/drakbackup:1865
+#: standalone/drakbackup:1774
#, c-format
msgid "DVD-R media"
msgstr "DVD-R 介质"
-#: standalone/drakbackup:1867
+#: standalone/drakbackup:1776
#, c-format
msgid "DVDRAM device"
msgstr "DVDRAM 设备"
-#: standalone/drakbackup:1898
+#: standalone/drakbackup:1807
#, c-format
msgid "No CD device defined!"
msgstr "没有发现 CD 设备!"
-#: standalone/drakbackup:1945
+#: standalone/drakbackup:1854
#, c-format
msgid "Use tape to backup"
msgstr "使用磁带备份"
-#: standalone/drakbackup:1948
+#: standalone/drakbackup:1857
#, c-format
msgid "Device name to use for backup"
msgstr "用于备份的设备名"
-#: standalone/drakbackup:1954
+#: standalone/drakbackup:1863
#, c-format
msgid "Don't rewind tape after backup"
msgstr "在备份后不倒带"
-#: standalone/drakbackup:1960
+#: standalone/drakbackup:1869
#, c-format
msgid "Erase tape before backup"
msgstr "备份前清空磁带"
-#: standalone/drakbackup:1966
+#: standalone/drakbackup:1875
#, c-format
msgid "Eject tape after the backup"
msgstr "备份后弹出磁带"
-#: standalone/drakbackup:2033
+#: standalone/drakbackup:1942
#, c-format
msgid "Enter the directory to save to:"
msgstr "请输入要保存的目录:"
-#: standalone/drakbackup:2037
+#: standalone/drakbackup:1946
#, c-format
msgid "Directory to save to"
msgstr "要保存的目录"
-#: standalone/drakbackup:2042
+#: standalone/drakbackup:1951
#, c-format
msgid ""
"Maximum size\n"
@@ -16957,42 +16968,42 @@ msgstr ""
"允许“Drak 备份”\n"
" 使用的最大空间(Mb)"
-#: standalone/drakbackup:2106
+#: standalone/drakbackup:2015
#, c-format
msgid "CD-R / DVD-R"
msgstr "CDROM / DVDROM"
-#: standalone/drakbackup:2111
+#: standalone/drakbackup:2020
#, c-format
msgid "HardDrive / NFS"
msgstr "硬盘 / NFS"
-#: standalone/drakbackup:2127 standalone/drakbackup:2132
-#: standalone/drakbackup:2137
+#: standalone/drakbackup:2036 standalone/drakbackup:2041
+#: standalone/drakbackup:2046
#, c-format
msgid "hourly"
msgstr "每小时"
-#: standalone/drakbackup:2128 standalone/drakbackup:2133
-#: standalone/drakbackup:2137
+#: standalone/drakbackup:2037 standalone/drakbackup:2042
+#: standalone/drakbackup:2046
#, c-format
msgid "daily"
msgstr "每日"
-#: standalone/drakbackup:2129 standalone/drakbackup:2134
-#: standalone/drakbackup:2137
+#: standalone/drakbackup:2038 standalone/drakbackup:2043
+#: standalone/drakbackup:2046
#, c-format
msgid "weekly"
msgstr "每周"
-#: standalone/drakbackup:2130 standalone/drakbackup:2135
-#: standalone/drakbackup:2137
+#: standalone/drakbackup:2039 standalone/drakbackup:2044
+#: standalone/drakbackup:2046
#, c-format
msgid "monthly"
msgstr "每月"
-#: standalone/drakbackup:2131 standalone/drakbackup:2136
-#: standalone/drakbackup:2137
+#: standalone/drakbackup:2040 standalone/drakbackup:2045
+#: standalone/drakbackup:2046
#, c-format
msgid "custom"
msgstr "定制"
@@ -17000,7 +17011,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:2142
+#: standalone/drakbackup:2051
#, c-format
msgid "January"
msgstr "一月"
@@ -17008,7 +17019,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:2142
+#: standalone/drakbackup:2051
#, c-format
msgid "February"
msgstr "二月"
@@ -17016,7 +17027,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:2142
+#: standalone/drakbackup:2051
#, c-format
msgid "March"
msgstr "三月"
@@ -17024,7 +17035,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:2143
+#: standalone/drakbackup:2052
#, c-format
msgid "April"
msgstr "四月"
@@ -17032,7 +17043,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:2143
+#: standalone/drakbackup:2052
#, c-format
msgid "May"
msgstr "五月"
@@ -17040,7 +17051,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:2143
+#: standalone/drakbackup:2052
#, c-format
msgid "June"
msgstr "六月"
@@ -17048,7 +17059,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:2143
+#: standalone/drakbackup:2052
#, c-format
msgid "July"
msgstr "七月"
@@ -17056,7 +17067,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:2143
+#: standalone/drakbackup:2052
#, c-format
msgid "August"
msgstr "八月"
@@ -17064,7 +17075,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:2143
+#: standalone/drakbackup:2052
#, c-format
msgid "September"
msgstr "九月"
@@ -17072,7 +17083,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:2144
+#: standalone/drakbackup:2053
#, c-format
msgid "October"
msgstr "十月"
@@ -17080,7 +17091,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:2144
+#: standalone/drakbackup:2053
#, c-format
msgid "November"
msgstr "十一月"
@@ -17088,7 +17099,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:2144
+#: standalone/drakbackup:2053
#, c-format
msgid "December"
msgstr "十二月"
@@ -17099,7 +17110,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:2149
+#: standalone/drakbackup:2058
#, c-format
msgid "Sunday"
msgstr "星期日"
@@ -17110,7 +17121,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:2149
+#: standalone/drakbackup:2058
#, c-format
msgid "Monday"
msgstr "星期一"
@@ -17121,7 +17132,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:2149
+#: standalone/drakbackup:2058
#, c-format
msgid "Tuesday"
msgstr "星期二"
@@ -17132,7 +17143,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:2150
+#: standalone/drakbackup:2059
#, c-format
msgid "Wednesday"
msgstr "星期三"
@@ -17143,7 +17154,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:2150
+#: standalone/drakbackup:2059
#, c-format
msgid "Thursday"
msgstr "星期四"
@@ -17154,7 +17165,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:2150
+#: standalone/drakbackup:2059
#, c-format
msgid "Friday"
msgstr "星期五"
@@ -17165,22 +17176,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:2150
+#: standalone/drakbackup:2059
#, c-format
msgid "Saturday"
msgstr "星期六"
-#: standalone/drakbackup:2185
+#: standalone/drakbackup:2094
#, c-format
msgid "Use daemon"
msgstr "使用守护进程"
-#: standalone/drakbackup:2190
+#: standalone/drakbackup:2099
#, c-format
msgid "Please choose the time interval between each backup"
msgstr "请选择每次备份的时间间隔"
-#: standalone/drakbackup:2196
+#: standalone/drakbackup:2105
#, c-format
msgid "Custom setup/crontab entry:"
msgstr "自定义 setup/crontab 项: "
@@ -17188,7 +17199,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:2201
+#: standalone/drakbackup:2110
#, c-format
msgid "Minute"
msgstr "分钟"
@@ -17196,7 +17207,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:2205
+#: standalone/drakbackup:2114
#, c-format
msgid "Hour"
msgstr "小时"
@@ -17204,7 +17215,7 @@ msgstr "小时"
# ui/evolution-calendar.xml.h:11
# ui/evolution-calendar.xml.h:11
# ui/evolution-calendar.xml.h:11
-#: standalone/drakbackup:2209
+#: standalone/drakbackup:2118
#, c-format
msgid "Day"
msgstr "天"
@@ -17212,7 +17223,7 @@ msgstr "天"
# ui/evolution-calendar.xml.h:20
# ui/evolution-calendar.xml.h:20
# ui/evolution-calendar.xml.h:20
-#: standalone/drakbackup:2213
+#: standalone/drakbackup:2122
#, c-format
msgid "Month"
msgstr "月"
@@ -17223,137 +17234,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:2217
+#: standalone/drakbackup:2126
#, c-format
msgid "Weekday"
msgstr "平日"
-#: standalone/drakbackup:2223
+#: standalone/drakbackup:2132
#, c-format
msgid "Please choose the media for backup."
msgstr "请选择备份使用的介质。"
-#: standalone/drakbackup:2230
+#: standalone/drakbackup:2139
#, c-format
msgid "Please be sure that the cron daemon is included in your services."
msgstr "请确认 cron 守护程序包含在您的服务中。"
-#: standalone/drakbackup:2231
+#: standalone/drakbackup:2140
#, c-format
msgid "Note that currently all 'net' media also use the hard drive."
msgstr "请注意目前所有的“网络”介质都还要使用硬盘。"
-#: standalone/drakbackup:2281
+#: standalone/drakbackup:2190
#, c-format
msgid "Please choose the compression type"
msgstr "请选择压缩类型"
-#: standalone/drakbackup:2285
+#: standalone/drakbackup:2194
#, c-format
msgid "Use .backupignore files"
msgstr "使用 .backupignore 文件"
-#: standalone/drakbackup:2287
+#: standalone/drakbackup:2196
#, c-format
msgid "Send mail report after each backup to:"
msgstr "在每次备份后发送邮件报告给:"
-#: standalone/drakbackup:2293
+#: standalone/drakbackup:2202
#, c-format
msgid "SMTP server for mail:"
msgstr "邮件的 SMTP 服务器:"
-#: standalone/drakbackup:2298
+#: standalone/drakbackup:2207
#, c-format
msgid "Delete Hard Drive tar files after backup to other media."
msgstr "备份到其它介质之后删除硬盘上的 tar 文件。"
-#: standalone/drakbackup:2338
+#: standalone/drakbackup:2247
#, c-format
msgid "What"
msgstr "内容"
-#: standalone/drakbackup:2343
+#: standalone/drakbackup:2252
#, c-format
msgid "Where"
msgstr "位置"
-#: standalone/drakbackup:2348
+#: standalone/drakbackup:2257
#, c-format
msgid "When"
msgstr "时间"
-#: standalone/drakbackup:2353
+#: standalone/drakbackup:2262
#, c-format
msgid "More Options"
msgstr "更多选项"
-#: standalone/drakbackup:2366
+#: standalone/drakbackup:2275
#, c-format
msgid "Backup destination not configured..."
msgstr "备份目的未配置..."
-#: standalone/drakbackup:2385 standalone/drakbackup:4413
+#: standalone/drakbackup:2293 standalone/drakbackup:4208
#, c-format
msgid "Drakbackup Configuration"
msgstr "“Drak 备份”配置"
-#: standalone/drakbackup:2402
+#: standalone/drakbackup:2309
#, c-format
msgid "Please choose where you want to backup"
msgstr "请选择您希望备份何处"
-#: standalone/drakbackup:2404
+#: standalone/drakbackup:2311
#, c-format
msgid "Hard Drive used to prepare backups for all media"
msgstr "用于准备全部介质备份的硬盘驱动器"
-#: standalone/drakbackup:2412
+#: standalone/drakbackup:2319
#, c-format
msgid "Across Network"
msgstr "通过网络"
-#: standalone/drakbackup:2420
+#: standalone/drakbackup:2327
#, c-format
msgid "On CD-R"
msgstr "在 CD-R 上"
-#: standalone/drakbackup:2428
+#: standalone/drakbackup:2335
#, c-format
msgid "On Tape Device"
msgstr "在磁带机上"
-#: standalone/drakbackup:2468
+#: standalone/drakbackup:2374
#, c-format
msgid "Backup Users"
msgstr "备份用户"
-#: standalone/drakbackup:2469
+#: standalone/drakbackup:2375
#, c-format
msgid " (Default is all users)"
msgstr "(默认是所有用户)"
-#: standalone/drakbackup:2481
+#: standalone/drakbackup:2387
#, c-format
msgid "Please choose what you want to backup"
msgstr "请选择您要备份的文件"
-#: standalone/drakbackup:2482
+#: standalone/drakbackup:2388
#, c-format
msgid "Backup System"
msgstr "备份系统"
-#: standalone/drakbackup:2484
+#: standalone/drakbackup:2390
#, c-format
msgid "Select user manually"
msgstr "手工选择用户"
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2419
#, c-format
msgid "Please select data to backup..."
msgstr "请选择需备份的数据..."
-#: standalone/drakbackup:2585
+#: standalone/drakbackup:2491
#, c-format
msgid ""
"\n"
@@ -17362,7 +17373,7 @@ msgstr ""
"\n"
"备份来源: \n"
-#: standalone/drakbackup:2586
+#: standalone/drakbackup:2492
#, c-format
msgid ""
"\n"
@@ -17371,7 +17382,7 @@ msgstr ""
"\n"
"- 系统文件: \n"
-#: standalone/drakbackup:2588
+#: standalone/drakbackup:2494
#, c-format
msgid ""
"\n"
@@ -17380,7 +17391,7 @@ msgstr ""
"\n"
"- 用户文件: \n"
-#: standalone/drakbackup:2590
+#: standalone/drakbackup:2496
#, c-format
msgid ""
"\n"
@@ -17389,7 +17400,7 @@ msgstr ""
"\n"
"- 其它文件: \n"
-#: standalone/drakbackup:2592
+#: standalone/drakbackup:2498
#, c-format
msgid ""
"\n"
@@ -17398,12 +17409,12 @@ msgstr ""
"\n"
"- 保存在硬盘路径: %s\n"
-#: standalone/drakbackup:2593
+#: standalone/drakbackup:2499
#, c-format
msgid "\tLimit disk usage to %s MB\n"
msgstr "\t限制磁盘使用为 %s MB\n"
-#: standalone/drakbackup:2596
+#: standalone/drakbackup:2502
#, c-format
msgid ""
"\n"
@@ -17412,17 +17423,17 @@ msgstr ""
"\n"
"- 备份后删除硬盘的 tar 文件。\n"
-#: standalone/drakbackup:2600
+#: standalone/drakbackup:2506
#, c-format
msgid "NO"
msgstr "否"
-#: standalone/drakbackup:2601
+#: standalone/drakbackup:2507
#, c-format
msgid "YES"
msgstr "是"
-#: standalone/drakbackup:2602
+#: standalone/drakbackup:2508
#, c-format
msgid ""
"\n"
@@ -17431,22 +17442,22 @@ msgstr ""
"\n"
"- 刻录光盘"
-#: standalone/drakbackup:2603
+#: standalone/drakbackup:2509
#, c-format
msgid "RW"
msgstr "RW"
-#: standalone/drakbackup:2604
+#: standalone/drakbackup:2510
#, c-format
msgid " on device: %s"
msgstr " 使用设备: %s"
-#: standalone/drakbackup:2605
+#: standalone/drakbackup:2511
#, c-format
msgid " (multi-session)"
msgstr "(多轨道)"
-#: standalone/drakbackup:2606
+#: standalone/drakbackup:2512
#, c-format
msgid ""
"\n"
@@ -17455,12 +17466,12 @@ msgstr ""
"\n"
"- 保存到磁带设备: %s"
-#: standalone/drakbackup:2607
+#: standalone/drakbackup:2513
#, c-format
msgid "\t\tErase=%s"
msgstr "\t\t删除=%s"
-#: standalone/drakbackup:2610
+#: standalone/drakbackup:2516
#, c-format
msgid ""
"\n"
@@ -17469,7 +17480,7 @@ msgstr ""
"\n"
"- 通过 %s 保存到主机: %s\n"
-#: standalone/drakbackup:2611
+#: standalone/drakbackup:2517
#, c-format
msgid ""
"\t\t user name: %s\n"
@@ -17478,7 +17489,7 @@ msgstr ""
"\t\t 用户名: %s\n"
"\t\t 路径: %s \n"
-#: standalone/drakbackup:2612
+#: standalone/drakbackup:2518
#, c-format
msgid ""
"\n"
@@ -17487,42 +17498,42 @@ msgstr ""
"\n"
"- 选项: \n"
-#: standalone/drakbackup:2613
+#: standalone/drakbackup:2519
#, c-format
msgid "\tDo not include System Files\n"
msgstr "\t不包括系统文件\n"
-#: standalone/drakbackup:2615
+#: standalone/drakbackup:2521
#, c-format
msgid "\tBackups use tar and bzip2\n"
msgstr "\t使用 tar 和 bzip2 备份\n"
-#: standalone/drakbackup:2616
+#: standalone/drakbackup:2522
#, c-format
msgid "\tBackups use tar and gzip\n"
msgstr "\t使用 tar 和 gzip 备份\n"
-#: standalone/drakbackup:2617
+#: standalone/drakbackup:2523
#, c-format
msgid "\tBackups use tar only\n"
msgstr "\t只使用 tar 备份\n"
-#: standalone/drakbackup:2619
+#: standalone/drakbackup:2525
#, c-format
msgid "\tUse .backupignore files\n"
msgstr "\t使用 .backupignore 文件\n"
-#: standalone/drakbackup:2620
+#: standalone/drakbackup:2526
#, c-format
msgid "\tSend mail to %s\n"
msgstr "\t发送邮件到 %s\n"
-#: standalone/drakbackup:2621
+#: standalone/drakbackup:2527
#, c-format
msgid "\tUsing SMTP server %s\n"
msgstr "\t使用 SMTP 服务器 %s\n"
-#: standalone/drakbackup:2623
+#: standalone/drakbackup:2529
#, c-format
msgid ""
"\n"
@@ -17531,47 +17542,47 @@ msgstr ""
"\n"
"- 守护进程,%s 通过: \n"
-#: standalone/drakbackup:2624
+#: standalone/drakbackup:2530
#, c-format
msgid "\t-Hard drive.\n"
msgstr "\t-硬盘。\n"
-#: standalone/drakbackup:2625
+#: standalone/drakbackup:2531
#, c-format
msgid "\t-CD-R.\n"
msgstr "\t-CD-R。\n"
-#: standalone/drakbackup:2626
+#: standalone/drakbackup:2532
#, c-format
msgid "\t-Tape \n"
msgstr "\t-磁带\n"
-#: standalone/drakbackup:2627
+#: standalone/drakbackup:2533
#, c-format
msgid "\t-Network by FTP.\n"
msgstr "\t-网络通过 FTP。\n"
-#: standalone/drakbackup:2628
+#: standalone/drakbackup:2534
#, c-format
msgid "\t-Network by SSH.\n"
msgstr "\t-网络通过 SSH。\n"
-#: standalone/drakbackup:2629
+#: standalone/drakbackup:2535
#, c-format
msgid "\t-Network by rsync.\n"
msgstr "\t-网络通过 rsync。\n"
-#: standalone/drakbackup:2630
+#: standalone/drakbackup:2536
#, c-format
msgid "\t-Network by webdav.\n"
msgstr "\t-通过 webdav 的网络。\n"
-#: standalone/drakbackup:2632
+#: standalone/drakbackup:2538
#, c-format
msgid "No configuration, please click Wizard or Advanced.\n"
msgstr "没有配置,请选择向导或高级。\n"
-#: standalone/drakbackup:2637
+#: standalone/drakbackup:2543
#, c-format
msgid ""
"List of data to restore:\n"
@@ -17580,27 +17591,27 @@ msgstr ""
"要恢复数据的清单: \n"
"\n"
-#: standalone/drakbackup:2639
+#: standalone/drakbackup:2545
#, c-format
msgid "- Restore System Files.\n"
msgstr "- 恢复系统文件。\n"
-#: standalone/drakbackup:2641 standalone/drakbackup:2651
+#: standalone/drakbackup:2547 standalone/drakbackup:2557
#, c-format
msgid " - from date: %s %s\n"
msgstr " - 从日期: %s %s\n"
-#: standalone/drakbackup:2644
+#: standalone/drakbackup:2550
#, c-format
msgid "- Restore User Files: \n"
msgstr "- 恢复用户文件: \n"
-#: standalone/drakbackup:2649
+#: standalone/drakbackup:2555
#, c-format
msgid "- Restore Other Files: \n"
msgstr "- 恢复其它文件: \n"
-#: standalone/drakbackup:2830
+#: standalone/drakbackup:2736
#, c-format
msgid ""
"List of data corrupted:\n"
@@ -17609,127 +17620,127 @@ msgstr ""
"已毁坏数据的清单: \n"
"\n"
-#: standalone/drakbackup:2832
+#: standalone/drakbackup:2738
#, c-format
msgid "Please uncheck or remove it on next time."
msgstr "请取消选择并删除它。"
-#: standalone/drakbackup:2842
+#: standalone/drakbackup:2748
#, c-format
msgid "Backup files are corrupted"
msgstr "备份文件损坏了"
-#: standalone/drakbackup:2863
+#: standalone/drakbackup:2769
#, c-format
msgid " All of your selected data have been "
msgstr " 您选择的全部数据已经 "
-#: standalone/drakbackup:2864
+#: standalone/drakbackup:2770
#, c-format
msgid " Successfuly Restored on %s "
msgstr " 成功的恢复到 %s "
-#: standalone/drakbackup:2987
+#: standalone/drakbackup:2889
#, c-format
msgid " Restore Configuration "
msgstr " 恢复配置 "
-#: standalone/drakbackup:3015
+#: standalone/drakbackup:2917
#, c-format
msgid "OK to restore the other files."
msgstr "即将恢复其它文件。"
-#: standalone/drakbackup:3031
+#: standalone/drakbackup:2933
#, c-format
msgid "User list to restore (only the most recent date per user is important)"
msgstr "可恢复的用户清单(每个用户最近的数据是最重要的)"
-#: standalone/drakbackup:3098
+#: standalone/drakbackup:3000
#, c-format
msgid "Please choose the date to restore:"
msgstr "请选择需要恢复的日期:"
-#: standalone/drakbackup:3135
+#: standalone/drakbackup:3037
#, c-format
msgid "Restore from Hard Disk."
msgstr "从硬盘恢复"
-#: standalone/drakbackup:3137
+#: standalone/drakbackup:3039
#, c-format
msgid "Enter the directory where backups are stored"
msgstr "请输入存储备份的目录"
-#: standalone/drakbackup:3141
+#: standalone/drakbackup:3043
#, c-format
msgid "Directory with backups"
msgstr "存有备份的目录"
-#: standalone/drakbackup:3194
+#: standalone/drakbackup:3097
#, c-format
msgid "Select another media to restore from"
msgstr "请选择另外的介质用以恢复"
-#: standalone/drakbackup:3196
+#: standalone/drakbackup:3099
#, c-format
msgid "Other Media"
msgstr "其它介质"
-#: standalone/drakbackup:3201
+#: standalone/drakbackup:3104
#, c-format
msgid "Restore system"
msgstr "恢复系统"
-#: standalone/drakbackup:3202
+#: standalone/drakbackup:3105
#, c-format
msgid "Restore Users"
msgstr "恢复用户文件"
-#: standalone/drakbackup:3203
+#: standalone/drakbackup:3106
#, c-format
msgid "Restore Other"
msgstr "恢复其它文件"
-#: standalone/drakbackup:3205
+#: standalone/drakbackup:3108
#, c-format
msgid "Select path to restore (instead of /)"
msgstr "选择将要恢复到的路径(/ 除外)"
-#: standalone/drakbackup:3209 standalone/drakbackup:3490
+#: standalone/drakbackup:3112 standalone/drakbackup:3394
#, c-format
msgid "Path To Restore To"
msgstr "恢复到的路径"
-#: standalone/drakbackup:3212
+#: standalone/drakbackup:3115
#, c-format
msgid "Do new backup before restore (only for incremental backups.)"
msgstr "恢复前做新的备份(只适用于增量备份。)"
-#: standalone/drakbackup:3214
+#: standalone/drakbackup:3117
#, c-format
msgid "Remove user directories before restore."
msgstr "恢复前删除用户目录。"
-#: standalone/drakbackup:3298
+#: standalone/drakbackup:3201
#, c-format
msgid "Filename text substring to search for (empty string matches all):"
msgstr "要搜索的文件名文字(空字符串将匹配全部): "
-#: standalone/drakbackup:3301
+#: standalone/drakbackup:3204
#, c-format
msgid "Search Backups"
msgstr "搜索备份"
-#: standalone/drakbackup:3320
+#: standalone/drakbackup:3223
#, c-format
msgid "No matches found..."
msgstr "没有发现匹配项..."
-#: standalone/drakbackup:3324
+#: standalone/drakbackup:3227
#, c-format
msgid "Restore Selected"
msgstr "恢复选中文件"
-#: standalone/drakbackup:3458
+#: standalone/drakbackup:3362
#, c-format
msgid ""
"Click date/time to see backup files.\n"
@@ -17738,7 +17749,7 @@ msgstr ""
"点击日期/时间可查看备份文件。\n"
"Ctrl+单击文件可选择多个文件。"
-#: standalone/drakbackup:3464
+#: standalone/drakbackup:3368
#, c-format
msgid ""
"Restore Selected\n"
@@ -17747,7 +17758,7 @@ msgstr ""
"恢复选中的\n"
"目录项"
-#: standalone/drakbackup:3473
+#: standalone/drakbackup:3377
#, c-format
msgid ""
"Restore Selected\n"
@@ -17756,17 +17767,17 @@ msgstr ""
"恢复选中的\n"
"文件"
-#: standalone/drakbackup:3550
+#: standalone/drakbackup:3454
#, c-format
msgid "Backup files not found at %s."
msgstr "在 %s 没有发现备份文件。"
-#: standalone/drakbackup:3563
+#: standalone/drakbackup:3467
#, c-format
msgid "Restore From CD"
msgstr "从光盘恢复"
-#: standalone/drakbackup:3563
+#: standalone/drakbackup:3467
#, c-format
msgid ""
"Insert the CD with volume label %s\n"
@@ -17775,235 +17786,235 @@ msgstr ""
"请把卷标为 %s 的光盘插入\n"
"到加载于 /mnt/cdrom 的光盘驱动器"
-#: standalone/drakbackup:3565
+#: standalone/drakbackup:3469
#, c-format
msgid "Not the correct CD label. Disk is labelled %s."
msgstr "光盘卷标不对。这张盘的卷标是 %s。"
-#: standalone/drakbackup:3575
+#: standalone/drakbackup:3479
#, c-format
msgid "Restore From Tape"
msgstr "从磁带恢复"
-#: standalone/drakbackup:3575
+#: standalone/drakbackup:3479
#, c-format
msgid ""
"Insert the tape with volume label %s\n"
" in the tape drive device %s"
msgstr "请把卷标为 %s 的磁带装进磁带机 %s"
-#: standalone/drakbackup:3577
+#: standalone/drakbackup:3481
#, c-format
msgid "Not the correct tape label. Tape is labelled %s."
msgstr "磁带卷标不对。这盘磁带的卷标是 %s。"
-#: standalone/drakbackup:3588
+#: standalone/drakbackup:3492
#, c-format
msgid "Restore Via Network"
msgstr "通过网络恢复"
-#: standalone/drakbackup:3588
+#: standalone/drakbackup:3492
#, c-format
msgid "Restore Via Network Protocol: %s"
msgstr "恢复使用的网络协议: %s"
-#: standalone/drakbackup:3589
+#: standalone/drakbackup:3493
#, c-format
msgid "Host Name"
msgstr "主机名"
-#: standalone/drakbackup:3590
+#: standalone/drakbackup:3494
#, c-format
msgid "Host Path or Module"
msgstr "主机路径和模块"
-#: standalone/drakbackup:3597
+#: standalone/drakbackup:3501
#, c-format
msgid "Password required"
msgstr "需要密码"
-#: standalone/drakbackup:3603
+#: standalone/drakbackup:3507
#, c-format
msgid "Username required"
msgstr "需要用户名"
-#: standalone/drakbackup:3606
+#: standalone/drakbackup:3510
#, c-format
msgid "Hostname required"
msgstr "需要主机名"
-#: standalone/drakbackup:3611
+#: standalone/drakbackup:3515
#, c-format
msgid "Path or Module required"
msgstr "要求提供路径或模块"
-#: standalone/drakbackup:3624
+#: standalone/drakbackup:3528
#, c-format
msgid "Files Restored..."
msgstr "文件已恢复..."
-#: standalone/drakbackup:3627
+#: standalone/drakbackup:3531
#, c-format
msgid "Restore Failed..."
msgstr "恢复失败..."
-#: standalone/drakbackup:3737 standalone/drakbackup:3754
+#: standalone/drakbackup:3549
#, c-format
msgid "%s not retrieved..."
msgstr "%s 未获取..."
-#: standalone/drakbackup:3880 standalone/drakbackup:3953
+#: standalone/drakbackup:3748 standalone/drakbackup:3817
#, c-format
msgid "Search for files to restore"
msgstr "搜索要恢复的文件"
-#: standalone/drakbackup:3885
+#: standalone/drakbackup:3752
#, c-format
msgid "Restore all backups"
msgstr "恢复所有备份"
-#: standalone/drakbackup:3894
+#: standalone/drakbackup:3760
#, c-format
msgid "Custom Restore"
msgstr "定制恢复"
-#: standalone/drakbackup:3899 standalone/drakbackup:3949
+#: standalone/drakbackup:3764 standalone/drakbackup:3813
#, c-format
msgid "Restore From Catalog"
msgstr "从目录恢复"
-#: standalone/drakbackup:3921
+#: standalone/drakbackup:3785
#, c-format
msgid "Unable to find backups to restore...\n"
msgstr "无法找到要恢复的数据...\n"
-#: standalone/drakbackup:3922
+#: standalone/drakbackup:3786
#, c-format
msgid "Verify that %s is the correct path"
msgstr "查证得 %s 是正确的路径"
-#: standalone/drakbackup:3923
+#: standalone/drakbackup:3787
#, c-format
msgid " and the CD is in the drive"
msgstr " 而且 CD 盘在驱动器中"
-#: standalone/drakbackup:3925
+#: standalone/drakbackup:3789
#, c-format
msgid "Backups on unmountable media - Use Catalog to restore"
msgstr "备份在未加载的介质中 - 使用目录来恢复"
-#: standalone/drakbackup:3941
+#: standalone/drakbackup:3805
#, c-format
msgid "CD in place - continue."
msgstr "光盘就绪 - 继续。"
-#: standalone/drakbackup:3946
+#: standalone/drakbackup:3810
#, c-format
msgid "Browse to new restore repository."
msgstr "浏览新的恢复仓库。"
-#: standalone/drakbackup:3947
+#: standalone/drakbackup:3811
#, c-format
msgid "Directory To Restore From"
msgstr "恢复来自目录"
-#: standalone/drakbackup:3986
+#: standalone/drakbackup:3847
#, c-format
msgid "Restore Progress"
msgstr "恢复进展"
-#: standalone/drakbackup:4016 standalone/drakbackup:4123
+#: standalone/drakbackup:3898 standalone/drakbackup:3971
#: standalone/logdrake:174
#, c-format
msgid "Save"
msgstr "保存"
-#: standalone/drakbackup:4099
+#: standalone/drakbackup:3954
#, c-format
msgid "Build Backup"
msgstr "创建备份"
-#: standalone/drakbackup:4147 standalone/drakbackup:4512
+#: standalone/drakbackup:3987 standalone/drakbackup:4307
#, c-format
msgid "Restore"
msgstr "恢复"
-#: standalone/drakbackup:4277
+#: standalone/drakbackup:4075
#, c-format
msgid "The following packages need to be installed:\n"
msgstr "下列软件包需要安装: \n"
-#: standalone/drakbackup:4304
+#: standalone/drakbackup:4102
#, c-format
msgid "Please select data to restore..."
msgstr "请选择要恢复的数据..."
-#: standalone/drakbackup:4344
+#: standalone/drakbackup:4142
#, c-format
msgid "Backup system files"
msgstr "备份系统文件"
-#: standalone/drakbackup:4347
+#: standalone/drakbackup:4145
#, c-format
msgid "Backup user files"
msgstr "备份用户文件"
-#: standalone/drakbackup:4350
+#: standalone/drakbackup:4148
#, c-format
msgid "Backup other files"
msgstr "备份其它文件"
-#: standalone/drakbackup:4353 standalone/drakbackup:4389
+#: standalone/drakbackup:4151 standalone/drakbackup:4185
#, c-format
msgid "Total Progress"
msgstr "总进展"
-#: standalone/drakbackup:4381
+#: standalone/drakbackup:4177
#, c-format
msgid "Sending files by FTP"
msgstr "通过 FTP 发送文件"
-#: standalone/drakbackup:4384
+#: standalone/drakbackup:4180
#, c-format
msgid "Sending files..."
msgstr "正在发送文件..."
-#: standalone/drakbackup:4455
+#: standalone/drakbackup:4250
#, c-format
msgid "Backup Now from configuration file"
msgstr "现在从配置文件备份"
-#: standalone/drakbackup:4460
+#: standalone/drakbackup:4255
#, c-format
msgid "View Backup Configuration."
msgstr "查看备份配置。"
-#: standalone/drakbackup:4486
+#: standalone/drakbackup:4281
#, c-format
msgid "Wizard Configuration"
msgstr "向导配置"
-#: standalone/drakbackup:4491
+#: standalone/drakbackup:4286
#, c-format
msgid "Advanced Configuration"
msgstr "高级配置"
-#: standalone/drakbackup:4496
+#: standalone/drakbackup:4291
#, c-format
msgid "View Configuration"
msgstr "查看配置"
-#: standalone/drakbackup:4500
+#: standalone/drakbackup:4295
#, c-format
msgid "View Last Log"
msgstr "查看上次的日志"
-#: standalone/drakbackup:4505
+#: standalone/drakbackup:4300
#, c-format
msgid "Backup Now"
msgstr "立即备份"
-#: standalone/drakbackup:4509
+#: standalone/drakbackup:4304
#, c-format
msgid ""
"No configuration file found \n"
@@ -18012,7 +18023,7 @@ msgstr ""
"没有找到配置文件\n"
"请单击向导或高级。"
-#: standalone/drakbackup:4530 standalone/drakbackup:4533
+#: standalone/drakbackup:4324 standalone/drakbackup:4327
#, c-format
msgid "Drakbackup"
msgstr "Drak 备份"
@@ -18027,9 +18038,10 @@ msgstr "图形化启动主题选择"
msgid "System mode"
msgstr "系统模式"
-#: standalone/drakboot:68 standalone/drakfloppy:46 standalone/harddrake2:97
-#: standalone/harddrake2:98 standalone/logdrake:71 standalone/printerdrake:150
-#: standalone/printerdrake:151 standalone/printerdrake:152
+#: standalone/drakboot:68 standalone/drakfloppy:46 standalone/harddrake2:103
+#: standalone/harddrake2:104 standalone/logdrake:71
+#: standalone/printerdrake:150 standalone/printerdrake:151
+#: standalone/printerdrake:152
#, c-format
msgid "/_File"
msgstr "/文件(_F)"
@@ -18039,7 +18051,7 @@ msgstr "/文件(_F)"
msgid "/File/_Quit"
msgstr "/文件(F)/退出(_Q)"
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/harddrake2:98
+#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/harddrake2:104
#: standalone/logdrake:77 standalone/printerdrake:152
#, c-format
msgid "<control>Q"
@@ -18372,7 +18384,7 @@ msgstr "服务器: "
msgid "Reset"
msgstr "重置"
-#: standalone/drakclock:212
+#: standalone/drakclock:214
#, c-format
msgid ""
"We need to install ntp package\n"
@@ -18390,17 +18402,17 @@ msgstr ""
msgid "Network configuration (%d adapters)"
msgstr "网络配置(%d 网卡)"
-#: standalone/drakconnect:92 standalone/drakconnect:738
+#: standalone/drakconnect:92 standalone/drakconnect:751
#, c-format
msgid "Gateway:"
msgstr "网关: "
-#: standalone/drakconnect:92 standalone/drakconnect:738
+#: standalone/drakconnect:92 standalone/drakconnect:751
#, c-format
msgid "Interface:"
msgstr "网卡: "
-#: standalone/drakconnect:96 standalone/net_monitor:105
+#: standalone/drakconnect:96 standalone/net_monitor:106
#, c-format
msgid "Wait please"
msgstr "请稍候"
@@ -18430,7 +18442,7 @@ msgstr "主机名: "
msgid "Configure hostname..."
msgstr "配置主机名..."
-#: standalone/drakconnect:149 standalone/drakconnect:779
+#: standalone/drakconnect:149 standalone/drakconnect:792
#, c-format
msgid "LAN configuration"
msgstr "局域网配置"
@@ -18440,8 +18452,8 @@ msgstr "局域网配置"
msgid "Configure Local Area Network..."
msgstr "配置局域网..."
-#: standalone/drakconnect:162 standalone/drakconnect:237
-#: standalone/drakconnect:241
+#: standalone/drakconnect:162 standalone/drakconnect:240
+#: standalone/drakconnect:244
#, c-format
msgid "Apply"
msgstr "应用"
@@ -18451,135 +18463,124 @@ msgstr "应用"
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:263 standalone/drakconnect:272
-#: standalone/drakconnect:292 standalone/drakconnect:444
-#: standalone/drakconnect:448 standalone/drakconnect:576
+#: standalone/drakconnect:218
#, c-format
-msgid "Account"
-msgstr "帐户"
+msgid "Device selected"
+msgstr "删除选中"
-#: standalone/drakconnect:298 standalone/drakconnect:370
-#: standalone/drakconnect:371 standalone/drakconnect:576
+#: standalone/drakconnect:314
#, c-format
-msgid "Wireless"
-msgstr "无线"
+msgid "IP configuration"
+msgstr "IP 配置"
-#: standalone/drakconnect:344
+#: standalone/drakconnect:351
#, c-format
msgid "DNS servers"
msgstr "DNS 服务器"
-#: standalone/drakconnect:351
+#: standalone/drakconnect:359
#, c-format
msgid "Search Domain"
msgstr "搜索域"
-#: standalone/drakconnect:359
+#: standalone/drakconnect:367
#, c-format
msgid "static"
msgstr "静态"
-#: standalone/drakconnect:359
+#: standalone/drakconnect:367
#, c-format
msgid "DHCP"
msgstr "DHCP"
-#: standalone/drakconnect:482
+#: standalone/drakconnect:493
#, c-format
msgid "Flow control"
msgstr "流控制"
-#: standalone/drakconnect:483
+#: standalone/drakconnect:494
#, c-format
msgid "Line termination"
msgstr "挂线"
-#: standalone/drakconnect:493
-#, c-format
-msgid "Use lock file"
-msgstr "使用锁定文件"
-
-#: standalone/drakconnect:496
+#: standalone/drakconnect:505
#, c-format
msgid "Modem timeout"
msgstr "调制解调器超时"
-#: standalone/drakconnect:500
+#: standalone/drakconnect:509
+#, c-format
+msgid "Use lock file"
+msgstr "使用锁定文件"
+
+#: standalone/drakconnect:511
#, c-format
msgid "Wait for dialup tone before dialing"
msgstr "在拨号前等候拨号音"
-#: standalone/drakconnect:503
+#: standalone/drakconnect:514
#, c-format
msgid "Busy wait"
msgstr "遇忙等待"
-#: standalone/drakconnect:507
+#: standalone/drakconnect:519
#, c-format
msgid "Modem sound"
msgstr "调制解调器声音"
-#: standalone/drakconnect:508
+#: standalone/drakconnect:520
#, c-format
msgid "Enable"
msgstr "启用"
-#: standalone/drakconnect:508
+#: standalone/drakconnect:520
#, c-format
msgid "Disable"
msgstr "禁用"
-#: standalone/drakconnect:558 standalone/harddrake2:58
+#: standalone/drakconnect:571 standalone/harddrake2:62
#, c-format
msgid "Media class"
msgstr "介质类别"
-#: standalone/drakconnect:559 standalone/drakfloppy:140
+#: standalone/drakconnect:572 standalone/drakfloppy:141
#, c-format
msgid "Module name"
msgstr "模块名"
-#: standalone/drakconnect:560
+#: standalone/drakconnect:573
#, c-format
msgid "Mac Address"
msgstr "Mac 地址"
-#: standalone/drakconnect:561 standalone/harddrake2:21
+#: standalone/drakconnect:574 standalone/harddrake2:21
#, c-format
msgid "Bus"
msgstr "总线"
-#: standalone/drakconnect:562 standalone/harddrake2:29
+#: standalone/drakconnect:575 standalone/harddrake2:29
#, c-format
msgid "Location on the bus"
msgstr "在总线上的位置"
-#: standalone/drakconnect:632 standalone/drakgw:248 standalone/drakpxe:138
+#: standalone/drakconnect:645 standalone/drakgw:248 standalone/drakpxe:138
#, c-format
msgid ""
"No ethernet network adapter has been detected on your system. Please run the "
"hardware configuration tool."
msgstr "您的系统里没有配置以太网卡。请运行硬件配置工具。"
-#: standalone/drakconnect:638
+#: standalone/drakconnect:651
#, c-format
msgid "Remove a network interface"
msgstr "删除网卡"
-#: standalone/drakconnect:642
+#: standalone/drakconnect:655
#, c-format
msgid "Select the network interface to remove:"
msgstr "选择要删除的网卡: "
-#: standalone/drakconnect:666
+#: standalone/drakconnect:679
#, c-format
msgid ""
"An error occured while deleting the \"%s\" network interface:\n"
@@ -18590,70 +18591,70 @@ msgstr ""
"\n"
"%s"
-#: standalone/drakconnect:668
+#: standalone/drakconnect:681
#, c-format
msgid ""
"Congratulations, the \"%s\" network interface has been succesfully deleted"
msgstr "恭喜,“%s”网卡已经成功删除"
-#: standalone/drakconnect:685
+#: standalone/drakconnect:698
#, c-format
msgid "No Ip"
msgstr "没有 IP"
-#: standalone/drakconnect:686
+#: standalone/drakconnect:699
#, c-format
msgid "No Mask"
msgstr "没有掩码"
-#: standalone/drakconnect:687 standalone/drakconnect:850
+#: standalone/drakconnect:700 standalone/drakconnect:863
#, c-format
msgid "up"
msgstr "上移"
-#: standalone/drakconnect:687 standalone/drakconnect:850
+#: standalone/drakconnect:700 standalone/drakconnect:863
#, c-format
msgid "down"
msgstr "下移"
-#: standalone/drakconnect:728 standalone/net_monitor:415
+#: standalone/drakconnect:741 standalone/net_monitor:419
#, c-format
msgid "Connected"
msgstr "已连接"
-#: standalone/drakconnect:728 standalone/net_monitor:415
+#: standalone/drakconnect:741 standalone/net_monitor:419
#, c-format
msgid "Not connected"
msgstr "未连接"
-#: standalone/drakconnect:730
+#: standalone/drakconnect:743
#, c-format
msgid "Disconnect..."
msgstr "断开连接..."
-#: standalone/drakconnect:730
+#: standalone/drakconnect:743
#, c-format
msgid "Connect..."
msgstr "连接..."
-#: standalone/drakconnect:759
+#: standalone/drakconnect:772
#, c-format
msgid ""
"Warning, another Internet connection has been detected, maybe using your "
"network"
msgstr "警告,检测到另外的 Internet 连接,可能是通过本地网络"
-#: standalone/drakconnect:775
+#: standalone/drakconnect:788
#, c-format
msgid "Deactivate now"
msgstr "立即禁用"
-#: standalone/drakconnect:775
+#: standalone/drakconnect:788
#, c-format
msgid "Activate now"
msgstr "立即激活"
-#: standalone/drakconnect:783
+#: standalone/drakconnect:796
#, c-format
msgid ""
"You don't have any configured interface.\n"
@@ -18662,27 +18663,27 @@ msgstr ""
"您没有配置好的网卡。\n"
"单击“配置”先配置网卡"
-#: standalone/drakconnect:797
+#: standalone/drakconnect:810
#, c-format
msgid "LAN Configuration"
msgstr "LAN 配置"
-#: standalone/drakconnect:809
+#: standalone/drakconnect:822
#, c-format
msgid "Adapter %s: %s"
msgstr "适配器 %s: %s"
-#: standalone/drakconnect:818
+#: standalone/drakconnect:831
#, c-format
msgid "Boot Protocol"
msgstr "启动协议"
-#: standalone/drakconnect:819
+#: standalone/drakconnect:832
#, c-format
msgid "Started on boot"
msgstr "开机时启动"
-#: standalone/drakconnect:855
+#: standalone/drakconnect:868
#, c-format
msgid ""
"This interface has not been configured yet.\n"
@@ -18691,7 +18692,8 @@ msgstr ""
"这块网卡还没有配置过。\n"
"请从“Mandrakelinux 控制中心”运行“添加网卡”助手"
-#: standalone/drakconnect:910
+#. -PO: here "Internet access" should be translated the same was as in control-center
+#: standalone/drakconnect:923
#, c-format
msgid ""
"You don't have any configured Internet connection.\n"
@@ -18700,32 +18702,32 @@ msgstr ""
"您没有配置过 Internet 连接。\n"
"请在控制中心中运行“Internet 访问”。"
-#: standalone/drakconnect:918
+#: standalone/drakconnect:931
#, c-format
msgid "Internet connection configuration"
msgstr "Internet 连接配置"
-#: standalone/drakconnect:936
+#: standalone/drakconnect:949
#, c-format
msgid "Third DNS server (optional)"
msgstr "第三 DNS 服务器(可选)"
-#: standalone/drakconnect:958
+#: standalone/drakconnect:971
#, c-format
msgid "Internet Connection Configuration"
msgstr "Internet 连接配置"
-#: standalone/drakconnect:959
+#: standalone/drakconnect:972
#, c-format
msgid "Internet access"
msgstr "Internet 访问"
-#: standalone/drakconnect:961 standalone/net_monitor:87
+#: standalone/drakconnect:974 standalone/net_monitor:88
#, c-format
msgid "Connection type: "
msgstr "连接类型:"
-#: standalone/drakconnect:964
+#: standalone/drakconnect:977
#, c-format
msgid "Status:"
msgstr "状态: "
@@ -18755,82 +18757,82 @@ msgstr "更改已经完成,您想要重新启动 dm 设备吗?"
msgid "drakfloppy"
msgstr "Drak 启动软盘"
-#: standalone/drakfloppy:82
+#: standalone/drakfloppy:83
#, c-format
msgid "Boot disk creation"
msgstr "创建启动盘"
-#: standalone/drakfloppy:83
+#: standalone/drakfloppy:84
#, c-format
msgid "General"
msgstr "常规"
-#: standalone/drakfloppy:86
+#: standalone/drakfloppy:87
#, c-format
msgid "Device"
msgstr "设备"
-#: standalone/drakfloppy:92
+#: standalone/drakfloppy:93
#, c-format
msgid "Kernel version"
msgstr "内核版本"
-#: standalone/drakfloppy:107
+#: standalone/drakfloppy:108
#, c-format
msgid "Preferences"
msgstr "首选项"
-#: standalone/drakfloppy:121
+#: standalone/drakfloppy:122
#, c-format
msgid "Advanced preferences"
msgstr "高级设置"
-#: standalone/drakfloppy:140
+#: standalone/drakfloppy:141
#, c-format
msgid "Size"
msgstr "大小"
-#: standalone/drakfloppy:143
+#: standalone/drakfloppy:144
#, c-format
msgid "Mkinitrd optional arguments"
msgstr "Mkinitrd 可选参数"
-#: standalone/drakfloppy:145
+#: standalone/drakfloppy:146
#, c-format
msgid "force"
msgstr "强迫"
-#: standalone/drakfloppy:146
+#: standalone/drakfloppy:147
#, c-format
msgid "omit raid modules"
msgstr "省略 RAID 模块"
-#: standalone/drakfloppy:147
+#: standalone/drakfloppy:148
#, c-format
msgid "if needed"
msgstr "当需要时"
-#: standalone/drakfloppy:148
+#: standalone/drakfloppy:149
#, c-format
msgid "omit scsi modules"
msgstr "省略 scsi 模块"
-#: standalone/drakfloppy:151
+#: standalone/drakfloppy:152
#, c-format
msgid "Add a module"
msgstr "增加模块"
-#: standalone/drakfloppy:160
+#: standalone/drakfloppy:161
#, c-format
msgid "Remove a module"
msgstr "卸载模块"
-#: standalone/drakfloppy:295
+#: standalone/drakfloppy:296
#, c-format
msgid "Be sure a media is present for the device %s"
msgstr "确定设备 %s 的介质存在"
-#: standalone/drakfloppy:301
+#: standalone/drakfloppy:302
#, c-format
msgid ""
"There is no medium or it is write-protected for device %s.\n"
@@ -18839,22 +18841,22 @@ msgstr ""
"设备 %s 介质不存在或被写保护。\n"
"请插入介质。"
-#: standalone/drakfloppy:305
+#: standalone/drakfloppy:306
#, c-format
msgid "Unable to fork: %s"
msgstr "无法创建进程: %s"
-#: standalone/drakfloppy:308
+#: standalone/drakfloppy:309
#, c-format
msgid "Floppy creation completed"
msgstr "完成创建软盘"
-#: standalone/drakfloppy:308
+#: standalone/drakfloppy:309
#, c-format
msgid "The creation of the boot floppy has been successfully completed \n"
msgstr "创建启动软盘已经成功地完成了\n"
-#: standalone/drakfloppy:311
+#: standalone/drakfloppy:312
#, c-format
msgid ""
"Unable to properly close mkbootdisk:\n"
@@ -19603,22 +19605,22 @@ msgstr "自定义和系统设置"
msgid "Editable"
msgstr "可编辑"
-#: standalone/drakperm:48 standalone/drakperm:314
+#: standalone/drakperm:48 standalone/drakperm:318
#, c-format
msgid "Path"
msgstr "路径"
-#: standalone/drakperm:48 standalone/drakperm:250
+#: standalone/drakperm:48 standalone/drakperm:254
#, c-format
msgid "User"
msgstr "用户"
-#: standalone/drakperm:48 standalone/drakperm:250
+#: standalone/drakperm:48 standalone/drakperm:254
#, c-format
msgid "Group"
msgstr "组"
-#: standalone/drakperm:48 standalone/drakperm:326
+#: standalone/drakperm:48 standalone/drakperm:330
#, c-format
msgid "Permissions"
msgstr "权限"
@@ -19678,9 +19680,10 @@ msgstr "在末尾添加新的规则"
msgid "Delete selected rule"
msgstr "删除选中的规则"
+#. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
#: standalone/drakperm:125 standalone/drakups:281 standalone/drakups:330
#: standalone/drakups:350 standalone/drakvpn:333 standalone/drakvpn:694
-#: standalone/printerdrake:229
+#: standalone/printerdrake:233
#, c-format
msgid "Edit"
msgstr "编辑"
@@ -19690,47 +19693,47 @@ msgstr "编辑"
msgid "Edit current rule"
msgstr "编辑当前规则"
-#: standalone/drakperm:242
+#: standalone/drakperm:246
#, c-format
msgid "browse"
msgstr "浏览"
-#: standalone/drakperm:252
+#: standalone/drakperm:256
#, c-format
msgid "Read"
msgstr "读取"
-#: standalone/drakperm:253
+#: standalone/drakperm:257
#, c-format
msgid "Enable \"%s\" to read the file"
msgstr "允许“%s”读取文件"
-#: standalone/drakperm:256
+#: standalone/drakperm:260
#, c-format
msgid "Write"
msgstr "写入"
-#: standalone/drakperm:257
+#: standalone/drakperm:261
#, c-format
msgid "Enable \"%s\" to write the file"
msgstr "允许“%s”写入文件"
-#: standalone/drakperm:260
+#: standalone/drakperm:264
#, c-format
msgid "Execute"
msgstr "执行"
-#: standalone/drakperm:261
+#: standalone/drakperm:265
#, c-format
msgid "Enable \"%s\" to execute the file"
msgstr "允许“%s”执行此文件"
-#: standalone/drakperm:263
+#: standalone/drakperm:267
#, c-format
msgid "Sticky-bit"
msgstr "Sticky-bit"
-#: standalone/drakperm:263
+#: standalone/drakperm:267
#, c-format
msgid ""
"Used for directory:\n"
@@ -19739,52 +19742,52 @@ msgstr ""
"用于目录:\n"
" 只有目录的所有者或目录中文件的所有者可以删除它"
-#: standalone/drakperm:264
+#: standalone/drakperm:268
#, c-format
msgid "Set-UID"
msgstr "Set-UID"
-#: standalone/drakperm:264
+#: standalone/drakperm:268
#, c-format
msgid "Use owner id for execution"
msgstr "使用所有者 ID 执行"
-#: standalone/drakperm:265
+#: standalone/drakperm:269
#, c-format
msgid "Set-GID"
msgstr "Set-GID"
-#: standalone/drakperm:265
+#: standalone/drakperm:269
#, c-format
msgid "Use group id for execution"
msgstr "使用组 ID 执行"
-#: standalone/drakperm:283 standalone/drakxtv:87
+#: standalone/drakperm:287 standalone/drakxtv:87
#, c-format
msgid "User :"
msgstr "用户: "
-#: standalone/drakperm:285
+#: standalone/drakperm:289
#, c-format
msgid "Group :"
msgstr "组: "
-#: standalone/drakperm:289
+#: standalone/drakperm:293
#, c-format
msgid "Current user"
msgstr "当前用户"
-#: standalone/drakperm:290
+#: standalone/drakperm:294
#, c-format
msgid "When checked, owner and group won't be changed"
msgstr "选中后,无法更改所有者和组"
-#: standalone/drakperm:300
+#: standalone/drakperm:304
#, c-format
msgid "Path selection"
msgstr "选择路径"
-#: standalone/drakperm:320
+#: standalone/drakperm:324
#, c-format
msgid "Property"
msgstr "属性"
@@ -19934,6 +19937,8 @@ msgstr "否"
msgid "yes"
msgstr "是"
+#. -PO: Do not alter the <span ..> and </span> tags
+#. -PO: Translate the security levels (Poor, Standard, High, Higher and Paranoid) in the same way, you translated these individuals words
#: standalone/draksec:81
#, c-format
msgid ""
@@ -20242,7 +20247,7 @@ msgid "Make kernel message quiet by default"
msgstr "默认设定内核消息不显示"
#: standalone/draksplash:161 standalone/draksplash:319
-#: standalone/draksplash:462
+#: standalone/draksplash:464
#, c-format
msgid "Notice"
msgstr "注意"
@@ -20262,22 +20267,23 @@ msgstr "选择图像"
msgid "saving Bootsplash theme..."
msgstr "保存开机画面主题..."
-#: standalone/draksplash:443
+#: standalone/draksplash:445
#, c-format
msgid "ProgressBar color selection"
msgstr "进度条颜色选择"
-#: standalone/draksplash:462
+#: standalone/draksplash:464
#, c-format
msgid "You must choose an image file first!"
msgstr "您必须先选择一个图像文件!"
-#: standalone/draksplash:467
+#: standalone/draksplash:469
#, c-format
msgid "Generating preview ..."
msgstr "正在生成预览..."
-#: standalone/draksplash:512
+#. -PO: First %s is theme name, second %s (in parenthesis) is resolution
+#: standalone/draksplash:515
#, c-format
msgid "%s BootSplash (%s) preview"
msgstr "%s 启动画面(%s)预览"
@@ -20319,7 +20325,7 @@ msgstr ""
msgid "Autodetection"
msgstr "自动检测"
-#: standalone/drakups:90 standalone/harddrake2:134
+#: standalone/drakups:90 standalone/harddrake2:140
#, c-format
msgid "Detection in progress"
msgstr "检测进行中"
@@ -20400,7 +20406,7 @@ msgid "UPS devices"
msgstr "UPS 服务"
#: standalone/drakups:233 standalone/drakups:251 standalone/drakups:266
-#: standalone/harddrake2:63
+#: standalone/harddrake2:67
#, c-format
msgid "Name"
msgstr "名称"
@@ -20430,7 +20436,7 @@ msgstr "规则 "
msgid "Action"
msgstr "操作"
-#: standalone/drakups:278 standalone/drakvpn:1146 standalone/harddrake2:57
+#: standalone/drakups:278 standalone/drakvpn:1146 standalone/harddrake2:61
#, c-format
msgid "Level"
msgstr "级别"
@@ -21932,42 +21938,43 @@ msgstr "驱动器能力"
msgid "special capacities of the driver (burning ability and or DVD support)"
msgstr "驱动器的特殊能力(刻录能力和/或 DVD 支持)"
-#: standalone/harddrake2:36
+#. -PO: here "comas" is the medical coma, not the lexical coma!!
+#: standalone/harddrake2:37
#, c-format
msgid "Coma bug"
msgstr "Coma 错误"
-#: standalone/harddrake2:36
+#: standalone/harddrake2:37
#, c-format
msgid "whether this cpu has the Cyrix 6x86 Coma bug"
msgstr "此 CPU 是否有 Cyrix 6x86 Coma 错误"
-#: standalone/harddrake2:37
+#: standalone/harddrake2:38
#, c-format
msgid "Cpuid family"
msgstr "CPUID 家族"
-#: standalone/harddrake2:37
+#: standalone/harddrake2:38
#, c-format
msgid "family of the cpu (eg: 6 for i686 class)"
msgstr "CPU 家族(如 6 代表 i686 级别)"
-#: standalone/harddrake2:38
+#: standalone/harddrake2:39
#, c-format
msgid "Cpuid level"
msgstr "CPUID 级别"
-#: standalone/harddrake2:38
+#: standalone/harddrake2:39
#, c-format
msgid "information level that can be obtained through the cpuid instruction"
msgstr "通过 CPUID 指令可获取的信息级别"
-#: standalone/harddrake2:39
+#: standalone/harddrake2:40
#, c-format
msgid "Frequency (MHz)"
msgstr "频率(MHz)"
-#: standalone/harddrake2:39
+#: standalone/harddrake2:40
#, c-format
msgid ""
"the CPU frequency in MHz (Megahertz which in first approximation may be "
@@ -21976,57 +21983,68 @@ msgid ""
msgstr ""
"以 MHz 为单位的 CPU 频率(初次估计的兆赫兹可能比较接近 CPU 每秒可执行的指令数)"
-#: standalone/harddrake2:40
+#: standalone/harddrake2:41
#, c-format
msgid "this field describes the device"
msgstr "此处描述了设备"
-#: standalone/harddrake2:41
+#: standalone/harddrake2:42
#, c-format
msgid "Old device file"
msgstr "旧的设备文件"
-#: standalone/harddrake2:42
+#: standalone/harddrake2:43
#, c-format
msgid "old static device name used in dev package"
msgstr "dev 软件包中使用的旧的静态设备名"
-#: standalone/harddrake2:43
+#: standalone/harddrake2:44
#, c-format
msgid "New devfs device"
msgstr "新的 devfs 设备"
-#: standalone/harddrake2:44
+#: standalone/harddrake2:45
#, c-format
msgid "new dynamic device name generated by core kernel devfs"
msgstr "内核自带的 devfs 中使用的新的动态设备名"
-#: standalone/harddrake2:46
+#. -PO: here "module" is the "jargon term" for a kernel driver
+#: standalone/harddrake2:48
#, c-format
msgid "Module"
msgstr "模块"
-#: standalone/harddrake2:46
+#: standalone/harddrake2:48
#, c-format
msgid "the module of the GNU/Linux kernel that handles the device"
msgstr "管理该设备的 GNU/Linux 内核模块"
-#: standalone/harddrake2:47
+#: standalone/harddrake2:49
+#, c-format
+msgid "Extended partitions"
+msgstr "扩展分区"
+
+#: standalone/harddrake2:49
+#, c-format
+msgid "the number of extended partitions"
+msgstr "扩展分区的编号"
+
+#: standalone/harddrake2:50
#, c-format
msgid "Flags"
msgstr "标志"
-#: standalone/harddrake2:47
+#: standalone/harddrake2:50
#, c-format
msgid "CPU flags reported by the kernel"
msgstr "核心报告的 CPU 标志"
-#: standalone/harddrake2:48
+#: standalone/harddrake2:51
#, c-format
msgid "Fdiv bug"
msgstr "Fdiv 错误"
-#: standalone/harddrake2:49
+#: standalone/harddrake2:52
#, c-format
msgid ""
"Early Intel Pentium chips manufactured have a bug in their floating point "
@@ -22036,155 +22054,175 @@ msgstr ""
"早期的 Intel Pentium 芯片在浮点处理器中有错误,导致在执行浮点除法(FDIV)时精度"
"下降"
-#: standalone/harddrake2:50
+#: standalone/harddrake2:53
#, c-format
msgid "Is FPU present"
msgstr "FPU 存在"
-#: standalone/harddrake2:50
+#: standalone/harddrake2:53
#, c-format
msgid "yes means the processor has an arithmetic coprocessor"
msgstr "“是”代表处理器有数学协处理器"
-#: standalone/harddrake2:51
+#: standalone/harddrake2:54
#, c-format
msgid "Whether the FPU has an irq vector"
msgstr "FPU 是否有 IRQ 向量"
-#: standalone/harddrake2:51
+#: standalone/harddrake2:54
#, c-format
msgid "yes means the arithmetic coprocessor has an exception vector attached"
msgstr "“是”代表算术协处理器附加了意外向量"
-#: standalone/harddrake2:52
+#: standalone/harddrake2:55
#, c-format
msgid "F00f bug"
msgstr "F00f 错误"
-#: standalone/harddrake2:52
+#: standalone/harddrake2:55
#, c-format
msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
msgstr "早期的奔腾芯片在解码 FOOF 字节码时存在错误并可能会死锁"
-#: standalone/harddrake2:53
+#: standalone/harddrake2:56
+#, c-format
+msgid "Geometry"
+msgstr "物理参数"
+
+#: standalone/harddrake2:56
+#, c-format
+msgid "Cylinder/head/sectors geometry of the disk"
+msgstr "磁盘的磁头/删区等物理参数"
+
+#: standalone/harddrake2:57
#, c-format
msgid "Halt bug"
msgstr "死锁错误"
-#: standalone/harddrake2:54
+#: standalone/harddrake2:58
#, c-format
msgid ""
"Some of the early i486DX-100 chips cannot reliably return to operating mode "
"after the \"halt\" instruction is used"
msgstr "某些早期的 i486DX-100 芯片在使用“halt”指令后无法确定返回操作模式"
-#: standalone/harddrake2:56
+#: standalone/harddrake2:60
#, c-format
msgid "Floppy format"
msgstr "软盘格式化"
-#: standalone/harddrake2:56
+#: standalone/harddrake2:60
#, c-format
msgid "format of floppies supported by the drive"
msgstr "驱动器接受的软盘格式"
-#: standalone/harddrake2:57
+#: standalone/harddrake2:61
#, c-format
msgid "sub generation of the cpu"
msgstr "CPU 的次世代"
-#: standalone/harddrake2:58
+#: standalone/harddrake2:62
#, c-format
msgid "class of hardware device"
msgstr "硬件设备的分类"
-#: standalone/harddrake2:59 standalone/harddrake2:60
+#: standalone/harddrake2:63 standalone/harddrake2:64
#: standalone/printerdrake:212
#, c-format
msgid "Model"
msgstr "型号"
-#: standalone/harddrake2:59
+#: standalone/harddrake2:63
#, c-format
msgid "hard disk model"
msgstr "硬盘型号"
-#: standalone/harddrake2:60
+#: standalone/harddrake2:64
#, c-format
msgid "generation of the cpu (eg: 8 for PentiumIII, ...)"
msgstr "CPU 世代(如 8 代表 PentiumIII,等等)"
-#: standalone/harddrake2:61
+#: standalone/harddrake2:65
#, c-format
msgid "Model name"
msgstr "型号名称"
-#: standalone/harddrake2:61
+#: standalone/harddrake2:65
#, c-format
msgid "official vendor name of the cpu"
msgstr "CPU 的官方厂家名称"
-#: standalone/harddrake2:62
+#: standalone/harddrake2:66
#, c-format
msgid "Number of buttons"
msgstr "按钮数目"
-#: standalone/harddrake2:62
+#: standalone/harddrake2:66
#, c-format
msgid "the number of buttons the mouse has"
msgstr "鼠标按钮数"
-#: standalone/harddrake2:63
+#: standalone/harddrake2:67
#, c-format
msgid "the name of the CPU"
msgstr "CPU 名称"
-#: standalone/harddrake2:64
+#: standalone/harddrake2:68
#, c-format
msgid "network printer port"
msgstr "网络打印机端口"
-#: standalone/harddrake2:65
+#: standalone/harddrake2:69
#, c-format
msgid "Processor ID"
msgstr "处理器 ID"
-#: standalone/harddrake2:65
+#: standalone/harddrake2:69
#, c-format
msgid "the number of the processor"
msgstr "处理器编号"
-#: standalone/harddrake2:66
+#: standalone/harddrake2:70
+#, c-format
+msgid "Primary partitions"
+msgstr "主分区"
+
+#: standalone/harddrake2:70
+#, c-format
+msgid "the number of the primary partitions"
+msgstr "主分区的编号"
+
+#: standalone/harddrake2:71
#, c-format
msgid "Model stepping"
msgstr "型号步进"
-#: standalone/harddrake2:66
+#: standalone/harddrake2:71
#, c-format
msgid "stepping of the cpu (sub model (generation) number)"
msgstr "CPU 步进(次型号(世代))"
-#: standalone/harddrake2:67
+#: standalone/harddrake2:72
#, c-format
msgid "the type of bus on which the mouse is connected"
msgstr "请选择您鼠标所连接的总线类型"
-#: standalone/harddrake2:68
+#: standalone/harddrake2:73
#, c-format
msgid "the vendor name of the device"
msgstr "设备的厂家名称"
-#: standalone/harddrake2:69
+#: standalone/harddrake2:74
#, c-format
msgid "the vendor name of the processor"
msgstr "处理器供应商"
-#: standalone/harddrake2:70
+#: standalone/harddrake2:75
#, c-format
msgid "Write protection"
msgstr "写保护"
-#: standalone/harddrake2:70
+#: standalone/harddrake2:75
#, c-format
msgid ""
"the WP flag in the CR0 register of the cpu enforce write proctection at the "
@@ -22194,50 +22232,51 @@ msgstr ""
"CPU 中 CRO 寄存器的 WP 标志位强制在内存页面级别进行写保护,这使得处理器可以避"
"免未检查的内核访问用户内存(不过此防护有 bug)"
-#: standalone/harddrake2:84 standalone/logdrake:78 standalone/printerdrake:146
+#. -PO: please keep all "/" charaters !!!
+#: standalone/harddrake2:90 standalone/logdrake:78 standalone/printerdrake:146
#: standalone/printerdrake:159
#, c-format
msgid "/_Options"
msgstr "/选项(_O)"
-#: standalone/harddrake2:85 standalone/harddrake2:106 standalone/logdrake:80
+#: standalone/harddrake2:91 standalone/harddrake2:112 standalone/logdrake:80
#: standalone/printerdrake:171 standalone/printerdrake:172
#: standalone/printerdrake:173 standalone/printerdrake:174
#, c-format
msgid "/_Help"
msgstr "/帮助(_H)"
-#: standalone/harddrake2:89
+#: standalone/harddrake2:95
#, c-format
msgid "/Autodetect _printers"
msgstr "/自动检测打印机(_P)"
-#: standalone/harddrake2:90
+#: standalone/harddrake2:96
#, c-format
msgid "/Autodetect _modems"
msgstr "/自动检测调制解调器(_M)"
-#: standalone/harddrake2:91
+#: standalone/harddrake2:97
#, c-format
msgid "/Autodetect _jaz drives"
msgstr "/自动检测 jaz 驱动器(_J)"
-#: standalone/harddrake2:98 standalone/printerdrake:152
+#: standalone/harddrake2:104 standalone/printerdrake:152
#, c-format
msgid "/_Quit"
msgstr "/退出(_Q)"
-#: standalone/harddrake2:107
+#: standalone/harddrake2:113
#, c-format
msgid "/_Fields description"
msgstr "/域描述(_F)"
-#: standalone/harddrake2:109
+#: standalone/harddrake2:115
#, c-format
msgid "Harddrake help"
msgstr "“Drak 硬件配置”帮助"
-#: standalone/harddrake2:110
+#: standalone/harddrake2:116
#, c-format
msgid ""
"Description of the fields:\n"
@@ -22246,29 +22285,30 @@ msgstr ""
"各个域的描述: \n"
"\n"
-#: standalone/harddrake2:115
+#: standalone/harddrake2:121
#, 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\")"
msgstr "只要您选中了设备,您就能看到在右侧框架(“信息”)中显示的解释。"
-#: standalone/harddrake2:120 standalone/printerdrake:173
+#: standalone/harddrake2:126 standalone/printerdrake:173
#, c-format
msgid "/_Report Bug"
msgstr "/故障报告(_R)"
-#: standalone/harddrake2:121 standalone/printerdrake:174
+#: standalone/harddrake2:127 standalone/printerdrake:174
#, c-format
msgid "/_About..."
msgstr "/关于(_A)..."
-#: standalone/harddrake2:122
+#: standalone/harddrake2:128
#, c-format
msgid "About Harddrake"
msgstr "关于“Drak 硬件配置”"
-#: standalone/harddrake2:124
+#. -PO: Do not alter the <span ..> and </span> tags
+#: standalone/harddrake2:130
#, c-format
msgid ""
"This is HardDrake, a Mandrake hardware configuration tool.\n"
@@ -22283,58 +22323,58 @@ msgstr ""
"tvignaud@mandrakesoft.com&gt;\n"
"\n"
-#: standalone/harddrake2:141
+#: standalone/harddrake2:147
#, c-format
msgid "Harddrake2 version %s"
msgstr "Drak 硬件配置 2 版本 %s"
-#: standalone/harddrake2:157
+#: standalone/harddrake2:163
#, c-format
msgid "Detected hardware"
msgstr "检测到的硬件"
-#: standalone/harddrake2:162
+#: standalone/harddrake2:168
#, c-format
msgid "Configure module"
msgstr "配置模块"
-#: standalone/harddrake2:169
+#: standalone/harddrake2:175
#, c-format
msgid "Run config tool"
msgstr "运行配置工具"
-#: standalone/harddrake2:216
+#: standalone/harddrake2:222
#, c-format
msgid "unknown"
msgstr "未知"
-#: standalone/harddrake2:217
+#: standalone/harddrake2:223
#, c-format
msgid "Unknown"
msgstr "未知"
-#: standalone/harddrake2:235
+#: standalone/harddrake2:241
#, c-format
msgid ""
"Click on a device in the left tree in order to display its information here."
msgstr "单击左侧树中的设备,就可在此显示其信息。"
-#: standalone/harddrake2:286
+#: standalone/harddrake2:295
#, c-format
msgid "secondary"
msgstr "次要"
-#: standalone/harddrake2:286
+#: standalone/harddrake2:295
#, c-format
msgid "primary"
msgstr "主"
-#: standalone/harddrake2:294
+#: standalone/harddrake2:303
#, c-format
msgid "burner"
msgstr "刻录机"
-#: standalone/harddrake2:294
+#: standalone/harddrake2:303
#, c-format
msgid "DVD"
msgstr "DVD"
@@ -22457,7 +22497,7 @@ msgstr "搜索"
msgid "A tool to monitor your logs"
msgstr "日志监视工具"
-#: standalone/logdrake:130 standalone/net_monitor:85
+#: standalone/logdrake:130 standalone/net_monitor:86
#, c-format
msgid "Settings"
msgstr "设置"
@@ -22652,27 +22692,27 @@ msgstr "鼠标测试"
msgid "Please test your mouse:"
msgstr "请测试您的鼠标: "
-#: standalone/net_monitor:51 standalone/net_monitor:56
+#: standalone/net_monitor:52 standalone/net_monitor:57
#, c-format
msgid "Network Monitoring"
msgstr "网络监视"
-#: standalone/net_monitor:91
+#: standalone/net_monitor:92
#, c-format
msgid "Global statistics"
msgstr "全局统计"
-#: standalone/net_monitor:94
+#: standalone/net_monitor:95
#, c-format
msgid "Instantaneous"
msgstr "瞬时"
-#: standalone/net_monitor:94
+#: standalone/net_monitor:95
#, c-format
msgid "Average"
msgstr "平均"
-#: standalone/net_monitor:95
+#: standalone/net_monitor:96
#, c-format
msgid ""
"Sending\n"
@@ -22681,7 +22721,7 @@ msgstr ""
"发送\n"
"速度: "
-#: standalone/net_monitor:96
+#: standalone/net_monitor:97
#, c-format
msgid ""
"Receiving\n"
@@ -22690,7 +22730,7 @@ msgstr ""
"接收\n"
"速度: "
-#: standalone/net_monitor:99
+#: standalone/net_monitor:100
#, c-format
msgid ""
"Connection\n"
@@ -22699,37 +22739,37 @@ msgstr ""
"连接\n"
"时间: "
-#: standalone/net_monitor:121
+#: standalone/net_monitor:122
#, c-format
msgid "Wait please, testing your connection..."
msgstr "请稍候,正在测试连接..."
-#: standalone/net_monitor:149 standalone/net_monitor:162
+#: standalone/net_monitor:150 standalone/net_monitor:163
#, c-format
msgid "Disconnecting from Internet "
msgstr "从 Internet 断开 "
-#: standalone/net_monitor:149 standalone/net_monitor:162
+#: standalone/net_monitor:150 standalone/net_monitor:163
#, c-format
msgid "Connecting to Internet "
msgstr "正在连接到 Internet"
-#: standalone/net_monitor:193
+#: standalone/net_monitor:194
#, c-format
msgid "Disconnection from Internet failed."
msgstr "从 Internet 断开连接失败。"
-#: standalone/net_monitor:194
+#: standalone/net_monitor:195
#, c-format
msgid "Disconnection from Internet complete."
msgstr "从 Internet 断开完成。"
-#: standalone/net_monitor:196
+#: standalone/net_monitor:197
#, c-format
msgid "Connection complete."
msgstr "连接完成。"
-#: standalone/net_monitor:197
+#: standalone/net_monitor:198
#, c-format
msgid ""
"Connection failed.\n"
@@ -22738,59 +22778,59 @@ msgstr ""
"连接失败。\n"
"请在 Mandrakelinux 控制中心中检查您的配置。"
-#: standalone/net_monitor:295
+#: standalone/net_monitor:299
#, c-format
msgid "Color configuration"
msgstr "颜色配置"
-#: standalone/net_monitor:343 standalone/net_monitor:363
+#: standalone/net_monitor:347 standalone/net_monitor:367
#, c-format
msgid "sent: "
msgstr "已发送: "
-#: standalone/net_monitor:350 standalone/net_monitor:367
+#: standalone/net_monitor:354 standalone/net_monitor:371
#, c-format
msgid "received: "
msgstr "已接收: "
-#: standalone/net_monitor:357
+#: standalone/net_monitor:361
#, c-format
msgid "average"
msgstr "平均"
-#: standalone/net_monitor:360
+#: standalone/net_monitor:364
#, c-format
msgid "Local measure"
msgstr "本机测量"
-#: standalone/net_monitor:392
+#: standalone/net_monitor:396
#, c-format
msgid "transmitted"
msgstr "已传送"
-#: standalone/net_monitor:393
+#: standalone/net_monitor:397
#, c-format
msgid "received"
msgstr "已接收"
-#: standalone/net_monitor:411
+#: standalone/net_monitor:415
#, c-format
msgid ""
"Warning, another internet connection has been detected, maybe using your "
"network"
msgstr "警告,检测到了另外的 Internet 连接,可能使用您的网络"
-#: standalone/net_monitor:417
+#: standalone/net_monitor:421
#, c-format
msgid "Disconnect %s"
msgstr "断开 %s"
-#: standalone/net_monitor:417
+#: standalone/net_monitor:421
#, c-format
msgid "Connect %s"
msgstr "连接 %s"
-#: standalone/net_monitor:422
+#: standalone/net_monitor:426
#, c-format
msgid "No internet connection configured"
msgstr "尚未配置 Internet 连接"
@@ -22882,62 +22922,66 @@ msgstr "连接类型"
msgid "Server Name"
msgstr "服务器名"
-#: standalone/printerdrake:225
+#. -PO: "Add Printer" is a button text and the translation has to be AS SHORT AS POSSIBLE
+#: standalone/printerdrake:227
#, c-format
msgid "Add Printer"
msgstr "添加打印机"
-#: standalone/printerdrake:225
+#: standalone/printerdrake:227
#, c-format
msgid "Add a new printer to the system"
msgstr "向系统中添加一台新打印机"
-#: standalone/printerdrake:227
+#. -PO: "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
+#: standalone/printerdrake:230
#, c-format
msgid "Set as default"
msgstr "设为默认"
-#: standalone/printerdrake:227
+#: standalone/printerdrake:230
#, c-format
msgid "Set selected printer as the default printer"
msgstr "将选中打印机设为默认打印机"
-#: standalone/printerdrake:229
+#: standalone/printerdrake:233
#, c-format
msgid "Edit selected printer"
msgstr "编辑选中的打印机"
-#: standalone/printerdrake:231
+#: standalone/printerdrake:236
#, c-format
msgid "Delete selected printer"
msgstr "删除选中的打印机"
-#: standalone/printerdrake:233
+#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
+#: standalone/printerdrake:239
#, c-format
msgid "Refresh"
msgstr "刷新"
-#: standalone/printerdrake:233
+#: standalone/printerdrake:239
#, c-format
msgid "Refresh the list"
msgstr "刷新列表"
-#: standalone/printerdrake:235
+#. -PO: "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
+#: standalone/printerdrake:242
#, c-format
msgid "Configure CUPS"
msgstr "配置 CUPS"
-#: standalone/printerdrake:235
+#: standalone/printerdrake:242
#, c-format
msgid "Configure CUPS printing system"
msgstr "配置 CUPS 打印系统"
-#: standalone/printerdrake:521
+#: standalone/printerdrake:528
#, c-format
msgid "Authors: "
msgstr "作者: "
-#: standalone/printerdrake:527
+#: standalone/printerdrake:534
#, c-format
msgid "Printer Management \n"
msgstr "打印机管理\n"
@@ -22969,17 +23013,17 @@ msgstr "无法安装用“Drak 扫描仪”设置扫描仪所需的软件包。"
msgid "Scannerdrake will not be started now."
msgstr "“Drak 扫描仪”现在不会启动。"
-#: standalone/scannerdrake:66 standalone/scannerdrake:459
+#: standalone/scannerdrake:66 standalone/scannerdrake:464
#, c-format
msgid "Searching for configured scanners ..."
msgstr "正在搜索已配置的扫描仪..."
-#: standalone/scannerdrake:70 standalone/scannerdrake:463
+#: standalone/scannerdrake:70 standalone/scannerdrake:468
#, c-format
msgid "Searching for new scanners ..."
msgstr "正在搜索新的扫描仪..."
-#: standalone/scannerdrake:78 standalone/scannerdrake:485
+#: standalone/scannerdrake:78 standalone/scannerdrake:490
#, c-format
msgid "Re-generating list of configured scanners ..."
msgstr "正在重新生成已配置的扫描仪清单..."
@@ -23111,17 +23155,22 @@ msgstr "为它安装固件"
msgid "Select firmware file for the %s"
msgstr "选择 %s 的固件文件"
-#: standalone/scannerdrake:282
+#: standalone/scannerdrake:274
+#, c-format
+msgid "Could not install the firmware file for the %s!"
+msgstr "无法安装 %s 的固件文件"
+
+#: standalone/scannerdrake:287
#, c-format
msgid "The firmware file for your %s was successfully installed."
msgstr "您 %s 的固件文件已经成功安装。"
-#: standalone/scannerdrake:292
+#: standalone/scannerdrake:297
#, c-format
msgid "The %s is unsupported"
msgstr "扫描仪 %s 不被支持"
-#: standalone/scannerdrake:297
+#: standalone/scannerdrake:302
#, c-format
msgid ""
"The %s must be configured by printerdrake.\n"
@@ -23130,33 +23179,33 @@ msgstr ""
"这个 %s 必须使用“Drak 打印机”来配置。\n"
"您可以在“%s 控制中心”的“硬件”部分打开“Drak 打印机”。"
-#: standalone/scannerdrake:301 standalone/scannerdrake:308
-#: standalone/scannerdrake:338
+#: standalone/scannerdrake:306 standalone/scannerdrake:313
+#: standalone/scannerdrake:343
#, c-format
msgid "Auto-detect available ports"
msgstr "自动检测可用的端口"
-#: standalone/scannerdrake:303 standalone/scannerdrake:349
+#: standalone/scannerdrake:308 standalone/scannerdrake:354
#, c-format
msgid "Please select the device where your %s is attached"
msgstr "请选择您的 %s 所连接的设备。"
-#: standalone/scannerdrake:304
+#: standalone/scannerdrake:309
#, c-format
msgid "(Note: Parallel ports cannot be auto-detected)"
msgstr "(注意: 并行端口无法自动检测)"
-#: standalone/scannerdrake:306 standalone/scannerdrake:351
+#: standalone/scannerdrake:311 standalone/scannerdrake:356
#, c-format
msgid "choose device"
msgstr "选择设备"
-#: standalone/scannerdrake:340
+#: standalone/scannerdrake:345
#, c-format
msgid "Searching for scanners ..."
msgstr "正在搜索扫描仪..."
-#: standalone/scannerdrake:375
+#: standalone/scannerdrake:380
#, c-format
msgid ""
"Your %s has been configured.\n"
@@ -23166,7 +23215,7 @@ msgstr ""
"您的 %s 已经配置好了。\n"
"现在您可以从应用程序菜单的“多媒体/图像”中使用“XSane”或“Kooka”来扫描文档。"
-#: standalone/scannerdrake:399
+#: standalone/scannerdrake:404
#, c-format
msgid ""
"The following scanners\n"
@@ -23179,7 +23228,7 @@ msgstr ""
"%s\n"
"直接连接在您的系统。\n"
-#: standalone/scannerdrake:400
+#: standalone/scannerdrake:405
#, c-format
msgid ""
"The following scanner\n"
@@ -23192,42 +23241,42 @@ msgstr ""
"%s\n"
"直接连接在您的系统。\n"
-#: standalone/scannerdrake:403 standalone/scannerdrake:406
+#: standalone/scannerdrake:408 standalone/scannerdrake:411
#, c-format
msgid "There are no scanners found which are available on your system.\n"
msgstr "没有发现扫描仪直接连接在您的机器上。\n"
-#: standalone/scannerdrake:420
+#: standalone/scannerdrake:425
#, c-format
msgid "Search for new scanners"
msgstr "搜索新扫描仪"
-#: standalone/scannerdrake:426
+#: standalone/scannerdrake:431
#, c-format
msgid "Add a scanner manually"
msgstr "手动添加扫描仪"
-#: standalone/scannerdrake:433
+#: standalone/scannerdrake:438
#, c-format
msgid "Install/Update firmware files"
msgstr "安装/更新固件文件"
-#: standalone/scannerdrake:439
+#: standalone/scannerdrake:444
#, c-format
msgid "Scanner sharing"
msgstr "扫描仪共享"
-#: standalone/scannerdrake:498 standalone/scannerdrake:663
+#: standalone/scannerdrake:503 standalone/scannerdrake:668
#, c-format
msgid "All remote machines"
msgstr "全部远程计算机"
-#: standalone/scannerdrake:510 standalone/scannerdrake:813
+#: standalone/scannerdrake:515 standalone/scannerdrake:818
#, c-format
msgid "This machine"
msgstr "本机"
-#: standalone/scannerdrake:550
+#: standalone/scannerdrake:555
#, c-format
msgid ""
"Here you can choose whether the scanners connected to this machine should be "
@@ -23236,95 +23285,95 @@ msgstr ""
"您可以在此选择是否将连接到本机的扫描仪共享给远程计算机,以及共享给哪些计算"
"机。"
-#: standalone/scannerdrake:551
+#: standalone/scannerdrake:556
#, c-format
msgid ""
"You can also decide here whether scanners on remote machines should be made "
"available on this machine."
msgstr "您还可以在此决定是否要将远程的扫描仪自动安装为本机所用。"
-#: standalone/scannerdrake:554
+#: standalone/scannerdrake:559
#, c-format
msgid "The scanners on this machine are available to other computers"
msgstr "此计算机上的扫描仪可共享给计算机"
-#: standalone/scannerdrake:556
+#: standalone/scannerdrake:561
#, c-format
msgid "Scanner sharing to hosts: "
msgstr "在主机上共享扫描仪:"
-#: standalone/scannerdrake:570
+#: standalone/scannerdrake:575
#, c-format
msgid "Use scanners on remote computers"
msgstr "在远程计算机上使用扫描仪"
-#: standalone/scannerdrake:573
+#: standalone/scannerdrake:578
#, c-format
msgid "Use the scanners on hosts: "
msgstr "在下列主机上使用扫描仪:"
-#: standalone/scannerdrake:600 standalone/scannerdrake:672
-#: standalone/scannerdrake:822
+#: standalone/scannerdrake:605 standalone/scannerdrake:677
+#: standalone/scannerdrake:827
#, c-format
msgid "Sharing of local scanners"
msgstr "共享本地扫描仪"
-#: standalone/scannerdrake:601
+#: standalone/scannerdrake:606
#, c-format
msgid ""
"These are the machines on which the locally connected scanner(s) should be "
"available:"
msgstr "下面是本地连接的扫描仪要开放的计算机:"
-#: standalone/scannerdrake:612 standalone/scannerdrake:762
+#: standalone/scannerdrake:617 standalone/scannerdrake:767
#, c-format
msgid "Add host"
msgstr "添加主机"
-#: standalone/scannerdrake:618 standalone/scannerdrake:768
+#: standalone/scannerdrake:623 standalone/scannerdrake:773
#, c-format
msgid "Edit selected host"
msgstr "编辑选中的主机"
-#: standalone/scannerdrake:627 standalone/scannerdrake:777
+#: standalone/scannerdrake:632 standalone/scannerdrake:782
#, c-format
msgid "Remove selected host"
msgstr "删除选中的主机"
-#: standalone/scannerdrake:651 standalone/scannerdrake:659
-#: standalone/scannerdrake:664 standalone/scannerdrake:710
-#: standalone/scannerdrake:801 standalone/scannerdrake:809
-#: standalone/scannerdrake:814 standalone/scannerdrake:860
+#: standalone/scannerdrake:656 standalone/scannerdrake:664
+#: standalone/scannerdrake:669 standalone/scannerdrake:715
+#: standalone/scannerdrake:806 standalone/scannerdrake:814
+#: standalone/scannerdrake:819 standalone/scannerdrake:865
#, c-format
msgid "Name/IP address of host:"
msgstr "主机的名称/IP 地址:"
-#: standalone/scannerdrake:673 standalone/scannerdrake:823
+#: standalone/scannerdrake:678 standalone/scannerdrake:828
#, c-format
msgid "Choose the host on which the local scanners should be made available:"
msgstr "选择本地扫描仪适用的网络或主机:"
-#: standalone/scannerdrake:684 standalone/scannerdrake:834
+#: standalone/scannerdrake:689 standalone/scannerdrake:839
#, c-format
msgid "You must enter a host name or an IP address.\n"
msgstr "您必须输入主机名或 IP 地址。\n"
-#: standalone/scannerdrake:695 standalone/scannerdrake:845
+#: standalone/scannerdrake:700 standalone/scannerdrake:850
#, c-format
msgid "This host is already in the list, it cannot be added again.\n"
msgstr "此主机已经位于列表中,无法再次添加。\n"
-#: standalone/scannerdrake:750
+#: standalone/scannerdrake:755
#, c-format
msgid "Usage of remote scanners"
msgstr "远程扫描仪使用情况"
-#: standalone/scannerdrake:751
+#: standalone/scannerdrake:756
#, c-format
msgid "These are the machines from which the scanners should be used:"
msgstr "下面是要使用扫描仪的计算机:"
-#: standalone/scannerdrake:908
+#: standalone/scannerdrake:913
#, c-format
msgid ""
"saned needs to be installed to share the local scanner(s).\n"
@@ -23335,32 +23384,32 @@ msgstr ""
"\n"
"您是否想要安装 saned 软件包?"
-#: standalone/scannerdrake:912 standalone/scannerdrake:916
+#: standalone/scannerdrake:917 standalone/scannerdrake:921
#, c-format
msgid "Your scanner(s) will not be available on the network."
msgstr "您的扫描仪将不会在网络上出现。"
-#: standalone/service_harddrake:58
+#: standalone/service_harddrake:62
#, c-format
msgid "Some devices in the \"%s\" hardware class were removed:\n"
msgstr "删除了一些“%s”类别的设备:\n"
-#: standalone/service_harddrake:59
+#: standalone/service_harddrake:63
#, c-format
msgid "- %s was removed\n"
msgstr "- %s 已删除\n"
-#: standalone/service_harddrake:62
+#: standalone/service_harddrake:66
#, c-format
msgid "Some devices were added: %s\n"
msgstr "添加了一些设备: %s\n"
-#: standalone/service_harddrake:63
+#: standalone/service_harddrake:67
#, c-format
msgid "- %s was added\n"
msgstr "- %s 已添加\n"
-#: standalone/service_harddrake:107
+#: standalone/service_harddrake:126
#, c-format
msgid "Hardware probing in progress"
msgstr "硬件检测进行中"
@@ -23465,22 +23514,22 @@ msgstr "安装更新"
msgid "Exit install"
msgstr "退出安装"
-#: ugtk2.pm:1075
+#: ugtk2.pm:1084
#, c-format
msgid "Is this correct?"
msgstr "这样正确吗?"
-#: ugtk2.pm:1203
+#: ugtk2.pm:1212
#, c-format
msgid "Expand Tree"
msgstr "展开树"
-#: ugtk2.pm:1204
+#: ugtk2.pm:1213
#, c-format
msgid "Collapse Tree"
msgstr "折叠树"
-#: ugtk2.pm:1205
+#: ugtk2.pm:1214
#, c-format
msgid "Toggle between flat and group sorted"
msgstr "切换清单显示/按组排序"
@@ -23652,69 +23701,3 @@ msgstr "NFS 服务器,SMB 服务器,代理服务器,SSH 服务器"
msgid "Set of tools to read and send mail and news and to browse the Web"
msgstr "一组上网工具,用于收发邮件和新闻,或者浏览网站"
-#~ msgid ""
-#~ "Due to incompatibilities of the 2.6 series kernel with the LSB runtime\n"
-#~ "tests, the 2.4 series kernel will be installed as the default to insure\n"
-#~ "compliance under the \"LSB\" group selection."
-#~ msgstr ""
-#~ "由于 2.6 系列的内核与 LSB 运行时刻测试不兼容,我们将会把 2.4 系列内核\n"
-#~ "作为默认值,以遵从“LSB”组选择。"
-
-#~ msgid "XawTV isn't installed!"
-#~ msgstr "XawTV 没有安装!"
-
-#~ msgid "Provider dns 1 (optional)"
-#~ msgstr "服务商 DNS 1(可选)"
-
-#~ msgid "Provider dns 2 (optional)"
-#~ msgstr "服务商 DNS 2(可选)"
-
-#~ msgid "Ethernet Card"
-#~ msgstr "以太网卡"
-
-#~ msgid "DHCP Client"
-#~ msgstr "DHCP 客户端"
-
-#~ msgid "Display"
-#~ msgstr "显示"
-
-#~ msgid "Display configuration"
-#~ msgstr "显示配置"
-
-#~ msgid "Use tar and bzip2 (rather than tar and gzip)"
-#~ msgstr "使用 tar 和 bzip2(而不是 tar 和 gzip)"
-
-#~ msgid ""
-#~ "Change\n"
-#~ "Restore Path"
-#~ msgstr ""
-#~ "修改\n"
-#~ "恢复路径"
-
-#~ msgid "European protocol"
-#~ msgstr "欧洲协议"
-
-#~ msgid "Found \"%s\" interface do you want to use it ?"
-#~ msgstr "找到了“%s”接口,您想要使用吗?"
-
-#~ msgid "Bewan USB modem"
-#~ msgstr "Bewan USB 调制解调器"
-
-#~ msgid "ISDN configuration has not yet be ported to new wizard layer"
-#~ msgstr "ISDN 配置尚未移植到新向导层"
-
-#~ msgid "What kind is your ISDN connection?"
-#~ msgstr "您的 ISDN 连接是什么类型?"
-
-#~ msgid "Do you want to start a new configuration ?"
-#~ msgstr "您想要开始新配置吗?"
-
-#~ msgid ""
-#~ "I have detected an ISDN PCI card, but I don't know its type. Please "
-#~ "select a PCI card on the next screen."
-#~ msgstr ""
-#~ "我检测到一块 ISDN PCI 卡,不过无法识别它的型号。请在下一屏幕里选择您的 "
-#~ "PCI 卡。"
-
-#~ msgid "No ISDN PCI card found. Please select one on the next screen."
-#~ msgstr "没有探测到 ISDN PCI 卡。请在下一屏幕里挑选一种。"