summaryrefslogtreecommitdiffstats
path: root/perl-install/share/po/zh_CN.po
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>2005-03-03 09:19:59 +0000
committerPablo Saratxaga <pablo@mandriva.com>2005-03-03 09:19:59 +0000
commit046612a0de8eacaecb1914333f9d4facb4ac44cb (patch)
tree2823e1dad3faef650147d3bfa83f3c8266227eb5 /perl-install/share/po/zh_CN.po
parent854e603dc751754d1e86712056e5553376ca8f8e (diff)
downloaddrakx-046612a0de8eacaecb1914333f9d4facb4ac44cb.tar
drakx-046612a0de8eacaecb1914333f9d4facb4ac44cb.tar.gz
drakx-046612a0de8eacaecb1914333f9d4facb4ac44cb.tar.bz2
drakx-046612a0de8eacaecb1914333f9d4facb4ac44cb.tar.xz
drakx-046612a0de8eacaecb1914333f9d4facb4ac44cb.zip
Added translation for "recommended" string
Diffstat (limited to 'perl-install/share/po/zh_CN.po')
-rw-r--r--perl-install/share/po/zh_CN.po8920
1 files changed, 4794 insertions, 4126 deletions
diff --git a/perl-install/share/po/zh_CN.po b/perl-install/share/po/zh_CN.po
index d436e3e58..b2c5aaa26 100644
--- a/perl-install/share/po/zh_CN.po
+++ b/perl-install/share/po/zh_CN.po
@@ -7,9 +7,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: DrakX 10.1\n"
-"POT-Creation-Date: 2004-10-07 21:57+0200\n"
-"PO-Revision-Date: 2004-10-08 00:20+0800\n"
+"Project-Id-Version: DrakX 10.2\n"
+"POT-Creation-Date: 2005-02-24 14:10+0100\n"
+"PO-Revision-Date: 2005-02-08 03:59+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: Mandrakelinux i18n Team <cooker-i18n@linux-mandrake.com>\n"
"MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
#: ../move/move.pm:292
#, c-format
msgid "Which USB key do you want to format?"
-msgstr "您想要格式化哪个 USB 密钥闪存盘?"
+msgstr "您想要格式化哪个 USB 密钥闪存盘?"
#: ../move/move.pm:296
#, c-format
@@ -36,7 +36,7 @@ msgstr ""
#: ../move/move.pm:448 ../move/move.pm:460
#, c-format
-msgid "Key isn't writable"
+msgid "Key is not writable"
msgstr "密钥盘写保护"
#: ../move/move.pm:450
@@ -44,7 +44,7 @@ msgstr "密钥盘写保护"
msgid ""
"The USB key seems to have write protection enabled. Please\n"
"unplug it, remove write protection, and then plug it again."
-msgstr "USB 密钥盘好像启用了写保护。请拔出该密钥盘,去掉写保护,然后重新插入。"
+msgstr "USB 密钥盘好像启用了写保护。请拔出该密钥盘, 去掉写保护, 然后重新插入。"
#: ../move/move.pm:452
#, c-format
@@ -59,20 +59,20 @@ msgstr "不使用 USB 密钥盘"
#: ../move/move.pm:462
#, c-format
msgid ""
-"The USB key seems to have write protection enabled, but we can't safely\n"
+"The USB key seems to have write protection enabled, but we can not safely\n"
"unplug it now.\n"
"\n"
"\n"
"Click the button to reboot the machine, unplug it, remove write protection,\n"
"plug the key again, and launch Mandrake Move again."
msgstr ""
-"USB 密钥盘好像启用了写保护,但是现在无法安全拔出该密钥盘。\n"
+"USB 密钥盘好像启用了写保护, 但是现在无法安全拔出该密钥盘。\n"
"\n"
"\n"
-"请单击按钮重新启动计算机,拔出该密钥盘之后,去掉写保护后再插入,\n"
+"请单击按钮重新启动计算机, 拔出该密钥盘之后, 去掉写保护后再插入, \n"
"然后再次调用 Mandrake Move。"
-#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1353
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1317
#, c-format
msgid "Reboot"
msgstr "重新启动"
@@ -80,7 +80,7 @@ msgstr "重新启动"
#: ../move/move.pm:473
#, c-format
msgid ""
-"Your USB key doesn't have any valid Windows (FAT) partitions.\n"
+"Your USB key does not have any valid Windows (FAT) partitions.\n"
"We need one to continue (beside, it's more standard so that you\n"
"will be able to move and access your files from machines\n"
"running Windows). Please plug in an USB key containing a\n"
@@ -92,18 +92,18 @@ msgid ""
"Operating System."
msgstr ""
"您的 USB 密钥盘中没有有效的 Windows(FAT) 分区。而要继续使用此系\n"
-"统,必须存在这样一个分区。除此以外,FAT 分区还更加标准,这样您就\n"
+"统, 必须存在这样一个分区。除此以外, FAT 分区还更加标准, 这样您就\n"
"能够从运行 Windows 的计算机中移动并访问您的文件了。请插入另外一\n"
"块含有 Windows 分区的 USB 密钥盘。\n"
"\n"
"\n"
-"没有 USB 密钥盘,您当然也可以继续 - 您仍然可以像普通的 Mandrake\n"
+"没有 USB 密钥盘, 您当然也可以继续 - 您仍然可以像普通的 Mandrake\n"
"操作系统一样使用 Mandrake Move。"
#: ../move/move.pm:483
#, c-format
msgid ""
-"We didn't detect any USB key on your system. If you\n"
+"We did not detect any USB key on your system. If you\n"
"plug in an USB key now, Mandrake Move will have the ability\n"
"to transparently save the data in your home directory and\n"
"system wide configuration, for next boot on this computer\n"
@@ -116,12 +116,12 @@ msgid ""
"Operating System."
msgstr ""
"我们没有在您的系统中检测到任何 USB 密钥盘。如果您现在插入一块这\n"
-"样的盘的话,Mandrake Move 将可以将您主目录和系统级配置中的数据透\n"
-"明的保存在该密钥盘中,以备下次启动此计算机之用。注意: 如果您刚刚\n"
-"插入了密钥盘,请在再次检测之前稍等几秒。\n"
+"样的盘的话, Mandrake Move 将可以将您主目录和系统级配置中的数据透\n"
+"明的保存在该密钥盘中, 以备下次启动此计算机之用。注意: 如果您刚刚\n"
+"插入了密钥盘, 请在再次检测之前稍等几秒。\n"
"\n"
"\n"
-"没有 USB 密钥盘,您当然也可以继续 - 您仍然可以像普通的 Mandrake\n"
+"没有 USB 密钥盘, 您当然也可以继续 - 您仍然可以像普通的 Mandrake\n"
"操作系统一样使用 Mandrake Move。"
#: ../move/move.pm:494
@@ -142,12 +142,12 @@ msgstr "设置 USB 密钥盘"
#: ../move/move.pm:517
#, c-format
msgid "Please wait, setting up system configuration files on USB key..."
-msgstr "请稍候,正在 USB 密钥盘上设置系统配置文件..."
+msgstr "请稍候, 正在 USB 密钥盘上设置系统配置文件..."
#: ../move/move.pm:546
#, c-format
msgid "Enter your user information, password will be used for screensaver"
-msgstr "请输入您的信息,密码将会用于屏幕保护程序"
+msgstr "请输入您的信息, 密码将会用于屏幕保护程序"
#: ../move/move.pm:556
#, c-format
@@ -157,61 +157,64 @@ msgstr "自动配置"
#: ../move/move.pm:556
#, c-format
msgid "Please wait, detecting and configuring devices..."
-msgstr "请稍候,正在检测并配置设备..."
+msgstr "请稍候, 正在检测并配置设备..."
#: ../move/move.pm:604 ../move/move.pm:660 ../move/move.pm:664
-#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:223
-#: diskdrake/interactive.pm:236 diskdrake/interactive.pm:377
-#: diskdrake/interactive.pm:392 diskdrake/interactive.pm:515
-#: diskdrake/interactive.pm:520 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:167
-#: install_steps.pm:82 install_steps_interactive.pm:38 interactive/http.pm:117
-#: interactive/http.pm:118 network/netconnect.pm:995 network/netconnect.pm:999
-#: network/netconnect.pm:1004 network/netconnect.pm:1045
-#: network/netconnect.pm:1049 network/netconnect.pm:1187
-#: network/netconnect.pm:1192 network/netconnect.pm:1210
-#: network/netconnect.pm:1393 printer/printerdrake.pm:238
+#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:227
+#: diskdrake/interactive.pm:240 diskdrake/interactive.pm:393
+#: diskdrake/interactive.pm:411 diskdrake/interactive.pm:541
+#: diskdrake/interactive.pm:546 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:183
+#: install_any.pm:1564 install_any.pm:1587 install_steps.pm:82
+#: install_steps_interactive.pm:38 interactive/http.pm:117
+#: interactive/http.pm:118 network/netconnect.pm:1037
+#: network/netconnect.pm:1041 network/netconnect.pm:1046
+#: network/netconnect.pm:1072 network/netconnect.pm:1141
+#: network/netconnect.pm:1145 network/netconnect.pm:1283
+#: network/netconnect.pm:1288 network/netconnect.pm:1306
+#: network/netconnect.pm:1491 printer/printerdrake.pm:238
#: printer/printerdrake.pm:245 printer/printerdrake.pm:270
#: printer/printerdrake.pm:416 printer/printerdrake.pm:421
#: printer/printerdrake.pm:434 printer/printerdrake.pm:444
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:1182
-#: printer/printerdrake.pm:1229 printer/printerdrake.pm:1266
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1314
-#: printer/printerdrake.pm:1328 printer/printerdrake.pm:1418
-#: printer/printerdrake.pm:1498 printer/printerdrake.pm:1502
-#: printer/printerdrake.pm:1506 printer/printerdrake.pm:1555
-#: printer/printerdrake.pm:1612 printer/printerdrake.pm:1616
-#: printer/printerdrake.pm:1630 printer/printerdrake.pm:1740
-#: printer/printerdrake.pm:1744 printer/printerdrake.pm:1781
-#: printer/printerdrake.pm:1846 printer/printerdrake.pm:1864
-#: printer/printerdrake.pm:1873 printer/printerdrake.pm:1882
-#: printer/printerdrake.pm:1893 printer/printerdrake.pm:1955
-#: printer/printerdrake.pm:2408 printer/printerdrake.pm:2672
-#: printer/printerdrake.pm:2678 printer/printerdrake.pm:3188
-#: printer/printerdrake.pm:3192 printer/printerdrake.pm:3196
-#: printer/printerdrake.pm:3606 printer/printerdrake.pm:3846
-#: printer/printerdrake.pm:3866 printer/printerdrake.pm:3942
-#: printer/printerdrake.pm:4007 printer/printerdrake.pm:4123
-#: standalone/drakTermServ:379 standalone/drakTermServ:731
-#: standalone/drakTermServ:738 standalone/drakTermServ:933
-#: standalone/drakTermServ:1403 standalone/drakTermServ:1408
-#: standalone/drakTermServ:1415 standalone/drakTermServ:1426
-#: standalone/drakTermServ:1447 standalone/drakauth:37
-#: standalone/drakbackup:512 standalone/drakbackup:626
-#: standalone/drakbackup:1128 standalone/drakbackup:1161
-#: standalone/drakbackup:1665 standalone/drakbackup:1821
-#: standalone/drakbackup:2416 standalone/drakbackup:4105
-#: standalone/drakbackup:4325 standalone/drakbug:235 standalone/drakbug:254
-#: standalone/drakbug:260 standalone/drakclock:125 standalone/drakconnect:648
-#: standalone/drakconnect:651 standalone/drakconnect:670
-#: standalone/drakfloppy:297 standalone/drakfloppy:301
-#: standalone/drakfloppy:307 standalone/drakfont:210 standalone/drakfont:223
-#: standalone/drakfont:259 standalone/drakfont:604 standalone/draksplash:21
-#: standalone/draksplash:501 standalone/drakxtv:107 standalone/logdrake:169
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:635
+#: printer/printerdrake.pm:1288 printer/printerdrake.pm:1335
+#: printer/printerdrake.pm:1372 printer/printerdrake.pm:1416
+#: printer/printerdrake.pm:1420 printer/printerdrake.pm:1434
+#: printer/printerdrake.pm:1524 printer/printerdrake.pm:1605
+#: printer/printerdrake.pm:1609 printer/printerdrake.pm:1613
+#: printer/printerdrake.pm:1662 printer/printerdrake.pm:1719
+#: printer/printerdrake.pm:1723 printer/printerdrake.pm:1737
+#: printer/printerdrake.pm:1848 printer/printerdrake.pm:1852
+#: printer/printerdrake.pm:1889 printer/printerdrake.pm:1957
+#: printer/printerdrake.pm:1975 printer/printerdrake.pm:1984
+#: printer/printerdrake.pm:1993 printer/printerdrake.pm:2004
+#: printer/printerdrake.pm:2066 printer/printerdrake.pm:2159
+#: printer/printerdrake.pm:2678 printer/printerdrake.pm:2949
+#: printer/printerdrake.pm:2955 printer/printerdrake.pm:3501
+#: printer/printerdrake.pm:3505 printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3965 printer/printerdrake.pm:4205
+#: printer/printerdrake.pm:4225 printer/printerdrake.pm:4301
+#: printer/printerdrake.pm:4366 printer/printerdrake.pm:4483
+#: standalone/drakTermServ:392 standalone/drakTermServ:753
+#: standalone/drakTermServ:760 standalone/drakTermServ:779
+#: standalone/drakTermServ:998 standalone/drakTermServ:1478
+#: standalone/drakTermServ:1483 standalone/drakTermServ:1490
+#: standalone/drakTermServ:1502 standalone/drakTermServ:1523
+#: standalone/drakauth:35 standalone/drakbackup:511 standalone/drakbackup:625
+#: standalone/drakbackup:1127 standalone/drakbackup:1160
+#: standalone/drakbackup:1671 standalone/drakbackup:1827
+#: standalone/drakbackup:2421 standalone/drakbackup:4110
+#: standalone/drakbackup:4330 standalone/drakbug:191 standalone/drakclock:124
+#: standalone/drakconnect:649 standalone/drakconnect:652
+#: standalone/drakconnect:671 standalone/drakfloppy:297
+#: standalone/drakfloppy:300 standalone/drakfloppy:306 standalone/drakfont:209
+#: standalone/drakfont:222 standalone/drakfont:258 standalone/drakfont:604
+#: standalone/draksplash:21 standalone/draksplash:501 standalone/drakxtv:107
+#: standalone/finish-install:39 standalone/logdrake:169
#: standalone/logdrake:437 standalone/logdrake:442 standalone/scannerdrake:59
-#: standalone/scannerdrake:196 standalone/scannerdrake:255
-#: standalone/scannerdrake:684 standalone/scannerdrake:695
-#: standalone/scannerdrake:834 standalone/scannerdrake:845
-#: standalone/scannerdrake:915 wizards.pm:95 wizards.pm:99 wizards.pm:121
+#: standalone/scannerdrake:202 standalone/scannerdrake:261
+#: standalone/scannerdrake:715 standalone/scannerdrake:726
+#: standalone/scannerdrake:865 standalone/scannerdrake:876
+#: standalone/scannerdrake:946 wizards.pm:95 wizards.pm:99 wizards.pm:121
#, c-format
msgid "Error"
msgstr "错误"
@@ -219,10 +222,10 @@ msgstr "错误"
#: ../move/move.pm:605 install_steps.pm:83
#, c-format
msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
+"An error occurred, but I do not know how to handle it nicely.\n"
"Continue at your own risk."
msgstr ""
-"发生错误,可是我不知道该怎样处理才好。\n"
+"发生错误, 可是我不知道该怎样处理才好。\n"
"继续下去会怎样就看您的运气了。"
#: ../move/move.pm:660 install_steps_interactive.pm:38
@@ -255,12 +258,12 @@ msgstr ""
"%s\n"
"\n"
"这可能是 USB 密钥盘中的系统配置文件已经损坏。此时只需删除这些文\n"
-"件,然后重新启动 Mandrake Move 即可解决此问题。要完成这一操作,\n"
+"件, 然后重新启动 Mandrake Move 即可解决此问题。要完成这一操作, \n"
"只需点击下面的按钮。\n"
"\n"
"\n"
-"您也可能想要重新启动后拔出 USB 密钥盘,或者在其它操作系统中检查\n"
-"其中的内容,甚至想要看看 #3 和 #4 控制台中的日志文件,以便试着检\n"
+"您也可能想要重新启动后拔出 USB 密钥盘, 或者在其它操作系统中检查\n"
+"其中的内容, 甚至想要看看 #3 和 #4 控制台中的日志文件, 以便试着检\n"
"查究竟是哪里出了问题。"
#: ../move/move.pm:681
@@ -289,8 +292,8 @@ msgid "No CDROM support"
msgstr "无 CDROM 支持"
#: ../move/tree/mdk_totem:76 diskdrake/hd_gtk.pm:95
-#: diskdrake/interactive.pm:1005 diskdrake/interactive.pm:1015
-#: diskdrake/interactive.pm:1068
+#: diskdrake/interactive.pm:1020 diskdrake/interactive.pm:1030
+#: diskdrake/interactive.pm:1083
#, c-format
msgid "Read carefully!"
msgstr "请仔细阅读!"
@@ -298,10 +301,10 @@ msgstr "请仔细阅读!"
#: ../move/tree/mdk_totem:77
#, c-format
msgid ""
-"You can't use another CDROM when the following programs are running: \n"
+"You can not use another CDROM when the following programs are running: \n"
"%s"
msgstr ""
-"在下列程序运行的过程中,您无法使用其它的 CDROM: \n"
+"在下列程序运行的过程中, 您无法使用其它的 CDROM: \n"
"%s"
#: ../move/tree/mdk_totem:101
@@ -354,104 +357,104 @@ msgstr "32 MB"
msgid "64 MB or more"
msgstr "64 MB 或更多"
-#: Xconfig/card.pm:155
+#: Xconfig/card.pm:159
#, c-format
msgid "X server"
msgstr "X 服务器"
-#: Xconfig/card.pm:156
+#: Xconfig/card.pm:160
#, c-format
msgid "Choose an X server"
msgstr "选择 X 服务器"
-#: Xconfig/card.pm:188
+#: Xconfig/card.pm:192
#, c-format
msgid "Multi-head configuration"
msgstr "多显示器配置"
-#: Xconfig/card.pm:189
+#: Xconfig/card.pm:193
#, c-format
msgid ""
"Your system supports multiple head configuration.\n"
"What do you want to do?"
msgstr ""
"您的系统支持多显示器。\n"
-"是否进行设置?"
+"是否进行设置?"
-#: Xconfig/card.pm:255
+#: Xconfig/card.pm:262
#, c-format
-msgid "Can't install Xorg package: %s"
+msgid "Can not install Xorg package: %s"
msgstr "无法安装 Xorg 软件包: %s"
-#: Xconfig/card.pm:265
+#: Xconfig/card.pm:272
#, c-format
msgid "Select the memory size of your graphics card"
msgstr "请选择您显示卡上内存的大小"
-#: Xconfig/card.pm:352
+#: Xconfig/card.pm:349
#, c-format
msgid "Xorg configuration"
msgstr "Xorg 配置"
-#: Xconfig/card.pm:354
+#: Xconfig/card.pm:351
#, c-format
msgid "Which configuration of Xorg do you want to have?"
-msgstr "您希望拥有哪个 Xorg 配置?"
+msgstr "您希望拥有哪个 Xorg 配置?"
-#: Xconfig/card.pm:387
+#: Xconfig/card.pm:384
#, c-format
msgid "Configure all heads independently"
msgstr "独立配置所有头"
-#: Xconfig/card.pm:388
+#: Xconfig/card.pm:385
#, c-format
msgid "Use Xinerama extension"
msgstr "使用 Xinerama 扩展"
-#: Xconfig/card.pm:393
+#: Xconfig/card.pm:390
#, c-format
msgid "Configure only card \"%s\"%s"
msgstr "只配置“%s”%s 卡"
-#: Xconfig/card.pm:405 Xconfig/various.pm:23
+#: Xconfig/card.pm:402 Xconfig/various.pm:23
#, c-format
msgid "Xorg %s"
msgstr "Xorg %s"
-#: Xconfig/card.pm:412 Xconfig/various.pm:22
+#: Xconfig/card.pm:409 Xconfig/various.pm:22
#, c-format
msgid "Xorg %s with 3D hardware acceleration"
msgstr "Xorg %s 带有硬件 3D 加速的支持"
-#: Xconfig/card.pm:414
+#: Xconfig/card.pm:411
#, c-format
msgid "Your card can have 3D hardware acceleration support with Xorg %s."
-msgstr "使用 Xorg %s,您的显示卡可以得到 3D 硬件加速支持。"
+msgstr "使用 Xorg %s, 您的显示卡可以得到 3D 硬件加速支持。"
-#: Xconfig/card.pm:420
+#: Xconfig/card.pm:417
#, c-format
msgid "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
msgstr "Xorg %s 带有试验阶段的 3D 硬件加速支持"
-#: Xconfig/card.pm:422
+#: Xconfig/card.pm:419
#, c-format
msgid ""
"Your card can have 3D hardware acceleration support with Xorg %s,\n"
"NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
msgstr ""
-"使用 Xorg %s,您的显示卡可以得到 3D 硬件加速支持。\n"
-"注意这是试验阶段的支持,它可能会使您的电脑失去反应。"
+"使用 Xorg %s, 您的显示卡可以得到 3D 硬件加速支持。\n"
+"注意这是试验阶段的支持, 它可能会使您的电脑失去反应。"
-#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:912
+#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:117 any.pm:914
#, c-format
msgid "Custom"
msgstr "自定义"
#: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14
-#: install_steps_interactive.pm:88 printer/printerdrake.pm:712
-#: printer/printerdrake.pm:3937 printer/printerdrake.pm:4382
-#: standalone/draksplash:120 standalone/harddrake2:265 standalone/logdrake:174
-#: standalone/net_applet:160 standalone/scannerdrake:446
+#: install_steps_interactive.pm:86 printer/printerdrake.pm:737
+#: printer/printerdrake.pm:4296 printer/printerdrake.pm:4742
+#: standalone/draksplash:120 standalone/logdrake:174 standalone/net_applet:183
+#: standalone/scannerdrake:477
#, c-format
msgid "Quit"
msgstr "退出"
@@ -461,12 +464,12 @@ msgstr "退出"
msgid "Graphic Card"
msgstr "显示卡"
-#: Xconfig/main.pm:120 Xconfig/monitor.pm:110
+#: Xconfig/main.pm:120 Xconfig/monitor.pm:111
#, c-format
msgid "Monitor"
msgstr "显示器"
-#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:222
+#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:221
#, c-format
msgid "Resolution"
msgstr "分辨率"
@@ -476,19 +479,19 @@ msgstr "分辨率"
msgid "Test"
msgstr "测试"
-#: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:418
+#: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:437
#: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:80
-#: standalone/drakfont:494 standalone/drakfont:556 standalone/harddrake2:262
+#: standalone/drakfont:493 standalone/drakfont:555
#, c-format
msgid "Options"
msgstr "选项"
-#: Xconfig/main.pm:167
+#: Xconfig/main.pm:168
#, c-format
msgid "Your Xorg configuration file is broken, we will ignore it."
-msgstr "您的 Xorg 配置文件已经损坏,我们将会忽略该文件。"
+msgstr "您的 Xorg 配置文件已经损坏, 我们将会忽略该文件。"
-#: Xconfig/main.pm:184
+#: Xconfig/main.pm:186
#, c-format
msgid ""
"Keep the changes?\n"
@@ -496,43 +499,43 @@ msgid ""
"\n"
"%s"
msgstr ""
-"保存修改吗?\n"
+"保存修改吗?\n"
"当前配置是: \n"
"\n"
"%s"
-#: Xconfig/monitor.pm:111
+#: Xconfig/monitor.pm:112
#, c-format
msgid "Choose a monitor for head #%d"
msgstr "选择显示头 %d 的显示器"
-#: Xconfig/monitor.pm:111
+#: Xconfig/monitor.pm:112
#, c-format
msgid "Choose a monitor"
msgstr "选择显示器"
-#: Xconfig/monitor.pm:117
+#: Xconfig/monitor.pm:118
#, c-format
msgid "Plug'n Play"
msgstr "即插即用"
-#: Xconfig/monitor.pm:118 mouse.pm:49
+#: Xconfig/monitor.pm:119 mouse.pm:49
#, c-format
msgid "Generic"
msgstr "通用"
-#: Xconfig/monitor.pm:119 standalone/drakconnect:567 standalone/harddrake2:49
-#: standalone/harddrake2:83
+#: Xconfig/monitor.pm:120 standalone/drakconnect:569 standalone/harddrake2:52
+#: standalone/harddrake2:86
#, c-format
msgid "Vendor"
msgstr "厂家"
-#: Xconfig/monitor.pm:129
+#: Xconfig/monitor.pm:130
#, c-format
msgid "Plug'n Play probing failed. Please select the correct monitor"
msgstr "即插即用检测失败。请明确选择一个显示器"
-#: Xconfig/monitor.pm:134
+#: Xconfig/monitor.pm:135
#, c-format
msgid ""
"The two critical parameters are the vertical refresh rate, which is the "
@@ -547,19 +550,19 @@ msgid ""
" If in doubt, choose a conservative setting."
msgstr ""
"两个关键的参数: \n"
-"(1) 垂直刷新率,用于设置屏幕每秒钟更新的次数;\n"
-"(2) 水平刷新率,用于设置显示扫描线的速率。\n"
+"(1) 垂直刷新率, 用于设置屏幕每秒钟更新的次数;\n"
+"(2) 水平刷新率, 用于设置显示扫描线的速率。\n"
"\n"
"千万小心!不要把这些同步范围设定得超过您的显示器的能力: \n"
"不恰当的设置可能会损害您的显示器!\n"
-"所以没把握时,您可以选择保守的设置。"
+"所以没把握时, 您可以选择保守的设置。"
-#: Xconfig/monitor.pm:141
+#: Xconfig/monitor.pm:142
#, c-format
msgid "Horizontal refresh rate"
msgstr "水平刷新率"
-#: Xconfig/monitor.pm:142
+#: Xconfig/monitor.pm:143
#, c-format
msgid "Vertical refresh rate"
msgstr "垂直刷新率"
@@ -584,7 +587,7 @@ msgstr "6 万 5 千色(16 位)"
msgid "16 million colors (24 bits)"
msgstr "1 千 6 百万色(24 位)"
-#: Xconfig/resolution_and_depth.pm:135
+#: Xconfig/resolution_and_depth.pm:133
#, c-format
msgid "Resolutions"
msgstr "分辨率"
@@ -599,45 +602,45 @@ msgstr "选择屏幕分辨率以及颜色深度"
msgid "Graphics card: %s"
msgstr "显示卡: %s"
-#: Xconfig/resolution_and_depth.pm:284 interactive.pm:403
-#: interactive/gtk.pm:766 interactive/http.pm:103 interactive/http.pm:156
+#: Xconfig/resolution_and_depth.pm:285 interactive.pm:424
+#: interactive/gtk.pm:768 interactive/http.pm:103 interactive/http.pm:156
#: interactive/newt.pm:317 interactive/newt.pm:419 interactive/stdio.pm:39
#: interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172
-#: standalone/drakTermServ:201 standalone/drakTermServ:474
-#: standalone/drakbackup:3962 standalone/drakbackup:4022
-#: standalone/drakbackup:4066 standalone/drakconnect:165
-#: standalone/drakconnect:850 standalone/drakconnect:937
-#: standalone/drakconnect:1036 standalone/drakfont:577 standalone/drakroam:388
-#: standalone/drakups:208 standalone/net_monitor:345 ugtk2.pm:417 ugtk2.pm:515
-#: ugtk2.pm:1122 ugtk2.pm:1145
+#: standalone/drakTermServ:199 standalone/drakTermServ:490
+#: standalone/drakbackup:3967 standalone/drakbackup:4027
+#: standalone/drakbackup:4071 standalone/drakconnect:165
+#: standalone/drakconnect:849 standalone/drakconnect:936
+#: standalone/drakconnect:1035 standalone/drakfont:576 standalone/drakroam:388
+#: standalone/drakups:208 standalone/net_monitor:344 ugtk2.pm:409 ugtk2.pm:506
+#: ugtk2.pm:900 ugtk2.pm:923
#, c-format
msgid "Ok"
msgstr "确定"
-#: Xconfig/resolution_and_depth.pm:284 diskdrake/smbnfs_gtk.pm:81 help.pm:89
-#: help.pm:444 install_steps_gtk.pm:458 install_steps_interactive.pm:412
-#: install_steps_interactive.pm:840 interactive.pm:404 interactive/gtk.pm:770
+#: Xconfig/resolution_and_depth.pm:285 diskdrake/smbnfs_gtk.pm:81 help.pm:89
+#: help.pm:444 install_steps_gtk.pm:480 install_steps_interactive.pm:422
+#: install_steps_interactive.pm:826 interactive.pm:425 interactive/gtk.pm:772
#: interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:316
#: interactive/newt.pm:423 interactive/stdio.pm:39 interactive/stdio.pm:142
-#: interactive/stdio.pm:176 printer/printerdrake.pm:3266
-#: standalone/drakautoinst:217 standalone/drakbackup:3888
-#: standalone/drakbackup:3892 standalone/drakbackup:3950
-#: standalone/drakconnect:164 standalone/drakconnect:935
-#: standalone/drakconnect:1035 standalone/drakfont:667 standalone/drakfont:744
-#: standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:344
-#: ugtk2.pm:411 ugtk2.pm:513 ugtk2.pm:522 ugtk2.pm:1122
+#: interactive/stdio.pm:176 printer/printerdrake.pm:3579
+#: standalone/drakautoinst:217 standalone/drakbackup:3893
+#: standalone/drakbackup:3897 standalone/drakbackup:3955
+#: standalone/drakconnect:164 standalone/drakconnect:934
+#: standalone/drakconnect:1034 standalone/drakfont:668 standalone/drakfont:745
+#: standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:343
+#: ugtk2.pm:403 ugtk2.pm:504 ugtk2.pm:513 ugtk2.pm:900
#, c-format
msgid "Cancel"
msgstr "取消"
-#: Xconfig/resolution_and_depth.pm:284 diskdrake/hd_gtk.pm:153
-#: install_steps_gtk.pm:239 install_steps_gtk.pm:644 interactive.pm:498
-#: interactive/gtk.pm:628 interactive/gtk.pm:630 standalone/drakTermServ:280
-#: standalone/drakbackup:3884 standalone/drakbug:128
+#: Xconfig/resolution_and_depth.pm:285 diskdrake/hd_gtk.pm:153
+#: install_steps_gtk.pm:228 install_steps_gtk.pm:629 interactive.pm:519
+#: interactive/gtk.pm:638 interactive/gtk.pm:640 standalone/drakTermServ:284
+#: standalone/drakbackup:3889 standalone/drakbug:104
#: standalone/drakconnect:160 standalone/drakconnect:245
-#: standalone/drakfont:512 standalone/drakperm:134 standalone/draksec:337
-#: standalone/draksec:339 standalone/draksec:357 standalone/draksec:359
-#: standalone/harddrake2:261 ugtk2.pm:1235 ugtk2.pm:1236
+#: standalone/drakfont:511 standalone/drakperm:134 standalone/draksec:336
+#: standalone/draksec:338 standalone/draksec:356 standalone/draksec:358
+#: ugtk2.pm:1031 ugtk2.pm:1032
#, c-format
msgid "Help"
msgstr "帮助"
@@ -650,7 +653,7 @@ msgstr "测试配置"
#: Xconfig/test.pm:31
#, c-format
msgid "Do you want to test the configuration?"
-msgstr "您想要测试您的配置吗?"
+msgstr "您想要测试您的配置吗?"
#: Xconfig/test.pm:31
#, c-format
@@ -664,24 +667,24 @@ msgid ""
"%s\n"
"Try to change some parameters"
msgstr ""
-"发生了错误: \n"
+"发生了错误:\n"
"%s\n"
"试着更改某些参数"
-#: Xconfig/test.pm:133
+#: Xconfig/test.pm:129
#, c-format
msgid "Leaving in %d seconds"
msgstr "即将于 %d 秒后离开"
-#: Xconfig/test.pm:133
+#: Xconfig/test.pm:129
#, c-format
msgid "Is this the correct setting?"
-msgstr "这样正确吗?"
+msgstr "设置正确吗?"
#: Xconfig/various.pm:29
#, c-format
msgid "Keyboard layout: %s\n"
-msgstr "键盘的布局: %s\n"
+msgstr "键盘布局: %s\n"
#: Xconfig/various.pm:30
#, c-format
@@ -746,7 +749,7 @@ msgid ""
"Would you like Xorg to start when you reboot?"
msgstr ""
"我可以设定您的电脑在开机时自动进入图形界面(Xorg)。\n"
-"您希望这么做吗?"
+"您希望这么做吗?"
#: Xconfig/various.pm:87
#, c-format
@@ -763,30 +766,30 @@ msgstr ""
"看来您的图形卡拥有电视输出接口。\n"
"可以配置它用帧缓冲器工作。\n"
"\n"
-"您必须先把您的电视和您的图形卡连接好,然后启动您的电脑。\n"
+"您必须先把您的电视和您的图形卡连接好, 然后启动您的电脑。\n"
"然后在启动引导程序中选择“TVout”条目\n"
"\n"
-"您是否要使用此特性?"
+"您是否要使用此特性?"
#: Xconfig/various.pm:99
#, c-format
msgid "What norm is your TV using?"
-msgstr "您的电视信号是什么制式?"
+msgstr "您的电视信号是什么制式?"
-#: any.pm:116 harddrake/sound.pm:170 interactive.pm:441 standalone/drakbug:227
-#: standalone/drakconnect:167 standalone/drakconnect:611 standalone/draksec:68
-#: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:211
-#: standalone/service_harddrake:199
+#: any.pm:140 harddrake/sound.pm:191 install_any.pm:652 interactive.pm:462
+#: standalone/drakconnect:167 standalone/drakconnect:613 standalone/draksec:68
+#: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:231
+#: standalone/service_harddrake:204
#, c-format
msgid "Please wait"
msgstr "请稍候"
-#: any.pm:116
+#: any.pm:140
#, c-format
msgid "Bootloader installation in progress"
msgstr "启动引导程序安装中"
-#: any.pm:127
+#: any.pm:151
#, c-format
msgid ""
"LILO wants to assign a new Volume ID to drive %s. However, changing\n"
@@ -796,34 +799,34 @@ msgid ""
"\n"
"Assign a new Volume ID?"
msgstr ""
-"LILO 想要为驱动器 %s 指定新卷 ID。但是,更改 Windows NT、2000 或 XP 启动盘的"
-"卷 ID 将会导致 Windows 的严重错误。这对于 Windows 95/98,或者是Windows NT 数"
-"据磁盘不会造成任何问题。\n"
+"LILO 想要为驱动器 %s 指定新卷 ID。但是, 更改 Windows NT、2000 或 XP 启动盘的"
+"卷 ID 将会导致 Windows 的严重错误。这对于 Windows 95/98, 或者是 Windows NT 的"
+"数据磁盘不会造成任何问题。\n"
"\n"
-"要指定新卷 ID 吗?"
+"要指定新卷 ID 吗?"
-#: any.pm:138
+#: any.pm:162
#, c-format
msgid "Installation of bootloader failed. The following error occurred:"
-msgstr "安装系统引导程序失败,出现下列错误: "
+msgstr "安装系统引导程序失败。出现下列错误:"
-#: any.pm:144
+#: any.pm:168
#, c-format
msgid ""
"You may need to change your Open Firmware boot-device to\n"
-" enable the bootloader. If you don't see the bootloader prompt at\n"
+" enable the bootloader. If you do not see the bootloader prompt at\n"
" reboot, hold down Command-Option-O-F at reboot and enter:\n"
" setenv boot-device %s,\\\\:tbxi\n"
" Then type: shut-down\n"
"At your next boot you should see the bootloader prompt."
msgstr ""
"您可能得改变开放固件引导设备来使能启动引导程序。\n"
-"如果开机时没有引导程序提示,按 Command-Option-O-F 然后输入: \n"
+"如果开机时没有引导程序提示, 按 Command-Option-O-F 然后输入: \n"
" setenv boot-device %s,\\\\:tbxi\n"
" 然后输入: shut-down\n"
"您将在下次开机时看到引导程序提示。"
-#: any.pm:181
+#: any.pm:206
#, c-format
msgid ""
"You decided to install the bootloader on a partition.\n"
@@ -836,261 +839,259 @@ msgstr ""
"那么在用于启动的硬盘上您应该已经有一个安装启动引导程序(例如: System "
"Commander)。\n"
"\n"
-"您要用哪个硬盘启动?"
+"您要用哪个硬盘启动?"
-#: any.pm:204 help.pm:739
+#: any.pm:229 help.pm:739
#, c-format
msgid "First sector of drive (MBR)"
msgstr "驱动器的第一扇区(MBR)"
-#: any.pm:205
+#: any.pm:230
#, c-format
msgid "First sector of the root partition"
msgstr "根分区的第一扇区"
-#: any.pm:207
+#: any.pm:232
#, c-format
msgid "On Floppy"
msgstr "在软盘上"
-#: any.pm:209 help.pm:739 printer/printerdrake.pm:3603
+#: any.pm:234 help.pm:739 printer/printerdrake.pm:3962
#, c-format
msgid "Skip"
msgstr "跳过"
-#: any.pm:213
+#: any.pm:238
#, c-format
msgid "LILO/grub Installation"
msgstr "LILO/grub 安装"
-#: any.pm:214
+#: any.pm:239
#, c-format
msgid "Where do you want to install the bootloader?"
-msgstr "您希望启动引导程序安装到哪里?"
+msgstr "您希望启动引导程序安装到哪里?"
-#: any.pm:239 standalone/drakboot:307
+#: any.pm:264 standalone/drakboot:307
#, c-format
msgid "Boot Style Configuration"
msgstr "启动风格配置"
-#: any.pm:241 any.pm:275
+#: any.pm:266 any.pm:298
#, c-format
msgid "Bootloader main options"
msgstr "引导程序的主要选项"
-#: any.pm:245
+#: any.pm:270
#, c-format
msgid "Give the ram size in MB"
msgstr "以兆为单位给出内存大小"
-#: any.pm:247
+#: any.pm:272
#, c-format
msgid ""
"Option ``Restrict command line options'' is of no use without a password"
msgstr "没有密码不能使用“限定命令行选项”"
-#: any.pm:248 any.pm:586 install_steps_interactive.pm:1215
+#: any.pm:273 any.pm:606 authentication.pm:176
#, c-format
msgid "The passwords do not match"
msgstr "两次密码不符"
-#: any.pm:248 any.pm:586 diskdrake/interactive.pm:1261
-#: install_steps_interactive.pm:1215
+#: any.pm:273 any.pm:606 authentication.pm:176 diskdrake/interactive.pm:1270
#, c-format
msgid "Please try again"
msgstr "请再试一次"
-#: any.pm:253 any.pm:278
+#: any.pm:278 any.pm:301
#, c-format
msgid "Bootloader to use"
msgstr "要使用的引导程序"
-#: any.pm:255 any.pm:280
+#: any.pm:280 any.pm:303
#, c-format
msgid "Boot device"
msgstr "启动设备"
-#: any.pm:257
+#: any.pm:282
#, c-format
msgid "Delay before booting default image"
msgstr "启动默认映像前的延迟"
-#: any.pm:258
+#: any.pm:283
#, c-format
msgid "Enable ACPI"
msgstr "启用 ACPI"
-#: any.pm:260
+#: any.pm:285
#, c-format
msgid "Force no APIC"
msgstr "强制无 APIC"
-#: any.pm:262
+#: any.pm:287
#, c-format
msgid "Force No Local APIC"
msgstr "强制无本地 APIC"
-#: any.pm:264 any.pm:613 diskdrake/smbnfs_gtk.pm:180
-#: install_steps_interactive.pm:1220 network/netconnect.pm:595
-#: printer/printerdrake.pm:1489 printer/printerdrake.pm:1609
-#: standalone/drakbackup:1647 standalone/drakbackup:3490
-#: standalone/drakups:295
+#: any.pm:289 any.pm:633 authentication.pm:181 diskdrake/smbnfs_gtk.pm:180
+#: network/netconnect.pm:633 printer/printerdrake.pm:1596
+#: printer/printerdrake.pm:1716 standalone/drakbackup:1653
+#: standalone/drakbackup:3495 standalone/drakups:295
#, c-format
msgid "Password"
msgstr "密码"
-#: any.pm:265 any.pm:614 install_steps_interactive.pm:1221
+#: any.pm:290 any.pm:634 authentication.pm:182
#, c-format
msgid "Password (again)"
msgstr "密码(请再输一次)"
-#: any.pm:266
+#: any.pm:291
#, c-format
msgid "Restrict command line options"
msgstr "限制命令行选项"
-#: any.pm:266
+#: any.pm:291
#, c-format
msgid "restrict"
msgstr "限制"
-#: any.pm:268
+#: any.pm:293
#, c-format
msgid "Clean /tmp at each boot"
msgstr "每次启动时清除 /tmp"
-#: any.pm:269
+#: any.pm:294
#, c-format
msgid "Precise RAM size if needed (found %d MB)"
msgstr "精确的内存大小(找到 %d MB)"
-#: any.pm:279
+#: any.pm:302
#, c-format
msgid "Init Message"
msgstr "初始信息"
-#: any.pm:281
+#: any.pm:304
#, c-format
msgid "Open Firmware Delay"
msgstr "开放固件延迟"
-#: any.pm:282
+#: any.pm:305
#, c-format
msgid "Kernel Boot Timeout"
msgstr "核心启动超时"
-#: any.pm:283
+#: any.pm:306
#, c-format
msgid "Enable CD Boot?"
-msgstr "允许 CD 启动?"
+msgstr "允许 CD 启动?"
-#: any.pm:284
+#: any.pm:307
#, c-format
msgid "Enable OF Boot?"
-msgstr "启用 OF 启动?"
+msgstr "启用 OF 启动?"
-#: any.pm:285
+#: any.pm:308
#, c-format
msgid "Default OS?"
-msgstr "默认操作系统?"
+msgstr "默认操作系统?"
-#: any.pm:338
+#: any.pm:361
#, c-format
msgid "Image"
msgstr "映像"
-#: any.pm:339 any.pm:349
+#: any.pm:362 any.pm:372
#, c-format
msgid "Root"
msgstr "根目录"
-#: any.pm:340 any.pm:362
+#: any.pm:363 any.pm:385
#, c-format
msgid "Append"
msgstr "追加"
-#: any.pm:342 standalone/drakboot:309 standalone/drakboot:313
+#: any.pm:365 standalone/drakboot:309 standalone/drakboot:313
#, c-format
msgid "Video mode"
msgstr "显示模式"
-#: any.pm:344
+#: any.pm:367
#, c-format
msgid "Initrd"
msgstr "Initrd"
-#: any.pm:345
+#: any.pm:368
#, c-format
msgid "Network profile"
msgstr "网络配置文件"
-#: any.pm:354 any.pm:359 any.pm:361
+#: any.pm:377 any.pm:382 any.pm:384
#, c-format
msgid "Label"
msgstr "标签"
-#: any.pm:356 any.pm:366 harddrake/v4l.pm:275 standalone/drakfloppy:84
+#: any.pm:379 any.pm:389 harddrake/v4l.pm:275 standalone/drakfloppy:84
#: standalone/drakfloppy:90 standalone/draksec:52
#, c-format
msgid "Default"
msgstr "默认"
-#: any.pm:363
+#: any.pm:386
#, c-format
msgid "Initrd-size"
msgstr "Initrd 大小"
-#: any.pm:365
+#: any.pm:388
#, c-format
msgid "NoVideo"
msgstr "无视频"
-#: any.pm:376
+#: any.pm:399
#, c-format
msgid "Empty label not allowed"
msgstr "标签不能为空"
-#: any.pm:377
+#: any.pm:400
#, c-format
msgid "You must specify a kernel image"
msgstr "您必须指定一个内核映像"
-#: any.pm:377
+#: any.pm:400
#, c-format
msgid "You must specify a root partition"
msgstr "您必须指定根目录所在分区"
-#: any.pm:378
+#: any.pm:401
#, c-format
msgid "This label is already used"
msgstr "这个名字已经被使用"
-#: any.pm:392
+#: any.pm:415
#, c-format
msgid "Which type of entry do you want to add?"
-msgstr "要添加的条目是什么类型?"
+msgstr "要添加的条目是什么类型?"
-#: any.pm:393
+#: any.pm:416
#, c-format
msgid "Linux"
msgstr "Linux"
-#: any.pm:393
+#: any.pm:416
#, c-format
msgid "Other OS (SunOS...)"
msgstr "其它操作系统(SunOS...)"
-#: any.pm:394
+#: any.pm:417
#, c-format
msgid "Other OS (MacOS...)"
msgstr "其它操作系统(MacOS...)"
-#: any.pm:394
+#: any.pm:417
#, c-format
msgid "Other OS (Windows...)"
msgstr "其它操作系统(Windows...)"
-#: any.pm:422
+#: any.pm:445
#, c-format
msgid ""
"Here are the entries on your boot menu so far.\n"
@@ -1099,152 +1100,152 @@ msgstr ""
"引导菜单中现有下列条目。\n"
"您可以创建额外的条目或是更改已存在的条目。"
-#: any.pm:572
+#: any.pm:592
#, c-format
msgid "access to X programs"
msgstr "允许使用 X 应用程序"
-#: any.pm:573
+#: any.pm:593
#, c-format
msgid "access to rpm tools"
msgstr "允许使用 rpm 工具"
-#: any.pm:574
+#: any.pm:594
#, c-format
msgid "allow \"su\""
msgstr "允许使用“su”指令"
-#: any.pm:575
+#: any.pm:595
#, c-format
msgid "access to administrative files"
msgstr "允许访问系统设置文件"
-#: any.pm:576
+#: any.pm:596
#, c-format
msgid "access to network tools"
msgstr "允许使用网络工具"
-#: any.pm:577
+#: any.pm:597
#, c-format
msgid "access to compilation tools"
msgstr "允许使用编译工具"
-#: any.pm:582
+#: any.pm:602
#, c-format
msgid "(already added %s)"
msgstr "(已经添加了 %s)"
-#: any.pm:587
+#: any.pm:607
#, c-format
msgid "This password is too simple"
msgstr "密码太简单"
-#: any.pm:588
+#: any.pm:608
#, c-format
msgid "Please give a user name"
msgstr "请给出用户名"
-#: any.pm:589
+#: any.pm:609
#, c-format
msgid ""
"The user name must contain only lower cased letters, numbers, `-' and `_'"
-msgstr "用户名只能有小写字母、数字、“-”和“_”"
+msgstr "用户名只能包含小写字母、数字、“-”和“_”"
-#: any.pm:590
+#: any.pm:610
#, c-format
msgid "The user name is too long"
msgstr "该用户名太长"
-#: any.pm:591
+#: any.pm:611
#, c-format
msgid "This user name has already been added"
msgstr "该用户名已经存在"
-#: any.pm:595
+#: any.pm:615
#, c-format
msgid "Add user"
msgstr "添加用户"
-#: any.pm:596
+#: any.pm:616
#, c-format
msgid ""
"Enter a user\n"
"%s"
msgstr ""
-"请输入一个用户名\n"
+"输入一个用户名\n"
"%s"
-#: any.pm:599 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157
+#: any.pm:619 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157
#: diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:82 help.pm:530
#: interactive/http.pm:151 printer/printerdrake.pm:191
-#: printer/printerdrake.pm:376 printer/printerdrake.pm:4382
-#: standalone/drakbackup:2703 standalone/scannerdrake:637
-#: standalone/scannerdrake:787
+#: printer/printerdrake.pm:376 printer/printerdrake.pm:4742
+#: standalone/drakbackup:2708 standalone/scannerdrake:668
+#: standalone/scannerdrake:818
#, c-format
msgid "Done"
msgstr "完成"
-#: any.pm:600 help.pm:51
+#: any.pm:620 help.pm:51
#, c-format
msgid "Accept user"
-msgstr "接受该用户"
+msgstr "接受用户"
-#: any.pm:611
+#: any.pm:631
#, c-format
msgid "Real name"
msgstr "真实姓名"
-#: any.pm:612 standalone/drakbackup:1642
+#: any.pm:632 standalone/drakbackup:1648
#, c-format
msgid "Login name"
msgstr "登录名"
-#: any.pm:615
+#: any.pm:635
#, c-format
msgid "Shell"
msgstr "Shell"
-#: any.pm:617
+#: any.pm:637
#, c-format
msgid "Icon"
msgstr "图标"
-#: any.pm:664 security/l10n.pm:14
+#: any.pm:684 security/l10n.pm:14
#, c-format
msgid "Autologin"
msgstr "自动登录"
-#: any.pm:665
+#: any.pm:685
#, c-format
msgid "I can set up your computer to automatically log on one user."
msgstr "您可在此设定启动时自动以某用户的身份登入系统。"
-#: any.pm:666 help.pm:51
+#: any.pm:686 help.pm:51
#, c-format
msgid "Do you want to use this feature?"
-msgstr "您要使用此特性吗?"
+msgstr "您要使用此特性吗?"
-#: any.pm:667
+#: any.pm:687
#, c-format
msgid "Choose the default user:"
-msgstr "选择默认的用户: "
+msgstr "选择默认的用户:"
-#: any.pm:668
+#: any.pm:688
#, c-format
msgid "Choose the window manager to run:"
-msgstr "选择要运行的窗口管理程序: "
+msgstr "选择要运行的窗口管理程序:"
-#: any.pm:680
+#: any.pm:700
#, c-format
msgid "Please choose a language to use."
msgstr "请选择要使用的语言。"
-#: any.pm:681
+#: any.pm:701
#, c-format
msgid "Language choice"
msgstr "语言选择"
-#: any.pm:707
+#: any.pm:727
#, c-format
msgid ""
"Mandrakelinux can support multiple languages. Select\n"
@@ -1254,57 +1255,59 @@ msgstr ""
"Mandrakelinux 可以支持多种语言。请选择您想要安装的语言。\n"
"安装完成并重新启动系统后它们就可以使用。"
-#: any.pm:725 help.pm:647
+#: any.pm:746 help.pm:647
#, c-format
msgid "Use Unicode by default"
msgstr "默认使用 Unicode"
-#: any.pm:726 help.pm:647
+#: any.pm:747 help.pm:647
#, c-format
msgid "All languages"
msgstr "全部语言"
-#: any.pm:765 help.pm:566 help.pm:855 install_steps_interactive.pm:960
+#: any.pm:786 help.pm:566 help.pm:855 install_steps_interactive.pm:946
#, c-format
msgid "Country / Region"
msgstr "国家/地区"
-#: any.pm:766
+#: any.pm:787
#, c-format
msgid "Please choose your country."
msgstr "请选择您的国家/地区。"
-#: any.pm:768
+#: any.pm:789
#, c-format
msgid "Here is the full list of available countries"
msgstr "在此列出了可用的全部国家/地区"
-#: any.pm:769
+#: any.pm:790
#, c-format
msgid "Other Countries"
msgstr "其它国家"
-#: any.pm:777
+#: any.pm:798
#, c-format
msgid "Input method:"
msgstr "输入法:"
-#: any.pm:778 install_any.pm:420 printer/printerdrake.pm:99
+#: any.pm:799 install_any.pm:388 network/netconnect.pm:323
+#: network/netconnect.pm:328 printer/printerdrake.pm:99
+#: printer/printerdrake.pm:2111
#, c-format
msgid "None"
msgstr "无"
-#: any.pm:912
+#: any.pm:914
#, c-format
msgid "No sharing"
msgstr "禁止共享"
-#: any.pm:912
+#: any.pm:914
#, c-format
msgid "Allow all users"
msgstr "允许所有用户使用"
-#: any.pm:916
+#: any.pm:918
#, c-format
msgid ""
"Would you like to allow users to share some of their directories?\n"
@@ -1313,52 +1316,52 @@ msgid ""
"\n"
"\"Custom\" permit a per-user granularity.\n"
msgstr ""
-"您愿意让用户能共享他们的目录吗?\n"
-"在这里选择允许,用户将可以在 KDE 和 Gnome 的文件管理器中单击“共享”菜单项\n"
-"“定制”允许按照不同用户细分设置。\n"
+"您想要允许用户能共享他们自己的目录吗?\n"
+"选择允许, 用户将只需在 Konqueror 和 Nautilus 中单击“共享”即可开放共享。\n"
+"“自定义”允许按照不同用户细分设置。\n"
-#: any.pm:928
+#: any.pm:930
#, c-format
msgid ""
"NFS: the traditional Unix file sharing system, with less support on Mac and "
"Windows."
-msgstr "NFS: 传统的 Unix 文件共享系统,Mac 和 Windows 上支持较少。"
+msgstr "NFS: 传统的 Unix 文件共享系统, Mac 和 Windows 上支持较少。"
-#: any.pm:931
+#: any.pm:933
#, 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:939
+#: any.pm:941
#, c-format
msgid ""
"You can export using NFS or SMB. Please select which you would like to use."
msgstr "您可以使用 NFS 或 Samba 导出。请选择您想要使用的协议。"
-#: any.pm:964
+#: any.pm:966
#, c-format
msgid "Launch userdrake"
msgstr "运行“Drak 用户管理”"
-#: any.pm:964 printer/printerdrake.pm:3478 printer/printerdrake.pm:3481
-#: printer/printerdrake.pm:3482 printer/printerdrake.pm:3483
-#: printer/printerdrake.pm:4676 standalone/drakTermServ:289
-#: standalone/drakbackup:4084 standalone/drakbug:151 standalone/drakfont:500
-#: standalone/drakfont:594 standalone/net_monitor:123
-#: standalone/printerdrake:559
+#: any.pm:966 printer/printerdrake.pm:3802 printer/printerdrake.pm:3805
+#: printer/printerdrake.pm:3806 printer/printerdrake.pm:3807
+#: printer/printerdrake.pm:5036 standalone/drakTermServ:294
+#: standalone/drakbackup:4089 standalone/drakbug:126 standalone/drakfont:499
+#: standalone/drakfont:595 standalone/net_monitor:123
+#: standalone/printerdrake:547
#, c-format
msgid "Close"
msgstr "关闭"
-#: any.pm:966
+#: any.pm:968
#, c-format
msgid ""
"The per-user sharing uses the group \"fileshare\". \n"
"You can use userdrake to add a user to this group."
msgstr ""
-"按用户设置的共享,使用组“fileshare”。\n"
+"按用户设置的共享, 使用组“fileshare”。\n"
"您可以使用“Drak 用户管理”将用户添加到此组中。"
#: authentication.pm:16
@@ -1376,38 +1379,43 @@ msgstr "LDAP"
msgid "NIS"
msgstr "NIS"
-#: authentication.pm:19 authentication.pm:127
+#: authentication.pm:19
+#, c-format
+msgid "Smart Card"
+msgstr "智能卡"
+
+#: authentication.pm:20 authentication.pm:148
#, c-format
msgid "Windows Domain"
msgstr "Windows 域"
-#: authentication.pm:20
+#: authentication.pm:21
#, c-format
msgid "Active Directory with SFU"
msgstr "带 SFU 的活动目录"
-#: authentication.pm:21
+#: authentication.pm:22
#, c-format
msgid "Active Directory with Winbind"
msgstr "带 Winbind 的活动目录"
-#: authentication.pm:30
+#: authentication.pm:51
#, c-format
msgid "Local file:"
msgstr "本地文件:"
-#: authentication.pm:30
+#: authentication.pm:51
#, c-format
msgid ""
"Use local for all authentication and information user tell in local file"
msgstr "使用本地进行全部身份验证并在本地文件中存储关于用户的信息"
-#: authentication.pm:31
+#: authentication.pm:52
#, c-format
msgid "LDAP:"
msgstr "LDAP:"
-#: authentication.pm:31
+#: authentication.pm:52
#, c-format
msgid ""
"Tells your computer to use LDAP for some or all authentication. LDAP "
@@ -1416,12 +1424,12 @@ msgstr ""
"通知您的计算机使用 LDAP 进行某些或全部身份验证。LDAP 能够在您的组织中巩固特定"
"类型的信息。"
-#: authentication.pm:32
+#: authentication.pm:53
#, c-format
msgid "NIS:"
msgstr "NIS:"
-#: authentication.pm:32
+#: authentication.pm:53
#, c-format
msgid ""
"Allows you to run a group of computers in the same Network Information "
@@ -1429,126 +1437,127 @@ msgid ""
msgstr ""
"允许您通过公共的密码和组文件在同一个网络信息服务(NIS)域中运行一组计算机。"
-#: authentication.pm:33
+#: authentication.pm:54
#, c-format
msgid "Windows Domain:"
msgstr "Windows 域:"
-#: authentication.pm:33
+#: authentication.pm:54
#, c-format
msgid ""
"Winbind allows the system to retrieve information and authenticate users in "
"a Windows domain."
msgstr "Winbind 允许系统在 Windows 域中获取用户的信息并对用户进行身份验证。"
-#: authentication.pm:34
+#: authentication.pm:55
#, c-format
msgid "Active Directory with SFU:"
msgstr "带 SFU 的活动目录:"
-#: authentication.pm:34 authentication.pm:35
+#: authentication.pm:55 authentication.pm:56
#, c-format
msgid ""
"Kerberos is a secure system for providing network authentication services."
msgstr "Kerberos 是提供网络身份验证服务的安全系统。"
-#: authentication.pm:35
+#: authentication.pm:56
#, c-format
msgid "Active Directory with Winbind:"
msgstr "带 Winbind 的活动目录:"
-#: authentication.pm:60
+#: authentication.pm:81
#, c-format
msgid "Authentication LDAP"
msgstr "LDAP 认证"
-#: authentication.pm:61
+#: authentication.pm:82
#, c-format
msgid "LDAP Base dn"
msgstr "LDAP 基 DN"
-#: authentication.pm:62 share/compssUsers.pl:101
+#: authentication.pm:83 share/compssUsers.pl:101
#, c-format
msgid "LDAP Server"
msgstr "LDAP 服务器"
-#: authentication.pm:75 fsedit.pm:21
+#: authentication.pm:96 fsedit.pm:21
#, c-format
msgid "simple"
msgstr "简单"
-#: authentication.pm:76
+#: authentication.pm:97
#, c-format
msgid "TLS"
msgstr "TLS"
-#: authentication.pm:77
+#: authentication.pm:98
#, c-format
msgid "SSL"
msgstr "SSL"
-#: authentication.pm:78
+#: authentication.pm:99
#, c-format
msgid "security layout (SASL/Kerberos)"
msgstr "安全层(SASL/Kerberos)"
-#: authentication.pm:85 authentication.pm:123
+#: authentication.pm:106 authentication.pm:144
#, c-format
msgid "Authentication Active Directory"
msgstr "验证活动目录"
-#: authentication.pm:86 authentication.pm:125 diskdrake/smbnfs_gtk.pm:181
+#: authentication.pm:107 authentication.pm:146 diskdrake/smbnfs_gtk.pm:181
#, c-format
msgid "Domain"
msgstr "域"
-#: authentication.pm:88 diskdrake/dav.pm:63 help.pm:146
+#: authentication.pm:109 diskdrake/dav.pm:63 help.pm:146
#: printer/printerdrake.pm:135 share/compssUsers.pl:81
+#: standalone/drakTermServ:269
#, c-format
msgid "Server"
msgstr "服务器"
-#: authentication.pm:89
+#: authentication.pm:110
#, c-format
msgid "LDAP users database"
msgstr "LDAP 用户数据库"
-#: authentication.pm:90
+#: authentication.pm:111
#, c-format
msgid "Use Anonymous BIND "
msgstr "使用匿名 BIND"
-#: authentication.pm:91
+#: authentication.pm:112
#, c-format
msgid "LDAP user allowed to browse the Active Directory"
msgstr "允许浏览活动目录的 LDAP 用户"
-#: authentication.pm:92
+#: authentication.pm:113
#, c-format
msgid "Password for user"
msgstr "用户的密码"
-#: authentication.pm:93
+#: authentication.pm:114
#, c-format
msgid "Encryption"
msgstr "加密"
-#: authentication.pm:104
+#: authentication.pm:125
#, c-format
msgid "Authentication NIS"
msgstr "NIS 认证"
-#: authentication.pm:105
+#: authentication.pm:126
#, c-format
msgid "NIS Domain"
msgstr "NIS 网域"
-#: authentication.pm:106
+#: authentication.pm:127
#, c-format
msgid "NIS Server"
msgstr "NIS 服务器"
-#: authentication.pm:111
+#: authentication.pm:132
#, c-format
msgid ""
"For this to work for a W2K PDC, you will probably need to have the admin "
@@ -1564,47 +1573,79 @@ msgid ""
"The command 'wbinfo -t' will test whether your authentication secrets are "
"good."
msgstr ""
-"为了在 W2K PDC 服务器的环境中正常使用,您可能得请 W2K 管理员 运行“C:\\>net "
+"为了在 W2K PDC 服务器的环境中正常使用, 您可能得请 W2K 管理员运行“C:\\>net "
"localgroup \"Pre-Windows 2000 Compatible Access\" everyone /add”并重启服务"
"器。\n"
"您还需要一个域管理员的用户名/密码以便把这个机器添加到 Windows(TM) 域。\n"
-"如果网络还没有启用,DrakX 会在网络设置步骤之后尝试加入域。\n"
-"如果这个设置因为什么失败了而且域认证不起作用,启动系统之后运行“smbpasswd -j "
+"如果网络还没有启用, DrakX 会在网络设置步骤之后尝试加入域。\n"
+"如果这个设置因为什么失败了而且域认证不起作用, 启动系统之后运行“smbpasswd -j "
"域名 -U 用户%%密码”填入您的 Windows(tm) 域名和管理员的用户名/密码。\n"
"命令“wbinfo -t”会测试您的认证密码是否完好。"
-#: authentication.pm:123
+#: authentication.pm:144
#, c-format
msgid "Authentication Windows Domain"
msgstr "Windows 域认证"
-#: authentication.pm:128
+#: authentication.pm:149
#, c-format
msgid "Domain Admin User Name"
msgstr "域管理员用户名"
-#: authentication.pm:129
+#: authentication.pm:150
#, c-format
msgid "Domain Admin Password"
msgstr "域管理员密码"
-#: authentication.pm:130
+#: authentication.pm:151
#, c-format
msgid "Use Idmap for store UID/SID "
msgstr "使用 Idmap 存储 UID/SID"
-#: authentication.pm:131
+#: authentication.pm:152
#, c-format
msgid "Default Idmap "
msgstr "默认 Idmap"
-#: authentication.pm:231
+#: authentication.pm:165
+#, c-format
+msgid "Set administrator (root) password and network authentication methods"
+msgstr "设定管理员(root)密码及网络认证方式"
+
+#: authentication.pm:166
+#, c-format
+msgid "Set administrator (root) password"
+msgstr "设定管理员(root)密码"
+
+#: authentication.pm:167 standalone/drakvpn:1125
+#, c-format
+msgid "Authentication method"
+msgstr "身份验证方式"
+
+#. -PO: keep this short or else the buttons will not fit in the window
+#: authentication.pm:172 help.pm:722
+#, c-format
+msgid "No password"
+msgstr "无密码"
+
+#: authentication.pm:178
#, c-format
-msgid "Can't use broadcast with no NIS domain"
+msgid "This password is too short (it must be at least %d characters long)"
+msgstr "这个密码太简单了(至少要有 %d 个字符)"
+
+#: authentication.pm:183 network/netconnect.pm:328 network/netconnect.pm:634
+#: standalone/drakauth:23 standalone/drakauth:25 standalone/drakconnect:459
+#, c-format
+msgid "Authentication"
+msgstr "身份验证"
+
+#: authentication.pm:296
+#, c-format
+msgid "Can not use broadcast with no NIS domain"
msgstr "没有 NIS 域无法广播"
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:673
+#: bootloader.pm:728
#, c-format
msgid ""
"Welcome to the operating system chooser!\n"
@@ -1619,51 +1660,51 @@ msgstr ""
"wait for default boot.\n"
"\n"
-#: bootloader.pm:787
+#: bootloader.pm:815
#, c-format
msgid "LILO with graphical menu"
msgstr "图形菜单 LILO"
-#: bootloader.pm:788
+#: bootloader.pm:816
#, c-format
msgid "LILO with text menu"
msgstr "文本菜单 LILO"
-#: bootloader.pm:789
+#: bootloader.pm:817
#, c-format
msgid "Grub"
msgstr "Grub"
-#: bootloader.pm:790
+#: bootloader.pm:818
#, c-format
msgid "Yaboot"
msgstr "Yaboot"
-#: bootloader.pm:852
+#: bootloader.pm:881
#, c-format
msgid "not enough room in /boot"
msgstr "/boot 中没有足够空间"
-#: bootloader.pm:1266
+#: bootloader.pm:1295
#, c-format
-msgid "You can't install the bootloader on a %s partition\n"
+msgid "You can not install the bootloader on a %s partition\n"
msgstr "%s 分区不能安装启动引导程序\n"
-#: bootloader.pm:1311
+#: bootloader.pm:1340
#, c-format
msgid ""
"Your bootloader configuration must be updated because partition has been "
"renumbered"
-msgstr "必须更新您的启动引导程序配置,因为分区已经重新编号"
+msgstr "必须更新您的启动引导程序配置, 因为分区已经重新编号"
-#: bootloader.pm:1326
+#: bootloader.pm:1355
#, c-format
msgid ""
-"The bootloader can't be installed correctly. You have to boot rescue and "
+"The bootloader can not be installed correctly. You have to boot rescue and "
"choose \"%s\""
msgstr "无法正确安装启动引导程序。您需要以抢救方式启动并选择“%s”"
-#: bootloader.pm:1327
+#: bootloader.pm:1356
#, c-format
msgid "Re-install Boot Loader"
msgstr "重新安装启动引导程序"
@@ -1703,94 +1744,115 @@ msgstr "1 分钟"
msgid "%d seconds"
msgstr "%d 秒钟"
-#: common.pm:197
-#, c-format
-msgid "Can't make screenshots before partitioning"
-msgstr "无法在分区完成之前进行屏幕捕捉"
-
-#: common.pm:204
-#, c-format
-msgid "Screenshots will be available after install in %s"
-msgstr "安装完成后,所有的屏幕抓图都会保存到 %s 之中"
-
-#: common.pm:269
+#: common.pm:240
#, c-format
msgid "kdesu missing"
msgstr "缺少 kdesu"
-#: common.pm:272
+#: common.pm:243
#, c-format
msgid "consolehelper missing"
msgstr "缺少 consolehelper"
-#: crypto.pm:14 crypto.pm:28 lang.pm:254 network/adsl_consts.pm:309
-#: network/adsl_consts.pm:320 network/adsl_consts.pm:330
-#: network/adsl_consts.pm:340 network/adsl_consts.pm:350
-#: network/adsl_consts.pm:361 network/adsl_consts.pm:372
-#: network/adsl_consts.pm:382 network/adsl_consts.pm:392
-#: network/netconnect.pm:47
-#, c-format
-msgid "France"
-msgstr "法国"
-
-#: crypto.pm:15 lang.pm:229
+#: crypto.pm:14 crypto.pm:43 lang.pm:202 network/adsl_consts.pm:50
+#: network/adsl_consts.pm:58 network/adsl_consts.pm:66
#, c-format
-msgid "Costa Rica"
-msgstr "哥斯达黎加"
+msgid "Austria"
+msgstr "奥地利"
-#: crypto.pm:16 crypto.pm:29 lang.pm:201 network/adsl_consts.pm:59
-#: network/adsl_consts.pm:66 network/adsl_consts.pm:77
-#: network/adsl_consts.pm:85 network/netconnect.pm:50
+#: crypto.pm:15 crypto.pm:34 lang.pm:209 network/adsl_consts.pm:74
+#: network/adsl_consts.pm:82 network/adsl_consts.pm:93
+#: network/adsl_consts.pm:101 network/netconnect.pm:50
#, c-format
msgid "Belgium"
msgstr "比利时"
-#: crypto.pm:17 crypto.pm:30 lang.pm:235
+#: crypto.pm:16 lang.pm:230 network/adsl_consts.pm:780
+#: network/adsl_consts.pm:788 network/adsl_consts.pm:798
+#, c-format
+msgid "Switzerland"
+msgstr "瑞士"
+
+#: crypto.pm:17 lang.pm:237
+#, c-format
+msgid "Costa Rica"
+msgstr "哥斯达黎加"
+
+#: crypto.pm:18 crypto.pm:35 lang.pm:243 network/adsl_consts.pm:319
#, c-format
msgid "Czech Republic"
msgstr "捷克共和国"
-#: crypto.pm:18 crypto.pm:31 lang.pm:236 network/adsl_consts.pm:410
-#: network/adsl_consts.pm:418
+#: crypto.pm:19 crypto.pm:36 lang.pm:244 network/adsl_consts.pm:437
+#: network/adsl_consts.pm:445
#, c-format
msgid "Germany"
msgstr "德国"
-#: crypto.pm:19 crypto.pm:32 lang.pm:267 network/adsl_consts.pm:428
+#: crypto.pm:20 crypto.pm:33 lang.pm:262 network/adsl_consts.pm:343
+#: network/adsl_consts.pm:354 network/adsl_consts.pm:365
+#: network/adsl_consts.pm:375 network/adsl_consts.pm:385
+#: network/adsl_consts.pm:396 network/adsl_consts.pm:407
+#: network/adsl_consts.pm:417 network/adsl_consts.pm:427
+#: network/netconnect.pm:47
+#, c-format
+msgid "France"
+msgstr "法国"
+
+#: crypto.pm:21 crypto.pm:37 lang.pm:275 network/adsl_consts.pm:455
#, c-format
msgid "Greece"
msgstr "希腊"
-#: crypto.pm:20 crypto.pm:33 lang.pm:340
+#: crypto.pm:22 lang.pm:286 network/adsl_consts.pm:463
#, c-format
-msgid "Norway"
-msgstr "挪威"
+msgid "Hungary"
+msgstr "匈牙利"
-#: crypto.pm:21 crypto.pm:34 lang.pm:369 network/adsl_consts.pm:561
+#: crypto.pm:23 crypto.pm:42 lang.pm:295 network/adsl_consts.pm:489
+#: network/adsl_consts.pm:499 network/adsl_consts.pm:509
+#: network/adsl_consts.pm:517 network/netconnect.pm:49 standalone/drakxtv:47
#, c-format
-msgid "Sweden"
-msgstr "瑞典"
+msgid "Italy"
+msgstr "意大利"
-#: crypto.pm:22 crypto.pm:36 lang.pm:339 network/adsl_consts.pm:495
-#: network/netconnect.pm:48
+#: crypto.pm:24 crypto.pm:41 lang.pm:347 network/adsl_consts.pm:545
+#: network/adsl_consts.pm:553 network/adsl_consts.pm:561
+#: network/adsl_consts.pm:569 network/netconnect.pm:48
#, c-format
msgid "Netherlands"
msgstr "荷兰"
-#: crypto.pm:23 crypto.pm:37 lang.pm:287 network/adsl_consts.pm:452
-#: network/adsl_consts.pm:462 network/adsl_consts.pm:469
-#: network/netconnect.pm:49 standalone/drakxtv:47
+#: crypto.pm:25 crypto.pm:38 lang.pm:348 network/adsl_consts.pm:577
+#: network/adsl_consts.pm:582 network/adsl_consts.pm:587
+#: network/adsl_consts.pm:592 network/adsl_consts.pm:597
+#: network/adsl_consts.pm:602 network/adsl_consts.pm:607
#, c-format
-msgid "Italy"
-msgstr "意大利"
+msgid "Norway"
+msgstr "挪威"
-#: crypto.pm:24 crypto.pm:38 lang.pm:194 network/adsl_consts.pm:36
-#: network/adsl_consts.pm:44 network/adsl_consts.pm:52
+#: crypto.pm:26 lang.pm:360 network/adsl_consts.pm:614
+#: network/adsl_consts.pm:624
#, c-format
-msgid "Austria"
-msgstr "奥地利"
+msgid "Poland"
+msgstr "波兰"
+
+#: crypto.pm:27 crypto.pm:39 lang.pm:377 network/adsl_consts.pm:772
+#, c-format
+msgid "Sweden"
+msgstr "瑞典"
+
+#: crypto.pm:28 lang.pm:382
+#, c-format
+msgid "Slovakia"
+msgstr "斯洛伐克"
+
+#: crypto.pm:29 lang.pm:406
+#, c-format
+msgid "Taiwan"
+msgstr "中国台湾"
-#: crypto.pm:35 crypto.pm:65 lang.pm:403 network/netconnect.pm:51
+#: crypto.pm:40 crypto.pm:75 lang.pm:411 network/netconnect.pm:51
#, c-format
msgid "United States"
msgstr "美国"
@@ -1803,27 +1865,27 @@ msgid ""
"configured as a WebDAV server). If you would like to add WebDAV mount\n"
"points, select \"New\"."
msgstr ""
-"WebDAV 是一种协议,它允许您将 Web 服务器的目录装载到本地,并将其看作本地的\n"
+"WebDAV 是一种协议, 它允许您将 Web 服务器的目录装载到本地, 并将其看作本地的\n"
"文件系统(假设该 Web 服务器已经配置为 WebDAV 服务器)。如果您想要添加 WebDAV\n"
-"挂载点,请选择“新建”。"
+"挂载点, 请选择“新建”。"
#: diskdrake/dav.pm:25
#, c-format
msgid "New"
msgstr "新建"
-#: diskdrake/dav.pm:61 diskdrake/interactive.pm:425 diskdrake/smbnfs_gtk.pm:75
+#: diskdrake/dav.pm:61 diskdrake/interactive.pm:443 diskdrake/smbnfs_gtk.pm:75
#, c-format
msgid "Unmount"
msgstr "卸载"
-#: diskdrake/dav.pm:62 diskdrake/interactive.pm:422 diskdrake/smbnfs_gtk.pm:76
+#: diskdrake/dav.pm:62 diskdrake/interactive.pm:440 diskdrake/smbnfs_gtk.pm:76
#, c-format
msgid "Mount"
msgstr "挂载"
-#: diskdrake/dav.pm:64 diskdrake/interactive.pm:416
-#: diskdrake/interactive.pm:627 diskdrake/interactive.pm:646
+#: diskdrake/dav.pm:64 diskdrake/interactive.pm:435
+#: diskdrake/interactive.pm:653 diskdrake/interactive.pm:672
#: diskdrake/removable.pm:23 diskdrake/smbnfs_gtk.pm:79
#, c-format
msgid "Mount point"
@@ -1844,13 +1906,13 @@ msgstr "URL 应该是以 http:// 或 https:// 开头"
msgid "Server: "
msgstr "服务器: "
-#: diskdrake/dav.pm:110 diskdrake/interactive.pm:479
-#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1232
+#: diskdrake/dav.pm:110 diskdrake/interactive.pm:504
+#: diskdrake/interactive.pm:1166 diskdrake/interactive.pm:1241
#, c-format
msgid "Mount point: "
msgstr "挂载点: "
-#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1239
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1248
#, c-format
msgid "Options: %s"
msgstr "选项: %s"
@@ -1867,7 +1929,7 @@ msgid ""
"enough)\n"
"at the beginning of the disk"
msgstr ""
-"如果您计划采用 aboot,请注意在磁盘的开头位置留下一段自由空间\n"
+"如果您计划采用 aboot, 请注意在磁盘的开头位置留下一段自由空间\n"
"(2048 扇区就足够了)"
#: diskdrake/hd_gtk.pm:155 help.pm:530
@@ -1889,15 +1951,15 @@ msgid ""
msgstr ""
"您有一个很大的 Microsoft Windows 分区。\n"
"我建议您先重新设置这个分区的大小\n"
-"(点中它,然后按“改变大小”)"
+"(点中它, 然后按“改变大小”)"
#: diskdrake/hd_gtk.pm:194
#, c-format
msgid "Please click on a partition"
-msgstr "请选中一个分区"
+msgstr "请单击一个分区"
-#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:474
-#: standalone/drakbackup:2938 standalone/drakbackup:2998
+#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:482
+#: standalone/drakbackup:2943 standalone/drakbackup:3003
#, c-format
msgid "Details"
msgstr "细节"
@@ -1907,566 +1969,522 @@ msgstr "细节"
msgid "No hard drives found"
msgstr "没有发现硬盘"
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
#, c-format
msgid "Ext2"
msgstr "Ext2"
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
#, c-format
msgid "Journalised FS"
msgstr "日志文件系统"
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
#, c-format
msgid "Swap"
msgstr "交换"
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
#, c-format
msgid "SunOS"
msgstr "SunOS"
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
#, c-format
msgid "HFS"
msgstr "HFS"
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
#, c-format
msgid "Windows"
msgstr "Windows"
-#: diskdrake/hd_gtk.pm:326 install_steps_gtk.pm:298 mouse.pm:168
-#: services.pm:164 standalone/drakbackup:1603 standalone/drakperm:250
+#: diskdrake/hd_gtk.pm:339 install_steps_gtk.pm:284 mouse.pm:168
+#: services.pm:162 standalone/drakbackup:1609 standalone/drakperm:250
#, c-format
msgid "Other"
msgstr "其它"
-#: diskdrake/hd_gtk.pm:326 diskdrake/interactive.pm:1172
+#: diskdrake/hd_gtk.pm:339 diskdrake/interactive.pm:1181
#, c-format
msgid "Empty"
msgstr "空"
-#: diskdrake/hd_gtk.pm:330
+#: diskdrake/hd_gtk.pm:343
#, c-format
msgid "Filesystem types:"
msgstr "文件系统类型: "
-#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:349 diskdrake/hd_gtk.pm:352
+#: diskdrake/hd_gtk.pm:360 diskdrake/hd_gtk.pm:362 diskdrake/hd_gtk.pm:368
#, c-format
msgid "Use ``%s'' instead"
msgstr "用“%s”代替"
-#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:352
-#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:580
+#: diskdrake/hd_gtk.pm:360 diskdrake/interactive.pm:459
+#, c-format
+msgid "Create"
+msgstr "新建"
+
+#: diskdrake/hd_gtk.pm:360 diskdrake/hd_gtk.pm:368
+#: diskdrake/interactive.pm:436 diskdrake/interactive.pm:606
#: diskdrake/removable.pm:25 diskdrake/removable.pm:48
-#: standalone/harddrake2:101
+#: standalone/harddrake2:106 standalone/harddrake2:115
#, c-format
msgid "Type"
msgstr "类型"
-#: diskdrake/hd_gtk.pm:347 diskdrake/interactive.pm:441
-#, c-format
-msgid "Create"
-msgstr "新建"
-
#. -PO: "Delete" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: diskdrake/hd_gtk.pm:349 diskdrake/interactive.pm:426
-#: standalone/drakperm:124 standalone/printerdrake:242
+#: diskdrake/hd_gtk.pm:362 diskdrake/interactive.pm:444
+#: standalone/drakperm:124 standalone/printerdrake:235
#, c-format
msgid "Delete"
msgstr "删除"
-#: diskdrake/hd_gtk.pm:352
+#: diskdrake/hd_gtk.pm:368
#, c-format
msgid "Use ``Unmount'' first"
msgstr "请先“Unmount”"
-#: diskdrake/interactive.pm:187
+#: diskdrake/interactive.pm:191
#, c-format
msgid "Choose another partition"
msgstr "选择其它分区"
-#: diskdrake/interactive.pm:187
+#: diskdrake/interactive.pm:191
#, c-format
msgid "Choose a partition"
msgstr "选择分区"
-#: diskdrake/interactive.pm:216
+#: diskdrake/interactive.pm:220
#, c-format
msgid "Exit"
msgstr "退出"
-#: diskdrake/interactive.pm:249 help.pm:530
+#: diskdrake/interactive.pm:253 help.pm:530
#, c-format
msgid "Undo"
msgstr "撤消"
-#: diskdrake/interactive.pm:249
+#: diskdrake/interactive.pm:253
#, c-format
msgid "Toggle to normal mode"
msgstr "切换到正常模式"
-#: diskdrake/interactive.pm:249
+#: diskdrake/interactive.pm:253
#, c-format
msgid "Toggle to expert mode"
msgstr "切换到专家模式"
-#: diskdrake/interactive.pm:268
+#: diskdrake/interactive.pm:272
#, c-format
msgid "Continue anyway?"
-msgstr "仍然继续吗?"
+msgstr "仍然继续吗?"
+
+#: diskdrake/interactive.pm:275
+#, c-format
+msgid ""
+"You should format partition %s.\n"
+"Otherwise no entry for mount point %s will be written in fstab.\n"
+"Quit anyway?"
+msgstr ""
+"您应该格式化分区 %s。\n"
+"否则, 将无法在 fstab 中写入挂载点 %s 的任何信息。\n"
+"仍然退出吗?"
-#: diskdrake/interactive.pm:273
+#: diskdrake/interactive.pm:282
#, c-format
msgid "Quit without saving"
msgstr "退出而不保存更改"
-#: diskdrake/interactive.pm:273
+#: diskdrake/interactive.pm:282
#, c-format
msgid "Quit without writing the partition table?"
-msgstr "退出而不保存分区表吗?"
+msgstr "退出而不保存分区表吗?"
-#: diskdrake/interactive.pm:278
+#: diskdrake/interactive.pm:287
#, c-format
msgid "Do you want to save /etc/fstab modifications"
-msgstr "您想要保存 /etc/fstab 修改吗?"
+msgstr "您想要保存 /etc/fstab 修改吗?"
-#: diskdrake/interactive.pm:285 install_steps_interactive.pm:313
+#: diskdrake/interactive.pm:294 install_steps_interactive.pm:329
#, c-format
msgid "You need to reboot for the partition table modifications to take place"
msgstr "对分区表的更改要等到重新启动后才能生效"
-#: diskdrake/interactive.pm:298 help.pm:530
+#: diskdrake/interactive.pm:307 help.pm:530
#, c-format
msgid "Clear all"
msgstr "全部清除"
-#: diskdrake/interactive.pm:299 help.pm:530
+#: diskdrake/interactive.pm:308 help.pm:530
#, c-format
msgid "Auto allocate"
msgstr "自动分配"
-#: diskdrake/interactive.pm:300 help.pm:530 help.pm:566 help.pm:606
-#: help.pm:855 install_steps_interactive.pm:124
+#: diskdrake/interactive.pm:309 help.pm:530 help.pm:566 help.pm:606
+#: help.pm:855 install_steps_interactive.pm:122
#, c-format
msgid "More"
msgstr "更多"
-#: diskdrake/interactive.pm:305
+#: diskdrake/interactive.pm:314
#, c-format
msgid "Hard drive information"
msgstr "硬盘信息"
-#: diskdrake/interactive.pm:337
+#: diskdrake/interactive.pm:346
#, c-format
msgid "All primary partitions are used"
msgstr "主分区数目已经满了"
-#: diskdrake/interactive.pm:338
+#: diskdrake/interactive.pm:347
#, c-format
-msgid "I can't add any more partitions"
+msgid "I can not add any more partitions"
msgstr "我无法再添加任何分区了"
-#: diskdrake/interactive.pm:339
+#: diskdrake/interactive.pm:348
#, c-format
msgid ""
"To have more partitions, please delete one to be able to create an extended "
"partition"
-msgstr "如果需要更多的分区,请删除一个主分区以创建扩展分区"
+msgstr "如果需要更多的分区, 请删除一个主分区以创建扩展分区"
-#: diskdrake/interactive.pm:350 help.pm:530
+#: diskdrake/interactive.pm:359 help.pm:530
#, c-format
msgid "Save partition table"
msgstr "保存分区表"
-#: diskdrake/interactive.pm:351 help.pm:530
+#: diskdrake/interactive.pm:360 help.pm:530
#, c-format
msgid "Restore partition table"
msgstr "恢复分区表"
-#: diskdrake/interactive.pm:352 help.pm:530
+#: diskdrake/interactive.pm:361 help.pm:530
#, c-format
msgid "Rescue partition table"
msgstr "抢救分区表"
-#: diskdrake/interactive.pm:354 help.pm:530
+#: diskdrake/interactive.pm:363 help.pm:530
#, c-format
msgid "Reload partition table"
msgstr "重新读取分区表"
-#: diskdrake/interactive.pm:356
+#: diskdrake/interactive.pm:365
#, c-format
msgid "Removable media automounting"
msgstr "自动装载可移动介质"
-#: diskdrake/interactive.pm:365 diskdrake/interactive.pm:385
+#: diskdrake/interactive.pm:376 diskdrake/interactive.pm:402
#, c-format
msgid "Select file"
msgstr "选择文件"
-#: diskdrake/interactive.pm:372
+#: diskdrake/interactive.pm:388
#, c-format
msgid ""
"The backup partition table has not the same size\n"
"Still continue?"
msgstr ""
"备份分区表的大小和原来的有所不同\n"
-"仍然继续吗?"
-
-#: diskdrake/interactive.pm:386 harddrake/sound.pm:246 keyboard.pm:351
-#: lang.pm:1046 network/netconnect.pm:470 printer/printerdrake.pm:1037
-#: printer/printerdrake.pm:2009 printer/printerdrake.pm:2075
-#: printer/printerdrake.pm:2110 printer/printerdrake.pm:2414
-#: printer/printerdrake.pm:3330 printer/printerdrake.pm:3611
-#: printer/printerdrake.pm:3733 printer/printerdrake.pm:4823
-#: standalone/drakTermServ:315 standalone/drakTermServ:1045
-#: standalone/drakTermServ:1101 standalone/drakTermServ:1769
-#: standalone/drakbackup:511 standalone/drakbackup:610 standalone/drakboot:165
-#: standalone/drakclock:225 standalone/drakconnect:972
-#: standalone/drakfloppy:291 standalone/drakups:27 standalone/scannerdrake:51
-#: standalone/scannerdrake:909
-#, c-format
-msgid "Warning"
-msgstr "警告"
+"仍然继续吗?"
-#: diskdrake/interactive.pm:387
-#, c-format
-msgid ""
-"Insert a floppy in drive\n"
-"All data on this floppy will be lost"
-msgstr ""
-"请在驱动器中插入一张软盘\n"
-"这张软盘上所有的数据都将丢失"
-
-#: diskdrake/interactive.pm:398
+#: diskdrake/interactive.pm:417
#, c-format
msgid "Trying to rescue partition table"
msgstr "正在尝试恢复分区表"
-#: diskdrake/interactive.pm:404
+#: diskdrake/interactive.pm:423
#, c-format
msgid "Detailed information"
msgstr "详细信息"
-#: diskdrake/interactive.pm:419 diskdrake/interactive.pm:717
+#: diskdrake/interactive.pm:438 diskdrake/interactive.pm:743
#, c-format
msgid "Resize"
msgstr "改变大小"
-#: diskdrake/interactive.pm:420 diskdrake/interactive.pm:783
-#, c-format
-msgid "Move"
-msgstr "移动"
-
-#: diskdrake/interactive.pm:421
+#: diskdrake/interactive.pm:439
#, c-format
msgid "Format"
msgstr "格式化"
-#: diskdrake/interactive.pm:423
+#: diskdrake/interactive.pm:441
#, c-format
msgid "Add to RAID"
msgstr "加入 RAID"
-#: diskdrake/interactive.pm:424
+#: diskdrake/interactive.pm:442
#, c-format
msgid "Add to LVM"
msgstr "加入 LVM"
-#: diskdrake/interactive.pm:427
+#: diskdrake/interactive.pm:445
#, c-format
msgid "Remove from RAID"
msgstr "从 RAID 中移除"
-#: diskdrake/interactive.pm:428
+#: diskdrake/interactive.pm:446
#, c-format
msgid "Remove from LVM"
msgstr "从 LVM 中移除"
-#: diskdrake/interactive.pm:429
+#: diskdrake/interactive.pm:447
#, c-format
msgid "Modify RAID"
msgstr "修改 RAID"
-#: diskdrake/interactive.pm:430
+#: diskdrake/interactive.pm:448
#, c-format
msgid "Use for loopback"
msgstr "用于回环"
-#: diskdrake/interactive.pm:472
+#: diskdrake/interactive.pm:497
#, c-format
msgid "Create a new partition"
msgstr "创建一个新分区"
-#: diskdrake/interactive.pm:475
+#: diskdrake/interactive.pm:500
#, c-format
msgid "Start sector: "
msgstr "开始扇区: "
-#: diskdrake/interactive.pm:477 diskdrake/interactive.pm:884
+#: diskdrake/interactive.pm:502 diskdrake/interactive.pm:899
#, c-format
msgid "Size in MB: "
msgstr "大小(MB): "
-#: diskdrake/interactive.pm:478 diskdrake/interactive.pm:885
+#: diskdrake/interactive.pm:503 diskdrake/interactive.pm:900
#, c-format
msgid "Filesystem type: "
msgstr "文件系统类型: "
-#: diskdrake/interactive.pm:483
+#: diskdrake/interactive.pm:508
#, c-format
msgid "Preference: "
msgstr "首选项: "
-#: diskdrake/interactive.pm:486
+#: diskdrake/interactive.pm:511
#, c-format
msgid "Logical volume name "
msgstr "逻辑卷标"
-#: diskdrake/interactive.pm:515
+#: diskdrake/interactive.pm:541
#, c-format
msgid ""
-"You can't create a new partition\n"
+"You can not create a new partition\n"
"(since you reached the maximal number of primary partitions).\n"
"First remove a primary partition and create an extended partition."
msgstr ""
"您无法创建新分区\n"
"(您超过了允许的主分区数量)。\n"
-"请先删除一个主分区,然后创建一个扩展分区。"
+"请先删除一个主分区, 然后创建一个扩展分区。"
-#: diskdrake/interactive.pm:545
+#: diskdrake/interactive.pm:571
#, c-format
msgid "Remove the loopback file?"
-msgstr "删除回环(loopback)文件?"
+msgstr "删除回环(loopback)文件?"
-#: diskdrake/interactive.pm:564
+#: diskdrake/interactive.pm:590
#, c-format
msgid ""
"After changing type of partition %s, all data on this partition will be lost"
-msgstr "在改变分区表 %s 的类型之后,在这个分区上的所有资料将要被清除"
+msgstr "在改变分区表 %s 的类型之后, 在这个分区上的所有资料将要被清除"
-#: diskdrake/interactive.pm:576
+#: diskdrake/interactive.pm:602
#, c-format
msgid "Change partition type"
msgstr "更改分区类型"
-#: diskdrake/interactive.pm:577 diskdrake/removable.pm:47
+#: diskdrake/interactive.pm:603 diskdrake/removable.pm:47
#, c-format
msgid "Which filesystem do you want?"
-msgstr "您希望使用哪种文件系统?"
+msgstr "您希望使用哪种文件系统?"
-#: diskdrake/interactive.pm:585
+#: diskdrake/interactive.pm:611
#, c-format
msgid "Switching from ext2 to ext3"
msgstr "把 ext2 升级到 ext3"
-#: diskdrake/interactive.pm:614
+#: diskdrake/interactive.pm:640
#, c-format
msgid "Where do you want to mount the loopback file %s?"
-msgstr "您想把回环(loopback)文件 %s 挂载到哪里?"
+msgstr "您想把回环(loopback)文件 %s 挂载到哪里?"
-#: diskdrake/interactive.pm:615
+#: diskdrake/interactive.pm:641
#, c-format
msgid "Where do you want to mount device %s?"
-msgstr "您想把设备 %s 挂载到哪里?"
+msgstr "您想把设备 %s 挂载到哪里?"
-#: diskdrake/interactive.pm:620
+#: diskdrake/interactive.pm:646
#, c-format
msgid ""
-"Can't unset mount point as this partition is used for loop back.\n"
+"Can not unset mount point as this partition is used for loop back.\n"
"Remove the loopback first"
msgstr ""
-"无法取消设定的挂载点,因为该分区正用于回环。\n"
+"无法取消设定的挂载点, 因为该分区正用于回环。\n"
"请先删除回环"
-#: diskdrake/interactive.pm:645
+#: diskdrake/interactive.pm:671
#, c-format
msgid "Where do you want to mount %s?"
-msgstr "您想把 %s 挂载到哪里?"
+msgstr "您想把 %s 挂载到哪里?"
-#: diskdrake/interactive.pm:669 diskdrake/interactive.pm:748
+#: diskdrake/interactive.pm:695 diskdrake/interactive.pm:774
#: install_interactive.pm:156 install_interactive.pm:188
#, c-format
msgid "Resizing"
msgstr "改变大小"
-#: diskdrake/interactive.pm:669
+#: diskdrake/interactive.pm:695
#, c-format
msgid "Computing FAT filesystem bounds"
msgstr "计算 FAT 文件系统的边界"
-#: diskdrake/interactive.pm:705
+#: diskdrake/interactive.pm:731
#, c-format
msgid "This partition is not resizeable"
msgstr "无法更改此分区的大小"
-#: diskdrake/interactive.pm:710
+#: diskdrake/interactive.pm:736
#, c-format
msgid "All data on this partition should be backed-up"
msgstr "应该先备份在这个分区上的所有数据"
-#: diskdrake/interactive.pm:712
+#: diskdrake/interactive.pm:738
#, c-format
msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr "改变分区 %s 的大小之后,这个分区上现有的所有资料将被清除"
+msgstr "改变分区 %s 的大小之后, 这个分区上现有的所有资料将被清除"
-#: diskdrake/interactive.pm:717
+#: diskdrake/interactive.pm:743
#, c-format
msgid "Choose the new size"
msgstr "选择新的大小"
-#: diskdrake/interactive.pm:718
+#: diskdrake/interactive.pm:744
#, c-format
msgid "New size in MB: "
msgstr "新大小(MB): "
-#: diskdrake/interactive.pm:761 install_interactive.pm:196
+#: diskdrake/interactive.pm:787 install_interactive.pm:196
#, c-format
msgid ""
"To ensure data integrity after resizing the partition(s), \n"
"filesystem checks will be run on your next boot into Windows(TM)"
msgstr ""
-"为了保证更改分区大小之后的数据完整性,在您下次启动进入 Windows(TM) 时可能\n"
+"为了保证更改分区大小之后的数据完整性, 在您下次启动进入 Windows(TM) 时可能\n"
"会自动运行文件系统检查。"
-#: diskdrake/interactive.pm:784
-#, c-format
-msgid "Which disk do you want to move it to?"
-msgstr "您想移动它到哪个盘?"
-
-#: diskdrake/interactive.pm:785
-#, c-format
-msgid "Sector"
-msgstr "扇区"
-
-#: diskdrake/interactive.pm:786
-#, c-format
-msgid "Which sector do you want to move it to?"
-msgstr "您想移动它到哪个扇区?"
-
-#: diskdrake/interactive.pm:789
-#, c-format
-msgid "Moving"
-msgstr "移动中"
-
-#: diskdrake/interactive.pm:789
-#, c-format
-msgid "Moving partition..."
-msgstr "正在移动分区..."
-
-#: diskdrake/interactive.pm:810
+#: diskdrake/interactive.pm:825
#, c-format
msgid "Choose an existing RAID to add to"
msgstr "选择加入一个已存在的 RAID"
-#: diskdrake/interactive.pm:812 diskdrake/interactive.pm:828
+#: diskdrake/interactive.pm:827 diskdrake/interactive.pm:844
#, c-format
msgid "new"
msgstr "新建"
-#: diskdrake/interactive.pm:826
+#: diskdrake/interactive.pm:842
#, c-format
msgid "Choose an existing LVM to add to"
msgstr "选择加入一个已存在的 LVM"
-#: diskdrake/interactive.pm:832
+#: diskdrake/interactive.pm:848
#, c-format
msgid "LVM name?"
-msgstr "LVM 名称?"
+msgstr "LVM 名称?"
-#: diskdrake/interactive.pm:869
+#: diskdrake/interactive.pm:884
#, c-format
-msgid "This partition can't be used for loopback"
+msgid "This partition can not be used for loopback"
msgstr "这个分区不能被用于回环"
-#: diskdrake/interactive.pm:882
+#: diskdrake/interactive.pm:897
#, c-format
msgid "Loopback"
msgstr "回环"
-#: diskdrake/interactive.pm:883
+#: diskdrake/interactive.pm:898
#, c-format
msgid "Loopback file name: "
msgstr "回环文件名: "
-#: diskdrake/interactive.pm:888
+#: diskdrake/interactive.pm:903
#, c-format
msgid "Give a file name"
msgstr "给一个文件名"
-#: diskdrake/interactive.pm:891
+#: diskdrake/interactive.pm:906
#, c-format
msgid "File is already used by another loopback, choose another one"
-msgstr "文件已经被另一个回环使用,请另外选择一个"
+msgstr "文件已经被另一个回环使用, 请另外选择一个"
-#: diskdrake/interactive.pm:892
+#: diskdrake/interactive.pm:907
#, c-format
msgid "File already exists. Use it?"
-msgstr "文件已经存在。使用现有的文件吗?"
+msgstr "文件已经存在。使用现有的文件吗?"
-#: diskdrake/interactive.pm:915
+#: diskdrake/interactive.pm:930
#, c-format
msgid "Mount options"
msgstr "挂载选项"
-#: diskdrake/interactive.pm:922
+#: diskdrake/interactive.pm:937
#, c-format
msgid "Various"
msgstr "杂项"
-#: diskdrake/interactive.pm:987
+#: diskdrake/interactive.pm:1002
#, c-format
msgid "device"
msgstr "设备"
-#: diskdrake/interactive.pm:988
+#: diskdrake/interactive.pm:1003
#, c-format
msgid "level"
msgstr "级别"
-#: diskdrake/interactive.pm:989
+#: diskdrake/interactive.pm:1004
#, c-format
msgid "chunk size in KiB"
msgstr "组块大小(KB)"
-#: diskdrake/interactive.pm:1006
+#: diskdrake/interactive.pm:1021
#, c-format
msgid "Be careful: this operation is dangerous."
msgstr "小心: 该操作有危险。"
-#: diskdrake/interactive.pm:1021
+#: diskdrake/interactive.pm:1036
#, c-format
msgid "What type of partitioning?"
-msgstr "何种分区类型?"
+msgstr "何种分区类型?"
-#: diskdrake/interactive.pm:1059
+#: diskdrake/interactive.pm:1074
#, c-format
msgid "You'll need to reboot before the modification can take place"
msgstr "修改要等到重新启动后才能生效"
-#: diskdrake/interactive.pm:1068
+#: diskdrake/interactive.pm:1083
#, c-format
msgid "Partition table of drive %s is going to be written to disk!"
msgstr "驱动器 %s 的分区表将会写入磁盘中!"
-#: diskdrake/interactive.pm:1081
+#: diskdrake/interactive.pm:1096
#, c-format
msgid "After formatting partition %s, all data on this partition will be lost"
-msgstr "格式化分区 %s 之后,该分区上的所有数据都将丢失"
+msgstr "格式化分区 %s 之后, 该分区上的所有数据都将丢失"
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1112
#, c-format
msgid "Move files to the new partition"
msgstr "移动文件到新分区"
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1112
#, c-format
msgid "Hide files"
msgstr "隐藏文件"
-#: diskdrake/interactive.pm:1102
+#: diskdrake/interactive.pm:1113
#, c-format
msgid ""
"Directory %s already contains data\n"
@@ -2475,103 +2493,108 @@ msgstr ""
"目录 %s 已经包含数据\n"
"(%s)"
-#: diskdrake/interactive.pm:1113
+#: diskdrake/interactive.pm:1124
#, c-format
msgid "Moving files to the new partition"
msgstr "移动文件到新分区"
-#: diskdrake/interactive.pm:1117
+#: diskdrake/interactive.pm:1128
#, c-format
msgid "Copying %s"
msgstr "复制 %s"
-#: diskdrake/interactive.pm:1121
+#: diskdrake/interactive.pm:1132
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
-#: diskdrake/interactive.pm:1135
+#: diskdrake/interactive.pm:1146
#, c-format
msgid "partition %s is now known as %s"
msgstr "分区 %s 现在被识别为 %s"
-#: diskdrake/interactive.pm:1156 diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1147
+#, c-format
+msgid "Partitions have been renumbered: "
+msgstr "分区已被重新编号: "
+
+#: diskdrake/interactive.pm:1167 diskdrake/interactive.pm:1226
#, c-format
msgid "Device: "
msgstr "设备: "
-#: diskdrake/interactive.pm:1157
+#: diskdrake/interactive.pm:1168
#, c-format
msgid "Devfs name: "
msgstr "Devfs 名称: "
-#: diskdrake/interactive.pm:1158
+#: diskdrake/interactive.pm:1169
#, c-format
msgid "Volume label: "
msgstr "卷标: "
-#: diskdrake/interactive.pm:1159
+#: diskdrake/interactive.pm:1170
#, c-format
msgid "DOS drive letter: %s (just a guess)\n"
msgstr "DOS 下的盘符: %s(只是猜测)\n"
-#: diskdrake/interactive.pm:1163 diskdrake/interactive.pm:1170
-#: diskdrake/interactive.pm:1235
+#: diskdrake/interactive.pm:1174 diskdrake/interactive.pm:1183
+#: diskdrake/interactive.pm:1244
#, c-format
msgid "Type: "
msgstr "类型: "
-#: diskdrake/interactive.pm:1167 install_steps_gtk.pm:310
+#: diskdrake/interactive.pm:1178 install_steps_gtk.pm:296
#, c-format
msgid "Name: "
msgstr "名称: "
-#: diskdrake/interactive.pm:1174
+#: diskdrake/interactive.pm:1185
#, c-format
msgid "Start: sector %s\n"
msgstr "开始: 第 %s 扇区\n"
-#: diskdrake/interactive.pm:1175
+#: diskdrake/interactive.pm:1186
#, c-format
msgid "Size: %s"
msgstr "大小: %s"
-#: diskdrake/interactive.pm:1177
+#: diskdrake/interactive.pm:1188
#, c-format
msgid ", %s sectors"
-msgstr ",%s 扇区"
+msgstr ", %s 扇区"
-#: diskdrake/interactive.pm:1179
+#: diskdrake/interactive.pm:1190
#, c-format
msgid "Cylinder %d to %d\n"
msgstr "柱面 %d 到 %d\n"
-#: diskdrake/interactive.pm:1180
+#: diskdrake/interactive.pm:1191
#, c-format
msgid "Number of logical extents: %d"
msgstr "逻辑扩展分区数: %d"
-#: diskdrake/interactive.pm:1181
+#: diskdrake/interactive.pm:1192
#, c-format
msgid "Formatted\n"
msgstr "已格式化\n"
-#: diskdrake/interactive.pm:1182
+#: diskdrake/interactive.pm:1193
#, c-format
msgid "Not formatted\n"
msgstr "未格式化\n"
-#: diskdrake/interactive.pm:1183
+#: diskdrake/interactive.pm:1194
#, c-format
msgid "Mounted\n"
msgstr "已挂载\n"
-#: diskdrake/interactive.pm:1184
+#: diskdrake/interactive.pm:1195
#, c-format
msgid "RAID %s\n"
msgstr "RAID %s\n"
-#: diskdrake/interactive.pm:1186
+#: diskdrake/interactive.pm:1197
#, c-format
msgid ""
"Loopback file(s):\n"
@@ -2580,36 +2603,36 @@ msgstr ""
"回环文件: \n"
" %s\n"
-#: diskdrake/interactive.pm:1187
+#: diskdrake/interactive.pm:1198
#, c-format
msgid ""
"Partition booted by default\n"
" (for MS-DOS boot, not for lilo)\n"
msgstr ""
"预设的启动分区\n"
-" (给 MS-DOS 启动用的,跟 lilo 无关)\n"
+" (给 MS-DOS 启动用的, 跟 lilo 无关)\n"
-#: diskdrake/interactive.pm:1189
+#: diskdrake/interactive.pm:1200
#, c-format
msgid "Level %s\n"
msgstr "级别 %s\n"
-#: diskdrake/interactive.pm:1190
+#: diskdrake/interactive.pm:1201
#, c-format
msgid "Chunk size %d KiB\n"
msgstr "组块大小 %d KB\n"
-#: diskdrake/interactive.pm:1191
+#: diskdrake/interactive.pm:1202
#, c-format
msgid "RAID-disks %s\n"
msgstr "RAID 磁盘 %s\n"
-#: diskdrake/interactive.pm:1193
+#: diskdrake/interactive.pm:1204
#, c-format
msgid "Loopback file name: %s"
msgstr "回环文件名称: %s"
-#: diskdrake/interactive.pm:1196
+#: diskdrake/interactive.pm:1207
#, c-format
msgid ""
"\n"
@@ -2621,7 +2644,7 @@ msgstr ""
"此分区很可能是驱动器分区。\n"
"您最好请不要更改它。\n"
-#: diskdrake/interactive.pm:1199
+#: diskdrake/interactive.pm:1210
#, c-format
msgid ""
"\n"
@@ -2633,68 +2656,68 @@ msgstr ""
"该 Bootstrap 分区特别\n"
"是保留给双重启动系统。\n"
-#: diskdrake/interactive.pm:1218
+#: diskdrake/interactive.pm:1227
#, c-format
msgid "Read-only"
msgstr "只读"
-#: diskdrake/interactive.pm:1219
+#: diskdrake/interactive.pm:1228
#, c-format
msgid "Size: %s\n"
msgstr "大小: %s\n"
-#: diskdrake/interactive.pm:1220
+#: diskdrake/interactive.pm:1229
#, c-format
msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "硬盘参数: %s 柱面,%s 磁头,%s 扇区\n"
+msgstr "硬盘参数: %s 柱面, %s 磁头, %s 扇区\n"
-#: diskdrake/interactive.pm:1221
+#: diskdrake/interactive.pm:1230
#, c-format
msgid "Info: "
msgstr "信息: "
-#: diskdrake/interactive.pm:1222
+#: diskdrake/interactive.pm:1231
#, c-format
msgid "LVM-disks %s\n"
msgstr "LVM 磁盘 %s\n"
-#: diskdrake/interactive.pm:1223
+#: diskdrake/interactive.pm:1232
#, c-format
msgid "Partition table type: %s\n"
msgstr "分区表类型: %s\n"
-#: diskdrake/interactive.pm:1224
+#: diskdrake/interactive.pm:1233
#, c-format
msgid "on channel %d id %d\n"
msgstr "通道 %d id %d\n"
-#: diskdrake/interactive.pm:1256
+#: diskdrake/interactive.pm:1265
#, c-format
msgid "Filesystem encryption key"
msgstr "文件系统加密密钥"
-#: diskdrake/interactive.pm:1257
+#: diskdrake/interactive.pm:1266
#, c-format
msgid "Choose your filesystem encryption key"
msgstr "选择该文件系统的加密密钥"
-#: diskdrake/interactive.pm:1260
+#: diskdrake/interactive.pm:1269
#, c-format
msgid "This encryption key is too simple (must be at least %d characters long)"
msgstr "这个加密密钥太简单了(至少要有 %d 个字符)"
-#: diskdrake/interactive.pm:1261
+#: diskdrake/interactive.pm:1270
#, c-format
msgid "The encryption keys do not match"
msgstr "两次加密密钥不符"
-#: diskdrake/interactive.pm:1264 network/netconnect.pm:1040
-#: standalone/drakconnect:395
+#: diskdrake/interactive.pm:1273 network/netconnect.pm:1136
+#: standalone/drakconnect:397
#, c-format
msgid "Encryption key"
msgstr "加密密钥"
-#: diskdrake/interactive.pm:1265
+#: diskdrake/interactive.pm:1274
#, c-format
msgid "Encryption key (again)"
msgstr "加密密钥(再输入一次)"
@@ -2706,8 +2729,8 @@ msgstr "更改类型"
#: diskdrake/smbnfs_gtk.pm:163
#, c-format
-msgid "Can't login using username %s (bad password?)"
-msgstr "不能使用用户名 %s 登录(密码错误?)"
+msgid "Can not login using username %s (bad password?)"
+msgstr "不能使用用户名 %s 登录(密码错误?)"
#: diskdrake/smbnfs_gtk.pm:167 diskdrake/smbnfs_gtk.pm:176
#, c-format
@@ -2728,9 +2751,9 @@ msgstr "另一个"
#, c-format
msgid ""
"Please enter your username, password and domain name to access this host."
-msgstr "要访问此主机,请输入您的用户名,密码和域名"
+msgstr "要访问此主机, 请输入您的用户名, 密码和域名"
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3489
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3494
#, c-format
msgid "Username"
msgstr "用户名"
@@ -2748,7 +2771,7 @@ msgstr "搜索新服务器"
#: do_pkgs.pm:16 do_pkgs.pm:31
#, c-format
msgid "The package %s needs to be installed. Do you want to install it?"
-msgstr "需要安装软件包 %s。您同意安装吗?"
+msgstr "需要安装软件包 %s。您同意安装吗?"
#: do_pkgs.pm:21 do_pkgs.pm:36
#, c-format
@@ -2760,52 +2783,52 @@ msgstr "无法找到必需的软件包 %s"
msgid "Installing packages..."
msgstr "正在安装软件包..."
-#: do_pkgs.pm:216
+#: do_pkgs.pm:217
#, c-format
msgid "Removing packages..."
msgstr "正在删除软件包..."
-#: fs.pm:445 fs.pm:494
+#: fs.pm:487 fs.pm:536
#, c-format
msgid "Mounting partition %s"
msgstr "正在挂载分区 %s"
-#: fs.pm:446 fs.pm:495
+#: fs.pm:488 fs.pm:537
#, c-format
msgid "mounting partition %s in directory %s failed"
msgstr "将分区 %s 挂载于目录 %s 失败"
-#: fs.pm:466 fs.pm:473
+#: fs.pm:508 fs.pm:515
#, c-format
msgid "Checking %s"
msgstr "正在检查 %s"
-#: fs.pm:511 partition_table.pm:387
+#: fs.pm:553 partition_table.pm:391
#, c-format
msgid "error unmounting %s: %s"
msgstr "卸载 %s 出错: %s"
-#: fs.pm:543
+#: fs.pm:585
#, c-format
msgid "Enabling swap partition %s"
msgstr "正在启用 swap 分区 %s"
-#: fs/format.pm:39 fs/format.pm:46
+#: fs/format.pm:44 fs/format.pm:51
#, c-format
msgid "Formatting partition %s"
msgstr "正在格式化分区 %s"
-#: fs/format.pm:43
+#: fs/format.pm:48
#, c-format
msgid "Creating and formatting file %s"
msgstr "正在创建和格式化文件 %s"
-#: fs/format.pm:78
+#: fs/format.pm:83
#, c-format
-msgid "I don't know how to format %s in type %s"
+msgid "I do not know how to format %s in type %s"
msgstr "不知道如何将 %s 格式化成 %s 类型"
-#: fs/format.pm:80
+#: fs/format.pm:88 fs/format.pm:90
#, c-format
msgid "%s formatting of %s failed"
msgstr "%s 格式化 %s 失败"
@@ -2817,7 +2840,7 @@ msgid ""
"(e.g, for faster access on the news spool to speed up news servers)."
msgstr ""
"不在此文件系统更新 inode 访问次数\n"
-"(例如,为了加速对新闻服务器的新闻池的访问)"
+"(例如, 为了加速对新闻服务器的新闻池的访问)"
#: fs/mount_options.pm:115
#, c-format
@@ -2826,7 +2849,7 @@ msgid ""
"the -a option will not cause the file system to be mounted)."
msgstr ""
"只能显式装载。\n"
-"(即,-a 选项将不会装载文件系统)"
+"(即, -a 选项将不会装载文件系统)"
#: fs/mount_options.pm:118
#, c-format
@@ -2841,7 +2864,7 @@ msgid ""
"containing binaries for architectures other than its own."
msgstr ""
"不允许在装载的文件系统上执行任何二进制文件。\n"
-"此选项对于特定服务器可能非常有用,比如服务器所包含的文件系统中包含其它\n"
+"此选项对于特定服务器可能非常有用, 比如服务器所包含的文件系统中包含其它\n"
"架构的二进制文件。"
#: fs/mount_options.pm:124
@@ -2852,7 +2875,7 @@ msgid ""
"have suidperl(1) installed.)"
msgstr ""
"不允许 set-user-identifier 或 set-group-identifier 位生效。\n"
-"(这可能比较安全,如果您安装了 suidperl(1) 则不太安全。)"
+"(这可能比较安全, 如果您安装了 suidperl(1) 则不太安全。)"
#: fs/mount_options.pm:128
#, c-format
@@ -2874,9 +2897,9 @@ msgid ""
"(unless overridden by subsequent options, as in the option line\n"
"user,exec,dev,suid )."
msgstr ""
-"允许普通用户装载文件系统。装载用户的用户名将写入 mtab,这样他就可以稍候\n"
-"再次拆卸文件系统。此选项意味着选项 noexec,nosuid 以及 nodev(除非在选项\n"
-"行中用单独的选项 user,exec,dev,suid 加以覆盖)。"
+"允许普通用户装载文件系统。装载用户的用户名将写入 mtab, 这样他就可以稍候\n"
+"再次拆卸文件系统。此选项意味着选项 noexec, nosuid 以及 nodev(除非在选项\n"
+"行中用单独的选项 user, exec, dev, suid 加以覆盖)。"
#: fs/mount_options.pm:142
#, c-format
@@ -2888,14 +2911,14 @@ msgstr "给普通用户以写权限"
msgid "Give read-only access to ordinary users"
msgstr "给普通用户以只读权限"
-#: fs/type.pm:364
+#: fs/type.pm:370
#, c-format
-msgid "You can't use JFS for partitions smaller than 16MB"
+msgid "You can not use JFS for partitions smaller than 16MB"
msgstr "您不能把 JFS(日志文件系统)用于小于 16 MB 的分区"
-#: fs/type.pm:365
+#: fs/type.pm:371
#, c-format
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgid "You can not use ReiserFS for partitions smaller than 32MB"
msgstr "您不能把 ReiserFS 用于小于 32 MB 的分区"
#: fsedit.pm:25
@@ -2908,39 +2931,40 @@ msgstr "有 /usr"
msgid "server"
msgstr "服务器"
-#: fsedit.pm:168
+#: fsedit.pm:184
#, c-format
msgid ""
-"I can't read the partition table of device %s, it's too corrupted for me :(\n"
+"I can not read the partition table of device %s, it's too corrupted for me :"
+"(\n"
"I can try to go on, erasing over bad partitions (ALL DATA will be lost!).\n"
"The other solution is to not allow DrakX to modify the partition table.\n"
"(the error is %s)\n"
"\n"
"Do you agree to lose all the partitions?\n"
msgstr ""
-"我无法读取设备 %s 的分区表,这个分区表破坏得太严重了 :(\n"
-"我可以尝试清除坏分区(所有的数据将被清除!),然后继续。\n"
+"我无法读取设备 %s 的分区表, 这个分区表破坏得太严重了 :(\n"
+"我可以尝试清除坏分区(所有的数据将被清除!), 然后继续。\n"
"另外一个解决办法是禁止 DrakX 修改分区表。\n"
"(错误是 %s)\n"
"\n"
-"您同意清除所有分区吗?\n"
+"您同意清除所有分区吗?\n"
-#: fsedit.pm:385
+#: fsedit.pm:401
#, c-format
msgid "Mount points must begin with a leading /"
msgstr "挂载点必需要以 / 为开头"
-#: fsedit.pm:386
+#: fsedit.pm:402
#, c-format
msgid "Mount points should contain only alphanumerical characters"
msgstr "挂载点只能包含字母和数字"
-#: fsedit.pm:387
+#: fsedit.pm:403
#, c-format
msgid "There is already a partition with mount point %s\n"
msgstr "已经有一个分区的挂载点是 %s\n"
-#: fsedit.pm:389
+#: fsedit.pm:405
#, c-format
msgid ""
"You've selected a software RAID partition as root (/).\n"
@@ -2948,15 +2972,15 @@ msgid ""
"Please be sure to add a /boot partition"
msgstr ""
"您选择了把软件 RAID 分区作为根(/)。\n"
-"如果没有一个 /boot 分区,各种启动引导程序都无法处理这种情况。\n"
-"所以,请增加一个 /boot 分区。"
+"如果没有一个 /boot 分区, 各种启动引导程序都无法处理这种情况。\n"
+"所以, 请增加一个 /boot 分区。"
-#: fsedit.pm:392
+#: fsedit.pm:408
#, c-format
-msgid "You can't use a LVM Logical Volume for mount point %s"
+msgid "You can not use a LVM Logical Volume for mount point %s"
msgstr "不能用 LVM 逻辑卷做 %s 挂载点"
-#: fsedit.pm:394
+#: fsedit.pm:410
#, c-format
msgid ""
"You've selected a LVM Logical Volume as root (/).\n"
@@ -2964,49 +2988,44 @@ msgid ""
"Please be sure to add a /boot partition"
msgstr ""
"您选择了把 LVM 卷作为根(/)。\n"
-"如果没有一个 /boot 分区,各种启动引导程序都无法处理这种情况。\n"
-"所以,请增加一个 /boot 分区。"
+"如果没有一个 /boot 分区, 各种启动引导程序都无法处理这种情况。\n"
+"所以, 请增加一个 /boot 分区。"
-#: fsedit.pm:397
+#: fsedit.pm:413
#, c-format
msgid ""
-"You may not be able to install lilo (since lilo doesn't handle a LV on "
+"You may not be able to install lilo (since lilo does not handle a LV on "
"multiple PVs)"
msgstr "您可能无法安装 lilo(因为 lilo 不能处理多轨道的启动光盘)"
-#: fsedit.pm:400 fsedit.pm:402
+#: fsedit.pm:416 fsedit.pm:418
#, c-format
msgid "This directory should remain within the root filesystem"
msgstr "这个目录应该保留在根文件系统中"
-#: fsedit.pm:404 fsedit.pm:406
+#: fsedit.pm:420 fsedit.pm:422
#, 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:408
+#: fsedit.pm:424
#, c-format
-msgid "You can't use an encrypted file system for mount point %s"
+msgid "You can not use an encrypted file system for mount point %s"
msgstr "挂载点 %s 不能使用用加密的文件系统"
-#: fsedit.pm:469
+#: fsedit.pm:485
#, c-format
msgid "Not enough free space for auto-allocating"
msgstr "没有足够的空闲空间供自动分配"
-#: fsedit.pm:471
+#: fsedit.pm:487
#, c-format
msgid "Nothing to do"
msgstr "不做任何事"
-#: fsedit.pm:569
-#, c-format
-msgid "Error opening %s for writing: %s"
-msgstr "在打开 %s 写入时发生错误:%s"
-
-#: harddrake/data.pm:61
+#: harddrake/data.pm:61 install_any.pm:1505
#, c-format
msgid "Floppy"
msgstr "软盘"
@@ -3016,12 +3035,12 @@ msgstr "软盘"
msgid "Zip"
msgstr "Zip"
-#: harddrake/data.pm:81
+#: harddrake/data.pm:81 install_any.pm:1506
#, c-format
-msgid "Disk"
-msgstr "磁盘"
+msgid "Hard Disk"
+msgstr "硬盘"
-#: harddrake/data.pm:90
+#: harddrake/data.pm:90 install_any.pm:1507
#, c-format
msgid "CDROM"
msgstr "CDROM"
@@ -3036,7 +3055,7 @@ msgstr "CD/DVD 刻录机"
msgid "DVD-ROM"
msgstr "DVD-ROM"
-#: harddrake/data.pm:120 standalone/drakbackup:2045
+#: harddrake/data.pm:120 standalone/drakbackup:2051
#, c-format
msgid "Tape"
msgstr "磁带机"
@@ -3066,147 +3085,152 @@ msgstr "声卡"
msgid "Webcam"
msgstr "摄像头"
-#: harddrake/data.pm:181
+#: harddrake/data.pm:180
#, c-format
msgid "Processors"
msgstr "处理器"
-#: harddrake/data.pm:191
+#: harddrake/data.pm:190
#, c-format
msgid "ISDN adapters"
msgstr "ISDN 适配器"
-#: harddrake/data.pm:201
+#: harddrake/data.pm:200
#, c-format
msgid "Ethernetcard"
msgstr "以太网卡"
-#: harddrake/data.pm:219 network/netconnect.pm:484
+#: harddrake/data.pm:218 network/netconnect.pm:518
#, c-format
msgid "Modem"
msgstr "调制解调器"
-#: harddrake/data.pm:229
+#: harddrake/data.pm:228
#, c-format
msgid "ADSL adapters"
msgstr "ADSL 适配器"
-#: harddrake/data.pm:243
+#: harddrake/data.pm:242
#, c-format
-msgid "AGP controllers"
-msgstr "AGP 控制器"
+msgid "Memory"
+msgstr "内存"
-#: harddrake/data.pm:252
+#: harddrake/data.pm:251
#, c-format
-msgid "Bridges and system controllers"
-msgstr "桥接和系统控制器"
+msgid "AGP controllers"
+msgstr "AGP 控制器"
-#: harddrake/data.pm:261 help.pm:186 help.pm:855
-#: install_steps_interactive.pm:992 printer/printerdrake.pm:875
+#: harddrake/data.pm:260 help.pm:186 help.pm:855
+#: install_steps_interactive.pm:978
#, c-format
msgid "Printer"
msgstr "打印机"
-#: harddrake/data.pm:271
+#: harddrake/data.pm:270
#, c-format
msgid "Joystick"
msgstr "游戏杆"
-#: harddrake/data.pm:281
+#: harddrake/data.pm:280
#, c-format
msgid "(E)IDE/ATA controllers"
msgstr "(E)IDE/ATA 控制器"
-#: harddrake/data.pm:290
+#: harddrake/data.pm:289
#, c-format
msgid "SATA controllers"
msgstr "SATA 控制器"
-#: harddrake/data.pm:299
+#: harddrake/data.pm:298
#, c-format
msgid "Firewire controllers"
msgstr "火线控制器"
-#: harddrake/data.pm:308
+#: harddrake/data.pm:307
#, c-format
msgid "PCMCIA controllers"
msgstr "PCMCIA 控制器"
-#: harddrake/data.pm:321
+#: harddrake/data.pm:316
#, c-format
msgid "SCSI controllers"
msgstr "SCSI 控制器"
-#: harddrake/data.pm:330
+#: harddrake/data.pm:325
#, c-format
msgid "USB controllers"
msgstr "USB 控制器"
-#: harddrake/data.pm:339
+#: harddrake/data.pm:334
#, c-format
msgid "USB ports"
msgstr "USB 端口"
-#: harddrake/data.pm:348
+#: harddrake/data.pm:343
#, c-format
msgid "SMBus controllers"
msgstr "SMBus 控制器"
-#: harddrake/data.pm:357
+#: harddrake/data.pm:352
+#, c-format
+msgid "Bridges and system controllers"
+msgstr "桥接和系统控制器"
+
+#: harddrake/data.pm:361
#, c-format
msgid "UPS"
msgstr "UPS"
-#: harddrake/data.pm:366 help.pm:855 install_steps_interactive.pm:120
-#: install_steps_interactive.pm:952 standalone/keyboarddrake:24
+#: harddrake/data.pm:370 help.pm:855 install_steps_interactive.pm:118
+#: install_steps_interactive.pm:938 standalone/keyboarddrake:28
#, c-format
msgid "Keyboard"
msgstr "键盘"
-#: harddrake/data.pm:379 help.pm:855 install_steps_interactive.pm:985
+#: harddrake/data.pm:383 help.pm:855 install_steps_interactive.pm:971
#, c-format
msgid "Mouse"
msgstr "鼠标"
-#: harddrake/data.pm:393
+#: harddrake/data.pm:397
#, c-format
msgid "Scanner"
msgstr "扫描仪"
-#: harddrake/data.pm:403 standalone/harddrake2:431
+#: harddrake/data.pm:407 standalone/harddrake2:439
#, c-format
msgid "Unknown/Others"
msgstr "未知/其它"
-#: harddrake/data.pm:431
+#: harddrake/data.pm:435
#, c-format
msgid "cpu # "
msgstr "CPU # "
-#: harddrake/sound.pm:170 standalone/drakconnect:169
-#: standalone/drakconnect:613
+#: harddrake/sound.pm:191 standalone/drakconnect:169
+#: standalone/drakconnect:615
#, c-format
msgid "Please Wait... Applying the configuration"
msgstr "请稍候...正在应用配置"
-#: harddrake/sound.pm:206
+#: harddrake/sound.pm:227
#, c-format
msgid "No alternative driver"
msgstr "没有替代的驱动程序"
-#: harddrake/sound.pm:207
+#: harddrake/sound.pm:228
#, c-format
msgid ""
"There's no known OSS/ALSA alternative driver for your sound card (%s) which "
"currently uses \"%s\""
-msgstr "没有已知的 OSS/ALSA 替代驱动程序可以用在您的声卡(%s)上,现正使用“%s”"
+msgstr "没有已知的 OSS/ALSA 替代驱动程序可以用在您的声卡(%s)上, 现正使用“%s”"
-#: harddrake/sound.pm:213
+#: harddrake/sound.pm:234
#, c-format
msgid "Sound configuration"
msgstr "声音配置"
-#: harddrake/sound.pm:215
+#: harddrake/sound.pm:236
#, c-format
msgid ""
"Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -3214,7 +3238,10 @@ msgid ""
msgstr ""
"您可以在这里配置可以用在您的声卡(%s)上的替代驱动程序(可以选择 OSS 或 ALSA)。"
-#: harddrake/sound.pm:217
+#. -PO: here the first %s is either "OSS" or "ALSA",
+#. -PO: the second %s is the name of the current driver
+#. -PO: and the third %s is the name of the default driver
+#: harddrake/sound.pm:241
#, c-format
msgid ""
"\n"
@@ -3226,7 +3253,7 @@ msgstr ""
"\n"
"您的声卡现在正在使用 %s“%s”驱动程序(其默认驱动程序为“%s”)"
-#: harddrake/sound.pm:219
+#: harddrake/sound.pm:243
#, c-format
msgid ""
"OSS (Open Sound System) was the first sound API. It's an OS independent "
@@ -3246,29 +3273,46 @@ msgid ""
"the ALSA library.\n"
msgstr ""
"OSS(开放声音系统)是第一个声音 API。这是一个与操作系统无关的声音 API(在绝大多"
-"数 UNIX 系统可用),但是它非常基础且 API 也受到很大限制。\n"
-"更重要的是,OSS 驱动程序需要彻底的重新开发。\n"
+"数 UNIX 系统可用), 但是它非常基础且 API 也受到很大限制。\n"
+"更重要的是, OSS 驱动程序需要彻底的重新开发。\n"
"\n"
-"ALSA(高级 Linux 声音体系)是一个模块化架构,它支持大量的 ISA、USB 和 PCI 声"
+"ALSA(高级 Linux 声音体系)是一个模块化架构, 它支持大量的 ISA、USB 和 PCI 声"
"卡。\n"
"\n"
"它提供的 API 比 OSS 高级得多。\n"
"\n"
-"要使用 alsa,您可以获得:\n"
+"要使用 alsa, 您可以获得:\n"
"- 与旧的 OSS 兼容的 API\n"
-"- 新的 ALSA API 带来许多增强特性,但这需要使用 ALSA 库。\n"
+"- 新的 ALSA API 带来许多增强特性, 但这需要使用 ALSA 库。\n"
-#: harddrake/sound.pm:233 harddrake/sound.pm:318 standalone/drakups:146
+#: harddrake/sound.pm:257 harddrake/sound.pm:342 standalone/drakups:146
#, c-format
msgid "Driver:"
msgstr "驱动程序: "
-#: harddrake/sound.pm:238
+#: harddrake/sound.pm:262
#, c-format
msgid "Trouble shooting"
msgstr "疑难解答"
-#: harddrake/sound.pm:246
+#: harddrake/sound.pm:270 keyboard.pm:391 lang.pm:1039
+#: network/netconnect.pm:504 printer/printerdrake.pm:1142
+#: printer/printerdrake.pm:2142 printer/printerdrake.pm:2228
+#: printer/printerdrake.pm:2274 printer/printerdrake.pm:2341
+#: printer/printerdrake.pm:2376 printer/printerdrake.pm:2684
+#: printer/printerdrake.pm:2691 printer/printerdrake.pm:3643
+#: printer/printerdrake.pm:3970 printer/printerdrake.pm:4092
+#: printer/printerdrake.pm:5183 standalone/drakTermServ:325
+#: standalone/drakTermServ:1111 standalone/drakTermServ:1172
+#: standalone/drakTermServ:1821 standalone/drakbackup:510
+#: standalone/drakbackup:609 standalone/drakboot:165 standalone/drakclock:224
+#: standalone/drakconnect:971 standalone/drakfloppy:291 standalone/drakups:27
+#: standalone/scannerdrake:51 standalone/scannerdrake:940
+#, c-format
+msgid "Warning"
+msgstr "警告"
+
+#: harddrake/sound.pm:270
#, c-format
msgid ""
"The old \"%s\" driver is blacklisted.\n"
@@ -3283,47 +3327,47 @@ msgstr ""
"\n"
"新的“%s”驱动程序仅会在下此启动时使用。"
-#: harddrake/sound.pm:254
+#: harddrake/sound.pm:278
#, c-format
msgid "No open source driver"
msgstr "没有开放源代码的驱动程序"
-#: harddrake/sound.pm:255
+#: harddrake/sound.pm:279
#, c-format
msgid ""
"There's no free driver for your sound card (%s), but there's a proprietary "
"driver at \"%s\"."
msgstr ""
-"没有已知的 OSS/ALSA 替代驱动程序可以用在您的(%s)声卡上,不过在“%s”有一个专有"
+"没有已知的 OSS/ALSA 替代驱动程序可以用在您的(%s)声卡上, 不过在“%s”有一个专有"
"的驱动程序。"
-#: harddrake/sound.pm:258
+#: harddrake/sound.pm:282
#, c-format
msgid "No known driver"
msgstr "没有已知驱动程序"
-#: harddrake/sound.pm:259
+#: harddrake/sound.pm:283
#, c-format
msgid "There's no known driver for your sound card (%s)"
msgstr "没有已知的驱动程序可以用在您的声卡(%s)上"
-#: harddrake/sound.pm:263
+#: harddrake/sound.pm:287
#, c-format
msgid "Unknown driver"
msgstr "未知的驱动程序"
-#: harddrake/sound.pm:264
+#: harddrake/sound.pm:288
#, c-format
msgid "Error: The \"%s\" driver for your sound card is unlisted"
msgstr "错误: 您的“%s”声卡驱动程序未被列出"
-#: harddrake/sound.pm:278
+#: harddrake/sound.pm:302
#, c-format
msgid "Sound trouble shooting"
msgstr "声音疑难解决"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: harddrake/sound.pm:281
+#: harddrake/sound.pm:305
#, c-format
msgid ""
"The classic bug sound tester is to run the following commands:\n"
@@ -3362,18 +3406,18 @@ msgstr ""
"\n"
"- “/sbin/fuser -v /dev/dsp”将会告诉您哪个程序使用声卡。\n"
-#: harddrake/sound.pm:307
+#: harddrake/sound.pm:331
#, c-format
msgid "Let me pick any driver"
msgstr "让我挑选任意驱动"
-#: harddrake/sound.pm:310
+#: harddrake/sound.pm:334
#, c-format
msgid "Choosing an arbitrary driver"
msgstr "选择其它驱动"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: harddrake/sound.pm:313
+#: harddrake/sound.pm:337
#, c-format
msgid ""
"If you really think that you know which driver is the right one for your "
@@ -3415,8 +3459,8 @@ msgid ""
"If your card is misdetected, you can force the right tuner and card types "
"here. Just select your tv card parameters if needed."
msgstr ""
-"对于大多数现代的电视卡,GNU/Linux 内核的 bttv 模块能自动检测正确的参数。\n"
-"如果自动检测不适合您的卡,您可以在这里强制设定正确的调协器及卡的类型。只有必"
+"对于大多数现代的电视卡, GNU/Linux 内核的 bttv 模块能自动检测正确的参数。\n"
+"如果自动检测不适合您的卡, 您可以在这里强制设定正确的调协器及卡的类型。只有必"
"要时才设置电视卡参数。"
#: harddrake/v4l.pm:312
@@ -3462,12 +3506,12 @@ msgid ""
"terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
"button will reboot your computer."
msgstr ""
-"在继续之前,您应该仔细阅读许可协议的条款。该许可适用于整个 Mandrakelinux发行"
-"版。如果您同意其中的全部条款,请选中\"%s\"框。如果不同意,单击\"%s\"按钮将重"
+"在继续之前, 您应该仔细阅读许可协议的条款。该许可适用于整个 Mandrakelinux发行"
+"版。如果您同意其中的全部条款, 请选中\"%s\"框。如果不同意, 单击\"%s\"按钮将重"
"新启动您的计算机。"
-#: help.pm:14 install_steps_gtk.pm:567 install_steps_interactive.pm:94
-#: install_steps_interactive.pm:745 standalone/drakautoinst:216
+#: help.pm:14 install_steps_gtk.pm:552 install_steps_interactive.pm:92
+#: install_steps_interactive.pm:731 standalone/drakautoinst:216
#, c-format
msgid "Accept"
msgstr "接受"
@@ -3477,16 +3521,17 @@ msgstr "接受"
msgid ""
"GNU/Linux is a multi-user system which means each user can have his or her\n"
"own preferences, own files and so on. But unlike \"root\", who is the\n"
-"system administrator, the users you add at this point won't be authorized\n"
+"system administrator, the users you add at this point will not be "
+"authorized\n"
"to change anything except their own files and their own configurations,\n"
"protecting the system from unintentional or malicious changes which could\n"
"impact on the system as a whole. You'll have to create at least one regular\n"
"user for yourself -- this is the account which you should use for routine,\n"
"day-to-day usage. Although it's very easy to log in as \"root\" to do\n"
"anything and everything, it may also be very dangerous! A very simple\n"
-"mistake could mean that your system won't work any more. If you make a\n"
+"mistake could mean that your system will not work any more. If you make a\n"
"serious mistake as a regular user, the worst that can happen is that you'll\n"
-"lose some information, but you won't affect the entire system.\n"
+"lose some information, but you will not affect the entire system.\n"
"\n"
"The first field asks you for a real name. Of course, this is not mandatory\n"
"-- you can actually enter whatever you like. DrakX will use the first word\n"
@@ -3507,55 +3552,55 @@ msgid ""
"\n"
"When you're finished adding users, you'll be asked to choose a user who\n"
"will be automatically logged into the system when the computer boots up. If\n"
-"you're interested in that feature (and don't care much about local\n"
+"you're interested in that feature (and do not care much about local\n"
"security), choose the desired user and window manager, then click on\n"
"\"%s\". If you're not interested in this feature, uncheck the \"%s\" box."
msgstr ""
-"GNU/Linux 是多用户系统,这意味着每个用户可拥有自己独立的首选项,以及自己的文"
-"件,等等。若要了解关于多用户系统的更多内容,建议您阅读\n"
+"GNU/Linux 是多用户系统, 这意味着每个用户可拥有自己独立的首选项, 以及自己的文"
+"件, 等等。若要了解关于多用户系统的更多内容, 建议您阅读\n"
"``初学者指南''。但是与系统管理员 \"root\"\n"
-"不同,您在此处添加的用户所能做的更改将仅限于他们自己的文件及他们自己的配置,"
+"不同, 您在此处添加的用户所能做的更改将仅限于他们自己的文件及他们自己的配置, "
"这可使系统免遭有意无意的破坏。您至少需要为您自己创建一个普通用户 --\n"
"这应该是您每天所使用的主要账户。尽管以 \"root\"\n"
-"登录很容易,您可以不受任何限制的完成任何操作,但这很危险!非常低级的错误就可"
-"能让您的系统再也无法启动。如果您以普通用户的身份犯了非常危险的错误,最坏的情"
-"况也就是丢失某些信息,而不会影响整个系统。\n"
+"登录很容易, 您可以不受任何限制的完成任何操作, 但这很危险!非常低级的错误就可"
+"能让您的系统再也无法启动。如果您以普通用户的身份犯了非常危险的错误, 最坏的情"
+"况也就是丢失某些信息, 而不会影响整个系统。\n"
"\n"
-"第一个域会询问您的真实姓名。当然,这并不是必需的 -- 您当然可以输入您喜欢的任"
+"第一个域会询问您的真实姓名。当然, 这并不是必需的 -- 您当然可以输入您喜欢的任"
"何内容。DrakX\n"
-"将会使用您在此域中输入的第一个单词作为\"%s\"域的初始值,即此用户登录系统所用"
-"的名称。如果您喜欢的话,您也可以不使用默认值,而换用您喜欢的用户名。下一步就"
-"是输入密码。从安全的角度来说,非特权(普通)用户密码并没有\n"
-"\"root\" 密码那么需要保密,但是也没有理由忽视这个密码,而将其留空或设置得太简"
-"单: 反正,您自己的文件将会是最危险的。\n"
+"将会使用您在此域中输入的第一个单词作为\"%s\"域的初始值, 即此用户登录系统所用"
+"的名称。如果您喜欢的话, 您也可以不使用默认值, 而换用您喜欢的用户名。下一步就"
+"是输入密码。从安全的角度来说, 非特权(普通)用户密码并没有\n"
+"\"root\" 密码那么需要保密, 但是也没有理由忽视这个密码, 而将其留空或设置得太简"
+"单: 反正, 您自己的文件将会是最危险的。\n"
"\n"
-"您单击\"%s\"之后,您还可以添加其它用户。可以为您的每个朋友添加一个用户: 例"
-"如,您的父亲或您的妹妹。当您添加完用户之后,请单击\"%s\"。\n"
+"您单击\"%s\"之后, 您还可以添加其它用户。可以为您的每个朋友添加一个用户: 例"
+"如, 您的父亲或您的妹妹。当您添加完用户之后, 请单击\"%s\"。\n"
"\n"
"单击\"%s\"按钮允许您更改该用户的默认 \"shell\"(默认为 bash)。\n"
"\n"
"\n"
-"当您添加完用户之后,您可以从中选择一个用户,计算机启动后将自动以该用户的身份"
-"登录到系统。如果您对此特性感兴趣(也不考虑太多的本地安全性),请选择希望的用户"
-"和窗口管理器,然后单击\"%s\"。如果您对此特性不感兴趣,请不要选中\"%s\"框。"
+"当您添加完用户之后, 您可以从中选择一个用户, 计算机启动后将自动以该用户的身份"
+"登录到系统。如果您对此特性感兴趣(也不考虑太多的本地安全性), 请选择希望的用户"
+"和窗口管理器, 然后单击\"%s\"。如果您对此特性不感兴趣, 请不要选中\"%s\"框。"
-#: help.pm:51 printer/printerdrake.pm:1488 printer/printerdrake.pm:1608
+#: help.pm:51 printer/printerdrake.pm:1595 printer/printerdrake.pm:1715
#, c-format
msgid "User name"
msgstr "用户名"
-#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:247
-#: interactive.pm:403 interactive/newt.pm:317 network/netconnect.pm:280
-#: network/tools.pm:198 printer/printerdrake.pm:3268
-#: standalone/drakTermServ:372 standalone/drakbackup:3941
-#: standalone/drakbackup:4035 standalone/drakbackup:4052
-#: standalone/drakbackup:4070 ugtk2.pm:515
+#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:233
+#: install_steps_gtk.pm:689 interactive.pm:424 interactive/newt.pm:317
+#: network/netconnect.pm:278 network/tools.pm:182 printer/printerdrake.pm:3581
+#: standalone/drakTermServ:382 standalone/drakbackup:3946
+#: standalone/drakbackup:4040 standalone/drakbackup:4057
+#: standalone/drakbackup:4075 ugtk2.pm:506
#, c-format
msgid "Next"
msgstr "下一步"
#: help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722
-#: interactive.pm:371
+#: interactive.pm:385
#, c-format
msgid "Advanced"
msgstr "高级"
@@ -3596,18 +3641,18 @@ msgid ""
"\"second lowest SCSI ID\", etc."
msgstr ""
"在此列出了您硬盘上已有的 Linux\n"
-"分区。您可以保留向导所作的选择,因为对于大多数安装来说这一选择是较好的。如果"
-"您想要进行更改的话,您必须至少定义一个根分区(\"/\")。不要选择太小的分区,否则"
-"您可能无法安装足够的软件。如果您想要将您的数据存放在单独的分区中,您还需要创"
+"分区。您可以保留向导所作的选择, 因为对于大多数安装来说这一选择是较好的。如果"
+"您想要进行更改的话, 您必须至少定义一个根分区(\"/\")。不要选择太小的分区, 否则"
+"您可能无法安装足够的软件。如果您想要将您的数据存放在单独的分区中, 您还需要创"
"建一个\n"
"\"/home\" 分区(仅当您有多于一个 Linux 分区时才可用)。\n"
"\n"
-"每个分区都按下列格式列出: \"名称\",\"容量\"。\n"
+"每个分区都按下列格式列出: \"名称\", \"容量\"。\n"
"\n"
-"\"名称\"结构为: \"硬盘类型\",\"硬盘编号\",\"分区编号\"(例如,\"hda1\")。\n"
+"\"名称\"结构为: \"硬盘类型\", \"硬盘编号\", \"分区编号\"(例如, \"hda1\")。\n"
"\n"
-"\"硬盘类型\"取决于硬盘的接口方式。如您的硬盘是 IDE 硬盘,则\"硬盘类型\"就为"
-"\"hd\";若硬盘为 SCSI 硬盘,就为\"sd\"。\n"
+"\"硬盘类型\"取决于硬盘的接口方式。如您的硬盘是 IDE 硬盘, 则\"硬盘类型\"就为"
+"\"hd\";若硬盘为 SCSI 硬盘, 就为\"sd\"。\n"
"\n"
"\"硬盘编号\"就是在\"hd\"或\"sd\"后面的那个字母。对于IDE硬盘: \n"
"\n"
@@ -3619,8 +3664,8 @@ msgstr ""
"\n"
" * \"d\"意味着\"从IDE控制器的从硬盘\"。\n"
"\n"
-"对于 SCSI 硬盘,\"a\"意味着\"最低的 SCSI ID\",\"b\"意味着\"第二低的 SCSI ID"
-"\",依此类推。"
+"对于 SCSI 硬盘, \"a\"意味着\"最低的 SCSI ID\", \"b\"意味着\"第二低的 SCSI ID"
+"\", 依此类推。"
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
@@ -3633,9 +3678,9 @@ msgid ""
"CD at hand, just click on \"%s\", the corresponding packages will not be\n"
"installed."
msgstr ""
-"Mandrakelinux 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM,"
+"Mandrakelinux 安装分布于多张 CD-ROM 中。如果选中软件包位于另外的 CD-ROM, "
"DrakX 将弹出当前\n"
-"CD,并要求您插入所需的正确 CD。如果您手中没有所请求的 CD,只需单击\"%s\",就"
+"CD, 并要求您插入所需的正确 CD。如果您手中没有所请求的 CD, 只需单击\"%s\", 就"
"不会安装相应的软件包了。"
# DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -3700,48 +3745,48 @@ msgid ""
"megabytes."
msgstr ""
"现在该指定要在您的系统中安装哪些程序了。Mandrakelinux\n"
-"为您准备了数千个软件包。而为了使管理软件包更加容易,软件包已经按相似程度分成"
+"为您准备了数千个软件包。而为了使管理软件包更加容易, 软件包已经按相似程度分成"
"了多个组。\n"
"\n"
"Mandrakelinux\n"
-"按四个类别对软件包进行了分类。您可以从不同的类别混合选择应用程序。也就是说,"
+"按四个类别对软件包进行了分类。您可以从不同的类别混合选择应用程序。也就是说, "
"``工作站''中也可以选择安装``服务器''分类中的应用程序。\n"
"\n"
-" * \"%s\":如果您计划将您的计算机用作工作站,请选择工作站分类中的一个或多个"
+" * \"%s\":如果您计划将您的计算机用作工作站, 请选择工作站分类中的一个或多个"
"组。\n"
"\n"
-" * \"%s\":如果您计划使用您的计算机进行编程,请从该类别中选择相应的组。特殊"
+" * \"%s\":如果您计划使用您的计算机进行编程, 请从该类别中选择相应的组。特殊"
"的 \"LSB\"\n"
-"组将会对您的系统进行配置,这样所编译的结果将会尽可能遵从 Linux 标准基础(LSB)"
+"组将会对您的系统进行配置, 这样所编译的结果将会尽可能遵从 Linux 标准基础(LSB)"
"规范。\n"
"\n"
-" 选择 \"LSB\" 组将安装 \"2.4\" 内核系列,而不是默认的 \"2.6\" 内核。这是为"
+" 选择 \"LSB\" 组将安装 \"2.4\" 内核系列, 而不是默认的 \"2.6\" 内核。这是为"
"了保证系统能够百分之百的遵从\n"
-"LSB。但是,即便您不选择 \"LSB\" 组,您也会得到一个接近百分之百遵从 LSB 的系"
+"LSB。但是, 即便您不选择 \"LSB\" 组, 您也会得到一个接近百分之百遵从 LSB 的系"
"统。\n"
"\n"
-" * \"%s\":如果您的计算机即将成为服务器,请选择您想要安装在计算机上的公共服"
+" * \"%s\":如果您的计算机即将成为服务器, 请选择您想要安装在计算机上的公共服"
"务。\n"
"\n"
-" * \"%s\":这里您可以选择您首选的图形环境。如果您想要使用图形界面,则至少要选"
+" * \"%s\":这里您可以选择您首选的图形环境。如果您想要使用图形界面, 则至少要选"
"择其中一个。\n"
"\n"
-"将鼠标光标移动到组名之上,您会看到该组的简要描述文字。\n"
+"将鼠标光标移动到组名之上, 您会看到该组的简要描述文字。\n"
"\n"
-"如果您对所提供的软件包比较熟悉,或者您想要完全控制安装什么软件包,就可以选中"
+"如果您对所提供的软件包比较熟悉, 或者您想要完全控制安装什么软件包, 就可以选中"
"\"%s\"选项。\n"
"\n"
-"如果您以\"%s\"模式启动安装,您可以不选择任何组,这样可以避免安装任何新软件"
+"如果您以\"%s\"模式启动安装, 您可以不选择任何组, 这样可以避免安装任何新软件"
"包。这对于修复或升级已有系统很有帮助。\n"
"\n"
-"如果您在执行常规安装(与升级相对)的时候一个组也没有选中,会弹出一个对话框建议"
+"如果您在执行常规安装(与升级相对)的时候一个组也没有选中, 会弹出一个对话框建议"
"最小安装的不同选项:\n"
"\n"
" * \"%s\":安装图形桌面所需的最少软件包。\n"
"\n"
-" * \"%s\":安装基本系统,另加基本工具及相应文档。此安装适合建立服务器。\n"
+" * \"%s\":安装基本系统, 另加基本工具及相应文档。此安装适合建立服务器。\n"
"\n"
-" * \"%s\":将安装使 Linux 系统能够正常运行的最少软件包。使用此安装,您仅仅有"
+" * \"%s\":将安装使 Linux 系统能够正常运行的最少软件包。使用此安装, 您仅仅有"
"命令行界面。此安装的总计大小为约 65 兆字节。"
#: help.pm:146 share/compssUsers.pl:23
@@ -3760,7 +3805,7 @@ msgstr "开发"
msgid "Graphical Environment"
msgstr "图形环境"
-#: help.pm:146 install_steps_gtk.pm:242 install_steps_interactive.pm:646
+#: help.pm:146 install_steps_gtk.pm:231 install_steps_interactive.pm:642
#, c-format
msgid "Individual package selection"
msgstr "选择单个软件包"
@@ -3805,7 +3850,8 @@ msgid ""
"services at boot time. Even if they are safe and have no known issues at\n"
"the time the distribution was shipped, it is entirely possible that\n"
"security holes were discovered after this version of Mandrakelinux was\n"
-"finalized. If you don't know what a particular service is supposed to do or\n"
+"finalized. If you do not know what a particular service is supposed to do "
+"or\n"
"why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
"the listed services and they will be started automatically at boot time. !!\n"
"\n"
@@ -3823,45 +3869,46 @@ msgid ""
"another installation. See the second tip of the last step on how to create\n"
"such a floppy."
msgstr ""
-"如果您选中了想要选择单个软件包,安装程序会显示出一个软件包的树形结构,其中会"
-"按照组和子组分类显示全部软件包。浏览软件包树时,您可以选择整个组,子组或单个"
+"如果您选中了想要选择单个软件包, 安装程序会显示出一个软件包的树形结构, 其中会"
+"按照组和子组分类显示全部软件包。浏览软件包树时, 您可以选择整个组, 子组或单个"
"软件包。\n"
"\n"
-"只要您在左侧的树中选择了软件包,右侧就会出现该软件包用途的描述。\n"
+"只要您在左侧的树中选择了软件包, 右侧就会出现该软件包用途的描述。\n"
"\n"
"!!\n"
-"如果选择了服务器软件包,不管是您特意选中的,还是因为该软件包是某组的成员,您"
-"都需要确认是否真的想要安装这些服务器。默认情况下,Mandrakelinux\n"
-"会在启动时自动启动已安装的全部服务。尽管在发行版送出时这些服务是安全的,但完"
+"如果选择了服务器软件包, 不管是您特意选中的, 还是因为该软件包是某组的成员, 您"
+"都需要确认是否真的想要安装这些服务器。默认情况下, Mandrakelinux\n"
+"会在启动时自动启动已安装的全部服务。尽管在发行版送出时这些服务是安全的, 但完"
"全有可能在此版本 Mandrakelinux\n"
-"完成后发现了相应软件的安全漏洞。如果您并不知道特定服务的用途,或者不知道为什"
-"么要安装这些服务,请单击\"%s\"。单击\"%s\"将安装列出的服务,并且启动时这些服"
+"完成后发现了相应软件的安全漏洞。如果您并不知道特定服务的用途, 或者不知道为什"
+"么要安装这些服务, 请单击\"%s\"。单击\"%s\"将安装列出的服务, 并且启动时这些服"
"务会被自动启动。\n"
"!!\n"
"\n"
"\n"
"\"%s\"选项用于在安装程序自动选择软件包以解决依赖性问题时禁止弹出警告对话框。"
-"某些软件包会依赖其它软件包,而要安装一个软件包的需要先安装另外一个软件包。安"
-"装程序会自动确定要满足依赖性需要安装哪些软件包,以便顺利完成安装。\n"
+"某些软件包会依赖其它软件包, 而要安装一个软件包的需要先安装另外一个软件包。安"
+"装程序会自动确定要满足依赖性需要安装哪些软件包, 以便顺利完成安装。\n"
"\n"
"\n"
"列表底部的小软盘图标允许您装入先前安装时创建的软件包列表。如果您一次想要配置"
-"多台计算机,此选项可能非常有用。单击此图标后,您需要插入另外一次安装结束后创"
-"建的那张软盘。参看最后一步的第二条提示,其中描述了如何创建这样的软盘。"
+"多台计算机, 此选项可能非常有用。单击此图标后, 您需要插入另外一次安装结束后创"
+"建的那张软盘。参看最后一步的第二条提示, 其中描述了如何创建这样的软盘。"
-#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:722
-#: interactive.pm:149 modules/interactive.pm:71 standalone/drakbackup:2503
-#: standalone/draksec:54 standalone/harddrake2:299 ugtk2.pm:1121
-#: wizards.pm:156
+#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:792
+#: interactive.pm:149 modules/interactive.pm:71 standalone/drakbackup:2508
+#: standalone/draksec:54 standalone/harddrake2:306 standalone/net_applet:255
+#: ugtk2.pm:899 wizards.pm:156
#, c-format
msgid "No"
msgstr "否"
-#: help.pm:180 help.pm:285 help.pm:444 install_any.pm:722 interactive.pm:149
-#: modules/interactive.pm:71 printer/printerdrake.pm:711
-#: standalone/drakbackup:2503 standalone/drakgw:290 standalone/drakgw:291
-#: standalone/drakgw:299 standalone/drakgw:309 standalone/draksec:55
-#: standalone/harddrake2:298 ugtk2.pm:1121 wizards.pm:156
+#: help.pm:180 help.pm:285 help.pm:444 install_any.pm:792 interactive.pm:149
+#: modules/interactive.pm:71 printer/printerdrake.pm:736
+#: standalone/drakbackup:2508 standalone/drakgw:287 standalone/drakgw:288
+#: standalone/drakgw:296 standalone/drakgw:306 standalone/draksec:55
+#: standalone/harddrake2:305 standalone/net_applet:259 ugtk2.pm:899
+#: wizards.pm:156
#, c-format
msgid "Yes"
msgstr "是"
@@ -3882,12 +3929,12 @@ msgid ""
"manual is similar to the one used during installation."
msgstr ""
"\"%s\":单击\"%s\"按钮将打开打印机配置向导。请参看``初学者指南''中的相应章"
-"节,其中详细描述了如何设置新打印机。那里给出的界面与安装时所用的界面大体相"
+"节, 其中详细描述了如何设置新打印机。那里给出的界面与安装时所用的界面大体相"
"同。"
-#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:622
-#: standalone/drakbackup:2329 standalone/drakbackup:2333
-#: standalone/drakbackup:2337 standalone/drakbackup:2341
+#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:607
+#: standalone/drakbackup:2333 standalone/drakbackup:2337
+#: standalone/drakbackup:2341 standalone/drakbackup:2345
#, c-format
msgid "Configure"
msgstr "配置"
@@ -3901,7 +3948,7 @@ msgid ""
"time.\n"
"\n"
"DrakX will list all services available on the current installation. Review\n"
-"each one of them carefully and uncheck those which aren't needed at boot\n"
+"each one of them carefully and uncheck those which are not needed at boot\n"
"time.\n"
"\n"
"A short explanatory text will be displayed about a service when it is\n"
@@ -3909,22 +3956,23 @@ msgid ""
"it is safer to leave the default behavior.\n"
"\n"
"!! At this stage, be very careful if you intend to use your machine as a\n"
-"server: you probably don't want to start any services which you don't need.\n"
+"server: you probably do not want to start any services which you do not "
+"need.\n"
"Please remember that some services can be dangerous if they're enabled on a\n"
"server. In general, select only those services you really need. !!"
msgstr ""
"此对话框可让您选择启动时要启动哪些服务。\n"
"\n"
-"DrakX 将会列出本次安装所有可用的服务。请仔细检查,并且去掉那些在启动时不总需"
+"DrakX 将会列出本次安装所有可用的服务。请仔细检查, 并且去掉那些在启动时不总需"
"要的服务。\n"
"\n"
-"将您的鼠标移动到选项上面会弹出帮助提示,解释这个服务的作用。不过,如果您不确"
-"定某一个服务到底是否需要,还是保留默认设置会比较安全。\n"
+"将您的鼠标移动到选项上面会弹出帮助提示, 解释这个服务的作用。不过, 如果您不确"
+"定某一个服务到底是否需要, 还是保留默认设置会比较安全。\n"
"\n"
"!!\n"
-"如果您的机器将作为服务器,在这一步请格外小心:请不要启动任何您不需要的服务。"
-"请不要忘了,如果在服务器上启用了某些服务,这些服务可能对服务器造成潜在的危"
-"险。通常,只选择您确实要使用的那些服务。\n"
+"如果您的机器将作为服务器, 在这一步请格外小心:请不要启动任何您不需要的服务。"
+"请不要忘了, 如果在服务器上启用了某些服务, 这些服务可能对服务器造成潜在的危"
+"险。通常, 只选择您确实要使用的那些服务。\n"
"!!"
# DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -3945,18 +3993,18 @@ msgid ""
"choose a time server located near you. This option actually installs a time\n"
"server which can be used by other machines on your local network as well."
msgstr ""
-"GNU/Linux 以 GMT (格林威治标准时)管理时间,并根据您所选的时区将其翻译为本地时"
-"间。如果您主板上的时钟设定为本地时间,您应当关闭\n"
-"\"%s\",这将会让 GNU/Linux 知道系统始终和硬件时钟在同一时区。如果本计算机仍然"
-"运行其它操作系统,如\n"
-"Windows,则此设置将十分有用。\n"
+"GNU/Linux 以 GMT (格林威治标准时)管理时间, 并根据您所选的时区将其翻译为本地时"
+"间。如果您主板上的时钟设定为本地时间, 您应当关闭\n"
+"\"%s\", 这将会让 GNU/Linux 知道系统始终和硬件时钟在同一时区。如果本计算机仍然"
+"运行其它操作系统, 如\n"
+"Windows, 则此设置将十分有用。\n"
"\n"
"\"%s\"选项将连接到 Internet 上的远程时间服务器自动校准系统时钟。要让此特性正"
-"常工作,您必须连接到\n"
+"常工作, 您必须连接到\n"
"Internet。最好选择地理位置离您较近的时间服务器。此选项还会自动安装时间服务"
-"器,这样您局域网中的其它计算机都能够进行自动校时了。"
+"器, 这样您局域网中的其它计算机都能够进行自动校时了。"
-#: help.pm:217 install_steps_interactive.pm:887
+#: help.pm:217 install_steps_interactive.pm:873
#, c-format
msgid "Hardware clock set to GMT"
msgstr "您的系统时钟设定为 GMT"
@@ -3983,10 +4031,10 @@ msgid ""
msgstr ""
"显示卡\n"
"\n"
-" 安装程序通常可以自动检测并配置连接到计算机上的显示卡。如果检测的结果不对,"
+" 安装程序通常可以自动检测并配置连接到计算机上的显示卡。如果检测的结果不对, "
"您可以在此列表中选择您所实际使用的显示卡。\n"
"\n"
-" 如果您的显示卡支持不同的服务器,为了选择是否要启用 3D 加速,您应该在这里选"
+" 如果您的显示卡支持不同的服务器, 为了选择是否要启用 3D 加速, 您应该在这里选"
"择符合您需要的服务器。"
# DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -4053,22 +4101,22 @@ msgstr ""
"X(代表 X 窗口系统)是 GNU/Linux 图形界面的核心部分。Mandrakelinux\n"
"附带的所有图形环境(KDE、GNOME、AfterStep、WindowMaker 等)都依赖于该系统。\n"
"\n"
-"您将会看到不同的参数列表,以便进行图形显示选项的更改来达到最佳状态。其中包"
+"您将会看到不同的参数列表, 以便进行图形显示选项的更改来达到最佳状态。其中包"
"括:\n"
"\n"
"显示卡\n"
"\n"
-" 安装程序通常可以自动检测并配置连接到计算机上的显示卡。如果检测的结果不对,"
+" 安装程序通常可以自动检测并配置连接到计算机上的显示卡。如果检测的结果不对, "
"您可以在此列表中选择您所实际使用的显示卡。\n"
"\n"
-" 如果您的显示卡支持不同的服务器,为了选择是否要启用 3D 加速,您应该在这里选"
+" 如果您的显示卡支持不同的服务器, 为了选择是否要启用 3D 加速, 您应该在这里选"
"择符合您需要的服务器。\n"
"\n"
"\n"
"\n"
"显示器\n"
"\n"
-" 安装程序通常可以自动检测并配置连接到计算机上的显示器。如果检测的结果不对,"
+" 安装程序通常可以自动检测并配置连接到计算机上的显示器。如果检测的结果不对, "
"您可以在此列表中选择您所实际使用的显示器。\n"
"\n"
"\n"
@@ -4076,28 +4124,28 @@ msgstr ""
"分辨率\n"
"\n"
" \n"
-"您可以在此选择分辨率和颜色深度,但您的显示卡硬件要支持。请选择最适合您需要的"
+"您可以在此选择分辨率和颜色深度, 但您的显示卡硬件要支持。请选择最适合您需要的"
"选项(您在安装完成之后仍可进行修改)。所选配置的例子会显示在显示器上。\n"
"\n"
"\n"
"\n"
"测试\n"
"\n"
-" 根据您的硬件,此项可能不会出现。\n"
+" 根据您的硬件, 此项可能不会出现。\n"
"\n"
-" 系统将会以所选的分辨率打开图形屏幕。如果您在测试时看到了提示,请回答\"%s"
-"\",DrakX\n"
-"就会执行安装的下一步骤。如果您没有看到任何提示,这意味着自动检测的某一部分不"
-"正确,测试将会在 12\n"
-"秒后自动结束,并把您带回菜单。请更改设置,直到您能够看到正确的图形显示为"
+" 系统将会以所选的分辨率打开图形屏幕。如果您在测试时看到了提示, 请回答\"%s"
+"\", DrakX\n"
+"就会执行安装的下一步骤。如果您没有看到任何提示, 这意味着自动检测的某一部分不"
+"正确, 测试将会在 12\n"
+"秒后自动结束, 并把您带回菜单。请更改设置, 直到您能够看到正确的图形显示为"
"止。\n"
"\n"
"\n"
"\n"
"选项\n"
"\n"
-" 您可以在此选择是否想要在计算机启动的时候就切换到图形界面。显然,如果本机将"
-"用作服务器,或者您的显示配置还没有成功,您可能想要选择\"%s\"。"
+" 您可以在此选择是否想要在计算机启动的时候就切换到图形界面。显然, 如果本机将"
+"用作服务器, 或者您的显示配置还没有成功, 您可能想要选择\"%s\"。"
#: help.pm:288
#, c-format
@@ -4111,7 +4159,7 @@ msgstr ""
"显示器\n"
"\n"
" 安装程序通常可以自动检测并配置连接到计算机上的显示器。如果不幸您的显示器未"
-"被检测出来,您可以在此列表中选择您所实际使用的显示器。"
+"被检测出来, 您可以在此列表中选择您所实际使用的显示器。"
#: help.pm:295
#, c-format
@@ -4125,7 +4173,7 @@ msgid ""
msgstr ""
"分辨率\n"
"\n"
-" 您可以在此选择分辨率和颜色深度,但您的硬件要支持。请选择最适合您需要的选项"
+" 您可以在此选择分辨率和颜色深度, 但您的硬件要支持。请选择最适合您需要的选项"
"(您在安装完成之后仍可进行修改)。所选配置的例子会显示在显示器上。"
# DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -4137,7 +4185,7 @@ msgid ""
"or without 3D acceleration, you're asked to choose the server which best\n"
"suits your needs."
msgstr ""
-"如果您的显示卡支持不同的服务器,为了选择是否要启用 3D 加速,您应该在这里选择"
+"如果您的显示卡支持不同的服务器, 为了选择是否要启用 3D 加速, 您应该在这里选择"
"符合您需要的服务器。"
# DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -4154,8 +4202,8 @@ msgid ""
msgstr ""
"选项\n"
"\n"
-" 您可以在此选择是否想要在计算机启动的时候就切换到图形界面。显然,如果本机将"
-"用作服务器,或者您的显示配置还没有成功,您可能想要选择\"%s\"。"
+" 您可以在此选择是否想要在计算机启动的时候就切换到图形界面。显然, 如果本机将"
+"用作服务器, 或者您的显示配置还没有成功, 您可能想要选择\"%s\"。"
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
@@ -4204,7 +4252,8 @@ msgid ""
"\n"
" * \"%s\". If you want to delete all data and all partitions present on\n"
"your hard drive and replace them with your new Mandrakelinux system, choose\n"
-"this option. Be careful, because you won't be able to undo this operation\n"
+"this option. Be careful, because you will not be able to undo this "
+"operation\n"
"after you confirm.\n"
"\n"
" !! If you choose this option, all data on your disk will be deleted. !!\n"
@@ -4222,57 +4271,57 @@ msgid ""
"experience. For more instructions on how to use the DiskDrake utility,\n"
"refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
msgstr ""
-"在这一步里,您需要决定您想要将 Mandrakelinux\n"
-"操作系统安装到硬盘的何处。如果您的硬盘完全是空的,或者已有操作系统使用了所有"
-"的空间,您就必须要对硬盘进行分区。粗略的说,对硬盘进行分区就是将其划分成几个"
-"逻辑上不同的部分,以便创建安装您新的\n"
+"在这一步里, 您需要决定您想要将 Mandrakelinux\n"
+"操作系统安装到硬盘的何处。如果您的硬盘完全是空的, 或者已有操作系统使用了所有"
+"的空间, 您就必须要对硬盘进行分区。粗略的说, 对硬盘进行分区就是将其划分成几个"
+"逻辑上不同的部分, 以便创建安装您新的\n"
"Mandrakelinux 系统所需的空间。\n"
"\n"
-"由于对硬盘进行分区通常是不可恢复的,并且可能导致数据丢失,所以对于没有经验的"
-"用户来说,分区是十分危险的操作。所幸的是,DrakX\n"
-"所包含的向导能够显著简化这一过程。在继续这一步骤之前,请花点时间仔细阅读本节"
+"由于对硬盘进行分区通常是不可恢复的, 并且可能导致数据丢失, 所以对于没有经验的"
+"用户来说, 分区是十分危险的操作。所幸的是, DrakX\n"
+"所包含的向导能够显著简化这一过程。在继续这一步骤之前, 请花点时间仔细阅读本节"
"及以上的所有内容。\n"
"\n"
-"根据您的硬盘配置不同,您可从以下选项中加以选择:\n"
+"根据您的硬盘配置不同, 您可从以下选项中加以选择:\n"
"\n"
-" * \"%s\"。此选项将对您的空驱动器执行自动分区。如果您使用此选项,则不会有任何"
+" * \"%s\"。此选项将对您的空驱动器执行自动分区。如果您使用此选项, 则不会有任何"
"后续的提示。\n"
"\n"
" * \"%s\"。向导检测到了硬盘上有一个或多个已有的 Linux\n"
-"分区。如果您想要使用这些分区,请选择此选项。稍后,安装程序会让您选择与每个分"
-"区关联的挂载点。先前的挂载点默认已经选中了,而保留这些选项是个不错的主意。\n"
+"分区。如果您想要使用这些分区, 请选择此选项。稍后, 安装程序会让您选择与每个分"
+"区关联的挂载点。先前的挂载点默认已经选中了, 而保留这些选项是个不错的主意。\n"
"\n"
-" * \"%s\"。如果在您的硬盘上安装了 Microsoft Windows,而该操作系统占用了所有的"
-"空间,您就需要为 GNU/Linux\n"
-"创建剩余空间。要完成这一操作,您可以删除您的 Microsoft Windows 分区和数据(参"
-"看``删除整个磁盘''方案),或者更改\n"
+" * \"%s\"。如果在您的硬盘上安装了 Microsoft Windows, 而该操作系统占用了所有的"
+"空间, 您就需要为 GNU/Linux\n"
+"创建剩余空间。要完成这一操作, 您可以删除您的 Microsoft Windows 分区和数据(参"
+"看``删除整个磁盘''方案), 或者更改\n"
"Microsoft Windows FAT 或 NTFS 分区的大小。更改分区大小通常不会造成任何数据丢"
-"失,但您必须事先对 Windows\n"
+"失, 但您必须事先对 Windows\n"
"分区进行了磁盘碎片整理。我们强烈推荐您事先备份您的数据。如果您想要在同一台计"
"算机上使用 Mandrakelinux 和 Microsoft\n"
-"Windows,则推荐使用此选项。\n"
+"Windows, 则推荐使用此选项。\n"
"\n"
-" 注意,在执行这一过程之后,您原有的 Microsoft Windows 分区将会比先前小一"
+" 注意, 在执行这一过程之后, 您原有的 Microsoft Windows 分区将会比先前小一"
"些。而您在 Microsoft Windows\n"
"下可用来存储数据或安装新软件的剩余空间也会变少。\n"
"\n"
-" * \"%s\"。如果您想要删除硬盘上的全部数据和全部分区,并将其替换为全新的 "
+" * \"%s\"。如果您想要删除硬盘上的全部数据和全部分区, 并将其替换为全新的 "
"Mandrakelinux\n"
-"系统,请选择此选项。请额外小心,因为在您确认之后,此操作无法撤销。\n"
+"系统, 请选择此选项。请额外小心, 因为在您确认之后, 此操作无法撤销。\n"
"\n"
-" !! 如果您选择了此选项,您硬盘上的全部数据都将被删除。 !!\n"
+" !! 如果您选择了此选项, 您硬盘上的全部数据都将被删除。 !!\n"
"\n"
-" * \"%s\"。当硬盘完全被 Microsoft Windows 占用时,会出现此选项。选择此选项将"
-"删除硬盘上的全部内容,然后从头开始进行分区。\n"
+" * \"%s\"。当硬盘完全被 Microsoft Windows 占用时, 会出现此选项。选择此选项将"
+"删除硬盘上的全部内容, 然后从头开始进行分区。\n"
"\n"
-" !! 如果您选择了此选项,您硬盘上的全部数据都将被删除。 !!\n"
+" !! 如果您选择了此选项, 您硬盘上的全部数据都将被删除。 !!\n"
"\n"
" *\n"
-"\"%s\"。如果您想要手动对您的硬盘进行分区,请选择此选项。请额外小心——该功能十"
-"分强大,但也很危险,您可能在不经意之间毁掉您的全部数据。这也正是为什么我们只"
+"\"%s\"。如果您想要手动对您的硬盘进行分区, 请选择此选项。请额外小心——该功能十"
+"分强大, 但也很危险, 您可能在不经意之间毁掉您的全部数据。这也正是为什么我们只"
"对那些以前执行过类似操作并有些经验的用户才推荐此选项的原因。要获得关于如何使"
"用\n"
-"DiskDrake 工具的更多说明,请参阅``初学者指南''一书中的``管理您的分区''一节。"
+"DiskDrake 工具的更多说明, 请参阅``初学者指南''一书中的``管理您的分区''一节。"
#: help.pm:374 install_interactive.pm:95
#, c-format
@@ -4310,7 +4359,7 @@ msgstr "自定义磁盘分区"
#, c-format
msgid ""
"There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to be used. Just click on \"%s\" to reboot the system. Don't forget\n"
+"ready to be used. Just click on \"%s\" to reboot the system. Do not forget\n"
"to remove the installation media (CD-ROM or floppy). The first thing you\n"
"should see after your computer has finished doing its hardware tests is the\n"
"boot-loader menu, giving you the choice of which operating system to start.\n"
@@ -4343,49 +4392,49 @@ msgid ""
"\"mformat a:\", or \"fdformat /dev/fd0\" followed by \"mkfs.vfat\n"
"/dev/fd0\"."
msgstr ""
-"现在安装已经完成,您的 GNU/Linux 系统已经可以使用了。只需单击\"%s\"就可重新启"
+"现在安装已经完成, 您的 GNU/Linux 系统已经可以使用了。只需单击\"%s\"就可重新启"
"动系统。别忘了取出安装介质(CD-ROM\n"
-"或软盘)。在计算机完成硬件测试后,您所看到的第一个系统自检完后的屏幕就是引导菜"
-"单,您可以从中选择要启动哪个操作系统。\n"
+"或软盘)。在计算机完成硬件测试后, 您所看到的第一个系统自检完后的屏幕就是引导菜"
+"单, 您可以从中选择要启动哪个操作系统。\n"
"\n"
-"\"%s\"按钮显示了两个额外的按钮,可:\n"
+"\"%s\"按钮显示了两个额外的按钮, 可:\n"
"\n"
-" * \"%s\":创建一张安装软盘。该软盘可在无人值守的情况下,按照您刚才的设置重新"
+" * \"%s\":创建一张安装软盘。该软盘可在无人值守的情况下, 按照您刚才的设置重新"
"安装一个类似的系统。\n"
"\n"
-" 请注意,单击按钮后会出现两个不同的选项:\n"
+" 请注意, 单击按钮后会出现两个不同的选项:\n"
"\n"
" * \"%s\"。 半自动安装。只有分区部分是交互的。\n"
"\n"
-" * \"%s\"。 全自动安装:硬盘会被完全重写,所有数据都将丢失。\n"
+" * \"%s\"。 全自动安装:硬盘会被完全重写, 所有数据都将丢失。\n"
"\n"
-" 如果有一大批相同的机器要安装,这个功能非常方便。请参考我们网站上的自动安装"
+" 如果有一大批相同的机器要安装, 这个功能非常方便。请参考我们网站上的自动安装"
"一节中的更多信息。\n"
"\n"
" * \"%s\"(*):把您刚才选择的软件包记录在软盘上。要使用本次的安装包执行另外一"
-"次安装,请插入软盘然后开始安装。出现提示的时候,按 [F1]\n"
-"键,输入 >>linux defcfg=\"floppy\" <<。\n"
+"次安装, 请插入软盘然后开始安装。出现提示的时候, 按 [F1]\n"
+"键, 输入 >>linux defcfg=\"floppy\" <<。\n"
"\n"
-"(*) 您需要一张 FAT 格式的软盘。要在 GNU/Linux 下创建一张这样的软盘,一种方法"
+"(*) 您需要一张 FAT 格式的软盘。要在 GNU/Linux 下创建一张这样的软盘, 一种方法"
"是输入 \"mformat a:\";另一种是首先\n"
-"\"fdformat /dev/fd0\",然后 \"mkfs.vfat /dev/fd0\"。"
+"\"fdformat /dev/fd0\", 然后 \"mkfs.vfat /dev/fd0\"。"
#: help.pm:409
#, c-format
msgid "Generate auto-install floppy"
msgstr "生成自动安装软盘"
-#: help.pm:409 install_steps_interactive.pm:1363
+#: help.pm:409 install_steps_interactive.pm:1328
#, c-format
msgid "Replay"
msgstr "重现"
-#: help.pm:409 install_steps_interactive.pm:1363
+#: help.pm:409 install_steps_interactive.pm:1328
#, c-format
msgid "Automated"
msgstr "自动"
-#: help.pm:409 install_steps_interactive.pm:1366
+#: help.pm:409 install_steps_interactive.pm:1331
#, c-format
msgid "Save packages selection"
msgstr "保存软件包选择"
@@ -4401,12 +4450,13 @@ msgid ""
"\n"
"Please note that it's not necessary to reformat all pre-existing\n"
"partitions. You must reformat the partitions containing the operating\n"
-"system (such as \"/\", \"/usr\" or \"/var\") but you don't have to reformat\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to "
+"reformat\n"
"partitions containing data that you wish to keep (typically \"/home\").\n"
"\n"
"Please be careful when selecting partitions. After the formatting is\n"
"completed, all data on the selected partitions will be deleted and you\n"
-"won't be able to recover it.\n"
+"will not be able to recover it.\n"
"\n"
"Click on \"%s\" when you're ready to format the partitions.\n"
"\n"
@@ -4417,27 +4467,27 @@ msgid ""
"bad blocks on the disk."
msgstr ""
"如果您想要重用某些现有的 GNU/Linux\n"
-"分区,您可能想要先格式化其中的一些分区,并删除这些分区中的全部数据。如果您希"
-"望这么做的话,请同时选中这些分区。\n"
+"分区, 您可能想要先格式化其中的一些分区, 并删除这些分区中的全部数据。如果您希"
+"望这么做的话, 请同时选中这些分区。\n"
"\n"
-"请注意,没有必要重新格式化已有的全部分区。您必须重新格式化包含操作系统的分区"
-"(比如 \"/\",\"/usr\" 或\n"
-"\"/var\"),而无需重新格式化包含您想要保留的数据的分区(典型的如 \"/home\")。\n"
+"请注意, 没有必要重新格式化已有的全部分区。您必须重新格式化包含操作系统的分区"
+"(比如 \"/\", \"/usr\" 或\n"
+"\"/var\"), 而无需重新格式化包含您想要保留的数据的分区(典型的如 \"/home\")。\n"
"\n"
-"请在选择分区时额外小心。格式化后,选中分区的全部数据都将被删除,您也无法进行"
+"请在选择分区时额外小心。格式化后, 选中分区的全部数据都将被删除, 您也无法进行"
"恢复。\n"
"\n"
-"如果您准备好格式化分区了,请单击\"%s\"。\n"
+"如果您准备好格式化分区了, 请单击\"%s\"。\n"
"\n"
-"如果您想要选择其它分区用于安装 Mandrakelinux 操作系统,请单击\"%s\"。\n"
+"如果您想要选择其它分区用于安装 Mandrakelinux 操作系统, 请单击\"%s\"。\n"
"\n"
-"如果您想要选择要检测磁盘上的坏块,请单击单击\"%s\"。"
+"如果您想要选择要检测磁盘上的坏块, 请单击单击\"%s\"。"
-#: help.pm:431 install_steps_gtk.pm:402 interactive.pm:404
-#: interactive/newt.pm:316 printer/printerdrake.pm:3266
-#: standalone/drakTermServ:351 standalone/drakbackup:3901
-#: standalone/drakbackup:3940 standalone/drakbackup:4051
-#: standalone/drakbackup:4066 ugtk2.pm:513
+#: help.pm:431 install_steps_gtk.pm:388 interactive.pm:425
+#: interactive/newt.pm:316 printer/printerdrake.pm:3579
+#: standalone/drakTermServ:361 standalone/drakbackup:3906
+#: standalone/drakbackup:3945 standalone/drakbackup:4056
+#: standalone/drakbackup:4071 ugtk2.pm:504
#, c-format
msgid "Previous"
msgstr "上一步"
@@ -4460,18 +4510,18 @@ msgid ""
"the selected package(s), or \"%s\" to abort."
msgstr ""
"在您安装 Mandrakelinux\n"
-"的这个时候,很可能有些软件包在发行之后已经更新。有些故障已经被修正,有些安全"
-"问题已经被解决。为了让您能够享用这些更新,您现在可以从 Internet\n"
-"上下载它们。如果您的 Internet 连接已经可以使用,请选择\"%s\"。如果您愿意以后"
-"再升级,请选择\"%s\"。\n"
+"的这个时候, 很可能有些软件包在发行之后已经更新。有些故障已经被修正, 有些安全"
+"问题已经被解决。为了让您能够享用这些更新, 您现在可以从 Internet\n"
+"上下载它们。如果您的 Internet 连接已经可以使用, 请选择\"%s\"。如果您愿意以后"
+"再升级, 请选择\"%s\"。\n"
"\n"
"\n"
-"选择\"%s\"将显示一个清单,其中列出的地方都提供了更新软件包。您应该选择离您地"
-"理位置较近的镜像。之后会出现一个可以下载的软件包选择树:复查选项,然后单击\"%"
-"s\"来获取并安装选中的软件包,要终止请单击\"%s\"。"
+"选择\"%s\"将显示一个清单, 其中列出的地方都提供了更新软件包。您应该选择离您地"
+"理位置较近的镜像。之后会出现一个可以下载的软件包选择树:复查选项, 然后单击\"%"
+"s\"来获取并安装选中的软件包, 要终止请单击\"%s\"。"
-#: help.pm:444 help.pm:588 install_steps_gtk.pm:401
-#: install_steps_interactive.pm:158 standalone/drakbackup:4098
+#: help.pm:444 help.pm:588 install_steps_gtk.pm:387
+#: install_steps_interactive.pm:156 standalone/drakbackup:4103
#, c-format
msgid "Install"
msgstr "安装"
@@ -4487,18 +4537,18 @@ msgid ""
"exposed to the Internet. The trade-off that a higher security level is\n"
"generally obtained at the expense of ease of use.\n"
"\n"
-"If you don't know what to choose, keep the default option. You'll be able\n"
+"If you do not know what to choose, keep the default option. You'll be able\n"
"to change it later with the draksec tool, which is part of Mandrakelinux\n"
"Control Center.\n"
"\n"
"Fill the \"%s\" field with the e-mail address of the person responsible for\n"
"security. Security messages will be sent to that address."
msgstr ""
-"在这里,DrakX 将允许您选择计算机要使用的安全级别。说的直白一点,如果计算机将"
-"包含关键数据,或者将直接暴露于 Internet\n"
-"之下,则应该设置较高的安全级别。较高的安全级别通常以损失易用性作为代价。\n"
+"在这里, DrakX 将允许您选择计算机要使用的安全级别。说的直白一点, 如果计算机将"
+"包含关键数据, 或者将直接暴露于 Internet\n"
+"之下, 则应该设置较高的安全级别。较高的安全级别通常以损失易用性作为代价。\n"
"\n"
-"如果您不知道要选择什么,请保持默认选项。您可以稍后从 Mandrakelinux 控制中心的"
+"如果您不知道要选择什么, 请保持默认选项。您可以稍后从 Mandrakelinux 控制中心的"
"一部分 draksec\n"
"来更改安全级别。\n"
"\n"
@@ -4541,7 +4591,7 @@ msgid ""
"floppy disk.\n"
"\n"
" * \"%s\": if your partition table is damaged, you can try to recover it\n"
-"using this option. Please be careful and remember that it doesn't always\n"
+"using this option. Please be careful and remember that it does not always\n"
"work.\n"
"\n"
" * \"%s\": discards all changes and reloads the partition table that was\n"
@@ -4585,16 +4635,16 @@ msgid ""
"may find it a useful place to store a spare kernel and ramdisk images for\n"
"emergency boot situations."
msgstr ""
-"在这一步中,您需要选择要使用哪个或哪些分区来安装您的 Mandrakelinux 系统。如果"
-"已经定义了分区,不管是先前安装的 GNU/Linux\n"
-"还是由其它分区工具划分的,您都可以使用已有的分区。否则,必须对硬盘分区进行定"
+"在这一步中, 您需要选择要使用哪个或哪些分区来安装您的 Mandrakelinux 系统。如果"
+"已经定义了分区, 不管是先前安装的 GNU/Linux\n"
+"还是由其它分区工具划分的, 您都可以使用已有的分区。否则, 必须对硬盘分区进行定"
"义。\n"
"\n"
-"要创建分区,您必须先选择硬盘。您可以单击“hda”选择第一个 IDE 硬盘进行分"
-"区,“hdb”选择第二个 IDE 硬盘,“sda”\n"
-"选择第一个 SCSI 驱动器,依此类推。\n"
+"要创建分区, 您必须先选择硬盘。您可以单击“hda”选择第一个 IDE 硬盘进行分区, "
+"“hdb”选择第二个 IDE 硬盘, “sda”\n"
+"选择第一个 SCSI 驱动器, 依此类推。\n"
"\n"
-"为了对选中硬盘进行分区,您需要使用这些选项: \n"
+"为了对选中硬盘进行分区, 您需要使用这些选项: \n"
"\n"
" * \"%s\": 此选项将删除选中硬盘上的全部分区\n"
"\n"
@@ -4602,34 +4652,34 @@ msgstr ""
"\n"
"\"%s\": 使您可以访问额外特性: \n"
"\n"
-" * \"%s\": 将分区表保存到软盘。如果需要的话,稍后可进行分区表修复。强烈推荐您"
+" * \"%s\": 将分区表保存到软盘。如果需要的话, 稍后可进行分区表修复。强烈推荐您"
"执行这一步骤。\n"
"\n"
" * \"%s\": 允许您恢复先前保存在软盘上的分区表。\n"
"\n"
-" * \"%s\": 如果您的分区表已损坏,您可以使用此选项尝试修复。请额外小心,并记住"
+" * \"%s\": 如果您的分区表已损坏, 您可以使用此选项尝试修复。请额外小心, 并记住"
"这一选项并不总是能够帮助您。\n"
"\n"
" * \"%s\": 忽略全部更改并重新装入硬盘上的原始分区表。\n"
"\n"
" * \"%s\": 取消此选项将强迫用户手动挂载类似软盘和 CD-ROM 的可移动介质。\n"
"\n"
-" * \"%s\": 如果您想要使用向导对您的营盘进行分区,则使用此选项。如果您对分区理"
-"解不深的话,推荐您使用此选项。\n"
+" * \"%s\": 如果您想要使用向导对您的营盘进行分区, 则使用此选项。如果您对分区理"
+"解不深的话, 推荐您使用此选项。\n"
"\n"
" * \"%s\": 使用此选项取消您的更改。\n"
"\n"
-" * \"%s\": 允许对分区进行额外的操作(类型、选项、格式化),并给出关于硬盘的额外"
+" * \"%s\": 允许对分区进行额外的操作(类型、选项、格式化), 并给出关于硬盘的额外"
"信息。\n"
"\n"
-" * \"%s\": 当您完成对硬盘的分区后,此选项将把您的更改回存到硬盘。\n"
+" * \"%s\": 当您完成对硬盘的分区后, 此选项将把您的更改回存到硬盘。\n"
"\n"
-"定义分区大小时,您可以使用键盘上的光标键对分区大小进行调整。\n"
+"定义分区大小时, 您可以使用键盘上的光标键对分区大小进行调整。\n"
"\n"
"注意: 您可以使用键盘访问任何选项。可以使用 [Tab] 和 [上/下]光标键来切换分"
"区。\n"
"\n"
-"选中分区后,您可以用: \n"
+"选中分区后, 您可以用: \n"
"\n"
" * Ctrl+C 创建新分区(如果选中了空分区)\n"
"\n"
@@ -4637,11 +4687,11 @@ msgstr ""
"\n"
" * Ctrl+M 设定挂载点\n"
"\n"
-"要的关于不同的文件系统类型的更多信息,请查看“参考手册”中 ext2FS 一章。\n"
+"要的关于不同的文件系统类型的更多信息, 请查看“参考手册”中 ext2FS 一章。\n"
"\n"
-"如果您在 PPC 计算机上安装,您可能需要创建至少 1MB 大小的 HFS“bootstrap”分区,"
+"如果您在 PPC 计算机上安装, 您可能需要创建至少 1MB 大小的 HFS“bootstrap”分区, "
"该分区将用于 yaboot\n"
-"引导程序。如果您创建的分区再稍微大点,比如说 50MB,您可能会发现这个分区可用来"
+"引导程序。如果您创建的分区再稍微大点, 比如说 50MB, 您可能会发现这个分区可用来"
"存储内核或紧急引导时的虚拟磁盘映像。"
#: help.pm:530
@@ -4687,15 +4737,15 @@ msgid ""
"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
"disk or partition is called \"C:\")."
msgstr ""
-"在硬盘上检测到了多个 Microsoft 分区。请选择一个分区改变大小,以便安装您新\n"
+"在硬盘上检测到了多个 Microsoft 分区。请选择一个分区改变大小, 以便安装您新\n"
"的 Mandrakelinux 操作系统。\n"
"\n"
"每个分区都是按“Linux 名称”、“Windows 名称”、“容量”顺序列出的。\n"
"\n"
-"“Linux 名称”的结构为:“硬盘类型”、“硬盘编号”、“分区编号”(例如,\n"
+"“Linux 名称”的结构为:“硬盘类型”、“硬盘编号”、“分区编号”(例如, \n"
"“hda1”)。\n"
"\n"
-"如果您的硬盘是 IDE 硬盘,“硬盘类型”为“hd”;如果为 SCSI 硬盘则为“sd”。\n"
+"如果您的硬盘是 IDE 硬盘, “硬盘类型”为“hd”;如果为 SCSI 硬盘则为“sd”。\n"
"\n"
"“硬盘编号”总是跟在“hd”或“sd”后面的字母。对于 IDE 硬盘来说:\n"
"\n"
@@ -4707,7 +4757,7 @@ msgstr ""
"\n"
" *“d”意味着“从 IDE 控制器的从硬盘”。\n"
"\n"
-"对于 SCSI 硬盘,“a”意味着“最低的 SCSI ID”,“b”意味着“第二低的 SCSI ID”,等"
+"对于 SCSI 硬盘, “a”意味着“最低的 SCSI ID”, “b”意味着“第二低的 SCSI ID”, 等"
"等。\n"
"\n"
"“Windows 名称”就是硬盘在 Windows 下的盘符(第一个此盘或分区就是“C:”)。"
@@ -4718,11 +4768,12 @@ msgstr ""
#, c-format
msgid ""
"\"%s\": check the current country selection. If you're not in this country,\n"
-"click on the \"%s\" button and choose another. If your country isn't in the\n"
+"click on the \"%s\" button and choose another. If your country is not in "
+"the\n"
"list shown, click on the \"%s\" button to get the complete country list."
msgstr ""
-"\"%s\":检查当前的国家选择。如果您并非在这个国家,请单击\"%s\"按钮,并选择另"
-"外的选项。如果您的国家在第一个列表中并没有显示出来,单击\"%s\"按钮可获得完整"
+"\"%s\":检查当前的国家选择。如果您并非在这个国家, 请单击\"%s\"按钮, 并选择另"
+"外的选项。如果您的国家在第一个列表中并没有显示出来, 单击\"%s\"按钮可获得完整"
"的国家列表。"
# DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -4744,25 +4795,25 @@ msgid ""
"\n"
" * \"%s\". This installation class allows you to update the packages\n"
"currently installed on your Mandrakelinux system. Your current partitioning\n"
-"scheme and user data won't be altered. Most of the other configuration\n"
+"scheme and user data will not be altered. Most of the other configuration\n"
"steps remain available and are similar to a standard installation.\n"
"\n"
"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
"to Mandrakelinux version \"8.1\" is not recommended."
msgstr ""
-"仅当在您的计算机上发现了已有的 GNU/Linux 分区,才会激活这一步骤。\n"
+"仅当在您的计算机上发现了已有的 GNU/Linux 分区, 才会激活这一步骤。\n"
"\n"
-"DrakX 现在需要知道您是想要执行全新安装,还是升级已有的 Mandrakelinux 系统:\n"
+"DrakX 现在需要知道您是想要执行全新安装, 还是升级已有的 Mandrakelinux 系统:\n"
"\n"
" *\n"
-"\"%s\":总体来说,这将完全销毁旧系统。但是,根据您选择的分区方案,您可以让现"
-"有的数据(比如\"主\"目录)免于覆盖。如果您想要更改硬盘的分区方案,或者更该文件"
-"系统,您就应该使用此选项。\n"
+"\"%s\":总体来说, 这将完全销毁旧系统。但是, 根据您选择的分区方案, 您可以让现"
+"有的数据(比如\"主\"目录)免于覆盖。如果您想要更改硬盘的分区方案, 或者更该文件"
+"系统, 您就应该使用此选项。\n"
"\n"
" * \"%s\":这一安装级别允许您更新目前安装在您 Mandrakelinux\n"
"系统上的软件包。您的分区方案和用户数据都不会被破坏。绝大多数配置步骤仍然可"
-"用,与标准安装类似。\n"
+"用, 与标准安装类似。\n"
"\n"
"使用``升级''选项应该在 \"8.1\" 或更新版本的 Mandrakelinux 系统上工作正常。不"
"推荐在先于 \"8.1\" 版本的\n"
@@ -4781,7 +4832,7 @@ msgid ""
"language: for example, if you are an English-speaking Swiss native, you may\n"
"have a Swiss keyboard. Or if you speak English and are located in Quebec,\n"
"you may find yourself in the same situation where your native language and\n"
-"country-set keyboard don't match. In either case, this installation step\n"
+"country-set keyboard do not match. In either case, this installation step\n"
"will allow you to select an appropriate keyboard from a list.\n"
"\n"
"Click on the \"%s\" button to be shown a list of supported keyboards.\n"
@@ -4790,18 +4841,18 @@ msgid ""
"dialog will allow you to choose the key binding which will switch the\n"
"keyboard between the Latin and non-Latin layouts."
msgstr ""
-"根据您在中所选择的语言,DrakX 将会自动选择特定类型的键盘配置。请检查列出的选"
-"项是否适合您,若不适合请选择其它键盘布局。\n"
+"根据您在中所选择的语言, DrakX 将会自动选择特定类型的键盘配置。请检查列出的选"
+"项是否适合您, 若不适合请选择其它键盘布局。\n"
"\n"
"\n"
-"当然,可能您使用的语言与键盘并不相同:例如,您是说英语的瑞典本土人,但正在用"
-"瑞士键盘。或者,如果您说英语但住在魁北克,您可能也会遇到您的母语和所使用的键"
-"盘并不匹配的情况。不管是哪种情况,您都可以在这一步骤从列表种选择相应的键"
+"当然, 可能您使用的语言与键盘并不相同:例如, 您是说英语的瑞典本土人, 但正在用"
+"瑞士键盘。或者, 如果您说英语但住在魁北克, 您可能也会遇到您的母语和所使用的键"
+"盘并不匹配的情况。不管是哪种情况, 您都可以在这一步骤从列表种选择相应的键"
"盘。\n"
"\n"
"单击\"%s\"按钮可显示所支持键盘的完整列表。\n"
"\n"
-"如果您选择了基于非拉丁字符集的键盘布局,下个对话框将允许您选择用于切换拉丁和"
+"如果您选择了基于非拉丁字符集的键盘布局, 下个对话框将允许您选择用于切换拉丁和"
"非拉丁布局之间的组合键。"
# DO NOT BOTHER TO MODIFY HERE, SEE:
@@ -4852,38 +4903,38 @@ msgstr ""
"第一步是选择您首选的语言。\n"
"\n"
"您对首选语言的选择将影响安装程序、文档及系统的总体配置。请先选择您所在的地"
-"区,然后选择您讲的语言。\n"
+"区, 然后选择您讲的语言。\n"
"\n"
"\n"
-"单击\"%s\"按钮以后,您可以选择要在您的工作站上安装哪些额外的语言,即为系统文"
-"档和应用程序安装特定语言的文件。例如,如果您的计算机要为繁体中文的用户提供服"
-"务,请在树视图中选择简体中文作为默认语言,然后在高级选项中选择\"%s\"。\n"
+"单击\"%s\"按钮以后, 您可以选择要在您的工作站上安装哪些额外的语言, 即为系统文"
+"档和应用程序安装特定语言的文件。例如, 如果您的计算机要为繁体中文的用户提供服"
+"务, 请在树视图中选择简体中文作为默认语言, 然后在高级选项中选择\"%s\"。\n"
"\n"
-"关于 UTF-8 (Unicode) 支持:Unicode 是一种新的字符编码,该编码可支持所有现存的"
-"语言。但是,在 GNU/Linux 下完全支持\n"
-"Unicode,仍然在开发和完善中。由此原因,Mandrakelinux 会根据用户的选择是否使"
+"关于 UTF-8 (Unicode) 支持:Unicode 是一种新的字符编码, 该编码可支持所有现存的"
+"语言。但是, 在 GNU/Linux 下完全支持\n"
+"Unicode, 仍然在开发和完善中。由此原因, Mandrakelinux 会根据用户的选择是否使"
"用 UTF-8:\n"
"\n"
" * 如果您所选的语言自身有强制性的编码(latin1 语言、俄语、日语、中文、朝鲜语、"
"泰语、希腊语、土耳其语及大多数 iso-8859-2\n"
-"语言),则会默认使用强制编码;\n"
+"语言), 则会默认使用强制编码;\n"
"\n"
" * 其它语言默认会使用 Unicode;\n"
"\n"
-" * 如果需要两种或更多种语言,而这两种语言所使用的编码并不相同,则整个系统都会"
+" * 如果需要两种或更多种语言, 而这两种语言所使用的编码并不相同, 则整个系统都会"
"使用 Unicode;\n"
"\n"
-" * 最后,如果要强制系统使用 Unicode,而不管选中的是哪个或哪些语言,则应选中选"
+" * 最后, 如果要强制系统使用 Unicode, 而不管选中的是哪个或哪些语言, 则应选中选"
"项\"%s\"。\n"
"\n"
"\n"
-"请注意,系统没有限制您只能选择一种额外的语言。您可以选择多种语言,甚至选择\"%"
-"s\"框表明您想要安装全部语言。选择支持某种语言,意味着同时安装该语言的翻译、字"
+"请注意, 系统没有限制您只能选择一种额外的语言。您可以选择多种语言, 甚至选择\"%"
+"s\"框表明您想要安装全部语言。选择支持某种语言, 意味着同时安装该语言的翻译、字"
"体、拼写检查程序等等。\n"
"\n"
-"要在系统中所安装的不同语言之间切换,请以 \"root\" 身份执行 \"/usr/sbin/"
+"要在系统中所安装的不同语言之间切换, 请以 \"root\" 身份执行 \"/usr/sbin/"
"localedrake\"\n"
-"命令,这样可以更改整个系统所用的语言。以普通用户执行该命令,只会更改特定用户"
+"命令, 这样可以更改整个系统所用的语言。以普通用户执行该命令, 只会更改特定用户"
"的语言设置。"
#: help.pm:647
@@ -4929,28 +4980,28 @@ msgid ""
"Test the buttons and check that the mouse pointer moves on-screen as you\n"
"move your mouse about."
msgstr ""
-"通常情况下,DrakX\n"
-"能够正确检测到您的鼠标有几个按键。如果检测不正确的话,就会假定您有一个两键鼠"
-"标,并配置为模拟第三键。如果您想在两键鼠标上使用第三键的话,只需同时按下左右"
+"通常情况下, DrakX\n"
+"能够正确检测到您的鼠标有几个按键。如果检测不正确的话, 就会假定您有一个两键鼠"
+"标, 并配置为模拟第三键。如果您想在两键鼠标上使用第三键的话, 只需同时按下左右"
"键。DrakX\n"
-"会自动确定您的鼠标所使用的端口,是 PS/2、串口,还是 USB 接口。\n"
+"会自动确定您的鼠标所使用的端口, 是 PS/2、串口, 还是 USB 接口。\n"
"\n"
-"如果您的三键鼠标没有滚轮,您可以选择\"%s\"类型的鼠标。DrakX 就会配置您的鼠标"
-"来模拟滚轮:只需按下中键,然后上下移动鼠标。\n"
+"如果您的三键鼠标没有滚轮, 您可以选择\"%s\"类型的鼠标。DrakX 就会配置您的鼠标"
+"来模拟滚轮:只需按下中键, 然后上下移动鼠标。\n"
"\n"
-"如果因为某些原因,您希望指定不同类型的鼠标,请从提供的列表中进行选择。\n"
+"如果因为某些原因, 您希望指定不同类型的鼠标, 请从提供的列表中进行选择。\n"
"\n"
-"您可以选择\"%s\"选项来选择``通用''鼠标类型,这样基本会适应任何鼠标。\n"
+"您可以选择\"%s\"选项来选择``通用''鼠标类型, 这样基本会适应任何鼠标。\n"
"\n"
-"如果您选择了不同于默认值的鼠标,会出现一个测试屏幕。请用您鼠标的按键和滚轮来"
-"验证设置是否正确,鼠标是否工作正常。如果鼠标工作不正常,请按空格键或\n"
-"[Enter] 键取消测试,返回到可供选择的鼠标列表中。\n"
+"如果您选择了不同于默认值的鼠标, 会出现一个测试屏幕。请用您鼠标的按键和滚轮来"
+"验证设置是否正确, 鼠标是否工作正常。如果鼠标工作不正常, 请按空格键或\n"
+"[Enter] 键取消测试, 返回到可供选择的鼠标列表中。\n"
"\n"
"\n"
-"滚轮鼠标有时可能无法自动检测,所以您可能需要从列表中进行选择。请确定您选对了"
-"鼠标所连接的端口。选择鼠标后,单击\"%s\"按钮,会在屏幕上出现鼠标图像。试着滚"
-"动滚轮,以确保滚轮可以正常激活。您在滚动鼠标滚轮的同时应该看到屏幕上的滚轮也"
-"在滚动。另外,也应该测试一下鼠标按钮,鼠标指针的移动应该和鼠标的操作保持一"
+"滚轮鼠标有时可能无法自动检测, 所以您可能需要从列表中进行选择。请确定您选对了"
+"鼠标所连接的端口。选择鼠标后, 单击\"%s\"按钮, 会在屏幕上出现鼠标图像。试着滚"
+"动滚轮, 以确保滚轮可以正常激活。您在滚动鼠标滚轮的同时应该看到屏幕上的滚轮也"
+"在滚动。另外, 也应该测试一下鼠标按钮, 鼠标指针的移动应该和鼠标的操作保持一"
"致。"
#: help.pm:681
@@ -4969,8 +5020,8 @@ msgid ""
"Please select the correct port. For example, the \"COM1\" port under\n"
"Windows is named \"ttyS0\" under GNU/Linux."
msgstr ""
-"请选择正确的端口。例如,\n"
-"MS Windows 里的 COM1,在 GNU/Linux 里面叫做 ttyS0。"
+"请选择正确的端口。例如, \n"
+"MS Windows 里的 COM1, 在 GNU/Linux 里面叫做 ttyS0。"
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
@@ -4994,10 +5045,11 @@ msgid ""
"characters long. Never write down the \"root\" password -- it makes it far\n"
"too easy to compromise your system.\n"
"\n"
-"One caveat: don't make the password too long or too complicated because you\n"
+"One caveat: do not make the password too long or too complicated because "
+"you\n"
"must be able to remember it!\n"
"\n"
-"The password won't be displayed on screen as you type it. To reduce the\n"
+"The password will not be displayed on screen as you type it. To reduce the\n"
"chance of a blind typing error you'll need to enter the password twice. If\n"
"you do happen to make the same typing error twice, you'll have to use this\n"
"``incorrect'' password the first time you'll try to connect as \"root\".\n"
@@ -5006,53 +5058,47 @@ msgid ""
"click on the \"%s\" button.\n"
"\n"
"If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
-"services, select the appropriate one for \"%s\". If you don't know which\n"
+"services, select the appropriate one for \"%s\". If you do not know which\n"
"one to use, you should ask your network administrator.\n"
"\n"
"If you happen to have problems with remembering passwords, or if your\n"
"computer will never be connected to the Internet and you absolutely trust\n"
"everybody who uses your computer, you can choose to have \"%s\"."
msgstr ""
-"要保卫您的 GNU/Linux 系统,现在是最关键的一步:您需要输入 \"root\" 密码。"
+"要保卫您的 GNU/Linux 系统, 现在是最关键的一步:您需要输入 \"root\" 密码。"
"\"Root\"\n"
-"是系统管理员,而且是唯一有权进行更新、添加用户、更改泛系统配置等操作的用户。"
-"简言之,\"root\"\n"
-"可以做任何事!这就是为什么您必须选择难于猜测的密码:如果您的密码太简单了,"
+"是系统管理员, 而且是唯一有权进行更新、添加用户、更改泛系统配置等操作的用户。"
+"简言之, \"root\"\n"
+"可以做任何事!这就是为什么您必须选择难于猜测的密码:如果您的密码太简单了, "
"DrakX\n"
-"会提醒您的。正如您所看到的那样,您不必非得输入密码,但是我们强烈建议您输入一"
+"会提醒您的。正如您所看到的那样, 您不必非得输入密码, 但是我们强烈建议您输入一"
"个密码。GNU/Linux 和其它任何操作系统一样容易遇到错误的操作。由于\n"
-"\"root\" 可以越过所有限制并在访问分区时无意间就删除分区上的全部数据,所以成"
+"\"root\" 可以越过所有限制并在访问分区时无意间就删除分区上的全部数据, 所以成"
"为 \"root\" 应该很难才对。\n"
"\n"
-"密码应该是字母和数字的无序混合,并且至少要有 8 位长。绝对不要将 \"root\" 的密"
+"密码应该是字母和数字的无序混合, 并且至少要有 8 位长。绝对不要将 \"root\" 的密"
"码写下来 -- 这样的密码形同虚设。\n"
"\n"
-"还有一条准则 -- 不要将密码设置得太长或太复杂,否则您自己也记不住!\n"
+"还有一条准则 -- 不要将密码设置得太长或太复杂, 否则您自己也记不住!\n"
"\n"
-"您输入的密码不会显示在屏幕上。为了减少盲打所造成的输入错误,您需要再次输入密"
-"码。如果您碰巧两次都输错了,那么这个``不正确的''密码将成为您第一次以\n"
+"您输入的密码不会显示在屏幕上。为了减少盲打所造成的输入错误, 您需要再次输入密"
+"码。如果您碰巧两次都输错了, 那么这个``不正确的''密码将成为您第一次以\n"
"\"root\" 身份登录时的密码。\n"
"\n"
-"如果您想要身份验证服务器控制对您计算机的访问,请单击\"%s\"按钮。\n"
+"如果您想要身份验证服务器控制对您计算机的访问, 请单击\"%s\"按钮。\n"
"\n"
-"如果您的网络使用 LDAP 或 NIS,又或者PDC Windows\n"
-"域验证服务,请选择相应的\"%s\"。如果您不知道应该使用哪种,请询问您的网络管理"
+"如果您的网络使用 LDAP 或 NIS, 又或者PDC Windows\n"
+"域验证服务, 请选择相应的\"%s\"。如果您不知道应该使用哪种, 请询问您的网络管理"
"员。\n"
"\n"
-"如果您记住密码有困难的话,如果您的计算机不需要连接到 Internet,您也绝对信任可"
-"使用您计算机的所有人,您可以选择\"%s\"。"
+"如果您记住密码有困难的话, 如果您的计算机不需要连接到 Internet, 您也绝对信任可"
+"使用您计算机的所有人, 您可以选择\"%s\"。"
#: help.pm:722
#, c-format
msgid "authentication"
msgstr "认证"
-#. -PO: keep this short or else the buttons will not fit in the window
-#: help.pm:722 install_steps_interactive.pm:1211
-#, c-format
-msgid "No password"
-msgstr "无密码"
-
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
#: help.pm:725
@@ -5069,24 +5115,25 @@ msgid ""
"\n"
" * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
"\n"
-"If DrakX can't determine where to place the boot sector, it'll ask you\n"
+"If DrakX can not determine where to place the boot sector, it'll ask you\n"
"where it should place it. Generally, the \"%s\" is the safest place.\n"
-"Choosing \"%s\" won't install any boot loader. Use this option only if you\n"
+"Choosing \"%s\" will not install any boot loader. Use this option only if "
+"you\n"
"know what you're doing."
msgstr ""
-"所谓引导程序,是指计算机启动时所执行的小程序。它的责任就是启动整个系统。通"
-"常,引导程序的安装是全自动的。DrakX\n"
-"将分析磁盘的引导扇区,并根据发现的情况做出以下操作:\n"
+"所谓引导程序, 是指计算机启动时所执行的小程序。它的责任就是启动整个系统。通"
+"常, 引导程序的安装是全自动的。DrakX\n"
+"将分析磁盘的引导扇区, 并根据发现的情况做出以下操作:\n"
"\n"
-" * 如果发现了 Windows 引导扇区,则将其替换为 GRUB/LILO 引导扇区。这样,您就可"
+" * 如果发现了 Windows 引导扇区, 则将其替换为 GRUB/LILO 引导扇区。这样, 您就可"
"以装入 GNU/Linux\n"
"或在您计算机上安装的任何操作系统。\n"
"\n"
-" * 如果发现了 GRUB 或 LILO 引导扇区,则将其替换为新的引导扇区。\n"
+" * 如果发现了 GRUB 或 LILO 引导扇区, 则将其替换为新的引导扇区。\n"
"\n"
-"如果无法确定,DrakX\n"
-"将询问您将引导程序放在哪里。通常,\"%s\"是最安全的地方。选择\"%s\"将不会安装"
-"任何引导程序。除非您真的知道自己在做什么的话,否则不要使用此选项。"
+"如果无法确定, DrakX\n"
+"将询问您将引导程序放在哪里。通常, \"%s\"是最安全的地方。选择\"%s\"将不会安装"
+"任何引导程序。除非您真的知道自己在做什么的话, 否则不要使用此选项。"
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
@@ -5097,9 +5144,9 @@ msgid ""
"operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
"the printing systems is best suited to particular types of configuration.\n"
"\n"
-" * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
+" * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
"if you have a direct connection to your printer, you want to be able to\n"
-"panic out of printer jams, and you don't have networked printers. (\"%s\"\n"
+"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
"will handle only very simple network cases and is somewhat slow when used\n"
"within networks.) It's recommended that you use \"pdq\" if this is your\n"
"first experience with GNU/Linux.\n"
@@ -5114,39 +5161,39 @@ msgid ""
"\"%s\" includes graphical front-ends for printing or choosing printer\n"
"options and for managing the printer.\n"
"\n"
-"If you make a choice now, and later find that you don't like your printing\n"
+"If you make a choice now, and later find that you do not like your printing\n"
"system you may change it by running PrinterDrake from the Mandrakelinux\n"
"Control Center and clicking on the \"%s\" button."
msgstr ""
-"现在,应该为您的计算机选择打印系统了。其它的操作系统也许只提供了一种选择,但 "
+"现在, 应该为您的计算机选择打印系统了。其它的操作系统也许只提供了一种选择, 但 "
"Mandrakelinux\n"
"提供了两种。每种打印系统都能够在不同的配置中大展身手。\n"
"\n"
" * \"%s\" --\n"
-"这是``不排队打印''的缩写。如果您的打印机是直接连接在这台电脑上的,您也不会打"
-"印太多的任务,更不会使用网络打印机,那么请选择本系统。(\"%s\"\n"
-"只能应付极为简单的网络情况,而且在网络中使用也很慢。)如果您从来没有使用过 "
-"GNU/Linux,那么推荐您使用\"pdq\"。\n"
+"这是``不排队打印''的缩写。如果您的打印机是直接连接在这台电脑上的, 您也不会打"
+"印太多的任务, 更不会使用网络打印机, 那么请选择本系统。(\"%s\"\n"
+"只能应付极为简单的网络情况, 而且在网络中使用也很慢。)如果您从来没有使用过 "
+"GNU/Linux, 那么推荐您使用\"pdq\"。\n"
"\n"
" * \"%s\" -``通用 Unix\n"
-"打印系统'',不论是打印到本地打印机,还是打印到地球另一面的网络打印机,本系统"
-"都能完全胜任。它配置简单,甚至可以作为老式 \"lpd\n"
-"\"打印系统的服务器和客户机。所以即便是老得掉牙的操作系统需要打印服务的话,都"
-"可以顺畅的应用本系统。尽管它的功能十分强大,可它的基本设置仍然和\n"
-"\"pdq\" 一样简单。如果您想模拟一台 \"lpd\" 服务器,不要忘了打开 \"cups-lpd "
+"打印系统'', 不论是打印到本地打印机, 还是打印到地球另一面的网络打印机, 本系统"
+"都能完全胜任。它配置简单, 甚至可以作为老式 \"lpd\n"
+"\"打印系统的服务器和客户机。所以即便是老得掉牙的操作系统需要打印服务的话, 都"
+"可以顺畅的应用本系统。尽管它的功能十分强大, 可它的基本设置仍然和\n"
+"\"pdq\" 一样简单。如果您想模拟一台 \"lpd\" 服务器, 不要忘了打开 \"cups-lpd "
"\" 守护程序。\"%s\"\n"
-"还包括一个图形界面,可用来打印或选择打印机选项,以及管理打印机。\n"
+"还包括一个图形界面, 可用来打印或选择打印机选项, 以及管理打印机。\n"
"\n"
-"如果您现在进行了选择,但稍后又发现您并不喜欢所选择的打印系统,可以轻松修改。"
+"如果您现在进行了选择, 但稍后又发现您并不喜欢所选择的打印系统, 可以轻松修改。"
"只需从 Mandrakelinux Control Center中选择\n"
-"PrinterDrake,然后单击\"%s\"按钮。"
+"PrinterDrake, 然后单击\"%s\"按钮。"
#: help.pm:765
#, c-format
msgid "pdq"
msgstr "pdq"
-#: help.pm:765 printer/cups.pm:115 printer/data.pm:104
+#: help.pm:765 printer/cups.pm:115 printer/data.pm:118
#, c-format
msgid "CUPS"
msgstr "CUPS"
@@ -5177,17 +5224,17 @@ msgid ""
"configure the driver."
msgstr ""
"DrakX 将会首先检测您系统中所安装的 IDE 设备。它还会搜索您系统中所有的 PCI\n"
-"SCSI 适配卡。如果 DrakX 发现了 SCSI 适配卡,它会自动安装合适的驱动程序。\n"
+"SCSI 适配卡。如果 DrakX 发现了 SCSI 适配卡, 它会自动安装合适的驱动程序。\n"
"\n"
-"由于硬件检测并不总是可信的,DrakX 可能无法检测到您的硬盘驱动器。如果是这样\n"
-"的话,您就需要手动指定您的硬件。\n"
+"由于硬件检测并不总是可信的, DrakX 可能无法检测到您的硬盘驱动器。如果是这样\n"
+"的话, 您就需要手动指定您的硬件。\n"
"\n"
"\n"
-"如果您需要手动指定 PCI SCSI 适配卡,DrakX 将提问您是否要指定特别的参数。您\n"
-"最好让 DrakX 去检测硬件,这样有助于获得初始化适配卡所需的选项。在大多数情况\n"
-"下,DrakX 将会顺利通过这一步。\n"
+"如果您需要手动指定 PCI SCSI 适配卡, DrakX 将提问您是否要指定特别的参数。您\n"
+"最好让 DrakX 去检测硬件, 这样有助于获得初始化适配卡所需的选项。在大多数情况\n"
+"下, DrakX 将会顺利通过这一步。\n"
"\n"
-"如果 DrakX 无法检测到适当的参数,就只好劳驾您亲自配置驱动程序了。"
+"如果 DrakX 无法检测到适当的参数, 就只好劳驾您亲自配置驱动程序了。"
# DO NOT BOTHER TO MODIFY HERE, SEE:
# cvs.mandrakesoft.com:/cooker/doc/manualB/modules/zh_cn/drakx-chapter.xml
@@ -5195,14 +5242,14 @@ msgstr ""
#, c-format
msgid ""
"\"%s\": if a sound card is detected on your system, it'll be displayed\n"
-"here. If you notice the sound card isn't the one actually present on your\n"
+"here. If you notice the sound card is not the one actually present on your\n"
"system, you can click on the button and choose a different driver."
msgstr ""
-"\"%s\":如果在您的系统中检测到了声卡,则会在此处显示。如果您发现在此显示的声"
-"卡与您系统中实际安装的声卡并不相同,您可以单击该按钮选择不同的驱动程序。"
+"\"%s\":如果在您的系统中检测到了声卡, 则会在此处显示。如果您发现在此显示的声"
+"卡与您系统中实际安装的声卡并不相同, 您可以单击该按钮选择不同的驱动程序。"
-#: help.pm:788 help.pm:855 install_steps_interactive.pm:1019
-#: install_steps_interactive.pm:1036
+#: help.pm:788 help.pm:855 install_steps_interactive.pm:1005
+#: install_steps_interactive.pm:1022
#, c-format
msgid "Sound card"
msgstr "声卡"
@@ -5223,7 +5270,7 @@ msgid ""
"\n"
" * \"%s\": check the current country selection. If you're not in this\n"
"country, click on the \"%s\" button and choose another. If your country\n"
-"isn't in the list shown, click on the \"%s\" button to get the complete\n"
+"is not in the list shown, click on the \"%s\" button to get the complete\n"
"country list.\n"
"\n"
" * \"%s\": by default, DrakX deduces your time zone based on the country\n"
@@ -5239,18 +5286,18 @@ msgid ""
"presented in our manual is similar to the one used during installation.\n"
"\n"
" * \"%s\": if a sound card is detected on your system, it'll be displayed\n"
-"here. If you notice the sound card isn't the one actually present on your\n"
+"here. If you notice the sound card is not the one actually present on your\n"
"system, you can click on the button and choose a different driver.\n"
"\n"
" * \"%s\": if you have a TV card, this is where information about its\n"
-"configuration will be displayed. If you have a TV card and it isn't\n"
+"configuration will be displayed. If you have a TV card and it is not\n"
"detected, click on \"%s\" to try to configure it manually.\n"
"\n"
" * \"%s\": you can click on \"%s\" to change the parameters associated with\n"
"the card if you feel the configuration is wrong.\n"
"\n"
" * \"%s\": by default, DrakX configures your graphical interface in\n"
-"\"800x600\" or \"1024x768\" resolution. If that doesn't suit you, click on\n"
+"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
"\"%s\" to reconfigure your graphical interface.\n"
"\n"
" * \"%s\": if you wish to configure your Internet or local network access,\n"
@@ -5278,68 +5325,68 @@ msgid ""
"on your machine. If you plan to use this machine as a server it's a good\n"
"idea to review this setup."
msgstr ""
-"作为概览,DrakX\n"
-"将会将它所发现的关于系统的信息概览显示出来。根据您所安装的硬件不同,您可能会"
-"看到以下各项的部分或全部。每项由几个可配置的硬件项组成,而每个条目后面都列出"
+"作为概览, DrakX\n"
+"将会将它所发现的关于系统的信息概览显示出来。根据您所安装的硬件不同, 您可能会"
+"看到以下各项的部分或全部。每项由几个可配置的硬件项组成, 而每个条目后面都列出"
"了当前配置的概览。单击相应的\"%s\"按钮可进行更改。\n"
"\n"
-" * \"%s\":检查当前的键盘映射配置,如果需要的话进行更改。\n"
+" * \"%s\":检查当前的键盘映射配置, 如果需要的话进行更改。\n"
"\n"
" *\n"
-"\"%s\":检查当前的国家选择。如果您并非在这个国家,请单击\"%s\"按钮,并选择另"
-"外的选项。如果您的国家在第一个列表中并没有显示出来,单击\"%s\"按钮可获得完整"
+"\"%s\":检查当前的国家选择。如果您并非在这个国家, 请单击\"%s\"按钮, 并选择另"
+"外的选项。如果您的国家在第一个列表中并没有显示出来, 单击\"%s\"按钮可获得完整"
"的国家列表。\n"
"\n"
-" * \"%s\":默认情况下,DrakX 会根据您所选的国家猜测您的时区。如果时区不对的"
-"话,您可以单击此处的\"%s\"按钮。\n"
+" * \"%s\":默认情况下, DrakX 会根据您所选的国家猜测您的时区。如果时区不对的"
+"话, 您可以单击此处的\"%s\"按钮。\n"
"\n"
-" * \"%s\":检查当前的鼠标配置,如果需要的话单击按钮进行修改。\n"
+" * \"%s\":检查当前的鼠标配置, 如果需要的话单击按钮进行修改。\n"
"\n"
" *\n"
"\"%s\":单击\"%s\"按钮将打开打印机配置向导。请参看``初学者指南''中的相应章"
-"节,其中详细描述了如何设置新打印机。那里给出的界面与安装时所用的界面大体相"
+"节, 其中详细描述了如何设置新打印机。那里给出的界面与安装时所用的界面大体相"
"同。\n"
"\n"
" *\n"
-"\"%s\":如果在您的系统中检测到了声卡,则会在此处显示。如果您发现在此显示的声"
-"卡与您系统中实际安装的声卡并不相同,您可以单击该按钮选择不同的驱动程序。\n"
+"\"%s\":如果在您的系统中检测到了声卡, 则会在此处显示。如果您发现在此显示的声"
+"卡与您系统中实际安装的声卡并不相同, 您可以单击该按钮选择不同的驱动程序。\n"
"\n"
" *\n"
-"\"%s\":如果在您的系统中检测到了电视卡,则会在此显示关于其配置的信息。如果您"
-"安装了电视卡,但并未被正确检测到,请单击\"%s\"尝试手动进行配置。\n"
+"\"%s\":如果在您的系统中检测到了电视卡, 则会在此显示关于其配置的信息。如果您"
+"安装了电视卡, 但并未被正确检测到, 请单击\"%s\"尝试手动进行配置。\n"
"\n"
-" * \"%s\":如果您觉得检测的配置有错,可以点击\"%s\"来更改与该卡关联的参数。\n"
+" * \"%s\":如果您觉得检测的配置有错, 可以点击\"%s\"来更改与该卡关联的参数。\n"
"\n"
-" * \"%s\":默认情况下,DrakX 会将您的图形界面配置为 \"800x600\" 或 \"1024x768"
+" * \"%s\":默认情况下, DrakX 会将您的图形界面配置为 \"800x600\" 或 \"1024x768"
"\"\n"
-"分辨率。如果这不适合您的话,请单击\"%s\"重新配置您的图形界面。\n"
+"分辨率。如果这不适合您的话, 请单击\"%s\"重新配置您的图形界面。\n"
"\n"
-" * \"%s\":如果您想要配置您的 Internet 或局域网访问,现在就可以进行。请参考印"
+" * \"%s\":如果您想要配置您的 Internet 或局域网访问, 现在就可以进行。请参考印"
"刷文档或在安装完成后使用 Mandrakelinux\n"
"Control Center来获得完整的在线帮助。\n"
"\n"
-" * \"%s\":如果您所安装的计算机位于代理服务器之后,这里将允许您配置 HTTP 和 "
+" * \"%s\":如果您所安装的计算机位于代理服务器之后, 这里将允许您配置 HTTP 和 "
"FTP 代理服务器地址。\n"
"\n"
-" * \"%s\":此项允许您重新调整安全级别,与以前的步骤完全相同()。\n"
+" * \"%s\":此项允许您重新调整安全级别, 与以前的步骤完全相同()。\n"
"\n"
" * \"%s\":如果您计划将您的计算机连接到\n"
-"Internet,那么保护您的计算机免于攻击的有效方法就是设置防火墙。请参考``初学者"
-"指南''中的相应章节,以获得关于防火墙设置的细节。\n"
+"Internet, 那么保护您的计算机免于攻击的有效方法就是设置防火墙。请参考``初学者"
+"指南''中的相应章节, 以获得关于防火墙设置的细节。\n"
"\n"
-" * \"%s\":如果您想要更改您的引导程序配置,请单击此按钮。这仅适用于高级用户。"
+" * \"%s\":如果您想要更改您的引导程序配置, 请单击此按钮。这仅适用于高级用户。"
"请参考印刷文档或 Mandrakelinux Control\n"
"Center中关于引导程序配置的帮助。\n"
"\n"
" * \"%s\":在此您可以精确调整要在您的计算机上运行哪些服务。如果您要将此计算机"
-"用作服务器,那么应该复查这一设置。"
+"用作服务器, 那么应该复查这一设置。"
-#: help.pm:855 install_steps_interactive.pm:978 standalone/drakclock:101
+#: help.pm:855 install_steps_interactive.pm:964 standalone/drakclock:100
#, c-format
msgid "Timezone"
msgstr "时区"
-#: help.pm:855 install_steps_interactive.pm:1052
+#: help.pm:855 install_steps_interactive.pm:1038
#, c-format
msgid "TV card"
msgstr "电视卡"
@@ -5354,32 +5401,33 @@ msgstr "ISDN 卡"
msgid "Graphical Interface"
msgstr "图形界面"
-#: help.pm:855 install_steps_interactive.pm:1070 standalone/drakbackup:2030
+#: help.pm:855 install_any.pm:1528 install_steps_interactive.pm:1056
+#: standalone/drakbackup:2036
#, c-format
msgid "Network"
msgstr "网络"
-#: help.pm:855 install_steps_interactive.pm:1085
+#: help.pm:855 install_steps_interactive.pm:1071
#, c-format
msgid "Proxies"
msgstr "代理服务器"
-#: help.pm:855 install_steps_interactive.pm:1096
+#: help.pm:855 install_steps_interactive.pm:1082
#, c-format
msgid "Security Level"
msgstr "安全级别"
-#: help.pm:855 install_steps_interactive.pm:1110
+#: help.pm:855 install_steps_interactive.pm:1096
#, c-format
msgid "Firewall"
msgstr "防火墙"
-#: help.pm:855 install_steps_interactive.pm:1124
+#: help.pm:855 install_steps_interactive.pm:1110
#, c-format
msgid "Bootloader"
msgstr "引导程序"
-#: help.pm:855 install_steps_interactive.pm:1137 services.pm:195
+#: help.pm:855 install_steps_interactive.pm:1123 services.pm:193
#, c-format
msgid "Services"
msgstr "服务"
@@ -5392,7 +5440,7 @@ msgid ""
"and will not be recoverable!"
msgstr ""
"请选择您为了安装新的 Mandrakelinux 分区想要删除的硬盘分区。\n"
-"注意,该硬盘分区上的所有数据将丢失并且无法恢复!"
+"注意, 该硬盘分区上的所有数据将丢失并且无法恢复!"
#: help.pm:863
#, c-format
@@ -5405,10 +5453,10 @@ msgid ""
"Click on \"%s\" to quit this operation without losing data and partitions\n"
"present on this hard drive."
msgstr ""
-"如果您想要删除此硬盘上的所有数据和分区,请单击“%s”。注意,单击“%s”后,\n"
+"如果您想要删除此硬盘上的所有数据和分区, 请单击“%s”。注意, 单击“%s”后, \n"
"您将无法恢复此硬盘上的任何数据或分区(包括任何 Windows 数据)。\n"
"\n"
-"单击“%s”可以停止此操作,此硬盘上的任何数据或分区不会丢失。"
+"单击“%s”可以停止此操作, 此硬盘上的任何数据或分区不会丢失。"
#: help.pm:869
#, c-format
@@ -5423,11 +5471,11 @@ msgstr "<- 上一步"
#: install2.pm:117
#, c-format
msgid ""
-"Can't access kernel modules corresponding to your kernel (file %s is "
+"Can not access kernel modules corresponding to your kernel (file %s is "
"missing), this generally means your boot floppy in not in sync with the "
"Installation medium (please create a newer boot floppy)"
msgstr ""
-"无法读取与您的内核配套的内核模块(缺少文件 %s),通常是因为启动软盘与安装介质不"
+"无法读取与您的内核配套的内核模块(缺少文件 %s), 通常是因为启动软盘与安装介质不"
"配套(请制作新的启动盘)"
#: install2.pm:167
@@ -5435,22 +5483,13 @@ msgstr ""
msgid "You must also format %s"
msgstr "您还必须格式化 %s"
-#: install_any.pm:390
-#, c-format
-msgid ""
-"The following installation media have been found.\n"
-"If you want to skip some of them, you can unselect them now."
-msgstr ""
-"找到了下列安装介质。\n"
-"如果您想要跳过其中一些,请不要选中。"
-
-#: install_any.pm:411
+#: install_any.pm:376
#, c-format
msgid "Do you have further supplementary media?"
-msgstr "您有其它赠品介质吗?"
+msgstr "您有其它赠品介质吗?"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:414
+#: install_any.pm:379
#, c-format
msgid ""
"The following media have been found and will be used during install: %s.\n"
@@ -5458,62 +5497,85 @@ msgid ""
"\n"
"Do you have a supplementary installation media to configure?"
msgstr ""
-"安装过程中找到了下列介质,并将使用下列介质:%s\n"
+"安装过程中找到了下列介质, 并将使用下列介质:%s\n"
"\n"
"\n"
-"您是否有要配置的赠品安装介质?"
+"您是否有要配置的赠品安装介质?"
-#: install_any.pm:420 printer/printerdrake.pm:2652
-#: printer/printerdrake.pm:2659 standalone/scannerdrake:176
-#: standalone/scannerdrake:184 standalone/scannerdrake:235
-#: standalone/scannerdrake:242
+#: install_any.pm:388 printer/printerdrake.pm:2929
+#: printer/printerdrake.pm:2936 standalone/scannerdrake:182
+#: standalone/scannerdrake:190 standalone/scannerdrake:241
+#: standalone/scannerdrake:248
#, c-format
msgid "CD-ROM"
msgstr "CD-ROM"
-#: install_any.pm:420
+#: install_any.pm:388
#, c-format
msgid "Network (http)"
msgstr "网络 (http)"
-#: install_any.pm:420
+#: install_any.pm:388
#, c-format
msgid "Network (ftp)"
msgstr "网络 (ftp)"
-#: install_any.pm:464 standalone/drakbackup:112
+#: install_any.pm:436 standalone/drakbackup:112
#, c-format
msgid "No device found"
msgstr "没有发现设备"
-#: install_any.pm:468
+#: install_any.pm:440
#, c-format
msgid "Insert the CD"
msgstr "插入光盘"
-#: install_any.pm:492
+#: install_any.pm:445
+#, c-format
+msgid "Unable to mount CD-ROM"
+msgstr "无法挂载 CD-ROM"
+
+#: install_any.pm:468
#, c-format
msgid "Insert the CD 1 again"
msgstr "再次插入第一张光盘"
-#: install_any.pm:502 install_any.pm:506
+#: install_any.pm:478 install_any.pm:482
#, c-format
msgid "URL of the mirror?"
msgstr "镜像的 URL?"
-#: install_any.pm:532
+#: install_any.pm:515
#, c-format
-msgid "Can't find hdlist file on this mirror"
+msgid ""
+"Can't find a package list file on this mirror. Make sure the location is "
+"correct."
msgstr "未在此经向上找到 hdlist 文件"
+#: install_any.pm:633
+#, c-format
+msgid ""
+"Change your Cd-Rom!\n"
+"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
+"done."
+msgstr ""
+"请换另一片光盘!\n"
+"\n"
+"请在驱动器中插入标有“%s”的光盘, 然后单击“确定”。"
+
+#: install_any.pm:652
+#, c-format
+msgid "Copying in progress"
+msgstr "复制进行中"
+
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:713
+#: install_any.pm:783
#, c-format
msgid ""
"You have selected the following server(s): %s\n"
"\n"
"\n"
-"These servers are activated by default. They don't have any known security\n"
+"These servers are activated by default. They do not have any known security\n"
"issues, but some new ones could be found. In that case, you must make sure\n"
"to upgrade as soon as possible.\n"
"\n"
@@ -5523,14 +5585,14 @@ msgstr ""
"您选择了以下服务器: %s\n"
"\n"
"\n"
-"这些服务器默认会被激活。它们没有已知的安全问题,但可能发现新问题。如果那样,"
+"这些服务器默认会被激活。它们没有已知的安全问题, 但可能发现新问题。如果那样, "
"您一定要立即升级。\n"
"\n"
"\n"
-"您真要安装这些服务器吗?\n"
+"您真要安装这些服务器吗?\n"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:736
+#: install_any.pm:806
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -5538,39 +5600,27 @@ msgid ""
"\n"
"Do you really want to remove these packages?\n"
msgstr ""
-"为了升级您的系统,将要删除下列的软件包: %s\n"
+"为了升级您的系统, 将要删除下列的软件包: %s\n"
"\n"
"\n"
-"您确定要删除这些软件包吗?\n"
+"您确定要删除这些软件包吗?\n"
-#: install_any.pm:1116
-#, c-format
-msgid "Insert a FAT formatted floppy in drive %s"
-msgstr "请在驱动器 %s 中插入一张 FAT 格式的软盘"
-
-#: install_any.pm:1120
-#, c-format
-msgid "This floppy is not FAT formatted"
-msgstr "该软盘不是 FAT 格式"
-
-#: install_any.pm:1132
-#, c-format
-msgid ""
-"To use this saved packages selection, boot installation with ``linux "
-"defcfg=floppy''"
-msgstr "使用保存的软件包选择,以“linux defcfg=floppy”启动"
-
-#: install_any.pm:1160 partition_table.pm:595
+#: install_any.pm:1214 partition_table.pm:603
#, c-format
msgid "Error reading file %s"
msgstr "请取文件 %s 出错"
-#: install_any.pm:1361
+#: install_any.pm:1425
#, c-format
-msgid "%s (was %s)"
-msgstr "%s(以前是 %s)"
+msgid "The following disk(s) were renamed:"
+msgstr "下列盘片已重命名:"
-#: install_any.pm:1396
+#: install_any.pm:1427
+#, c-format
+msgid "%s (previously named as %s)"
+msgstr "%s(以前的名称为 %s)"
+
+#: install_any.pm:1465
#, c-format
msgid ""
"An error occurred - no valid devices were found on which to create new "
@@ -5578,12 +5628,52 @@ msgid ""
msgstr ""
"发生错误!新建文件系统时找不到可用的设备。请检查您的硬件以确定问题的原因"
-#: install_gtk.pm:160
+#: install_any.pm:1509
+#, c-format
+msgid "HTTP"
+msgstr "HTTP"
+
+#: install_any.pm:1509
+#, c-format
+msgid "FTP"
+msgstr "FTP"
+
+#: install_any.pm:1509
+#, c-format
+msgid "NFS"
+msgstr "NFS"
+
+#: install_any.pm:1532
+#, c-format
+msgid "Please choose a media"
+msgstr "请选择介质"
+
+#: install_any.pm:1564
+#, c-format
+msgid "Bad media %s"
+msgstr "无效的介质 %s"
+
+#: install_any.pm:1576
+#, c-format
+msgid "File already exists. Overwrite it?"
+msgstr "文件已经存在。覆盖吗?"
+
+#: install_any.pm:1627
+#, c-format
+msgid "Can not make screenshots before partitioning"
+msgstr "无法在分区完成之前进行屏幕捕捉"
+
+#: install_any.pm:1634
+#, c-format
+msgid "Screenshots will be available after install in %s"
+msgstr "安装完成后, 所有的屏幕抓图都会保存到 %s 之中"
+
+#: install_gtk.pm:136
#, c-format
msgid "System installation"
msgstr "系统安装"
-#: install_gtk.pm:163
+#: install_gtk.pm:139
#, c-format
msgid "System configuration"
msgstr "系统配置"
@@ -5595,7 +5685,7 @@ msgid ""
"You can find some information about them at: %s"
msgstr ""
"您系统中的部分硬件需要“私有”的驱动程序才能工作。\n"
-"有关它们的情况,请您查看: %s"
+"有关它们的情况, 请您查看: %s"
#: install_interactive.pm:62
#, c-format
@@ -5606,18 +5696,18 @@ msgid ""
msgstr ""
"必须指定一个根分区。\n"
"请先创建一个 Linux 分区(或在图中单击现有的一个)。\n"
-"然后在列表里选择“挂载点”,设为“/”。"
+"然后在列表里选择“挂载点”, 设为“/”。"
#: install_interactive.pm:67
#, c-format
msgid ""
-"You don't have a swap partition.\n"
+"You do not have a swap partition.\n"
"\n"
"Continue anyway?"
msgstr ""
"您还没有交换分区。\n"
"\n"
-"要继续吗?"
+"要继续吗?"
#: install_interactive.pm:70 install_steps.pm:211
#, c-format
@@ -5647,7 +5737,7 @@ msgstr "利用 Windows 分区进行回环"
#: install_interactive.pm:117
#, c-format
msgid "Which partition do you want to use for Linux4Win?"
-msgstr "请问您要在哪一个分区里放 Linux4Win?"
+msgstr "请问您要在哪一个分区里放 Linux4Win?"
#: install_interactive.pm:119
#, c-format
@@ -5672,7 +5762,7 @@ msgstr "没有 FAT 分区来用作回环(或者没有足够剩余空间)"
#: install_interactive.pm:139
#, c-format
msgid "Which partition do you want to resize?"
-msgstr "您需要改变哪个分区的大小?"
+msgstr "您需要改变哪个分区的大小?"
#: install_interactive.pm:153
#, c-format
@@ -5680,7 +5770,7 @@ msgid ""
"The FAT resizer is unable to handle your partition, \n"
"the following error occurred: %s"
msgstr ""
-"改变 FAT 分区大小的程序无法处理这个分区,\n"
+"改变 FAT 分区大小的程序无法处理这个分区, \n"
"发生了如下错误: %s"
#: install_interactive.pm:156
@@ -5695,7 +5785,7 @@ msgid ""
"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
"installation."
msgstr ""
-"您的 Windows 分区有太多碎片,请重新启动,进入 Windows,运行磁盘碎片整理程序,"
+"您的 Windows 分区有太多碎片, 请重新启动, 进入 Windows, 运行磁盘碎片整理程序, "
"然后重新开始安装 Mandrakelinux"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -5715,16 +5805,16 @@ msgid ""
msgstr ""
"警告!\n"
"\n"
-"DrakX 现在要调整您的 Windows 分区的大小。请小心: 此操作十分危险。为安全起见,"
-"您应该先退出安装程序,在 Windows 的命令提示符状态下运行“chkdsk c:”(注意,只运"
-"行图形化程序“磁盘扫描程序”是不够的,请确定在命令提示符状态下使用“chkdsk”。)另"
-"外,还建议您运行磁盘碎片整理程序。然后重新启动本安装程序。您还应该备份您的数"
-"据。一切就绪后,请按“确定”。"
+"DrakX 现在要调整您的 Windows 分区的大小。请小心: 此操作十分危险。为安全起见, "
+"您应该先退出安装程序, 在 Windows 的命令提示符状态下运行“chkdsk c:”(注意, 只运"
+"行图形化程序“磁盘扫描程序”是不够的, 请确定在命令提示符状态下使用“chkdsk”。)另"
+"外, 还建议您运行磁盘碎片整理程序。然后重新启动本安装程序。您还应该备份您的数"
+"据。一切就绪后, 请按“确定”。"
#: install_interactive.pm:178
#, c-format
msgid "Which size do you want to keep for Windows on"
-msgstr "您将保留多少空间给 Windows?"
+msgstr "您将保留多少空间给 Windows?"
#: install_interactive.pm:179
#, c-format
@@ -5754,7 +5844,7 @@ msgstr "删除 Windows(TM)"
#: install_interactive.pm:215
#, c-format
msgid "You have more than one hard drive, which one do you install linux on?"
-msgstr "您有不只一个硬盘,您要在哪个上面安装 Linux?"
+msgstr "您有不只一个硬盘, 您要在哪个上面安装 Linux?"
#: install_interactive.pm:219
#, c-format
@@ -5770,14 +5860,14 @@ msgstr "使用 fdisk"
#, c-format
msgid ""
"You can now partition %s.\n"
-"When you are done, don't forget to save using `w'"
+"When you are done, do not forget to save using `w'"
msgstr ""
"您现在可以在 %s 上分区。\n"
-"做完之后,不要忘记用“w”命令保存您的修改"
+"做完之后, 不要忘记用“w”命令保存您的修改"
#: install_interactive.pm:271
#, c-format
-msgid "I can't find any room for installing"
+msgid "I can not find any room for installing"
msgstr "我无法找到安装需要的空间"
#: install_interactive.pm:275
@@ -5932,24 +6022,24 @@ msgstr ""
"1. 许可协议\n"
"\n"
"请仔细阅读此文档。此文档是您与 Mandrakesoft S.A. 之间关于本软件产品的一个许可"
-"协议。如果您安装、复制或使用本软件产品,即表明您接受并完全同意遵守本许可协议"
-"的内容和条件。如果您不同意本许可协议中的任何部分,您将无权安装、复制或使用本"
-"软件产品任何试图不遵守本许可协议的内容和条件,而安装、复制或使用本软件产品的"
-"行为都是非法的,并将导致本许可协议赋予您的各种权利立即作废,根据许可协议的条"
-"款,您将必须立即销毁本软件产品的任何副本。\n"
+"协议。如果您安装、复制或使用本软件产品, 即表明您接受并完全同意遵守本许可协议"
+"的内容和条件。如果您不同意本许可协议中的任何部分, 您将无权安装、复制或使用本"
+"软件产品任何试图不遵守本许可协议的内容和条件, 而安装、复制或使用本软件产品的"
+"行为都是非法的, 并将导致本许可协议赋予您的各种权利立即作废, 根据许可协议的条"
+"款, 您将必须立即销毁本软件产品的任何副本。\n"
"\n"
"\n"
"2. 有限担保\n"
"\n"
-"本软件产品和附带的文档是一经发表即“不再修改”,在法律允许的范围内没有任何担"
+"本软件产品和附带的文档是一经发表即“不再修改”, 在法律允许的范围内没有任何担"
"保。在法律允许的范围内 Mandrakesoft S.A. 对因使用或不能使用本软件产品而引起的"
"特定、偶然、直接、间接的无论任何损失(包括但不限于生意的丧失、生意的中断、财务"
-"损失、因法院裁决产生的法律费用和处罚或其他因此产生的损失)将不承担责任,即使 "
+"损失、因法院裁决产生的法律费用和处罚或其他因此产生的损失)将不承担责任, 即使 "
"Mandrakesoft S.A. 已经被告知有发生这种损失的可能性。\n"
"\n"
"在某些国家中关于拥有和使用被禁止的软件的有限责任\n"
"\n"
-"在法律允许的范围内 Mandrakesoft S.A. 或其分销者对因拥有或使用,或从任何 "
+"在法律允许的范围内 Mandrakesoft S.A. 或其分销者对因拥有或使用, 或从任何 "
"Mandrakelinux 的网站下载在某些国家中被当地法律禁止或限制的软件而引起的特定、"
"偶然、直接、间接的无论任何损失 (包括但不限于生意的丧失、生意的中断、财务损"
"失、因法院裁决产生的法律费用和处罚或其他因此产生的损失)将不承担责任。这种有限"
@@ -5959,28 +6049,28 @@ msgstr ""
"3. GPL 许可协议和其它有关协议\n"
"\n"
"本软件产品由不同个人或组织所创作的各部分组成。这些部分基本上都采用 GNU 通用公"
-"共许可协议(GNU General Public Licence),此后简称为“GPL”,或其它类似的许可协议"
+"共许可协议(GNU General Public Licence), 此后简称为“GPL”, 或其它类似的许可协议"
"的条款和条件。这些许可协议大多允许您使用、复制、修改或重新发表协议所覆盖的部"
-"分。使用这些软件之前,请仔细阅读有关许可协议的条款和条件。如果对任何部分的许"
-"可协议有疑问,应该与该部分的作者联系,Mandrakesoft 无法解答这些问题。由 "
+"分。使用这些软件之前, 请仔细阅读有关许可协议的条款和条件。如果对任何部分的许"
+"可协议有疑问, 应该与该部分的作者联系, Mandrakesoft 无法解答这些问题。由 "
"Mandrakesoft S.A. 开发的各个程序受 GPL 许可协议保护。由 Mandrakesoft S.A. 创"
"作的文档采用一个特别的许可协议。详情见有关的文档。\n"
"\n"
"\n"
"4. 知识产权\n"
"\n"
-"本软件产品的各个组件的所有权利属于它们各自的作者,并受到所有可适用于软件程序"
+"本软件产品的各个组件的所有权利属于它们各自的作者, 并受到所有可适用于软件程序"
"的知识产权和版权法律的保护。Mandrakesoft S.A. 保留对本软件产品进行全面或部分"
-"的更改或调整的权利,不论采用任何方法,不论出于任何目的。\n"
-"“Mandrake”,“Mandrakelinux”和相关的标志是 Mandrakesoft S.A. 的商标。\n"
+"的更改或调整的权利, 不论采用任何方法, 不论出于任何目的。\n"
+"“Mandrake”, “Mandrakelinux”和相关的标志是 Mandrakesoft S.A. 的商标。\n"
"\n"
"\n"
"5. 适用法律\n"
"\n"
-"如果本协议的任何部分被法院裁定为无效、非法或不适用,该部分将被排除在本协议之"
+"如果本协议的任何部分被法院裁定为无效、非法或不适用, 该部分将被排除在本协议之"
"外。您仍然需要遵守本协议的其它可使用的部分。本协议的内容和条件受法国法律管"
-"辖。有关本协议的任何争议最好在法庭外解决。作为最后的手段,争议将被提交法国巴"
-"黎适当的法院审理。对本文档有任何疑问,请联系 Mandrakesoft S.A.。\n"
+"辖。有关本协议的任何争议最好在法庭外解决。作为最后的手段, 争议将被提交法国巴"
+"黎适当的法院审理。对本文档有任何疑问, 请联系 Mandrakesoft S.A.。\n"
"\n"
"以上中文翻译仅为方便您理解, 不能作为法律用途, 请以协议英文文本为准。\n"
@@ -5995,10 +6085,10 @@ msgid ""
"patent\n"
"may be applicable to you, check your local laws."
msgstr ""
-"警告: 自由软件并不一定是没有专利的,一些自由软件可能包含一些在您的国家有专\n"
-"的成分。比方说,MP3 解码器在用作更多用途时可能需要许可证(请参看 \n"
-"http://www.mp3licensing.com 以获得更多信息)。如果您对专利是否适用于您感到\n"
-"疑惑,请查看当地的法律。"
+"警告: 自由软件并不一定是没有专利的, 一些自由软件可能包含一些在您的国家享有专"
+"利的成分。比方说, MP3 解码器在用作更多用途时可能需要许可证(请参看 http://www."
+"mp3licensing.com 以获得更多信息)。如果您对专利是否适用于您感到疑惑, 请查看当"
+"地的法律。"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
#: install_messages.pm:98
@@ -6036,21 +6126,21 @@ msgstr ""
"\n"
"警告\n"
"\n"
-"请仔细阅读下列的条款。如果您不同意其中任何部分,您就不可以安装下一个光盘上的"
+"请仔细阅读下列的条款。如果您不同意其中任何部分, 您就不可以安装下一个光盘上的"
"软件。选择“拒绝”将继续安装其它介质上的软件。\n"
"\n"
"\n"
"下一个光盘的部分内容的许可协议不是 GPL 或类似的协议。每个这样的内容受到各自不"
-"同的条件和条款的限制。在您使用或重新分发该内容之前,请仔细阅读并遵守其特定的"
+"同的条件和条款的限制。在您使用或重新分发该内容之前, 请仔细阅读并遵守其特定的"
"许可协议。\n"
-"通常这些协议会限制对该内容进行转换,复制(备份目的除外),再次分发,反向工程,"
-"反汇编,反编译或其它修改。如果违背任何协议的条款,协议赋予您的权利也立即终"
-"止。除非协议中有特定的条款赋予您相关权利,您通常不能在超过一台系统中安装该程"
-"序,或者把它应用在网络上。如果有疑问,请直接与该内容的发行者或作者联系。\n"
-"向第三方转让或复制这些内容,包括其文档通常是被禁止的。\n"
+"通常这些协议会限制对该内容进行转换, 复制(备份目的除外), 再次分发, 反向工程, "
+"反汇编, 反编译或其它修改。如果违背任何协议的条款, 协议赋予您的权利也立即终"
+"止。除非协议中有特定的条款赋予您相关权利, 您通常不能在超过一台系统中安装该程"
+"序, 或者把它应用在网络上。如果有疑问, 请直接与该内容的发行者或作者联系。\n"
+"向第三方转让或复制这些内容, 包括其文档通常是被禁止的。\n"
"\n"
"\n"
-"下一个光盘的内容的全部权利分别属于它们各自的作者,并受到可应用与软件程序的知"
+"下一个光盘的内容的全部权利分别属于它们各自的作者, 并受到可应用与软件程序的知"
"识产权和版权法律的保护。\n"
#: install_messages.pm:131
@@ -6072,16 +6162,16 @@ msgid ""
"install chapter of the Official Mandrakelinux User's Guide."
msgstr ""
"恭喜。安装完成了。\n"
-"请取出启动介质,然后按 ENTER 重新启动。\n"
+"请取出启动介质, 然后按 ENTER 重新启动。\n"
"\n"
"\n"
-"要了解此版本 Mandrakelinux 的修订,请访问以下勘误表: \n"
+"要了解此版本 Mandrakelinux 的修订, 请访问以下勘误表: \n"
"\n"
"\n"
"%s\n"
"\n"
"\n"
-"关于安装后如何配置您的系统,请查看 Mandrakelinux 官方用户手册。"
+"关于安装后如何配置您的系统, 请查看 Mandrakelinux 官方用户手册。"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
#: install_messages.pm:144
@@ -6094,19 +6184,19 @@ msgstr "http://www.mandrakelinux.com/en/101errata.php3"
msgid "Duplicate mount point %s"
msgstr "重复的挂载点 %s"
-#: install_steps.pm:477
+#: install_steps.pm:479
#, c-format
msgid ""
-"Some important packages didn't get installed properly.\n"
+"Some important packages did not get installed properly.\n"
"Either your cdrom drive or your cdrom is defective.\n"
"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm"
"\"\n"
msgstr ""
"一些重要软件包没有正确的安装。\n"
"您的光盘或者驱动器可能有缺陷。\n"
-"请在一台安装好的电脑上检查光盘,命令是“rpm -qpl media/main/*.rpm”\n"
+"请在一台安装好的电脑上检查光盘, 命令是“rpm -qpl media/main/*.rpm”\n"
-#: install_steps.pm:603
+#: install_steps.pm:599
#, c-format
msgid "No floppy drive available"
msgstr "没有可用的软盘驱动器"
@@ -6116,7 +6206,7 @@ msgstr "没有可用的软盘驱动器"
msgid "Entering step `%s'\n"
msgstr "进入步骤“%s”\n"
-#: install_steps_gtk.pm:184
+#: install_steps_gtk.pm:177
#, c-format
msgid ""
"Your system is low on resources. You may have some problem installing\n"
@@ -6125,422 +6215,439 @@ msgid ""
"press `F1' when booting on CDROM, then enter `text'."
msgstr ""
"您的系统资源不足。您在安装 Mandrakelinux 时可能遇到问题。\n"
-"如果这样,您可以尝试文本模式的安装。\n"
-"在从光盘启动后按“F1”键,然后输入“text”。"
+"如果这样, 您可以尝试文本模式的安装。\n"
+"在从光盘启动后按“F1”键, 然后输入“text”。"
-#: install_steps_gtk.pm:235 install_steps_interactive.pm:628
+#: install_steps_gtk.pm:224 install_steps_interactive.pm:624
#, c-format
msgid "Package Group Selection"
msgstr "程序组选择"
-#: install_steps_gtk.pm:264 install_steps_interactive.pm:567
+#: install_steps_gtk.pm:250 install_steps_interactive.pm:567
#, c-format
msgid "Total size: %d / %d MB"
msgstr "总共大小: %d / %d MB"
-#: install_steps_gtk.pm:309
+#: install_steps_gtk.pm:295
#, c-format
msgid "Bad package"
msgstr "有错的软件包"
-#: install_steps_gtk.pm:311
+#: install_steps_gtk.pm:297
#, c-format
msgid "Version: "
msgstr "版本: "
-#: install_steps_gtk.pm:312
+#: install_steps_gtk.pm:298
#, c-format
msgid "Size: "
msgstr "大小: "
-#: install_steps_gtk.pm:312
+#: install_steps_gtk.pm:298
#, c-format
msgid "%d KB\n"
msgstr "%d KB\n"
-#: install_steps_gtk.pm:313
+#: install_steps_gtk.pm:299
#, c-format
msgid "Importance: "
msgstr "重要程度: "
-#: install_steps_gtk.pm:346
+#: install_steps_gtk.pm:332
#, c-format
-msgid "You can't select/unselect this package"
+msgid "You can not select/unselect this package"
msgstr "您不能改变这个软件包的选定"
-#: install_steps_gtk.pm:350
+#: install_steps_gtk.pm:336
#, c-format
msgid "due to missing %s"
msgstr "由于缺少 %s"
-#: install_steps_gtk.pm:351
+#: install_steps_gtk.pm:337
#, c-format
msgid "due to unsatisfied %s"
msgstr "由于不满足的 %s"
-#: install_steps_gtk.pm:352
+#: install_steps_gtk.pm:338
#, c-format
msgid "trying to promote %s"
msgstr "尝试推广 %s"
-#: install_steps_gtk.pm:353
+#: install_steps_gtk.pm:339
#, c-format
msgid "in order to keep %s"
msgstr "为了保留 %s"
-#: install_steps_gtk.pm:358
+#: install_steps_gtk.pm:344
#, c-format
msgid ""
-"You can't select this package as there is not enough space left to install it"
+"You can not select this package as there is not enough space left to install "
+"it"
msgstr "您不可以选择这个软件包。没有足够空间安装它。"
-#: install_steps_gtk.pm:361
+#: install_steps_gtk.pm:347
#, c-format
msgid "The following packages are going to be installed"
msgstr "即将安装下列软件包"
-#: install_steps_gtk.pm:362
+#: install_steps_gtk.pm:348
#, c-format
msgid "The following packages are going to be removed"
msgstr "即将卸载下列软件包"
-#: install_steps_gtk.pm:386
+#: install_steps_gtk.pm:372
#, c-format
-msgid "This is a mandatory package, it can't be unselected"
-msgstr "这个软件包是必需的,不能取消选定"
+msgid "This is a mandatory package, it can not be unselected"
+msgstr "这个软件包是必需的, 不能取消选定"
-#: install_steps_gtk.pm:388
+#: install_steps_gtk.pm:374
#, c-format
-msgid "You can't unselect this package. It is already installed"
+msgid "You can not unselect this package. It is already installed"
msgstr "您不可以取消选择这个软件包。它已经安装过了"
-#: install_steps_gtk.pm:391
+#: install_steps_gtk.pm:377
#, c-format
msgid ""
"This package must be upgraded.\n"
"Are you sure you want to deselect it?"
msgstr ""
"这个软件包必须进行升级。\n"
-"您真的要删除它吗?"
+"您真的要删除它吗?"
-#: install_steps_gtk.pm:394
+#: install_steps_gtk.pm:380
#, c-format
-msgid "You can't unselect this package. It must be upgraded"
+msgid "You can not unselect this package. It must be upgraded"
msgstr "您不能不选择这个软件包。它必须升级"
-#: install_steps_gtk.pm:399
+#: install_steps_gtk.pm:385
#, c-format
msgid "Show automatically selected packages"
msgstr "自动显示选中的软件包"
-#: install_steps_gtk.pm:404
+#: install_steps_gtk.pm:390
#, c-format
-msgid "Load/Save on floppy"
-msgstr "软盘载入/保存"
+msgid "Load/Save selection"
+msgstr "装入/保存选择"
-#: install_steps_gtk.pm:405
+#: install_steps_gtk.pm:391
#, c-format
msgid "Updating package selection"
msgstr "更新软件包选择"
-#: install_steps_gtk.pm:410
+#: install_steps_gtk.pm:396
#, c-format
msgid "Minimal install"
msgstr "最小安装"
-#: install_steps_gtk.pm:424 install_steps_interactive.pm:481
+#: install_steps_gtk.pm:410 install_steps_interactive.pm:483
#, c-format
msgid "Choose the packages you want to install"
msgstr "选择您想要安装的软件包"
-#: install_steps_gtk.pm:440 install_steps_interactive.pm:720
+#: install_steps_gtk.pm:426 install_steps_interactive.pm:706
#, c-format
msgid "Installing"
msgstr "正在安装"
-#: install_steps_gtk.pm:447
+#: install_steps_gtk.pm:433
#, c-format
msgid "Estimating"
msgstr "正在估计"
-#: install_steps_gtk.pm:453
+#: install_steps_gtk.pm:482
+#, c-format
+msgid "No details"
+msgstr "无细节"
+
+#: install_steps_gtk.pm:490
#, c-format
msgid "Time remaining "
msgstr "剩余时间"
-#: install_steps_gtk.pm:464
+#: install_steps_gtk.pm:497
#, c-format
msgid "Please wait, preparing installation..."
-msgstr "请稍候,正在准备安装..."
+msgstr "请稍候, 正在准备安装..."
-#: install_steps_gtk.pm:474
-#, c-format
-msgid "No details"
-msgstr "无细节"
-
-#: install_steps_gtk.pm:527
+#: install_steps_gtk.pm:512
#, c-format
msgid "%d packages"
msgstr "%d 个软件包"
-#: install_steps_gtk.pm:532
+#: install_steps_gtk.pm:517
#, c-format
msgid "Installing package %s"
msgstr "正在安装软件包 %s"
-#: install_steps_gtk.pm:567 install_steps_interactive.pm:94
-#: install_steps_interactive.pm:745
+#: install_steps_gtk.pm:552 install_steps_interactive.pm:92
+#: install_steps_interactive.pm:731
#, c-format
msgid "Refuse"
msgstr "拒绝"
-#: install_steps_gtk.pm:571 install_steps_interactive.pm:749
+#: install_steps_gtk.pm:556 install_steps_interactive.pm:735
#, c-format
msgid ""
"Change your Cd-Rom!\n"
"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
"done.\n"
-"If you don't have it, press Cancel to avoid installation from this Cd-Rom."
+"If you do not have it, press Cancel to avoid installation from this Cd-Rom."
msgstr ""
"请换另一片光盘!\n"
"\n"
-"请在驱动器中插入标有“%s”的光盘,然后单击“确定”。\n"
-"如果您没有这张光盘,请单击“取消”,放弃安装这张光盘上的软件。"
+"请在驱动器中插入标有“%s”的光盘, 然后单击“确定”。\n"
+"如果您没有这张光盘, 请单击“取消”, 放弃安装这张光盘上的软件。"
-#: install_steps_gtk.pm:586 install_steps_interactive.pm:760
+#: install_steps_gtk.pm:571 install_steps_interactive.pm:746
#, c-format
msgid "There was an error ordering packages:"
msgstr "排列软件包时出错: "
-#: install_steps_gtk.pm:586 install_steps_gtk.pm:590
-#: install_steps_interactive.pm:760 install_steps_interactive.pm:764
+#: install_steps_gtk.pm:571 install_steps_gtk.pm:575
+#: install_steps_interactive.pm:746 install_steps_interactive.pm:750
#, c-format
msgid "Go on anyway?"
-msgstr "真的要继续?"
+msgstr "真的要继续?"
-#: install_steps_gtk.pm:590 install_steps_interactive.pm:764
+#: install_steps_gtk.pm:575 install_steps_interactive.pm:750
#, c-format
msgid "There was an error installing packages:"
msgstr "安装软件包时出错: "
-#: install_steps_gtk.pm:632 install_steps_interactive.pm:934
-#: install_steps_interactive.pm:1086
+#: install_steps_gtk.pm:617 install_steps_interactive.pm:920
+#: install_steps_interactive.pm:1072
#, c-format
msgid "not configured"
msgstr "未配置"
-#: install_steps_interactive.pm:86
+#: install_steps_gtk.pm:680
+#, c-format
+msgid ""
+"The following installation media have been found.\n"
+"If you want to skip some of them, you can unselect them now."
+msgstr ""
+"找到了下列安装介质。\n"
+"如果您想要跳过其中一些, 请不要选中。"
+
+#: install_steps_gtk.pm:684
#, c-format
-msgid "Do you want to recover your system?"
-msgstr "您要恢复您的系统吗?"
+msgid ""
+"You have the option to copy the contents of the CDs onto the hard drive "
+"before installation.\n"
+"It will then continue from the hard drive and the packages will remain "
+"available once the system is fully installed."
+msgstr ""
+"您可以选择在安装之前将光盘的全部内容复制到硬盘中。\n"
+"然后,安装将会从硬盘继续进行。当系统安装完成后,软件包仍然保留,以供日后添加"
+"软件使用。"
-#: install_steps_interactive.pm:87
+#: install_steps_gtk.pm:686
+#, c-format
+msgid "Copy whole CDs"
+msgstr "复制整张光盘"
+
+#: install_steps_interactive.pm:85
#, c-format
msgid "License agreement"
msgstr "许可协议"
-#: install_steps_interactive.pm:91
+#: install_steps_interactive.pm:89
#, c-format
msgid "Release Notes"
msgstr "版本通告"
-#: install_steps_interactive.pm:121
+#: install_steps_interactive.pm:119
#, c-format
msgid "Please choose your keyboard layout."
msgstr "请选择您使用的键盘布局。"
-#: install_steps_interactive.pm:123
+#: install_steps_interactive.pm:121
#, c-format
msgid "Here is the full list of available keyboards"
msgstr "在此列出了可用的全部键盘"
-#: install_steps_interactive.pm:153
+#: install_steps_interactive.pm:151
#, c-format
msgid "Install/Upgrade"
msgstr "安装/升级"
-#: install_steps_interactive.pm:154
+#: install_steps_interactive.pm:152
#, c-format
msgid "Is this an install or an upgrade?"
-msgstr "现在要新装还是升级?"
+msgstr "现在要新装还是升级?"
-#: install_steps_interactive.pm:160
+#: install_steps_interactive.pm:158
#, c-format
msgid "Upgrade %s"
msgstr "升级 %s"
-#: install_steps_interactive.pm:170
+#: install_steps_interactive.pm:168
#, c-format
msgid "Encryption key for %s"
msgstr "%s 的加密密钥"
-#: install_steps_interactive.pm:187
+#: install_steps_interactive.pm:185
#, c-format
msgid "Please choose your type of mouse."
msgstr "请选择您的鼠标类型。"
-#: install_steps_interactive.pm:196 standalone/mousedrake:46
+#: install_steps_interactive.pm:194 standalone/mousedrake:46
#, c-format
msgid "Mouse Port"
msgstr "鼠标端口"
-#: install_steps_interactive.pm:197 standalone/mousedrake:47
+#: install_steps_interactive.pm:195 standalone/mousedrake:47
#, c-format
msgid "Please choose which serial port your mouse is connected to."
msgstr "请选择您的鼠标是连接到那个串行口。"
-#: install_steps_interactive.pm:207
+#: install_steps_interactive.pm:205
#, c-format
msgid "Buttons emulation"
msgstr "鼠标键模拟"
-#: install_steps_interactive.pm:209
+#: install_steps_interactive.pm:207
#, c-format
msgid "Button 2 Emulation"
msgstr "两键模拟"
-#: install_steps_interactive.pm:210
+#: install_steps_interactive.pm:208
#, c-format
msgid "Button 3 Emulation"
msgstr "模拟三键"
-#: install_steps_interactive.pm:231
+#: install_steps_interactive.pm:229
#, c-format
msgid "PCMCIA"
msgstr "PCMCIA"
-#: install_steps_interactive.pm:231
+#: install_steps_interactive.pm:229
#, c-format
msgid "Configuring PCMCIA cards..."
msgstr "正在配置 PCMCIA 卡..."
-#: install_steps_interactive.pm:238
+#: install_steps_interactive.pm:236
#, c-format
msgid "IDE"
msgstr "IDE"
-#: install_steps_interactive.pm:238
+#: install_steps_interactive.pm:236
#, c-format
msgid "Configuring IDE"
msgstr "配置 IDE"
-#: install_steps_interactive.pm:258 network/tools.pm:187
+#: install_steps_interactive.pm:256 network/tools.pm:172
#, c-format
msgid "No partition available"
msgstr "没有可用的硬盘分区"
-#: install_steps_interactive.pm:261
+#: install_steps_interactive.pm:259
#, c-format
msgid "Scanning partitions to find mount points"
msgstr "正在扫描各个分区以查找挂载点"
-#: install_steps_interactive.pm:268
+#: install_steps_interactive.pm:266
#, c-format
msgid "Choose the mount points"
msgstr "选择挂载点"
-#: install_steps_interactive.pm:300
+#: install_steps_interactive.pm:312
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
"system, you'll need to create the bootstrap partition in DiskDrake"
msgstr ""
-"无法创建启动空间(1MB)!安装将继续,但如需启动系统,您可用“Drak 磁盘管理”创建"
+"无法创建启动空间(1MB)!安装将继续, 但如需启动系统, 您可用“Drak 磁盘管理”创建"
"启动分区"
-#: install_steps_interactive.pm:337
+#: install_steps_interactive.pm:317
+#, c-format
+msgid ""
+"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
+"to boot your system, you'll need to create the bootstrap partition in "
+"DiskDrake"
+msgstr ""
+"您需要创建一个 PPC PReP 启动空间!安装将继续, 但如需启动系统, 您可用“Drak 磁"
+"盘管理”创建启动分区"
+
+#: install_steps_interactive.pm:353
#, c-format
msgid "Choose the partitions you want to format"
msgstr "选择您要格式化的分区"
-#: install_steps_interactive.pm:339
+#: install_steps_interactive.pm:355
#, c-format
msgid "Check bad blocks?"
-msgstr "是否检查坏磁块?"
+msgstr "是否检查坏磁块?"
-#: install_steps_interactive.pm:371
+#: install_steps_interactive.pm:383
#, c-format
msgid ""
"Failed to check filesystem %s. Do you want to repair the errors? (beware, "
"you can lose data)"
-msgstr "检查文件系统 %s 失败。您想修复错误吗?(注意,有可能丢失数据)"
+msgstr "检查文件系统 %s 失败。您想修复错误吗?(注意, 有可能丢失数据)"
-#: install_steps_interactive.pm:374
+#: install_steps_interactive.pm:386
#, c-format
msgid "Not enough swap space to fulfill installation, please add some"
-msgstr "交换空间太少,无法完成安装,请扩大交换分区。"
+msgstr "交换空间太少, 无法完成安装, 请扩大交换分区。"
-#: install_steps_interactive.pm:381
+#: install_steps_interactive.pm:393
#, c-format
msgid "Looking for available packages and rebuilding rpm database..."
msgstr "正在寻找可安装的程序并重建 rpm 数据库..."
-#: install_steps_interactive.pm:382 install_steps_interactive.pm:442
+#: install_steps_interactive.pm:394 install_steps_interactive.pm:452
#, c-format
msgid "Looking for available packages..."
msgstr "正在寻找可安装的程序..."
-#: install_steps_interactive.pm:385
+#: install_steps_interactive.pm:397
#, c-format
msgid "Looking at packages already installed..."
msgstr "正在查找已经安装过的软件包..."
-#: install_steps_interactive.pm:389
+#: install_steps_interactive.pm:401
#, c-format
msgid "Finding packages to upgrade..."
msgstr "正在寻找可升级的程序..."
-#: install_steps_interactive.pm:405 install_steps_interactive.pm:834
-#, c-format
-msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr "正在连接 Mandrakelinux 网站以获得镜像网站列表..."
-
-#: install_steps_interactive.pm:411 install_steps_interactive.pm:839
+#: install_steps_interactive.pm:421 install_steps_interactive.pm:825
#, c-format
msgid "Choose a mirror from which to get the packages"
msgstr "选择一个镜像网站来取得软件包"
-#: install_steps_interactive.pm:451
+#: install_steps_interactive.pm:461
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%d "
"> %d)"
msgstr "您的系统所剩余的空间不够进行安装或升级(%d > %d)"
-#: install_steps_interactive.pm:493
-#, c-format
+#: install_steps_interactive.pm:495
+#, fuzzy, c-format
msgid ""
-"Please choose load or save package selection on floppy.\n"
-"The format is the same as auto_install generated floppies."
+"Please choose load or save package selection.\n"
+"The format is the same as auto_install generated files."
msgstr ""
-"请选择用软盘载入或保存软件包选择信息。\n"
-"格式与自动安装生成的软盘一样。"
-
-#: install_steps_interactive.pm:495
-#, c-format
-msgid "Load from floppy"
-msgstr "从软盘载入"
+"请选择装入或保存软件包选择息。\n"
+"格式与自动安装生成的文件一样。"
-#: install_steps_interactive.pm:495
+#: install_steps_interactive.pm:497
#, c-format
-msgid "Save on floppy"
-msgstr "保存入软盘"
+msgid "Load"
+msgstr "装入"
-#: install_steps_interactive.pm:499
+#: install_steps_interactive.pm:497 standalone/drakbackup:3924
+#: standalone/drakbackup:3997 standalone/logdrake:173
#, c-format
-msgid "Package selection"
-msgstr "软件包选择"
-
-#: install_steps_interactive.pm:499
-#, c-format
-msgid "Loading from floppy"
-msgstr "正在从软盘载入"
+msgid "Save"
+msgstr "保存"
-#: install_steps_interactive.pm:504
-#, c-format
-msgid "Insert a floppy containing package selection"
-msgstr "请插入包含软件包选择的软盘"
+#: install_steps_interactive.pm:505
+#, fuzzy, c-format
+msgid "Bad file"
+msgstr "真实文件"
#: install_steps_interactive.pm:581
#, c-format
@@ -6555,9 +6662,9 @@ msgstr "安装类型"
#: install_steps_interactive.pm:597
#, c-format
msgid ""
-"You haven't selected any group of packages.\n"
+"You have not selected any group of packages.\n"
"Please choose the minimal installation you want:"
-msgstr "您没有选择任何的组件,请选择最小安装:"
+msgstr "您没有选择任何的组件, 请选择最小安装:"
#: install_steps_interactive.pm:601
#, c-format
@@ -6569,33 +6676,33 @@ msgstr "安装基础文档(建议!)"
msgid "Truly minimal install (especially no urpmi)"
msgstr "真正最小安装(注意没有 urpmi 包管理工具)"
-#: install_steps_interactive.pm:645 standalone/drakxtv:52
+#: install_steps_interactive.pm:641 standalone/drakxtv:52
#, c-format
msgid "All"
msgstr "全部"
-#: install_steps_interactive.pm:694
+#: install_steps_interactive.pm:680
#, c-format
msgid ""
"If you have all the CDs in the list below, click Ok.\n"
"If you have none of those CDs, click Cancel.\n"
"If only some CDs are missing, unselect them, then click Ok."
msgstr ""
-"如果您拥有下列所有的光盘,单击“确定”。\n"
-"如果您没有其中任何一张,单击“取消”。\n"
-"如果您缺少其中一张,清除它的选中标记,然后单击“确认”。"
+"如果您拥有下列所有的光盘, 单击“确定”。\n"
+"如果您没有其中任何一张, 单击“取消”。\n"
+"如果您缺少其中一张, 清除它的选中标记, 然后单击“确认”。"
-#: install_steps_interactive.pm:699
+#: install_steps_interactive.pm:685
#, c-format
msgid "Cd-Rom labeled \"%s\""
msgstr "标为 %s 的光盘"
-#: install_steps_interactive.pm:720
+#: install_steps_interactive.pm:706
#, c-format
msgid "Preparing installation"
msgstr "正在准备安装"
-#: install_steps_interactive.pm:729
+#: install_steps_interactive.pm:715
#, c-format
msgid ""
"Installing package %s\n"
@@ -6604,17 +6711,17 @@ msgstr ""
"正在安装软件包 %s \n"
"%d%%"
-#: install_steps_interactive.pm:778
+#: install_steps_interactive.pm:764
#, c-format
msgid "Post-install configuration"
msgstr "安装后的配置"
-#: install_steps_interactive.pm:784
+#: install_steps_interactive.pm:770
#, c-format
msgid "Please insert the Update Modules floppy in drive %s"
msgstr "请在驱动器 %s 中插入一张更新模块软盘"
-#: install_steps_interactive.pm:813
+#: install_steps_interactive.pm:799
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -6629,215 +6736,199 @@ msgstr ""
"您现在有机会下载软件更新包。更新软件包是在发行版发布之后发布的。它们可能包含"
"对一些安全问题或故障的修改。\n"
"\n"
-"要下载这些软件包,您的网络连接必须已经配置好并且可以使用。\n"
+"要下载这些软件包, 您的网络连接必须已经配置好并且可以使用。\n"
"\n"
-"您是否要安装升级包?"
+"您是否要安装升级包?"
+
+#: install_steps_interactive.pm:820
+#, c-format
+msgid ""
+"Contacting Mandrakelinux web site to get the list of available mirrors..."
+msgstr "正在连接 Mandrakelinux 网站以获得镜像网站列表..."
-#: install_steps_interactive.pm:853
+#: install_steps_interactive.pm:839
#, c-format
msgid "Contacting the mirror to get the list of available packages..."
msgstr "正在连接镜像网站以取得可供安装的软件包的列表..."
-#: install_steps_interactive.pm:857
+#: install_steps_interactive.pm:843
#, c-format
msgid "Unable to contact mirror %s"
msgstr "无法连接镜像 %s"
-#: install_steps_interactive.pm:857
+#: install_steps_interactive.pm:843
#, c-format
msgid "Would you like to try again?"
-msgstr "您是否想要再试一次?"
+msgstr "您是否想要再试一次?"
-#: install_steps_interactive.pm:883 standalone/drakclock:46
+#: install_steps_interactive.pm:869 standalone/drakclock:45
#, c-format
msgid "Which is your timezone?"
-msgstr "您所在的时区?"
+msgstr "您所在的时区?"
-#: install_steps_interactive.pm:888
+#: install_steps_interactive.pm:874
#, c-format
msgid "Automatic time synchronization (using NTP)"
msgstr "自动时间同步(使用 NTP)"
-#: install_steps_interactive.pm:896
+#: install_steps_interactive.pm:882
#, c-format
msgid "NTP Server"
msgstr "NTP 服务器"
-#: install_steps_interactive.pm:938 steps.pm:30
+#: install_steps_interactive.pm:924 steps.pm:30
#, c-format
msgid "Summary"
msgstr "概要"
-#: install_steps_interactive.pm:951 install_steps_interactive.pm:959
-#: install_steps_interactive.pm:977 install_steps_interactive.pm:984
-#: install_steps_interactive.pm:1136 services.pm:135
-#: standalone/drakbackup:1593
+#: install_steps_interactive.pm:937 install_steps_interactive.pm:945
+#: install_steps_interactive.pm:963 install_steps_interactive.pm:970
+#: install_steps_interactive.pm:1122 services.pm:133
+#: standalone/drakbackup:1599
#, c-format
msgid "System"
msgstr "系统"
-#: install_steps_interactive.pm:991 install_steps_interactive.pm:1018
-#: install_steps_interactive.pm:1035 install_steps_interactive.pm:1051
-#: install_steps_interactive.pm:1062
+#: install_steps_interactive.pm:977 install_steps_interactive.pm:1004
+#: install_steps_interactive.pm:1021 install_steps_interactive.pm:1037
+#: install_steps_interactive.pm:1048
#, c-format
msgid "Hardware"
msgstr "硬件"
-#: install_steps_interactive.pm:997 install_steps_interactive.pm:1006
+#: install_steps_interactive.pm:983 install_steps_interactive.pm:992
#, c-format
msgid "Remote CUPS server"
msgstr "远程 CUPS 服务器"
-#: install_steps_interactive.pm:997
+#: install_steps_interactive.pm:983
#, c-format
msgid "No printer"
msgstr "没有打印机"
-#: install_steps_interactive.pm:1039
+#: install_steps_interactive.pm:1025
#, c-format
msgid "Do you have an ISA sound card?"
-msgstr "您有 ISA 声卡吗?"
+msgstr "您有 ISA 声卡吗?"
-#: install_steps_interactive.pm:1041
+#: install_steps_interactive.pm:1027
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
"card"
msgstr "安装之后运行“alsaconf”或“sndconfig”来配置您的声卡"
-#: install_steps_interactive.pm:1043
+#: install_steps_interactive.pm:1029
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "没有检测到声卡。请在安装之后尝试“Drak 硬件配置”。"
-#: install_steps_interactive.pm:1063
+#: install_steps_interactive.pm:1049
#, c-format
msgid "Graphical interface"
msgstr "图形界面"
-#: install_steps_interactive.pm:1069 install_steps_interactive.pm:1084
+#: install_steps_interactive.pm:1055 install_steps_interactive.pm:1070
#, c-format
msgid "Network & Internet"
msgstr "网络和 Internet"
-#: install_steps_interactive.pm:1086
+#: install_steps_interactive.pm:1072
#, c-format
msgid "configured"
msgstr "已配置"
-#: install_steps_interactive.pm:1095 install_steps_interactive.pm:1109
+#: install_steps_interactive.pm:1081 install_steps_interactive.pm:1095
#: steps.pm:20
#, c-format
msgid "Security"
msgstr "安全"
-#: install_steps_interactive.pm:1114
+#: install_steps_interactive.pm:1100
#, c-format
msgid "activated"
msgstr "已激活"
-#: install_steps_interactive.pm:1114
+#: install_steps_interactive.pm:1100
#, c-format
msgid "disabled"
msgstr "已禁用"
-#: install_steps_interactive.pm:1123
+#: install_steps_interactive.pm:1109
#, c-format
msgid "Boot"
msgstr "启动"
#. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1127
+#: install_steps_interactive.pm:1113
#, c-format
msgid "%s on %s"
msgstr "位于 %2$s 上的 %1$s"
-#: install_steps_interactive.pm:1141 services.pm:177
+#: install_steps_interactive.pm:1127 services.pm:175
#, c-format
msgid "Services: %d activated for %d registered"
-msgstr "服务: %2$d 项已注册,%1$d 项已激活"
+msgstr "服务: %2$d 项已注册, %1$d 项已激活"
-#: install_steps_interactive.pm:1151
+#: install_steps_interactive.pm:1137
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
-msgstr "您还没有配置过 X。您真的想要这样吗?"
-
-#: install_steps_interactive.pm:1205
-#, c-format
-msgid "Set root password and network authentication methods"
-msgstr "设定 root 密码及网络认证方式"
-
-#: install_steps_interactive.pm:1206
-#, c-format
-msgid "Set root password"
-msgstr "设定 root 密码"
+msgstr "您还没有配置过 X。您真的想要这样吗?"
#: install_steps_interactive.pm:1217
#, c-format
-msgid "This password is too short (it must be at least %d characters long)"
-msgstr "这个密码太简单了(至少要有 %d 个字符)"
-
-#: install_steps_interactive.pm:1222 network/netconnect.pm:596
-#: standalone/drakauth:25 standalone/drakauth:27 standalone/drakconnect:457
-#, c-format
-msgid "Authentication"
-msgstr "认证"
-
-#: install_steps_interactive.pm:1254
-#, c-format
msgid "Preparing bootloader..."
msgstr "正在准备引导程序..."
-#: install_steps_interactive.pm:1264
+#: install_steps_interactive.pm:1227
#, c-format
msgid ""
-"You appear to have an OldWorld or Unknown\n"
-" machine, the yaboot bootloader will not work for you.\n"
-"The install will continue, but you'll\n"
-" need to use BootX or some other means to boot your machine"
+"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+"will not work for you. The install will continue, but you'll need to use "
+"BootX or some other means to boot your machine. The kernel argument for the "
+"root fs is: root=%s"
msgstr ""
-"看来您用的是老掉牙或不认识的机器,\n"
-"yaboot 启动引导程序无法为您工作。\n"
-"安装将继续,不过您需要\n"
-"使用 BootX 或其它方式启动您的机器"
+"看来您用的是老掉牙或不认识的机器, yaboot 启动引导程序无法为您工作。安装将继"
+"续, 不过您需要使用 BootX 或其它方式启动您的机器。根文件系统的内核参数是:"
+"root=%s"
-#: install_steps_interactive.pm:1270
+#: install_steps_interactive.pm:1233
#, c-format
msgid "Do you want to use aboot?"
-msgstr "您要使用 aboot 吗?"
+msgstr "您要使用 aboot 吗?"
-#: install_steps_interactive.pm:1273
+#: install_steps_interactive.pm:1236
#, c-format
msgid ""
"Error installing aboot, \n"
"try to force installation even if that destroys the first partition?"
msgstr ""
-"安装 aboot 时出错,\n"
-"强迫安装会毁坏第一个分区,要继续吗?"
+"安装 aboot 时出错, \n"
+"强迫安装会毁坏第一个分区, 要继续吗?"
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1257
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
"restricted to the administrator."
-msgstr "在此安全级别中,只有管理员才能访问 Windows 分区中的文件。"
+msgstr "在此安全级别中, 只有管理员才能访问 Windows 分区中的文件。"
-#: install_steps_interactive.pm:1322 standalone/drakautoinst:76
+#: install_steps_interactive.pm:1286 standalone/drakautoinst:76
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "请在驱动器 %s 中插入一张空白软盘"
-#: install_steps_interactive.pm:1327
+#: install_steps_interactive.pm:1291
#, c-format
msgid "Please insert another floppy for drivers disk"
-msgstr "请插入另外一张软盘,作为驱动程序盘"
+msgstr "请插入另外一张软盘, 作为驱动程序盘"
-#: install_steps_interactive.pm:1329
+#: install_steps_interactive.pm:1293
#, c-format
msgid "Creating auto install floppy..."
msgstr "正在创建自动安装软盘..."
-#: install_steps_interactive.pm:1341
+#: install_steps_interactive.pm:1305
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -6846,14 +6937,14 @@ msgid ""
msgstr ""
"某些步骤没有完成。\n"
"\n"
-"您真的要现在退出吗?"
+"您真的要现在退出吗?"
-#: install_steps_interactive.pm:1356
+#: install_steps_interactive.pm:1321
#, c-format
msgid "Generate auto install floppy"
msgstr "生成自动安装软盘"
-#: install_steps_interactive.pm:1358
+#: install_steps_interactive.pm:1323
#, c-format
msgid ""
"The auto install can be fully automated if wanted,\n"
@@ -6862,8 +6953,8 @@ msgid ""
"\n"
"You may prefer to replay the installation.\n"
msgstr ""
-"如果需要的话,自动安装可以完全自动执行。\n"
-"但此时,安装程序将会接管硬盘!!\n"
+"如果需要的话, 自动安装可以完全自动执行。\n"
+"但此时, 安装程序将会接管硬盘!!\n"
"(只对在另外的计算机上安装而言)。\n"
"\n"
"您可能愿意重现安装过程。\n"
@@ -6880,37 +6971,37 @@ msgid ""
" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen "
msgstr " <Tab>/<Alt-Tab> 在项目间移动 | <空格> 选择 | <F12> 下个画面 "
-#: interactive.pm:170
+#: interactive.pm:184
#, c-format
msgid "Choose a file"
msgstr "选择文件"
-#: interactive.pm:295 interactive/gtk.pm:482 standalone/drakbackup:1534
-#: standalone/drakfont:592 standalone/drakfont:659 standalone/drakups:297
+#: interactive.pm:309 interactive/gtk.pm:489 standalone/drakbackup:1540
+#: standalone/drakfont:593 standalone/drakfont:660 standalone/drakups:297
#: standalone/drakups:357 standalone/drakups:377 standalone/drakvpn:333
#: standalone/drakvpn:694
#, c-format
msgid "Add"
msgstr "添加"
-#: interactive.pm:295 interactive/gtk.pm:482
+#: interactive.pm:309 interactive/gtk.pm:489
#, c-format
msgid "Modify"
msgstr "修改"
-#: interactive.pm:295 interactive/gtk.pm:482 standalone/drakups:299
+#: interactive.pm:309 interactive/gtk.pm:489 standalone/drakups:299
#: standalone/drakups:359 standalone/drakups:379 standalone/drakvpn:333
#: standalone/drakvpn:694
#, c-format
msgid "Remove"
msgstr "删除"
-#: interactive.pm:372
+#: interactive.pm:386
#, c-format
msgid "Basic"
msgstr "基本"
-#: interactive.pm:403 interactive/newt.pm:317 ugtk2.pm:515
+#: interactive.pm:424 interactive/newt.pm:317 ugtk2.pm:506
#, c-format
msgid "Finish"
msgstr "完成"
@@ -6923,12 +7014,12 @@ msgstr "执行"
#: interactive/stdio.pm:29 interactive/stdio.pm:148
#, c-format
msgid "Bad choice, try again\n"
-msgstr "错误的选择,请重试\n"
+msgstr "错误的选择, 请重试\n"
#: interactive/stdio.pm:30 interactive/stdio.pm:149
#, c-format
msgid "Your choice? (default %s) "
-msgstr "您的选择?(默认为 %s)"
+msgstr "您的选择?(默认为 %s)"
#: interactive/stdio.pm:54
#, c-format
@@ -6942,7 +7033,7 @@ msgstr ""
#: interactive/stdio.pm:70
#, c-format
msgid "Your choice? (0/1, default `%s') "
-msgstr "您的选择?(0/1,默认 %s)"
+msgstr "您的选择?(0/1, 默认 %s)"
#: interactive/stdio.pm:94
#, c-format
@@ -6952,12 +7043,12 @@ msgstr "按钮“%s”:%s"
#: interactive/stdio.pm:95
#, c-format
msgid "Do you want to click on this button?"
-msgstr "您希望单击此按钮吗?"
+msgstr "您希望单击此按钮吗?"
#: interactive/stdio.pm:104
#, c-format
msgid "Your choice? (default `%s'%s) "
-msgstr "您的选择?(默认“%s”%s)"
+msgstr "您的选择?(默认“%s”%s)"
#: interactive/stdio.pm:104
#, c-format
@@ -6976,9 +7067,9 @@ msgid ""
"or just hit Enter to proceed.\n"
"Your choice? "
msgstr ""
-"请输入需要修改的项目前面的数字,\n"
+"请输入需要修改的项目前面的数字, \n"
"按 Enter 继续。\n"
-"您的选择?"
+"您的选择?"
#: interactive/stdio.pm:138
#, c-format
@@ -6986,7 +7077,7 @@ msgid ""
"=> Notice, a label changed:\n"
"%s"
msgstr ""
-"=> 注意,一个标签改变了: \n"
+"=> 注意, 一个标签改变了: \n"
"%s"
#: interactive/stdio.pm:145
@@ -6994,765 +7085,870 @@ msgstr ""
msgid "Re-submit"
msgstr "重新提交"
-#: keyboard.pm:163 keyboard.pm:194
+#: keyboard.pm:170 keyboard.pm:204
#, c-format
msgid ""
"_: keyboard\n"
"Czech (QWERTZ)"
msgstr "捷克(QWERTZ)"
-#: keyboard.pm:164 keyboard.pm:196
+#: keyboard.pm:171 keyboard.pm:206
#, c-format
msgid ""
"_: keyboard\n"
"German"
msgstr "德国"
-#: keyboard.pm:165
+#: keyboard.pm:172
#, c-format
msgid ""
"_: keyboard\n"
"Dvorak"
msgstr "Dvorak"
-#: keyboard.pm:166 keyboard.pm:206
+#: keyboard.pm:173 keyboard.pm:223
#, c-format
msgid ""
"_: keyboard\n"
"Spanish"
msgstr "西班牙"
-#: keyboard.pm:167 keyboard.pm:207
+#: keyboard.pm:174 keyboard.pm:224
#, c-format
msgid ""
"_: keyboard\n"
"Finnish"
msgstr "芬兰"
-#: keyboard.pm:168 keyboard.pm:208
+#: keyboard.pm:175 keyboard.pm:227
#, c-format
msgid ""
"_: keyboard\n"
"French"
msgstr "法国"
-#: keyboard.pm:169 keyboard.pm:254
+#: keyboard.pm:176 keyboard.pm:275
#, c-format
msgid ""
"_: keyboard\n"
"Norwegian"
msgstr "挪威"
-#: keyboard.pm:170
+#: keyboard.pm:177
#, c-format
msgid ""
"_: keyboard\n"
"Polish"
msgstr "波兰"
-#: keyboard.pm:171 keyboard.pm:264
+#: keyboard.pm:178 keyboard.pm:287
#, c-format
msgid ""
"_: keyboard\n"
"Russian"
msgstr "俄国"
-#: keyboard.pm:173 keyboard.pm:268
+#: keyboard.pm:180 keyboard.pm:293
#, c-format
msgid ""
"_: keyboard\n"
"Swedish"
msgstr "瑞典语"
-#: keyboard.pm:174 keyboard.pm:287
+#: keyboard.pm:181 keyboard.pm:320
#, c-format
msgid "UK keyboard"
msgstr "英国"
-#: keyboard.pm:175 keyboard.pm:288
+#: keyboard.pm:182 keyboard.pm:323
#, c-format
msgid "US keyboard"
msgstr "美国键盘"
-#: keyboard.pm:177
+#: keyboard.pm:184
#, c-format
msgid ""
"_: keyboard\n"
"Albanian"
msgstr "阿尔巴尼亚"
-#: keyboard.pm:178
+#: keyboard.pm:185
#, c-format
msgid ""
"_: keyboard\n"
"Armenian (old)"
msgstr "美国(老式)"
-#: keyboard.pm:179
+#: keyboard.pm:186
#, c-format
msgid ""
"_: keyboard\n"
"Armenian (typewriter)"
msgstr "美国(打字机)"
-#: keyboard.pm:180
+#: keyboard.pm:187
#, c-format
msgid ""
"_: keyboard\n"
"Armenian (phonetic)"
msgstr "美国(音标)"
-#: keyboard.pm:181
+#: keyboard.pm:188
#, c-format
msgid ""
"_: keyboard\n"
"Arabic"
msgstr "阿拉伯"
-#: keyboard.pm:182
+#: keyboard.pm:189
#, c-format
msgid ""
"_: keyboard\n"
"Azerbaidjani (latin)"
msgstr "阿塞拜疆(拉丁)"
-#: keyboard.pm:183
+#: keyboard.pm:190
#, c-format
msgid ""
"_: keyboard\n"
"Belgian"
msgstr "比利时"
-#: keyboard.pm:184
+#: keyboard.pm:191
#, c-format
msgid ""
"_: keyboard\n"
-"Bengali"
-msgstr "孟加拉"
+"Bengali (Inscript-layout)"
+msgstr "孟加拉(Inscript)"
-#: keyboard.pm:185
+#: keyboard.pm:192
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Bengali (Probhat)"
+msgstr "孟加拉(Probhat)"
+
+#: keyboard.pm:193
#, c-format
msgid ""
"_: keyboard\n"
"Bulgarian (phonetic)"
msgstr "保加利亚(音标)"
-#: keyboard.pm:186
+#: keyboard.pm:194
#, c-format
msgid ""
"_: keyboard\n"
"Bulgarian (BDS)"
msgstr "保加利亚(BDS)"
-#: keyboard.pm:187
+#: keyboard.pm:195
#, c-format
msgid ""
"_: keyboard\n"
"Brazilian (ABNT-2)"
msgstr "巴西(ABNT-2)"
-#: keyboard.pm:188
+#: keyboard.pm:196
#, c-format
msgid ""
"_: keyboard\n"
"Bosnian"
msgstr "波斯尼亚"
-#: keyboard.pm:189
+#: keyboard.pm:197
#, c-format
msgid ""
"_: keyboard\n"
"Belarusian"
msgstr "白俄罗斯"
-#: keyboard.pm:191
+#: keyboard.pm:199
#, c-format
msgid ""
"_: keyboard\n"
"Swiss (German layout)"
msgstr "瑞士(德语布局)"
-#: keyboard.pm:193
+#: keyboard.pm:201
#, c-format
msgid ""
"_: keyboard\n"
"Swiss (French layout)"
msgstr "瑞士(法语布局)"
-#: keyboard.pm:195
+#: keyboard.pm:203
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Cherokee syllabics"
+msgstr "阿拉伯"
+
+#: keyboard.pm:205
#, c-format
msgid ""
"_: keyboard\n"
"Czech (QWERTY)"
msgstr "捷克(QWERTY)"
-#: keyboard.pm:197
+#: keyboard.pm:207
#, c-format
msgid ""
"_: keyboard\n"
"German (no dead keys)"
msgstr "德国(没有 dead keys)"
-#: keyboard.pm:198
+#: keyboard.pm:208
#, c-format
msgid ""
"_: keyboard\n"
"Devanagari"
msgstr "梵文"
-#: keyboard.pm:199
+#: keyboard.pm:209
#, c-format
msgid ""
"_: keyboard\n"
"Danish"
msgstr "丹麦"
-#: keyboard.pm:200
+#: keyboard.pm:210
#, c-format
msgid ""
"_: keyboard\n"
"Dvorak (US)"
msgstr "Dvorak(美国)"
-#: keyboard.pm:201
+#: keyboard.pm:212
#, c-format
msgid ""
"_: keyboard\n"
"Dvorak (Esperanto)"
msgstr "Dvorak(世界语)"
-#: keyboard.pm:202
+#: keyboard.pm:214
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Dvorak (French)"
+msgstr "Dvorak(法国)"
+
+#: keyboard.pm:216
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Dvorak (UK)"
+msgstr "Dvorak(英国)"
+
+#: keyboard.pm:217
#, c-format
msgid ""
"_: keyboard\n"
"Dvorak (Norwegian)"
msgstr "Dvorak(挪威)"
-#: keyboard.pm:203
+#: keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Dvorak (Polish)"
+msgstr "Dvorak(波兰)"
+
+#: keyboard.pm:220
#, c-format
msgid ""
"_: keyboard\n"
"Dvorak (Swedish)"
msgstr "Dvorak(瑞典)"
-#: keyboard.pm:205
+#: keyboard.pm:221
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Dzongkha/Tibetan"
+msgstr "藏语"
+
+#: keyboard.pm:222
#, c-format
msgid ""
"_: keyboard\n"
"Estonian"
msgstr "爱沙尼亚"
-#: keyboard.pm:209
+#: keyboard.pm:226
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Faroese"
+msgstr "法罗语"
+
+#: keyboard.pm:228
#, c-format
msgid ""
"_: keyboard\n"
"Georgian (\"Russian\" layout)"
msgstr "格鲁吉亚(“俄语”布局)"
-#: keyboard.pm:210
+#: keyboard.pm:229
#, c-format
msgid ""
"_: keyboard\n"
"Georgian (\"Latin\" layout)"
msgstr "格鲁吉亚(“拉丁”布局)"
-#: keyboard.pm:211
+#: keyboard.pm:230
#, c-format
msgid ""
"_: keyboard\n"
"Greek"
msgstr "希腊"
-#: keyboard.pm:212
+#: keyboard.pm:231
#, c-format
msgid ""
"_: keyboard\n"
"Greek (polytonic)"
msgstr "希腊语(polytonic)"
-#: keyboard.pm:213
+#: keyboard.pm:232
#, c-format
msgid ""
"_: keyboard\n"
"Gujarati"
msgstr "古吉拉特"
-#: keyboard.pm:214
+#: keyboard.pm:233
#, c-format
msgid ""
"_: keyboard\n"
"Gurmukhi"
msgstr "旁遮普"
-#: keyboard.pm:216
+#: keyboard.pm:235
#, c-format
msgid ""
"_: keyboard\n"
"Hungarian"
msgstr "匈牙利"
-#: keyboard.pm:217
+#: keyboard.pm:236
#, c-format
msgid ""
"_: keyboard\n"
"Croatian"
msgstr "克罗地亚"
-#: keyboard.pm:218
+#: keyboard.pm:237
#, c-format
msgid ""
"_: keyboard\n"
"Irish"
msgstr "爱尔兰"
-#: keyboard.pm:219
+#: keyboard.pm:238
#, c-format
msgid ""
"_: keyboard\n"
"Israeli"
msgstr "以色列"
-#: keyboard.pm:220
+#: keyboard.pm:239
#, c-format
msgid ""
"_: keyboard\n"
"Israeli (phonetic)"
msgstr "以色列(音标)"
-#: keyboard.pm:221
+#: keyboard.pm:240
#, c-format
msgid ""
"_: keyboard\n"
"Iranian"
msgstr "伊朗"
-#: keyboard.pm:222
+#: keyboard.pm:241
#, c-format
msgid ""
"_: keyboard\n"
"Icelandic"
msgstr "冰岛"
-#: keyboard.pm:223
+#: keyboard.pm:242
#, c-format
msgid ""
"_: keyboard\n"
"Italian"
msgstr "意大利"
-#: keyboard.pm:224
+#: keyboard.pm:243
#, c-format
msgid ""
"_: keyboard\n"
"Inuktitut"
msgstr "因纽特"
-#: keyboard.pm:229
+#: keyboard.pm:248
#, c-format
msgid ""
"_: keyboard\n"
"Japanese 106 keys"
msgstr "日文 106 键盘"
-#: keyboard.pm:230
+#: keyboard.pm:249
#, c-format
msgid ""
"_: keyboard\n"
"Kannada"
msgstr "埃纳德"
-#: keyboard.pm:233
+#: keyboard.pm:252
#, c-format
msgid ""
"_: keyboard\n"
"Korean"
msgstr "韩国键盘"
-#: keyboard.pm:234
+#: keyboard.pm:254
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Kurdish (arabic script)"
+msgstr "阿拉伯"
+
+#: keyboard.pm:255
#, c-format
msgid ""
"_: keyboard\n"
"Kyrgyz"
msgstr "Kyrgyz 键盘"
-#: keyboard.pm:235
+#: keyboard.pm:256
#, c-format
msgid ""
"_: keyboard\n"
"Latin American"
msgstr "拉丁美洲"
-#: keyboard.pm:236
+#: keyboard.pm:257
#, c-format
msgid ""
"_: keyboard\n"
"Laotian"
msgstr "老挝"
-#: keyboard.pm:238
+#: keyboard.pm:259
#, c-format
msgid ""
"_: keyboard\n"
"Lithuanian AZERTY (old)"
msgstr "立陶宛 AZERTY(老式)"
-#: keyboard.pm:241
+#: keyboard.pm:262
#, c-format
msgid ""
"_: keyboard\n"
"Lithuanian AZERTY (new)"
msgstr "立陶宛 AZERTY(新式)"
-#: keyboard.pm:243
+#: keyboard.pm:264
#, c-format
msgid ""
"_: keyboard\n"
"Lithuanian \"number row\" QWERTY"
msgstr "立陶宛“顺排”QWERTY"
-#: keyboard.pm:245
+#: keyboard.pm:266
#, c-format
msgid ""
"_: keyboard\n"
"Lithuanian \"phonetic\" QWERTY"
msgstr "立陶宛“同音”QWERTY"
-#: keyboard.pm:246
+#: keyboard.pm:267
#, c-format
msgid ""
"_: keyboard\n"
"Latvian"
msgstr "拉脱维亚"
-#: keyboard.pm:247
+#: keyboard.pm:268
#, c-format
msgid ""
"_: keyboard\n"
"Malayalam"
msgstr "德拉维"
-#: keyboard.pm:248
+#: keyboard.pm:269
#, c-format
msgid ""
"_: keyboard\n"
"Macedonian"
msgstr "马其顿"
-#: keyboard.pm:249
+#: keyboard.pm:270
#, c-format
msgid ""
"_: keyboard\n"
"Myanmar (Burmese)"
msgstr "缅甸"
-#: keyboard.pm:250
+#: keyboard.pm:271
#, c-format
msgid ""
"_: keyboard\n"
"Mongolian (cyrillic)"
msgstr "蒙古(西里尔)"
-#: keyboard.pm:251
+#: keyboard.pm:272
#, c-format
msgid ""
"_: keyboard\n"
"Maltese (UK)"
msgstr "马耳他(英国)"
-#: keyboard.pm:252
+#: keyboard.pm:273
#, c-format
msgid ""
"_: keyboard\n"
"Maltese (US)"
msgstr "马耳他(美国)"
-#: keyboard.pm:253
+#: keyboard.pm:274
#, c-format
msgid ""
"_: keyboard\n"
"Dutch"
msgstr "荷兰"
-#: keyboard.pm:255
+#: keyboard.pm:276
#, c-format
msgid ""
"_: keyboard\n"
"Oriya"
msgstr "奥里雅"
-#: keyboard.pm:256
+#: keyboard.pm:277
#, c-format
msgid ""
"_: keyboard\n"
"Polish (qwerty layout)"
msgstr "波兰(QWERTY 布局)"
-#: keyboard.pm:257
+#: keyboard.pm:278
#, c-format
msgid ""
"_: keyboard\n"
"Polish (qwertz layout)"
msgstr "波兰(QWERTZ 布局)"
-#: keyboard.pm:258
+#: keyboard.pm:280
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Pashto"
+msgstr "普什图语"
+
+#: keyboard.pm:281
#, c-format
msgid ""
"_: keyboard\n"
"Portuguese"
msgstr "葡萄牙语"
-#: keyboard.pm:260
+#: keyboard.pm:283
#, c-format
msgid ""
"_: keyboard\n"
"Canadian (Quebec)"
msgstr "加拿大(魁北克)"
-#: keyboard.pm:262
+#: keyboard.pm:285
#, c-format
msgid ""
"_: keyboard\n"
"Romanian (qwertz)"
msgstr "罗马尼亚(QWERTZ 布局)"
-#: keyboard.pm:263
+#: keyboard.pm:286
#, c-format
msgid ""
"_: keyboard\n"
"Romanian (qwerty)"
msgstr "罗马尼亚(QWERTY 布局)"
-#: keyboard.pm:265
+#: keyboard.pm:288
#, c-format
msgid ""
"_: keyboard\n"
"Russian (phonetic)"
msgstr "俄语(音标)"
-#: keyboard.pm:266
+#: keyboard.pm:289
#, c-format
msgid ""
"_: keyboard\n"
"Saami (norwegian)"
msgstr "Saami(挪威)"
-#: keyboard.pm:267
+#: keyboard.pm:290
#, c-format
msgid ""
"_: keyboard\n"
"Saami (swedish/finnish)"
msgstr "北部沙米语(瑞典/芬兰)"
-#: keyboard.pm:269
+#: keyboard.pm:292
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Sindhi"
+msgstr "泰国语键盘"
+
+#: keyboard.pm:294
#, c-format
msgid ""
"_: keyboard\n"
"Slovenian"
msgstr "斯洛文尼亚"
-#: keyboard.pm:270
+#: keyboard.pm:295
#, c-format
msgid ""
"_: keyboard\n"
"Slovakian (QWERTZ)"
msgstr "斯洛伐克(QWERTZ 布局)"
-#: keyboard.pm:271
+#: keyboard.pm:296
#, c-format
msgid ""
"_: keyboard\n"
"Slovakian (QWERTY)"
msgstr "斯洛伐克(QWERTY 布局)"
-#: keyboard.pm:273
+#: keyboard.pm:298
#, c-format
msgid ""
"_: keyboard\n"
"Serbian (cyrillic)"
msgstr "赛尔维亚(西里尔字母)"
-#: keyboard.pm:274
+#: keyboard.pm:299
#, c-format
msgid ""
"_: keyboard\n"
"Syriac"
msgstr "叙利亚"
-#: keyboard.pm:275
+#: keyboard.pm:300
#, c-format
msgid ""
"_: keyboard\n"
"Syriac (phonetic)"
msgstr "叙利亚(音标)"
-#: keyboard.pm:276
+#: keyboard.pm:301
#, c-format
msgid ""
"_: keyboard\n"
"Telugu"
msgstr "泰卢固"
-#: keyboard.pm:278
+#: keyboard.pm:303
#, c-format
msgid ""
"_: keyboard\n"
"Tamil (ISCII-layout)"
msgstr "泰米尔(ISCII-布局)"
-#: keyboard.pm:279
+#: keyboard.pm:304
#, c-format
msgid ""
"_: keyboard\n"
"Tamil (Typewriter-layout)"
msgstr "泰米尔(打字机布局)"
-#: keyboard.pm:280
+#: keyboard.pm:305
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Thai (Kedmanee)"
+msgstr "泰国语键盘"
+
+#: keyboard.pm:306
#, c-format
msgid ""
"_: keyboard\n"
-"Thai"
+"Thai (TIS-820)"
+msgstr "泰国语(TIS-820)"
+
+#: keyboard.pm:308
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Thai (Pattachote)"
msgstr "泰国语键盘"
-#: keyboard.pm:282
+#: keyboard.pm:311
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Tifinagh (+latin/arabic)"
+msgstr "南斯拉夫(拉丁)"
+
+#: keyboard.pm:313
#, c-format
msgid ""
"_: keyboard\n"
"Tajik"
-msgstr "塔吉克键盘"
+msgstr "塔吉克"
-#: keyboard.pm:283
+#: keyboard.pm:315
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Turkmen"
+msgstr "土库曼语"
+
+#: keyboard.pm:316
#, c-format
msgid ""
"_: keyboard\n"
"Turkish (traditional \"F\" model)"
msgstr "土耳其(传统“F”式)"
-#: keyboard.pm:284
+#: keyboard.pm:317
#, c-format
msgid ""
"_: keyboard\n"
"Turkish (modern \"Q\" model)"
msgstr "土耳其(现代“Q”式)"
-#: keyboard.pm:286
+#: keyboard.pm:319
#, c-format
msgid ""
"_: keyboard\n"
"Ukrainian"
msgstr "乌克兰"
-#: keyboard.pm:289
+#: keyboard.pm:322
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Urdu keyboard"
+msgstr "奥里雅"
+
+#: keyboard.pm:324
#, c-format
msgid "US keyboard (international)"
msgstr "美国键盘(国际)"
-#: keyboard.pm:290
+#: keyboard.pm:325
#, c-format
msgid ""
"_: keyboard\n"
"Uzbek (cyrillic)"
msgstr "乌兹别克(西里尔)"
-#: keyboard.pm:292
+#: keyboard.pm:327
#, c-format
msgid ""
"_: keyboard\n"
"Vietnamese \"numeric row\" QWERTY"
msgstr "越南键盘“顺排”QWERTY"
-#: keyboard.pm:293
+#: keyboard.pm:328
#, c-format
msgid ""
"_: keyboard\n"
"Yugoslavian (latin)"
msgstr "南斯拉夫(拉丁)"
-#: keyboard.pm:300
+#: keyboard.pm:335
#, c-format
msgid "Right Alt key"
msgstr "右边的 ALT 键"
-#: keyboard.pm:301
+#: keyboard.pm:336
#, c-format
msgid "Both Shift keys simultaneously"
msgstr "同时按两个 Shift 键"
-#: keyboard.pm:302
+#: keyboard.pm:337
#, c-format
msgid "Control and Shift keys simultaneously"
msgstr "同时按 Ctrl 和 Shift 键"
-#: keyboard.pm:303
+#: keyboard.pm:338
#, c-format
msgid "CapsLock key"
msgstr "CapsLock 键"
-#: keyboard.pm:304
+#: keyboard.pm:339
#, c-format
msgid "Shift and CapsLock keys simultaneously"
msgstr "同时按 Shift 和 CapsLock 键"
-#: keyboard.pm:305
+#: keyboard.pm:340
#, c-format
msgid "Ctrl and Alt keys simultaneously"
msgstr "同时按 Ctrl 和 Alt 键"
-#: keyboard.pm:306
+#: keyboard.pm:341
#, c-format
msgid "Alt and Shift keys simultaneously"
msgstr "同时按 Alt 和 Shift 键"
-#: keyboard.pm:307
+#: keyboard.pm:342
#, c-format
msgid "\"Menu\" key"
msgstr "“菜单”键"
-#: keyboard.pm:308
+#: keyboard.pm:343
#, c-format
msgid "Left \"Windows\" key"
msgstr "左侧“Windows”键"
-#: keyboard.pm:309
+#: keyboard.pm:344
#, c-format
msgid "Right \"Windows\" key"
msgstr "右侧“Windows”键"
-#: keyboard.pm:310
+#: keyboard.pm:345
#, c-format
msgid "Both Control keys simultaneously"
msgstr "同时按两个 Ctrl 键"
-#: keyboard.pm:311
+#: keyboard.pm:346
#, c-format
msgid "Both Alt keys simultaneously"
msgstr "同时按两个 Alt 键"
-#: keyboard.pm:312
+#: keyboard.pm:347
#, c-format
msgid "Left Shift key"
msgstr "左侧 Shift 键"
-#: keyboard.pm:313
+#: keyboard.pm:348
#, c-format
msgid "Right Shift key"
msgstr "右侧 Shift 键"
-#: keyboard.pm:314
+#: keyboard.pm:349
#, c-format
msgid "Left Alt key"
msgstr "左侧的 Alt 键"
-#: keyboard.pm:315
+#: keyboard.pm:350
#, c-format
msgid "Left Control key"
msgstr "左侧 Ctrl 键"
-#: keyboard.pm:316
+#: keyboard.pm:351
#, c-format
msgid "Right Control key"
msgstr "右侧 Ctrl 键"
-#: keyboard.pm:347
+#: keyboard.pm:387
#, c-format
msgid ""
"Here you can choose the key or key combination that will \n"
@@ -7761,9 +7957,9 @@ msgid ""
msgstr ""
"请您选择使用哪个按键或按键组合\n"
"来在不同的键盘布局之间切换\n"
-"(例如,英文和中文)"
+"(例如, 英文和中文)"
-#: keyboard.pm:352
+#: keyboard.pm:392
#, c-format
msgid ""
"This setting will be activated after the installation.\n"
@@ -7771,1172 +7967,1152 @@ msgid ""
"key to switch between the different keyboard layouts."
msgstr ""
"此设置将会在安装后激活。\n"
-"在安装过程中,您需要使用右侧的 Ctrl 键切换不同的键盘布局。"
+"在安装过程中, 您需要使用右侧的 Ctrl 键切换不同的键盘布局。"
#. -PO: the string "default:LTR" can be translated *ONLY* as "default:LTR"
#. -PO: or as "default:RTL", depending if your language is written from
#. -PO: left to right, or from right to left; any other string is wrong.
-#: lang.pm:165
+#: lang.pm:173
#, c-format
msgid "default:LTR"
msgstr "default:LTR"
-#: lang.pm:182
+#: lang.pm:190
#, c-format
msgid "Andorra"
msgstr "安道尔"
-#: lang.pm:183
+#: lang.pm:191 network/adsl_consts.pm:826
#, c-format
msgid "United Arab Emirates"
msgstr "阿拉伯联合酋长国"
-#: lang.pm:184
+#: lang.pm:192
#, c-format
msgid "Afghanistan"
msgstr "阿富汗"
-#: lang.pm:185
+#: lang.pm:193
#, c-format
msgid "Antigua and Barbuda"
msgstr "安提瓜和巴布达"
-#: lang.pm:186
+#: lang.pm:194
#, c-format
msgid "Anguilla"
msgstr "安圭拉"
-#: lang.pm:187
+#: lang.pm:195
#, c-format
msgid "Albania"
msgstr "阿尔巴尼亚"
-#: lang.pm:188
+#: lang.pm:196
#, c-format
msgid "Armenia"
msgstr "亚美尼亚"
-#: lang.pm:189
+#: lang.pm:197
#, c-format
msgid "Netherlands Antilles"
msgstr "荷属安的列斯"
-#: lang.pm:190
+#: lang.pm:198
#, c-format
msgid "Angola"
msgstr "安哥拉"
-#: lang.pm:191
+#: lang.pm:199
#, c-format
msgid "Antarctica"
msgstr "南极洲"
-#: lang.pm:192 network/adsl_consts.pm:28 standalone/drakxtv:50
+#: lang.pm:200 network/adsl_consts.pm:40 standalone/drakxtv:50
#, c-format
msgid "Argentina"
msgstr "阿根廷"
-#: lang.pm:193
+#: lang.pm:201
#, c-format
msgid "American Samoa"
msgstr "美属萨摩亚"
-#: lang.pm:195 standalone/drakxtv:48
+#: lang.pm:203 standalone/drakxtv:48
#, c-format
msgid "Australia"
msgstr "澳大利亚"
-#: lang.pm:196
+#: lang.pm:204
#, c-format
msgid "Aruba"
msgstr "阿鲁巴"
-#: lang.pm:197
+#: lang.pm:205
#, c-format
msgid "Azerbaijan"
msgstr "阿塞拜疆"
# ../drakfw_.c:
-#: lang.pm:198
+#: lang.pm:206
#, c-format
msgid "Bosnia and Herzegovina"
msgstr "波黑"
-#: lang.pm:199
+#: lang.pm:207
#, c-format
msgid "Barbados"
msgstr "巴巴多斯"
-#: lang.pm:200
+#: lang.pm:208
#, c-format
msgid "Bangladesh"
msgstr "孟加拉"
-#: lang.pm:202
+#: lang.pm:210
#, c-format
msgid "Burkina Faso"
msgstr "布基纳法索"
-#: lang.pm:203 network/adsl_consts.pm:126 network/adsl_consts.pm:134
+#: lang.pm:211 network/adsl_consts.pm:143 network/adsl_consts.pm:151
#, c-format
msgid "Bulgaria"
msgstr "保加利亚"
-#: lang.pm:204
+#: lang.pm:212
#, c-format
msgid "Bahrain"
msgstr "巴林"
-#: lang.pm:205
+#: lang.pm:213
#, c-format
msgid "Burundi"
msgstr "布隆迪"
-#: lang.pm:206
+#: lang.pm:214
#, c-format
msgid "Benin"
msgstr "贝宁"
-#: lang.pm:207
+#: lang.pm:215
#, c-format
msgid "Bermuda"
msgstr "百慕大"
-#: lang.pm:208
+#: lang.pm:216
#, c-format
msgid "Brunei Darussalam"
msgstr "文莱达鲁萨兰国"
-#: lang.pm:209
+#: lang.pm:217
#, c-format
msgid "Bolivia"
msgstr "玻利维亚"
-#: lang.pm:210 network/adsl_consts.pm:92 network/adsl_consts.pm:102
-#: network/adsl_consts.pm:110 network/adsl_consts.pm:118
+#: lang.pm:218 network/adsl_consts.pm:109 network/adsl_consts.pm:119
+#: network/adsl_consts.pm:127 network/adsl_consts.pm:135
#, c-format
msgid "Brazil"
msgstr "巴西"
-#: lang.pm:211
+#: lang.pm:219
#, c-format
msgid "Bahamas"
msgstr "巴哈马"
-#: lang.pm:212
+#: lang.pm:220
#, c-format
msgid "Bhutan"
msgstr "不丹"
-#: lang.pm:213
+#: lang.pm:221
#, c-format
msgid "Bouvet Island"
msgstr "布维岛"
-#: lang.pm:214
+#: lang.pm:222
#, c-format
msgid "Botswana"
msgstr "博茨瓦纳"
-#: lang.pm:215
+#: lang.pm:223
#, c-format
msgid "Belarus"
msgstr "白俄罗斯"
-#: lang.pm:216
+#: lang.pm:224
#, c-format
msgid "Belize"
msgstr "伯利兹"
-#: lang.pm:217
+#: lang.pm:225
#, c-format
msgid "Canada"
msgstr "加拿大"
-#: lang.pm:218
+#: lang.pm:226
#, c-format
msgid "Cocos (Keeling) Islands"
msgstr "科科斯群岛"
-#: lang.pm:219
+#: lang.pm:227
#, c-format
msgid "Congo (Kinshasa)"
msgstr "刚果(金沙萨)"
-#: lang.pm:220
+#: lang.pm:228
#, c-format
msgid "Central African Republic"
msgstr "中非共和国"
-#: lang.pm:221
+#: lang.pm:229
#, c-format
msgid "Congo (Brazzaville)"
msgstr "刚果(布拉柴维尔)"
-#: lang.pm:222 network/adsl_consts.pm:568 network/adsl_consts.pm:575
-#, c-format
-msgid "Switzerland"
-msgstr "瑞士"
-
-#: lang.pm:223
+#: lang.pm:231
#, c-format
msgid "Cote d'Ivoire"
msgstr "科特迪瓦"
-#: lang.pm:224
+#: lang.pm:232
#, c-format
msgid "Cook Islands"
msgstr "库克群岛"
-#: lang.pm:225
+#: lang.pm:233
#, c-format
msgid "Chile"
msgstr "智利"
-#: lang.pm:226
+#: lang.pm:234
#, c-format
msgid "Cameroon"
msgstr "喀麦隆"
-#: lang.pm:227 network/adsl_consts.pm:142 network/adsl_consts.pm:150
-#: network/adsl_consts.pm:158 network/adsl_consts.pm:166
-#: network/adsl_consts.pm:174 network/adsl_consts.pm:182
-#: network/adsl_consts.pm:190 network/adsl_consts.pm:198
-#: network/adsl_consts.pm:206 network/adsl_consts.pm:214
-#: network/adsl_consts.pm:222 network/adsl_consts.pm:230
-#: network/adsl_consts.pm:238 network/adsl_consts.pm:246
-#: network/adsl_consts.pm:254 network/adsl_consts.pm:262
-#: network/adsl_consts.pm:270 network/adsl_consts.pm:278
-#: network/adsl_consts.pm:286 network/adsl_consts.pm:294
+#: lang.pm:235 network/adsl_consts.pm:159 network/adsl_consts.pm:167
+#: network/adsl_consts.pm:175 network/adsl_consts.pm:183
+#: network/adsl_consts.pm:191 network/adsl_consts.pm:199
+#: network/adsl_consts.pm:207 network/adsl_consts.pm:215
+#: network/adsl_consts.pm:223 network/adsl_consts.pm:231
+#: network/adsl_consts.pm:239 network/adsl_consts.pm:247
+#: network/adsl_consts.pm:255 network/adsl_consts.pm:263
+#: network/adsl_consts.pm:271 network/adsl_consts.pm:279
+#: network/adsl_consts.pm:287 network/adsl_consts.pm:295
+#: network/adsl_consts.pm:303 network/adsl_consts.pm:311
#, c-format
msgid "China"
msgstr "中国"
-#: lang.pm:228
+#: lang.pm:236
#, c-format
msgid "Colombia"
msgstr "哥伦比亚"
-#: lang.pm:230
+#: lang.pm:238
#, c-format
msgid "Serbia & Montenegro"
msgstr "塞尔维亚和黑山"
-#: lang.pm:231
+#: lang.pm:239
#, c-format
msgid "Cuba"
msgstr "古巴"
-#: lang.pm:232
+#: lang.pm:240
#, c-format
msgid "Cape Verde"
msgstr "佛得角"
-#: lang.pm:233
+#: lang.pm:241
#, c-format
msgid "Christmas Island"
msgstr "圣诞岛"
-#: lang.pm:234
+#: lang.pm:242
#, c-format
msgid "Cyprus"
msgstr "塞浦路斯"
-#: lang.pm:237
+#: lang.pm:245
#, c-format
msgid "Djibouti"
msgstr "吉布提"
-#: lang.pm:238 network/adsl_consts.pm:302
+#: lang.pm:246 network/adsl_consts.pm:327
#, c-format
msgid "Denmark"
msgstr "丹麦"
-#: lang.pm:239
+#: lang.pm:247
#, c-format
msgid "Dominica"
msgstr "多米尼加"
-#: lang.pm:240
+#: lang.pm:248
#, c-format
msgid "Dominican Republic"
msgstr "多米尼加共和国"
-#: lang.pm:241
+#: lang.pm:249 network/adsl_consts.pm:30
#, c-format
msgid "Algeria"
msgstr "阿尔及利亚"
-#: lang.pm:242
+#: lang.pm:250
#, c-format
msgid "Ecuador"
msgstr "厄瓜多尔"
-#: lang.pm:243
+#: lang.pm:251
#, c-format
msgid "Estonia"
msgstr "爱沙尼亚"
-#: lang.pm:244
+#: lang.pm:252
#, c-format
msgid "Egypt"
msgstr "埃及"
-#: lang.pm:245
+#: lang.pm:253
#, c-format
msgid "Western Sahara"
msgstr "西撒哈拉"
-#: lang.pm:246
+#: lang.pm:254
#, c-format
msgid "Eritrea"
msgstr "厄立特里亚"
-#: lang.pm:247 network/adsl_consts.pm:531 network/adsl_consts.pm:540
-#: network/adsl_consts.pm:551
+#: lang.pm:255 network/adsl_consts.pm:663 network/adsl_consts.pm:672
+#: network/adsl_consts.pm:682 network/adsl_consts.pm:692
+#: network/adsl_consts.pm:700 network/adsl_consts.pm:708
+#: network/adsl_consts.pm:716 network/adsl_consts.pm:724
+#: network/adsl_consts.pm:732 network/adsl_consts.pm:740
+#: network/adsl_consts.pm:748 network/adsl_consts.pm:756
+#: network/adsl_consts.pm:764
#, c-format
msgid "Spain"
msgstr "西班牙"
-#: lang.pm:248
+#: lang.pm:256
#, c-format
msgid "Ethiopia"
msgstr "埃塞俄比亚"
-#: lang.pm:249 network/adsl_consts.pm:402
+#: lang.pm:257 network/adsl_consts.pm:335
#, c-format
msgid "Finland"
msgstr "芬兰"
-#: lang.pm:250
+#: lang.pm:258
#, c-format
msgid "Fiji"
msgstr "斐济"
-#: lang.pm:251
+#: lang.pm:259
#, c-format
msgid "Falkland Islands (Malvinas)"
msgstr "福克兰群岛(马尔维纳斯)"
-#: lang.pm:252
+#: lang.pm:260
#, c-format
msgid "Micronesia"
msgstr "密克罗尼西亚"
-#: lang.pm:253
+#: lang.pm:261
#, c-format
msgid "Faroe Islands"
msgstr "法罗群岛"
-#: lang.pm:255
+#: lang.pm:263
#, c-format
msgid "Gabon"
msgstr "加蓬"
-#: lang.pm:256 network/adsl_consts.pm:593 network/adsl_consts.pm:601
+#: lang.pm:264 network/adsl_consts.pm:836 network/adsl_consts.pm:846
#: network/netconnect.pm:52
#, c-format
msgid "United Kingdom"
msgstr "英国"
-#: lang.pm:257
+#: lang.pm:265
#, c-format
msgid "Grenada"
msgstr "格林纳达"
-#: lang.pm:258
+#: lang.pm:266
#, c-format
msgid "Georgia"
msgstr "乔治亚"
-#: lang.pm:259
+#: lang.pm:267
#, c-format
msgid "French Guiana"
msgstr "法属圭亚那"
-#: lang.pm:260
+#: lang.pm:268
#, c-format
msgid "Ghana"
msgstr "加纳"
-#: lang.pm:261
+#: lang.pm:269
#, c-format
msgid "Gibraltar"
msgstr "直布罗陀"
-#: lang.pm:262
+#: lang.pm:270
#, c-format
msgid "Greenland"
msgstr "格陵兰"
-#: lang.pm:263
+#: lang.pm:271
#, c-format
msgid "Gambia"
msgstr "冈比亚"
-#: lang.pm:264
+#: lang.pm:272
#, c-format
msgid "Guinea"
msgstr "几内亚"
-#: lang.pm:265
+#: lang.pm:273
#, c-format
msgid "Guadeloupe"
msgstr "瓜德洛普"
-#: lang.pm:266
+#: lang.pm:274
#, c-format
msgid "Equatorial Guinea"
msgstr "赤道几内亚"
-#: lang.pm:268
+#: lang.pm:276
#, c-format
msgid "South Georgia and the South Sandwich Islands"
msgstr "南乔治亚岛和南桑德韦奇岛"
-#: lang.pm:269
+#: lang.pm:277
#, c-format
msgid "Guatemala"
msgstr "危地马拉"
-#: lang.pm:270
+#: lang.pm:278
#, c-format
msgid "Guam"
msgstr "关岛"
-#: lang.pm:271
+#: lang.pm:279
#, c-format
msgid "Guinea-Bissau"
msgstr "几内亚比绍"
-#: lang.pm:272
+#: lang.pm:280
#, c-format
msgid "Guyana"
msgstr "圭亚那"
-#: lang.pm:273
+#: lang.pm:281
#, c-format
msgid "Hong Kong SAR (China)"
msgstr "中国香港"
-#: lang.pm:274
+#: lang.pm:282
#, c-format
msgid "Heard and McDonald Islands"
msgstr "赫德和麦克唐纳群岛"
-#: lang.pm:275
+#: lang.pm:283
#, c-format
msgid "Honduras"
msgstr "洪都拉斯"
-#: lang.pm:276
+#: lang.pm:284
#, c-format
msgid "Croatia"
msgstr "克罗地亚"
-#: lang.pm:277
+#: lang.pm:285
#, c-format
msgid "Haiti"
msgstr "海地"
-#: lang.pm:278 network/adsl_consts.pm:436
-#, c-format
-msgid "Hungary"
-msgstr "匈牙利"
-
-#: lang.pm:279
+#: lang.pm:287
#, c-format
msgid "Indonesia"
msgstr "印度尼西亚"
-#: lang.pm:280 network/adsl_consts.pm:444 standalone/drakxtv:47
+#: lang.pm:288 network/adsl_consts.pm:471 standalone/drakxtv:47
#, c-format
msgid "Ireland"
msgstr "爱尔兰"
-#: lang.pm:281
+#: lang.pm:289 network/adsl_consts.pm:479
#, c-format
msgid "Israel"
msgstr "以色列"
-#: lang.pm:282
+#: lang.pm:290
#, c-format
msgid "India"
msgstr "印度"
-#: lang.pm:283
+#: lang.pm:291
#, c-format
msgid "British Indian Ocean Territory"
msgstr "英属印度洋地区"
-#: lang.pm:284
+#: lang.pm:292
#, c-format
msgid "Iraq"
msgstr "伊拉克"
-#: lang.pm:285
+#: lang.pm:293
#, c-format
msgid "Iran"
msgstr "伊朗"
-#: lang.pm:286
+#: lang.pm:294
#, c-format
msgid "Iceland"
msgstr "冰岛"
-#: lang.pm:288
+#: lang.pm:296
#, c-format
msgid "Jamaica"
msgstr "牙买加"
-#: lang.pm:289
+#: lang.pm:297
#, c-format
msgid "Jordan"
msgstr "约旦"
-#: lang.pm:290
+#: lang.pm:298
#, c-format
msgid "Japan"
msgstr "日本"
-#: lang.pm:291
+#: lang.pm:299
#, c-format
msgid "Kenya"
msgstr "肯尼亚"
-#: lang.pm:292
+#: lang.pm:300
#, c-format
msgid "Kyrgyzstan"
msgstr "吉尔吉斯斯坦"
-#: lang.pm:293
+#: lang.pm:301
#, c-format
msgid "Cambodia"
msgstr "柬埔寨"
-#: lang.pm:294
+#: lang.pm:302
#, c-format
msgid "Kiribati"
msgstr "基里巴斯"
-#: lang.pm:295
+#: lang.pm:303
#, c-format
msgid "Comoros"
msgstr "科摩罗"
-#: lang.pm:296
+#: lang.pm:304
#, c-format
msgid "Saint Kitts and Nevis"
msgstr "圣基茨和尼维斯"
-#: lang.pm:297
+#: lang.pm:305
#, c-format
msgid "Korea (North)"
msgstr "朝鲜"
-#: lang.pm:298
+#: lang.pm:306
#, c-format
msgid "Korea"
msgstr "韩国"
-#: lang.pm:299
+#: lang.pm:307
#, c-format
msgid "Kuwait"
msgstr "科威特"
-#: lang.pm:300
+#: lang.pm:308
#, c-format
msgid "Cayman Islands"
msgstr "开曼群岛"
-#: lang.pm:301
+#: lang.pm:309
#, c-format
msgid "Kazakhstan"
msgstr "哈萨克斯坦"
-#: lang.pm:302
+#: lang.pm:310
#, c-format
msgid "Laos"
msgstr "老挝"
-#: lang.pm:303
+#: lang.pm:311
#, c-format
msgid "Lebanon"
msgstr "黎巴嫩"
-#: lang.pm:304
+#: lang.pm:312
#, c-format
msgid "Saint Lucia"
msgstr "圣卢西亚"
-#: lang.pm:305
+#: lang.pm:313
#, c-format
msgid "Liechtenstein"
msgstr "列支敦士登"
-#: lang.pm:306
+#: lang.pm:314
#, c-format
msgid "Sri Lanka"
msgstr "斯里兰卡"
-#: lang.pm:307
+#: lang.pm:315
#, c-format
msgid "Liberia"
msgstr "利比里亚"
-#: lang.pm:308
+#: lang.pm:316
#, c-format
msgid "Lesotho"
msgstr "莱索托"
-#: lang.pm:309 network/adsl_consts.pm:479
+#: lang.pm:317 network/adsl_consts.pm:527
#, c-format
msgid "Lithuania"
msgstr "立陶宛"
-#: lang.pm:310
+#: lang.pm:318
#, c-format
msgid "Luxembourg"
msgstr "卢森堡"
-#: lang.pm:311
+#: lang.pm:319
#, c-format
msgid "Latvia"
msgstr "拉脱维亚"
-#: lang.pm:312
+#: lang.pm:320
#, c-format
msgid "Libya"
msgstr "利比亚"
-#: lang.pm:313 network/adsl_consts.pm:487
+#: lang.pm:321 network/adsl_consts.pm:535
#, c-format
msgid "Morocco"
msgstr "摩洛哥"
-#: lang.pm:314
+#: lang.pm:322
#, c-format
msgid "Monaco"
msgstr "摩纳哥"
-#: lang.pm:315
+#: lang.pm:323
#, c-format
msgid "Moldova"
msgstr "摩尔多瓦"
-#: lang.pm:316
+#: lang.pm:324
#, c-format
msgid "Madagascar"
msgstr "马达加斯加"
-#: lang.pm:317
+#: lang.pm:325
#, c-format
msgid "Marshall Islands"
msgstr "马绍尔群岛"
# ../drakfwia"
-#: lang.pm:318
+#: lang.pm:326
#, c-format
msgid "Macedonia"
msgstr "马其顿"
-#: lang.pm:319
+#: lang.pm:327
#, c-format
msgid "Mali"
msgstr "马里"
-#: lang.pm:320
+#: lang.pm:328
#, c-format
msgid "Myanmar"
msgstr "缅甸"
-#: lang.pm:321
+#: lang.pm:329
#, c-format
msgid "Mongolia"
msgstr "蒙古"
-#: lang.pm:322
+#: lang.pm:330
#, c-format
msgid "Northern Mariana Islands"
msgstr "北马里亚那岛"
-#: lang.pm:323
+#: lang.pm:331
#, c-format
msgid "Martinique"
msgstr "马提尼克"
-#: lang.pm:324
+#: lang.pm:332
#, c-format
msgid "Mauritania"
msgstr "毛里塔尼亚"
-#: lang.pm:325
+#: lang.pm:333
#, c-format
msgid "Montserrat"
msgstr "蒙特塞拉特"
-#: lang.pm:326
+#: lang.pm:334
#, c-format
msgid "Malta"
msgstr "马耳他"
-#: lang.pm:327
+#: lang.pm:335
#, c-format
msgid "Mauritius"
msgstr "毛里求斯"
-#: lang.pm:328
+#: lang.pm:336
#, c-format
msgid "Maldives"
msgstr "马尔代夫"
-#: lang.pm:329
+#: lang.pm:337
#, c-format
msgid "Malawi"
msgstr "马拉维"
-#: lang.pm:330
+#: lang.pm:338
#, c-format
msgid "Mexico"
msgstr "墨西哥"
-#: lang.pm:331
+#: lang.pm:339
#, c-format
msgid "Malaysia"
msgstr "马来西亚"
-#: lang.pm:332
+#: lang.pm:340
#, c-format
msgid "Mozambique"
msgstr "莫桑比克"
-#: lang.pm:333
+#: lang.pm:341
#, c-format
msgid "Namibia"
msgstr "纳米比亚"
-#: lang.pm:334
+#: lang.pm:342
#, c-format
msgid "New Caledonia"
msgstr "新喀里多尼亚"
-#: lang.pm:335
+#: lang.pm:343
#, c-format
msgid "Niger"
msgstr "尼日尔"
-#: lang.pm:336
+#: lang.pm:344
#, c-format
msgid "Norfolk Island"
msgstr "诺福克岛"
-#: lang.pm:337
+#: lang.pm:345
#, c-format
msgid "Nigeria"
msgstr "尼日利亚"
-#: lang.pm:338
+#: lang.pm:346
#, c-format
msgid "Nicaragua"
msgstr "尼加拉瓜"
-#: lang.pm:341
+#: lang.pm:349
#, c-format
msgid "Nepal"
msgstr "尼泊尔"
-#: lang.pm:342
+#: lang.pm:350
#, c-format
msgid "Nauru"
msgstr "瑙鲁"
-#: lang.pm:343
+#: lang.pm:351
#, c-format
msgid "Niue"
msgstr "纽埃"
-#: lang.pm:344
+#: lang.pm:352
#, c-format
msgid "New Zealand"
msgstr "新西兰"
-#: lang.pm:345
+#: lang.pm:353
#, c-format
msgid "Oman"
msgstr "阿曼"
-#: lang.pm:346
+#: lang.pm:354
#, c-format
msgid "Panama"
msgstr "巴拿马"
-#: lang.pm:347
+#: lang.pm:355
#, c-format
msgid "Peru"
msgstr "秘鲁"
-#: lang.pm:348
+#: lang.pm:356
#, c-format
msgid "French Polynesia"
msgstr "法属玻利尼西亚"
-#: lang.pm:349
+#: lang.pm:357
#, c-format
msgid "Papua New Guinea"
msgstr "巴布亚新几内亚"
-#: lang.pm:350
+#: lang.pm:358
#, c-format
msgid "Philippines"
msgstr "菲律宾"
-#: lang.pm:351
+#: lang.pm:359
#, c-format
msgid "Pakistan"
msgstr "巴基斯坦"
-#: lang.pm:352 network/adsl_consts.pm:503
-#, c-format
-msgid "Poland"
-msgstr "波兰"
-
-#: lang.pm:353
+#: lang.pm:361
#, c-format
msgid "Saint Pierre and Miquelon"
msgstr "圣皮埃尔岛及密克隆岛"
-#: lang.pm:354
+#: lang.pm:362
#, c-format
msgid "Pitcairn"
msgstr "皮特克恩"
-#: lang.pm:355
+#: lang.pm:363
#, c-format
msgid "Puerto Rico"
msgstr "波多黎各"
-#: lang.pm:356
+#: lang.pm:364
#, c-format
msgid "Palestine"
msgstr "巴勒斯坦"
-#: lang.pm:357 network/adsl_consts.pm:513
+#: lang.pm:365 network/adsl_consts.pm:634
#, c-format
msgid "Portugal"
msgstr "葡萄牙"
-#: lang.pm:358
+#: lang.pm:366
#, c-format
msgid "Paraguay"
msgstr "巴拉圭"
-#: lang.pm:359
+#: lang.pm:367
#, c-format
msgid "Palau"
msgstr "帕劳"
-#: lang.pm:360
+#: lang.pm:368
#, c-format
msgid "Qatar"
msgstr "卡塔尔"
-#: lang.pm:361
+#: lang.pm:369
#, c-format
msgid "Reunion"
msgstr "留尼旺"
-#: lang.pm:362
+#: lang.pm:370
#, c-format
msgid "Romania"
msgstr "罗马尼亚"
-#: lang.pm:363
+#: lang.pm:371 network/adsl_consts.pm:642
#, c-format
msgid "Russia"
msgstr "俄罗斯"
-#: lang.pm:364
+#: lang.pm:372
#, c-format
msgid "Rwanda"
msgstr "卢旺达"
-#: lang.pm:365
+#: lang.pm:373
#, c-format
msgid "Saudi Arabia"
msgstr "沙特阿拉伯"
-#: lang.pm:366
+#: lang.pm:374
#, c-format
msgid "Solomon Islands"
msgstr "所罗门群岛"
-#: lang.pm:367
+#: lang.pm:375
#, c-format
msgid "Seychelles"
msgstr "塞舌尔"
-#: lang.pm:368
+#: lang.pm:376
#, c-format
msgid "Sudan"
msgstr "苏丹"
-#: lang.pm:370
+#: lang.pm:378
#, c-format
msgid "Singapore"
msgstr "新加坡"
-#: lang.pm:371
+#: lang.pm:379
#, c-format
msgid "Saint Helena"
msgstr "圣·海伦娜"
-#: lang.pm:372 network/adsl_consts.pm:520
+#: lang.pm:380 network/adsl_consts.pm:652
#, c-format
msgid "Slovenia"
msgstr "斯洛文尼亚"
-#: lang.pm:373
+#: lang.pm:381
#, c-format
msgid "Svalbard and Jan Mayen Islands"
msgstr "斯马尔巴特和扬马延岛"
-#: lang.pm:374
-#, c-format
-msgid "Slovakia"
-msgstr "斯洛伐克"
-
-#: lang.pm:375
+#: lang.pm:383
#, c-format
msgid "Sierra Leone"
msgstr "塞拉利昂"
-#: lang.pm:376
+#: lang.pm:384
#, c-format
msgid "San Marino"
msgstr "圣马力诺"
-#: lang.pm:377
+#: lang.pm:385
#, c-format
msgid "Senegal"
msgstr "塞内加尔"
-#: lang.pm:378
+#: lang.pm:386
#, c-format
msgid "Somalia"
msgstr "索马里"
-#: lang.pm:379
+#: lang.pm:387
#, c-format
msgid "Suriname"
msgstr "苏里南"
-#: lang.pm:380
+#: lang.pm:388
#, c-format
msgid "Sao Tome and Principe"
msgstr "圣多美和普林西比"
-#: lang.pm:381
+#: lang.pm:389
#, c-format
msgid "El Salvador"
msgstr "萨尔瓦多"
-#: lang.pm:382
+#: lang.pm:390
#, c-format
msgid "Syria"
msgstr "叙利亚"
-#: lang.pm:383
+#: lang.pm:391
#, c-format
msgid "Swaziland"
msgstr "斯威士兰"
-#: lang.pm:384
+#: lang.pm:392
#, c-format
msgid "Turks and Caicos Islands"
msgstr "特克斯和凯科斯群岛"
-#: lang.pm:385
+#: lang.pm:393
#, c-format
msgid "Chad"
msgstr "乍得"
-#: lang.pm:386
+#: lang.pm:394
#, c-format
msgid "French Southern Territories"
msgstr "法国南方属地"
-#: lang.pm:387
+#: lang.pm:395
#, c-format
msgid "Togo"
msgstr "多哥"
-#: lang.pm:388 network/adsl_consts.pm:585
+#: lang.pm:396 network/adsl_consts.pm:806
#, c-format
msgid "Thailand"
msgstr "泰国"
-#: lang.pm:389
+#: lang.pm:397
#, c-format
msgid "Tajikistan"
msgstr "塔吉克斯坦"
-#: lang.pm:390
+#: lang.pm:398
#, c-format
msgid "Tokelau"
msgstr "托克劳群岛"
-#: lang.pm:391
+#: lang.pm:399
#, c-format
msgid "East Timor"
msgstr "东帝汶"
-#: lang.pm:392
+#: lang.pm:400
#, c-format
msgid "Turkmenistan"
msgstr "土库曼斯坦"
-#: lang.pm:393
+#: lang.pm:401 network/adsl_consts.pm:816
#, c-format
msgid "Tunisia"
msgstr "突尼斯"
-#: lang.pm:394
+#: lang.pm:402
#, c-format
msgid "Tonga"
msgstr "汤加"
-#: lang.pm:395
+#: lang.pm:403
#, c-format
msgid "Turkey"
msgstr "土耳其"
-#: lang.pm:396
+#: lang.pm:404
#, c-format
msgid "Trinidad and Tobago"
msgstr "特立尼达和多巴哥岛"
-#: lang.pm:397
+#: lang.pm:405
#, c-format
msgid "Tuvalu"
msgstr "图瓦卢"
-#: lang.pm:398
-#, c-format
-msgid "Taiwan"
-msgstr "中国台湾"
-
-#: lang.pm:399
+#: lang.pm:407
#, c-format
msgid "Tanzania"
msgstr "坦桑尼亚"
-#: lang.pm:400
+#: lang.pm:408
#, c-format
msgid "Ukraine"
msgstr "乌克兰"
-#: lang.pm:401
+#: lang.pm:409
#, c-format
msgid "Uganda"
msgstr "乌干达"
-#: lang.pm:402
+#: lang.pm:410
#, c-format
msgid "United States Minor Outlying Islands"
msgstr "美属本土外岛屿"
-#: lang.pm:404
+#: lang.pm:412
#, c-format
msgid "Uruguay"
msgstr "乌拉圭"
-#: lang.pm:405
+#: lang.pm:413
#, c-format
msgid "Uzbekistan"
msgstr "乌兹别克斯坦"
-#: lang.pm:406
+#: lang.pm:414
#, c-format
msgid "Vatican"
msgstr "梵蒂冈"
-#: lang.pm:407
+#: lang.pm:415
#, c-format
msgid "Saint Vincent and the Grenadines"
msgstr "圣文森特和格林纳丁斯"
-#: lang.pm:408
+#: lang.pm:416
#, c-format
msgid "Venezuela"
msgstr "委内瑞拉"
-#: lang.pm:409
+#: lang.pm:417
#, c-format
msgid "Virgin Islands (British)"
msgstr "英属维京群岛"
-#: lang.pm:410
+#: lang.pm:418
#, c-format
msgid "Virgin Islands (U.S.)"
msgstr "美属维京群岛"
-#: lang.pm:411
+#: lang.pm:419
#, c-format
msgid "Vietnam"
msgstr "越南"
-#: lang.pm:412
+#: lang.pm:420
#, c-format
msgid "Vanuatu"
msgstr "瓦努阿图"
-#: lang.pm:413
+#: lang.pm:421
#, c-format
msgid "Wallis and Futuna"
msgstr "瓦利斯和富图纳群岛"
-#: lang.pm:414
+#: lang.pm:422
#, c-format
msgid "Samoa"
msgstr "萨摩亚"
-#: lang.pm:415
+#: lang.pm:423
#, c-format
msgid "Yemen"
msgstr "也门"
-#: lang.pm:416
+#: lang.pm:424
#, c-format
msgid "Mayotte"
msgstr "马约特岛"
-#: lang.pm:417 standalone/drakxtv:49
+#: lang.pm:425 standalone/drakxtv:49
#, c-format
msgid "South Africa"
msgstr "南非"
-#: lang.pm:418
+#: lang.pm:426
#, c-format
msgid "Zambia"
msgstr "赞比亚"
-#: lang.pm:419
+#: lang.pm:427
#, c-format
msgid "Zimbabwe"
msgstr "津巴布韦"
-#: lang.pm:1047
+#: lang.pm:1040
#, c-format
msgid "You should install the following packages: %s"
msgstr "您应该安装下列软件包:%s"
#. -PO: the following is used to combine packages names. eg: "initscripts, harddrake, yudit"
-#: lang.pm:1050 standalone/scannerdrake:135
+#: lang.pm:1043 standalone/scannerdrake:135
#, c-format
msgid ", "
msgstr "、"
-#: lang.pm:1101
+#: lang.pm:1094
#, c-format
msgid "Welcome to %s"
msgstr "欢迎使用 %s"
@@ -8946,12 +9122,12 @@ msgstr "欢迎使用 %s"
msgid "Circular mounts %s\n"
msgstr "循环装载 %s\n"
-#: lvm.pm:116
+#: lvm.pm:111
#, c-format
msgid "Remove the logical volumes first\n"
msgstr "请先删除逻辑卷\n"
-#: modules/interactive.pm:21 standalone/drakconnect:1033
+#: modules/interactive.pm:21 standalone/drakconnect:1032
#, c-format
msgid "Parameters"
msgstr "参数"
@@ -8979,40 +9155,60 @@ msgstr "找到 %s 接口"
#: modules/interactive.pm:64
#, c-format
msgid "Do you have another one?"
-msgstr "您有其它的吗?"
+msgstr "您有其它的吗?"
#: modules/interactive.pm:65
#, c-format
msgid "Do you have any %s interfaces?"
-msgstr "您还有其它 %s 网卡吗?"
+msgstr "您还有其它 %s 网卡吗?"
#: modules/interactive.pm:71
#, c-format
msgid "See hardware info"
msgstr "查看硬件信息"
+#: modules/interactive.pm:82
+#, c-format
+msgid "Installing driver for USB controller"
+msgstr "正在安装 USB 控制器的驱动程序"
+
+#: modules/interactive.pm:83
+#, c-format
+msgid "Installing driver for firewire controller %s"
+msgstr "正在安装火线控制器 %s 的驱动程序"
+
+#: modules/interactive.pm:84
+#, c-format
+msgid "Installing driver for hard drive controller %s"
+msgstr "正在安装硬盘控制器 %s 的驱动程序"
+
+#: modules/interactive.pm:85
+#, c-format
+msgid "Installing driver for ethernet controller %s"
+msgstr "正在安装以太网控制器 %s 的驱动程序"
+
#. -PO: the first %s is the card type (scsi, network, sound,...)
#. -PO: the second is the vendor+model name
-#: modules/interactive.pm:87
+#: modules/interactive.pm:96
#, c-format
msgid "Installing driver for %s card %s"
msgstr "正在安装 %s 卡 %s 的驱动程序"
-#: modules/interactive.pm:87
+#: modules/interactive.pm:99
#, c-format
msgid "(module %s)"
msgstr "(模块 %s)"
-#: modules/interactive.pm:98
+#: modules/interactive.pm:109
#, c-format
msgid ""
"You may now provide options to module %s.\n"
"Note that any address should be entered with the prefix 0x like '0x123'"
msgstr ""
"您现在可以提供模块 %s 的参数。\n"
-"注意要输入内存地址请使用 0x 前缀,如“0x123”"
+"注意要输入内存地址请使用 0x 前缀, 如“0x123”"
-#: modules/interactive.pm:104
+#: modules/interactive.pm:115
#, c-format
msgid ""
"You may now provide options to module %s.\n"
@@ -9021,20 +9217,20 @@ msgid ""
msgstr ""
"现在给模块 %s 指定它的选项。\n"
"选项的格式是“name=value name2=value2...”\n"
-"例如,“io=0x300 irq=7”"
+"例如, “io=0x300 irq=7”"
-#: modules/interactive.pm:106
+#: modules/interactive.pm:117
#, c-format
msgid "Module options:"
msgstr "模块参数: "
#. -PO: the %s is the driver type (scsi, network, sound,...)
-#: modules/interactive.pm:119
+#: modules/interactive.pm:130
#, c-format
msgid "Which %s driver should I try?"
-msgstr "尝试使用哪个 %s 驱动程序?"
+msgstr "尝试使用哪个 %s 驱动程序?"
-#: modules/interactive.pm:128
+#: modules/interactive.pm:139
#, c-format
msgid ""
"In some cases, the %s driver needs to have extra information to work\n"
@@ -9045,29 +9241,29 @@ msgid ""
"should\n"
"not cause any damage."
msgstr ""
-"有时候需要给 %s 驱动程序指定额外的信息才能正常运行,尽管通常不需要。\n"
-"您可以在这里指定一些额外的选项,也可以让驱动程序探测您的机器,自动\n"
-"确定需要的信息。偶尔会发生机器在探测中停止反应,不过这不会损坏什么。\n"
-"您决定怎么做?"
+"有时候需要给 %s 驱动程序指定额外的信息才能正常运行, 尽管通常不需要。\n"
+"您可以在这里指定一些额外的选项, 也可以让驱动程序探测您的机器, 自动\n"
+"确定需要的信息。偶尔会发生机器在探测中停止反应, 不过这不会损坏什么。\n"
+"您决定怎么做?"
-#: modules/interactive.pm:132
+#: modules/interactive.pm:143
#, c-format
msgid "Autoprobe"
msgstr "自动探测"
-#: modules/interactive.pm:132
+#: modules/interactive.pm:143
#, c-format
msgid "Specify options"
msgstr "指定选项"
-#: modules/interactive.pm:144
+#: modules/interactive.pm:155
#, c-format
msgid ""
"Loading module %s failed.\n"
"Do you want to try again with other parameters?"
msgstr ""
"模块 %s 加载失败。\n"
-"您要尝试其它的参数吗?"
+"您要尝试其它的参数吗?"
#: modules/parameters.pm:49
#, c-format
@@ -9119,11 +9315,11 @@ msgstr "普通 PS2 滚轮鼠标"
msgid "GlidePoint"
msgstr "GlidePoint"
-#: mouse.pm:36 network/modem.pm:57 network/modem.pm:58 network/modem.pm:59
-#: network/modem.pm:84 network/modem.pm:98 network/modem.pm:103
-#: network/modem.pm:136 network/netconnect.pm:607 network/netconnect.pm:612
-#: network/netconnect.pm:624 network/netconnect.pm:629
-#: network/netconnect.pm:645 network/netconnect.pm:647
+#: mouse.pm:36 network/modem.pm:58 network/modem.pm:59 network/modem.pm:60
+#: network/modem.pm:85 network/modem.pm:99 network/modem.pm:104
+#: network/modem.pm:137 network/netconnect.pm:645 network/netconnect.pm:650
+#: network/netconnect.pm:662 network/netconnect.pm:667
+#: network/netconnect.pm:683 network/netconnect.pm:685
#, c-format
msgid "Automatic"
msgstr "自动"
@@ -9226,17 +9422,17 @@ msgstr "MM HitTablet"
#: mouse.pm:71
#, c-format
msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "罗技鼠标(串口,旧 C7 型)"
+msgstr "罗技鼠标(串口, 旧 C7 型)"
#: mouse.pm:72
#, c-format
msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
-msgstr "罗技鼠标(串口,旧 C7 型),模拟滚轮"
+msgstr "罗技鼠标(串口, 旧 C7 型), 模拟滚轮"
#: mouse.pm:74
#, c-format
msgid "Kensington Thinking Mouse with Wheel emulation"
-msgstr "Kensington Thinking Mouse,模拟滚轮"
+msgstr "Kensington Thinking Mouse, 模拟滚轮"
#: mouse.pm:77
#, c-format
@@ -9256,7 +9452,7 @@ msgstr "三键"
#: mouse.pm:82
#, c-format
msgid "3 buttons with Wheel emulation"
-msgstr "3 键,模拟滚轮"
+msgstr "3 键, 模拟滚轮"
#: mouse.pm:86
#, c-format
@@ -9273,7 +9469,7 @@ msgstr "任何 PS/2 或 USB 鼠标"
msgid "Synaptics Touchpad"
msgstr "Synaptics 触摸板"
-#: mouse.pm:93 standalone/drakconnect:358 standalone/drakvpn:1140
+#: mouse.pm:93 standalone/drakconnect:360 standalone/drakvpn:1140
#, c-format
msgid "none"
msgstr "无"
@@ -9291,7 +9487,7 @@ msgstr "请测试您的鼠标"
#: mouse.pm:548
#, c-format
msgid "To activate the mouse,"
-msgstr "要激活鼠标,"
+msgstr "要激活鼠标,"
#: mouse.pm:549
#, c-format
@@ -9333,23 +9529,23 @@ msgstr "Sagem (使用 PPPoA) USB"
msgid "Sagem (using DHCP) USB"
msgstr "Sagem (使用 DHCP) USB"
-#: network/adsl.pm:35 network/netconnect.pm:799
+#: network/adsl.pm:35 network/netconnect.pm:839
#, c-format
msgid "Connect to the Internet"
msgstr "连接到 Internet"
-#: network/adsl.pm:36 network/netconnect.pm:800
+#: network/adsl.pm:36 network/netconnect.pm:840
#, c-format
msgid ""
"The most common way to connect with adsl is pppoe.\n"
"Some connections use PPTP, a few use DHCP.\n"
-"If you don't know, choose 'use PPPoE'"
+"If you do not know, choose 'use PPPoE'"
msgstr ""
"利用 ADSL 连接最常用的方法是 PPPoE。\n"
-"有一些利用 PPTP,还有极少数利用 DHCP。\n"
-"如果您没有把握,就选择“PPPoE”"
+"有一些利用 PPTP, 还有极少数利用 DHCP。\n"
+"如果您没有把握, 就选择“PPPoE”"
-#: network/adsl.pm:41 network/netconnect.pm:804
+#: network/adsl.pm:41 network/netconnect.pm:844
#, c-format
msgid "ADSL connection type:"
msgstr "ADSL 连接类型: "
@@ -9391,8 +9587,8 @@ msgstr "Telnet 服务器"
#: network/drakfirewall.pm:48
#, c-format
-msgid "Samba server"
-msgstr "Samba 服务器"
+msgid "Windows Files Sharing (SMB)"
+msgstr "Windows 文件共享(SMB)"
#: network/drakfirewall.pm:54
#, c-format
@@ -9426,7 +9622,7 @@ msgstr ""
"“Drak 防火墙”配置\n"
"\n"
"此程序可为您的 Mandrakelinux 机器配置个人防火墙。\n"
-"如果要配置强大的专用防火墙,请考虑使用专门的\n"
+"如果要配置强大的专用防火墙, 请考虑使用专门的\n"
"MandrakeSecurity 防火墙发行版。"
#: network/drakfirewall.pm:158
@@ -9444,7 +9640,7 @@ msgstr ""
#: network/drakfirewall.pm:175
#, c-format
msgid "Which services would you like to allow the Internet to connect to?"
-msgstr "您想要允许 Internet 连接到哪些服务?"
+msgstr "您想要允许 Internet 连接到哪些服务?"
#: network/drakfirewall.pm:176
#, c-format
@@ -9454,7 +9650,7 @@ msgid ""
"Have a look at /etc/services for information."
msgstr ""
"您可以输入各种端口。\n"
-"例如,可以这样: 139/tcp 139/udp 600:610/tcp 600:610/udp。\n"
+"例如, 可以这样: 139/tcp 139/udp 600:610/tcp 600:610/udp。\n"
"请参考 /etc/services 文件。"
#: network/drakfirewall.pm:182
@@ -9467,7 +9663,7 @@ msgid ""
"You can also give a range of ports (eg: 24300:24350/udp)"
msgstr ""
"指定的端口无效: %s。\n"
-"正确的格式是“port/tcp”或“port/udp”,\n"
+"正确的格式是“port/tcp”或“port/udp”, \n"
"其中 port 要在 1 和 65535 之间。\n"
"\n"
"您也可以给出端口范围(如: 24300:24350/udp)"
@@ -9482,107 +9678,107 @@ msgstr "全部(无防火墙)"
msgid "Other ports"
msgstr "其它端口"
-#: network/isdn.pm:125 network/netconnect.pm:456 network/netconnect.pm:564
-#: network/netconnect.pm:567
+#: network/isdn.pm:125 network/netconnect.pm:490 network/netconnect.pm:602
+#: network/netconnect.pm:605
#, c-format
msgid "Unlisted - edit manually"
msgstr "未列出 - 手动编辑"
-#: network/isdn.pm:168 network/netconnect.pm:388
+#: network/isdn.pm:168 network/netconnect.pm:422
#, c-format
msgid "ISA / PCMCIA"
msgstr "ISA / PCMCIA"
-#: network/isdn.pm:168 network/netconnect.pm:388
+#: network/isdn.pm:168 network/netconnect.pm:422
#, c-format
-msgid "I don't know"
+msgid "I do not know"
msgstr "我不知道"
-#: network/isdn.pm:169 network/netconnect.pm:388
+#: network/isdn.pm:169 network/netconnect.pm:422
#, c-format
msgid "PCI"
msgstr "PCI"
-#: network/isdn.pm:170 network/netconnect.pm:388
+#: network/isdn.pm:170 network/netconnect.pm:422
#, c-format
msgid "USB"
msgstr "USB"
-#: network/modem.pm:57 network/modem.pm:58 network/modem.pm:59
-#: network/netconnect.pm:612 network/netconnect.pm:629
-#: network/netconnect.pm:645
+#: network/modem.pm:58 network/modem.pm:59 network/modem.pm:60
+#: network/netconnect.pm:650 network/netconnect.pm:667
+#: network/netconnect.pm:683
#, c-format
msgid "Manual"
msgstr "手动"
-#: network/netconnect.pm:89 network/netconnect.pm:485
-#: network/netconnect.pm:489
+#: network/netconnect.pm:90 network/netconnect.pm:519
+#: network/netconnect.pm:523
#, c-format
msgid "Manual choice"
msgstr "手动选择"
-#: network/netconnect.pm:89
+#: network/netconnect.pm:90
#, c-format
msgid "Internal ISDN card"
msgstr "内置 ISDN 卡"
-#: network/netconnect.pm:98
+#: network/netconnect.pm:100
#, c-format
msgid "Ad-hoc"
msgstr "Ad-hoc"
-#: network/netconnect.pm:99
+#: network/netconnect.pm:101
#, c-format
msgid "Managed"
msgstr "受控的"
-#: network/netconnect.pm:100
+#: network/netconnect.pm:102
#, c-format
msgid "Master"
msgstr "主要的"
-#: network/netconnect.pm:101
+#: network/netconnect.pm:103
#, c-format
msgid "Repeater"
msgstr "转发器"
-#: network/netconnect.pm:102
+#: network/netconnect.pm:104
#, c-format
msgid "Secondary"
msgstr "次要的"
-#: network/netconnect.pm:103
+#: network/netconnect.pm:105
#, c-format
msgid "Auto"
msgstr "自动"
-#: network/netconnect.pm:106 printer/printerdrake.pm:1248
+#: network/netconnect.pm:108 printer/printerdrake.pm:1354
#: standalone/drakups:75
#, c-format
msgid "Manual configuration"
msgstr "手工配置"
-#: network/netconnect.pm:107
+#: network/netconnect.pm:109
#, c-format
msgid "Automatic IP (BOOTP/DHCP)"
msgstr "自动 IP(BOOTP/DHCP)"
-#: network/netconnect.pm:109
+#: network/netconnect.pm:111
#, c-format
msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
msgstr "自动 IP(BOOTP/DHCP/Zeroconf)"
-#: network/netconnect.pm:112
+#: network/netconnect.pm:114
#, c-format
msgid "Protocol for the rest of the world"
msgstr "世界其它地区的协议"
-#: network/netconnect.pm:114 standalone/drakconnect:539
+#: network/netconnect.pm:116 standalone/drakconnect:541
#, c-format
msgid "European protocol (EDSS1)"
msgstr "欧洲协议(EDSS1)"
-#: network/netconnect.pm:115 standalone/drakconnect:540
+#: network/netconnect.pm:117 standalone/drakconnect:542
#, c-format
msgid ""
"Protocol for the rest of the world\n"
@@ -9591,168 +9787,168 @@ msgstr ""
"世界其它地区的协议\n"
"没有 D-信道(专线)"
-#: network/netconnect.pm:151
+#: network/netconnect.pm:153
#, c-format
msgid "Alcatel speedtouch USB modem"
msgstr "阿尔卡特 Speedtouch USB 调制解调器"
-#: network/netconnect.pm:152
+#: network/netconnect.pm:154
#, c-format
msgid "Sagem USB modem"
msgstr "Sagem USB 调制解调器"
-#: network/netconnect.pm:153
+#: network/netconnect.pm:155
#, c-format
msgid "Bewan modem"
msgstr "Bewan 调制解调器"
-#: network/netconnect.pm:154
+#: network/netconnect.pm:156
#, c-format
msgid "ECI Hi-Focus modem"
msgstr "ECI Hi-Focus 调制解调器"
-#: network/netconnect.pm:158
+#: network/netconnect.pm:160
#, c-format
msgid "Dynamic Host Configuration Protocol (DHCP)"
msgstr "动态主机配置协议(DHCP)"
-#: network/netconnect.pm:159
+#: network/netconnect.pm:161
#, c-format
msgid "Manual TCP/IP configuration"
msgstr "手工配置 TCP/IP"
-#: network/netconnect.pm:160
+#: network/netconnect.pm:162
#, c-format
msgid "Point to Point Tunneling Protocol (PPTP)"
msgstr "点对点隧道协议(PPTP)"
-#: network/netconnect.pm:161
+#: network/netconnect.pm:163
#, c-format
msgid "PPP over Ethernet (PPPoE)"
msgstr "以太网上的点对点协议(PPPoE)"
-#: network/netconnect.pm:162
+#: network/netconnect.pm:164
#, c-format
msgid "PPP over ATM (PPPoA)"
msgstr "异步传输模式下的点对点协议(PPPoA)"
-#: network/netconnect.pm:163
+#: network/netconnect.pm:165
#, c-format
msgid "DSL over CAPI"
msgstr "CAPI 上的 DSL"
-#: network/netconnect.pm:167
+#: network/netconnect.pm:169
#, c-format
msgid "Bridged Ethernet LLC"
msgstr "桥接以太网 LLC"
-#: network/netconnect.pm:168
+#: network/netconnect.pm:170
#, c-format
msgid "Bridged Ethernet VC"
msgstr "桥接以太网 VC"
-#: network/netconnect.pm:169
+#: network/netconnect.pm:171
#, c-format
msgid "Routed IP LLC"
msgstr "路由 IP LLC"
-#: network/netconnect.pm:170
+#: network/netconnect.pm:172
#, c-format
msgid "Routed IP VC"
msgstr "路由 IP VC"
-#: network/netconnect.pm:171
+#: network/netconnect.pm:173
#, c-format
msgid "PPPoA LLC"
msgstr "PPPoA LLC"
-#: network/netconnect.pm:172
+#: network/netconnect.pm:174
#, c-format
msgid "PPPoA VC"
msgstr "PPPoA VC"
-#: network/netconnect.pm:176 standalone/drakconnect:474
+#: network/netconnect.pm:178 standalone/drakconnect:476
#, c-format
msgid "Script-based"
msgstr "基于脚本登录"
-#: network/netconnect.pm:177 standalone/drakconnect:474
+#: network/netconnect.pm:179 standalone/drakconnect:476
#, c-format
msgid "PAP"
msgstr "PAP"
-#: network/netconnect.pm:178 standalone/drakconnect:474
+#: network/netconnect.pm:180 standalone/drakconnect:476
#, c-format
msgid "Terminal-based"
msgstr "基于终端"
-#: network/netconnect.pm:179 standalone/drakconnect:474
+#: network/netconnect.pm:181 standalone/drakconnect:476
#, c-format
msgid "CHAP"
msgstr "CHAP"
-#: network/netconnect.pm:180 standalone/drakconnect:474
+#: network/netconnect.pm:182 standalone/drakconnect:476
#, c-format
msgid "PAP/CHAP"
msgstr "PAP/CHAP"
-#: network/netconnect.pm:236 standalone/drakconnect:59
+#: network/netconnect.pm:238 standalone/drakconnect:59
#, c-format
msgid "Network & Internet Configuration"
msgstr "网络和 Internet 配置"
-#: network/netconnect.pm:242
+#: network/netconnect.pm:244
#, c-format
msgid "(detected on port %s)"
msgstr "(在端口 %s 检测到)"
#. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:244
+#: network/netconnect.pm:246
#, c-format
msgid "(detected %s)"
msgstr "(检测到 %s)"
-#: network/netconnect.pm:244
+#: network/netconnect.pm:246
#, c-format
msgid "(detected)"
msgstr "(检测到)"
-#: network/netconnect.pm:246
+#: network/netconnect.pm:248
#, c-format
msgid "Modem connection"
msgstr "调制解调器连接"
-#: network/netconnect.pm:247
+#: network/netconnect.pm:249
#, c-format
msgid "ISDN connection"
msgstr "ISDN 连接"
-#: network/netconnect.pm:248
+#: network/netconnect.pm:250
#, c-format
msgid "ADSL connection"
msgstr "ADSL 连接"
-#: network/netconnect.pm:249
+#: network/netconnect.pm:251
#, c-format
msgid "Cable connection"
msgstr "有线电缆连接"
-#: network/netconnect.pm:250
+#: network/netconnect.pm:252
#, c-format
msgid "LAN connection"
msgstr "局域网连接"
-#: network/netconnect.pm:251 network/netconnect.pm:265
+#: network/netconnect.pm:253 network/netconnect.pm:267
#, c-format
msgid "Wireless connection"
msgstr "无线连接"
-#: network/netconnect.pm:261
+#: network/netconnect.pm:263
#, c-format
msgid "Choose the connection you want to configure"
msgstr "选择您想要配置的连接"
-#: network/netconnect.pm:279
+#: network/netconnect.pm:277
#, c-format
msgid ""
"We are now going to configure the %s connection.\n"
@@ -9765,130 +9961,141 @@ msgstr ""
"\n"
"按“%s”继续。"
-#: network/netconnect.pm:287 network/netconnect.pm:839
+#: network/netconnect.pm:285 network/netconnect.pm:879
#, c-format
msgid "Connection Configuration"
msgstr "连接配置"
-#: network/netconnect.pm:288 network/netconnect.pm:840
+#: network/netconnect.pm:286 network/netconnect.pm:880
#, c-format
msgid "Please fill or check the field below"
msgstr "请填写或选择下列项目"
-#: network/netconnect.pm:295 standalone/drakconnect:530
+#: network/netconnect.pm:293 standalone/drakconnect:532
#, c-format
msgid "Card IRQ"
msgstr "网卡的 IRQ"
-#: network/netconnect.pm:296 standalone/drakconnect:531
+#: network/netconnect.pm:294 standalone/drakconnect:533
#, c-format
msgid "Card mem (DMA)"
msgstr "网卡内存(DMA)"
-#: network/netconnect.pm:297 standalone/drakconnect:532
+#: network/netconnect.pm:295 standalone/drakconnect:534
#, c-format
msgid "Card IO"
msgstr "网卡 IO"
-#: network/netconnect.pm:298 standalone/drakconnect:533
+#: network/netconnect.pm:296 standalone/drakconnect:535
#, c-format
msgid "Card IO_0"
msgstr "网卡 IO_0"
-#: network/netconnect.pm:299
+#: network/netconnect.pm:297
#, c-format
msgid "Card IO_1"
msgstr "网卡 IO_1"
-#: network/netconnect.pm:300
+#: network/netconnect.pm:298
#, c-format
msgid "Your personal phone number"
msgstr "您自己的电话号码"
-#: network/netconnect.pm:301 network/netconnect.pm:843
+#: network/netconnect.pm:299 network/netconnect.pm:883
#, c-format
msgid "Provider name (ex provider.net)"
msgstr "服务商名称(如 provider.net)"
-#: network/netconnect.pm:302 standalone/drakconnect:469
+#: network/netconnect.pm:300 standalone/drakconnect:471
#, c-format
msgid "Provider phone number"
msgstr "服务商电话号码"
-#: network/netconnect.pm:303
+#: network/netconnect.pm:301
#, c-format
msgid "Provider DNS 1 (optional)"
msgstr "服务商 DNS 1(可选)"
-#: network/netconnect.pm:304
+#: network/netconnect.pm:302
#, c-format
msgid "Provider DNS 2 (optional)"
msgstr "服务商 DNS 2(可选)"
-#: network/netconnect.pm:305 standalone/drakconnect:420
+#: network/netconnect.pm:303 standalone/drakconnect:422
#, c-format
msgid "Dialing mode"
msgstr "拨号模式"
-#: network/netconnect.pm:306 standalone/drakconnect:425
-#: standalone/drakconnect:493
+#: network/netconnect.pm:304 standalone/drakconnect:427
+#: standalone/drakconnect:495
#, c-format
msgid "Connection speed"
msgstr "连接速率"
-#: network/netconnect.pm:307 standalone/drakconnect:430
+#: network/netconnect.pm:305 standalone/drakconnect:432
#, c-format
msgid "Connection timeout (in sec)"
msgstr "连接超时(秒)"
-#: network/netconnect.pm:310 network/netconnect.pm:846
-#: standalone/drakconnect:467
+#: network/netconnect.pm:308 network/netconnect.pm:329
+#: network/netconnect.pm:886 standalone/drakconnect:469
#, c-format
msgid "Account Login (user name)"
msgstr "账户登录(用户名)"
-#: network/netconnect.pm:311 network/netconnect.pm:847
-#: standalone/drakconnect:468
+#: network/netconnect.pm:309 network/netconnect.pm:330
+#: network/netconnect.pm:887 standalone/drakconnect:470
#, c-format
msgid "Account Password"
msgstr "账户密码"
-#: network/netconnect.pm:328 network/netconnect.pm:677
-#: network/netconnect.pm:880
+#: network/netconnect.pm:325
+#, c-format
+msgid "Cable: account options"
+msgstr "光缆: 账户选项"
+
+#: network/netconnect.pm:328
+#, c-format
+msgid "Use BPALogin (needed for Telstra)"
+msgstr "使用 BPALogin (Telstra 需要)"
+
+#: network/netconnect.pm:362 network/netconnect.pm:715
+#: network/netconnect.pm:920
#, c-format
msgid "Select the network interface to configure:"
msgstr "选择要配置的网卡: "
-#: network/netconnect.pm:330 network/netconnect.pm:378
-#: network/netconnect.pm:678 network/netconnect.pm:882 network/shorewall.pm:85
-#: standalone/drakconnect:683 standalone/drakgw:227 standalone/drakvpn:221
+#: network/netconnect.pm:364 network/netconnect.pm:412
+#: network/netconnect.pm:716 network/netconnect.pm:922
+#: network/netconnect.pm:1091 network/shorewall.pm:98
+#: standalone/drakconnect:684 standalone/drakgw:224 standalone/drakvpn:221
#, c-format
msgid "Net Device"
msgstr "网络设备"
-#: network/netconnect.pm:331 network/netconnect.pm:339
+#: network/netconnect.pm:365 network/netconnect.pm:373
#, c-format
msgid "External ISDN modem"
msgstr "外置 ISDN 调制解调器"
-#: network/netconnect.pm:377 standalone/harddrake2:192
+#: network/netconnect.pm:411 standalone/harddrake2:210
#, c-format
msgid "Select a device!"
msgstr "请选择设备!"
-#: network/netconnect.pm:386 network/netconnect.pm:396
-#: network/netconnect.pm:406 network/netconnect.pm:439
-#: network/netconnect.pm:453
+#: network/netconnect.pm:420 network/netconnect.pm:430
+#: network/netconnect.pm:440 network/netconnect.pm:473
+#: network/netconnect.pm:487
#, c-format
msgid "ISDN Configuration"
msgstr "ISDN 配置"
-#: network/netconnect.pm:387
+#: network/netconnect.pm:421
#, c-format
msgid "What kind of card do you have?"
-msgstr "请问您适配卡的种类?"
+msgstr "请问您适配卡的种类?"
-#: network/netconnect.pm:397
+#: network/netconnect.pm:431
#, c-format
msgid ""
"\n"
@@ -9898,26 +10105,26 @@ msgid ""
"card.\n"
msgstr ""
"\n"
-"如果您的卡是 ISA 卡,下一屏幕显示的值应该是正确的。\n"
+"如果您的卡是 ISA 卡, 下一屏幕显示的值应该是正确的。\n"
"\n"
-"如果您的卡是 PCMCIA 卡,您必须知道它的“irq”和“io”。\n"
+"如果您的卡是 PCMCIA 卡, 您必须知道它的“irq”和“io”。\n"
-#: network/netconnect.pm:401
+#: network/netconnect.pm:435
#, c-format
msgid "Continue"
msgstr "继续"
-#: network/netconnect.pm:401
+#: network/netconnect.pm:435
#, c-format
msgid "Abort"
msgstr "中止"
-#: network/netconnect.pm:407
+#: network/netconnect.pm:441
#, c-format
msgid "Which of the following is your ISDN card?"
-msgstr "下列哪个是您的 ISDN 卡?"
+msgstr "下列哪个是您的 ISDN 卡?"
-#: network/netconnect.pm:425
+#: network/netconnect.pm:459
#, c-format
msgid ""
"A CAPI driver is available for this modem. This CAPI driver can offer more "
@@ -9925,161 +10132,161 @@ msgid ""
"want to use?"
msgstr ""
"此调制解调器适用 CAPI 驱动程序。此 CAPI 驱动程序比免费驱动程序提供更多的功能"
-"(比如发送传真)。您想要使用哪个驱动程序?"
+"(比如发送传真)。您想要使用哪个驱动程序?"
-#: network/netconnect.pm:427 standalone/drakconnect:116 standalone/drakups:247
-#: standalone/harddrake2:117
+#: network/netconnect.pm:461 standalone/drakconnect:116 standalone/drakups:247
+#: standalone/harddrake2:131
#, c-format
msgid "Driver"
msgstr "驱动程序"
-#: network/netconnect.pm:439
+#: network/netconnect.pm:473
#, c-format
msgid "Which protocol do you want to use?"
-msgstr "您将使用哪种协议?"
+msgstr "您将使用哪种协议?"
-#: network/netconnect.pm:441 standalone/drakconnect:116
-#: standalone/drakconnect:309 standalone/drakconnect:538
+#: network/netconnect.pm:475 standalone/drakconnect:116
+#: standalone/drakconnect:309 standalone/drakconnect:540
#: standalone/drakvpn:1142
#, c-format
msgid "Protocol"
msgstr "协议"
-#: network/netconnect.pm:453
+#: network/netconnect.pm:487
#, c-format
msgid ""
"Select your provider.\n"
-"If it isn't listed, choose Unlisted."
+"If it is not listed, choose Unlisted."
msgstr ""
"选择您的提供商。\n"
-"如果该提供商未被列出,请选择“未列出”。"
+"如果该提供商未被列出, 请选择“未列出”。"
-#: network/netconnect.pm:455 network/netconnect.pm:563
-#: network/netconnect.pm:719
+#: network/netconnect.pm:489 network/netconnect.pm:601
+#: network/netconnect.pm:757
#, c-format
msgid "Provider:"
msgstr "服务商:"
-#: network/netconnect.pm:470
+#: network/netconnect.pm:504
#, c-format
msgid ""
-"Your modem isn't supported by the system.\n"
+"Your modem is not supported by the system.\n"
"Take a look at http://www.linmodems.org"
msgstr ""
"您的调制解调器不被系统支持。\n"
"请看看 http://www.linmodems.org"
-#: network/netconnect.pm:482
+#: network/netconnect.pm:516
#, c-format
msgid "Select the modem to configure:"
msgstr "选择要配置的调制解调器:"
-#: network/netconnect.pm:530
+#: network/netconnect.pm:568
#, c-format
msgid "Please choose which serial port your modem is connected to."
msgstr "请选择您的调制解调器是连接到哪个串行端口。"
-#: network/netconnect.pm:561
+#: network/netconnect.pm:599
#, c-format
msgid "Select your provider:"
msgstr "选择您的服务商:"
-#: network/netconnect.pm:589
+#: network/netconnect.pm:627
#, c-format
msgid "Dialup: account options"
msgstr "拨号: 账户设置"
-#: network/netconnect.pm:592
+#: network/netconnect.pm:630
#, c-format
msgid "Connection name"
msgstr "连接名称"
-#: network/netconnect.pm:593
+#: network/netconnect.pm:631
#, c-format
msgid "Phone number"
msgstr "电话号码"
-#: network/netconnect.pm:594
+#: network/netconnect.pm:632
#, c-format
msgid "Login ID"
msgstr "登录 ID"
-#: network/netconnect.pm:609 network/netconnect.pm:642
+#: network/netconnect.pm:647 network/netconnect.pm:680
#, c-format
msgid "Dialup: IP parameters"
msgstr "拨号: IP 参数"
-#: network/netconnect.pm:612
+#: network/netconnect.pm:650
#, c-format
msgid "IP parameters"
msgstr "IP 参数"
-#: network/netconnect.pm:613 network/netconnect.pm:976
+#: network/netconnect.pm:651 network/netconnect.pm:1018
#: printer/printerdrake.pm:454 standalone/drakconnect:116
-#: standalone/drakconnect:323 standalone/drakconnect:880
+#: standalone/drakconnect:325 standalone/drakconnect:879
#: standalone/drakups:282
#, c-format
msgid "IP address"
msgstr "IP 地址"
-#: network/netconnect.pm:614
+#: network/netconnect.pm:652
#, c-format
msgid "Subnet mask"
msgstr "子网掩码"
-#: network/netconnect.pm:626
+#: network/netconnect.pm:664
#, c-format
msgid "Dialup: DNS parameters"
msgstr "拨号: DNS 参数"
-#: network/netconnect.pm:629
+#: network/netconnect.pm:667
#, c-format
msgid "DNS"
msgstr "DNS"
-#: network/netconnect.pm:630
+#: network/netconnect.pm:668
#, c-format
msgid "Domain name"
msgstr "域名"
-#: network/netconnect.pm:631 network/netconnect.pm:844
-#: standalone/drakconnect:998
+#: network/netconnect.pm:669 network/netconnect.pm:884
+#: standalone/drakconnect:997
#, c-format
msgid "First DNS Server (optional)"
msgstr "首选 DNS 服务器(可选)"
-#: network/netconnect.pm:632 network/netconnect.pm:845
-#: standalone/drakconnect:999
+#: network/netconnect.pm:670 network/netconnect.pm:885
+#: standalone/drakconnect:998
#, c-format
msgid "Second DNS Server (optional)"
msgstr "备选 DNS 服务器(可选)"
-#: network/netconnect.pm:633
+#: network/netconnect.pm:671
#, c-format
msgid "Set hostname from IP"
msgstr "由 IP 设置主机名"
-#: network/netconnect.pm:645 standalone/drakconnect:334
+#: network/netconnect.pm:683 standalone/drakconnect:336
#, c-format
msgid "Gateway"
msgstr "网关"
-#: network/netconnect.pm:646
+#: network/netconnect.pm:684
#, c-format
msgid "Gateway IP address"
msgstr "网关 IP 地址"
-#: network/netconnect.pm:677
+#: network/netconnect.pm:715
#, c-format
msgid "ADSL configuration"
msgstr "ADSL 配置"
-#: network/netconnect.pm:717
+#: network/netconnect.pm:755
#, c-format
msgid "Please choose your ADSL provider"
msgstr "请选择您的 ADSL 提供商"
-#: network/netconnect.pm:735
+#: network/netconnect.pm:773
#, c-format
msgid ""
"You need the Alcatel microcode.\n"
@@ -10090,32 +10297,32 @@ msgstr ""
"您可以通过软盘或您的 Windows 分区提供该微代码,\n"
"或者现在跳过稍后再做。"
-#: network/netconnect.pm:739 network/netconnect.pm:744
+#: network/netconnect.pm:777 network/netconnect.pm:782
#, c-format
msgid "Use a floppy"
msgstr "使用软盘"
-#: network/netconnect.pm:739 network/netconnect.pm:748
+#: network/netconnect.pm:777 network/netconnect.pm:786
#, c-format
msgid "Use my Windows partition"
msgstr "使用我的 Windows 分区"
-#: network/netconnect.pm:739 network/netconnect.pm:751
+#: network/netconnect.pm:777 network/netconnect.pm:789
#, c-format
msgid "Do it later"
msgstr "稍后再做"
-#: network/netconnect.pm:758
+#: network/netconnect.pm:796
#, c-format
msgid "Firmware copy failed, file %s not found"
-msgstr "固件复制失败,文件 %s 未找到"
+msgstr "固件复制失败, 文件 %s 未找到"
-#: network/netconnect.pm:765
+#: network/netconnect.pm:803
#, c-format
msgid "Firmware copy succeeded"
msgstr "固件复制成功"
-#: network/netconnect.pm:780
+#: network/netconnect.pm:818
#, c-format
msgid ""
"You need the Alcatel microcode.\n"
@@ -10128,22 +10335,22 @@ msgstr ""
"%s\n"
"下载并将 mgmt.o 复制到 /usr/share/speedtouch"
-#: network/netconnect.pm:849
+#: network/netconnect.pm:889
#, c-format
msgid "Virtual Path ID (VPI):"
msgstr "虚拟路径 ID (VPI):"
-#: network/netconnect.pm:850
+#: network/netconnect.pm:890
#, c-format
msgid "Virtual Circuit ID (VCI):"
msgstr "虚拟电路 ID (VCI):"
-#: network/netconnect.pm:853
+#: network/netconnect.pm:893
#, c-format
msgid "Encapsulation:"
msgstr "封装: "
-#: network/netconnect.pm:870
+#: network/netconnect.pm:910
#, c-format
msgid ""
"The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10151,16 +10358,21 @@ msgid ""
"\n"
"You can find a driver on http://eciadsl.flashtux.org/"
msgstr ""
-"ECI Hi-Focus 调制解调器不被支持,这是由于二进制驱动程序发行上的原因。\n"
+"ECI Hi-Focus 调制解调器不被支持, 这是由于二进制驱动程序发行上的原因。\n"
"\n"
"您可以在此网站: http://eciadsl.flashtux.org/ 找到驱动程序。"
-#: network/netconnect.pm:882
+#: network/netconnect.pm:922
#, c-format
msgid "Manually load a driver"
msgstr "手动装入驱动程序"
-#: network/netconnect.pm:898
+#: network/netconnect.pm:922
+#, c-format
+msgid "Use a Windows driver (with ndiswrapper)"
+msgstr "使用 Windows 驱动程序(通过 ndiswrapper)"
+
+#: network/netconnect.pm:940
#, c-format
msgid ""
"WARNING: this device has been previously configured to connect to the "
@@ -10172,33 +10384,33 @@ msgstr ""
"修改下面的输入框将覆盖此配置。\n"
"您真的想要重新配置此设备吗?"
-#: network/netconnect.pm:912 network/netconnect.pm:1340
+#: network/netconnect.pm:954 network/netconnect.pm:1436
#, c-format
msgid ""
"Congratulations, the network and Internet configuration is finished.\n"
"\n"
msgstr ""
-"恭喜,网络和 Internet 配置完成。\n"
+"恭喜, 网络和 Internet 配置完成。\n"
"\n"
-#: network/netconnect.pm:929
+#: network/netconnect.pm:971
#, c-format
msgid "Zeroconf hostname resolution"
msgstr "Zeroconf 主机名解析"
-#: network/netconnect.pm:930 network/netconnect.pm:963
+#: network/netconnect.pm:972 network/netconnect.pm:1005
#, c-format
msgid "Configuring network device %s (driver %s)"
msgstr "配置网络设备 %s(驱动程序 %s)"
-#: network/netconnect.pm:931
+#: network/netconnect.pm:973
#, 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:964
+#: network/netconnect.pm:1006
#, c-format
msgid ""
"Please enter the IP configuration for this machine.\n"
@@ -10207,118 +10419,143 @@ msgid ""
msgstr ""
"请输入这台电脑的 IP 设置。\n"
"下列项目要求以句点分隔十进制格式输入的 IP 地址。\n"
-"(例如,1.2.3.4)"
+"(例如, 1.2.3.4)"
-#: network/netconnect.pm:971
+#: network/netconnect.pm:1013
#, c-format
msgid "Assign host name from DHCP address"
msgstr "从 DHCP 地址指定主机名"
-#: network/netconnect.pm:972
+#: network/netconnect.pm:1014
#, c-format
msgid "DHCP host name"
msgstr "DHCP 主机名"
-#: network/netconnect.pm:977 standalone/drakconnect:328
-#: standalone/drakconnect:881 standalone/drakgw:323
+#: network/netconnect.pm:1019 standalone/drakconnect:330
+#: standalone/drakconnect:880 standalone/drakgw:320
#, c-format
msgid "Netmask"
msgstr "子网掩码"
-#: network/netconnect.pm:979 standalone/drakconnect:413
+#: network/netconnect.pm:1021 standalone/drakconnect:415
#, c-format
msgid "Track network card id (useful for laptops)"
msgstr "跟踪网卡标志(用于笔记本电脑)"
-#: network/netconnect.pm:980 standalone/drakconnect:414
+#: network/netconnect.pm:1022 standalone/drakconnect:416
#, c-format
msgid "Network Hotplugging"
msgstr "网络热插拔"
-#: network/netconnect.pm:982 standalone/drakconnect:408
+#: network/netconnect.pm:1024 standalone/drakconnect:410
#, c-format
msgid "Start at boot"
msgstr "开机时启动"
-#: network/netconnect.pm:985 standalone/drakconnect:884
+#: network/netconnect.pm:1027 standalone/drakconnect:883
#, c-format
msgid "DHCP client"
msgstr "DHCP 客户端"
-#: network/netconnect.pm:995 printer/printerdrake.pm:1498
-#: standalone/drakconnect:648
+#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
+#: standalone/drakconnect:649
#, c-format
msgid "IP address should be in format 1.2.3.4"
msgstr "IP 地址的格式应该是 1.2.3.4"
-#: network/netconnect.pm:999
+#: network/netconnect.pm:1041
#, c-format
msgid "Warning: IP address %s is usually reserved!"
msgstr "警告: IP 地址 %s 通常是被保留的!"
-#: network/netconnect.pm:1004 standalone/drakTermServ:1690
-#: standalone/drakTermServ:1691 standalone/drakTermServ:1692
+#: network/netconnect.pm:1046 standalone/drakTermServ:1742
+#: standalone/drakTermServ:1743 standalone/drakTermServ:1744
#, c-format
msgid "%s already in use\n"
msgstr "%s 已经被使用了\n"
-#: network/netconnect.pm:1030 network/netconnect.pm:1059
+#: network/netconnect.pm:1067
+#, c-format
+msgid "Choose an ndiswrapper driver"
+msgstr "选择 ndiswrapper 驱动程序"
+
+#: network/netconnect.pm:1068 network/netconnect.pm:1075
+#, c-format
+msgid "Install a new driver"
+msgstr "安装新驱动程序"
+
+#: network/netconnect.pm:1068
+#, c-format
+msgid "Use already installed driver (%s)"
+msgstr "使用已安装的驱动程序(%s)"
+
+#: network/netconnect.pm:1072 printer/printerdrake.pm:3644
+#, c-format
+msgid "Could not install the %s package!"
+msgstr "无法安装 %s 软件包!"
+
+#: network/netconnect.pm:1076
+#, c-format
+msgid "Please select the Windows driver (.inf file)"
+msgstr "请选择 Windows 驱动程序(.inf 文件)"
+
+#: network/netconnect.pm:1126 network/netconnect.pm:1155
#, c-format
msgid "Please enter the wireless parameters for this card:"
msgstr "请选择此网卡的无线参数:"
-#: network/netconnect.pm:1033 standalone/drakconnect:380
+#: network/netconnect.pm:1129 standalone/drakconnect:382
#, c-format
msgid "Operating Mode"
msgstr "操作模式"
-#: network/netconnect.pm:1035 standalone/drakconnect:381
+#: network/netconnect.pm:1131 standalone/drakconnect:383
#, c-format
msgid "Network name (ESSID)"
msgstr "网络名称(ESSID)"
-#: network/netconnect.pm:1036 standalone/drakconnect:382
+#: network/netconnect.pm:1132 standalone/drakconnect:384
#, c-format
msgid "Network ID"
msgstr "网络 ID"
-#: network/netconnect.pm:1037 standalone/drakconnect:383
+#: network/netconnect.pm:1133 standalone/drakconnect:385
#, c-format
msgid "Operating frequency"
msgstr "运行频率"
-#: network/netconnect.pm:1038 standalone/drakconnect:384
+#: network/netconnect.pm:1134 standalone/drakconnect:386
#, c-format
msgid "Sensitivity threshold"
msgstr "灵敏度阀值"
-#: network/netconnect.pm:1039 standalone/drakconnect:385
+#: network/netconnect.pm:1135 standalone/drakconnect:387
#, c-format
msgid "Bitrate (in b/s)"
-msgstr "比特率(每秒比特数,b/s)"
+msgstr "比特率(每秒比特数, b/s)"
-#: network/netconnect.pm:1045
+#: network/netconnect.pm:1141
#, c-format
msgid ""
"Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
"frequency), or add enough '0' (zeroes)."
msgstr ""
-"频率应该有后缀 k,M 或 G(如“2.46G”代表 2.46 GHz 频率),或者后带足够"
+"频率应该有后缀 k, M 或 G(如“2.46G”代表 2.46 GHz 频率), 或者后带足够"
"的“0”(零)。"
-#: network/netconnect.pm:1049
+#: network/netconnect.pm:1145
#, 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”(零)。"
+msgstr "速度应该有后缀 k, M 或 G(如“11M”代表 11M), 或者后带足够的“0”(零)。"
-#: network/netconnect.pm:1062 standalone/drakconnect:396
+#: network/netconnect.pm:1158 standalone/drakconnect:398
#, c-format
msgid "RTS/CTS"
msgstr "RTS/CTS"
-#: network/netconnect.pm:1063
+#: network/netconnect.pm:1159
#, c-format
msgid ""
"RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -10331,23 +10568,23 @@ msgid ""
"fixed\n"
"or off."
msgstr ""
-"RTS/CTS 在每个信息包发出以前添加一个握手动作,以保证信道是空的。这会添加开"
-"销,\n"
+"RTS/CTS 在每个信息包发出以前添加一个握手动作, 以保证信道是空的。这会添加开"
+"销, \n"
"但会增加有隐藏节点和很多活跃节点时的性能。这个参数设置了节点发出 RTS 的最小"
"包\n"
-"的大小,一个等于中止计划的值的大小。您也可以设置这个值为自动、固定或者关闭。"
+"的大小, 一个等于中止计划的值的大小。您也可以设置这个值为自动、固定或者关闭。"
-#: network/netconnect.pm:1070 standalone/drakconnect:397
+#: network/netconnect.pm:1166 standalone/drakconnect:399
#, c-format
msgid "Fragmentation"
msgstr "块"
-#: network/netconnect.pm:1071 standalone/drakconnect:398
+#: network/netconnect.pm:1167 standalone/drakconnect:400
#, c-format
msgid "Iwconfig command extra arguments"
msgstr "Iwconfig 命令的额外参数"
-#: network/netconnect.pm:1072
+#: network/netconnect.pm:1168
#, c-format
msgid ""
"Here, one can configure some extra wireless parameters such as:\n"
@@ -10356,19 +10593,19 @@ msgid ""
"\n"
"See iwconfig(8) man page for further information."
msgstr ""
-"您可在此配置一些额外的无线参数,如:\n"
+"您可在此配置一些额外的无线参数, 如:\n"
"ap, channel, commit, enc, power, retry, sens, txpower(nick 已经设定为主机名"
"了)。\n"
"\n"
"请参看 iwconfig(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:1079 standalone/drakconnect:399
+#: network/netconnect.pm:1175 standalone/drakconnect:401
#, c-format
msgid "Iwspy command extra arguments"
msgstr "Iwspy 命令的额外参数"
-#: network/netconnect.pm:1080
+#: network/netconnect.pm:1176
#, c-format
msgid ""
"Iwspy is used to set a list of addresses in a wireless network\n"
@@ -10379,19 +10616,19 @@ msgid ""
"\n"
"See iwpspy(8) man page for further information."
msgstr ""
-"Iwspy 可在无线网卡中设置地址列表,并会逐一回读连接信息的质量。\n"
+"Iwspy 可在无线网卡中设置地址列表, 并会逐一回读连接信息的质量。\n"
"\n"
"此信息与 /proc/net/wireless 中的相同: \n"
"连接质量、信号强度和噪声级别。\n"
"\n"
"请参看 iwpspy(8) man page 中的更多信息。"
-#: network/netconnect.pm:1088 standalone/drakconnect:400
+#: network/netconnect.pm:1184 standalone/drakconnect:402
#, c-format
msgid "Iwpriv command extra arguments"
msgstr "Iwpriv 命令的额外参数"
-#: network/netconnect.pm:1089
+#: network/netconnect.pm:1185
#, c-format
msgid ""
"Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10410,17 +10647,17 @@ msgid ""
msgstr ""
"Iwpriv 允许为无线网卡设置可选(私有)的参数。\n"
"\n"
-"Iwpriv 会分析您所给出的参数,并对每个驱动程序分别加以设置(这与设置通用参数"
+"Iwpriv 会分析您所给出的参数, 并对每个驱动程序分别加以设置(这与设置通用参数"
"的\n"
"iwconfig 刚好相反)。\n"
"\n"
-"从道理上说,每个设备驱动程序的文档都应该明示了如何使用这些网卡特定的命令及"
+"从道理上说, 每个设备驱动程序的文档都应该明示了如何使用这些网卡特定的命令及"
"命\n"
"令的效果。\n"
"\n"
"请参看 iwpriv(8) man page 中的更多信息。"
-#: network/netconnect.pm:1163
+#: network/netconnect.pm:1259
#, c-format
msgid ""
"Please enter your host name.\n"
@@ -10429,70 +10666,70 @@ msgid ""
"You may also enter the IP address of the gateway if you have one."
msgstr ""
"请输入您的主机名称。\n"
-"您的主机名称必需是个完全限定的名称,例如“mybox.mylab.myco.com”。\n"
-"如果您有网关的话,也请输入其 IP 地址。"
+"您的主机名称必需是个完全限定的名称, 例如“mybox.mylab.myco.com”。\n"
+"如果您有网关的话, 也请输入其 IP 地址。"
-#: network/netconnect.pm:1167
+#: network/netconnect.pm:1263
#, c-format
msgid "Last but not least you can also type in your DNS server IP addresses."
-msgstr "最后,您还应该至少输入您 DNS 服务器的 IP 地址。"
+msgstr "最后, 您还应该至少输入您 DNS 服务器的 IP 地址。"
-#: network/netconnect.pm:1169 standalone/drakconnect:997
+#: network/netconnect.pm:1265 standalone/drakconnect:996
#, c-format
msgid "Host name (optional)"
msgstr "主机名(可选)"
-#: network/netconnect.pm:1169
+#: network/netconnect.pm:1265
#, c-format
msgid "Host name"
msgstr "主机名"
-#: network/netconnect.pm:1171
+#: network/netconnect.pm:1267
#, c-format
msgid "DNS server 1"
msgstr "DNS 服务器 1"
-#: network/netconnect.pm:1172
+#: network/netconnect.pm:1268
#, c-format
msgid "DNS server 2"
msgstr "DNS 服务器 2"
-#: network/netconnect.pm:1173
+#: network/netconnect.pm:1269
#, c-format
msgid "DNS server 3"
msgstr "DNS 服务器 3"
-#: network/netconnect.pm:1174
+#: network/netconnect.pm:1270
#, c-format
msgid "Search domain"
msgstr "搜索网域"
-#: network/netconnect.pm:1175
+#: network/netconnect.pm:1271
#, c-format
msgid "By default search domain will be set from the fully-qualified host name"
-msgstr "默认情况下,搜索域名将会根据完全限定的主机名进行设定"
+msgstr "默认情况下, 搜索域名将会根据完全限定的主机名进行设定"
-#: network/netconnect.pm:1176
+#: network/netconnect.pm:1272
#, c-format
msgid "Gateway (e.g. %s)"
msgstr "网关(如 %s)"
-#: network/netconnect.pm:1178
+#: network/netconnect.pm:1274
#, c-format
msgid "Gateway device"
msgstr "网关设备"
-#: network/netconnect.pm:1187
+#: network/netconnect.pm:1283
#, c-format
msgid "DNS server address should be in format 1.2.3.4"
msgstr "DNS 服务器的格式应该是 1.2.3.4"
-#: network/netconnect.pm:1192 standalone/drakconnect:651
+#: network/netconnect.pm:1288 standalone/drakconnect:652
#, c-format
msgid "Gateway address should be in format 1.2.3.4"
msgstr "网关地址的格式应该是 1.2.3.4"
-#: network/netconnect.pm:1203
+#: network/netconnect.pm:1299
#, c-format
msgid ""
"If desired, enter a Zeroconf hostname.\n"
@@ -10500,21 +10737,21 @@ msgid ""
"its shared resources that are not managed by the network.\n"
"It is not necessary on most networks."
msgstr ""
-"如果需要的话,输入 Zeroconf 主机名。\n"
+"如果需要的话, 输入 Zeroconf 主机名。\n"
"这将被您的计算机用于通知其未被网络管理的共享资源。\n"
"大多数网络中不需要此设置。"
-#: network/netconnect.pm:1207
+#: network/netconnect.pm:1303
#, c-format
msgid "Zeroconf Host name"
msgstr "Zeroconf 主机名"
-#: network/netconnect.pm:1210
+#: network/netconnect.pm:1306
#, c-format
msgid "Zeroconf host name must not contain a ."
msgstr "Zeroconf 主机名不能包含“.”"
-#: network/netconnect.pm:1220
+#: network/netconnect.pm:1316
#, c-format
msgid ""
"You have configured multiple ways to connect to the Internet.\n"
@@ -10525,52 +10762,52 @@ msgstr ""
"选择您要使用的一种。\n"
"\n"
-#: network/netconnect.pm:1222
+#: network/netconnect.pm:1318
#, c-format
msgid "Internet connection"
msgstr "Internet 连接"
-#: network/netconnect.pm:1230
+#: network/netconnect.pm:1326
#, c-format
msgid "Configuration is complete, do you want to apply settings?"
-msgstr "配置完成,您想要应用设置吗?"
+msgstr "配置完成, 您想要应用设置吗?"
-#: network/netconnect.pm:1240
+#: network/netconnect.pm:1336
#, c-format
msgid "Do you want to start the connection at boot?"
-msgstr "您是否希望一开机就启动连接?"
+msgstr "您是否希望一开机就启动连接?"
-#: network/netconnect.pm:1258
+#: network/netconnect.pm:1354
#, c-format
msgid "Automatically at boot"
msgstr "开机时自动启动"
-#: network/netconnect.pm:1260
+#: network/netconnect.pm:1356
#, c-format
msgid "By using Net Applet in the system tray"
msgstr "使用系统脱盘中的网络小程序"
-#: network/netconnect.pm:1262
+#: network/netconnect.pm:1358
#, c-format
msgid "Manually (the interface would still be activated at boot)"
msgstr "手动(启动时仍会激活网卡)"
-#: network/netconnect.pm:1271
+#: network/netconnect.pm:1367
#, c-format
msgid "How do you want to dial this connection?"
-msgstr "您想要如何拨打此连接?"
+msgstr "您想要如何拨打此连接?"
-#: network/netconnect.pm:1284
+#: network/netconnect.pm:1380
#, c-format
msgid "The network needs to be restarted. Do you want to restart it?"
-msgstr "网络需要重新启动。您要重新启动吗?"
+msgstr "网络需要重新启动。您要重新启动吗?"
-#: network/netconnect.pm:1291 network/netconnect.pm:1356
+#: network/netconnect.pm:1387 network/netconnect.pm:1452
#, c-format
msgid "Network Configuration"
msgstr "网络配置"
-#: network/netconnect.pm:1292
+#: network/netconnect.pm:1388
#, c-format
msgid ""
"A problem occurred while restarting the network: \n"
@@ -10581,54 +10818,54 @@ msgstr ""
"\n"
"%s"
-#: network/netconnect.pm:1300
+#: network/netconnect.pm:1396
#, c-format
msgid "Do you want to try to connect to the Internet now?"
-msgstr "您想要测试连接到 Internet 吗?"
+msgstr "您想要测试连接到 Internet 吗?"
-#: network/netconnect.pm:1308 standalone/drakconnect:1029
+#: network/netconnect.pm:1404 standalone/drakconnect:1028
#, c-format
msgid "Testing your connection..."
msgstr "正在测试您的连接..."
-#: network/netconnect.pm:1324
+#: network/netconnect.pm:1420
#, c-format
msgid "The system is now connected to the Internet."
msgstr "您的系统现在正连接到 Internet。"
-#: network/netconnect.pm:1325
+#: network/netconnect.pm:1421
#, c-format
msgid "For security reasons, it will be disconnected now."
-msgstr "由于安全原因,现在将断开连接。"
+msgstr "由于安全原因, 现在将断开连接。"
-#: network/netconnect.pm:1326
+#: network/netconnect.pm:1422
#, c-format
msgid ""
-"The system doesn't seem to be connected to the Internet.\n"
+"The system does not seem to be connected to the Internet.\n"
"Try to reconfigure your connection."
msgstr ""
"看来系统没有连接到 Internet。\n"
"请重新尝试配置您的连接。"
-#: network/netconnect.pm:1343
+#: network/netconnect.pm:1439
#, 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:1344
+#: network/netconnect.pm:1440
#, c-format
msgid ""
"Problems occurred during configuration.\n"
-"Test your connection via net_monitor or mcc. If your connection doesn't "
+"Test your connection via net_monitor or mcc. If your connection does not "
"work, you might want to relaunch the configuration."
msgstr ""
"配置过程中出现错误。\n"
-"请从网络监视器或者控制中心测试您的连接。如果您的连接不工作,您可能想要重新配"
+"请从网络监视器或者控制中心测试您的连接。如果您的连接不工作, 您可能想要重新配"
"置。"
-#: network/netconnect.pm:1357
+#: network/netconnect.pm:1453
#, c-format
msgid ""
"Because you are doing a network installation, your network is already "
@@ -10636,10 +10873,10 @@ msgid ""
"Click on Ok to keep your configuration, or cancel to reconfigure your "
"Internet & Network connection.\n"
msgstr ""
-"由于您正在执行网络安装,您的网络已经配置好了。\n"
-"单击“确定”保存配置,或“取消”重新配置网络。\n"
+"由于您正在执行网络安装, 您的网络已经配置好了。\n"
+"单击“确定”保存配置, 或“取消”重新配置网络。\n"
-#: network/netconnect.pm:1393
+#: network/netconnect.pm:1491
#, c-format
msgid ""
"An unexpected error has happened:\n"
@@ -10648,44 +10885,44 @@ msgstr ""
"发生了意外错误: \n"
"%s"
-#: network/network.pm:316
+#: network/network.pm:319
#, c-format
msgid "Proxies configuration"
msgstr "代理服务器配置"
-#: network/network.pm:317
+#: network/network.pm:320
#, c-format
msgid "HTTP proxy"
msgstr "HTTP 代理服务器"
-#: network/network.pm:318
+#: network/network.pm:321
#, c-format
msgid "FTP proxy"
msgstr "FTP 代理服务器"
-#: network/network.pm:321
+#: network/network.pm:324
#, c-format
msgid "Proxy should be http://..."
msgstr "代理服务器应该是 http://..."
-#: network/network.pm:322
+#: network/network.pm:325
#, c-format
msgid "URL should begin with 'ftp:' or 'http:'"
msgstr "URL 应该是以“ftp:”或“http:”开头"
-#: network/shorewall.pm:28
+#: network/shorewall.pm:25
#, c-format
msgid "Firewalling configuration detected!"
msgstr "发现防火墙配置!"
-#: network/shorewall.pm:29
+#: network/shorewall.pm:26
#, c-format
msgid ""
"Warning! An existing firewalling configuration has been detected. You may "
"need some manual fixes after installation."
msgstr "警告!发现原来的配置利用了防火墙功能。您可能需要在安装之后手工修改。"
-#: network/shorewall.pm:78 standalone/drakgw:220 standalone/drakvpn:214
+#: network/shorewall.pm:91 standalone/drakgw:217 standalone/drakvpn:214
#, c-format
msgid ""
"Please enter the name of the interface connected to the internet.\n"
@@ -10698,65 +10935,65 @@ msgstr ""
"请输入连接到互联网的网卡名称。\n"
"\n"
"例如:\n"
-"\t\tppp+ 代表调制解调器或 DSL 连接,\n"
-"\t\teth0 或 eth1 代表有线电视连接,\n"
+"\t\tppp+ 代表调制解调器或 DSL 连接, \n"
+"\t\teth0 或 eth1 代表有线电视连接, \n"
"\t\tippp+ 代表 ISDN 连接。\n"
-#: network/tools.pm:197
+#: network/tools.pm:181
#, c-format
msgid "Insert floppy"
msgstr "插入软盘"
-#: network/tools.pm:198
+#: network/tools.pm:182
#, c-format
msgid ""
"Insert a FAT formatted floppy in drive %s with %s in root directory and "
"press %s"
msgstr ""
-"请在驱动器 %s 中插入一张 FAT 格式的软盘,该软盘要求在根目录有 %s。然后,请按 "
+"请在驱动器 %s 中插入一张 FAT 格式的软盘, 该软盘要求在根目录有 %s。然后, 请按 "
"%s"
-#: network/tools.pm:199
+#: network/tools.pm:187
#, c-format
msgid "Floppy access error, unable to mount device %s"
-msgstr "软驱访问错误,无法挂载 %s"
+msgstr "软驱访问错误, 无法挂载 %s"
-#: partition_table.pm:393
+#: partition_table.pm:397
#, c-format
msgid "mount failed: "
msgstr "挂载失败: "
-#: partition_table.pm:498
+#: partition_table.pm:502
#, c-format
msgid "Extended partition not supported on this platform"
msgstr "这个平台上不支持扩展分区"
-#: partition_table.pm:516
+#: partition_table.pm:520
#, c-format
msgid ""
-"You have a hole in your partition table but I can't use it.\n"
+"You have a hole in your partition table but I can not use it.\n"
"The only solution is to move your primary partitions to have the hole next "
"to the extended partitions."
msgstr ""
-"分区表里有一段是空的,可是我没法使用它。\n"
-"唯一的办法是移动您的主分区,把空闲部分换到与扩展分区相邻的位置。"
+"分区表里有一段是空的, 可是我没法使用它。\n"
+"唯一的办法是移动您的主分区, 把空闲部分换到与扩展分区相邻的位置。"
-#: partition_table.pm:602
+#: partition_table.pm:611
#, c-format
msgid "Restoring from file %s failed: %s"
msgstr "从文件 %s 恢复失败: %s"
-#: partition_table.pm:604
+#: partition_table.pm:613
#, c-format
msgid "Bad backup file"
msgstr "错误的备份文件"
-#: partition_table.pm:624
+#: partition_table.pm:633
#, c-format
msgid "Error writing to file %s"
msgstr "写入文件 %s 出错"
-#: partition_table/raw.pm:238
+#: partition_table/raw.pm:240
#, c-format
msgid ""
"Something bad is happening on your drive. \n"
@@ -10766,7 +11003,7 @@ msgid ""
msgstr ""
"您的硬盘有严重问题。\n"
"一次数据完整性检查失败了。\n"
-"这意味着,如果继续往硬盘里写入任何东西,硬盘将可能随时坏掉,损坏数据"
+"这意味着, 如果继续往硬盘里写入任何东西, 硬盘将可能随时坏掉, 损坏数据"
#: pkgs.pm:23
#, c-format
@@ -10803,7 +11040,7 @@ msgstr "(在 %s)"
msgid "(on this machine)"
msgstr "(在本机上)"
-#: printer/cups.pm:115 standalone/printerdrake:203
+#: printer/cups.pm:115 standalone/printerdrake:187
#, c-format
msgid "Configured on other machines"
msgstr "已在其它计算机上配置"
@@ -10813,60 +11050,60 @@ msgstr "已在其它计算机上配置"
msgid "On CUPS server \"%s\""
msgstr "在 CUPS 服务器“%s”"
-#: printer/cups.pm:117 printer/printerdrake.pm:4290
-#: printer/printerdrake.pm:4300 printer/printerdrake.pm:4445
-#: printer/printerdrake.pm:4456 printer/printerdrake.pm:4651
+#: printer/cups.pm:117 printer/printerdrake.pm:4650
+#: printer/printerdrake.pm:4660 printer/printerdrake.pm:4805
+#: printer/printerdrake.pm:4816 printer/printerdrake.pm:5011
#, c-format
msgid " (Default)"
msgstr "(默认)"
-#: printer/data.pm:40
+#: printer/data.pm:56
#, c-format
-msgid "PDQ - Print, Don't Queue"
-msgstr "PDQ - 打印,不排队"
+msgid "PDQ - Print, Do not Queue"
+msgstr "PDQ - 打印, 不排队"
-#: printer/data.pm:41
+#: printer/data.pm:57
#, c-format
msgid "PDQ"
msgstr "PDQ"
-#: printer/data.pm:53
+#: printer/data.pm:69
#, c-format
msgid "LPD - Line Printer Daemon"
msgstr "LPD - 行式打印向导"
-#: printer/data.pm:54
+#: printer/data.pm:70
#, c-format
msgid "LPD"
msgstr "LPD"
-#: printer/data.pm:76
+#: printer/data.pm:91
#, c-format
msgid "LPRng - LPR New Generation"
msgstr "LPRng - 新一代 LPR"
-#: printer/data.pm:77
+#: printer/data.pm:92
#, c-format
msgid "LPRng"
msgstr "LPRng"
-#: printer/data.pm:103
+#: printer/data.pm:117
#, c-format
msgid "CUPS - Common Unix Printing System"
msgstr "CUPS - 公共 Unix 打印系统"
-#: printer/data.pm:132
+#: printer/data.pm:147
#, c-format
msgid "CUPS - Common Unix Printing System (remote server)"
msgstr "CUPS - 公共 Unix 打印系统(远程服务器)"
-#: printer/data.pm:133
+#: printer/data.pm:148
#, c-format
msgid "Remote CUPS"
msgstr "远程 CUPS"
-#: printer/detect.pm:149 printer/detect.pm:227 printer/detect.pm:429
-#: printer/detect.pm:466
+#: printer/detect.pm:153 printer/detect.pm:236 printer/detect.pm:438
+#: printer/detect.pm:475
#, c-format
msgid "Unknown Model"
msgstr "未知型号"
@@ -10886,7 +11123,7 @@ msgstr "远程打印机"
msgid "Printer on remote CUPS server"
msgstr "远程 CUPS 服务器的打印机"
-#: printer/main.pm:30 printer/printerdrake.pm:1521
+#: printer/main.pm:30 printer/printerdrake.pm:1628
#, c-format
msgid "Printer on remote lpd server"
msgstr "远程 lpd 服务器的打印机"
@@ -10906,7 +11143,7 @@ msgstr "SMB/Windows 95/98/NT 服务器上的打印机"
msgid "Printer on NetWare server"
msgstr "NetWare 服务器上的打印机"
-#: printer/main.pm:34 printer/printerdrake.pm:1525
+#: printer/main.pm:34 printer/printerdrake.pm:1632
#, c-format
msgid "Enter a printer device URI"
msgstr "输入打印机设备 URI"
@@ -10916,192 +11153,238 @@ msgstr "输入打印机设备 URI"
msgid "Pipe job into a command"
msgstr "作业管道定向到命令"
-#: printer/main.pm:321 printer/main.pm:604 printer/main.pm:1635
-#: printer/main.pm:2331 printer/main.pm:2340 printer/printerdrake.pm:874
-#: printer/printerdrake.pm:1981 printer/printerdrake.pm:4688
+#. Translation of the "(recommended)" in printer driver entries
+#: printer/main.pm:45
+#, c-format
+msgid "recommended"
+msgstr "建议"
+
+#: printer/main.pm:324 printer/main.pm:629 printer/main.pm:1664
+#: printer/main.pm:2699 printer/main.pm:2708 printer/printerdrake.pm:903
+#: printer/printerdrake.pm:2094 printer/printerdrake.pm:5048
#, c-format
msgid "Unknown model"
msgstr "未知型号"
-#: printer/main.pm:346 standalone/printerdrake:202
+#: printer/main.pm:349 standalone/printerdrake:186
#, c-format
msgid "Configured on this machine"
msgstr "已在本机上配置"
-#: printer/main.pm:352 printer/printerdrake.pm:1069
+#: printer/main.pm:355 printer/printerdrake.pm:1175
#, c-format
msgid " on parallel port #%s"
msgstr " 位于并行口 #%s"
-#: printer/main.pm:355 printer/printerdrake.pm:1072
+#: printer/main.pm:358 printer/printerdrake.pm:1178
#, c-format
msgid ", USB printer #%s"
-msgstr ",USB 打印机 #%s"
+msgstr ", USB 打印机 #%s"
-#: printer/main.pm:357
+#: printer/main.pm:360
#, c-format
msgid ", USB printer"
-msgstr ",USB 打印机"
+msgstr ", USB 打印机"
+
+#: printer/main.pm:364
+#, c-format
+msgid ", HP printer on a parallel port"
+msgstr ",并行端口上的惠普打印机"
+
+#: printer/main.pm:366
+#, c-format
+msgid ", HP printer on USB"
+msgstr ", USB 上的惠普打印机"
+
+#: printer/main.pm:368
+#, c-format
+msgid ", HP printer on HP JetDirect"
+msgstr ", HP JetDirect 上的惠普打印机"
+
+#: printer/main.pm:370
+#, c-format
+msgid ", HP printer"
+msgstr ", 惠普打印机"
-#: printer/main.pm:362
+#: printer/main.pm:376
#, c-format
msgid ", multi-function device on parallel port #%s"
-msgstr ",并行端口上的一体机 #%s"
+msgstr ", 并行端口上的一体机 #%s"
-#: printer/main.pm:365
+#: printer/main.pm:379
#, c-format
msgid ", multi-function device on a parallel port"
-msgstr ",并行端口上的一体机"
+msgstr ", 并行端口上的一体机"
-#: printer/main.pm:367
+#: printer/main.pm:381
#, c-format
msgid ", multi-function device on USB"
-msgstr ",USB 端口上的一体机"
+msgstr ", USB 端口上的一体机"
-#: printer/main.pm:369
+#: printer/main.pm:383
#, c-format
msgid ", multi-function device on HP JetDirect"
-msgstr ",HP JetDirect 上的一体机"
+msgstr ", HP JetDirect 上的一体机"
-#: printer/main.pm:371
+#: printer/main.pm:385
#, c-format
msgid ", multi-function device"
-msgstr ",一体机"
+msgstr ", 一体机"
-#: printer/main.pm:375
+#: printer/main.pm:389
#, c-format
msgid ", printing to %s"
-msgstr ",打印到 %s"
+msgstr ", 打印到 %s"
-#: printer/main.pm:378
+#: printer/main.pm:392
#, c-format
msgid " on LPD server \"%s\", printer \"%s\""
msgstr "LPD 服务器“%s”上的打印机“%s”"
-#: printer/main.pm:381
+#: printer/main.pm:395
#, c-format
msgid ", TCP/IP host \"%s\", port %s"
-msgstr ",TCP/IP 主机“%s”,端口 %s"
+msgstr ", TCP/IP 主机“%s”, 端口 %s"
-#: printer/main.pm:386
+#: printer/main.pm:400
#, c-format
msgid " on SMB/Windows server \"%s\", share \"%s\""
msgstr "SMB/Windows 服务器“%s”上的共享“%s”"
-#: printer/main.pm:391
+#: printer/main.pm:405
#, c-format
msgid " on Novell server \"%s\", printer \"%s\""
msgstr "Novell 打印服务器“%s”上的打印机“%s”"
-#: printer/main.pm:394
+#: printer/main.pm:408
#, c-format
msgid ", using command %s"
-msgstr ",使用命令 %s"
+msgstr ", 使用命令 %s"
-#: printer/main.pm:409
+#: printer/main.pm:423
#, c-format
msgid "Parallel port #%s"
msgstr "并行端口 #%s"
-#: printer/main.pm:412 printer/printerdrake.pm:1090
-#: printer/printerdrake.pm:1117 printer/printerdrake.pm:1135
+#: printer/main.pm:426 printer/printerdrake.pm:1196
+#: printer/printerdrake.pm:1223 printer/printerdrake.pm:1241
#, c-format
msgid "USB printer #%s"
msgstr "USB 打印机 #%s"
-#: printer/main.pm:414
+#: printer/main.pm:428
#, c-format
msgid "USB printer"
msgstr "USB 打印机"
-#: printer/main.pm:419
+#: printer/main.pm:432
+#, c-format
+msgid "HP printer on a parallel port"
+msgstr "并行端口上的惠普打印机"
+
+#: printer/main.pm:434
+#, c-format
+msgid "HP printer on USB"
+msgstr "USB 上的惠普打印机"
+
+#: printer/main.pm:436
+#, c-format
+msgid "HP printer on HP JetDirect"
+msgstr "HP JetDirect 上的惠普打印机"
+
+#: printer/main.pm:438
+#, c-format
+msgid "HP printer"
+msgstr "惠普打印机"
+
+#: printer/main.pm:444
#, c-format
msgid "Multi-function device on parallel port #%s"
msgstr "并行端口 #%s 上的一体机"
-#: printer/main.pm:422
+#: printer/main.pm:447
#, c-format
msgid "Multi-function device on a parallel port"
msgstr "并行端口上的一体机"
-#: printer/main.pm:424
+#: printer/main.pm:449
#, c-format
msgid "Multi-function device on USB"
msgstr "USB 端口上的一体机"
-#: printer/main.pm:426
+#: printer/main.pm:451
#, c-format
msgid "Multi-function device on HP JetDirect"
msgstr "HP JetDirect 上的一体机"
-#: printer/main.pm:428
+#: printer/main.pm:453
#, c-format
msgid "Multi-function device"
msgstr "一体机"
-#: printer/main.pm:432
+#: printer/main.pm:457
#, c-format
msgid "Prints into %s"
msgstr "打印到 %s"
-#: printer/main.pm:435
+#: printer/main.pm:460
#, c-format
msgid "LPD server \"%s\", printer \"%s\""
msgstr "LPD 服务器“%s”上的打印机“%s”"
-#: printer/main.pm:438
+#: printer/main.pm:463
#, c-format
msgid "TCP/IP host \"%s\", port %s"
-msgstr "TCP/IP 主机“%s”,端口 %s"
+msgstr "TCP/IP 主机“%s”, 端口 %s"
-#: printer/main.pm:443
+#: printer/main.pm:468
#, c-format
msgid "SMB/Windows server \"%s\", share \"%s\""
msgstr "SMB/Windows 服务器“%s”上的共享“%s”"
-#: printer/main.pm:448
+#: printer/main.pm:473
#, c-format
msgid "Novell server \"%s\", printer \"%s\""
msgstr "Novell 服务器“%s”上的打印机“%s”"
-#: printer/main.pm:451
+#: printer/main.pm:476
#, c-format
msgid "Uses command %s"
msgstr "使用命令 %s"
-#: printer/main.pm:453
+#: printer/main.pm:478
#, c-format
msgid "URI: %s"
msgstr "URI: %s"
-#: printer/main.pm:601 printer/printerdrake.pm:820
-#: printer/printerdrake.pm:2584
+#: printer/main.pm:626 printer/printerdrake.pm:849
+#: printer/printerdrake.pm:2861
#, c-format
msgid "Raw printer (No driver)"
msgstr "直接打印输出(不使用驱动程序)"
-#: printer/main.pm:1147 printer/printerdrake.pm:205
+#: printer/main.pm:1176 printer/printerdrake.pm:205
#: printer/printerdrake.pm:217
#, c-format
msgid "Local network(s)"
msgstr "局域网"
-#: printer/main.pm:1149 printer/printerdrake.pm:221
+#: printer/main.pm:1178 printer/printerdrake.pm:221
#, c-format
msgid "Interface \"%s\""
msgstr "网卡“%s”"
-#: printer/main.pm:1151
+#: printer/main.pm:1180
#, c-format
msgid "Network %s"
msgstr "网络 %s"
-#: printer/main.pm:1153
+#: printer/main.pm:1182
#, c-format
msgid "Host %s"
msgstr "主机 %s"
-#: printer/main.pm:1182
+#: printer/main.pm:1211
#, c-format
msgid "%s (Port %s)"
msgstr "%s(端口 %s)"
@@ -11118,9 +11401,9 @@ msgid ""
"and uploaded whenever the printer is connected and turned on.\n"
msgstr ""
"惠普 LaserJet 1000 需要在开机之前先上传固件。请您从惠普的网站上下载 Windows "
-"驱动程序包(打印机光盘上的固件无效),并从中提取固件文件。只需用“unzip”一类的工"
-"具从自解压的“.exe”文件打开,然后找到“sihp1000.img”文件。将此文件复制到“/etc/"
-"printer”目录中。这样该文件就会被自动上传脚本发现,从而在打印机开机时会被自动"
+"驱动程序包(打印机光盘上的固件无效), 并从中提取固件文件。只需用“unzip”一类的工"
+"具从自解压的“.exe”文件打开, 然后找到“sihp1000.img”文件。将此文件复制到“/etc/"
+"printer”目录中。这样该文件就会被自动上传脚本发现, 从而在打印机开机时会被自动"
"上传到打印机中。\n"
#: printer/printerdrake.pm:61
@@ -11134,7 +11417,7 @@ msgid ""
"Here you can choose whether the printers connected to this machine should be "
"accessible by remote machines and by which remote machines."
msgstr ""
-"您可以在此选择是否将连接到本机的打印机共享给远程计算机,以及共享给哪些计算"
+"您可以在此选择是否将连接到本机的打印机共享给远程计算机, 以及共享给哪些计算"
"机。"
#: printer/printerdrake.pm:63
@@ -11164,8 +11447,8 @@ msgstr "在主机/网络上共享打印机:"
msgid "Custom configuration"
msgstr "自定义配置"
-#: printer/printerdrake.pm:83 standalone/scannerdrake:562
-#: standalone/scannerdrake:579
+#: printer/printerdrake.pm:83 standalone/scannerdrake:593
+#: standalone/scannerdrake:610
#, c-format
msgid "No remote machines"
msgstr "没有远程计算机"
@@ -11187,10 +11470,10 @@ msgid ""
"address(es) and optionally the port number(s) here to get the printer "
"information from the server(s)."
msgstr ""
-"要访问局域网中远程 CUPS 服务器上的打印机,您只需打开“自动查找远程计算机上\n"
+"要访问局域网中远程 CUPS 服务器上的打印机, 您只需打开“自动查找远程计算机上\n"
"可用的打印机”选项;CUPS 服务器会自动通知您的计算机有关打印机的信息。目前\n"
"您计算机上可用的打印机都会列在“Drak 打印机”的“远程打印机”栏中。如果您\n"
-"的 CUPS 服务器不在您的局域网中,您就需要在此输入 IP 地址以及可选的端口号,\n"
+"的 CUPS 服务器不在您的局域网中, 您就需要在此输入 IP 地址以及可选的端口号, \n"
"这样才能获得服务器的打印机信息。"
#: printer/printerdrake.pm:109
@@ -11209,10 +11492,10 @@ msgid ""
"print Japanese text on a printer set up on a remote machine, you have to "
"activate this function on that remote machine."
msgstr ""
-"打开此选项将允许打印用日语写成的纯文本文件。除非您真的想要打印日文,否则请不"
-"要使用此功能。因为一旦该功能被激活,您将再也无法打印拉丁字体中的重音字符,您"
-"也不能调整页边距、字符大小,等等。此设置只影响定义在本地的打印机。如果您想要"
-"在远程打印机上打印日文,您就必须在远程打印机上激活此功能。"
+"打开此选项将允许打印用日语写成的纯文本文件。除非您真的想要打印日文, 否则请不"
+"要使用此功能。因为一旦该功能被激活, 您将再也无法打印拉丁字体中的重音字符, 您"
+"也不能调整页边距、字符大小, 等等。此设置只影响定义在本地的打印机。如果您想要"
+"在远程打印机上打印日文, 您就必须在远程打印机上激活此功能。"
#: printer/printerdrake.pm:117
#, c-format
@@ -11235,19 +11518,19 @@ msgid ""
"If some of these measures lead to problems for you, turn this option off, "
"but then you have to take care of these points."
msgstr ""
-"如果打开此选项,每次 CUPS 启动时都会自动保证:\n"
+"如果打开此选项, 每次 CUPS 启动时都会自动保证:\n"
"\n"
-"- 如果 LPD/LPRng 已经安装,则 CUPS 不会覆盖 /etc/printcap\n"
+"- 如果 LPD/LPRng 已经安装, 则 CUPS 不会覆盖 /etc/printcap\n"
"\n"
-"- 如果没有 /etc/cups/cupsd.conf,则会创建一个新的\n"
+"- 如果没有 /etc/cups/cupsd.conf, 则会创建一个新的\n"
"\n"
-"- 如果打印机信息是广播的,就不会以“localhost”作为服务器名。\n"
+"- 如果打印机信息是广播的, 就不会以“localhost”作为服务器名。\n"
"\n"
-"如果这些措施中有什么对您造成问题,请将此选项关闭,但是那样您必须自己想办法处"
+"如果这些措施中有什么对您造成问题, 请将此选项关闭, 但是那样您必须自己想办法处"
"理上述几点。"
#: printer/printerdrake.pm:132 printer/printerdrake.pm:500
-#: printer/printerdrake.pm:3933
+#: printer/printerdrake.pm:4292
#, c-format
msgid "Remote CUPS server and no local CUPS daemon"
msgstr "远程 CUPS 服务器且无本地 CUPS 守护程序"
@@ -11271,9 +11554,9 @@ msgid ""
"define local print queues then and if the specified server is down it cannot "
"be printed at all from this machine."
msgstr ""
-"在此模式中,将会停止本地 CUPS 守护程序,而全部打印请求将会直接传送给下面指定"
-"的服务器。请注意,您以后将无法定义本地打印队列,而且如果指定的服务器宕机的"
-"话,将无法通过本机打印。"
+"在此模式中, 将会停止本地 CUPS 守护程序, 而全部打印请求将会直接传送给下面指定"
+"的服务器。请注意, 您以后将无法定义本地打印队列, 而且如果指定的服务器宕机的"
+"话, 将无法通过本机打印。"
#: printer/printerdrake.pm:155 printer/printerdrake.pm:230
#, c-format
@@ -11334,7 +11617,7 @@ msgstr "正确 IP 地址的例子: \n"
#: printer/printerdrake.pm:271
#, c-format
msgid "This host/network is already in the list, it cannot be added again.\n"
-msgstr "此主机/网络已经位于列表中,无法再次添加。\n"
+msgstr "此主机/网络已经位于列表中, 无法再次添加。\n"
#: printer/printerdrake.pm:340 printer/printerdrake.pm:410
#, c-format
@@ -11349,7 +11632,7 @@ msgid ""
"local network."
msgstr ""
"在此添加您想要使用的打印机所属 CUPS 服务器。除非服务器未将其打印机信息广播到"
-"局域网上,否则您无需提供此信息。"
+"局域网上, 否则您无需提供此信息。"
#: printer/printerdrake.pm:352
#, c-format
@@ -11374,7 +11657,7 @@ msgstr "请输入您想使用的打印机所在主机的 IP 地址和端口。"
#: printer/printerdrake.pm:412
#, c-format
msgid "If no port is given, 631 will be taken as default."
-msgstr "如果没有给出端口,默认将会使用 631。"
+msgstr "如果没有给出端口, 默认将会使用 631。"
#: printer/printerdrake.pm:416
#, c-format
@@ -11386,7 +11669,7 @@ msgstr "缺少服务器 IP!"
msgid "The entered IP is not correct.\n"
msgstr "输入的 IP 不正确。\n"
-#: printer/printerdrake.pm:434 printer/printerdrake.pm:1744
+#: printer/printerdrake.pm:434 printer/printerdrake.pm:1852
#, c-format
msgid "The port number should be an integer!"
msgstr "端口须为数字!"
@@ -11394,10 +11677,10 @@ msgstr "端口须为数字!"
#: printer/printerdrake.pm:445
#, c-format
msgid "This server is already in the list, it cannot be added again.\n"
-msgstr "此服务器已经位于列表中,无法再次添加。\n"
+msgstr "此服务器已经位于列表中, 无法再次添加。\n"
-#: printer/printerdrake.pm:456 printer/printerdrake.pm:1765
-#: standalone/drakups:247 standalone/harddrake2:47
+#: printer/printerdrake.pm:456 printer/printerdrake.pm:1873
+#: standalone/drakups:247 standalone/harddrake2:50
#, c-format
msgid "Port"
msgstr "端口"
@@ -11407,42 +11690,43 @@ msgstr "端口"
#: printer/printerdrake.pm:530
#, c-format
msgid "On, Name or IP of remote server:"
-msgstr "开,远程服务器的名称或 IP 地址:"
+msgstr "开, 远程服务器的名称或 IP 地址:"
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:3942
-#: printer/printerdrake.pm:4007
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:4301
+#: printer/printerdrake.pm:4366
#, c-format
msgid "CUPS server name or IP address missing."
msgstr "缺少 CUPS 服务器名称或 IP 地址。"
#: printer/printerdrake.pm:560 printer/printerdrake.pm:580
-#: printer/printerdrake.pm:649 printer/printerdrake.pm:714
-#: printer/printerdrake.pm:741 printer/printerdrake.pm:796
-#: printer/printerdrake.pm:838 printer/printerdrake.pm:848
-#: printer/printerdrake.pm:1818 printer/printerdrake.pm:2004
-#: printer/printerdrake.pm:2021 printer/printerdrake.pm:2064
-#: printer/printerdrake.pm:2104 printer/printerdrake.pm:2147
-#: printer/printerdrake.pm:2184 printer/printerdrake.pm:2194
-#: printer/printerdrake.pm:2437 printer/printerdrake.pm:2442
-#: printer/printerdrake.pm:2579 printer/printerdrake.pm:2689
-#: printer/printerdrake.pm:3247 printer/printerdrake.pm:3312
-#: printer/printerdrake.pm:3361 printer/printerdrake.pm:3364
-#: printer/printerdrake.pm:3484 printer/printerdrake.pm:3549
-#: printer/printerdrake.pm:3621 printer/printerdrake.pm:3642
-#: printer/printerdrake.pm:3651 printer/printerdrake.pm:3745
-#: printer/printerdrake.pm:3837 printer/printerdrake.pm:3843
-#: printer/printerdrake.pm:3863 printer/printerdrake.pm:3969
-#: printer/printerdrake.pm:4076 printer/printerdrake.pm:4095
-#: printer/printerdrake.pm:4104 printer/printerdrake.pm:4117
-#: printer/printerdrake.pm:4313 printer/printerdrake.pm:4749
-#: printer/printerdrake.pm:4826 standalone/printerdrake:64
-#: standalone/printerdrake:84 standalone/printerdrake:566
+#: printer/printerdrake.pm:673 printer/printerdrake.pm:739
+#: printer/printerdrake.pm:766 printer/printerdrake.pm:825
+#: printer/printerdrake.pm:867 printer/printerdrake.pm:877
+#: printer/printerdrake.pm:1926 printer/printerdrake.pm:2137
+#: printer/printerdrake.pm:2169 printer/printerdrake.pm:2217
+#: printer/printerdrake.pm:2269 printer/printerdrake.pm:2286
+#: printer/printerdrake.pm:2330 printer/printerdrake.pm:2370
+#: printer/printerdrake.pm:2420 printer/printerdrake.pm:2454
+#: printer/printerdrake.pm:2464 printer/printerdrake.pm:2714
+#: printer/printerdrake.pm:2719 printer/printerdrake.pm:2856
+#: printer/printerdrake.pm:2966 printer/printerdrake.pm:3560
+#: printer/printerdrake.pm:3625 printer/printerdrake.pm:3674
+#: printer/printerdrake.pm:3677 printer/printerdrake.pm:3808
+#: printer/printerdrake.pm:3908 printer/printerdrake.pm:3980
+#: printer/printerdrake.pm:4001 printer/printerdrake.pm:4010
+#: printer/printerdrake.pm:4104 printer/printerdrake.pm:4196
+#: printer/printerdrake.pm:4202 printer/printerdrake.pm:4222
+#: printer/printerdrake.pm:4328 printer/printerdrake.pm:4435
+#: printer/printerdrake.pm:4454 printer/printerdrake.pm:4463
+#: printer/printerdrake.pm:4477 printer/printerdrake.pm:4673
+#: printer/printerdrake.pm:5109 printer/printerdrake.pm:5186
+#: standalone/printerdrake:67 standalone/printerdrake:554
#, c-format
msgid "Printerdrake"
msgstr "Drak 打印机"
-#: printer/printerdrake.pm:561 printer/printerdrake.pm:3550
-#: printer/printerdrake.pm:4077
+#: printer/printerdrake.pm:561 printer/printerdrake.pm:3909
+#: printer/printerdrake.pm:4436
#, c-format
msgid "Reading printer data..."
msgstr "正在读取打印机数据..."
@@ -11452,17 +11736,17 @@ msgstr "正在读取打印机数据..."
msgid "Restarting CUPS..."
msgstr "正在重新启动 CUPS..."
-#: printer/printerdrake.pm:606
+#: printer/printerdrake.pm:608 printer/printerdrake.pm:628
#, c-format
msgid "Select Printer Connection"
msgstr "选择打印机连接"
-#: printer/printerdrake.pm:607
+#: printer/printerdrake.pm:609
#, c-format
msgid "How is the printer connected?"
-msgstr "打印机是如何连接的?"
+msgstr "打印机是如何连接的?"
-#: printer/printerdrake.pm:609
+#: printer/printerdrake.pm:611
#, c-format
msgid ""
"\n"
@@ -11472,7 +11756,7 @@ msgstr ""
"\n"
"不需要在这里配置远程的 CUPS 服务器上的打印机;这些打印机会被自动探测到。"
-#: printer/printerdrake.pm:612 printer/printerdrake.pm:4315
+#: printer/printerdrake.pm:614 printer/printerdrake.pm:4675
#, c-format
msgid ""
"\n"
@@ -11480,30 +11764,53 @@ msgid ""
"detected nor tested!"
msgstr ""
"\n"
-"警告:没有激活的局域网连接,远程打印机既没法检测也没法测试!"
+"警告:没有激活的局域网连接, 远程打印机既没法检测也没法测试!"
-#: printer/printerdrake.pm:619
+#: printer/printerdrake.pm:621
#, c-format
msgid ""
"Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
-msgstr "打印机自动检测(本地,TCP/Socket、SMB 打印机和设备 URI)"
+msgstr "打印机自动检测(本地, TCP/Socket、SMB 打印机和设备 URI)"
+
+#: printer/printerdrake.pm:623
+#, c-format
+msgid "Modify timeout for network printer auto-detection"
+msgstr ""
-#: printer/printerdrake.pm:649
+#: printer/printerdrake.pm:629
+#, c-format
+msgid "Enter the timeout for network printer auto-detection (in msec) here. "
+msgstr ""
+
+#: printer/printerdrake.pm:631
+#, c-format
+msgid ""
+"The longer you choose the timeout, the more reliable the detections of "
+"network printers will be, but the scan can take longer then, especially if "
+"there are many machines with local firewalls in the network. "
+msgstr ""
+
+#: printer/printerdrake.pm:635
+#, fuzzy, c-format
+msgid "The timeout must be a positive integer number!"
+msgstr "选项 %s 必须是整数!"
+
+#: printer/printerdrake.pm:673
#, c-format
msgid "Checking your system..."
msgstr "正在检查您的系统..."
-#: printer/printerdrake.pm:665
+#: printer/printerdrake.pm:690
#, c-format
msgid "and one unknown printer"
msgstr "和一台未知的打印机"
-#: printer/printerdrake.pm:667
+#: printer/printerdrake.pm:692
#, c-format
msgid "and %d unknown printers"
msgstr "和 %d 台未知的打印机"
-#: printer/printerdrake.pm:671
+#: printer/printerdrake.pm:696
#, c-format
msgid ""
"The following printers\n"
@@ -11516,7 +11823,7 @@ msgstr ""
"%s%s\n"
"直接连接在您的系统"
-#: printer/printerdrake.pm:673
+#: printer/printerdrake.pm:698
#, c-format
msgid ""
"The following printer\n"
@@ -11529,7 +11836,7 @@ msgstr ""
"%s%s\n"
"直接连接在您的系统"
-#: printer/printerdrake.pm:674
+#: printer/printerdrake.pm:699
#, c-format
msgid ""
"The following printer\n"
@@ -11542,7 +11849,7 @@ msgstr ""
"%s%s\n"
"直接连接在您的系统"
-#: printer/printerdrake.pm:678
+#: printer/printerdrake.pm:703
#, c-format
msgid ""
"\n"
@@ -11551,7 +11858,7 @@ msgstr ""
"\n"
"有一个未知的打印机直接连接在您的系统"
-#: printer/printerdrake.pm:679
+#: printer/printerdrake.pm:704
#, c-format
msgid ""
"\n"
@@ -11560,84 +11867,84 @@ msgstr ""
"\n"
"有 %d 个未知的打印机直接连接在您的系统"
-#: printer/printerdrake.pm:682
+#: printer/printerdrake.pm:707
#, c-format
msgid ""
"There are no printers found which are directly connected to your machine"
msgstr "没有发现打印机直接连接在您的机器上"
-#: printer/printerdrake.pm:685
+#: printer/printerdrake.pm:710
#, c-format
msgid " (Make sure that all your printers are connected and turned on).\n"
msgstr "(请确认您的打印机已经连接好并且接通了电源)。\n"
-#: printer/printerdrake.pm:698
+#: printer/printerdrake.pm:723
#, c-format
msgid ""
"Do you want to enable printing on the printers mentioned above or on "
"printers in the local network?\n"
-msgstr "您想激活上述打印机的打印功能,还是要使用本地网络的打印机来打印?\n"
+msgstr "您想激活上述打印机的打印功能, 还是要使用本地网络的打印机来打印?\n"
-#: printer/printerdrake.pm:699
+#: printer/printerdrake.pm:724
#, c-format
msgid "Do you want to enable printing on printers in the local network?\n"
-msgstr "您想使用本地网络的打印机来打印吗?\n"
+msgstr "您想使用本地网络的打印机来打印吗?\n"
-#: printer/printerdrake.pm:701
+#: printer/printerdrake.pm:726
#, c-format
msgid "Do you want to enable printing on the printers mentioned above?\n"
-msgstr "您是否希望在上述的打印机上进行打印?\n"
+msgstr "您是否希望在上述的打印机上进行打印?\n"
-#: printer/printerdrake.pm:702
+#: printer/printerdrake.pm:727
#, c-format
msgid "Are you sure that you want to set up printing on this machine?\n"
-msgstr "您确定要在这台机器上设置打印吗?\n"
+msgstr "您确定要在这台机器上设置打印吗?\n"
-#: printer/printerdrake.pm:703
+#: printer/printerdrake.pm:728
#, c-format
msgid ""
"NOTE: Depending on the printer model and the printing system up to %d MB of "
"additional software will be installed."
msgstr ""
-"注意:根据不同的打印机型号和打印系统,需要安装附加的软件,最多会需要 %d MB 空"
+"注意:根据不同的打印机型号和打印系统, 需要安装附加的软件, 最多会需要 %d MB 空"
"间。"
-#: printer/printerdrake.pm:742
+#: printer/printerdrake.pm:767
#, c-format
msgid "Searching for new printers..."
msgstr "正在搜索新的打印机..."
-#: printer/printerdrake.pm:797
+#: printer/printerdrake.pm:826
#, c-format
msgid "Found printer on %s..."
msgstr "在 %s 上找到了打印机..."
-#: printer/printerdrake.pm:822
+#: printer/printerdrake.pm:851
#, c-format
msgid "("
msgstr "("
-#: printer/printerdrake.pm:823
+#: printer/printerdrake.pm:852
#, c-format
msgid " on "
msgstr " 位于 "
-#: printer/printerdrake.pm:824 standalone/scannerdrake:137
+#: printer/printerdrake.pm:853 standalone/scannerdrake:137
#, c-format
msgid ")"
msgstr ")"
-#: printer/printerdrake.pm:829 printer/printerdrake.pm:2591
+#: printer/printerdrake.pm:858 printer/printerdrake.pm:2868
#, c-format
msgid "Printer model selection"
msgstr "打印机型号选择"
-#: printer/printerdrake.pm:830 printer/printerdrake.pm:2592
+#: printer/printerdrake.pm:859 printer/printerdrake.pm:2869
#, c-format
msgid "Which printer model do you have?"
-msgstr "您的打印机的型号是什么?"
+msgstr "您的打印机的型号是什么?"
-#: printer/printerdrake.pm:831
+#: printer/printerdrake.pm:860
#, c-format
msgid ""
"\n"
@@ -11649,31 +11956,32 @@ msgstr ""
"\n"
"“Drak 打印机”无法确定您的打印机 %s 是什么型号的。请从列表中选择正确的型号。"
-#: printer/printerdrake.pm:834 printer/printerdrake.pm:2597
+#: printer/printerdrake.pm:863 printer/printerdrake.pm:2874
#, c-format
msgid ""
"If your printer is not listed, choose a compatible (see printer manual) or a "
"similar one."
-msgstr "如果您的打印机不在列表中,请选择兼容的(参考打印机手册)或类似的型号。"
+msgstr "如果您的打印机不在列表中, 请选择兼容的(参考打印机手册)或类似的型号。"
-#: printer/printerdrake.pm:839
+#: printer/printerdrake.pm:868
#, c-format
msgid "Configuring printer on %s..."
msgstr "正在配置位于 %s 上的打印机..."
-#: printer/printerdrake.pm:849 printer/printerdrake.pm:4096
+#: printer/printerdrake.pm:878 printer/printerdrake.pm:4455
#, c-format
msgid "Configuring printer \"%s\"..."
msgstr "正在配置打印机“%s”..."
-#: printer/printerdrake.pm:932 printer/printerdrake.pm:944
-#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1987
-#: printer/printerdrake.pm:4332 printer/printerdrake.pm:4501
+#: printer/printerdrake.pm:1036 printer/printerdrake.pm:1048
+#: printer/printerdrake.pm:1107 printer/printerdrake.pm:2103
+#: printer/printerdrake.pm:2118 printer/printerdrake.pm:2188
+#: printer/printerdrake.pm:4692 printer/printerdrake.pm:4861
#, c-format
msgid "Add a new printer"
msgstr "添加新打印机"
-#: printer/printerdrake.pm:933
+#: printer/printerdrake.pm:1037
#, c-format
msgid ""
"\n"
@@ -11689,12 +11997,12 @@ msgstr ""
"\n"
"欢迎使用打印机设置向导\n"
"\n"
-"此向导允许您安装本地或远程打印机,以便在本机或网络上的其它计算机上使用。\n"
+"此向导允许您安装本地或远程打印机, 以便在本机或网络上的其它计算机上使用。\n"
"\n"
-"它会询问所有必要的信息以进行打印机设置,并允许您访问所有可用的打印机驱动程"
+"它会询问所有必要的信息以进行打印机设置, 并允许您访问所有可用的打印机驱动程"
"序、驱动程序选项和打印机连接类型。"
-#: printer/printerdrake.pm:946
+#: printer/printerdrake.pm:1050
#, c-format
msgid ""
"\n"
@@ -11709,8 +12017,8 @@ msgid ""
"\n"
"Note that auto-detecting printers on the network takes longer than the auto-"
"detection of only the printers connected to this machine. So turn off the "
-"auto-detection of network and/or Windows-hosted printers when you don't need "
-"it.\n"
+"auto-detection of network and/or Windows-hosted printers when you do not "
+"need it.\n"
"\n"
" Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want "
"to set up your printer(s) now."
@@ -11718,18 +12026,18 @@ msgstr ""
"\n"
"欢迎使用打印机设置向导\n"
"\n"
-"本向导将帮助您安装您的打印机,不论打印机是直接连接在本机上,还是直接连接在网"
-"络,甚至是接在远程的 Windows 机器上。\n"
+"本向导将帮助您安装您的打印机, 不论打印机是直接连接在本机上, 还是直接连接在网"
+"络, 甚至是接在远程的 Windows 机器上。\n"
"\n"
-"请连接好本地打印机并打开本地打印机的电源,这样系统才能自动检测到。同时,您的"
+"请连接好本地打印机并打开本地打印机的电源, 这样系统才能自动检测到。同时, 您的"
"网络打印机和 Windows 打印机也必须连接好并打开电源。\n"
"\n"
-"注意自动检测网络上的打印机比检测连接在本机的打印机所花时间要长。所以,如果您"
-"不需要,请关闭对网络打印机或 Windows 打印机的自动检测。\n"
+"注意自动检测网络上的打印机比检测连接在本机的打印机所花时间要长。所以, 如果您"
+"不需要, 请关闭对网络打印机或 Windows 打印机的自动检测。\n"
"\n"
-"一切准备就绪后请单击“下一步”。如果您不想现在设置打印机,请单击“取消”。"
+"一切准备就绪后请单击“下一步”。如果您不想现在设置打印机, 请单击“取消”。"
-#: printer/printerdrake.pm:955
+#: printer/printerdrake.pm:1059
#, c-format
msgid ""
"\n"
@@ -11749,11 +12057,11 @@ msgstr ""
"\n"
"本向导将帮助您安装连接在本机上的打印机。\n"
"\n"
-"请插入并打开本地打印机的电源,这样系统才能自动检测到。\n"
+"请插入并打开本地打印机的电源, 这样系统才能自动检测到。\n"
"\n"
-"一切准备就绪后请单击“下一步”。如果您不想现在设置打印机,请单击“取消”。"
+"一切准备就绪后请单击“下一步”。如果您不想现在设置打印机, 请单击“取消”。"
-#: printer/printerdrake.pm:963
+#: printer/printerdrake.pm:1067
#, c-format
msgid ""
"\n"
@@ -11768,7 +12076,7 @@ msgid ""
"\n"
"Note that auto-detecting printers on the network takes longer than the auto-"
"detection of only the printers connected to this machine. So turn off the "
-"auto-detection of network printers when you don't need it.\n"
+"auto-detection of network printers when you do not need it.\n"
"\n"
" Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want "
"to set up your printer(s) now."
@@ -11776,18 +12084,18 @@ msgstr ""
"\n"
"欢迎使用打印机设置向导\n"
"\n"
-"本向导将帮助您安装您的打印机,不论打印机是直接连接在本机上,还是直接连接在网"
+"本向导将帮助您安装您的打印机, 不论打印机是直接连接在本机上, 还是直接连接在网"
"络上。\n"
"\n"
-"请连接好并打开本地打印机的电源,这样系统才能自动检测到。同样,您的网络打印机"
+"请连接好并打开本地打印机的电源, 这样系统才能自动检测到。同样, 您的网络打印机"
"也必须连接好并打开电源。\n"
"\n"
-"注意自动检测网络上的打印机比检测连接在本机的打印机所花时间要长。所以,如果您"
-"不需要,请关闭对网络打印机或 Windows 打印机的自动检测。\n"
+"注意自动检测网络上的打印机比检测连接在本机的打印机所花时间要长。所以, 如果您"
+"不需要, 请关闭对网络打印机或 Windows 打印机的自动检测。\n"
"\n"
-"一切准备就绪后请单击“下一步”。如果您不想现在设置打印机,请单击“取消”。"
+"一切准备就绪后请单击“下一步”。如果您不想现在设置打印机, 请单击“取消”。"
-#: printer/printerdrake.pm:972
+#: printer/printerdrake.pm:1076
#, c-format
msgid ""
"\n"
@@ -11807,27 +12115,27 @@ msgstr ""
"\n"
"这个向导将帮助您配置连接在这台电脑的打印机。\n"
"\n"
-"如果您的打印机直接连在这台电脑,请把它(们)插接到这台电脑并打开电源,这样才能"
+"如果您的打印机直接连在这台电脑, 请把它(们)插接到这台电脑并打开电源, 这样才能"
"对它(们)进行自动检测。\n"
"\n"
-"准备好就单击“下一步”,如果您不想现在配置打印机就单击“取消”。"
+"准备好就单击“下一步”, 如果您不想现在配置打印机就单击“取消”。"
-#: printer/printerdrake.pm:981
+#: printer/printerdrake.pm:1085
#, c-format
msgid "Auto-detect printers connected to this machine"
msgstr "自动探测这台机器连接的打印机"
-#: printer/printerdrake.pm:984
+#: printer/printerdrake.pm:1088
#, c-format
msgid "Auto-detect printers connected directly to the local network"
msgstr "自动探测直接连接到本地网络的打印机"
-#: printer/printerdrake.pm:987
+#: printer/printerdrake.pm:1091
#, c-format
msgid "Auto-detect printers connected to machines running Microsoft Windows"
msgstr "自动探测运行 Microsoft Windows 的机器连接的打印机"
-#: printer/printerdrake.pm:1003
+#: printer/printerdrake.pm:1108
#, c-format
msgid ""
"\n"
@@ -11841,77 +12149,78 @@ msgid ""
"select \"Printer\" in the \"Hardware\" section of the %s Control Center."
msgstr ""
"\n"
-"恭喜,您的打印机已经安装好并配置完成了!\n"
+"恭喜, 您的打印机已经安装好并配置完成了!\n"
"\n"
"您已经可以使用应用程序的“打印”命令(通常在“文件”菜单里)来打印文件了。\n"
"\n"
-"如果以后要添加、删除打印机,改变打印机名字,或者需要修改默认打印参数(送纸器、"
-"输出质量等),请在“%s 控制中心”的“硬件”部分选择“打印机”。"
+"如果以后要添加、删除打印机, 改变打印机名字, 或者需要修改默认打印参数(送纸器、"
+"输出质量等), 请在“%s 控制中心”的“硬件”部分选择“打印机”。"
-#: printer/printerdrake.pm:1038 printer/printerdrake.pm:1267
-#: printer/printerdrake.pm:1329 printer/printerdrake.pm:1419
-#: printer/printerdrake.pm:1556 printer/printerdrake.pm:1631
-#: printer/printerdrake.pm:1782 printer/printerdrake.pm:1865
-#: printer/printerdrake.pm:1874 printer/printerdrake.pm:1883
-#: printer/printerdrake.pm:1894 printer/printerdrake.pm:2010
-#: printer/printerdrake.pm:2076 printer/printerdrake.pm:2111
+#: printer/printerdrake.pm:1143 printer/printerdrake.pm:1373
+#: printer/printerdrake.pm:1435 printer/printerdrake.pm:1525
+#: printer/printerdrake.pm:1663 printer/printerdrake.pm:1738
+#: printer/printerdrake.pm:1890 printer/printerdrake.pm:1976
+#: printer/printerdrake.pm:1985 printer/printerdrake.pm:1994
+#: printer/printerdrake.pm:2005 printer/printerdrake.pm:2143
+#: printer/printerdrake.pm:2229 printer/printerdrake.pm:2275
+#: printer/printerdrake.pm:2342 printer/printerdrake.pm:2377
#, c-format
msgid "Could not install the %s packages!"
msgstr "无法安装 %s 软件包!"
-#: printer/printerdrake.pm:1040
+#: printer/printerdrake.pm:1145
#, c-format
msgid "Skipping Windows/SMB server auto-detection"
msgstr "跳过 Windows/SMB 服务器自动检测"
-#: printer/printerdrake.pm:1046 printer/printerdrake.pm:1190
-#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
+#: printer/printerdrake.pm:1151 printer/printerdrake.pm:1296
+#: printer/printerdrake.pm:1531 printer/printerdrake.pm:1785
#, c-format
msgid "Printer auto-detection"
msgstr "打印机自动检测"
-#: printer/printerdrake.pm:1046
+#: printer/printerdrake.pm:1151
#, c-format
msgid "Detecting devices..."
msgstr "正在检测设备..."
-#: printer/printerdrake.pm:1075
+#: printer/printerdrake.pm:1181
#, c-format
msgid ", network printer \"%s\", port %s"
-msgstr ",网络打印机“%s”,端口 %s"
+msgstr ", 网络打印机“%s”, 端口 %s"
-#: printer/printerdrake.pm:1078
+#: printer/printerdrake.pm:1184
#, c-format
msgid ", printer \"%s\" on SMB/Windows server \"%s\""
msgstr ", 打印机“%s”在 SMB/Windows 服务器“%s” 上"
-#: printer/printerdrake.pm:1082
+#: printer/printerdrake.pm:1188
#, c-format
msgid "Detected %s"
msgstr "检测到 %s"
-#: printer/printerdrake.pm:1087 printer/printerdrake.pm:1114
-#: printer/printerdrake.pm:1132
+#: printer/printerdrake.pm:1193 printer/printerdrake.pm:1220
+#: printer/printerdrake.pm:1238
#, c-format
msgid "Printer on parallel port #%s"
msgstr "并行端口打印机 #%s"
-#: printer/printerdrake.pm:1093
+#: printer/printerdrake.pm:1199
#, c-format
msgid "Network printer \"%s\", port %s"
-msgstr "网络打印机“%s”,端口 %s"
+msgstr "网络打印机“%s”, 端口 %s"
-#: printer/printerdrake.pm:1096
+#: printer/printerdrake.pm:1202
#, c-format
msgid "Printer \"%s\" on SMB/Windows server \"%s\""
msgstr "打印机“%s”在 SMB/Windows 服务器打印机“%s”上"
-#: printer/printerdrake.pm:1177
+#: printer/printerdrake.pm:1283
#, c-format
msgid "Local Printer"
msgstr "本机打印机"
-#: printer/printerdrake.pm:1178
+#: printer/printerdrake.pm:1284
#, c-format
msgid ""
"No local printer found! To manually install a printer enter a device name/"
@@ -11920,67 +12229,67 @@ msgid ""
"printer: /dev/usb/lp1, ...)."
msgstr ""
"没有发现本地打印机!要手工设置打印机请在输入行写文件名/设备名(并行端口:/dev/"
-"lp0,/dev/lp1,...,相当于 LPT1:,LPT2:,...,第一个 USB 打印机:/dev/usb/"
-"lp0,第二个 USB 打印机:/dev/usb/lp1,...)。"
+"lp0, /dev/lp1, ..., 相当于 LPT1:, LPT2:, ..., 第一个 USB 打印机:/dev/usb/"
+"lp0, 第二个 USB 打印机:/dev/usb/lp1, ...)。"
-#: printer/printerdrake.pm:1182
+#: printer/printerdrake.pm:1288
#, c-format
msgid "You must enter a device or file name!"
msgstr "您需要输入打印机设备名或一文件名!"
-#: printer/printerdrake.pm:1191
+#: printer/printerdrake.pm:1297
#, c-format
msgid "No printer found!"
msgstr "没有发现打印机!"
-#: printer/printerdrake.pm:1199
+#: printer/printerdrake.pm:1305
#, c-format
msgid "Local Printers"
msgstr "本机打印机"
-#: printer/printerdrake.pm:1200
+#: printer/printerdrake.pm:1306
#, c-format
msgid "Available printers"
msgstr "可用打印机"
-#: printer/printerdrake.pm:1204 printer/printerdrake.pm:1213
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1319
#, c-format
msgid "The following printer was auto-detected. "
msgstr "下列打印机被自动检测到了。"
-#: printer/printerdrake.pm:1206
+#: printer/printerdrake.pm:1312
#, c-format
msgid ""
"If it is not the one you want to configure, enter a device name/file name in "
"the input line"
-msgstr "如果您要使用的打印机不在其中,请在输入栏输入一个设备名或文件名"
+msgstr "如果您要使用的打印机不在其中, 请在输入栏输入一个设备名或文件名"
-#: printer/printerdrake.pm:1207
+#: printer/printerdrake.pm:1313
#, c-format
msgid ""
"Alternatively, you can specify a device name/file name in the input line"
-msgstr "或者,您可以在输入行指定一个设备名/文件名"
+msgstr "或者, 您可以在输入行指定一个设备名/文件名"
-#: printer/printerdrake.pm:1208 printer/printerdrake.pm:1217
+#: printer/printerdrake.pm:1314 printer/printerdrake.pm:1323
#, c-format
msgid "Here is a list of all auto-detected printers. "
msgstr "下面所列为自动检测到的打印机"
-#: printer/printerdrake.pm:1210
+#: printer/printerdrake.pm:1316
#, c-format
msgid ""
"Please choose the printer you want to set up or enter a device name/file "
"name in the input line"
msgstr "请选择要设置的打印机或输入一个设备名或文件名到输入栏"
-#: printer/printerdrake.pm:1211
+#: printer/printerdrake.pm:1317
#, c-format
msgid ""
"Please choose the printer to which the print jobs should go or enter a "
"device name/file name in the input line"
-msgstr "请选择打印机的任务,或者输入一个设备名或文件名到输入栏"
+msgstr "请选择打印机的任务, 或者输入一个设备名或文件名到输入栏"
-#: printer/printerdrake.pm:1215
+#: printer/printerdrake.pm:1321
#, c-format
msgid ""
"The configuration of the printer will work fully automatically. If your "
@@ -11988,14 +12297,14 @@ msgid ""
"configuration, turn on \"Manual configuration\"."
msgstr ""
"打印机的设置会完全自动工作。如果您的打印机没有被正确检测或者您想定制打印机设"
-"置,选择“手工设置”。"
+"置, 选择“手工设置”。"
-#: printer/printerdrake.pm:1216
+#: printer/printerdrake.pm:1322
#, c-format
msgid "Currently, no alternative possibility is available"
-msgstr "现在,没有两种供选择的选项"
+msgstr "现在, 没有两种供选择的选项"
-#: printer/printerdrake.pm:1219
+#: printer/printerdrake.pm:1325
#, c-format
msgid ""
"Please choose the printer you want to set up. The configuration of the "
@@ -12004,119 +12313,119 @@ msgid ""
"\"Manual configuration\"."
msgstr ""
"请选择您希望设置的打印机。设置打印机将完全自动工作。如果您的打印机没有被正确"
-"检测或者您想定制打印机设置,选择“手工设置”。"
+"检测或者您想定制打印机设置, 选择“手工设置”。"
-#: printer/printerdrake.pm:1220
+#: printer/printerdrake.pm:1326
#, c-format
msgid "Please choose the printer to which the print jobs should go."
msgstr "请选择将执行任务的打印机。"
-#: printer/printerdrake.pm:1222
+#: printer/printerdrake.pm:1328
#, c-format
msgid ""
"Please choose the port that your printer is connected to or enter a device "
"name/file name in the input line"
msgstr "请选择您打印机使用的端口或输入栏内填入一合法设备或文件"
-#: printer/printerdrake.pm:1223
+#: printer/printerdrake.pm:1329
#, c-format
msgid "Please choose the port that your printer is connected to."
msgstr "请选择您的打印机是连接到哪个端口。"
-#: printer/printerdrake.pm:1225
+#: printer/printerdrake.pm:1331
#, c-format
msgid ""
" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
"1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
msgstr ""
-"(并行口: /dev/lp0,/dev/lp1,...,相当于 LPT1:,LPT2:,...,第一个 USB 设备"
-"口: /dev/usb/lp0,第二个 USB 设备口: /dev/usb/lp1,...)。"
+"(并行口: /dev/lp0, /dev/lp1, ..., 相当于 LPT1:, LPT2:, ..., 第一个 USB 设备"
+"口: /dev/usb/lp0, 第二个 USB 设备口: /dev/usb/lp1, ...)。"
-#: printer/printerdrake.pm:1229
+#: printer/printerdrake.pm:1335
#, c-format
msgid "You must choose/enter a printer/device!"
msgstr "您必须选择/输入一台打印机/设备!"
-#: printer/printerdrake.pm:1269 printer/printerdrake.pm:1331
-#: printer/printerdrake.pm:1421 printer/printerdrake.pm:1558
-#: printer/printerdrake.pm:1633 printer/printerdrake.pm:1784
-#: printer/printerdrake.pm:1867 printer/printerdrake.pm:1876
-#: printer/printerdrake.pm:1885 printer/printerdrake.pm:1896
+#: printer/printerdrake.pm:1375 printer/printerdrake.pm:1437
+#: printer/printerdrake.pm:1527 printer/printerdrake.pm:1665
+#: printer/printerdrake.pm:1740 printer/printerdrake.pm:1892
+#: printer/printerdrake.pm:1978 printer/printerdrake.pm:1987
+#: printer/printerdrake.pm:1996 printer/printerdrake.pm:2007
#, c-format
msgid "Aborting"
msgstr "中止"
-#: printer/printerdrake.pm:1304
+#: printer/printerdrake.pm:1410
#, c-format
msgid "Remote lpd Printer Options"
msgstr "远程 lpd 打印机选项"
-#: printer/printerdrake.pm:1305
+#: printer/printerdrake.pm:1411
#, c-format
msgid ""
"To use a remote lpd printer, you need to supply the hostname of the printer "
"server and the printer name on that server."
msgstr ""
-"要使用一个远程的 lpd 打印队列,您需要指定打印服务器的\n"
+"要使用一个远程的 lpd 打印队列, 您需要指定打印服务器的\n"
"主机名和打印任务要送往的打印队列的名字。"
-#: printer/printerdrake.pm:1306
+#: printer/printerdrake.pm:1412
#, c-format
msgid "Remote host name"
msgstr "远程主机名"
-#: printer/printerdrake.pm:1307
+#: printer/printerdrake.pm:1413
#, c-format
msgid "Remote printer name"
msgstr "远程打印机名"
-#: printer/printerdrake.pm:1310
+#: printer/printerdrake.pm:1416
#, c-format
msgid "Remote host name missing!"
msgstr "未找到远程主机!"
-#: printer/printerdrake.pm:1314
+#: printer/printerdrake.pm:1420
#, c-format
msgid "Remote printer name missing!"
msgstr "没有找到远程打印机!"
-#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
-#: standalone/drakTermServ:429 standalone/drakTermServ:726
-#: standalone/drakTermServ:742 standalone/drakTermServ:1405
-#: standalone/drakTermServ:1413 standalone/drakTermServ:1424
-#: standalone/drakbackup:513 standalone/drakbackup:619
-#: standalone/drakbackup:654 standalone/drakbackup:774
-#: standalone/harddrake2:237
+#: printer/printerdrake.pm:1449 printer/printerdrake.pm:2025
+#: standalone/drakTermServ:445 standalone/drakTermServ:747
+#: standalone/drakTermServ:764 standalone/drakTermServ:1480
+#: standalone/drakTermServ:1488 standalone/drakTermServ:1500
+#: standalone/drakbackup:512 standalone/drakbackup:618
+#: standalone/drakbackup:653 standalone/drakbackup:773
+#: standalone/harddrake2:256
#, c-format
msgid "Information"
msgstr "信息"
-#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
+#: printer/printerdrake.pm:1449 printer/printerdrake.pm:2025
#, c-format
msgid "Detected model: %s %s"
msgstr "检测到型号: %s %s"
-#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
+#: printer/printerdrake.pm:1531 printer/printerdrake.pm:1785
#, c-format
msgid "Scanning network..."
msgstr "正在扫描网络..."
-#: printer/printerdrake.pm:1436 printer/printerdrake.pm:1457
+#: printer/printerdrake.pm:1543 printer/printerdrake.pm:1564
#, c-format
msgid ", printer \"%s\" on server \"%s\""
-msgstr ",打印机“%s”在服务器“%s”上"
+msgstr ", 打印机“%s”在服务器“%s”上"
-#: printer/printerdrake.pm:1439 printer/printerdrake.pm:1460
+#: printer/printerdrake.pm:1546 printer/printerdrake.pm:1567
#, c-format
msgid "Printer \"%s\" on server \"%s\""
msgstr "服务器“%2$s”上的打印机“%1$s”"
-#: printer/printerdrake.pm:1481
+#: printer/printerdrake.pm:1588
#, c-format
msgid "SMB (Windows 9x/NT) Printer Options"
msgstr "SMB(Windows 9x/NT)打印机选项"
-#: printer/printerdrake.pm:1482
+#: printer/printerdrake.pm:1589
#, c-format
msgid ""
"To print to a SMB printer, you need to provide the SMB host name (Note! It "
@@ -12124,62 +12433,62 @@ msgid ""
"the print server, as well as the share name for the printer you wish to "
"access and any applicable user name, password, and workgroup information."
msgstr ""
-"如果您要使用的是 SMB 打印机(就是 Windows 9x/NT 网络共享打印机),\n"
+"如果您要使用的是 SMB 打印机(就是 Windows 9x/NT 网络共享打印机), \n"
"您需要说明主机的 SMB 名字(注意!是您在 Windows 网络\n"
-"邻居里看到的主机名,可能与它的 TCP/IP 主机名不同!),可能还需要它的 IP 地"
-"址,\n"
-"以及有权访问打印机的用户名,工作组和密码,当然还有打印机的共享名。"
+"邻居里看到的主机名, 可能与它的 TCP/IP 主机名不同!), 可能还需要它的 IP 地"
+"址, \n"
+"以及有权访问打印机的用户名, 工作组和密码, 当然还有打印机的共享名。"
-#: printer/printerdrake.pm:1483
+#: printer/printerdrake.pm:1590
#, c-format
msgid ""
" If the desired printer was auto-detected, simply choose it from the list "
"and then add user name, password, and/or workgroup if needed."
msgstr ""
-"如果自动检测发现了想要的打印机,只要从列表中选择它,然后添加用户名、密码,以"
+"如果自动检测发现了想要的打印机, 只要从列表中选择它, 然后添加用户名、密码, 以"
"及可能需要的网络组名。"
-#: printer/printerdrake.pm:1485
+#: printer/printerdrake.pm:1592
#, c-format
msgid "SMB server host"
msgstr "SMB 服务器主机"
-#: printer/printerdrake.pm:1486
+#: printer/printerdrake.pm:1593
#, c-format
msgid "SMB server IP"
msgstr "SMB 服务器 IP"
-#: printer/printerdrake.pm:1487
+#: printer/printerdrake.pm:1594
#, c-format
msgid "Share name"
msgstr "共享名"
-#: printer/printerdrake.pm:1490
+#: printer/printerdrake.pm:1597
#, c-format
msgid "Workgroup"
msgstr "工作组"
-#: printer/printerdrake.pm:1492
+#: printer/printerdrake.pm:1599
#, c-format
msgid "Auto-detected"
msgstr "自动检测到"
-#: printer/printerdrake.pm:1502
+#: printer/printerdrake.pm:1609
#, c-format
msgid "Either the server name or the server's IP must be given!"
msgstr "输入服务器名或服务器的IP!"
-#: printer/printerdrake.pm:1506
+#: printer/printerdrake.pm:1613
#, c-format
msgid "Samba share name missing!"
msgstr "缺少 Samba 共享名!"
-#: printer/printerdrake.pm:1512
+#: printer/printerdrake.pm:1619
#, c-format
msgid "SECURITY WARNING!"
msgstr "安全警告!"
-#: printer/printerdrake.pm:1513
+#: printer/printerdrake.pm:1620
#, c-format
msgid ""
"You are about to set up printing to a Windows account with password. Due to "
@@ -12202,21 +12511,21 @@ msgid ""
"type in Printerdrake.\n"
"\n"
msgstr ""
-"您将要配置使用 Windows 账户和密码的打印。由于 Samba 客户软件的体系缺陷,密码"
+"您将要配置使用 Windows 账户和密码的打印。由于 Samba 客户软件的体系缺陷, 密码"
"将以明文出现在 Samba 向 Windows 服务器发送打印任务的命令行中。所以这个系统的"
"所有用户都可以用下列命令看到密码:“ps auxwww”。\n"
"\n"
"我们建议您使用下面列出的替代方法之一(所有情况中您必须设法保证只有您的本地网络"
-"的计算机可以访问您的 Windows 服务器,例如使用防火墙):\n"
+"的计算机可以访问您的 Windows 服务器, 例如使用防火墙):\n"
"\n"
-"使用 Windows 服务器上没有密码的账户,如“GUEST”账户或者打印专用的账户。不要清"
-"除一个普通用户的密码保护,或者取消管理员用户的密码。\n"
+"使用 Windows 服务器上没有密码的账户, 如“GUEST”账户或者打印专用的账户。不要清"
+"除一个普通用户的密码保护, 或者取消管理员用户的密码。\n"
"\n"
"在您的 Windows 服务器上设置打印机支持 LPD 协议。然后在这个电脑上用打印机配置"
"向导按照“%s”连接方式配置打印机。\n"
"\n"
-#: printer/printerdrake.pm:1523
+#: printer/printerdrake.pm:1630
#, c-format
msgid ""
"Set up your Windows server to make the printer available under the IPP "
@@ -12228,7 +12537,7 @@ msgstr ""
"向导按照“%s”连接方式配置打印机。\n"
"\n"
-#: printer/printerdrake.pm:1526
+#: printer/printerdrake.pm:1633
#, c-format
msgid ""
"Connect your printer to a Linux server and let your Windows machine(s) "
@@ -12238,14 +12547,14 @@ msgid ""
msgstr ""
"把打印机连接到一个 Linux 服务器然后让 Windows 机器作为客户连接服务器。\n"
"\n"
-"您坚持要继续这样配置打印机吗?"
+"您坚持要继续这样配置打印机吗?"
-#: printer/printerdrake.pm:1604
+#: printer/printerdrake.pm:1711
#, c-format
msgid "NetWare Printer Options"
msgstr "NetWare 打印机选项"
-#: printer/printerdrake.pm:1605
+#: printer/printerdrake.pm:1712
#, c-format
msgid ""
"To print on a NetWare printer, you need to provide the NetWare print server "
@@ -12253,55 +12562,55 @@ msgid ""
"print queue name for the printer you wish to access and any applicable user "
"name and password."
msgstr ""
-"如果您要使用的是 NetWare 打印机,您需要说明主机的 NetWare 名字(注意!可能\n"
-"与它的 TCP/IP 主机名不同!),以及有权访问打印机的用户名和密码,当然还有打\n"
+"如果您要使用的是 NetWare 打印机, 您需要说明主机的 NetWare 名字(注意!可能\n"
+"与它的 TCP/IP 主机名不同!), 以及有权访问打印机的用户名和密码, 当然还有打\n"
"印机的打印队列名。"
-#: printer/printerdrake.pm:1606
+#: printer/printerdrake.pm:1713
#, c-format
msgid "Printer Server"
msgstr "打印机服务器"
-#: printer/printerdrake.pm:1607
+#: printer/printerdrake.pm:1714
#, c-format
msgid "Print Queue Name"
msgstr "打印队列名"
-#: printer/printerdrake.pm:1612
+#: printer/printerdrake.pm:1719
#, c-format
msgid "NCP server name missing!"
msgstr "NCP 服务器未找到"
-#: printer/printerdrake.pm:1616
+#: printer/printerdrake.pm:1723
#, c-format
msgid "NCP queue name missing!"
msgstr "NCP 队列名未找到!"
-#: printer/printerdrake.pm:1689 printer/printerdrake.pm:1709
+#: printer/printerdrake.pm:1797 printer/printerdrake.pm:1817
#, c-format
msgid ", host \"%s\", port %s"
-msgstr ",主机“%s”,端口 %s"
+msgstr ", 主机“%s”, 端口 %s"
-#: printer/printerdrake.pm:1692 printer/printerdrake.pm:1712
+#: printer/printerdrake.pm:1800 printer/printerdrake.pm:1820
#, c-format
msgid "Host \"%s\", port %s"
-msgstr "主机“%s”,端口 %s"
+msgstr "主机“%s”, 端口 %s"
-#: printer/printerdrake.pm:1733
+#: printer/printerdrake.pm:1841
#, c-format
msgid "TCP/Socket Printer Options"
msgstr "TCP/Socket 打印机选项"
-#: printer/printerdrake.pm:1735
+#: printer/printerdrake.pm:1843
#, c-format
msgid ""
"Choose one of the auto-detected printers from the list or enter the hostname "
"or IP and the optional port number (default is 9100) in the input fields."
msgstr ""
-"从自动检测到的打印机列表中选择一个,或者在输入域中输入主机名或 IP,以及可选的"
+"从自动检测到的打印机列表中选择一个, 或者在输入域中输入主机名或 IP, 以及可选的"
"端口号(默认是 9100)。"
-#: printer/printerdrake.pm:1736
+#: printer/printerdrake.pm:1844
#, c-format
msgid ""
"To print to a TCP or socket printer, you need to provide the host name or IP "
@@ -12309,31 +12618,31 @@ msgid ""
"JetDirect servers the port number is usually 9100, on other servers it can "
"vary. See the manual of your hardware."
msgstr ""
-"要打印到一台 TCP 或 socket 打印机,您需要提供打印机的主机名和可选的端口号码"
-"(默认是 9100)。HP JetDirect 打印服务器通常用端口 9100,其它服务器可能用其它的"
+"要打印到一台 TCP 或 socket 打印机, 您需要提供打印机的主机名和可选的端口号码"
+"(默认是 9100)。HP JetDirect 打印服务器通常用端口 9100, 其它服务器可能用其它的"
"端口。请查阅您的硬件手册。"
-#: printer/printerdrake.pm:1740
+#: printer/printerdrake.pm:1848
#, c-format
msgid "Printer host name or IP missing!"
msgstr "缺少打印机主机名或 IP 地址!"
-#: printer/printerdrake.pm:1763
+#: printer/printerdrake.pm:1871
#, c-format
msgid "Printer host name or IP"
msgstr "打印机主机名或 IP 地址"
-#: printer/printerdrake.pm:1819
+#: printer/printerdrake.pm:1927
#, c-format
msgid "Refreshing Device URI list..."
msgstr "正在刷新设备 URI 列表..."
-#: printer/printerdrake.pm:1822 printer/printerdrake.pm:1824
+#: printer/printerdrake.pm:1930 printer/printerdrake.pm:1932
#, c-format
msgid "Printer Device URI"
msgstr "打印机设备 URI"
-#: printer/printerdrake.pm:1823
+#: printer/printerdrake.pm:1931
#, c-format
msgid ""
"You can specify directly the URI to access the printer. The URI must fulfill "
@@ -12343,158 +12652,243 @@ msgstr ""
"您可以直接使用 URI 访问打印机。URI 必须符合 CUPS 或 Foomatic 规定。但注意不是"
"所有的打印队列(spooler)都支持 URI。"
-#: printer/printerdrake.pm:1846
+#: printer/printerdrake.pm:1957
#, c-format
msgid "A valid URI must be entered!"
msgstr "必须输入有效的 URI!"
-#: printer/printerdrake.pm:1949
+#: printer/printerdrake.pm:2060
#, c-format
msgid "Pipe into command"
msgstr "管道命令"
-#: printer/printerdrake.pm:1950
+#: printer/printerdrake.pm:2061
#, c-format
msgid ""
"Here you can specify any arbitrary command line into which the job should be "
"piped instead of being sent directly to a printer."
msgstr ""
-"您可在此指定任意的命令行,打印任务将通过该命令行构成的管道再送到打印机。"
+"您可在此指定任意的命令行, 打印任务将通过该命令行构成的管道再送到打印机。"
-#: printer/printerdrake.pm:1951
+#: printer/printerdrake.pm:2062
#, c-format
msgid "Command line"
msgstr "命令行"
-#: printer/printerdrake.pm:1955
+#: printer/printerdrake.pm:2066
#, c-format
msgid "A command line must be entered!"
msgstr "必须输入命令行!"
-#: printer/printerdrake.pm:1988
+#: printer/printerdrake.pm:2104
+#, c-format
+msgid ""
+"On many HP printers there are special functions available, maintenance (ink "
+"level checking, nozzle cleaning. head alignment, ...) on all not too old "
+"inkjets, scanning on multi-function devices, and memory card access on "
+"printers with card readers. "
+msgstr ""
+
+#: printer/printerdrake.pm:2106
+#, c-format
+msgid ""
+"To access these extra functions on your HP printer, it must be set up with "
+"the appropriate software: "
+msgstr ""
+
+#: printer/printerdrake.pm:2107
+#, c-format
+msgid ""
+"Either with the newer HPLIP which allows printer maintenance through the "
+"easy-to-use graphical application \"Toolbox\" and four-edge full-bleed on "
+"newer PhotoSmart models "
+msgstr ""
+
+#: printer/printerdrake.pm:2108
+#, c-format
+msgid ""
+"or with the older HPOJ which allows only scanner and memory card access, but "
+"could help you in case of failure of HPLIP. "
+msgstr ""
+
+#: printer/printerdrake.pm:2110
+#, c-format
+msgid "What is your choice (choose \"None\" for non-HP printers)? "
+msgstr ""
+
+#: printer/printerdrake.pm:2111 printer/printerdrake.pm:2112
+#: printer/printerdrake.pm:2138 printer/printerdrake.pm:2144
+#: printer/printerdrake.pm:2170
+#, c-format
+msgid "HPLIP"
+msgstr ""
+
+#: printer/printerdrake.pm:2111 printer/printerdrake.pm:2114
+#: printer/printerdrake.pm:2270 printer/printerdrake.pm:2276
+#: printer/printerdrake.pm:2287
+#, c-format
+msgid "HPOJ"
+msgstr ""
+
+#: printer/printerdrake.pm:2119
#, c-format
msgid ""
"Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
-"LaserJet 1100/1200/1220/3200/3300 with scanner, DeskJet 450, Sony IJP-V100), "
-"an HP PhotoSmart or an HP LaserJet 2200?"
+"LaserJet 1100/1200/1220/3000/3200/3300/4345 with scanner, DeskJet 450, Sony "
+"IJP-V100), an HP PhotoSmart or an HP LaserJet 2200?"
msgstr ""
-"您的打印机是否为惠普或索尼出品的一体机(OfficeJect,PSC,配备扫描仪的LaserJet "
-"1100/1200/1220/3200/3300,DeskJet 450, Sony IJP-V100),惠普 PhotoSmart 或 HP "
-"LaserJet 2200?"
+"您的打印机是否为惠普或索尼出品的一体机(OfficeJect, PSC, 配备扫描仪的LaserJet "
+"1100/1200/1220/3000/3200/3300/4345, DeskJet 450, Sony IJP-V100), 惠普 "
+"PhotoSmart 或 HP LaserJet 2200?"
-#: printer/printerdrake.pm:2005
+#: printer/printerdrake.pm:2138 printer/printerdrake.pm:2270
#, c-format
-msgid "Installing HPOJ package..."
-msgstr "正在安装 HPOJ 包..."
+msgid "Installing %s package..."
+msgstr "正在安装 %s 包..."
-#: printer/printerdrake.pm:2012
+#: printer/printerdrake.pm:2145 printer/printerdrake.pm:2277
#, c-format
msgid "Only printing will be possible on the %s."
msgstr "打印将只能在 %s 上进行。"
-#: printer/printerdrake.pm:2022 printer/printerdrake.pm:2148
+#: printer/printerdrake.pm:2160
#, c-format
-msgid "Checking device and configuring HPOJ..."
-msgstr "正在检查并配置 HPOJ..."
+msgid "Could not remove your old HPOJ configuration file %s for your %s! "
+msgstr ""
+
+#: printer/printerdrake.pm:2162
+#, c-format
+msgid "Please remove the file manually and restart HPOJ."
+msgstr ""
-#: printer/printerdrake.pm:2065
+#: printer/printerdrake.pm:2170 printer/printerdrake.pm:2287
+#, c-format
+msgid "Checking device and configuring %s..."
+msgstr "正在检查并配置 %s..."
+
+#: printer/printerdrake.pm:2189
+#, fuzzy, c-format
+msgid "Which printer do you want to set up with HPLIP?"
+msgstr "您将使用哪种协议?"
+
+#: printer/printerdrake.pm:2218 printer/printerdrake.pm:2331
#, c-format
msgid "Installing SANE packages..."
msgstr "正在安装 SANE 包..."
-#: printer/printerdrake.pm:2078
+#: printer/printerdrake.pm:2231 printer/printerdrake.pm:2344
#, c-format
msgid "Scanning on the %s will not be possible."
msgstr "不可能在 %s 上扫描。"
-#: printer/printerdrake.pm:2105
+#: printer/printerdrake.pm:2246
+#, c-format
+msgid "Using and Maintaining your %s"
+msgstr "使用并维护您的 %s"
+
+#: printer/printerdrake.pm:2371
#, c-format
msgid "Installing mtools packages..."
msgstr "正在安装 mtools 包..."
-#: printer/printerdrake.pm:2113
+#: printer/printerdrake.pm:2379
#, c-format
msgid "Photo memory card access on the %s will not be possible."
msgstr "%s 上的照片存储卡不可能访问。"
-#: printer/printerdrake.pm:2128
+#: printer/printerdrake.pm:2395
#, c-format
msgid "Scanning on your HP multi-function device"
msgstr "正在扫描您的惠普一体机"
-#: printer/printerdrake.pm:2136
+#: printer/printerdrake.pm:2404
#, c-format
msgid "Photo memory card access on your HP multi-function device"
msgstr "您的惠普一体机的照片存储卡访问"
-#: printer/printerdrake.pm:2185
+#: printer/printerdrake.pm:2421
+#, c-format
+msgid "Configuring device..."
+msgstr "正在配置设备..."
+
+#: printer/printerdrake.pm:2455
#, c-format
msgid "Making printer port available for CUPS..."
msgstr "正在配置打印机端口适用于 CUPS..."
-#: printer/printerdrake.pm:2194 printer/printerdrake.pm:2438
-#: printer/printerdrake.pm:2580
+#: printer/printerdrake.pm:2464 printer/printerdrake.pm:2715
+#: printer/printerdrake.pm:2857
#, c-format
msgid "Reading printer database..."
msgstr "正在读取打印机数据库..."
-#: printer/printerdrake.pm:2404
+#: printer/printerdrake.pm:2674
#, c-format
msgid "Enter Printer Name and Comments"
msgstr "输入打印机名称和注释"
-#: printer/printerdrake.pm:2408 printer/printerdrake.pm:3606
+#: printer/printerdrake.pm:2678 printer/printerdrake.pm:3965
#, c-format
msgid "Name of printer should contain only letters, numbers and the underscore"
msgstr "打印机名称可以包含字母、数字和下划线"
-#: printer/printerdrake.pm:2414 printer/printerdrake.pm:3611
+#: printer/printerdrake.pm:2684 printer/printerdrake.pm:3970
#, c-format
msgid ""
"The printer \"%s\" already exists,\n"
"do you really want to overwrite its configuration?"
msgstr ""
-"打印机“%s”已经存在,\n"
-"您真的想要覆盖其配置吗?"
+"打印机“%s”已经存在, \n"
+"您真的想要覆盖其配置吗?"
-#: printer/printerdrake.pm:2423
+#: printer/printerdrake.pm:2691
+#, c-format
+msgid ""
+"The printer name \"%s\" has more than 12 characters which can make the "
+"printer unaccessible from Windows clients. Do you really want to use this "
+"name?"
+msgstr ""
+"打印机名称“%s”多于十二个字符,这可能在 Windows 客户中使得打印机无法访问。您真"
+"的想要使用此名称吗?"
+
+#: printer/printerdrake.pm:2700
#, c-format
msgid ""
"Every printer needs a name (for example \"printer\"). The Description and "
"Location fields do not need to be filled in. They are comments for the users."
msgstr ""
-"每台打印机需要一个名字(如“printer”)。\n"
-"打印机描述和位置是可选项,它们仅仅供用户识别之用。"
+"每台打印机需要一个名字(如“printer”)。打印机描述和位置是可选项, 它们仅仅供用户"
+"识别之用。"
-#: printer/printerdrake.pm:2424
+#: printer/printerdrake.pm:2701
#, c-format
msgid "Name of printer"
msgstr "打印机名称"
-#: printer/printerdrake.pm:2425 standalone/drakconnect:568
-#: standalone/harddrake2:34 standalone/printerdrake:218
-#: standalone/printerdrake:225
+#: printer/printerdrake.pm:2702 standalone/drakconnect:570
+#: standalone/harddrake2:37 standalone/printerdrake:211
+#: standalone/printerdrake:218
#, c-format
msgid "Description"
msgstr "描述"
-#: printer/printerdrake.pm:2426 standalone/printerdrake:218
-#: standalone/printerdrake:225
+#: printer/printerdrake.pm:2703 standalone/printerdrake:211
+#: standalone/printerdrake:218
#, c-format
msgid "Location"
msgstr "位置"
-#: printer/printerdrake.pm:2443
+#: printer/printerdrake.pm:2720
#, c-format
msgid "Preparing printer database..."
msgstr "正在准备打印机数据..."
-#: printer/printerdrake.pm:2559
+#: printer/printerdrake.pm:2836
#, c-format
msgid "Your printer model"
msgstr "您的打印机型号"
-#: printer/printerdrake.pm:2560
+#: printer/printerdrake.pm:2837
#, c-format
msgid ""
"Printerdrake has compared the model name resulting from the printer auto-"
@@ -12509,26 +12903,26 @@ msgid ""
"%s"
msgstr ""
"“Drak 打印机”通过比较自动检测得到的打印机型号信息和它自己的打印机数据库中列出"
-"的型号以发现最接近的匹配。如果您的打印机没有列在数据库中,匹配结果可能是错"
-"的。请检查结果是否正确,如果是,请选择“型号正确”;否则,请选择“手工选择型"
-"号”,您就可以在下一屏手工选择打印机型号。\n"
+"的型号以发现最接近的匹配。如果您的打印机没有列在数据库中, 匹配结果可能是错"
+"的。请检查结果是否正确, 如果是, 请选择“型号正确”;否则, 请选择“手工选择型"
+"号”, 您就可以在下一屏手工选择打印机型号。\n"
"\n"
"“Drak 打印机”发现您的打印机是:\n"
"\n"
"%s"
-#: printer/printerdrake.pm:2565 printer/printerdrake.pm:2568
+#: printer/printerdrake.pm:2842 printer/printerdrake.pm:2845
#, c-format
msgid "The model is correct"
msgstr "型号正确"
-#: printer/printerdrake.pm:2566 printer/printerdrake.pm:2567
-#: printer/printerdrake.pm:2570
+#: printer/printerdrake.pm:2843 printer/printerdrake.pm:2844
+#: printer/printerdrake.pm:2847
#, c-format
msgid "Select model manually"
msgstr "手工选择型号"
-#: printer/printerdrake.pm:2593
+#: printer/printerdrake.pm:2870
#, c-format
msgid ""
"\n"
@@ -12540,104 +12934,104 @@ msgstr ""
"\n"
"\n"
"请检查“Drak 打印机”用自动检测选择的型号是否与您的打印机一致。如果选中的是不正"
-"确的型号或“原始打印机”,请从列表中选择正确的型号。"
+"确的型号或“原始打印机”, 请从列表中选择正确的型号。"
-#: printer/printerdrake.pm:2612
+#: printer/printerdrake.pm:2889
#, c-format
msgid "Install a manufacturer-supplied PPD file"
msgstr "安装制造商提供的 PPD 文件"
-#: printer/printerdrake.pm:2643
+#: printer/printerdrake.pm:2920
#, c-format
msgid ""
"Every PostScript printer is delivered with a PPD file which describes the "
"printer's options and features."
msgstr ""
-"每台 PostScript 打印机都随机赠送了一个 PPD 文件,其中描述了打印机的选项和特"
+"每台 PostScript 打印机都随机赠送了一个 PPD 文件, 其中描述了打印机的选项和特"
"性。"
-#: printer/printerdrake.pm:2644
+#: printer/printerdrake.pm:2921
#, c-format
msgid ""
"This file is usually somewhere on the CD with the Windows and Mac drivers "
"delivered with the printer."
msgstr "此文件通常位于随机的赠送的 Windows 和 Mac 驱动程序光盘中。"
-#: printer/printerdrake.pm:2645
+#: printer/printerdrake.pm:2922
#, c-format
msgid "You can find the PPD files also on the manufacturer's web sites."
msgstr "您还可以在制造商的网站找到 PPD 文件。"
-#: printer/printerdrake.pm:2646
+#: printer/printerdrake.pm:2923
#, c-format
msgid ""
"If you have Windows installed on your machine, you can find the PPD file on "
"your Windows partition, too."
msgstr ""
-"如果您的计算机上安装了 Windows,您也可以在您的 Windows 分区上找到 PPD 文件。"
+"如果您的计算机上安装了 Windows, 您也可以在您的 Windows 分区上找到 PPD 文件。"
-#: printer/printerdrake.pm:2647
+#: printer/printerdrake.pm:2924
#, c-format
msgid ""
"Installing the printer's PPD file and using it when setting up the printer "
"makes all options of the printer available which are provided by the "
"printer's hardware"
msgstr ""
-"在设置打印机时安装打印机的 PPD 文件并使用该文件,可充分发挥打印机硬件所提供的"
+"在设置打印机时安装打印机的 PPD 文件并使用该文件, 可充分发挥打印机硬件所提供的"
"全部功能"
-#: printer/printerdrake.pm:2648
+#: printer/printerdrake.pm:2925
#, c-format
msgid ""
"Here you can choose the PPD file to be installed on your machine, it will "
"then be used for the setup of your printer."
-msgstr "您可在此选择要安装到您计算机的 PPD 文件,该文件将用于设置打印机。"
+msgstr "您可在此选择要安装到您计算机的 PPD 文件, 该文件将用于设置打印机。"
-#: printer/printerdrake.pm:2650
+#: printer/printerdrake.pm:2927
#, c-format
msgid "Install PPD file from"
msgstr "安装 PPD 文件的来源"
-#: printer/printerdrake.pm:2653 printer/printerdrake.pm:2661
-#: standalone/scannerdrake:177 standalone/scannerdrake:186
-#: standalone/scannerdrake:236 standalone/scannerdrake:244
+#: printer/printerdrake.pm:2930 printer/printerdrake.pm:2938
+#: standalone/scannerdrake:183 standalone/scannerdrake:192
+#: standalone/scannerdrake:242 standalone/scannerdrake:250
#, c-format
msgid "Floppy Disk"
msgstr "软盘"
-#: printer/printerdrake.pm:2654 printer/printerdrake.pm:2663
-#: standalone/scannerdrake:178 standalone/scannerdrake:188
-#: standalone/scannerdrake:237 standalone/scannerdrake:246
+#: printer/printerdrake.pm:2931 printer/printerdrake.pm:2940
+#: standalone/scannerdrake:184 standalone/scannerdrake:194
+#: standalone/scannerdrake:243 standalone/scannerdrake:252
#, c-format
msgid "Other place"
msgstr "其它位置"
-#: printer/printerdrake.pm:2669
+#: printer/printerdrake.pm:2946
#, c-format
msgid "Select PPD file"
msgstr "选择 PPD 文件"
-#: printer/printerdrake.pm:2673
+#: printer/printerdrake.pm:2950
#, c-format
msgid "The PPD file %s does not exist or is unreadable!"
msgstr "PPD 文件 %s 不存在或者不可读!"
-#: printer/printerdrake.pm:2679
+#: printer/printerdrake.pm:2956
#, c-format
msgid "The PPD file %s does not conform with the PPD specifications!"
msgstr "PPD 文件 %s 不遵从 PPD 规范!"
-#: printer/printerdrake.pm:2690
+#: printer/printerdrake.pm:2967
#, c-format
msgid "Installing PPD file..."
msgstr "正在安装 PPD 文件..."
-#: printer/printerdrake.pm:2807
+#: printer/printerdrake.pm:3084
#, c-format
msgid "OKI winprinter configuration"
msgstr "OKI winprinter 打印机配置"
-#: printer/printerdrake.pm:2808
+#: printer/printerdrake.pm:3085
#, c-format
msgid ""
"You are configuring an OKI laser winprinter. These printers\n"
@@ -12647,17 +13041,17 @@ msgid ""
"first parallel port before you print a test page. Otherwise the printer will "
"not work. Your connection type setting will be ignored by the driver."
msgstr ""
-"您正在配置 OKI 激光打印机。由于这些打印机使用了特别的通讯协议,因此只能连接在"
-"第一个并行口。如果您连接到其他的端口或者打印服务器箱,请在您打印测试页时将其"
-"连接到第一个并行口上。否则,该打印机将不会工作。您的连接类型设置将会被驱动程"
+"您正在配置 OKI 激光打印机。由于这些打印机使用了特别的通讯协议, 因此只能连接在"
+"第一个并行口。如果您连接到其他的端口或者打印服务器箱, 请在您打印测试页时将其"
+"连接到第一个并行口上。否则, 该打印机将不会工作。您的连接类型设置将会被驱动程"
"序忽略。"
-#: printer/printerdrake.pm:2833 printer/printerdrake.pm:2863
+#: printer/printerdrake.pm:3110 printer/printerdrake.pm:3140
#, c-format
msgid "Lexmark inkjet configuration"
msgstr "利盟喷墨打印机设定"
-#: printer/printerdrake.pm:2834
+#: printer/printerdrake.pm:3111
#, c-format
msgid ""
"The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -12665,10 +13059,10 @@ msgid ""
"printer to a local port or configure it on the machine where it is connected "
"to."
msgstr ""
-"利盟提供的喷墨打印机驱动程序仅仅支持本地打印机,而非远程主机或打印服务箱上的"
-"打印机。请把打印机连接到您的本机端口,或者在连接了打印机的电脑上进行配置。"
+"利盟提供的喷墨打印机驱动程序仅仅支持本地打印机, 而非远程主机或打印服务箱上的"
+"打印机。请把打印机连接到您的本机端口, 或者在连接了打印机的电脑上进行配置。"
-#: printer/printerdrake.pm:2864
+#: printer/printerdrake.pm:3141
#, c-format
msgid ""
"To be able to print with your Lexmark inkjet and this configuration, you "
@@ -12682,16 +13076,16 @@ msgid ""
msgstr ""
"要配置利盟喷墨打印机需要从利盟网站(http://www.lexmark.com/)下载喷墨打印机驱动"
"程序。单击“Drivers”链接。然后挑选您的型号并选择“Linux”操作系统。驱动程序的形"
-"式有 RPM 包或带有互动式图形界面的脚本程序。如果您使用这个配置工具,就不必使用"
+"式有 RPM 包或带有互动式图形界面的脚本程序。如果您使用这个配置工具, 就不必使用"
"图形界面的安装程序。在许可协议之后直接按取消。用“lexmarkmaintain”命令打印喷头"
-"对齐测试页,然后用这个程序调节喷头对齐。"
+"对齐测试页, 然后用这个程序调节喷头对齐。"
-#: printer/printerdrake.pm:2874
+#: printer/printerdrake.pm:3151
#, c-format
msgid "Lexmark X125 configuration"
msgstr "利盟 X125 配置"
-#: printer/printerdrake.pm:2875
+#: printer/printerdrake.pm:3152
#, c-format
msgid ""
"The driver for this printer only supports printers locally connected via "
@@ -12699,15 +13093,15 @@ msgid ""
"your printer to a local USB port or configure it on the machine where it is "
"connected to."
msgstr ""
-"此打印的驱动程序只支持通过 USB 连接到本地的打印机,而非远程主机或打印服务器上"
-"的打印机。请把打印机连接到您的 USB 端口,或者在连接了打印机的电脑上进行配置。"
+"此打印的驱动程序只支持通过 USB 连接到本地的打印机, 而非远程主机或打印服务器上"
+"的打印机。请把打印机连接到您的 USB 端口, 或者在连接了打印机的电脑上进行配置。"
-#: printer/printerdrake.pm:2897
+#: printer/printerdrake.pm:3174
#, c-format
msgid "Samsung ML/QL-85G configuration"
msgstr "Samsung ML/QL-85G 配置"
-#: printer/printerdrake.pm:2898 printer/printerdrake.pm:2925
+#: printer/printerdrake.pm:3175 printer/printerdrake.pm:3202
#, c-format
msgid ""
"The driver for this printer only supports printers locally connected on the "
@@ -12715,21 +13109,21 @@ msgid ""
"on other parallel ports. Please connect your printer to the first parallel "
"port or configure it on the machine where it is connected to."
msgstr ""
-"此打印的驱动程序只支持通过第一个并口连接到本地的打印机,而非远程主机或打印服"
-"务器上或者其它并口的的打印机。请把打印机连接到您的第一个并口,或者在连接了打"
+"此打印的驱动程序只支持通过第一个并口连接到本地的打印机, 而非远程主机或打印服"
+"务器上或者其它并口的的打印机。请把打印机连接到您的第一个并口, 或者在连接了打"
"印机的电脑上进行配置。"
-#: printer/printerdrake.pm:2924
+#: printer/printerdrake.pm:3201
#, c-format
msgid "Canon LBP-460/660 configuration"
msgstr "Canon LBP-460/660 配置"
-#: printer/printerdrake.pm:2943
+#: printer/printerdrake.pm:3220
#, c-format
msgid "Firmware-Upload for HP LaserJet 1000"
msgstr "惠普 LaserJet 1000 的固件上载"
-#: printer/printerdrake.pm:3056
+#: printer/printerdrake.pm:3369
#, c-format
msgid ""
"Printer default settings\n"
@@ -12741,44 +13135,44 @@ msgid ""
msgstr ""
"打印机默认设置\n"
"\n"
-"您应该确定页面大小和墨水类型/打印模式(若可用)和激光打印机的硬件配置(内存,双"
-"工单元,托纸盘)设置正确。注意超高质量/分辨率打印可能会变得很慢。"
+"您应该确定页面大小和墨水类型/打印模式(若可用)和激光打印机的硬件配置(内存, 双"
+"工单元, 托纸盘)设置正确。注意超高质量/分辨率打印可能会变得很慢。"
-#: printer/printerdrake.pm:3181
+#: printer/printerdrake.pm:3494
#, c-format
msgid "Printer default settings"
msgstr "打印机默认设置"
-#: printer/printerdrake.pm:3188
+#: printer/printerdrake.pm:3501
#, c-format
msgid "Option %s must be an integer number!"
msgstr "选项 %s 必须是整数!"
-#: printer/printerdrake.pm:3192
+#: printer/printerdrake.pm:3505
#, c-format
msgid "Option %s must be a number!"
msgstr "选项 %s 必须是数字!"
-#: printer/printerdrake.pm:3196
+#: printer/printerdrake.pm:3509
#, c-format
msgid "Option %s out of range!"
msgstr "选项 %s 超出范围!"
-#: printer/printerdrake.pm:3247
+#: printer/printerdrake.pm:3560
#, c-format
msgid ""
"Do you want to set this printer (\"%s\")\n"
"as the default printer?"
msgstr ""
"您希望设置这个打印机(“%s”)\n"
-"作为默认打印机吗?"
+"作为默认打印机吗?"
-#: printer/printerdrake.pm:3262
+#: printer/printerdrake.pm:3575
#, c-format
msgid "Test pages"
msgstr "测试页"
-#: printer/printerdrake.pm:3263
+#: printer/printerdrake.pm:3576
#, c-format
msgid ""
"Please select the test pages you want to print.\n"
@@ -12790,57 +13184,52 @@ msgstr ""
"注意:在某些打印机上打印照片可能要花相当长的时间。\n"
"一般请选择标准测试页。"
-#: printer/printerdrake.pm:3267
+#: printer/printerdrake.pm:3580
#, c-format
msgid "No test pages"
msgstr "没有测试页"
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3581
#, c-format
msgid "Print"
msgstr "打印"
-#: printer/printerdrake.pm:3293
+#: printer/printerdrake.pm:3606
#, c-format
msgid "Standard test page"
msgstr "标准测试页"
-#: printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3609
#, c-format
msgid "Alternative test page (Letter)"
msgstr "可换测试页(信纸)"
-#: printer/printerdrake.pm:3299
+#: printer/printerdrake.pm:3612
#, c-format
msgid "Alternative test page (A4)"
msgstr "替换测试页 (A4)"
-#: printer/printerdrake.pm:3301
+#: printer/printerdrake.pm:3614
#, c-format
msgid "Photo test page"
msgstr "照片测试页"
-#: printer/printerdrake.pm:3305
+#: printer/printerdrake.pm:3618
#, c-format
msgid "Do not print any test page"
msgstr "不打印任何测试页"
-#: printer/printerdrake.pm:3313 printer/printerdrake.pm:3485
+#: printer/printerdrake.pm:3626 printer/printerdrake.pm:3809
#, c-format
msgid "Printing test page(s)..."
msgstr "正在打印测试页..."
-#: printer/printerdrake.pm:3331
-#, c-format
-msgid "Could not install the %s package!"
-msgstr "无法安装 %s 软件包!"
-
-#: printer/printerdrake.pm:3333
+#: printer/printerdrake.pm:3646
#, c-format
msgid "Skipping photo test page."
msgstr "跳过照片测试页。"
-#: printer/printerdrake.pm:3350
+#: printer/printerdrake.pm:3663
#, c-format
msgid ""
"Test page(s) have been sent to the printer.\n"
@@ -12854,7 +13243,7 @@ msgstr ""
"%s\n"
"\n"
-#: printer/printerdrake.pm:3354
+#: printer/printerdrake.pm:3667
#, c-format
msgid ""
"Test page(s) have been sent to the printer.\n"
@@ -12863,17 +13252,17 @@ msgstr ""
"测试页已经发送到打印机。\n"
"打印机开始工作之前可能要等一段时间。\n"
-#: printer/printerdrake.pm:3364
+#: printer/printerdrake.pm:3677
#, c-format
msgid "Did it work properly?"
-msgstr "工作正常?"
+msgstr "工作正常?"
-#: printer/printerdrake.pm:3386 printer/printerdrake.pm:4689
+#: printer/printerdrake.pm:3700 printer/printerdrake.pm:5049
#, c-format
msgid "Raw printer"
msgstr "原始打印机"
-#: printer/printerdrake.pm:3416
+#: printer/printerdrake.pm:3738
#, c-format
msgid ""
"To print a file from the command line (terminal window) you can either use "
@@ -12884,18 +13273,18 @@ msgstr ""
"要从命令行打印文件可使用命令“%s <文件>”或图形打印工具:“xpp <文件"
">”或“kprinter <文件>”。图形工具让您比较容易的选择打印机和修改打印选项。\n"
-#: printer/printerdrake.pm:3418
+#: printer/printerdrake.pm:3740
#, c-format
msgid ""
"These commands you can also use in the \"Printing command\" field of the "
"printing dialogs of many applications, but here do not supply the file name "
"because the file to print is provided by the application.\n"
msgstr ""
-"该命令您可用在许多应用的打印对话框的“打印命令”中,因为应用程序会提供要打印的"
-"文件,所以那里不用写文件名。\n"
+"该命令您可用在许多应用的打印对话框的“打印命令”中, 因为应用程序会提供要打印的"
+"文件, 所以那里不用写文件名。\n"
-#: printer/printerdrake.pm:3421 printer/printerdrake.pm:3438
-#: printer/printerdrake.pm:3448
+#: printer/printerdrake.pm:3743 printer/printerdrake.pm:3760
+#: printer/printerdrake.pm:3770
#, c-format
msgid ""
"\n"
@@ -12904,21 +13293,21 @@ msgid ""
"line, e. g. \"%s <file>\". "
msgstr ""
"\n"
-"“%s”命令也可用来修改特殊打印作业的选项。只需简单地往命令行中加入想要的设置,"
+"“%s”命令也可用来修改特殊打印作业的选项。只需简单地往命令行中加入想要的设置, "
"例如:“%s <file>”。"
-#: printer/printerdrake.pm:3424 printer/printerdrake.pm:3464
+#: printer/printerdrake.pm:3746 printer/printerdrake.pm:3786
#, c-format
msgid ""
"To know about the options available for the current printer read either the "
"list shown below or click on the \"Print option list\" button.%s%s%s\n"
"\n"
msgstr ""
-"要了解当前打印机可用的选项,请看下面的列表,或者单击“打印选项列表”按钮。%s%s%"
+"要了解当前打印机可用的选项, 请看下面的列表, 或者单击“打印选项列表”按钮。%s%s%"
"s\n"
"\n"
-#: printer/printerdrake.pm:3428
+#: printer/printerdrake.pm:3750
#, c-format
msgid ""
"Here is a list of the available printing options for the current printer:\n"
@@ -12927,39 +13316,39 @@ msgstr ""
"以下是可用于当前打印机的一些打印选项: \n"
"\n"
-#: printer/printerdrake.pm:3433 printer/printerdrake.pm:3443
+#: printer/printerdrake.pm:3755 printer/printerdrake.pm:3765
#, c-format
msgid ""
"To print a file from the command line (terminal window) use the command \"%s "
"<file>\".\n"
-msgstr "要从命令行(终端窗口)打印文件,请使用命令“%s <文件>”。\n"
+msgstr "要从命令行(终端窗口)打印文件, 请使用命令“%s <文件>”。\n"
-#: printer/printerdrake.pm:3435 printer/printerdrake.pm:3445
-#: printer/printerdrake.pm:3455
+#: printer/printerdrake.pm:3757 printer/printerdrake.pm:3767
+#: printer/printerdrake.pm:3777
#, c-format
msgid ""
"This command you can also use in the \"Printing command\" field of the "
"printing dialogs of many applications. But here do not supply the file name "
"because the file to print is provided by the application.\n"
msgstr ""
-"该命令您可用在许多应用的打印对话框的“打印命令”项。但是此处并不提供文件名,因"
+"该命令您可用在许多应用的打印对话框的“打印命令”项。但是此处并不提供文件名, 因"
"为要打印的文件由应用程序提供。\n"
-#: printer/printerdrake.pm:3440 printer/printerdrake.pm:3450
+#: printer/printerdrake.pm:3762 printer/printerdrake.pm:3772
#, c-format
msgid ""
"To get a list of the options available for the current printer click on the "
"\"Print option list\" button."
-msgstr "要获得当前打印机的可用选项列表,请单击“打印选项列表”按钮。"
+msgstr "要获得当前打印机的可用选项列表, 请单击“打印选项列表”按钮。"
-#: printer/printerdrake.pm:3453
+#: printer/printerdrake.pm:3775
#, c-format
msgid ""
"To print a file from the command line (terminal window) use the command \"%s "
"<file>\" or \"%s <file>\".\n"
msgstr "用命令“%s <文件>”或“%s <文件>”打印文件。\n"
-#: printer/printerdrake.pm:3457
+#: printer/printerdrake.pm:3779
#, c-format
msgid ""
"You can also use the graphical interface \"xpdq\" for setting options and "
@@ -12970,10 +13359,10 @@ msgid ""
"jams.\n"
msgstr ""
"您可以用图形接口“xpdq”设置打印选项和处理打印作业。\n"
-"如果您使用 KDE,桌面上有“停止打印机!”图标,当您点击它时,打印作业将立即停"
-"止。例如,它可以用在纸张堵塞时。\n"
+"如果您使用 KDE, 桌面上有“停止打印机!”图标, 当您点击它时, 打印作业将立即停"
+"止。例如, 它可以用在纸张堵塞时。\n"
-#: printer/printerdrake.pm:3461
+#: printer/printerdrake.pm:3783
#, c-format
msgid ""
"\n"
@@ -12982,34 +13371,121 @@ msgid ""
"line, e. g. \"%s <file>\".\n"
msgstr ""
"\n"
-"“%s”和“%s”命令允许修改打印作业的选项,例如:“%s <file>”。\n"
+"“%s”和“%s”命令允许修改打印作业的选项, 例如:“%s <file>”。\n"
-#: printer/printerdrake.pm:3471
+#: printer/printerdrake.pm:3793
#, c-format
msgid "Printing/Scanning/Photo Cards on \"%s\""
msgstr "在“%s”打印机上的打印/扫描/照片卡"
-#: printer/printerdrake.pm:3472
+#: printer/printerdrake.pm:3794
#, c-format
msgid "Printing/Scanning on \"%s\""
msgstr "在“%s”打印机上打印/扫描"
-#: printer/printerdrake.pm:3474
+#: printer/printerdrake.pm:3796
#, c-format
msgid "Printing/Photo Card Access on \"%s\""
msgstr "“%s”打印机上的打印/照片卡访问"
-#: printer/printerdrake.pm:3475
+#: printer/printerdrake.pm:3798
+#, c-format
+msgid "Using/Maintaining the printer \"%s\""
+msgstr "使用/维护打印机“%s”"
+
+#: printer/printerdrake.pm:3799
#, c-format
msgid "Printing on the printer \"%s\""
msgstr "正在“%s”打印机上打印"
-#: printer/printerdrake.pm:3481
+#: printer/printerdrake.pm:3805
#, c-format
msgid "Print option list"
msgstr "打印机选项列表"
-#: printer/printerdrake.pm:3502
+#: printer/printerdrake.pm:3827
+#, c-format
+msgid ""
+"Your %s is set up with HP's HPLIP driver software. This way many special "
+"features of your printer are supported.\n"
+"\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3830
+#, c-format
+msgid ""
+"The scanner in your printer can be used with the usual SANE software, for "
+"example Kooka or XSane (Both in the Multimedia/Graphics menu). "
+msgstr ""
+
+#: printer/printerdrake.pm:3831
+#, c-format
+msgid ""
+"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"your scanner on the network.\n"
+"\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3835
+#, c-format
+msgid ""
+"The memory card readers in your printer can be accessed like a usual USB "
+"mass storage device. "
+msgstr ""
+
+#: printer/printerdrake.pm:3836
+#, c-format
+msgid ""
+"After inserting a card a hard disk icon to access the card should appear on "
+"your desktop.\n"
+"\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3838
+#, c-format
+msgid ""
+"The memory card readers in your printer can be accessed using HP's Printer "
+"Toolbox (Menu: System/Monitoring/HP Printer Toolbox) clicking the \"Access "
+"Photo Cards...\" button on the \"Functions\" tab. "
+msgstr ""
+
+#: printer/printerdrake.pm:3839
+#, c-format
+msgid ""
+"Note that this is very slow, reading the pictures from the camera or a USB "
+"card reader is usually faster.\n"
+"\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3842
+#, c-format
+msgid ""
+"HP's Printer Toolbox (Menu: System/Monitoring/HP Printer Toolbox) offers a "
+"lot of status monitoring and maintenance functions for your %s:\n"
+"\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3843
+#, c-format
+msgid " - Ink level/status info\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3844
+#, c-format
+msgid " - Ink nozzle cleaning\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3845
+#, c-format
+msgid " - Print head alignment\n"
+msgstr ""
+
+#: printer/printerdrake.pm:3846
+#, fuzzy, c-format
+msgid " - Color calibration\n"
+msgstr " - 颜色校正\n"
+
+#: printer/printerdrake.pm:3861
#, c-format
msgid ""
"Your multi-function device was configured automatically to be able to scan. "
@@ -13024,15 +13500,15 @@ msgid ""
"device, you only need to use \"scannerdrake\" if you want to share the "
"scanner on the network."
msgstr ""
-"您的一体机已经自动配置成能够扫描。要扫描,可以使用命令“scanimage”(“scanimage "
+"您的一体机已经自动配置成能够扫描。要扫描, 可以使用命令“scanimage”(“scanimage "
"-d hp:%s”指定多个扫描仪之一)或者用图形界面“xscanimage”或“xsane”。如果您使用 "
-"GIMP,可以从“文件”/“获取”菜单的有关项目扫描。也可以使用“man scanimage”命令查"
+"GIMP, 可以从“文件”/“获取”菜单的有关项目扫描。也可以使用“man scanimage”命令查"
"看更多信息。\n"
"\n"
-"您无需对此设备使用“Drak 扫描仪”配置工具。除非您想要在网络上共享此扫描仪,您才"
+"您无需对此设备使用“Drak 扫描仪”配置工具。除非您想要在网络上共享此扫描仪, 您才"
"需要使用“Drak 扫描仪”。"
-#: printer/printerdrake.pm:3528
+#: printer/printerdrake.pm:3887
#, c-format
msgid ""
"Your printer was configured automatically to give you access to the photo "
@@ -13046,18 +13522,18 @@ msgid ""
"of the file lists."
msgstr ""
"已经自动配置允许电脑访问您的打印机里面的照片卡驱动器。要访问您的打印机里面的"
-"照片卡,可以使用图形界面程序“MtoolsFM”(菜单:“应用程序”->“文件工具”->“MTools "
+"照片卡, 可以使用图形界面程序“MtoolsFM”(菜单:“应用程序”->“文件工具”->“MTools "
"文件管理器”)或者命令行工具“mtools”(输入“man mtools”命令查看更多信息)。您或在"
-"盘符“p:”中发现卡上的文件系统,如果您有多于一个支持照片卡的 HP 打印机可以查看"
-"后续的盘符。在“MtoolsFM”中,您可以在文件列表的右上角切换盘符。"
+"盘符“p:”中发现卡上的文件系统, 如果您有多于一个支持照片卡的 HP 打印机可以查看"
+"后续的盘符。在“MtoolsFM”中, 您可以在文件列表的右上角切换盘符。"
-#: printer/printerdrake.pm:3570 printer/printerdrake.pm:3597
-#: printer/printerdrake.pm:3632
+#: printer/printerdrake.pm:3929 printer/printerdrake.pm:3956
+#: printer/printerdrake.pm:3991
#, c-format
msgid "Transfer printer configuration"
msgstr "传送打印机配置"
-#: printer/printerdrake.pm:3571
+#: printer/printerdrake.pm:3930
#, c-format
msgid ""
"You can copy the printer configuration which you have done for the spooler %"
@@ -13067,37 +13543,37 @@ msgid ""
"Not all queues can be transferred due to the following reasons:\n"
msgstr ""
"您可以把做好的打印机配置从队列 %s 复制到您当前的队列 %s。所有配置数据将被\n"
-"覆盖,但是打印作业不会迁移。\n"
-"由于以下原因,某些打印队列无法迁移:\n"
+"覆盖, 但是打印作业不会迁移。\n"
+"由于以下原因, 某些打印队列无法迁移:\n"
-#: printer/printerdrake.pm:3574
+#: printer/printerdrake.pm:3933
#, c-format
msgid ""
"CUPS does not support printers on Novell servers or printers sending the "
"data into a free-formed command.\n"
msgstr "CUPS 不支持 Novell 服务器上的打印机及发送数据到无格式命令的打印机。\n"
-#: printer/printerdrake.pm:3576
+#: printer/printerdrake.pm:3935
#, c-format
msgid ""
"PDQ only supports local printers, remote LPD printers, and Socket/TCP "
"printers.\n"
msgstr "PDQ 只支持本地打印机、远程LPD打印机和 Socket/TCP 打印机。\n"
-#: printer/printerdrake.pm:3578
+#: printer/printerdrake.pm:3937
#, c-format
msgid "LPD and LPRng do not support IPP printers.\n"
msgstr "LPD 和 LPRng 不支持IPP打印机。\n"
-#: printer/printerdrake.pm:3580
+#: printer/printerdrake.pm:3939
#, c-format
msgid ""
"In addition, queues not created with this program or \"foomatic-configure\" "
"cannot be transferred."
msgstr ""
-"另外,如果队列不是由这个程序或者“foomatic-configure”所创建,就无法传送。"
+"另外, 如果队列不是由这个程序或者“foomatic-configure”所创建, 就无法传送。"
-#: printer/printerdrake.pm:3581
+#: printer/printerdrake.pm:3940
#, c-format
msgid ""
"\n"
@@ -13105,10 +13581,10 @@ msgid ""
"or with native CUPS drivers cannot be transferred."
msgstr ""
"\n"
-"而且,如果打印机需要使用厂商提供的 PPD 文件配置,或打印机带有内置的 CUPS 驱动"
-"程序,它将无法传送。"
+"而且, 如果打印机需要使用厂商提供的 PPD 文件配置, 或打印机带有内置的 CUPS 驱动"
+"程序, 它将无法传送。"
-#: printer/printerdrake.pm:3582
+#: printer/printerdrake.pm:3941
#, c-format
msgid ""
"\n"
@@ -13118,17 +13594,17 @@ msgstr ""
"\n"
"标记您要迁移的打印机并单击“传送”。"
-#: printer/printerdrake.pm:3585
+#: printer/printerdrake.pm:3944
#, c-format
msgid "Do not transfer printers"
msgstr "不传送打印机"
-#: printer/printerdrake.pm:3586 printer/printerdrake.pm:3602
+#: printer/printerdrake.pm:3945 printer/printerdrake.pm:3961
#, c-format
msgid "Transfer"
msgstr "传送"
-#: printer/printerdrake.pm:3598
+#: printer/printerdrake.pm:3957
#, c-format
msgid ""
"A printer named \"%s\" already exists under %s. \n"
@@ -13139,46 +13615,46 @@ msgstr ""
"单击“传送”覆盖配置。\n"
"您也可以选择新的名称或跳过该打印机。"
-#: printer/printerdrake.pm:3619
+#: printer/printerdrake.pm:3978
#, c-format
msgid "New printer name"
msgstr "新打印机名称"
-#: printer/printerdrake.pm:3622
+#: printer/printerdrake.pm:3981
#, c-format
msgid "Transferring %s..."
msgstr "正在传送 %s ..."
-#: printer/printerdrake.pm:3633
+#: printer/printerdrake.pm:3992
#, c-format
msgid ""
"You have transferred your former default printer (\"%s\"), Should it be also "
"the default printer under the new printing system %s?"
msgstr ""
-"您已经传送以前系统中的默认打印机(“%s”),是否设置为新打印系统的默认打印机 %s?"
+"您已经传送以前系统中的默认打印机(“%s”), 是否设置为新打印系统的默认打印机 %s?"
-#: printer/printerdrake.pm:3643
+#: printer/printerdrake.pm:4002
#, c-format
msgid "Refreshing printer data..."
msgstr "正在刷新打印机数据..."
-#: printer/printerdrake.pm:3652
+#: printer/printerdrake.pm:4011
#, c-format
msgid "Starting network..."
msgstr "正在启动网络..."
-#: printer/printerdrake.pm:3695 printer/printerdrake.pm:3699
-#: printer/printerdrake.pm:3701
+#: printer/printerdrake.pm:4054 printer/printerdrake.pm:4058
+#: printer/printerdrake.pm:4060
#, c-format
msgid "Configure the network now"
msgstr "立即配置网络"
-#: printer/printerdrake.pm:3696
+#: printer/printerdrake.pm:4055
#, c-format
msgid "Network functionality not configured"
msgstr "尚未完成网络配置"
-#: printer/printerdrake.pm:3697
+#: printer/printerdrake.pm:4056
#, c-format
msgid ""
"You are going to configure a remote printer. This needs working network "
@@ -13186,15 +13662,15 @@ msgid ""
"configuration, you will not be able to use the printer which you are "
"configuring now. How do you want to proceed?"
msgstr ""
-"您在配置远程打印机。配置远程打印需要网络访问,但您还没有配置网络。如果您仍\n"
-"旧不进行网络配置的话,您将不能使用您现在正在配置的打印机。您希望怎样继续?"
+"您在配置远程打印机。配置远程打印需要网络访问, 但您还没有配置网络。如果您仍\n"
+"旧不进行网络配置的话, 您将不能使用您现在正在配置的打印机。您希望怎样继续?"
-#: printer/printerdrake.pm:3700
+#: printer/printerdrake.pm:4059
#, c-format
msgid "Go on without configuring the network"
msgstr "跳过网络配置继续"
-#: printer/printerdrake.pm:3735
+#: printer/printerdrake.pm:4094
#, c-format
msgid ""
"The network configuration done during the installation cannot be started "
@@ -13203,40 +13679,40 @@ msgid ""
"\"Network & Internet\"/\"Connection\", and afterwards set up the printer, "
"also using the %s Control Center, section \"Hardware\"/\"Printer\""
msgstr ""
-"安装时的网络配置现在无法启动。请在启动系统后检查是否可以访问网络,并使用 %s "
-"控制中心的“网络和 Internet”/“连接”一节纠正配置,然后再使用 %s 控制中心的“硬"
+"安装时的网络配置现在无法启动。请在启动系统后检查是否可以访问网络, 并使用 %s "
+"控制中心的“网络和 Internet”/“连接”一节纠正配置, 然后再使用 %s 控制中心的“硬"
"件”/“打印机”设置打印机"
-#: printer/printerdrake.pm:3736
+#: printer/printerdrake.pm:4095
#, c-format
msgid ""
"The network access was not running and could not be started. Please check "
"your configuration and your hardware. Then try to configure your remote "
"printer again."
msgstr ""
-"网络访问未运行,也无法启动。请检查您的配置和您的硬件。然后再次配置远程打印。"
+"网络访问未运行, 也无法启动。请检查您的配置和您的硬件。然后再次配置远程打印。"
-#: printer/printerdrake.pm:3746
+#: printer/printerdrake.pm:4105
#, c-format
msgid "Restarting printing system..."
msgstr "重新启动打印系统..."
-#: printer/printerdrake.pm:3776
+#: printer/printerdrake.pm:4135
#, c-format
msgid "high"
msgstr "高"
-#: printer/printerdrake.pm:3776
+#: printer/printerdrake.pm:4135
#, c-format
msgid "paranoid"
msgstr "严格"
-#: printer/printerdrake.pm:3778
+#: printer/printerdrake.pm:4137
#, c-format
msgid "Installing a printing system in the %s security level"
msgstr "在 %s 安全级别上安装打印系统"
-#: printer/printerdrake.pm:3779
+#: printer/printerdrake.pm:4138
#, c-format
msgid ""
"You are about to install the printing system %s on a system running in the %"
@@ -13252,17 +13728,17 @@ msgid ""
msgstr ""
"您正在安装 %s 打印系统到 %s 安全级别的系统上。\n"
"\n"
-"该打印系统在后台运行守护程序,守护程序能通过网络进行远程访问,而可能遭受攻\n"
+"该打印系统在后台运行守护程序, 守护程序能通过网络进行远程访问, 而可能遭受攻\n"
"击。该安全级别缺省启动少数选择的留守程序。\n"
"\n"
-"您要配置打印吗?"
+"您要配置打印吗?"
-#: printer/printerdrake.pm:3814
+#: printer/printerdrake.pm:4173
#, c-format
msgid "Starting the printing system at boot time"
msgstr "开机时启动打印系统"
-#: printer/printerdrake.pm:3815
+#: printer/printerdrake.pm:4174
#, c-format
msgid ""
"The printing system (%s) will not be started automatically when the machine "
@@ -13280,34 +13756,34 @@ msgstr ""
"这可能是由设置为很高的安全级别所引起的。因为打印系统对攻击而言是一个潜在的威"
"胁。\n"
"\n"
-"您希望让打印系统自动启动吗?"
+"您希望让打印系统自动启动吗?"
-#: printer/printerdrake.pm:3837
+#: printer/printerdrake.pm:4196
#, c-format
msgid "Checking installed software..."
msgstr "正在检查已经安装的软件..."
-#: printer/printerdrake.pm:3843
+#: printer/printerdrake.pm:4202
#, c-format
msgid "Removing %s..."
msgstr "正在删除 %s..."
-#: printer/printerdrake.pm:3847
+#: printer/printerdrake.pm:4206
#, c-format
msgid "Could not remove the %s printing system!"
msgstr "无法删除 %s 打印系统!"
-#: printer/printerdrake.pm:3863
+#: printer/printerdrake.pm:4222
#, c-format
msgid "Installing %s..."
msgstr "正在安装 %s..."
-#: printer/printerdrake.pm:3867
+#: printer/printerdrake.pm:4226
#, c-format
msgid "Could not install the %s printing system!"
msgstr "无法安装 %s 打印系统!"
-#: printer/printerdrake.pm:3934
+#: printer/printerdrake.pm:4293
#, c-format
msgid ""
"In this mode there is no local printing system, all printing requests go "
@@ -13315,54 +13791,54 @@ msgid ""
"define local print queues then and if the specified server is down it cannot "
"be printed at all from this machine."
msgstr ""
-"在此模式中没有本地打印系统,全部打印请求将会直接传送给下面指定的服务器。请注"
-"意,您以后将无法定义本地打印队列,而且如果指定的服务器宕机的话,将无法通过本"
+"在此模式中没有本地打印系统, 全部打印请求将会直接传送给下面指定的服务器。请注"
+"意, 您以后将无法定义本地打印队列, 而且如果指定的服务器宕机的话, 将无法通过本"
"机打印。"
-#: printer/printerdrake.pm:3936
+#: printer/printerdrake.pm:4295
#, c-format
msgid ""
"Enter the host name or IP of your CUPS server and click OK if you want to "
"use this mode, click \"Quit\" otherwise."
msgstr ""
-"如果您想要使用此模式,请输入您 CUPS 服务器的主机名或 IP 地址,然后单击“确"
+"如果您想要使用此模式, 请输入您 CUPS 服务器的主机名或 IP 地址, 然后单击“确"
"定”。否则请单击“退出”。”"
-#: printer/printerdrake.pm:3950
+#: printer/printerdrake.pm:4309
#, c-format
msgid "Name or IP of remote server:"
msgstr "远程服务器的名称或 IP 地址:"
-#: printer/printerdrake.pm:3970
+#: printer/printerdrake.pm:4329
#, c-format
msgid "Setting Default Printer..."
msgstr "正在设置默认打印机..."
-#: printer/printerdrake.pm:3989
+#: printer/printerdrake.pm:4348
#, c-format
msgid "Local CUPS printing system or remote CUPS server?"
msgstr "是本地 CUPS 打印系统还是远程 CUPS 服务器?"
-#: printer/printerdrake.pm:3990
+#: printer/printerdrake.pm:4349
#, c-format
msgid "The CUPS printing system can be used in two ways: "
msgstr "CUPS 打印系统可以通过两种方式使用:"
-#: printer/printerdrake.pm:3992
+#: printer/printerdrake.pm:4351
#, c-format
msgid "1. The CUPS printing system can run locally. "
msgstr "1. 在本地运行 CUPS 打印系统。"
-#: printer/printerdrake.pm:3993
+#: printer/printerdrake.pm:4352
#, c-format
msgid ""
"Then locally connected printers can be used and remote printers on other "
"CUPS servers in the same network are automatically discovered. "
msgstr ""
-"既可以使用本地连接的打印机,也可以自动发现同一网络中安装在其它 CUPS 服务器上"
+"既可以使用本地连接的打印机, 也可以自动发现同一网络中安装在其它 CUPS 服务器上"
"的远程打印机。"
-#: printer/printerdrake.pm:3994
+#: printer/printerdrake.pm:4353
#, c-format
msgid ""
"Disadvantage of this approach is, that more resources on the local machine "
@@ -13370,238 +13846,238 @@ msgid ""
"daemon has to run in the background and needs some memory, and the IPP port "
"(port 631) is opened. "
msgstr ""
-"这种方式的缺点在于,需要耗费本机的较多资源:既需要安装额外的软件包,也需要在"
-"后台运行 CUPS 守护程序,这可能需要占用一些内存。此外还需要开放IPP 端口(号码 "
+"这种方式的缺点在于, 需要耗费本机的较多资源:既需要安装额外的软件包, 也需要在"
+"后台运行 CUPS 守护程序, 这可能需要占用一些内存。此外还需要开放IPP 端口(号码 "
"631)。"
-#: printer/printerdrake.pm:3996
+#: printer/printerdrake.pm:4355
#, c-format
msgid "2. All printing requests are immediately sent to a remote CUPS server. "
msgstr "2. 全部打印请求立即发送给远程 CUPS 服务器。"
-#: printer/printerdrake.pm:3997
+#: printer/printerdrake.pm:4356
#, c-format
msgid ""
"Here local resource occupation is reduced to a minimum. No CUPS daemon is "
"started or port opened, no software infrastructure for setting up local "
"print queues is installed, so less memory and disk space is used. "
msgstr ""
-"这样可将本地资源占用降低最低。既不启动 CUPS 守护程序,也无需开放端口,设置本"
-"地打印队列也无需软件架构支持,这样内存和磁盘空间都基本上不会占用。"
+"这样可将本地资源占用降低最低。既不启动 CUPS 守护程序, 也无需开放端口, 设置本"
+"地打印队列也无需软件架构支持, 这样内存和磁盘空间都基本上不会占用。"
-#: printer/printerdrake.pm:3998
+#: printer/printerdrake.pm:4357
#, c-format
msgid ""
"Disadvantage is that it is not possible to define local printers then and if "
"the specified server is down it cannot be printed at all from this machine. "
msgstr ""
-"缺点是,以后无法定义本地打印机。而且如果指定的服务器宕机的话,将无法通过本机"
+"缺点是, 以后无法定义本地打印机。而且如果指定的服务器宕机的话, 将无法通过本机"
"打印。"
-#: printer/printerdrake.pm:4000
+#: printer/printerdrake.pm:4359
#, c-format
msgid "How should CUPS be set up on your machine?"
msgstr "如何在您的计算机上设置 CUPS?"
-#: printer/printerdrake.pm:4004 printer/printerdrake.pm:4019
-#: printer/printerdrake.pm:4023 printer/printerdrake.pm:4029
+#: printer/printerdrake.pm:4363 printer/printerdrake.pm:4378
+#: printer/printerdrake.pm:4382 printer/printerdrake.pm:4388
#, c-format
msgid "Remote server, specify Name or IP here:"
-msgstr "远程服务器,在此指定名称或 IP 地址:"
+msgstr "远程服务器, 在此指定名称或 IP 地址:"
-#: printer/printerdrake.pm:4018
+#: printer/printerdrake.pm:4377
#, c-format
msgid "Local CUPS printing system"
msgstr "本地 CUPS 打印系统"
-#: printer/printerdrake.pm:4056
+#: printer/printerdrake.pm:4415
#, c-format
msgid "Select Printer Spooler"
msgstr "选择打印机系统"
-#: printer/printerdrake.pm:4057
+#: printer/printerdrake.pm:4416
#, c-format
msgid "Which printing system (spooler) do you want to use?"
msgstr "您需要使用哪种打印系统?"
-#: printer/printerdrake.pm:4105
+#: printer/printerdrake.pm:4464
#, c-format
msgid "Failed to configure printer \"%s\"!"
msgstr "配置打印机“%s”失败"
-#: printer/printerdrake.pm:4118
+#: printer/printerdrake.pm:4478
#, c-format
msgid "Installing Foomatic..."
msgstr "正在安装 Foomatic..."
-#: printer/printerdrake.pm:4124
+#: printer/printerdrake.pm:4484
#, c-format
msgid "Could not install %s packages, %s cannot be started!"
-msgstr "无法安装 %s 软件包,%s 无法启动!"
+msgstr "无法安装 %s 软件包, %s 无法启动!"
-#: printer/printerdrake.pm:4314
+#: printer/printerdrake.pm:4674
#, c-format
msgid ""
"The following printers are configured. Double-click on a printer to change "
"its settings; to make it the default printer; or to view information about "
"it. "
msgstr ""
-"下列打印机已配置。双击打印机可更改其设置、将其设为默认打印机,或者查看相关信"
+"下列打印机已配置。双击打印机可更改其设置、将其设为默认打印机, 或者查看相关信"
"息。"
-#: printer/printerdrake.pm:4344
+#: printer/printerdrake.pm:4704
#, c-format
msgid "Display all available remote CUPS printers"
msgstr "显示可用的全部远程 CUPS 打印机"
-#: printer/printerdrake.pm:4345
+#: printer/printerdrake.pm:4705
#, c-format
msgid "Refresh printer list (to display all available remote CUPS printers)"
msgstr "更新打印列表(显示所有可用的远程 CUPS 打印机)"
-#: printer/printerdrake.pm:4356
+#: printer/printerdrake.pm:4716
#, c-format
msgid "CUPS configuration"
msgstr "CUPS 配置"
-#: printer/printerdrake.pm:4368
+#: printer/printerdrake.pm:4728
#, c-format
msgid "Change the printing system"
msgstr "更改打印系统"
-#: printer/printerdrake.pm:4377
+#: printer/printerdrake.pm:4737
#, c-format
msgid "Normal Mode"
msgstr "普通模式"
-#: printer/printerdrake.pm:4378
+#: printer/printerdrake.pm:4738
#, c-format
msgid "Expert Mode"
msgstr "专家模式"
-#: printer/printerdrake.pm:4632 printer/printerdrake.pm:4690
-#: printer/printerdrake.pm:4768 printer/printerdrake.pm:4777
+#: printer/printerdrake.pm:4992 printer/printerdrake.pm:5050
+#: printer/printerdrake.pm:5128 printer/printerdrake.pm:5137
#, c-format
msgid "Printer options"
msgstr "打印机选项"
-#: printer/printerdrake.pm:4668
+#: printer/printerdrake.pm:5028
#, c-format
msgid "Modify printer configuration"
msgstr "修改打印机配置"
-#: printer/printerdrake.pm:4670
+#: printer/printerdrake.pm:5030
#, c-format
msgid ""
"Printer %s%s\n"
"What do you want to modify on this printer?"
msgstr ""
"打印机 %s%s\n"
-"真的要修改吗?"
+"真的要修改吗?"
-#: printer/printerdrake.pm:4675
+#: printer/printerdrake.pm:5035
#, c-format
msgid "This printer is disabled"
msgstr "此打印机已禁用"
-#: printer/printerdrake.pm:4677
+#: printer/printerdrake.pm:5037
#, c-format
msgid "Do it!"
msgstr "执行!"
-#: printer/printerdrake.pm:4682 printer/printerdrake.pm:4737
+#: printer/printerdrake.pm:5042 printer/printerdrake.pm:5097
#, c-format
msgid "Printer connection type"
msgstr "打印机连接类型"
-#: printer/printerdrake.pm:4683 printer/printerdrake.pm:4743
+#: printer/printerdrake.pm:5043 printer/printerdrake.pm:5103
#, c-format
msgid "Printer name, description, location"
msgstr "打印机名称、描述、位置"
-#: printer/printerdrake.pm:4685 printer/printerdrake.pm:4761
+#: printer/printerdrake.pm:5045 printer/printerdrake.pm:5121
#, c-format
msgid "Printer manufacturer, model, driver"
-msgstr "打印机厂家,型号,驱动"
+msgstr "打印机厂家, 型号, 驱动"
-#: printer/printerdrake.pm:4686 printer/printerdrake.pm:4762
+#: printer/printerdrake.pm:5046 printer/printerdrake.pm:5122
#, c-format
msgid "Printer manufacturer, model"
-msgstr "打印机厂家,型号"
+msgstr "打印机厂家, 型号"
-#: printer/printerdrake.pm:4692 printer/printerdrake.pm:4772
+#: printer/printerdrake.pm:5052 printer/printerdrake.pm:5132
#, c-format
msgid "Set this printer as the default"
msgstr "设置该打印机为默认"
-#: printer/printerdrake.pm:4697 printer/printerdrake.pm:4778
-#: printer/printerdrake.pm:4780
+#: printer/printerdrake.pm:5057 printer/printerdrake.pm:5138
+#: printer/printerdrake.pm:5140
#, c-format
msgid "Enable Printer"
msgstr "启用打印机"
-#: printer/printerdrake.pm:4700 printer/printerdrake.pm:4783
-#: printer/printerdrake.pm:4785
+#: printer/printerdrake.pm:5060 printer/printerdrake.pm:5143
+#: printer/printerdrake.pm:5145
#, c-format
msgid "Disable Printer"
msgstr "禁用打印机"
-#: printer/printerdrake.pm:4701 printer/printerdrake.pm:4788
+#: printer/printerdrake.pm:5061 printer/printerdrake.pm:5148
#, c-format
msgid "Print test pages"
msgstr "打印测试页"
-#: printer/printerdrake.pm:4702 printer/printerdrake.pm:4790
+#: printer/printerdrake.pm:5062 printer/printerdrake.pm:5150
#, c-format
msgid "Learn how to use this printer"
msgstr "了解怎样使用此打印机"
-#: printer/printerdrake.pm:4703 printer/printerdrake.pm:4792
+#: printer/printerdrake.pm:5063 printer/printerdrake.pm:5152
#, c-format
msgid "Remove printer"
msgstr "删除打印机"
-#: printer/printerdrake.pm:4750
+#: printer/printerdrake.pm:5110
#, c-format
msgid "Removing old printer \"%s\"..."
msgstr "删除旧打印机“%s”..."
-#: printer/printerdrake.pm:4781
+#: printer/printerdrake.pm:5141
#, c-format
msgid "Printer \"%s\" is now enabled."
msgstr "打印机“%s”现已启用。"
-#: printer/printerdrake.pm:4786
+#: printer/printerdrake.pm:5146
#, c-format
msgid "Printer \"%s\" is now disabled."
msgstr "打印机“%s”现已禁用。"
-#: printer/printerdrake.pm:4823
+#: printer/printerdrake.pm:5183
#, c-format
msgid "Do you really want to remove the printer \"%s\"?"
-msgstr "真的要删除打印机“%s”?"
+msgstr "真的要删除打印机“%s”?"
-#: printer/printerdrake.pm:4827
+#: printer/printerdrake.pm:5187
#, c-format
msgid "Removing printer \"%s\"..."
msgstr "正在删除打印机“%s”..."
-#: printer/printerdrake.pm:4851
+#: printer/printerdrake.pm:5211
#, c-format
msgid "Default printer"
msgstr "默认打印机"
-#: printer/printerdrake.pm:4852
+#: printer/printerdrake.pm:5212
#, c-format
msgid "The printer \"%s\" is set as the default printer now."
msgstr "打印机“%s”设为缺省打印机。"
-#: raid.pm:36
+#: raid.pm:42
#, c-format
-msgid "Can't add a partition to _formatted_ RAID %s"
+msgid "Can not add a partition to _formatted_ RAID %s"
msgstr "无法加入一个分区到已经格式化的硬盘阵列 %s"
-#: raid.pm:132
+#: raid.pm:144
#, c-format
msgid "Not enough partitions for RAID level %d\n"
msgstr "没有足够的分区建立 %d 级的硬盘阵列\n"
@@ -13627,15 +14103,15 @@ msgid "Could not set permissions of firmware file %s!"
msgstr "无法设定固件文件 %s 的权限!"
#: scanner.pm:200 standalone/scannerdrake:66 standalone/scannerdrake:70
-#: standalone/scannerdrake:78 standalone/scannerdrake:340
-#: standalone/scannerdrake:415 standalone/scannerdrake:459
-#: standalone/scannerdrake:463 standalone/scannerdrake:485
-#: standalone/scannerdrake:550
+#: standalone/scannerdrake:78 standalone/scannerdrake:346
+#: standalone/scannerdrake:382 standalone/scannerdrake:446
+#: standalone/scannerdrake:490 standalone/scannerdrake:494
+#: standalone/scannerdrake:516 standalone/scannerdrake:581
#, c-format
msgid "Scannerdrake"
msgstr "Drak 扫描仪"
-#: scanner.pm:201 standalone/scannerdrake:916
+#: scanner.pm:201 standalone/scannerdrake:947
#, c-format
msgid "Could not install the packages needed to share your scanner(s)."
msgstr "无法安装共享您的扫描仪所需的软件包。"
@@ -13675,9 +14151,9 @@ msgid ""
"\n"
"Else only /etc/issue is allowed."
msgstr ""
-"如果设为 ALL,则允许 /etc/issue 和 /etc/issue.net 存在。\n"
+"如果设为 ALL, 则允许 /etc/issue 和 /etc/issue.net 存在。\n"
"\n"
-"如果设为 NONE,则除了 /etc/issue 以外不允许任何事务。\n"
+"如果设为 NONE, 则除了 /etc/issue 以外不允许任何事务。\n"
"否则只能允许 /etc/issue。"
#: security/help.pm:27
@@ -13727,9 +14203,9 @@ msgid ""
msgstr ""
"允许/禁止 X 连接:\n"
"\n"
-"- 所有(允许所有连接),\n"
+"- 所有(允许所有连接), \n"
"\n"
-"- 本地(只允许本地连接),\n"
+"- 本地(只允许本地连接), \n"
"\n"
"- 无(禁止所有连接)。"
@@ -13758,14 +14234,14 @@ msgid ""
msgstr ""
"认证:\n"
"\n"
-"- 如果设为“ALL”,则认证所有被 tcp_wrappers 控制的服务(参看 hosts.deny(5) man "
+"- 如果设为“ALL”, 则认证所有被 tcp_wrappers 控制的服务(参看 hosts.deny(5) man "
"page);\n"
"\n"
-"- 如果设为“LOCAL”,则仅对本地服务;\n"
+"- 如果设为“LOCAL”, 则仅对本地服务;\n"
"\n"
-"- 如果设为“NONE”,则不认证任何服务。\n"
+"- 如果设为“NONE”, 则不认证任何服务。\n"
"\n"
-"要认证您需要的服务,请使用 /etc/hosts.allow(参看 hosts.allow(5))。"
+"要认证您需要的服务, 请使用 /etc/hosts.allow(参看 hosts.allow(5))。"
#: security/help.pm:63
#, c-format
@@ -13780,12 +14256,12 @@ msgid ""
"packages."
msgstr ""
"如果 /etc/security/msec/security.conf 中的 SERVER_LEVEL(若不存在就是\n"
-"SECURE_LEVEL)大于 3 的话,就创建指向 /etc/security/msec/server."
+"SECURE_LEVEL)大于 3 的话, 就创建指向 /etc/security/msec/server."
"<SERVER_LEVEL>\n"
"的符号链接 /etc/security/msec/server。\n"
"\n"
"chkconfig --add 会使用 /etc/security/msec/server 来决定在安装包中出现文\n"
-"件时,决定是否要添加服务。"
+"件时, 决定是否要添加服务。"
#: security/help.pm:72
#, c-format
@@ -13811,7 +14287,7 @@ msgid ""
"Enable/Disable name resolution spoofing protection. If\n"
"\"%s\" is true, also reports to syslog."
msgstr ""
-"启用/禁用名称解析欺骗保护。如果“%s”为 true,\n"
+"启用/禁用名称解析欺骗保护。如果“%s”为 true, \n"
"还同时报告到系统日志。"
#: security/help.pm:80 standalone/draksec:213
@@ -13827,7 +14303,7 @@ msgstr "启用/禁用 IP 欺骗保护。"
#: security/help.pm:84
#, c-format
msgid "Enable/Disable libsafe if libsafe is found on the system."
-msgstr "启用/禁用 libsafe,若在系统中发现 libsafe。"
+msgstr "启用/禁用 libsafe, 若在系统中发现 libsafe。"
#: security/help.pm:86
#, c-format
@@ -13873,7 +14349,7 @@ msgstr "将 name 添加为 msec 处理密码时效的例外。"
#: security/help.pm:102
#, c-format
msgid "Set password aging to \"max\" days and delay to change to \"inactive\"."
-msgstr "将密码时效设置为“max”天,将延迟更改为“不活动”。"
+msgstr "将密码时效设置为“max”天, 将延迟更改为“不活动”。"
#: security/help.pm:104
#, c-format
@@ -13885,7 +14361,7 @@ msgstr "设置密码历史长度以避免密码重用。"
msgid ""
"Set the password minimum length and minimum number of digit and minimum "
"number of capitalized letters."
-msgstr "设置密码最短长度,数字的最少个数,大写字母的最少个数。"
+msgstr "设置密码最短长度, 数字的最少个数, 大写字母的最少个数。"
#: security/help.pm:108
#, c-format
@@ -13895,7 +14371,7 @@ msgstr "设置 root umask。"
#: security/help.pm:109
#, c-format
msgid "if set to yes, check open ports."
-msgstr "如果设为 yes,就会检查打开的端口。"
+msgstr "如果设为 yes, 就会检查打开的端口。"
#: security/help.pm:110
#, c-format
@@ -13908,9 +14384,9 @@ msgid ""
"\n"
"- for users with the 0 id other than root."
msgstr ""
-"如果设为 yes,就会检查:\n"
+"如果设为 yes, 就会检查:\n"
"\n"
-"- 空密码,\n"
+"- 空密码, \n"
"\n"
"- /etc/shadow 中没有密码\n"
"\n"
@@ -13919,83 +14395,83 @@ msgstr ""
#: security/help.pm:117
#, c-format
msgid "if set to yes, check permissions of files in the users' home."
-msgstr "如果设为 yes,就会在用户 home 里检查文件的允许权限。"
+msgstr "如果设为 yes, 就会在用户 home 里检查文件的允许权限。"
#: security/help.pm:118
#, c-format
msgid "if set to yes, check if the network devices are in promiscuous mode."
-msgstr "如果设为 yes,就会检查网络设备是否工作在混乱状态下。"
+msgstr "如果设为 yes, 就会检查网络设备是否工作在混乱状态下。"
#: security/help.pm:119
#, c-format
msgid "if set to yes, run the daily security checks."
-msgstr "如果设为 yes,就会运行每日安全检查。"
+msgstr "如果设为 yes, 就会运行每日安全检查。"
#: security/help.pm:120
#, c-format
msgid "if set to yes, check additions/removals of sgid files."
-msgstr "如果设为 yes,就会在 sgid 文件中检查添加/删除。"
+msgstr "如果设为 yes, 就会在 sgid 文件中检查添加/删除。"
#: security/help.pm:121
#, c-format
msgid "if set to yes, check empty password in /etc/shadow."
-msgstr "如果设为 yes,就会 /etc/shadow 中的空密码。"
+msgstr "如果设为 yes, 就会 /etc/shadow 中的空密码。"
#: security/help.pm:122
#, c-format
msgid "if set to yes, verify checksum of the suid/sgid files."
-msgstr "如果设为 yes,就会校验 suid/sgid 文件的校验和。"
+msgstr "如果设为 yes, 就会校验 suid/sgid 文件的校验和。"
#: security/help.pm:123
#, c-format
msgid "if set to yes, check additions/removals of suid root files."
-msgstr "如果设为 yes,就会检查 suid root 文件的添加/删除。"
+msgstr "如果设为 yes, 就会检查 suid root 文件的添加/删除。"
#: security/help.pm:124
#, c-format
msgid "if set to yes, report unowned files."
-msgstr "如果设为 yes,就会报告无主文件。"
+msgstr "如果设为 yes, 就会报告无主文件。"
#: security/help.pm:125
#, c-format
msgid "if set to yes, check files/directories writable by everybody."
-msgstr "如果设为 yes,就会每个人都检查可写的文件/文件夹。"
+msgstr "如果设为 yes, 就会每个人都检查可写的文件/文件夹。"
#: security/help.pm:126
#, c-format
msgid "if set to yes, run chkrootkit checks."
-msgstr "如果设为 yes,就会运行 chkrootkit 检查。"
+msgstr "如果设为 yes, 就会运行 chkrootkit 检查。"
#: security/help.pm:127
#, c-format
msgid ""
"if set, send the mail report to this email address else send it to root."
-msgstr "如果设置,发送邮件报告到这个邮箱地址,或者发给 root。"
+msgstr "如果设置, 发送邮件报告到这个邮箱地址, 或者发给 root。"
#: security/help.pm:128
#, c-format
msgid "if set to yes, report check result by mail."
-msgstr "如果设为 yes,就会通过邮件报告检测结果。"
+msgstr "如果设为 yes, 就会通过邮件报告检测结果。"
#: security/help.pm:129
#, c-format
msgid "Do not send mails if there's nothing to warn about"
-msgstr "如果没有可警告的,则不发送邮件"
+msgstr "如果没有可警告的, 则不发送邮件"
#: security/help.pm:130
#, c-format
msgid "if set to yes, run some checks against the rpm database."
-msgstr "如果设为 yes,就会用和 rpm 数据库冲突的方式进行一些检查。"
+msgstr "如果设为 yes, 就会用和 rpm 数据库冲突的方式进行一些检查。"
#: security/help.pm:131
#, c-format
msgid "if set to yes, report check result to syslog."
-msgstr "如果设为 yes,就会将检查结果报告给系统日志。"
+msgstr "如果设为 yes, 就会将检查结果报告给系统日志。"
#: security/help.pm:132
#, c-format
msgid "if set to yes, reports check result to tty."
-msgstr "如果设为 yes,就会给 tty 报告检测结果。"
+msgstr "如果设为 yes, 就会给 tty 报告检测结果。"
#: security/help.pm:134
#, c-format
@@ -14005,7 +14481,7 @@ msgstr "设置 shell 命令历史大小。-1 表示没有限制。"
#: security/help.pm:136
#, c-format
msgid "Set the shell timeout. A value of zero means no timeout."
-msgstr "设置 shell 超时。若设为 0,则为没有超时。"
+msgstr "设置 shell 超时。若设为 0, 则为没有超时。"
#: security/help.pm:136
#, c-format
@@ -14105,7 +14581,7 @@ msgstr "启用 IP 欺骗保护"
#: security/l10n.pm:29
#, c-format
msgid "Enable libsafe if libsafe is found on the system"
-msgstr "启用 libsafe,若在系统中发现 libsafe"
+msgstr "启用 libsafe, 若在系统中发现 libsafe"
#: security/l10n.pm:30
#, c-format
@@ -14250,7 +14726,7 @@ msgstr "不需要时不发送邮件"
#: security/l10n.pm:58
#, c-format
msgid "If set, send the mail report to this email address else send it to root"
-msgstr "如果设置,就将邮件报告发送到这个邮箱地址,或者发给 root"
+msgstr "如果设置, 就将邮件报告发送到这个邮箱地址, 或者发给 root"
#: security/l10n.pm:59
#, c-format
@@ -14304,8 +14780,8 @@ msgid ""
"but very sensitive. It must not be used for a machine connected to others\n"
"or to the Internet. There is no password access."
msgstr ""
-"这一级别应慎重使用。它使您的系统更易用,然而也更脆弱:\n"
-"假如这台机器将要和其它机器联网或者接入互联网,绝对不要采用这个级别。\n"
+"这一级别应慎重使用。它使您的系统更易用, 然而也更脆弱:\n"
+"假如这台机器将要和其它机器联网或者接入互联网, 绝对不要采用这个级别。\n"
"这个级别连基本的密码检查也没有。"
#: security/level.pm:44
@@ -14329,7 +14805,7 @@ msgstr ""
msgid ""
"There are already some restrictions, and more automatic checks are run every "
"night."
-msgstr "添加了某些限制,每天夜间自动执行更多检查。"
+msgstr "添加了某些限制, 每天夜间自动执行更多检查。"
#: security/level.pm:47
#, c-format
@@ -14341,9 +14817,9 @@ msgid ""
"connections from many clients. Note: if your machine is only a client on the "
"Internet, you should choose a lower level."
msgstr ""
-"使用这个安全级别,此系统可以作为服务器使用。\n"
-"拥有足够的安全性,系统可以作为服务器接受来自众多客户的连接。注意: 如果您的机"
-"器不在互联网上提供服务,请选择一个较低级别。"
+"使用这个安全级别, 此系统可以作为服务器使用。\n"
+"拥有足够的安全性, 系统可以作为服务器接受来自众多客户的连接。注意: 如果您的机"
+"器不在互联网上提供服务, 请选择一个较低级别。"
#: security/level.pm:50
#, c-format
@@ -14351,7 +14827,7 @@ msgid ""
"This is similar to the previous level, but the system is entirely closed and "
"security features are at their maximum."
msgstr ""
-"类似于前一安全级别,不过系统处于完全封闭状态。所有安全特性达到最大限度。"
+"类似于前一安全级别, 不过系统处于完全封闭状态。所有安全特性达到最大限度。"
#: security/level.pm:55
#, c-format
@@ -14400,7 +14876,7 @@ msgid ""
"apmd is used for monitoring battery status and logging it via syslog.\n"
"It can also be used for shutting down the machine when the battery is low."
msgstr ""
-"apmd 监视电池状态,并通过 syslog 作记录。\n"
+"apmd 监视电池状态, 并通过 syslog 作记录。\n"
"它还能用来在电池不足时关闭机器。"
#: services.pm:23
@@ -14420,8 +14896,8 @@ msgid ""
"basic\n"
"UNIX cron, including better security and more powerful configuration options."
msgstr ""
-"cron 是一个标准的 UNIX 程序,它可以定期的执行用户指定的程序。\n"
-"vixie cron 在基本的 UNIX cron 上增加了一些特性,包括改进的安全性,\n"
+"cron 是一个标准的 UNIX 程序, 它可以定期的执行用户指定的程序。\n"
+"vixie cron 在基本的 UNIX cron 上增加了一些特性, 包括改进的安全性, \n"
"和更强大的配置选项。"
#: services.pm:28
@@ -14442,8 +14918,8 @@ msgid ""
"operations,\n"
"and includes support for pop-up menus on the console."
msgstr ""
-"GPM 为基于文本的 Linux 应用程序提供对鼠标的支持,如 MC 命令解释器。\n"
-"它同时提供了利用鼠标的控制台复制并粘贴操作,还支持控制台上的弹出式\n"
+"GPM 为基于文本的 Linux 应用程序提供对鼠标的支持, 如 MC 命令解释器。\n"
+"它同时提供了利用鼠标的控制台复制并粘贴操作, 还支持控制台上的弹出式\n"
"菜单。"
#: services.pm:33
@@ -14451,7 +14927,7 @@ msgstr ""
msgid ""
"HardDrake runs a hardware probe, and optionally configures\n"
"new/changed hardware."
-msgstr "HardDrake 进行硬件检测,还可以配置新增/变化的硬件。"
+msgstr "HardDrake 进行硬件检测, 还可以配置新增/变化的硬件。"
#: services.pm:35
#, c-format
@@ -14470,7 +14946,7 @@ msgid ""
"all of the services it is responsible for."
msgstr ""
"超级互联网后台服务器(常称作 inetd)在需要时启动各种其它的互联网服务。\n"
-"它负责响应多种服务,包括 telnet、ftp、rsh 和 rlogin。\n"
+"它负责响应多种服务, 包括 telnet、ftp、rsh 和 rlogin。\n"
"禁止 inetd 就同时禁止了它负责的所有服务。"
#: services.pm:40
@@ -14479,7 +14955,7 @@ msgid ""
"Launch packet filtering for Linux kernel 2.2 series, to set\n"
"up a firewall to protect your machine from network attacks."
msgstr ""
-"启动内核 2.2 的数据包过滤功能,设置防火墙\n"
+"启动内核 2.2 的数据包过滤功能, 设置防火墙\n"
"以保护您的机器不受网络攻击。"
#: services.pm:42
@@ -14490,7 +14966,7 @@ msgid ""
"You should leave this enabled for most machines."
msgstr ""
"这个程序按照 /etc/sysconfig/keyboard 的设定加载选择的键盘映射。\n"
-"您可以使用 kbdconfig 工具修改这个设定。对大多数机器,应该开启这个服务。"
+"您可以使用 kbdconfig 工具修改这个设定。对大多数机器, 应该开启这个服务。"
#: services.pm:45
#, c-format
@@ -14527,14 +15003,14 @@ msgstr ""
msgid ""
"Linux Virtual Server, used to build a high-performance and highly\n"
"available server."
-msgstr "Linux 虚拟服务器,用来构架高效和高可用系统。"
+msgstr "Linux 虚拟服务器, 用来构架高效和高可用系统。"
#: services.pm:54
#, c-format
msgid ""
"named (BIND) is a Domain Name Server (DNS) that is used to resolve host "
"names to IP addresses."
-msgstr "named(BIND) 是一个域名服务器(DNS),用来把主机名解析成 IP 地址。"
+msgstr "named(BIND) 是一个域名服务器(DNS), 用来把主机名解析成 IP 地址。"
#: services.pm:55
#, c-format
@@ -14542,8 +15018,8 @@ msgid ""
"Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
"Manager/Windows), and NCP (NetWare) mount points."
msgstr ""
-"加载和卸载所有网络文件系统(NFS),SMB(Lan\n"
-"Manager/Windows),和 NCP(NetWare)加载点。"
+"加载和卸载所有网络文件系统(NFS), SMB(Lan\n"
+"Manager/Windows), 和 NCP(NetWare)加载点。"
#: services.pm:57
#, c-format
@@ -14560,7 +15036,7 @@ msgid ""
"/etc/exports file."
msgstr ""
"NFS 是常用的通过 TCP/IP 网络共享文件的协议。\n"
-"这个服务提供了 NFS 服务器功能,可以通过\n"
+"这个服务提供了 NFS 服务器功能, 可以通过\n"
"/etc/exports 文件配置。"
#: services.pm:62
@@ -14588,12 +15064,12 @@ msgstr "支持 OKI 4w 及其兼容的视窗打印机。"
#, c-format
msgid ""
"PCMCIA support is usually to support things like ethernet and\n"
-"modems in laptops. It won't get started unless configured so it is safe to "
-"have\n"
-"it installed on machines that don't need it."
+"modems in laptops. It will not get started unless configured so it is safe "
+"to have\n"
+"it installed on machines that do not need it."
msgstr ""
"PCMCIA 支持通常用于在笔记本电脑中添加\n"
-"以太网卡或者调制解调器。如果没有配置它不会启动,\n"
+"以太网卡或者调制解调器。如果没有配置它不会启动, \n"
"所以不必担心它。"
#: services.pm:70
@@ -14604,8 +15080,8 @@ msgid ""
"machines\n"
"which act as servers for protocols which make use of the RPC mechanism."
msgstr ""
-"portmapper 管理各种 RPC 连接,像 NFS 和 NIS 这些协议会用到它。\n"
-"如果您的电脑将要提供利用用 RPC 机制协议的服务,就必须运行 portmap 服务器。"
+"portmapper 管理各种 RPC 连接, 像 NFS 和 NIS 这些协议会用到它。\n"
+"如果您的电脑将要提供利用用 RPC 机制协议的服务, 就必须运行 portmap 服务器。"
#: services.pm:73
#, c-format
@@ -14613,7 +15089,7 @@ msgid ""
"Postfix is a Mail Transport Agent, which is the program that moves mail from "
"one machine to another."
msgstr ""
-"Postfix 是一个邮件传递代理,这个程序帮助您把电子邮件从\n"
+"Postfix 是一个邮件传递代理, 这个程序帮助您把电子邮件从\n"
"一台机器送到另一台。"
#: services.pm:74
@@ -14621,7 +15097,7 @@ msgstr ""
msgid ""
"Saves and restores system entropy pool for higher quality random\n"
"number generation."
-msgstr "保存和恢复系统的熵池,可以产生更高品质的随机数。"
+msgstr "保存和恢复系统的熵池, 可以产生更高品质的随机数。"
#: services.pm:76
#, c-format
@@ -14629,7 +15105,7 @@ msgid ""
"Assign raw devices to block devices (such as hard drive\n"
"partitions), for the use of applications such as Oracle or DVD players"
msgstr ""
-"将 RAW 设备指定为块设备(如硬盘分区),\n"
+"将 RAW 设备指定为块设备(如硬盘分区), \n"
"以便供 Oracle 或 DVD 播放机之类的程序使用"
#: services.pm:78
@@ -14640,7 +15116,7 @@ msgid ""
"routing protocols are needed for complex networks."
msgstr ""
"后台服务 routed 允许通过 RIP 协议自动更新的 IP 路由表。在小型网络上广泛的\n"
-"采用 RIP,然而在更复杂的网络上需要更复杂的路由协议。"
+"采用 RIP, 然而在更复杂的网络上需要更复杂的路由协议。"
#: services.pm:81
#, c-format
@@ -14676,7 +15152,7 @@ msgid ""
"Syslog is the facility by which many daemons use to log messages\n"
"to various system log files. It is a good idea to always run syslog."
msgstr ""
-"Syslog 是这样一个设施,很多其它的后台服务利用它在各种系统日志文件\n"
+"Syslog 是这样一个设施, 很多其它的后台服务利用它在各种系统日志文件\n"
"中记录日志消息。一直运行 syslog 是个好主意。"
#: services.pm:90
@@ -14689,79 +15165,79 @@ msgstr "装入您 USB 设备的驱动程序。"
msgid "Starts the X Font Server (this is mandatory for Xorg to run)."
msgstr "启动 X 字体服务器(Xorg 所需)。"
-#: services.pm:117 services.pm:159
+#: services.pm:115 services.pm:157
#, c-format
msgid "Choose which services should be automatically started at boot time"
msgstr "选择开机时自动启动的服务"
-#: services.pm:129
+#: services.pm:127
#, c-format
msgid "Printing"
msgstr "打印"
-#: services.pm:130
+#: services.pm:128
#, c-format
msgid "Internet"
msgstr "互联网"
-#: services.pm:133
+#: services.pm:131
#, c-format
msgid "File sharing"
msgstr "文件共享"
-#: services.pm:140
+#: services.pm:138
#, c-format
msgid "Remote Administration"
msgstr "远程管理"
-#: services.pm:148
+#: services.pm:146
#, c-format
msgid "Database Server"
msgstr "数据库服务器"
-#: services.pm:211
+#: services.pm:209
#, c-format
msgid "running"
msgstr "运行中"
-#: services.pm:211
+#: services.pm:209
#, c-format
msgid "stopped"
msgstr "已停止"
-#: services.pm:215
+#: services.pm:213
#, c-format
msgid "Services and daemons"
msgstr "服务和守护程序"
-#: services.pm:221
+#: services.pm:219
#, c-format
msgid ""
"No additional information\n"
"about this service, sorry."
msgstr "没有该服务的附加信息。"
-#: services.pm:226 ugtk2.pm:1214
+#: services.pm:224 ugtk2.pm:1010
#, c-format
msgid "Info"
msgstr "信息"
-#: services.pm:229
+#: services.pm:227
#, c-format
msgid "Start when requested"
msgstr "请求时启动"
-#: services.pm:229
+#: services.pm:227
#, c-format
msgid "On boot"
msgstr "启动时"
-#: services.pm:246
+#: services.pm:244
#, c-format
msgid "Start"
msgstr "启动"
-#: services.pm:246
+#: services.pm:244
#, c-format
msgid "Stop"
msgstr "停止"
@@ -14784,8 +15260,8 @@ msgid ""
"together with <b>a lot of applications</b> meeting every need you could even "
"think of."
msgstr ""
-"Mandrakelinux 是一整套系统的有机组成,其中不仅包括<b>操作系统</b>(基于 Linux "
-"内核),还包括您梦寐以求的<b>海量应用程序</b>。"
+"Mandrakelinux 是一整套系统的有机组成, 其中不仅包括<b>操作系统</b>(基于 Linux "
+"内核), 还包括您梦寐以求的<b>海量应用程序</b>。"
#: share/advertising/01.pl:19
#, c-format
@@ -14847,7 +15323,7 @@ msgid ""
"they want, provided they make the results available."
msgstr ""
"GPL 是开放源代码模型的核心;它使得每个人都可以以自己喜欢的方式<b>自由</b>使"
-"用、学习、发布并改进软件,只要结果仍然公开。"
+"用、学习、发布并改进软件, 只要结果仍然公开。"
#: share/advertising/03.pl:19
#, c-format
@@ -14855,7 +15331,7 @@ msgid ""
"The main benefit of this is that the number of developers is virtually "
"<b>unlimited</b>, resulting in <b>very high quality</b> software."
msgstr ""
-"这种方式的主要优势在于,开发者的数量可以是<b>无限</b>的,而软件的<b>超高质量"
+"这种方式的主要优势在于, 开发者的数量可以是<b>无限</b>的, 而软件的<b>超高质量"
"</b>也是其它模式望尘莫及的。"
#: share/advertising/04.pl:13
@@ -14872,7 +15348,7 @@ msgid ""
"<b>key role</b> in the Mandrakelinux world."
msgstr ""
"Mandrakelinux 拥有的用户和开发者<b>社区人数众多</b>。这样的社区所扮演的角色十"
-"分广泛,从错误报告到开发新程序。社区在 Mandrakelinux 世界中扮演着<b>至关重要"
+"分广泛, 从错误报告到开发新程序。社区在 Mandrakelinux 世界中扮演着<b>至关重要"
"</b>的角色。"
#: share/advertising/04.pl:17
@@ -14882,8 +15358,8 @@ msgid ""
"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
"php3</b> if you would like to get <b>involved</b> in the development."
msgstr ""
-"要<b>更多地了解</b>我们的活力社区,请浏览 <b>www.mandrakelinux.com</b>;而如"
-"果您想要直接<b>参与</b>开发的话,请直接查看 <b>www.mandrakelinux.com/en/"
+"要<b>更多地了解</b>我们的活力社区, 请浏览 <b>www.mandrakelinux.cn</b>;而如果"
+"您想要直接<b>参与</b>开发的话, 请直接查看 <b>www.mandrakelinux.com/en/"
"cookerdevel.php3</b>。"
#: share/advertising/05.pl:13
@@ -14897,14 +15373,14 @@ msgid ""
"You are now installing <b>Mandrakelinux Download</b>. This is the free "
"version that Mandrakesoft wants to keep <b>available to everyone</b>."
msgstr ""
-"您正在安装 <b>Mandrakelinux 下载版本</b>。这是一种免费下载的版本,"
+"您正在安装 <b>Mandrakelinux 下载版本</b>。这是一种免费下载的版本, "
"Mandrakesoft 想要将其贡献给<b>每个人</b>。"
#: share/advertising/05.pl:17
#, c-format
msgid ""
"The Download version <b>cannot include</b> all the software that is not open "
-"source. Therefore, you won't find in the Download version:"
+"source. Therefore, you will not find in the Download version:"
msgstr ""
"下载版本<b>无法包含</b>非开放源代码的软件。因此您在下载版本中找不到如下软件:"
@@ -14924,14 +15400,14 @@ msgstr "\t* <b>私有软件</b> (诸如 Acrobat® Reader®、RealPlayer®、Flas
#: share/advertising/05.pl:21
#, c-format
msgid ""
-"You won't have access to the <b>services included</b> in the other "
+"You will not have access to the <b>services included</b> in the other "
"Mandrakesoft products either."
msgstr "您也无法访问 Mandrakesoft 其它产品中<b>所增送的增值服务</b>。"
#: share/advertising/06.pl:13
#, c-format
msgid "<b>Discovery, Your First Linux Desktop</b>"
-msgstr "<b>探索,您的第一个 Linux 桌面</b>"
+msgstr "<b>探索, 您的第一个 Linux 桌面</b>"
#: share/advertising/06.pl:15
#, c-format
@@ -14947,13 +15423,13 @@ msgid ""
"with a single application per task."
msgstr ""
"探索版是<b>最易用最友好</b>的 Linux 发行版。我们为您精选了各式<b>金牌应用软件"
-"</b>,相信它能够完全满足您对办公、多媒体和互联网应用的要求。其中的菜单也是面"
-"向任务的,每种任务都为您准备了单一的应用程序。"
+"</b>, 相信它能够完全满足您对办公、多媒体和互联网应用的要求。其中的菜单也是面"
+"向任务的, 每种任务都为您准备了单一的应用程序。"
#: share/advertising/07.pl:13
#, c-format
msgid "<b>PowerPack, The Ultimate Linux Desktop</b>"
-msgstr "<b>专业版,Linux 终极桌面</b>"
+msgstr "<b>专业版, Linux 终极桌面</b>"
#: share/advertising/07.pl:15
#, c-format
@@ -14968,13 +15444,13 @@ msgid ""
"to the most advanced."
msgstr ""
"专业版是 Mandrakesoft 的<b>金牌 Linux 桌面</b>产品。除了是最易用最友好的 "
-"Linux 发行版,专业版还包括了<b>数千应用程序</b> - 从最流行程序到最专业的程序"
+"Linux 发行版, 专业版还包括了<b>数千应用程序</b> - 从最流行程序到最专业的程序"
"一应俱全。"
#: share/advertising/08.pl:13
#, c-format
msgid "<b>PowerPack+, The Linux Solution for Desktops and Servers</b>"
-msgstr "<b>专业版+,桌面和服务器的 Linux 解决方案</b>"
+msgstr "<b>专业版+, 桌面和服务器的 Linux 解决方案</b>"
#: share/advertising/08.pl:15
#, c-format
@@ -14990,7 +15466,7 @@ msgid ""
"applications</b>."
msgstr ""
"专业版+是中小规模<b>网络</b>的<b>全能 Linux 解决方案</b>。该版本除了收集了上"
-"千<b>桌面应用程序</b>专业版之外,还精心选择了的世界级<b>服务器应用程序</b>。"
+"千<b>桌面应用程序</b>专业版之外, 还精心选择了的世界级<b>服务器应用程序</b>。"
#: share/advertising/09.pl:13
#, c-format
@@ -15012,17 +15488,17 @@ msgstr "Mandrakelinux 10.1 产品包括:"
#: share/advertising/09.pl:18
#, c-format
msgid "\t* <b>Discovery</b>, Your First Linux Desktop."
-msgstr "\t* <b>探索版</b>,您的第一个 Linux 桌面。"
+msgstr "\t* <b>探索版</b>, 您的第一个 Linux 桌面。"
#: share/advertising/09.pl:19
#, c-format
msgid "\t* <b>PowerPack</b>, The Ultimate Linux Desktop."
-msgstr "\t* <b>专业版</b>,Linux 终极桌面。"
+msgstr "\t* <b>专业版</b>, Linux 终极桌面。"
#: share/advertising/09.pl:20
#, c-format
msgid "\t* <b>PowerPack+</b>, The Linux Solution for Desktops and Servers."
-msgstr "\t* <b>专业版+</b>,桌面和服务器的 Linux 解决方案。"
+msgstr "\t* <b>专业版+</b>, 桌面和服务器的 Linux 解决方案。"
#: share/advertising/09.pl:21
#, c-format
@@ -15030,7 +15506,7 @@ msgid ""
"\t* <b>Mandrakelinux 10.1 for x86-64</b>, The Mandrakelinux solution for "
"making the most of your 64-bit processor."
msgstr ""
-"\t* <b>Mandrakelinux 10.1 for x86-64</b>,充分发挥您 64 位处理器性能的 "
+"\t* <b>Mandrakelinux 10.1 for x86-64</b>, 充分发挥您 64 位处理器性能的 "
"Mandrakelinux 解决方案。"
#: share/advertising/10.pl:13
@@ -15044,15 +15520,15 @@ msgid ""
"Mandrakesoft has developed two products that allow you to use Mandrakelinux "
"<b>on any computer</b> and without any need to actually install it:"
msgstr ""
-"Mandrakesoft 开发了两款随身产品,使得您可以在不安装的情况下<b>在任何计算机上"
+"Mandrakesoft 开发了两款随身产品, 使得您可以在不安装的情况下<b>在任何计算机上"
"</b>使用 Mandrakelinux:"
#: share/advertising/10.pl:16
#, c-format
msgid ""
"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
-"bootable CD-Rom."
-msgstr "\t* <b>Move</b>,直接从可启动光盘中运行的 Mandrakelinux 发行版。"
+"bootable CD-ROM."
+msgstr "\t* <b>Move</b>, 直接从可启动光盘中运行的 Mandrakelinux 发行版。"
#: share/advertising/10.pl:17
#, c-format
@@ -15060,7 +15536,7 @@ msgid ""
"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
"ultra-compact “LaCie Mobile Hard Drive”."
msgstr ""
-"\t* <b>GlobeTrotter</b>,预装于超强压缩的 LaCie 移动硬盘中的 Mandrakelinux 发"
+"\t* <b>GlobeTrotter</b>, 预装于超强压缩的 LaCie 移动硬盘中的 Mandrakelinux 发"
"行版。"
#: share/advertising/11.pl:13
@@ -15078,17 +15554,17 @@ msgstr "下面是 Mandrakesoft 专为适合<b>专业需求</b>所设计的产品
#: share/advertising/11.pl:16
#, c-format
msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
-msgstr "\t* <b>企业桌面</b>,商务适用的 Mandrakelinux 桌面。"
+msgstr "\t* <b>企业桌面</b>, 商务适用的 Mandrakelinux 桌面。"
#: share/advertising/11.pl:17
#, c-format
msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr "\t* <b>企业服务器</b>,Mandrakelinux 服务器解决方案。"
+msgstr "\t* <b>企业服务器</b>, Mandrakelinux 服务器解决方案。"
#: share/advertising/11.pl:18
#, c-format
msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
-msgstr "\t* <b>多网络防火墙</b>,Mandrakelinux 安全解决方案。"
+msgstr "\t* <b>多网络防火墙</b>, Mandrakelinux 安全解决方案。"
#: share/advertising/12.pl:13
#, c-format
@@ -15108,9 +15584,9 @@ msgstr ""
#, c-format
msgid ""
"KDE will make your <b>first steps</b> with Linux so <b>easy</b> that you "
-"won't ever think of running another operating system!"
+"will not ever think of running another operating system!"
msgstr ""
-"KDE 将使您的<b>首次</b> Linux 之旅变得<b>极为简单</b>,您甚至不会想到运行其它"
+"KDE 将使您的<b>首次</b> Linux 之旅变得<b>极为简单</b>, 您甚至不会想到运行其它"
"操作系统!"
#: share/advertising/12.pl:19
@@ -15119,7 +15595,7 @@ msgid ""
"KDE also includes a lot of <b>well integrated applications</b> such as "
"Konqueror, the web browser and Kontact, the personal information manager."
msgstr ""
-"KDE 还包含了大量<b>紧密集成的应用程序</b>,诸如 Web 浏览器 Konqueror、个人信"
+"KDE 还包含了大量<b>紧密集成的应用程序</b>, 诸如 Web 浏览器 Konqueror、个人信"
"息管理器 Kontact。"
#: share/advertising/13-a.pl:13 share/advertising/13-b.pl:13
@@ -15133,7 +15609,7 @@ msgid ""
"With PowerPack, you will have the choice of the <b>graphical desktop "
"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
msgstr ""
-"在专业版中,您可以选择各种<b>图形桌面环境</b>。而 Mandrakesoft 为您预设的桌面"
+"在专业版中, 您可以选择各种<b>图形桌面环境</b>。而 Mandrakesoft 为您预设的桌面"
"环境是 <b>KDE</b>。"
#: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
@@ -15151,8 +15627,8 @@ msgid ""
"But we advise you to try all available ones (including <b>GNOME</b>, "
"<b>IceWM</b>, etc.) and pick your favorite."
msgstr ""
-"但是,我们还是建议您尝试一下其它桌面环境(如 <b>GNOME</b>、<b>IceWM</b>,等"
-"等),然后再从中选择您的最爱。"
+"但是, 我们还是建议您尝试一下其它桌面环境(如 <b>GNOME</b>、<b>IceWM</b>, 等"
+"等), 然后再从中选择您的最爱。"
#: share/advertising/13-b.pl:15
#, c-format
@@ -15160,7 +15636,7 @@ msgid ""
"With PowerPack+, you will have the choice of the <b>graphical desktop "
"environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
msgstr ""
-"在专业版+中,您可以选择各种<b>图形桌面环境</b>。而 Mandrakesoft 为您预设的桌"
+"在专业版+中, 您可以选择各种<b>图形桌面环境</b>。而 Mandrakesoft 为您预设的桌"
"面环境是 <b>KDE</b>。"
#: share/advertising/14.pl:13
@@ -15179,7 +15655,7 @@ msgid ""
"It is a <b>full-featured office suite</b> that includes word processor, "
"spreadsheet, presentation and drawing applications."
msgstr ""
-"它是一套<b>全功能的办公套件</b>,其中包含了字处理器、电子表格、演示文稿和绘图"
+"它是一套<b>全功能的办公套件</b>, 其中包含了字处理器、电子表格、演示文稿和绘图"
"程序。"
#: share/advertising/14.pl:19
@@ -15188,7 +15664,7 @@ msgid ""
"OpenOffice.org can read and write most types of <b>Microsoft® Office</b> "
"documents such as Word, Excel and PowerPoint® files."
msgstr ""
-"OpenOffice.org 可以读写大多数 <b>Microsoft® Office</b> 的文档,比如 Word、"
+"OpenOffice.org 可以读写大多数 <b>Microsoft® Office</b> 的文档, 比如 Word、"
"Excel 和 PowerPoint® 文件。"
#: share/advertising/15.pl:13
@@ -15209,7 +15685,7 @@ msgid ""
"an <b>address book</b>, a <b>calendar</b>, plus a tool for taking <b>notes</"
"b>!"
msgstr ""
-"Kontact 并不仅仅是全能的<b>电子邮件客户程序</b>,它还包括了<b>地址簿</b>、<b>"
+"Kontact 并不仅仅是全能的<b>电子邮件客户程序</b>, 它还包括了<b>地址簿</b>、<b>"
"日历</b>以及记录<b>便笺</b>的工具!"
#: share/advertising/15.pl:19
@@ -15217,7 +15693,7 @@ msgstr ""
msgid ""
"It is the easiest way to communicate with your contacts and to organize your "
"time."
-msgstr "要想与您的联系人交流,或者组织您的时间,Kontact 将是您的绝佳选择。"
+msgstr "要想与您的联系人交流, 或者组织您的时间, Kontact 将是您的绝佳选择。"
#: share/advertising/16.pl:13
#, c-format
@@ -15286,7 +15762,7 @@ msgid ""
"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
"<b>all of your tasks</b>:"
msgstr ""
-"在 Mandrakelinux 菜单中,您可<b>轻而易举</b>的找到完成<b>各种任务</b>的应用程"
+"在 Mandrakelinux 菜单中, 您可<b>轻而易举</b>的找到完成<b>各种任务</b>的应用程"
"序:"
#: share/advertising/18.pl:16
@@ -15318,7 +15794,7 @@ msgstr "\t* 用 <b>Kopete</b> 参与在线聊天"
msgid ""
"\t* Listen to your <b>audio CDs</b> and <b>music files</b>, watch your "
"<b>videos</b>."
-msgstr "\t* 聆听<b>音乐 CD</b> 和<b>音乐文件</b>,观看<b>电影</b>。"
+msgstr "\t* 聆听<b>音乐 CD</b> 和<b>音乐文件</b>, 观看<b>电影</b>。"
#: share/advertising/18.pl:21
#, c-format
@@ -15341,7 +15817,7 @@ msgstr "专业版为您提供了<b>开发</b>您自己的应用程序的绝佳
msgid ""
"You will enjoy the powerful, integrated development environment from KDE, "
"<b>KDevelop</b>, which will let you program in a lot of languages."
-msgstr "您将享受到强大的 KDE 集成开发环境 <b>KDevelop</b>,它支持各种语言。"
+msgstr "您将享受到强大的 KDE 集成开发环境 <b>KDevelop</b>, 它支持各种语言。"
#: share/advertising/19.pl:19
#, c-format
@@ -15391,7 +15867,7 @@ msgid ""
"With all these <b>powerful tools</b>, you will be able to write applications "
"in <b>dozens of programming languages</b>:"
msgstr ""
-"使用这些<b>强力工具</b>,您将能够使用<b>各种编程语言</b>编写您自己的应用程"
+"使用这些<b>强力工具</b>, 您将能够使用<b>各种编程语言</b>编写您自己的应用程"
"序:"
#: share/advertising/21.pl:16
@@ -15446,7 +15922,7 @@ msgid ""
"leading Linux compiler <b>GCC</b>, you will be able to create applications "
"in <b>many different languages</b> (C, C++, Java™, Perl, Python, etc.)."
msgstr ""
-"通过强大的集成开发环境 <b>KDevelop</b> 以及领先的 Linux 编译器 <b>GCC</b>,您"
+"通过强大的集成开发环境 <b>KDevelop</b> 以及领先的 Linux 编译器 <b>GCC</b>, 您"
"可以用<b>各种不同的语言</b>(C、C++、Java™、Perl、Python 等)创建自己的应用程"
"序。"
@@ -15463,7 +15939,7 @@ msgid ""
"allow you to:"
msgstr ""
"专业版可让您访问 <b>Kolab</b> 这一全功能的<b>群件服务器</b>。如若配合 "
-"<b>Kontact</b> 客户端使用,您将可以:"
+"<b>Kontact</b> 客户端使用, 您将可以:"
#: share/advertising/23.pl:16
#, c-format
@@ -15489,7 +15965,7 @@ msgstr "<b>服务器</b>"
#, c-format
msgid ""
"Empower your business network with <b>premier server solutions</b> including:"
-msgstr "用<b>金牌服务器解决方案</b>武装您的商务网络,包括: "
+msgstr "用<b>金牌服务器解决方案</b>武装您的商务网络, 包括: "
#: share/advertising/24.pl:16
#, c-format
@@ -15514,7 +15990,7 @@ msgstr "\t* <b>MySQL</b> 和 <b>PostgreSQL</b>: 世界最流行的开放源代
msgid ""
"\t* <b>CVS</b>: Concurrent Versions System, the dominant open source network-"
"transparent version control system."
-msgstr "\t* <b>CVS</b>: 协同版本系统,占绝对统治地位的开放源代码版本控制系统。"
+msgstr "\t* <b>CVS</b>: 协同版本系统, 占绝对统治地位的开放源代码版本控制系统。"
#: share/advertising/24.pl:20
#, c-format
@@ -15541,7 +16017,7 @@ msgid ""
"Mandrakelinux-specific utilities designed to simplify the configuration of "
"your computer."
msgstr ""
-"<b>Mandrakelinux 控制中心</b>是 Mandrakelinux 特有工具的大集合,它可显著简化"
+"<b>Mandrakelinux 控制中心</b>是 Mandrakelinux 特有工具的大集合, 它可显著简化"
"对计算机的配置。"
#: share/advertising/25.pl:17
@@ -15552,8 +16028,8 @@ msgid ""
"points, network and Internet, security level of your computer, etc."
msgstr ""
"您将立即感受到这一组<b>超过 60 个</b>贴心工具的美妙之处。轻松配置硬件设备、定"
-"义挂载点、设置网络和 Internet、调整计算机的安全级别,以及与系统相关的所有内"
-"容,它都可帮您轻松完成。"
+"义挂载点、设置网络和 Internet、调整计算机的安全级别, 以及与系统相关的所有内"
+"容, 它都可帮您轻松完成。"
#: share/advertising/26.pl:13
#, c-format
@@ -15570,10 +16046,10 @@ msgid ""
"and the development of Mandrakelinux, <b>please</b> consider buying one of "
"our products or services!"
msgstr ""
-"与其它软件编程方式相同,开放源代码软件<b>需要时间和人力</b>进行开发。为了遵从"
-"开放源代码理念,Mandrakesoft 会销售增值产品和服务,以便进一步<b>改进 "
+"与其它软件编程方式相同, 开放源代码软件<b>需要时间和人力</b>进行开发。为了遵从"
+"开放源代码理念, Mandrakesoft 会销售增值产品和服务, 以便进一步<b>改进 "
"Mandrakelinux</b>。如果您想要<b>支持开放源代码理念</b>以及 Mandrakelinux 的开"
-"发,<b>请</b>考虑购买我们的产品或服务!"
+"发, <b>请</b>考虑购买我们的产品或服务!"
#: share/advertising/27.pl:13
#, c-format
@@ -15586,7 +16062,7 @@ msgid ""
"To learn more about Mandrakesoft products and services, you can visit our "
"<b>e-commerce platform</b>."
msgstr ""
-"要了解关于 Mandrakesoft 产品和服务的更多信息,您可以参观我们的<b>电子商务平台"
+"要了解关于 Mandrakesoft 产品和服务的更多信息, 您可以参观我们的<b>电子商务平台"
"</b>。"
#: share/advertising/27.pl:17
@@ -15599,7 +16075,7 @@ msgstr "您可在这里找到我们全部的产品、服务和第三方产品。
msgid ""
"This platform has just been <b>redesigned</b> to improve its efficiency and "
"usability."
-msgstr "此平台刚刚经过<b>重新设计</b>,效率和可用性都大为改观。"
+msgstr "此平台刚刚经过<b>重新设计</b>, 效率和可用性都大为改观。"
#: share/advertising/27.pl:21
#, c-format
@@ -15622,7 +16098,7 @@ msgstr "<b>Mandrakeclub</b> 是您 Mandrakelinux 产品的<b>绝佳拍档</b>...
#, c-format
msgid ""
"Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
-msgstr "加入 Mandrakeclub,您可充分享受各项<b>超值回馈</b>,例如:"
+msgstr "加入 Mandrakeclub, 您可充分享受各项<b>超值回馈</b>, 例如:"
#: share/advertising/28.pl:18
#, c-format
@@ -15651,7 +16127,7 @@ msgid ""
"\t* <b>Early and privileged access</b>, before public release, to "
"Mandrakelinux <b>ISO images</b>."
msgstr ""
-"\t* <b>优先访问</b>,在公众之前优先访问 Mandrakelinux <b>ISO 映像</b>。"
+"\t* <b>优先访问</b>, 在公众之前优先访问 Mandrakelinux <b>ISO 映像</b>。"
#: share/advertising/29.pl:13
#, c-format
@@ -15708,7 +16184,7 @@ msgid ""
"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
"<b>our technical support platform</b> www.mandrakeexpert.com."
msgstr ""
-"您需要<b>帮助</b>吗?您可在<b>我们的技术支持平台</b> www.mandrakeexpert.com "
+"您需要<b>帮助</b>吗?您可在<b>我们的技术支持平台</b> www.mandrakeexpert.com "
"与 Mandrakesoft 的技术专家会面。"
#: share/advertising/30.pl:17
@@ -15717,7 +16193,7 @@ msgid ""
"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
"a lot of time."
msgstr ""
-"感谢<b>具有资质认证的 Mandrakelinux 专家</b>的帮助,您将能够节省大量时间。"
+"感谢<b>具有资质认证的 Mandrakelinux 专家</b>的帮助, 您将能够节省大量时间。"
#: share/advertising/30.pl:19
#, c-format
@@ -15725,7 +16201,7 @@ msgid ""
"For any question related to Mandrakelinux, you have the possibility to "
"purchase support incidents at <b>store.mandrakesoft.com</b>."
msgstr ""
-"如果有关于 Mandrakelinux 的任何问题,您都可以在 <b>store.mandrakesoft.com</"
+"如果有关于 Mandrakelinux 的任何问题, 您都可以在 <b>store.mandrakesoft.com</"
"b> 购买支持事件。"
#: share/compssUsers.pl:25
@@ -15739,7 +16215,7 @@ msgid ""
"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
msgstr ""
-"办公程序: 字处理(OpenOffice.org Writer、Kword),电子表格(OpenOffice.org "
+"办公程序: 字处理(OpenOffice.org Writer、Kword), 电子表格(OpenOffice.org "
"Calc、Kspread)、PDF 阅读器等"
#: share/compssUsers.pl:28
@@ -15748,7 +16224,7 @@ msgid ""
"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
"gnumeric), pdf viewers, etc"
msgstr ""
-"办公程序: 字处理(kword、abiword),电子表格(kspread、gnumeric)、pdf 阅读器等"
+"办公程序: 字处理(kword、abiword), 电子表格(kspread、gnumeric)、pdf 阅读器等"
#: share/compssUsers.pl:33
#, c-format
@@ -15780,7 +16256,7 @@ msgstr "Internet 工作站"
msgid ""
"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
"Web"
-msgstr "一组工具,用于收发电子邮件及新闻组(mutt,tin..),浏览网站"
+msgstr "一组工具, 用于收发电子邮件及新闻组(mutt, tin..), 浏览网站"
#: share/compssUsers.pl:49
#, c-format
@@ -15810,12 +16286,12 @@ msgstr "控制台工具"
#: share/compssUsers.pl:60
#, c-format
msgid "Editors, shells, file tools, terminals"
-msgstr "编辑器,shell,文件工具,终端"
+msgstr "编辑器, shell, 文件工具, 终端"
#: share/compssUsers.pl:65 share/compssUsers.pl:165
#, c-format
msgid "C and C++ development libraries, programs and include files"
-msgstr "C 和 C++ 开发库,程序及头文件"
+msgstr "C 和 C++ 开发库, 程序及头文件"
#: share/compssUsers.pl:69 share/compssUsers.pl:169
#, c-format
@@ -15950,7 +16426,7 @@ msgstr "网络计算机服务器"
#: share/compssUsers.pl:138
#, c-format
msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS 服务器,SMB 服务器,代理服务器,SSH 服务器"
+msgstr "NFS 服务器, SMB 服务器, 代理服务器, SSH 服务器"
#: share/compssUsers.pl:146
#, c-format
@@ -15962,7 +16438,7 @@ msgstr "KDE 工作站"
msgid ""
"The K Desktop Environment, the basic graphical environment with a collection "
"of accompanying tools"
-msgstr "KDE 桌面环境,基本的图形环境和一组配套的工具"
+msgstr "KDE 桌面环境, 基本的图形环境和一组配套的工具"
#: share/compssUsers.pl:151
#, c-format
@@ -15984,7 +16460,7 @@ msgstr "其它图形桌面"
#: share/compssUsers.pl:156
#, c-format
msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm,Window Maker,Enlightenment, Fvwm 等"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm 等"
#: share/compssUsers.pl:179
#, c-format
@@ -16018,7 +16494,7 @@ msgstr "监视工具、进程统计、tcpdump、nmap……"
#: share/compssUsers.pl:196
#, c-format
-msgid "MandrakeSoft Wizards"
+msgid "Mandrakesoft Wizards"
msgstr "Mandrakesoft 向导"
#: share/compssUsers.pl:197
@@ -16043,15 +16519,15 @@ msgid ""
"along with this program; if not, write to the Free Software\n"
"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
msgstr ""
-"这个程序是自由软件;您可以重新发布,或修改它,只要您遵守来自 Free Software\n"
+"这个程序是自由软件;您可以重新发布, 或修改它, 只要您遵守来自 Free Software\n"
" Foundation 自由软件基金会的 GNU General Public License 通用公共许可证第 2\n"
-" 版,或者更新的版本。\n"
+" 版, 或者更新的版本。\n"
"\n"
-"我们发行这个软件是希望它有用,但是不提供任何担保;不保证它适合任何普通或特\n"
+"我们发行这个软件是希望它有用, 但是不提供任何担保;不保证它适合任何普通或特\n"
"定的用途。细节见 GNU General Public License 通用公共许可证。\n"
"\n"
"您应该随同本软件得到一份 GNU General Public License 通用公共许可证;如果没\n"
-"有,请写信给自由软件基金会,地址是 Free Software Foundation, Inc., 59 \n"
+"有, 请写信给自由软件基金会, 地址是 Free Software Foundation, Inc., 59 \n"
"Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
#: standalone.pm:40
@@ -16157,8 +16633,8 @@ msgstr ""
"--replace :若字体存在则替换\n"
"--application :0 无应用程序。\n"
" :1 支持所有应用程序。\n"
-" :应用程序名,如 so 代表 staroffice \n"
-" :gs 代表 ghostscript,仅在此处可用。"
+" :应用程序名, 如 so 代表 staroffice \n"
+" :gs 代表 ghostscript, 仅在此处可用。"
#: standalone.pm:84
#, c-format
@@ -16209,7 +16685,7 @@ msgid ""
"--disconnect : disconnect to internet if already connected\n"
"--force : used with (dis)connect : force (dis)connection.\n"
"--status : returns 1 if connected 0 otherwise, then exit.\n"
-"--quiet : don't be interactive. To be used with (dis)connect."
+"--quiet : do not be interactive. To be used with (dis)connect."
msgstr ""
"[选项]\n"
"网络和互联网连接配置和监视程序\n"
@@ -16218,7 +16694,7 @@ msgstr ""
"--connect: 如果没有连接到互联网则连接\n"
"--disconnect: 如果已经连接到互联网则断开\n"
"--force: 用于连接/断开: 强制连接/断开。\n"
-"--status: 如果连接则返回 1 否则返回 0,然后退出。\n"
+"--status: 如果连接则返回 1 否则返回 0, 然后退出。\n"
"--quiet: 不进行交互。用于断开连接。"
#: standalone.pm:107
@@ -16230,9 +16706,9 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
#, c-format
msgid ""
"[OPTION]...\n"
-" --no-confirmation don't ask first confirmation question in "
+" --no-confirmation do not ask first confirmation question in "
"MandrakeUpdate mode\n"
-" --no-verify-rpm don't verify packages signatures\n"
+" --no-verify-rpm do not verify packages signatures\n"
" --changelog-first display changelog before filelist in the "
"description window\n"
" --merge-all-rpmnew propose to merge all .rpmnew/.rpmsave files found"
@@ -16274,27 +16750,32 @@ msgstr ""
"用法:%s [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--testing] "
"[-v|--version] "
-#: standalone/XFdrake:85
+#: standalone/XFdrake:61
+#, c-format
+msgid "You need to reboot for changes to take effect"
+msgstr "您需要重新启动才能让更改生效"
+
+#: standalone/XFdrake:92
#, c-format
msgid "Please log out and then use Ctrl-Alt-BackSpace"
-msgstr "请注销,然后同时按 Ctrl-Alt-BackSpace"
+msgstr "请注销, 然后同时按 Ctrl-Alt-BackSpace"
-#: standalone/XFdrake:89
+#: standalone/XFdrake:96
#, c-format
msgid "You need to log out and back in again for changes to take effect"
msgstr "您需要注销后重新登录才能让更改生效"
-#: standalone/drakTermServ:76
+#: standalone/drakTermServ:74
#, c-format
msgid "Useless without Terminal Server"
msgstr "没有终端服务器就无用"
-#: standalone/drakTermServ:108 standalone/drakTermServ:114
+#: standalone/drakTermServ:106 standalone/drakTermServ:112
#, c-format
msgid "%s: %s requires a username...\n"
msgstr "%s: %s 需要用户名...\n"
-#: standalone/drakTermServ:125
+#: standalone/drakTermServ:123
#, c-format
msgid ""
"%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -16303,67 +16784,77 @@ msgstr ""
"%s: %s 需要主机名、MAC 地址、IP、nbi-image、代表瘦客户端的 0/1、代表本地配置"
"的 0/1...\n"
-#: standalone/drakTermServ:131
+#: standalone/drakTermServ:129
#, c-format
msgid "%s: %s requires hostname...\n"
msgstr "%s: %s 需要主机名...\n"
-#: standalone/drakTermServ:213 standalone/drakTermServ:216
+#: standalone/drakTermServ:211 standalone/drakTermServ:214
#, c-format
msgid "Terminal Server Configuration"
msgstr "终端服务器配置"
-#: standalone/drakTermServ:231
+#: standalone/drakTermServ:220
#, c-format
msgid "Enable Server"
msgstr "启用服务器"
-#: standalone/drakTermServ:237
+#: standalone/drakTermServ:226
#, c-format
msgid "Disable Server"
msgstr "禁用服务器"
-#: standalone/drakTermServ:245
+#: standalone/drakTermServ:232
#, c-format
msgid "Start Server"
msgstr "启动服务器"
-#: standalone/drakTermServ:251
+#: standalone/drakTermServ:238
#, c-format
msgid "Stop Server"
msgstr "停止服务器"
-#: standalone/drakTermServ:259
+#: standalone/drakTermServ:247
#, c-format
msgid "Etherboot Floppy/ISO"
msgstr "Etherboot 软盘/ISO"
-#: standalone/drakTermServ:263
+#: standalone/drakTermServ:251
#, c-format
msgid "Net Boot Images"
msgstr "网络启动磁盘镜像"
-#: standalone/drakTermServ:269
+#: standalone/drakTermServ:258
#, c-format
msgid "Add/Del Users"
msgstr "添加/删除用户"
-#: standalone/drakTermServ:273
+#: standalone/drakTermServ:262
#, c-format
msgid "Add/Del Clients"
msgstr "添加/删除客户"
-#: standalone/drakTermServ:284 standalone/drakbug:47
+#: standalone/drakTermServ:270
+#, c-format
+msgid "Images"
+msgstr "映像"
+
+#: standalone/drakTermServ:271
+#, c-format
+msgid "Clients/Users"
+msgstr "客户/用户"
+
+#: standalone/drakTermServ:289 standalone/drakbug:47
#, c-format
msgid "First Time Wizard"
msgstr "初次使用向导"
-#: standalone/drakTermServ:315 standalone/drakTermServ:316
+#: standalone/drakTermServ:325 standalone/drakTermServ:326
#, c-format
msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
-msgstr "%s 定义为 dm,将 gdm 用户添加到 /etc/passwd$$CLIENT$$"
+msgstr "%s 定义为 dm, 将 gdm 用户添加到 /etc/passwd$$CLIENT$$"
-#: standalone/drakTermServ:322
+#: standalone/drakTermServ:332
#, c-format
msgid ""
"\n"
@@ -16390,32 +16881,37 @@ msgstr ""
"\t1) 要求您选择“瘦”或“胖”客户。\n"
"\t2) 设置 DHCP。\n"
"\t\n"
-"完成以上步骤后,向导将: \n"
+"完成以上步骤后, 向导将: \n"
"\t\n"
" a) 制作全部 nbis。\n"
" b) 激活服务器。\n"
" c) 启动服务器。\n"
-" d) 同步 shadow 文件,这样包括 root 在内的全部用户都将会被添\n"
+" d) 同步 shadow 文件, 这样包括 root 在内的全部用户都将会被添\n"
" 加到 shadow$$CLIENT$$ 文件中了。\n"
" e) 要求您制作启动软盘。\n"
-" f) 如果是瘦客户的话,询问您是否想要重新启动 K 登陆管理器(KDM)。\n"
+" f) 如果是瘦客户的话, 询问您是否想要重新启动 K 登陆管理器(KDM)。\n"
-#: standalone/drakTermServ:367
+#: standalone/drakTermServ:377
#, c-format
msgid "Cancel Wizard"
msgstr "取消向导"
-#: standalone/drakTermServ:379
+#: standalone/drakTermServ:392
#, c-format
msgid "Please save dhcpd config!"
msgstr "请保存 dhcpd 配置!"
-#: standalone/drakTermServ:407
+#: standalone/drakTermServ:420
#, c-format
msgid "Use thin clients."
msgstr "使用瘦客户端。"
-#: standalone/drakTermServ:409
+#: standalone/drakTermServ:422
+#, c-format
+msgid "Sync client X keyboard settings with server."
+msgstr "将客户端的 X 键盘设置与服务器同步。"
+
+#: standalone/drakTermServ:424
#, c-format
msgid ""
"Please select default client type.\n"
@@ -16424,48 +16920,43 @@ msgid ""
" 'Fat' clients use their own CPU/RAM but the server's filesystem."
msgstr ""
"请选择默认客户端类型。\n"
-" “瘦”客户端会使用服务器的 CPU/内存,只是使用客户端进行显示。\n"
-" “胖”客户端将会使用自己的 CPU/内存,但会使用服务器的文件系统。"
+" “瘦”客户端会使用服务器的 CPU/内存, 只是使用客户端进行显示。\n"
+" “胖”客户端将会使用自己的 CPU/内存, 但会使用服务器的文件系统。"
-#: standalone/drakTermServ:421 standalone/drakTermServ:1034
-#, c-format
-msgid "Sync client X keyboard settings with server."
-msgstr "将客户端的 X 键盘设置与服务器同步。"
-
-#: standalone/drakTermServ:428
+#: standalone/drakTermServ:444
#, c-format
msgid "Creating net boot images for all kernels"
msgstr "为全部内核创建网络引导映像"
-#: standalone/drakTermServ:429 standalone/drakTermServ:726
-#: standalone/drakTermServ:742
+#: standalone/drakTermServ:445 standalone/drakTermServ:747
+#: standalone/drakTermServ:764
#, c-format
msgid "This will take a few minutes."
msgstr "这将花费几分钟。"
-#: standalone/drakTermServ:433 standalone/drakTermServ:452
+#: standalone/drakTermServ:449 standalone/drakTermServ:468
#, c-format
msgid "Done!"
msgstr "完成!"
-#: standalone/drakTermServ:438
+#: standalone/drakTermServ:454
#, c-format
msgid "Syncing server user list with client list, including root."
-msgstr "将服务器用户列表与客户列表同步,包括 root。"
+msgstr "将服务器用户列表与客户列表同步, 包括 root。"
-#: standalone/drakTermServ:458
+#: standalone/drakTermServ:474
#, c-format
msgid ""
"In order to enable changes made for thin clients, the display manager must "
"be restarted. Restart now?"
-msgstr "为了要启用为瘦客户所作的更改,必须重新启动显示管理器。立即重新启动吗?"
+msgstr "为了要启用为瘦客户所作的更改, 必须重新启动显示管理器。立即重新启动吗?"
-#: standalone/drakTermServ:493
+#: standalone/drakTermServ:509
#, c-format
msgid "Terminal Server Overview"
msgstr "终端服务器概览"
-#: standalone/drakTermServ:494
+#: standalone/drakTermServ:510
#, c-format
msgid ""
" - Create Etherboot Enabled Boot Images:\n"
@@ -16481,14 +16972,14 @@ msgid ""
"one full kernel."
msgstr ""
" - 创建 Etherboot 的以太网启动映像:\n"
-" \t要通过 etherboot 启动核心,必须创建特殊的 kernel/initrd 映像。\n"
-" \tmkinitrd-net 能够在这一过程中发挥很大作用,而“Drak 终端服务”仅仅"
+" \t要通过 etherboot 启动核心, 必须创建特殊的 kernel/initrd 映像。\n"
+" \tmkinitrd-net 能够在这一过程中发挥很大作用, 而“Drak 终端服务”仅仅"
"是\n"
" \t帮助管理/定制这些映像的图形化界面。要创建文件 /etc/dhcpd.conf."
-"etherboot-pcimap.include,与 dhcpd.conf 相关联,\n"
+"etherboot-pcimap.include, 与 dhcpd.conf 相关联, \n"
" \t您需要至少为一个完整的内核创建以太网启动镜像。"
-#: standalone/drakTermServ:500
+#: standalone/drakTermServ:516
#, c-format
msgid ""
" - Maintain /etc/dhcpd.conf:\n"
@@ -16508,19 +16999,19 @@ msgid ""
"like:"
msgstr ""
" - 维护 /etc/dhcpd.conf:\n"
-" \t\t要通过网络启动客户端,每个客户端都需要一个 dhcpd.conf 项,指派"
+" \t\t要通过网络启动客户端, 每个客户端都需要一个 dhcpd.conf 项, 指派"
"一\n"
" \t\t个 IP 地址和机器的网络启动映像。drakTermServ 能够帮助创建/删除"
"这\n"
" \t\t些项。\n"
"\t\t\t\n"
" \t\t(PCI 卡可以省略映像 - etherboot 会请求正确的映像。您应该还考"
-"虑 \t\tetherboot 何时查找映像,因此需要被命名为\n"
-" \t\tboot-3c59x.nbi,而不是 boot-3c59x.2.4.19-16mdk.nbi)。\n"
+"虑 \t\tetherboot 何时查找映像, 因此需要被命名为\n"
+" \t\tboot-3c59x.nbi, 而不是 boot-3c59x.2.4.19-16mdk.nbi)。\n"
"\t\t\t \n"
" \t\t一个可以支持无盘工作站典型的 dhcpd.conf 应该是这样:"
-#: standalone/drakTermServ:518
+#: standalone/drakTermServ:534
#, c-format
msgid ""
" While you can use a pool of IP addresses, rather than setup a "
@@ -16558,22 +17049,22 @@ msgid ""
" Note: You must stop/start the server after adding or changing "
"clients."
msgstr ""
-"\t\t\t尽管您可以使用 IP 地址池,而不是为某个客户机设置特定的地址,但使用固"
+"\t\t\t尽管您可以使用 IP 地址池, 而不是为某个客户机设置特定的地址, 但使用固"
"定\n"
"\t\t\t地址方案将会促进 ClusterNFS 所提供的指定客户端配置文件的功能。\n"
"\t\t\t\n"
"\t\t\t注意:“#type”项仅由 drakTermServ 使用。客户端可以是“thin”或\n"
-"\t\t\t“fat”。瘦客户端可以通过 XDMCP 运行服务器上的大多数软件,而胖客户端则\n"
-"\t\t\t在本机上运行大多数软件。有一个特殊的 inittab,\n"
+"\t\t\t“fat”。瘦客户端可以通过 XDMCP 运行服务器上的大多数软件, 而胖客户端则\n"
+"\t\t\t在本机上运行大多数软件。有一个特殊的 inittab, \n"
"\t\t\t%s 是专为瘦客户端写的。如果使用的是瘦\n"
-"\t\t\t客户端,为了启用 XDMCP,则需要修改系统配置文件 xdm-config,kdmrc 和 \n"
-"\t\t\tgdm.conf。考虑到使用 XDMCP 时可能出现的安全问题,需要修改 host.deny "
+"\t\t\t客户端, 为了启用 XDMCP, 则需要修改系统配置文件 xdm-config, kdmrc 和 \n"
+"\t\t\tgdm.conf。考虑到使用 XDMCP 时可能出现的安全问题, 需要修改 host.deny "
"和 \n"
"\t\t\thosts.allow 来限制仅可由本地子网访问。\n"
"\t\t\t\n"
"\t\t\t注意:在添加或更改客户端后您必须停止/启动服务器。"
-#: standalone/drakTermServ:538
+#: standalone/drakTermServ:554
#, c-format
msgid ""
" - Maintain /etc/exports:\n"
@@ -16602,7 +17093,7 @@ msgstr ""
"\t\t\t\n"
"\t\t\t这里的子网/掩码应该与您的网络相同。"
-#: standalone/drakTermServ:550
+#: standalone/drakTermServ:566
#, c-format
msgid ""
" - Maintain %s:\n"
@@ -16613,12 +17104,12 @@ msgid ""
"file."
msgstr ""
" - 维护 %s:\n"
-" \t\t对于那些想要从无盘工作站登录到系统的用户来说,他们所对应的登录"
+" \t\t对于那些想要从无盘工作站登录到系统的用户来说, 他们所对应的登录"
"项\n"
-" \t\t除了要在 /etc/shadow 中之外,还应在 %s$\n"
+" \t\t除了要在 /etc/shadow 中之外, 还应在 %s$\n"
" \t\t中存有副本。drakTermServ 能够帮助您完成这一过程。"
-#: standalone/drakTermServ:554
+#: standalone/drakTermServ:570
#, c-format
msgid ""
" - Per client %s:\n"
@@ -16629,13 +17120,13 @@ msgid ""
" \tdrakTermServ will help create these files."
msgstr ""
" - 每客户 %s:\n"
-" \t\t通过 clusternfs,每个无盘工作站都可以在服务器的 root 文件系统中"
+" \t\t通过 clusternfs, 每个无盘工作站都可以在服务器的 root 文件系统中"
"有\n"
-" \t\t其自己唯一的配置文件。通过允许客户端硬件配置,drakTermServ 将会帮"
+" \t\t其自己唯一的配置文件。通过允许客户端硬件配置, drakTermServ 将会帮"
"助您创建\n"
" \t\t这些文件。"
-#: standalone/drakTermServ:559
+#: standalone/drakTermServ:575
#, c-format
msgid ""
" - Per client system configuration files:\n"
@@ -16655,19 +17146,19 @@ msgid ""
"machine is configured."
msgstr ""
" - 每客户系统配置文件:\n"
-" \t通过 clusternfs,每一个无盘工作站都能拥有一个属于自己的唯一的配置文"
-"件,\n"
+" \t通过 clusternfs, 每一个无盘工作站都能拥有一个属于自己的唯一的配置文"
+"件, \n"
" \t保存在服务器的 root 文件系统中。通过允许本地客户端的硬件配置的存"
-"在,\n"
-" \t客户端能够定制诸如 /etc/modules.conf,/etc/sysconfig/mouse,/etc/"
+"在, \n"
+" \t客户端能够定制诸如 /etc/modules.conf, /etc/sysconfig/mouse, /etc/"
"sysconfig/keyboard\n"
" \t在每客户端的基础之上。\n"
"\n"
" 注意:启用本地硬件配置就意味着启用了 root 登录到每一个客户端机器的\n"
-" 终端服务器这一特性。本地配置能够被关闭,但\n"
-" 保留配置文件,只要客户端机器被配置了的话。"
+" 终端服务器这一特性。本地配置能够被关闭, 但\n"
+" 保留配置文件, 只要客户端机器被配置了的话。"
-#: standalone/drakTermServ:568
+#: standalone/drakTermServ:584
#, c-format
msgid ""
" - /etc/xinetd.d/tftp:\n"
@@ -16715,11 +17206,11 @@ msgstr ""
" server_args = -s /var/lib/tftpboot\n"
" \t}\n"
" \t\t\n"
-" \t\t与默认安装相比,这里的更改在于将 disable 标志置为“no”,并且将目录"
+" \t\t与默认安装相比, 这里的更改在于将 disable 标志置为“no”, 并且将目录"
"更改\n"
-" \t\t为 /var/lib/tftpboot,这里正是 mkinitrd-net 存放映像的地点。"
+" \t\t为 /var/lib/tftpboot, 这里正是 mkinitrd-net 存放映像的地点。"
-#: standalone/drakTermServ:589
+#: standalone/drakTermServ:605
#, c-format
msgid ""
" - Create etherboot floppies/CDs:\n"
@@ -16737,7 +17228,7 @@ msgid ""
" \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
msgstr ""
" - 创建 etherboot 启动软盘/光盘:\n"
-" \t\t无法工作站需要在网卡上有 ROM 镜像,或者启动软盘或光盘来初始化启动"
+" \t\t无法工作站需要在网卡上有 ROM 镜像, 或者启动软盘或光盘来初始化启动"
"过程。\n"
" \t\t“Drak 终端服务”能够帮助您根据客户端计算机的网卡生成这些镜像。\n"
" \t\t\n"
@@ -16747,62 +17238,72 @@ msgstr ""
" \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
" \t\t/usr/lib/etherboot/lzrom/3c509.lzrom > /dev/fd0"
-#: standalone/drakTermServ:624
+#: standalone/drakTermServ:640
#, c-format
msgid "Boot Floppy"
msgstr "启动软盘"
-#: standalone/drakTermServ:626
+#: standalone/drakTermServ:642
#, c-format
msgid "Boot ISO"
msgstr "启动 ISO"
-#: standalone/drakTermServ:628
+#: standalone/drakTermServ:644
#, c-format
msgid "PXE Image"
msgstr "PXE 映像"
-#: standalone/drakTermServ:696
+#: standalone/drakTermServ:712
#, c-format
msgid "Default kernel version"
msgstr "默认内核版本"
-#: standalone/drakTermServ:724
+#: standalone/drakTermServ:715
+#, c-format
+msgid "Create PXE images."
+msgstr "创建 PXE 映像。"
+
+#: standalone/drakTermServ:745
#, c-format
msgid "Build Whole Kernel -->"
msgstr "建造整个内核 -->"
-#: standalone/drakTermServ:731
+#: standalone/drakTermServ:753
#, c-format
msgid "No kernel selected!"
msgstr "没有选择内核!"
-#: standalone/drakTermServ:734
+#: standalone/drakTermServ:756
#, c-format
msgid "Build Single NIC -->"
msgstr "建造单独的网卡 -->"
-#: standalone/drakTermServ:738
+#: standalone/drakTermServ:760
#, c-format
msgid "No NIC selected!"
msgstr "没有选择网卡!"
-#: standalone/drakTermServ:741
+#: standalone/drakTermServ:763
#, c-format
msgid "Build All Kernels -->"
msgstr "建造全部内核 -->"
-#: standalone/drakTermServ:749
+#: standalone/drakTermServ:774
#, c-format
msgid "<-- Delete"
msgstr "<-- 删除"
-#: standalone/drakTermServ:756
+#: standalone/drakTermServ:779
+#, c-format
+msgid "No image selected!"
+msgstr "没有选择图像!"
+
+#: standalone/drakTermServ:782
#, c-format
msgid "Delete All NBIs"
msgstr "删除所有 NBI"
-#: standalone/drakTermServ:843
+#: standalone/drakTermServ:908
#, c-format
msgid ""
"!!! Indicates the password in the system database is different than\n"
@@ -16812,94 +17313,101 @@ msgstr ""
"!!!表明系统数据库中的密码与终端服务器数据库中的密码不同。\n"
"请删除/在终端服务器中重新添加用户后才能登录。"
-#: standalone/drakTermServ:848
+#: standalone/drakTermServ:913
#, c-format
msgid "Add User -->"
msgstr "添加用户 -->"
-#: standalone/drakTermServ:854
+#: standalone/drakTermServ:919
#, c-format
msgid "<-- Del User"
msgstr "<-- 删除用户"
-#: standalone/drakTermServ:890
+#: standalone/drakTermServ:955
#, c-format
msgid "type: %s"
msgstr "类型: %s"
-#: standalone/drakTermServ:894
+#: standalone/drakTermServ:959
#, c-format
msgid "local config: %s"
msgstr "本地配置: %s"
-#: standalone/drakTermServ:924
+#: standalone/drakTermServ:989
#, c-format
msgid ""
"Allow local hardware\n"
"configuration."
msgstr "允许本地硬件配置。"
-#: standalone/drakTermServ:933
+#: standalone/drakTermServ:998
#, c-format
msgid "No net boot images created!"
msgstr "没有创建网络启动镜像!"
-#: standalone/drakTermServ:951
+#: standalone/drakTermServ:1017
#, c-format
msgid "Thin Client"
msgstr "瘦客户端"
-#: standalone/drakTermServ:955
+#: standalone/drakTermServ:1021
#, c-format
msgid "Allow Thin Clients"
msgstr "允许瘦客户端"
-#: standalone/drakTermServ:956
+#: standalone/drakTermServ:1022
+#, c-format
+msgid ""
+"Sync client X keyboard\n"
+" settings with server."
+msgstr "将客户端的 X 键盘设置与服务器同步。"
+
+#: standalone/drakTermServ:1023
#, c-format
msgid "Add Client -->"
msgstr "添加客户 -->"
-#: standalone/drakTermServ:970
+#: standalone/drakTermServ:1037
#, c-format
msgid "type: fat"
msgstr "类型: 胖"
-#: standalone/drakTermServ:971
+#: standalone/drakTermServ:1038
#, c-format
msgid "type: thin"
msgstr "类型: 瘦"
-#: standalone/drakTermServ:978
+#: standalone/drakTermServ:1045
#, c-format
msgid "local config: false"
msgstr "本机配置: 假"
-#: standalone/drakTermServ:979
+#: standalone/drakTermServ:1046
#, c-format
msgid "local config: true"
msgstr "本地配置: 真"
-#: standalone/drakTermServ:987
+#: standalone/drakTermServ:1054
#, c-format
msgid "<-- Edit Client"
msgstr "<-- 编辑客户"
-#: standalone/drakTermServ:1013
+#: standalone/drakTermServ:1080
#, c-format
msgid "Disable Local Config"
msgstr "禁用本地配置"
-#: standalone/drakTermServ:1020
+#: standalone/drakTermServ:1087
#, c-format
msgid "Delete Client"
msgstr "删除客户"
-#: standalone/drakTermServ:1029
+#: standalone/drakTermServ:1096
#, c-format
msgid "dhcpd Config..."
msgstr "dhcpd 配置..."
-#: standalone/drakTermServ:1045
+#: standalone/drakTermServ:1111
#, c-format
msgid ""
"Need to restart the Display Manager for full changes to take effect. \n"
@@ -16908,77 +17416,77 @@ msgstr ""
"需要重新启动显示管理器以便所有更改生效。\n"
"(service dm restart - 控制台上)"
-#: standalone/drakTermServ:1085
+#: standalone/drakTermServ:1156
#, c-format
-msgid "Thin clients won't work with autologin. Disable autologin?"
-msgstr "瘦客户无法使用自动登录。禁用自动登录吗?"
+msgid "Thin clients will not work with autologin. Disable autologin?"
+msgstr "瘦客户无法使用自动登录。禁用自动登录吗?"
-#: standalone/drakTermServ:1101
+#: standalone/drakTermServ:1172
#, c-format
msgid "All clients will use %s"
msgstr "全部客户都使用 %s"
-#: standalone/drakTermServ:1133
+#: standalone/drakTermServ:1204
#, c-format
msgid "Subnet:"
msgstr "子网: "
-#: standalone/drakTermServ:1140
+#: standalone/drakTermServ:1211
#, c-format
msgid "Netmask:"
msgstr "子网掩码: "
-#: standalone/drakTermServ:1147
+#: standalone/drakTermServ:1218
#, c-format
msgid "Routers:"
msgstr "路由器: "
-#: standalone/drakTermServ:1154
+#: standalone/drakTermServ:1225
#, c-format
msgid "Subnet Mask:"
msgstr "子网掩码: "
-#: standalone/drakTermServ:1161
+#: standalone/drakTermServ:1232
#, c-format
msgid "Broadcast Address:"
msgstr "广播地址: "
-#: standalone/drakTermServ:1168
+#: standalone/drakTermServ:1239
#, c-format
msgid "Domain Name:"
msgstr "域名: "
-#: standalone/drakTermServ:1176
+#: standalone/drakTermServ:1247
#, c-format
msgid "Name Servers:"
msgstr "命名服务器: "
-#: standalone/drakTermServ:1187
+#: standalone/drakTermServ:1258
#, c-format
msgid "IP Range Start:"
msgstr "IP 范围起点: "
-#: standalone/drakTermServ:1188
+#: standalone/drakTermServ:1259
#, c-format
msgid "IP Range End:"
msgstr "IP 范围终点: "
-#: standalone/drakTermServ:1230
+#: standalone/drakTermServ:1301
#, c-format
msgid "Append TS Includes To Existing Config"
msgstr "在已有配置中追加 TS 包含"
-#: standalone/drakTermServ:1232
+#: standalone/drakTermServ:1303
#, c-format
msgid "Write Config"
msgstr "写入配置"
-#: standalone/drakTermServ:1248
+#: standalone/drakTermServ:1319
#, c-format
msgid "dhcpd Server Configuration"
msgstr "dhcpd 服务器配置"
-#: standalone/drakTermServ:1249
+#: standalone/drakTermServ:1320
#, c-format
msgid ""
"Most of these values were extracted\n"
@@ -16988,100 +17496,100 @@ msgstr ""
"这些值中绝大多数会从您正在运行的系统\n"
"中提取。若需要您可以进行修改。"
-#: standalone/drakTermServ:1252
+#: standalone/drakTermServ:1323
#, c-format
msgid "Dynamic IP Address Pool:"
msgstr "动态 IP 地址池: "
-#: standalone/drakTermServ:1399
+#: standalone/drakTermServ:1474
#, c-format
msgid "Please insert floppy disk:"
msgstr "请插入软盘: "
-#: standalone/drakTermServ:1403
+#: standalone/drakTermServ:1478
#, c-format
-msgid "Couldn't access the floppy!"
+msgid "Could not access the floppy!"
msgstr "无法访问软盘!"
-#: standalone/drakTermServ:1405
+#: standalone/drakTermServ:1480
#, c-format
msgid "Floppy can be removed now"
msgstr "现在可以取出软盘了"
-#: standalone/drakTermServ:1408
+#: standalone/drakTermServ:1483
#, c-format
msgid "No floppy drive available!"
msgstr "没有可用的软盘驱动器!"
-#: standalone/drakTermServ:1413
+#: standalone/drakTermServ:1488
#, c-format
msgid "PXE image is %s/%s"
msgstr "PXE 镜像是 %s/%s"
-#: standalone/drakTermServ:1415
+#: standalone/drakTermServ:1490
#, c-format
msgid "Error writing %s/%s"
msgstr "写入 %s/%s 出错"
-#: standalone/drakTermServ:1424
+#: standalone/drakTermServ:1500
#, c-format
msgid "Etherboot ISO image is %s"
msgstr "Etherboot ISO 镜像是 %s"
-#: standalone/drakTermServ:1426
+#: standalone/drakTermServ:1502
#, c-format
msgid "Something went wrong! - Is mkisofs installed?"
-msgstr "发生错误!- mkisofs 安装了吗?"
+msgstr "发生错误!- mkisofs 安装了吗?"
-#: standalone/drakTermServ:1447
+#: standalone/drakTermServ:1523
#, c-format
msgid "Need to create /etc/dhcpd.conf first!"
msgstr "需要先创建 /etc/dhcpd.conf 文件!"
-#: standalone/drakTermServ:1602
+#: standalone/drakTermServ:1683
#, c-format
msgid "%s passwd bad in Terminal Server - rewriting...\n"
msgstr "%s 的密码在中断服务器中无效 - 正在重写...\n"
-#: standalone/drakTermServ:1615
+#: standalone/drakTermServ:1696
#, c-format
msgid "%s is not a user..\n"
msgstr "%s 不是用户...\n"
-#: standalone/drakTermServ:1616
+#: standalone/drakTermServ:1697
#, c-format
msgid "%s is already a Terminal Server user\n"
msgstr "%s 已经是终端服务器用户了\n"
-#: standalone/drakTermServ:1618
+#: standalone/drakTermServ:1699
#, c-format
msgid "Addition of %s to Terminal Server failed!\n"
msgstr "将 %s 添加到终端服务器失败!\n"
-#: standalone/drakTermServ:1620
+#: standalone/drakTermServ:1701
#, c-format
msgid "%s added to Terminal Server\n"
msgstr "%s 已加入终端服务器\n"
-#: standalone/drakTermServ:1666
+#: standalone/drakTermServ:1718
#, c-format
msgid "Deleted %s...\n"
msgstr "已删除 %s...\n"
-#: standalone/drakTermServ:1668 standalone/drakTermServ:1741
+#: standalone/drakTermServ:1720 standalone/drakTermServ:1793
#, c-format
msgid "%s not found...\n"
msgstr "%s 未找到...\n"
-#: standalone/drakTermServ:1769
+#: standalone/drakTermServ:1821
#, c-format
msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
msgstr "/etc/hosts.allow 和 /etc/hosts.deny 已经配置 - 无更改"
-#: standalone/drakTermServ:1921
+#: standalone/drakTermServ:1961
#, c-format
msgid "Configuration changed - restart clusternfs/dhcpd?"
-msgstr "配置已更改 - 重新启动 clusternfs/dhcpd 吗?"
+msgstr "配置已更改 - 重新启动 clusternfs/dhcpd 吗?"
#: standalone/drakautoinst:38
#, c-format
@@ -17090,7 +17598,7 @@ msgstr "错误!"
#: standalone/drakautoinst:39
#, c-format
-msgid "I can't find needed image file `%s'."
+msgid "I can not find needed image file `%s'."
msgstr "无法找到映像文件“%s”。"
#: standalone/drakautoinst:41
@@ -17113,11 +17621,11 @@ msgid ""
"\n"
"Press ok to continue."
msgstr ""
-"现在配置自动安装软盘。该功能有些危险,请慎重使用。\n"
+"现在配置自动安装软盘。该功能有些危险, 请慎重使用。\n"
"\n"
-"使用此功能,您可以重现该机器的安装,交互提示某些步骤,修改数值。\n"
+"使用此功能, 您可以重现该机器的安装, 交互提示某些步骤, 修改数值。\n"
"\n"
-"为安全起见,分区及格式化不会自动执行。您必须在要安装的机器上选择。\n"
+"为安全起见, 分区及格式化不会自动执行。您必须在要安装的机器上选择。\n"
"\n"
"请点击确定继续。"
@@ -17141,7 +17649,7 @@ msgstr "自动步骤配置"
msgid ""
"Please choose for each step whether it will replay like your install, or it "
"will be manual"
-msgstr "请指定安装的每一步骤,是要按照本次安装重放,还是手工完成"
+msgstr "请指定安装的每一步骤, 是要按照本次安装重放, 还是手工完成"
#: standalone/drakautoinst:77 standalone/drakautoinst:78
#: standalone/drakautoinst:92
@@ -17172,8 +17680,8 @@ msgstr ""
"\n"
"左边列出了自动安装可用的选项"
-#: standalone/drakautoinst:252 standalone/drakgw:600 standalone/drakvpn:902
-#: standalone/scannerdrake:375
+#: standalone/drakautoinst:252 standalone/drakgw:597 standalone/drakvpn:902
+#: standalone/scannerdrake:405
#, c-format
msgid "Congratulations!"
msgstr "恭喜!"
@@ -17212,56 +17720,56 @@ msgstr "硬盘"
msgid "tape"
msgstr "磁带机"
-#: standalone/drakbackup:153
+#: standalone/drakbackup:152
#, c-format
msgid ""
"Expect is an extension to the TCL scripting language that allows interactive "
"sessions without user intervention."
-msgstr "异常是 TCL 脚本语言的一种扩展,允许免打扰的交互式会话。"
+msgstr "异常是 TCL 脚本语言的一种扩展, 允许免打扰的交互式会话。"
-#: standalone/drakbackup:154
+#: standalone/drakbackup:153
#, c-format
msgid "Store the password for this system in drakbackup configuration."
msgstr "在“Drak 备份”的配置中存储此系统的密码。"
-#: standalone/drakbackup:155
+#: 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。"
+msgstr "对于多轨道 CD, 仅仅第一段会删除 cdrw。否则会在每次备份时删除 cdrw。"
-#: standalone/drakbackup:156
+#: 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:157
+#: standalone/drakbackup:156
#, c-format
msgid ""
"Incremental backups only save files that have changed or are new since the "
"last backup."
msgstr "增量备份只备份那些自上次备份后更改或新建的文件。"
-#: standalone/drakbackup:158
+#: 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:159
+#: standalone/drakbackup:158
#, c-format
msgid ""
"This should be a local user or email address that you want the backup "
"results sent to. You will need to define a functioning mail server."
msgstr ""
-"这应该是以逗号分隔的本地用户或电子邮件列表,备份结果将会发送给这些人。您还需"
+"这应该是以逗号分隔的本地用户或电子邮件列表, 备份结果将会发送给这些人。您还需"
"要能够正常工作的邮件服务器。"
-#: standalone/drakbackup:160
+#: standalone/drakbackup:159
#, c-format
msgid ""
"Files or wildcards listed in a .backupignore file at the top of a directory "
@@ -17269,27 +17777,27 @@ msgid ""
msgstr ""
"在目录树顶层列出的 .backupignore 文件中列出的文件或通配符表将不会备份。"
-#: standalone/drakbackup:161
+#: standalone/drakbackup:160
#, c-format
msgid ""
"For backups to other media, files are still created on the hard drive, then "
"moved to the other media. Enabling this option will remove the hard drive "
"tar files after the backup."
msgstr ""
-"对于备份到其它介质,文件仍然会先在硬盘上创建,然后移动到其它介质。启用此选项"
+"对于备份到其它介质, 文件仍然会先在硬盘上创建, 然后移动到其它介质。启用此选项"
"将在备份完成后删除硬盘上的 tar 文件。"
-#: standalone/drakbackup:162
+#: standalone/drakbackup:161
#, c-format
msgid ""
"Some protocols, like rsync, may be configured at the server end. Rather "
"than using a directory path, you would use the 'module' name for the service "
"path."
msgstr ""
-"某些协议,如 rsync,可以在服务器后端配置。除了使用目录路径,您还可以使用服务"
+"某些协议, 如 rsync, 可以在服务器后端配置。除了使用目录路径, 您还可以使用服务"
"器路径的“模块”名。"
-#: standalone/drakbackup:163
+#: standalone/drakbackup:162
#, c-format
msgid ""
"Custom allows you to specify your own day and time. The other options use "
@@ -17298,50 +17806,50 @@ msgstr ""
"自定义允许您指定您自己的天和时间。其它选项将使用 /etc/crontab 中的 run-"
"parts。"
-#: standalone/drakbackup:327
+#: standalone/drakbackup:326
#, c-format
msgid "No media selected for cron operation."
msgstr "没有为 cron 操作选择介质。"
-#: standalone/drakbackup:331
+#: standalone/drakbackup:330
#, c-format
msgid "No interval selected for cron operation."
msgstr "没有为 cron 操作选择间隔。"
-#: standalone/drakbackup:378
+#: standalone/drakbackup:377
#, c-format
msgid "Interval cron not available as non-root"
msgstr "非 root 用户还不能使用间隔 cron"
-#: standalone/drakbackup:463 standalone/logdrake:437
+#: standalone/drakbackup:462 standalone/logdrake:437
#, c-format
msgid "\"%s\" neither is a valid email nor is an existing local user!"
-msgstr "“%s”既不是有效的电子邮件,也不是已存在的本地用户!"
+msgstr "“%s”既不是有效的电子邮件, 也不是已存在的本地用户!"
-#: standalone/drakbackup:467 standalone/logdrake:442
+#: standalone/drakbackup:466 standalone/logdrake:442
#, c-format
msgid ""
"\"%s\" is a local user, but you did not select a local smtp, so you must use "
"a complete email address!"
msgstr ""
-"“%s”是本地用户,但是您没有选择本地 SMTP,所以您必须使用完整的电子邮件地址!"
+"“%s”是本地用户, 但是您没有选择本地 SMTP, 所以您必须使用完整的电子邮件地址!"
-#: standalone/drakbackup:476
+#: standalone/drakbackup:475
#, c-format
msgid "Valid user list changed, rewriting config file."
-msgstr "有效用户列表已经更改,重写配置文件。"
+msgstr "有效用户列表已经更改, 重写配置文件。"
-#: standalone/drakbackup:478
+#: standalone/drakbackup:477
#, c-format
msgid "Old user list:\n"
msgstr "旧用户列表:\n"
-#: standalone/drakbackup:480
+#: standalone/drakbackup:479
#, c-format
msgid "New user list:\n"
msgstr "新用户列表:\n"
-#: standalone/drakbackup:525
+#: standalone/drakbackup:524
#, c-format
msgid ""
"\n"
@@ -17350,7 +17858,7 @@ msgstr ""
"\n"
" “Drak 备份”报告 \n"
-#: standalone/drakbackup:526
+#: standalone/drakbackup:525
#, c-format
msgid ""
"\n"
@@ -17359,7 +17867,7 @@ msgstr ""
"\n"
" “Drak 备份”守护进程报告\n"
-#: standalone/drakbackup:532
+#: standalone/drakbackup:531
#, c-format
msgid ""
"\n"
@@ -17371,13 +17879,13 @@ msgstr ""
" “Drak 备份”报告细节\n"
"\n"
-#: standalone/drakbackup:557 standalone/drakbackup:628
-#: standalone/drakbackup:684
+#: standalone/drakbackup:556 standalone/drakbackup:627
+#: standalone/drakbackup:683
#, c-format
msgid "Total progress"
msgstr "总进度"
-#: standalone/drakbackup:610
+#: standalone/drakbackup:609
#, c-format
msgid ""
"%s exists, delete?\n"
@@ -17385,47 +17893,47 @@ msgid ""
"If you've already done this process you'll probably\n"
" need to purge the entry from authorized_keys on the server."
msgstr ""
-"%s 已存在,要删除吗?\n"
+"%s 已存在, 要删除吗?\n"
"\n"
-"如果您曾经做过这个步骤,您可能需要\n"
+"如果您曾经做过这个步骤, 您可能需要\n"
"从服务器的的 authorized_keys 删除该项目。"
-#: standalone/drakbackup:619
+#: standalone/drakbackup:618
#, c-format
msgid "This may take a moment to generate the keys."
msgstr "生成密钥需要一些时间。"
-#: standalone/drakbackup:626
+#: standalone/drakbackup:625
#, c-format
msgid "Cannot spawn %s."
msgstr "无法 spawn %s。"
-#: standalone/drakbackup:643
+#: standalone/drakbackup:642
#, c-format
msgid "No password prompt on %s at port %s"
msgstr "%s 上的端口 %s 没有密码提示"
-#: standalone/drakbackup:644
+#: standalone/drakbackup:643
#, c-format
msgid "Bad password on %s"
msgstr "%s 密码无效"
-#: standalone/drakbackup:645
+#: standalone/drakbackup:644
#, c-format
msgid "Permission denied transferring %s to %s"
msgstr "没有权限把 %s 迁移到 %s"
-#: standalone/drakbackup:646
+#: standalone/drakbackup:645
#, c-format
-msgid "Can't find %s on %s"
+msgid "Can not find %s on %s"
msgstr "没有 %s 在 %s 上"
-#: standalone/drakbackup:650
+#: standalone/drakbackup:649
#, c-format
msgid "%s not responding"
msgstr "%s 没有响应"
-#: standalone/drakbackup:654
+#: standalone/drakbackup:653
#, c-format
msgid ""
"Transfer successful\n"
@@ -17436,92 +17944,92 @@ msgid ""
"without being prompted for a password."
msgstr ""
"传送成功\n"
-"要验证您可以登录到服务器,请运行:\n"
+"要验证您可以登录到服务器, 请运行:\n"
"\n"
"ssh -i %s %s@%s\n"
"\n"
"这样不会提问密码。"
-#: standalone/drakbackup:698
+#: standalone/drakbackup:697
#, c-format
msgid "WebDAV remote site already in sync!"
msgstr "WebDAV 远程站点已经同步!"
-#: standalone/drakbackup:702
+#: standalone/drakbackup:701
#, c-format
msgid "WebDAV transfer failed!"
msgstr "WebDAV 传输失败!"
-#: standalone/drakbackup:723
+#: standalone/drakbackup:722
#, c-format
msgid "No CD-R/DVD-R in drive!"
msgstr "驱动器里没有 CDR/DVDR"
-#: standalone/drakbackup:727
+#: standalone/drakbackup:726
#, c-format
msgid "Does not appear to be recordable media!"
msgstr "介质不像是可以写入的!"
-#: standalone/drakbackup:732
+#: standalone/drakbackup:731
#, c-format
msgid "Not erasable media!"
msgstr "不可清除的介质!"
-#: standalone/drakbackup:774
+#: standalone/drakbackup:773
#, c-format
msgid "This may take a moment to erase the media."
msgstr "清空介质需要一些时间。"
-#: standalone/drakbackup:832
+#: standalone/drakbackup:831
#, c-format
msgid "Permission problem accessing CD."
msgstr "没有适当的权限读写 CD。"
-#: standalone/drakbackup:859
+#: standalone/drakbackup:858
#, c-format
msgid "No tape in %s!"
msgstr "%s 里没有磁带!"
-#: standalone/drakbackup:966
+#: standalone/drakbackup:965
#, c-format
msgid ""
"Backup quota exceeded!\n"
"%d MB used vs %d MB allocated."
msgstr ""
"达到了备份限额!\n"
-"使用了 %d MB,而分配了 %d MB。"
+"使用了 %d MB, 而分配了 %d MB。"
-#: standalone/drakbackup:985 standalone/drakbackup:1018
+#: standalone/drakbackup:984 standalone/drakbackup:1017
#, c-format
msgid "Backup system files..."
msgstr "备份系统文件..."
-#: standalone/drakbackup:1019 standalone/drakbackup:1060
+#: standalone/drakbackup:1018 standalone/drakbackup:1059
#, c-format
msgid "Hard Disk Backup files..."
msgstr "备份硬盘文件..."
-#: standalone/drakbackup:1059
+#: standalone/drakbackup:1058
#, c-format
msgid "Backup User files..."
msgstr "备份用户文件..."
-#: standalone/drakbackup:1094
+#: standalone/drakbackup:1093
#, c-format
msgid "Backup Other files..."
msgstr "备份其它文件..."
-#: standalone/drakbackup:1095
+#: standalone/drakbackup:1094
#, c-format
msgid "Hard Disk Backup Progress..."
msgstr "硬盘文件备份进度..."
-#: standalone/drakbackup:1100
+#: standalone/drakbackup:1099
#, c-format
msgid "No changes to backup!"
msgstr "没有需要备份的修改!"
-#: standalone/drakbackup:1118 standalone/drakbackup:1142
+#: standalone/drakbackup:1117 standalone/drakbackup:1141
#, c-format
msgid ""
"\n"
@@ -17532,7 +18040,7 @@ msgstr ""
"“Drak 备份”使用 %s: \n"
"\n"
-#: standalone/drakbackup:1127
+#: standalone/drakbackup:1126
#, c-format
msgid ""
"\n"
@@ -17542,18 +18050,18 @@ msgstr ""
"\n"
"FTP 连接错误: 无法通过 FTP 传送您的备份文件。\n"
-#: standalone/drakbackup:1128
+#: standalone/drakbackup:1127
#, c-format
msgid ""
"Error during sending file via FTP. Please correct your FTP configuration."
msgstr "通过 FTP 发送文件出错。请更正您的 FTP 配置。"
-#: standalone/drakbackup:1130
+#: standalone/drakbackup:1129
#, c-format
msgid "file list sent by FTP: %s\n"
msgstr "通过 FTP 发送的文件列表: %s\n"
-#: standalone/drakbackup:1147
+#: standalone/drakbackup:1146
#, c-format
msgid ""
"\n"
@@ -17564,7 +18072,7 @@ msgstr ""
"“Drak 备份”的光盘操作: \n"
"\n"
-#: standalone/drakbackup:1152
+#: standalone/drakbackup:1151
#, c-format
msgid ""
"\n"
@@ -17575,22 +18083,22 @@ msgstr ""
"“Drak 备份”的磁带操作: \n"
"\n"
-#: standalone/drakbackup:1161
+#: standalone/drakbackup:1160
#, c-format
msgid "Error sending mail. Your report mail was not sent."
msgstr "发送邮件出错。您的报告邮件没有发出。"
-#: standalone/drakbackup:1162
+#: standalone/drakbackup:1161
#, c-format
msgid " Error while sending mail. \n"
msgstr "发送电子邮件出错。\n"
-#: standalone/drakbackup:1192
+#: standalone/drakbackup:1191
#, c-format
-msgid "Can't create catalog!"
+msgid "Can not create catalog!"
msgstr "无法创建 catalog!"
-#: standalone/drakbackup:1414
+#: standalone/drakbackup:1420
#, c-format
msgid ""
"\n"
@@ -17599,218 +18107,218 @@ msgstr ""
"\n"
"请选中您需要的所有选项。\n"
-#: standalone/drakbackup:1415
+#: standalone/drakbackup:1421
#, c-format
msgid ""
"These options can backup and restore all files in your /etc directory.\n"
msgstr "这些选项将备份和恢复您的 /etc 目录中的全部文件。\n"
-#: standalone/drakbackup:1416
+#: standalone/drakbackup:1422
#, c-format
msgid "Backup your System files. (/etc directory)"
msgstr "备份系统文件。(/etc 目录)"
-#: standalone/drakbackup:1417 standalone/drakbackup:1481
-#: standalone/drakbackup:1547
+#: standalone/drakbackup:1423 standalone/drakbackup:1487
+#: standalone/drakbackup:1553
#, c-format
msgid "Use Incremental/Differential Backups (do not replace old backups)"
msgstr "使用增量/差异备份(不破坏老备份)"
-#: standalone/drakbackup:1419 standalone/drakbackup:1483
-#: standalone/drakbackup:1549
+#: standalone/drakbackup:1425 standalone/drakbackup:1489
+#: standalone/drakbackup:1555
#, c-format
msgid "Use Incremental Backups"
msgstr "使用增量备份"
-#: standalone/drakbackup:1419 standalone/drakbackup:1483
-#: standalone/drakbackup:1549
+#: standalone/drakbackup:1425 standalone/drakbackup:1489
+#: standalone/drakbackup:1555
#, c-format
msgid "Use Differential Backups"
msgstr "使用差异备份"
-#: standalone/drakbackup:1421
+#: standalone/drakbackup:1427
#, c-format
msgid "Do not include critical files (passwd, group, fstab)"
-msgstr "不包括关键文件(passwd,group,fstab)"
+msgstr "不包括关键文件(passwd, group, fstab)"
-#: standalone/drakbackup:1422
+#: standalone/drakbackup:1428
#, c-format
msgid ""
"With this option you will be able to restore any version\n"
" of your /etc directory."
msgstr "使用此选项您可把 /etc 目录恢复到任何以前的版本。"
-#: standalone/drakbackup:1453
+#: standalone/drakbackup:1459
#, c-format
msgid "Please check all users that you want to include in your backup."
msgstr "请选择您希望备份的用户。"
-#: standalone/drakbackup:1480
+#: standalone/drakbackup:1486
#, c-format
msgid "Do not include the browser cache"
msgstr "不包括浏览器缓存"
-#: standalone/drakbackup:1534
+#: standalone/drakbackup:1540
#, c-format
msgid "Select the files or directories and click on 'OK'"
-msgstr "选择文件或目录,然后单击“确定”"
+msgstr "选择文件或目录, 然后单击“确定”"
-#: standalone/drakbackup:1535 standalone/drakfont:660
+#: standalone/drakbackup:1541 standalone/drakfont:661
#, c-format
msgid "Remove Selected"
msgstr "删除选中的"
-#: standalone/drakbackup:1598
+#: standalone/drakbackup:1604
#, c-format
msgid "Users"
msgstr "用户"
-#: standalone/drakbackup:1618
+#: standalone/drakbackup:1624
#, c-format
msgid "Use network connection to backup"
msgstr "使用网络连接作备份"
-#: standalone/drakbackup:1620
+#: standalone/drakbackup:1626
#, c-format
msgid "Net Method:"
msgstr "网络方法:"
-#: standalone/drakbackup:1624
+#: standalone/drakbackup:1630
#, c-format
msgid "Use Expect for SSH"
msgstr "把 Expect 用于 SSH"
-#: standalone/drakbackup:1625
+#: standalone/drakbackup:1631
#, c-format
msgid "Create/Transfer backup keys for SSH"
msgstr "创建/传送 SSH 的备份密钥"
-#: standalone/drakbackup:1627
+#: standalone/drakbackup:1633
#, c-format
msgid "Transfer Now"
msgstr "现在传送"
-#: standalone/drakbackup:1629
+#: standalone/drakbackup:1635
#, c-format
msgid "Other (not drakbackup) keys in place already"
msgstr "其它(不是“Drak 备份”)密钥已经有了"
-#: standalone/drakbackup:1632
+#: standalone/drakbackup:1638
#, c-format
msgid "Host name or IP."
msgstr "主机名或 IP。"
-#: standalone/drakbackup:1637
+#: standalone/drakbackup:1643
#, c-format
msgid "Directory (or module) to put the backup on this host."
msgstr "将备份放在该主机的目录(或模块)。"
-#: standalone/drakbackup:1649
+#: standalone/drakbackup:1655
#, c-format
msgid "Remember this password"
msgstr "记住密码"
-#: standalone/drakbackup:1665
+#: standalone/drakbackup:1671
#, c-format
msgid "Need hostname, username and password!"
msgstr "需要主机名、用户名和密码!"
-#: standalone/drakbackup:1756
+#: standalone/drakbackup:1762
#, c-format
msgid "Use CD-R/DVD-R to backup"
msgstr "使用 CD/DVDROM 备份"
-#: standalone/drakbackup:1759
+#: standalone/drakbackup:1765
#, c-format
msgid "Choose your CD/DVD device"
msgstr "请选择您的 CD/DVD 设备"
-#: standalone/drakbackup:1764
+#: standalone/drakbackup:1770
#, c-format
msgid "Choose your CD/DVD media size"
msgstr "请选择您的 CD/DVD 介质大小"
-#: standalone/drakbackup:1771
+#: standalone/drakbackup:1777
#, c-format
msgid "Multisession CD"
msgstr "多轨道 CD"
-#: standalone/drakbackup:1773
+#: standalone/drakbackup:1779
#, c-format
msgid "CDRW media"
msgstr "CDRW 介质"
-#: standalone/drakbackup:1779
+#: standalone/drakbackup:1785
#, c-format
msgid "Erase your RW media (1st Session)"
msgstr "清除您的 RW 介质(第一节)"
-#: standalone/drakbackup:1780
+#: standalone/drakbackup:1786
#, c-format
msgid " Erase Now "
msgstr " 立即清除 "
-#: standalone/drakbackup:1786
+#: standalone/drakbackup:1792
#, c-format
msgid "DVD+RW media"
msgstr "DVD+RW 介质"
-#: standalone/drakbackup:1788
+#: standalone/drakbackup:1794
#, c-format
msgid "DVD-R media"
msgstr "DVD-R 介质"
-#: standalone/drakbackup:1790
+#: standalone/drakbackup:1796
#, c-format
msgid "DVDRAM device"
msgstr "DVDRAM 设备"
-#: standalone/drakbackup:1821
+#: standalone/drakbackup:1827
#, c-format
msgid "No CD device defined!"
msgstr "没有发现 CD 设备!"
-#: standalone/drakbackup:1863
+#: standalone/drakbackup:1869
#, c-format
msgid "Use tape to backup"
msgstr "使用磁带备份"
-#: standalone/drakbackup:1866
+#: standalone/drakbackup:1872
#, c-format
msgid "Device name to use for backup"
msgstr "用于备份的设备名"
-#: standalone/drakbackup:1872
+#: standalone/drakbackup:1878
#, c-format
msgid "Backup directly to tape"
msgstr "直接备份到磁带"
-#: standalone/drakbackup:1878
+#: standalone/drakbackup:1884
#, c-format
-msgid "Don't rewind tape after backup"
+msgid "Do not rewind tape after backup"
msgstr "在备份后不倒带"
-#: standalone/drakbackup:1884
+#: standalone/drakbackup:1890
#, c-format
msgid "Erase tape before backup"
msgstr "备份前清空磁带"
-#: standalone/drakbackup:1890
+#: standalone/drakbackup:1896
#, c-format
msgid "Eject tape after the backup"
msgstr "备份后弹出磁带"
-#: standalone/drakbackup:1962
+#: standalone/drakbackup:1968
#, c-format
msgid "Enter the directory to save to:"
msgstr "请输入要保存的目录:"
-#: standalone/drakbackup:1966
+#: standalone/drakbackup:1972
#, c-format
msgid "Directory to save to"
msgstr "要保存的目录"
-#: standalone/drakbackup:1971
+#: standalone/drakbackup:1977
#, c-format
msgid ""
"Maximum size\n"
@@ -17819,42 +18327,42 @@ msgstr ""
"允许“Drak 备份”\n"
" 使用的最大空间(Mb)"
-#: standalone/drakbackup:2035
+#: standalone/drakbackup:2041
#, c-format
msgid "CD-R / DVD-R"
msgstr "CDROM / DVDROM"
-#: standalone/drakbackup:2040
+#: standalone/drakbackup:2046
#, c-format
msgid "HardDrive / NFS"
msgstr "硬盘 / NFS"
-#: standalone/drakbackup:2055 standalone/drakbackup:2056
-#: standalone/drakbackup:2061
+#: standalone/drakbackup:2061 standalone/drakbackup:2062
+#: standalone/drakbackup:2067
#, c-format
msgid "hourly"
msgstr "每小时"
-#: standalone/drakbackup:2055 standalone/drakbackup:2057
-#: standalone/drakbackup:2062
+#: standalone/drakbackup:2061 standalone/drakbackup:2063
+#: standalone/drakbackup:2068
#, c-format
msgid "daily"
msgstr "每日"
-#: standalone/drakbackup:2055 standalone/drakbackup:2058
-#: standalone/drakbackup:2063
+#: standalone/drakbackup:2061 standalone/drakbackup:2064
+#: standalone/drakbackup:2069
#, c-format
msgid "weekly"
msgstr "每周"
-#: standalone/drakbackup:2055 standalone/drakbackup:2059
-#: standalone/drakbackup:2064
+#: standalone/drakbackup:2061 standalone/drakbackup:2065
+#: standalone/drakbackup:2070
#, c-format
msgid "monthly"
msgstr "每月"
-#: standalone/drakbackup:2055 standalone/drakbackup:2060
-#: standalone/drakbackup:2065
+#: standalone/drakbackup:2061 standalone/drakbackup:2066
+#: standalone/drakbackup:2071
#, c-format
msgid "custom"
msgstr "定制"
@@ -17862,7 +18370,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:2069
+#: standalone/drakbackup:2075
#, c-format
msgid "January"
msgstr "一月"
@@ -17870,7 +18378,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:2069
+#: standalone/drakbackup:2075
#, c-format
msgid "February"
msgstr "二月"
@@ -17878,7 +18386,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:2069
+#: standalone/drakbackup:2075
#, c-format
msgid "March"
msgstr "三月"
@@ -17886,7 +18394,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:2070
+#: standalone/drakbackup:2076
#, c-format
msgid "April"
msgstr "四月"
@@ -17894,7 +18402,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:2070
+#: standalone/drakbackup:2076
#, c-format
msgid "May"
msgstr "五月"
@@ -17902,7 +18410,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:2070
+#: standalone/drakbackup:2076
#, c-format
msgid "June"
msgstr "六月"
@@ -17910,7 +18418,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:2070
+#: standalone/drakbackup:2076
#, c-format
msgid "July"
msgstr "七月"
@@ -17918,7 +18426,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:2070
+#: standalone/drakbackup:2076
#, c-format
msgid "August"
msgstr "八月"
@@ -17926,7 +18434,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:2070
+#: standalone/drakbackup:2076
#, c-format
msgid "September"
msgstr "九月"
@@ -17934,7 +18442,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:2071
+#: standalone/drakbackup:2077
#, c-format
msgid "October"
msgstr "十月"
@@ -17942,7 +18450,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:2071
+#: standalone/drakbackup:2077
#, c-format
msgid "November"
msgstr "十一月"
@@ -17950,7 +18458,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:2071
+#: standalone/drakbackup:2077
#, c-format
msgid "December"
msgstr "十二月"
@@ -17961,7 +18469,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:2074
+#: standalone/drakbackup:2080
#, c-format
msgid "Sunday"
msgstr "星期日"
@@ -17972,7 +18480,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:2074
+#: standalone/drakbackup:2080
#, c-format
msgid "Monday"
msgstr "星期一"
@@ -17983,7 +18491,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:2074
+#: standalone/drakbackup:2080
#, c-format
msgid "Tuesday"
msgstr "星期二"
@@ -17994,7 +18502,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:2075
+#: standalone/drakbackup:2081
#, c-format
msgid "Wednesday"
msgstr "星期三"
@@ -18005,7 +18513,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:2075
+#: standalone/drakbackup:2081
#, c-format
msgid "Thursday"
msgstr "星期四"
@@ -18016,7 +18524,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:2075
+#: standalone/drakbackup:2081
#, c-format
msgid "Friday"
msgstr "星期五"
@@ -18027,22 +18535,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:2075
+#: standalone/drakbackup:2081
#, c-format
msgid "Saturday"
msgstr "星期六"
-#: standalone/drakbackup:2107
+#: standalone/drakbackup:2113
#, c-format
msgid "Use daemon"
msgstr "使用守护进程"
-#: standalone/drakbackup:2112
+#: standalone/drakbackup:2117
#, c-format
msgid "Please choose the time interval between each backup"
msgstr "请选择每次备份的时间间隔"
-#: standalone/drakbackup:2118
+#: standalone/drakbackup:2123
#, c-format
msgid "Custom setup/crontab entry:"
msgstr "自定义 setup/crontab 项: "
@@ -18050,7 +18558,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:2123
+#: standalone/drakbackup:2128
#, c-format
msgid "Minute"
msgstr "分钟"
@@ -18058,7 +18566,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:2127
+#: standalone/drakbackup:2132
#, c-format
msgid "Hour"
msgstr "小时"
@@ -18066,7 +18574,7 @@ msgstr "小时"
# ui/evolution-calendar.xml.h:11
# ui/evolution-calendar.xml.h:11
# ui/evolution-calendar.xml.h:11
-#: standalone/drakbackup:2131
+#: standalone/drakbackup:2136
#, c-format
msgid "Day"
msgstr "天"
@@ -18074,7 +18582,7 @@ msgstr "天"
# ui/evolution-calendar.xml.h:20
# ui/evolution-calendar.xml.h:20
# ui/evolution-calendar.xml.h:20
-#: standalone/drakbackup:2135
+#: standalone/drakbackup:2140
#, c-format
msgid "Month"
msgstr "月"
@@ -18085,137 +18593,143 @@ 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:2139
+#: standalone/drakbackup:2144
#, c-format
msgid "Weekday"
msgstr "平日"
-#: standalone/drakbackup:2145
+#: standalone/drakbackup:2150
#, c-format
msgid "Please choose the media for backup."
msgstr "请选择备份使用的介质。"
-#: standalone/drakbackup:2152
+#: standalone/drakbackup:2156
#, c-format
msgid "Please be sure that the cron daemon is included in your services."
msgstr "请确认 cron 守护程序包含在您的服务中。"
-#: standalone/drakbackup:2153
+#: standalone/drakbackup:2157
+#, c-format
+msgid ""
+"If your machine is not on all the time, you might want to install anacron."
+msgstr "如果您的计算机并不是时刻开机, 您可能想要安装 anacron。"
+
+#: standalone/drakbackup:2158
#, c-format
msgid "Note that currently all 'net' media also use the hard drive."
msgstr "请注意目前所有的“网络”介质都还要使用硬盘。"
-#: standalone/drakbackup:2201
+#: standalone/drakbackup:2205
#, c-format
msgid "Please choose the compression type"
msgstr "请选择压缩类型"
-#: standalone/drakbackup:2205
+#: standalone/drakbackup:2209
#, c-format
msgid "Use .backupignore files"
msgstr "使用 .backupignore 文件"
-#: standalone/drakbackup:2207
+#: standalone/drakbackup:2211
#, c-format
msgid "Send mail report after each backup to:"
msgstr "在每次备份后发送邮件报告给:"
-#: standalone/drakbackup:2213
+#: standalone/drakbackup:2217
#, c-format
msgid "SMTP server for mail:"
msgstr "邮件的 SMTP 服务器:"
-#: standalone/drakbackup:2218
+#: standalone/drakbackup:2222
#, c-format
msgid "Delete Hard Drive tar files after backup to other media."
msgstr "备份到其它介质之后删除硬盘上的 tar 文件。"
-#: standalone/drakbackup:2258
+#: standalone/drakbackup:2262
#, c-format
msgid "What"
msgstr "内容"
-#: standalone/drakbackup:2263
+#: standalone/drakbackup:2267
#, c-format
msgid "Where"
msgstr "位置"
-#: standalone/drakbackup:2268
+#: standalone/drakbackup:2272
#, c-format
msgid "When"
msgstr "时间"
-#: standalone/drakbackup:2273
+#: standalone/drakbackup:2277
#, c-format
msgid "More Options"
msgstr "更多选项"
-#: standalone/drakbackup:2286
+#: standalone/drakbackup:2290
#, c-format
msgid "Backup destination not configured..."
msgstr "备份目的未配置..."
-#: standalone/drakbackup:2306 standalone/drakbackup:4229
+#: standalone/drakbackup:2310 standalone/drakbackup:4234
#, c-format
msgid "Drakbackup Configuration"
msgstr "“Drak 备份”配置"
-#: standalone/drakbackup:2322
+#: standalone/drakbackup:2326
#, c-format
msgid "Please choose where you want to backup"
msgstr "请选择您希望备份何处"
-#: standalone/drakbackup:2325
+#: standalone/drakbackup:2329
#, c-format
msgid "Hard Drive used to prepare backups for all media"
msgstr "用于准备全部介质备份的硬盘驱动器"
-#: standalone/drakbackup:2325
+#: standalone/drakbackup:2329
#, c-format
msgid "Across Network"
msgstr "通过网络"
-#: standalone/drakbackup:2325
+#: standalone/drakbackup:2329
#, c-format
msgid "On CD-R"
msgstr "在 CD-R 上"
-#: standalone/drakbackup:2325
+#: standalone/drakbackup:2329
#, c-format
msgid "On Tape Device"
msgstr "在磁带机上"
-#: standalone/drakbackup:2371
+#: standalone/drakbackup:2375
#, c-format
msgid "Backup Users"
msgstr "备份用户"
-#: standalone/drakbackup:2372
+#: standalone/drakbackup:2376
#, c-format
msgid " (Default is all users)"
msgstr "(默认是所有用户)"
-#: standalone/drakbackup:2384
+#: standalone/drakbackup:2389
#, c-format
msgid "Please choose what you want to backup"
msgstr "请选择您要备份的文件"
-#: standalone/drakbackup:2385
+#: standalone/drakbackup:2390
#, c-format
msgid "Backup System"
msgstr "备份系统"
-#: standalone/drakbackup:2387
+#: standalone/drakbackup:2392
#, c-format
msgid "Select user manually"
msgstr "手工选择用户"
-#: standalone/drakbackup:2416
+#: standalone/drakbackup:2421
#, c-format
msgid "Please select data to backup..."
msgstr "请选择需备份的数据..."
-#: standalone/drakbackup:2488
+#: standalone/drakbackup:2493
#, c-format
msgid ""
"\n"
@@ -18224,7 +18738,7 @@ msgstr ""
"\n"
"备份来源: \n"
-#: standalone/drakbackup:2489
+#: standalone/drakbackup:2494
#, c-format
msgid ""
"\n"
@@ -18233,7 +18747,7 @@ msgstr ""
"\n"
"- 系统文件: \n"
-#: standalone/drakbackup:2491
+#: standalone/drakbackup:2496
#, c-format
msgid ""
"\n"
@@ -18242,7 +18756,7 @@ msgstr ""
"\n"
"- 用户文件: \n"
-#: standalone/drakbackup:2493
+#: standalone/drakbackup:2498
#, c-format
msgid ""
"\n"
@@ -18251,7 +18765,7 @@ msgstr ""
"\n"
"- 其它文件: \n"
-#: standalone/drakbackup:2495
+#: standalone/drakbackup:2500
#, c-format
msgid ""
"\n"
@@ -18260,12 +18774,12 @@ msgstr ""
"\n"
"- 保存在硬盘路径: %s\n"
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2501
#, c-format
msgid "\tLimit disk usage to %s MB\n"
msgstr "\t限制磁盘使用为 %s MB\n"
-#: standalone/drakbackup:2499
+#: standalone/drakbackup:2504
#, c-format
msgid ""
"\n"
@@ -18274,7 +18788,7 @@ msgstr ""
"\n"
"- 备份后删除硬盘的 tar 文件。\n"
-#: standalone/drakbackup:2504
+#: standalone/drakbackup:2509
#, c-format
msgid ""
"\n"
@@ -18283,22 +18797,22 @@ msgstr ""
"\n"
"- 刻录光盘"
-#: standalone/drakbackup:2505
+#: standalone/drakbackup:2510
#, c-format
msgid "RW"
msgstr "RW"
-#: standalone/drakbackup:2506
+#: standalone/drakbackup:2511
#, c-format
msgid " on device: %s"
msgstr " 使用设备: %s"
-#: standalone/drakbackup:2507
+#: standalone/drakbackup:2512
#, c-format
msgid " (multi-session)"
msgstr "(多轨道)"
-#: standalone/drakbackup:2508
+#: standalone/drakbackup:2513
#, c-format
msgid ""
"\n"
@@ -18307,17 +18821,17 @@ msgstr ""
"\n"
"- 保存到磁带设备: %s"
-#: standalone/drakbackup:2509
+#: standalone/drakbackup:2514
#, c-format
msgid "\t\tErase=%s"
msgstr "\t\t删除=%s"
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2516
#, c-format
msgid "\tBackup directly to Tape\n"
msgstr "\t直接备份到磁带\n"
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2518
#, c-format
msgid ""
"\n"
@@ -18326,7 +18840,7 @@ msgstr ""
"\n"
"- 通过 %s 保存到主机: %s\n"
-#: standalone/drakbackup:2514
+#: standalone/drakbackup:2519
#, c-format
msgid ""
"\t\t user name: %s\n"
@@ -18335,7 +18849,7 @@ msgstr ""
"\t\t 用户名: %s\n"
"\t\t 路径: %s \n"
-#: standalone/drakbackup:2515
+#: standalone/drakbackup:2520
#, c-format
msgid ""
"\n"
@@ -18344,91 +18858,91 @@ msgstr ""
"\n"
"- 选项: \n"
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2521
#, c-format
msgid "\tDo not include System Files\n"
msgstr "\t不包括系统文件\n"
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2523
#, c-format
msgid "\tBackups use tar and bzip2\n"
msgstr "\t使用 tar 和 bzip2 备份\n"
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2524
#, c-format
msgid "\tBackups use tar and gzip\n"
msgstr "\t使用 tar 和 gzip 备份\n"
-#: standalone/drakbackup:2520
+#: standalone/drakbackup:2525
#, c-format
msgid "\tBackups use tar only\n"
msgstr "\t只使用 tar 备份\n"
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2527
#, c-format
msgid "\tUse .backupignore files\n"
msgstr "\t使用 .backupignore 文件\n"
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2528
#, c-format
msgid "\tSend mail to %s\n"
msgstr "\t发送邮件到 %s\n"
-#: standalone/drakbackup:2524
+#: standalone/drakbackup:2529
#, c-format
msgid "\tUsing SMTP server %s\n"
msgstr "\t使用 SMTP 服务器 %s\n"
-#: standalone/drakbackup:2526
+#: standalone/drakbackup:2531
#, c-format
msgid ""
"\n"
"- Daemon, %s via:\n"
msgstr ""
"\n"
-"- 守护进程,%s 通过: \n"
+"- 守护进程, %s 通过: \n"
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2532
#, c-format
msgid "\t-Hard drive.\n"
msgstr "\t-硬盘。\n"
-#: standalone/drakbackup:2528
+#: standalone/drakbackup:2533
#, c-format
msgid "\t-CD-R.\n"
msgstr "\t-CD-R。\n"
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2534
#, c-format
msgid "\t-Tape \n"
msgstr "\t-磁带\n"
-#: standalone/drakbackup:2530
+#: standalone/drakbackup:2535
#, c-format
msgid "\t-Network by FTP.\n"
msgstr "\t-网络通过 FTP。\n"
-#: standalone/drakbackup:2531
+#: standalone/drakbackup:2536
#, c-format
msgid "\t-Network by SSH.\n"
msgstr "\t-网络通过 SSH。\n"
-#: standalone/drakbackup:2532
+#: standalone/drakbackup:2537
#, c-format
msgid "\t-Network by rsync.\n"
msgstr "\t-网络通过 rsync。\n"
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2538
#, c-format
msgid "\t-Network by webdav.\n"
msgstr "\t-通过 webdav 的网络。\n"
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2540
#, c-format
msgid "No configuration, please click Wizard or Advanced.\n"
-msgstr "没有配置,请选择向导或高级。\n"
+msgstr "没有配置, 请选择向导或高级。\n"
-#: standalone/drakbackup:2540
+#: standalone/drakbackup:2545
#, c-format
msgid ""
"List of data to restore:\n"
@@ -18437,27 +18951,27 @@ msgstr ""
"要恢复数据的清单: \n"
"\n"
-#: standalone/drakbackup:2542
+#: standalone/drakbackup:2547
#, c-format
msgid "- Restore System Files.\n"
msgstr "- 恢复系统文件。\n"
-#: standalone/drakbackup:2544 standalone/drakbackup:2554
+#: standalone/drakbackup:2549 standalone/drakbackup:2559
#, c-format
msgid " - from date: %s %s\n"
msgstr " - 从日期: %s %s\n"
-#: standalone/drakbackup:2547
+#: standalone/drakbackup:2552
#, c-format
msgid "- Restore User Files: \n"
msgstr "- 恢复用户文件: \n"
-#: standalone/drakbackup:2552
+#: standalone/drakbackup:2557
#, c-format
msgid "- Restore Other Files: \n"
msgstr "- 恢复其它文件: \n"
-#: standalone/drakbackup:2731
+#: standalone/drakbackup:2736
#, c-format
msgid ""
"List of data corrupted:\n"
@@ -18466,127 +18980,127 @@ msgstr ""
"已毁坏数据的清单: \n"
"\n"
-#: standalone/drakbackup:2733
+#: standalone/drakbackup:2738
#, c-format
msgid "Please uncheck or remove it on next time."
msgstr "请取消选择并删除它。"
-#: standalone/drakbackup:2743
+#: standalone/drakbackup:2748
#, c-format
msgid "Backup files are corrupted"
msgstr "备份文件损坏了"
-#: standalone/drakbackup:2764
+#: standalone/drakbackup:2769
#, c-format
msgid " All of your selected data have been "
msgstr " 您选择的全部数据已经 "
-#: standalone/drakbackup:2765
+#: standalone/drakbackup:2770
#, c-format
msgid " Successfully Restored on %s "
msgstr " 成功的恢复到 %s "
-#: standalone/drakbackup:2885
+#: standalone/drakbackup:2890
#, c-format
msgid " Restore Configuration "
msgstr " 恢复配置 "
-#: standalone/drakbackup:2913
+#: standalone/drakbackup:2918
#, c-format
msgid "OK to restore the other files."
msgstr "即将恢复其它文件。"
-#: standalone/drakbackup:2929
+#: standalone/drakbackup:2934
#, c-format
msgid "User list to restore (only the most recent date per user is important)"
msgstr "可恢复的用户清单(每个用户最近的数据是最重要的)"
-#: standalone/drakbackup:2994
+#: standalone/drakbackup:2999
#, c-format
msgid "Please choose the date to restore:"
msgstr "请选择需要恢复的日期:"
-#: standalone/drakbackup:3031
+#: standalone/drakbackup:3036
#, c-format
msgid "Restore from Hard Disk."
msgstr "从硬盘恢复"
-#: standalone/drakbackup:3033
+#: standalone/drakbackup:3038
#, c-format
msgid "Enter the directory where backups are stored"
msgstr "请输入存储备份的目录"
-#: standalone/drakbackup:3037
+#: standalone/drakbackup:3042
#, c-format
msgid "Directory with backups"
msgstr "存有备份的目录"
-#: standalone/drakbackup:3091
+#: standalone/drakbackup:3096
#, c-format
msgid "Select another media to restore from"
msgstr "请选择另外的介质用以恢复"
-#: standalone/drakbackup:3093
+#: standalone/drakbackup:3098
#, c-format
msgid "Other Media"
msgstr "其它介质"
-#: standalone/drakbackup:3098
+#: standalone/drakbackup:3103
#, c-format
msgid "Restore system"
msgstr "恢复系统"
-#: standalone/drakbackup:3099
+#: standalone/drakbackup:3104
#, c-format
msgid "Restore Users"
msgstr "恢复用户文件"
-#: standalone/drakbackup:3100
+#: standalone/drakbackup:3105
#, c-format
msgid "Restore Other"
msgstr "恢复其它文件"
-#: standalone/drakbackup:3102
+#: standalone/drakbackup:3107
#, c-format
msgid "Select path to restore (instead of /)"
msgstr "选择将要恢复到的路径(/ 除外)"
-#: standalone/drakbackup:3106 standalone/drakbackup:3388
+#: standalone/drakbackup:3111 standalone/drakbackup:3393
#, c-format
msgid "Path To Restore To"
msgstr "恢复到的路径"
-#: standalone/drakbackup:3109
+#: standalone/drakbackup:3114
#, c-format
msgid "Do new backup before restore (only for incremental backups.)"
msgstr "恢复前做新的备份(只适用于增量备份。)"
-#: standalone/drakbackup:3111
+#: standalone/drakbackup:3116
#, c-format
msgid "Remove user directories before restore."
msgstr "恢复前删除用户目录。"
-#: standalone/drakbackup:3196
+#: standalone/drakbackup:3201
#, c-format
msgid "Filename text substring to search for (empty string matches all):"
msgstr "要搜索的文件名文字(空字符串将匹配全部): "
-#: standalone/drakbackup:3199
+#: standalone/drakbackup:3204
#, c-format
msgid "Search Backups"
msgstr "搜索备份"
-#: standalone/drakbackup:3217
+#: standalone/drakbackup:3222
#, c-format
msgid "No matches found..."
msgstr "没有发现匹配项..."
-#: standalone/drakbackup:3221
+#: standalone/drakbackup:3226
#, c-format
msgid "Restore Selected"
msgstr "恢复选中文件"
-#: standalone/drakbackup:3356
+#: standalone/drakbackup:3361
#, c-format
msgid ""
"Click date/time to see backup files.\n"
@@ -18595,7 +19109,7 @@ msgstr ""
"点击日期/时间可查看备份文件。\n"
"Ctrl+单击文件可选择多个文件。"
-#: standalone/drakbackup:3362
+#: standalone/drakbackup:3367
#, c-format
msgid ""
"Restore Selected\n"
@@ -18604,7 +19118,7 @@ msgstr ""
"恢复选中的\n"
"目录项"
-#: standalone/drakbackup:3371
+#: standalone/drakbackup:3376
#, c-format
msgid ""
"Restore Selected\n"
@@ -18613,17 +19127,17 @@ msgstr ""
"恢复选中的\n"
"文件"
-#: standalone/drakbackup:3448
+#: standalone/drakbackup:3453
#, c-format
msgid "Backup files not found at %s."
msgstr "在 %s 没有发现备份文件。"
-#: standalone/drakbackup:3461
+#: standalone/drakbackup:3466
#, c-format
msgid "Restore From CD"
msgstr "从光盘恢复"
-#: standalone/drakbackup:3461
+#: standalone/drakbackup:3466
#, c-format
msgid ""
"Insert the CD with volume label %s\n"
@@ -18632,235 +19146,229 @@ msgstr ""
"请把卷标为 %s 的光盘插入\n"
"到加载于 /mnt/cdrom 的光盘驱动器"
-#: standalone/drakbackup:3463
+#: standalone/drakbackup:3468
#, c-format
msgid "Not the correct CD label. Disk is labelled %s."
msgstr "光盘卷标不对。这张盘的卷标是 %s。"
-#: standalone/drakbackup:3473
+#: standalone/drakbackup:3478
#, c-format
msgid "Restore From Tape"
msgstr "从磁带恢复"
-#: standalone/drakbackup:3473
+#: standalone/drakbackup:3478
#, c-format
msgid ""
"Insert the tape with volume label %s\n"
" in the tape drive device %s"
msgstr "请把卷标为 %s 的磁带装进磁带机 %s"
-#: standalone/drakbackup:3475
+#: standalone/drakbackup:3480
#, c-format
msgid "Not the correct tape label. Tape is labelled %s."
msgstr "磁带卷标不对。这盘磁带的卷标是 %s。"
-#: standalone/drakbackup:3486
+#: standalone/drakbackup:3491
#, c-format
msgid "Restore Via Network"
msgstr "通过网络恢复"
-#: standalone/drakbackup:3486
+#: standalone/drakbackup:3491
#, c-format
msgid "Restore Via Network Protocol: %s"
msgstr "恢复使用的网络协议: %s"
-#: standalone/drakbackup:3487
+#: standalone/drakbackup:3492
#, c-format
msgid "Host Name"
msgstr "主机名"
-#: standalone/drakbackup:3488
+#: standalone/drakbackup:3493
#, c-format
msgid "Host Path or Module"
msgstr "主机路径和模块"
-#: standalone/drakbackup:3495
+#: standalone/drakbackup:3500
#, c-format
msgid "Password required"
msgstr "需要密码"
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3506
#, c-format
msgid "Username required"
msgstr "需要用户名"
-#: standalone/drakbackup:3504
+#: standalone/drakbackup:3509
#, c-format
msgid "Hostname required"
msgstr "需要主机名"
-#: standalone/drakbackup:3509
+#: standalone/drakbackup:3514
#, c-format
msgid "Path or Module required"
msgstr "要求提供路径或模块"
-#: standalone/drakbackup:3522
+#: standalone/drakbackup:3527
#, c-format
msgid "Files Restored..."
msgstr "文件已恢复..."
-#: standalone/drakbackup:3525
+#: standalone/drakbackup:3530
#, c-format
msgid "Restore Failed..."
msgstr "恢复失败..."
-#: standalone/drakbackup:3543
+#: standalone/drakbackup:3548
#, c-format
msgid "%s not retrieved..."
msgstr "%s 未获取..."
-#: standalone/drakbackup:3765 standalone/drakbackup:3834
+#: standalone/drakbackup:3770 standalone/drakbackup:3839
#, c-format
msgid "Search for files to restore"
msgstr "搜索要恢复的文件"
-#: standalone/drakbackup:3769
+#: standalone/drakbackup:3774
#, c-format
msgid "Restore all backups"
msgstr "恢复所有备份"
-#: standalone/drakbackup:3777
+#: standalone/drakbackup:3782
#, c-format
msgid "Custom Restore"
msgstr "定制恢复"
-#: standalone/drakbackup:3781 standalone/drakbackup:3830
+#: standalone/drakbackup:3786 standalone/drakbackup:3835
#, c-format
msgid "Restore From Catalog"
msgstr "从目录恢复"
-#: standalone/drakbackup:3802
+#: standalone/drakbackup:3807
#, c-format
msgid "Unable to find backups to restore...\n"
msgstr "无法找到要恢复的数据...\n"
-#: standalone/drakbackup:3803
+#: standalone/drakbackup:3808
#, c-format
msgid "Verify that %s is the correct path"
msgstr "查证得 %s 是正确的路径"
-#: standalone/drakbackup:3804
+#: standalone/drakbackup:3809
#, c-format
msgid " and the CD is in the drive"
msgstr " 而且 CD 盘在驱动器中"
-#: standalone/drakbackup:3806
+#: standalone/drakbackup:3811
#, c-format
msgid "Backups on unmountable media - Use Catalog to restore"
msgstr "备份在未加载的介质中 - 使用目录来恢复"
-#: standalone/drakbackup:3822
+#: standalone/drakbackup:3827
#, c-format
msgid "CD in place - continue."
msgstr "光盘就绪 - 继续。"
-#: standalone/drakbackup:3827
+#: standalone/drakbackup:3832
#, c-format
msgid "Browse to new restore repository."
msgstr "浏览新的恢复仓库。"
-#: standalone/drakbackup:3828
+#: standalone/drakbackup:3833
#, c-format
msgid "Directory To Restore From"
msgstr "恢复来自目录"
-#: standalone/drakbackup:3864
+#: standalone/drakbackup:3869
#, c-format
msgid "Restore Progress"
msgstr "恢复进展"
-#: standalone/drakbackup:3919 standalone/drakbackup:3992
-#: standalone/logdrake:173
-#, c-format
-msgid "Save"
-msgstr "保存"
-
-#: standalone/drakbackup:3975
+#: standalone/drakbackup:3980
#, c-format
msgid "Build Backup"
msgstr "创建备份"
-#: standalone/drakbackup:4008 standalone/drakbackup:4328
+#: standalone/drakbackup:4013 standalone/drakbackup:4333
#, c-format
msgid "Restore"
msgstr "恢复"
-#: standalone/drakbackup:4096
+#: standalone/drakbackup:4101
#, c-format
msgid "The following packages need to be installed:\n"
msgstr "下列软件包需要安装: \n"
-#: standalone/drakbackup:4123
+#: standalone/drakbackup:4128
#, c-format
msgid "Please select data to restore..."
msgstr "请选择要恢复的数据..."
-#: standalone/drakbackup:4163
+#: standalone/drakbackup:4168
#, c-format
msgid "Backup system files"
msgstr "备份系统文件"
-#: standalone/drakbackup:4166
+#: standalone/drakbackup:4171
#, c-format
msgid "Backup user files"
msgstr "备份用户文件"
-#: standalone/drakbackup:4169
+#: standalone/drakbackup:4174
#, c-format
msgid "Backup other files"
msgstr "备份其它文件"
-#: standalone/drakbackup:4172 standalone/drakbackup:4206
+#: standalone/drakbackup:4177 standalone/drakbackup:4211
#, c-format
msgid "Total Progress"
msgstr "总进展"
-#: standalone/drakbackup:4198
+#: standalone/drakbackup:4203
#, c-format
msgid "Sending files by FTP"
msgstr "通过 FTP 发送文件"
-#: standalone/drakbackup:4201
+#: standalone/drakbackup:4206
#, c-format
msgid "Sending files..."
msgstr "正在发送文件..."
-#: standalone/drakbackup:4271
+#: standalone/drakbackup:4276
#, c-format
msgid "Backup Now from configuration file"
msgstr "现在从配置文件备份"
-#: standalone/drakbackup:4276
+#: standalone/drakbackup:4281
#, c-format
msgid "View Backup Configuration."
msgstr "查看备份配置。"
-#: standalone/drakbackup:4302
+#: standalone/drakbackup:4307
#, c-format
msgid "Wizard Configuration"
msgstr "向导配置"
-#: standalone/drakbackup:4307
+#: standalone/drakbackup:4312
#, c-format
msgid "Advanced Configuration"
msgstr "高级配置"
-#: standalone/drakbackup:4312
+#: standalone/drakbackup:4317
#, c-format
msgid "View Configuration"
msgstr "查看配置"
-#: standalone/drakbackup:4316
+#: standalone/drakbackup:4321
#, c-format
msgid "View Last Log"
msgstr "查看上次的日志"
-#: standalone/drakbackup:4321
+#: standalone/drakbackup:4326
#, c-format
msgid "Backup Now"
msgstr "立即备份"
-#: standalone/drakbackup:4325
+#: standalone/drakbackup:4330
#, c-format
msgid ""
"No configuration file found \n"
@@ -18869,7 +19377,7 @@ msgstr ""
"没有找到配置文件\n"
"请单击向导或高级。"
-#: standalone/drakbackup:4345 standalone/drakbackup:4348
+#: standalone/drakbackup:4350 standalone/drakbackup:4353
#, c-format
msgid "Drakbackup"
msgstr "Drak 备份"
@@ -18884,10 +19392,10 @@ msgstr "图形化启动主题选择"
msgid "System mode"
msgstr "系统模式"
-#: standalone/drakboot:74 standalone/drakfloppy:47 standalone/harddrake2:171
-#: standalone/harddrake2:172 standalone/logdrake:70
-#: standalone/printerdrake:156 standalone/printerdrake:157
-#: standalone/printerdrake:158
+#: standalone/drakboot:74 standalone/drakfloppy:47 standalone/harddrake2:187
+#: standalone/harddrake2:188 standalone/logdrake:70
+#: standalone/printerdrake:138 standalone/printerdrake:139
+#: standalone/printerdrake:140
#, c-format
msgid "/_File"
msgstr "/文件(_F)"
@@ -18897,8 +19405,8 @@ msgstr "/文件(_F)"
msgid "/File/_Quit"
msgstr "/文件(F)/退出(_Q)"
-#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/harddrake2:172
-#: standalone/logdrake:76 standalone/printerdrake:158
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/harddrake2:188
+#: standalone/logdrake:76 standalone/printerdrake:140
#, c-format
msgid "<control>Q"
msgstr "<control>Q"
@@ -18924,13 +19432,13 @@ msgid ""
"Your system bootloader is not in framebuffer mode. To activate graphical "
"boot, select a graphic video mode from the bootloader configuration tool."
msgstr ""
-"您的系统引导程序并不位于帧缓存模式。要激活图形化引导程序,请在引导程序配置工"
+"您的系统引导程序并不位于帧缓存模式。要激活图形化引导程序, 请在引导程序配置工"
"具中选择图形视频模式。"
#: standalone/drakboot:167
#, c-format
msgid "Do you want to configure it now?"
-msgstr "您想要现在配置吗?"
+msgstr "您想要现在配置吗?"
#: standalone/drakboot:177
#, c-format
@@ -18953,13 +19461,13 @@ msgstr "系统启动时进入图形环境"
#: standalone/drakboot:197
#, c-format
-msgid "No, I don't want autologin"
-msgstr "否,不要自动登录"
+msgid "No, I do not want autologin"
+msgstr "否, 不要自动登录"
#: standalone/drakboot:198
#, c-format
msgid "Yes, I want autologin with this (user, desktop)"
-msgstr "是,以(用户,桌面)自动登录"
+msgstr "是, 以指定用户的身份自动登录到指定桌面"
#: standalone/drakboot:201
#, c-format
@@ -18978,7 +19486,7 @@ msgid ""
"selected below.\n"
"Be sure your video card supports the mode you choose."
msgstr ""
-"请选择视频模式,该模式将应用到下面所选的每个启动项。\n"
+"请选择视频模式, 该模式将应用到下面所选的每个启动项。\n"
"请确定您的视频卡支持您所选的模式。"
#: standalone/drakbug:41
@@ -18996,8 +19504,8 @@ msgstr "Mandrakelinux 控制中心"
msgid "Synchronization tool"
msgstr "同步工具"
-#: standalone/drakbug:49 standalone/drakbug:63 standalone/drakbug:176
-#: standalone/drakbug:178 standalone/drakbug:182
+#: standalone/drakbug:49 standalone/drakbug:63 standalone/drakbug:148
+#: standalone/drakbug:150 standalone/drakbug:154
#, c-format
msgid "Standalone Tools"
msgstr "独立工具"
@@ -19052,159 +19560,106 @@ msgstr "Drak 用户管理"
msgid "Configuration Wizards"
msgstr "配置向导"
-#: standalone/drakbug:83
-#, c-format
-msgid "Application:"
-msgstr "应用程序: "
-
-#: standalone/drakbug:84 standalone/drakbug:96
-#, c-format
-msgid "Package: "
-msgstr "软件包: "
-
-#: standalone/drakbug:85
-#, c-format
-msgid "Kernel:"
-msgstr "内核: "
-
-#: standalone/drakbug:86 standalone/drakbug:97
+#: standalone/drakbug:81
#, c-format
-msgid "Release: "
-msgstr "版本: "
+msgid "Select Mandrakesoft Tool:"
+msgstr "选择 Mandrakesoft 工具:"
-#: standalone/drakbug:91
+#: standalone/drakbug:82
#, c-format
msgid ""
-"Application Name\n"
-"or Full Path:"
+"or Application Name\n"
+"(or Full Path):"
msgstr ""
"应用程序名\n"
-"或者完整路径: "
+"(或完整路径): "
-#: standalone/drakbug:94
+#: standalone/drakbug:85
#, c-format
msgid "Find Package"
msgstr "查找软件包"
-#: standalone/drakbug:98
-#, c-format
-msgid "Summary: "
-msgstr "概要: "
-
-#: standalone/drakbug:104
-#, c-format
-msgid "Bug Description/System Information"
-msgstr "错误描述系统信息"
-
-#: standalone/drakbug:105
-#, c-format
-msgid "YOUR TEXT HERE"
-msgstr "在这儿输入您要写的文字"
-
-#: standalone/drakbug:108
-#, c-format
-msgid "Submit kernel version"
-msgstr "提交内核版本"
-
-#: standalone/drakbug:109
+#: standalone/drakbug:87
#, c-format
-msgid "Submit cpuinfo"
-msgstr "提交 CPU 信息"
+msgid "Package: "
+msgstr "软件包: "
-#: standalone/drakbug:110
+#: standalone/drakbug:88
#, c-format
-msgid "Submit lspci"
-msgstr "提交 lspci"
+msgid "Kernel:"
+msgstr "内核: "
-#: standalone/drakbug:124
+#: standalone/drakbug:100
#, c-format
msgid ""
-"To submit a bug report, click on the report button.\n"
-"This will open a web browser window on %s\n"
-" where you'll find a form to fill in. The information displayed above will "
-"be \n"
-"transferred to that server."
+"To submit a bug report, click on the report button. \n"
+"This will open a web browser window on %s where you'll find a form to fill "
+"in. The information displayed above will be transferred to that server. \n"
+"Things useful to include in your report are the output of lspci, kernel "
+"version, and /proc/cpuinfo."
msgstr ""
-"要提交故障报告,单击报告按钮。\n"
-"它会打开一个浏览器窗口,进入 %s\n"
-"那里有一个表格需要您填写。上面显示的信息将被传送到服务器。"
+"要提交故障报告, 单击报告按钮。\n"
+"它会打开一个浏览器窗口, 进入 %s, 那里有一个表格需要您填写。上面显示的信息将被"
+"传送到服务器。\n"
+"如果在您的报告中列出 lspci 的输出、内核的版本以及 /proc/cpuinfo 的内容, 可能"
+"会更有帮助一些。"
-#: standalone/drakbug:130
+#: standalone/drakbug:106
#, c-format
msgid "Report"
msgstr "报告"
-#: standalone/drakbug:191
+#: standalone/drakbug:163
#, c-format
msgid "Not installed"
msgstr "没有安装"
-#: standalone/drakbug:203
+#: standalone/drakbug:175
#, c-format
msgid "Package not installed"
msgstr "软件包未安装"
-#: standalone/drakbug:220
-#, c-format
-msgid "NOT FOUND"
-msgstr "没有找到"
-
-#: standalone/drakbug:227
-#, c-format
-msgid "connecting to %s..."
-msgstr "正在连接到 %s ..."
-
-#: standalone/drakbug:235
+#: standalone/drakbug:191
#, c-format
msgid "No browser available! Please install one"
msgstr "没有可用的浏览器!请安装一个"
-#: standalone/drakbug:254
-#, c-format
-msgid "Please enter a package name."
-msgstr "请输入软件包名称。"
-
-#: standalone/drakbug:260
-#, c-format
-msgid "Please enter summary text."
-msgstr "请输入概括性的文字。"
-
-#: standalone/drakclock:30
+#: standalone/drakclock:29
#, c-format
msgid "DrakClock"
msgstr "Drak 时间设置"
-#: standalone/drakclock:40
+#: standalone/drakclock:39
#, c-format
msgid "not defined"
msgstr "未定义"
-#: standalone/drakclock:42
+#: standalone/drakclock:41
#, c-format
msgid "Change Time Zone"
msgstr "更改时区"
-#: standalone/drakclock:46
+#: standalone/drakclock:45
#, c-format
msgid "Timezone - DrakClock"
msgstr "时区 - Drak 时间设置"
-#: standalone/drakclock:48
+#: standalone/drakclock:47
#, c-format
msgid "GMT - DrakClock"
msgstr "GMT - Drak 时间设置"
-#: standalone/drakclock:48
+#: standalone/drakclock:47
#, c-format
msgid "Is your hardware clock set to GMT?"
msgstr "您的系统时钟是否为 GMT?"
-#: standalone/drakclock:76
+#: standalone/drakclock:75
#, c-format
msgid "Network Time Protocol"
msgstr "网络时间协议"
-#: standalone/drakclock:78
+#: standalone/drakclock:77
#, c-format
msgid ""
"Your computer can synchronize its clock\n"
@@ -19213,27 +19668,27 @@ msgstr ""
"您的计算机可以通过 NTP 协议与远程时间服\n"
"务器的时钟同步"
-#: standalone/drakclock:79
+#: standalone/drakclock:78
#, c-format
msgid "Enable Network Time Protocol"
msgstr "启用网络时间协议"
-#: standalone/drakclock:87
+#: standalone/drakclock:86
#, c-format
msgid "Server:"
msgstr "服务器: "
-#: standalone/drakclock:125
+#: standalone/drakclock:124
#, c-format
msgid "Could not synchronize with %s."
msgstr "无法与 %s 同步。"
-#: standalone/drakclock:147 standalone/drakclock:157
+#: standalone/drakclock:146 standalone/drakclock:156
#, c-format
msgid "Reset"
msgstr "重置"
-#: standalone/drakclock:225
+#: standalone/drakclock:224
#, c-format
msgid ""
"We need to install ntp package\n"
@@ -19241,22 +19696,22 @@ msgid ""
"\n"
"Do you want to install ntp?"
msgstr ""
-"要启用网络时间协议,必须安装 NTP\n"
+"要启用网络时间协议, 必须安装 NTP\n"
"软件包\n"
"\n"
-"您是否想要安装 ntp?"
+"您是否想要安装 ntp?"
#: standalone/drakconnect:85
#, c-format
msgid "Network configuration (%d adapters)"
msgstr "网络配置(%d 网卡)"
-#: standalone/drakconnect:96 standalone/drakconnect:787
+#: standalone/drakconnect:96 standalone/drakconnect:786
#, c-format
msgid "Gateway:"
msgstr "网关: "
-#: standalone/drakconnect:96 standalone/drakconnect:787
+#: standalone/drakconnect:96 standalone/drakconnect:786
#, c-format
msgid "Interface:"
msgstr "网卡: "
@@ -19271,8 +19726,8 @@ msgstr "请稍候"
msgid "Interface"
msgstr "网卡"
-#: standalone/drakconnect:116 standalone/printerdrake:218
-#: standalone/printerdrake:225
+#: standalone/drakconnect:116 standalone/printerdrake:211
+#: standalone/printerdrake:218
#, c-format
msgid "State"
msgstr "状态"
@@ -19287,7 +19742,7 @@ msgstr "主机名: "
msgid "Configure hostname..."
msgstr "配置主机名..."
-#: standalone/drakconnect:149 standalone/drakconnect:843
+#: standalone/drakconnect:149 standalone/drakconnect:842
#, c-format
msgid "LAN configuration"
msgstr "局域网配置"
@@ -19318,120 +19773,120 @@ msgstr "选中的设备"
msgid "IP configuration"
msgstr "IP 配置"
-#: standalone/drakconnect:342
+#: standalone/drakconnect:344
#, c-format
msgid "DNS servers"
msgstr "DNS 服务器"
-#: standalone/drakconnect:350
+#: standalone/drakconnect:352
#, c-format
msgid "Search Domain"
msgstr "搜索域"
-#: standalone/drakconnect:358
+#: standalone/drakconnect:360
#, c-format
msgid "static"
msgstr "静态"
-#: standalone/drakconnect:358
+#: standalone/drakconnect:360
#, c-format
msgid "DHCP"
msgstr "DHCP"
-#: standalone/drakconnect:436
+#: standalone/drakconnect:438
#, c-format
msgid "Metric"
msgstr "度量衡"
-#: standalone/drakconnect:491
+#: standalone/drakconnect:493
#, c-format
msgid "Flow control"
msgstr "流控制"
-#: standalone/drakconnect:492
+#: standalone/drakconnect:494
#, c-format
msgid "Line termination"
msgstr "挂线"
-#: standalone/drakconnect:503
+#: standalone/drakconnect:505
#, c-format
msgid "Modem timeout"
msgstr "调制解调器超时"
-#: standalone/drakconnect:507
+#: standalone/drakconnect:509
#, c-format
msgid "Use lock file"
msgstr "使用锁定文件"
-#: standalone/drakconnect:509
+#: standalone/drakconnect:511
#, c-format
msgid "Wait for dialup tone before dialing"
msgstr "在拨号前等候拨号音"
-#: standalone/drakconnect:512
+#: standalone/drakconnect:514
#, c-format
msgid "Busy wait"
msgstr "遇忙等待"
-#: standalone/drakconnect:517
+#: standalone/drakconnect:519
#, c-format
msgid "Modem sound"
msgstr "调制解调器声音"
-#: standalone/drakconnect:518
+#: standalone/drakconnect:520
#, c-format
msgid "Enable"
msgstr "启用"
-#: standalone/drakconnect:518
+#: standalone/drakconnect:520
#, c-format
msgid "Disable"
msgstr "禁用"
-#: standalone/drakconnect:569 standalone/harddrake2:45
+#: standalone/drakconnect:571 standalone/harddrake2:48
#, c-format
msgid "Media class"
msgstr "介质类别"
-#: standalone/drakconnect:570 standalone/drakfloppy:136
+#: standalone/drakconnect:572 standalone/drakfloppy:136
#, c-format
msgid "Module name"
msgstr "模块名"
-#: standalone/drakconnect:571
+#: standalone/drakconnect:573
#, c-format
msgid "Mac Address"
msgstr "Mac 地址"
-#: standalone/drakconnect:572 standalone/harddrake2:23
-#: standalone/harddrake2:104
+#: standalone/drakconnect:574 standalone/harddrake2:26
+#: standalone/harddrake2:118
#, c-format
msgid "Bus"
msgstr "总线"
-#: standalone/drakconnect:573 standalone/harddrake2:29
+#: standalone/drakconnect:575 standalone/harddrake2:32
#, c-format
msgid "Location on the bus"
msgstr "在总线上的位置"
-#: standalone/drakconnect:670 standalone/drakgw:250 standalone/drakpxe:138
+#: standalone/drakconnect:671 standalone/drakgw:247 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:678
+#: standalone/drakconnect:679
#, c-format
msgid "Remove a network interface"
msgstr "删除网卡"
-#: standalone/drakconnect:682
+#: standalone/drakconnect:683
#, c-format
msgid "Select the network interface to remove:"
msgstr "选择要删除的网卡: "
-#: standalone/drakconnect:713
+#: standalone/drakconnect:715
#, c-format
msgid ""
"An error occurred while deleting the \"%s\" network interface:\n"
@@ -19442,11 +19897,11 @@ msgstr ""
"\n"
"%s"
-#: standalone/drakconnect:715
+#: standalone/drakconnect:716
#, c-format
msgid ""
"Congratulations, the \"%s\" network interface has been successfully deleted"
-msgstr "恭喜,“%s”网卡已经成功删除"
+msgstr "恭喜, “%s”网卡已经成功删除"
#: standalone/drakconnect:732
#, c-format
@@ -19458,83 +19913,83 @@ msgstr "没有 IP"
msgid "No Mask"
msgstr "没有掩码"
-#: standalone/drakconnect:734 standalone/drakconnect:914
+#: standalone/drakconnect:734 standalone/drakconnect:913
#, c-format
msgid "up"
msgstr "上移"
-#: standalone/drakconnect:734 standalone/drakconnect:914
+#: standalone/drakconnect:734 standalone/drakconnect:913
#, c-format
msgid "down"
msgstr "下移"
-#: standalone/drakconnect:777 standalone/net_monitor:468
+#: standalone/drakconnect:776 standalone/net_monitor:470
#, c-format
msgid "Connected"
msgstr "已连接"
-#: standalone/drakconnect:777 standalone/net_monitor:468
+#: standalone/drakconnect:776 standalone/net_monitor:470
#, c-format
msgid "Not connected"
msgstr "未连接"
-#: standalone/drakconnect:779
+#: standalone/drakconnect:778
#, c-format
msgid "Disconnect..."
msgstr "断开连接..."
-#: standalone/drakconnect:779
+#: standalone/drakconnect:778
#, c-format
msgid "Connect..."
msgstr "连接..."
-#: standalone/drakconnect:808
+#: standalone/drakconnect:807
#, c-format
msgid ""
"Warning, another Internet connection has been detected, maybe using your "
"network"
-msgstr "警告,检测到另外的 Internet 连接,可能是通过本地网络"
+msgstr "警告, 检测到另外的 Internet 连接, 可能是通过本地网络"
-#: standalone/drakconnect:839
+#: standalone/drakconnect:838
#, c-format
msgid "Deactivate now"
msgstr "立即禁用"
-#: standalone/drakconnect:839
+#: standalone/drakconnect:838
#, c-format
msgid "Activate now"
msgstr "立即激活"
-#: standalone/drakconnect:847
+#: standalone/drakconnect:846
#, c-format
msgid ""
-"You don't have any configured interface.\n"
+"You do not have any configured interface.\n"
"Configure them first by clicking on 'Configure'"
msgstr ""
"您没有配置好的网卡。\n"
"单击“配置”先配置网卡"
-#: standalone/drakconnect:861
+#: standalone/drakconnect:860
#, c-format
msgid "LAN Configuration"
msgstr "LAN 配置"
-#: standalone/drakconnect:873
+#: standalone/drakconnect:872
#, c-format
msgid "Adapter %s: %s"
msgstr "适配器 %s: %s"
-#: standalone/drakconnect:882
+#: standalone/drakconnect:881
#, c-format
msgid "Boot Protocol"
msgstr "启动协议"
-#: standalone/drakconnect:883
+#: standalone/drakconnect:882
#, c-format
msgid "Started on boot"
msgstr "开机时启动"
-#: standalone/drakconnect:919
+#: standalone/drakconnect:918
#, c-format
msgid ""
"This interface has not been configured yet.\n"
@@ -19544,41 +19999,46 @@ msgstr ""
"请从“Mandrakelinux 控制中心”运行“添加网卡”助手"
#. -PO: here "Add Connection" should be translated the same was as in control-center
-#: standalone/drakconnect:974 standalone/net_applet:46
+#: standalone/drakconnect:973 standalone/net_applet:50
#, c-format
msgid ""
-"You don't have any configured Internet connection.\n"
-"Run the \"Add Connection\" assistant from the Mandrakelinux Control Center"
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mandrakelinux Control Center"
msgstr ""
"您从未配置过 Internet 连接。\n"
-"请从 Mandrakelinux 控制中心运行“添加连接”助手"
+"请从 Mandrakelinux 控制中心运行“%s”助手"
-#: standalone/drakconnect:982
+#: standalone/drakconnect:974 standalone/net_applet:51
+#, c-format
+msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
+msgstr "设置新的网络连接(局域网、ISDN、ADSL……)"
+
+#: standalone/drakconnect:981
#, c-format
msgid "Internet connection configuration"
msgstr "Internet 连接配置"
-#: standalone/drakconnect:1000
+#: standalone/drakconnect:999
#, c-format
msgid "Third DNS server (optional)"
msgstr "第三 DNS 服务器(可选)"
-#: standalone/drakconnect:1022
+#: standalone/drakconnect:1021
#, c-format
msgid "Internet Connection Configuration"
msgstr "Internet 连接配置"
-#: standalone/drakconnect:1023
+#: standalone/drakconnect:1022
#, c-format
msgid "Internet access"
msgstr "Internet 访问"
-#: standalone/drakconnect:1025 standalone/net_monitor:101
+#: standalone/drakconnect:1024 standalone/net_monitor:101
#, c-format
msgid "Connection type: "
msgstr "连接类型:"
-#: standalone/drakconnect:1028
+#: standalone/drakconnect:1027
#, c-format
msgid "Status:"
msgstr "状态: "
@@ -19615,13 +20075,13 @@ msgid ""
"into your system with the X Window System running and supports running\n"
"several different X sessions on your local machine at the same time."
msgstr ""
-"X11 显示管理器允许您以图形化方式登录到您的系统,使用 X 窗口系统和在您的本\n"
+"X11 显示管理器允许您以图形化方式登录到您的系统, 使用 X 窗口系统和在您的本\n"
"地机器同时跑很多个不同的 X 连接服务。"
#: standalone/drakedm:79
#, c-format
msgid "The change is done, do you want to restart the dm service?"
-msgstr "更改已经完成,您想要重新启动 dm 设备吗?"
+msgstr "更改已经完成, 您想要重新启动 dm 设备吗?"
#: standalone/drakedm:80
#, c-format
@@ -19629,7 +20089,7 @@ msgid ""
"You are going to close all running programs and lose your current session. "
"Are you really sure that you want to restart the dm service?"
msgstr ""
-"您即将关闭运行中的全部程序,并丢失您当前的会话。您真的确定您想要重新启动 dm "
+"您即将关闭运行中的全部程序, 并丢失您当前的会话。您真的确定您想要重新启动 dm "
"服务吗?"
#: standalone/drakfloppy:41
@@ -19647,7 +20107,7 @@ msgstr "创建启动盘"
msgid "General"
msgstr "常规"
-#: standalone/drakfloppy:82 standalone/harddrake2:131
+#: standalone/drakfloppy:82 standalone/harddrake2:145
#, c-format
msgid "Device"
msgstr "设备"
@@ -19721,23 +20181,23 @@ msgstr ""
"设备 %s 介质不存在或被写保护。\n"
"请插入介质。"
-#: standalone/drakfloppy:301
+#: standalone/drakfloppy:300
#, c-format
msgid "Unable to fork: %s"
msgstr "无法创建进程: %s"
-#: standalone/drakfloppy:304
+#: standalone/drakfloppy:303
#, c-format
msgid "Floppy creation completed"
msgstr "完成创建软盘"
-#: standalone/drakfloppy:304
+#: standalone/drakfloppy:303
#, c-format
msgid "The creation of the boot floppy has been successfully completed \n"
msgstr "创建启动软盘已经成功地完成了\n"
#. -PO: Do not alter the <span ..> and </span> tags
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:308
#, c-format
msgid ""
"Unable to properly close mkbootdisk:\n"
@@ -19748,109 +20208,109 @@ msgstr ""
"\n"
"<span foreground=\"Red\"><tt>%s</tt></span>"
-#: standalone/drakfont:183
+#: standalone/drakfont:182
#, c-format
msgid "Search installed fonts"
msgstr "搜索已安装的字体"
-#: standalone/drakfont:185
+#: standalone/drakfont:184
#, c-format
msgid "Unselect fonts installed"
msgstr "不选已安装的文件"
-#: standalone/drakfont:208
+#: standalone/drakfont:207
#, c-format
msgid "parse all fonts"
msgstr "分析所有字体"
-#: standalone/drakfont:210
+#: standalone/drakfont:209
#, c-format
msgid "No fonts found"
msgstr "找不到字体"
-#: standalone/drakfont:218 standalone/drakfont:258 standalone/drakfont:325
-#: standalone/drakfont:358 standalone/drakfont:366 standalone/drakfont:392
-#: standalone/drakfont:410 standalone/drakfont:424
+#: standalone/drakfont:217 standalone/drakfont:257 standalone/drakfont:324
+#: standalone/drakfont:357 standalone/drakfont:365 standalone/drakfont:391
+#: standalone/drakfont:409 standalone/drakfont:423
#, c-format
msgid "done"
msgstr "完成"
-#: standalone/drakfont:223
+#: standalone/drakfont:222
#, c-format
msgid "Could not find any font in your mounted partitions"
msgstr "在已挂载的分区中找不到任何字体"
-#: standalone/drakfont:256
+#: standalone/drakfont:255
#, c-format
msgid "Reselect correct fonts"
msgstr "重新选择正确字体"
-#: standalone/drakfont:259
+#: standalone/drakfont:258
#, c-format
msgid "Could not find any font.\n"
msgstr "找不到任何字体。\n"
-#: standalone/drakfont:269
+#: standalone/drakfont:268
#, c-format
msgid "Search for fonts in installed list"
msgstr "在安装记录中查找字体"
-#: standalone/drakfont:294
+#: standalone/drakfont:293
#, c-format
msgid "%s fonts conversion"
msgstr "%s 字体转换"
-#: standalone/drakfont:323
+#: standalone/drakfont:322
#, c-format
msgid "Fonts copy"
msgstr "复制字体"
-#: standalone/drakfont:326
+#: standalone/drakfont:325
#, c-format
msgid "True Type fonts installation"
msgstr "TrueType 字体安装"
-#: standalone/drakfont:333
+#: standalone/drakfont:332
#, c-format
msgid "please wait during ttmkfdir..."
-msgstr "正在运行 ttmkfdir,请稍候..."
+msgstr "正在运行 ttmkfdir, 请稍候..."
-#: standalone/drakfont:334
+#: standalone/drakfont:333
#, c-format
msgid "True Type install done"
msgstr "TrueType 字体安装完成"
-#: standalone/drakfont:340 standalone/drakfont:355
+#: standalone/drakfont:339 standalone/drakfont:354
#, c-format
msgid "type1inst building"
msgstr "正在构造 type1inst"
-#: standalone/drakfont:349
+#: standalone/drakfont:348
#, c-format
msgid "Ghostscript referencing"
msgstr "Ghostscript 引用"
-#: standalone/drakfont:359
+#: standalone/drakfont:358
#, c-format
msgid "Suppress Temporary Files"
msgstr "删除临时文件"
-#: standalone/drakfont:362
+#: standalone/drakfont:361
#, c-format
msgid "Restart XFS"
msgstr "重新启动 XFS"
-#: standalone/drakfont:408 standalone/drakfont:418
+#: standalone/drakfont:407 standalone/drakfont:417
#, c-format
msgid "Suppress Fonts Files"
msgstr "删除字体文件"
-#: standalone/drakfont:420
+#: standalone/drakfont:419
#, c-format
msgid "xfs restart"
msgstr "重新启动 xfs"
-#: standalone/drakfont:428
+#: standalone/drakfont:427
#, c-format
msgid ""
"Before installing any fonts, be sure that you have the right to use and "
@@ -19861,35 +20321,35 @@ msgid ""
msgstr ""
"安装任何字体之前请确认您有权利在自己的系统安装和使用它。\n"
"\n"
-"-通常字体安装可以正常进行。但有罕见的例外,有问题的字体会使 X 挂住。"
+"-通常字体安装可以正常进行。但有罕见的例外, 有问题的字体会使 X 挂住。"
-#: standalone/drakfont:477 standalone/drakfont:486
+#: standalone/drakfont:476 standalone/drakfont:485
#, c-format
msgid "DrakFont"
msgstr "Drak 字体"
-#: standalone/drakfont:487
+#: standalone/drakfont:486
#, c-format
msgid "Font List"
msgstr "字体列表"
-#: standalone/drakfont:493
+#: standalone/drakfont:492
#, c-format
msgid "About"
msgstr "关于"
-#: standalone/drakfont:495 standalone/drakfont:691 standalone/drakfont:729
+#: standalone/drakfont:494 standalone/drakfont:692 standalone/drakfont:730
#, c-format
msgid "Uninstall"
msgstr "卸载"
-#: standalone/drakfont:496
+#: standalone/drakfont:495
#, c-format
msgid "Import"
msgstr "导入"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: standalone/drakfont:514
+#: standalone/drakfont:513
#, c-format
msgid ""
"Copyright (C) 2001-2002 by Mandrakesoft \n"
@@ -19910,7 +20370,7 @@ msgstr ""
"\n"
" VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
-#: standalone/drakfont:523
+#: standalone/drakfont:522
#, c-format
msgid ""
"This program is free software; you can redistribute it and/or modify\n"
@@ -19929,18 +20389,18 @@ msgid ""
" along with this program; if not, write to the Free Software\n"
" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
msgstr ""
-"这个程序是自由软件;您可以重新发布,或修改它,只要您遵守来自 Free Software\n"
+"这个程序是自由软件;您可以重新发布, 或修改它, 只要您遵守来自 Free Software\n"
" Foundation 自由软件基金会的 GNU General Public License 通用公共许可证第 2\n"
-" 版,或者(以您的意愿)更新的版本。\n"
+" 版, 或者(以您的意愿)更新的版本。\n"
"\n"
-"我们发行这个软件是希望它有用,但是不提供任何担保;不保证它适合任何普通或特\n"
+"我们发行这个软件是希望它有用, 但是不提供任何担保;不保证它适合任何普通或特\n"
"定的用途。细节见 GNU General Public License 通用公共许可证。\n"
"\n"
"您应该随同本软件得到一份 GNU General Public License 通用公共许可证;如果没\n"
-"有,请写信给自由软件基金会,地址是 Free Software Foundation, Inc., 59 \n"
+"有, 请写信给自由软件基金会, 地址是 Free Software Foundation, Inc., 59 \n"
"Temple Place - Suite 330, Boston, MA 02111-1307, USA."
-#: standalone/drakfont:539
+#: standalone/drakfont:538
#, c-format
msgid ""
"Thanks:\n"
@@ -19971,12 +20431,12 @@ msgstr ""
"\t Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin 编写: \n"
" 转换 ttf 字体文件为 afm 和 pfb 字体。\n"
-#: standalone/drakfont:558
+#: standalone/drakfont:557
#, c-format
msgid "Choose the applications that will support the fonts:"
msgstr "请选择支持字体的应用程序: "
-#: standalone/drakfont:559
+#: standalone/drakfont:558
#, c-format
msgid ""
"Before installing any fonts, be sure that you have the right to use and "
@@ -19985,36 +20445,36 @@ msgid ""
"You can install the fonts the normal way. In rare cases, bogus fonts may "
"hang up your X Server."
msgstr ""
-"安装任何字体之前,请确认您有权利在您的系统安装并使用这些字体。\n"
+"安装任何字体之前, 请确认您有权利在您的系统安装并使用这些字体。\n"
"\n"
-"通常字体安装可以正常进行。但有罕见的例外,有问题的字体会使 X 挂住。"
+"通常字体安装可以正常进行。但有罕见的例外, 有问题的字体会使 X 挂住。"
-#: standalone/drakfont:569
+#: standalone/drakfont:568
#, c-format
msgid "Ghostscript"
msgstr "Ghostscript"
-#: standalone/drakfont:570
+#: standalone/drakfont:569
#, c-format
msgid "StarOffice"
msgstr "StarOffice"
-#: standalone/drakfont:571
+#: standalone/drakfont:570
#, c-format
msgid "Abiword"
msgstr "Abiword"
-#: standalone/drakfont:572
+#: standalone/drakfont:571
#, c-format
msgid "Generic Printers"
msgstr "通用打印机"
-#: standalone/drakfont:588
+#: standalone/drakfont:587
#, c-format
msgid "Select the font file or directory and click on 'Add'"
-msgstr "选择字体文件或目录,然后单击“添加”"
+msgstr "选择字体文件或目录, 然后单击“添加”"
-#: standalone/drakfont:589
+#: standalone/drakfont:588
#, c-format
msgid "File Selection"
msgstr "选择文件"
@@ -20024,92 +20484,92 @@ msgstr "选择文件"
msgid "You've not selected any font"
msgstr "您未选中任何字体"
-#: standalone/drakfont:656
+#: standalone/drakfont:657
#, c-format
msgid "Import fonts"
msgstr "导入字体"
-#: standalone/drakfont:661
+#: standalone/drakfont:662
#, c-format
msgid "Install fonts"
msgstr "安装字体"
-#: standalone/drakfont:696
+#: standalone/drakfont:697
#, c-format
msgid "click here if you are sure."
-msgstr "如果您确定,请点击这儿。"
+msgstr "如果您确定, 请点击这儿。"
-#: standalone/drakfont:698
+#: standalone/drakfont:699
#, c-format
msgid "here if no."
-msgstr "如果要放弃,点击这儿."
+msgstr "如果要放弃, 点击这儿."
-#: standalone/drakfont:737
+#: standalone/drakfont:738
#, c-format
msgid "Unselected All"
msgstr "全部不选"
-#: standalone/drakfont:740
+#: standalone/drakfont:741
#, c-format
msgid "Selected All"
msgstr "全部选中"
-#: standalone/drakfont:743
+#: standalone/drakfont:744
#, c-format
msgid "Remove List"
msgstr "删除列表"
-#: standalone/drakfont:754 standalone/drakfont:773
+#: standalone/drakfont:755 standalone/drakfont:774
#, c-format
msgid "Importing fonts"
msgstr "导入字体"
-#: standalone/drakfont:758 standalone/drakfont:778
+#: standalone/drakfont:759 standalone/drakfont:779
#, c-format
msgid "Initial tests"
msgstr "初始测试"
-#: standalone/drakfont:759
+#: standalone/drakfont:760
#, c-format
msgid "Copy fonts on your system"
msgstr "复制系统中的字体"
-#: standalone/drakfont:760
+#: standalone/drakfont:761
#, c-format
msgid "Install & convert Fonts"
msgstr "安装并转换字体"
-#: standalone/drakfont:761
+#: standalone/drakfont:762
#, c-format
msgid "Post Install"
msgstr "安装后的设置"
-#: standalone/drakfont:779
+#: standalone/drakfont:780
#, c-format
msgid "Remove fonts on your system"
msgstr "删除系统中的字体"
-#: standalone/drakfont:780
+#: standalone/drakfont:781
#, c-format
msgid "Post Uninstall"
msgstr "删除后"
-#: standalone/drakgw:58 standalone/drakgw:194
+#: standalone/drakgw:58 standalone/drakgw:191
#, c-format
msgid "Internet Connection Sharing"
msgstr "共享互联网连接"
-#: standalone/drakgw:114 standalone/drakvpn:51
+#: standalone/drakgw:111 standalone/drakvpn:51
#, c-format
msgid "Sorry, we support only 2.4 and above kernels."
-msgstr "对不起,我们只支持 2.4 及以上版本的内核。"
+msgstr "对不起, 我们只支持 2.4 及以上版本的内核。"
-#: standalone/drakgw:125
+#: standalone/drakgw:122
#, c-format
msgid "Internet Connection Sharing currently disabled"
msgstr "Internet 连接共享现在被禁用"
-#: standalone/drakgw:126
+#: standalone/drakgw:123
#, c-format
msgid ""
"The setup of Internet connection sharing has already been done.\n"
@@ -20120,41 +20580,41 @@ msgstr ""
"Internet 连接共享的设定已经完成。\n"
"它当前已经被禁用。\n"
"\n"
-"您要做什么?"
+"您要做什么?"
-#: standalone/drakgw:130 standalone/drakvpn:127
+#: standalone/drakgw:127 standalone/drakvpn:127
#, c-format
msgid "enable"
msgstr "启用"
-#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
+#: standalone/drakgw:127 standalone/drakgw:154 standalone/drakvpn:101
#: standalone/drakvpn:127
#, c-format
msgid "reconfigure"
msgstr "重新配置"
-#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
+#: standalone/drakgw:127 standalone/drakgw:154 standalone/drakvpn:101
#: standalone/drakvpn:127 standalone/drakvpn:376 standalone/drakvpn:735
#, c-format
msgid "dismiss"
msgstr "放弃"
-#: standalone/drakgw:137
+#: standalone/drakgw:134
#, c-format
msgid "Enabling servers..."
msgstr "正在启用服务器..."
-#: standalone/drakgw:149
+#: standalone/drakgw:146
#, c-format
msgid "Internet Connection Sharing is now enabled."
msgstr "Internet 连接共享现已启用。"
-#: standalone/drakgw:152
+#: standalone/drakgw:149
#, c-format
msgid "Internet Connection Sharing currently enabled"
msgstr "Internet 连接共享现在已经启用"
-#: standalone/drakgw:153
+#: standalone/drakgw:150
#, c-format
msgid ""
"The setup of Internet Connection Sharing has already been done.\n"
@@ -20165,24 +20625,24 @@ msgstr ""
"Internet 连接共享的设置已经完成。\n"
"它当前已经被启用。\n"
"\n"
-"您要做什么?"
+"您要做什么?"
-#: standalone/drakgw:157 standalone/drakvpn:101
+#: standalone/drakgw:154 standalone/drakvpn:101
#, c-format
msgid "disable"
msgstr "禁用"
-#: standalone/drakgw:160
+#: standalone/drakgw:157
#, c-format
msgid "Disabling servers..."
msgstr "正在禁用服务器..."
-#: standalone/drakgw:175
+#: standalone/drakgw:172
#, c-format
msgid "Internet Connection Sharing is now disabled."
msgstr "Internet 连接共享现在被禁用了。"
-#: standalone/drakgw:195
+#: standalone/drakgw:192
#, c-format
msgid ""
"You are about to configure your computer to share its Internet connection.\n"
@@ -20196,33 +20656,33 @@ msgid ""
"(LAN)."
msgstr ""
"现在将要把您电脑上的 Internet 连接配置为共享给其它电脑。\n"
-"使用此特性,局域网上的其它计算机都将可以使用本机上的 Internet 连接。\n"
+"使用此特性, 局域网上的其它计算机都将可以使用本机上的 Internet 连接。\n"
"\n"
"请确定在继续操作之前已经使用 DrakConnect 配置了您的网络/Internet 访问。\n"
"\n"
"注意: 您另外需要一块专用的网卡来设置局域网(LAN)。"
-#: standalone/drakgw:239
+#: standalone/drakgw:236
#, c-format
msgid "Interface %s (using module %s)"
msgstr "网卡 %s(使用 %s 模块)"
-#: standalone/drakgw:240
+#: standalone/drakgw:237
#, c-format
msgid "Interface %s"
msgstr "网卡 %s"
-#: standalone/drakgw:249 standalone/drakpxe:137
+#: standalone/drakgw:246 standalone/drakpxe:137
#, c-format
msgid "No network adapter on your system!"
msgstr "您系统中没有网卡!"
-#: standalone/drakgw:256
+#: standalone/drakgw:253
#, c-format
msgid "Network interface"
msgstr "网卡"
-#: standalone/drakgw:257
+#: standalone/drakgw:254
#, c-format
msgid ""
"There is only one configured network adapter on your system:\n"
@@ -20237,24 +20697,24 @@ msgstr ""
"\n"
"对这块网卡配置您的局域网。"
-#: standalone/drakgw:263 standalone/drakpxe:142
+#: standalone/drakgw:260 standalone/drakpxe:142
#, c-format
msgid "Choose the network interface"
msgstr "选择网卡"
-#: standalone/drakgw:264
+#: standalone/drakgw:261
#, c-format
msgid ""
"Please choose what network adapter will be connected to your Local Area "
"Network."
msgstr "请选择您将使用哪张网卡连接您的局域网。"
-#: standalone/drakgw:293
+#: standalone/drakgw:290
#, c-format
msgid "Network interface already configured"
msgstr "已完成网络配置"
-#: standalone/drakgw:294
+#: standalone/drakgw:291
#, c-format
msgid ""
"Warning, the network adapter (%s) is already configured.\n"
@@ -20263,33 +20723,33 @@ msgid ""
"\n"
"You can do it manually but you need to know what you're doing."
msgstr ""
-"警告,网卡(%s)已经配置过。\n"
+"警告, 网卡(%s)已经配置过。\n"
"\n"
-"您希望自动重新配置吗?\n"
+"您希望自动重新配置吗?\n"
"\n"
-"如果您知道怎样做,也可以手工配置。"
+"如果您知道怎样做, 也可以手工配置。"
-#: standalone/drakgw:299
+#: standalone/drakgw:296
#, c-format
msgid "Automatic reconfiguration"
msgstr "自动重新配置"
-#: standalone/drakgw:299
+#: standalone/drakgw:296
#, c-format
msgid "No (experts only)"
msgstr "无(仅对专家)"
-#: standalone/drakgw:300
+#: standalone/drakgw:297
#, c-format
msgid "Show current interface configuration"
msgstr "修改当前网络接口的配置"
-#: standalone/drakgw:301
+#: standalone/drakgw:298
#, c-format
msgid "Current interface configuration"
msgstr "当前接口配置"
-#: standalone/drakgw:302
+#: standalone/drakgw:299
#, c-format
msgid ""
"Current configuration of `%s':\n"
@@ -20306,7 +20766,7 @@ msgstr ""
"IP 属性: %s\n"
"其它: %s"
-#: standalone/drakgw:315
+#: standalone/drakgw:312
#, c-format
msgid ""
"I can keep your current configuration and assume you already set up a DHCP "
@@ -20321,100 +20781,100 @@ msgid ""
"for you.\n"
"\n"
msgstr ""
-"我现在可以保留您当前的设置并假定您已经设置好了 DHCP 服务器;如果是这样的话,"
-"请检查我已经从本地网络上读取到了您正在使用的网络;我不会强行重新配置,也不会"
+"我现在可以保留您当前的设置并假定您已经设置好了 DHCP 服务器;如果是这样的话, "
+"请检查我已经从本地网络上读取到了您正在使用的网络;我不会强行重新配置, 也不会"
"更改您的 DHCP 服务器配置。\n"
"\n"
-"默认的 DNS 项是配置在防火墙上的缓冲命名服务器。例如,您可以将其替换为您的 "
+"默认的 DNS 项是配置在防火墙上的缓冲命名服务器。例如, 您可以将其替换为您的 "
"ISP DNS IP。\n"
"\t\t \n"
-"否则,我就会重新配置您的接口并重新为您配置 DHCP 服务器。\n"
+"否则, 我就会重新配置您的接口并重新为您配置 DHCP 服务器。\n"
"\n"
-#: standalone/drakgw:322
+#: standalone/drakgw:319
#, c-format
msgid "Local Network adress"
msgstr "本地网络地址"
-#: standalone/drakgw:326
+#: standalone/drakgw:323
#, c-format
msgid ""
"DHCP Server Configuration.\n"
"\n"
"Here you can select different options for the DHCP server configuration.\n"
-"If you don't know the meaning of an option, simply leave it as it is."
+"If you do not know the meaning of an option, simply leave it as it is."
msgstr ""
"DHCP 服务器配置。\n"
"\n"
"在此您可以选择 DHCP 服务器配置的不同选项。\n"
-"如果您不知道选项的含义,那么就不管它,不必进行修改。"
+"如果您不知道选项的含义, 那么就不管它, 不必进行修改。"
-#: standalone/drakgw:330
+#: standalone/drakgw:327
#, c-format
msgid "(This) DHCP Server IP"
msgstr "(此)DHCP 服务器 IP"
-#: standalone/drakgw:331
+#: standalone/drakgw:328
#, c-format
msgid "The DNS Server IP"
msgstr "DNS 服务器 IP"
-#: standalone/drakgw:332
+#: standalone/drakgw:329
#, c-format
msgid "The internal domain name"
msgstr "内部域名"
-#: standalone/drakgw:333
+#: standalone/drakgw:330
#, c-format
msgid "The DHCP start range"
msgstr "DHCP 起始范围"
-#: standalone/drakgw:334
+#: standalone/drakgw:331
#, c-format
msgid "The DHCP end range"
msgstr "DHCP 终止范围"
-#: standalone/drakgw:335
+#: standalone/drakgw:332
#, c-format
msgid "The default lease (in seconds)"
msgstr "默认租期(以秒为单位)"
-#: standalone/drakgw:336
+#: standalone/drakgw:333
#, c-format
msgid "The maximum lease (in seconds)"
msgstr "最长租期(以秒为单位)"
-#: standalone/drakgw:337
+#: standalone/drakgw:334
#, c-format
msgid "Re-configure interface and DHCP server"
msgstr "重新配置网卡和 DHCP 服务器"
-#: standalone/drakgw:344
+#: standalone/drakgw:341
#, c-format
msgid "The Local Network did not finish with `.0', bailing out."
-msgstr "本地网络没有以“.0”结束,已经修改。"
+msgstr "本地网络没有以“.0”结束, 已经修改。"
-#: standalone/drakgw:354
+#: standalone/drakgw:351
#, c-format
msgid "Potential LAN address conflict found in current config of %s!\n"
msgstr "在当前的 %s 配置中发现可能的 LAN 地址冲突!\n"
-#: standalone/drakgw:364
+#: standalone/drakgw:361
#, c-format
msgid "Configuring..."
msgstr "正在配置..."
-#: standalone/drakgw:365
+#: standalone/drakgw:362
#, c-format
msgid "Configuring scripts, installing software, starting servers..."
-msgstr "正在配置脚本,安装软件,启动服务程序 ..."
+msgstr "正在配置脚本, 安装软件, 启动服务程序 ..."
-#: standalone/drakgw:405 standalone/drakpxe:231 standalone/drakvpn:278
+#: standalone/drakgw:402 standalone/drakpxe:231 standalone/drakvpn:278
#, c-format
msgid "Problems installing package %s"
msgstr "安装 %s 软件包出现问题"
-#: standalone/drakgw:601
+#: standalone/drakgw:598
#, c-format
msgid ""
"Everything has been configured.\n"
@@ -20422,10 +20882,9 @@ msgid ""
"Area Network, using automatic network configuration (DHCP) and\n"
" a Transparent Proxy Cache server (SQUID)."
msgstr ""
-"所有配置都完成了。\n"
+"所有配置都已完成了。\n"
"您现在可以利用自动网络设置(DHCP)和透明代理缓存服务器(SQUID)让您的局域网上其它"
-"的电脑共享您的\n"
-"互联网连接了。"
+"的电脑共享您的互联网连接了。"
#: standalone/drakhelp:17
#, c-format
@@ -20438,8 +20897,8 @@ msgid ""
"Usage: \n"
msgstr ""
" Drak 帮助 0.1\n"
-"版权 (C) 2003 Mandrakesoft.\n"
-"这是自由软件,可按照 GNU GPL 协议条款再发放。\n"
+"版权 (C) 2003-2004 Mandrakesoft.\n"
+"这是自由软件, 可按照 GNU GPL 协议条款再发放。\n"
"\n"
"用法: \n"
@@ -20480,7 +20939,7 @@ msgstr ""
msgid ""
"No browser is installed on your system, Please install one if you want to "
"browse the help system"
-msgstr "在您的系统上没有安装浏览器。如果您想要浏览帮助系统的话,请先安装一个"
+msgstr "在您的系统上没有安装浏览器。如果您想要浏览帮助系统的话, 请先安装一个"
#: standalone/drakperm:22
#, c-format
@@ -20529,7 +20988,7 @@ msgid ""
"groups via msec.\n"
"You can also edit your own rules which will owerwrite the default rules."
msgstr ""
-"在这儿您可以查看权限定义文件,以便使用 msec 来调整各种文件权限、所有者、组"
+"在这儿您可以查看权限定义文件, 以便使用 msec 来调整各种文件权限、所有者、组"
"等。\n"
"您可以编写自己的规则以代替各种默认的规则。"
@@ -20580,7 +21039,7 @@ msgstr "删除选中的规则"
#. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
#: standalone/drakperm:125 standalone/drakups:298 standalone/drakups:358
#: standalone/drakups:378 standalone/drakvpn:333 standalone/drakvpn:694
-#: standalone/printerdrake:239
+#: standalone/printerdrake:232
#, c-format
msgid "Edit"
msgstr "编辑"
@@ -20694,8 +21153,8 @@ msgstr "当前用户"
#: standalone/drakperm:297
#, c-format
-msgid "When checked, owner and group won't be changed"
-msgstr "选中后,无法更改所有者和组"
+msgid "When checked, owner and group will not be changed"
+msgstr "选中后, 无法更改所有者和组"
#: standalone/drakperm:307
#, c-format
@@ -20732,13 +21191,13 @@ msgid ""
"Note: you need a dedicated Network Adapter to set up a Local Area Network "
"(LAN)."
msgstr ""
-"您将要在您的电脑上配置一个安装服务器,这包括安装一个 PXE 服务器并把它配置\n"
+"您将要在您的电脑上配置一个安装服务器, 这包括安装一个 PXE 服务器并把它配置\n"
"为 DHCP 服务器和 TFTP 服务器。\n"
-"使用此特性,您局域网上的其它电脑就能够从这个服务器安装系统。\n"
+"使用此特性, 您局域网上的其它电脑就能够从这个服务器安装系统。\n"
"\n"
-"继续之前,请一定要使用“Drak 连接”配置您的网络和互联网连接。\n"
+"继续之前, 请一定要使用“Drak 连接”配置您的网络和互联网连接。\n"
"\n"
-"注意:要建立一个局域网(LAN),您需要专用的网卡。"
+"注意: 要建立一个局域网(LAN), 您需要专用的网卡。"
#: standalone/drakpxe:143
#, c-format
@@ -20759,9 +21218,9 @@ msgid ""
"The network address is %s using a netmask of %s.\n"
"\n"
msgstr ""
-"DHCP 服务器可以让其它电脑用 PXE 启动,并得到指定范围内的地址。\n"
+"DHCP 服务器可以让其它电脑用 PXE 启动, 并得到指定范围内的地址。\n"
"\n"
-"网络地址是 %s 而子网掩码是 %s.\n"
+"网络地址是 %s 而子网掩码是 %s。\n"
"\n"
#: standalone/drakpxe:173
@@ -20785,7 +21244,7 @@ msgid ""
msgstr ""
"请指定在哪里可以找到安装镜像。\n"
"\n"
-"如果您还没有这个目录,请复制 CD 或 DVD 的内容。\n"
+"如果您还没有这个目录, 请复制 CD 或 DVD 的内容。\n"
"\n"
#: standalone/drakpxe:192
@@ -20802,7 +21261,7 @@ msgstr "没有发现映像"
#, c-format
msgid ""
"No CD or DVD image found, please copy the installation program and rpm files."
-msgstr "没有发现 CD 或 DVD 映像,请复制安装程序和 RPM 文件。"
+msgstr "没有发现 CD 或 DVD 映像, 请复制安装程序和 RPM 文件。"
#: standalone/drakpxe:210
#, c-format
@@ -20894,8 +21353,8 @@ msgstr ""
"您可在此设置安全级别以及您机器的管理员。\n"
"\n"
"\n"
-"“<span weight=\"bold\">安全管理员</span>”是这样一个人,如果设置了“<span "
-"weight=\"bold\">安全警告</span>”选项,他就会收到这样的安全警告。您可以设置用"
+"“<span weight=\"bold\">安全管理员</span>”是这样一个人, 如果设置了“<span "
+"weight=\"bold\">安全警告</span>”选项, 他就会收到这样的安全警告。您可以设置用"
"户名或者电子邮件。\n"
"\n"
"\n"
@@ -20905,34 +21364,34 @@ msgstr ""
"置:\n"
"\n"
"\n"
-"<span foreground=\"royalblue3\">低</span>:这种情况下非常不安全,但却是非常易"
-"于使用的安全级别。这一安全级别应仅用于不连接到任何网络,且并非人人都可访问的"
+"<span foreground=\"royalblue3\">低</span>:这种情况下非常不安全, 但却是非常易"
+"于使用的安全级别。这一安全级别应仅用于不连接到任何网络, 且并非人人都可访问的"
"机器。\n"
"\n"
"\n"
"<span foreground=\"royalblue3\">标准</span>:对于那些会以客户端连接到 "
-"Internet 的计算机,推荐使用本安全级别。\n"
+"Internet 的计算机, 推荐使用本安全级别。\n"
"\n"
"\n"
-"<span foreground=\"royalblue3\">高</span>:此安全级别已有一些限制,并且会在每"
+"<span foreground=\"royalblue3\">高</span>:此安全级别已有一些限制, 并且会在每"
"晚执行更多的自动检查。\n"
"\n"
"\n"
"<span foreground=\"royalblue3\">较高</span>:假如要将系统用作将接受大量客户访"
-"问的服务器的话,本安全级别已经足够安全了。如果您的计算机仅仅是 Internet 的客"
-"户端,请使用较低的级别。\n"
+"问的服务器的话, 本安全级别已经足够安全了。如果您的计算机仅仅是 Internet 的客"
+"户端, 请使用较低的级别。\n"
"\n"
"\n"
-"<span foreground=\"royalblue3\">苛刻</span>:本级别与前一级别类似,但系统几乎"
-"完全封闭,安全特性达到最高"
+"<span foreground=\"royalblue3\">苛刻</span>:本级别与前一级别类似, 但系统几乎"
+"完全封闭, 安全特性达到最高"
-#: standalone/draksec:154 standalone/harddrake2:184
+#: standalone/draksec:154 standalone/harddrake2:202
#, c-format
msgid ""
"Description of the fields:\n"
"\n"
msgstr ""
-"各个域的描述: \n"
+"各个域的描述:\n"
"\n"
#: standalone/draksec:168
@@ -20970,15 +21429,15 @@ msgstr "系统选项"
msgid "Periodic Checks"
msgstr "定期检查"
-#: standalone/draksec:299
+#: standalone/draksec:298
#, c-format
msgid "Please wait, setting security level..."
-msgstr "请稍候,正在设置安全级别..."
+msgstr "请稍候, 正在设置安全级别..."
-#: standalone/draksec:305
+#: standalone/draksec:304
#, c-format
msgid "Please wait, setting security options..."
-msgstr "请稍候,正在设置安全选项..."
+msgstr "请稍候, 正在设置安全选项..."
#: standalone/draksound:47
#, c-format
@@ -20998,14 +21457,14 @@ msgid ""
"\n"
"http://www.linux-mandrake.com/en/hardware.php3"
msgstr ""
-"在您的机器上没有检测到声卡。请检查您是否正确的安装了您的声卡,它是否被 Linux "
+"在您的机器上没有检测到声卡。请检查您是否正确的安装了您的声卡, 它是否被 Linux "
"支持。\n"
"\n"
"\n"
"您可以访问硬件数据库: \n"
"\n"
"\n"
-"http://www.linux-mandrake.com/zh_CN/hardware.php3"
+"http://www.mandrakelinux.com/zh_CN/hardware.php3"
#: standalone/draksound:57
#, c-format
@@ -21019,7 +21478,7 @@ msgstr ""
"\n"
"\n"
"\n"
-"注意: 如果您的声卡是 ISA 即插即用的,您需要使用 sndconfig 程序。只需在控制台"
+"注意: 如果您的声卡是 ISA 即插即用的, 您需要使用 sndconfig 程序。只需在控制台"
"中输入“alsaconf”或“sndconfig”。"
#: standalone/draksplash:21
@@ -21066,14 +21525,14 @@ msgstr "配置开机画面图片"
msgid ""
"x coordinate of text box\n"
"in number of characters"
-msgstr "文本框的 X 坐标,按字符数计算"
+msgstr "文本框的 X 坐标, 按字符数计算"
#: standalone/draksplash:97
#, c-format
msgid ""
"y coordinate of text box\n"
"in number of characters"
-msgstr "文本框的 Y 坐标,按字符数计算"
+msgstr "文本框的 Y 坐标, 按字符数计算"
#: standalone/draksplash:98
#, c-format
@@ -21189,7 +21648,7 @@ msgid ""
"\n"
"<span foreground=\"Red\">%s</span>"
msgstr ""
-"无法装入图像“%s”,原因是:\n"
+"无法装入图像“%s”, 原因是:\n"
"\n"
"<span foreground=\"Red\">%s</span>"
@@ -21224,14 +21683,14 @@ msgid ""
msgstr ""
"现在即将添加 UPS 设备。\n"
"\n"
-"您是想要自动检测连接到本机的 UPS 设备还是手动选择?"
+"您是想要自动检测连接到本机的 UPS 设备还是手动选择?"
#: standalone/drakups:93
#, c-format
msgid "Autodetection"
msgstr "自动检测"
-#: standalone/drakups:101 standalone/harddrake2:211
+#: standalone/drakups:101 standalone/harddrake2:231
#, c-format
msgid "Detection in progress"
msgstr "检测进行中"
@@ -21274,7 +21733,7 @@ msgid ""
"Please fill in its name, its driver and its port."
msgstr ""
"正在配置“%2$s”的“%1$s”。\n"
-"请填入其名称,其驱动程序和其端口。"
+"请填入其名称, 其驱动程序和其端口。"
#: standalone/drakups:145
#, c-format
@@ -21312,7 +21771,8 @@ msgid "UPS devices"
msgstr "UPS 服务"
#: standalone/drakups:247 standalone/drakups:266 standalone/drakups:282
-#: standalone/harddrake2:80 standalone/harddrake2:102
+#: standalone/harddrake2:83 standalone/harddrake2:109
+#: standalone/harddrake2:116
#, c-format
msgid "Name"
msgstr "名称"
@@ -21342,7 +21802,7 @@ msgstr "规则 "
msgid "Action"
msgstr "操作"
-#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:77
+#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:80
#, c-format
msgid "Level"
msgstr "级别"
@@ -21385,7 +21845,7 @@ msgstr ""
"\n"
"该连接目前已经被启用。\n"
"\n"
-"您要做什么?"
+"您要做什么?"
#: standalone/drakvpn:105
#, c-format
@@ -21415,7 +21875,7 @@ msgstr ""
"\n"
"该连接目前已经被禁用。\n"
"\n"
-"您要做什么?"
+"您要做什么?"
#: standalone/drakvpn:135
#, c-format
@@ -21449,12 +21909,12 @@ msgid ""
msgstr ""
"您即将配置计算机使用 VPN 连接。\n"
"\n"
-"通过此特性,您本地私有网络中的计算机和远程私有网络之间的计算机将可透过\n"
+"通过此特性, 您本地私有网络中的计算机和远程私有网络之间的计算机将可透过\n"
"各自的防火墙在 Internet 上安全的共享资源。\n"
"\n"
"在 Internet 上的通讯是加密的。本地和远程计算机看起来像是在同一个网络中。\n"
"\n"
-"在您继续进行之前,请先确定您已经通过“Drak 连接”配置了您的网络/Internet\n"
+"在您继续进行之前, 请先确定您已经通过“Drak 连接”配置了您的网络/Internet\n"
"访问。"
#: standalone/drakvpn:184
@@ -21481,7 +21941,7 @@ msgstr ""
" - ipsec-howto: \t\thttp://www.ipsec-howto.org\n"
" - %s 软件包所带的文档和 man page\n"
"\n"
-"在继续进行之前,请至少阅读 ipsec-howto 文档。"
+"在继续进行之前, 请至少阅读 ipsec-howto 文档。"
#: standalone/drakvpn:196
#, c-format
@@ -21531,10 +21991,10 @@ msgid ""
msgstr ""
"配置步骤!\n"
"\n"
-"您需要先定义安全策略,然后再配置自动密钥交换(IKE)守护\n"
+"您需要先定义安全策略, 然后再配置自动密钥交换(IKE)守护\n"
"程序。我们所使用的 KAME IKE 守护程序称为“racoon”。\n"
"\n"
-"您想要配置什么?\n"
+"您想要配置什么?\n"
#: standalone/drakvpn:307
#, c-format
@@ -21544,7 +22004,7 @@ msgid ""
"\n"
"Simply click on Next.\n"
msgstr ""
-"接下来,我们将配置 %s 文件。\n"
+"接下来, 我们将配置 %s 文件。\n"
"\n"
"\n"
"只需点击下一步。\n"
@@ -21571,7 +22031,7 @@ msgstr ""
"\n"
"您现在可以:\n"
"\n"
-" - 显示、添加、编辑或删除区段,然后\n"
+" - 显示、添加、编辑或删除区段, 然后\n"
" - 提交更改\n"
"\n"
"您想要做什么?\n"
@@ -21609,7 +22069,7 @@ msgstr ""
"\n"
"这应该是一个新配置。\n"
"\n"
-"您需要回退,并选择“添加”。\n"
+"您需要回退, 并选择“添加”。\n"
#: standalone/drakvpn:368
#, c-format
@@ -21673,7 +22133,7 @@ msgstr ""
"已经存在此名称的区段。\n"
"名称区段应该唯一。\n"
"\n"
-"您应该回退并添加另外一个区段,或者更改其名称。\n"
+"您应该回退并添加另外一个区段, 或者更改其名称。\n"
#: standalone/drakvpn:400
#, c-format
@@ -21690,7 +22150,7 @@ msgstr ""
"\n"
"请确定所有其它区段都在此配置设置区段之后。\n"
"\n"
-"当您完成后,请选择继续。或者后退到上一步。\n"
+"当您完成后, 请选择继续。或者后退到上一步。\n"
#: standalone/drakvpn:405
#, c-format
@@ -21730,7 +22190,7 @@ msgid ""
"\n"
"Here you define the default settings. \n"
"All the other sections will follow this one.\n"
-"The left settings are optional. If don't define\n"
+"The left settings are optional. If do not define\n"
"them here, globally, you can define them in each\n"
"section.\n"
msgstr ""
@@ -21738,7 +22198,7 @@ msgstr ""
"\n"
"您可在此定义默认设置。所有其它区段都跟在此区段\n"
"之后。剩下的设置都是可选的。如果您不想在此定义\n"
-"全局定义,您还可以在每个区段中分别定义。\n"
+"全局定义, 您还可以在每个区段中分别定义。\n"
#: standalone/drakvpn:451
#, c-format
@@ -21796,7 +22256,7 @@ msgstr ""
"您的 %s 文件已经有几个区段或连接了。\n"
"\n"
"您现在可以添加一个新的区段。\n"
-"当您准备好写入数据后,请选择继续。\n"
+"当您准备好写入数据后, 请选择继续。\n"
#: standalone/drakvpn:491
#, c-format
@@ -21850,7 +22310,7 @@ msgstr ""
"已经存在此名称的区段。\n"
"名称区段应该唯一。\n"
"\n"
-"您应该回退并添加另外一个区段,或者更改其名称。\n"
+"您应该回退并添加另外一个区段, 或者更改其名称。\n"
#: standalone/drakvpn:543
#, c-format
@@ -21865,7 +22325,7 @@ msgstr ""
"\n"
"您现在可以添加安全策略。\n"
"\n"
-"当您准备好写入数据后,请选择继续。\n"
+"当您准备好写入数据后, 请选择继续。\n"
#: standalone/drakvpn:576 standalone/drakvpn:826
#, c-format
@@ -21882,7 +22342,7 @@ msgid ""
msgstr ""
"您的 %s 文件已经有几个区段或连接了。\n"
"\n"
-"您可以下面选择想要编辑的区段,然后点击下一步。\n"
+"您可以下面选择想要编辑的区段, 然后点击下一步。\n"
#: standalone/drakvpn:580 standalone/drakvpn:660 standalone/drakvpn:831
#: standalone/drakvpn:877
@@ -21892,7 +22352,7 @@ msgstr "区段名称"
#: standalone/drakvpn:590
#, c-format
-msgid "Can't edit!"
+msgid "Can not edit!"
msgstr "无法编辑!"
#: standalone/drakvpn:591
@@ -21908,7 +22368,7 @@ msgstr ""
"您不能编辑此区段。\n"
"\n"
"此区段是 Freeswan 2.X 必须的。\n"
-"您必须在 %s 文件顶部指定版本 2.0,并且"
+"您必须在 %s 文件顶部指定版本 2.0, 并且"
#: standalone/drakvpn:600
#, c-format
@@ -21921,7 +22381,7 @@ msgstr ""
"您的 %s 文件已经有几个区段了。\n"
"\n"
"您现在可以编辑配置设置区段项。\n"
-"当您准备好写入数据后,请选择继续。\n"
+"当您准备好写入数据后, 请选择继续。\n"
#: standalone/drakvpn:611
#, c-format
@@ -21934,7 +22394,7 @@ msgstr ""
"您的 %s 文件已经有几个区段或连接了。\n"
"\n"
"您现在可以编辑默认区段项。\n"
-"当您准备好写入数据后,请选择继续。\n"
+"当您准备好写入数据后, 请选择继续。\n"
#: standalone/drakvpn:624
#, c-format
@@ -21949,7 +22409,7 @@ msgstr ""
"\n"
"您现在可以编辑普通区段项。\n"
"\n"
-"当您准备好写入数据后,请选择继续。\n"
+"当您准备好写入数据后, 请选择继续。\n"
#: standalone/drakvpn:645
#, c-format
@@ -21964,7 +22424,7 @@ msgstr ""
"\n"
"您现在可以编辑安全策略。\n"
"\n"
-"当您准备好写入数据后,请选择继续。\n"
+"当您准备好写入数据后, 请选择继续。\n"
#: standalone/drakvpn:656 standalone/drakvpn:873
#, c-format
@@ -21981,7 +22441,7 @@ msgid ""
msgstr ""
"您的 %s 文件已经有几个区段或连接了。\n"
"\n"
-"您可以下面选择想要删除的区段,然后点击下一步。\n"
+"您可以下面选择想要删除的区段, 然后点击下一步。\n"
#: standalone/drakvpn:686
#, c-format
@@ -22107,7 +22567,7 @@ msgstr ""
"\n"
"请确定所有其它区段都在此配置设置区段之后。\n"
"\n"
-"当您完成后,请选择继续。或者后退到上一步。\n"
+"当您完成后, 请选择继续。或者后退到上一步。\n"
#: standalone/drakvpn:827
#, c-format
@@ -22119,7 +22579,7 @@ msgid ""
msgstr ""
"您的 %s 文件已经有几个区段或连接了。\n"
"\n"
-"您可以下面选择想要编辑的区段,然后点击下一步。\n"
+"您可以下面选择想要编辑的区段, 然后点击下一步。\n"
#: standalone/drakvpn:838
#, c-format
@@ -22556,11 +23016,6 @@ msgstr ""
msgid "Hash algorithm"
msgstr "哈希算法"
-#: standalone/drakvpn:1125
-#, c-format
-msgid "Authentication method"
-msgstr "身份验证方式"
-
#: standalone/drakvpn:1126
#, c-format
msgid "DH group"
@@ -22725,7 +23180,7 @@ msgid ""
"Please,\n"
"type in your tv norm and country"
msgstr ""
-"现在,\n"
+"现在, \n"
"请输入您的电视制式和国家或地区"
#: standalone/drakxtv:87
@@ -22763,13 +23218,13 @@ msgstr "祝您愉快!"
msgid "Now, you can run xawtv (under X Window!) !\n"
msgstr "您现在可以在 X 中运行 xawtv 看电视了!\n"
-#: standalone/drakxtv:134
+#: standalone/drakxtv:149
#, c-format
msgid "No TV Card detected!"
msgstr "没有发现电视卡!"
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: standalone/drakxtv:136
+#: standalone/drakxtv:151
#, c-format
msgid ""
"No TV Card has been detected on your machine. Please verify that a Linux-"
@@ -22790,244 +23245,244 @@ msgstr ""
"\n"
"http://www.mandarkelinux.com/zh_CN/hardware.php3"
-#: standalone/harddrake2:20
+#: standalone/harddrake2:23
#, c-format
msgid "Alternative drivers"
msgstr "替代的驱动程序"
-#: standalone/harddrake2:21
+#: standalone/harddrake2:24
#, c-format
msgid "the list of alternative drivers for this sound card"
msgstr "这个声卡的替代驱动程序列表"
-#: standalone/harddrake2:24
+#: standalone/harddrake2:27
#, c-format
msgid ""
"this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
-msgstr "设备所插在的物理总线(例如:PCI,USB,...)"
+msgstr "设备所插在的物理总线(例如:PCI, USB, ...)"
-#: standalone/harddrake2:26 standalone/harddrake2:130
+#: standalone/harddrake2:29 standalone/harddrake2:144
#, c-format
msgid "Bus identification"
msgstr "总线标识"
-#: standalone/harddrake2:27
+#: standalone/harddrake2:30
#, c-format
msgid ""
"- PCI and USB devices: this lists the vendor, device, subvendor and "
"subdevice PCI/USB ids"
msgstr ""
-"- PCI 和 USB 设备:列出 PCI/USB 的 vendor, device,subvendor 和 subdevice 代码"
+"- PCI 和 USB 设备:列出 PCI/USB 的 vendor, device, subvendor 和 subdevice 代码"
-#: standalone/harddrake2:30
+#: standalone/harddrake2:33
#, c-format
msgid ""
"- pci devices: this gives the PCI slot, device and function of this card\n"
"- eide devices: the device is either a slave or a master device\n"
"- scsi devices: the scsi bus and the scsi device ids"
msgstr ""
-"- pci 设备: 列出 PCI 插槽,设备和功能\n"
+"- pci 设备: 列出 PCI 插槽, 设备和功能\n"
"- eide 设备: 主设备或从设备\n"
"- scsi 设备: 列出 scsi 总线和 scsi 设备号"
-#: standalone/harddrake2:33
+#: standalone/harddrake2:36
#, c-format
msgid "Drive capacity"
msgstr "驱动器能力"
-#: standalone/harddrake2:33
+#: standalone/harddrake2:36
#, c-format
msgid "special capacities of the driver (burning ability and or DVD support)"
msgstr "驱动器的特殊能力(刻录能力和/或 DVD 支持)"
-#: standalone/harddrake2:34
+#: standalone/harddrake2:37
#, c-format
msgid "this field describes the device"
msgstr "此处描述了设备"
-#: standalone/harddrake2:35
+#: standalone/harddrake2:38
#, c-format
msgid "Old device file"
msgstr "旧的设备文件"
-#: standalone/harddrake2:36
+#: standalone/harddrake2:39
#, c-format
msgid "old static device name used in dev package"
msgstr "dev 软件包中使用的旧的静态设备名"
-#: standalone/harddrake2:37
+#: standalone/harddrake2:40
#, c-format
msgid "New devfs device"
msgstr "新的 devfs 设备"
-#: standalone/harddrake2:38
+#: standalone/harddrake2:41
#, c-format
msgid "new dynamic device name generated by core kernel devfs"
msgstr "内核自带的 devfs 中使用的新的动态设备名"
#. -PO: here "module" is the "jargon term" for a kernel driver
-#: standalone/harddrake2:41
+#: standalone/harddrake2:44
#, c-format
msgid "Module"
msgstr "模块"
-#: standalone/harddrake2:41
+#: standalone/harddrake2:44
#, c-format
msgid "the module of the GNU/Linux kernel that handles the device"
msgstr "管理该设备的 GNU/Linux 内核模块"
-#: standalone/harddrake2:42
+#: standalone/harddrake2:45
#, c-format
msgid "Extended partitions"
msgstr "扩展分区"
-#: standalone/harddrake2:42
+#: standalone/harddrake2:45
#, c-format
msgid "the number of extended partitions"
msgstr "扩展分区的编号"
-#: standalone/harddrake2:43
+#: standalone/harddrake2:46
#, c-format
msgid "Geometry"
msgstr "物理参数"
-#: standalone/harddrake2:43
+#: standalone/harddrake2:46
#, c-format
msgid "Cylinder/head/sectors geometry of the disk"
msgstr "磁盘的磁头/扇区等物理参数"
-#: standalone/harddrake2:44
+#: standalone/harddrake2:47
#, c-format
msgid "Disk controller"
msgstr "磁盘控制器"
-#: standalone/harddrake2:44
+#: standalone/harddrake2:47
#, c-format
msgid "the disk controller on the host side"
msgstr "主机方的磁盘控制器"
-#: standalone/harddrake2:45
+#: standalone/harddrake2:48
#, c-format
msgid "class of hardware device"
msgstr "硬件设备的分类"
-#: standalone/harddrake2:46 standalone/harddrake2:78
-#: standalone/printerdrake:218
+#: standalone/harddrake2:49 standalone/harddrake2:81
+#: standalone/printerdrake:211
#, c-format
msgid "Model"
msgstr "型号"
-#: standalone/harddrake2:46
+#: standalone/harddrake2:49
#, c-format
msgid "hard disk model"
msgstr "硬盘型号"
-#: standalone/harddrake2:47
+#: standalone/harddrake2:50
#, c-format
msgid "network printer port"
msgstr "网络打印机端口"
-#: standalone/harddrake2:48
+#: standalone/harddrake2:51
#, c-format
msgid "Primary partitions"
msgstr "主分区"
-#: standalone/harddrake2:48
+#: standalone/harddrake2:51
#, c-format
msgid "the number of the primary partitions"
msgstr "主分区的编号"
-#: standalone/harddrake2:49
+#: standalone/harddrake2:52
#, c-format
msgid "the vendor name of the device"
msgstr "设备的厂家名称"
-#: standalone/harddrake2:50
+#: standalone/harddrake2:53
#, c-format
msgid "Bus PCI #"
msgstr "总线 PCI #"
-#: standalone/harddrake2:50
+#: standalone/harddrake2:53
#, c-format
msgid "the PCI bus on which the device is plugged"
msgstr "设备所插入的 PCI 总线"
-#: standalone/harddrake2:51
+#: standalone/harddrake2:54
#, c-format
msgid "PCI device #"
msgstr "PCI 设备 #"
-#: standalone/harddrake2:51
+#: standalone/harddrake2:54
#, c-format
msgid "PCI device number"
msgstr "PCI 设备号"
-#: standalone/harddrake2:52
+#: standalone/harddrake2:55
#, c-format
msgid "PCI function #"
msgstr "PCI 功能 #"
-#: standalone/harddrake2:52
+#: standalone/harddrake2:55
#, c-format
msgid "PCI function number"
msgstr "PCI 功能号"
-#: standalone/harddrake2:53
+#: standalone/harddrake2:56
#, c-format
msgid "Vendor ID"
msgstr "厂家 ID"
-#: standalone/harddrake2:53
+#: standalone/harddrake2:56
#, c-format
msgid "this is the standard numerical identifier of the vendor"
msgstr "这是厂家的标准数字标识"
-#: standalone/harddrake2:54
+#: standalone/harddrake2:57
#, c-format
msgid "Device ID"
msgstr "设备 ID "
-#: standalone/harddrake2:54
+#: standalone/harddrake2:57
#, c-format
msgid "this is the numerical identifier of the device"
msgstr "这是设备的数字标识"
-#: standalone/harddrake2:55
+#: standalone/harddrake2:58
#, c-format
msgid "Sub vendor ID"
msgstr "子供应商 ID"
-#: standalone/harddrake2:55
+#: standalone/harddrake2:58
#, c-format
msgid "this is the minor numerical identifier of the vendor"
msgstr "这是供应商的次要数字标识"
-#: standalone/harddrake2:56
+#: standalone/harddrake2:59
#, c-format
msgid "Sub device ID"
msgstr "子设备 ID"
-#: standalone/harddrake2:56
+#: standalone/harddrake2:59
#, c-format
msgid "this is the minor numerical identifier of the device"
msgstr "这是设备的次要数字标识"
-#: standalone/harddrake2:57
+#: standalone/harddrake2:60
#, c-format
msgid "Device USB ID"
msgstr "设备 USB ID"
-#: standalone/harddrake2:57
+#: standalone/harddrake2:60
#, c-format
msgid ".."
msgstr ".."
-#: standalone/harddrake2:61
+#: standalone/harddrake2:64
#, c-format
msgid "Bogomips"
msgstr "Bogomips"
-#: standalone/harddrake2:61
+#: standalone/harddrake2:64
#, c-format
msgid ""
"the GNU/Linux kernel needs to run a calculation loop at boot time to "
@@ -23035,55 +23490,55 @@ msgid ""
"\"benchmark\" the cpu."
msgstr ""
"GNU/Linux 核心需要在启动时运行计算循环以便初始化计时器。其结果将以 bogomips "
-"存储,以便作为 CPU 的衡量“基准”(Benchmark)。"
+"存储, 以便作为 CPU 的衡量“基准”(Benchmark)。"
-#: standalone/harddrake2:62
+#: standalone/harddrake2:65
#, c-format
msgid "Cache size"
msgstr "缓存大小"
-#: standalone/harddrake2:62
+#: standalone/harddrake2:65
#, c-format
msgid "size of the (second level) cpu cache"
msgstr "CPU 二级缓存大小"
#. -PO: here "comas" is the medical coma, not the lexical coma!!
-#: standalone/harddrake2:65
+#: standalone/harddrake2:68
#, c-format
msgid "Coma bug"
msgstr "Coma 错误"
-#: standalone/harddrake2:65
+#: standalone/harddrake2:68
#, c-format
msgid "whether this cpu has the Cyrix 6x86 Coma bug"
msgstr "此 CPU 是否有 Cyrix 6x86 Coma 错误"
-#: standalone/harddrake2:66
+#: standalone/harddrake2:69
#, c-format
msgid "Cpuid family"
msgstr "CPUID 家族"
-#: standalone/harddrake2:66
+#: standalone/harddrake2:69
#, c-format
msgid "family of the cpu (eg: 6 for i686 class)"
msgstr "CPU 家族(如 6 代表 i686 级别)"
-#: standalone/harddrake2:67
+#: standalone/harddrake2:70
#, c-format
msgid "Cpuid level"
msgstr "CPUID 级别"
-#: standalone/harddrake2:67
+#: standalone/harddrake2:70
#, c-format
msgid "information level that can be obtained through the cpuid instruction"
msgstr "通过 CPUID 指令可获取的信息级别"
-#: standalone/harddrake2:68
+#: standalone/harddrake2:71
#, c-format
msgid "Frequency (MHz)"
msgstr "频率(MHz)"
-#: standalone/harddrake2:68
+#: standalone/harddrake2:71
#, c-format
msgid ""
"the CPU frequency in MHz (Megahertz which in first approximation may be "
@@ -23092,174 +23547,174 @@ msgid ""
msgstr ""
"以 MHz 为单位的 CPU 频率(初次估计的兆赫兹可能比较接近 CPU 每秒可执行的指令数)"
-#: standalone/harddrake2:69
+#: standalone/harddrake2:72
#, c-format
msgid "Flags"
msgstr "标志"
-#: standalone/harddrake2:69
+#: standalone/harddrake2:72
#, c-format
msgid "CPU flags reported by the kernel"
msgstr "核心报告的 CPU 标志"
-#: standalone/harddrake2:70
+#: standalone/harddrake2:73
#, c-format
msgid "Fdiv bug"
msgstr "Fdiv 错误"
-#: standalone/harddrake2:71
+#: standalone/harddrake2:74
#, c-format
msgid ""
"Early Intel Pentium chips manufactured have a bug in their floating point "
"processor which did not achieve the required precision when performing a "
"Floating point DIVision (FDIV)"
msgstr ""
-"早期的 Intel Pentium 芯片在浮点处理器中有错误,导致在执行浮点除法(FDIV)时精度"
+"早期的 Intel Pentium 芯片在浮点处理器中有错误, 导致在执行浮点除法(FDIV)时精度"
"下降"
-#: standalone/harddrake2:72
+#: standalone/harddrake2:75
#, c-format
msgid "Is FPU present"
msgstr "FPU 存在"
-#: standalone/harddrake2:72
+#: standalone/harddrake2:75
#, c-format
msgid "yes means the processor has an arithmetic coprocessor"
msgstr "“是”代表处理器有数学协处理器"
-#: standalone/harddrake2:73
+#: standalone/harddrake2:76
#, c-format
msgid "Whether the FPU has an irq vector"
msgstr "FPU 是否有 IRQ 向量"
-#: standalone/harddrake2:73
+#: standalone/harddrake2:76
#, c-format
msgid "yes means the arithmetic coprocessor has an exception vector attached"
msgstr "“是”代表算术协处理器附加了意外向量"
-#: standalone/harddrake2:74
+#: standalone/harddrake2:77
#, c-format
msgid "F00f bug"
msgstr "F00f 错误"
-#: standalone/harddrake2:74
+#: standalone/harddrake2:77
#, c-format
msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
msgstr "早期的奔腾芯片在解码 FOOF 字节码时存在错误并可能会死锁"
-#: standalone/harddrake2:75
+#: standalone/harddrake2:78
#, c-format
msgid "Halt bug"
msgstr "死锁错误"
-#: standalone/harddrake2:76
+#: standalone/harddrake2:79
#, 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:77
+#: standalone/harddrake2:80
#, c-format
msgid "sub generation of the cpu"
msgstr "CPU 的次世代"
-#: standalone/harddrake2:78
+#: standalone/harddrake2:81
#, c-format
msgid "generation of the cpu (eg: 8 for Pentium III, ...)"
-msgstr "CPU 世代(如 8 代表 Pentium III,等等)"
+msgstr "CPU 世代(如 8 代表 Pentium III, 等等)"
-#: standalone/harddrake2:79
+#: standalone/harddrake2:82
#, c-format
msgid "Model name"
msgstr "型号名称"
-#: standalone/harddrake2:79
+#: standalone/harddrake2:82
#, c-format
msgid "official vendor name of the cpu"
msgstr "CPU 的官方厂家名称"
-#: standalone/harddrake2:80
+#: standalone/harddrake2:83
#, c-format
msgid "the name of the CPU"
msgstr "CPU 名称"
-#: standalone/harddrake2:81
+#: standalone/harddrake2:84
#, c-format
msgid "Processor ID"
msgstr "处理器 ID"
-#: standalone/harddrake2:81
+#: standalone/harddrake2:84
#, c-format
msgid "the number of the processor"
msgstr "处理器编号"
-#: standalone/harddrake2:82
+#: standalone/harddrake2:85
#, c-format
msgid "Model stepping"
msgstr "型号步进"
-#: standalone/harddrake2:82
+#: standalone/harddrake2:85
#, c-format
msgid "stepping of the cpu (sub model (generation) number)"
msgstr "CPU 步进(次型号(世代))"
-#: standalone/harddrake2:83
+#: standalone/harddrake2:86
#, c-format
msgid "the vendor name of the processor"
msgstr "处理器供应商"
-#: standalone/harddrake2:84
+#: standalone/harddrake2:87
#, c-format
msgid "Write protection"
msgstr "写保护"
-#: standalone/harddrake2:84
+#: standalone/harddrake2:87
#, c-format
msgid ""
"the WP flag in the CR0 register of the cpu enforce write protection at the "
"memory page level, thus enabling the processor to prevent unchecked kernel "
"accesses to user memory (aka this is a bug guard)"
msgstr ""
-"CPU 中 CRO 寄存器的 WP 标志位强制在内存页面级别进行写保护,这使得处理器可以避"
+"CPU 中 CRO 寄存器的 WP 标志位强制在内存页面级别进行写保护, 这使得处理器可以避"
"免未检查的内核访问用户内存(不过此防护有 bug)"
-#: standalone/harddrake2:88
+#: standalone/harddrake2:91
#, c-format
msgid "Floppy format"
msgstr "软盘格式化"
-#: standalone/harddrake2:88
+#: standalone/harddrake2:91
#, c-format
msgid "format of floppies supported by the drive"
msgstr "驱动器接受的软盘格式"
-#: standalone/harddrake2:92
+#: standalone/harddrake2:95
#, c-format
msgid "Channel"
msgstr "通道"
-#: standalone/harddrake2:92
+#: standalone/harddrake2:95
#, c-format
msgid "EIDE/SCSI channel"
msgstr "EIDE/SCSI 通道"
-#: standalone/harddrake2:93
+#: standalone/harddrake2:96
#, c-format
msgid "Disk identifier"
msgstr "磁盘标识"
-#: standalone/harddrake2:93
+#: standalone/harddrake2:96
#, c-format
msgid "usually the disk serial number"
msgstr "通常是磁盘序列号"
-#: standalone/harddrake2:94
+#: standalone/harddrake2:97
#, c-format
msgid "Logical unit number"
msgstr "逻辑单元号"
-#: standalone/harddrake2:94
+#: standalone/harddrake2:97
#, c-format
msgid ""
"the SCSI target number (LUN). SCSI devices connected to a host are uniquely "
@@ -23269,253 +23724,299 @@ msgstr ""
"SCSI 目标号(LUN)。连接到主机的 SCSI 设备将通过通道号、目标 ID 和逻辑单元号加"
"以唯一标识。"
-#: standalone/harddrake2:99
+#. -PO: here, "size" is the size of the ram chip (eg: 128Mo, 256Mo, ...)
+#: standalone/harddrake2:104
+#, c-format
+msgid "Installed size"
+msgstr "安装容量"
+
+#: standalone/harddrake2:104
+#, c-format
+msgid "Installed size of the memory bank"
+msgstr "已安装的内存容量"
+
+#: standalone/harddrake2:105
+#, c-format
+msgid "Enabled Size"
+msgstr "启用容量"
+
+#: standalone/harddrake2:105
+#, c-format
+msgid "Enabled size of the memory bank"
+msgstr "已启用的内存容量"
+
+#: standalone/harddrake2:106
+#, c-format
+msgid "type of the memory device"
+msgstr "内存条类型"
+
+#: standalone/harddrake2:107
+#, c-format
+msgid "Speed"
+msgstr "速度"
+
+#: standalone/harddrake2:107
+#, c-format
+msgid "Speed of the memory bank"
+msgstr "内存速度"
+
+#: standalone/harddrake2:108
+#, c-format
+msgid "Bank connections"
+msgstr "内存条连接"
+
+#: standalone/harddrake2:109
+#, c-format
+msgid "Socket designation of the memory bank"
+msgstr "内存条的插座指派"
+
+#: standalone/harddrake2:113
#, c-format
msgid "Device file"
msgstr "设备文件"
-#: standalone/harddrake2:99
+#: standalone/harddrake2:113
#, c-format
msgid ""
"the device file used to communicate with the kernel driver for the mouse"
msgstr "内核驱动程序与鼠标进行通讯的设备文件"
-#: standalone/harddrake2:100
+#: standalone/harddrake2:114
#, c-format
msgid "Emulated wheel"
msgstr "模拟滚轮"
-#: standalone/harddrake2:100
+#: standalone/harddrake2:114
#, c-format
msgid "whether the wheel is emulated or not"
msgstr "是否模拟滚轮"
-#: standalone/harddrake2:101
+#: standalone/harddrake2:115
#, c-format
msgid "the type of the mouse"
msgstr "鼠标类型"
-#: standalone/harddrake2:102
+#: standalone/harddrake2:116
#, c-format
msgid "the name of the mouse"
msgstr "鼠标名称"
-#: standalone/harddrake2:103
+#: standalone/harddrake2:117
#, c-format
msgid "Number of buttons"
msgstr "按钮数目"
-#: standalone/harddrake2:103
+#: standalone/harddrake2:117
#, c-format
msgid "the number of buttons the mouse has"
msgstr "鼠标按钮数"
-#: standalone/harddrake2:104
+#: standalone/harddrake2:118
#, c-format
msgid "the type of bus on which the mouse is connected"
msgstr "请选择您鼠标所连接的总线类型"
-#: standalone/harddrake2:105
+#: standalone/harddrake2:119
#, c-format
msgid "Mouse protocol used by X11"
msgstr "X11 所用的鼠标协议"
-#: standalone/harddrake2:105
+#: standalone/harddrake2:119
#, c-format
msgid "the protocol that the graphical desktop use with the mouse"
msgstr "图形桌面使用鼠标的协议"
-#: standalone/harddrake2:112 standalone/harddrake2:121
-#: standalone/harddrake2:128 standalone/harddrake2:136
-#: standalone/harddrake2:309
+#: standalone/harddrake2:126 standalone/harddrake2:135
+#: standalone/harddrake2:142 standalone/harddrake2:150
+#: standalone/harddrake2:316
#, c-format
msgid "Identification"
msgstr "标识"
-#: standalone/harddrake2:113 standalone/harddrake2:129
+#: standalone/harddrake2:127 standalone/harddrake2:143
#, c-format
msgid "Connection"
msgstr "连接"
-#: standalone/harddrake2:122
+#: standalone/harddrake2:136
#, c-format
msgid "Performances"
msgstr "性能"
-#: standalone/harddrake2:123
+#: standalone/harddrake2:137
#, c-format
msgid "Bugs"
msgstr "错误"
-#: standalone/harddrake2:124
+#: standalone/harddrake2:138
#, c-format
msgid "FPU"
msgstr "FPU"
-#: standalone/harddrake2:132
+#: standalone/harddrake2:146
#, c-format
msgid "Partitions"
msgstr "分区"
-#: standalone/harddrake2:137
+#: standalone/harddrake2:151
#, c-format
msgid "Features"
msgstr "特性"
#. -PO: please keep all "/" characters !!!
-#: standalone/harddrake2:158 standalone/logdrake:77
-#: standalone/printerdrake:152 standalone/printerdrake:165
+#: standalone/harddrake2:174 standalone/logdrake:77
+#: standalone/printerdrake:134 standalone/printerdrake:147
#, c-format
msgid "/_Options"
msgstr "/选项(_O)"
-#: standalone/harddrake2:159 standalone/harddrake2:180 standalone/logdrake:79
-#: standalone/printerdrake:177 standalone/printerdrake:178
-#: standalone/printerdrake:179 standalone/printerdrake:180
+#: standalone/harddrake2:175 standalone/harddrake2:197 standalone/logdrake:79
+#: standalone/printerdrake:159 standalone/printerdrake:161
+#: standalone/printerdrake:164 standalone/printerdrake:166
#, c-format
msgid "/_Help"
msgstr "/帮助(_H)"
-#: standalone/harddrake2:163
+#: standalone/harddrake2:179
#, c-format
msgid "/Autodetect _printers"
msgstr "/自动检测打印机(_P)"
-#: standalone/harddrake2:164
+#: standalone/harddrake2:180
#, c-format
msgid "/Autodetect _modems"
msgstr "/自动检测调制解调器(_M)"
-#: standalone/harddrake2:165
+#: standalone/harddrake2:181
#, c-format
msgid "/Autodetect _jaz drives"
msgstr "/自动检测 jaz 驱动器(_J)"
-#: standalone/harddrake2:172 standalone/printerdrake:158
+#: standalone/harddrake2:188 standalone/printerdrake:140
#, c-format
msgid "/_Quit"
msgstr "/退出(_Q)"
-#: standalone/harddrake2:181
+#: standalone/harddrake2:199
#, c-format
msgid "/_Fields description"
msgstr "/域描述(_F)"
-#: standalone/harddrake2:183
+#: standalone/harddrake2:201
#, c-format
msgid "Harddrake help"
msgstr "“Drak 硬件配置”帮助"
-#: standalone/harddrake2:192
+#: standalone/harddrake2:210
#, 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 "只要您选中了设备,您就能看到在右侧框架(“信息”)中显示的解释。"
+msgstr "只要您选中了设备, 您就能看到在右侧框架(“信息”)中显示的解释。"
-#: standalone/harddrake2:197 standalone/printerdrake:179
+#: standalone/harddrake2:216 standalone/printerdrake:164
#, c-format
msgid "/_Report Bug"
msgstr "/故障报告(_R)"
-#: standalone/harddrake2:198 standalone/printerdrake:180
+#: standalone/harddrake2:218 standalone/printerdrake:166
#, c-format
msgid "/_About..."
msgstr "/关于(_A)..."
-#: standalone/harddrake2:199
+#: standalone/harddrake2:219
#, c-format
msgid "About Harddrake"
msgstr "关于 Drak 硬件配置"
#. -PO: Do not alter the <span ..> and </span> tags
-#: standalone/harddrake2:201
+#: standalone/harddrake2:221
#, c-format
msgid ""
-"This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
+"This is HardDrake, a %s hardware configuration tool.\n"
"<span foreground=\"royalblue3\">Version:</span> %s\n"
"<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
"tvignaud@mandrakesoft.com&gt;\n"
"\n"
msgstr ""
-"这是“Drak 硬件设置”,Mandrakelinux 的硬件设置工具。\n"
+"这是“Drak 硬件设置”, %s 的硬件设置工具。\n"
"<span foreground=\"royalblue3\">版本:</span> %s\n"
"<span foreground=\"royalblue3\">作者:</span> Thierry Vignaud &lt;"
"tvignaud@mandrakesoft.com&gt;\n"
"\n"
-#: standalone/harddrake2:218
+#: standalone/harddrake2:238
#, c-format
msgid "Harddrake2"
msgstr "Drak 硬件配置"
-#: standalone/harddrake2:234
+#: standalone/harddrake2:253
#, c-format
msgid "Detected hardware"
msgstr "检测到的硬件"
-#: standalone/harddrake2:239
+#: standalone/harddrake2:258
#, c-format
msgid "Configure module"
msgstr "配置模块"
-#: standalone/harddrake2:246
+#: standalone/harddrake2:265
#, c-format
msgid "Run config tool"
msgstr "运行配置工具"
-#: standalone/harddrake2:296 standalone/net_monitor:108
+#: standalone/harddrake2:303 standalone/net_monitor:108
#: standalone/net_monitor:109 standalone/net_monitor:114
#, c-format
msgid "unknown"
msgstr "未知"
-#: standalone/harddrake2:297 standalone/printerdrake:308
-#: standalone/printerdrake:346
+#: standalone/harddrake2:304 standalone/printerdrake:298
+#: standalone/printerdrake:336
#, c-format
msgid "Unknown"
msgstr "未知"
-#: standalone/harddrake2:317
+#: standalone/harddrake2:324
#, c-format
msgid "Misc"
msgstr "杂项"
-#: standalone/harddrake2:332
+#: standalone/harddrake2:339
#, c-format
msgid ""
"Click on a device in the left tree in order to display its information here."
-msgstr "单击左侧树中的设备,就可在此显示其信息。"
+msgstr "单击左侧树中的设备, 就可在此显示其信息。"
-#: standalone/harddrake2:384
+#: standalone/harddrake2:391
#, c-format
msgid "secondary"
msgstr "次要"
-#: standalone/harddrake2:384
+#: standalone/harddrake2:391
#, c-format
msgid "primary"
msgstr "主"
-#: standalone/harddrake2:388
+#: standalone/harddrake2:395
#, c-format
msgid "burner"
msgstr "刻录机"
-#: standalone/harddrake2:388
+#: standalone/harddrake2:395
#, c-format
msgid "DVD"
msgstr "DVD"
-#: standalone/keyboarddrake:25
+#: standalone/keyboarddrake:29
#, c-format
msgid "Please, choose your keyboard layout."
msgstr "请选择您使用的键盘布局。"
-#: standalone/keyboarddrake:34
+#: standalone/keyboarddrake:45
#, c-format
msgid "Do you want the BackSpace to return Delete in console?"
-msgstr "您是否想要 BackSpace 在控制台起 Delete 的作用?"
+msgstr "您是否想要 BackSpace 在控制台起 Delete 的作用?"
#: standalone/localedrake:38
#, c-format
@@ -23525,7 +24026,7 @@ msgstr "Drak 语言设置"
#: standalone/localedrake:67
#, c-format
msgid "The change is done, but to be effective you must logout"
-msgstr "修改已经完成,不过您必须退出登录修改才会生效"
+msgstr "修改已经完成, 不过您必须退出登录修改才会生效"
#: standalone/logdrake:50
#, c-format
@@ -23673,7 +24174,7 @@ msgstr "提醒向导意外失败:"
#: standalone/logdrake:221
#, c-format
msgid "please wait, parsing file: %s"
-msgstr "请等待,正在分析文件: %s"
+msgstr "请等待, 正在分析文件: %s"
#: standalone/logdrake:376
#, c-format
@@ -23739,7 +24240,7 @@ msgstr ""
#: standalone/logdrake:406
#, c-format
msgid "What do you want to do?"
-msgstr "您想做什么?"
+msgstr "您想做什么?"
#: standalone/logdrake:413
#, c-format
@@ -23751,7 +24252,7 @@ msgstr "服务设置"
msgid ""
"You will receive an alert if one of the selected services is no longer "
"running"
-msgstr "如果选中的服务中有任何一个停止运行,您将收到提醒"
+msgstr "如果选中的服务中有任何一个停止运行, 您将收到提醒"
#: standalone/logdrake:421
#, c-format
@@ -23808,7 +24309,7 @@ msgstr "请选择您的鼠标类型。"
#: standalone/mousedrake:44
#, c-format
msgid "Emulate third button?"
-msgstr "模拟三键吗?"
+msgstr "模拟三键吗?"
#: standalone/mousedrake:61
#, c-format
@@ -23818,55 +24319,140 @@ msgstr "鼠标测试"
#: standalone/mousedrake:64
#, c-format
msgid "Please test your mouse:"
-msgstr "请测试您的鼠标: "
+msgstr "请测试您的鼠标:"
-#: standalone/net_applet:30
+#: standalone/net_applet:34
#, c-format
msgid "Network is up on interface %s"
msgstr "已通过网卡 %s 联网"
#. -PO: keep the "Configure Network" substring synced with the "Configure Network" message below
-#: standalone/net_applet:38
+#: standalone/net_applet:42
#, c-format
msgid "Network is down on interface %s. Click on \"Configure Network\""
msgstr "网卡 %s 的网络已断。请单击“配置网络”"
-#: standalone/net_applet:53 standalone/net_monitor:471
+#: standalone/net_applet:57 standalone/net_monitor:473
#, c-format
msgid "Connect %s"
msgstr "连接 %s"
-#: standalone/net_applet:54 standalone/net_monitor:471
+#: standalone/net_applet:58 standalone/net_monitor:473
#, c-format
msgid "Disconnect %s"
msgstr "断开 %s"
-#: standalone/net_applet:55
+#: standalone/net_applet:59
#, c-format
msgid "Monitor Network"
msgstr "监视网络"
-#: standalone/net_applet:56
+#: standalone/net_applet:60
#, c-format
msgid "Configure Network"
msgstr "配置网络"
#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/net_applet:57 standalone/printerdrake:245
+#: standalone/net_applet:61 standalone/printerdrake:238
#, c-format
msgid "Refresh"
msgstr "刷新"
-#: standalone/net_applet:58
+#: standalone/net_applet:62
#, c-format
msgid "Get Online Help"
msgstr "获得在线帮助"
-#: standalone/net_applet:158
+#: standalone/net_applet:177
+#, fuzzy, c-format
+msgid "Interactive intrusion detection"
+msgstr "打印机自动检测"
+
+#: standalone/net_applet:181
#, c-format
msgid "Always launch on startup"
msgstr "启动时自动调用"
+#: standalone/net_applet:230
+#, c-format
+msgid "A port scanning attack has been attempted by %s."
+msgstr ""
+
+#: standalone/net_applet:231
+#, c-format
+msgid "The %s service has been attacked by %s."
+msgstr ""
+
+#: standalone/net_applet:232
+#, c-format
+msgid "A password cracking attack has been attempted by %s."
+msgstr ""
+
+#: standalone/net_applet:240
+#, fuzzy, c-format
+msgid "Active Firewall: intrusion detected"
+msgstr "发现防火墙配置!"
+
+#: standalone/net_applet:251
+#, fuzzy, c-format
+msgid "Do you want to blacklist the attacker?"
+msgstr "您要使用此特性吗?"
+
+#: standalone/net_applet:265
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: standalone/net_applet:268
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "无细节"
+
+#: standalone/net_applet:272
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: standalone/net_applet:273
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "网卡"
+
+#: standalone/net_applet:274
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "类型: %s"
+
+#: standalone/net_applet:275
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "协议"
+
+#: standalone/net_applet:276
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "网关 IP 地址"
+
+#: standalone/net_applet:277
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "回环文件名称: %s"
+
+#: standalone/net_applet:278
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "服务和守护程序"
+
+#: standalone/net_applet:279
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "端口: %s"
+
+#: standalone/net_applet:280
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
#: standalone/net_monitor:61 standalone/net_monitor:66
#, c-format
msgid "Network Monitoring"
@@ -23922,7 +24508,7 @@ msgstr "对接收和发出的数据使用同一比例"
#: standalone/net_monitor:139
#, c-format
msgid "Wait please, testing your connection..."
-msgstr "请稍候,正在测试连接..."
+msgstr "请稍候, 正在测试连接..."
#: standalone/net_monitor:188 standalone/net_monitor:201
#, c-format
@@ -23958,198 +24544,194 @@ msgstr ""
"连接失败。\n"
"请在 Mandrakelinux 控制中心中检查您的配置。"
-#: standalone/net_monitor:341
+#: standalone/net_monitor:340
#, c-format
msgid "Color configuration"
msgstr "颜色配置"
-#: standalone/net_monitor:389 standalone/net_monitor:409
+#: standalone/net_monitor:388 standalone/net_monitor:408
#, c-format
msgid "sent: "
msgstr "已发送: "
-#: standalone/net_monitor:396 standalone/net_monitor:413
+#: standalone/net_monitor:395 standalone/net_monitor:412
#, c-format
msgid "received: "
msgstr "已接收: "
-#: standalone/net_monitor:403
+#: standalone/net_monitor:402
#, c-format
msgid "average"
msgstr "平均"
-#: standalone/net_monitor:406
+#: standalone/net_monitor:405
#, c-format
msgid "Local measure"
msgstr "本机测量"
-#: standalone/net_monitor:464
+#: standalone/net_monitor:466
#, c-format
msgid ""
"Warning, another internet connection has been detected, maybe using your "
"network"
-msgstr "警告,检测到了另外的 Internet 连接,可能使用您的网络"
+msgstr "警告, 检测到了另外的 Internet 连接, 可能使用您的网络"
-#: standalone/net_monitor:475
+#: standalone/net_monitor:477
#, c-format
msgid "No internet connection configured"
msgstr "尚未配置 Internet 连接"
-#: standalone/printerdrake:69
-#, c-format
-msgid "Loading printer configuration... Please wait"
-msgstr "正在装入打印机配置... 请稍候"
-
-#: standalone/printerdrake:85
+#: standalone/printerdrake:68
#, c-format
msgid "Reading data of installed printers..."
msgstr "正在读取所安装打印机的数据..."
-#: standalone/printerdrake:134
+#: standalone/printerdrake:116
#, c-format
msgid "%s Printer Management Tool"
msgstr "%s 打印机管理工具"
-#: standalone/printerdrake:148 standalone/printerdrake:149
-#: standalone/printerdrake:150 standalone/printerdrake:151
-#: standalone/printerdrake:159 standalone/printerdrake:160
-#: standalone/printerdrake:164
+#: standalone/printerdrake:130 standalone/printerdrake:131
+#: standalone/printerdrake:132 standalone/printerdrake:133
+#: standalone/printerdrake:141 standalone/printerdrake:142
+#: standalone/printerdrake:146
#, c-format
msgid "/_Actions"
msgstr "/操作(_A)"
-#: standalone/printerdrake:148 standalone/printerdrake:160
+#: standalone/printerdrake:130 standalone/printerdrake:142
#, c-format
msgid "/_Add Printer"
msgstr "/添加打印机(_A)"
-#: standalone/printerdrake:149
+#: standalone/printerdrake:131
#, c-format
msgid "/Set as _Default"
msgstr "/设为默认值(_D)"
-#: standalone/printerdrake:150
+#: standalone/printerdrake:132
#, c-format
msgid "/_Edit"
msgstr "/编辑(_E)"
-#: standalone/printerdrake:151
+#: standalone/printerdrake:133
#, c-format
msgid "/_Delete"
msgstr "/删除(_D)"
-#: standalone/printerdrake:152
+#: standalone/printerdrake:134
#, c-format
msgid "/_Expert mode"
msgstr "/专家模式(_E)"
-#: standalone/printerdrake:157
+#: standalone/printerdrake:139
#, c-format
msgid "/_Refresh"
msgstr "/刷新(_R)"
-#: standalone/printerdrake:164
+#: standalone/printerdrake:146
#, c-format
msgid "/_Configure CUPS"
msgstr "/配置 CUPS(_C)"
-#: standalone/printerdrake:197
+#: standalone/printerdrake:181
#, c-format
msgid "Search:"
msgstr "搜索:"
-#: standalone/printerdrake:200
+#: standalone/printerdrake:184
#, c-format
msgid "Apply filter"
msgstr "应用过滤器"
-#: standalone/printerdrake:218 standalone/printerdrake:225
+#: standalone/printerdrake:211 standalone/printerdrake:218
#, c-format
msgid "Def."
msgstr "默认"
-#: standalone/printerdrake:218 standalone/printerdrake:225
+#: standalone/printerdrake:211 standalone/printerdrake:218
#, c-format
msgid "Printer Name"
msgstr "打印机名称"
-#: standalone/printerdrake:218
+#: standalone/printerdrake:211
#, c-format
msgid "Connection Type"
msgstr "连接类型"
-#: standalone/printerdrake:225
+#: standalone/printerdrake:218
#, c-format
msgid "Server Name"
msgstr "服务器名"
#. -PO: "Add Printer" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:233
+#: standalone/printerdrake:226
#, c-format
msgid "Add Printer"
msgstr "添加打印机"
-#: standalone/printerdrake:233
+#: standalone/printerdrake:226
#, c-format
msgid "Add a new printer to the system"
msgstr "向系统中添加一台新打印机"
#. -PO: "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:236
+#: standalone/printerdrake:229
#, c-format
msgid "Set as default"
msgstr "设为默认值"
-#: standalone/printerdrake:236
+#: standalone/printerdrake:229
#, c-format
msgid "Set selected printer as the default printer"
msgstr "将选中打印机设为默认打印机"
-#: standalone/printerdrake:239
+#: standalone/printerdrake:232
#, c-format
msgid "Edit selected printer"
msgstr "编辑选中的打印机"
-#: standalone/printerdrake:242
+#: standalone/printerdrake:235
#, c-format
msgid "Delete selected printer"
msgstr "删除选中的打印机"
-#: standalone/printerdrake:245
+#: standalone/printerdrake:238
#, c-format
msgid "Refresh the list"
msgstr "刷新列表"
#. -PO: "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:248
+#: standalone/printerdrake:241
#, c-format
msgid "Configure CUPS"
msgstr "配置 CUPS"
-#: standalone/printerdrake:248
+#: standalone/printerdrake:241
#, c-format
msgid "Configure CUPS printing system"
msgstr "配置 CUPS 打印系统"
-#: standalone/printerdrake:309 standalone/printerdrake:347
+#: standalone/printerdrake:299 standalone/printerdrake:337
#, c-format
msgid "Enabled"
msgstr "已启用"
-#: standalone/printerdrake:310 standalone/printerdrake:348
+#: standalone/printerdrake:300 standalone/printerdrake:338
#, c-format
msgid "Disabled"
msgstr "已禁用"
-#: standalone/printerdrake:572
+#: standalone/printerdrake:560
#, c-format
msgid "Authors: "
msgstr "作者: "
-#: standalone/printerdrake:578
+#. -PO: here %s is the version number
+#: standalone/printerdrake:570
#, c-format
-msgid "Printer Management \n"
-msgstr "打印机管理\n"
+msgid "Printer Management %s"
+msgstr "打印机管理 %s"
#: standalone/scannerdrake:51
#, c-format
@@ -24158,9 +24740,9 @@ msgid ""
"\n"
"Do you want to install the SANE packages?"
msgstr ""
-"要使用扫描仪,需要安装 SANE 软件包。\n"
+"要使用扫描仪, 需要安装 SANE 软件包。\n"
"\n"
-"您想要安装 SANE 软件包吗?"
+"您想要安装 SANE 软件包吗?"
#: standalone/scannerdrake:55
#, c-format
@@ -24178,22 +24760,22 @@ msgstr "无法安装用“Drak 扫描仪”设置扫描仪所需的软件包。"
msgid "Scannerdrake will not be started now."
msgstr "“Drak 扫描仪”现在不会启动。"
-#: standalone/scannerdrake:67 standalone/scannerdrake:460
+#: standalone/scannerdrake:67 standalone/scannerdrake:491
#, c-format
msgid "Searching for configured scanners..."
msgstr "正在搜索已配置的扫描仪..."
-#: standalone/scannerdrake:71 standalone/scannerdrake:464
+#: standalone/scannerdrake:71 standalone/scannerdrake:495
#, c-format
msgid "Searching for new scanners..."
msgstr "正在搜索新的扫描仪..."
-#: standalone/scannerdrake:79 standalone/scannerdrake:486
+#: standalone/scannerdrake:79 standalone/scannerdrake:517
#, c-format
msgid "Re-generating list of configured scanners..."
msgstr "正在重新生成已配置的扫描仪清单..."
-#: standalone/scannerdrake:101 standalone/scannerdrake:142
+#: standalone/scannerdrake:101
#, c-format
msgid "The %s is not supported by this version of %s."
msgstr "%2$s 版本不支持 %1$s。"
@@ -24201,12 +24783,12 @@ msgstr "%2$s 版本不支持 %1$s。"
#: standalone/scannerdrake:104
#, c-format
msgid "%s found on %s, configure it automatically?"
-msgstr "发现 %s 连接在 %s 上,是否自动配置它?"
+msgstr "发现 %s 连接在 %s 上, 是否自动配置它?"
#: standalone/scannerdrake:116
#, c-format
msgid "%s is not in the scanner database, configure it manually?"
-msgstr "扫描仪数据库中没有 %s,要手工配置它吗?"
+msgstr "扫描仪数据库中没有 %s, 要手工配置它吗?"
#: standalone/scannerdrake:131
#, c-format
@@ -24221,38 +24803,48 @@ msgstr " ("
#: standalone/scannerdrake:133
#, c-format
msgid "Detected model: %s"
-msgstr "检测到型号:%s"
+msgstr "检测到型号: %s"
#: standalone/scannerdrake:136
#, c-format
msgid "Port: %s"
msgstr "端口: %s"
-#: standalone/scannerdrake:165 standalone/scannerdrake:179
+#: standalone/scannerdrake:138 standalone/scannerdrake:141
+#, c-format
+msgid " (UNSUPPORTED)"
+msgstr ""
+
+#: standalone/scannerdrake:144
+#, fuzzy, c-format
+msgid "The %s is not supported under Linux."
+msgstr "%2$s 版本不支持 %1$s。"
+
+#: standalone/scannerdrake:171 standalone/scannerdrake:185
#, c-format
msgid "Do not install firmware file"
msgstr "不安装固件文件"
-#: standalone/scannerdrake:169 standalone/scannerdrake:221
+#: standalone/scannerdrake:175 standalone/scannerdrake:227
#, c-format
msgid ""
"It is possible that your %s needs its firmware to be uploaded everytime when "
"it is turned on."
msgstr "很有可能您的 %s 需要每次它们启动时都上载它们的固件。"
-#: standalone/scannerdrake:170 standalone/scannerdrake:222
+#: standalone/scannerdrake:176 standalone/scannerdrake:228
#, c-format
msgid "If this is the case, you can make this be done automatically."
-msgstr "如果是这样的话,您可以让它自动完成。"
+msgstr "如果是这样的话, 您可以让它自动完成。"
-#: standalone/scannerdrake:171 standalone/scannerdrake:225
+#: standalone/scannerdrake:177 standalone/scannerdrake:231
#, c-format
msgid ""
"To do so, you need to supply the firmware file for your scanner so that it "
"can be installed."
-msgstr "要这样做的话,您需要提供您扫描仪的固件文件,这样它就可以被安装了。"
+msgstr "要这样做的话, 您需要提供您扫描仪的固件文件, 这样它就可以被安装了。"
-#: standalone/scannerdrake:172 standalone/scannerdrake:226
+#: standalone/scannerdrake:178 standalone/scannerdrake:232
#, c-format
msgid ""
"You find the file on the CD or floppy coming with the scanner, on the "
@@ -24261,70 +24853,70 @@ msgstr ""
"您可能需要在随同扫描仪的 CD 或者软盘、制造商的网站或者您的 Windows 分区中寻找"
"它。"
-#: standalone/scannerdrake:174 standalone/scannerdrake:233
+#: standalone/scannerdrake:180 standalone/scannerdrake:239
#, c-format
msgid "Install firmware file from"
-msgstr "从这儿安装固件"
+msgstr "固件文件存放在"
-#: standalone/scannerdrake:194
+#: standalone/scannerdrake:200
#, c-format
msgid "Select firmware file"
msgstr "选择固件文件"
-#: standalone/scannerdrake:197 standalone/scannerdrake:256
+#: standalone/scannerdrake:203 standalone/scannerdrake:262
#, c-format
msgid "The firmware file %s does not exist or is unreadable!"
msgstr "固件文件 %s 不存在或无法访问!"
-#: standalone/scannerdrake:220
+#: standalone/scannerdrake:226
#, c-format
msgid ""
"It is possible that your scanners need their firmware to be uploaded "
"everytime when they are turned on."
msgstr "很有可能您的扫描仪需要每次它们启动时都上载它们的固件。"
-#: standalone/scannerdrake:224
+#: standalone/scannerdrake:230
#, c-format
msgid ""
"To do so, you need to supply the firmware files for your scanners so that it "
"can be installed."
-msgstr "要这样做的话,您需要提供您扫描仪的固件文件,这样它就可以被安装了。"
+msgstr "要这样做的话, 您需要提供您扫描仪的固件文件, 这样它就可以被安装了。"
-#: standalone/scannerdrake:227
+#: standalone/scannerdrake:233
#, c-format
msgid ""
"If you have already installed your scanner's firmware you can update the "
"firmware here by supplying the new firmware file."
msgstr ""
-"如果您已经安装了您扫描仪的固件,您也可以通过在这里提供新固件的方式来升级固"
+"如果您已经安装了您扫描仪的固件, 您也可以通过在这里提供新固件的方式来升级固"
"件。"
-#: standalone/scannerdrake:229
+#: standalone/scannerdrake:235
#, c-format
msgid "Install firmware for the"
-msgstr "为它安装固件"
+msgstr "选择要安装固件的扫描仪"
-#: standalone/scannerdrake:252
+#: standalone/scannerdrake:258
#, c-format
msgid "Select firmware file for the %s"
msgstr "选择 %s 的固件文件"
-#: standalone/scannerdrake:270
+#: standalone/scannerdrake:276
#, c-format
msgid "Could not install the firmware file for the %s!"
-msgstr "无法安装 %s 的固件文件"
+msgstr "无法安装 %s 的固件文件!"
-#: standalone/scannerdrake:283
+#: standalone/scannerdrake:289
#, c-format
msgid "The firmware file for your %s was successfully installed."
msgstr "您 %s 的固件文件已经成功安装。"
-#: standalone/scannerdrake:293
+#: standalone/scannerdrake:299
#, c-format
msgid "The %s is unsupported"
msgstr "扫描仪 %s 不被支持"
-#: standalone/scannerdrake:298
+#: standalone/scannerdrake:304
#, c-format
msgid ""
"The %s must be configured by printerdrake.\n"
@@ -24333,33 +24925,87 @@ msgstr ""
"这个 %s 必须使用“Drak 打印机”来配置。\n"
"您可以在“%s 控制中心”的“硬件”部分打开“Drak 打印机”。"
-#: standalone/scannerdrake:302 standalone/scannerdrake:309
-#: standalone/scannerdrake:339
+#: standalone/scannerdrake:308 standalone/scannerdrake:315
+#: standalone/scannerdrake:345
#, c-format
msgid "Auto-detect available ports"
msgstr "自动检测可用的端口"
-#: standalone/scannerdrake:304 standalone/scannerdrake:350
+#: standalone/scannerdrake:310 standalone/scannerdrake:356
#, c-format
msgid "Please select the device where your %s is attached"
msgstr "请选择您的 %s 所连接的设备。"
-#: standalone/scannerdrake:305
+#: standalone/scannerdrake:311
#, c-format
msgid "(Note: Parallel ports cannot be auto-detected)"
msgstr "(注意: 并行端口无法自动检测)"
-#: standalone/scannerdrake:307 standalone/scannerdrake:352
+#: standalone/scannerdrake:313 standalone/scannerdrake:358
#, c-format
msgid "choose device"
msgstr "选择设备"
-#: standalone/scannerdrake:341
+#: standalone/scannerdrake:347
#, c-format
msgid "Searching for scanners..."
msgstr "正在搜索扫描仪..."
-#: standalone/scannerdrake:376
+#: standalone/scannerdrake:383
+#, fuzzy, c-format
+msgid "Setting up kernel modules..."
+msgstr "内核模块。"
+
+#: standalone/scannerdrake:390 standalone/scannerdrake:397
+#, fuzzy, c-format
+msgid "Attention!"
+msgstr "自动检测"
+
+#: standalone/scannerdrake:391
+#, c-format
+msgid ""
+"Your %s cannot be configured fully automatically.\n"
+"\n"
+"Manual adjustments are required. Please edit the configuration file /etc/"
+"sane.d/%s.conf. "
+msgstr ""
+
+#: standalone/scannerdrake:392 standalone/scannerdrake:401
+#, c-format
+msgid ""
+"More info in the driver's manual page. Run the command \"man sane-%s\" to "
+"read it."
+msgstr ""
+
+#: standalone/scannerdrake:394 standalone/scannerdrake:403
+#, fuzzy, c-format
+msgid ""
+"After that you may scan documents using \"XSane\" or \"Kooka\" from "
+"Multimedia/Graphics in the applications menu."
+msgstr ""
+"您的 %s 已经配置好了。\n"
+"现在您可以从应用程序菜单的“多媒体/图像”中使用“XSane”或“Kooka”来扫描文档。"
+
+#: standalone/scannerdrake:398
+#, c-format
+msgid ""
+"Your %s has been configured, but it is possible that additional manual "
+"adjustments are needed to get it to work. "
+msgstr ""
+
+#: standalone/scannerdrake:399
+#, c-format
+msgid ""
+"If it does not appear in the list of configured scanners in the main window "
+"of Scannerdrake or if it does not work correctly, "
+msgstr ""
+
+#: standalone/scannerdrake:400
+#, c-format
+msgid "edit the configuration file /etc/sane.d/%s.conf. "
+msgstr ""
+
+#: standalone/scannerdrake:406
#, c-format
msgid ""
"Your %s has been configured.\n"
@@ -24369,7 +25015,7 @@ msgstr ""
"您的 %s 已经配置好了。\n"
"现在您可以从应用程序菜单的“多媒体/图像”中使用“XSane”或“Kooka”来扫描文档。"
-#: standalone/scannerdrake:400
+#: standalone/scannerdrake:431
#, c-format
msgid ""
"The following scanners\n"
@@ -24382,7 +25028,7 @@ msgstr ""
"%s\n"
"直接连接在您的系统。\n"
-#: standalone/scannerdrake:401
+#: standalone/scannerdrake:432
#, c-format
msgid ""
"The following scanner\n"
@@ -24395,150 +25041,150 @@ msgstr ""
"%s\n"
"直接连接在您的系统。\n"
-#: standalone/scannerdrake:404 standalone/scannerdrake:407
+#: standalone/scannerdrake:435 standalone/scannerdrake:438
#, c-format
msgid "There are no scanners found which are available on your system.\n"
msgstr "没有发现扫描仪直接连接在您的机器上。\n"
-#: standalone/scannerdrake:421
+#: standalone/scannerdrake:452
#, c-format
msgid "Search for new scanners"
msgstr "搜索新扫描仪"
-#: standalone/scannerdrake:427
+#: standalone/scannerdrake:458
#, c-format
msgid "Add a scanner manually"
msgstr "手动添加扫描仪"
-#: standalone/scannerdrake:434
+#: standalone/scannerdrake:465
#, c-format
msgid "Install/Update firmware files"
msgstr "安装/更新固件文件"
-#: standalone/scannerdrake:440
+#: standalone/scannerdrake:471
#, c-format
msgid "Scanner sharing"
msgstr "扫描仪共享"
-#: standalone/scannerdrake:499 standalone/scannerdrake:664
+#: standalone/scannerdrake:530 standalone/scannerdrake:695
#, c-format
msgid "All remote machines"
msgstr "全部远程计算机"
-#: standalone/scannerdrake:511 standalone/scannerdrake:814
+#: standalone/scannerdrake:542 standalone/scannerdrake:845
#, c-format
msgid "This machine"
msgstr "本机"
-#: standalone/scannerdrake:551
+#: standalone/scannerdrake:582
#, c-format
msgid ""
"Here you can choose whether the scanners connected to this machine should be "
"accessible by remote machines and by which remote machines."
msgstr ""
-"您可以在此选择是否将连接到本机的扫描仪共享给远程计算机,以及共享给哪些计算"
+"您可以在此选择是否将连接到本机的扫描仪共享给远程计算机, 以及共享给哪些计算"
"机。"
-#: standalone/scannerdrake:552
+#: standalone/scannerdrake:583
#, c-format
msgid ""
"You can also decide here whether scanners on remote machines should be made "
"available on this machine."
msgstr "您还可以在此决定是否要将远程的扫描仪自动安装为本机所用。"
-#: standalone/scannerdrake:555
+#: standalone/scannerdrake:586
#, c-format
msgid "The scanners on this machine are available to other computers"
msgstr "此计算机上的扫描仪可共享给计算机"
-#: standalone/scannerdrake:557
+#: standalone/scannerdrake:588
#, c-format
msgid "Scanner sharing to hosts: "
msgstr "在主机上共享扫描仪:"
-#: standalone/scannerdrake:571
+#: standalone/scannerdrake:602
#, c-format
msgid "Use scanners on remote computers"
msgstr "在远程计算机上使用扫描仪"
-#: standalone/scannerdrake:574
+#: standalone/scannerdrake:605
#, c-format
msgid "Use the scanners on hosts: "
msgstr "在下列主机上使用扫描仪:"
-#: standalone/scannerdrake:601 standalone/scannerdrake:673
-#: standalone/scannerdrake:823
+#: standalone/scannerdrake:632 standalone/scannerdrake:704
+#: standalone/scannerdrake:854
#, c-format
msgid "Sharing of local scanners"
msgstr "共享本地扫描仪"
-#: standalone/scannerdrake:602
+#: standalone/scannerdrake:633
#, c-format
msgid ""
"These are the machines on which the locally connected scanner(s) should be "
"available:"
msgstr "下面是本地连接的扫描仪要开放的计算机:"
-#: standalone/scannerdrake:613 standalone/scannerdrake:763
+#: standalone/scannerdrake:644 standalone/scannerdrake:794
#, c-format
msgid "Add host"
msgstr "添加主机"
-#: standalone/scannerdrake:619 standalone/scannerdrake:769
+#: standalone/scannerdrake:650 standalone/scannerdrake:800
#, c-format
msgid "Edit selected host"
msgstr "编辑选中的主机"
-#: standalone/scannerdrake:628 standalone/scannerdrake:778
+#: standalone/scannerdrake:659 standalone/scannerdrake:809
#, c-format
msgid "Remove selected host"
msgstr "删除选中的主机"
-#: standalone/scannerdrake:652 standalone/scannerdrake:660
-#: standalone/scannerdrake:665 standalone/scannerdrake:711
-#: standalone/scannerdrake:802 standalone/scannerdrake:810
-#: standalone/scannerdrake:815 standalone/scannerdrake:861
+#: standalone/scannerdrake:683 standalone/scannerdrake:691
+#: standalone/scannerdrake:696 standalone/scannerdrake:742
+#: standalone/scannerdrake:833 standalone/scannerdrake:841
+#: standalone/scannerdrake:846 standalone/scannerdrake:892
#, c-format
msgid "Name/IP address of host:"
msgstr "主机的名称/IP 地址:"
-#: standalone/scannerdrake:674 standalone/scannerdrake:824
+#: standalone/scannerdrake:705 standalone/scannerdrake:855
#, c-format
msgid "Choose the host on which the local scanners should be made available:"
msgstr "选择本地扫描仪适用的网络或主机:"
-#: standalone/scannerdrake:685 standalone/scannerdrake:835
+#: standalone/scannerdrake:716 standalone/scannerdrake:866
#, c-format
msgid "You must enter a host name or an IP address.\n"
msgstr "您必须输入主机名或 IP 地址。\n"
-#: standalone/scannerdrake:696 standalone/scannerdrake:846
+#: standalone/scannerdrake:727 standalone/scannerdrake:877
#, c-format
msgid "This host is already in the list, it cannot be added again.\n"
-msgstr "此主机已经位于列表中,无法再次添加。\n"
+msgstr "此主机已经位于列表中, 无法再次添加。\n"
-#: standalone/scannerdrake:751
+#: standalone/scannerdrake:782
#, c-format
msgid "Usage of remote scanners"
msgstr "远程扫描仪使用情况"
-#: standalone/scannerdrake:752
+#: standalone/scannerdrake:783
#, c-format
msgid "These are the machines from which the scanners should be used:"
msgstr "下面是要使用扫描仪的计算机:"
-#: standalone/scannerdrake:909
+#: standalone/scannerdrake:940
#, c-format
msgid ""
"saned needs to be installed to share the local scanner(s).\n"
"\n"
"Do you want to install the saned package?"
msgstr ""
-"要共享本地打印机,必须安装 saned。\n"
+"要共享本地打印机, 必须安装 saned。\n"
"\n"
-"您是否想要安装 saned 软件包?"
+"您是否想要安装 saned 软件包?"
-#: standalone/scannerdrake:913 standalone/scannerdrake:917
+#: standalone/scannerdrake:944 standalone/scannerdrake:948
#, c-format
msgid "Your scanner(s) will not be available on the network."
msgstr "您的扫描仪将不会在网络上出现。"
@@ -24563,7 +25209,7 @@ msgstr "添加了一些设备: %s\n"
msgid "- %s was added\n"
msgstr "- %s 已添加\n"
-#: standalone/service_harddrake:199
+#: standalone/service_harddrake:204
#, c-format
msgid "Hardware probing in progress"
msgstr "硬件检测进行中"
@@ -24576,7 +25222,7 @@ msgstr "在“%s”类别更改了硬件(还剩 %s 秒回答)"
#: standalone/service_harddrake_confirm:8
#, c-format
msgid "Do you want to run the appropriate config tool?"
-msgstr "您想要运行相应的配置工具吗?"
+msgstr "您想要运行相应的配置工具吗?"
#: steps.pm:14
#, c-format
@@ -24630,8 +25276,8 @@ msgstr "安装系统"
#: steps.pm:25
#, c-format
-msgid "Root password"
-msgstr "Root 密码"
+msgid "Administrator password"
+msgstr "管理员密码"
#: steps.pm:26
#, c-format
@@ -24668,25 +25314,50 @@ msgstr "安装更新"
msgid "Exit install"
msgstr "退出安装"
-#: ugtk2.pm:1122
+#: ugtk2.pm:900
#, c-format
msgid "Is this correct?"
-msgstr "这样正确吗?"
+msgstr "这样正确吗?"
+
+#: ugtk2.pm:960
+#, c-format
+msgid "No file chosen"
+msgstr "未选择文件"
+
+#: ugtk2.pm:962
+#, c-format
+msgid "You have chosen a file, not a directory"
+msgstr "您选择了文件,而非目录"
+
+#: ugtk2.pm:964
+#, c-format
+msgid "You have chosen a directory, not a file"
+msgstr "您选择了目录,而非文件"
+
+#: ugtk2.pm:966
+#, c-format
+msgid "No such directory"
+msgstr "无此目录"
-#: ugtk2.pm:1250
+#: ugtk2.pm:966
+#, c-format
+msgid "No such file"
+msgstr "非本地文件"
+
+#: ugtk2.pm:1045
#, c-format
msgid "Expand Tree"
msgstr "展开树"
-#: ugtk2.pm:1251
+#: ugtk2.pm:1046
#, c-format
msgid "Collapse Tree"
msgstr "折叠树"
-#: ugtk2.pm:1252
+#: ugtk2.pm:1047
#, c-format
msgid "Toggle between flat and group sorted"
-msgstr "切换清单显示/按组排序"
+msgstr "切换清单显示/分组排序"
#: wizards.pm:95
#, c-format
@@ -24695,12 +25366,9 @@ msgid ""
"Click \"Next\" to install or \"Cancel\" to quit"
msgstr ""
"%s 未安装\n"
-"请点击“下一步”进行安装,或者点击“取消”退出"
+"请点击“下一步”进行安装, 或者点击“取消”退出"
#: wizards.pm:99
#, c-format
msgid "Installation failed"
msgstr "安装失败"
-
-#~ msgid "The "
-#~ msgstr " "