summaryrefslogtreecommitdiff
path: root/po/zh_CN
diff options
context:
space:
mode:
authorChristian Perrier <bubulle@debian.org>2011-01-08 16:54:38 +0000
committerChristian Perrier <bubulle@debian.org>2011-01-08 16:54:38 +0000
commita950b6d69cc813119c6802653657b19873c44acb (patch)
tree9ef972f10019030b0560e43738787b9ebe45be0d /po/zh_CN
parent9068eb3afa7fb523fd33fc94164bf5353e7d41d7 (diff)
downloadinstallation-guide-a950b6d69cc813119c6802653657b19873c44acb.zip
Update PO files
Diffstat (limited to 'po/zh_CN')
-rw-r--r--po/zh_CN/boot-installer.po182
-rw-r--r--po/zh_CN/hardware.po20
-rw-r--r--po/zh_CN/install-methods.po13
-rw-r--r--po/zh_CN/installation-howto.po33
-rw-r--r--po/zh_CN/partitioning.po27
-rw-r--r--po/zh_CN/preparing.po36
-rw-r--r--po/zh_CN/preseed.po508
-rw-r--r--po/zh_CN/random-bits.po12
-rw-r--r--po/zh_CN/using-d-i.po774
9 files changed, 833 insertions, 772 deletions
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 1168be9b6..5db05897a 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-12-29 12:07+0000\n"
"PO-Revision-Date: 2010-10-26 20:28+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -2856,7 +2856,7 @@ msgstr ""
"<userinput>theme=<replaceable>dark</replaceable></userinput> 设置。"
#. Tag: term
-#: boot-installer.xml:2283 boot-installer.xml:2514
+#: boot-installer.xml:2283 boot-installer.xml:2516
#, no-c-format
msgid "netcfg/disable_dhcp"
msgstr "netcfg/disable_dhcp"
@@ -3127,13 +3127,13 @@ msgstr ""
"<xref linkend=\"rescue\"/>。"
#. Tag: title
-#: boot-installer.xml:2458
+#: boot-installer.xml:2460
#, no-c-format
msgid "Using boot parameters to answer questions"
msgstr "使用内核模块参数回答提问"
#. Tag: para
-#: boot-installer.xml:2459
+#: boot-installer.xml:2461
#, no-c-format
msgid ""
"With some exceptions, a value can be set at the boot prompt for any question "
@@ -3146,25 +3146,25 @@ msgstr ""
"bootparms\"/> 找到。下面是一些具体的例子。"
#. Tag: term
-#: boot-installer.xml:2471
+#: boot-installer.xml:2473
#, no-c-format
msgid "debian-installer/language (language)"
msgstr "debian-installer/language (language)"
#. Tag: term
-#: boot-installer.xml:2472
+#: boot-installer.xml:2474
#, no-c-format
msgid "debian-installer/country (country)"
msgstr "debian-installer/country (country)"
#. Tag: term
-#: boot-installer.xml:2473
+#: boot-installer.xml:2475
#, no-c-format
msgid "debian-installer/locale (locale)"
msgstr "debian-installer/locale (locale)"
#. Tag: para
-#: boot-installer.xml:2474
+#: boot-installer.xml:2476
#, no-c-format
msgid ""
"There are two ways to specify the language, country and locale to use for "
@@ -3174,7 +3174,7 @@ msgstr ""
"和地方(locale)。"
#. Tag: para
-#: boot-installer.xml:2479
+#: boot-installer.xml:2481
#, no-c-format
msgid ""
"The first and easiest is to pass only the parameter <literal>locale</"
@@ -3192,7 +3192,7 @@ msgstr ""
"式组合。"
#. Tag: para
-#: boot-installer.xml:2488
+#: boot-installer.xml:2490
#, no-c-format
msgid ""
"The second, more flexible option is to specify <literal>language</literal> "
@@ -3207,13 +3207,13 @@ msgstr ""
"locale=en_GB.UTF-8</userinput>。"
#. Tag: term
-#: boot-installer.xml:2500
+#: boot-installer.xml:2502
#, no-c-format
msgid "anna/choose_modules (modules)"
msgstr "anna/choose_modules (modules)"
#. Tag: para
-#: boot-installer.xml:2501
+#: boot-installer.xml:2503
#, no-c-format
msgid ""
"Can be used to automatically load installer components that are not loaded "
@@ -3228,7 +3228,7 @@ msgstr ""
"classname> (参阅 <xref linkend=\"pppoe\"/>)</phrase>。"
#. Tag: para
-#: boot-installer.xml:2515
+#: boot-installer.xml:2517
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> if you want to disable DHCP and instead "
@@ -3237,13 +3237,13 @@ msgstr ""
"如果您想禁止 DHCP 使用静态网络设置,将它设为 <userinput>true</userinput>。"
#. Tag: term
-#: boot-installer.xml:2524
+#: boot-installer.xml:2526
#, no-c-format
msgid "mirror/protocol (protocol)"
msgstr "mirror/protocol (protocol)"
#. Tag: para
-#: boot-installer.xml:2525
+#: boot-installer.xml:2527
#, no-c-format
msgid ""
"By default the installer will use the http protocol to download files from "
@@ -3258,13 +3258,13 @@ msgstr ""
"序使用该协议。注意,必须手动输入主机名,而不是从列表中选择 ftp 镜像。"
#. Tag: term
-#: boot-installer.xml:2538
+#: boot-installer.xml:2540
#, no-c-format
msgid "tasksel:tasksel/first (tasks)"
msgstr "tasksel:tasksel/first (tasks)"
#. Tag: para
-#: boot-installer.xml:2539
+#: boot-installer.xml:2541
#, no-c-format
msgid ""
"Can be used to select tasks that are not available from the interactive task "
@@ -3275,13 +3275,13 @@ msgstr ""
"literal> 任务。参阅 <xref linkend=\"pkgsel\"/> 了解详细信息。"
#. Tag: title
-#: boot-installer.xml:2553
+#: boot-installer.xml:2555
#, no-c-format
msgid "Passing parameters to kernel modules"
msgstr "给内核模块传递参数"
#. Tag: para
-#: boot-installer.xml:2554
+#: boot-installer.xml:2556
#, no-c-format
msgid ""
"If drivers are compiled into the kernel, you can pass parameters to them as "
@@ -3301,7 +3301,7 @@ msgstr ""
"配置中。"
#. Tag: para
-#: boot-installer.xml:2567
+#: boot-installer.xml:2569
#, no-c-format
msgid ""
"Note that it is now quite rare that parameters need to be passed to modules. "
@@ -3313,7 +3313,7 @@ msgstr ""
"并很好地设置默认参数。然而,某些情况下还是需要手动设置参数。"
#. Tag: para
-#: boot-installer.xml:2574
+#: boot-installer.xml:2576
#, no-c-format
msgid ""
"The syntax to use to set parameters for modules is: "
@@ -3333,19 +3333,19 @@ msgstr ""
"用:"
#. Tag: screen
-#: boot-installer.xml:2584
+#: boot-installer.xml:2586
#, no-c-format
msgid "3c509.xcvr=3 3c509.irq=10"
msgstr "3c509.xcvr=3 3c509.irq=10"
#. Tag: title
-#: boot-installer.xml:2590
+#: boot-installer.xml:2592
#, no-c-format
msgid "Blacklisting kernel modules"
msgstr "内核模块黑名单"
#. Tag: para
-#: boot-installer.xml:2591
+#: boot-installer.xml:2593
#, no-c-format
msgid ""
"Sometimes it may be necessary to blacklist a module to prevent it from being "
@@ -3360,7 +3360,7 @@ msgstr ""
"间冲突或者错误的驱动先加载,将造成设备无法正常工作。"
#. Tag: para
-#: boot-installer.xml:2600
+#: boot-installer.xml:2602
#, no-c-format
msgid ""
"You can blacklist a module using the following syntax: "
@@ -3374,7 +3374,7 @@ msgstr ""
"入 <filename>/etc/modprobe.d/blacklist.local</filename> 文件的黑名单中。"
#. Tag: para
-#: boot-installer.xml:2608
+#: boot-installer.xml:2610
#, no-c-format
msgid ""
"Note that a module may still be loaded by the installation system itself. "
@@ -3386,19 +3386,19 @@ msgstr ""
"件检查过程中从显示的模块列表中取消该模块。"
#. Tag: title
-#: boot-installer.xml:2625
+#: boot-installer.xml:2626
#, no-c-format
msgid "Troubleshooting the Installation Process"
msgstr "安装过程中的故障修复"
#. Tag: title
-#: boot-installer.xml:2630
+#: boot-installer.xml:2631
#, no-c-format
msgid "CD-ROM Reliability"
msgstr "CD-ROM 的可靠性"
#. Tag: para
-#: boot-installer.xml:2631
+#: boot-installer.xml:2632
#, no-c-format
msgid ""
"Sometimes, especially with older CD-ROM drives, the installer may fail to "
@@ -3410,7 +3410,7 @@ msgstr ""
"&mdash; 即使是从 CD-ROM 成功引导 &mdash; 无法识别 CD-ROM 或在安装时读取错误。"
#. Tag: para
-#: boot-installer.xml:2638
+#: boot-installer.xml:2639
#, no-c-format
msgid ""
"There are many different possible causes for these problems. We can only "
@@ -3421,13 +3421,13 @@ msgstr ""
"下的由您来处理。"
#. Tag: para
-#: boot-installer.xml:2644
+#: boot-installer.xml:2645
#, no-c-format
msgid "There are two very simple things that you should try first."
msgstr "您首先应试试两种最简单的方法。"
#. Tag: para
-#: boot-installer.xml:2649
+#: boot-installer.xml:2650
#, no-c-format
msgid ""
"If the CD-ROM does not boot, check that it was inserted correctly and that "
@@ -3435,7 +3435,7 @@ msgid ""
msgstr "如果 CD-ROM 没有引导,检查一下它是否放好,并且没有弄脏。"
#. Tag: para
-#: boot-installer.xml:2655
+#: boot-installer.xml:2656
#, no-c-format
msgid ""
"If the installer fails to recognize a CD-ROM, try just running the option "
@@ -3448,7 +3448,7 @@ msgstr ""
"的问题可以用这种方法解决。"
#. Tag: para
-#: boot-installer.xml:2665
+#: boot-installer.xml:2666
#, no-c-format
msgid ""
"If this does not work, then try the suggestions in the subsections below. "
@@ -3459,7 +3459,7 @@ msgstr ""
"CD-ROM 和 DVD,为了方便,只提到 CD-ROM。"
#. Tag: para
-#: boot-installer.xml:2671
+#: boot-installer.xml:2672
#, no-c-format
msgid ""
"If you cannot get the installation working from CD-ROM, try one of the other "
@@ -3467,13 +3467,13 @@ msgid ""
msgstr "如果您用 CD-ROM 无法安装,试试其他可用的安装方法。"
#. Tag: title
-#: boot-installer.xml:2679
+#: boot-installer.xml:2680
#, no-c-format
msgid "Common issues"
msgstr "常见问题"
#. Tag: para
-#: boot-installer.xml:2682
+#: boot-installer.xml:2683
#, no-c-format
msgid ""
"Some older CD-ROM drives do not support reading from discs that were burned "
@@ -3481,7 +3481,7 @@ msgid ""
msgstr "有些老 CD-ROM 驱动器不能读取新 CD 刻录机的高速模式下刻录的光盘。"
#. Tag: para
-#: boot-installer.xml:2688
+#: boot-installer.xml:2689
#, no-c-format
msgid ""
"If your system boots correctly from the CD-ROM, it does not necessarily mean "
@@ -3492,7 +3492,7 @@ msgstr ""
"(或者,更准确一点,CD-ROM 驱动器所连接的控制器)。"
#. Tag: para
-#: boot-installer.xml:2695
+#: boot-installer.xml:2696
#, no-c-format
msgid ""
"Some older CD-ROM drives do not work correctly if <quote>direct memory "
@@ -3502,19 +3502,19 @@ msgstr ""
"常工作。"
#. Tag: title
-#: boot-installer.xml:2706
+#: boot-installer.xml:2707
#, no-c-format
msgid "How to investigate and maybe solve issues"
msgstr "如何调查研究或许可以解决问题"
#. Tag: para
-#: boot-installer.xml:2707
+#: boot-installer.xml:2708
#, no-c-format
msgid "If the CD-ROM fails to boot, try the suggestions listed below."
msgstr "如果从 CD-ROM 引导失败,试试下面所列的建议。"
#. Tag: para
-#: boot-installer.xml:2712
+#: boot-installer.xml:2713
#, no-c-format
msgid ""
"Check that your BIOS actually supports booting from CD-ROM (older systems "
@@ -3524,7 +3524,7 @@ msgstr ""
"持您所使用的介质。"
#. Tag: para
-#: boot-installer.xml:2718
+#: boot-installer.xml:2719
#, no-c-format
msgid ""
"If you downloaded an iso image, check that the md5sum of that image matches "
@@ -3548,7 +3548,7 @@ msgstr ""
"用下面的命令。它使用映像的尺寸从 CD-ROM 读取正确的字节数。"
#. Tag: screen
-#: boot-installer.xml:2731
+#: boot-installer.xml:2732
#, no-c-format
msgid ""
"$ dd if=/dev/cdrom | \\\n"
@@ -3570,7 +3570,7 @@ msgstr ""
"134486016 bytes (134 MB) copied, 97.474 seconds, 1.4 MB/s"
#. Tag: para
-#: boot-installer.xml:2736
+#: boot-installer.xml:2737
#, no-c-format
msgid ""
"If, after the installer has been booted successfully, the CD-ROM is not "
@@ -3589,7 +3589,7 @@ msgstr ""
"shell。"
#. Tag: para
-#: boot-installer.xml:2748
+#: boot-installer.xml:2749
#, no-c-format
msgid ""
"Switch to VT4 or view the contents of <filename>/var/log/syslog</filename> "
@@ -3601,7 +3601,7 @@ msgstr ""
"<command>dmesg</command> 的输出。"
#. Tag: para
-#: boot-installer.xml:2755
+#: boot-installer.xml:2756
#, no-c-format
msgid ""
"Check in the output of <command>dmesg</command> if your CD-ROM drive was "
@@ -3629,7 +3629,7 @@ msgstr ""
"<command>modprobe</command> 手动加载。"
#. Tag: para
-#: boot-installer.xml:2769
+#: boot-installer.xml:2770
#, no-c-format
msgid ""
"Check that there is a device node for your CD-ROM drive under <filename>/dev/"
@@ -3641,7 +3641,7 @@ msgstr ""
"cdrom0</filename>。"
#. Tag: para
-#: boot-installer.xml:2777
+#: boot-installer.xml:2778
#, no-c-format
msgid ""
"Use the <command>mount</command> command to check if the CD-ROM is already "
@@ -3656,7 +3656,7 @@ msgstr ""
"</screen></informalexample> 检查命令后面是否有什么错误信息。"
#. Tag: para
-#: boot-installer.xml:2787
+#: boot-installer.xml:2788
#, no-c-format
msgid ""
"Check if DMA is currently enabled: <informalexample><screen>\n"
@@ -3681,7 +3681,7 @@ msgstr ""
"</screen></informalexample> 确保您所处的目录对应 CD-ROM 驱动器。"
#. Tag: para
-#: boot-installer.xml:2802
+#: boot-installer.xml:2803
#, no-c-format
msgid ""
"If there are any problems during the installation, try checking the "
@@ -3693,13 +3693,13 @@ msgstr ""
"性。如果 CD-ROM 可以读,该选项可以对其进行测试。"
#. Tag: title
-#: boot-installer.xml:2817
+#: boot-installer.xml:2818
#, no-c-format
msgid "Floppy Disk Reliability"
msgstr "软盘的可靠性"
#. Tag: para
-#: boot-installer.xml:2819
+#: boot-installer.xml:2820
#, no-c-format
msgid ""
"The biggest problem for people using floppy disks to install &debian; seems "
@@ -3708,7 +3708,7 @@ msgstr ""
"对于用软盘安装 &debian; 的人来说,他们遇到的最大的问题很可能是软盘的可靠性。"
#. Tag: para
-#: boot-installer.xml:2824
+#: boot-installer.xml:2825
#, no-c-format
msgid ""
"The boot floppy is the floppy with the worst problems, because it is read by "
@@ -3724,7 +3724,7 @@ msgstr ""
"息。"
#. Tag: para
-#: boot-installer.xml:2833
+#: boot-installer.xml:2834
#, no-c-format
msgid ""
"If you are having the installation stall at a particular floppy, the first "
@@ -3739,7 +3739,7 @@ msgstr ""
"化以后看起来没有错误。如果可能,在别的统上重写这些软盘更好一些。"
#. Tag: para
-#: boot-installer.xml:2842
+#: boot-installer.xml:2843
#, no-c-format
msgid ""
"One user reports he had to write the images to floppy <emphasis>three</"
@@ -3750,7 +3750,7 @@ msgstr ""
"软盘才算工作良好。"
#. Tag: para
-#: boot-installer.xml:2848
+#: boot-installer.xml:2849
#, no-c-format
msgid ""
"Normally you should not have to download a floppy image again, but if you "
@@ -3761,7 +3761,7 @@ msgstr ""
"来检验下载的映像是否正确。"
#. Tag: para
-#: boot-installer.xml:2854
+#: boot-installer.xml:2855
#, no-c-format
msgid ""
"Other users have reported that simply rebooting a few times with the same "
@@ -3772,13 +3772,13 @@ msgstr ""
"有缺陷的硬件或固件软盘驱动器驱动程序造成的。"
#. Tag: title
-#: boot-installer.xml:2863
+#: boot-installer.xml:2864
#, no-c-format
msgid "Boot Configuration"
msgstr "引导配置"
#. Tag: para
-#: boot-installer.xml:2865
+#: boot-installer.xml:2866
#, no-c-format
msgid ""
"If you have problems and the kernel hangs during the boot process, doesn't "
@@ -3791,7 +3791,7 @@ msgstr ""
"\"/> 讨论。"
#. Tag: para
-#: boot-installer.xml:2872
+#: boot-installer.xml:2873
#, no-c-format
msgid ""
"Often, problems can be solved by removing add-ons and peripherals, and then "
@@ -3803,7 +3803,7 @@ msgstr ""
"phrase>"
#. Tag: para
-#: boot-installer.xml:2878
+#: boot-installer.xml:2879
#, no-c-format
msgid ""
"If you have a large amount of memory installed in your machine, more than "
@@ -3816,13 +3816,13 @@ msgstr ""
"<userinput>mem=512m</userinput>。"
#. Tag: title
-#: boot-installer.xml:2889 boot-installer.xml:2991
+#: boot-installer.xml:2890 boot-installer.xml:2992
#, no-c-format
msgid "Common &arch-title; Installation Problems"
msgstr "&arch-title; 常见安装问题"
#. Tag: para
-#: boot-installer.xml:2890
+#: boot-installer.xml:2891
#, no-c-format
msgid ""
"There are some common installation problems that can be solved or avoided by "
@@ -3830,7 +3830,7 @@ msgid ""
msgstr "有一些常见的安装问题,可以通过给安装程序特定的引导参数解决或避免。"
#. Tag: para
-#: boot-installer.xml:2895
+#: boot-installer.xml:2896
#, no-c-format
msgid ""
"Some systems have floppies with <quote>inverted DCLs</quote>. If you receive "
@@ -3841,7 +3841,7 @@ msgstr ""
"息,并且知道软盘是好的,请尝试 <userinput>floppy=thinkpad</userinput> 参数。"
#. Tag: para
-#: boot-installer.xml:2901
+#: boot-installer.xml:2902
#, no-c-format
msgid ""
"On some systems, such as the IBM PS/1 or ValuePoint (which have ST-506 disk "
@@ -3859,7 +3859,7 @@ msgstr ""
"replaceable>,<replaceable>sectors</replaceable></userinput>。"
#. Tag: para
-#: boot-installer.xml:2910
+#: boot-installer.xml:2911
#, no-c-format
msgid ""
"If you have a very old machine, and the kernel hangs after saying "
@@ -3872,7 +3872,7 @@ msgstr ""
"userinput> 参数来取消这个测试。"
#. Tag: para
-#: boot-installer.xml:2917
+#: boot-installer.xml:2918
#, no-c-format
msgid ""
"Some systems (especially laptops) that have a native resolution that is not "
@@ -3895,7 +3895,7 @@ msgstr ""
"boot 参数 <userinput>fb=false</userinput>。"
#. Tag: para
-#: boot-installer.xml:2935
+#: boot-installer.xml:2936
#, no-c-format
msgid ""
"If your screen begins to show a weird picture while the kernel boots, eg. "
@@ -3913,13 +3913,13 @@ msgstr ""
"\"boot-parms\"/> 来获得细节信息。"
#. Tag: title
-#: boot-installer.xml:2949
+#: boot-installer.xml:2950
#, no-c-format
msgid "System Freeze During the PCMCIA Configuration Phase"
msgstr "在 PCMCIA 配置阶段系统停止"
#. Tag: para
-#: boot-installer.xml:2950
+#: boot-installer.xml:2951
#, no-c-format
msgid ""
"Some laptop models produced by Dell are known to crash when PCMCIA device "
@@ -3937,7 +3937,7 @@ msgstr ""
"段。"
#. Tag: para
-#: boot-installer.xml:2960
+#: boot-installer.xml:2961
#, no-c-format
msgid ""
"Alternatively, you can boot the installer in expert mode. You will then be "
@@ -3957,13 +3957,13 @@ msgstr ""
"项。注意您在安装程序中,输入这些值的时候必须忽略逗号。"
#. Tag: title
-#: boot-installer.xml:2977
+#: boot-installer.xml:2978
#, no-c-format
msgid "System Freeze while Loading USB Modules"
msgstr "在装入 USB 模块时系统停止"
#. Tag: para
-#: boot-installer.xml:2978
+#: boot-installer.xml:2979
#, no-c-format
msgid ""
"The kernel normally tries to install USB modules and the USB keyboard driver "
@@ -3979,19 +3979,19 @@ msgstr ""
"<userinput>nousb</userinput> 参数。"
#. Tag: para
-#: boot-installer.xml:2992
+#: boot-installer.xml:2993
#, no-c-format
msgid "There are some common installation problems that are worth mentioning."
msgstr "有一些常见的安装问题值得解释一下。"
#. Tag: title
-#: boot-installer.xml:2998
+#: boot-installer.xml:2999
#, no-c-format
msgid "Misdirected video output"
msgstr "错误的视频输出"
#. Tag: para
-#: boot-installer.xml:2999
+#: boot-installer.xml:3000
#, no-c-format
msgid ""
"It is fairly common for &arch-title; to have two video cards in one machine, "
@@ -4015,7 +4015,7 @@ msgstr ""
"<userinput>video=atyfb:off</userinput> 启动安装程序。"
#. Tag: para
-#: boot-installer.xml:3013
+#: boot-installer.xml:3014
#, no-c-format
msgid ""
"Note that you may also have to manually add this parameter to the silo "
@@ -4028,13 +4028,13 @@ msgstr ""
"xorg.conf</filename> 中的视频驱动。"
#. Tag: title
-#: boot-installer.xml:3024
+#: boot-installer.xml:3025
#, no-c-format
msgid "Failure to Boot or Install from CD-ROM"
msgstr "从 CD-ROM 上引导或安装失败"
#. Tag: para
-#: boot-installer.xml:3025
+#: boot-installer.xml:3026
#, no-c-format
msgid ""
"Some Sparc systems are notoriously difficult to boot from CD-ROM and even if "
@@ -4045,19 +4045,19 @@ msgstr ""
"费解的错误。SunBlade 系统被报告了很多问题。"
#. Tag: para
-#: boot-installer.xml:3031
+#: boot-installer.xml:3032
#, no-c-format
msgid "We recommend to install such systems by netbooting the installer."
msgstr "我们建议从网络安装这些系统。"
#. Tag: title
-#: boot-installer.xml:3040
+#: boot-installer.xml:3041
#, no-c-format
msgid "Interpreting the Kernel Startup Messages"
msgstr "内核起始信息注解"
#. Tag: para
-#: boot-installer.xml:3042
+#: boot-installer.xml:3043
#, no-c-format
msgid ""
"During the boot sequence, you may see many messages in the form "
@@ -4091,13 +4091,13 @@ msgstr ""
"linkend=\"kernel-baking\"/>)</phrase>。"
#. Tag: title
-#: boot-installer.xml:3067
+#: boot-installer.xml:3068
#, no-c-format
msgid "Reporting Installation Problems"
msgstr "报告安装问题"
#. Tag: para
-#: boot-installer.xml:3068
+#: boot-installer.xml:3069
#, no-c-format
msgid ""
"If you get through the initial boot phase but cannot complete the install, "
@@ -4114,7 +4114,7 @@ msgstr ""
"索。如果您正在提交一个 bug 报告,可以报告里附上该信息。"
#. Tag: para
-#: boot-installer.xml:3079
+#: boot-installer.xml:3080
#, no-c-format
msgid ""
"Other pertinent installation messages may be found in <filename>/var/log/</"
@@ -4125,13 +4125,13 @@ msgstr ""
"新安装的系统启动后,放在 <filename>/var/log/debian-installer/</filename> 里。"
#. Tag: title
-#: boot-installer.xml:3090
+#: boot-installer.xml:3091
#, no-c-format
msgid "Submitting Installation Reports"
msgstr "提交缺陷报告"
#. Tag: para
-#: boot-installer.xml:3091
+#: boot-installer.xml:3092
#, no-c-format
msgid ""
"If you still have problems, please submit an installation report. We also "
@@ -4143,7 +4143,7 @@ msgstr ""
"这让我们可以尽可能多地了解硬件的配置数量。"
#. Tag: para
-#: boot-installer.xml:3098
+#: boot-installer.xml:3099
#, no-c-format
msgid ""
"Note that your installation report will be published in the Debian Bug "
@@ -4154,7 +4154,7 @@ msgstr ""
"件列表。确保您使用的邮件地址可以被公开。"
#. Tag: para
-#: boot-installer.xml:3104
+#: boot-installer.xml:3105
#, no-c-format
msgid ""
"If you have a working &debian; system, the easiest way to send an "
@@ -4173,7 +4173,7 @@ msgstr ""
"command> 命令。"
#. Tag: para
-#: boot-installer.xml:3114
+#: boot-installer.xml:3115
#, no-c-format
msgid ""
"Alternatively you can use this template when filling out installation "
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index a0f601af8..5a9e3e5fb 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -1493,7 +1493,14 @@ msgid ""
"developerworks/linux/linux390/development_technical.html\"> Linux on "
"<trademark class=\"registered\">System z</trademark> page on developerWorks</"
"ulink>."
-msgstr "&debian; Squeeze 已不再支持 ESA/390 模式的引导。您的机器至少要支持 z/Architecture、Architecture Level Set 2。不过 userland 仍然为 ESA/390 编译。所有的 zSeries 硬件完全获得支持。&arch-title; 支持的软件源自 2.6.32 内核开发流。有关 IBM 支持 Linux 的最新信息可以在 <ulink url=\"http://www.ibm.com/developerworks/linux/linux390/development_technical.html\"> Linux on <trademark class=\"registered\">System z</trademark> page on developerWorks</ulink> 找到。"
+msgstr ""
+"&debian; Squeeze 已不再支持 ESA/390 模式的引导。您的机器至少要支持 z/"
+"Architecture、Architecture Level Set 2。不过 userland 仍然为 ESA/390 编译。所"
+"有的 zSeries 硬件完全获得支持。&arch-title; 支持的软件源自 2.6.32 内核开发"
+"流。有关 IBM 支持 Linux 的最新信息可以在 <ulink url=\"http://www.ibm.com/"
+"developerworks/linux/linux390/development_technical.html\"> Linux on "
+"<trademark class=\"registered\">System z</trademark> page on developerWorks</"
+"ulink> 找到。"
# index.docbook:224, index.docbook:683, index.docbook:780, index.docbook:799, index.docbook:842, index.docbook:884, index.docbook:938, index.docbook:1085, index.docbook:1491
#. Tag: title
@@ -1761,12 +1768,6 @@ msgstr "图形卡支持"
#. Tag: para
#: hardware.xml:1224
#, no-c-format
-#| msgid ""
-#| "You should be using a VGA-compatible display interface for the console "
-#| "terminal. Nearly every modern display card is compatible with VGA. "
-#| "Ancient standards such CGA, MDA, or HGA should also work, assuming you do "
-#| "not require X11 support. Note that X11 is not used during the "
-#| "installation process described in this document."
msgid ""
"You should be using a VGA-compatible display interface for the console "
"terminal. Nearly every modern display card is compatible with VGA. Ancient "
@@ -1774,7 +1775,10 @@ msgid ""
"require X11 support. Note that X11 is not used during the installation "
"process described in this document unless the graphical installer was "
"explicitly selected."
-msgstr "您应该给终端控制台使用 VGA 兼容的显示接口。几乎所有的新显卡都兼容 VGA。在不使用 X11 支持的情况下,您也可以用古老的 CGA、MDA 或 HGA 工作。注意,除非特意选择使用图形安装程序,本文所述的安装过程中并不会使用 X11 图形界面。"
+msgstr ""
+"您应该给终端控制台使用 VGA 兼容的显示接口。几乎所有的新显卡都兼容 VGA。在不使"
+"用 X11 支持的情况下,您也可以用古老的 CGA、MDA 或 HGA 工作。注意,除非特意选"
+"择使用图形安装程序,本文所述的安装过程中并不会使用 X11 图形界面。"
#. Tag: para
#: hardware.xml:1233
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index 92264c8c2..574d6c7f1 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-29 05:56+0000\n"
+"POT-Creation-Date: 2010-12-29 12:07+0000\n"
"PO-Revision-Date: 2010-11-04 16:56+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1411,9 +1411,6 @@ msgstr ""
#. Tag: para
#: install-methods.xml:996
#, no-c-format
-#| msgid ""
-#| "Copy the following files from a &debian; CD image to <filename>c:\\</"
-#| "filename>."
msgid ""
"Copy the following directories from a &debian; CD image to <filename>c:\\</"
"filename>."
@@ -2021,14 +2018,14 @@ msgid ""
"to serve images from. However, &debian-gnu; packages may use other "
"directories to comply with the <ulink url=\"&url-fhs-home;\">Filesystem "
"Hierarchy Standard</ulink>. For example, <classname>tftpd-hpa</classname> by "
-"default uses <filename>/srv/tftp</filename>. You may have to adjust "
-"the configuration examples in this section accordingly."
+"default uses <filename>/srv/tftp</filename>. You may have to adjust the "
+"configuration examples in this section accordingly."
msgstr ""
"因为历史原因,TFTP 服务器使用 <filename>/tftpboot</filename> 作为映像文件目"
"录。然而,&debian-gnu; 软件包遵守 <ulink url=\"&url-fhs-home;\">Filesystem "
"Hierarchy Standard</ulink> 使用其他的目录。例如,<classname>tftpd-hpa</"
-"classname> 默认使用 <filename>/srv/tftp</filename>。您或许要适当地调"
-"整一下配置文件示例。"
+"classname> 默认使用 <filename>/srv/tftp</filename>。您或许要适当地调整一下配"
+"置文件示例。"
#. Tag: para
#: install-methods.xml:1350
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index 53979b5a6..b93a7cb09 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-12-29 12:07+0000\n"
"PO-Revision-Date: 2010-10-27 23:06+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -309,20 +309,27 @@ msgstr ""
#. Tag: para
#: installation-howto.xml:178
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The easiest thing to set up is probably PXE netbooting. Untar the file "
+#| "<filename>netboot/pxeboot.tar.gz</filename> into <filename>/var/lib/"
+#| "tftpboot</filename> or wherever is appropriate for your tftp server. Set "
+#| "up your DHCP server to pass filename <filename>/pxelinux.0</filename> to "
+#| "clients, and with luck everything will just work. For detailed "
+#| "instructions, see <xref linkend=\"install-tftp\"/>."
msgid ""
"The easiest thing to set up is probably PXE netbooting. Untar the file "
-"<filename>netboot/pxeboot.tar.gz</filename> into <filename>/var/lib/"
-"tftpboot</filename> or wherever is appropriate for your tftp server. Set up "
-"your DHCP server to pass filename <filename>/pxelinux.0</filename> to "
-"clients, and with luck everything will just work. For detailed instructions, "
-"see <xref linkend=\"install-tftp\"/>."
+"<filename>netboot/pxeboot.tar.gz</filename> into <filename>/srv/tftp</"
+"filename> or wherever is appropriate for your tftp server. Set up your DHCP "
+"server to pass filename <filename>/pxelinux.0</filename> to clients, and "
+"with luck everything will just work. For detailed instructions, see <xref "
+"linkend=\"install-tftp\"/>."
msgstr ""
"最简单的建立方式是使用 PXE 的网络启动。解开 <filename>netboot/pxeboot.tar."
-"gz</filename> 文件,把它放到 <filename>/srv/tftp</filename>,或者放到"
-"您的 tftp 服务器所使用的目录。然后再建立 DHCP 服务器,传送 <filename>/"
-"pxelinux.0</filename> 这个文件名给客户端。老天保佑的话,就能顺利安装了。若要"
-"知道详细的操作步骤,请参阅 <xref linkend=\"install-tftp\"/>。"
+"gz</filename> 文件,把它放到 <filename>/srv/tftp</filename>,或者放到您的 "
+"tftp 服务器所使用的目录。然后再建立 DHCP 服务器,传送 <filename>/pxelinux.0</"
+"filename> 这个文件名给客户端。老天保佑的话,就能顺利安装了。若要知道详细的操"
+"作步骤,请参阅 <xref linkend=\"install-tftp\"/>。"
#. Tag: title
#: installation-howto.xml:192
@@ -605,5 +612,5 @@ msgid ""
"We hope that your &debian; installation is pleasant and that you find "
"&debian; useful. You might want to read <xref linkend=\"post-install\"/>."
msgstr ""
-"我们祝愿您安装 &debian; 顺利愉快,并希望您能发现 &debian; 的用武之地。还有您也"
-"许可以读一下 <xref linkend=\"post-install\"/>。"
+"我们祝愿您安装 &debian; 顺利愉快,并希望您能发现 &debian; 的用武之地。还有您"
+"也许可以读一下 <xref linkend=\"post-install\"/>。"
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index 1800f794c..bc2773e1d 100644
--- a/po/zh_CN/partitioning.po
+++ b/po/zh_CN/partitioning.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-10 12:35+0000\n"
+"POT-Creation-Date: 2010-12-29 12:07+0000\n"
"PO-Revision-Date: 2010-10-27 23:10+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -526,15 +526,22 @@ msgstr ""
#. Tag: para
#: partitioning.xml:268
-#, no-c-format
-msgid ""
-"On 32-bit architectures (i386, m68k, 32-bit SPARC, and PowerPC), the maximum "
-"size of a swap partition is 2GB. That should be enough for nearly any "
-"installation. However, if your swap requirements are this high, you should "
-"probably try to spread the swap across different disks (also called "
-"<quote>spindles</quote>) and, if possible, different SCSI or IDE channels. "
-"The kernel will balance swap usage between multiple swap partitions, giving "
-"better performance."
+#, fuzzy, no-c-format
+#| msgid ""
+#| "On 32-bit architectures (i386, m68k, 32-bit SPARC, and PowerPC), the "
+#| "maximum size of a swap partition is 2GB. That should be enough for nearly "
+#| "any installation. However, if your swap requirements are this high, you "
+#| "should probably try to spread the swap across different disks (also "
+#| "called <quote>spindles</quote>) and, if possible, different SCSI or IDE "
+#| "channels. The kernel will balance swap usage between multiple swap "
+#| "partitions, giving better performance."
+msgid ""
+"On some 32-bit architectures (m68k and PowerPC), the maximum size of a swap "
+"partition is 2GB. That should be enough for nearly any installation. "
+"However, if your swap requirements are this high, you should probably try to "
+"spread the swap across different disks (also called <quote>spindles</quote>) "
+"and, if possible, different SCSI or IDE channels. The kernel will balance "
+"swap usage between multiple swap partitions, giving better performance."
msgstr ""
"在 32 位体系结构(i386、m68k、32 位 SPARC 和 PowerPC)下,最大的交换分区尺寸是 "
"2GB。这应该基本满足任何安装情况。但是如果您的交换分区需求非常大,您应该尝试分"
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index ce74582c8..256613b59 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -423,7 +423,9 @@ msgstr "&arch-title; Hardware References"
msgid ""
"Documentation of &arch-title;-specific boot sequence, commands and device "
"drivers (e.g. DASD, XPRAM, Console, OSA, HiperSockets and z/VM interaction)"
-msgstr "&arch-title;-规格引导次序、命令和设备驱动程序文档(如: DASD、XPRAM、Console、OSA、HiperSockets 和 z/VM interaction)"
+msgstr ""
+"&arch-title;-规格引导次序、命令和设备驱动程序文档(如: DASD、XPRAM、Console、"
+"OSA、HiperSockets 和 z/VM interaction)"
#. Tag: ulink
#: preparing.xml:318
@@ -1019,7 +1021,6 @@ msgstr "桌面系统"
#. Tag: entry
#: preparing.xml:681
#, no-c-format
-#| msgid "512 megabytes"
msgid "128 megabytes"
msgstr "128 MB"
@@ -1486,17 +1487,6 @@ msgstr ""
#. Tag: para
#: preparing.xml:983
#, no-c-format
-#| msgid ""
-#| "The first thing needed is a copy of <command>fips</command> which is "
-#| "available in the <filename>tools/</filename> directory on your nearest "
-#| "&debian; mirror. Unzip the archive and copy the files <filename>RESTORRB."
-#| "EXE</filename>, <filename>FIPS.EXE</filename> and <filename>ERRORS.TXT</"
-#| "filename> to a bootable floppy. A bootable floppy can be created using "
-#| "the command <filename>sys a:</filename> under DOS. <command>fips</"
-#| "command> comes with very good documentation which you may want to read. "
-#| "You will definitely need to read the documentation if you use a disk "
-#| "compression driver or a disk manager. Create the disk and read the "
-#| "documentation <emphasis>before</emphasis> you defragment the disk."
msgid ""
"The first thing needed is a copy of <command>fips</command>. Unzip the "
"archive and copy the files <filename>RESTORRB.EXE</filename>, <filename>FIPS."
@@ -1506,7 +1496,13 @@ msgid ""
"you may want to read. You will definitely need to read the documentation if "
"you use a disk compression driver or a disk manager. Create the disk and "
"read the documentation <emphasis>before</emphasis> you defragment the disk."
-msgstr "首先需要一份 <command>fips</command>。解压并复制文件 <filename>RESTORRB.EXE</filename>、<filename>FIPS.EXE</filename> 和 <filename>ERRORS.TXT</filename> 到一张引导软盘。在 DOS 下,引导软盘可以用 <filename>sys a:</filename> 命令制作。<command>fips</command> 附带有非常好的文档,您需要读一读。如果您使用了压缩磁盘或者磁盘管理器,那一定要读一下这份文档。创建磁盘,然后在整理磁盘碎片<emphasis>前</emphasis>阅读这份文档。"
+msgstr ""
+"首先需要一份 <command>fips</command>。解压并复制文件 <filename>RESTORRB.EXE</"
+"filename>、<filename>FIPS.EXE</filename> 和 <filename>ERRORS.TXT</filename> "
+"到一张引导软盘。在 DOS 下,引导软盘可以用 <filename>sys a:</filename> 命令制"
+"作。<command>fips</command> 附带有非常好的文档,您需要读一读。如果您使用了压"
+"缩磁盘或者磁盘管理器,那一定要读一下这份文档。创建磁盘,然后在整理磁盘碎片"
+"<emphasis>前</emphasis>阅读这份文档。"
#. Tag: para
#: preparing.xml:995
@@ -2562,11 +2558,6 @@ msgstr ""
#. Tag: para
#: preparing.xml:1710
#, no-c-format
-#| msgid ""
-#| "You need to copy all the files from the <filename>generic</filename> sub-"
-#| "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
-#| "filename> and <filename>initrd.debian</filename> in binary mode with a "
-#| "fixed record length of 80 characters."
msgid ""
"You need to copy all the files from the <filename>generic</filename> sub-"
"directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
@@ -2575,7 +2566,12 @@ msgid ""
"in either ASCII or EBCDIC format. A sample <filename>debian.exec</filename> "
"script, which will punch the files in the proper order, is included with the "
"images."
-msgstr "您需要从 <filename>generic</filename> 子目录复制所有的文件到 CMS 磁盘。确保 <filename>kernel.debian</filename> 和 <filename>initrd.debian</filename> 是以 80 字符固定记录长度的二进制模式传输。<filename>parmfile.debian</filename> 可以是 ASCII 或 EBCDIC 格式。有一个例子脚本 <filename>debian.exec</filename>,用来将文件按正确次序存放,也包含在映象里面。"
+msgstr ""
+"您需要从 <filename>generic</filename> 子目录复制所有的文件到 CMS 磁盘。确保 "
+"<filename>kernel.debian</filename> 和 <filename>initrd.debian</filename> 是"
+"以 80 字符固定记录长度的二进制模式传输。<filename>parmfile.debian</filename> "
+"可以是 ASCII 或 EBCDIC 格式。有一个例子脚本 <filename>debian.exec</"
+"filename>,用来将文件按正确次序存放,也包含在映象里面。"
#. Tag: title
#: preparing.xml:1726
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index e45e6c61c..bd55bfd37 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-29 05:56+0000\n"
+"POT-Creation-Date: 2010-12-29 12:07+0000\n"
"PO-Revision-Date: 2010-11-04 18:18+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -314,9 +314,9 @@ msgstr ""
"其他的预置方法,您需要在启动的时候告诉安装程序所使用的文件。这通过给内核传递"
"引导参数完成,可以在启动时手动指定,或者编辑 bootloader 的配置文件<phrase "
"arch=\"linux-any\">(如: <filename>syslinux.cfg</filename>),并在内核的附加行"
-"后面添加参数。</phrase><phrase arch=\"kfreebsd-any\">(如: "
-"<filename>grub.cfg</filename>),并为内核添加一个新<literal>设置</literal>行。"
-"</phrase><phrase arch=\"hurd-any\">(如: <filename>grub.cfg</filename>),并在 "
+"后面添加参数。</phrase><phrase arch=\"kfreebsd-any\">(如: <filename>grub."
+"cfg</filename>),并为内核添加一个新<literal>设置</literal>行。</"
+"phrase><phrase arch=\"hurd-any\">(如: <filename>grub.cfg</filename>),并在 "
"<filename>gnumach.gz</filename> 行后添加参数。</phrase>"
#. Tag: para
@@ -1172,14 +1172,22 @@ msgstr ""
"的一些例子(像键盘选择和 bootloader 安装)可能不恰当,需要用适合您架构的 "
"debconf 设置替换。"
+#. Tag: para
+#: preseed.xml:689
+#, no-c-format
+msgid ""
+"Details on how the different Debian Installer components actually work can "
+"be found in <xref linkend=\"module-details\"/>."
+msgstr ""
+
#. Tag: title
-#: preseed.xml:692
+#: preseed.xml:697
#, no-c-format
msgid "Localization"
msgstr "本地化"
#. Tag: para
-#: preseed.xml:693
+#: preseed.xml:698
#, no-c-format
msgid ""
"Setting localization values will only work if you are using initrd "
@@ -1189,7 +1197,7 @@ msgstr ""
"设置本地信息只适用于使用 initrd 预置。其他方式下这些问题是在询问之后加载的。"
#. Tag: para
-#: preseed.xml:699
+#: preseed.xml:704
#, no-c-format
msgid ""
"The locale can be used to specify both language and country and can be any "
@@ -1205,7 +1213,7 @@ msgstr ""
"userinput>。"
#. Tag: para
-#: preseed.xml:708
+#: preseed.xml:713
#, no-c-format
msgid ""
"Although this method is very easy to use, it does not allow preseeding of "
@@ -1224,7 +1232,7 @@ msgstr ""
"因此另一种方法是单独预置各值。语言和国家可以在引导参数里面指定。"
#. Tag: screen
-#: preseed.xml:723
+#: preseed.xml:728
#, no-c-format
msgid ""
"# Preseeding only locale sets language, country and locale.\n"
@@ -1248,7 +1256,7 @@ msgstr ""
"#d-i localechooser/supported-locales en_US.UTF-8, nl_NL.UTF-8"
#. Tag: para
-#: preseed.xml:725
+#: preseed.xml:730
#, no-c-format
msgid ""
"Keyboard configuration consists of selecting a keyboard architecture and a "
@@ -1260,7 +1268,7 @@ msgstr ""
"因此通常不必预置。keymap 必须对 &d-i; 所选择的键盘体系有效。"
#. Tag: screen
-#: preseed.xml:732
+#: preseed.xml:737
#, no-c-format
msgid ""
"# Keyboard selection.\n"
@@ -1276,7 +1284,7 @@ msgstr ""
"#d-i console-keymaps-usb/keymap select mac-usb-us"
#. Tag: para
-#: preseed.xml:734
+#: preseed.xml:739
#, no-c-format
msgid ""
"To skip keyboard configuration, preseed <classname>console-tools/archs</"
@@ -1287,7 +1295,7 @@ msgstr ""
"tools/archs</classname>。这将导致内核 keymap 保持活动。"
#. Tag: para
-#: preseed.xml:743
+#: preseed.xml:748
#, no-c-format
msgid ""
"The changes in the input layer for 2.6 kernels have made the keyboard "
@@ -1298,13 +1306,13 @@ msgstr ""
"<quote>PC</quote> (<userinput>at</userinput>) keymap。"
#. Tag: title
-#: preseed.xml:753
+#: preseed.xml:758
#, no-c-format
msgid "Network configuration"
msgstr "网络设置"
#. Tag: para
-#: preseed.xml:754
+#: preseed.xml:759
#, no-c-format
msgid ""
"Of course, preseeding the network configuration won't work if you're loading "
@@ -1317,7 +1325,7 @@ msgstr ""
"助。如果您计划从网络加载预置文件,应该使用传递网络设置给内核引导参数的方式。"
#. Tag: para
-#: preseed.xml:762
+#: preseed.xml:767
#, no-c-format
msgid ""
"If you need to pick a particular interface when netbooting before loading a "
@@ -1328,7 +1336,7 @@ msgstr ""
"<userinput>interface=<replaceable>eth1</replaceable></userinput>。"
#. Tag: para
-#: preseed.xml:768
+#: preseed.xml:773
#, no-c-format
msgid ""
"Although preseeding the network configuration is normally not possible when "
@@ -1344,19 +1352,19 @@ msgstr ""
"再运行一次,这需要将下面的命令包含在 <quote>preseed/run</quote> 脚本里面:"
#. Tag: screen
-#: preseed.xml:778
+#: preseed.xml:783
#, no-c-format
msgid "killall.sh; netcfg"
msgstr "killall.sh; netcfg"
#. Tag: para
-#: preseed.xml:780
+#: preseed.xml:785
#, no-c-format
msgid "The following debconf variables are relevant for network configuration."
msgstr "下面的 debconf 变量与网络配置相关。"
#. Tag: screen
-#: preseed.xml:786
+#: preseed.xml:791
#, no-c-format
msgid ""
"# Disable network configuration entirely. This is useful for cdrom\n"
@@ -1458,7 +1466,7 @@ msgstr ""
"#d-i hw-detect/load_firmware boolean true"
#. Tag: para
-#: preseed.xml:788
+#: preseed.xml:793
#, no-c-format
msgid ""
"Please note that <command>netcfg</command> will automatically determine the "
@@ -1477,13 +1485,13 @@ msgstr ""
"quote> 确定不使用网关。"
#. Tag: title
-#: preseed.xml:804
+#: preseed.xml:809
#, no-c-format
msgid "Network console"
msgstr "网络控制台"
#. Tag: screen
-#: preseed.xml:806
+#: preseed.xml:811
#, no-c-format
msgid ""
"# Use the following settings if you wish to make use of the network-console\n"
@@ -1501,13 +1509,13 @@ msgstr ""
"#d-i network-console/password-again password r00tme"
#. Tag: title
-#: preseed.xml:811
+#: preseed.xml:816
#, no-c-format
msgid "Mirror settings"
msgstr "镜像设置"
#. Tag: para
-#: preseed.xml:812
+#: preseed.xml:817
#, no-c-format
msgid ""
"Depending on the installation method you use, a mirror may be used to "
@@ -1519,7 +1527,7 @@ msgstr ""
"安装的系统建立 <filename>/etc/apt/sources.list</filename>。"
#. Tag: para
-#: preseed.xml:819
+#: preseed.xml:824
#, no-c-format
msgid ""
"The parameter <classname>mirror/suite</classname> determines the suite for "
@@ -1528,7 +1536,7 @@ msgstr ""
"参数 <classname>mirror/suite</classname> 决定了安装好的系统使用的套件。"
#. Tag: para
-#: preseed.xml:824
+#: preseed.xml:829
#, no-c-format
msgid ""
"The parameter <classname>mirror/udeb/suite</classname> determines the suite "
@@ -1543,7 +1551,7 @@ msgstr ""
"常安装程序会自动安装并使用正确的值而毋需手动设置。"
#. Tag: screen
-#: preseed.xml:835
+#: preseed.xml:840
#, no-c-format
msgid ""
"# If you select ftp, the mirror/country string does not need to be set.\n"
@@ -1571,13 +1579,131 @@ msgstr ""
"#d-i mirror/udeb/suite string testing"
#. Tag: title
-#: preseed.xml:840
+#: preseed.xml:845
+#, no-c-format
+msgid "Account setup"
+msgstr "帐号设置"
+
+#. Tag: para
+#: preseed.xml:846
+#, no-c-format
+msgid ""
+"The password for the root account and name and password for a first regular "
+"user's account can be preseeded. For the passwords you can use either clear "
+"text values or MD5 <emphasis>hashes</emphasis>."
+msgstr ""
+"root 帐号的密码和第一个普通用户的名字和密码都可以预置。您可以给密码使用纯文本"
+"或 MD5 <emphasis>哈希</emphasis> 值。"
+
+#. Tag: para
+#: preseed.xml:853
+#, no-c-format
+msgid ""
+"Be aware that preseeding passwords is not completely secure as everyone with "
+"access to the preconfiguration file will have the knowledge of these "
+"passwords. Using MD5 hashes is considered slightly better in terms of "
+"security but it might also give a false sense of security as access to a MD5 "
+"hash allows for brute force attacks."
+msgstr ""
+"要知道预置密码并不安全,每个可以访问预置文件的用户都可以看到这些密码。使用 "
+"MD5 哈希值相对安全一些,但也会造成安全的假象,MD5 哈希值也可以被暴力破解。"
+
+#. Tag: screen
+#: preseed.xml:863
+#, no-c-format
+msgid ""
+"# Skip creation of a root account (normal user account will be able to\n"
+"# use sudo).\n"
+"#d-i passwd/root-login boolean false\n"
+"# Alternatively, to skip creation of a normal user account.\n"
+"#d-i passwd/make-user boolean false\n"
+"\n"
+"# Root password, either in clear text\n"
+"#d-i passwd/root-password password r00tme\n"
+"#d-i passwd/root-password-again password r00tme\n"
+"# or encrypted using an MD5 hash.\n"
+"#d-i passwd/root-password-crypted password [MD5 hash]\n"
+"\n"
+"# To create a normal user account.\n"
+"#d-i passwd/user-fullname string Debian User\n"
+"#d-i passwd/username string debian\n"
+"# Normal user's password, either in clear text\n"
+"#d-i passwd/user-password password insecure\n"
+"#d-i passwd/user-password-again password insecure\n"
+"# or encrypted using an MD5 hash.\n"
+"#d-i passwd/user-password-crypted password [MD5 hash]\n"
+"# Create the first user with the specified UID instead of the default.\n"
+"#d-i passwd/user-uid string 1010\n"
+"\n"
+"# The user account will be added to some standard initial groups. To\n"
+"# override that, use this.\n"
+"#d-i passwd/user-default-groups string audio cdrom video"
+msgstr ""
+"# Skip creation of a root account (normal user account will be able to\n"
+"# use sudo).\n"
+"#d-i passwd/root-login boolean false\n"
+"# Alternatively, to skip creation of a normal user account.\n"
+"#d-i passwd/make-user boolean false\n"
+"\n"
+"# Root password, either in clear text\n"
+"#d-i passwd/root-password password r00tme\n"
+"#d-i passwd/root-password-again password r00tme\n"
+"# or encrypted using an MD5 hash.\n"
+"#d-i passwd/root-password-crypted password [MD5 hash]\n"
+"\n"
+"# To create a normal user account.\n"
+"#d-i passwd/user-fullname string Debian User\n"
+"#d-i passwd/username string debian\n"
+"# Normal user's password, either in clear text\n"
+"#d-i passwd/user-password password insecure\n"
+"#d-i passwd/user-password-again password insecure\n"
+"# or encrypted using an MD5 hash.\n"
+"#d-i passwd/user-password-crypted password [MD5 hash]\n"
+"# Create the first user with the specified UID instead of the default.\n"
+"#d-i passwd/user-uid string 1010\n"
+"\n"
+"# The user account will be added to some standard initial groups. To\n"
+"# override that, use this.\n"
+"#d-i passwd/user-default-groups string audio cdrom video"
+
+#. Tag: para
+#: preseed.xml:865
+#, no-c-format
+msgid ""
+"The <classname>passwd/root-password-crypted</classname> and "
+"<classname>passwd/user-password-crypted</classname> variables can also be "
+"preseeded with <quote>!</quote> as their value. In that case, the "
+"corresponding account is disabled. This may be convenient for the root "
+"account, provided of course that an alternative method is set up to allow "
+"administrative activities or root login (for instance by using SSH key "
+"authentication or <command>sudo</command>)."
+msgstr ""
+"<classname>passwd/root-password-crypted</classname> 和 <classname>passwd/"
+"user-password-crypted</classname> 值可以使用 <quote>!</quote> 作为他们的预置"
+"值。这种情况下,对应的帐号关闭。它常用于 root 帐号,用其他替代方法允许管理或 "
+"root 登录(例如使用 SSH key 认证或 sudo)。"
+
+#. Tag: para
+#: preseed.xml:875
+#, no-c-format
+msgid ""
+"The following command can be used to generate an MD5 hash for a password:"
+msgstr "下面的命令可用于生成密码的 MD5 值。"
+
+#. Tag: screen
+#: preseed.xml:879
+#, no-c-format
+msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
+msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
+
+#. Tag: title
+#: preseed.xml:885
#, no-c-format
msgid "Clock and time zone setup"
msgstr "时钟与时区设置"
#. Tag: screen
-#: preseed.xml:842
+#: preseed.xml:887
#, no-c-format
msgid ""
"# Controls whether or not the hardware clock is set to UTC.\n"
@@ -1605,13 +1731,13 @@ msgstr ""
"#d-i clock-setup/ntp-server string ntp.example.com"
#. Tag: title
-#: preseed.xml:847
+#: preseed.xml:892
#, no-c-format
msgid "Partitioning"
msgstr "分区"
#. Tag: para
-#: preseed.xml:848
+#: preseed.xml:893
#, no-c-format
msgid ""
"Using preseeding to partition the harddisk is limited to what is supported "
@@ -1625,7 +1751,7 @@ msgstr ""
"义方案,用户自定义的方案文件或预置文件包含的方案。"
#. Tag: para
-#: preseed.xml:856
+#: preseed.xml:901
#, no-c-format
msgid ""
"Preseeding of advanced partition setups using RAID, LVM and encryption is "
@@ -1636,7 +1762,7 @@ msgstr ""
"性不足。"
#. Tag: para
-#: preseed.xml:862
+#: preseed.xml:907
#, no-c-format
msgid ""
"The examples below only provide basic information on the use of recipes. For "
@@ -1655,7 +1781,7 @@ msgstr ""
"改变。"
#. Tag: para
-#: preseed.xml:876
+#: preseed.xml:921
#, no-c-format
msgid ""
"The identification of disks is dependent on the order in which their drivers "
@@ -1666,13 +1792,13 @@ msgstr ""
"确的那一个。"
#. Tag: title
-#: preseed.xml:885
+#: preseed.xml:930
#, no-c-format
msgid "Partitioning example"
msgstr "分区示例"
#. Tag: screen
-#: preseed.xml:887
+#: preseed.xml:932
#, no-c-format
msgid ""
"# If the system has free space you can choose to only partition that space.\n"
@@ -1822,42 +1948,34 @@ msgstr ""
"d-i partman/confirm_nooverwrite boolean true"
#. Tag: title
-#: preseed.xml:891
+#: preseed.xml:936
#, no-c-format
msgid "Partitioning using RAID"
msgstr "使用 RAID 分区"
#. Tag: para
-#: preseed.xml:892
+#: preseed.xml:937
#, no-c-format
-#| msgid ""
-#| "You can also use preseeding to set up partitions on software RAID arrays. "
-#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
-#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
-#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
-#| "bootloader\"/>."
msgid ""
"You can also use preseeding to set up partitions on software RAID arrays. "
"Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
"specifying spare devices."
-msgstr "您可以使用预置来建立软 RAID 阵列。支持 RAID 等级 0、1、5、6 和 10,建立降级阵列(degraded arrays)和指定额外设备。"
+msgstr ""
+"您可以使用预置来建立软 RAID 阵列。支持 RAID 等级 0、1、5、6 和 10,建立降级阵"
+"列(degraded arrays)和指定额外设备。"
#. Tag: para
-#: preseed.xml:898
+#: preseed.xml:943
#, no-c-format
-#| msgid ""
-#| "You can also use preseeding to set up partitions on software RAID arrays. "
-#| "Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and "
-#| "specifying spare devices. If you are using RAID 1, you can preseed grub "
-#| "to install to all devices used in the array; see <xref linkend=\"preseed-"
-#| "bootloader\"/>."
msgid ""
"If you are using RAID 1, you can preseed grub to install to all devices used "
"in the array; see <xref linkend=\"preseed-bootloader\"/>."
-msgstr "如果是使用 RAID 1,您可以预置 grub 安装所有的阵列中的设备; 参见 <xref linkend=\"preseed-bootloader\"/>。"
+msgstr ""
+"如果是使用 RAID 1,您可以预置 grub 安装所有的阵列中的设备; 参见 <xref "
+"linkend=\"preseed-bootloader\"/>。"
#. Tag: para
-#: preseed.xml:905
+#: preseed.xml:950
#, no-c-format
msgid ""
"This type of automated partitioning is easy to get wrong. It is also "
@@ -1871,7 +1989,7 @@ msgstr ""
"<filename>/var/log/syslog</filename>。"
#. Tag: screen
-#: preseed.xml:915
+#: preseed.xml:960
#, no-c-format
msgid ""
"# The method should be set to \"raid\".\n"
@@ -1975,13 +2093,13 @@ msgstr ""
"d-i partman/confirm_nooverwrite boolean true"
#. Tag: title
-#: preseed.xml:920
+#: preseed.xml:965
#, no-c-format
msgid "Controlling how partitions are mounted"
msgstr "分区挂载控制"
#. Tag: para
-#: preseed.xml:921
+#: preseed.xml:966
#, no-c-format
msgid ""
"Normally, filesystems are mounted using a universally unique identifier "
@@ -1997,7 +2115,7 @@ msgstr ""
"系统仍然使用 UUID 方式挂载。"
#. Tag: para
-#: preseed.xml:930
+#: preseed.xml:975
#, no-c-format
msgid ""
"Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2007,7 +2125,7 @@ msgstr ""
"挂载。"
#. Tag: para
-#: preseed.xml:937
+#: preseed.xml:982
#, no-c-format
msgid ""
"Traditional device names may change based on the order in which the kernel "
@@ -2021,7 +2139,7 @@ msgstr ""
"后会出现一些随机的情况。"
#. Tag: screen
-#: preseed.xml:947
+#: preseed.xml:992
#, no-c-format
msgid ""
"# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2039,13 +2157,13 @@ msgstr ""
"#d-i partman/mount_style select uuid"
#. Tag: title
-#: preseed.xml:953
+#: preseed.xml:998
#, no-c-format
msgid "Base system installation"
msgstr "基本系统安装"
#. Tag: para
-#: preseed.xml:954
+#: preseed.xml:999
#, no-c-format
msgid ""
"There is actually not very much that can be preseeded for this stage of the "
@@ -2054,7 +2172,7 @@ msgid ""
msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内核安装相关的问题。"
#. Tag: screen
-#: preseed.xml:961
+#: preseed.xml:1006
#, no-c-format
msgid ""
"# Configure APT to not install recommended packages by default. Use of this\n"
@@ -2064,7 +2182,8 @@ msgid ""
"\n"
"# Select the initramfs generator used to generate the initrd for 2.6 "
"kernels.\n"
-"#d-i base-installer/kernel/linux/initramfs-generators string initramfs-tools\n"
+"#d-i base-installer/kernel/linux/initramfs-generators string initramfs-"
+"tools\n"
"\n"
"# The kernel image (meta) package to be installed; \"none\" can be used if "
"no\n"
@@ -2078,7 +2197,8 @@ msgstr ""
"\n"
"# Select the initramfs generator used to generate the initrd for 2.6 "
"kernels.\n"
-"#d-i base-installer/kernel/linux/initramfs-generators string initramfs-tools\n"
+"#d-i base-installer/kernel/linux/initramfs-generators string initramfs-"
+"tools\n"
"\n"
"# The kernel image (meta) package to be installed; \"none\" can be used if "
"no\n"
@@ -2086,131 +2206,13 @@ msgstr ""
"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486"
#. Tag: title
-#: preseed.xml:966
-#, no-c-format
-msgid "Account setup"
-msgstr "帐号设置"
-
-#. Tag: para
-#: preseed.xml:967
-#, no-c-format
-msgid ""
-"The password for the root account and name and password for a first regular "
-"user's account can be preseeded. For the passwords you can use either clear "
-"text values or MD5 <emphasis>hashes</emphasis>."
-msgstr ""
-"root 帐号的密码和第一个普通用户的名字和密码都可以预置。您可以给密码使用纯文本"
-"或 MD5 <emphasis>哈希</emphasis> 值。"
-
-#. Tag: para
-#: preseed.xml:974
-#, no-c-format
-msgid ""
-"Be aware that preseeding passwords is not completely secure as everyone with "
-"access to the preconfiguration file will have the knowledge of these "
-"passwords. Using MD5 hashes is considered slightly better in terms of "
-"security but it might also give a false sense of security as access to a MD5 "
-"hash allows for brute force attacks."
-msgstr ""
-"要知道预置密码并不安全,每个可以访问预置文件的用户都可以看到这些密码。使用 "
-"MD5 哈希值相对安全一些,但也会造成安全的假象,MD5 哈希值也可以被暴力破解。"
-
-#. Tag: screen
-#: preseed.xml:984
-#, no-c-format
-msgid ""
-"# Skip creation of a root account (normal user account will be able to\n"
-"# use sudo).\n"
-"#d-i passwd/root-login boolean false\n"
-"# Alternatively, to skip creation of a normal user account.\n"
-"#d-i passwd/make-user boolean false\n"
-"\n"
-"# Root password, either in clear text\n"
-"#d-i passwd/root-password password r00tme\n"
-"#d-i passwd/root-password-again password r00tme\n"
-"# or encrypted using an MD5 hash.\n"
-"#d-i passwd/root-password-crypted password [MD5 hash]\n"
-"\n"
-"# To create a normal user account.\n"
-"#d-i passwd/user-fullname string Debian User\n"
-"#d-i passwd/username string debian\n"
-"# Normal user's password, either in clear text\n"
-"#d-i passwd/user-password password insecure\n"
-"#d-i passwd/user-password-again password insecure\n"
-"# or encrypted using an MD5 hash.\n"
-"#d-i passwd/user-password-crypted password [MD5 hash]\n"
-"# Create the first user with the specified UID instead of the default.\n"
-"#d-i passwd/user-uid string 1010\n"
-"\n"
-"# The user account will be added to some standard initial groups. To\n"
-"# override that, use this.\n"
-"#d-i passwd/user-default-groups string audio cdrom video"
-msgstr ""
-"# Skip creation of a root account (normal user account will be able to\n"
-"# use sudo).\n"
-"#d-i passwd/root-login boolean false\n"
-"# Alternatively, to skip creation of a normal user account.\n"
-"#d-i passwd/make-user boolean false\n"
-"\n"
-"# Root password, either in clear text\n"
-"#d-i passwd/root-password password r00tme\n"
-"#d-i passwd/root-password-again password r00tme\n"
-"# or encrypted using an MD5 hash.\n"
-"#d-i passwd/root-password-crypted password [MD5 hash]\n"
-"\n"
-"# To create a normal user account.\n"
-"#d-i passwd/user-fullname string Debian User\n"
-"#d-i passwd/username string debian\n"
-"# Normal user's password, either in clear text\n"
-"#d-i passwd/user-password password insecure\n"
-"#d-i passwd/user-password-again password insecure\n"
-"# or encrypted using an MD5 hash.\n"
-"#d-i passwd/user-password-crypted password [MD5 hash]\n"
-"# Create the first user with the specified UID instead of the default.\n"
-"#d-i passwd/user-uid string 1010\n"
-"\n"
-"# The user account will be added to some standard initial groups. To\n"
-"# override that, use this.\n"
-"#d-i passwd/user-default-groups string audio cdrom video"
-
-#. Tag: para
-#: preseed.xml:986
-#, no-c-format
-msgid ""
-"The <classname>passwd/root-password-crypted</classname> and "
-"<classname>passwd/user-password-crypted</classname> variables can also be "
-"preseeded with <quote>!</quote> as their value. In that case, the "
-"corresponding account is disabled. This may be convenient for the root "
-"account, provided of course that an alternative method is set up to allow "
-"administrative activities or root login (for instance by using SSH key "
-"authentication or <command>sudo</command>)."
-msgstr ""
-"<classname>passwd/root-password-crypted</classname> 和 <classname>passwd/"
-"user-password-crypted</classname> 值可以使用 <quote>!</quote> 作为他们的预置"
-"值。这种情况下,对应的帐号关闭。它常用于 root 帐号,用其他替代方法允许管理或 "
-"root 登录(例如使用 SSH key 认证或 sudo)。"
-
-#. Tag: para
-#: preseed.xml:996
-#, no-c-format
-msgid ""
-"The following command can be used to generate an MD5 hash for a password:"
-msgstr "下面的命令可用于生成密码的 MD5 值。"
-
-#. Tag: screen
-#: preseed.xml:1000
-#, no-c-format
-msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
-msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
-
-#. Tag: title
-#: preseed.xml:1006
+#: preseed.xml:1011
#, no-c-format
msgid "Apt setup"
msgstr "设置 apt"
#. Tag: para
-#: preseed.xml:1007
+#: preseed.xml:1012
#, no-c-format
msgid ""
"Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2223,7 +2225,7 @@ msgstr ""
"仓库。"
#. Tag: screen
-#: preseed.xml:1015
+#: preseed.xml:1020
#, no-c-format
msgid ""
"# You can choose to install non-free and contrib software.\n"
@@ -2281,13 +2283,13 @@ msgstr ""
"#d-i debian-installer/allow_unauthenticated boolean true"
#. Tag: title
-#: preseed.xml:1020
+#: preseed.xml:1025
#, no-c-format
msgid "Package selection"
msgstr "选择软件包"
#. Tag: para
-#: preseed.xml:1021
+#: preseed.xml:1026
#, no-c-format
msgid ""
"You can choose to install any combination of tasks that are available. "
@@ -2295,73 +2297,73 @@ msgid ""
msgstr "您可以选择安装存在的任务的组合。本文编撰时已有的任务包括:"
#. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1035
#, no-c-format
msgid "standard"
msgstr "standard"
#. Tag: userinput
-#: preseed.xml:1033
+#: preseed.xml:1038
#, no-c-format
msgid "desktop"
msgstr "desktop"
#. Tag: userinput
-#: preseed.xml:1036
+#: preseed.xml:1041
#, no-c-format
msgid "gnome-desktop"
msgstr "gnome-desktop"
#. Tag: userinput
-#: preseed.xml:1039
+#: preseed.xml:1044
#, no-c-format
msgid "kde-desktop"
msgstr "kde-desktop"
#. Tag: userinput
-#: preseed.xml:1042
+#: preseed.xml:1047
#, no-c-format
msgid "web-server"
msgstr "web-server"
#. Tag: userinput
-#: preseed.xml:1045
+#: preseed.xml:1050
#, no-c-format
msgid "print-server"
msgstr "print-server"
#. Tag: userinput
-#: preseed.xml:1048
+#: preseed.xml:1053
#, no-c-format
msgid "dns-server"
msgstr "dns-server"
#. Tag: userinput
-#: preseed.xml:1051
+#: preseed.xml:1056
#, no-c-format
msgid "file-server"
msgstr "file-server"
#. Tag: userinput
-#: preseed.xml:1054
+#: preseed.xml:1059
#, no-c-format
msgid "mail-server"
msgstr "mail-server"
#. Tag: userinput
-#: preseed.xml:1057
+#: preseed.xml:1062
#, no-c-format
msgid "sql-database"
msgstr "sql-database"
#. Tag: userinput
-#: preseed.xml:1060
+#: preseed.xml:1065
#, no-c-format
msgid "laptop"
msgstr "laptop"
#. Tag: para
-#: preseed.xml:1064
+#: preseed.xml:1069
#, no-c-format
msgid ""
"You can also choose to install no tasks, and force the installation of a set "
@@ -2372,7 +2374,7 @@ msgstr ""
"<userinput>standard</userinput> 任务。"
#. Tag: para
-#: preseed.xml:1070
+#: preseed.xml:1075
#, no-c-format
msgid ""
"If you want to install some individual packages in addition to packages "
@@ -2386,7 +2388,7 @@ msgstr ""
"命令行上使用。"
#. Tag: screen
-#: preseed.xml:1080
+#: preseed.xml:1085
#, no-c-format
msgid ""
"#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2424,62 +2426,14 @@ msgstr ""
"#popularity-contest popularity-contest/participate boolean false"
#. Tag: title
-#: preseed.xml:1085
+#: preseed.xml:1090
#, no-c-format
msgid "Boot loader installation"
msgstr "安装 bootloader"
#. Tag: screen
-#: preseed.xml:1087
-#, no-c-format
-#| msgid ""
-#| "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). "
-#| "If you want lilo installed\n"
-#| "# instead, uncomment this:\n"
-#| "#d-i grub-installer/skip boolean true\n"
-#| "# To also skip installing lilo, and install no bootloader, uncomment "
-#| "this\n"
-#| "# too:\n"
-#| "#d-i lilo-installer/skip boolean true</phrase>\n"
-#| "<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, "
-#| "uncomment this\n"
-#| "#d-i grub-installer/skip boolean true</phrase>\n"
-#| "\n"
-#| "# With a few exceptions for unusual partitioning setups, GRUB 2 is now "
-#| "the\n"
-#| "# default. If you need GRUB Legacy for some particular reason, then\n"
-#| "# uncomment this:\n"
-#| "#d-i grub-installer/grub2_instead_of_grub_legacy boolean false\n"
-#| "\n"
-#| "# This is fairly safe to set, it makes grub install automatically to the "
-#| "MBR\n"
-#| "# if no other operating system is detected on the machine.\n"
-#| "d-i grub-installer/only_debian boolean true\n"
-#| "\n"
-#| "# This one makes grub-installer install to the MBR if it also finds some "
-#| "other\n"
-#| "# OS, which is less safe as it might not be able to boot that other OS.\n"
-#| "d-i grub-installer/with_other_os boolean true\n"
-#| "\n"
-#| "# Alternatively, if you want to install to a location other than the "
-#| "mbr,\n"
-#| "# uncomment and edit these lines:\n"
-#| "#d-i grub-installer/only_debian boolean false\n"
-#| "#d-i grub-installer/with_other_os boolean false\n"
-#| "#d-i grub-installer/bootdev string (hd0,0)\n"
-#| "# To install grub to multiple disks:\n"
-#| "#d-i grub-installer/bootdev string (hd0,0) (hd1,0) (hd2,0)\n"
-#| "\n"
-#| "# Optional password for grub, either in clear text\n"
-#| "#d-i grub-installer/password password r00tme\n"
-#| "#d-i grub-installer/password-again password r00tme\n"
-#| "# or encrypted using an MD5 hash, see grub-md5-crypt(8).\n"
-#| "#d-i grub-installer/password-crypted password [MD5 hash]\n"
-#| "\n"
-#| "# Use the following option to add additional boot parameters for the\n"
-#| "# installed system (if supported by the bootloader installer).\n"
-#| "# Note: options passed to the installer will be added automatically.\n"
-#| "#d-i debian-installer/add-kernel-opts string nousb"
+#: preseed.xml:1092
+#, no-c-format
msgid ""
"<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If "
"you want lilo installed\n"
@@ -2528,13 +2482,15 @@ msgid ""
"# Note: options passed to the installer will be added automatically.\n"
"#d-i debian-installer/add-kernel-opts string nousb"
msgstr ""
-"<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If you want lilo installed\n"
+"<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If "
+"you want lilo installed\n"
"# instead, uncomment this:\n"
"#d-i grub-installer/skip boolean true\n"
"# To also skip installing lilo, and install no bootloader, uncomment this\n"
"# too:\n"
"#d-i lilo-installer/skip boolean true</phrase>\n"
-"<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, uncomment this\n"
+"<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, uncomment "
+"this\n"
"#d-i grub-installer/skip boolean true</phrase>\n"
"\n"
"# With a few exceptions for unusual partitioning setups, GRUB 2 is now the\n"
@@ -2542,11 +2498,13 @@ msgstr ""
"# uncomment this:\n"
"#d-i grub-installer/grub2_instead_of_grub_legacy boolean false\n"
"\n"
-"# This is fairly safe to set, it makes grub install automatically to the MBR\n"
+"# This is fairly safe to set, it makes grub install automatically to the "
+"MBR\n"
"# if no other operating system is detected on the machine.\n"
"d-i grub-installer/only_debian boolean true\n"
"\n"
-"# This one makes grub-installer install to the MBR if it also finds some other\n"
+"# This one makes grub-installer install to the MBR if it also finds some "
+"other\n"
"# OS, which is less safe as it might not be able to boot that other OS.\n"
"d-i grub-installer/with_other_os boolean true\n"
"\n"
@@ -2572,7 +2530,7 @@ msgstr ""
"#d-i debian-installer/add-kernel-opts string nousb"
#. Tag: para
-#: preseed.xml:1089
+#: preseed.xml:1094
#, no-c-format
msgid ""
"An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2584,13 +2542,13 @@ msgstr ""
"令。"
#. Tag: title
-#: preseed.xml:1099
+#: preseed.xml:1104
#, no-c-format
msgid "Finishing up the installation"
msgstr "完成安装"
#. Tag: screen
-#: preseed.xml:1101
+#: preseed.xml:1106
#, no-c-format
msgid ""
"# During installations from serial console, the regular virtual consoles\n"
@@ -2630,13 +2588,13 @@ msgstr ""
"#d-i debian-installer/exit/poweroff boolean true"
#. Tag: title
-#: preseed.xml:1106
+#: preseed.xml:1111
#, no-c-format
msgid "Preseeding other packages"
msgstr "预置其他的软件包"
#. Tag: screen
-#: preseed.xml:1108
+#: preseed.xml:1113
#, no-c-format
msgid ""
"# Depending on what software you choose to install, or if things go wrong\n"
@@ -2656,19 +2614,19 @@ msgstr ""
"# debconf-get-selections >> file"
#. Tag: title
-#: preseed.xml:1115
+#: preseed.xml:1120
#, no-c-format
msgid "Advanced options"
msgstr "高级选项"
#. Tag: title
-#: preseed.xml:1118
+#: preseed.xml:1123
#, no-c-format
msgid "Running custom commands during the installation"
msgstr "安装过程中运行用户命令"
#. Tag: para
-#: preseed.xml:1119
+#: preseed.xml:1124
#, no-c-format
msgid ""
"A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2678,7 +2636,7 @@ msgstr ""
"本。"
#. Tag: screen
-#: preseed.xml:1127
+#: preseed.xml:1132
#, no-c-format
msgid ""
"# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2726,13 +2684,13 @@ msgstr ""
"#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
#. Tag: title
-#: preseed.xml:1132
+#: preseed.xml:1137
#, no-c-format
msgid "Using preseeding to change default values"
msgstr "使用预置修改默认值"
#. Tag: para
-#: preseed.xml:1133
+#: preseed.xml:1138
#, no-c-format
msgid ""
"It is possible to use preseeding to change the default answer for a "
@@ -2756,7 +2714,7 @@ msgstr ""
"这对于测试和调试您的预置文件很有帮助。"
#. Tag: para
-#: preseed.xml:1147
+#: preseed.xml:1152
#, no-c-format
msgid ""
"Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2769,7 +2727,7 @@ msgstr ""
"\"preseed-bootparms\"/> 的脚注。"
#. Tag: para
-#: preseed.xml:1154
+#: preseed.xml:1159
#, no-c-format
msgid ""
"If you are preseeding using boot parameters, you can make the installer ask "
@@ -2790,13 +2748,13 @@ msgstr ""
"在安装时显示出来的问题对应的参数,而不是<quote>内部的</quote>参数。"
#. Tag: title
-#: preseed.xml:1168
+#: preseed.xml:1173
#, no-c-format
msgid "Chainloading preconfiguration files"
msgstr "预置文件链"
#. Tag: para
-#: preseed.xml:1169
+#: preseed.xml:1174
#, no-c-format
msgid ""
"It is possible to include other preconfiguration files from a "
@@ -2810,7 +2768,7 @@ msgstr ""
"外的文件里面。"
#. Tag: screen
-#: preseed.xml:1179
+#: preseed.xml:1184
#, no-c-format
msgid ""
"# More than one file can be listed, separated by spaces; all will be\n"
@@ -2860,7 +2818,7 @@ msgstr ""
"#d-i preseed/run string foo.sh"
#. Tag: para
-#: preseed.xml:1181
+#: preseed.xml:1186
#, no-c-format
msgid ""
"It is also possible to chainload from the initrd or file preseeding phase, "
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 8a1d96559..041c78b4b 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-29 05:56+0000\n"
+"POT-Creation-Date: 2010-12-29 12:07+0000\n"
"PO-Revision-Date: 2010-11-04 18:18+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -429,9 +429,9 @@ msgid ""
"disk space. A minimal base installation, without the <quote>Standard system</"
"quote> task selected, will take &base-system-size;MB."
msgstr ""
-"对于 amd64 架构,基本安装默认使用 2.6 内核,包含了所有的标准软件包,需要 &std-"
-"system-size;MB 磁盘空间。最小化的基本安装,没有选择 <quote>Standard system</"
-"quote> 任务,需要 &base-system-size;MB。"
+"对于 amd64 架构,基本安装默认使用 2.6 内核,包含了所有的标准软件包,需要 "
+"&std-system-size;MB 磁盘空间。最小化的基本安装,没有选择 <quote>Standard "
+"system</quote> 任务,需要 &base-system-size;MB。"
#. Tag: para
#: random-bits.xml:207
@@ -803,28 +803,24 @@ msgstr "&task-sql-tot;"
#. Tag: entry
#: random-bits.xml:341
#, no-c-format
-#| msgid "DNS server"
msgid "SSH server"
msgstr "SSH 服务器"
#. Tag: entry
#: random-bits.xml:342
#, no-c-format
-#| msgid "&task-sql-inst;"
msgid "&task-ssh-inst;"
msgstr "&task-ssh-inst;"
#. Tag: entry
#: random-bits.xml:343
#, no-c-format
-#| msgid "&task-sql-dl;"
msgid "&task-ssh-dl;"
msgstr "&task-ssh-dl;"
#. Tag: entry
#: random-bits.xml:344
#, no-c-format
-#| msgid "&task-sql-tot;"
msgid "&task-ssh-tot;"
msgstr "&task-ssh-tot;"
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 0dc4c8332..4b434fbd7 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-10-29 05:56+0000\n"
+"POT-Creation-Date: 2011-01-08 16:52+0000\n"
"PO-Revision-Date: 2010-11-04 18:24+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1280,16 +1280,13 @@ msgstr "设置用户和密码"
#. Tag: para
#: using-d-i.xml:902
#, no-c-format
-#| msgid ""
-#| "After the base system has been installed, the installer will allow you to "
-#| "set up the <quote>root</quote> account and/or an account for the first "
-#| "user. Other user accounts can be created after the installation has been "
-#| "completed."
msgid ""
"Just before configuring the clock, the installer will allow you to set up "
"the <quote>root</quote> account and/or an account for the first user. Other "
"user accounts can be created after the installation has been completed."
-msgstr "在设置时钟之前,安装程序允许您创建 <quote>root</quote> 帐号和/或第一个用户帐号。其他的用户帐号可以在安装完成之后创建。"
+msgstr ""
+"在设置时钟之前,安装程序允许您创建 <quote>root</quote> 帐号和/或第一个用户帐"
+"号。其他的用户帐号可以在安装完成之后创建。"
#. Tag: title
#: using-d-i.xml:916
@@ -1569,11 +1566,16 @@ msgstr "支持下列的文件系统。"
#. Tag: para
#: using-d-i.xml:1093
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
+#| "<emphasis>ext2</emphasis>, <emphasis>ext3</emphasis>, <emphasis>ext4</"
+#| "emphasis>"
msgid ""
"<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
-"<emphasis>ext2</emphasis>, <emphasis>ext3</emphasis>, <emphasis>ext4</"
-"emphasis>"
+"<emphasis>ext2</emphasis>, <phrase arch=\"linux-any\"><emphasis>ext3</"
+"emphasis>,</phrase> <phrase arch=\"linux-any\"><emphasis>ext4</emphasis></"
+"phrase>"
msgstr ""
"<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
"<emphasis>ext2</emphasis>, <emphasis>ext3</emphasis>, <emphasis>ext4</"
@@ -1596,21 +1598,82 @@ msgstr ""
msgid "<emphasis>jfs</emphasis> (not available on all architectures)"
msgstr "<emphasis>jfs</emphasis> (并不是所有架构都支持)"
+#. Tag: emphasis
+#: using-d-i.xml:1107
+#, fuzzy, no-c-format
+#| msgid "<emphasis>NTFS</emphasis> (read-only)"
+msgid "<emphasis>ufs</emphasis>"
+msgstr "<emphasis>NTFS</emphasis> (只读)"
+
+#. Tag: para
+#: using-d-i.xml:1108
+#, no-c-format
+msgid "The default file system is UFS."
+msgstr ""
+
#. Tag: para
-#: using-d-i.xml:1106
+#: using-d-i.xml:1111
#, no-c-format
msgid "<emphasis>xfs</emphasis> (not available on all architectures)"
msgstr "<emphasis>xfs</emphasis> (并不是所有架构都支持)"
+#. Tag: emphasis
+#: using-d-i.xml:1115
+#, fuzzy, no-c-format
+#| msgid "<emphasis>NTFS</emphasis> (read-only)"
+msgid "<emphasis>zfs</emphasis>"
+msgstr "<emphasis>NTFS</emphasis> (只读)"
+
+#. Tag: para
+#: using-d-i.xml:1116
+#, no-c-format
+msgid ""
+"As ZFS support in the installer is still in development, only a basic subset "
+"of ZFS features are supported. Some of them can be enabled manually after "
+"the initial install, but there are some caveats:"
+msgstr ""
+
#. Tag: para
-#: using-d-i.xml:1109
+#: using-d-i.xml:1121
+#, no-c-format
+msgid ""
+"Each ZFS pool will host only one filesystem. After install is finished, more "
+"filesystems can be created on this pool by using the <quote>zfs create</"
+"quote> command."
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:1126
+#, no-c-format
+msgid ""
+"Each ZFS pool will be composed of exactly one partition. After install is "
+"finished, a single-device ZFS pool can be converted into a multi-device pool "
+"by using the <quote>zpool add</quote> command, or into a mirrored pool by "
+"using the <quote>zpool attach</quote> command. However, you shouldn't do "
+"this on the pool that hosts root filesystem, as it would prevent GRUB from "
+"booting your system."
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:1134
+#, no-c-format
+msgid ""
+"Compression is not currently supported. After the install is finished, "
+"compression can be enabled by setting the <quote>compression</quote> "
+"property via the <quote>zfs set</quote> command. However, if a compression "
+"algorithm other than the default (lzjb) is used on the pool that hosts your "
+"root filesystem, this may prevent GRUB from booting your system."
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:1143
#, no-c-format
msgid ""
"<emphasis>reiserfs</emphasis> (optional; not available on all architectures)"
msgstr "<emphasis>reiserfs</emphasis> (选项;并不是所有架构都支持)"
#. Tag: para
-#: using-d-i.xml:1111
+#: using-d-i.xml:1145
#, no-c-format
msgid ""
"Support for the Reiser file system is no longer available by default. When "
@@ -1623,13 +1686,13 @@ msgstr ""
"版本 3。"
#. Tag: emphasis
-#: using-d-i.xml:1118
+#: using-d-i.xml:1152
#, no-c-format
msgid "jffs2"
msgstr "jffs2"
#. Tag: para
-#: using-d-i.xml:1119
+#: using-d-i.xml:1153
#, no-c-format
msgid ""
"Used on some systems to read flash memory. It is not possible to create new "
@@ -1637,13 +1700,13 @@ msgid ""
msgstr "在一些系统上用于读取闪存。不可以创建新的 jffs2 分区。"
#. Tag: emphasis
-#: using-d-i.xml:1124
+#: using-d-i.xml:1158
#, no-c-format
msgid "qnx4"
msgstr "qnx4"
#. Tag: para
-#: using-d-i.xml:1125
+#: using-d-i.xml:1159
#, no-c-format
msgid ""
"Existing partitions will be recognized and it is possible to assign mount "
@@ -1651,19 +1714,19 @@ msgid ""
msgstr "识别已存在的分区并挂载它们。不可以创建新的 qnx4 分区。"
#. Tag: para
-#: using-d-i.xml:1129
+#: using-d-i.xml:1163
#, no-c-format
msgid "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
msgstr "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
#. Tag: para
-#: using-d-i.xml:1132
+#: using-d-i.xml:1166
#, no-c-format
msgid "<emphasis>NTFS</emphasis> (read-only)"
msgstr "<emphasis>NTFS</emphasis> (只读)"
#. Tag: para
-#: using-d-i.xml:1134
+#: using-d-i.xml:1168
#, no-c-format
msgid ""
"Existing NTFS partitions can be resized and it is possible to assign mount "
@@ -1671,13 +1734,13 @@ msgid ""
msgstr "已存在的 NTFS 分区可以调整大小,并挂载它们。不能创建新的 NTFS 分区。"
#. Tag: title
-#: using-d-i.xml:1144
+#: using-d-i.xml:1178
#, no-c-format
msgid "Guided Partitioning"
msgstr "导引式分区"
#. Tag: para
-#: using-d-i.xml:1145
+#: using-d-i.xml:1179
#, no-c-format
msgid ""
"If you choose guided partitioning, you may have three options: to create "
@@ -1693,14 +1756,14 @@ msgstr ""
"footnote>"
#. Tag: para
-#: using-d-i.xml:1160
+#: using-d-i.xml:1194
#, no-c-format
msgid ""
"The option to use (encrypted) LVM may not be available on all architectures."
msgstr "(加密) LVM 的选项并不是在所有体系下都可用。"
#. Tag: para
-#: using-d-i.xml:1165
+#: using-d-i.xml:1199
#, no-c-format
msgid ""
"When using LVM or encrypted LVM, the installer will create most partitions "
@@ -1714,7 +1777,7 @@ msgstr ""
"大分区将无法读取,对您的(私有)数据提供了额外的安全性。"
#. Tag: para
-#: using-d-i.xml:1174
+#: using-d-i.xml:1208
#, no-c-format
msgid ""
"When using encrypted LVM, the installer will also automatically erase the "
@@ -1728,7 +1791,7 @@ msgstr ""
"时间。"
#. Tag: para
-#: using-d-i.xml:1183
+#: using-d-i.xml:1217
#, no-c-format
msgid ""
"If you choose guided partitioning using LVM or encrypted LVM, some changes "
@@ -1743,36 +1806,49 @@ msgstr ""
"安装程序会在写入磁盘之前让您确认。"
#. Tag: para
-#: using-d-i.xml:1193
-#, no-c-format
-msgid ""
-"If you choose guided partitioning (either classic or using (encrypted) LVM) "
-"for a whole disk, you will first be asked to select the disk you want to "
-"use. Check that all your disks are listed and, if you have several disks, "
-"make sure you select the correct one. The order they are listed in may "
-"differ from what you are used to. The size of the disks may help to identify "
-"them."
+#: using-d-i.xml:1227
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you choose guided partitioning (either classic or using (encrypted) "
+#| "LVM) for a whole disk, you will first be asked to select the disk you "
+#| "want to use. Check that all your disks are listed and, if you have "
+#| "several disks, make sure you select the correct one. The order they are "
+#| "listed in may differ from what you are used to. The size of the disks may "
+#| "help to identify them."
+msgid ""
+"If you choose guided partitioning<phrase arch=\"linux-any\"> (either classic "
+"or using (encrypted) LVM)</phrase> for a whole disk, you will first be asked "
+"to select the disk you want to use. Check that all your disks are listed "
+"and, if you have several disks, make sure you select the correct one. The "
+"order they are listed in may differ from what you are used to. The size of "
+"the disks may help to identify them."
msgstr ""
"假如用导引式分区(经典方式或(加密)LVM)选择整个磁盘,您会首先被要求选择将要使用"
"的磁盘。检查一下您所有的磁盘都被列出,如果有多个磁盘,确认所选是您真正要使用"
"的那块。排列的次序可能与以前的不同。磁盘的尺寸将会帮助您识别它们。"
#. Tag: para
-#: using-d-i.xml:1202
-#, no-c-format
+#: using-d-i.xml:1236
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Any data on the disk you select will eventually be lost, but you will "
+#| "always be asked to confirm any changes before they are written to the "
+#| "disk. If you have selected the classic method of partitioning, you will "
+#| "be able to undo any changes right until the end; when using (encrypted) "
+#| "LVM this is not possible."
msgid ""
"Any data on the disk you select will eventually be lost, but you will always "
-"be asked to confirm any changes before they are written to the disk. If you "
-"have selected the classic method of partitioning, you will be able to undo "
-"any changes right until the end; when using (encrypted) LVM this is not "
-"possible."
+"be asked to confirm any changes before they are written to the disk. <phrase "
+"arch=\"linux-any\"> If you have selected the classic method of partitioning, "
+"you will be able to undo any changes right until the end; when using "
+"(encrypted) LVM this is not possible. </phrase>"
msgstr ""
"所选磁盘上的所有数据将会丢失,但您总会在写入磁盘前得到提示进行确认。如果选择"
"了经典分区方式,您将可以在整个过程中撤销任何修改;而使用(加密) LVM 将无法撤"
"销。"
#. Tag: para
-#: using-d-i.xml:1210
+#: using-d-i.xml:1246
#, no-c-format
msgid ""
"Next, you will be able to choose from the schemes listed in the table below. "
@@ -1788,73 +1864,73 @@ msgstr ""
"1GB 以上的空间(具体大小视所选的方式而不同),那么导引式分区将以失败告终。"
#. Tag: entry
-#: using-d-i.xml:1226
+#: using-d-i.xml:1262
#, no-c-format
msgid "Partitioning scheme"
msgstr "分区方式"
#. Tag: entry
-#: using-d-i.xml:1227
+#: using-d-i.xml:1263
#, no-c-format
msgid "Minimum space"
msgstr "所需最小空间"
#. Tag: entry
-#: using-d-i.xml:1228
+#: using-d-i.xml:1264
#, no-c-format
msgid "Created partitions"
msgstr "所新建的分区"
#. Tag: entry
-#: using-d-i.xml:1234
+#: using-d-i.xml:1270
#, no-c-format
msgid "All files in one partition"
msgstr "所有文件在同一分区"
#. Tag: entry
-#: using-d-i.xml:1235
+#: using-d-i.xml:1271
#, no-c-format
msgid "600MB"
msgstr "600MB"
#. Tag: entry
-#: using-d-i.xml:1236
+#: using-d-i.xml:1272
#, no-c-format
msgid "<filename>/</filename>, swap"
msgstr "<filename>/</filename>, swap"
#. Tag: entry
-#: using-d-i.xml:1238
+#: using-d-i.xml:1274
#, no-c-format
msgid "Separate /home partition"
msgstr "建立 /home 分区"
#. Tag: entry
-#: using-d-i.xml:1239
+#: using-d-i.xml:1275
#, no-c-format
msgid "500MB"
msgstr "500MB"
#. Tag: entry
-#: using-d-i.xml:1240
+#: using-d-i.xml:1276
#, no-c-format
msgid "<filename>/</filename>, <filename>/home</filename>, swap"
msgstr "<filename>/</filename>, <filename>/home</filename>, swap"
#. Tag: entry
-#: using-d-i.xml:1244
+#: using-d-i.xml:1280
#, no-c-format
msgid "Separate /home, /usr, /var and /tmp partitions"
msgstr "分别建立 /home、/usr、/var 和 /tmp 分区"
#. Tag: entry
-#: using-d-i.xml:1245
+#: using-d-i.xml:1281
#, no-c-format
msgid "<entry>1GB</entry>"
msgstr "<entry>1GB</entry>"
#. Tag: entry
-#: using-d-i.xml:1246
+#: using-d-i.xml:1282
#, no-c-format
msgid ""
"<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
@@ -1864,7 +1940,7 @@ msgstr ""
"filename>, <filename>/var</filename>, <filename>/tmp</filename>, swap"
#. Tag: para
-#: using-d-i.xml:1255
+#: using-d-i.xml:1291
#, no-c-format
msgid ""
"If you choose guided partitioning using (encrypted) LVM, the installer will "
@@ -1876,7 +1952,7 @@ msgstr ""
"boot</filename> 分区。其他的分区,除了交换分区,都会建在 LVM 分区之内。"
#. Tag: para
-#: using-d-i.xml:1261
+#: using-d-i.xml:1297
#, no-c-format
msgid ""
"If you choose guided partitioning for your IA-64 system, there will be an "
@@ -1889,7 +1965,7 @@ msgstr ""
"手动把某个分区作为 EFI 引导分区。"
#. Tag: para
-#: using-d-i.xml:1269
+#: using-d-i.xml:1305
#, no-c-format
msgid ""
"After selecting a scheme, the next screen will show your new partition "
@@ -1900,7 +1976,7 @@ msgstr ""
"区是否将被格式化,将以何种方式格式化,以及它们将被挂载到哪里的相关信息。"
#. Tag: para
-#: using-d-i.xml:1275
+#: using-d-i.xml:1311
#, no-c-format
msgid ""
"The list of partitions might look like this: <informalexample><screen>\n"
@@ -1948,7 +2024,7 @@ msgstr ""
"置,但使用手动方式分区的结果会有所不同。"
#. Tag: para
-#: using-d-i.xml:1288
+#: using-d-i.xml:1324
#, no-c-format
msgid ""
"This concludes the guided partitioning. If you are satisfied with the "
@@ -1966,13 +2042,13 @@ msgstr ""
"后再次运行导引式分区,或者按照下面的介绍进行手动分区。"
#. Tag: title
-#: using-d-i.xml:1302
+#: using-d-i.xml:1338
#, no-c-format
msgid "Manual Partitioning"
msgstr "手动分区"
#. Tag: para
-#: using-d-i.xml:1303
+#: using-d-i.xml:1339
#, no-c-format
msgid ""
"A similar screen to the one shown just above will be displayed if you choose "
@@ -1987,7 +2063,7 @@ msgstr ""
"面谈到。"
#. Tag: para
-#: using-d-i.xml:1311
+#: using-d-i.xml:1347
#, no-c-format
msgid ""
"If you select a pristine disk which has neither partitions nor free space on "
@@ -2000,8 +2076,27 @@ msgstr ""
"的磁盘条目下出现一个新行,上面写着 <quote>FREE SPACE</quote>。"
#. Tag: para
-#: using-d-i.xml:1319
-#, no-c-format
+#: using-d-i.xml:1355
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you select some free space, you will have the opportunity to create a "
+#| "new partition. You will have to answer a quick series of questions about "
+#| "its size, type (primary or logical), and location (beginning or end of "
+#| "the free space). After this, you will be presented with a detailed "
+#| "overview of your new partition. The main setting is <guimenuitem>Use as:</"
+#| "guimenuitem>, which determines if the partition will have a file system "
+#| "on it, or be used for swap, software RAID, LVM, an encrypted file system, "
+#| "or not be used at all. Other settings include mountpoint, mount options, "
+#| "and bootable flag; which settings are shown depends on how the partition "
+#| "is to be used. If you don't like the preselected defaults, feel free to "
+#| "change them to your liking. E.g. by selecting the option <guimenuitem>Use "
+#| "as:</guimenuitem>, you can choose a different filesystem for this "
+#| "partition, including options to use the partition for swap, software "
+#| "RAID, LVM, or not use it at all. Another nice feature is the ability to "
+#| "copy data from an existing partition onto this one. When you are "
+#| "satisfied with your new partition, select <guimenuitem>Done setting up "
+#| "the partition</guimenuitem> and you will return to <command>partman</"
+#| "command>'s main screen."
msgid ""
"If you select some free space, you will have the opportunity to create a new "
"partition. You will have to answer a quick series of questions about its "
@@ -2009,15 +2104,16 @@ msgid ""
"space). After this, you will be presented with a detailed overview of your "
"new partition. The main setting is <guimenuitem>Use as:</guimenuitem>, which "
"determines if the partition will have a file system on it, or be used for "
-"swap, software RAID, LVM, an encrypted file system, or not be used at all. "
-"Other settings include mountpoint, mount options, and bootable flag; which "
-"settings are shown depends on how the partition is to be used. If you don't "
-"like the preselected defaults, feel free to change them to your liking. E.g. "
-"by selecting the option <guimenuitem>Use as:</guimenuitem>, you can choose a "
-"different filesystem for this partition, including options to use the "
-"partition for swap, software RAID, LVM, or not use it at all. Another nice "
-"feature is the ability to copy data from an existing partition onto this "
-"one. When you are satisfied with your new partition, select "
+"swap,<phrase arch=\"linux-any\"> software RAID, LVM, an encrypted file "
+"system,</phrase> or not be used at all. Other settings include mountpoint, "
+"mount options, and bootable flag; which settings are shown depends on how "
+"the partition is to be used. If you don't like the preselected defaults, "
+"feel free to change them to your liking. E.g. by selecting the option "
+"<guimenuitem>Use as:</guimenuitem>, you can choose a different filesystem "
+"for this partition, including options to use the partition for swap,<phrase "
+"arch=\"linux-any\"> software RAID, LVM,</phrase> or not use it at all. "
+"Another nice feature is the ability to copy data from an existing partition "
+"onto this one. When you are satisfied with your new partition, select "
"<guimenuitem>Done setting up the partition</guimenuitem> and you will return "
"to <command>partman</command>'s main screen."
msgstr ""
@@ -2035,7 +2131,7 @@ msgstr ""
"动退回到 <command>partman</command> 的主界面。"
#. Tag: para
-#: using-d-i.xml:1341
+#: using-d-i.xml:1377
#, no-c-format
msgid ""
"If you decide you want to change something about your partition, simply "
@@ -2054,7 +2150,7 @@ msgstr ""
"这个菜单中,您还可以删除分区。"
#. Tag: para
-#: using-d-i.xml:1352
+#: using-d-i.xml:1388
#, no-c-format
msgid ""
"Be sure to create at least two partitions: one for the <emphasis>root</"
@@ -2069,7 +2165,7 @@ msgstr ""
"面的步骤,直到您纠正了这个错误。"
#. Tag: para
-#: using-d-i.xml:1360
+#: using-d-i.xml:1396
#, no-c-format
msgid ""
"If you forget to select and format an EFI boot partition, <command>partman</"
@@ -2080,7 +2176,7 @@ msgstr ""
"点,不让您继续操作,直到您划分出这样一个分区。"
#. Tag: para
-#: using-d-i.xml:1366
+#: using-d-i.xml:1402
#, no-c-format
msgid ""
"Capabilities of <command>partman</command> can be extended with installer "
@@ -2096,7 +2192,7 @@ msgstr ""
"filename> 或者 <filename>partman-lvm</filename>)。"
#. Tag: para
-#: using-d-i.xml:1374
+#: using-d-i.xml:1410
#, no-c-format
msgid ""
"After you are satisfied with partitioning, select <guimenuitem>Finish "
@@ -2110,13 +2206,13 @@ msgstr ""
"此分区。"
#. Tag: title
-#: using-d-i.xml:1402
+#: using-d-i.xml:1438
#, no-c-format
msgid "Configuring Multidisk Devices (Software RAID)"
msgstr "配置多磁盘设备(软 RAID)"
#. Tag: para
-#: using-d-i.xml:1403
+#: using-d-i.xml:1439
#, no-c-format
msgid ""
"If you have more than one harddrive<footnote><para> To be honest, you can "
@@ -2134,7 +2230,7 @@ msgstr ""
"<firstterm>软 RAID</firstterm>)。"
#. Tag: para
-#: using-d-i.xml:1416
+#: using-d-i.xml:1452
#, no-c-format
msgid ""
"MD is basically a bunch of partitions located on different disks and "
@@ -2147,7 +2243,7 @@ msgstr ""
"command> 格式化,分配挂载点,等等)。"
#. Tag: para
-#: using-d-i.xml:1424
+#: using-d-i.xml:1460
#, no-c-format
msgid ""
"What benefits this brings depends on the type of MD device you are creating. "
@@ -2239,101 +2335,101 @@ msgstr ""
"listitem> </varlistentry></variablelist> 总结:"
#. Tag: entry
-#: using-d-i.xml:1538
+#: using-d-i.xml:1574
#, no-c-format
msgid "Type"
msgstr "类型"
#. Tag: entry
-#: using-d-i.xml:1539
+#: using-d-i.xml:1575
#, no-c-format
msgid "Minimum Devices"
msgstr "最少设备"
#. Tag: entry
-#: using-d-i.xml:1540
+#: using-d-i.xml:1576
#, no-c-format
msgid "Spare Device"
msgstr "备用设备"
#. Tag: entry
-#: using-d-i.xml:1541
+#: using-d-i.xml:1577
#, no-c-format
msgid "Survives disk failure?"
msgstr "幸免于磁盘损坏?"
#. Tag: entry
-#: using-d-i.xml:1542
+#: using-d-i.xml:1578
#, no-c-format
msgid "Available Space"
msgstr "可用空间"
#. Tag: entry
-#: using-d-i.xml:1548
+#: using-d-i.xml:1584
#, no-c-format
msgid "RAID0"
msgstr "RAID0"
# index.docbook:1105, index.docbook:1113
#. Tag: entry
-#: using-d-i.xml:1549 using-d-i.xml:1557 using-d-i.xml:1587
+#: using-d-i.xml:1585 using-d-i.xml:1593 using-d-i.xml:1623
#, no-c-format
msgid "<entry>2</entry>"
msgstr "<entry>2</entry>"
# index.docbook:1106, index.docbook:1107
#. Tag: entry
-#: using-d-i.xml:1550 using-d-i.xml:1551
+#: using-d-i.xml:1586 using-d-i.xml:1587
#, no-c-format
msgid "<entry>no</entry>"
msgstr "<entry>否</entry>"
#. Tag: entry
-#: using-d-i.xml:1552
+#: using-d-i.xml:1588
#, no-c-format
msgid "Size of the smallest partition multiplied by number of devices in RAID"
msgstr "容量为最小分区乘以 RAID 设备数"
#. Tag: entry
-#: using-d-i.xml:1556
+#: using-d-i.xml:1592
#, no-c-format
msgid "RAID1"
msgstr "RAID1"
# index.docbook:1114, index.docbook:1122
#. Tag: entry
-#: using-d-i.xml:1558 using-d-i.xml:1566 using-d-i.xml:1577 using-d-i.xml:1588
+#: using-d-i.xml:1594 using-d-i.xml:1602 using-d-i.xml:1613 using-d-i.xml:1624
#, no-c-format
msgid "optional"
msgstr "可选"
# index.docbook:1115, index.docbook:1123
#. Tag: entry
-#: using-d-i.xml:1559 using-d-i.xml:1567 using-d-i.xml:1578 using-d-i.xml:1589
+#: using-d-i.xml:1595 using-d-i.xml:1603 using-d-i.xml:1614 using-d-i.xml:1625
#, no-c-format
msgid "<entry>yes</entry>"
msgstr "<entry>是</entry>"
#. Tag: entry
-#: using-d-i.xml:1560
+#: using-d-i.xml:1596
#, no-c-format
msgid "Size of the smallest partition in RAID"
msgstr "容量为 RAID 最小分区"
#. Tag: entry
-#: using-d-i.xml:1564
+#: using-d-i.xml:1600
#, no-c-format
msgid "RAID5"
msgstr "RAID5"
#. Tag: entry
-#: using-d-i.xml:1565
+#: using-d-i.xml:1601
#, no-c-format
msgid "<entry>3</entry>"
msgstr "<entry>3</entry>"
#. Tag: entry
-#: using-d-i.xml:1568
+#: using-d-i.xml:1604
#, no-c-format
msgid ""
"Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2341,20 +2437,20 @@ msgid ""
msgstr "容量为最小分区乘以(RAID 设备数量减一)"
#. Tag: entry
-#: using-d-i.xml:1575
+#: using-d-i.xml:1611
#, no-c-format
msgid "RAID6"
msgstr "RAID6"
# index.docbook:1105, index.docbook:1113
#. Tag: entry
-#: using-d-i.xml:1576
+#: using-d-i.xml:1612
#, no-c-format
msgid "<entry>4</entry>"
msgstr "<entry>4</entry>"
#. Tag: entry
-#: using-d-i.xml:1579
+#: using-d-i.xml:1615
#, no-c-format
msgid ""
"Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2362,13 +2458,13 @@ msgid ""
msgstr "容量为最小分区乘以(RAID 设备数量减二)"
#. Tag: entry
-#: using-d-i.xml:1586
+#: using-d-i.xml:1622
#, no-c-format
msgid "RAID10"
msgstr "RAID10"
#. Tag: entry
-#: using-d-i.xml:1590
+#: using-d-i.xml:1626
#, no-c-format
msgid ""
"Total of all partitions divided by the number of chunk copies (defaults to "
@@ -2376,7 +2472,7 @@ msgid ""
msgstr "所有的分区数除以 chunk 拷贝数(默认为二)"
#. Tag: para
-#: using-d-i.xml:1597
+#: using-d-i.xml:1633
#, no-c-format
msgid ""
"If you want to know more about Software RAID, have a look at <ulink url="
@@ -2386,7 +2482,7 @@ msgstr ""
"\">Software RAID HOWTO</ulink>。"
#. Tag: para
-#: using-d-i.xml:1602
+#: using-d-i.xml:1638
#, no-c-format
msgid ""
"To create an MD device, you need to have the desired partitions it should "
@@ -2401,7 +2497,7 @@ msgstr ""
"volume for RAID</guimenuitem> </menuchoice>。)"
#. Tag: para
-#: using-d-i.xml:1611
+#: using-d-i.xml:1647
#, no-c-format
msgid ""
"Make sure that the system can be booted with the partitioning scheme you are "
@@ -2419,7 +2515,7 @@ msgstr ""
"<filename>/</filename> 同时 RAID1 给 <filename>/boot</filename> 是一种方式。"
#. Tag: para
-#: using-d-i.xml:1623
+#: using-d-i.xml:1659
#, no-c-format
msgid ""
"Support for MD is a relatively new addition to the installer. You may "
@@ -2434,7 +2530,7 @@ msgstr ""
"验的用户,从 shell 手动地处理一些配置和安装步骤,也许会绕开这些问题。"
#. Tag: para
-#: using-d-i.xml:1632
+#: using-d-i.xml:1668
#, no-c-format
msgid ""
"Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> "
@@ -2454,7 +2550,7 @@ msgstr ""
"RAID1)。后续操作会根据您选择的 MD 类型而定。"
#. Tag: para
-#: using-d-i.xml:1645
+#: using-d-i.xml:1681
#, no-c-format
msgid ""
"RAID0 is simple &mdash; you will be issued with the list of available RAID "
@@ -2465,7 +2561,7 @@ msgstr ""
"组成 MD 的分区。"
#. Tag: para
-#: using-d-i.xml:1652
+#: using-d-i.xml:1688
#, no-c-format
msgid ""
"RAID1 is a bit more tricky. First, you will be asked to enter the number of "
@@ -2482,7 +2578,7 @@ msgstr ""
"将不会允许您继续下去,直到纠正错误。"
#. Tag: para
-#: using-d-i.xml:1664
+#: using-d-i.xml:1700
#, no-c-format
msgid ""
"RAID5 has a setup procedure similar to RAID1 with the exception that you "
@@ -2492,7 +2588,7 @@ msgstr ""
"区。"
#. Tag: para
-#: using-d-i.xml:1670
+#: using-d-i.xml:1706
#, no-c-format
msgid ""
"RAID6 also has a setup procedure similar to RAID1 except that at least "
@@ -2502,7 +2598,7 @@ msgstr ""
"区。"
#. Tag: para
-#: using-d-i.xml:1676
+#: using-d-i.xml:1712
#, no-c-format
msgid ""
"RAID10 again has a setup procedure similar to RAID1 except in expert mode. "
@@ -2520,7 +2616,7 @@ msgstr ""
"贝数。这些活动设备必须是让所有的拷贝可以分布到不同磁盘。"
#. Tag: para
-#: using-d-i.xml:1690
+#: using-d-i.xml:1726
#, no-c-format
msgid ""
"It is perfectly possible to have several types of MD at once. For example, "
@@ -2536,7 +2632,7 @@ msgstr ""
"RAID1 (相当可靠的 100 GB 分区用于 <filename>/home</filename>)。"
#. Tag: para
-#: using-d-i.xml:1699
+#: using-d-i.xml:1735
#, no-c-format
msgid ""
"After you set up MD devices to your liking, you can <guimenuitem>Finish</"
@@ -2549,13 +2645,13 @@ msgstr ""
"您的新 MD 设备,并分配挂载点这样的属性。"
#. Tag: title
-#: using-d-i.xml:1714
+#: using-d-i.xml:1750
#, no-c-format
msgid "Configuring the Logical Volume Manager (LVM)"
msgstr "配置逻辑卷管理(LVM)"
#. Tag: para
-#: using-d-i.xml:1715
+#: using-d-i.xml:1751
#, no-c-format
msgid ""
"If you are working with computers at the level of system administrator or "
@@ -2569,7 +2665,7 @@ msgstr ""
"或符号链接等方法来折腾。"
#. Tag: para
-#: using-d-i.xml:1723
+#: using-d-i.xml:1759
#, no-c-format
msgid ""
"To avoid the described situation you can use Logical Volume Manager (LVM). "
@@ -2587,7 +2683,7 @@ msgstr ""
"点在于它可以跨越多个物理磁盘。"
#. Tag: para
-#: using-d-i.xml:1733
+#: using-d-i.xml:1769
#, no-c-format
msgid ""
"Now when you realize you need more space for your old 160GB <filename>/home</"
@@ -2605,7 +2701,7 @@ msgstr ""
"阅 <ulink url=\"&url-lvm-howto;\">LVM HOWTO</ulink>。"
#. Tag: para
-#: using-d-i.xml:1744
+#: using-d-i.xml:1780
#, no-c-format
msgid ""
"LVM setup in &d-i; is quite simple and completely supported inside "
@@ -2620,7 +2716,7 @@ msgstr ""
"<guimenuitem>physical volume for LVM</guimenuitem> </menuchoice>"
#. Tag: para
-#: using-d-i.xml:1753
+#: using-d-i.xml:1789
#, no-c-format
msgid ""
"When you return to the main <command>partman</command> screen, you will see "
@@ -2637,7 +2733,7 @@ msgstr ""
"了 LVM 配置的小结。菜单项本身是与内容相关,只显示可用的操作。可能的操作有:"
#. Tag: para
-#: using-d-i.xml:1764
+#: using-d-i.xml:1800
#, no-c-format
msgid ""
"<guimenuitem>Display configuration details</guimenuitem>: shows LVM device "
@@ -2647,43 +2743,43 @@ msgstr ""
"名称和逻辑卷尺寸等"
#. Tag: guimenuitem
-#: using-d-i.xml:1769
+#: using-d-i.xml:1805
#, no-c-format
msgid "Create volume group"
msgstr "Create volume group"
#. Tag: guimenuitem
-#: using-d-i.xml:1772
+#: using-d-i.xml:1808
#, no-c-format
msgid "Create logical volume"
msgstr "Create logical volume"
#. Tag: guimenuitem
-#: using-d-i.xml:1775
+#: using-d-i.xml:1811
#, no-c-format
msgid "Delete volume group"
msgstr "Delete volume group"
#. Tag: guimenuitem
-#: using-d-i.xml:1778
+#: using-d-i.xml:1814
#, no-c-format
msgid "Delete logical volume"
msgstr "Delete logical volume"
#. Tag: guimenuitem
-#: using-d-i.xml:1781
+#: using-d-i.xml:1817
#, no-c-format
msgid "Extend volume group"
msgstr "Extend volume group"
#. Tag: guimenuitem
-#: using-d-i.xml:1784
+#: using-d-i.xml:1820
#, no-c-format
msgid "Reduce volume group"
msgstr "Reduce volume group"
#. Tag: para
-#: using-d-i.xml:1786
+#: using-d-i.xml:1822
#, no-c-format
msgid ""
"<guimenuitem>Finish</guimenuitem>: return to the main <command>partman</"
@@ -2692,7 +2788,7 @@ msgstr ""
"<guimenuitem>Finish</guimenuitem>: 返回 <command>partman</command> 主界面"
#. Tag: para
-#: using-d-i.xml:1792
+#: using-d-i.xml:1828
#, no-c-format
msgid ""
"Use the options in that menu to first create a volume group and then create "
@@ -2700,7 +2796,7 @@ msgid ""
msgstr "使用该菜单内的选项首先创建卷组,然后在里面创建逻辑卷。"
#. Tag: para
-#: using-d-i.xml:1797
+#: using-d-i.xml:1833
#, no-c-format
msgid ""
"After you return to the main <command>partman</command> screen, any created "
@@ -2711,13 +2807,13 @@ msgstr ""
"通的分区一样(您也应该这样对待它们)。"
#. Tag: title
-#: using-d-i.xml:1811
+#: using-d-i.xml:1847
#, no-c-format
msgid "Configuring Encrypted Volumes"
msgstr "配置加密卷"
#. Tag: para
-#: using-d-i.xml:1812
+#: using-d-i.xml:1848
#, no-c-format
msgid ""
"&d-i; allows you to set up encrypted partitions. Every file you write to "
@@ -2735,7 +2831,7 @@ msgstr ""
"许可以访问硬盘,但是没有正确的口令,硬盘上的数据看起来就像是随机的字符。"
#. Tag: para
-#: using-d-i.xml:1824
+#: using-d-i.xml:1860
#, no-c-format
msgid ""
"The two most important partitions to encrypt are: the home partition, where "
@@ -2758,7 +2854,7 @@ msgstr ""
"加载内核。"
#. Tag: para
-#: using-d-i.xml:1839
+#: using-d-i.xml:1875
#, no-c-format
msgid ""
"Please note that the performance of encrypted partitions will be less than "
@@ -2770,7 +2866,7 @@ msgstr ""
"密和解密。性能将与您的 CPU 速度、选择的加密算法和密钥长度紧密相关。"
#. Tag: para
-#: using-d-i.xml:1846
+#: using-d-i.xml:1882
#, no-c-format
msgid ""
"To use encryption, you have to create a new partition by selecting some free "
@@ -2788,7 +2884,7 @@ msgstr ""
"guimenu> </menuchoice> 选项。菜单将包含分区的加密选项。"
#. Tag: para
-#: using-d-i.xml:1857
+#: using-d-i.xml:1893
#, no-c-format
msgid ""
"&d-i; supports several encryption methods. The default method is "
@@ -2803,7 +2899,7 @@ msgstr ""
"使用默认的方法。"
#. Tag: para
-#: using-d-i.xml:1869
+#: using-d-i.xml:1905
#, no-c-format
msgid ""
"First, let's have a look at the options available when you select "
@@ -2816,13 +2912,13 @@ msgstr ""
"的安全考虑的选择。"
#. Tag: term
-#: using-d-i.xml:1879
+#: using-d-i.xml:1915
#, no-c-format
msgid "Encryption: <userinput>aes</userinput>"
msgstr "Encryption: <userinput>aes</userinput>"
#. Tag: para
-#: using-d-i.xml:1881
+#: using-d-i.xml:1917
#, no-c-format
msgid ""
"This option lets you select the encryption algorithm (<firstterm>cipher</"
@@ -2845,13 +2941,13 @@ msgstr ""
"纪的敏感信息。"
#. Tag: term
-#: using-d-i.xml:1899
+#: using-d-i.xml:1935
#, no-c-format
msgid "Key size: <userinput>256</userinput>"
msgstr "Key size: <userinput>256</userinput>"
#. Tag: para
-#: using-d-i.xml:1901
+#: using-d-i.xml:1937
#, no-c-format
msgid ""
"Here you can specify the length of the encryption key. With a larger key "
@@ -2863,13 +2959,13 @@ msgstr ""
"加长度自然会降低性能。cipher 决定可用的密钥长度。"
#. Tag: term
-#: using-d-i.xml:1913
+#: using-d-i.xml:1949
#, no-c-format
msgid "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
msgstr "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
#. Tag: para
-#: using-d-i.xml:1915
+#: using-d-i.xml:1951
#, no-c-format
msgid ""
"The <firstterm>Initialization Vector</firstterm> or <firstterm>IV</"
@@ -2885,7 +2981,7 @@ msgstr ""
"复模板推断信息。"
#. Tag: para
-#: using-d-i.xml:1925
+#: using-d-i.xml:1961
#, no-c-format
msgid ""
"From the provided alternatives, the default <userinput>cbc-essiv:sha256</"
@@ -2898,25 +2994,25 @@ msgstr ""
"法时,才使用其他的算法。"
#. Tag: term
-#: using-d-i.xml:1937
+#: using-d-i.xml:1973
#, no-c-format
msgid "Encryption key: <userinput>Passphrase</userinput>"
msgstr "Encryption key: <userinput>Passphrase</userinput>"
#. Tag: para
-#: using-d-i.xml:1939
+#: using-d-i.xml:1975
#, no-c-format
msgid "Here you can choose the type of the encryption key for this partition."
msgstr "这里您可以为分区选择所使用的加密密钥类型。"
#. Tag: term
-#: using-d-i.xml:1945
+#: using-d-i.xml:1981
#, no-c-format
msgid "Passphrase"
msgstr "Passphrase"
#. Tag: para
-#: using-d-i.xml:1946
+#: using-d-i.xml:1982
#, no-c-format
msgid ""
"The encryption key will be computed<footnote> <para> Using a passphrase as "
@@ -2929,13 +3025,13 @@ msgstr ""
"使用时要求输入。"
#. Tag: term
-#: using-d-i.xml:1961 using-d-i.xml:2054
+#: using-d-i.xml:1997 using-d-i.xml:2090
#, no-c-format
msgid "Random key"
msgstr "Random key"
#. Tag: para
-#: using-d-i.xml:1962
+#: using-d-i.xml:1998
#, no-c-format
msgid ""
"A new encryption key will be generated from random data each time you try to "
@@ -2950,7 +3046,7 @@ msgstr ""
"面临暴力破解,但是除非加密算法中有未知的弱点,这辈子也不会被攻破。)"
#. Tag: para
-#: using-d-i.xml:1971
+#: using-d-i.xml:2007
#, no-c-format
msgid ""
"Random keys are useful for swap partitions because you do not need to bother "
@@ -2967,13 +3063,13 @@ msgstr ""
"写入到交换分区的数据。"
#. Tag: term
-#: using-d-i.xml:1990 using-d-i.xml:2067
+#: using-d-i.xml:2026 using-d-i.xml:2103
#, no-c-format
msgid "Erase data: <userinput>yes</userinput>"
msgstr "Erase data: <userinput>yes</userinput>"
#. Tag: para
-#: using-d-i.xml:1992
+#: using-d-i.xml:2028
#, no-c-format
msgid ""
"Determines whether the content of this partition should be overwritten with "
@@ -2991,7 +3087,7 @@ msgstr ""
"备上的数据。</para></footnote>。"
#. Tag: para
-#: using-d-i.xml:2012
+#: using-d-i.xml:2048
#, no-c-format
msgid ""
"If you select <menuchoice> <guimenu>Encryption method:</guimenu> "
@@ -3003,13 +3099,13 @@ msgstr ""
"下面内容:"
#. Tag: term
-#: using-d-i.xml:2021
+#: using-d-i.xml:2057
#, no-c-format
msgid "Encryption: <userinput>AES256</userinput>"
msgstr "Encryption: <userinput>AES256</userinput>"
#. Tag: para
-#: using-d-i.xml:2023
+#: using-d-i.xml:2059
#, no-c-format
msgid ""
"For loop-AES, unlike dm-crypt, the options for cipher and key size are "
@@ -3020,25 +3116,25 @@ msgstr ""
"时选取。请查阅前面关于 cipher 和密钥长度的章节了解更多信息。"
#. Tag: term
-#: using-d-i.xml:2033
+#: using-d-i.xml:2069
#, no-c-format
msgid "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
msgstr "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
#. Tag: para
-#: using-d-i.xml:2035
+#: using-d-i.xml:2071
#, no-c-format
msgid "Here you can select the type of the encryption key for this partition."
msgstr "这里您可以为分区选择加密密钥的类型。"
#. Tag: term
-#: using-d-i.xml:2041
+#: using-d-i.xml:2077
#, no-c-format
msgid "Keyfile (GnuPG)"
msgstr "Keyfile (GnuPG)"
#. Tag: para
-#: using-d-i.xml:2042
+#: using-d-i.xml:2078
#, no-c-format
msgid ""
"The encryption key will be generated from random data during the "
@@ -3050,19 +3146,19 @@ msgstr ""
"application> 加密。要使用它,您需要输入正确的 passphrase (在以后会要求提供)。"
#. Tag: para
-#: using-d-i.xml:2055
+#: using-d-i.xml:2091
#, no-c-format
msgid "Please see the section on random keys above."
msgstr "请查阅前面有关随机密钥的章节。"
#. Tag: para
-#: using-d-i.xml:2069
+#: using-d-i.xml:2105
#, no-c-format
msgid "Please see the the section on erasing data above."
msgstr "请查阅前面有关删除数据的章节。"
#. Tag: para
-#: using-d-i.xml:2078
+#: using-d-i.xml:2114
#, no-c-format
msgid ""
"After you have selected the desired parameters for your encrypted "
@@ -3077,7 +3173,7 @@ msgstr ""
"标记分区上的数据,以及写新分区表等动作。对于大的分区,这会花一些时间。"
#. Tag: para
-#: using-d-i.xml:2088
+#: using-d-i.xml:2124
#, no-c-format
msgid ""
"Next you will be asked to enter a passphrase for partitions configured to "
@@ -3091,7 +3187,7 @@ msgstr ""
"(比如生日、爱好、宠物的名字、以及家里其他成员的名字,等等)。"
#. Tag: para
-#: using-d-i.xml:2097
+#: using-d-i.xml:2133
#, no-c-format
msgid ""
"Before you input any passphrases, you should have made sure that your "
@@ -3111,7 +3207,7 @@ msgstr ""
"所选择的键盘布局未能正确建立,而且是在为根文件系统输入 passphrase 的时候。"
#. Tag: para
-#: using-d-i.xml:2110
+#: using-d-i.xml:2146
#, no-c-format
msgid ""
"If you selected to use methods other than a passphrase to create encryption "
@@ -3130,7 +3226,7 @@ msgstr ""
"程在每个要加密的分区重复进行。"
#. Tag: para
-#: using-d-i.xml:2126
+#: using-d-i.xml:2162
#, no-c-format
msgid ""
"After returning to the main partitioning menu, you will see all encrypted "
@@ -3161,7 +3257,7 @@ msgstr ""
"您不合适,可以进行修改。"
#. Tag: para
-#: using-d-i.xml:2139
+#: using-d-i.xml:2175
#, no-c-format
msgid ""
"Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</"
@@ -3177,7 +3273,7 @@ msgstr ""
"面的 <xref linkend=\"mount-encrypted-volumes\"/> 说明。"
#. Tag: para
-#: using-d-i.xml:2149
+#: using-d-i.xml:2185
#, no-c-format
msgid ""
"Once you are satisfied with the partitioning scheme, continue with the "
@@ -3185,13 +3281,13 @@ msgid ""
msgstr "当您满意分区之后,可以继续安装过程。"
#. Tag: title
-#: using-d-i.xml:2160
+#: using-d-i.xml:2196
#, no-c-format
msgid "Installing the Base System"
msgstr "安装基本系统"
#. Tag: para
-#: using-d-i.xml:2161
+#: using-d-i.xml:2197
#, no-c-format
msgid ""
"Although this stage is the least problematic, it consumes a significant "
@@ -3203,7 +3299,7 @@ msgstr ""
"果您用较慢的计算机或网络,这要花费好一会儿时间。"
#. Tag: para
-#: using-d-i.xml:2174
+#: using-d-i.xml:2210
#, no-c-format
msgid ""
"During installation of the base system, package unpacking and setup messages "
@@ -3218,7 +3314,7 @@ msgstr ""
"Alt</keycap><keycap>F1</keycap></keycombo>。"
#. Tag: para
-#: using-d-i.xml:2183
+#: using-d-i.xml:2219
#, no-c-format
msgid ""
"The unpack/setup messages generated during this phase are also saved in "
@@ -3229,7 +3325,7 @@ msgstr ""
"<filename>/var/log/syslog</filename>。"
#. Tag: para
-#: using-d-i.xml:2189
+#: using-d-i.xml:2225
#, no-c-format
msgid ""
"As part of the installation, a &arch-kernel; kernel will be installed. At "
@@ -3242,7 +3338,7 @@ msgstr ""
"核。"
#. Tag: para
-#: using-d-i.xml:2196
+#: using-d-i.xml:2232
#, no-c-format
msgid ""
"When packages are installed using the package management system, it will by "
@@ -3257,7 +3353,7 @@ msgstr ""
"看,正常情况下应该安装这些软件。"
#. Tag: para
-#: using-d-i.xml:2206
+#: using-d-i.xml:2242
#, no-c-format
msgid ""
"For technical reasons packages installed during the installation of the base "
@@ -3269,13 +3365,13 @@ msgstr ""
"</quote>。上面提到的原则只适用于之后的安装过程。"
#. Tag: title
-#: using-d-i.xml:2218
+#: using-d-i.xml:2254
#, no-c-format
msgid "Installing Additional Software"
msgstr "安装额外的软件"
#. Tag: para
-#: using-d-i.xml:2219
+#: using-d-i.xml:2255
#, no-c-format
msgid ""
"At this point you have a usable but limited system. Most users will want to "
@@ -3288,13 +3384,13 @@ msgstr ""
"装基本系统还要花时间。"
#. Tag: title
-#: using-d-i.xml:2234
+#: using-d-i.xml:2270
#, no-c-format
msgid "Configuring apt"
msgstr "配置 apt"
#. Tag: para
-#: using-d-i.xml:2236
+#: using-d-i.xml:2272
#, no-c-format
msgid ""
"One of the tools used to install packages on a &debian-gnu; system is a "
@@ -3325,7 +3421,7 @@ msgstr ""
"软件包管理工具使用。"
#. Tag: para
-#: using-d-i.xml:2260
+#: using-d-i.xml:2296
#, no-c-format
msgid ""
"<command>apt</command> must be configured so that it knows from where to "
@@ -3338,7 +3434,7 @@ msgstr ""
"并编辑成自己喜欢的地方。"
#. Tag: para
-#: using-d-i.xml:2267
+#: using-d-i.xml:2303
#, no-c-format
msgid ""
"If you are installing at default priority, the installer will largely take "
@@ -3353,7 +3449,7 @@ msgstr ""
"序程序会自动加上安全镜像,它是 <quote>volatile</quote> 更新服务的镜像。"
#. Tag: para
-#: using-d-i.xml:2276
+#: using-d-i.xml:2312
#, no-c-format
msgid ""
"If you are installing at a lower priority (e.g. in expert mode), you will be "
@@ -3367,13 +3463,13 @@ msgstr ""
"和 <quote>non-free</quote> 软件仓库里面添加软件包。"
#. Tag: title
-#: using-d-i.xml:2287
+#: using-d-i.xml:2323
#, no-c-format
msgid "Installing from more than one CD or DVD"
msgstr "从多个 CD 或 DVD 安装"
#. Tag: para
-#: using-d-i.xml:2289
+#: using-d-i.xml:2325
#, no-c-format
msgid ""
"If you are installing from a CD or a DVD that is part of a larger set, the "
@@ -3386,7 +3482,7 @@ msgstr ""
"们里面的软件包了。"
#. Tag: para
-#: using-d-i.xml:2296
+#: using-d-i.xml:2332
#, no-c-format
msgid ""
"If you do not have any additional CDs or DVDs, that is no problem: using "
@@ -3398,7 +3494,7 @@ msgstr ""
"节说明),意味着下一步中选择的任务里面并非所有的软件包都会安装。"
#. Tag: para
-#: using-d-i.xml:2304
+#: using-d-i.xml:2340
#, no-c-format
msgid ""
"Packages are included on CDs (and DVDs) in the order of their popularity. "
@@ -3410,7 +3506,7 @@ msgstr ""
"常用的软件,而最后一张光盘里面包含的是很少有人用到的软件。"
#. Tag: para
-#: using-d-i.xml:2311
+#: using-d-i.xml:2347
#, no-c-format
msgid ""
"It also means that buying or downloading and burning a full CD set is just a "
@@ -3424,7 +3520,7 @@ msgstr ""
"DVD 的情况类似:只要一张,或者前两张 DVD 就能满足您大部分要求。"
#. Tag: para
-#: using-d-i.xml:2320
+#: using-d-i.xml:2356
#, no-c-format
msgid ""
"A good rule of thumb is that for a regular desktop installation (using the "
@@ -3437,7 +3533,7 @@ msgstr ""
"境。"
#. Tag: para
-#: using-d-i.xml:2328
+#: using-d-i.xml:2364
#, no-c-format
msgid ""
"If you do scan multiple CDs or DVDs, the installer will prompt you to "
@@ -3452,13 +3548,13 @@ msgstr ""
"照次序来可以降低出错的几率。"
#. Tag: title
-#: using-d-i.xml:2341
+#: using-d-i.xml:2377
#, no-c-format
msgid "Using a network mirror"
msgstr "使用网络镜像"
#. Tag: para
-#: using-d-i.xml:2343
+#: using-d-i.xml:2379
#, no-c-format
msgid ""
"One question that will be asked during most installs is whether or not to "
@@ -3469,7 +3565,7 @@ msgstr ""
"默认答案会很好,但还是有一些例外。"
#. Tag: para
-#: using-d-i.xml:2349
+#: using-d-i.xml:2385
#, no-c-format
msgid ""
"If you are <emphasis>not</emphasis> installing from a full CD or DVD or "
@@ -3485,7 +3581,7 @@ msgstr ""
"<literal>desktop</literal> 任务。"
#. Tag: para
-#: using-d-i.xml:2358
+#: using-d-i.xml:2394
#, no-c-format
msgid ""
"If you are installing from a single full CD or using a full CD image, using "
@@ -3502,7 +3598,7 @@ msgstr ""
"装,以后(比如,重新启动到新系统)再安装额外的软件包。"
#. Tag: para
-#: using-d-i.xml:2369
+#: using-d-i.xml:2405
#, no-c-format
msgid ""
"If you are installing from a DVD or using a DVD image, any packages needed "
@@ -3515,7 +3611,7 @@ msgstr ""
"项。"
#. Tag: para
-#: using-d-i.xml:2376
+#: using-d-i.xml:2412
#, no-c-format
msgid ""
"One advantage of adding a network mirror is that updates that have occurred "
@@ -3528,7 +3624,7 @@ msgstr ""
"可以安装已经更新的内容,确保了系统的安全性和稳定性。。"
#. Tag: para
-#: using-d-i.xml:2383
+#: using-d-i.xml:2419
#, no-c-format
msgid ""
"In summary: selecting a network mirror is generally a good idea, except if "
@@ -3542,26 +3638,26 @@ msgstr ""
"的数据量取决于"
#. Tag: para
-#: using-d-i.xml:2392
+#: using-d-i.xml:2428
#, no-c-format
msgid "the tasks you select in the next step of the installation,"
msgstr "安装下一步选择的任务,"
#. Tag: para
-#: using-d-i.xml:2397
+#: using-d-i.xml:2433
#, no-c-format
msgid "which packages are needed for those tasks,"
msgstr "这些任务所需的软件包,"
#. Tag: para
-#: using-d-i.xml:2402
+#: using-d-i.xml:2438
#, no-c-format
msgid ""
"which of those packages are present on the CDs or DVDs you have scanned, and"
msgstr "已检测的 CD 或 DVD 上的软件包,并且"
#. Tag: para
-#: using-d-i.xml:2407
+#: using-d-i.xml:2443
#, no-c-format
msgid ""
"whether any updated versions of packages included on the CDs or DVDs are "
@@ -3572,7 +3668,7 @@ msgstr ""
"安全更新的镜像)。"
#. Tag: para
-#: using-d-i.xml:2416
+#: using-d-i.xml:2452
#, no-c-format
msgid ""
"Note that the last point means that, even if you choose not to use a network "
@@ -3584,13 +3680,13 @@ msgstr ""
"且软件包有安全更新,仍然会从互联网下载更新后的软件包。"
#. Tag: title
-#: using-d-i.xml:2432
+#: using-d-i.xml:2468
#, no-c-format
msgid "Selecting and Installing Software"
msgstr "选择和安装软件"
#. Tag: para
-#: using-d-i.xml:2434
+#: using-d-i.xml:2470
#, no-c-format
msgid ""
"During the installation process, you are given the opportunity to select "
@@ -3605,7 +3701,7 @@ msgstr ""
"来快速建立您的计算机应对各种任务。"
#. Tag: para
-#: using-d-i.xml:2443
+#: using-d-i.xml:2479
#, no-c-format
msgid ""
"So, you have the ability to choose <emphasis>tasks</emphasis> first, and "
@@ -3635,7 +3731,7 @@ msgstr ""
"空间。"
#. Tag: para
-#: using-d-i.xml:2470
+#: using-d-i.xml:2506
#, no-c-format
msgid ""
"Some tasks may be pre-selected based on the characteristics of the computer "
@@ -3646,7 +3742,7 @@ msgstr ""
"些任务。此时甚至可以不选中任何任务。"
#. Tag: para
-#: using-d-i.xml:2477
+#: using-d-i.xml:2513
#, no-c-format
msgid ""
"In the standard user interface of the installer, you can use the space bar "
@@ -3654,7 +3750,7 @@ msgid ""
msgstr "在安装程序的标准用户界面下,您可以使用空格键切换任务的选择。"
#. Tag: para
-#: using-d-i.xml:2483
+#: using-d-i.xml:2519
#, no-c-format
msgid ""
"Unless you are using the special KDE or Xfce/LXDE CDs, the <quote>Desktop "
@@ -3664,7 +3760,7 @@ msgstr ""
"GNOME 桌面环境。"
#. Tag: para
-#: using-d-i.xml:2488
+#: using-d-i.xml:2524
#, no-c-format
msgid ""
"It is not possible to interactively select a different desktop during the "
@@ -3683,7 +3779,7 @@ msgstr ""
"literal> 或 <literal>desktop=lxde</literal> 进行选择。"
#. Tag: para
-#: using-d-i.xml:2499
+#: using-d-i.xml:2535
#, no-c-format
msgid ""
"Some CD images (businesscard, netinst and DVD) also allow selection of the "
@@ -3696,7 +3792,7 @@ msgstr ""
"<quote>Alternative desktop environments</quote>。"
#. Tag: para
-#: using-d-i.xml:2506
+#: using-d-i.xml:2542
#, no-c-format
msgid ""
"Note that this will only work if the packages needed for the desired desktop "
@@ -3711,7 +3807,7 @@ msgstr ""
"Xfce 或 LXDE 同样适用于 DVD 映象或其他的安装方法。"
#. Tag: para
-#: using-d-i.xml:2516
+#: using-d-i.xml:2552
#, no-c-format
msgid ""
"The various server tasks will install software roughly as follows. DNS "
@@ -3730,7 +3826,7 @@ msgstr ""
"classname>。"
#. Tag: para
-#: using-d-i.xml:2527
+#: using-d-i.xml:2563
#, no-c-format
msgid ""
"The <quote>Standard system</quote> task will install any package that has a "
@@ -3744,7 +3840,7 @@ msgstr ""
"并需要一个最小化的系统,您应该让该任务选中。"
#. Tag: para
-#: using-d-i.xml:2535
+#: using-d-i.xml:2571
#, no-c-format
msgid ""
"If during language selection a default locale other than the <quote>C</"
@@ -3761,7 +3857,7 @@ msgstr ""
"(如果存在)还会安装该桌面对应的本地化软件包。"
#. Tag: para
-#: using-d-i.xml:2545
+#: using-d-i.xml:2581
#, no-c-format
msgid ""
"Once you've selected your tasks, select &BTN-CONT;. At this point, "
@@ -3773,7 +3869,7 @@ msgstr ""
"选中任务的软件包。假如某个程序需要用户输入信息,它将提示您指定。"
#. Tag: para
-#: using-d-i.xml:2552
+#: using-d-i.xml:2588
#, no-c-format
msgid ""
"You should be aware that especially the Desktop task is very large. "
@@ -3788,7 +3884,7 @@ msgstr ""
"间。一旦启动,安装软件包过程将无法取消。"
#. Tag: para
-#: using-d-i.xml:2561
+#: using-d-i.xml:2597
#, no-c-format
msgid ""
"Even when packages are included on the CD-ROM, the installer may still "
@@ -3803,13 +3899,13 @@ msgstr ""
"新);如果您安装的是测试版本,这会出现在使用旧映像安装时。"
#. Tag: title
-#: using-d-i.xml:2576
+#: using-d-i.xml:2612
#, no-c-format
msgid "Making Your System Bootable"
msgstr "创建启动系统"
#. Tag: para
-#: using-d-i.xml:2578
+#: using-d-i.xml:2614
#, no-c-format
msgid ""
"If you are installing a diskless workstation, obviously, booting off the "
@@ -3822,13 +3918,13 @@ msgstr ""
"linkend=\"boot-dev-select-sun\"/>。</phrase>"
#. Tag: title
-#: using-d-i.xml:2593
+#: using-d-i.xml:2629
#, no-c-format
msgid "Detecting other operating systems"
msgstr "检测其他的操作系统"
#. Tag: para
-#: using-d-i.xml:2595
+#: using-d-i.xml:2631
#, no-c-format
msgid ""
"Before a boot loader is installed, the installer will attempt to probe for "
@@ -3842,7 +3938,7 @@ msgstr ""
"&debian; 一起,计算机也将配置为可以启动其他操作系统。"
#. Tag: para
-#: using-d-i.xml:2603
+#: using-d-i.xml:2639
#, no-c-format
msgid ""
"Note that multiple operating systems booting on a single machine is still "
@@ -3856,13 +3952,13 @@ msgstr ""
"管理器的文档了解更多信息。"
#. Tag: title
-#: using-d-i.xml:2621
+#: using-d-i.xml:2657
#, no-c-format
msgid "<command>palo</command>-installer"
msgstr "<command>palo</command>-installer"
#. Tag: para
-#: using-d-i.xml:2622
+#: using-d-i.xml:2658
#, no-c-format
msgid ""
"The bootloader on PA-RISC is <quote>palo</quote>. <command>PALO</command> is "
@@ -3877,19 +3973,19 @@ msgstr ""
"<command>PALO</command> 能真正地读 Linux 分区。"
#. Tag: para
-#: using-d-i.xml:2631
+#: using-d-i.xml:2667
#, no-c-format
msgid "hppa FIXME ( need more info )"
msgstr "hppa FIXME ( need more info )"
#. Tag: title
-#: using-d-i.xml:2643
+#: using-d-i.xml:2679
#, no-c-format
msgid "Install the <command>Grub</command> Boot Loader on a Hard Disk"
msgstr "硬盘上 <command>Grub</command> Boot Loader 的安装"
#. Tag: para
-#: using-d-i.xml:2645
+#: using-d-i.xml:2681
#, no-c-format
msgid ""
"The main &architecture; boot loader is called <quote>grub</quote>. Grub is a "
@@ -3900,7 +3996,7 @@ msgstr ""
"定的 boot loader,它对新手和老手都是一个不错的缺省选择。"
#. Tag: para
-#: using-d-i.xml:2651
+#: using-d-i.xml:2687
#, no-c-format
msgid ""
"By default, grub will be installed into the Master Boot Record (MBR), where "
@@ -3912,7 +4008,7 @@ msgstr ""
"请参阅 grub 的手册。"
#. Tag: para
-#: using-d-i.xml:2657
+#: using-d-i.xml:2693
#, no-c-format
msgid ""
"If you do not want to install grub, use the &BTN-GOBACK; button to get to "
@@ -3923,13 +4019,13 @@ msgstr ""
"用的任何 bootloader。"
#. Tag: title
-#: using-d-i.xml:2670
+#: using-d-i.xml:2706
#, no-c-format
msgid "Install the <command>LILO</command> Boot Loader on a Hard Disk"
msgstr "硬盘上 <command>LILO</command> Boot Loader 的安装"
#. Tag: para
-#: using-d-i.xml:2672
+#: using-d-i.xml:2708
#, no-c-format
msgid ""
"The second &architecture; boot loader is called <quote>LILO</quote>. It is "
@@ -3945,7 +4041,7 @@ msgstr ""
"HOWTO</ulink>。"
#. Tag: para
-#: using-d-i.xml:2682
+#: using-d-i.xml:2718
#, no-c-format
msgid ""
"Currently the LILO installation will only create menu entries for other "
@@ -3958,7 +4054,7 @@ msgstr ""
"统。"
#. Tag: para
-#: using-d-i.xml:2690
+#: using-d-i.xml:2726
#, no-c-format
msgid ""
"&d-i; offers you three choices on where to install the <command>LILO</"
@@ -3966,13 +4062,13 @@ msgid ""
msgstr "&d-i; 提供给您三种选择去哪安装 <command>LILO</command> boot loader:"
#. Tag: term
-#: using-d-i.xml:2697
+#: using-d-i.xml:2733
#, no-c-format
msgid "Master Boot Record (MBR)"
msgstr "主引导区(MBR)"
#. Tag: para
-#: using-d-i.xml:2697
+#: using-d-i.xml:2733
#, no-c-format
msgid ""
"This way the <command>LILO</command> will take complete control of the boot "
@@ -3980,13 +4076,13 @@ msgid ""
msgstr "这种方式 <command>LILO</command> 将完全控制启动过程。"
#. Tag: term
-#: using-d-i.xml:2704
+#: using-d-i.xml:2740
#, no-c-format
msgid "new &debian; partition"
msgstr "新 &debian; 分区"
#. Tag: para
-#: using-d-i.xml:2704
+#: using-d-i.xml:2740
#, no-c-format
msgid ""
"Choose this if you want to use another boot manager. <command>LILO</command> "
@@ -3997,13 +4093,13 @@ msgstr ""
"新 &debian; 分区的起始位置,并能作为第二 boot loader。"
#. Tag: term
-#: using-d-i.xml:2713
+#: using-d-i.xml:2749
#, no-c-format
msgid "Other choice"
msgstr "其它选择"
#. Tag: para
-#: using-d-i.xml:2713
+#: using-d-i.xml:2749
#, no-c-format
msgid ""
"Useful for advanced users who want to install <command>LILO</command> "
@@ -4016,7 +4112,7 @@ msgstr ""
"filename> 或 <filename>/dev/sda</filename>。"
#. Tag: para
-#: using-d-i.xml:2723
+#: using-d-i.xml:2759
#, no-c-format
msgid ""
"If you can no longer boot into Windows 9x (or DOS) after this step, you'll "
@@ -4030,13 +4126,13 @@ msgstr ""
"录 &mdash; 但这也意味着您要使用其他方法才能启动 &debian;!"
#. Tag: title
-#: using-d-i.xml:2739
+#: using-d-i.xml:2775
#, no-c-format
msgid "Install the <command>ELILO</command> Boot Loader on a Hard Disk"
msgstr "安装 <command>ELILO</command> Boot Loader 到硬盘"
#. Tag: para
-#: using-d-i.xml:2741
+#: using-d-i.xml:2777
#, no-c-format
msgid ""
"The &architecture; boot loader is called <quote>elilo</quote>. It is modeled "
@@ -4061,7 +4157,7 @@ msgstr ""
"和启动 Linux 内核的工作。"
#. Tag: para
-#: using-d-i.xml:2757
+#: using-d-i.xml:2793
#, no-c-format
msgid ""
"The <quote>elilo</quote> configuration and installation is done as the last "
@@ -4076,21 +4172,14 @@ msgstr ""
"<emphasis>root</emphasis> 文件系统相同的磁盘。"
#. Tag: title
-#: using-d-i.xml:2769
+#: using-d-i.xml:2805
#, no-c-format
msgid "Choose the correct partition!"
msgstr "选择正确的分区!"
#. Tag: para
-#: using-d-i.xml:2771
+#: using-d-i.xml:2807
#, no-c-format
-#| msgid ""
-#| "The criteria for selecting a partition is that it is FAT format "
-#| "filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
-#| "multiple choices depending on what it finds from scanning all of the "
-#| "disks of the system including EFI partitions of other system disks and "
-#| "EFI diagnostic partitions. Remember, <command>elilo</command> may format "
-#| "the partition during the installation, erasing any previous contents!"
msgid ""
"The criterion for selecting a partition is that it must be a FAT format "
"filesystem with its <emphasis>boot</emphasis> flag set. &d-i; may show "
@@ -4098,16 +4187,20 @@ msgid ""
"of the system including EFI partitions of other system disks and EFI "
"diagnostic partitions. Remember, <command>elilo</command> may format the "
"partition during the installation, erasing any previous contents!"
-msgstr "选择分区的准则是文件系统必须为 FAT 并有 <emphasis>boot</emphasis> 标志。&d-i; 可能会显示多个选择,这取决于被扫描的包含 EFI 分区的磁盘和 EFI 诊断分区。切记,<command>elilo</command> 在安装时可能会格式化分区,这将清除以前所有的内容!"
+msgstr ""
+"选择分区的准则是文件系统必须为 FAT 并有 <emphasis>boot</emphasis> 标志。&d-"
+"i; 可能会显示多个选择,这取决于被扫描的包含 EFI 分区的磁盘和 EFI 诊断分区。切"
+"记,<command>elilo</command> 在安装时可能会格式化分区,这将清除以前所有的内"
+"容!"
#. Tag: title
-#: using-d-i.xml:2786
+#: using-d-i.xml:2822
#, no-c-format
msgid "EFI Partition Contents"
msgstr "EFI 分区内容"
#. Tag: para
-#: using-d-i.xml:2788
+#: using-d-i.xml:2824
#, no-c-format
msgid ""
"The EFI partition is a FAT filesystem format partition on one of the hard "
@@ -4133,13 +4226,13 @@ msgstr ""
"间,系统更新或重新配置,文件系统中也许会有其他文件。"
#. Tag: filename
-#: using-d-i.xml:2810
+#: using-d-i.xml:2846
#, no-c-format
msgid "elilo.conf"
msgstr "elilo.conf"
#. Tag: para
-#: using-d-i.xml:2811
+#: using-d-i.xml:2847
#, no-c-format
msgid ""
"This is the configuration file read by the boot loader when it starts. It is "
@@ -4150,13 +4243,13 @@ msgstr ""
"filename> 的复制,其文件名重写成 EFI 分区上的文件。"
#. Tag: filename
-#: using-d-i.xml:2820
+#: using-d-i.xml:2856
#, no-c-format
msgid "elilo.efi"
msgstr "elilo.efi"
#. Tag: para
-#: using-d-i.xml:2821
+#: using-d-i.xml:2857
#, no-c-format
msgid ""
"This is the boot loader program that the <quote>EFI Boot Manager</quote> "
@@ -4169,13 +4262,13 @@ msgstr ""
"<quote>EFI Boot Manager</quote> 命令菜单。"
#. Tag: filename
-#: using-d-i.xml:2831
+#: using-d-i.xml:2867
#, no-c-format
msgid "initrd.img"
msgstr "initrd.img"
#. Tag: para
-#: using-d-i.xml:2832
+#: using-d-i.xml:2868
#, no-c-format
msgid ""
"This is the initial root filesystem used to boot the kernel. It is a copy of "
@@ -4188,13 +4281,13 @@ msgstr ""
"filename> 符号链接 <filename>/initrd.img</filename> 指向的文件。"
#. Tag: filename
-#: using-d-i.xml:2844
+#: using-d-i.xml:2880
#, no-c-format
msgid "readme.txt"
msgstr "readme.txt"
#. Tag: para
-#: using-d-i.xml:2845
+#: using-d-i.xml:2881
#, no-c-format
msgid ""
"This is a small text file warning you that the contents of the directory are "
@@ -4205,13 +4298,13 @@ msgstr ""
"任何本地修改在下次 <filename>/usr/sbin/elilo</filename> 运行时将丢失。"
#. Tag: filename
-#: using-d-i.xml:2855
+#: using-d-i.xml:2891
#, no-c-format
msgid "vmlinuz"
msgstr "vmlinuz"
#. Tag: para
-#: using-d-i.xml:2856
+#: using-d-i.xml:2892
#, no-c-format
msgid ""
"This is the compressed kernel itself. It is a copy of the file referenced in "
@@ -4224,13 +4317,13 @@ msgstr ""
"<filename>/vmlinuz</filename> 指向的文件。"
#. Tag: title
-#: using-d-i.xml:2876
+#: using-d-i.xml:2912
#, no-c-format
msgid "<command>arcboot</command>-installer"
msgstr "<command>arcboot</command>-installer"
#. Tag: para
-#: using-d-i.xml:2877
+#: using-d-i.xml:2913
#, no-c-format
msgid ""
"The boot loader on SGI machines is <command>arcboot</command>. It has to be "
@@ -4270,13 +4363,13 @@ msgstr ""
"</screen></informalexample> ,然后键入 <command>boot</command>。"
#. Tag: replaceable
-#: using-d-i.xml:2896
+#: using-d-i.xml:2932
#, no-c-format
msgid "scsi"
msgstr "scsi"
#. Tag: para
-#: using-d-i.xml:2897
+#: using-d-i.xml:2933
#, no-c-format
msgid ""
"is the SCSI bus to be booted from, this is <userinput>0</userinput> for the "
@@ -4284,13 +4377,13 @@ msgid ""
msgstr "是启动的 SCSI 总线,<userinput>0</userinput> 为板载控制器"
#. Tag: replaceable
-#: using-d-i.xml:2905
+#: using-d-i.xml:2941
#, no-c-format
msgid "disk"
msgstr "disk"
#. Tag: para
-#: using-d-i.xml:2906
+#: using-d-i.xml:2942
#, no-c-format
msgid ""
"is the SCSI ID of the hard disk on which <command>arcboot</command> is "
@@ -4299,13 +4392,13 @@ msgstr "硬盘的 SCSI ID,<command>arcboot</command> 安装在其上"
# index.docbook:1643, index.docbook:1712
#. Tag: replaceable
-#: using-d-i.xml:2914
+#: using-d-i.xml:2950
#, no-c-format
msgid "partnr"
msgstr "partnr"
#. Tag: para
-#: using-d-i.xml:2915
+#: using-d-i.xml:2951
#, no-c-format
msgid ""
"is the number of the partition on which <filename>/etc/arcboot.conf</"
@@ -4313,13 +4406,13 @@ msgid ""
msgstr "分区号,<filename>/etc/arcboot.conf</filename> 处于该分区"
#. Tag: replaceable
-#: using-d-i.xml:2923
+#: using-d-i.xml:2959
#, no-c-format
msgid "config"
msgstr "config"
#. Tag: para
-#: using-d-i.xml:2924
+#: using-d-i.xml:2960
#, no-c-format
msgid ""
"is the name of the configuration entry in <filename>/etc/arcboot.conf</"
@@ -4329,13 +4422,13 @@ msgstr ""
"quote> 。"
#. Tag: title
-#: using-d-i.xml:2945
+#: using-d-i.xml:2981
#, no-c-format
msgid "Install <command>Yaboot</command> on a Hard Disk"
msgstr "安装 <command>Yaboot</command> 至硬盘"
#. Tag: para
-#: using-d-i.xml:2946
+#: using-d-i.xml:2982
#, no-c-format
msgid ""
"Newer (mid 1998 and on) PowerMacs use <command>yaboot</command> as their "
@@ -4353,13 +4446,13 @@ msgstr ""
"设为启动 &debian-gnu;。"
#. Tag: title
-#: using-d-i.xml:2964
+#: using-d-i.xml:3000
#, no-c-format
msgid "Install <command>Quik</command> on a Hard Disk"
msgstr "安装 <command>Quik</command> 至硬盘"
#. Tag: para
-#: using-d-i.xml:2965
+#: using-d-i.xml:3001
#, no-c-format
msgid ""
"The boot loader for OldWorld Power Macintosh machines is <command>quik</"
@@ -4372,13 +4465,13 @@ msgstr ""
"以工作在 7200,7300 和 7600 Powermacs,以及一些 Power Computing 克隆。"
#. Tag: title
-#: using-d-i.xml:2981
+#: using-d-i.xml:3017
#, no-c-format
msgid "<command>zipl</command>-installer"
msgstr "<command>zipl</command>-installer"
#. Tag: para
-#: using-d-i.xml:2982
+#: using-d-i.xml:3018
#, no-c-format
msgid ""
"The boot loader on &arch-title; is <quote>zipl</quote>. <command>ZIPL</"
@@ -4393,13 +4486,13 @@ msgstr ""
"Commands</quote>,它位于 IBM 的 developerWorks 网站<command>ZIPL</command>。"
#. Tag: title
-#: using-d-i.xml:2999
+#: using-d-i.xml:3035
#, no-c-format
msgid "Install the <command>SILO</command> Boot Loader on a Hard Disk"
msgstr "安装 <command>SILO</command> Boot Loader 到硬盘"
#. Tag: para
-#: using-d-i.xml:3001
+#: using-d-i.xml:3037
#, no-c-format
msgid ""
"The standard &architecture; boot loader is called <quote>silo</quote>. It is "
@@ -4426,13 +4519,13 @@ msgstr ""
"区启动。这对于安装 GNU/Linux 到一个已经存在 SunOS/Solaris 的系统很有用。"
#. Tag: title
-#: using-d-i.xml:3026
+#: using-d-i.xml:3062
#, no-c-format
msgid "Continue Without Boot Loader"
msgstr "不使用 boot loader 继续进行"
#. Tag: para
-#: using-d-i.xml:3028
+#: using-d-i.xml:3064
#, no-c-format
msgid ""
"This option can be used to complete the installation even when no boot "
@@ -4443,7 +4536,7 @@ msgstr ""
"是因为不想要(比如,您想使用已经存在的 boot loader)"
#. Tag: para
-#: using-d-i.xml:3035
+#: using-d-i.xml:3071
#, no-c-format
msgid ""
"If you plan to manually configure your bootloader, you should check the name "
@@ -4462,13 +4555,13 @@ msgstr ""
"filename> 到一个独立的分区,还需要 <filename>/boot</filename> 文件系统。"
#. Tag: title
-#: using-d-i.xml:3052
+#: using-d-i.xml:3088
#, no-c-format
msgid "Finishing the Installation"
msgstr "完成安装"
#. Tag: para
-#: using-d-i.xml:3053
+#: using-d-i.xml:3089
#, no-c-format
msgid ""
"This is the last step in the &debian; installation process during which the "
@@ -4479,13 +4572,13 @@ msgstr ""
"&d-i; 之后的清理。"
#. Tag: title
-#: using-d-i.xml:3066
+#: using-d-i.xml:3102
#, no-c-format
msgid "Setting the System Clock"
msgstr "设置系统时钟"
#. Tag: para
-#: using-d-i.xml:3068
+#: using-d-i.xml:3104
#, no-c-format
msgid ""
"The installer may ask you if the computer's clock is set to UTC. Normally "
@@ -4497,7 +4590,7 @@ msgstr ""
"装程序依据是否有其他系统已经安装这类事情,来决定时钟要不要设为 UTC。"
#. Tag: para
-#: using-d-i.xml:3075
+#: using-d-i.xml:3111
#, no-c-format
msgid ""
"In expert mode you will always be able to choose whether or not the clock is "
@@ -4513,7 +4606,7 @@ msgstr ""
"常设为本地时间。如果您需要多重引导,请选择本地时间而不是 GMT。</phrase>"
#. Tag: para
-#: using-d-i.xml:3086
+#: using-d-i.xml:3122
#, no-c-format
msgid ""
"At this point &d-i; will also attempt to save the current time to the "
@@ -4524,13 +4617,13 @@ msgstr ""
"决于刚才的选择。"
#. Tag: title
-#: using-d-i.xml:3101
+#: using-d-i.xml:3137
#, no-c-format
msgid "Reboot the System"
msgstr "重新启动系统"
#. Tag: para
-#: using-d-i.xml:3103
+#: using-d-i.xml:3139
#, no-c-format
msgid ""
"You will be prompted to remove the boot media (CD, floppy, etc) that you "
@@ -4541,7 +4634,7 @@ msgstr ""
"&debian; 系统。"
#. Tag: para
-#: using-d-i.xml:3109
+#: using-d-i.xml:3145
#, no-c-format
msgid ""
"After a final prompt the system will be halted because rebooting is not "
@@ -4553,13 +4646,13 @@ msgstr ""
"上的 IPL &debian-gnu;,它在安装步骤第一步里被选做根文件系统。"
#. Tag: title
-#: using-d-i.xml:3122
+#: using-d-i.xml:3158
#, no-c-format
-msgid "Miscellaneous"
-msgstr "杂项"
+msgid "Troubleshooting"
+msgstr ""
#. Tag: para
-#: using-d-i.xml:3123
+#: using-d-i.xml:3159
#, no-c-format
msgid ""
"The components listed in this section are usually not involved in the "
@@ -4570,13 +4663,13 @@ msgstr ""
"题。"
#. Tag: title
-#: using-d-i.xml:3136
+#: using-d-i.xml:3172
#, no-c-format
msgid "Saving the installation logs"
msgstr "保存安装记录"
#. Tag: para
-#: using-d-i.xml:3138
+#: using-d-i.xml:3174
#, no-c-format
msgid ""
"If the installation is successful, the logfiles created during the "
@@ -4587,7 +4680,7 @@ msgstr ""
"的 <filename>/var/log/installer/</filename>。"
#. Tag: para
-#: using-d-i.xml:3145
+#: using-d-i.xml:3181
#, no-c-format
msgid ""
"Choosing <guimenuitem>Save debug logs</guimenuitem> from the main menu "
@@ -4601,13 +4694,13 @@ msgstr ""
"其它系统上研究记录,或者用于报告的附件。"
#. Tag: title
-#: using-d-i.xml:3165
+#: using-d-i.xml:3201
#, no-c-format
msgid "Using the Shell and Viewing the Logs"
msgstr "使用 Shell 查看记录"
#. Tag: para
-#: using-d-i.xml:3167
+#: using-d-i.xml:3203
#, no-c-format
msgid ""
"There are several methods you can use to get a shell while running an "
@@ -4631,13 +4724,13 @@ msgstr ""
"安装程序。"
#. Tag: para
-#: using-d-i.xml:3185
+#: using-d-i.xml:3221
#, no-c-format
msgid "For the graphical installer see also <xref linkend=\"gtk-using\"/>."
msgstr "对于图形安装程序,请参阅 <xref linkend=\"gtk-using\"/>。"
#. Tag: para
-#: using-d-i.xml:3189
+#: using-d-i.xml:3225
#, no-c-format
msgid ""
"If you cannot switch consoles, there is also an <guimenuitem>Execute a "
@@ -4652,7 +4745,7 @@ msgstr ""
"到安装程序。"
#. Tag: para
-#: using-d-i.xml:3197
+#: using-d-i.xml:3233
#, no-c-format
msgid ""
"At this point you are booted from the RAM disk, and there is a limited set "
@@ -4668,7 +4761,7 @@ msgstr ""
"Bourne shell 的克隆,有一些如自动完成与历史纪录这样的好特性。"
#. Tag: para
-#: using-d-i.xml:3206
+#: using-d-i.xml:3242
#, no-c-format
msgid ""
"To edit and view files, use the text editor <command>nano</command>. Log "
@@ -4679,7 +4772,7 @@ msgstr ""
"以在 <filename>/var/log</filename> 目录找到。"
#. Tag: para
-#: using-d-i.xml:3213
+#: using-d-i.xml:3249
#, no-c-format
msgid ""
"Although you can do basically anything in a shell that the available "
@@ -4690,7 +4783,7 @@ msgstr ""
"题时进行调试。"
#. Tag: para
-#: using-d-i.xml:3219
+#: using-d-i.xml:3255
#, no-c-format
msgid ""
"Doing things manually from the shell may interfere with the installation "
@@ -4702,13 +4795,13 @@ msgstr ""
"该让安装程序激活交换分区,而不是在 shell 里面自己动手。"
#. Tag: title
-#: using-d-i.xml:3234
+#: using-d-i.xml:3271
#, no-c-format
msgid "Installation Over the Network"
msgstr "通过网络安装"
#. Tag: para
-#: using-d-i.xml:3236
+#: using-d-i.xml:3273
#, no-c-format
msgid ""
"One of the more interesting components is <firstterm>network-console</"
@@ -4723,7 +4816,7 @@ msgstr ""
"先建立网络。(您可以使用 <xref linkend=\"automatic-install\"/> 做这部分工作。)"
#. Tag: para
-#: using-d-i.xml:3246
+#: using-d-i.xml:3283
#, no-c-format
msgid ""
"This component is not loaded into the main installation menu by default, so "
@@ -4743,7 +4836,7 @@ msgstr ""
"SSH</guimenuitem>。"
#. Tag: para
-#: using-d-i.xml:3259
+#: using-d-i.xml:3296
#, no-c-format
msgid ""
"For installations on &arch-title;, this is the default method after setting "
@@ -4751,7 +4844,7 @@ msgid ""
msgstr "在 &arch-title; 上安装,建立网络之后这是默认的方法。"
#. Tag: para
-#: using-d-i.xml:3264
+#: using-d-i.xml:3301
#, no-c-format
msgid ""
"<phrase arch=\"not-s390\">After selecting this new entry, you</phrase> "
@@ -4770,7 +4863,7 @@ msgstr ""
"fingerprint。您需要安全地传输该 fingerprint 给那些要继续远程安装的人。"
#. Tag: para
-#: using-d-i.xml:3276
+#: using-d-i.xml:3313
#, no-c-format
msgid ""
"Should you decide to continue with the installation locally, you can always "
@@ -4781,7 +4874,7 @@ msgstr ""
"他的组件。"
#. Tag: para
-#: using-d-i.xml:3282
+#: using-d-i.xml:3319
#, no-c-format
msgid ""
"Now let's switch to the other side of the wire. As a prerequisite, you need "
@@ -4809,7 +4902,7 @@ msgstr ""
"确认是否正确。"
#. Tag: para
-#: using-d-i.xml:3299
+#: using-d-i.xml:3336
#, no-c-format
msgid ""
"The <command>ssh</command> server in the installer uses a default "
@@ -4830,7 +4923,7 @@ msgstr ""
"接在安装过程中的哪一点断开,您在连接之后可能继续,也可能无法继续安装过程。"
#. Tag: para
-#: using-d-i.xml:3312
+#: using-d-i.xml:3349
#, no-c-format
msgid ""
"You may be able to avoid the connection being dropped by adding the option "
@@ -4850,7 +4943,7 @@ msgstr ""
"需要的时候采用。"
#. Tag: para
-#: using-d-i.xml:3325
+#: using-d-i.xml:3362
#, no-c-format
msgid ""
"If you install several computers in turn and they happen to have the same IP "
@@ -4872,7 +4965,7 @@ msgstr ""
"footnote>,再重新来过。"
#. Tag: para
-#: using-d-i.xml:3341
+#: using-d-i.xml:3378
#, no-c-format
msgid ""
"After the login you will be presented with an initial screen where you have "
@@ -4889,7 +4982,7 @@ msgstr ""
"的系统。在安装菜单只能打开一个 SSH 会话,但 shell 可以打开多个。"
#. Tag: para
-#: using-d-i.xml:3351
+#: using-d-i.xml:3388
#, no-c-format
msgid ""
"After you have started the installation remotely over SSH, you should not go "
@@ -4902,13 +4995,13 @@ msgstr ""
"配置的数据库。结果可能导致安装失败或者安装完成的系统出现问题。"
#. Tag: title
-#: using-d-i.xml:3371
+#: using-d-i.xml:3407
#, no-c-format
msgid "Loading Missing Firmware"
msgstr "加载缺失的固件"
#. Tag: para
-#: using-d-i.xml:3372
+#: using-d-i.xml:3408
#, no-c-format
msgid ""
"As described in <xref linkend=\"hardware-firmware\"/>, some devices require "
@@ -4921,7 +5014,7 @@ msgstr ""
"强功能就无法使用。"
#. Tag: para
-#: using-d-i.xml:3380
+#: using-d-i.xml:3416
#, no-c-format
msgid ""
"If a device driver requests firmware that is not available, &d-i; will "
@@ -4937,7 +5030,7 @@ msgstr ""
"序模块。"
#. Tag: para
-#: using-d-i.xml:3390
+#: using-d-i.xml:3426
#, no-c-format
msgid ""
"Which devices are scanned and which file systems are supported depends on "
@@ -4953,7 +5046,7 @@ msgstr ""
"phrase>"
#. Tag: para
-#: using-d-i.xml:3400
+#: using-d-i.xml:3436
#, no-c-format
msgid ""
"Note that it is possible to skip loading the firmware if you know the device "
@@ -4964,7 +5057,7 @@ msgstr ""
"固件。"
#. Tag: para
-#: using-d-i.xml:3407
+#: using-d-i.xml:3443
#, no-c-format
msgid ""
"Support for loading firmware is still relatively basic and is likely to be "
@@ -4978,13 +5071,13 @@ msgstr ""
"反应遇到的任何问题(参阅 <xref linkend=\"submit-bug\"/>)。"
#. Tag: title
-#: using-d-i.xml:3418
+#: using-d-i.xml:3454
#, no-c-format
msgid "Preparing a medium"
msgstr "准备介质"
#. Tag: para
-#: using-d-i.xml:3419
+#: using-d-i.xml:3455
#, no-c-format
msgid ""
"Although in some cases the firmware can also be loaded from a partition on a "
@@ -5001,7 +5094,7 @@ msgstr ""
"程最初阶段最可能支持的文件系统。"
#. Tag: para
-#: using-d-i.xml:3429
+#: using-d-i.xml:3465
#, no-c-format
msgid ""
"Tarballs and zip files containing current packages for the most common "
@@ -5016,7 +5109,7 @@ msgstr ""
"件系统里面。"
#. Tag: para
-#: using-d-i.xml:3443
+#: using-d-i.xml:3479
#, no-c-format
msgid ""
"If the firmware you need is not included in the tarball, you can also "
@@ -5029,7 +5122,7 @@ msgstr ""
"件。以下概要列出大多数固件软件包,但不保证完整,有些还是非固件软件包:"
#. Tag: para
-#: using-d-i.xml:3457
+#: using-d-i.xml:3493
#, no-c-format
msgid ""
"It is also possible to copy individual firmware files to the medium. Loose "
@@ -5040,13 +5133,13 @@ msgstr ""
"造商那里获得。"
#. Tag: title
-#: using-d-i.xml:3466
+#: using-d-i.xml:3502
#, no-c-format
msgid "Firmware and the Installed System"
msgstr "固件和安装好的系统"
#. Tag: para
-#: using-d-i.xml:3467
+#: using-d-i.xml:3503
#, no-c-format
msgid ""
"Any firmware loaded during the installation will be copied automatically to "
@@ -5061,7 +5154,7 @@ msgstr ""
"序不同的内核版本,有可能由于版本的偏差造成固件不能加载。"
#. Tag: para
-#: using-d-i.xml:3476
+#: using-d-i.xml:3512
#, no-c-format
msgid ""
"If the firmware was loaded from a firmware package, &d-i; will also install "
@@ -5075,7 +5168,7 @@ msgstr ""
"做的优点在于如果有固件的新版本存在会自动更新。"
#. Tag: para
-#: using-d-i.xml:3484
+#: using-d-i.xml:3520
#, no-c-format
msgid ""
"If loading the firmware was skipped during the installation, the relevant "
@@ -5086,7 +5179,7 @@ msgstr ""
"安装好固件或软件包。"
#. Tag: para
-#: using-d-i.xml:3491
+#: using-d-i.xml:3527
#, no-c-format
msgid ""
"If the firmware was loaded from loose firmware files, the firmware copied to "
@@ -5096,3 +5189,6 @@ msgid ""
msgstr ""
"如果固件从不严格的固件文件加载,复制到安装好的系统的固件将<emphasis>不会</"
"emphasis>自动更新,除非对应的固件软件包(如果有的话)在系统安装之后安装。"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "杂项"