summaryrefslogtreecommitdiff
path: root/po/zh_CN
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN')
-rw-r--r--po/zh_CN/boot-installer.po14
-rw-r--r--po/zh_CN/install-methods.po320
-rw-r--r--po/zh_CN/installation-howto.po60
-rw-r--r--po/zh_CN/using-d-i.po36
4 files changed, 244 insertions, 186 deletions
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 7ca607950..07e7c0ad0 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: 2012-12-19 21:47+0000\n"
+"POT-Creation-Date: 2012-12-29 10:09+0000\n"
"PO-Revision-Date: 2012-11-25 16:26+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -438,8 +438,9 @@ msgstr ""
#. Tag: title
#: boot-installer.xml:389
-#, no-c-format
-msgid "Booting from DOS"
+#, fuzzy, no-c-format
+#| msgid "Booting from DOS"
+msgid "Booting from DOS using loadlin"
msgstr "从 DOS 引导"
#. Tag: para
@@ -490,9 +491,12 @@ msgstr ""
#. Tag: title
#: boot-installer.xml:423
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Booting from Linux Using <command>LILO</command> or <command>GRUB</"
+#| "command>"
msgid ""
-"Booting from Linux Using <command>LILO</command> or <command>GRUB</command>"
+"Booting from Linux using <command>LILO</command> or <command>GRUB</command>"
msgstr "引导 Linux 使用 <command>LILO</command> 或 <command>GRUB</command>"
#. Tag: para
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index f501bd457..f2a3852d3 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: 2012-11-24 22:10+0000\n"
+"POT-Creation-Date: 2012-12-29 10:09+0000\n"
"PO-Revision-Date: 2012-11-26 00:19+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -778,39 +778,7 @@ msgstr ""
">)。"
#. Tag: para
-#: install-methods.xml:578
-#, no-c-format
-msgid ""
-"A special method can be used to add firmware to the <filename>mini.iso</"
-"filename>. First, write the <filename>mini.iso</filename> to the USB stick. "
-"Next obtain the necessary firmware files. See <xref linkend=\"loading-"
-"firmware\"/> for more information about firmware. Now unplug and replug the "
-"USB stick, and two partitions should now be visible on it. You should mount "
-"the second of the two partitions, and unpack the firmware onto it."
-msgstr ""
-"有一个特殊的方法可以将固件加入 <filename>mini.iso</filename>。首先将 "
-"<filename>mini.iso</filename> 写入 U 盘。接着取得所需的固件。参阅 <xref "
-"linkend=\"loading-firmware\"/> 了解固件信息。然后拔插 U 盘,会有两个分区出现"
-"在 U 盘上。您应该挂载第二个分区,并将固件解压到里面。"
-
-#. Tag: screen
-#: install-methods.xml:588
-#, no-c-format
-msgid ""
-"# mount /dev/<replaceable>sdX2</replaceable> /mnt\n"
-"# cd /mnt\n"
-"# tar zxvf <replaceable>/path/to/</replaceable>firmware.tar.gz\n"
-"# cd /\n"
-"# umount"
-msgstr ""
-"# mount /dev/<replaceable>sdX2</replaceable> /mnt\n"
-"# cd /mnt\n"
-"# tar zxvf <replaceable>/path/to/</replaceable>firmware.tar.gz\n"
-"# cd /\n"
-"# umount"
-
-#. Tag: para
-#: install-methods.xml:594
+#: install-methods.xml:577
#, no-c-format
msgid ""
"The CD or DVD image you choose should be written directly to the USB stick, "
@@ -823,7 +791,7 @@ msgstr ""
"U 盘已经卸载:"
#. Tag: screen
-#: install-methods.xml:601
+#: install-methods.xml:584
#, no-c-format
msgid ""
"<prompt>#</prompt> <userinput>cp <replaceable>debian.iso</replaceable> /dev/"
@@ -835,7 +803,7 @@ msgstr ""
"<prompt>#</prompt> <userinput>sync</userinput>"
#. Tag: para
-#: install-methods.xml:603
+#: install-methods.xml:586
#, no-c-format
msgid ""
"Simply writing the CD or DVD image to USB like this should work fine for "
@@ -845,14 +813,58 @@ msgstr ""
"对大多数用户来说,简单地把 CD 或 DVD 映像写入 U 盘已经够用。下面更为复杂的选"
"项主要提供给有特殊需要的用户。"
+#. Tag: para
+#: install-methods.xml:594
+#, no-c-format
+msgid ""
+"The hybrid image on the stick does not occupy all the storage space, so it "
+"may be worth considering using the free space to hold firmware files or "
+"packages or any other files of your choice. This could be useful if you have "
+"only one stick or just want to keep everything you need on one device."
+msgstr ""
+
+#. Tag: para
+#: install-methods.xml:602
+#, no-c-format
+msgid ""
+"Create a second, FAT partition on the stick, mount the partition and copy or "
+"unpack the firmware onto it. For example:"
+msgstr ""
+
+#. Tag: screen
+#: install-methods.xml:607
+#, no-c-format
+msgid ""
+"# mount /dev/<replaceable>sdX2</replaceable> /mnt\n"
+"# cd /mnt\n"
+"# tar zxvf <replaceable>/path/to/</replaceable>firmware.tar.gz\n"
+"# cd /\n"
+"# umount"
+msgstr ""
+"# mount /dev/<replaceable>sdX2</replaceable> /mnt\n"
+"# cd /mnt\n"
+"# tar zxvf <replaceable>/path/to/</replaceable>firmware.tar.gz\n"
+"# cd /\n"
+"# umount"
+
+#. Tag: para
+#: install-methods.xml:609
+#, no-c-format
+msgid ""
+"You might have written the <filename>mini.iso</filename> to the USB stick. "
+"In this case the second partition doesn't have to be created as, very "
+"nicely, it will already be present. Unplugging and replugging the USB stick "
+"should make the two partitions visible."
+msgstr ""
+
#. Tag: title
-#: install-methods.xml:614
+#: install-methods.xml:623
#, no-c-format
msgid "Manually copying files to the USB stick"
msgstr "手动复制文件到 U 盘。"
#. Tag: para
-#: install-methods.xml:615
+#: install-methods.xml:624
#, no-c-format
msgid ""
"An alternative way to set up your USB stick is to manually copy the "
@@ -864,7 +876,7 @@ msgstr ""
"可以使用较少容量,请参考 <xref linkend=\"usb-copy-flexible\"/>)。"
#. Tag: para
-#: install-methods.xml:622
+#: install-methods.xml:631
#, no-c-format
msgid ""
"There is an all-in-one file <filename>hd-media/boot.img.gz</filename> which "
@@ -879,7 +891,7 @@ msgstr ""
"classname> 和对应的配置文件</phrase>。"
#. Tag: para
-#: install-methods.xml:631
+#: install-methods.xml:640
#, no-c-format
msgid ""
"Note that, although convenient, this method does have one major "
@@ -893,19 +905,19 @@ msgstr ""
"量创建一个新的文件系统。"
#. Tag: para
-#: install-methods.xml:639
+#: install-methods.xml:648
#, no-c-format
msgid "To use this image simply extract it directly to your USB stick:"
msgstr "使用该映象只须将它直接解压到 U 盘:"
#. Tag: screen
-#: install-methods.xml:643
+#: install-methods.xml:652
#, no-c-format
msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sdX</replaceable>"
msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX</replaceable>"
#. Tag: para
-#: install-methods.xml:645
+#: install-methods.xml:654
#, no-c-format
msgid ""
"Create a partition of type \"Apple_Bootstrap\" on your USB stick using "
@@ -916,13 +928,13 @@ msgstr ""
"的 <userinput>C</userinput> 命令,并直接解压映象:"
#. Tag: screen
-#: install-methods.xml:651
+#: install-methods.xml:660
#, no-c-format
msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
#. Tag: para
-#: install-methods.xml:653
+#: install-methods.xml:662
#, no-c-format
msgid ""
"After that, mount the USB memory stick <phrase arch=\"x86\">"
@@ -943,13 +955,13 @@ msgstr ""
"(<userinput>umount /mnt</userinput>) 就完成了。"
#. Tag: title
-#: install-methods.xml:670
+#: install-methods.xml:679
#, no-c-format
msgid "Manually copying files to the USB stick &mdash; the flexible way"
msgstr "手动复制文件到 U 盘 &mdash; 灵活的方法"
#. Tag: para
-#: install-methods.xml:671
+#: install-methods.xml:680
#, no-c-format
msgid ""
"If you like more flexibility or just want to know what's going on, you "
@@ -962,13 +974,13 @@ msgstr ""
"文件放到 U 盘。"
#. Tag: title
-#: install-methods.xml:686 install-methods.xml:808
+#: install-methods.xml:695 install-methods.xml:817
#, no-c-format
msgid "Partitioning the USB stick"
msgstr "给 U 盘分区"
#. Tag: para
-#: install-methods.xml:687
+#: install-methods.xml:696
#, no-c-format
msgid ""
"We will show how to set up the memory stick to use the first partition, "
@@ -976,7 +988,7 @@ msgid ""
msgstr "我们将展示如何使用 U 盘的第一个分区,而不是整个设备。"
#. Tag: para
-#: install-methods.xml:692
+#: install-methods.xml:701
#, no-c-format
msgid ""
"Since most USB sticks come pre-configured with a single FAT16 partition, you "
@@ -1008,7 +1020,7 @@ msgstr ""
"&debian; 软件包内。"
#. Tag: para
-#: install-methods.xml:716
+#: install-methods.xml:725
#, no-c-format
msgid ""
"In order to start the kernel after booting from the USB stick, we will put a "
@@ -1025,7 +1037,7 @@ msgstr ""
"用来改变 boot loader 的配置文件。"
#. Tag: para
-#: install-methods.xml:726
+#: install-methods.xml:735
#, no-c-format
msgid ""
"To put <classname>syslinux</classname> on the FAT16 partition on your USB "
@@ -1048,13 +1060,13 @@ msgstr ""
"filename> 文件。"
#. Tag: title
-#: install-methods.xml:743 install-methods.xml:855
+#: install-methods.xml:752 install-methods.xml:864
#, no-c-format
msgid "Adding the installer image"
msgstr "添加安装程序映像"
#. Tag: para
-#: install-methods.xml:744
+#: install-methods.xml:753
#, no-c-format
msgid ""
"Mount the partition (<userinput>mount /dev/<replaceable>sdX1</replaceable> /"
@@ -1078,7 +1090,7 @@ msgstr ""
"(8.3) 文件名。"
#. Tag: para
-#: install-methods.xml:768
+#: install-methods.xml:777
#, no-c-format
msgid ""
"Next you should create a <filename>syslinux.cfg</filename> configuration "
@@ -1101,7 +1113,7 @@ msgstr ""
"userinput> 到第二行尾部。还可以添加其他的参数。"
#. Tag: para
-#: install-methods.xml:780
+#: install-methods.xml:789
#, no-c-format
msgid ""
"To enable the boot prompt to permit further parameter appending, add a "
@@ -1110,7 +1122,7 @@ msgstr ""
"添加 <userinput>prompt 1</userinput> 一行,使得引导提示符可以允许附加参数。"
#. Tag: para
-#: install-methods.xml:785 install-methods.xml:895
+#: install-methods.xml:794 install-methods.xml:904
#, no-c-format
msgid ""
"If you used an <filename>hd-media</filename> image, you should now copy the "
@@ -1128,7 +1140,7 @@ msgstr ""
"footnote> 到 U 盘。完成后,卸载 U 盘 (<userinput>umount /mnt</userinput>)。"
#. Tag: para
-#: install-methods.xml:809
+#: install-methods.xml:818
#, no-c-format
msgid ""
"Most USB sticks do not come pre-configured in such a way that Open Firmware "
@@ -1155,7 +1167,7 @@ msgstr ""
"command> 命令包含在 &debian; 的 <classname>hfsutils</classname> 软件包中。"
#. Tag: para
-#: install-methods.xml:826
+#: install-methods.xml:835
#, no-c-format
msgid ""
"In order to start the kernel after booting from the USB stick, we will put a "
@@ -1170,7 +1182,7 @@ msgstr ""
"变启动引导器的配置文件。"
#. Tag: para
-#: install-methods.xml:835
+#: install-methods.xml:844
#, no-c-format
msgid ""
"The normal <command>ybin</command> tool that comes with <command>yaboot</"
@@ -1204,7 +1216,7 @@ msgstr ""
"就可以用普通的 Unix 工具来处理了。"
#. Tag: para
-#: install-methods.xml:856
+#: install-methods.xml:865
#, no-c-format
msgid ""
"Mount the partition (<userinput>mount /dev/<replaceable>sdX2</replaceable> /"
@@ -1214,31 +1226,31 @@ msgstr ""
"mnt</userinput>),然后复制下面的安装程序映象文件到 U 盘:"
#. Tag: para
-#: install-methods.xml:863
+#: install-methods.xml:872
#, no-c-format
msgid "<filename>vmlinux</filename> (kernel binary)"
msgstr "<filename>vmlinux</filename> (内核二进制文件)"
#. Tag: para
-#: install-methods.xml:868
+#: install-methods.xml:877
#, no-c-format
msgid "<filename>initrd.gz</filename> (initial ramdisk image)"
msgstr "<filename>initrd.gz</filename> (初始化内存映像)"
#. Tag: para
-#: install-methods.xml:873
+#: install-methods.xml:882
#, no-c-format
msgid "<filename>yaboot.conf</filename> (yaboot configuration file)"
msgstr "<filename>yaboot.conf</filename> (yaboot 配置文件)"
#. Tag: para
-#: install-methods.xml:878
+#: install-methods.xml:887
#, no-c-format
msgid "<filename>boot.msg</filename> (optional boot message)"
msgstr "<filename>boot.msg</filename> (可选的启动信息)"
#. Tag: para
-#: install-methods.xml:885
+#: install-methods.xml:894
#, no-c-format
msgid ""
"The <filename>yaboot.conf</filename> configuration file should contain the "
@@ -1274,13 +1286,13 @@ msgstr ""
"的大小。"
#. Tag: title
-#: install-methods.xml:923
+#: install-methods.xml:932
#, no-c-format
msgid "Preparing Files for Hard Disk Booting"
msgstr "为从硬盘引导准备文件"
#. Tag: para
-#: install-methods.xml:924
+#: install-methods.xml:933
#, no-c-format
msgid ""
"The installer may be booted using boot files placed on an existing hard "
@@ -1291,7 +1303,7 @@ msgstr ""
"者直接使用 BIOS 提供的引导装载程序直接启动。"
#. Tag: para
-#: install-methods.xml:930
+#: install-methods.xml:939
#, no-c-format
msgid ""
"A full, <quote>pure network</quote> installation can be achieved using this "
@@ -1304,7 +1316,7 @@ msgstr ""
"缠不清。"
#. Tag: para
-#: install-methods.xml:937
+#: install-methods.xml:946
#, no-c-format
msgid ""
"The installer cannot boot from files on an HFS+ file system. MacOS System "
@@ -1324,7 +1336,7 @@ msgstr ""
"Linux 之间交换文件,特别是那些您下载的安装文件。"
#. Tag: para
-#: install-methods.xml:948
+#: install-methods.xml:957
#, no-c-format
msgid ""
"Different programs are used for hard disk installation system booting, "
@@ -1335,16 +1347,19 @@ msgstr ""
"装程序的引导将使用不同的安装文件。"
#. Tag: title
-#: install-methods.xml:957
-#, no-c-format
+#: install-methods.xml:966
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Hard disk installer booting using <command>LILO</command> or "
+#| "<command>GRUB</command>"
msgid ""
-"Hard disk installer booting using <command>LILO</command> or <command>GRUB</"
-"command>"
+"Hard disk installer booting from Linux using <command>LILO</command> or "
+"<command>GRUB</command>"
msgstr ""
"硬盘安装程序引导使用 <command>LILO</command> 或 <command>GRUB</command>"
#. Tag: para
-#: install-methods.xml:959
+#: install-methods.xml:968
#, no-c-format
msgid ""
"This section explains how to add to or even replace an existing linux "
@@ -1354,7 +1369,7 @@ msgstr ""
"command> 或 <command>GRUB</command>。"
#. Tag: para
-#: install-methods.xml:965
+#: install-methods.xml:974
#, no-c-format
msgid ""
"At boot time, both bootloaders support loading in memory not only the "
@@ -1365,7 +1380,7 @@ msgstr ""
"盘可以被用做内核的根文件系统。"
#. Tag: para
-#: install-methods.xml:971
+#: install-methods.xml:980
#, no-c-format
msgid ""
"Copy the following files from the &debian; archives to a convenient location "
@@ -1376,19 +1391,19 @@ msgstr ""
"newinstall/</filename>。"
#. Tag: para
-#: install-methods.xml:979
+#: install-methods.xml:988
#, no-c-format
msgid "<filename>vmlinuz</filename> (kernel binary)"
msgstr "<filename>vmlinuz</filename>(内核二进制文件)"
#. Tag: para
-#: install-methods.xml:984
+#: install-methods.xml:993
#, no-c-format
msgid "<filename>initrd.gz</filename> (ramdisk image)"
msgstr "<filename>initrd.gz</filename> (内存虚拟磁盘映像)"
#. Tag: para
-#: install-methods.xml:991
+#: install-methods.xml:1000
#, no-c-format
msgid ""
"Finally, to configure the bootloader proceed to <xref linkend=\"boot-initrd"
@@ -1396,13 +1411,14 @@ msgid ""
msgstr "最后,要配置 bootloader,请进入 <xref linkend=\"boot-initrd\"/>。"
#. Tag: title
-#: install-methods.xml:1001
-#, no-c-format
-msgid "Hard disk installer booting using <command>loadlin</command>"
+#: install-methods.xml:1010
+#, fuzzy, no-c-format
+#| msgid "Hard disk installer booting using <command>loadlin</command>"
+msgid "Hard disk installer booting from DOS using <command>loadlin</command>"
msgstr "硬盘安装程序引导使用 <command>loadlin</command>"
#. Tag: para
-#: install-methods.xml:1002
+#: install-methods.xml:1011
#, no-c-format
msgid ""
"This section explains how to prepare your hard drive for booting the "
@@ -1411,7 +1427,7 @@ msgstr ""
"本节将说明如何用 <command>loadlin</command> 从 DOS 启动安装程序准备您的硬盘。"
#. Tag: para
-#: install-methods.xml:1007
+#: install-methods.xml:1016
#, no-c-format
msgid ""
"Copy the following directories from a &debian; CD image to <filename>c:\\</"
@@ -1419,26 +1435,26 @@ msgid ""
msgstr "从 &debian; CD 映象复制下列目录到 <filename>c:\\</filename>。"
#. Tag: para
-#: install-methods.xml:1012
+#: install-methods.xml:1021
#, no-c-format
msgid ""
"<filename>/&x86-install-dir;</filename> (kernel binary and ramdisk image)"
msgstr "<filename>/&x86-install-dir;</filename> (二进制和 ramdisk 映象)"
#. Tag: para
-#: install-methods.xml:1017
+#: install-methods.xml:1026
#, no-c-format
msgid "<filename>/tools</filename> (loadlin tool)"
msgstr "<filename>/tools</filename> (loadlin 工具)"
#. Tag: title
-#: install-methods.xml:1030
+#: install-methods.xml:1039
#, no-c-format
msgid "Hard Disk Installer Booting for OldWorld Macs"
msgstr "在 OldWorld Macs 上引导硬盘安装程序"
#. Tag: para
-#: install-methods.xml:1031
+#: install-methods.xml:1040
#, no-c-format
msgid ""
"The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
@@ -1460,7 +1476,7 @@ msgstr ""
"是必须的。"
#. Tag: para
-#: install-methods.xml:1044
+#: install-methods.xml:1053
#, no-c-format
msgid ""
"Download and unstuff the <application>BootX</application> distribution, "
@@ -1487,13 +1503,13 @@ msgstr ""
"的系统文件夹中。"
#. Tag: title
-#: install-methods.xml:1064
+#: install-methods.xml:1073
#, no-c-format
msgid "Hard Disk Installer Booting for NewWorld Macs"
msgstr "在 NewWorld Macs 上启动硬盘安装程序"
#. Tag: para
-#: install-methods.xml:1065
+#: install-methods.xml:1074
#, no-c-format
msgid ""
"NewWorld PowerMacs support booting from a network or an ISO9660 CD-ROM, as "
@@ -1511,7 +1527,7 @@ msgstr ""
"不能用在 NewWorld PowerMacs 上。"
#. Tag: para
-#: install-methods.xml:1076
+#: install-methods.xml:1085
#, no-c-format
msgid ""
"<emphasis>Copy</emphasis> (not move) the following four files which you "
@@ -1524,31 +1540,31 @@ msgstr ""
"硬盘图标的方法来完成)。"
#. Tag: filename
-#: install-methods.xml:1086 install-methods.xml:1412
+#: install-methods.xml:1095 install-methods.xml:1421
#, no-c-format
msgid "vmlinux"
msgstr "vmlinux"
#. Tag: filename
-#: install-methods.xml:1091 install-methods.xml:1417
+#: install-methods.xml:1100 install-methods.xml:1426
#, no-c-format
msgid "initrd.gz"
msgstr "initrd.gz"
#. Tag: filename
-#: install-methods.xml:1096 install-methods.xml:1422
+#: install-methods.xml:1105 install-methods.xml:1431
#, no-c-format
msgid "yaboot"
msgstr "yaboot"
#. Tag: filename
-#: install-methods.xml:1101 install-methods.xml:1427
+#: install-methods.xml:1110 install-methods.xml:1436
#, no-c-format
msgid "yaboot.conf"
msgstr "yaboot.conf"
#. Tag: para
-#: install-methods.xml:1106
+#: install-methods.xml:1115
#, no-c-format
msgid ""
"Make a note of the partition number of the MacOS partition where you place "
@@ -1562,19 +1578,19 @@ msgstr ""
"的时候,您需要这个分区号码在 Open Firmware 提示符下面输入命令。"
#. Tag: para
-#: install-methods.xml:1114
+#: install-methods.xml:1123
#, no-c-format
msgid "To boot the installer, proceed to <xref linkend=\"boot-newworld\"/>."
msgstr "要引导安装程序,请进入 <xref linkend=\"boot-newworld\"/>。"
#. Tag: title
-#: install-methods.xml:1127
+#: install-methods.xml:1136
#, no-c-format
msgid "Preparing Files for TFTP Net Booting"
msgstr "为使用 TFTP 网络引导准备文件"
#. Tag: para
-#: install-methods.xml:1128
+#: install-methods.xml:1137
#, no-c-format
msgid ""
"If your machine is connected to a local area network, you may be able to "
@@ -1588,7 +1604,7 @@ msgstr ""
"上面的某个特殊地方,并且配置好能够能够支持对您的机器进行引导。"
#. Tag: para
-#: install-methods.xml:1136
+#: install-methods.xml:1145
#, no-c-format
msgid ""
"You need to set up a TFTP server, and for many machines a DHCP server<phrase "
@@ -1600,7 +1616,7 @@ msgstr ""
"condition=\"supports-bootp\">,或 BOOTP 服务器</phrase>。"
#. Tag: para
-#: install-methods.xml:1143
+#: install-methods.xml:1152
#, no-c-format
msgid ""
"<phrase condition=\"supports-rarp\">The Reverse Address Resolution Protocol "
@@ -1619,7 +1635,7 @@ msgstr ""
"些系统只能通过 DHCP 来配置。"
#. Tag: para
-#: install-methods.xml:1157
+#: install-methods.xml:1166
#, no-c-format
msgid ""
"For PowerPC, if you have a NewWorld Power Macintosh machine, it is a good "
@@ -1630,7 +1646,7 @@ msgstr ""
"替 BOOTP 比较好。有些最新的机器不能从 BOOTP 引导。"
#. Tag: para
-#: install-methods.xml:1163
+#: install-methods.xml:1172
#, no-c-format
msgid ""
"Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. There "
@@ -1640,7 +1656,7 @@ msgstr ""
"个 <classname>rbootd</classname> 软件包。"
#. Tag: para
-#: install-methods.xml:1168
+#: install-methods.xml:1177
#, no-c-format
msgid ""
"The Trivial File Transfer Protocol (TFTP) is used to serve the boot image to "
@@ -1654,7 +1670,7 @@ msgstr ""
"Linux 上面的一些操作例子。"
#. Tag: para
-#: install-methods.xml:1176
+#: install-methods.xml:1185
#, no-c-format
msgid ""
"For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. "
@@ -1667,13 +1683,13 @@ msgstr ""
"多问题。另一个好的选择是 <classname>atftpd</classname>。"
#. Tag: title
-#: install-methods.xml:1192
+#: install-methods.xml:1201
#, no-c-format
msgid "Setting up RARP server"
msgstr "设置 RARP 服务器"
#. Tag: para
-#: install-methods.xml:1193
+#: install-methods.xml:1202
#, no-c-format
msgid ""
"To set up RARP, you need to know the Ethernet address (a.k.a. the MAC "
@@ -1691,7 +1707,7 @@ msgstr ""
"addr show dev eth0</userinput> 命令。"
#. Tag: para
-#: install-methods.xml:1205
+#: install-methods.xml:1214
#, no-c-format
msgid ""
"On a RARP server system using a Linux 2.4 or 2.6 kernel, or Solaris/SunOS, "
@@ -1714,13 +1730,13 @@ msgstr ""
"<userinput>/usr/etc/rarpd -a</userinput> 命令。"
#. Tag: title
-#: install-methods.xml:1226
+#: install-methods.xml:1235
#, no-c-format
msgid "Setting up a DHCP server"
msgstr "设置 DHCP 服务器"
#. Tag: para
-#: install-methods.xml:1227
+#: install-methods.xml:1236
#, no-c-format
msgid ""
"One free software DHCP server is ISC <command>dhcpd</command>. For &debian-"
@@ -1733,7 +1749,7 @@ msgstr ""
"示例文件(参阅 <filename>/etc/dhcp3/dhcpd.conf</filename>):"
#. Tag: screen
-#: install-methods.xml:1234
+#: install-methods.xml:1243
#, no-c-format
msgid ""
"option domain-name \"example.com\";\n"
@@ -1777,7 +1793,7 @@ msgstr ""
"}"
#. Tag: para
-#: install-methods.xml:1236
+#: install-methods.xml:1245
#, no-c-format
msgid ""
"In this example, there is one server <replaceable>servername</replaceable> "
@@ -1793,7 +1809,7 @@ msgstr ""
"TFTP 获取的文件名。"
#. Tag: para
-#: install-methods.xml:1246
+#: install-methods.xml:1255
#, no-c-format
msgid ""
"After you have edited the <command>dhcpd</command> configuration file, "
@@ -1803,13 +1819,13 @@ msgstr ""
"<userinput>/etc/init.d/dhcp3-server restart</userinput>。"
#. Tag: title
-#: install-methods.xml:1254
+#: install-methods.xml:1263
#, no-c-format
msgid "Enabling PXE Booting in the DHCP configuration"
msgstr "在 DHCP 配置中打开 PXE 引导功能"
#. Tag: para
-#: install-methods.xml:1255
+#: install-methods.xml:1264
#, no-c-format
msgid ""
"Here is another example for a <filename>dhcp.conf</filename> using the Pre-"
@@ -1879,13 +1895,13 @@ msgstr ""
"的 <xref linkend=\"tftp-images\"/>)。"
#. Tag: title
-#: install-methods.xml:1275
+#: install-methods.xml:1284
#, no-c-format
msgid "Setting up a BOOTP server"
msgstr "架设 BOOTP 服务器"
#. Tag: para
-#: install-methods.xml:1276
+#: install-methods.xml:1285
#, no-c-format
msgid ""
"There are two BOOTP servers available for GNU/Linux. The first is CMU "
@@ -1900,7 +1916,7 @@ msgstr ""
"<classname>dhcp3-server</classname> 软件包。"
#. Tag: para
-#: install-methods.xml:1284
+#: install-methods.xml:1293
#, no-c-format
msgid ""
"To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
@@ -1962,7 +1978,7 @@ msgstr ""
"MAC 地址。</phrase>"
#. Tag: para
-#: install-methods.xml:1317
+#: install-methods.xml:1326
#, no-c-format
msgid ""
"By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
@@ -1984,13 +2000,13 @@ msgstr ""
"<command>dhcpd</command>。"
#. Tag: title
-#: install-methods.xml:1336
+#: install-methods.xml:1345
#, no-c-format
msgid "Enabling the TFTP Server"
msgstr "开启 TFTP 服务器"
#. Tag: para
-#: install-methods.xml:1337
+#: install-methods.xml:1346
#, no-c-format
msgid ""
"To get the TFTP server ready to go, you should first make sure that "
@@ -1999,7 +2015,7 @@ msgstr ""
"要准备好 TFTP 服务器,您首先需要确定 <command>tftpd</command> 已经启动。"
#. Tag: para
-#: install-methods.xml:1342
+#: install-methods.xml:1351
#, no-c-format
msgid ""
"In the case of <classname>tftpd-hpa</classname> there are two ways the "
@@ -2013,7 +2029,7 @@ msgstr ""
"以在安装软件包的时候选择,也可以用重新配置软件包方式修改。"
#. Tag: para
-#: install-methods.xml:1351
+#: install-methods.xml:1360
#, no-c-format
msgid ""
"Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
@@ -2030,7 +2046,7 @@ msgstr ""
"置文件示例。"
#. Tag: para
-#: install-methods.xml:1361
+#: install-methods.xml:1370
#, no-c-format
msgid ""
"All <command>in.tftpd</command> alternatives available in &debian; should "
@@ -2044,7 +2060,7 @@ msgstr ""
"问题,建议先检查这些日志信息,这对于分析错误是一个好的起始点。"
#. Tag: para
-#: install-methods.xml:1369
+#: install-methods.xml:1378
#, no-c-format
msgid ""
"If you intend to install &debian; on an SGI machine and your TFTP server is "
@@ -2072,13 +2088,13 @@ msgstr ""
"错误。"
#. Tag: title
-#: install-methods.xml:1391
+#: install-methods.xml:1400
#, no-c-format
msgid "Move TFTP Images Into Place"
msgstr "将 TFTP 映像放到适当的位置"
#. Tag: para
-#: install-methods.xml:1392
+#: install-methods.xml:1401
#, no-c-format
msgid ""
"Next, place the TFTP boot image you need, as found in <xref linkend=\"where-"
@@ -2093,7 +2109,7 @@ msgstr ""
"完全决定于 TFTP 客户程序,而且没有一个强制的标准。"
#. Tag: para
-#: install-methods.xml:1401
+#: install-methods.xml:1410
#, no-c-format
msgid ""
"On NewWorld Power Macintosh machines, you will need to set up the "
@@ -2108,13 +2124,13 @@ msgstr ""
"件:"
#. Tag: filename
-#: install-methods.xml:1432
+#: install-methods.xml:1441
#, no-c-format
msgid "boot.msg"
msgstr "boot.msg"
#. Tag: para
-#: install-methods.xml:1437
+#: install-methods.xml:1446
#, no-c-format
msgid ""
"For PXE booting, everything you should need is set up in the "
@@ -2129,7 +2145,7 @@ msgstr ""
"需的文件名传递给 <command>tftpd</command>。"
#. Tag: para
-#: install-methods.xml:1445
+#: install-methods.xml:1454
#, no-c-format
msgid ""
"For PXE booting, everything you should need is set up in the "
@@ -2144,13 +2160,13 @@ msgstr ""
"efi</filename> 以启动所需的文件名传递至<command>tftpd</command>。"
#. Tag: title
-#: install-methods.xml:1457
+#: install-methods.xml:1466
#, no-c-format
msgid "SPARC TFTP Booting"
msgstr "SPARC TFTP 引导"
#. Tag: para
-#: install-methods.xml:1458
+#: install-methods.xml:1467
#, no-c-format
msgid ""
"Some SPARC architectures add the subarchitecture names, such as "
@@ -2178,7 +2194,7 @@ msgstr ""
"并在必要时加上子体系名。"
#. Tag: para
-#: install-methods.xml:1474
+#: install-methods.xml:1483
#, no-c-format
msgid ""
"If you've done all this correctly, giving the command <userinput>boot net</"
@@ -2190,7 +2206,7 @@ msgstr ""
"映像。假如映像找不到,查看 tftp 服务器的日志所需要的映像文件名。"
#. Tag: para
-#: install-methods.xml:1481
+#: install-methods.xml:1490
#, no-c-format
msgid ""
"You can also force some sparc systems to look for a specific file name by "
@@ -2203,13 +2219,13 @@ msgstr ""
"仍然必须被请放置在 TFTP 服务器要查找的目录中。"
#. Tag: title
-#: install-methods.xml:1492
+#: install-methods.xml:1501
#, no-c-format
msgid "SGI TFTP Booting"
msgstr "SGI TFTP 引导"
#. Tag: para
-#: install-methods.xml:1493
+#: install-methods.xml:1502
#, no-c-format
msgid ""
"On SGI machines you can rely on the <command>bootpd</command> to supply the "
@@ -2223,13 +2239,13 @@ msgstr ""
"现在 <filename>/etc/dhcpd.conf</filename>。"
#. Tag: title
-#: install-methods.xml:1601
+#: install-methods.xml:1610
#, no-c-format
msgid "Automatic Installation"
msgstr "自动化安装"
#. Tag: para
-#: install-methods.xml:1602
+#: install-methods.xml:1611
#, no-c-format
msgid ""
"For installing on multiple computers it's possible to do fully automatic "
@@ -2244,13 +2260,13 @@ msgstr ""
"更多细节。"
#. Tag: title
-#: install-methods.xml:1614
+#: install-methods.xml:1623
#, no-c-format
msgid "Automatic Installation Using the &debian; Installer"
msgstr "使用 &debian; 安装程序进行自动安装"
#. Tag: para
-#: install-methods.xml:1615
+#: install-methods.xml:1624
#, no-c-format
msgid ""
"The &debian; Installer supports automating installs via preconfiguration "
@@ -2262,7 +2278,7 @@ msgstr ""
"介质上加载,并自动回答安装过程中的问题。"
#. Tag: para
-#: install-methods.xml:1622
+#: install-methods.xml:1631
#, no-c-format
msgid ""
"Full documentation on preseeding including a working example that you can "
@@ -2270,3 +2286,17 @@ msgid ""
msgstr ""
"在 <xref linkend=\"appendix-preseed\"/> 是有关预置文件的完整文档,并有一些可"
"以使用的例子供您修改。"
+
+#~ msgid ""
+#~ "A special method can be used to add firmware to the <filename>mini.iso</"
+#~ "filename>. First, write the <filename>mini.iso</filename> to the USB "
+#~ "stick. Next obtain the necessary firmware files. See <xref linkend="
+#~ "\"loading-firmware\"/> for more information about firmware. Now unplug "
+#~ "and replug the USB stick, and two partitions should now be visible on it. "
+#~ "You should mount the second of the two partitions, and unpack the "
+#~ "firmware onto it."
+#~ msgstr ""
+#~ "有一个特殊的方法可以将固件加入 <filename>mini.iso</filename>。首先将 "
+#~ "<filename>mini.iso</filename> 写入 U 盘。接着取得所需的固件。参阅 <xref "
+#~ "linkend=\"loading-firmware\"/> 了解固件信息。然后拔插 U 盘,会有两个分区出"
+#~ "现在 U 盘上。您应该挂载第二个分区,并将固件解压到里面。"
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index 4519e5225..070641b5f 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: 2012-10-24 19:53+0000\n"
+"POT-Creation-Date: 2012-12-29 10:09+0000\n"
"PO-Revision-Date: 2012-11-25 23:32+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -440,6 +440,19 @@ msgstr ""
#: installation-howto.xml:255
#, no-c-format
msgid ""
+"Setting up your clock and time zone is followed by the creation of user "
+"accounts. By default you are asked to provide a password for the "
+"<quote>root</quote> (administrator) account and information necessary to "
+"create one regular user account. If you do not specify a password for the "
+"<quote>root</quote> user this account will be disabled but the "
+"<command>sudo</command> package will be installed later to enable "
+"administrative tasks to be carried out on the new system."
+msgstr ""
+
+#. Tag: para
+#: installation-howto.xml:264
+#, no-c-format
+msgid ""
"Now it is time to partition your disks. First you will be given the "
"opportunity to automatically partition either an entire drive, or available "
"free space on a drive (see <xref linkend=\"partman-auto\"/>). This is "
@@ -452,7 +465,7 @@ msgstr ""
"guimenuitem>。"
#. Tag: para
-#: installation-howto.xml:263
+#: installation-howto.xml:272
#, no-c-format
msgid ""
"If you have an existing DOS or Windows partition that you want to preserve, "
@@ -466,7 +479,7 @@ msgstr ""
"装空间:只需选择该分区,并指定它的新尺寸。"
#. Tag: para
-#: installation-howto.xml:270
+#: installation-howto.xml:279
#, no-c-format
msgid ""
"On the next screen you will see your partition table, how the partitions "
@@ -488,7 +501,7 @@ msgstr ""
"\"partitioning\"/> 有更多关于分区方面的信息。"
#. Tag: para
-#: installation-howto.xml:283
+#: installation-howto.xml:292
#, no-c-format
msgid ""
"Now &d-i; formats your partitions and starts to install the base system, "
@@ -498,7 +511,7 @@ msgstr ""
"装内核。"
#. Tag: para
-#: installation-howto.xml:288
+#: installation-howto.xml:297
#, no-c-format
msgid ""
"The base system that was installed earlier is a working, but very minimal "
@@ -518,19 +531,7 @@ msgstr ""
"quote>任务。参阅 <xref linkend=\"pkgsel\"/> 了解本步骤的详细信息。"
#. Tag: para
-#: installation-howto.xml:300
-#, no-c-format
-msgid ""
-"Installation of the base system is followed by setting up user accounts. By "
-"default you will need to provide a password for the <quote>root</quote> "
-"(administrator) account and information necessary to create one regular user "
-"account."
-msgstr ""
-"安装基本系统之后是建立用户帐号。默认情况下,您需要为 <quote>root</quote> (管"
-"理员) 帐号设置密码,并建立一个普通用户帐号。"
-
-#. Tag: para
-#: installation-howto.xml:307
+#: installation-howto.xml:309
#, no-c-format
msgid ""
"The last step is to install a boot loader. If the installer detects other "
@@ -546,7 +547,7 @@ msgstr ""
"它这样做,而是把 GRUB 装在其它什么地方。</phrase>"
#. Tag: para
-#: installation-howto.xml:317
+#: installation-howto.xml:319
#, no-c-format
msgid ""
"&d-i; will now tell you that the installation has finished. Remove the cdrom "
@@ -559,7 +560,7 @@ msgstr ""
"<xref linkend=\"boot-new\"/> 有对它的详尽说明。"
#. Tag: para
-#: installation-howto.xml:324
+#: installation-howto.xml:326
#, no-c-format
msgid ""
"If you need more information on the install process, see <xref linkend=\"d-i-"
@@ -567,13 +568,13 @@ msgid ""
msgstr "如果您想要更多的安装过程相关信息,请看 <xref linkend=\"d-i-intro\"/>。"
#. Tag: title
-#: installation-howto.xml:333
+#: installation-howto.xml:335
#, no-c-format
msgid "Send us an installation report"
msgstr "请给我们发一份安装报告"
#. Tag: para
-#: installation-howto.xml:334
+#: installation-howto.xml:336
#, no-c-format
msgid ""
"If you successfully managed an installation with &d-i;, please take time to "
@@ -588,7 +589,7 @@ msgstr ""
"然后执行 <command>reportbug installation-reports</command>。"
#. Tag: para
-#: installation-howto.xml:344
+#: installation-howto.xml:346
#, no-c-format
msgid ""
"If you did not complete the install, you probably found a bug in debian-"
@@ -603,13 +604,13 @@ msgstr ""
"\"problem-report\"/>。"
#. Tag: title
-#: installation-howto.xml:356
+#: installation-howto.xml:358
#, no-c-format
msgid "And finally&hellip;"
msgstr "末了&hellip;"
#. Tag: para
-#: installation-howto.xml:357
+#: installation-howto.xml:359
#, no-c-format
msgid ""
"We hope that your &debian; installation is pleasant and that you find "
@@ -617,3 +618,12 @@ msgid ""
msgstr ""
"我们祝愿您安装 &debian; 顺利愉快,并希望您能发现 &debian; 的用武之地。还有您"
"也许可以读一下 <xref linkend=\"post-install\"/>。"
+
+#~ msgid ""
+#~ "Installation of the base system is followed by setting up user accounts. "
+#~ "By default you will need to provide a password for the <quote>root</"
+#~ "quote> (administrator) account and information necessary to create one "
+#~ "regular user account."
+#~ msgstr ""
+#~ "安装基本系统之后是建立用户帐号。默认情况下,您需要为 <quote>root</quote> "
+#~ "(管理员) 帐号设置密码,并建立一个普通用户帐号。"
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index a388ff513..92a645563 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: 2012-10-24 19:53+0000\n"
+"POT-Creation-Date: 2012-12-29 10:09+0000\n"
"PO-Revision-Date: 2012-11-26 15:04+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -5123,14 +5123,28 @@ msgstr ""
"假如了解设备毋需固件也可以工作,或者设备在安装时并不需要使用,您可以跳过加载"
"固件。"
+#. Tag: para
+#: using-d-i.xml:3504
+#, no-c-format
+msgid ""
+"&d-i; only prompts for firmware needed by kernel modules loaded during the "
+"installation. Not all drivers are included in &d-i;, in particular radeon is "
+"not, so this implies that the capabilities of some devices may be no "
+"different at the end of the installation from what they were at the "
+"beginning. Consequently, some of your hardware may not be being used to its "
+"full potential. If you suspect this is the case, or are just curious, it is "
+"not a bad idea to check the output of the <command>dmesg</command> command "
+"on the newly booted system and search for <quote>firmware</quote>."
+msgstr ""
+
#. Tag: title
-#: using-d-i.xml:3506
+#: using-d-i.xml:3518
#, no-c-format
msgid "Preparing a medium"
msgstr "准备介质"
#. Tag: para
-#: using-d-i.xml:3507
+#: using-d-i.xml:3519
#, no-c-format
msgid ""
"Official CD images do not include non-free firmware. The most common method "
@@ -5150,7 +5164,7 @@ msgstr ""
"下。推荐使用 FAT 文件系统,因为在安装过程的早期阶段它肯定能被支持。"
#. Tag: para
-#: using-d-i.xml:3520
+#: using-d-i.xml:3532
#, no-c-format
msgid ""
"Tarballs and zip files containing current packages for the most common "
@@ -5165,7 +5179,7 @@ msgstr ""
"件系统里面。"
#. Tag: para
-#: using-d-i.xml:3534
+#: using-d-i.xml:3546
#, no-c-format
msgid ""
"If the firmware you need is not included in the tarball, you can also "
@@ -5178,7 +5192,7 @@ msgstr ""
"件。以下概要列出大多数固件软件包,但不保证完整,有些还是非固件软件包:"
#. Tag: para
-#: using-d-i.xml:3548
+#: using-d-i.xml:3560
#, no-c-format
msgid ""
"It is also possible to copy individual firmware files to the medium. Loose "
@@ -5189,13 +5203,13 @@ msgstr ""
"造商那里获得。"
#. Tag: title
-#: using-d-i.xml:3557
+#: using-d-i.xml:3569
#, no-c-format
msgid "Firmware and the Installed System"
msgstr "固件和安装好的系统"
#. Tag: para
-#: using-d-i.xml:3558
+#: using-d-i.xml:3570
#, no-c-format
msgid ""
"Any firmware loaded during the installation will be copied automatically to "
@@ -5210,7 +5224,7 @@ msgstr ""
"序不同的内核版本,有可能由于版本的偏差造成固件不能加载。"
#. Tag: para
-#: using-d-i.xml:3567
+#: using-d-i.xml:3579
#, no-c-format
msgid ""
"If the firmware was loaded from a firmware package, &d-i; will also install "
@@ -5224,7 +5238,7 @@ msgstr ""
"做的优点在于如果有固件的新版本存在会自动更新。"
#. Tag: para
-#: using-d-i.xml:3575
+#: using-d-i.xml:3587
#, no-c-format
msgid ""
"If loading the firmware was skipped during the installation, the relevant "
@@ -5235,7 +5249,7 @@ msgstr ""
"安装好固件或软件包。"
#. Tag: para
-#: using-d-i.xml:3582
+#: using-d-i.xml:3594
#, no-c-format
msgid ""
"If the firmware was loaded from loose firmware files, the firmware copied to "