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.po1133
-rw-r--r--po/zh_CN/boot-new.po11
-rw-r--r--po/zh_CN/hardware.po1127
-rw-r--r--po/zh_CN/install-methods.po307
-rw-r--r--po/zh_CN/partitioning.po240
-rw-r--r--po/zh_CN/post-install.po48
-rw-r--r--po/zh_CN/preparing.po537
-rw-r--r--po/zh_CN/preseed.po6
-rw-r--r--po/zh_CN/random-bits.po644
-rw-r--r--po/zh_CN/using-d-i.po591
10 files changed, 2773 insertions, 1871 deletions
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 66659e12b..efbb018ba 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: 2015-03-22 13:58+0000\n"
+"POT-Creation-Date: 2015-04-15 20:29+0000\n"
"PO-Revision-Date: 2015-03-21 18:13+0100\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -70,10 +70,10 @@ msgstr ""
#: boot-installer.xml:47
#, no-c-format
msgid ""
-"uImage/uInitrd are image formats designed for the u-boot firmware that is "
-"used on many ARM-based systems. Older u-boot versions can only boot files in "
+"uImage/uInitrd are image formats designed for the U-Boot firmware that is "
+"used on many ARM-based systems. Older U-Boot versions can only boot files in "
"uImage/uInitrd format, so these are often used on older armel systems. Newer "
-"u-boot versions can - besides booting uImages/uInitrds - also boot standard "
+"U-Boot versions can - besides booting uImages/uInitrds - also boot standard "
"Linux kernels and ramdisk images, but the command syntax to do that is "
"slightly different from that for booting uImages."
msgstr ""
@@ -89,7 +89,35 @@ msgid ""
msgstr ""
#. Tag: title
-#: boot-installer.xml:64
+#: boot-installer.xml:65
+#, fuzzy, no-c-format
+#| msgid "Boot Configuration"
+msgid "Console configuration"
+msgstr "引导配置"
+
+#. Tag: para
+#: boot-installer.xml:66
+#, no-c-format
+msgid ""
+"The netboot tarball (<xref linkend=\"boot-armhf-netboot.tar.gz\"/>), the hd-"
+"media tarball (<xref linkend=\"boot-hd-media\"/>) and the installer SD-card "
+"images (<xref linkend=\"boot-installer-sd-image\"/>) use the (platform-"
+"specific) default console that is defined by U-Boot in the <quote>console</"
+"quote> variable. In most cases that is a serial console, so on those "
+"platforms you by default need a serial console cable to use the installer."
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:75
+#, no-c-format
+msgid ""
+"On platforms which also support a video console, you can modify the U-Boot "
+"<quote>console</quote> variable accordingly if you would like the installer "
+"to start on the video console."
+msgstr ""
+
+#. Tag: title
+#: boot-installer.xml:82
#, fuzzy, no-c-format
#| msgid "Booting from TFTP"
msgid "Booting by TFTP"
@@ -97,8 +125,8 @@ msgstr "从 TFTP 引导"
# index.docbook:432, index.docbook:786, index.docbook:1338, index.docbook:1819, index.docbook:2242, index.docbook:2338
#. Tag: para
-#: boot-installer.xml:70 boot-installer.xml:689 boot-installer.xml:1311
-#: boot-installer.xml:1495 boot-installer.xml:1818 boot-installer.xml:1928
+#: boot-installer.xml:88 boot-installer.xml:727 boot-installer.xml:1362
+#: boot-installer.xml:1546 boot-installer.xml:1868 boot-installer.xml:2016
#, fuzzy, no-c-format
#| msgid ""
#| "Booting from the network requires that you have a network connection and "
@@ -113,8 +141,8 @@ msgstr ""
# index.docbook:437, index.docbook:791, index.docbook:1343, index.docbook:1824, index.docbook:2247, index.docbook:2343
#. Tag: para
-#: boot-installer.xml:76 boot-installer.xml:695 boot-installer.xml:1317
-#: boot-installer.xml:1501 boot-installer.xml:1824 boot-installer.xml:1934
+#: boot-installer.xml:94 boot-installer.xml:733 boot-installer.xml:1368
+#: boot-installer.xml:1552 boot-installer.xml:1874 boot-installer.xml:2022
#, no-c-format
msgid ""
"Older systems such as the 715 might require the use of an RBOOT server "
@@ -123,8 +151,8 @@ msgstr "较早的系统比如 715 也许需要使用一台 RBOOT 服务器来取
# index.docbook:442, index.docbook:796, index.docbook:1348, index.docbook:1829, index.docbook:2252, index.docbook:2348
#. Tag: para
-#: boot-installer.xml:81 boot-installer.xml:700 boot-installer.xml:1322
-#: boot-installer.xml:1506 boot-installer.xml:1829 boot-installer.xml:1939
+#: boot-installer.xml:99 boot-installer.xml:738 boot-installer.xml:1373
+#: boot-installer.xml:1557 boot-installer.xml:1879 boot-installer.xml:2027
#, fuzzy, no-c-format
#| msgid ""
#| "The installation method to support network booting is described in <xref "
@@ -135,22 +163,22 @@ msgid ""
msgstr "支持的网络引导安装方法在 <xref linkend=\"install-tftp\"/>。"
#. Tag: title
-#: boot-installer.xml:90
+#: boot-installer.xml:108
#, no-c-format
-msgid "TFTP-booting in u-boot"
+msgid "TFTP-booting in U-Boot"
msgstr ""
#. Tag: para
-#: boot-installer.xml:91
+#: boot-installer.xml:109
#, no-c-format
msgid ""
-"Network booting on systems using the u-boot firmware consists of three "
+"Network booting on systems using the U-Boot firmware consists of three "
"steps: a) configuring the network, b) loading the images (kernel/initial "
"ramdisk/dtb) into memory and c) actually executing the previosly loaded code."
msgstr ""
#. Tag: para
-#: boot-installer.xml:97
+#: boot-installer.xml:115
#, no-c-format
msgid ""
"First you have to configure the network, either automatically via DHCP by "
@@ -169,13 +197,13 @@ msgid ""
msgstr ""
#. Tag: screen
-#: boot-installer.xml:104
+#: boot-installer.xml:122
#, no-c-format
msgid "saveenv"
msgstr ""
#. Tag: para
-#: boot-installer.xml:106
+#: boot-installer.xml:124
#, no-c-format
msgid ""
"Afterwards you need to load the images (kernel/initial ramdisk/dtb) into "
@@ -186,10 +214,10 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-installer.xml:114
+#: boot-installer.xml:132
#, no-c-format
msgid ""
-"On some systems, u-boot predefines a set of environment variables with "
+"On some systems, U-Boot predefines a set of environment variables with "
"suitable load addresses: kernel_addr_r, ramdisk_addr_r and fdt_addr_r. You "
"can check whether they are defined by running <informalexample><screen>\n"
"printenv kernel_addr_r ramdisk_addr_r fdt_addr_r\n"
@@ -201,7 +229,7 @@ msgid ""
msgstr ""
#. Tag: screen
-#: boot-installer.xml:125
+#: boot-installer.xml:143
#, no-c-format
msgid ""
"setenv kernel_addr_r 0x46000000\n"
@@ -210,7 +238,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-installer.xml:127
+#: boot-installer.xml:145
#, no-c-format
msgid ""
"When the load addresses are defined, you can load the images into memory "
@@ -218,7 +246,7 @@ msgid ""
msgstr ""
#. Tag: screen
-#: boot-installer.xml:130
+#: boot-installer.xml:148
#, no-c-format
msgid ""
"tftpboot ${kernel_addr_r} &lt;filename of the kernel image&gt;\n"
@@ -227,11 +255,11 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-installer.xml:132
+#: boot-installer.xml:150
#, no-c-format
msgid ""
"The third part is setting the kernel commandline and actually executing the "
-"loaded code. U-boot passes the content of the <quote>bootargs</quote> "
+"loaded code. U-Boot passes the content of the <quote>bootargs</quote> "
"environment variable as commandline to the kernel, so any parameters for the "
"kernel and the installer - such as the console device (see <xref linkend="
"\"boot-console\"/>) or preseeding options (see <xref linkend=\"installer-args"
@@ -246,42 +274,94 @@ msgid ""
msgstr ""
#. Tag: screen
-#: boot-installer.xml:145
+#: boot-installer.xml:163
#, no-c-format
msgid "bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r}"
msgstr ""
#. Tag: para
-#: boot-installer.xml:147
+#: boot-installer.xml:165
#, no-c-format
msgid ""
"Note: When booting standard linux images, it is important to load the "
-"initial ramdisk image after the kernel and the dtb as u-boot sets the "
+"initial ramdisk image after the kernel and the dtb as U-Boot sets the "
"filesize variable to the size of the last file loaded and the bootz command "
"requires the size of the ramdisk image to work correctly. In case of booting "
"a platform-specific kernel, i.e. a kernel without device-tree, simply omit "
"the ${fdt_addr_r} parameter."
msgstr ""
+#. Tag: title
+#: boot-installer.xml:176
+#, no-c-format
+msgid "Pre-built netboot tarball"
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:177
+#, no-c-format
+msgid ""
+"&debian; provides a pre-built tarball (&armmp-netboot-tarball;) that can "
+"simply be unpacked on your tftp server and contains all files necessary for "
+"netbooting. It also includes a boot script that automates all steps to load "
+"the installer. Modern U-Boot versions contain a tftp autoboot feature that "
+"becomes active if there is no bootable local storage device (MMC/SD, USB, "
+"IDE/SATA/SCSI) and then loads this boot script from the tftp server. "
+"Prerequisite for using this feature is that you have a dhcp server in your "
+"network which provides the client with the address of the tftp server."
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:189
+#, no-c-format
+msgid ""
+"If you would like to trigger the tftp autoboot feature from the U-Boot "
+"commandline, you can use the follwing command:"
+msgstr ""
+
+#. Tag: screen
+#: boot-installer.xml:192
+#, no-c-format
+msgid "run bootcmd_dhcp"
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:194
+#, no-c-format
+msgid ""
+"To manually load the bootscript provided by the tarball, you can "
+"alternatively issue the following commands at the U-Boot prompt:"
+msgstr ""
+
+#. Tag: screen
+#: boot-installer.xml:198
+#, no-c-format
+msgid ""
+"setenv autoload no\n"
+"dhcp\n"
+"tftpboot ${scriptaddr} /debian-installer/armhf/tftpboot.scr\n"
+"source ${scriptaddr}"
+msgstr ""
+
# index.docbook:700, index.docbook:2176
#. Tag: title
-#: boot-installer.xml:160
+#: boot-installer.xml:206
#, fuzzy, no-c-format
#| msgid "Booting from USB memory stick"
-msgid "Booting from a USB stick in u-boot"
+msgid "Booting from a USB stick in U-Boot"
msgstr "从 U 盘引导"
#. Tag: para
-#: boot-installer.xml:161
+#: boot-installer.xml:207
#, no-c-format
msgid ""
-"Many modern u-boot versions have USB support and allow booting from USB mass "
+"Many modern U-Boot versions have USB support and allow booting from USB mass "
"storage devices such as USB sticks. Unfortunately the exact steps required "
"to do that can vary quite a bit from device to device."
msgstr ""
#. Tag: para
-#: boot-installer.xml:168
+#: boot-installer.xml:214
#, no-c-format
msgid ""
"U-Boot v2014.10 has introduced a common commandline handling and autoboot "
@@ -292,69 +372,166 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-installer.xml:177
+#: boot-installer.xml:223
#, no-c-format
msgid ""
"To build a bootable USB stick for installing &debian;, unpack the hd-media "
"tarball (see <xref linkend=\"where-files\"/>) onto a USB stick formatted "
-"with a filesystem supported by the u-boot version on your device. For modern "
-"u-boot versions, any of FAT16 / FAT32 / ext2 / ext3 / ext4 usually works. "
+"with a filesystem supported by the U-Boot version on your device. For modern "
+"U-Boot versions, any of FAT16 / FAT32 / ext2 / ext3 / ext4 usually works. "
"Then copy the ISO image file of the first &debian; installation CD or DVD "
"onto the stick."
msgstr ""
#. Tag: para
-#: boot-installer.xml:187
+#: boot-installer.xml:233
#, no-c-format
msgid ""
-"The autoboot framework in modern u-boot versions works similar to the boot "
+"The autoboot framework in modern U-Boot versions works similar to the boot "
"ordering options in a PC BIOS, i.e. it checks a list of possible boot "
"devices for a valid boot image and starts the first one it finds. If there "
"is no operating system installed, plugging in the USB stick and powering up "
"the system should result in starting the installer. You can also initiate "
-"the USB-boot process any time from the u-boot prompt by entering the "
+"the USB-boot process any time from the U-Boot prompt by entering the "
"<quote>run bootcmd_usb0</quote> command."
msgstr ""
#. Tag: para
-#: boot-installer.xml:197
+#: boot-installer.xml:243
#, no-c-format
msgid ""
"One problem that can come up when booting from a USB stick while using a "
"serial console can be a console baudrate mismatch. If a console variable is "
-"defined in u-boot, the &d-i; boot script automatically passes it to the "
+"defined in U-Boot, the &d-i; boot script automatically passes it to the "
"kernel to set the primary console device and, if applicable, the console "
"baudrate. Unfortunately the handling of the console variable varies from "
"platform to platform - on some platforms, the console variable includes the "
"baudrate (as in <quote>console=ttyS0,115200</quote>), while on other "
"platforms the console variable contains only the device (as in "
"<quote>console=ttyS0</quote>). The latter case leads to a garbled console "
-"output when the default baudrate differs between u-boot and the kernel. "
-"Modern u-boot versions often use 115200 baud while the kernel still defaults "
+"output when the default baudrate differs between U-Boot and the kernel. "
+"Modern U-Boot versions often use 115200 baud while the kernel still defaults "
"to the traditional 9600 baud. If this happens, you should manually set the "
"console variable to contain the correct baudrate for your system and then "
"start the installer with the <quote>run bootcmd_usb0</quote> command."
msgstr ""
+#. Tag: title
+#: boot-installer.xml:264
+#, no-c-format
+msgid "Using pre-built SD-card images with the installer"
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:265
+#, no-c-format
+msgid ""
+"For a number of systems, Debian provides SD card images that contain both U-"
+"Boot and the &d-i;. These images are provided in two variants - one for "
+"downloading the software packages over the network (available at &armmp-"
+"netboot-sd-img;) and one for offline installations using a Debian CD/DVD "
+"(available at &armmp-hd-media-sd-img;). To save space and network bandwidth, "
+"the images consist of two parts - a system-dependent part named "
+"<quote>firmware.&lt;system-type&gt;.img.gz</quote>, and a system-independent "
+"part named <quote>partition.img.gz</quote>."
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:276
+#, no-c-format
+msgid ""
+"To create a complete image from the two parts on Linux systems, you can use "
+"zcat as follows: <informalexample><screen>zcat firmware.&lt;system-type&gt;."
+"img.gz partition.img.gz > complete_image.img</screen></informalexample> On "
+"Windows systems, you have to first decompress the two parts separately, "
+"which can be done e.g. by using 7-Zip, and then concatenate the decompressed "
+"parts together by running the command <informalexample><screen>copy /b "
+"firmware.&lt;system-type&gt;.img + partition.img complete_image.img</"
+"screen></informalexample> in a Windows CMD.exe window."
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:290
+#, no-c-format
+msgid ""
+"Write the resulting image onto an SD card, e.g. by running the following "
+"command on a Linux system: <informalexample><screen>cat complete_image.img "
+"> /dev/SD_CARD_DEVICE</screen></informalexample> After plugging the SD card "
+"into the target system and powering the system up, the installer is loaded "
+"from the SD card. If you use the hd-media variant for offline installations, "
+"you must provide the installer with access to the first &debian; CD/DVD on a "
+"separate medium, which can e.g. be a CD/DVD ISO image on a USB stick."
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:302
+#, no-c-format
+msgid ""
+"When you come to the partitioning step in the installer (see <xref linkend="
+"\"di-partition\"/>), you can delete or replace any previous partitions on "
+"the card. Once the installer is started, it runs completely in the system's "
+"main memory and does not need to access the SD card anymore, so you can use "
+"the full card for installing &debian;. The easiest way to create a proper "
+"partition layout on the SD card is to let the installer automatically create "
+"one for you (see <xref linkend=\"partman-auto\"/>)."
+msgstr ""
+
+# index.docbook:700, index.docbook:2176
+#. Tag: title
+#: boot-installer.xml:443
+#, no-c-format
+msgid "Booting from USB Memory Stick"
+msgstr "从 U 盘引导"
+
+#. Tag: para
+#: boot-installer.xml:449
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Let's assume you have prepared everything from <xref linkend=\"boot-dev-"
+#| "select\"/> and <xref linkend=\"boot-usb-files\"/>. Now just plug your USB "
+#| "stick into some free USB connector and reboot the computer. The system "
+#| "should boot up, and unless you have used the flexible way to build the "
+#| "stick and not enabled it, you should be presented with the <prompt>boot:</"
+#| "prompt> prompt. Here you can enter optional boot arguments, or just hit "
+#| "&enterkey;."
+msgid ""
+"If your computer will boot from USB, this will probably be the easiest route "
+"for installation. Assuming you have prepared everything from <xref linkend="
+"\"boot-dev-select\"/> and <xref linkend=\"boot-usb-files\"/>, just plug your "
+"USB stick into some free USB connector and reboot the computer. The system "
+"should boot up, and unless you have used the flexible way to build the stick "
+"and not enabled it, you should be presented with a graphical boot menu. Here "
+"you can select various installer options, or just hit &enterkey;."
+msgstr ""
+"假设您已经准备好了从 <xref linkend=\"boot-dev-select\"/> 到 <xref linkend="
+"\"boot-usb-files\"/> 的所有步骤。现在只需插入 U 盘到一个空的 USB 插槽并重启。"
+"除非您使用了灵活方式创建 U 盘并不激活,系统应该引导,并看到一个 <prompt>boot:"
+"</prompt> 提示符。此时您可以输入一些引导选项,也可以直接按 &enterkey;。"
+
# index.docbook:578, index.docbook:951, index.docbook:1764, index.docbook:2018, index.docbook:2372
#. Tag: title
-#: boot-installer.xml:345 boot-installer.xml:924 boot-installer.xml:1581
-#: boot-installer.xml:1962
+#: boot-installer.xml:463 boot-installer.xml:976 boot-installer.xml:1632
+#: boot-installer.xml:2050
#, no-c-format
msgid "Booting from a CD-ROM"
msgstr "从 CD-ROM 启动"
# index.docbook:531, index.docbook:584, index.docbook:957, index.docbook:1776, index.docbook:2024, index.docbook:2378
#. Tag: para
-#: boot-installer.xml:351 boot-installer.xml:930 boot-installer.xml:1587
-#: boot-installer.xml:1968
-#, no-c-format
+#: boot-installer.xml:469 boot-installer.xml:982 boot-installer.xml:1638
+#: boot-installer.xml:2056
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The easiest route for most people will be to use a set of &debian; CDs. "
+#| "If you have a CD set, and if your machine supports booting directly off "
+#| "the CD, great! Simply <phrase arch=\"x86\"> configure your system for "
+#| "booting off a CD as described in <xref linkend=\"boot-dev-select\"/>, </"
+#| "phrase> insert your CD, reboot, and proceed to the next chapter."
msgid ""
-"The easiest route for most people will be to use a set of &debian; CDs. If "
-"you have a CD set, and if your machine supports booting directly off the CD, "
-"great! Simply <phrase arch=\"x86\"> configure your system for booting off a "
-"CD as described in <xref linkend=\"boot-dev-select\"/>, </phrase> insert "
-"your CD, reboot, and proceed to the next chapter."
+"If you have a CD set, and if your machine supports booting directly off the "
+"CD, great! Simply <phrase arch=\"x86\"> configure your system for booting "
+"off a CD as described in <xref linkend=\"boot-dev-select\"/>, </phrase> "
+"insert your CD, reboot, and proceed to the next chapter."
msgstr ""
"对于大多数人来说,最快的途径是使用一套 &debian; CD 光盘套件。如果您有此套件,"
"并且如果您的机器支持直接 CD 引导,太棒了!只需要<phrase arch=\"x86\">配置您的"
@@ -363,8 +540,8 @@ msgstr ""
# index.docbook:542, index.docbook:595, index.docbook:968, index.docbook:1787, index.docbook:2035, index.docbook:2389
#. Tag: para
-#: boot-installer.xml:362 boot-installer.xml:941 boot-installer.xml:1598
-#: boot-installer.xml:1979
+#: boot-installer.xml:479 boot-installer.xml:992 boot-installer.xml:1648
+#: boot-installer.xml:2066
#, no-c-format
msgid ""
"Note that certain CD drives may require special drivers, and thus be "
@@ -379,8 +556,8 @@ msgstr ""
# index.docbook:550, index.docbook:603, index.docbook:976, index.docbook:1795, index.docbook:2043, index.docbook:2397
#. Tag: para
-#: boot-installer.xml:370 boot-installer.xml:949 boot-installer.xml:1606
-#: boot-installer.xml:1987
+#: boot-installer.xml:487 boot-installer.xml:1000 boot-installer.xml:1656
+#: boot-installer.xml:2074
#, fuzzy, no-c-format
#| msgid ""
#| "Even if you cannot boot from CD-ROM, you can probably install the "
@@ -401,8 +578,8 @@ msgstr ""
# index.docbook:558, index.docbook:611, index.docbook:984, index.docbook:1803, index.docbook:2051, index.docbook:2405
#. Tag: para
-#: boot-installer.xml:378 boot-installer.xml:957 boot-installer.xml:1614
-#: boot-installer.xml:1995
+#: boot-installer.xml:495 boot-installer.xml:1008 boot-installer.xml:1664
+#: boot-installer.xml:2082
#, no-c-format
msgid ""
"If you have problems booting, see <xref linkend=\"boot-troubleshooting\"/>."
@@ -410,19 +587,19 @@ msgstr ""
"如果您遇到引导方面的问题,请参见 <xref linkend=\"boot-troubleshooting\"/>。"
#. Tag: title
-#: boot-installer.xml:452
+#: boot-installer.xml:505
#, no-c-format
msgid "Booting from Windows"
msgstr "从 Windows 引导"
#. Tag: para
-#: boot-installer.xml:453
+#: boot-installer.xml:506
#, no-c-format
msgid "To start the installer from Windows, you can either"
msgstr "从 Windows 下启动安装程序,您可以"
#. Tag: para
-#: boot-installer.xml:458
+#: boot-installer.xml:511
#, no-c-format
msgid ""
"obtain CD-ROM/DVD-ROM<phrase condition=\"bootable-usb\"> or USB memory "
@@ -435,7 +612,7 @@ msgstr ""
"condition=\"bootable-usb\"> 或 U 盘</phrase> 安装介质,或"
#. Tag: para
-#: boot-installer.xml:466
+#: boot-installer.xml:519
#, no-c-format
msgid ""
"download a standalone Windows executable, which is available as tools/win32-"
@@ -445,7 +622,7 @@ msgstr ""
"stable/win32-loader.exe."
#. Tag: para
-#: boot-installer.xml:474
+#: boot-installer.xml:527
#, no-c-format
msgid ""
"If you use an installation CD or DVD, a pre-installation program should be "
@@ -459,7 +636,7 @@ msgstr ""
"<command>setup.exe</command> 程序。"
#. Tag: para
-#: boot-installer.xml:482
+#: boot-installer.xml:535
#, no-c-format
msgid ""
"After the program has been started, a few preliminary questions will be "
@@ -470,14 +647,14 @@ msgstr ""
"序。"
#. Tag: title
-#: boot-installer.xml:492
+#: boot-installer.xml:545
#, fuzzy, no-c-format
#| msgid "Booting from DOS"
msgid "Booting from DOS using loadlin"
msgstr "从 DOS 引导"
#. Tag: para
-#: boot-installer.xml:493
+#: boot-installer.xml:546
#, no-c-format
msgid ""
"Boot into DOS (not Windows). To do this, you can for instance boot from a "
@@ -485,7 +662,7 @@ msgid ""
msgstr "要启动到 DOS (非 Windows),您可以从一个用于恢复或诊断的磁盘引导。"
#. Tag: para
-#: boot-installer.xml:498
+#: boot-installer.xml:551
#, no-c-format
msgid ""
"If you can access the installation CD, change the current drive to the CD-"
@@ -502,7 +679,7 @@ msgstr ""
"\"/> 指引准备好了硬盘, 然后切换到该磁盘。"
#. Tag: para
-#: boot-installer.xml:508
+#: boot-installer.xml:561
#, no-c-format
msgid ""
"Enter the subdirectory for the flavor you chose, e.g., "
@@ -523,7 +700,7 @@ msgstr ""
"会加载并运行安装程序。"
#. Tag: title
-#: boot-installer.xml:526
+#: boot-installer.xml:579
#, fuzzy, no-c-format
#| msgid ""
#| "Booting from Linux Using <command>LILO</command> or <command>GRUB</"
@@ -533,7 +710,7 @@ msgid ""
msgstr "引导 Linux 使用 <command>LILO</command> 或 <command>GRUB</command>"
#. Tag: para
-#: boot-installer.xml:529
+#: boot-installer.xml:582
#, no-c-format
msgid ""
"To boot the installer from hard disk, you must first download and place the "
@@ -543,7 +720,7 @@ msgstr ""
"<xref linkend=\"boot-drive-files\"/>。"
#. Tag: para
-#: boot-installer.xml:534
+#: boot-installer.xml:587
#, no-c-format
msgid ""
"If you intend to use the hard drive only for booting and then download "
@@ -559,7 +736,7 @@ msgstr ""
"您重新分区用于引导的硬盘,需要小心操作。"
#. Tag: para
-#: boot-installer.xml:544
+#: boot-installer.xml:597
#, no-c-format
msgid ""
"Alternatively, if you intend to keep an existing partition on the hard drive "
@@ -575,7 +752,7 @@ msgstr ""
"以从硬盘引导,并从 CD/DVD 映像文件上安装,而不使用网络。"
#. Tag: para
-#: boot-installer.xml:553
+#: boot-installer.xml:606
#, no-c-format
msgid ""
"For <command>LILO</command>, you will need to configure two essential things "
@@ -593,7 +770,7 @@ msgstr ""
"lilo.conf</filename> 的例子:"
#. Tag: screen
-#: boot-installer.xml:574
+#: boot-installer.xml:627
#, no-c-format
msgid ""
"image=/boot/newinstall/vmlinuz\n"
@@ -605,7 +782,7 @@ msgstr ""
" initrd=/boot/newinstall/initrd.gz"
#. Tag: para
-#: boot-installer.xml:574
+#: boot-installer.xml:627
#, no-c-format
msgid ""
"For more details, refer to the <citerefentry><refentrytitle>initrd</"
@@ -620,7 +797,7 @@ msgstr ""
"行 <userinput>lilo</userinput> 并且重新启动。"
#. Tag: para
-#: boot-installer.xml:583
+#: boot-installer.xml:636
#, no-c-format
msgid ""
"The procedure for <command>GRUB1</command> is quite similar. Locate your "
@@ -635,7 +812,7 @@ msgstr ""
"boot</filename> 位于系统中第一个磁盘的第一个分区上面):"
#. Tag: screen
-#: boot-installer.xml:591
+#: boot-installer.xml:644
#, no-c-format
msgid ""
"title New Install\n"
@@ -649,7 +826,7 @@ msgstr ""
"initrd /boot/newinstall/initrd.gz"
#. Tag: para
-#: boot-installer.xml:593
+#: boot-installer.xml:646
#, no-c-format
msgid ""
"The procedure for <command>GRUB2</command> is very similar. The file is "
@@ -660,7 +837,7 @@ msgstr ""
"filename> 替代 <filename>menu.lst</filename> 文件。安装程序的入口,例如:"
#. Tag: screen
-#: boot-installer.xml:599
+#: boot-installer.xml:652
#, no-c-format
msgid ""
"menuentry 'New Install' {\n"
@@ -680,7 +857,7 @@ msgstr ""
"}"
#. Tag: para
-#: boot-installer.xml:601
+#: boot-installer.xml:654
#, no-c-format
msgid ""
"From here on, there should be no difference between <command>GRUB</command> "
@@ -689,39 +866,16 @@ msgstr ""
"从这里开始,下面采用 <command>GRUB</command> 或 <command>LILO</command> 将没"
"有什么差别。"
-# index.docbook:700, index.docbook:2176
-#. Tag: title
-#: boot-installer.xml:610
-#, no-c-format
-msgid "Booting from USB Memory Stick"
-msgstr "从 U 盘引导"
-
-#. Tag: para
-#: boot-installer.xml:611
-#, no-c-format
-msgid ""
-"Let's assume you have prepared everything from <xref linkend=\"boot-dev-"
-"select\"/> and <xref linkend=\"boot-usb-files\"/>. Now just plug your USB "
-"stick into some free USB connector and reboot the computer. The system "
-"should boot up, and unless you have used the flexible way to build the stick "
-"and not enabled it, you should be presented with the <prompt>boot:</prompt> "
-"prompt. Here you can enter optional boot arguments, or just hit &enterkey;."
-msgstr ""
-"假设您已经准备好了从 <xref linkend=\"boot-dev-select\"/> 到 <xref linkend="
-"\"boot-usb-files\"/> 的所有步骤。现在只需插入 U 盘到一个空的 USB 插槽并重启。"
-"除非您使用了灵活方式创建 U 盘并不激活,系统应该引导,并看到一个 <prompt>boot:"
-"</prompt> 提示符。此时您可以输入一些引导选项,也可以直接按 &enterkey;。"
-
# index.docbook:723, index.docbook:1876, index.docbook:2278, index.docbook:2426
#. Tag: title
-#: boot-installer.xml:625 boot-installer.xml:1868
+#: boot-installer.xml:663 boot-installer.xml:1918
#, no-c-format
msgid "Booting from Floppies"
msgstr "从软盘引导"
# index.docbook:724, index.docbook:2286
#. Tag: para
-#: boot-installer.xml:626 boot-installer.xml:1876
+#: boot-installer.xml:664 boot-installer.xml:1926
#, no-c-format
msgid ""
"You will have already downloaded the floppy images you needed and created "
@@ -731,7 +885,7 @@ msgstr ""
"\"create-floppy\"/>。"
#. Tag: para
-#: boot-installer.xml:633
+#: boot-installer.xml:671
#, no-c-format
msgid ""
"To boot from the installer boot floppy, place it in the primary floppy "
@@ -741,7 +895,7 @@ msgstr ""
"开。"
#. Tag: para
-#: boot-installer.xml:639
+#: boot-installer.xml:677
#, no-c-format
msgid ""
"For installing from an LS-120 drive (ATAPI version) with a set of floppies, "
@@ -757,7 +911,7 @@ msgstr ""
"(master),那么在提示符下输入 <userinput>install root=/dev/hdc</userinput>。"
#. Tag: para
-#: boot-installer.xml:649
+#: boot-installer.xml:687
#, no-c-format
msgid ""
"Note that on some machines, <keycombo><keycap>Control</keycap> <keycap>Alt</"
@@ -772,7 +926,7 @@ msgstr ""
"选择。在其它情况下,请在引导时使用硬重启。"
#. Tag: para
-#: boot-installer.xml:658
+#: boot-installer.xml:696
#, no-c-format
msgid ""
"The floppy disk will be accessed, and you should then see a screen that "
@@ -782,7 +936,7 @@ msgstr ""
"</prompt> 提示符。"
#. Tag: para
-#: boot-installer.xml:664
+#: boot-installer.xml:702
#, no-c-format
msgid ""
"Once you press &enterkey;, you should see the message "
@@ -798,7 +952,7 @@ msgstr ""
"下面 <xref linkend=\"kernel-msgs\"/> 可以找到。"
#. Tag: para
-#: boot-installer.xml:673
+#: boot-installer.xml:711
#, no-c-format
msgid ""
"After booting from the boot floppy, the root floppy is requested. Insert the "
@@ -811,26 +965,26 @@ msgstr ""
# index.docbook:274, index.docbook:780, index.docbook:1320, index.docbook:1813, index.docbook:1896, index.docbook:2236, index.docbook:2332
#. Tag: title
-#: boot-installer.xml:683 boot-installer.xml:1293 boot-installer.xml:1435
-#: boot-installer.xml:1489 boot-installer.xml:1812 boot-installer.xml:1922
+#: boot-installer.xml:721 boot-installer.xml:1344 boot-installer.xml:1486
+#: boot-installer.xml:1540 boot-installer.xml:1862 boot-installer.xml:2010
#, no-c-format
msgid "Booting with TFTP"
msgstr "用 TFTP 引导"
#. Tag: para
-#: boot-installer.xml:708
+#: boot-installer.xml:746
#, no-c-format
msgid "There are various ways to do a TFTP boot on i386."
msgstr "在 i386 体系上有很多方法用 TFTP 进行引导。"
#. Tag: title
-#: boot-installer.xml:714
+#: boot-installer.xml:752
#, no-c-format
msgid "NIC or Motherboard that support PXE"
msgstr "支持 PXE 的网卡或者主板"
#. Tag: para
-#: boot-installer.xml:715
+#: boot-installer.xml:753
#, no-c-format
msgid ""
"It could be that your Network Interface Card or Motherboard provides PXE "
@@ -843,13 +997,13 @@ msgstr ""
"引导。"
#. Tag: title
-#: boot-installer.xml:726
+#: boot-installer.xml:764
#, no-c-format
msgid "NIC with Network BootROM"
msgstr "网络 BootROM 的网卡"
#. Tag: para
-#: boot-installer.xml:727
+#: boot-installer.xml:765
#, no-c-format
msgid ""
"It could be that your Network Interface Card provides TFTP boot "
@@ -857,7 +1011,7 @@ msgid ""
msgstr "您的网卡很有可能提供了 TFTP 引导功能。"
#. Tag: para
-#: boot-installer.xml:732
+#: boot-installer.xml:770
#, no-c-format
msgid ""
"Let us (<email>&email-debian-boot-list;</email>) know how did you manage it. "
@@ -867,13 +1021,13 @@ msgstr ""
"文档。"
#. Tag: title
-#: boot-installer.xml:740
+#: boot-installer.xml:778
#, no-c-format
msgid "Etherboot"
msgstr "Etherboot"
#. Tag: para
-#: boot-installer.xml:741
+#: boot-installer.xml:779
#, no-c-format
msgid ""
"The <ulink url=\"http://www.etherboot.org\">etherboot project</ulink> "
@@ -884,48 +1038,52 @@ msgstr ""
# index.docbook:1943, index.docbook:2477
#. Tag: title
-#: boot-installer.xml:751
+#: boot-installer.xml:789
#, no-c-format
msgid "The Boot Screen"
msgstr "引导界面"
#. Tag: para
-#: boot-installer.xml:752
+#: boot-installer.xml:790
#, no-c-format
msgid ""
"When the installer boots, you should be presented with a friendly graphical "
-"screen showing the &debian; logo and a menu: <informalexample><screen>\n"
-"Installer boot menu\n"
-"\n"
-"Install\n"
-"Graphical install\n"
-"Advanced options >\n"
-"Help\n"
-"Install with speech synthesis\n"
-"\n"
-"Press ENTER to boot or TAB to edit a menu entry\n"
-"</screen></informalexample> Depending on the installation method you are "
-"using, the <quote>Graphical install</quote> option may not be available. Bi-"
-"arch images additionally have a 64 bit variant for each install option, "
-"right below it, thus almost doubling the number of options."
+"screen showing the &debian; logo and a menu:"
msgstr ""
-"安装程序引导后,您应该看到界面友好的图形画面显示着 &debian; 图标和菜单:"
-"<informalexample><screen>\n"
+
+#. Tag: screen
+#: boot-installer.xml:795
+#, no-c-format
+msgid ""
"Installer boot menu\n"
"\n"
"Install\n"
"Graphical install\n"
"Advanced options >\n"
"Help\n"
-"Install with speech synthesis\n"
-"\n"
-"Press ENTER to boot or TAB to edit a menu entry\n"
-"</screen></informalexample> 根据您使用的不同安装方法,<quote>Graphical "
-"install</quote> 选项可能不会出现。双体系(bi-arch)映像会额外有一个 64 位安装选"
-"项,在其下方,因此会有双倍的选项。"
+"Install with speech synthesis"
+msgstr ""
#. Tag: para
-#: boot-installer.xml:764
+#: boot-installer.xml:799
+#, no-c-format
+msgid ""
+"This graphical screen will look very slightly different depending on how "
+"your computer has booted (BIOS or UEFI), but the same options will be shown."
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:807
+#, no-c-format
+msgid ""
+"Depending on the installation method you are using, the <quote>Graphical "
+"install</quote> option may not be available. Bi-arch images additionally "
+"have a 64 bit variant for each install option, right below it, thus almost "
+"doubling the number of options."
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:814
#, fuzzy, no-c-format
#| msgid ""
#| "For a normal installation, select either the <quote>Install</quote> or "
@@ -945,7 +1103,7 @@ msgstr ""
"quote> 入口已经选中 &mdash; 然后按下 &enterkey; 引导安装程序。"
#. Tag: para
-#: boot-installer.xml:772
+#: boot-installer.xml:822
#, no-c-format
msgid ""
"The <quote>Advanced options</quote> entry gives access to a second menu that "
@@ -956,13 +1114,21 @@ msgstr ""
"expert 模式、rescue 模式和自动安装。"
#. Tag: para
-#: boot-installer.xml:778
-#, no-c-format
+#: boot-installer.xml:828
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you wish or need to add any boot parameters for either the installer "
+#| "or the kernel, press &tabkey;. This will display the default boot command "
+#| "for the selected menu entry and allow to add additional options. The help "
+#| "screens (see below) list some common possible options. Press &enterkey; "
+#| "to boot the installer with your options; pressing &escapekey; will return "
+#| "you to the boot menu and undo any changes you made."
msgid ""
"If you wish or need to add any boot parameters for either the installer or "
-"the kernel, press &tabkey;. This will display the default boot command for "
-"the selected menu entry and allow to add additional options. The help "
-"screens (see below) list some common possible options. Press &enterkey; to "
+"the kernel, press &tabkey; (BIOS boot) or &ekey; (UEFI boot). This will "
+"display the boot command for the selected menu entry and allow you to edit "
+"it to suit your needs. The help screens (see below) list some common "
+"possible options. Press &enterkey; (BIOS boot) or &f10key; (UEFI boot) to "
"boot the installer with your options; pressing &escapekey; will return you "
"to the boot menu and undo any changes you made."
msgstr ""
@@ -972,7 +1138,7 @@ msgstr ""
"您所做的修改。"
#. Tag: para
-#: boot-installer.xml:787
+#: boot-installer.xml:839
#, no-c-format
msgid ""
"Choosing the <quote>Help</quote> entry will result in the first help screen "
@@ -1001,7 +1167,7 @@ msgstr ""
"(例如:<userinput>install fb=false</userinput>)。"
#. Tag: para
-#: boot-installer.xml:805
+#: boot-installer.xml:857
#, no-c-format
msgid ""
"The keyboard is assumed to have a default American English layout at this "
@@ -1017,7 +1183,7 @@ msgstr ""
"说明了如何找到要使用正确的键。"
#. Tag: para
-#: boot-installer.xml:815
+#: boot-installer.xml:867
#, no-c-format
msgid ""
"If you are using a system that has the BIOS configured to use serial "
@@ -1035,7 +1201,7 @@ msgstr ""
"Assistant</quote> (IRA)。"
#. Tag: para
-#: boot-installer.xml:825
+#: boot-installer.xml:877
#, no-c-format
msgid ""
"To bypass the graphical boot screen you can either blindly press &escapekey; "
@@ -1053,13 +1219,13 @@ msgstr ""
"userinput>,这在帮助里面有说明。"
#. Tag: title
-#: boot-installer.xml:841
+#: boot-installer.xml:893
#, no-c-format
msgid "The Graphical Installer"
msgstr ""
#. Tag: para
-#: boot-installer.xml:842
+#: boot-installer.xml:894
#, no-c-format
msgid ""
"The graphical version of the installer is only available for a limited "
@@ -1070,7 +1236,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-installer.xml:850
+#: boot-installer.xml:902
#, no-c-format
msgid ""
"Although the functionality is identical, the graphical installer still has a "
@@ -1082,7 +1248,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-installer.xml:859
+#: boot-installer.xml:911
#, no-c-format
msgid ""
"The graphical installer is available with all CD images and with the hd-"
@@ -1096,7 +1262,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-installer.xml:870
+#: boot-installer.xml:922
#, no-c-format
msgid ""
"There is also a graphical installer image that can be netbooted. And there "
@@ -1108,7 +1274,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-installer.xml:883
+#: boot-installer.xml:935
#, no-c-format
msgid ""
"For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
@@ -1120,7 +1286,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-installer.xml:897
+#: boot-installer.xml:949
#, no-c-format
msgid ""
"Just as with the text-based installer it is possible to add boot parameters "
@@ -1128,7 +1294,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-installer.xml:903
+#: boot-installer.xml:955
#, no-c-format
msgid ""
"The graphical installer requires significantly more memory to run than the "
@@ -1138,7 +1304,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-installer.xml:910
+#: boot-installer.xml:962
#, no-c-format
msgid ""
"If the amount of memory in your system is below &minimum-memory;, the "
@@ -1148,13 +1314,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: boot-installer.xml:965
+#: boot-installer.xml:1016
#, no-c-format
msgid "CD Contents"
msgstr "CD 的内容"
#. Tag: para
-#: boot-installer.xml:967
+#: boot-installer.xml:1018
#, no-c-format
msgid ""
"There are three basic variations of &debian; Install CDs. The "
@@ -1175,7 +1341,7 @@ msgstr ""
"光盘套件,则可以不使用网络就能安装大量软件包,建立完整的系统。"
#. Tag: para
-#: boot-installer.xml:983
+#: boot-installer.xml:1034
#, no-c-format
msgid ""
"The IA-64 architecture uses the next generation Extensible Firmware "
@@ -1198,7 +1364,7 @@ msgstr ""
"MBR 或者引导块记录。"
#. Tag: para
-#: boot-installer.xml:999
+#: boot-installer.xml:1050
#, no-c-format
msgid ""
"The &debian; Installer CD contains a small EFI partition where the "
@@ -1213,7 +1379,7 @@ msgstr ""
"说明如下。"
#. Tag: para
-#: boot-installer.xml:1008
+#: boot-installer.xml:1059
#, no-c-format
msgid ""
"Most of the details of how <command>ELILO</command> actually loads and "
@@ -1232,7 +1398,7 @@ msgstr ""
"查一个 EFI 分区是否合适。"
#. Tag: para
-#: boot-installer.xml:1020
+#: boot-installer.xml:1071
#, no-c-format
msgid ""
"The EFI Boot Manager is presented as the last step of the firmware "
@@ -1252,13 +1418,13 @@ msgstr ""
"用第一个,当然,该选项不可用或者 CD 由于某种原因没法启动,使用第二个。"
#. Tag: title
-#: boot-installer.xml:1039
+#: boot-installer.xml:1090
#, no-c-format
msgid "IMPORTANT"
msgstr "重要"
#. Tag: para
-#: boot-installer.xml:1040
+#: boot-installer.xml:1091
#, no-c-format
msgid ""
"The EFI Boot Manager will select a default boot action, typically the first "
@@ -1275,13 +1441,13 @@ msgstr ""
"command>返回 Boot Manager。"
#. Tag: title
-#: boot-installer.xml:1052
+#: boot-installer.xml:1103
#, no-c-format
msgid "Option 1: Booting from the Boot Option Maintenance Menu"
msgstr "选项 1: 从 Boot Option Maintenance Menu 启动"
#. Tag: para
-#: boot-installer.xml:1059
+#: boot-installer.xml:1110
#, no-c-format
msgid ""
"Insert the CD in the DVD/CD drive and reboot the machine. The firmware will "
@@ -1292,7 +1458,7 @@ msgstr ""
"Boot Manager 页面和菜单。"
#. Tag: para
-#: boot-installer.xml:1065
+#: boot-installer.xml:1116
#, no-c-format
msgid ""
"Select <command>Boot Maintenance Menu</command> from the menu with the arrow "
@@ -1302,7 +1468,7 @@ msgstr ""
"<command>ENTER</command>。会显示一个新菜单。"
#. Tag: para
-#: boot-installer.xml:1071
+#: boot-installer.xml:1122
#, no-c-format
msgid ""
"Select <command>Boot From a File</command> from the menu with the arrow keys "
@@ -1318,7 +1484,7 @@ msgstr ""
"Boot</command>标签。如果您检查菜单行其他部分,会看到对应的设备和控制器信息。"
#. Tag: para
-#: boot-installer.xml:1082
+#: boot-installer.xml:1133
#, no-c-format
msgid ""
"You can choose either of the entries that refer to the CD/DVD drive. Select "
@@ -1334,7 +1500,7 @@ msgstr ""
"的 CD 目录列表,要求您进行(额外的)下一步。"
#. Tag: para
-#: boot-installer.xml:1093
+#: boot-installer.xml:1144
#, no-c-format
msgid ""
"You will only need this step if you chose <command>Debian Inst [Acpi ...</"
@@ -1348,7 +1514,7 @@ msgstr ""
"择,并按下 <command>ENTER</command>。这将进入启动步骤。"
#. Tag: para
-#: boot-installer.xml:1105
+#: boot-installer.xml:1156
#, no-c-format
msgid ""
"These steps start the &debian; boot loader which will display a menu page "
@@ -1359,13 +1525,13 @@ msgstr ""
"进入选择启动内核和选项。"
#. Tag: title
-#: boot-installer.xml:1115
+#: boot-installer.xml:1166
#, no-c-format
msgid "Option 2: Booting from the EFI Shell"
msgstr "选项 2: 从 EFI Shell 启动"
#. Tag: para
-#: boot-installer.xml:1116
+#: boot-installer.xml:1167
#, no-c-format
msgid ""
"If, for some reason, option 1 is not successful, reboot the machine and when "
@@ -1378,7 +1544,7 @@ msgstr ""
"来引导 &debian; 安装程序 CD :"
#. Tag: para
-#: boot-installer.xml:1127
+#: boot-installer.xml:1178
#, no-c-format
msgid ""
"Insert the CD in the DVD/CD drive and reboot the machine. The firmware will "
@@ -1387,7 +1553,7 @@ msgid ""
msgstr "把 CD 放入 DVD/CD 驱动器。"
#. Tag: para
-#: boot-installer.xml:1133
+#: boot-installer.xml:1184
#, no-c-format
msgid ""
"Select <command>EFI Shell</command> from the menu with the arrow keys and "
@@ -1407,7 +1573,7 @@ msgstr ""
"用于初始化 CD 驱动器。"
#. Tag: para
-#: boot-installer.xml:1147
+#: boot-installer.xml:1198
#, no-c-format
msgid ""
"Examine the output from the shell looking for the CDROM drive. It is most "
@@ -1420,7 +1586,7 @@ msgstr ""
"<filename>fs<replaceable>n</replaceable></filename>。"
#. Tag: para
-#: boot-installer.xml:1154
+#: boot-installer.xml:1205
#, no-c-format
msgid ""
"Enter <command>fs<replaceable>n</replaceable>:</command> and press "
@@ -1433,7 +1599,7 @@ msgstr ""
"光盘的分区号。Shell 现在将在提示符下显示分区号。"
#. Tag: para
-#: boot-installer.xml:1161
+#: boot-installer.xml:1212
#, no-c-format
msgid ""
"Enter <command>elilo</command> and press <command>ENTER</command>. This will "
@@ -1443,7 +1609,7 @@ msgstr ""
"骤。"
#. Tag: para
-#: boot-installer.xml:1168
+#: boot-installer.xml:1219
#, no-c-format
msgid ""
"As with option 1, these steps start the &debian; boot loader which will "
@@ -1457,13 +1623,13 @@ msgstr ""
"replaceable>:elilo</command>简短命令。进入选择启动内核和选项。"
#. Tag: title
-#: boot-installer.xml:1182
+#: boot-installer.xml:1233
#, no-c-format
msgid "Installing using a Serial Console"
msgstr "使用串口控制台安装"
#. Tag: para
-#: boot-installer.xml:1184
+#: boot-installer.xml:1235
#, no-c-format
msgid ""
"You may choose to perform an install using a monitor and keyboard or using a "
@@ -1481,7 +1647,7 @@ msgstr ""
"置。"
#. Tag: para
-#: boot-installer.xml:1195
+#: boot-installer.xml:1246
#, no-c-format
msgid ""
"In most circumstances, you will want the installer to use the same baud rate "
@@ -1493,7 +1659,7 @@ msgstr ""
"置,可以通过命令 <command>baud</command> 在 EFI shell 获得。"
#. Tag: para
-#: boot-installer.xml:1202
+#: boot-installer.xml:1253
#, no-c-format
msgid ""
"If there is not an option available that is configured for the serial device "
@@ -1508,7 +1674,7 @@ msgstr ""
"窗口。"
#. Tag: para
-#: boot-installer.xml:1213
+#: boot-installer.xml:1264
#, no-c-format
msgid ""
"Most IA-64 boxes ship with a default console setting of 9600 baud. This "
@@ -1523,7 +1689,7 @@ msgstr ""
"装。参考 <classname>Params</classname> 帮助菜单,获得启动文本模式安装的指导。"
#. Tag: para
-#: boot-installer.xml:1222
+#: boot-installer.xml:1273
#, no-c-format
msgid ""
"If you select the wrong console type, you will be able to select the kernel "
@@ -1535,13 +1701,13 @@ msgstr ""
"核启动后死掉,只有重新启动才能开始安装。"
#. Tag: title
-#: boot-installer.xml:1231
+#: boot-installer.xml:1282
#, no-c-format
msgid "Selecting the Boot Kernel and Options"
msgstr "选择启动内核与选项"
#. Tag: para
-#: boot-installer.xml:1233
+#: boot-installer.xml:1284
#, no-c-format
msgid ""
"The boot loader will display a form with a menu list and a text window with "
@@ -1558,7 +1724,7 @@ msgstr ""
"<classname>Params</classname>窗口解释命令行参数。"
#. Tag: para
-#: boot-installer.xml:1245
+#: boot-installer.xml:1296
#, no-c-format
msgid ""
"Consult the <classname>General</classname> help screen for the description "
@@ -1578,7 +1744,7 @@ msgstr ""
"始安装:"
#. Tag: para
-#: boot-installer.xml:1263
+#: boot-installer.xml:1314
#, no-c-format
msgid ""
"Select the kernel version and installation mode most appropriate to your "
@@ -1586,7 +1752,7 @@ msgid ""
msgstr "使用方向键选择您需要的内核版本和适合的安装模式。"
#. Tag: para
-#: boot-installer.xml:1268
+#: boot-installer.xml:1319
#, no-c-format
msgid ""
"Enter any boot parameters by typing at the keyboard. The text will be "
@@ -1597,7 +1763,7 @@ msgstr ""
"控制台)指定的。"
#. Tag: para
-#: boot-installer.xml:1275
+#: boot-installer.xml:1326
#, no-c-format
msgid ""
"Press <command>ENTER</command>. This will load and start the kernel. The "
@@ -1608,7 +1774,7 @@ msgstr ""
"一个屏幕显示常规的初始化信息。"
#. Tag: para
-#: boot-installer.xml:1284 boot-installer.xml:1421
+#: boot-installer.xml:1335 boot-installer.xml:1472
#, no-c-format
msgid ""
"Proceed to the next chapter to continue the installation where you will set "
@@ -1616,7 +1782,7 @@ msgid ""
msgstr "进入到下一章继续安装本地语言,网络和磁盘分区。"
#. Tag: para
-#: boot-installer.xml:1295
+#: boot-installer.xml:1346
#, no-c-format
msgid ""
"Booting an IA-64 system from the network is similar to a CD boot. The only "
@@ -1633,7 +1799,7 @@ msgstr ""
"器。"
#. Tag: para
-#: boot-installer.xml:1330
+#: boot-installer.xml:1381
#, no-c-format
msgid ""
"Network booting an IA-64 system requires two architecture-specific actions. "
@@ -1646,13 +1812,13 @@ msgstr ""
"必须在 EFI boot manager 下定义来打开网络的装入。"
#. Tag: title
-#: boot-installer.xml:1341
+#: boot-installer.xml:1392
#, no-c-format
msgid "Configuring the Server"
msgstr "配置网络服务器"
#. Tag: para
-#: boot-installer.xml:1342
+#: boot-installer.xml:1393
#, no-c-format
msgid ""
"A suitable TFTP entry for network booting an IA-64 system looks something "
@@ -1676,7 +1842,7 @@ msgstr ""
"在客户端运行。"
#. Tag: para
-#: boot-installer.xml:1352
+#: boot-installer.xml:1403
#, no-c-format
msgid ""
"Extract the <filename>netboot.tar.gz</filename> file into the directory used "
@@ -1691,7 +1857,7 @@ msgstr ""
"它包括 IA-64 系统需要的启动文件。"
#. Tag: screen
-#: boot-installer.xml:1362
+#: boot-installer.xml:1413
#, no-c-format
msgid ""
"# cd /var/lib/tftp\n"
@@ -1709,7 +1875,7 @@ msgstr ""
"[...]"
#. Tag: para
-#: boot-installer.xml:1362
+#: boot-installer.xml:1413
#, no-c-format
msgid ""
"The <filename>netboot.tar.gz</filename> contains an <filename>elilo.conf</"
@@ -1728,13 +1894,13 @@ msgstr ""
"filename>。请查看 <classname>elilo</classname> 软件包附带的文档以获得细节。"
#. Tag: title
-#: boot-installer.xml:1379
+#: boot-installer.xml:1430
#, no-c-format
msgid "Configuring the Client"
msgstr "配置客户机"
#. Tag: para
-#: boot-installer.xml:1380
+#: boot-installer.xml:1431
#, no-c-format
msgid ""
"To configure the client to support TFTP booting, start by booting to EFI and "
@@ -1761,7 +1927,7 @@ msgstr ""
"DHCP 查询,然后会从服务器装入 <filename>elilo.efi</filename>。"
#. Tag: para
-#: boot-installer.xml:1412
+#: boot-installer.xml:1463
#, no-c-format
msgid ""
"The boot loader will display its prompt after it has downloaded and "
@@ -1776,13 +1942,13 @@ msgstr ""
# index.docbook:1899, index.docbook:1946
#. Tag: title
-#: boot-installer.xml:1438 boot-installer.xml:1462
+#: boot-installer.xml:1489 boot-installer.xml:1513
#, no-c-format
msgid "SGI TFTP Booting"
msgstr "SGI TFTP 引导"
#. Tag: para
-#: boot-installer.xml:1439
+#: boot-installer.xml:1490
#, no-c-format
msgid ""
"After entering the command monitor use <informalexample><screen>\n"
@@ -1804,13 +1970,13 @@ msgstr ""
# index.docbook:1943, index.docbook:2477
#. Tag: title
-#: boot-installer.xml:1459 boot-installer.xml:2214
+#: boot-installer.xml:1510 boot-installer.xml:2301
#, no-c-format
msgid "Boot Parameters"
msgstr "引导参数"
#. Tag: para
-#: boot-installer.xml:1463
+#: boot-installer.xml:1514
#, no-c-format
msgid ""
"On SGI machines you can append boot parameters to the <command>bootp():</"
@@ -1820,7 +1986,7 @@ msgstr ""
"参数。"
#. Tag: para
-#: boot-installer.xml:1468
+#: boot-installer.xml:1519
#, no-c-format
msgid ""
"Following the <command>bootp():</command> command you can give the path and "
@@ -1838,19 +2004,19 @@ msgstr ""
"command>:"
#. Tag: screen
-#: boot-installer.xml:1478
+#: boot-installer.xml:1529
#, no-c-format
msgid "bootp(): append=\"root=/dev/sda1\""
msgstr "bootp(): append=\"root=/dev/sda1\""
#. Tag: title
-#: boot-installer.xml:1521
+#: boot-installer.xml:1572
#, no-c-format
msgid "s390 Limitations"
msgstr "s390 的限制"
#. Tag: para
-#: boot-installer.xml:1522
+#: boot-installer.xml:1573
#, no-c-format
msgid ""
"In order to run the installation system a working network setup and ssh "
@@ -1858,7 +2024,7 @@ msgid ""
msgstr "为了在 S/390 上安装系统,需要一个工作的网络设置和 ssh 会话。"
#. Tag: para
-#: boot-installer.xml:1527
+#: boot-installer.xml:1578
#, no-c-format
msgid ""
"The booting process starts with a network setup that prompts you for several "
@@ -1870,13 +2036,13 @@ msgstr ""
"一个 ssh 会话登录进入系统,并且开始一个标准系统安装。"
#. Tag: title
-#: boot-installer.xml:1538
+#: boot-installer.xml:1589
#, no-c-format
msgid "s390 Boot Parameters"
msgstr "s390 引导参数"
#. Tag: para
-#: boot-installer.xml:1539
+#: boot-installer.xml:1590
#, fuzzy, no-c-format
#| msgid ""
#| "On S/390 you can append boot parameters in the parm file. This file can "
@@ -1897,7 +2063,7 @@ msgstr ""
"映像。"
#. Tag: para
-#: boot-installer.xml:1556
+#: boot-installer.xml:1607
#, no-c-format
msgid ""
"If you boot the installer in a logical partition (LPAR) or virtual machine "
@@ -1920,7 +2086,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-installer.xml:1621
+#: boot-installer.xml:1671
#, no-c-format
msgid ""
"Currently, the only &arch-title; subarchitectures that support CD-ROM "
@@ -1936,7 +2102,7 @@ msgstr ""
"keycap> 和 <keycap>Delete</keycap> 组合键引导出厂默认的 CD/DVD 驱动器。"
#. Tag: para
-#: boot-installer.xml:1630
+#: boot-installer.xml:1680
#, no-c-format
msgid ""
"To boot a PowerMac from an external Firewire CD/DVD drive invoke Open "
@@ -1953,13 +2119,13 @@ msgstr ""
"</screen></informalexample> 另一种方法引导出厂默认的 CD/DVD 驱动器,键入"
#. Tag: screen
-#: boot-installer.xml:1641
+#: boot-installer.xml:1691
#, no-c-format
msgid "0 &gt; boot cd:,\\install\\yaboot"
msgstr "0 &gt; boot cd:,\\install\\yaboot"
#. Tag: para
-#: boot-installer.xml:1643
+#: boot-installer.xml:1693
#, no-c-format
msgid ""
"OldWorld PowerMacs will not boot a &debian; CD, because OldWorld computers "
@@ -1974,7 +2140,7 @@ msgstr ""
"安装程序 从 CD 上选择所需要的文件。"
#. Tag: para
-#: boot-installer.xml:1652
+#: boot-installer.xml:1702
#, no-c-format
msgid ""
"To boot &debian; CD/DVD on Pegasos II machine, hold <keycap>Esc</keycap> key "
@@ -1985,13 +2151,13 @@ msgstr ""
"<keycap>Esc</keycap> 键,出现 SmartFirmware 提示符后,键入"
#. Tag: screen
-#: boot-installer.xml:1658
+#: boot-installer.xml:1708
#, no-c-format
msgid "boot cd install/pegasos"
msgstr "boot cd install/pegasos"
#. Tag: para
-#: boot-installer.xml:1660
+#: boot-installer.xml:1710
#, fuzzy, no-c-format
#| msgid ""
#| "To boot &debian; CD/DVD on Pegasos II machine, hold <keycap>Esc</keycap> "
@@ -2006,20 +2172,20 @@ msgstr ""
"<keycap>Esc</keycap> 键,出现 SmartFirmware 提示符后,键入"
#. Tag: screen
-#: boot-installer.xml:1665
+#: boot-installer.xml:1715
#, no-c-format
msgid "0 > boot cdrom"
msgstr ""
#. Tag: title
-#: boot-installer.xml:1671
+#: boot-installer.xml:1721
#, no-c-format
msgid "Booting from Hard Disk"
msgstr "从硬盘引导"
# index.docbook:1591, index.docbook:2097
#. Tag: para
-#: boot-installer.xml:1677
+#: boot-installer.xml:1727
#, no-c-format
msgid ""
"Booting from an existing operating system is often a convenient option; for "
@@ -2030,7 +2196,7 @@ msgstr ""
# index.docbook:1597, index.docbook:2103
#. Tag: para
-#: boot-installer.xml:1683
+#: boot-installer.xml:1733
#, no-c-format
msgid ""
"To boot the installer from hard disk, you will have already completed "
@@ -2041,13 +2207,13 @@ msgstr ""
"下载并且安置所需文件。"
#. Tag: title
-#: boot-installer.xml:1703
+#: boot-installer.xml:1753
#, no-c-format
msgid "Booting OldWorld PowerMacs from MacOS"
msgstr "从 OldWorld PowerMacs 的 MacOS 上引导"
#. Tag: para
-#: boot-installer.xml:1704
+#: boot-installer.xml:1754
#, no-c-format
msgid ""
"If you set up BootX in <xref linkend=\"files-oldworld\"/>, you can use it to "
@@ -2068,13 +2234,13 @@ msgstr ""
"序。"
#. Tag: title
-#: boot-installer.xml:1722
+#: boot-installer.xml:1772
#, no-c-format
msgid "Booting NewWorld Macs from OpenFirmware"
msgstr "从 NewWorld Macs 的 OpenFirmware 引导"
#. Tag: para
-#: boot-installer.xml:1723
+#: boot-installer.xml:1773
#, no-c-format
msgid ""
"You will have already placed the <filename>vmlinux</filename>, "
@@ -2115,19 +2281,19 @@ msgstr ""
# index.docbook:700, index.docbook:2176
#. Tag: title
-#: boot-installer.xml:1755
+#: boot-installer.xml:1805
#, no-c-format
msgid "Booting from USB memory stick"
msgstr "从 U 盘引导"
#. Tag: para
-#: boot-installer.xml:1756
+#: boot-installer.xml:1806
#, no-c-format
msgid "Currently, NewWorld PowerMac systems are known to support USB booting."
msgstr "当前,New World PowerMac 系统支持从 USB 引导。"
#. Tag: para
-#: boot-installer.xml:1762
+#: boot-installer.xml:1812
#, no-c-format
msgid ""
"Make sure you have prepared everything from <xref linkend=\"boot-usb-files\"/"
@@ -2140,7 +2306,7 @@ msgstr ""
"Open Firmware 提示符。参阅 <xref linkend=\"invoking-openfirmware\"/>。"
#. Tag: para
-#: boot-installer.xml:1771
+#: boot-installer.xml:1821
#, no-c-format
msgid ""
"You will need to work out where the USB storage device appears in the device "
@@ -2161,7 +2327,7 @@ msgstr ""
"disk@1</filename> 。"
#. Tag: para
-#: boot-installer.xml:1783
+#: boot-installer.xml:1833
#, no-c-format
msgid ""
"Having worked out the device path, use a command like this to boot the "
@@ -2185,7 +2351,7 @@ msgstr ""
"command>。"
#. Tag: para
-#: boot-installer.xml:1797
+#: boot-installer.xml:1847
#, no-c-format
msgid ""
"The system should now boot up, and you should be presented with the "
@@ -2196,7 +2362,7 @@ msgstr ""
"动参数,或者只按下 &enterkey;。"
#. Tag: para
-#: boot-installer.xml:1803
+#: boot-installer.xml:1853
#, no-c-format
msgid ""
"This boot method is new, and may be difficult to get to work on some "
@@ -2207,13 +2373,13 @@ msgstr ""
"下安装报告,参阅 <xref linkend=\"submit-bug\"/>。"
#. Tag: para
-#: boot-installer.xml:1837
+#: boot-installer.xml:1887
#, no-c-format
msgid "Currently, PReP and New World PowerMac systems support netbooting."
msgstr "目前来说,PReP 以及 New World PowerMac 系统支持网络引导。"
#. Tag: para
-#: boot-installer.xml:1841
+#: boot-installer.xml:1891
#, no-c-format
msgid ""
"On machines with Open Firmware, such as NewWorld Power Macs, enter the boot "
@@ -2246,7 +2412,7 @@ msgstr ""
"<userinput>help boot</userinput> 命令可以给出语法和选项的说明。"
#. Tag: para
-#: boot-installer.xml:1869
+#: boot-installer.xml:1919
#, no-c-format
msgid ""
"Booting from floppies is supported for &arch-title;, although it is "
@@ -2258,7 +2424,7 @@ msgstr ""
"没有安装 软盘驱动器,并且附带的 USB 软盘并不支持引导。"
#. Tag: para
-#: boot-installer.xml:1881
+#: boot-installer.xml:1931
#, no-c-format
msgid ""
"To boot from the <filename>boot-floppy-hfs.img</filename> floppy, place it "
@@ -2269,7 +2435,7 @@ msgstr ""
"按下电源开关前把它放到软盘驱动器内。"
#. Tag: para
-#: boot-installer.xml:1887
+#: boot-installer.xml:1937
#, no-c-format
msgid ""
"For those not familiar with Macintosh floppy operations: a floppy placed in "
@@ -2281,7 +2447,7 @@ msgstr ""
"序。一个 没有有效引导系统的软盘将回被弹出,并且机器将检查硬盘分区。"
#. Tag: para
-#: boot-installer.xml:1894
+#: boot-installer.xml:1944
#, no-c-format
msgid ""
"After booting, the <filename>root.bin</filename> floppy is requested. Insert "
@@ -2292,13 +2458,13 @@ msgstr ""
"&enterkey;。安装程序将在根系统被装入内存后自动启动。"
#. Tag: title
-#: boot-installer.xml:1905
+#: boot-installer.xml:1955
#, no-c-format
msgid "PowerPC Boot Parameters"
msgstr "PowerPC 引导参数"
#. Tag: para
-#: boot-installer.xml:1906
+#: boot-installer.xml:1956
#, no-c-format
msgid ""
"Many older Apple monitors used a 640x480 67Hz mode. If your video appears "
@@ -2312,8 +2478,46 @@ msgstr ""
"userinput> 。它将为大多数 Mach64 和 Rage 显示设备选择合适的模式。对于 Rage "
"128 来说,请改变其值为 <userinput>video=aty128fb:vmode:6</userinput> 。"
+#. Tag: title
+#: boot-installer.xml:1968
+#, no-c-format
+msgid "Booting a ppc64el machine"
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:1969
+#, no-c-format
+msgid "How to boot a ppc64el machine:"
+msgstr ""
+
+#. Tag: title
+#: boot-installer.xml:1975
+#, no-c-format
+msgid "Petitboot"
+msgstr ""
+
#. Tag: para
-#: boot-installer.xml:1947
+#: boot-installer.xml:1976
+#, no-c-format
+msgid ""
+"Petitboot is a platform independent bootloader based on the Linux kexec. "
+"Petitboot supports loading kernel, initrd and device tree files from any "
+"Linux mountable filesystem, plus can load files from the network using the "
+"FTP, SFTP, TFTP, NFS, HTTP and HTTPS protocols. Petitboot can boot any "
+"operating system that includes kexec boot support."
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:1984
+#, no-c-format
+msgid ""
+"Petitboot looks for bootloader configuration files on mountable devices in "
+"the system, and can also be configured to use boot information from a DHCP "
+"server."
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:2035
#, no-c-format
msgid ""
"On machines with OpenBoot, simply enter the boot monitor on the machine "
@@ -2332,7 +2536,7 @@ msgstr ""
"i; 。"
#. Tag: para
-#: boot-installer.xml:2002
+#: boot-installer.xml:2089
#, no-c-format
msgid ""
"Most OpenBoot versions support the <userinput>boot cdrom</userinput> command "
@@ -2344,13 +2548,13 @@ msgstr ""
"盘)。"
#. Tag: title
-#: boot-installer.xml:2011
+#: boot-installer.xml:2098
#, no-c-format
msgid "IDPROM Messages"
msgstr "IDPROM 消息"
#. Tag: para
-#: boot-installer.xml:2012
+#: boot-installer.xml:2099
#, no-c-format
msgid ""
"If you cannot boot because you get messages about a problem with "
@@ -2364,17 +2568,29 @@ msgstr ""
"nvram-faq;\">Sun NVRAM FAQ</ulink> 以获得更多信息。"
#. Tag: title
-#: boot-installer.xml:2031
+#: boot-installer.xml:2118
#, no-c-format
msgid "Accessibility"
msgstr "辅助功能"
#. Tag: para
-#: boot-installer.xml:2032
-#, no-c-format
+#: boot-installer.xml:2119
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Some users may need specific support because of e.g. some visual "
+#| "impairment. <phrase arch=\"ia64;powerpc;x86\">USB braille displays are "
+#| "detected automatically (not serial displays connected via a serial-to-USB "
+#| "converter), but most other</phrase> <phrase arch=\"arm;hppa;mips;mipsel;"
+#| "sparc\">Most</phrase> accessibility features have to be enabled manually. "
+#| "<phrase arch=\"x86\">On machines that support it, the boot menu emits a "
+#| "beep when it is ready to receive keystrokes.</phrase> Some boot "
+#| "parameters can <phrase arch=\"x86\">then</phrase> be appended to enable "
+#| "accessibility features<phrase arch=\"x86\"> (see also <xref linkend="
+#| "\"boot-screen\"/>)</phrase>. Note that on most architectures the boot "
+#| "loader interprets your keyboard as a QWERTY keyboard."
msgid ""
"Some users may need specific support because of e.g. some visual impairment. "
-"<phrase arch=\"ia64;powerpc;x86\">USB braille displays are detected "
+"<phrase arch=\"ia64;powerpc;ppc64el;x86\">USB braille displays are detected "
"automatically (not serial displays connected via a serial-to-USB converter), "
"but most other</phrase> <phrase arch=\"arm;hppa;mips;mipsel;sparc\">Most</"
"phrase> accessibility features have to be enabled manually. <phrase arch="
@@ -2395,13 +2611,13 @@ msgstr ""
"要注意在大多数架构下 boot loader 将视您的键盘为 QWERTY 布局。"
#. Tag: title
-#: boot-installer.xml:2052
+#: boot-installer.xml:2139
#, no-c-format
msgid "Installer front-end"
msgstr ""
#. Tag: para
-#: boot-installer.xml:2053
+#: boot-installer.xml:2140
#, no-c-format
msgid ""
"The &debian; installer supports several front-ends for asking questions, "
@@ -2413,13 +2629,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: boot-installer.xml:2065
+#: boot-installer.xml:2152
#, no-c-format
msgid "USB Braille Displays"
msgstr "USB 盲文点显器"
#. Tag: para
-#: boot-installer.xml:2066
+#: boot-installer.xml:2153
#, no-c-format
msgid ""
"USB braille displays should be automatically detected. A textual version of "
@@ -2438,13 +2654,13 @@ msgstr ""
"website</ulink> 可以找到盲文点显器的键绑定文档。"
#. Tag: title
-#: boot-installer.xml:2081
+#: boot-installer.xml:2168
#, no-c-format
msgid "Serial Braille Displays"
msgstr "串口盲文点显器"
#. Tag: para
-#: boot-installer.xml:2082
+#: boot-installer.xml:2169
#, no-c-format
msgid ""
"Serial braille displays cannot safely be automatically detected (since that "
@@ -2479,13 +2695,13 @@ msgstr ""
"\"><classname>brltty</classname> website</ulink> 找到。"
#. Tag: title
-#: boot-installer.xml:2105 boot-installer.xml:3114
+#: boot-installer.xml:2192 boot-installer.xml:3201
#, no-c-format
msgid "Software Speech Synthesis"
msgstr "软件语音合成(Software Speech Synthesis)"
#. Tag: para
-#: boot-installer.xml:2106
+#: boot-installer.xml:2193
#, fuzzy, no-c-format
#| msgid ""
#| "Support for hardware speech synthesis devices is available only alongside "
@@ -2503,7 +2719,7 @@ msgstr ""
"择 <quote>Graphical install</quote> 项。"
#. Tag: para
-#: boot-installer.xml:2115
+#: boot-installer.xml:2202
#, fuzzy, no-c-format
#| msgid ""
#| "Support for software speech synthesis can be activated by selecting it in "
@@ -2521,7 +2737,7 @@ msgstr ""
"<classname>espeak</classname>)。"
#. Tag: para
-#: boot-installer.xml:2121
+#: boot-installer.xml:2208
#, no-c-format
msgid ""
"The default speech rate is quite slow. To make it faster, press "
@@ -2535,13 +2751,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: boot-installer.xml:2140
+#: boot-installer.xml:2227
#, no-c-format
msgid "Hardware Speech Synthesis"
msgstr "硬件语音合成(Hardware Speech Synthesis)"
#. Tag: para
-#: boot-installer.xml:2141
+#: boot-installer.xml:2228
#, fuzzy, no-c-format
#| msgid ""
#| "Support for hardware speech synthesis devices is available only alongside "
@@ -2557,7 +2773,7 @@ msgstr ""
"择 <quote>Graphical install</quote> 项。"
#. Tag: para
-#: boot-installer.xml:2148
+#: boot-installer.xml:2235
#, no-c-format
msgid ""
"Hardware speech synthesis devices cannot be automatically detected. You thus "
@@ -2577,13 +2793,13 @@ msgstr ""
"音合成设备的支持也会被自动安装到最终系统里面。"
#. Tag: title
-#: boot-installer.xml:2163
+#: boot-installer.xml:2250
#, no-c-format
msgid "Board Devices"
msgstr "板卡设备"
#. Tag: para
-#: boot-installer.xml:2164
+#: boot-installer.xml:2251
#, no-c-format
msgid ""
"Some accessibility devices are actual boards that are plugged inside the "
@@ -2598,7 +2814,7 @@ msgstr ""
"数量。"
#. Tag: para
-#: boot-installer.xml:2172
+#: boot-installer.xml:2259
#, no-c-format
msgid ""
"If desired a textual version of the bootloader can be activated before "
@@ -2608,13 +2824,13 @@ msgstr ""
"userinput> &enterkey;。"
#. Tag: title
-#: boot-installer.xml:2180
+#: boot-installer.xml:2267
#, no-c-format
msgid "High-Contrast Theme"
msgstr "高亮主题"
#. Tag: para
-#: boot-installer.xml:2181
+#: boot-installer.xml:2268
#, fuzzy, no-c-format
#| msgid ""
#| "For users with low vision, the installer can use a high-contrast theme "
@@ -2629,13 +2845,13 @@ msgstr ""
"<userinput>theme=dark</userinput> 引导参数即可。"
#. Tag: title
-#: boot-installer.xml:2190
+#: boot-installer.xml:2277
#, no-c-format
msgid "Preseeding"
msgstr "预置"
#. Tag: para
-#: boot-installer.xml:2191
+#: boot-installer.xml:2278
#, no-c-format
msgid ""
"Alternatively, &debian; can be installed completely automatically by using "
@@ -2645,13 +2861,13 @@ msgstr ""
"\"appendix-preseed\"/>。"
#. Tag: title
-#: boot-installer.xml:2199
+#: boot-installer.xml:2286
#, no-c-format
msgid "Accessibility of the installed system"
msgstr ""
#. Tag: para
-#: boot-installer.xml:2200
+#: boot-installer.xml:2287
#, no-c-format
msgid ""
"Documentation on accessibility of the installed system is available on the "
@@ -2660,7 +2876,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-installer.xml:2215
+#: boot-installer.xml:2302
#, no-c-format
msgid ""
"Boot parameters are Linux kernel parameters which are generally used to make "
@@ -2673,7 +2889,7 @@ msgstr ""
"要给内核一点小小的帮助。"
#. Tag: para
-#: boot-installer.xml:2222
+#: boot-installer.xml:2309
#, no-c-format
msgid ""
"If this is the first time you're booting the system, try the default boot "
@@ -2686,7 +2902,7 @@ msgstr ""
"的硬件特定参数。"
#. Tag: para
-#: boot-installer.xml:2229
+#: boot-installer.xml:2316
#, no-c-format
msgid ""
"Information on many boot parameters can be found in the <ulink url=\"http://"
@@ -2701,13 +2917,13 @@ msgstr ""
"linkend=\"boot-troubleshooting\"/>。"
#. Tag: title
-#: boot-installer.xml:2241
+#: boot-installer.xml:2328
#, no-c-format
msgid "Boot console"
msgstr ""
#. Tag: para
-#: boot-installer.xml:2243
+#: boot-installer.xml:2330
#, no-c-format
msgid ""
"If you are booting with a serial console, generally the kernel will "
@@ -2724,7 +2940,7 @@ msgstr ""
"是串口设备,通常是 <filename>ttyS0</filename> 形式。"
#. Tag: para
-#: boot-installer.xml:2255
+#: boot-installer.xml:2342
#, no-c-format
msgid ""
"You may need to specify parameters for the serial port, such as speed and "
@@ -2735,7 +2951,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-installer.xml:2263
+#: boot-installer.xml:2350
#, no-c-format
msgid ""
"In order to ensure the terminal type used by the installer matches your "
@@ -2760,7 +2976,7 @@ msgstr ""
"literal> 终端类型,而它又非常接近于 <literal>vt102</literal> 类型。"
#. Tag: para
-#: boot-installer.xml:2279
+#: boot-installer.xml:2366
#, no-c-format
msgid ""
"For &arch-title; the serial devices are <filename>ttya</filename> or "
@@ -2773,13 +2989,13 @@ msgstr ""
"<envar>output-device</envar> OpenPROM 变量至 <filename>ttya</filename>。"
#. Tag: title
-#: boot-installer.xml:2291
+#: boot-installer.xml:2378
#, no-c-format
msgid "&debian; Installer Parameters"
msgstr "&debian; 安装程序的参数"
#. Tag: para
-#: boot-installer.xml:2292
+#: boot-installer.xml:2379
#, no-c-format
msgid ""
"The installation system recognizes a few additional boot "
@@ -2792,7 +3008,7 @@ msgstr ""
"para> </footnote>,它们很有用。"
#. Tag: para
-#: boot-installer.xml:2305
+#: boot-installer.xml:2392
#, no-c-format
msgid ""
"A number of parameters have a <quote>short form</quote> that helps avoid the "
@@ -2806,19 +3022,19 @@ msgstr ""
"用简写。"
#. Tag: term
-#: boot-installer.xml:2317
+#: boot-installer.xml:2404
#, no-c-format
msgid "debconf/priority (priority)"
msgstr "debconf/priority (priority)"
#. Tag: para
-#: boot-installer.xml:2318
+#: boot-installer.xml:2405
#, no-c-format
msgid "This parameter sets the lowest priority of messages to be displayed."
msgstr "这些参数设置将设置显示的信息为最低的级别。"
#. Tag: para
-#: boot-installer.xml:2322
+#: boot-installer.xml:2409
#, no-c-format
msgid ""
"The default installation uses <userinput>priority=high</userinput>. This "
@@ -2831,7 +3047,7 @@ msgstr ""
"将按照要求调整优先级别。"
#. Tag: para
-#: boot-installer.xml:2329
+#: boot-installer.xml:2416
#, no-c-format
msgid ""
"If you add <userinput>priority=medium</userinput> as boot parameter, you "
@@ -2849,13 +3065,13 @@ msgstr ""
"且尝试正确无误地执行各项事宜。"
#. Tag: term
-#: boot-installer.xml:2343
+#: boot-installer.xml:2430
#, no-c-format
msgid "DEBIAN_FRONTEND"
msgstr "DEBIAN_FRONTEND"
#. Tag: para
-#: boot-installer.xml:2344
+#: boot-installer.xml:2431
#, no-c-format
msgid ""
"This boot parameter controls the type of user interface used for the "
@@ -2888,13 +3104,13 @@ msgstr ""
"所支持的平台上使用 <userinput>gtk</userinput> 前端。"
#. Tag: term
-#: boot-installer.xml:2375
+#: boot-installer.xml:2462
#, no-c-format
msgid "BOOT_DEBUG"
msgstr "BOOT_DEBUG"
#. Tag: para
-#: boot-installer.xml:2376
+#: boot-installer.xml:2463
#, no-c-format
msgid ""
"Setting this boot parameter to 2 will cause the installer's boot process to "
@@ -2906,49 +3122,49 @@ msgstr ""
"debug shell。(退出 shell 以后会继续引导过程。)"
#. Tag: userinput
-#: boot-installer.xml:2385
+#: boot-installer.xml:2472
#, no-c-format
msgid "BOOT_DEBUG=0"
msgstr "BOOT_DEBUG=0"
#. Tag: para
-#: boot-installer.xml:2386
+#: boot-installer.xml:2473
#, no-c-format
msgid "This is the default."
msgstr "此为默认。"
#. Tag: userinput
-#: boot-installer.xml:2390
+#: boot-installer.xml:2477
#, no-c-format
msgid "BOOT_DEBUG=1"
msgstr "BOOT_DEBUG=1"
#. Tag: para
-#: boot-installer.xml:2391
+#: boot-installer.xml:2478
#, no-c-format
msgid "More verbose than usual."
msgstr "更多的信息。"
#. Tag: userinput
-#: boot-installer.xml:2395
+#: boot-installer.xml:2482
#, no-c-format
msgid "BOOT_DEBUG=2"
msgstr "BOOT_DEBUG=2"
#. Tag: para
-#: boot-installer.xml:2396
+#: boot-installer.xml:2483
#, no-c-format
msgid "Lots of debugging information."
msgstr "大量的调试信息。"
#. Tag: userinput
-#: boot-installer.xml:2400
+#: boot-installer.xml:2487
#, no-c-format
msgid "BOOT_DEBUG=3"
msgstr "BOOT_DEBUG=3"
#. Tag: para
-#: boot-installer.xml:2401
+#: boot-installer.xml:2488
#, no-c-format
msgid ""
"Shells are run at various points in the boot process to allow detailed "
@@ -2958,13 +3174,13 @@ msgstr ""
"Shell 将继续引导过程。"
#. Tag: term
-#: boot-installer.xml:2415
+#: boot-installer.xml:2502
#, no-c-format
msgid "INSTALL_MEDIA_DEV"
msgstr "INSTALL_MEDIA_DEV"
#. Tag: para
-#: boot-installer.xml:2416
+#: boot-installer.xml:2503
#, no-c-format
msgid ""
"The value of the parameter is the path to the device to load the &debian; "
@@ -2975,7 +3191,7 @@ msgstr ""
"<userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</userinput>"
#. Tag: para
-#: boot-installer.xml:2422
+#: boot-installer.xml:2509
#, no-c-format
msgid ""
"The boot floppy, which normally scans all floppies it can to find the root "
@@ -2984,19 +3200,19 @@ msgstr ""
"引导软盘通常会扫描所有的软盘来找到根软盘,可以通过此参数设置只查找一个设备。"
#. Tag: term
-#: boot-installer.xml:2433
+#: boot-installer.xml:2520
#, no-c-format
msgid "log_host"
msgstr "log_host"
#. Tag: term
-#: boot-installer.xml:2434
+#: boot-installer.xml:2521
#, no-c-format
msgid "log_port"
msgstr "log_port"
#. Tag: para
-#: boot-installer.xml:2435
+#: boot-installer.xml:2522
#, no-c-format
msgid ""
"Causes the installer to send log messages to a remote syslog on the "
@@ -3007,13 +3223,13 @@ msgstr ""
"定,默认端口是 syslog 标准端口 514。"
#. Tag: term
-#: boot-installer.xml:2446
+#: boot-installer.xml:2533
#, no-c-format
msgid "lowmem"
msgstr "lowmem"
#. Tag: para
-#: boot-installer.xml:2447
+#: boot-installer.xml:2534
#, no-c-format
msgid ""
"Can be used to force the installer to a lowmem level higher than the one the "
@@ -3024,13 +3240,13 @@ msgstr ""
"和 2。参阅 <xref linkend=\"lowmem\"/>。"
#. Tag: term
-#: boot-installer.xml:2457
+#: boot-installer.xml:2544
#, no-c-format
msgid "noshell"
msgstr "noshell"
#. Tag: para
-#: boot-installer.xml:2458
+#: boot-installer.xml:2545
#, no-c-format
msgid ""
"Prevents the installer from offering interactive shells on tty2 and tty3. "
@@ -3040,13 +3256,13 @@ msgstr ""
"处。"
#. Tag: term
-#: boot-installer.xml:2467
+#: boot-installer.xml:2554
#, no-c-format
msgid "debian-installer/framebuffer (fb)"
msgstr "debian-installer/framebuffer (fb)"
#. Tag: para
-#: boot-installer.xml:2468
+#: boot-installer.xml:2555
#, no-c-format
msgid ""
"Some architectures use the kernel framebuffer to offer installation in a "
@@ -3062,13 +3278,13 @@ msgstr ""
"bogl 的相关错误信息、一个空白的屏幕,或者在开始安装几分钟后停止。"
#. Tag: para
-#: boot-installer.xml:2477
+#: boot-installer.xml:2564
#, no-c-format
msgid "Such problems have been reported on hppa."
msgstr "在 hppa 上面报告过存在这些问题。"
#. Tag: para
-#: boot-installer.xml:2481
+#: boot-installer.xml:2568
#, no-c-format
msgid ""
"Because of display problems on some systems, framebuffer support is "
@@ -3085,13 +3301,13 @@ msgstr ""
"<userinput>fb=true</userinput>。"
#. Tag: term
-#: boot-installer.xml:2495
+#: boot-installer.xml:2582
#, no-c-format
msgid "debian-installer/theme (theme)"
msgstr "debian-installer/theme (theme)"
#. Tag: para
-#: boot-installer.xml:2496
+#: boot-installer.xml:2583
#, no-c-format
msgid ""
"A theme determines how the user interface of the installer looks (colors, "
@@ -3106,13 +3322,13 @@ msgstr ""
"<userinput>theme=<replaceable>dark</replaceable></userinput> 设置。"
#. Tag: term
-#: boot-installer.xml:2508 boot-installer.xml:2741
+#: boot-installer.xml:2595 boot-installer.xml:2828
#, no-c-format
msgid "netcfg/disable_autoconfig"
msgstr "netcfg/disable_autoconfig"
#. Tag: para
-#: boot-installer.xml:2509
+#: boot-installer.xml:2596
#, fuzzy, no-c-format
#| msgid ""
#| "By default, the &d-i; automatically probes for network configuration via "
@@ -3129,7 +3345,7 @@ msgstr ""
"视并且改变其获得的设定。您可以在 DHCP 检测失败的情况下手工配置网络。"
#. Tag: para
-#: boot-installer.xml:2516
+#: boot-installer.xml:2603
#, fuzzy, no-c-format
#| msgid ""
#| "If you have a DHCP server on your local network, but want to avoid it "
@@ -3148,13 +3364,13 @@ msgstr ""
"阻止通过 DHCP 配置网络,并手工输入信息。"
#. Tag: term
-#: boot-installer.xml:2527
+#: boot-installer.xml:2614
#, no-c-format
msgid "hw-detect/start_pcmcia"
msgstr "hw-detect/start_pcmcia"
#. Tag: para
-#: boot-installer.xml:2528
+#: boot-installer.xml:2615
#, no-c-format
msgid ""
"Set to <userinput>false</userinput> to prevent starting PCMCIA services, if "
@@ -3164,13 +3380,13 @@ msgstr ""
"携机会有这种现象。"
#. Tag: term
-#: boot-installer.xml:2538
+#: boot-installer.xml:2625
#, no-c-format
msgid "disk-detect/dmraid/enable (dmraid)"
msgstr "disk-detect/dmraid/enable (dmraid)"
#. Tag: para
-#: boot-installer.xml:2539
+#: boot-installer.xml:2626
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> to enable support for Serial ATA RAID "
@@ -3184,13 +3400,13 @@ msgstr ""
"ulink> 找到。"
#. Tag: term
-#: boot-installer.xml:2550
+#: boot-installer.xml:2637
#, no-c-format
msgid "preseed/url (url)"
msgstr "preseed/url (url)"
#. Tag: para
-#: boot-installer.xml:2551
+#: boot-installer.xml:2638
#, no-c-format
msgid ""
"Specify the url to a preconfiguration file to download and use for "
@@ -3200,13 +3416,13 @@ msgstr ""
"install\"/>。"
#. Tag: term
-#: boot-installer.xml:2560
+#: boot-installer.xml:2647
#, no-c-format
msgid "preseed/file (file)"
msgstr "preseed/file (file)"
#. Tag: para
-#: boot-installer.xml:2561
+#: boot-installer.xml:2648
#, no-c-format
msgid ""
"Specify the path to a preconfiguration file to load for automating the "
@@ -3216,13 +3432,13 @@ msgstr ""
">。"
#. Tag: term
-#: boot-installer.xml:2570
+#: boot-installer.xml:2657
#, no-c-format
msgid "preseed/interactive"
msgstr "preseed/interactive"
#. Tag: para
-#: boot-installer.xml:2571
+#: boot-installer.xml:2658
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> to display questions even if they have "
@@ -3236,13 +3452,13 @@ msgstr ""
"<xref linkend=\"preseed-seenflag\"/> 了解详细信息。"
#. Tag: term
-#: boot-installer.xml:2583
+#: boot-installer.xml:2670
#, no-c-format
msgid "auto-install/enable (auto)"
msgstr "auto-install/enable (auto)"
#. Tag: para
-#: boot-installer.xml:2584
+#: boot-installer.xml:2671
#, no-c-format
msgid ""
"Delay questions that are normally asked before preseeding is possible until "
@@ -3253,13 +3469,13 @@ msgstr ""
"auto\"/> 了解自动安装的详细信息。"
#. Tag: term
-#: boot-installer.xml:2595
+#: boot-installer.xml:2682
#, no-c-format
msgid "finish-install/keep-consoles"
msgstr "finish-install/keep-consoles"
#. Tag: para
-#: boot-installer.xml:2596
+#: boot-installer.xml:2683
#, no-c-format
msgid ""
"During installations from serial or management console, the regular virtual "
@@ -3270,13 +3486,13 @@ msgstr ""
"inittab</filename> 里已经关掉。将其改为 <userinput>true</userinput> 打开。"
#. Tag: term
-#: boot-installer.xml:2607
+#: boot-installer.xml:2694
#, no-c-format
msgid "cdrom-detect/eject"
msgstr "cdrom-detect/eject"
#. Tag: para
-#: boot-installer.xml:2608
+#: boot-installer.xml:2695
#, no-c-format
msgid ""
"By default, before rebooting, &d-i; automatically ejects the optical media "
@@ -3292,7 +3508,7 @@ msgstr ""
"新加载介质。"
#. Tag: para
-#: boot-installer.xml:2617
+#: boot-installer.xml:2704
#, no-c-format
msgid ""
"Set to <userinput>false</userinput> to disable automatic ejection, and be "
@@ -3303,13 +3519,13 @@ msgstr ""
"后,不会自动从光盘引导。"
#. Tag: term
-#: boot-installer.xml:2628
+#: boot-installer.xml:2715
#, no-c-format
msgid "base-installer/install-recommends (recommends)"
msgstr "base-installer/install-recommends (recommends)"
#. Tag: para
-#: boot-installer.xml:2629
+#: boot-installer.xml:2716
#, no-c-format
msgid ""
"By setting this option to <userinput>false</userinput>, the package "
@@ -3322,7 +3538,7 @@ msgstr ""
"<xref linkend=\"di-install-base\"/>。"
#. Tag: para
-#: boot-installer.xml:2636
+#: boot-installer.xml:2723
#, no-c-format
msgid ""
"Note that this option allows to have a leaner system, but can also result in "
@@ -3336,13 +3552,13 @@ msgstr ""
"非常有经验的用户来使用。"
#. Tag: term
-#: boot-installer.xml:2648
+#: boot-installer.xml:2735
#, no-c-format
msgid "debian-installer/allow_unauthenticated"
msgstr "debian-installer/allow_unauthenticated"
#. Tag: para
-#: boot-installer.xml:2649
+#: boot-installer.xml:2736
#, no-c-format
msgid ""
"By default the installer requires that repositories be authenticated using a "
@@ -3355,13 +3571,13 @@ msgstr ""
"emphasis>"
#. Tag: term
-#: boot-installer.xml:2660
+#: boot-installer.xml:2747
#, no-c-format
msgid "ramdisk_size"
msgstr "ramdisk_size"
#. Tag: para
-#: boot-installer.xml:2661
+#: boot-installer.xml:2748
#, no-c-format
msgid ""
"This parameter should already be set to a correct value where needed; set it "
@@ -3372,13 +3588,13 @@ msgstr ""
"置。该值的单位是 kB。"
#. Tag: term
-#: boot-installer.xml:2671
+#: boot-installer.xml:2758
#, no-c-format
msgid "rescue/enable"
msgstr "rescue/enable"
#. Tag: para
-#: boot-installer.xml:2672
+#: boot-installer.xml:2759
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> to enter rescue mode rather than "
@@ -3388,13 +3604,13 @@ msgstr ""
"<xref linkend=\"rescue\"/>。"
#. Tag: title
-#: boot-installer.xml:2685
+#: boot-installer.xml:2772
#, no-c-format
msgid "Using boot parameters to answer questions"
msgstr "使用内核模块参数回答提问"
#. Tag: para
-#: boot-installer.xml:2686
+#: boot-installer.xml:2773
#, no-c-format
msgid ""
"With some exceptions, a value can be set at the boot prompt for any question "
@@ -3407,25 +3623,25 @@ msgstr ""
"bootparms\"/> 找到。下面是一些具体的例子。"
#. Tag: term
-#: boot-installer.xml:2698
+#: boot-installer.xml:2785
#, no-c-format
msgid "debian-installer/language (language)"
msgstr "debian-installer/language (language)"
#. Tag: term
-#: boot-installer.xml:2699
+#: boot-installer.xml:2786
#, no-c-format
msgid "debian-installer/country (country)"
msgstr "debian-installer/country (country)"
#. Tag: term
-#: boot-installer.xml:2700
+#: boot-installer.xml:2787
#, no-c-format
msgid "debian-installer/locale (locale)"
msgstr "debian-installer/locale (locale)"
#. Tag: para
-#: boot-installer.xml:2701
+#: boot-installer.xml:2788
#, no-c-format
msgid ""
"There are two ways to specify the language, country and locale to use for "
@@ -3435,7 +3651,7 @@ msgstr ""
"和地方(locale)。"
#. Tag: para
-#: boot-installer.xml:2706
+#: boot-installer.xml:2793
#, no-c-format
msgid ""
"The first and easiest is to pass only the parameter <literal>locale</"
@@ -3453,7 +3669,7 @@ msgstr ""
"式组合。"
#. Tag: para
-#: boot-installer.xml:2715
+#: boot-installer.xml:2802
#, no-c-format
msgid ""
"The second, more flexible option is to specify <literal>language</literal> "
@@ -3468,13 +3684,13 @@ msgstr ""
"locale=en_GB.UTF-8</userinput>。"
#. Tag: term
-#: boot-installer.xml:2727
+#: boot-installer.xml:2814
#, no-c-format
msgid "anna/choose_modules (modules)"
msgstr "anna/choose_modules (modules)"
#. Tag: para
-#: boot-installer.xml:2728
+#: boot-installer.xml:2815
#, no-c-format
msgid ""
"Can be used to automatically load installer components that are not loaded "
@@ -3489,7 +3705,7 @@ msgstr ""
"classname> (参阅 <xref linkend=\"pppoe\"/>)</phrase>。"
#. Tag: para
-#: boot-installer.xml:2742
+#: boot-installer.xml:2829
#, fuzzy, no-c-format
#| msgid ""
#| "Set to <userinput>true</userinput> if you want to disable DHCP and "
@@ -3501,13 +3717,13 @@ msgstr ""
"如果您想禁止 DHCP 使用静态网络设置,将它设为 <userinput>true</userinput>。"
#. Tag: term
-#: boot-installer.xml:2751
+#: boot-installer.xml:2838
#, no-c-format
msgid "mirror/protocol (protocol)"
msgstr "mirror/protocol (protocol)"
#. Tag: para
-#: boot-installer.xml:2752
+#: boot-installer.xml:2839
#, no-c-format
msgid ""
"By default the installer will use the http protocol to download files from "
@@ -3522,13 +3738,13 @@ msgstr ""
"序使用该协议。注意,必须手动输入主机名,而不是从列表中选择 ftp 镜像。"
#. Tag: term
-#: boot-installer.xml:2765
+#: boot-installer.xml:2852
#, no-c-format
msgid "tasksel:tasksel/first (tasks)"
msgstr "tasksel:tasksel/first (tasks)"
#. Tag: para
-#: boot-installer.xml:2766
+#: boot-installer.xml:2853
#, no-c-format
msgid ""
"Can be used to select tasks that are not available from the interactive task "
@@ -3539,13 +3755,13 @@ msgstr ""
"literal> 任务。参阅 <xref linkend=\"pkgsel\"/> 了解详细信息。"
#. Tag: title
-#: boot-installer.xml:2780
+#: boot-installer.xml:2867
#, no-c-format
msgid "Passing parameters to kernel modules"
msgstr "给内核模块传递参数"
#. Tag: para
-#: boot-installer.xml:2781
+#: boot-installer.xml:2868
#, no-c-format
msgid ""
"If drivers are compiled into the kernel, you can pass parameters to them as "
@@ -3565,7 +3781,7 @@ msgstr ""
"配置中。"
#. Tag: para
-#: boot-installer.xml:2794
+#: boot-installer.xml:2881
#, no-c-format
msgid ""
"Note that it is now quite rare that parameters need to be passed to modules. "
@@ -3577,7 +3793,7 @@ msgstr ""
"并很好地设置默认参数。然而,某些情况下还是需要手动设置参数。"
#. Tag: para
-#: boot-installer.xml:2801
+#: boot-installer.xml:2888
#, no-c-format
msgid ""
"The syntax to use to set parameters for modules is: "
@@ -3597,19 +3813,19 @@ msgstr ""
"用:"
#. Tag: screen
-#: boot-installer.xml:2811
+#: boot-installer.xml:2898
#, no-c-format
msgid "3c509.xcvr=3 3c509.irq=10"
msgstr "3c509.xcvr=3 3c509.irq=10"
#. Tag: title
-#: boot-installer.xml:2817
+#: boot-installer.xml:2904
#, no-c-format
msgid "Blacklisting kernel modules"
msgstr "内核模块黑名单"
#. Tag: para
-#: boot-installer.xml:2818
+#: boot-installer.xml:2905
#, no-c-format
msgid ""
"Sometimes it may be necessary to blacklist a module to prevent it from being "
@@ -3624,7 +3840,7 @@ msgstr ""
"间冲突或者错误的驱动先加载,将造成设备无法正常工作。"
#. Tag: para
-#: boot-installer.xml:2827
+#: boot-installer.xml:2914
#, no-c-format
msgid ""
"You can blacklist a module using the following syntax: "
@@ -3638,7 +3854,7 @@ msgstr ""
"入 <filename>/etc/modprobe.d/blacklist.local</filename> 文件的黑名单中。"
#. Tag: para
-#: boot-installer.xml:2835
+#: boot-installer.xml:2922
#, no-c-format
msgid ""
"Note that a module may still be loaded by the installation system itself. "
@@ -3650,19 +3866,19 @@ msgstr ""
"件检查过程中从显示的模块列表中取消该模块。"
#. Tag: title
-#: boot-installer.xml:2851
+#: boot-installer.xml:2938
#, no-c-format
msgid "Troubleshooting the Installation Process"
msgstr "安装过程中的故障修复"
#. Tag: title
-#: boot-installer.xml:2856
+#: boot-installer.xml:2943
#, no-c-format
msgid "CD-ROM Reliability"
msgstr "CD-ROM 的可靠性"
#. Tag: para
-#: boot-installer.xml:2857
+#: boot-installer.xml:2944
#, no-c-format
msgid ""
"Sometimes, especially with older CD-ROM drives, the installer may fail to "
@@ -3674,7 +3890,7 @@ msgstr ""
"&mdash; 即使是从 CD-ROM 成功引导 &mdash; 无法识别 CD-ROM 或在安装时读取错误。"
#. Tag: para
-#: boot-installer.xml:2864
+#: boot-installer.xml:2951
#, no-c-format
msgid ""
"There are many different possible causes for these problems. We can only "
@@ -3685,13 +3901,13 @@ msgstr ""
"下的由您来处理。"
#. Tag: para
-#: boot-installer.xml:2870
+#: boot-installer.xml:2957
#, no-c-format
msgid "There are two very simple things that you should try first."
msgstr "您首先应试试两种最简单的方法。"
#. Tag: para
-#: boot-installer.xml:2875
+#: boot-installer.xml:2962
#, no-c-format
msgid ""
"If the CD-ROM does not boot, check that it was inserted correctly and that "
@@ -3699,7 +3915,7 @@ msgid ""
msgstr "如果 CD-ROM 没有引导,检查一下它是否放好,并且没有弄脏。"
#. Tag: para
-#: boot-installer.xml:2881
+#: boot-installer.xml:2968
#, no-c-format
msgid ""
"If the installer fails to recognize a CD-ROM, try just running the option "
@@ -3712,7 +3928,7 @@ msgstr ""
"DMA 相关的问题可以用这种方法解决。"
#. Tag: para
-#: boot-installer.xml:2891
+#: boot-installer.xml:2978
#, no-c-format
msgid ""
"If this does not work, then try the suggestions in the subsections below. "
@@ -3723,7 +3939,7 @@ msgstr ""
"CD-ROM 和 DVD,为了方便,只提到 CD-ROM。"
#. Tag: para
-#: boot-installer.xml:2897
+#: boot-installer.xml:2984
#, no-c-format
msgid ""
"If you cannot get the installation working from CD-ROM, try one of the other "
@@ -3731,13 +3947,13 @@ msgid ""
msgstr "如果您用 CD-ROM 无法安装,试试其他可用的安装方法。"
#. Tag: title
-#: boot-installer.xml:2905
+#: boot-installer.xml:2992
#, no-c-format
msgid "Common issues"
msgstr "常见问题"
#. Tag: para
-#: boot-installer.xml:2908
+#: boot-installer.xml:2995
#, no-c-format
msgid ""
"Some older CD-ROM drives do not support reading from discs that were burned "
@@ -3745,7 +3961,7 @@ msgid ""
msgstr "有些老 CD-ROM 驱动器不能读取新 CD 刻录机的高速模式下刻录的光盘。"
#. Tag: para
-#: boot-installer.xml:2925
+#: boot-installer.xml:3012
#, no-c-format
msgid ""
"Some very old CD-ROM drives do not work correctly if <quote>direct memory "
@@ -3755,19 +3971,19 @@ msgstr ""
"正常工作。"
#. Tag: title
-#: boot-installer.xml:2936
+#: boot-installer.xml:3023
#, no-c-format
msgid "How to investigate and maybe solve issues"
msgstr "如何调查研究或许可以解决问题"
#. Tag: para
-#: boot-installer.xml:2937
+#: boot-installer.xml:3024
#, no-c-format
msgid "If the CD-ROM fails to boot, try the suggestions listed below."
msgstr "如果从 CD-ROM 引导失败,试试下面所列的建议。"
#. Tag: para
-#: boot-installer.xml:2942
+#: boot-installer.xml:3029
#, no-c-format
msgid ""
"Check that your BIOS actually supports booting from CD-ROM (only an issue "
@@ -3777,7 +3993,7 @@ msgstr ""
"开支持从 CD 引导。"
#. Tag: para
-#: boot-installer.xml:2949
+#: boot-installer.xml:3036
#, no-c-format
msgid ""
"If you downloaded an iso image, check that the md5sum of that image matches "
@@ -3801,7 +4017,7 @@ msgstr ""
"用下面的命令。它使用映像的尺寸从 CD-ROM 读取正确的字节数。"
#. Tag: screen
-#: boot-installer.xml:2962
+#: boot-installer.xml:3049
#, no-c-format
msgid ""
"$ dd if=/dev/cdrom | \\\n"
@@ -3823,7 +4039,7 @@ msgstr ""
"134486016 bytes (134 MB) copied, 97.474 seconds, 1.4 MB/s"
#. Tag: para
-#: boot-installer.xml:2967
+#: boot-installer.xml:3054
#, no-c-format
msgid ""
"If, after the installer has been booted successfully, the CD-ROM is not "
@@ -3842,7 +4058,7 @@ msgstr ""
"shell。"
#. Tag: para
-#: boot-installer.xml:2979
+#: boot-installer.xml:3066
#, no-c-format
msgid ""
"Switch to VT4 or view the contents of <filename>/var/log/syslog</filename> "
@@ -3854,7 +4070,7 @@ msgstr ""
"<command>dmesg</command> 的输出。"
#. Tag: para
-#: boot-installer.xml:2986
+#: boot-installer.xml:3073
#, no-c-format
msgid ""
"Check in the output of <command>dmesg</command> if your CD-ROM drive was "
@@ -3882,7 +4098,7 @@ msgstr ""
"<command>modprobe</command> 手动加载。"
#. Tag: para
-#: boot-installer.xml:3000
+#: boot-installer.xml:3087
#, no-c-format
msgid ""
"Check that there is a device node for your CD-ROM drive under <filename>/dev/"
@@ -3894,7 +4110,7 @@ msgstr ""
"cdrom0</filename>。"
#. Tag: para
-#: boot-installer.xml:3008
+#: boot-installer.xml:3095
#, no-c-format
msgid ""
"Use the <command>mount</command> command to check if the CD-ROM is already "
@@ -3909,7 +4125,7 @@ msgstr ""
"</screen></informalexample> 检查命令后面是否有什么错误信息。"
#. Tag: para
-#: boot-installer.xml:3018
+#: boot-installer.xml:3105
#, no-c-format
msgid ""
"Check if DMA is currently enabled: <informalexample><screen>\n"
@@ -3934,7 +4150,7 @@ msgstr ""
"</screen></informalexample> 确保您所处的目录对应 CD-ROM 驱动器。"
#. Tag: para
-#: boot-installer.xml:3033
+#: boot-installer.xml:3120
#, no-c-format
msgid ""
"If there are any problems during the installation, try checking the "
@@ -3946,13 +4162,13 @@ msgstr ""
"性。如果 CD-ROM 可以读,该选项可以对其进行测试。"
#. Tag: title
-#: boot-installer.xml:3048
+#: boot-installer.xml:3135
#, no-c-format
msgid "Floppy Disk Reliability"
msgstr "软盘的可靠性"
#. Tag: para
-#: boot-installer.xml:3050
+#: boot-installer.xml:3137
#, no-c-format
msgid ""
"The biggest problem for people using floppy disks to install &debian; seems "
@@ -3961,7 +4177,7 @@ msgstr ""
"对于用软盘安装 &debian; 的人来说,他们遇到的最大的问题很可能是软盘的可靠性。"
#. Tag: para
-#: boot-installer.xml:3055
+#: boot-installer.xml:3142
#, no-c-format
msgid ""
"The boot floppy is the floppy with the worst problems, because it is read by "
@@ -3977,7 +4193,7 @@ msgstr ""
"息。"
#. Tag: para
-#: boot-installer.xml:3064
+#: boot-installer.xml:3151
#, no-c-format
msgid ""
"If you are having the installation stall at a particular floppy, the first "
@@ -3992,7 +4208,7 @@ msgstr ""
"化以后看起来没有错误。如果可能,在别的统上重写这些软盘更好一些。"
#. Tag: para
-#: boot-installer.xml:3073
+#: boot-installer.xml:3160
#, no-c-format
msgid ""
"One user reports he had to write the images to floppy <emphasis>three</"
@@ -4003,7 +4219,7 @@ msgstr ""
"软盘才算工作良好。"
#. Tag: para
-#: boot-installer.xml:3079
+#: boot-installer.xml:3166
#, no-c-format
msgid ""
"Normally you should not have to download a floppy image again, but if you "
@@ -4014,7 +4230,7 @@ msgstr ""
"来检验下载的映像是否正确。"
#. Tag: para
-#: boot-installer.xml:3085
+#: boot-installer.xml:3172
#, no-c-format
msgid ""
"Other users have reported that simply rebooting a few times with the same "
@@ -4025,13 +4241,13 @@ msgstr ""
"有缺陷的硬件或固件软盘驱动器驱动程序造成的。"
#. Tag: title
-#: boot-installer.xml:3094
+#: boot-installer.xml:3181
#, no-c-format
msgid "Boot Configuration"
msgstr "引导配置"
#. Tag: para
-#: boot-installer.xml:3096
+#: boot-installer.xml:3183
#, no-c-format
msgid ""
"If you have problems and the kernel hangs during the boot process, doesn't "
@@ -4044,7 +4260,7 @@ msgstr ""
"\"/> 讨论。"
#. Tag: para
-#: boot-installer.xml:3105
+#: boot-installer.xml:3192
#, no-c-format
msgid ""
"In some cases, malfunctions can be caused by missing device firmware (see "
@@ -4055,7 +4271,7 @@ msgstr ""
"firmware\"/> 和 <xref linkend=\"loading-firmware\"/>)。"
#. Tag: para
-#: boot-installer.xml:3116
+#: boot-installer.xml:3203
#, no-c-format
msgid ""
"If software speech synthesis does not work, there is most probably an issue "
@@ -4070,37 +4286,37 @@ msgstr ""
"台机器上声音可以正常工作的 Linux 系统上(比如,live CD),运行下面命令的输出。"
#. Tag: userinput
-#: boot-installer.xml:3127
+#: boot-installer.xml:3214
#, no-c-format
msgid "dmesg"
msgstr "dmesg"
#. Tag: userinput
-#: boot-installer.xml:3129
+#: boot-installer.xml:3216
#, no-c-format
msgid "lspci"
msgstr "lspci"
#. Tag: userinput
-#: boot-installer.xml:3131
+#: boot-installer.xml:3218
#, no-c-format
msgid "lsmod"
msgstr "lsmod"
#. Tag: userinput
-#: boot-installer.xml:3133
+#: boot-installer.xml:3220
#, no-c-format
msgid "amixer"
msgstr "amixer"
#. Tag: title
-#: boot-installer.xml:3141 boot-installer.xml:3252
+#: boot-installer.xml:3228 boot-installer.xml:3339
#, no-c-format
msgid "Common &arch-title; Installation Problems"
msgstr "&arch-title; 常见安装问题"
#. Tag: para
-#: boot-installer.xml:3142
+#: boot-installer.xml:3229
#, no-c-format
msgid ""
"There are some common installation problems that can be solved or avoided by "
@@ -4108,7 +4324,7 @@ msgid ""
msgstr "有一些常见的安装问题,可以通过给安装程序特定的引导参数解决或避免。"
#. Tag: para
-#: boot-installer.xml:3193
+#: boot-installer.xml:3280
#, no-c-format
msgid ""
"If your screen begins to show a weird picture while the kernel boots, eg. "
@@ -4126,13 +4342,13 @@ msgstr ""
"\"boot-parms\"/> 来获得细节信息。"
#. Tag: title
-#: boot-installer.xml:3207
+#: boot-installer.xml:3294
#, no-c-format
msgid "System Freeze During the PCMCIA Configuration Phase"
msgstr "在 PCMCIA 配置阶段系统停止"
#. Tag: para
-#: boot-installer.xml:3208
+#: boot-installer.xml:3295
#, no-c-format
msgid ""
"Some very old laptop models produced by Dell are known to crash when PCMCIA "
@@ -4150,7 +4366,7 @@ msgstr ""
"题的资源区段。"
#. Tag: para
-#: boot-installer.xml:3218
+#: boot-installer.xml:3305
#, no-c-format
msgid ""
"Alternatively, you can boot the installer in expert mode. You will then be "
@@ -4170,19 +4386,19 @@ msgstr ""
"项。注意您在安装程序中,输入这些值的时候必须忽略逗号。"
#. Tag: para
-#: boot-installer.xml:3253
+#: boot-installer.xml:3340
#, no-c-format
msgid "There are some common installation problems that are worth mentioning."
msgstr "有一些常见的安装问题值得解释一下。"
#. Tag: title
-#: boot-installer.xml:3259
+#: boot-installer.xml:3346
#, no-c-format
msgid "Misdirected video output"
msgstr "错误的视频输出"
#. Tag: para
-#: boot-installer.xml:3260
+#: boot-installer.xml:3347
#, no-c-format
msgid ""
"It is fairly common for &arch-title; to have two video cards in one machine, "
@@ -4206,7 +4422,7 @@ msgstr ""
"<userinput>video=atyfb:off</userinput> 启动安装程序。"
#. Tag: para
-#: boot-installer.xml:3274
+#: boot-installer.xml:3361
#, no-c-format
msgid ""
"Note that you may also have to manually add this parameter to the silo "
@@ -4219,13 +4435,13 @@ msgstr ""
"xorg.conf</filename> 中的视频驱动。"
#. Tag: title
-#: boot-installer.xml:3285
+#: boot-installer.xml:3372
#, no-c-format
msgid "Failure to Boot or Install from CD-ROM"
msgstr "从 CD-ROM 上引导或安装失败"
#. Tag: para
-#: boot-installer.xml:3286
+#: boot-installer.xml:3373
#, no-c-format
msgid ""
"Some Sparc systems are notoriously difficult to boot from CD-ROM and even if "
@@ -4236,19 +4452,19 @@ msgstr ""
"费解的错误。SunBlade 系统被报告了很多问题。"
#. Tag: para
-#: boot-installer.xml:3292
+#: boot-installer.xml:3379
#, no-c-format
msgid "We recommend to install such systems by netbooting the installer."
msgstr "我们建议从网络安装这些系统。"
#. Tag: title
-#: boot-installer.xml:3301
+#: boot-installer.xml:3388
#, no-c-format
msgid "Interpreting the Kernel Startup Messages"
msgstr "内核起始信息注解"
#. Tag: para
-#: boot-installer.xml:3303
+#: boot-installer.xml:3390
#, no-c-format
msgid ""
"During the boot sequence, you may see many messages in the form "
@@ -4282,13 +4498,13 @@ msgstr ""
"linkend=\"kernel-baking\"/>)</phrase>。"
#. Tag: title
-#: boot-installer.xml:3328
+#: boot-installer.xml:3415
#, no-c-format
msgid "Reporting Installation Problems"
msgstr "报告安装问题"
#. Tag: para
-#: boot-installer.xml:3329
+#: boot-installer.xml:3416
#, no-c-format
msgid ""
"If you get through the initial boot phase but cannot complete the install, "
@@ -4305,7 +4521,7 @@ msgstr ""
"索。如果您正在提交一个 bug 报告,可以报告里附上该信息。"
#. Tag: para
-#: boot-installer.xml:3340
+#: boot-installer.xml:3427
#, no-c-format
msgid ""
"Other pertinent installation messages may be found in <filename>/var/log/</"
@@ -4316,13 +4532,13 @@ msgstr ""
"新安装的系统启动后,放在 <filename>/var/log/debian-installer/</filename> 里。"
#. Tag: title
-#: boot-installer.xml:3351
+#: boot-installer.xml:3438
#, no-c-format
msgid "Submitting Installation Reports"
msgstr "提交缺陷报告"
#. Tag: para
-#: boot-installer.xml:3352
+#: boot-installer.xml:3439
#, no-c-format
msgid ""
"If you still have problems, please submit an installation report. We also "
@@ -4334,7 +4550,7 @@ msgstr ""
"这让我们可以尽可能多地了解硬件的配置数量。"
#. Tag: para
-#: boot-installer.xml:3359
+#: boot-installer.xml:3446
#, no-c-format
msgid ""
"Note that your installation report will be published in the Debian Bug "
@@ -4345,7 +4561,7 @@ msgstr ""
"件列表。确保您使用的邮件地址可以被公开。"
#. Tag: para
-#: boot-installer.xml:3365
+#: boot-installer.xml:3452
#, no-c-format
msgid ""
"If you have a working &debian; system, the easiest way to send an "
@@ -4364,7 +4580,7 @@ msgstr ""
"command> 命令。"
#. Tag: para
-#: boot-installer.xml:3375
+#: boot-installer.xml:3462
#, no-c-format
msgid ""
"Alternatively you can use this template when filling out installation "
@@ -4450,6 +4666,39 @@ msgstr ""
"</screen></informalexample> 在 bug 报告中,请说明问题所在,包括内核挂起时最后"
"见到的内核消息。描述进入问题状态所进行的步骤。"
+#~ msgid ""
+#~ "When the installer boots, you should be presented with a friendly "
+#~ "graphical screen showing the &debian; logo and a menu: "
+#~ "<informalexample><screen>\n"
+#~ "Installer boot menu\n"
+#~ "\n"
+#~ "Install\n"
+#~ "Graphical install\n"
+#~ "Advanced options >\n"
+#~ "Help\n"
+#~ "Install with speech synthesis\n"
+#~ "\n"
+#~ "Press ENTER to boot or TAB to edit a menu entry\n"
+#~ "</screen></informalexample> Depending on the installation method you are "
+#~ "using, the <quote>Graphical install</quote> option may not be available. "
+#~ "Bi-arch images additionally have a 64 bit variant for each install "
+#~ "option, right below it, thus almost doubling the number of options."
+#~ msgstr ""
+#~ "安装程序引导后,您应该看到界面友好的图形画面显示着 &debian; 图标和菜单:"
+#~ "<informalexample><screen>\n"
+#~ "Installer boot menu\n"
+#~ "\n"
+#~ "Install\n"
+#~ "Graphical install\n"
+#~ "Advanced options >\n"
+#~ "Help\n"
+#~ "Install with speech synthesis\n"
+#~ "\n"
+#~ "Press ENTER to boot or TAB to edit a menu entry\n"
+#~ "</screen></informalexample> 根据您使用的不同安装方法,<quote>Graphical "
+#~ "install</quote> 选项可能不会出现。双体系(bi-arch)映像会额外有一个 64 位安"
+#~ "装选项,在其下方,因此会有双倍的选项。"
+
#~ msgid "Booting from CD-ROM"
#~ msgstr "从 CD 光盘上引导"
diff --git a/po/zh_CN/boot-new.po b/po/zh_CN/boot-new.po
index d1ccebcd8..fcad5fae9 100644
--- a/po/zh_CN/boot-new.po
+++ b/po/zh_CN/boot-new.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: 2014-08-26 20:40+0000\n"
+"POT-Creation-Date: 2015-04-15 20:29+0000\n"
"PO-Revision-Date: 2010-10-26 21:00+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -155,12 +155,17 @@ msgstr ""
#. Tag: para
#: boot-new.xml:84
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you use <command>BootX</command> to boot into the installed system, "
+#| "just select your desired kernel in the <filename>Linux Kernels</filename> "
+#| "folder, un-choose the ramdisk option, and add a root device corresponding "
+#| "to your installation; e.g. <userinput>/dev/hda8</userinput>."
msgid ""
"If you use <command>BootX</command> to boot into the installed system, just "
"select your desired kernel in the <filename>Linux Kernels</filename> folder, "
"un-choose the ramdisk option, and add a root device corresponding to your "
-"installation; e.g. <userinput>/dev/hda8</userinput>."
+"installation; e.g. <userinput>/dev/sda8</userinput>."
msgstr ""
"假如您使用 <command>BootX</command> 启动到安装的系统,只需选择需要的内核,位"
"于 <filename>Linux Kernels</filename> 目录,去掉 ramdisk 选项,并添加与您安装"
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 657ec80fb..deca41178 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.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: 2015-03-21 16:42+0000\n"
+"POT-Creation-Date: 2015-04-15 20:29+0000\n"
"PO-Revision-Date: 2012-11-25 23:22+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -76,20 +76,20 @@ msgstr "支持的体系"
#| "&debian; GNU/Linux &release; supports eleven major architectures and "
#| "several variations of each architecture known as <quote>flavors</quote>."
msgid ""
-"&debian; GNU/Linux &release; supports eight major architectures and several "
+"&debian; GNU/Linux &release; supports ten major architectures and several "
"variations of each architecture known as <quote>flavors</quote>."
msgstr ""
"&debian; GNU/Linux &release; 支持十一种主要的体系和一些称为 <quote>flavors</"
"quote> 的衍生品种。"
#. Tag: entry
-#: hardware.xml:53 hardware.xml:197
+#: hardware.xml:53 hardware.xml:193
#, no-c-format
msgid "Architecture"
msgstr "体系"
#. Tag: entry
-#: hardware.xml:53 hardware.xml:197
+#: hardware.xml:53 hardware.xml:193
#, no-c-format
msgid "&debian; Designation"
msgstr "&debian; 命名"
@@ -107,7 +107,7 @@ msgid "Flavor"
msgstr "Flavor"
#. Tag: entry
-#: hardware.xml:60 hardware.xml:203
+#: hardware.xml:60 hardware.xml:199
#, no-c-format
msgid "Intel x86-based"
msgstr "Intel x86-based"
@@ -119,7 +119,7 @@ msgid "i386"
msgstr "i386"
#. Tag: entry
-#: hardware.xml:67 hardware.xml:208
+#: hardware.xml:67 hardware.xml:204
#, no-c-format
msgid "AMD64 &amp; Intel 64"
msgstr "AMD64 &amp; Intel 64"
@@ -204,207 +204,213 @@ msgid "armhf"
msgstr "armhf"
#. Tag: entry
-#: hardware.xml:101
+#: hardware.xml:97
#, no-c-format
msgid "multiplatform"
msgstr ""
#. Tag: entry
-#: hardware.xml:102
+#: hardware.xml:98
#, no-c-format
msgid "armmp"
msgstr ""
#. Tag: entry
-#: hardware.xml:104
+#: hardware.xml:100
#, no-c-format
msgid "multiplatform for LPAE-capable systems"
msgstr ""
#. Tag: entry
-#: hardware.xml:105
+#: hardware.xml:101
#, no-c-format
msgid "armmp-lpae"
msgstr ""
#. Tag: entry
-#: hardware.xml:109
+#: hardware.xml:105
#, no-c-format
msgid "64bit ARM"
msgstr ""
#. Tag: entry
-#: hardware.xml:110
+#: hardware.xml:106
#, no-c-format
msgid "arm64"
msgstr ""
#. Tag: entry
-#: hardware.xml:116
+#: hardware.xml:112
#, no-c-format
msgid "MIPS (big endian)"
msgstr "MIPS (big endian)"
#. Tag: entry
-#: hardware.xml:117
+#: hardware.xml:113
#, no-c-format
msgid "mips"
msgstr "mips"
#. Tag: entry
-#: hardware.xml:118
+#: hardware.xml:114
#, no-c-format
msgid "SGI IP22 (Indy/Indigo 2)"
msgstr "SGI IP22 (Indy/Indigo 2)"
#. Tag: entry
-#: hardware.xml:119
+#: hardware.xml:115
#, no-c-format
msgid "r4k-ip22"
msgstr "r4k-ip22"
#. Tag: entry
-#: hardware.xml:121
+#: hardware.xml:117
#, no-c-format
msgid "SGI IP32 (O2)"
msgstr "SGI IP32 (O2)"
#. Tag: entry
-#: hardware.xml:122
+#: hardware.xml:118
#, no-c-format
msgid "r5k-ip32"
msgstr "r5k-ip32"
#. Tag: entry
-#: hardware.xml:124 hardware.xml:134
+#: hardware.xml:120 hardware.xml:130
#, no-c-format
msgid "MIPS Malta (32 bit)"
msgstr "MIPS Malta (32 bit)"
#. Tag: entry
-#: hardware.xml:125 hardware.xml:135
+#: hardware.xml:121 hardware.xml:131
#, no-c-format
msgid "4kc-malta"
msgstr "4kc-malta"
#. Tag: entry
-#: hardware.xml:127 hardware.xml:137
+#: hardware.xml:123 hardware.xml:133
#, no-c-format
msgid "MIPS Malta (64 bit)"
msgstr "MIPS Malta (64 bit)"
#. Tag: entry
-#: hardware.xml:128 hardware.xml:138
+#: hardware.xml:124 hardware.xml:134
#, no-c-format
msgid "5kc-malta"
msgstr "5kc-malta"
#. Tag: entry
-#: hardware.xml:132
+#: hardware.xml:128
#, no-c-format
msgid "MIPS (little endian)"
msgstr "MIPS (little endian)"
#. Tag: entry
-#: hardware.xml:133
+#: hardware.xml:129
#, no-c-format
msgid "mipsel"
msgstr "mipsel"
#. Tag: entry
-#: hardware.xml:142
+#: hardware.xml:138
#, no-c-format
msgid "IBM/Motorola PowerPC"
msgstr "IBM/Motorola PowerPC"
#. Tag: entry
-#: hardware.xml:143
+#: hardware.xml:139
#, fuzzy, no-c-format
#| msgid "<entry>powerpc</entry>"
msgid "<entry morerows=\"1\">powerpc</entry>"
msgstr "<entry>powerpc</entry>"
#. Tag: entry
-#: hardware.xml:144
+#: hardware.xml:140
#, no-c-format
msgid "PowerMac"
msgstr "PowerMac"
#. Tag: entry
-#: hardware.xml:145
+#: hardware.xml:141
#, no-c-format
msgid "pmac"
msgstr "pmac"
#. Tag: entry
-#: hardware.xml:147
+#: hardware.xml:143
#, no-c-format
msgid "PReP"
msgstr "PReP"
#. Tag: entry
-#: hardware.xml:148
+#: hardware.xml:144
#, no-c-format
msgid "prep"
msgstr "prep"
#. Tag: entry
-#: hardware.xml:152
+#: hardware.xml:148
#, fuzzy, no-c-format
-#| msgid "MIPS (little endian)"
-msgid "IBM PowerPC (little endian)"
-msgstr "MIPS (little endian)"
+#| msgid "Amiga Power-UP Systems (APUS)"
+msgid "Power Systems"
+msgstr "Amiga Power-UP Systems (APUS)"
#. Tag: entry
-#: hardware.xml:153
+#: hardware.xml:149
#, no-c-format
msgid "ppc64el"
msgstr ""
#. Tag: entry
-#: hardware.xml:179
+#: hardware.xml:150
+#, no-c-format
+msgid "IBM POWER8 or newer machines"
+msgstr ""
+
+#. Tag: entry
+#: hardware.xml:175
#, no-c-format
msgid "64bit IBM S/390"
msgstr "64bit IBM S/390"
#. Tag: entry
-#: hardware.xml:180
+#: hardware.xml:176
#, no-c-format
msgid "s390x"
msgstr "s390x"
#. Tag: entry
-#: hardware.xml:181
+#: hardware.xml:177
#, no-c-format
msgid "IPL from VM-reader and DASD"
msgstr "来自 VM-reader 和 DASD 的 IPL"
#. Tag: entry
-#: hardware.xml:182
+#: hardware.xml:178
#, no-c-format
msgid "generic"
msgstr "generic"
#. Tag: para
-#: hardware.xml:187
+#: hardware.xml:183
#, no-c-format
msgid "&debian; GNU/kFreeBSD &release; supports two architectures."
msgstr "&debian; GNU/kFreeBSD &release; 支持两种架构。"
#. Tag: entry
-#: hardware.xml:204
+#: hardware.xml:200
#, no-c-format
msgid "kfreebsd-i386"
msgstr "kfreebsd-i386"
#. Tag: entry
-#: hardware.xml:209
+#: hardware.xml:205
#, no-c-format
msgid "kfreebsd-amd64"
msgstr "kfreebsd-amd64"
#. Tag: para
-#: hardware.xml:214
+#: hardware.xml:210
#, no-c-format
msgid ""
"This document covers installation for the <emphasis>&arch-title;</emphasis> "
@@ -418,22 +424,7 @@ msgstr ""
"org/ports/\">&debian;-Ports</ulink> 网页。"
#. Tag: para
-#: hardware.xml:224
-#, no-c-format
-msgid ""
-"The &arch-title; architecture only supports Intel Itanium processors and not "
-"the much more common 64-bit processors from the Intel 64 family (including e."
-"g. the Pentium&nbsp;D and the Core2&nbsp;Duo). Those systems are supported "
-"by the <emphasis>amd64</emphasis> architecture or, if you prefer a 32-bit "
-"userland, the <emphasis>i386</emphasis> architecture."
-msgstr ""
-"&arch-title; 体系只支持 Intel Itanium 处理器,而不是常见的属于 Intel 64 家族"
-"的 64 位处理器(包括像 Pentium&nbsp;D 和 Core2&nbsp;Duo)。它们是被 "
-"<emphasis>amd64</emphasis> 体系支持。如果您希望使用 32 位系统,可以选择 "
-"<emphasis>i386</emphasis> 体系。"
-
-#. Tag: para
-#: hardware.xml:234
+#: hardware.xml:220
#, no-c-format
msgid ""
"This is the first official release of &debian-gnu; for the &arch-title; "
@@ -454,84 +445,101 @@ msgstr ""
"\"&url-list-subscribe;\">debian-&arch-listname; 邮件列表</ulink> 来进行讨论。"
#. Tag: title
-#: hardware.xml:256
+#: hardware.xml:242
#, no-c-format
msgid "CPU Support"
msgstr "CPU 支持"
#. Tag: para
-#: hardware.xml:257
+#: hardware.xml:243
#, no-c-format
msgid "Both AMD64 and Intel 64 processors are supported."
msgstr "AMD64 和 Intel 64 处理器都获得支持。"
# 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
-#: hardware.xml:282 hardware.xml:637 hardware.xml:656 hardware.xml:714
-#: hardware.xml:772 hardware.xml:802
+#: hardware.xml:268 hardware.xml:723 hardware.xml:780 hardware.xml:838
+#: hardware.xml:868 hardware.xml:1311
#, no-c-format
msgid "CPU, Main Boards, and Video Support"
msgstr "CPU,主板和视频支持"
#. Tag: para
-#: hardware.xml:284
+#: hardware.xml:270
+#, no-c-format
+msgid ""
+"ARM systems are much more heterogeneous than the i386/amd64-based PC "
+"architecture, so whilst 64-bit ARM machines should boot in a standardised "
+"way, like PCs, the situation is more complicated for 32-bit ARM machines."
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:279
#, no-c-format
msgid ""
-"ARM systems are a lot more heterogenous than the i386/amd64-based PC "
-"architecture, where all systems share a common system firmware (BIOS or/and "
-"UEFI) which handles the board-specific basic hardware initialization in a "
-"standardized way. The ARM architecture is used mainly in so-called "
-"<quote>systems-on-chip</quote> (SoCs). These SoCs are designed by many "
-"different companies with vastly varying hardware components even for the "
-"very basic functionality required to bring the system up. Systems using them "
-"usually lack a common system firmware interface and as a result, on ARM "
-"systems the Linux kernel has to take care of many system-specific low-level "
-"issues which are handled by the mainboard's BIOS in the PC world."
+"The ARM architecture is used mainly in so-called <quote>systems-on-chip</"
+"quote> (SoCs). These SoCs are designed by many different companies with "
+"vastly varying hardware components even for the very basic functionality "
+"required to bring the system up. System firmware interfaces have been "
+"increasingly standardised over time, but especially on older hardware "
+"firmware/boot interfaces vary a great deal, so on these systems the Linux "
+"kernel has to take care of many system-specific low-level issues which are "
+"handled by the mainboard's BIOS in the PC world."
msgstr ""
#. Tag: para
-#: hardware.xml:301
+#: hardware.xml:292
#, no-c-format
msgid ""
-"At the beginning of the ARM support in the Linux kernel, this resulted in "
-"the requirement of having a seperate kernel for each ARM system in contrast "
-"to the <quote>one-fits-all</quote> kernel for PC systems. As this approach "
-"does not scale to a large number of different systems, work has started to "
-"be able to provide a single ARM kernel that can run on different ARM "
-"systems. Support for newer ARM systems gets implemented in a way that allows "
-"the use of such a multiplatform kernel, but for several older systems a "
-"seperate specific kernel is still required. Because of this, the standard "
-"&debian; distribution only supports installation on a selected number of "
-"older ARM systems in addition to the newer systems which are supported by "
-"the ARM multiplatform (armmp) kernel."
+"At the beginning of the ARM support in the Linux kernel, the hardware "
+"variety resulted in the requirement of having a separate kernel for each ARM "
+"system in contrast to the <quote>one-fits-all</quote> kernel for PC systems. "
+"As this approach does not scale to a large number of different systems, work "
+"was done to allow booting with a single ARM kernel that can run on different "
+"ARM systems. Support for newer ARM systems gets implemented in a way that "
+"allows the use of such a multiplatform kernel, but for several older systems "
+"a separate specific kernel is still required."
msgstr ""
#. Tag: para
-#: hardware.xml:318
+#: hardware.xml:304
+#, no-c-format
+msgid ""
+"Because of this, the standard &debian; distribution only supports "
+"installation on a selected number of older 32-bit ARM systems in addition to "
+"the newer (32 and 64-bit) systems which are supported by the ARM "
+"multiplatform kernels (called 'armmp' on 32-bit armhf, no flavour name on 64-"
+"bit arm64)."
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:313
#, no-c-format
msgid ""
"The ARM architecture has evolved over time and modern ARM processors provide "
"features which are not available in older models. &debian; therefore "
-"provides two ARM ports, the &debian;/armel and the &debian;/armhf port. "
+"provides three ARM ports: the &debian;/arm64 port for all 64-bit machines, "
+"and the &debian;/armel and the &debian;/armhf ports for 32-bit machines. "
"&debian;/armel targets older ARM processors without support for a hardware "
"floating point unit (FPU), while &debian;/armhf works only on newer ARM "
"processors which implement at least the ARMv7 architecture with version 3 of "
"the ARM vector floating point specification (VFPv3). &debian;/armhf makes "
"use of the extended features and performance enhancements available on these "
-"models."
+"models. &debian;/arm64 works on processors which implement at least the "
+"ARMv8 architecture (which is 64bit)."
msgstr ""
#. Tag: para
-#: hardware.xml:346
+#: hardware.xml:350
#, fuzzy, no-c-format
#| msgid ""
#| "Most ARM CPUs may be run in either endian mode (big or little). However, "
#| "the majority of current system implementation uses little-endian mode. "
#| "&debian; currently only supports little-endian ARM systems."
msgid ""
-"Technically, several ARM CPUs can be run in either endian mode (big or "
-"little), but in practice the vast majority of currently available systems "
-"uses little-endian mode. Both &debian;/armhf and &debian;/armel support only "
+"Technically, all currently available ARM CPUs can be run in either endian "
+"mode (big or little), but in practice the vast majority use little-endian "
+"mode. All of &debian;/arm64, &debian;/armhf and &debian;/armel support only "
"little-endian systems."
msgstr ""
"大多数的 ARM CPU 可以运行在(big 或 little)任一 endian 模式下。但是当前绝大多"
@@ -539,151 +547,97 @@ msgstr ""
"ARM 系统。"
#. Tag: title
-#: hardware.xml:354
+#: hardware.xml:357
#, no-c-format
-msgid "Platforms supported by Debian/armel"
+msgid "Platforms supported by Debian/arm64"
msgstr ""
#. Tag: para
-#: hardware.xml:356
+#: hardware.xml:359
#, no-c-format
msgid ""
-"The following platforms are supported by &debian;/armel; they require "
-"platform-specific kernels."
+"Arm64/AArch64/ARMv8 hardware became available quite late in the &debian; "
+"&releasename-cap; release cycle so not many platforms have had support "
+"merged in the mainline kernel version in this release, which is the main "
+"requirement to have &d-i; working on them."
msgstr ""
-#. Tag: term
-#: hardware.xml:364
-#, fuzzy, no-c-format
-#| msgid "Intel IXP4xx"
-msgid "IXP4xx"
-msgstr "Intel IXP4xx"
-
#. Tag: para
-#: hardware.xml:365
+#: hardware.xml:368
#, no-c-format
msgid ""
-"The Intel IXP4xx processor series is used in network attached storage "
-"devices like the Linksys NSLU2."
+"The tested platforms are listed below, but in general, the multiplatform "
+"support in the arm64 Linux kernel also allows running &d-i; on arm64 systems "
+"not explicitly listed below, so long as the kernel used by &d-i; has support "
+"for the target system's components and a device-tree file for the target is "
+"available. In these cases, the installer can usually provide a working "
+"userland installation, and so long as UEFI is in use, it should be able to "
+"make the system bootable as well. If UEFI is not used (some 64-bit machines "
+"have been shipped with U-Boot) you will probably also need some manual steps "
+"to make the system bootable."
msgstr ""
-#. Tag: term
-#: hardware.xml:374
-#, no-c-format
-msgid "Kirkwood"
-msgstr "Kirkwood"
-
#. Tag: para
-#: hardware.xml:375
+#: hardware.xml:382
#, no-c-format
msgid ""
-"Kirkwood is a system on a chip (SoC) from Marvell that integrates an ARM "
-"CPU, Ethernet, SATA, USB, and other functionality in one chip. We currently "
-"support the following Kirkwood based devices: OpenRD (OpenRD-Base, OpenRD-"
-"Client and OpenRD-Ultimate), <ulink url=\"&url-arm-cyrius-sheevaplug;\">plug "
-"computers (SheevaPlug, GuruPlug and DreamPlug)</ulink>, <ulink url=\"&url-"
-"arm-cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> (all TS-11x, TS-21x "
-"and TS-41x models), and LaCie NASes (Network Space v2, Network Space Max v2, "
-"Internet Space v2, d2 Network v2, 2Big Network v2 and 5Big Network v2)."
+"The following platforms are known to be supported by &debian;/arm64 in this "
+"release. There is only one kernel, which supports all the listed platforms."
msgstr ""
-"Kirkwood 是 Marvell 的 SoC 产品,集成了 ARM CPU、Ethernet、SATA、USB,以及其"
-"他一些功能。当前我们能支持以下几种基于 Kirkwood 的设备:OpenRD (OpenRD-Base, "
-"OpenRD-Client 和 OpenRD-Ultimate)、<ulink url=\"&url-arm-cyrius-sheevaplug;"
-"\">plug computers (SheevaPlug、GuruPlug 和 DreamPlug)</ulink>, <ulink url="
-"\"&url-arm-cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> (所有 TS-11x、"
-"TS-21x 和 TS-41x 型号),以及 LaCie NASes (Network Space v2、Network Space "
-"Max v2、Internet Space v2、d2 Network v2、2Big Network v2 和 5Big Network "
-"v2)。"
#. Tag: term
-#: hardware.xml:391
+#: hardware.xml:389
#, no-c-format
-msgid "Orion5x"
-msgstr "Orion5x"
-
-#. Tag: para
-#: hardware.xml:392
-#, no-c-format
-msgid ""
-"Orion is a system on a chip (SoC) from Marvell that integrates an ARM CPU, "
-"Ethernet, SATA, USB, and other functionality in one chip. There are many "
-"Network Attached Storage (NAS) devices on the market that are based on an "
-"Orion chip. We currently support the following Orion based devices: <ulink "
-"url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</ulink>, <ulink url="
-"\"&url-arm-cyrius-dns323;\">D-Link DNS-323</ulink> and <ulink url=\"&url-arm-"
-"cyrius-mv2120;\">HP mv2120</ulink>."
+msgid "Applied Micro (APM) Mustang/X-Gene"
msgstr ""
-"Orion 是 Marvell 的 SoC 产品,集成了 ARM CPU、Ethernet、SATA、USB,以及其他一"
-"些功能。市场上有很多 NAS 设备基于 Orion 芯片。我们当前支持以下几种基于 Orion "
-"的设备: <ulink url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</ulink>、"
-"<ulink url=\"&url-arm-cyrius-dns323;\">D-Link DNS-323</ulink> 和 <ulink url="
-"\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink>。"
-
-#. Tag: term
-#: hardware.xml:406
-#, no-c-format
-msgid "<term>Versatile</term>"
-msgstr "<term>Versatile</term>"
#. Tag: para
-#: hardware.xml:407
+#: hardware.xml:391
#, no-c-format
msgid ""
-"The Versatile platform is emulated by QEMU and is therefore a nice way to "
-"test and run &debian; on ARM if you don't have the hardware."
-msgstr ""
-"Versatile 平台由 QEMU 模拟,如果您没有硬件设备,用它来测试运行在 ARM 上的 "
-"&debian; 是一个不错的方法。"
-
-#. Tag: title
-#: hardware.xml:420
-#, no-c-format
-msgid "Platforms no longer supported by Debian/armel"
+"The APM Mustang was the first Linux-capable ARMv8 system available. It uses "
+"the X-gene SoC, since also used in other machines, which is an 8-core CPU, "
+"with ethernet, USB, serial. A common form-factor looks just like a desktop "
+"PC box, but many versions are expected. Most of the hardware is supported in "
+"the mainline kernel, but USB support is lacking in the &releasename-cap; "
+"kernel."
msgstr ""
#. Tag: term
-#: hardware.xml:424
+#: hardware.xml:404
#, no-c-format
-msgid "IOP32x"
-msgstr "IOP32x"
+msgid "ARM Juno Development Platform"
+msgstr ""
#. Tag: para
-#: hardware.xml:425
+#: hardware.xml:406
#, no-c-format
msgid ""
-"Intel's I/O Processor (IOP) line is found in a number of products related to "
-"data storage and processing, such as the <ulink url=\"&url-arm-cyrius-"
-"glantank;\">GLAN Tank</ulink> from IO-Data and the <ulink url=\"&url-arm-"
-"cyrius-n2100;\">Thecus N2100</ulink>. &debian; has supported the IOP32x "
-"platform in &debian; 7, but does not support it anymore from version 8 on "
-"due to hardware constraints of the platform which make it unsuitable for the "
-"installation of newer &debian; releases."
-msgstr ""
-
-#. Tag: term
-#: hardware.xml:439
-#, no-c-format
-msgid "MV78xx0"
+"Juno is a capable development board with a 6-core (2xA57, 4xA53) ARMv8-A "
+"800Mhz CPU, Mali (T624) graphics, 8GB DDR3 RAM, Ethernet, USB, Serial. It "
+"was designed for system bring-up and power testing so is neither small nor "
+"cheap, but was one of the first boards available. All the hardware is "
+"supported in the mainline kernel and in &releasename-cap;."
msgstr ""
#. Tag: para
-#: hardware.xml:440
+#: hardware.xml:420
#, no-c-format
msgid ""
-"The MV78xx0 platform has been used on the Marvell DB-78xx0-BP development "
-"board. It was supported in Debian 7 with a platform-specific kernel (based "
-"on the Linux kernel version 3.2), but is not supported anymore from Debian 8 "
-"onwards."
+"When using &d-i; on non-UEFI systems, you may have to manually make the "
+"system bootable at the end of the installation, e.g. by running the required "
+"commands in a shell started from within &d-i;. flash-kernel knows how to set "
+"up an X-Gene system booting with U-Boot."
msgstr ""
#. Tag: title
-#: hardware.xml:455
+#: hardware.xml:430
#, no-c-format
msgid "Platforms supported by Debian/armhf"
msgstr ""
#. Tag: para
-#: hardware.xml:457
+#: hardware.xml:432
#, no-c-format
msgid ""
"The following systems are known to work with &debian;/armhf using the "
@@ -691,40 +645,40 @@ msgid ""
msgstr ""
#. Tag: term
-#: hardware.xml:464
+#: hardware.xml:439
#, no-c-format
msgid "Freescale MX53 Quick Start Board"
msgstr ""
#. Tag: para
-#: hardware.xml:466
+#: hardware.xml:441
#, no-c-format
msgid "The IMX53QSB is a development board based on the i.MX53 SoC."
msgstr ""
#. Tag: term
-#: hardware.xml:473
+#: hardware.xml:448
#, fuzzy, no-c-format
#| msgid "versatile"
msgid "Versatile Express"
msgstr "versatile"
#. Tag: para
-#: hardware.xml:475
+#: hardware.xml:450
#, no-c-format
msgid ""
"The Versatile Express is a development board series from ARM consisting of a "
-"baseboard which can be equipped with various CPU daughterboards."
+"baseboard which can be equipped with various CPU daughter boards."
msgstr ""
#. Tag: term
-#: hardware.xml:484
+#: hardware.xml:459
#, no-c-format
msgid "Certain Allwinner sunXi-based development boards and embedded systems"
msgstr ""
#. Tag: para
-#: hardware.xml:487
+#: hardware.xml:462
#, no-c-format
msgid ""
"The armmp kernel supports several development boards and embedded systems "
@@ -735,37 +689,37 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:495
+#: hardware.xml:470
#, no-c-format
msgid "Cubietech Cubieboard 1 + 2 / Cubietruck"
msgstr ""
#. Tag: para
-#: hardware.xml:498
+#: hardware.xml:473
#, no-c-format
msgid "LeMaker Banana Pi and Banana Pro"
msgstr ""
#. Tag: para
-#: hardware.xml:501
+#: hardware.xml:476
#, no-c-format
-msgid "LinkSprite pcDuino"
+msgid "LinkSprite pcDuino and pcDuino3"
msgstr ""
#. Tag: para
-#: hardware.xml:504
+#: hardware.xml:479
#, no-c-format
msgid "Mele A1000"
msgstr ""
#. Tag: para
-#: hardware.xml:507
+#: hardware.xml:482
#, no-c-format
msgid "Miniand Hackberry"
msgstr ""
#. Tag: para
-#: hardware.xml:510
+#: hardware.xml:485
#, no-c-format
msgid ""
"Olimex A10-Olinuxino-LIME / A10s-Olinuxino Micro / A13-Olinuxino / A13-"
@@ -774,13 +728,13 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:515
+#: hardware.xml:490
#, no-c-format
msgid "PineRiver Mini X-Plus"
msgstr ""
#. Tag: para
-#: hardware.xml:521
+#: hardware.xml:496
#, no-c-format
msgid ""
"System support for Allwinner sunXi-based devices is limited to drivers and "
@@ -789,7 +743,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:527
+#: hardware.xml:502
#, no-c-format
msgid ""
"The mainline Linux kernel generally supports serial console, ethernet, SATA, "
@@ -800,23 +754,23 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:535
+#: hardware.xml:510
#, no-c-format
msgid ""
"Using a local display is technically possible without native display drivers "
"via the <quote>simplefb</quote> infrastructure in the mainline kernel, which "
-"relies on the <quote>u-boot</quote> bootloader for initializing the display "
-"hardware, but this is not supported by the u-boot version in &debian; 8."
+"relies on the <quote>U-Boot</quote> bootloader for initialising the display "
+"hardware, but this is not supported by the U-Boot version in &debian; 8."
msgstr ""
#. Tag: term
-#: hardware.xml:547
+#: hardware.xml:522
#, no-c-format
msgid "SolidRun Cubox-i2eX / Cubox-i4Pro"
msgstr ""
#. Tag: para
-#: hardware.xml:549
+#: hardware.xml:524
#, no-c-format
msgid ""
"The Cubox-i series is a set of small, cubical-shaped systems based on the "
@@ -829,13 +783,13 @@ msgid ""
msgstr ""
#. Tag: term
-#: hardware.xml:564
+#: hardware.xml:539
#, no-c-format
msgid "Wandboard Quad"
msgstr ""
#. Tag: para
-#: hardware.xml:566
+#: hardware.xml:541
#, no-c-format
msgid ""
"The Wandboard Quad is a development board based on the Freescale i.MX6 Quad "
@@ -849,7 +803,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:584
+#: hardware.xml:559
#, no-c-format
msgid ""
"Generally, the ARM multiplatform support in the Linux kernel allows running "
@@ -862,63 +816,197 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:595
+#: hardware.xml:570
#, no-c-format
msgid ""
-"When using &d-i; on such systems, you have to manually make the system "
+"When using &d-i; on such systems, you may have to manually make the system "
"bootable at the end of the installation, e.g. by running the required "
"commands in a shell started from within &d-i;."
msgstr ""
#. Tag: title
-#: hardware.xml:604
+#: hardware.xml:579
#, no-c-format
msgid "Platforms no longer supported by Debian/armhf"
msgstr ""
#. Tag: term
-#: hardware.xml:608
+#: hardware.xml:583
#, no-c-format
msgid "EfikaMX"
msgstr ""
#. Tag: para
-#: hardware.xml:609
+#: hardware.xml:584
#, no-c-format
msgid ""
"The EfikaMX platform (Genesi Efika Smartbook and Genesi EfikaMX nettop) has "
-"been supported in &debian; 7 with a platform-specific kernel, but is not "
-"supported anymore from &debian; 8 onwards. The code required to build the "
+"been supported in &debian; 7 with a platform-specific kernel, but is no "
+"longer supported from &debian; 8 onwards. The code required to build the "
"formerly used platform-specific kernel has been removed from the upstream "
"Linux kernel source in 2012, so Debian cannot provide newer builds."
msgstr ""
#. Tag: para
-#: hardware.xml:617
+#: hardware.xml:591
#, no-c-format
msgid ""
"Using the armmp multiplatform kernel on the EfikaMX platform would require "
"device-tree support for it, which is currently not available."
msgstr ""
+#. Tag: title
+#: hardware.xml:603
+#, no-c-format
+msgid "Platforms supported by Debian/armel"
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:605
+#, no-c-format
+msgid ""
+"The following platforms are supported by &debian;/armel; they require "
+"platform-specific kernels."
+msgstr ""
+
+#. Tag: term
+#: hardware.xml:613
+#, fuzzy, no-c-format
+#| msgid "Intel IXP4xx"
+msgid "IXP4xx"
+msgstr "Intel IXP4xx"
+
+#. Tag: para
+#: hardware.xml:614
+#, no-c-format
+msgid ""
+"The Intel IXP4xx processor series is used in network attached storage "
+"devices like the Linksys NSLU2."
+msgstr ""
+
#. Tag: para
-#: hardware.xml:638
+#: hardware.xml:619
#, no-c-format
msgid ""
-"There are two major support <emphasis>&architecture;</emphasis> flavors: PA-"
-"RISC 1.1 and PA-RISC 2.0. The PA-RISC 1.1 architecture is targeted at 32-bit "
-"processors whereas the 2.0 architecture is targeted to the 64-bit "
-"processors. Some systems are able to run either kernel. In both cases, the "
-"userland is 32-bit. There is the possibility of a 64-bit userland in the "
-"future."
+"While there is kernel support for this platform in &debian; 8, it is not "
+"supported by the &d-i;. It is possible to do a <quote>dist-upgrade</quote> "
+"from Debian 7 to Debian 8 for existing installations, though. Due to the low "
+"amount of RAM that systems based on the IXP4xx usually have, this requires "
+"that swap space is enabled prior to upgrading. Support for the IXP4xx "
+"platform will be dropped completely in &debian; 9."
msgstr ""
-"有两个主要支持的 <emphasis>&architecture;</emphasis> 变种:PA-RISC 1.1 和 PA-"
-"RISC 2.0。PA-RISC 1.1 体系目标是 32 位处理器,而 2.0 体系目标是 64 位处理器。"
-"有一些系统可以运行任一种内核。两者的 userland 都是 32 位的。将来也许会有 64 "
-"位的 userland。"
+
+#. Tag: term
+#: hardware.xml:632
+#, no-c-format
+msgid "Kirkwood"
+msgstr "Kirkwood"
#. Tag: para
-#: hardware.xml:657
+#: hardware.xml:633
+#, no-c-format
+msgid ""
+"Kirkwood is a system on a chip (SoC) from Marvell that integrates an ARM "
+"CPU, Ethernet, SATA, USB, and other functionality in one chip. We currently "
+"support the following Kirkwood based devices: OpenRD (OpenRD-Base, OpenRD-"
+"Client and OpenRD-Ultimate), <ulink url=\"&url-arm-cyrius-sheevaplug;\">plug "
+"computers (SheevaPlug, GuruPlug and DreamPlug)</ulink>, <ulink url=\"&url-"
+"arm-cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> (all TS-11x, TS-21x "
+"and TS-41x models), and LaCie NASes (Network Space v2, Network Space Max v2, "
+"Internet Space v2, d2 Network v2, 2Big Network v2 and 5Big Network v2)."
+msgstr ""
+"Kirkwood 是 Marvell 的 SoC 产品,集成了 ARM CPU、Ethernet、SATA、USB,以及其"
+"他一些功能。当前我们能支持以下几种基于 Kirkwood 的设备:OpenRD (OpenRD-Base, "
+"OpenRD-Client 和 OpenRD-Ultimate)、<ulink url=\"&url-arm-cyrius-sheevaplug;"
+"\">plug computers (SheevaPlug、GuruPlug 和 DreamPlug)</ulink>, <ulink url="
+"\"&url-arm-cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> (所有 TS-11x、"
+"TS-21x 和 TS-41x 型号),以及 LaCie NASes (Network Space v2、Network Space "
+"Max v2、Internet Space v2、d2 Network v2、2Big Network v2 和 5Big Network "
+"v2)。"
+
+#. Tag: term
+#: hardware.xml:649
+#, no-c-format
+msgid "Orion5x"
+msgstr "Orion5x"
+
+#. Tag: para
+#: hardware.xml:650
+#, no-c-format
+msgid ""
+"Orion is a system on a chip (SoC) from Marvell that integrates an ARM CPU, "
+"Ethernet, SATA, USB, and other functionality in one chip. There are many "
+"Network Attached Storage (NAS) devices on the market that are based on an "
+"Orion chip. We currently support the following Orion based devices: <ulink "
+"url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</ulink>, <ulink url="
+"\"&url-arm-cyrius-dns323;\">D-Link DNS-323</ulink> and <ulink url=\"&url-arm-"
+"cyrius-mv2120;\">HP mv2120</ulink>."
+msgstr ""
+"Orion 是 Marvell 的 SoC 产品,集成了 ARM CPU、Ethernet、SATA、USB,以及其他一"
+"些功能。市场上有很多 NAS 设备基于 Orion 芯片。我们当前支持以下几种基于 Orion "
+"的设备: <ulink url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</ulink>、"
+"<ulink url=\"&url-arm-cyrius-dns323;\">D-Link DNS-323</ulink> 和 <ulink url="
+"\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink>。"
+
+#. Tag: term
+#: hardware.xml:664
+#, no-c-format
+msgid "<term>Versatile</term>"
+msgstr "<term>Versatile</term>"
+
+#. Tag: para
+#: hardware.xml:665
+#, no-c-format
+msgid ""
+"The Versatile platform is emulated by QEMU and is therefore a nice way to "
+"test and run &debian; on ARM if you don't have the hardware."
+msgstr ""
+"Versatile 平台由 QEMU 模拟,如果您没有硬件设备,用它来测试运行在 ARM 上的 "
+"&debian; 是一个不错的方法。"
+
+#. Tag: title
+#: hardware.xml:678
+#, no-c-format
+msgid "Platforms no longer supported by Debian/armel"
+msgstr ""
+
+#. Tag: term
+#: hardware.xml:682
+#, no-c-format
+msgid "IOP32x"
+msgstr "IOP32x"
+
+#. Tag: para
+#: hardware.xml:683
+#, no-c-format
+msgid ""
+"Intel's I/O Processor (IOP) line is found in a number of products related to "
+"data storage and processing, such as the <ulink url=\"&url-arm-cyrius-"
+"glantank;\">GLAN Tank</ulink> from IO-Data and the <ulink url=\"&url-arm-"
+"cyrius-n2100;\">Thecus N2100</ulink>. &debian; has supported the IOP32x "
+"platform in &debian; 7, but does not support it any longer from version 8 on "
+"due to hardware constraints of the platform which make it unsuitable for the "
+"installation of newer &debian; releases."
+msgstr ""
+
+#. Tag: term
+#: hardware.xml:698
+#, no-c-format
+msgid "MV78xx0"
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:699
+#, no-c-format
+msgid ""
+"The MV78xx0 platform has been used on the Marvell DB-78xx0-BP development "
+"board. It was supported in Debian 7 with a platform-specific kernel (based "
+"on the Linux kernel version 3.2), but is not supported any more from Debian "
+"8 onwards."
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:724
#, no-c-format
msgid ""
"Complete information concerning supported peripherals can be found at <ulink "
@@ -930,13 +1018,13 @@ msgstr ""
# index.docbook:808, index.docbook:914
#. Tag: title
-#: hardware.xml:665 hardware.xml:749
+#: hardware.xml:732 hardware.xml:815
#, no-c-format
msgid "<title>CPU</title>"
msgstr "<title>CPU</title>"
#. Tag: para
-#: hardware.xml:666
+#: hardware.xml:733
#, no-c-format
msgid ""
"Nearly all x86-based (IA-32) processors still in use in personal computers "
@@ -949,7 +1037,7 @@ msgstr ""
"Athlon XP 和 Intel P4 Xeon 这些处理器。"
#. Tag: para
-#: hardware.xml:673
+#: hardware.xml:740
#, no-c-format
msgid ""
"However, &debian; GNU/Linux &releasename; will <emphasis>not</emphasis> run "
@@ -962,7 +1050,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:685
+#: hardware.xml:752
#, no-c-format
msgid ""
"If your system has a 64-bit processor from the AMD64 or Intel 64 families, "
@@ -973,13 +1061,13 @@ msgstr ""
"安装程序替代 (32位) i386 架构的安装程序。"
#. Tag: title
-#: hardware.xml:694
+#: hardware.xml:761
#, no-c-format
msgid "I/O Bus"
msgstr "I/O 总线"
#. Tag: para
-#: hardware.xml:695
+#: hardware.xml:762
#, no-c-format
msgid ""
"The system bus is the part of the motherboard which allows the CPU to "
@@ -993,7 +1081,7 @@ msgstr ""
"线)。近年来出售的个人电脑都会使用里面的一种。"
#. Tag: para
-#: hardware.xml:715
+#: hardware.xml:781
#, no-c-format
msgid ""
"&debian; on &arch-title; supports the following platforms: <itemizedlist> "
@@ -1023,7 +1111,7 @@ msgstr ""
"\"> debian-&arch-listname; mailing list</ulink>。"
#. Tag: para
-#: hardware.xml:750
+#: hardware.xml:816
#, no-c-format
msgid ""
"On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 and "
@@ -1036,7 +1124,7 @@ msgstr ""
"持 R5000。"
#. Tag: para
-#: hardware.xml:756
+#: hardware.xml:822
#, no-c-format
msgid ""
"Some MIPS machines can be operated in both big and little endian mode. For "
@@ -1047,7 +1135,7 @@ msgstr ""
"endian MIPS,请阅读 mipsel 体系的相关文档。"
#. Tag: para
-#: hardware.xml:773
+#: hardware.xml:839
#, fuzzy, no-c-format
#| msgid ""
#| "&debian; on &arch-title; supports the following platforms: <itemizedlist> "
@@ -1084,7 +1172,7 @@ msgstr ""
"mailing list</ulink>。"
#. Tag: para
-#: hardware.xml:803
+#: hardware.xml:869
#, no-c-format
msgid ""
"For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and "
@@ -1094,13 +1182,13 @@ msgstr ""
"PreP 子体系获得支持。"
#. Tag: title
-#: hardware.xml:824
+#: hardware.xml:890
#, no-c-format
msgid "Kernel Flavours"
msgstr "内核变种"
#. Tag: para
-#: hardware.xml:826
+#: hardware.xml:892
#, no-c-format
msgid ""
"There are two flavours of the powerpc kernel in &debian;, based on the CPU "
@@ -1108,13 +1196,13 @@ msgid ""
msgstr "在 &debian; 中有两种基于 CPU 类型的 powerpc 内核:"
#. Tag: term
-#: hardware.xml:833
+#: hardware.xml:899
#, no-c-format
msgid "<term>powerpc</term>"
msgstr "<term>powerpc</term>"
#. Tag: para
-#: hardware.xml:834
+#: hardware.xml:900
#, fuzzy, no-c-format
#| msgid ""
#| "Most systems use this kernel flavour, which supports the PowerPC 601, "
@@ -1129,31 +1217,31 @@ msgstr ""
"器。所有 Apple PowerMac 以后的系统包括 G4 都使用这其中的处理器。"
#. Tag: term
-#: hardware.xml:844
+#: hardware.xml:910
#, no-c-format
msgid "powerpc-smp"
msgstr ""
#. Tag: para
-#: hardware.xml:845
+#: hardware.xml:911
#, no-c-format
msgid "All Apple PowerMac G4 SMP machines."
msgstr ""
#. Tag: term
-#: hardware.xml:853
+#: hardware.xml:919
#, no-c-format
msgid "power64"
msgstr "power64"
#. Tag: para
-#: hardware.xml:854
+#: hardware.xml:920
#, no-c-format
msgid "The power64 kernel flavour supports the following CPUs:"
msgstr "power64 内核支持以下的 CPU:"
#. Tag: para
-#: hardware.xml:858
+#: hardware.xml:924
#, no-c-format
msgid ""
"The POWER3 processor is used in older IBM 64-bit server systems: known "
@@ -1165,7 +1253,7 @@ msgstr ""
"7044-270。"
#. Tag: para
-#: hardware.xml:864
+#: hardware.xml:930
#, no-c-format
msgid ""
"The POWER4 processor is used in more recent IBM 64-bit server systems: known "
@@ -1175,7 +1263,7 @@ msgstr ""
"630、650、655、670 和 690。"
#. Tag: para
-#: hardware.xml:869
+#: hardware.xml:935
#, fuzzy, no-c-format
#| msgid ""
#| "Systems using the Apple G5 (PPC970FX processor) are also based on the "
@@ -1188,19 +1276,19 @@ msgstr ""
"采用 Apple G5 (PPC970FX 处理器) 的系统也是基于 POWER4 体系,并使用这种内核。"
#. Tag: para
-#: hardware.xml:875
+#: hardware.xml:941
#, no-c-format
msgid "Newer IBM systems using POWER5, POWER6, and POWER7 processors."
msgstr ""
#. Tag: title
-#: hardware.xml:908
+#: hardware.xml:974
#, no-c-format
msgid "Power Macintosh (pmac) subarchitecture"
msgstr "Power Macintosh (pmac) 子体系"
#. Tag: para
-#: hardware.xml:910
+#: hardware.xml:976
#, no-c-format
msgid ""
"Apple (and briefly a few other manufacturers &mdash; Power Computing, for "
@@ -1213,7 +1301,7 @@ msgstr ""
"(&debian; 没有支持)、OldWorld PCI 和 NewWorld。"
#. Tag: para
-#: hardware.xml:917
+#: hardware.xml:983
#, no-c-format
msgid ""
"OldWorld systems are most Power Macintoshes with a floppy drive and a PCI "
@@ -1226,7 +1314,7 @@ msgstr ""
"些 Apple iMac PowerPC 前身使用 4 位数字命名方式,它们都是 OldWorld 的。"
#. Tag: para
-#: hardware.xml:925
+#: hardware.xml:991
#, no-c-format
msgid ""
"The so called NewWorld PowerMacs are any PowerMacs in translucent colored "
@@ -1241,7 +1329,7 @@ msgstr ""
"MacOS 的系统。"
#. Tag: para
-#: hardware.xml:933
+#: hardware.xml:999
#, no-c-format
msgid ""
"Specifications for Apple hardware are available at <ulink url=\"http://www."
@@ -1256,397 +1344,397 @@ msgstr ""
# index.docbook:1240, index.docbook:1375, index.docbook:1419, index.docbook:1448
#. Tag: entry
-#: hardware.xml:949 hardware.xml:1084 hardware.xml:1128 hardware.xml:1161
+#: hardware.xml:1015 hardware.xml:1150 hardware.xml:1194 hardware.xml:1227
#, no-c-format
msgid "Model Name/Number"
msgstr "型号名称/编号"
#. Tag: entry
-#: hardware.xml:950
+#: hardware.xml:1016
#, no-c-format
msgid "Generation"
msgstr "世代"
#. Tag: entry
-#: hardware.xml:956
+#: hardware.xml:1022
#, no-c-format
msgid "Apple"
msgstr "Apple"
#. Tag: entry
-#: hardware.xml:957
+#: hardware.xml:1023
#, no-c-format
msgid "iMac Bondi Blue, 5 Flavors, Slot Loading"
msgstr "iMac Bondi Blue, 5 Flavors, Slot Loading"
# index.docbook:1249, index.docbook:1252, index.docbook:1255, index.docbook:1258, index.docbook:1261, index.docbook:1264, index.docbook:1267, index.docbook:1270, index.docbook:1273, index.docbook:1276, index.docbook:1279, index.docbook:1282, index.docbook:1285, index.docbook:1288, index.docbook:1291, index.docbook:1294
#. Tag: entry
-#: hardware.xml:958 hardware.xml:961 hardware.xml:964 hardware.xml:967
-#: hardware.xml:970 hardware.xml:973 hardware.xml:976 hardware.xml:979
-#: hardware.xml:982 hardware.xml:985 hardware.xml:988 hardware.xml:991
-#: hardware.xml:994 hardware.xml:997 hardware.xml:1000 hardware.xml:1003
+#: hardware.xml:1024 hardware.xml:1027 hardware.xml:1030 hardware.xml:1033
+#: hardware.xml:1036 hardware.xml:1039 hardware.xml:1042 hardware.xml:1045
+#: hardware.xml:1048 hardware.xml:1051 hardware.xml:1054 hardware.xml:1057
+#: hardware.xml:1060 hardware.xml:1063 hardware.xml:1066 hardware.xml:1069
#, no-c-format
msgid "NewWorld"
msgstr "NewWorld"
#. Tag: entry
-#: hardware.xml:960
+#: hardware.xml:1026
#, no-c-format
msgid "iMac Summer 2000, Early 2001"
msgstr "iMac Summer 2000, Early 2001"
#. Tag: entry
-#: hardware.xml:963
+#: hardware.xml:1029
#, no-c-format
msgid "iMac G5"
msgstr "iMac G5"
#. Tag: entry
-#: hardware.xml:966
+#: hardware.xml:1032
#, no-c-format
msgid "iBook, iBook SE, iBook Dual USB"
msgstr "iBook, iBook SE, iBook Dual USB"
#. Tag: entry
-#: hardware.xml:969
+#: hardware.xml:1035
#, no-c-format
msgid "iBook2"
msgstr "iBook2"
#. Tag: entry
-#: hardware.xml:972
+#: hardware.xml:1038
#, no-c-format
msgid "iBook G4"
msgstr "iBook G4"
#. Tag: entry
-#: hardware.xml:975
+#: hardware.xml:1041
#, no-c-format
msgid "Power Macintosh Blue and White (B&amp;W) G3"
msgstr "Power Macintosh Blue and White (B&amp;W) G3"
#. Tag: entry
-#: hardware.xml:978
+#: hardware.xml:1044
#, no-c-format
msgid "Power Macintosh G4 PCI, AGP, Cube"
msgstr "Power Macintosh G4 PCI, AGP, Cube"
#. Tag: entry
-#: hardware.xml:981
+#: hardware.xml:1047
#, no-c-format
msgid "Power Macintosh G4 Gigabit Ethernet"
msgstr "Power Macintosh G4 Gigabit Ethernet"
#. Tag: entry
-#: hardware.xml:984
+#: hardware.xml:1050
#, no-c-format
msgid "Power Macintosh G4 Digital Audio, Quicksilver"
msgstr "Power Macintosh G4 Digital Audio, Quicksilver"
#. Tag: entry
-#: hardware.xml:987
+#: hardware.xml:1053
#, no-c-format
msgid "Power Macintosh G5"
msgstr "Power Macintosh G5"
#. Tag: entry
-#: hardware.xml:990
+#: hardware.xml:1056
#, no-c-format
msgid "PowerBook G3 FireWire Pismo (2000)"
msgstr "PowerBook G3 FireWire Pismo (2000)"
#. Tag: entry
-#: hardware.xml:993
+#: hardware.xml:1059
#, no-c-format
msgid "PowerBook G3 Lombard (1999)"
msgstr "PowerBook G3 Lombard (1999)"
#. Tag: entry
-#: hardware.xml:996
+#: hardware.xml:1062
#, no-c-format
msgid "PowerBook G4 Titanium"
msgstr "PowerBook G4 Titanium"
#. Tag: entry
-#: hardware.xml:999
+#: hardware.xml:1065
#, no-c-format
msgid "PowerBook G4 Aluminum"
msgstr "PowerBook G4 Aluminum"
#. Tag: entry
-#: hardware.xml:1002
+#: hardware.xml:1068
#, no-c-format
msgid "Xserve G5"
msgstr "Xserve G5"
#. Tag: entry
-#: hardware.xml:1005
+#: hardware.xml:1071
#, no-c-format
msgid "Performa 4400, 54xx, 5500"
msgstr "Performa 4400, 54xx, 5500"
# index.docbook:1297, index.docbook:1300, index.docbook:1303, index.docbook:1306, index.docbook:1309, index.docbook:1312, index.docbook:1315, index.docbook:1318, index.docbook:1321, index.docbook:1324, index.docbook:1327, index.docbook:1330, index.docbook:1336, index.docbook:1339, index.docbook:1345, index.docbook:1351, index.docbook:1357
#. Tag: entry
-#: hardware.xml:1006 hardware.xml:1009 hardware.xml:1012 hardware.xml:1015
-#: hardware.xml:1018 hardware.xml:1021 hardware.xml:1024 hardware.xml:1027
-#: hardware.xml:1030 hardware.xml:1033 hardware.xml:1036 hardware.xml:1039
-#: hardware.xml:1045 hardware.xml:1048 hardware.xml:1054 hardware.xml:1060
-#: hardware.xml:1066
+#: hardware.xml:1072 hardware.xml:1075 hardware.xml:1078 hardware.xml:1081
+#: hardware.xml:1084 hardware.xml:1087 hardware.xml:1090 hardware.xml:1093
+#: hardware.xml:1096 hardware.xml:1099 hardware.xml:1102 hardware.xml:1105
+#: hardware.xml:1111 hardware.xml:1114 hardware.xml:1120 hardware.xml:1126
+#: hardware.xml:1132
#, no-c-format
msgid "OldWorld"
msgstr "OldWorld"
#. Tag: entry
-#: hardware.xml:1008
+#: hardware.xml:1074
#, no-c-format
msgid "Performa 6360, 6400, 6500"
msgstr "Performa 6360, 6400, 6500"
#. Tag: entry
-#: hardware.xml:1011
+#: hardware.xml:1077
#, no-c-format
msgid "Power Macintosh 4400, 5400"
msgstr "Power Macintosh 4400, 5400"
#. Tag: entry
-#: hardware.xml:1014
+#: hardware.xml:1080
#, no-c-format
msgid "Power Macintosh 7200, 7300, 7500, 7600"
msgstr "Power Macintosh 7200, 7300, 7500, 7600"
#. Tag: entry
-#: hardware.xml:1017
+#: hardware.xml:1083
#, no-c-format
msgid "Power Macintosh 8200, 8500, 8600"
msgstr "Power Macintosh 8200, 8500, 8600"
#. Tag: entry
-#: hardware.xml:1020
+#: hardware.xml:1086
#, no-c-format
msgid "Power Macintosh 9500, 9600"
msgstr "Power Macintosh 9500, 9600"
#. Tag: entry
-#: hardware.xml:1023
+#: hardware.xml:1089
#, no-c-format
msgid "Power Macintosh (Beige) G3 Minitower"
msgstr "Power Macintosh (Beige) G3 Minitower"
#. Tag: entry
-#: hardware.xml:1026
+#: hardware.xml:1092
#, no-c-format
msgid "Power Macintosh (Beige) Desktop, All-in-One"
msgstr "Power Macintosh (Beige) Desktop, All-in-One"
#. Tag: entry
-#: hardware.xml:1029
+#: hardware.xml:1095
#, no-c-format
msgid "PowerBook 2400, 3400, 3500"
msgstr "PowerBook 2400, 3400, 3500"
#. Tag: entry
-#: hardware.xml:1032
+#: hardware.xml:1098
#, no-c-format
msgid "PowerBook G3 Wallstreet (1998)"
msgstr "PowerBook G3 Wallstreet (1998)"
#. Tag: entry
-#: hardware.xml:1035
+#: hardware.xml:1101
#, no-c-format
msgid "Twentieth Anniversary Macintosh"
msgstr "Twentieth Anniversary Macintosh"
#. Tag: entry
-#: hardware.xml:1038
+#: hardware.xml:1104
#, no-c-format
msgid "Workgroup Server 7250, 7350, 8550, 9650, G3"
msgstr "Workgroup Server 7250, 7350, 8550, 9650, G3"
#. Tag: entry
-#: hardware.xml:1043
+#: hardware.xml:1109
#, no-c-format
msgid "Power Computing"
msgstr "Power Computing"
#. Tag: entry
-#: hardware.xml:1044
+#: hardware.xml:1110
#, no-c-format
msgid "PowerBase, PowerTower / Pro, PowerWave"
msgstr "PowerBase, PowerTower / Pro, PowerWave"
#. Tag: entry
-#: hardware.xml:1047
+#: hardware.xml:1113
#, no-c-format
msgid "PowerCenter / Pro, PowerCurve"
msgstr "PowerCenter / Pro, PowerCurve"
#. Tag: entry
-#: hardware.xml:1052
+#: hardware.xml:1118
#, no-c-format
msgid "UMAX"
msgstr "UMAX"
#. Tag: entry
-#: hardware.xml:1053
+#: hardware.xml:1119
#, no-c-format
msgid "C500, C600, J700, S900"
msgstr "C500, C600, J700, S900"
#. Tag: entry
-#: hardware.xml:1058
+#: hardware.xml:1124
#, no-c-format
msgid "<entry>APS</entry>"
msgstr "<entry>APS</entry>"
#. Tag: entry
-#: hardware.xml:1059
+#: hardware.xml:1125
#, no-c-format
msgid "APS Tech M*Power 604e/2000"
msgstr "APS Tech M*Power 604e/2000"
# index.docbook:1355, index.docbook:1381
#. Tag: entry
-#: hardware.xml:1064 hardware.xml:1090
+#: hardware.xml:1130 hardware.xml:1156
#, no-c-format
msgid "Motorola"
msgstr "Motorola"
#. Tag: entry
-#: hardware.xml:1065
+#: hardware.xml:1131
#, no-c-format
msgid "Starmax 3000, 4000, 5000, 5500"
msgstr "Starmax 3000, 4000, 5000, 5500"
#. Tag: title
-#: hardware.xml:1074
+#: hardware.xml:1140
#, no-c-format
msgid "PReP subarchitecture"
msgstr "PReP 子体系"
#. Tag: entry
-#: hardware.xml:1091
+#: hardware.xml:1157
#, no-c-format
msgid "Firepower, PowerStack Series E, PowerStack II"
msgstr "Firepower, PowerStack Series E, PowerStack II"
#. Tag: entry
-#: hardware.xml:1093
+#: hardware.xml:1159
#, no-c-format
msgid "MPC 7xx, 8xx"
msgstr "MPC 7xx, 8xx"
#. Tag: entry
-#: hardware.xml:1095
+#: hardware.xml:1161
#, no-c-format
msgid "MTX, MTX+"
msgstr "MTX, MTX+"
#. Tag: entry
-#: hardware.xml:1097
+#: hardware.xml:1163
#, no-c-format
msgid "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
msgstr "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
#. Tag: entry
-#: hardware.xml:1099
+#: hardware.xml:1165
#, no-c-format
msgid "MCP(N)750"
msgstr "MCP(N)750"
# index.docbook:1394, index.docbook:1425
#. Tag: entry
-#: hardware.xml:1103 hardware.xml:1134
+#: hardware.xml:1169 hardware.xml:1200
#, no-c-format
msgid "IBM RS/6000"
msgstr "IBM RS/6000"
#. Tag: entry
-#: hardware.xml:1104
+#: hardware.xml:1170
#, no-c-format
msgid "40P, 43P"
msgstr "40P, 43P"
#. Tag: entry
-#: hardware.xml:1106
+#: hardware.xml:1172
#, no-c-format
msgid "Power 830/850/860 (6070, 6050)"
msgstr "Power 830/850/860 (6070, 6050)"
#. Tag: entry
-#: hardware.xml:1108
+#: hardware.xml:1174
#, no-c-format
msgid "6030, 7025, 7043"
msgstr "6030, 7025, 7043"
#. Tag: entry
-#: hardware.xml:1110
+#: hardware.xml:1176
#, no-c-format
msgid "p640"
msgstr "p640"
#. Tag: title
-#: hardware.xml:1118
+#: hardware.xml:1184
#, fuzzy, no-c-format
#| msgid "PReP subarchitecture"
msgid "CHRP subarchitecture"
msgstr "PReP 子体系"
#. Tag: entry
-#: hardware.xml:1135
+#: hardware.xml:1201
#, no-c-format
msgid "B50, 43P-150, 44P"
msgstr "B50, 43P-150, 44P"
#. Tag: entry
-#: hardware.xml:1138
+#: hardware.xml:1204
#, no-c-format
msgid "Genesi"
msgstr "Genesi"
#. Tag: entry
-#: hardware.xml:1139
+#: hardware.xml:1205
#, no-c-format
msgid "Pegasos I, Pegasos II"
msgstr "Pegasos I, Pegasos II"
#. Tag: entry
-#: hardware.xml:1142
+#: hardware.xml:1208
#, no-c-format
msgid "Fixstars"
msgstr ""
#. Tag: entry
-#: hardware.xml:1143
+#: hardware.xml:1209
#, no-c-format
msgid "YDL PowerStation"
msgstr ""
#. Tag: title
-#: hardware.xml:1151
+#: hardware.xml:1217
#, no-c-format
msgid "APUS subarchitecture (unsupported)"
msgstr "APUS 子体系 (不支持)"
#. Tag: entry
-#: hardware.xml:1167
+#: hardware.xml:1233
#, no-c-format
msgid "Amiga Power-UP Systems (APUS)"
msgstr "Amiga Power-UP Systems (APUS)"
#. Tag: entry
-#: hardware.xml:1168
+#: hardware.xml:1234
#, no-c-format
msgid "A1200, A3000, A4000"
msgstr "A1200, A3000, A4000"
#. Tag: title
-#: hardware.xml:1176
+#: hardware.xml:1242
#, no-c-format
msgid "Nubus PowerMac subarchitecture (unsupported)"
msgstr "Nubus PowerMac 子体系 (不支持)"
#. Tag: para
-#: hardware.xml:1178
+#: hardware.xml:1244
#, no-c-format
msgid ""
"NuBus systems are not currently supported by &debian;/powerpc. The "
@@ -1670,13 +1758,13 @@ msgstr ""
"nubus-pmac.sourceforge.net/\"></ulink>"
#. Tag: title
-#: hardware.xml:1215
+#: hardware.xml:1281
#, no-c-format
msgid "Non-PowerPC Macs"
msgstr "Non-PowerPC Macs"
#. Tag: para
-#: hardware.xml:1217
+#: hardware.xml:1283
#, no-c-format
msgid ""
"Macintosh computers using the 680x0 series of processors are <emphasis>not</"
@@ -1692,7 +1780,7 @@ msgstr ""
"字,像 Mac IIcx、LCIII 或 Quadra 950。"
#. Tag: para
-#: hardware.xml:1226
+#: hardware.xml:1292
#, no-c-format
msgid ""
"This model range started with the Mac II (Mac II, IIx, IIcx, IIci, IIsi, "
@@ -1707,7 +1795,7 @@ msgstr ""
"840AV, 900, 950), 最后是 Performa 200-640CD。"
#. Tag: para
-#: hardware.xml:1234
+#: hardware.xml:1300
#, no-c-format
msgid ""
"In laptops, it started with the Mac Portable, then the PowerBook 100-190cs "
@@ -1718,13 +1806,50 @@ msgstr ""
"Duo 210-550c (不包含带有 Nubus 的 PowerBook 500,见前面说明。)"
#. Tag: title
-#: hardware.xml:1250
+#: hardware.xml:1314
+#, fuzzy, no-c-format
+#| msgid "CPU/Machine types"
+msgid "Machines"
+msgstr "CPU/机器类型"
+
+#. Tag: para
+#: hardware.xml:1317
+#, no-c-format
+msgid "S822L"
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:1322
+#, no-c-format
+msgid "S821L"
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:1327
+#, no-c-format
+msgid "S822"
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:1332
+#, no-c-format
+msgid "S821"
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:1337
+#, no-c-format
+msgid "TYAN GN70-BP010"
+msgstr ""
+
+#. Tag: title
+#: hardware.xml:1352
#, no-c-format
msgid "zSeries and System z machine types"
msgstr "zSeries 和 System z 机器类型"
#. Tag: para
-#: hardware.xml:1251
+#: hardware.xml:1353
#, no-c-format
msgid ""
"Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
@@ -1746,13 +1871,13 @@ msgstr ""
"ulink>。"
#. Tag: title
-#: hardware.xml:1268
+#: hardware.xml:1370
#, no-c-format
msgid "PAV and HyperPAV"
msgstr "PAV 和 HyperPAV"
#. Tag: para
-#: hardware.xml:1269
+#: hardware.xml:1371
#, no-c-format
msgid ""
"PAV and HyperPAV are supported transparently, multipathing is not needed to "
@@ -1765,13 +1890,13 @@ msgstr ""
# 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
-#: hardware.xml:1285
+#: hardware.xml:1387
#, no-c-format
msgid "CPU and Main Boards Support"
msgstr "CPU 和主板支持"
#. Tag: para
-#: hardware.xml:1286
+#: hardware.xml:1388
#, no-c-format
msgid ""
"Sparc-based hardware is divided into a number of different subarchitectures, "
@@ -1783,13 +1908,13 @@ msgstr ""
"sun4m、sun4u 或 sun4v。下面说明包括哪些机器,以及每个获得支持的级别。"
#. Tag: term
-#: hardware.xml:1297
+#: hardware.xml:1399
#, no-c-format
msgid "sun4, sun4c, sun4d, sun4m"
msgstr "sun4, sun4c, sun4d, sun4m"
#. Tag: para
-#: hardware.xml:1299
+#: hardware.xml:1401
#, no-c-format
msgid ""
"None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
@@ -1802,7 +1927,7 @@ msgstr ""
"SPARCstation page</ulink>。"
#. Tag: para
-#: hardware.xml:1306
+#: hardware.xml:1408
#, no-c-format
msgid ""
"The last &debian; release to support sparc32 was Etch, but even then only "
@@ -1813,13 +1938,13 @@ msgstr ""
"32 位子体系在上一版本后已经停止支持。"
#. Tag: term
-#: hardware.xml:1316
+#: hardware.xml:1418
#, no-c-format
msgid "sun4u"
msgstr ""
#. Tag: para
-#: hardware.xml:1318
+#: hardware.xml:1420
#, no-c-format
msgid ""
"This subarchitecture includes all 64-bit machines (sparc64) based on the "
@@ -1835,13 +1960,13 @@ msgstr ""
"到 UP 和 SMP 配置中。"
#. Tag: term
-#: hardware.xml:1331
+#: hardware.xml:1433
#, no-c-format
msgid "sun4v"
msgstr ""
#. Tag: para
-#: hardware.xml:1333
+#: hardware.xml:1435
#, no-c-format
msgid ""
"This is the newest addition to the Sparc family, which includes machines "
@@ -1854,7 +1979,7 @@ msgstr ""
"smp 内核。"
#. Tag: para
-#: hardware.xml:1344
+#: hardware.xml:1446
#, no-c-format
msgid ""
"Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
@@ -1864,13 +1989,13 @@ msgstr ""
"持而得不到支持。"
#. Tag: title
-#: hardware.xml:1353
+#: hardware.xml:1455
#, no-c-format
msgid "Laptops"
msgstr "便携机"
#. Tag: para
-#: hardware.xml:1354
+#: hardware.xml:1456
#, no-c-format
msgid ""
"From a technical point of view, laptops are normal PCs, so all information "
@@ -1892,13 +2017,13 @@ msgstr ""
# index.docbook:1624, index.docbook:1649, index.docbook:1672
#. Tag: title
-#: hardware.xml:1371 hardware.xml:1391 hardware.xml:1418 hardware.xml:1441
+#: hardware.xml:1473 hardware.xml:1493 hardware.xml:1520 hardware.xml:1543
#, no-c-format
msgid "Multiple Processors"
msgstr "多处理器"
#. Tag: para
-#: hardware.xml:1372
+#: hardware.xml:1474
#, fuzzy, no-c-format
#| msgid ""
#| "Multiprocessor support &mdash; also called <quote>symmetric "
@@ -1925,7 +2050,7 @@ msgstr ""
"集成在一个物理芯片上。"
#. Tag: para
-#: hardware.xml:1382
+#: hardware.xml:1484
#, no-c-format
msgid ""
"The standard &debian; &release; kernel image has been compiled with SMP "
@@ -1935,7 +2060,7 @@ msgstr ""
"使用也没有问题。"
#. Tag: para
-#: hardware.xml:1393
+#: hardware.xml:1495
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1951,7 +2076,7 @@ msgstr ""
"者核心)数量,并可以在单处理器系统上关闭 SMP 功能。"
#. Tag: para
-#: hardware.xml:1402
+#: hardware.xml:1504
#, fuzzy, no-c-format
#| msgid ""
#| "Having multiple processors in a computer was originally only an issue for "
@@ -1971,7 +2096,7 @@ msgstr ""
"两个或多个称为<quote>核心</quote>的处理器单元集成在一个物理芯片上。"
#. Tag: para
-#: hardware.xml:1409
+#: hardware.xml:1511
#, no-c-format
msgid ""
"The 586 flavour of the &debian; kernel image packages for &arch-title; is "
@@ -1979,7 +2104,7 @@ msgid ""
msgstr "&arch-title; 的 586 &debian; 内核映像软件包没有支持 SMP 。"
#. Tag: para
-#: hardware.xml:1419
+#: hardware.xml:1521
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1994,7 +2119,7 @@ msgstr ""
"核仅使用第一个 CPU。"
#. Tag: para
-#: hardware.xml:1428
+#: hardware.xml:1530
#, no-c-format
msgid ""
"In order to take advantage of multiple processors, you'll have to replace "
@@ -2010,7 +2135,7 @@ msgstr ""
"</quote> 中选中 <quote>&smp-config-option;</quote>。</phrase>"
#. Tag: para
-#: hardware.xml:1442
+#: hardware.xml:1544
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -2026,7 +2151,7 @@ msgstr ""
"装,因为非 SMP 的内核也能在 SMP 的系统下启动,只不过内核只使用第一个 CPU。"
#. Tag: para
-#: hardware.xml:1452
+#: hardware.xml:1554
#, no-c-format
msgid ""
"In order to take advantage of multiple processors, you should check to see "
@@ -2037,7 +2162,7 @@ msgstr ""
"一个合适的内核软件包。"
#. Tag: para
-#: hardware.xml:1458
+#: hardware.xml:1560
#, no-c-format
msgid ""
"You can also build your own customized kernel to support SMP.<phrase arch="
@@ -2052,13 +2177,13 @@ msgstr ""
"<quote>&smp-config-option;</quote>。</phrase>"
#. Tag: title
-#: hardware.xml:1469
+#: hardware.xml:1571
#, no-c-format
msgid "Graphics Card Support"
msgstr "图形卡支持"
#. Tag: para
-#: hardware.xml:1470
+#: hardware.xml:1572
#, no-c-format
msgid ""
"&debian;'s support for graphical interfaces is determined by the underlying "
@@ -2079,7 +2204,7 @@ msgstr ""
"功能也需要安装额外的固件,但这是罕有的例子。"
#. Tag: para
-#: hardware.xml:1483
+#: hardware.xml:1585
#, no-c-format
msgid ""
"Details on supported graphics cards and pointing devices can be found at "
@@ -2090,13 +2215,13 @@ msgstr ""
"&debian; &release; 包含 X.Org &x11ver; 版。"
#. Tag: para
-#: hardware.xml:1488
+#: hardware.xml:1590
#, no-c-format
msgid "The X.Org X Window System is only supported on the SGI Indy and the O2."
msgstr "X.Org 的 X 窗口系统仅支持 SGI Indy 和 O2。"
#. Tag: para
-#: hardware.xml:1493
+#: hardware.xml:1595
#, no-c-format
msgid ""
"Most graphics options commonly found on Sparc-based machines are supported. "
@@ -2115,7 +2240,7 @@ msgstr ""
"卡。"
#. Tag: para
-#: hardware.xml:1503
+#: hardware.xml:1605
#, no-c-format
msgid ""
"It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -2138,13 +2263,13 @@ msgstr ""
"自动激活串口控制台。"
#. Tag: title
-#: hardware.xml:1525
+#: hardware.xml:1627
#, no-c-format
msgid "Network Connectivity Hardware"
msgstr "网络连接硬件"
#. Tag: para
-#: hardware.xml:1526
+#: hardware.xml:1628
#, no-c-format
msgid ""
"Almost any network interface card (NIC) supported by the &arch-kernel; "
@@ -2159,7 +2284,7 @@ msgstr ""
"很好。</phrase>"
#. Tag: para
-#: hardware.xml:1536
+#: hardware.xml:1638
#, no-c-format
msgid ""
"This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -2167,61 +2292,61 @@ msgid ""
msgstr "这包括一些通用 PCI 卡(对于支持 PCI 的系统)和来自 Sun 的网卡:"
#. Tag: para
-#: hardware.xml:1542
+#: hardware.xml:1644
#, no-c-format
msgid "Sun LANCE"
msgstr "Sun LANCE"
#. Tag: para
-#: hardware.xml:1547
+#: hardware.xml:1649
#, no-c-format
msgid "Sun Happy Meal"
msgstr "Sun Happy Meal"
#. Tag: para
-#: hardware.xml:1552
+#: hardware.xml:1654
#, no-c-format
msgid "Sun BigMAC"
msgstr "Sun BigMAC"
#. Tag: para
-#: hardware.xml:1557
+#: hardware.xml:1659
#, no-c-format
msgid "Sun QuadEthernet"
msgstr "Sun QuadEthernet"
#. Tag: para
-#: hardware.xml:1562
+#: hardware.xml:1664
#, no-c-format
msgid "MyriCOM Gigabit Ethernet"
msgstr "MyriCOM Gigabit Ethernet"
#. Tag: para
-#: hardware.xml:1569
+#: hardware.xml:1671
#, no-c-format
msgid "The list of supported network devices is:"
msgstr "支持的网络设备有:"
#. Tag: para
-#: hardware.xml:1574
+#: hardware.xml:1676
#, no-c-format
msgid "Channel to Channel (CTC) and ESCON connection (real or emulated)"
msgstr "Channel to Channel (CTC) 和 ESCON connection (实际或模拟)"
#. Tag: para
-#: hardware.xml:1579
+#: hardware.xml:1681
#, no-c-format
msgid "OSA-2 Token Ring/Ethernet and OSA-Express Fast Ethernet (non-QDIO)"
msgstr "OSA-2 Token Ring/Ethernet 和 OSA-Express Fast Ethernet (non-QDIO)"
#. Tag: para
-#: hardware.xml:1584
+#: hardware.xml:1686
#, no-c-format
msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
msgstr "QDIO 模式的 OSA-Express,HiperSockets 和 Guest-LANs"
#. Tag: para
-#: hardware.xml:1593
+#: hardware.xml:1695
#, no-c-format
msgid ""
"On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -2231,19 +2356,19 @@ msgstr ""
"块。"
#. Tag: para
-#: hardware.xml:1598
+#: hardware.xml:1700
#, no-c-format
msgid "ISDN is supported, but not during the installation."
msgstr "ISDN 虽也获得支持,不过不能在安装阶段使用。"
#. Tag: title
-#: hardware.xml:1605
+#: hardware.xml:1707
#, no-c-format
msgid "Wireless Network Cards"
msgstr "无线网卡"
#. Tag: para
-#: hardware.xml:1606
+#: hardware.xml:1708
#, no-c-format
msgid ""
"Wireless networking is in general supported as well and a growing number of "
@@ -2254,7 +2379,7 @@ msgstr ""
"核能支持的无线网卡也越来越多。"
#. Tag: para
-#: hardware.xml:1613
+#: hardware.xml:1715
#, no-c-format
msgid ""
"If firmware is needed, the installer will prompt you to load firmware. See "
@@ -2265,7 +2390,7 @@ msgstr ""
"> 了解如何在安装过程中加载固件的更多信息。"
#. Tag: para
-#: hardware.xml:1618
+#: hardware.xml:1720
#, no-c-format
msgid ""
"Wireless NICs that are not supported by the official &arch-kernel; kernel "
@@ -2276,7 +2401,7 @@ msgstr ""
"作,但是却不能在安装过程中使用。"
#. Tag: para
-#: hardware.xml:1623
+#: hardware.xml:1725
#, no-c-format
msgid ""
"If there is a problem with wireless and there is no other NIC you can use "
@@ -2292,7 +2417,7 @@ msgstr ""
"件,并手动配置网络。"
#. Tag: para
-#: hardware.xml:1633
+#: hardware.xml:1735
#, no-c-format
msgid ""
"In some cases the driver you need may not be available as a &debian; "
@@ -2308,13 +2433,13 @@ msgstr ""
"classname> 软件包,它让您使用 Windows 的驱动程序。</phrase>"
#. Tag: title
-#: hardware.xml:1647
+#: hardware.xml:1749
#, no-c-format
msgid "Known Issues for &arch-title;"
msgstr "&arch-title; 的一些已知问题"
#. Tag: para
-#: hardware.xml:1648
+#: hardware.xml:1750
#, no-c-format
msgid ""
"There are a couple of issues with specific network cards that are worth "
@@ -2322,13 +2447,13 @@ msgid ""
msgstr "有些特定的网卡事项需要在此提及。"
#. Tag: title
-#: hardware.xml:1655
+#: hardware.xml:1757
#, no-c-format
msgid "Conflict between tulip and dfme drivers"
msgstr "tulip 和 dfme 驱动程序之间的冲突"
#. Tag: para
-#: hardware.xml:1657
+#: hardware.xml:1759
#, no-c-format
msgid ""
"There are various PCI network cards that have the same PCI identification, "
@@ -2344,7 +2469,7 @@ msgstr ""
"如果使用不正确的驱动程序,网卡可能不工作,或者工作不正常。"
#. Tag: para
-#: hardware.xml:1667
+#: hardware.xml:1769
#, no-c-format
msgid ""
"This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -2357,7 +2482,7 @@ msgstr ""
"\"module-blacklist\"/> 将错误的驱动模块加入黑名单,以阻止这种情况发生。"
#. Tag: para
-#: hardware.xml:1675
+#: hardware.xml:1777
#, no-c-format
msgid ""
"An alternative solution during the installation is to switch to a shell and "
@@ -2374,13 +2499,13 @@ msgstr ""
"之后错误的模块可能还会加载。"
#. Tag: title
-#: hardware.xml:1688
+#: hardware.xml:1790
#, no-c-format
msgid "Sun B100 blade"
msgstr "Sun B100 blade"
#. Tag: para
-#: hardware.xml:1690
+#: hardware.xml:1792
#, no-c-format
msgid ""
"The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -2389,13 +2514,13 @@ msgstr ""
"<literal>cassini</literal> 网络驱动程序不能工作在 Sun B100 刀片系统上。"
#. Tag: title
-#: hardware.xml:1705
+#: hardware.xml:1807
#, no-c-format
msgid "Braille Displays"
msgstr "盲文点触设备(Braille Display)"
#. Tag: para
-#: hardware.xml:1706
+#: hardware.xml:1808
#, no-c-format
msgid ""
"Support for braille displays is determined by the underlying support found "
@@ -2412,13 +2537,13 @@ msgstr ""
"的 <classname>brltty</classname> 版本是 &brlttyver; 。"
#. Tag: title
-#: hardware.xml:1720
+#: hardware.xml:1822
#, no-c-format
msgid "Hardware Speech Synthesis"
msgstr "硬件语音合成(Hardware Speech Synthesis)"
#. Tag: para
-#: hardware.xml:1721
+#: hardware.xml:1823
#, no-c-format
msgid ""
"Support for hardware speech synthesis devices is determined by the "
@@ -2437,13 +2562,13 @@ msgstr ""
"gnu; &release; 配备的 <classname>speakup</classname> 版本是 &speakupver;。"
#. Tag: title
-#: hardware.xml:1741
+#: hardware.xml:1843
#, no-c-format
msgid "Peripherals and Other Hardware"
msgstr "外围设备与其他硬件"
#. Tag: para
-#: hardware.xml:1742
+#: hardware.xml:1844
#, fuzzy, no-c-format
#| msgid ""
#| "&arch-kernel; supports a large variety of hardware devices such as mice, "
@@ -2458,7 +2583,7 @@ msgstr ""
"设备。然而,在安装系统的时候,并不需要其中的大部分设备。"
#. Tag: para
-#: hardware.xml:1748
+#: hardware.xml:1850
#, no-c-format
msgid ""
"USB hardware generally works fine. On some very old PC systems some USB "
@@ -2471,7 +2596,7 @@ msgstr ""
"要任何额外的配置就能工作。"
#. Tag: para
-#: hardware.xml:1757
+#: hardware.xml:1859
#, no-c-format
msgid ""
"Package installations from XPRAM and tape are not supported by this system. "
@@ -2482,13 +2607,13 @@ msgstr ""
"通过 NFS、HTTP、FTP 从网络上取得。"
#. Tag: title
-#: hardware.xml:1770
+#: hardware.xml:1872
#, no-c-format
msgid "Devices Requiring Firmware"
msgstr "需要固件的设备"
#. Tag: para
-#: hardware.xml:1771
+#: hardware.xml:1873
#, no-c-format
msgid ""
"Besides the availability of a device driver, some hardware also requires so-"
@@ -2507,7 +2632,7 @@ msgstr ""
"系统中。"
#. Tag: para
-#: hardware.xml:1782
+#: hardware.xml:1884
#, no-c-format
msgid ""
"On many older devices which require firmware to work, the firmware file was "
@@ -2521,7 +2646,7 @@ msgstr ""
"主系统上传到设备中。"
#. Tag: para
-#: hardware.xml:1790
+#: hardware.xml:1892
#, no-c-format
msgid ""
"In most cases firmware is non-free according to the criteria used by the "
@@ -2536,7 +2661,7 @@ msgstr ""
"gnu; 可以合法地发布固件,它通常被单独地放置在仓库的 non-free 区里面。"
#. Tag: para
-#: hardware.xml:1799
+#: hardware.xml:1901
#, no-c-format
msgid ""
"However, this does not mean that such hardware cannot be used during an "
@@ -2551,7 +2676,7 @@ msgstr ""
"\"loading-firmware\"/> 了解如何在安装时加载固件文件或软件包的的详细信息。"
#. Tag: para
-#: hardware.xml:1808
+#: hardware.xml:1910
#, no-c-format
msgid ""
"If the &d-i; prompts for a firmware file and you do not have this firmware "
@@ -2568,13 +2693,13 @@ msgstr ""
"卡上)。"
#. Tag: title
-#: hardware.xml:1825
+#: hardware.xml:1927
#, no-c-format
msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
msgstr "特别为 GNU/&arch-kernel; 采购硬件"
#. Tag: para
-#: hardware.xml:1827
+#: hardware.xml:1929
#, no-c-format
msgid ""
"There are several vendors, who ship systems with &debian; or other "
@@ -2588,7 +2713,7 @@ msgstr ""
"心,因为这些硬件都已经确保能被 GNU/Linux 很好地支持。"
#. Tag: para
-#: hardware.xml:1835
+#: hardware.xml:1937
#, no-c-format
msgid ""
"If you do have to buy a machine with Windows bundled, carefully read the "
@@ -2602,7 +2727,7 @@ msgstr ""
"<quote>windows refund</quote> 搜索可以查到一些有益的信息。"
#. Tag: para
-#: hardware.xml:1843
+#: hardware.xml:1945
#, no-c-format
msgid ""
"Whether or not you are purchasing a system with &arch-kernel; bundled, or "
@@ -2618,13 +2743,13 @@ msgstr ""
"&arch-kernel; 友好的硬件销售商。"
#. Tag: title
-#: hardware.xml:1854
+#: hardware.xml:1956
#, no-c-format
msgid "Avoid Proprietary or Closed Hardware"
msgstr "避免专有或封闭的硬件"
#. Tag: para
-#: hardware.xml:1855
+#: hardware.xml:1957
#, no-c-format
msgid ""
"Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -2639,7 +2764,7 @@ msgstr ""
"于我们未被授权使用这些文档,造成它们无法在 &arch-kernel; 下工作。"
#. Tag: para
-#: hardware.xml:1865
+#: hardware.xml:1967
#, no-c-format
msgid ""
"In many cases there are standards (or at least some de-facto standards) "
@@ -2659,7 +2784,7 @@ msgstr ""
"所有设备都是符合标准的。"
#. Tag: para
-#: hardware.xml:1877
+#: hardware.xml:1979
#, no-c-format
msgid ""
"In other fields, among them e.g. printers, this is unfortunately not the "
@@ -2677,7 +2802,7 @@ msgstr ""
"于厂商提供的闭源驱动程序。"
#. Tag: para
-#: hardware.xml:1888
+#: hardware.xml:1990
#, no-c-format
msgid ""
"Even if there is a vendor-provided closed-source driver for such hardware "
@@ -2698,7 +2823,7 @@ msgstr ""
"统升级造成的不便。"
#. Tag: para
-#: hardware.xml:1901
+#: hardware.xml:2003
#, no-c-format
msgid ""
"You can help improve this situation by encouraging manufacturers of closed "
@@ -2709,13 +2834,13 @@ msgstr ""
"来改变这种状况。"
#. Tag: title
-#: hardware.xml:1916
+#: hardware.xml:2018
#, no-c-format
msgid "Installation Media"
msgstr "安装介质"
#. Tag: para
-#: hardware.xml:1918
+#: hardware.xml:2020
#, no-c-format
msgid ""
"This section will help you determine which different media types you can use "
@@ -2729,13 +2854,13 @@ msgstr ""
"读那一章的时候,可能需要回过头来参考本页。"
#. Tag: title
-#: hardware.xml:1928
+#: hardware.xml:2030
#, no-c-format
msgid "Floppies"
msgstr "软盘"
#. Tag: para
-#: hardware.xml:1929
+#: hardware.xml:2031
#, no-c-format
msgid ""
"In some cases, you'll have to do your first boot from floppy disks. "
@@ -2746,58 +2871,54 @@ msgstr ""
"(1440 千字节)软驱。"
#. Tag: para
-#: hardware.xml:1935
+#: hardware.xml:2037
#, no-c-format
msgid "For CHRP, floppy support is currently broken."
msgstr "用于 CHRP 的软盘支持已经被停止。"
#. Tag: title
-#: hardware.xml:1942
-#, no-c-format
-msgid "CD-ROM/DVD-ROM"
+#: hardware.xml:2044
+#, fuzzy, no-c-format
+#| msgid "CD-ROM/DVD-ROM"
+msgid "CD-ROM/DVD-ROM/BD-ROM"
msgstr "CD-ROM/DVD-ROM"
#. Tag: para
-#: hardware.xml:1944
-#, no-c-format
+#: hardware.xml:2046
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both "
+#| "CD-ROMs and DVD-ROMs, because both technologies are really the same from "
+#| "the operating system's point of view."
msgid ""
-"Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both CD-"
-"ROMs and DVD-ROMs, because both technologies are really the same from the "
-"operating system's point of view."
+"Whenever you see <quote>CD-ROM</quote> in this manual, it applies to all of "
+"CD-ROMs, DVD-ROMs and BD-ROMs, because all these technologies are really the "
+"same from the operating system's point of view."
msgstr ""
"每当在本手册中看到 <quote>CD-ROM</quote>,它泛指 CD-ROM 和 DVD-ROM。因为从操"
"作系统的角度看,它们所用的技术是相同的。"
#. Tag: para
-#: hardware.xml:1950
+#: hardware.xml:2052
#, no-c-format
msgid "CD-ROM based installation is supported for most architectures."
msgstr "大多数体系都支持基于 CD-ROM 的安装程序"
#. Tag: para
-#: hardware.xml:1954
-#, no-c-format
-msgid "On PCs SATA, IDE/ATAPI and SCSI CD-ROMs are supported."
-msgstr "PC 上的 SATA、IDE/ATAPI 和 SCSI CD-ROM 都获得支持。"
-
-#. Tag: para
-#: hardware.xml:1958
-#, no-c-format
+#: hardware.xml:2056
+#, fuzzy, no-c-format
+#| msgid ""
+#| "USB CD-ROM drives are also supported, as are FireWire devices that are "
+#| "supported by the ohci1394 and sbp2 drivers."
msgid ""
-"USB CD-ROM drives are also supported, as are FireWire devices that are "
-"supported by the ohci1394 and sbp2 drivers."
+"On PCs SATA, IDE/ATAPI, USB and SCSI CD-ROMs are supported, as are FireWire "
+"devices that are supported by the ohci1394 and sbp2 drivers."
msgstr ""
"USB CD-ROM 也是被支持的。而 FireWire 设备则是通过 ohci1394 和 sbp2 驱动程序来"
"获得支持。"
#. Tag: para
-#: hardware.xml:1963
-#, no-c-format
-msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
-msgstr "所有的 ARM 机器都支持 IDE/ATAPI CD-ROM。"
-
-#. Tag: para
-#: hardware.xml:1967
+#: hardware.xml:2071
#, no-c-format
msgid ""
"On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -2815,20 +2936,27 @@ msgstr ""
"固件上选择 <quote>System installation</quote> 项。"
#. Tag: title
-#: hardware.xml:1981
+#: hardware.xml:2085
#, no-c-format
msgid "USB Memory Stick"
msgstr "U 盘"
#. Tag: para
-#: hardware.xml:1983
-#, no-c-format
+#: hardware.xml:2087
+#, fuzzy, no-c-format
+#| msgid ""
+#| "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
+#| "cheap storage device. Most modern computer systems also allow booting the "
+#| "&d-i; from such a stick. Many modern computer systems, in particular "
+#| "netbooks and thin laptops, do not have a CD/DVD-ROM drive anymore at all "
+#| "and booting from USB media ist the standard way of installing a new "
+#| "operating system on them."
msgid ""
"USB flash disks a.k.a. USB memory sticks have become a commonly used and "
"cheap storage device. Most modern computer systems also allow booting the &d-"
"i; from such a stick. Many modern computer systems, in particular netbooks "
"and thin laptops, do not have a CD/DVD-ROM drive anymore at all and booting "
-"from USB media ist the standard way of installing a new operating system on "
+"from USB media is the standard way of installing a new operating system on "
"them."
msgstr ""
"USB 闪存,也叫 U 盘已经成为常见的和廉价的存储设备。大多数现代计算机系统允许从"
@@ -2836,13 +2964,13 @@ msgstr ""
"CD/DVD-ROM 驱动器,从 U 盘引导是安装操作系统的标准方法。"
#. Tag: title
-#: hardware.xml:1995
+#: hardware.xml:2099
#, no-c-format
msgid "Network"
msgstr "网络"
#. Tag: para
-#: hardware.xml:1997
+#: hardware.xml:2101
#, no-c-format
msgid ""
"The network can be used during the installation to retrieve files needed for "
@@ -2859,7 +2987,7 @@ msgstr ""
"用 ISDN 和 PPP。"
#. Tag: para
-#: hardware.xml:2007
+#: hardware.xml:2111
#, no-c-format
msgid ""
"You can also <emphasis>boot</emphasis> the installation system over the "
@@ -2878,7 +3006,7 @@ msgstr ""
"安装技术。</phrase>"
#. Tag: para
-#: hardware.xml:2020
+#: hardware.xml:2124
#, no-c-format
msgid ""
"Diskless installation, using network booting from a local area network and "
@@ -2888,13 +3016,13 @@ msgstr ""
"择。"
#. Tag: title
-#: hardware.xml:2029
+#: hardware.xml:2133
#, no-c-format
msgid "Hard Disk"
msgstr "硬盘"
#. Tag: para
-#: hardware.xml:2031
+#: hardware.xml:2135
#, no-c-format
msgid ""
"Booting the installation system directly from a hard disk is another option "
@@ -2906,7 +3034,7 @@ msgstr ""
"安装程序。该方式建议只用在没有其他安装方式可以选的情况下。"
#. Tag: para
-#: hardware.xml:2038
+#: hardware.xml:2142
#, no-c-format
msgid ""
"Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -2916,13 +3044,13 @@ msgstr ""
"(UFS slices)进行安装。"
#. Tag: title
-#: hardware.xml:2047
+#: hardware.xml:2151
#, no-c-format
msgid "Un*x or GNU system"
msgstr "Un*x 或 GNU 系统"
#. Tag: para
-#: hardware.xml:2049
+#: hardware.xml:2153
#, no-c-format
msgid ""
"If you are running another Unix-like system, you could use it to install "
@@ -2939,13 +3067,13 @@ msgstr ""
">。这种安装方法只建议给高级用户在没有其他安装方法可选的情况下使用。"
#. Tag: title
-#: hardware.xml:2062
+#: hardware.xml:2166
#, no-c-format
msgid "Supported Storage Systems"
msgstr "受支持的存储系统"
#. Tag: para
-#: hardware.xml:2064
+#: hardware.xml:2168
#, no-c-format
msgid ""
"The &debian; installer contains a kernel which is built to maximize the "
@@ -2953,7 +3081,7 @@ msgid ""
msgstr "&debian; 安装程序包含的内核能运行在最大数量的系统上。"
#. Tag: para
-#: hardware.xml:2068
+#: hardware.xml:2172
#, no-c-format
msgid ""
"Generally, the &debian; installation system includes support for IDE (also "
@@ -2965,7 +3093,7 @@ msgstr ""
"动器、USB 和 FireWire。支持的文件系统有 FAT、Win-32 FAT 扩展(VFAT) 和 NTFS。"
#. Tag: para
-#: hardware.xml:2085
+#: hardware.xml:2189
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -2987,7 +3115,7 @@ msgstr ""
"以了解更多关于 SPARC 硬件被 Linux 内核支持的情况。"
#. Tag: para
-#: hardware.xml:2118
+#: hardware.xml:2222
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -2998,7 +3126,7 @@ msgstr ""
"支持 CHRP 系统上的软盘。"
#. Tag: para
-#: hardware.xml:2124
+#: hardware.xml:2228
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -3009,7 +3137,7 @@ msgstr ""
"支持软驱。"
#. Tag: para
-#: hardware.xml:2130
+#: hardware.xml:2234
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -3017,7 +3145,7 @@ msgid ""
msgstr "所有 Linux 内核支持的存储系统也都被启动系统所支持。"
#. Tag: para
-#: hardware.xml:2135
+#: hardware.xml:2239
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -3029,13 +3157,13 @@ msgstr ""
"持。"
#. Tag: title
-#: hardware.xml:2152
+#: hardware.xml:2256
#, no-c-format
msgid "Memory and Disk Space Requirements"
msgstr "内存与磁盘空间的需求"
#. Tag: para
-#: hardware.xml:2154
+#: hardware.xml:2258
#, no-c-format
msgid ""
"You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -3048,7 +3176,7 @@ msgstr ""
"hardware-reqts\"/>。"
#. Tag: para
-#: hardware.xml:2161
+#: hardware.xml:2265
#, fuzzy, no-c-format
#| msgid ""
#| "Installation on systems with less memory<footnote condition=\"gtk\"> "
@@ -3072,6 +3200,42 @@ msgstr ""
"形界面两种方式之间选择,应选择普通方式。</para> </footnote>或磁盘空间上安装系"
"统或许可行,但只针对有经验的用户。"
+#, fuzzy
+#~| msgid "MIPS (little endian)"
+#~ msgid "IBM PowerPC (little endian)"
+#~ msgstr "MIPS (little endian)"
+
+#~ msgid ""
+#~ "The &arch-title; architecture only supports Intel Itanium processors and "
+#~ "not the much more common 64-bit processors from the Intel 64 family "
+#~ "(including e.g. the Pentium&nbsp;D and the Core2&nbsp;Duo). Those systems "
+#~ "are supported by the <emphasis>amd64</emphasis> architecture or, if you "
+#~ "prefer a 32-bit userland, the <emphasis>i386</emphasis> architecture."
+#~ msgstr ""
+#~ "&arch-title; 体系只支持 Intel Itanium 处理器,而不是常见的属于 Intel 64 家"
+#~ "族的 64 位处理器(包括像 Pentium&nbsp;D 和 Core2&nbsp;Duo)。它们是被 "
+#~ "<emphasis>amd64</emphasis> 体系支持。如果您希望使用 32 位系统,可以选择 "
+#~ "<emphasis>i386</emphasis> 体系。"
+
+#~ msgid ""
+#~ "There are two major support <emphasis>&architecture;</emphasis> flavors: "
+#~ "PA-RISC 1.1 and PA-RISC 2.0. The PA-RISC 1.1 architecture is targeted at "
+#~ "32-bit processors whereas the 2.0 architecture is targeted to the 64-bit "
+#~ "processors. Some systems are able to run either kernel. In both cases, "
+#~ "the userland is 32-bit. There is the possibility of a 64-bit userland in "
+#~ "the future."
+#~ msgstr ""
+#~ "有两个主要支持的 <emphasis>&architecture;</emphasis> 变种:PA-RISC 1.1 和 "
+#~ "PA-RISC 2.0。PA-RISC 1.1 体系目标是 32 位处理器,而 2.0 体系目标是 64 位处"
+#~ "理器。有一些系统可以运行任一种内核。两者的 userland 都是 32 位的。将来也许"
+#~ "会有 64 位的 userland。"
+
+#~ msgid "On PCs SATA, IDE/ATAPI and SCSI CD-ROMs are supported."
+#~ msgstr "PC 上的 SATA、IDE/ATAPI 和 SCSI CD-ROM 都获得支持。"
+
+#~ msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
+#~ msgstr "所有的 ARM 机器都支持 IDE/ATAPI CD-ROM。"
+
#~ msgid ""
#~ "However, &debian; GNU/Linux &releasename; will <emphasis>not</emphasis> "
#~ "run on 386 or earlier processors. Despite the architecture name \"i386\", "
@@ -3180,9 +3344,6 @@ msgstr ""
#~ msgid "cobalt"
#~ msgstr "cobalt"
-#~ msgid "CPU/Machine types"
-#~ msgstr "CPU/机器类型"
-
#~ msgid ""
#~ "All MIPS based Cobalt machines are supported with the exception of the "
#~ "Qube 2700 (Qube 1)."
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index 96c424173..bbf7e9b09 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: 2015-02-23 20:58+0000\n"
+"POT-Creation-Date: 2015-04-15 20:29+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"
@@ -300,14 +300,21 @@ msgid ""
"tarball;."
msgstr ""
+#. Tag: para
+#: install-methods.xml:223
+#, no-c-format
+msgid ""
+"U-boot images for various armhf platforms are available at &armmp-uboot-img;."
+msgstr ""
+
#. Tag: title
-#: install-methods.xml:265
+#: install-methods.xml:269
#, no-c-format
msgid "Creating Floppies from Disk Images"
msgstr "从软盘映像创建引导软盘"
#. Tag: para
-#: install-methods.xml:266
+#: install-methods.xml:270
#, no-c-format
msgid ""
"Bootable floppy disks are generally used as a last resort to boot the "
@@ -317,7 +324,7 @@ msgstr ""
"最后一种方法。"
#. Tag: para
-#: install-methods.xml:271
+#: install-methods.xml:275
#, no-c-format
msgid ""
"Booting the installer from floppy disk reportedly fails on Mac USB floppy "
@@ -325,7 +332,7 @@ msgid ""
msgstr "有报告说 Mac 上的 USB 软盘驱动器安装程序软盘引导失败。"
#. Tag: para
-#: install-methods.xml:276
+#: install-methods.xml:280
#, no-c-format
msgid ""
"Disk images are files containing the complete contents of a floppy disk in "
@@ -343,7 +350,7 @@ msgstr ""
"按扇区复制</emphasis>到软盘中。"
#. Tag: para
-#: install-methods.xml:287
+#: install-methods.xml:291
#, no-c-format
msgid ""
"There are different techniques for creating floppies from disk images. This "
@@ -354,7 +361,7 @@ msgstr ""
"像创建引导软盘。"
#. Tag: para
-#: install-methods.xml:293
+#: install-methods.xml:297
#, no-c-format
msgid ""
"Before you can create the floppies, you will first need to download them "
@@ -368,7 +375,7 @@ msgstr ""
"DVD,软盘映像可能已经包含在 CD/DVD 上面。</phrase>"
#. Tag: para
-#: install-methods.xml:301
+#: install-methods.xml:305
#, no-c-format
msgid ""
"No matter which method you use to create your floppies, you should remember "
@@ -379,13 +386,13 @@ msgstr ""
"保内容不会在无意被抹掉。"
#. Tag: title
-#: install-methods.xml:309
+#: install-methods.xml:313
#, no-c-format
msgid "Writing Disk Images From a Linux or Unix System"
msgstr "从 Linux 或者 Unix 系统写软盘映像"
#. Tag: para
-#: install-methods.xml:310
+#: install-methods.xml:314
#, no-c-format
msgid ""
"To write the floppy disk image files to the floppy disks, you will probably "
@@ -417,7 +424,7 @@ msgstr ""
"(Solaris 系统中使用 <command>eject</command> 命令,请参见其手册)</phrase>。"
#. Tag: para
-#: install-methods.xml:331
+#: install-methods.xml:335
#, no-c-format
msgid ""
"Some systems attempt to automatically mount a floppy disk when you place it "
@@ -447,7 +454,7 @@ msgstr ""
"统,请咨询您的系统管理员)。</phrase>"
#. Tag: para
-#: install-methods.xml:352
+#: install-methods.xml:356
#, no-c-format
msgid ""
"If writing a floppy on powerpc Linux, you will need to eject it. The "
@@ -458,13 +465,13 @@ msgstr ""
"command> 命令能够很好地对此进行控制,当然您可能需要先安装它。"
#. Tag: title
-#: install-methods.xml:370
+#: install-methods.xml:374
#, no-c-format
msgid "Writing Disk Images From DOS, Windows, or OS/2"
msgstr "在 DOS、Windows 或者 OS/2 下写磁盘映像"
#. Tag: para
-#: install-methods.xml:372
+#: install-methods.xml:376
#, no-c-format
msgid ""
"If you have access to an i386 or amd64 machine, you can use one of the "
@@ -473,7 +480,7 @@ msgstr ""
"如果您能操作一台 i386 或 amd64 机器,可以使用如下方法之一往软盘复制映像文件。"
#. Tag: para
-#: install-methods.xml:377
+#: install-methods.xml:381
#, no-c-format
msgid ""
"The <command>rawrite1</command> and <command>rawrite2</command> programs can "
@@ -487,7 +494,7 @@ msgstr ""
"或者在文件浏览器中双击使用这些程序是<emphasis>不能</emphasis>运行的。"
#. Tag: para
-#: install-methods.xml:385
+#: install-methods.xml:389
#, no-c-format
msgid ""
"The <command>rwwrtwin</command> program runs on Windows 95, NT, 98, 2000, "
@@ -498,7 +505,7 @@ msgstr ""
"可能最新的版本上运行。要使用它您需要解压 diskio.dll 至相同目录下。"
#. Tag: para
-#: install-methods.xml:391
+#: install-methods.xml:395
#, no-c-format
msgid ""
"These tools can be found on the Official &debian; CD-ROMs under the "
@@ -508,13 +515,13 @@ msgstr ""
"下。"
#. Tag: title
-#: install-methods.xml:404
+#: install-methods.xml:408
#, no-c-format
msgid "Writing Disk Images From MacOS"
msgstr "在 MacOS 上写磁盘映像"
#. Tag: para
-#: install-methods.xml:405
+#: install-methods.xml:409
#, no-c-format
msgid ""
"An AppleScript, <application>Make &debian; Floppy</application>, is "
@@ -534,7 +541,7 @@ msgstr ""
"您确认的确想要清空磁盘并写入磁盘映像。"
#. Tag: para
-#: install-methods.xml:416
+#: install-methods.xml:420
#, no-c-format
msgid ""
"You can also use the MacOS utility <command>Disk Copy</command> directly, or "
@@ -547,13 +554,13 @@ msgstr ""
"您可以使用以下方法之一来利用这些工具将磁盘映像写入软盘。"
#. Tag: title
-#: install-methods.xml:427
+#: install-methods.xml:431
#, no-c-format
msgid "Writing Disk Images with <command>Disk Copy</command>"
msgstr "写磁盘映像:使用<command>Disk Copy</command>"
#. Tag: para
-#: install-methods.xml:428
+#: install-methods.xml:432
#, no-c-format
msgid ""
"If you are creating the floppy image from files which were originally on the "
@@ -566,7 +573,7 @@ msgstr ""
"下载映像文件的情况。"
#. Tag: para
-#: install-methods.xml:437
+#: install-methods.xml:441
#, no-c-format
msgid ""
"Obtain <ulink url=\"&url-powerpc-creator-changer;\">Creator-Changer</ulink> "
@@ -576,7 +583,7 @@ msgstr ""
"且用它打开 <filename>root.bin</filename> 文件。"
#. Tag: para
-#: install-methods.xml:444
+#: install-methods.xml:448
#, no-c-format
msgid ""
"Change the Creator to <userinput>ddsk</userinput> (Disk Copy), and the Type "
@@ -587,7 +594,7 @@ msgstr ""
"<userinput>DDim</userinput> (binary floppy image)。注意此处大小写敏感。"
#. Tag: para
-#: install-methods.xml:451
+#: install-methods.xml:455
#, no-c-format
msgid ""
"<emphasis>Important:</emphasis> In the Finder, use <userinput>Get Info</"
@@ -602,7 +609,7 @@ msgstr ""
"会删除引导区。"
#. Tag: para
-#: install-methods.xml:460
+#: install-methods.xml:464
#, no-c-format
msgid ""
"Obtain <command>Disk Copy</command>; if you have a MacOS system or CD it "
@@ -614,7 +621,7 @@ msgstr ""
"ulink>。"
#. Tag: para
-#: install-methods.xml:467
+#: install-methods.xml:471
#, no-c-format
msgid ""
"Run <command>Disk Copy</command>, and select <menuchoice> "
@@ -629,13 +636,13 @@ msgstr ""
"删除它。完成后它应该会弹出软盘。"
#. Tag: title
-#: install-methods.xml:482
+#: install-methods.xml:486
#, no-c-format
msgid "Writing Disk Images with <command>suntar</command>"
msgstr "写磁盘映像:使用<command>suntar</command>"
#. Tag: para
-#: install-methods.xml:486
+#: install-methods.xml:490
#, no-c-format
msgid ""
"Obtain <command>suntar</command> from <ulink url=\"&url-powerpc-suntar;\"> </"
@@ -648,21 +655,21 @@ msgstr ""
"userinput> 菜单中选择<quote>Overwrite Sectors...</quote>。"
#. Tag: para
-#: install-methods.xml:494
+#: install-methods.xml:498
#, no-c-format
msgid ""
"Insert the floppy disk as requested, then hit &enterkey; (start at sector 0)."
msgstr "按照要求插入软盘,然后点击 &enterkey; (从0扇区开始)。"
#. Tag: para
-#: install-methods.xml:500
+#: install-methods.xml:504
#, no-c-format
msgid ""
"Select the <filename>root.bin</filename> file in the file-opening dialog."
msgstr "在打开文件对话框中选择 <filename>root.bin</filename> 文件。"
#. Tag: para
-#: install-methods.xml:505
+#: install-methods.xml:509
#, no-c-format
msgid ""
"After the floppy has been created successfully, select <menuchoice> "
@@ -675,7 +682,7 @@ msgstr ""
"换别的软盘试试。"
#. Tag: para
-#: install-methods.xml:513
+#: install-methods.xml:517
#, no-c-format
msgid ""
"Before using the floppy you created, <emphasis>set the write protect tab</"
@@ -686,13 +693,13 @@ msgstr ""
"然在 MacOS 中挂载了它,MacOS 将会将其毁坏。"
#. Tag: title
-#: install-methods.xml:532
+#: install-methods.xml:536
#, no-c-format
msgid "Preparing Files for USB Memory Stick Booting"
msgstr "为从 U 盘引导准备文件"
#. Tag: para
-#: install-methods.xml:534
+#: install-methods.xml:538
#, no-c-format
msgid ""
"To prepare the USB stick, you will need a system where GNU/Linux is already "
@@ -713,7 +720,7 @@ msgstr ""
"护开关。"
#. Tag: para
-#: install-methods.xml:547
+#: install-methods.xml:551
#, no-c-format
msgid ""
"The procedures described in this section will destroy anything already on "
@@ -725,13 +732,13 @@ msgstr ""
"搞错,比如写成硬盘,将造成该设备上的所有信息丢失。"
#. Tag: title
-#: install-methods.xml:557
+#: install-methods.xml:561
#, no-c-format
msgid "Preparing a USB stick using a hybrid CD or DVD image"
msgstr "使用混合 CD 或 DVD 映像制作 U 盘"
#. Tag: para
-#: install-methods.xml:558
+#: install-methods.xml:562
#, fuzzy, no-c-format
#| msgid ""
#| "Debian CD and DVD images can now be written directly a USB stick, which "
@@ -749,7 +756,7 @@ msgstr ""
"cdrom\"/> 获取 CD 或 DVD 映像。"
#. Tag: para
-#: install-methods.xml:566
+#: install-methods.xml:570
#, no-c-format
msgid ""
"Alternatively, for very small USB sticks, only a few megabytes in size, you "
@@ -762,7 +769,7 @@ msgstr ""
">)。"
#. Tag: para
-#: install-methods.xml:573
+#: install-methods.xml:577
#, fuzzy, no-c-format
#| msgid ""
#| "The CD or DVD image you choose should be written directly to the USB "
@@ -787,7 +794,7 @@ msgstr ""
"U 盘已经卸载:"
#. Tag: para
-#: install-methods.xml:587
+#: install-methods.xml:591
#, no-c-format
msgid ""
"The image must be written to the whole-disk device and not a partition, e."
@@ -796,7 +803,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: install-methods.xml:593
+#: install-methods.xml:597
#, no-c-format
msgid ""
"Simply writing the CD or DVD image to USB like this should work fine for "
@@ -807,7 +814,7 @@ msgstr ""
"项主要提供给有特殊需要的用户。"
#. Tag: para
-#: install-methods.xml:601
+#: install-methods.xml:605
#, no-c-format
msgid ""
"The hybrid image on the stick does not occupy all the storage space, so it "
@@ -817,7 +824,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: install-methods.xml:609
+#: install-methods.xml:613
#, no-c-format
msgid ""
"Create a second, FAT partition on the stick, mount the partition and copy or "
@@ -825,7 +832,7 @@ msgid ""
msgstr ""
#. Tag: screen
-#: install-methods.xml:614
+#: install-methods.xml:618
#, fuzzy, no-c-format
#| msgid ""
#| "# mount /dev/<replaceable>sdX2</replaceable> /mnt\n"
@@ -847,7 +854,7 @@ msgstr ""
"# umount"
#. Tag: para
-#: install-methods.xml:616
+#: install-methods.xml:620
#, no-c-format
msgid ""
"You might have written the <filename>mini.iso</filename> to the USB stick. "
@@ -857,13 +864,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: install-methods.xml:630
+#: install-methods.xml:634
#, no-c-format
msgid "Manually copying files to the USB stick"
msgstr "手动复制文件到 U 盘。"
#. Tag: para
-#: install-methods.xml:631
+#: install-methods.xml:635
#, no-c-format
msgid ""
"An alternative way to set up your USB stick is to manually copy the "
@@ -875,7 +882,7 @@ msgstr ""
"可以使用较少容量,请参考 <xref linkend=\"usb-copy-flexible\"/>)。"
#. Tag: para
-#: install-methods.xml:638
+#: install-methods.xml:642
#, no-c-format
msgid ""
"There is an all-in-one file <filename>hd-media/boot.img.gz</filename> which "
@@ -890,7 +897,7 @@ msgstr ""
"classname> 和对应的配置文件</phrase>。"
#. Tag: para
-#: install-methods.xml:647
+#: install-methods.xml:651
#, no-c-format
msgid ""
"Note that, although convenient, this method does have one major "
@@ -904,19 +911,19 @@ msgstr ""
"量创建一个新的文件系统。"
#. Tag: para
-#: install-methods.xml:655
+#: install-methods.xml:659
#, no-c-format
msgid "To use this image simply extract it directly to your USB stick:"
msgstr "使用该映象只须将它直接解压到 U 盘:"
#. Tag: screen
-#: install-methods.xml:659
+#: install-methods.xml:663
#, 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:661
+#: install-methods.xml:665
#, no-c-format
msgid ""
"Create a partition of type \"Apple_Bootstrap\" on your USB stick using "
@@ -927,13 +934,13 @@ msgstr ""
"的 <userinput>C</userinput> 命令,并直接解压映象:"
#. Tag: screen
-#: install-methods.xml:667
+#: install-methods.xml:671
#, 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:669
+#: install-methods.xml:673
#, no-c-format
msgid ""
"After that, mount the USB memory stick <phrase arch=\"x86\">"
@@ -954,13 +961,13 @@ msgstr ""
"(<userinput>umount /mnt</userinput>) 就完成了。"
#. Tag: title
-#: install-methods.xml:686
+#: install-methods.xml:690
#, no-c-format
msgid "Manually copying files to the USB stick &mdash; the flexible way"
msgstr "手动复制文件到 U 盘 &mdash; 灵活的方法"
#. Tag: para
-#: install-methods.xml:687
+#: install-methods.xml:691
#, fuzzy, no-c-format
#| msgid ""
#| "If you like more flexibility or just want to know what's going on, you "
@@ -979,13 +986,13 @@ msgstr ""
"文件放到 U 盘。"
#. Tag: title
-#: install-methods.xml:702 install-methods.xml:824
+#: install-methods.xml:706 install-methods.xml:828
#, no-c-format
msgid "Partitioning the USB stick"
msgstr "给 U 盘分区"
#. Tag: para
-#: install-methods.xml:703
+#: install-methods.xml:707
#, no-c-format
msgid ""
"We will show how to set up the memory stick to use the first partition, "
@@ -993,7 +1000,7 @@ msgid ""
msgstr "我们将展示如何使用 U 盘的第一个分区,而不是整个设备。"
#. Tag: para
-#: install-methods.xml:708
+#: install-methods.xml:712
#, no-c-format
msgid ""
"Since most USB sticks come pre-configured with a single FAT16 partition, you "
@@ -1025,7 +1032,7 @@ msgstr ""
"&debian; 软件包内。"
#. Tag: para
-#: install-methods.xml:732
+#: install-methods.xml:736
#, no-c-format
msgid ""
"In order to start the kernel after booting from the USB stick, we will put a "
@@ -1042,7 +1049,7 @@ msgstr ""
"用来改变 boot loader 的配置文件。"
#. Tag: para
-#: install-methods.xml:742
+#: install-methods.xml:746
#, no-c-format
msgid ""
"To put <classname>syslinux</classname> on the FAT16 partition on your USB "
@@ -1065,13 +1072,13 @@ msgstr ""
"filename> 文件。"
#. Tag: title
-#: install-methods.xml:759 install-methods.xml:871
+#: install-methods.xml:763 install-methods.xml:875
#, no-c-format
msgid "Adding the installer image"
msgstr "添加安装程序映像"
#. Tag: para
-#: install-methods.xml:760
+#: install-methods.xml:764
#, fuzzy, no-c-format
#| msgid ""
#| "Mount the partition (<userinput>mount /dev/<replaceable>sdX1</"
@@ -1106,7 +1113,7 @@ msgstr ""
"(8.3) 文件名。"
#. Tag: para
-#: install-methods.xml:784
+#: install-methods.xml:788
#, no-c-format
msgid ""
"Next you should create a <filename>syslinux.cfg</filename> configuration "
@@ -1129,7 +1136,7 @@ msgstr ""
"userinput> 到第二行尾部。还可以添加其他的参数。"
#. Tag: para
-#: install-methods.xml:796
+#: install-methods.xml:800
#, no-c-format
msgid ""
"To enable the boot prompt to permit further parameter appending, add a "
@@ -1138,7 +1145,7 @@ msgstr ""
"添加 <userinput>prompt 1</userinput> 一行,使得引导提示符可以允许附加参数。"
#. Tag: para
-#: install-methods.xml:801 install-methods.xml:911
+#: install-methods.xml:805 install-methods.xml:915
#, no-c-format
msgid ""
"If you used an <filename>hd-media</filename> image, you should now copy the "
@@ -1156,7 +1163,7 @@ msgstr ""
"footnote> 到 U 盘。完成后,卸载 U 盘 (<userinput>umount /mnt</userinput>)。"
#. Tag: para
-#: install-methods.xml:825
+#: install-methods.xml:829
#, no-c-format
msgid ""
"Most USB sticks do not come pre-configured in such a way that Open Firmware "
@@ -1183,7 +1190,7 @@ msgstr ""
"command> 命令包含在 &debian; 的 <classname>hfsutils</classname> 软件包中。"
#. Tag: para
-#: install-methods.xml:842
+#: install-methods.xml:846
#, no-c-format
msgid ""
"In order to start the kernel after booting from the USB stick, we will put a "
@@ -1198,7 +1205,7 @@ msgstr ""
"变启动引导器的配置文件。"
#. Tag: para
-#: install-methods.xml:851
+#: install-methods.xml:855
#, no-c-format
msgid ""
"The normal <command>ybin</command> tool that comes with <command>yaboot</"
@@ -1232,7 +1239,7 @@ msgstr ""
"就可以用普通的 Unix 工具来处理了。"
#. Tag: para
-#: install-methods.xml:872
+#: install-methods.xml:876
#, no-c-format
msgid ""
"Mount the partition (<userinput>mount /dev/<replaceable>sdX2</replaceable> /"
@@ -1242,31 +1249,31 @@ msgstr ""
"mnt</userinput>),然后复制下面的安装程序映象文件到 U 盘:"
#. Tag: para
-#: install-methods.xml:879
+#: install-methods.xml:883
#, no-c-format
msgid "<filename>vmlinux</filename> (kernel binary)"
msgstr "<filename>vmlinux</filename> (内核二进制文件)"
#. Tag: para
-#: install-methods.xml:884
+#: install-methods.xml:888
#, no-c-format
msgid "<filename>initrd.gz</filename> (initial ramdisk image)"
msgstr "<filename>initrd.gz</filename> (初始化内存映像)"
#. Tag: para
-#: install-methods.xml:889
+#: install-methods.xml:893
#, no-c-format
msgid "<filename>yaboot.conf</filename> (yaboot configuration file)"
msgstr "<filename>yaboot.conf</filename> (yaboot 配置文件)"
#. Tag: para
-#: install-methods.xml:894
+#: install-methods.xml:898
#, no-c-format
msgid "<filename>boot.msg</filename> (optional boot message)"
msgstr "<filename>boot.msg</filename> (可选的启动信息)"
#. Tag: para
-#: install-methods.xml:901
+#: install-methods.xml:905
#, no-c-format
msgid ""
"The <filename>yaboot.conf</filename> configuration file should contain the "
@@ -1302,13 +1309,13 @@ msgstr ""
"的大小。"
#. Tag: title
-#: install-methods.xml:939
+#: install-methods.xml:943
#, no-c-format
msgid "Preparing Files for Hard Disk Booting"
msgstr "为从硬盘引导准备文件"
#. Tag: para
-#: install-methods.xml:940
+#: install-methods.xml:944
#, no-c-format
msgid ""
"The installer may be booted using boot files placed on an existing hard "
@@ -1319,7 +1326,7 @@ msgstr ""
"者直接使用 BIOS 提供的引导装载程序直接启动。"
#. Tag: para
-#: install-methods.xml:946
+#: install-methods.xml:950
#, no-c-format
msgid ""
"A full, <quote>pure network</quote> installation can be achieved using this "
@@ -1332,7 +1339,7 @@ msgstr ""
"缠不清。"
#. Tag: para
-#: install-methods.xml:953
+#: install-methods.xml:957
#, no-c-format
msgid ""
"The installer cannot boot from files on an HFS+ file system. MacOS System "
@@ -1352,7 +1359,7 @@ msgstr ""
"Linux 之间交换文件,特别是那些您下载的安装文件。"
#. Tag: para
-#: install-methods.xml:964
+#: install-methods.xml:968
#, no-c-format
msgid ""
"Different programs are used for hard disk installation system booting, "
@@ -1363,7 +1370,7 @@ msgstr ""
"装程序的引导将使用不同的安装文件。"
#. Tag: title
-#: install-methods.xml:973
+#: install-methods.xml:977
#, fuzzy, no-c-format
#| msgid ""
#| "Hard disk installer booting using <command>LILO</command> or "
@@ -1375,7 +1382,7 @@ msgstr ""
"硬盘安装程序引导使用 <command>LILO</command> 或 <command>GRUB</command>"
#. Tag: para
-#: install-methods.xml:975
+#: install-methods.xml:979
#, no-c-format
msgid ""
"This section explains how to add to or even replace an existing linux "
@@ -1385,7 +1392,7 @@ msgstr ""
"command> 或 <command>GRUB</command>。"
#. Tag: para
-#: install-methods.xml:981
+#: install-methods.xml:985
#, no-c-format
msgid ""
"At boot time, both bootloaders support loading in memory not only the "
@@ -1396,7 +1403,7 @@ msgstr ""
"盘可以被用做内核的根文件系统。"
#. Tag: para
-#: install-methods.xml:987
+#: install-methods.xml:991
#, no-c-format
msgid ""
"Copy the following files from the &debian; archives to a convenient location "
@@ -1407,19 +1414,19 @@ msgstr ""
"newinstall/</filename>。"
#. Tag: para
-#: install-methods.xml:995
+#: install-methods.xml:999
#, no-c-format
msgid "<filename>vmlinuz</filename> (kernel binary)"
msgstr "<filename>vmlinuz</filename>(内核二进制文件)"
#. Tag: para
-#: install-methods.xml:1000
+#: install-methods.xml:1004
#, no-c-format
msgid "<filename>initrd.gz</filename> (ramdisk image)"
msgstr "<filename>initrd.gz</filename> (内存虚拟磁盘映像)"
#. Tag: para
-#: install-methods.xml:1007
+#: install-methods.xml:1011
#, no-c-format
msgid ""
"Finally, to configure the bootloader proceed to <xref linkend=\"boot-initrd"
@@ -1427,14 +1434,14 @@ msgid ""
msgstr "最后,要配置 bootloader,请进入 <xref linkend=\"boot-initrd\"/>。"
#. Tag: title
-#: install-methods.xml:1017
+#: install-methods.xml:1021
#, 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:1018
+#: install-methods.xml:1022
#, no-c-format
msgid ""
"This section explains how to prepare your hard drive for booting the "
@@ -1443,7 +1450,7 @@ msgstr ""
"本节将说明如何用 <command>loadlin</command> 从 DOS 启动安装程序准备您的硬盘。"
#. Tag: para
-#: install-methods.xml:1023
+#: install-methods.xml:1027
#, no-c-format
msgid ""
"Copy the following directories from a &debian; CD image to <filename>c:\\</"
@@ -1451,26 +1458,26 @@ msgid ""
msgstr "从 &debian; CD 映象复制下列目录到 <filename>c:\\</filename>。"
#. Tag: para
-#: install-methods.xml:1028
+#: install-methods.xml:1032
#, 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:1033
+#: install-methods.xml:1037
#, no-c-format
msgid "<filename>/tools</filename> (loadlin tool)"
msgstr "<filename>/tools</filename> (loadlin 工具)"
#. Tag: title
-#: install-methods.xml:1046
+#: install-methods.xml:1050
#, no-c-format
msgid "Hard Disk Installer Booting for OldWorld Macs"
msgstr "在 OldWorld Macs 上引导硬盘安装程序"
#. Tag: para
-#: install-methods.xml:1047
+#: install-methods.xml:1051
#, no-c-format
msgid ""
"The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
@@ -1492,7 +1499,7 @@ msgstr ""
"是必须的。"
#. Tag: para
-#: install-methods.xml:1060
+#: install-methods.xml:1064
#, no-c-format
msgid ""
"Download and unstuff the <application>BootX</application> distribution, "
@@ -1519,13 +1526,13 @@ msgstr ""
"的系统文件夹中。"
#. Tag: title
-#: install-methods.xml:1080
+#: install-methods.xml:1084
#, no-c-format
msgid "Hard Disk Installer Booting for NewWorld Macs"
msgstr "在 NewWorld Macs 上启动硬盘安装程序"
#. Tag: para
-#: install-methods.xml:1081
+#: install-methods.xml:1085
#, no-c-format
msgid ""
"NewWorld PowerMacs support booting from a network or an ISO9660 CD-ROM, as "
@@ -1543,7 +1550,7 @@ msgstr ""
"不能用在 NewWorld PowerMacs 上。"
#. Tag: para
-#: install-methods.xml:1092
+#: install-methods.xml:1096
#, no-c-format
msgid ""
"<emphasis>Copy</emphasis> (not move) the following four files which you "
@@ -1556,31 +1563,31 @@ msgstr ""
"硬盘图标的方法来完成)。"
#. Tag: filename
-#: install-methods.xml:1102 install-methods.xml:1428
+#: install-methods.xml:1106 install-methods.xml:1432
#, no-c-format
msgid "vmlinux"
msgstr "vmlinux"
#. Tag: filename
-#: install-methods.xml:1107 install-methods.xml:1433
+#: install-methods.xml:1111 install-methods.xml:1437
#, no-c-format
msgid "initrd.gz"
msgstr "initrd.gz"
#. Tag: filename
-#: install-methods.xml:1112 install-methods.xml:1438
+#: install-methods.xml:1116 install-methods.xml:1442
#, no-c-format
msgid "yaboot"
msgstr "yaboot"
#. Tag: filename
-#: install-methods.xml:1117 install-methods.xml:1443
+#: install-methods.xml:1121 install-methods.xml:1447
#, no-c-format
msgid "yaboot.conf"
msgstr "yaboot.conf"
#. Tag: para
-#: install-methods.xml:1122
+#: install-methods.xml:1126
#, no-c-format
msgid ""
"Make a note of the partition number of the MacOS partition where you place "
@@ -1594,19 +1601,19 @@ msgstr ""
"的时候,您需要这个分区号码在 Open Firmware 提示符下面输入命令。"
#. Tag: para
-#: install-methods.xml:1130
+#: install-methods.xml:1134
#, no-c-format
msgid "To boot the installer, proceed to <xref linkend=\"boot-newworld\"/>."
msgstr "要引导安装程序,请进入 <xref linkend=\"boot-newworld\"/>。"
#. Tag: title
-#: install-methods.xml:1143
+#: install-methods.xml:1147
#, no-c-format
msgid "Preparing Files for TFTP Net Booting"
msgstr "为使用 TFTP 网络引导准备文件"
#. Tag: para
-#: install-methods.xml:1144
+#: install-methods.xml:1148
#, no-c-format
msgid ""
"If your machine is connected to a local area network, you may be able to "
@@ -1620,7 +1627,7 @@ msgstr ""
"上面的某个特殊地方,并且配置好能够能够支持对您的机器进行引导。"
#. Tag: para
-#: install-methods.xml:1152
+#: install-methods.xml:1156
#, no-c-format
msgid ""
"You need to set up a TFTP server, and for many machines a DHCP server<phrase "
@@ -1632,7 +1639,7 @@ msgstr ""
"condition=\"supports-bootp\">,或 BOOTP 服务器</phrase>。"
#. Tag: para
-#: install-methods.xml:1159
+#: install-methods.xml:1163
#, no-c-format
msgid ""
"<phrase condition=\"supports-rarp\">The Reverse Address Resolution Protocol "
@@ -1651,7 +1658,7 @@ msgstr ""
"些系统只能通过 DHCP 来配置。"
#. Tag: para
-#: install-methods.xml:1173
+#: install-methods.xml:1177
#, no-c-format
msgid ""
"For PowerPC, if you have a NewWorld Power Macintosh machine, it is a good "
@@ -1662,7 +1669,7 @@ msgstr ""
"替 BOOTP 比较好。有些最新的机器不能从 BOOTP 引导。"
#. Tag: para
-#: install-methods.xml:1179
+#: install-methods.xml:1183
#, no-c-format
msgid ""
"Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. There "
@@ -1672,7 +1679,7 @@ msgstr ""
"个 <classname>rbootd</classname> 软件包。"
#. Tag: para
-#: install-methods.xml:1184
+#: install-methods.xml:1188
#, no-c-format
msgid ""
"The Trivial File Transfer Protocol (TFTP) is used to serve the boot image to "
@@ -1686,7 +1693,7 @@ msgstr ""
"Linux 上面的一些操作例子。"
#. Tag: para
-#: install-methods.xml:1192
+#: install-methods.xml:1196
#, no-c-format
msgid ""
"For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. "
@@ -1699,13 +1706,13 @@ msgstr ""
"多问题。另一个好的选择是 <classname>atftpd</classname>。"
#. Tag: title
-#: install-methods.xml:1208
+#: install-methods.xml:1212
#, no-c-format
msgid "Setting up RARP server"
msgstr "设置 RARP 服务器"
#. Tag: para
-#: install-methods.xml:1209
+#: install-methods.xml:1213
#, no-c-format
msgid ""
"To set up RARP, you need to know the Ethernet address (a.k.a. the MAC "
@@ -1723,7 +1730,7 @@ msgstr ""
"addr show dev eth0</userinput> 命令。"
#. Tag: para
-#: install-methods.xml:1221
+#: install-methods.xml:1225
#, fuzzy, no-c-format
#| msgid ""
#| "On a RARP server system using a Linux 2.4 or 2.6 kernel, or Solaris/"
@@ -1757,13 +1764,13 @@ msgstr ""
"<userinput>/usr/etc/rarpd -a</userinput> 命令。"
#. Tag: title
-#: install-methods.xml:1242
+#: install-methods.xml:1246
#, no-c-format
msgid "Setting up a DHCP server"
msgstr "设置 DHCP 服务器"
#. Tag: para
-#: install-methods.xml:1243
+#: install-methods.xml:1247
#, no-c-format
msgid ""
"One free software DHCP server is ISC <command>dhcpd</command>. For &debian-"
@@ -1776,7 +1783,7 @@ msgstr ""
"配置示例文件(参阅 <filename>/etc/dhcp/dhcpd.conf</filename>):"
#. Tag: screen
-#: install-methods.xml:1250
+#: install-methods.xml:1254
#, no-c-format
msgid ""
"option domain-name \"example.com\";\n"
@@ -1820,7 +1827,7 @@ msgstr ""
"}"
#. Tag: para
-#: install-methods.xml:1252
+#: install-methods.xml:1256
#, no-c-format
msgid ""
"In this example, there is one server <replaceable>servername</replaceable> "
@@ -1836,7 +1843,7 @@ msgstr ""
"TFTP 获取的文件名。"
#. Tag: para
-#: install-methods.xml:1262
+#: install-methods.xml:1266
#, no-c-format
msgid ""
"After you have edited the <command>dhcpd</command> configuration file, "
@@ -1846,13 +1853,13 @@ msgstr ""
"<userinput>/etc/init.d/isc-dhcp-server restart</userinput>。"
#. Tag: title
-#: install-methods.xml:1270
+#: install-methods.xml:1274
#, no-c-format
msgid "Enabling PXE Booting in the DHCP configuration"
msgstr "在 DHCP 配置中打开 PXE 引导功能"
#. Tag: para
-#: install-methods.xml:1271
+#: install-methods.xml:1275
#, no-c-format
msgid ""
"Here is another example for a <filename>dhcp.conf</filename> using the Pre-"
@@ -1922,13 +1929,13 @@ msgstr ""
"的 <xref linkend=\"tftp-images\"/>)。"
#. Tag: title
-#: install-methods.xml:1291
+#: install-methods.xml:1295
#, no-c-format
msgid "Setting up a BOOTP server"
msgstr "架设 BOOTP 服务器"
#. Tag: para
-#: install-methods.xml:1292
+#: install-methods.xml:1296
#, no-c-format
msgid ""
"There are two BOOTP servers available for GNU/Linux. The first is CMU "
@@ -1943,7 +1950,7 @@ msgstr ""
"<classname>isc-dhcp-server</classname> 软件包。"
#. Tag: para
-#: install-methods.xml:1300
+#: install-methods.xml:1304
#, no-c-format
msgid ""
"To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
@@ -2005,7 +2012,7 @@ msgstr ""
"MAC 地址。</phrase>"
#. Tag: para
-#: install-methods.xml:1333
+#: install-methods.xml:1337
#, fuzzy, no-c-format
#| msgid ""
#| "By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
@@ -2037,13 +2044,13 @@ msgstr ""
"<command>dhcpd</command>。"
#. Tag: title
-#: install-methods.xml:1352
+#: install-methods.xml:1356
#, no-c-format
msgid "Enabling the TFTP Server"
msgstr "开启 TFTP 服务器"
#. Tag: para
-#: install-methods.xml:1353
+#: install-methods.xml:1357
#, no-c-format
msgid ""
"To get the TFTP server ready to go, you should first make sure that "
@@ -2052,7 +2059,7 @@ msgstr ""
"要准备好 TFTP 服务器,您首先需要确定 <command>tftpd</command> 已经启动。"
#. Tag: para
-#: install-methods.xml:1358
+#: install-methods.xml:1362
#, no-c-format
msgid ""
"In the case of <classname>tftpd-hpa</classname> there are two ways the "
@@ -2066,7 +2073,7 @@ msgstr ""
"以在安装软件包的时候选择,也可以用重新配置软件包方式修改。"
#. Tag: para
-#: install-methods.xml:1367
+#: install-methods.xml:1371
#, no-c-format
msgid ""
"Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
@@ -2083,7 +2090,7 @@ msgstr ""
"置文件示例。"
#. Tag: para
-#: install-methods.xml:1377
+#: install-methods.xml:1381
#, no-c-format
msgid ""
"All <command>in.tftpd</command> alternatives available in &debian; should "
@@ -2097,7 +2104,7 @@ msgstr ""
"问题,建议先检查这些日志信息,这对于分析错误是一个好的起始点。"
#. Tag: para
-#: install-methods.xml:1385
+#: install-methods.xml:1389
#, no-c-format
msgid ""
"If you intend to install &debian; on an SGI machine and your TFTP server is "
@@ -2125,13 +2132,13 @@ msgstr ""
"错误。"
#. Tag: title
-#: install-methods.xml:1407
+#: install-methods.xml:1411
#, no-c-format
msgid "Move TFTP Images Into Place"
msgstr "将 TFTP 映像放到适当的位置"
#. Tag: para
-#: install-methods.xml:1408
+#: install-methods.xml:1412
#, no-c-format
msgid ""
"Next, place the TFTP boot image you need, as found in <xref linkend=\"where-"
@@ -2146,7 +2153,7 @@ msgstr ""
"完全决定于 TFTP 客户程序,而且没有一个强制的标准。"
#. Tag: para
-#: install-methods.xml:1417
+#: install-methods.xml:1421
#, no-c-format
msgid ""
"On NewWorld Power Macintosh machines, you will need to set up the "
@@ -2161,13 +2168,13 @@ msgstr ""
"件:"
#. Tag: filename
-#: install-methods.xml:1448
+#: install-methods.xml:1452
#, no-c-format
msgid "boot.msg"
msgstr "boot.msg"
#. Tag: para
-#: install-methods.xml:1453
+#: install-methods.xml:1457
#, no-c-format
msgid ""
"For PXE booting, everything you should need is set up in the "
@@ -2182,7 +2189,7 @@ msgstr ""
"需的文件名传递给 <command>tftpd</command>。"
#. Tag: para
-#: install-methods.xml:1461
+#: install-methods.xml:1465
#, no-c-format
msgid ""
"For PXE booting, everything you should need is set up in the "
@@ -2197,13 +2204,13 @@ msgstr ""
"efi</filename> 以启动所需的文件名传递至<command>tftpd</command>。"
#. Tag: title
-#: install-methods.xml:1473
+#: install-methods.xml:1477
#, no-c-format
msgid "SPARC TFTP Booting"
msgstr "SPARC TFTP 引导"
#. Tag: para
-#: install-methods.xml:1474
+#: install-methods.xml:1478
#, no-c-format
msgid ""
"Some SPARC architectures add the subarchitecture names, such as "
@@ -2231,7 +2238,7 @@ msgstr ""
"并在必要时加上子体系名。"
#. Tag: para
-#: install-methods.xml:1490
+#: install-methods.xml:1494
#, no-c-format
msgid ""
"If you've done all this correctly, giving the command <userinput>boot net</"
@@ -2243,7 +2250,7 @@ msgstr ""
"映像。假如映像找不到,查看 tftp 服务器的日志所需要的映像文件名。"
#. Tag: para
-#: install-methods.xml:1497
+#: install-methods.xml:1501
#, no-c-format
msgid ""
"You can also force some sparc systems to look for a specific file name by "
@@ -2256,13 +2263,13 @@ msgstr ""
"仍然必须被请放置在 TFTP 服务器要查找的目录中。"
#. Tag: title
-#: install-methods.xml:1508
+#: install-methods.xml:1512
#, no-c-format
msgid "SGI TFTP Booting"
msgstr "SGI TFTP 引导"
#. Tag: para
-#: install-methods.xml:1509
+#: install-methods.xml:1513
#, no-c-format
msgid ""
"On SGI machines you can rely on the <command>bootpd</command> to supply the "
@@ -2276,13 +2283,13 @@ msgstr ""
"现在 <filename>/etc/dhcpd.conf</filename>。"
#. Tag: title
-#: install-methods.xml:1617
+#: install-methods.xml:1621
#, no-c-format
msgid "Automatic Installation"
msgstr "自动化安装"
#. Tag: para
-#: install-methods.xml:1618
+#: install-methods.xml:1622
#, no-c-format
msgid ""
"For installing on multiple computers it's possible to do fully automatic "
@@ -2297,13 +2304,13 @@ msgstr ""
"更多细节。"
#. Tag: title
-#: install-methods.xml:1630
+#: install-methods.xml:1634
#, no-c-format
msgid "Automatic Installation Using the &debian; Installer"
msgstr "使用 &debian; 安装程序进行自动安装"
#. Tag: para
-#: install-methods.xml:1631
+#: install-methods.xml:1635
#, no-c-format
msgid ""
"The &debian; Installer supports automating installs via preconfiguration "
@@ -2315,7 +2322,7 @@ msgstr ""
"介质上加载,并自动回答安装过程中的问题。"
#. Tag: para
-#: install-methods.xml:1638
+#: install-methods.xml:1642
#, no-c-format
msgid ""
"Full documentation on preseeding including a working example that you can "
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index 7f3a899d4..00a589574 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: 2015-01-09 19:07+0000\n"
+"POT-Creation-Date: 2015-04-15 20:29+0000\n"
"PO-Revision-Date: 2012-11-26 00:20+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -567,13 +567,19 @@ msgstr ""
#. Tag: para
#: partitioning.xml:291
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "As an example, an older home machine might have 32MB of RAM and a 1.7GB "
+#| "IDE drive on <filename>/dev/hda</filename>. There might be a 500MB "
+#| "partition for another operating system on <filename>/dev/hda1</filename>, "
+#| "a 32MB swap partition on <filename>/dev/hda3</filename> and about 1.2GB "
+#| "on <filename>/dev/hda2</filename> as the Linux partition."
msgid ""
"As an example, an older home machine might have 32MB of RAM and a 1.7GB IDE "
-"drive on <filename>/dev/hda</filename>. There might be a 500MB partition for "
-"another operating system on <filename>/dev/hda1</filename>, a 32MB swap "
-"partition on <filename>/dev/hda3</filename> and about 1.2GB on <filename>/"
-"dev/hda2</filename> as the Linux partition."
+"drive on <filename>/dev/sda</filename>. There might be a 500MB partition for "
+"another operating system on <filename>/dev/sda1</filename>, a 32MB swap "
+"partition on <filename>/dev/sda3</filename> and about 1.2GB on <filename>/"
+"dev/sda2</filename> as the Linux partition."
msgstr ""
"举一个例子,一个较老的家用机器上,可能有 32MB 内存和一个 <filename>/dev/hda</"
"filename> 上的 1.7GB IDE 驱动器。<filename>/dev/hda1</filename> 上有一个 "
@@ -623,26 +629,24 @@ msgstr "第二个软盘驱动器被命名为 <filename>/dev/fd1</filename>。"
#. Tag: para
#: partitioning.xml:335
-#, no-c-format
-msgid ""
-"The first SCSI disk (SCSI ID address-wise) is named <filename>/dev/sda</"
-"filename>."
-msgstr ""
-"第一个 SCSI 驱动器(SCSI ID address-wise)被命名为 <filename>/dev/sda</"
-"filename>。"
+#, fuzzy, no-c-format
+#| msgid "The first DASD device is named <filename>/dev/dasda</filename>."
+msgid "The first hard disk detected is named <filename>/dev/sda</filename>."
+msgstr "第一个 DASD 设备被命名为 <filename>/dev/dasda</filename>。"
#. Tag: para
-#: partitioning.xml:341
-#, no-c-format
+#: partitioning.xml:340
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The second DASD device is named <filename>/dev/dasdb</filename>, and so "
+#| "on."
msgid ""
-"The second SCSI disk (address-wise) is named <filename>/dev/sdb</filename>, "
-"and so on."
-msgstr ""
-"第二个 SCSI 驱动器(address-wise)被命名为 <filename>/dev/sdb</filename>,等"
-"等。"
+"The second hard disk detected is named <filename>/dev/sdb</filename>, and so "
+"on."
+msgstr "第二个 DASD 设备被命名为 <filename>/dev/dasdb</filename>,等等。"
#. Tag: para
-#: partitioning.xml:347
+#: partitioning.xml:346
#, no-c-format
msgid ""
"The first SCSI CD-ROM is named <filename>/dev/scd0</filename>, also known as "
@@ -652,49 +656,20 @@ msgstr ""
"<filename>/dev/sr0</filename>。"
#. Tag: para
-#: partitioning.xml:353
-#, no-c-format
-msgid ""
-"The master disk on IDE primary controller is named <filename>/dev/hda</"
-"filename>."
-msgstr "主 IDE 控制器下的主磁盘被命名为 <filename>/dev/hda</filename>。"
-
-#. Tag: para
-#: partitioning.xml:359
-#, no-c-format
-msgid ""
-"The slave disk on IDE primary controller is named <filename>/dev/hdb</"
-"filename>."
-msgstr "主 IDE 控制器的从盘命名为 <filename>/dev/hdb</filename>。"
-
-#. Tag: para
-#: partitioning.xml:365
-#, no-c-format
-msgid ""
-"The master and slave disks of the secondary controller can be called "
-"<filename>/dev/hdc</filename> and <filename>/dev/hdd</filename>, "
-"respectively. Newer IDE controllers can actually have two channels, "
-"effectively acting like two controllers."
-msgstr ""
-"第二个控制器的主磁盘和从磁盘会分别被叫做 <filename>/dev/hdc</filename> 和 "
-"<filename>/dev/hdd</filename>,较新的 IDE 控制器实际上有两个通道,扮演着两个"
-"控制器的角色。"
-
-#. Tag: para
-#: partitioning.xml:376
+#: partitioning.xml:355
#, no-c-format
msgid "The first DASD device is named <filename>/dev/dasda</filename>."
msgstr "第一个 DASD 设备被命名为 <filename>/dev/dasda</filename>。"
#. Tag: para
-#: partitioning.xml:382
+#: partitioning.xml:361
#, no-c-format
msgid ""
"The second DASD device is named <filename>/dev/dasdb</filename>, and so on."
msgstr "第二个 DASD 设备被命名为 <filename>/dev/dasdb</filename>,等等。"
#. Tag: para
-#: partitioning.xml:390
+#: partitioning.xml:369
#, no-c-format
msgid ""
"The partitions on each disk are represented by appending a decimal number to "
@@ -707,7 +682,7 @@ msgstr ""
"一个和第二个分区。"
#. Tag: para
-#: partitioning.xml:397
+#: partitioning.xml:376
#, no-c-format
msgid ""
"Here is a real-life example. Let's assume you have a system with 2 SCSI "
@@ -726,7 +701,7 @@ msgstr ""
"filename> 及其分区。"
#. Tag: para
-#: partitioning.xml:408
+#: partitioning.xml:387
#, no-c-format
msgid ""
"Note that if you have two SCSI host bus adapters (i.e., controllers), the "
@@ -738,16 +713,23 @@ msgstr ""
"的解决方案是观察引导信息,如果您知道驱动器型号和/或者容量。"
#. Tag: para
-#: partitioning.xml:415
-#, no-c-format
+#: partitioning.xml:394
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Linux represents the primary partitions as the drive name, plus the "
+#| "numbers 1 through 4. For example, the first primary partition on the "
+#| "first IDE drive is <filename>/dev/hda1</filename>. The logical partitions "
+#| "are numbered starting at 5, so the first logical partition on that same "
+#| "drive is <filename>/dev/hda5</filename>. Remember that the extended "
+#| "partition, that is, the primary partition holding the logical partitions, "
+#| "is not usable by itself. This applies to SCSI disks as well as IDE disks."
msgid ""
"Linux represents the primary partitions as the drive name, plus the numbers "
-"1 through 4. For example, the first primary partition on the first IDE drive "
-"is <filename>/dev/hda1</filename>. The logical partitions are numbered "
-"starting at 5, so the first logical partition on that same drive is "
-"<filename>/dev/hda5</filename>. Remember that the extended partition, that "
-"is, the primary partition holding the logical partitions, is not usable by "
-"itself. This applies to SCSI disks as well as IDE disks."
+"1 through 4. For example, the first primary partition on the first drive is "
+"<filename>/dev/sda1</filename>. The logical partitions are numbered starting "
+"at 5, so the first logical partition on that same drive is <filename>/dev/"
+"sda5</filename>. Remember that the extended partition, that is, the primary "
+"partition holding the logical partitions, is not usable by itself."
msgstr ""
"Linux 表示主分区为驱动器名称加上数字 1 到 4。例如,在第一个 IDE 驱动器上的第"
"一个主分区是 <filename>/dev/hda1</filename>。逻辑驱动器将会从数字 5 开始,因"
@@ -756,7 +738,7 @@ msgstr ""
"适用。"
#. Tag: para
-#: partitioning.xml:426
+#: partitioning.xml:404
#, no-c-format
msgid ""
"Sun disk partitions allow for 8 separate partitions (or slices). The third "
@@ -769,7 +751,7 @@ msgstr ""
"器(SILO 或者 SUN 的)使用。"
#. Tag: para
-#: partitioning.xml:433
+#: partitioning.xml:411
#, no-c-format
msgid ""
"The partitions on each disk are represented by appending a decimal number to "
@@ -782,13 +764,13 @@ msgstr ""
"个 DASD 设备的第一个以及第二个分区。"
#. Tag: title
-#: partitioning.xml:448
+#: partitioning.xml:426
#, no-c-format
msgid "&debian; Partitioning Programs"
msgstr "&debian; 分区程序"
#. Tag: para
-#: partitioning.xml:449
+#: partitioning.xml:427
#, no-c-format
msgid ""
"Several varieties of partitioning programs have been adapted by &debian; "
@@ -800,7 +782,7 @@ msgstr ""
"合您的体系的程序列表。"
#. Tag: para
-#: partitioning.xml:462
+#: partitioning.xml:440
#, no-c-format
msgid ""
"Recommended partitioning tool in &debian;. This Swiss army knife can also "
@@ -813,13 +795,13 @@ msgstr ""
"区至挂接点。"
#. Tag: para
-#: partitioning.xml:474
+#: partitioning.xml:452
#, no-c-format
msgid "The original Linux disk partitioner, good for gurus."
msgstr "最早的 Linux 磁盘分区工具,对于老手很好用。"
#. Tag: para
-#: partitioning.xml:478
+#: partitioning.xml:456
#, no-c-format
msgid ""
"Be careful if you have existing FreeBSD partitions on your machine. The "
@@ -833,13 +815,13 @@ msgstr ""
"参阅 <ulink url=\"&url-linux-freebsd;\">Linux+FreeBSD HOWTO</ulink>。"
#. Tag: para
-#: partitioning.xml:491
+#: partitioning.xml:469
#, no-c-format
msgid "A simple-to-use, full-screen disk partitioner for the rest of us."
msgstr "一个简单易用、全屏幕的磁盘分区程序。供其他人员使用。"
#. Tag: para
-#: partitioning.xml:495
+#: partitioning.xml:473
#, no-c-format
msgid ""
"Note that <command>cfdisk</command> doesn't understand FreeBSD partitions at "
@@ -849,25 +831,25 @@ msgstr ""
"设备名称与结果可能不同。"
#. Tag: para
-#: partitioning.xml:505
+#: partitioning.xml:483
#, no-c-format
msgid "Atari-aware version of <command>fdisk</command>."
msgstr "Atari 版本的 <command>fdisk</command>。"
#. Tag: para
-#: partitioning.xml:514
+#: partitioning.xml:492
#, no-c-format
msgid "Amiga-aware version of <command>fdisk</command>."
msgstr "Amiga-aware 版本的 <command>fdisk</command>。"
#. Tag: para
-#: partitioning.xml:523
+#: partitioning.xml:501
#, no-c-format
msgid "Mac-aware version of <command>fdisk</command>."
msgstr "Mac-aware 版本的 <command>fdisk</command>。"
#. Tag: para
-#: partitioning.xml:532
+#: partitioning.xml:510
#, no-c-format
msgid ""
"PowerMac-aware version of <command>fdisk</command>, also used by BVM and "
@@ -877,7 +859,7 @@ msgstr ""
"VMEbus 系统。"
#. Tag: para
-#: partitioning.xml:542
+#: partitioning.xml:520
#, no-c-format
msgid ""
"&arch-title; version of <command>fdisk</command>; Please read the fdasd "
@@ -892,7 +874,7 @@ msgstr ""
"\"Installation Commands</ulink> 的第 13 章获得详细信息。"
#. Tag: para
-#: partitioning.xml:553
+#: partitioning.xml:531
#, no-c-format
msgid ""
"One of these programs will be run by default when you select "
@@ -905,13 +887,13 @@ msgstr ""
"式。"
#. Tag: para
-#: partitioning.xml:560
+#: partitioning.xml:538
#, no-c-format
msgid "Remember to mark your boot partition as <quote>Bootable</quote>."
msgstr "要记得标记您的引导分区为 <quote>Bootable</quote>。"
#. Tag: para
-#: partitioning.xml:563
+#: partitioning.xml:541
#, no-c-format
msgid ""
"One key point when partitioning for Mac type disks is that the swap "
@@ -928,14 +910,14 @@ msgstr ""
# index.docbook:612, index.docbook:672, index.docbook:696, index.docbook:793, index.docbook:912, index.docbook:989
#. Tag: title
-#: partitioning.xml:579 partitioning.xml:603 partitioning.xml:699
-#: partitioning.xml:813 partitioning.xml:890
+#: partitioning.xml:557 partitioning.xml:581 partitioning.xml:677
+#: partitioning.xml:791 partitioning.xml:868
#, no-c-format
msgid "Partitioning for &arch-title;"
msgstr "为 &arch-title; 准备分区"
#. Tag: para
-#: partitioning.xml:580
+#: partitioning.xml:558
#, no-c-format
msgid ""
"PALO, the HPPA boot loader, requires a partition of type <quote>F0</quote> "
@@ -961,7 +943,7 @@ msgstr ""
"25&ndash;50 MB 一般来说应该足够了。"
#. Tag: para
-#: partitioning.xml:604
+#: partitioning.xml:582
#, no-c-format
msgid ""
"If you have an existing other operating system such as DOS or Windows and "
@@ -978,7 +960,7 @@ msgstr ""
"<guimenuitem>Manual</guimenuitem> 选项,然后只需选择已有的分区,更改其尺寸。"
#. Tag: para
-#: partitioning.xml:614
+#: partitioning.xml:592
#, no-c-format
msgid ""
"The PC BIOS generally adds additional constraints for disk partitioning. "
@@ -996,7 +978,7 @@ msgstr ""
"的介绍,帮助您在大多数情况下进行规划。"
#. Tag: para
-#: partitioning.xml:624
+#: partitioning.xml:602
#, no-c-format
msgid ""
"<quote>Primary</quote> partitions are the original partitioning scheme for "
@@ -1014,7 +996,7 @@ msgstr ""
"一个扩展分区。"
#. Tag: para
-#: partitioning.xml:635
+#: partitioning.xml:613
#, no-c-format
msgid ""
"Linux limits the partitions per drive to 255 partitions for SCSI disks (3 "
@@ -1030,7 +1012,7 @@ msgstr ""
"过 20 个的分区,除非您首先为这些分区手工创建了设备文件。"
#. Tag: para
-#: partitioning.xml:645
+#: partitioning.xml:623
#, no-c-format
msgid ""
"If you have a large IDE disk, and are using neither LBA addressing, nor "
@@ -1044,7 +1026,7 @@ msgstr ""
"盘第一个 1024 柱面内(在没有 BIOS 转换的情况下,大约有 524MB)。"
#. Tag: para
-#: partitioning.xml:653
+#: partitioning.xml:631
#, no-c-format
msgid ""
"This restriction doesn't apply if you have a BIOS newer than around "
@@ -1068,7 +1050,7 @@ msgstr ""
"&arch-kernel; 并不使用 BIOS 来进行磁盘寻址。"
#. Tag: para
-#: partitioning.xml:667
+#: partitioning.xml:645
#, no-c-format
msgid ""
"If you have a large disk, you might have to use cylinder translation "
@@ -1088,7 +1070,7 @@ msgstr ""
"</emphasis>的 1024 柱面内。"
#. Tag: para
-#: partitioning.xml:679
+#: partitioning.xml:657
#, no-c-format
msgid ""
"The recommended way of accomplishing this is to create a small "
@@ -1108,7 +1090,7 @@ msgstr ""
"起作用,甚至也不管您的 BIOS 是否支持大硬盘访问扩展。"
#. Tag: para
-#: partitioning.xml:700
+#: partitioning.xml:678
#, no-c-format
msgid ""
"The <command>partman</command> disk partitioner is the default partitioning "
@@ -1122,13 +1104,13 @@ msgstr ""
"<command>parted</command> 来进行磁盘分区的。"
#. Tag: title
-#: partitioning.xml:712
+#: partitioning.xml:690
#, no-c-format
msgid "EFI Recognized Formats"
msgstr "EFI 能够识别的格式"
#. Tag: para
-#: partitioning.xml:713
+#: partitioning.xml:691
#, no-c-format
msgid ""
"The IA-64 EFI firmware supports two partition table (or disk label) formats, "
@@ -1145,7 +1127,7 @@ msgstr ""
"DOS 分区表。"
#. Tag: para
-#: partitioning.xml:725
+#: partitioning.xml:703
#, no-c-format
msgid ""
"The automatic partitioning recipes for <command>partman</command> allocate "
@@ -1159,7 +1141,7 @@ msgstr ""
"配置分区。其方法类似设置一个 <emphasis>交换</emphasis> 分区。"
#. Tag: para
-#: partitioning.xml:733
+#: partitioning.xml:711
#, no-c-format
msgid ""
"The <command>partman</command> partitioner will handle most disk layouts. "
@@ -1204,13 +1186,13 @@ msgstr ""
"它可能要扫描坏区。"
#. Tag: title
-#: partitioning.xml:758
+#: partitioning.xml:736
#, no-c-format
msgid "Boot Loader Partition Requirements"
msgstr "启动引导器分区要求"
#. Tag: para
-#: partitioning.xml:759
+#: partitioning.xml:737
#, no-c-format
msgid ""
"ELILO, the IA-64 boot loader, requires a partition containing a FAT file "
@@ -1225,7 +1207,7 @@ msgstr ""
"个内核的话,128MB 也许更好。"
#. Tag: para
-#: partitioning.xml:768
+#: partitioning.xml:746
#, no-c-format
msgid ""
"The EFI Boot Manager and the EFI Shell fully support the GPT table so the "
@@ -1247,7 +1229,7 @@ msgstr ""
"入一个 EFI 分区。"
#. Tag: para
-#: partitioning.xml:783
+#: partitioning.xml:761
#, no-c-format
msgid ""
"It is strongly recommended that you allocate the EFI boot partition on the "
@@ -1257,13 +1239,13 @@ msgstr ""
"盘上。"
#. Tag: title
-#: partitioning.xml:791
+#: partitioning.xml:769
#, no-c-format
msgid "EFI Diagnostic Partitions"
msgstr "EFI 诊断分区"
#. Tag: para
-#: partitioning.xml:792
+#: partitioning.xml:770
#, no-c-format
msgid ""
"The EFI firmware is significantly more sophisticated than the usual BIOS "
@@ -1282,7 +1264,7 @@ msgstr ""
"区的时候。"
#. Tag: para
-#: partitioning.xml:814
+#: partitioning.xml:792
#, no-c-format
msgid ""
"SGI machines require an SGI disk label in order to make the system bootable "
@@ -1298,13 +1280,13 @@ msgstr ""
"入。注意 volume header 必须从 0 号扇区开始。"
#. Tag: title
-#: partitioning.xml:831
+#: partitioning.xml:809
#, no-c-format
msgid "Partitioning Newer PowerMacs"
msgstr "为较新的 PowerMacs 分区"
#. Tag: para
-#: partitioning.xml:832
+#: partitioning.xml:810
#, no-c-format
msgid ""
"If you are installing onto a NewWorld PowerMac you must create a special "
@@ -1326,7 +1308,7 @@ msgstr ""
"command> 里面使用 <userinput>b</userinput> 命令。"
#. Tag: para
-#: partitioning.xml:845
+#: partitioning.xml:823
#, no-c-format
msgid ""
"The special partition type Apple_Bootstrap is required to prevent MacOS from "
@@ -1337,7 +1319,7 @@ msgstr ""
"为里面 含有一些特殊修改的模式来让 OpenFirmware 能够自动启动它。"
#. Tag: para
-#: partitioning.xml:852
+#: partitioning.xml:830
#, no-c-format
msgid ""
"Note that the bootstrap partition is only meant to hold 3 very small files: "
@@ -1354,7 +1336,7 @@ msgstr ""
"command> 工具可以用来维护这个分区。"
#. Tag: para
-#: partitioning.xml:862
+#: partitioning.xml:840
#, no-c-format
msgid ""
"In order for OpenFirmware to automatically boot &debian-gnu; the bootstrap "
@@ -1374,7 +1356,7 @@ msgstr ""
"顺序。"
#. Tag: para
-#: partitioning.xml:874
+#: partitioning.xml:852
#, no-c-format
msgid ""
"Apple disks normally have several small driver partitions. If you intend to "
@@ -1388,7 +1370,7 @@ msgstr ""
"启动的时候,会初始化没有任何激活的 MacOS 分区以及驱动分区的磁盘。"
#. Tag: para
-#: partitioning.xml:891
+#: partitioning.xml:869
#, no-c-format
msgid ""
"Make sure you create a <quote>Sun disk label</quote> on your boot disk. This "
@@ -1401,7 +1383,7 @@ msgstr ""
"<keycap>s</keycap> 中用 <command>fdisk</command> 键来创建 Sun 磁盘标记。"
#. Tag: para
-#: partitioning.xml:899
+#: partitioning.xml:877
#, no-c-format
msgid ""
"Furthermore, on &arch-title; disks, make sure your first partition on your "
@@ -1420,7 +1402,7 @@ msgstr ""
"或者 UFS 分区在那里;它们将隔离分区表和引导块。"
#. Tag: para
-#: partitioning.xml:910
+#: partitioning.xml:888
#, no-c-format
msgid ""
"It is also advised that the third partition should be of type <quote>Whole "
@@ -1432,6 +1414,40 @@ msgstr ""
"(从第一个柱面至最后一个),这是 Sun 磁盘格式的惯例,并且确保 <command>SILO</"
"command> 启动引导器工作良好。"
+#~ msgid ""
+#~ "The first SCSI disk (SCSI ID address-wise) is named <filename>/dev/sda</"
+#~ "filename>."
+#~ msgstr ""
+#~ "第一个 SCSI 驱动器(SCSI ID address-wise)被命名为 <filename>/dev/sda</"
+#~ "filename>。"
+
+#~ msgid ""
+#~ "The second SCSI disk (address-wise) is named <filename>/dev/sdb</"
+#~ "filename>, and so on."
+#~ msgstr ""
+#~ "第二个 SCSI 驱动器(address-wise)被命名为 <filename>/dev/sdb</filename>,等"
+#~ "等。"
+
+#~ msgid ""
+#~ "The master disk on IDE primary controller is named <filename>/dev/hda</"
+#~ "filename>."
+#~ msgstr "主 IDE 控制器下的主磁盘被命名为 <filename>/dev/hda</filename>。"
+
+#~ msgid ""
+#~ "The slave disk on IDE primary controller is named <filename>/dev/hdb</"
+#~ "filename>."
+#~ msgstr "主 IDE 控制器的从盘命名为 <filename>/dev/hdb</filename>。"
+
+#~ msgid ""
+#~ "The master and slave disks of the secondary controller can be called "
+#~ "<filename>/dev/hdc</filename> and <filename>/dev/hdd</filename>, "
+#~ "respectively. Newer IDE controllers can actually have two channels, "
+#~ "effectively acting like two controllers."
+#~ msgstr ""
+#~ "第二个控制器的主磁盘和从磁盘会分别被叫做 <filename>/dev/hdc</filename> 和 "
+#~ "<filename>/dev/hdd</filename>,较新的 IDE 控制器实际上有两个通道,扮演着两"
+#~ "个控制器的角色。"
+
#~ msgid "Virtual directory for system information (2.4 and 2.6 kernels)"
#~ msgstr "系统信息的虚拟目录(2.4 和 2.6 内核)"
diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po
index 8a265c140..e1e20080b 100644
--- a/po/zh_CN/post-install.po
+++ b/po/zh_CN/post-install.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-06-16 09:12+0000\n"
+"POT-Creation-Date: 2015-04-15 20:29+0000\n"
"PO-Revision-Date: 2012-07-25 22:38+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -191,7 +191,11 @@ msgid ""
"important and expect to have. Information on these additional repositories "
"can be found on the &debian; Wiki page titled <ulink url=\"&url-debian-wiki-"
"software;\">The Software Available for &debian;'s Stable Release</ulink>."
-msgstr "有一些官方或非官方的软件库,在默认的 &debian; 安装下并未打开。它们之中含有一些重要的必备软件。关于这些软件库的信息放在 &debian; Wiki 页面 <ulink url=\"&url-debian-wiki-software;\">The Software Available for &debian;'s Stable Release</ulink>。"
+msgstr ""
+"有一些官方或非官方的软件库,在默认的 &debian; 安装下并未打开。它们之中含有一"
+"些重要的必备软件。关于这些软件库的信息放在 &debian; Wiki 页面 <ulink url="
+"\"&url-debian-wiki-software;\">The Software Available for &debian;'s Stable "
+"Release</ulink>。"
#. Tag: title
#: post-install.xml:154
@@ -1014,17 +1018,27 @@ msgstr ""
#. Tag: para
#: post-install.xml:700
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "To access rescue mode, type <userinput>rescue</userinput> at the "
+#| "<prompt>boot:</prompt> prompt, or boot with the <userinput>rescue/"
+#| "enable=true</userinput> boot parameter. You'll be shown the first few "
+#| "screens of the installer, with a note in the corner of the display to "
+#| "indicate that this is rescue mode, not a full installation. Don't worry, "
+#| "your system is not about to be overwritten! Rescue mode simply takes "
+#| "advantage of the hardware detection facilities available in the installer "
+#| "to ensure that your disks, network devices, and so on are available to "
+#| "you while repairing your system."
msgid ""
-"To access rescue mode, type <userinput>rescue</userinput> at the "
-"<prompt>boot:</prompt> prompt, or boot with the <userinput>rescue/"
-"enable=true</userinput> boot parameter. You'll be shown the first few "
-"screens of the installer, with a note in the corner of the display to "
-"indicate that this is rescue mode, not a full installation. Don't worry, "
-"your system is not about to be overwritten! Rescue mode simply takes "
-"advantage of the hardware detection facilities available in the installer to "
-"ensure that your disks, network devices, and so on are available to you "
-"while repairing your system."
+"To access rescue mode, select <userinput>rescue</userinput> from the boot "
+"menu, type <userinput>rescue</userinput> at the <prompt>boot:</prompt> "
+"prompt, or boot with the <userinput>rescue/enable=true</userinput> boot "
+"parameter. You'll be shown the first few screens of the installer, with a "
+"note in the corner of the display to indicate that this is rescue mode, not "
+"a full installation. Don't worry, your system is not about to be "
+"overwritten! Rescue mode simply takes advantage of the hardware detection "
+"facilities available in the installer to ensure that your disks, network "
+"devices, and so on are available to you while repairing your system."
msgstr ""
"要进入 rescue 模式,请在 <prompt>boot:</prompt> 提示符后键入 "
"<userinput>rescue</userinput>,或者启动时给给引导参数加上 <userinput>rescue/"
@@ -1034,7 +1048,7 @@ msgstr ""
"用。"
#. Tag: para
-#: post-install.xml:715
+#: post-install.xml:717
#, no-c-format
msgid ""
"Instead of the partitioning tool, you should now be presented with a list of "
@@ -1048,7 +1062,7 @@ msgstr ""
"创建一样。"
#. Tag: para
-#: post-install.xml:723
+#: post-install.xml:725
#, no-c-format
msgid ""
"If possible, the installer will now present you with a shell prompt in the "
@@ -1064,7 +1078,7 @@ msgstr ""
"userinput> 完成。</phrase>"
#. Tag: para
-#: post-install.xml:735
+#: post-install.xml:737
#, no-c-format
msgid ""
"If the installer cannot run a usable shell in the root file system you "
@@ -1080,13 +1094,13 @@ msgstr ""
"统将挂载到 <filename>/target</filename> 目录。"
#. Tag: para
-#: post-install.xml:744
+#: post-install.xml:746
#, no-c-format
msgid "In either case, after you exit the shell, the system will reboot."
msgstr "无论哪种情况,退出 shell 之后,系统将重启。"
#. Tag: para
-#: post-install.xml:748
+#: post-install.xml:750
#, no-c-format
msgid ""
"Finally, note that repairing broken systems can be difficult, and this "
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 6f58b5bfa..ae9d46a68 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.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: 2014-08-05 21:38+0000\n"
+"POT-Creation-Date: 2015-04-15 20:29+0000\n"
"PO-Revision-Date: 2012-11-26 13:45+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1617,7 +1617,7 @@ msgstr ""
# index.docbook:1522, index.docbook:1865
#. Tag: title
-#: preparing.xml:1138 preparing.xml:1290
+#: preparing.xml:1138 preparing.xml:1479
#, no-c-format
msgid "Boot Device Selection"
msgstr "选择引导设备"
@@ -1649,10 +1649,21 @@ msgstr ""
#. Tag: para
#: preparing.xml:1154
-#, no-c-format
-msgid ""
-"Most BIOS versions allow to call up a boot menu on system startup in which "
-"you select from which device the computer should start for the current "
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Most BIOS versions allow to call up a boot menu on system startup in "
+#| "which you select from which device the computer should start for the "
+#| "current session. If this option is available, the BIOS usually displays a "
+#| "short message like <quote>press <keycap>F12</keycap> for boot menu</"
+#| "quote> on system startup. The actual key used to select this menu varies "
+#| "from system to system; commonly used keys are <keycap>F12</keycap>, "
+#| "<keycap>F11</keycap> and <keycap>F8</keycap>. Choosing a device from this "
+#| "menu does not change the default boot order of the BIOS, i.e. you can "
+#| "start once from a USB stick while having configured the internal harddisk "
+#| "as the normal primary boot device."
+msgid ""
+"Most BIOS versions allow you to call up a boot menu on system startup in "
+"which you select from which device the computer should start for the current "
"session. If this option is available, the BIOS usually displays a short "
"message like <quote>press <keycap>F12</keycap> for boot menu</quote> on "
"system startup. The actual key used to select this menu varies from system "
@@ -1671,10 +1682,14 @@ msgstr ""
#. Tag: para
#: preparing.xml:1168
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If your BIOS does not provide you with a boot menu to do ad-hoc choices "
+#| "of the current boot device, you have to change your BIOS setup to make "
+#| "the device from which the &d-i; shall be booted the primary boot device."
msgid ""
"If your BIOS does not provide you with a boot menu to do ad-hoc choices of "
-"the current boot device, you have to change your BIOS setup to make the "
+"the current boot device, you will have to change your BIOS setup to make the "
"device from which the &d-i; shall be booted the primary boot device."
msgstr ""
"如果您的 BIOS 不提供引导菜单选择当前的启动设备,您只好从 BIOS 设置中将 &d-i; "
@@ -1795,13 +1810,308 @@ msgstr ""
"<guibutton>Save</guibutton> 按钮使固件补丁安装到 nvram。"
#. Tag: title
-#: preparing.xml:1257
+#: preparing.xml:1253
+#, no-c-format
+msgid "How to update bare metal ppc64el firmware"
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1254
+#, no-c-format
+msgid ""
+"This is an excerpt from <ulink url=\"&url-ibm-powerkvm;\">IBM PowerKVM on "
+"IBM POWER8</ulink>"
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1259
+#, no-c-format
+msgid ""
+"Open Power Abstraction Layer (OPAL) is the system firmware in the stack of "
+"POWER processor-based server."
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1264
+#, no-c-format
+msgid ""
+"There may be instances when the user might have to upgrade the Power Systems "
+"firmware to a more recent level to acquire new features or additional "
+"support for devices."
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1270
+#, no-c-format
+msgid "Make sure that the following requirements are met:"
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1275
+#, fuzzy, no-c-format
+#| msgid "Their order on the system."
+msgid "an OS to be running on the system;"
+msgstr "它们在系统上的次序。"
+
+#. Tag: para
+#: preparing.xml:1277
+#, no-c-format
+msgid "the .img file of the OPAL level that the user needs to update to;"
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1279
+#, no-c-format
+msgid "the machine isn't under HMC control."
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1283
+#, no-c-format
+msgid ""
+"Power Systems has two sides of flash to boot firmware from, namely permanent "
+"and temporary. This provides a way to test firmware updates on the temporary "
+"side of the flash before committing the tested changes to the permanent "
+"side, thereby committing the new updates."
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1290
+#, no-c-format
+msgid "Perform the following steps for the update:"
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1295
+#, no-c-format
+msgid ""
+"Save the level of the existing firmware before really updating. In ASM, in "
+"the system menu, click <command>Service Aids ??? Service Processor Command "
+"Line</command>, and run the following command:"
+msgstr ""
+
+#. Tag: screen
+#: preparing.xml:1299
+#, no-c-format
+msgid "cupdcmd -f"
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1300
+#, no-c-format
+msgid ""
+"Download the .img file of the level of firmware to be updated to a location "
+"in the host filesystem. Refer to IBM Fix Central for downloading the image "
+"file."
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1304
+#, no-c-format
+msgid ""
+"Verify the image downloaded by running the following command and save the "
+"output."
+msgstr ""
+
+#. Tag: screen
+#: preparing.xml:1307
+#, no-c-format
+msgid "$update_flash -v -f &lt;file_name.img&gt;"
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1309
+#, no-c-format
+msgid "Update the firmware by running the following command."
+msgstr ""
+
+#. Tag: screen
+#: preparing.xml:1311
+#, no-c-format
+msgid "$update_flash -f &lt;file_name.img&gt;"
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1317
+#, no-c-format
+msgid ""
+"The command reboots the system and therefore, sessions if any, would be lost."
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1320
+#, no-c-format
+msgid "Do not reboot or switch off the system until it is back."
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1327
+#, no-c-format
+msgid ""
+"Verify the updated firmware level of the temporary side of the flash as in "
+"step 1."
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1330
+#, no-c-format
+msgid ""
+"In case the update has to be reverted, the user can do so by running this "
+"command: <informalexample><screen>\n"
+" $update_flash -r\n"
+"</screen></informalexample> Rejection would reject only the temporary side "
+"of the flash. Therefore, the new level should be committed to the permanent "
+"side only after thorough testing of the new firmware."
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1337
+#, no-c-format
+msgid ""
+"The new updated level can be committed to the permanent side of the flash by "
+"running the following command."
+msgstr ""
+
+#. Tag: screen
+#: preparing.xml:1340
+#, no-c-format
+msgid "$update_flash -c"
+msgstr ""
+
+#. Tag: title
+#: preparing.xml:1348
+#, no-c-format
+msgid "Updating KVM guest firmware (SLOF)"
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1349
+#, no-c-format
+msgid ""
+"Slimline Open Firmware (SLOF) is an implementation of the IEEE 1275 "
+"standard. It can be used as partition firmware for pSeries machines running "
+"on QEMU or KVM."
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1356
+#, no-c-format
+msgid ""
+"The package qemu-slof is, in fact, a dependency of package qemu-system-ppc "
+"(which also provides the virtual package qemu-system-ppc64), and can be "
+"installed or updated via <command>apt-get</command> tool on Debian-based "
+"distros. Like so: <informalexample><screen>\n"
+"# apt-get install qemu-slof\n"
+"</screen></informalexample> SLOF can also be installed into rpm-based "
+"distribution systems, given the proper repository or rpm package. "
+"Additionally, the upstream source code is available at http://github.com/"
+"leilihh/SLOF."
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1370
+#, no-c-format
+msgid ""
+"Thus, one can use a different SLOF file rather than the default, when "
+"running <command>qemu-system</command>, by adding the command line argument "
+"<userinput>-bios &lt;slof_file&gt; </userinput> when starting qemu."
+msgstr ""
+
+#. Tag: title
+#: preparing.xml:1380
+#, no-c-format
+msgid "Updating PowerKVM hypervisor"
+msgstr ""
+
+#. Tag: title
+#: preparing.xml:1381
+#, no-c-format
+msgid "Instructions for Netboot installation"
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1382
+#, no-c-format
+msgid ""
+"You will need a DHCP/TFTP (BOOTP) server, as well as a web server. After "
+"downloading ibm-powerkvm-*-ppc64-service-*.iso, mount loop it and unpack it "
+"into some directory within your HTTP server www root structure (say "
+"wwwroot): <informalexample><screen>\n"
+"# cd &lt;directory-where-the-iso-is&gt;\n"
+"# mkdir ./iso\n"
+"# sudo mount -o loop ibm-powerkvm-*-ppc64-service-*.iso ./iso\n"
+"# cp -a ./iso/* &lt;path-to-wwwroot&gt;\n"
+"</screen></informalexample> Create the petitboot.conf file in a directory "
+"under your tftproot, say /tftproot/powerkvm, with the following contents: "
+"<informalexample><screen>\n"
+"label PowerKVM Automated Install\n"
+"kernel http://YOUR-SERVER-IP/SOME-PATH-TO-wwwroot/ppc/ppc64/vmlinuz\n"
+"initrd http://YOUR-SERVER-IP/SOME-PATH-TO-wwwroot/ppc/ppc64/initrd.img\n"
+"append root=live:http://YOUR-SERVER-IP/SOME-PATH-TO-wwwroot/LiveOS/squashfs."
+"img repo=http://YOUR-SERVER-IP/SOME-PATH-TO-wwwroot/packages rd.dm=0 rd.md=0 "
+"console=hvc0 console=tty0\n"
+"</screen></informalexample> Editing your dhcpd.conf, set this directive at "
+"the beginning: <informalexample><screen>\n"
+"option conf-file code 209 = text;\n"
+"</screen></informalexample> Add the system directive: "
+"<informalexample><screen>\n"
+"host &lt;your-system&gt; {\n"
+" hardware ethernet &lt;system macaddr&gt;\n"
+" fixed-address &lt;system ip&gt;;\n"
+" option host-name \"&lt;system hostname&gt;\";\n"
+" option conf-file \"&lt;powerkvm/petitboot.conf&gt;\";\n"
+" }\n"
+"</screen></informalexample> Reboot the dhcp server."
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1406
+#, no-c-format
+msgid "Boot your PowerLinux machine."
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1410
+#, no-c-format
+msgid ""
+"There should be the following option at petitboot (select it): "
+"<informalexample><screen>\n"
+"\"Power KVM Automated Install\" \n"
+"</screen></informalexample> The installer menu should appear automatically."
+msgstr ""
+
+#. Tag: title
+#: preparing.xml:1421
+#, no-c-format
+msgid "Instructions for DVD"
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1422
+#, no-c-format
+msgid ""
+"Boot the ISO ibm-powerkvm-*-ppc64-service-*.iso (either burn a DVD or make "
+"it virtual if using QEMU) and simply wait for the boot."
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1425
+#, no-c-format
+msgid ""
+"There should be the following option at petitboot (select it): "
+"<informalexample><screen>\n"
+"\"POWERKVM_LIVECD\" \n"
+"</screen></informalexample> The installer menu should appear automatically."
+msgstr ""
+
+#. Tag: title
+#: preparing.xml:1446
#, no-c-format
msgid "Invoking OpenBoot"
msgstr "使用 OpenBoot"
#. Tag: para
-#: preparing.xml:1259
+#: preparing.xml:1448
#, no-c-format
msgid ""
"OpenBoot provides the basic functions needed to boot the &arch-title; "
@@ -1815,7 +2125,7 @@ msgstr ""
"机做很多事情,如诊断和简单脚本。"
#. Tag: para
-#: preparing.xml:1267
+#: preparing.xml:1456
#, no-c-format
msgid ""
"To get to the boot prompt you need to hold down the <keycap>Stop</keycap> "
@@ -1834,7 +2144,7 @@ msgstr ""
"<keycap>n</keycap> 键得到新风格的提示符。"
#. Tag: para
-#: preparing.xml:1279
+#: preparing.xml:1468
#, no-c-format
msgid ""
"If you are using a serial console, send a break to the machine. With "
@@ -1848,7 +2158,7 @@ msgstr ""
"档。"
#. Tag: para
-#: preparing.xml:1292
+#: preparing.xml:1481
#, no-c-format
msgid ""
"You can use OpenBoot to boot from specific devices, and also to change your "
@@ -1866,7 +2176,7 @@ msgstr ""
"Reference</ulink>。"
#. Tag: para
-#: preparing.xml:1302
+#: preparing.xml:1491
#, no-c-format
msgid ""
"Typically, with newer revisions, you can use OpenBoot devices such as "
@@ -1905,7 +2215,7 @@ msgstr ""
"<ulink url=\"&url-openboot;\">Sun OpenBoot Reference</ulink>。"
#. Tag: para
-#: preparing.xml:1325
+#: preparing.xml:1514
#, no-c-format
msgid ""
"To boot from a specific device, use the command <userinput>boot "
@@ -1934,19 +2244,19 @@ msgstr ""
"</screen></informalexample> 或在 Solaris下执行:"
#. Tag: screen
-#: preparing.xml:1344
+#: preparing.xml:1533
#, no-c-format
msgid "eeprom boot-device=disk1:1"
msgstr "eeprom boot-device=disk1:1"
#. Tag: title
-#: preparing.xml:1354
+#: preparing.xml:1543
#, no-c-format
msgid "BIOS Setup"
msgstr "BIOS 设置"
#. Tag: para
-#: preparing.xml:1355
+#: preparing.xml:1544
#, no-c-format
msgid ""
"In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -1966,7 +2276,7 @@ msgstr ""
"通过远程方式使用。这归因于该系统上的 3215/3270 控制台是线型,而不是字符型的。"
#. Tag: para
-#: preparing.xml:1367
+#: preparing.xml:1556
#, fuzzy, no-c-format
#| msgid ""
#| "Linux on this platform runs either natively on the bare machine, in a so-"
@@ -1991,7 +2301,7 @@ msgstr ""
"上的 HMC 启动。"
#. Tag: para
-#: preparing.xml:1376
+#: preparing.xml:1565
#, no-c-format
msgid ""
"Before you actually perform an installation, you have to go over some design "
@@ -2012,13 +2322,13 @@ msgstr ""
"回到本文档查看 &debian; 规格的安装步骤。"
#. Tag: title
-#: preparing.xml:1393
+#: preparing.xml:1582
#, no-c-format
msgid "Native and LPAR installations"
msgstr "本地化(Native)和 LPAR 安装"
#. Tag: para
-#: preparing.xml:1394
+#: preparing.xml:1583
#, no-c-format
msgid ""
"Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2034,13 +2344,13 @@ msgstr ""
"如何为 Linux 建立 LPAR 的部分。"
#. Tag: title
-#: preparing.xml:1408
+#: preparing.xml:1597
#, no-c-format
msgid "Installation as a VM guest"
msgstr "作为一个 VM guest 安装"
#. Tag: para
-#: preparing.xml:1410
+#: preparing.xml:1599
#, no-c-format
msgid ""
"Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -2056,7 +2366,7 @@ msgstr ""
"如何为运行 Linux 建立 VM guest 的部分。"
#. Tag: para
-#: preparing.xml:1420
+#: preparing.xml:1609
#, no-c-format
msgid ""
"You need to copy all the files from the <filename>generic</filename> sub-"
@@ -2076,13 +2386,13 @@ msgstr ""
"<filename>debian.exec</filename> 示例脚本,用于按正确次序存放文件。"
#. Tag: title
-#: preparing.xml:1437
+#: preparing.xml:1626
#, no-c-format
msgid "Setting up an installation server"
msgstr "建立安装服务器"
#. Tag: para
-#: preparing.xml:1439
+#: preparing.xml:1628
#, no-c-format
msgid ""
"If you don't have a connection to the Internet (either directly or via a web "
@@ -2095,7 +2405,7 @@ msgstr ""
"HTTP 或 FTP 访问。"
#. Tag: para
-#: preparing.xml:1447
+#: preparing.xml:1636
#, no-c-format
msgid ""
"The installation server needs to copy the exact directory structure from any "
@@ -2107,19 +2417,19 @@ msgstr ""
"些独立于体系的文件。您也可以复制所有的安装 CD 到这样的目录树中。"
#. Tag: emphasis
-#: preparing.xml:1456
+#: preparing.xml:1645
#, no-c-format
msgid "FIXME: more information needed &mdash; from a Redbook?"
msgstr "FIXME: more information needed &mdash; from a Redbook?"
#. Tag: title
-#: preparing.xml:1466
+#: preparing.xml:1655
#, no-c-format
msgid "ARM firmware"
msgstr ""
#. Tag: para
-#: preparing.xml:1468
+#: preparing.xml:1657
#, no-c-format
msgid ""
"As already mentioned before, there is unfortunately no standard for system "
@@ -2134,7 +2444,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: preparing.xml:1480
+#: preparing.xml:1669
#, no-c-format
msgid ""
"As a result even newly sold systems often use a firmware that is based on a "
@@ -2148,13 +2458,44 @@ msgid ""
msgstr ""
#. Tag: title
-#: preparing.xml:1493
+#: preparing.xml:1682
#, no-c-format
-msgid "Setting the ethernet MAC address in u-boot"
+msgid "Debian-provided U-Boot (system firmware) images"
msgstr ""
#. Tag: para
-#: preparing.xml:1494
+#: preparing.xml:1683
+#, no-c-format
+msgid ""
+"Debian provides U-Boot images for various armhf systems that can load their "
+"U-Boot from an SD card at &armmp-uboot-img;. The U-Boot builds are offered "
+"in two formats: raw U-Boot components and a ready-made card image that can "
+"easily be written onto an SD card. The raw U-Boot components are provided "
+"for advanced users; the generally recommended way is to use one of the ready-"
+"made SD card images. They are named &lt;system-type&gt;.sdcard.img.gz and "
+"can be written to a card e.g. with <informalexample><screen>zcat &lt;system-"
+"type&gt;.sdcard.img.gz > /dev/SD_CARD_DEVICE</screen></informalexample> As "
+"with all images, please be aware that writing the image to an SD card wipes "
+"all previous contents of the card!"
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1698
+#, no-c-format
+msgid ""
+"If Debian provides a U-Boot image for your system, it is recommended that "
+"you use this image instead of the vendor-provided U-Boot, as the version in "
+"Debian is usually newer and has more features."
+msgstr ""
+
+#. Tag: title
+#: preparing.xml:1706
+#, no-c-format
+msgid "Setting the ethernet MAC address in U-Boot"
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1707
#, no-c-format
msgid ""
"The MAC address of every ethernet interface should normally be globally "
@@ -2165,7 +2506,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: preparing.xml:1502
+#: preparing.xml:1715
#, no-c-format
msgid ""
"In the case of development boards, sometimes the manufacturer wants to avoid "
@@ -2180,7 +2521,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: preparing.xml:1513
+#: preparing.xml:1726
#, no-c-format
msgid ""
"To avoid conflicts with existing officially-assigned MAC addresses, there is "
@@ -2193,68 +2534,68 @@ msgid ""
msgstr ""
#. Tag: para
-#: preparing.xml:1523
+#: preparing.xml:1736
#, no-c-format
msgid ""
-"On systems using u-boot as system firmware, the ethernet MAC address is "
+"On systems using U-Boot as system firmware, the ethernet MAC address is "
"placed in the <quote>ethaddr</quote> environment variable. It can be checked "
-"at the u-boot command prompt with the command <quote>printenv ethaddr</"
+"at the U-Boot command prompt with the command <quote>printenv ethaddr</"
"quote> and can be set with the command <quote>setenv ethaddr ca:ff:"
"ee:12:34:56</quote>. After setting the value, the command <quote>saveenv</"
"quote> makes the assignment permanent."
msgstr ""
#. Tag: title
-#: preparing.xml:1534
+#: preparing.xml:1747
#, no-c-format
-msgid "Kernel/Initrd/Device-Tree relocation issues in u-boot"
+msgid "Kernel/Initrd/Device-Tree relocation issues in U-Boot"
msgstr ""
#. Tag: para
-#: preparing.xml:1535
+#: preparing.xml:1748
#, no-c-format
msgid ""
-"On some systems with older u-boot versions there can be problems with "
+"On some systems with older U-Boot versions there can be problems with "
"properly relocating the Linux kernel, the initial ramdisk and the device-"
-"tree blob in memory during the boot process. In this case, u-boot shows the "
+"tree blob in memory during the boot process. In this case, U-Boot shows the "
"message <quote>Starting kernel ...</quote>, but the system freezes "
"afterwards without further output. These issues have been solved with newer "
-"u-boot versions from v2014.07 onwards."
+"U-Boot versions from v2014.07 onwards."
msgstr ""
#. Tag: para
-#: preparing.xml:1544
+#: preparing.xml:1757
#, no-c-format
msgid ""
-"If the system has originally used a u-boot version older than v2014.07 and "
+"If the system has originally used a U-Boot version older than v2014.07 and "
"has been upgraded to a newer version later, the problem might still occur "
-"even after upgrading u-boot. Upgrading u-boot usually does not modify the "
-"existing u-boot environment variables and the fix requires an additional "
-"environment variable (bootm_size) to be set, which u-boot does automatically "
+"even after upgrading U-Boot. Upgrading U-Boot usually does not modify the "
+"existing U-Boot environment variables and the fix requires an additional "
+"environment variable (bootm_size) to be set, which U-Boot does automatically "
"only on fresh installations without existing environment data. It is "
-"possible to manually set bootm_size to the new u-boot's default value by "
-"running the command <quote>env default bootm_size; saveenv</quote> at the u-"
-"boot prompt."
+"possible to manually set bootm_size to the new U-Boot's default value by "
+"running the command <quote>env default bootm_size; saveenv</quote> at the U-"
+"Boot prompt."
msgstr ""
#. Tag: para
-#: preparing.xml:1555
+#: preparing.xml:1768
#, no-c-format
msgid ""
"Another possibility to circumvent relocation-related problems is to run the "
"command <quote>setenv fdt_high ffffffff; setenv initrd_high 0xffffffff; "
-"saveenv</quote> at the u-boot prompt to completely disable the relocation of "
+"saveenv</quote> at the U-Boot prompt to completely disable the relocation of "
"the initial ramdisk and the device-tree blob."
msgstr ""
#. Tag: title
-#: preparing.xml:1565
+#: preparing.xml:1778
#, no-c-format
msgid "Systems with UEFI firmware"
msgstr ""
#. Tag: para
-#: preparing.xml:1566
+#: preparing.xml:1779
#, no-c-format
msgid ""
"UEFI (<quote>Unified Extensible Firmware Interface</quote>) is a new kind of "
@@ -2263,7 +2604,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: preparing.xml:1572
+#: preparing.xml:1785
#, no-c-format
msgid ""
"Currently most PC systems that use UEFI also have a so-called "
@@ -2272,18 +2613,18 @@ msgid ""
"BIOS, so that software written for the classic PC BIOS can be used "
"unchanged. Nonetheless UEFI is intended to one day completely replace the "
"old PC BIOS without being fully backwards-compatible and there are already a "
-"few systems with UEFI but without CSM."
+"lot of systems with UEFI but without CSM."
msgstr ""
#. Tag: para
-#: preparing.xml:1582
+#: preparing.xml:1795
#, no-c-format
msgid ""
"On systems with UEFI there are a few things to take into consideration when "
"installing an operating system. The way the firmware loads an operating "
"system is fundamentally different between the classic BIOS (or UEFI in CSM "
"mode) and native UEFI. One major difference is the way the harddisk "
-"partitions get recorded on the harddisk. While the classic BIOS and UEFI in "
+"partitions are recorded on the harddisk. While the classic BIOS and UEFI in "
"CSM mode use a DOS partition table, native UEFI uses a different "
"partitioning scheme called <quote>GUID Partition Table</quote> (GPT). On a "
"single disk, for all practical purposes only one of the two can be used and "
@@ -2292,14 +2633,14 @@ msgid ""
"from a disk with GPT is only possible in native UEFI mode, but using GPT "
"becomes more and more common as hard disk sizes grow, because the classic "
"DOS partition table cannot address disks larger than about 2 Terabytes while "
-"GPT allows for by far larger disks. The other major difference between BIOS "
-"(or UEFI in CSM mode) and native UEFI is from where boot code is loaded and "
-"in which format it has to be, so that different bootloaders are needed for "
-"both systems."
+"GPT allows for far larger disks. The other major difference between BIOS (or "
+"UEFI in CSM mode) and native UEFI is the location where boot code is stored "
+"and in which format it has to be. This means that different bootloaders are "
+"needed for each system."
msgstr ""
#. Tag: para
-#: preparing.xml:1602
+#: preparing.xml:1815
#, no-c-format
msgid ""
"The latter becomes important when booting &d-i; on a UEFI system with CSM "
@@ -2318,7 +2659,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: preparing.xml:1618
+#: preparing.xml:1831
#, no-c-format
msgid ""
"Another UEFI-related topic is the so-called <quote>secure boot</quote> "
@@ -2330,54 +2671,66 @@ msgid ""
"Microsoft used for signing the Windows bootloader. As the boot code used by "
"&d-i; is not signed by Microsoft, booting the installer requires prior "
"deactivation of secure boot in case it is enabled. Secure boot is often "
-"enabled by default on systems that come preinstalled with a 64Bit version of "
-"Windows 8 and there is unfortunately no standard where in the UEFI setup it "
-"can be disabled. On some systems, the option to disable secure boot is only "
-"made visible when a BIOS password has been set by the user, so if you have a "
+"enabled by default on systems that come preinstalled with a 64-bit version "
+"of Windows 8 and there is unfortunately no standard way to disable it in the "
+"UEFI setup. On some systems, the option to disable secure boot is only made "
+"visible when a BIOS password has been set by the user, so if you have a "
"system with secure boot enabled, but cannot find an option to disable it, "
"try setting a BIOS password, powercycle the machine and look again for an "
"appropriate option."
msgstr ""
#. Tag: title
-#: preparing.xml:1640
+#: preparing.xml:1853
#, no-c-format
msgid "Disabling the Windows 8 <quote>fast boot</quote> feature"
msgstr ""
#. Tag: para
-#: preparing.xml:1641
+#: preparing.xml:1854
+#, no-c-format
+msgid ""
+"Windows 8 offers a feature called <quote>fast boot</quote> to cut down "
+"system startup time. Technically, when this feature is enabled, Windows 8 "
+"does not do a real shutdown and a real cold boot afterwards when ordered to "
+"shut down, but instead does something resembling a partial suspend to disk "
+"to reduce the <quote>boot</quote> time. As long as Windows 8 is the only "
+"operating system on the machine, this is unproblematic, but it can result in "
+"problems and data loss when you have a dual boot setup in which another "
+"operating system accesses the same filesystems as Windows 8 does. In that "
+"case the real state of the filesystem can be different from what Windows 8 "
+"believes it to be after the <quote>boot</quote> and this could cause "
+"filesystem corruption upon further write accesses to the filesystem. "
+"Therefore in a dual boot setup, to avoid filesystem corruption the "
+"<quote>fast boot</quote> feature has to be disabled within Windows."
+msgstr ""
+
+#. Tag: para
+#: preparing.xml:1870
#, no-c-format
msgid ""
-"Windows 8 offers a feature called <quote>fast boot</quote> to cut down the "
-"time needed to boot itself. Technically, when this feature is enabled, "
-"Windows 8 does not do a real shutdown and a real cold boot afterwards when "
-"ordered to shut down, but instead does something resembling a partial "
-"suspend to disk to reduce the <quote>boot</quote> time. As long as Windows 8 "
-"is the only operating system on the machine, this is unproblematic, but it "
-"can result in problems and data loss when you have a dual boot setup in "
-"which another operating system accesses the same filesystems as Windows 8 "
-"does. In that case the real state of the filesystem can be different from "
-"what Windows 8 believes it to be after the <quote>boot</quote> and this "
-"could cause filesystem corruption upon further write accesses to the "
-"filesystem. Therefore in a dual boot setup, to avoid filesystem corruption "
-"the <quote>fast boot</quote> feature has to be disabled within Windows."
+"It may also be necessary to disable <quote>fast boot</quote> to even allow "
+"access to UEFI setup to choose to boot another operating system or &d-i;. On "
+"some UEFI systems, the firmware will reduce <quote>boot</quote> time by not "
+"initialising the keyboard controller or USB hardware; in these cases, it is "
+"necessary to boot into Windows and disable this feature to allow for a "
+"change of boot order."
msgstr ""
#. Tag: title
-#: preparing.xml:1659
+#: preparing.xml:1882
#, no-c-format
msgid "Hardware Issues to Watch Out For"
msgstr "需要留心的硬件问题"
#. Tag: title
-#: preparing.xml:1662
+#: preparing.xml:1885
#, no-c-format
msgid "USB BIOS support and keyboards"
msgstr "USB BIOS 支持与键盘"
#. Tag: para
-#: preparing.xml:1663
+#: preparing.xml:1886
#, no-c-format
msgid ""
"If you have no PS/2-style keyboard, but only a USB model, on some very old "
@@ -2394,13 +2747,13 @@ msgstr ""
"keyboard support</quote> 选项。"
#. Tag: title
-#: preparing.xml:1676
+#: preparing.xml:1899
#, no-c-format
msgid "Display-visibility on OldWorld Powermacs"
msgstr "在 OldWorld Powermac 上正常显示"
#. Tag: para
-#: preparing.xml:1678
+#: preparing.xml:1901
#, no-c-format
msgid ""
"Some OldWorld Powermacs, most notably those with the <quote>control</quote> "
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index f1a9e2c44..fce58cbb6 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: 2015-03-21 16:42+0000\n"
+"POT-Creation-Date: 2015-04-15 20:29+0000\n"
"PO-Revision-Date: 2012-11-26 13:49+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -2163,8 +2163,8 @@ msgid ""
"only\n"
"# one disk the installer will default to using that, but otherwise the "
"device\n"
-"# name must be given in traditional, non-devfs format (so e.g. /dev/hda or\n"
-"# /dev/sda, and not e.g. /dev/discs/disc0/disc).\n"
+"# name must be given in traditional, non-devfs format (so e.g. /dev/sda\n"
+"# and not e.g. /dev/discs/disc0/disc).\n"
"# For example, to use the first SCSI/SATA hard disk:\n"
"#d-i partman-auto/disk string /dev/sda\n"
"# In addition, you'll need to specify the method to use.\n"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 7594cd2be..253dbd138 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: 2015-01-09 19:07+0000\n"
+"POT-Creation-Date: 2015-04-15 20:29+0000\n"
"PO-Revision-Date: 2012-11-26 13:55+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -68,263 +68,181 @@ msgstr "第二个软驱"
#. Tag: filename
#: random-bits.xml:37
#, no-c-format
-msgid "<filename>hda</filename>"
-msgstr "<filename>hda</filename>"
+msgid "<filename>sda</filename>"
+msgstr "<filename>sda</filename>"
#. Tag: entry
#: random-bits.xml:38
#, no-c-format
-msgid "IDE Hard disk / CD-ROM on the first IDE port (Master)"
-msgstr "在第一个 IDE 口(Master)的 IDE 硬盘/光驱"
+msgid "First hard disk"
+msgstr ""
#. Tag: filename
#: random-bits.xml:40
#, no-c-format
-msgid "<filename>hdb</filename>"
-msgstr "<filename>hdb</filename>"
+msgid "<filename>sdb</filename>"
+msgstr "<filename>sdb</filename>"
#. Tag: entry
#: random-bits.xml:41
#, no-c-format
-msgid "IDE Hard disk / CD-ROM on the first IDE port (Slave)"
-msgstr "在第一个 IDE 口(Slave)的 IDE 硬盘/光驱"
+msgid "Second hard disk"
+msgstr ""
#. Tag: filename
#: random-bits.xml:43
#, no-c-format
-msgid "<filename>hdc</filename>"
-msgstr "<filename>hdc</filename>"
+msgid "sda1"
+msgstr "sda1"
#. Tag: entry
#: random-bits.xml:44
-#, no-c-format
-msgid "IDE Hard disk / CD-ROM on the second IDE port (Master)"
-msgstr "在第二个 IDE 口(Master)的 IDE 硬盘/光驱"
+#, fuzzy, no-c-format
+#| msgid "First partition of the first IDE hard disk"
+msgid "First partition of the first hard disk"
+msgstr "在第一块 IDE 硬盘上的第一个分区"
#. Tag: filename
#: random-bits.xml:46
#, no-c-format
-msgid "<filename>hdd</filename>"
-msgstr "<filename>hdd</filename>"
+msgid "sdb7"
+msgstr ""
#. Tag: entry
#: random-bits.xml:47
-#, no-c-format
-msgid "IDE Hard disk / CD-ROM on the second IDE port (Slave)"
-msgstr "在第二个 IDE 口(Slave)的 IDE 硬盘/光驱"
-
-#. Tag: filename
-#: random-bits.xml:49
-#, no-c-format
-msgid "hda1"
-msgstr "hda1"
-
-#. Tag: entry
-#: random-bits.xml:50
-#, no-c-format
-msgid "First partition of the first IDE hard disk"
-msgstr "在第一块 IDE 硬盘上的第一个分区"
-
-#. Tag: filename
-#: random-bits.xml:52
-#, no-c-format
-msgid "hdd15"
-msgstr "hdd15"
-
-#. Tag: entry
-#: random-bits.xml:53
-#, no-c-format
-msgid "Fifteenth partition of the fourth IDE hard disk"
-msgstr "在第四块 IDE 硬盘上的第十五个分区"
-
-#. Tag: filename
-#: random-bits.xml:59
-#, no-c-format
-msgid "<filename>sda</filename>"
-msgstr "<filename>sda</filename>"
-
-#. Tag: entry
-#: random-bits.xml:60
-#, no-c-format
-msgid "SCSI Hard disk with lowest SCSI ID (e.g. 0)"
-msgstr "SCSI ID (比如 0)最小的 SCSI 硬盘"
-
-#. Tag: filename
-#: random-bits.xml:62
-#, no-c-format
-msgid "<filename>sdb</filename>"
-msgstr "<filename>sdb</filename>"
-
-#. Tag: entry
-#: random-bits.xml:63
-#, no-c-format
-msgid "SCSI Hard disk with next higher SCSI ID (e.g. 1)"
-msgstr "下一个 SCSI ID (比如 1)的 SCSI 硬盘"
-
-#. Tag: filename
-#: random-bits.xml:65
-#, no-c-format
-msgid "<filename>sdc</filename>"
-msgstr "<filename>sdc</filename>"
-
-#. Tag: entry
-#: random-bits.xml:66
-#, no-c-format
-msgid "SCSI Hard disk with next higher SCSI ID (e.g. 2)"
-msgstr "下一个 SCSI ID (比如 2)的 SCSI 硬盘"
-
-#. Tag: filename
-#: random-bits.xml:68
-#, no-c-format
-msgid "sda1"
-msgstr "sda1"
-
-#. Tag: entry
-#: random-bits.xml:69
-#, no-c-format
-msgid "First partition of the first SCSI hard disk"
-msgstr "在第一块 SCSI 硬盘上的第一个分区"
-
-#. Tag: filename
-#: random-bits.xml:71
-#, no-c-format
-msgid "sdd10"
-msgstr "sdd10"
-
-#. Tag: entry
-#: random-bits.xml:72
-#, no-c-format
-msgid "Tenth partition of the fourth SCSI hard disk"
+#, fuzzy, no-c-format
+#| msgid "Tenth partition of the fourth SCSI hard disk"
+msgid "Seventh partition of the second hard disk"
msgstr "在第四块 SCSI 硬盘上的第十个分区"
#. Tag: filename
-#: random-bits.xml:78
+#: random-bits.xml:53
#, no-c-format
msgid "<filename>sr0</filename>"
msgstr "<filename>sr0</filename>"
#. Tag: entry
-#: random-bits.xml:79
+#: random-bits.xml:54
#, no-c-format
-msgid "SCSI CD-ROM with the lowest SCSI ID"
-msgstr "SCSI ID 最小的 SCSI 光驱"
+msgid "First CD-ROM"
+msgstr ""
#. Tag: filename
-#: random-bits.xml:81
+#: random-bits.xml:56
#, no-c-format
msgid "<filename>sr1</filename>"
msgstr "<filename>sr1</filename>"
#. Tag: entry
-#: random-bits.xml:82
+#: random-bits.xml:57
#, no-c-format
-msgid "SCSI CD-ROM with the next higher SCSI ID"
-msgstr "下一个 SCSI ID 的 SCSI 光驱"
+msgid "Second CD-ROM"
+msgstr ""
#. Tag: filename
-#: random-bits.xml:88
+#: random-bits.xml:63
#, no-c-format
msgid "ttyS0"
msgstr "ttyS0"
#. Tag: entry
-#: random-bits.xml:89
+#: random-bits.xml:64
#, no-c-format
msgid "Serial port 0, COM1 under MS-DOS"
msgstr "串口 0,即 MS-DOS 下的 COM1"
#. Tag: filename
-#: random-bits.xml:91
+#: random-bits.xml:66
#, no-c-format
msgid "ttyS1"
msgstr "ttyS1"
#. Tag: entry
-#: random-bits.xml:92
+#: random-bits.xml:67
#, no-c-format
msgid "Serial port 1, COM2 under MS-DOS"
msgstr "串口 1,即 MS-DOS 下的 COM2"
#. Tag: filename
-#: random-bits.xml:94
+#: random-bits.xml:69
#, no-c-format
msgid "psaux"
msgstr "psaux"
#. Tag: entry
-#: random-bits.xml:95
+#: random-bits.xml:70
#, no-c-format
msgid "PS/2 mouse device"
msgstr "PS/2 鼠标设备"
#. Tag: filename
-#: random-bits.xml:97
+#: random-bits.xml:72
#, no-c-format
msgid "gpmdata"
msgstr "gpmdata"
#. Tag: entry
-#: random-bits.xml:98
+#: random-bits.xml:73
#, no-c-format
msgid "Pseudo device, repeater data from GPM (mouse) daemon"
msgstr "伪设备,中转从GPM(鼠标)服务传来的数据"
#. Tag: filename
-#: random-bits.xml:104
+#: random-bits.xml:79
#, no-c-format
msgid "cdrom"
msgstr "cdrom"
#. Tag: entry
-#: random-bits.xml:105
+#: random-bits.xml:80
#, no-c-format
msgid "Symbolic link to the CD-ROM drive"
msgstr "指向光驱的符号链接"
#. Tag: filename
-#: random-bits.xml:107
+#: random-bits.xml:82
#, no-c-format
msgid "mouse"
msgstr "mouse"
#. Tag: entry
-#: random-bits.xml:108
+#: random-bits.xml:83
#, no-c-format
msgid "Symbolic link to the mouse device file"
msgstr "指向鼠标设备文件的符号链接"
#. Tag: filename
-#: random-bits.xml:114
+#: random-bits.xml:89
#, no-c-format
msgid "null"
msgstr "null"
#. Tag: entry
-#: random-bits.xml:115
+#: random-bits.xml:90
#, no-c-format
msgid "Anything written to this device will disappear"
msgstr "所有写入该设备的东西都会消失"
#. Tag: filename
-#: random-bits.xml:117
+#: random-bits.xml:92
#, no-c-format
msgid "zero"
msgstr "zero"
#. Tag: entry
-#: random-bits.xml:118
+#: random-bits.xml:93
#, no-c-format
msgid "One can endlessly read zeros out of this device"
msgstr "可以从该设备永无休止地读出零"
#. Tag: title
-#: random-bits.xml:125
+#: random-bits.xml:100
#, no-c-format
msgid "Setting Up Your Mouse"
msgstr "设定您的鼠标"
#. Tag: para
-#: random-bits.xml:126
+#: random-bits.xml:101
#, no-c-format
msgid ""
"The mouse can be used in both the Linux console (with gpm) and the X window "
@@ -344,7 +262,7 @@ msgstr ""
"filename> 分别是各自的配置文件。"
#. Tag: para
-#: random-bits.xml:137
+#: random-bits.xml:112
#, no-c-format
msgid ""
"Certain kernel modules must be loaded in order for your mouse to work. In "
@@ -382,7 +300,7 @@ msgstr ""
"<userinput>kernel/drivers/input/mouse</userinput> 下的分类。"
#. Tag: para
-#: random-bits.xml:184
+#: random-bits.xml:159
#, no-c-format
msgid ""
"Modern kernels give you the capability to emulate a three-button mouse when "
@@ -393,7 +311,7 @@ msgstr ""
"加入 <filename>/etc/sysctl.conf</filename> 文件。"
#. Tag: screen
-#: random-bits.xml:191
+#: random-bits.xml:166
#, no-c-format
msgid ""
"# 3-button mouse emulation\n"
@@ -415,13 +333,13 @@ msgstr ""
"# For different keys, use showkey to tell you what the code is."
#. Tag: title
-#: random-bits.xml:198
+#: random-bits.xml:173
#, no-c-format
msgid "Disk Space Needed for Tasks"
msgstr "各软件集所需的磁盘空间"
#. Tag: para
-#: random-bits.xml:199
+#: random-bits.xml:174
#, fuzzy, no-c-format
#| msgid ""
#| "A standard installation for the amd64 architecture, including all "
@@ -440,7 +358,7 @@ msgstr ""
"system</quote> 任务,需要 &base-system-size;MB。"
#. Tag: para
-#: random-bits.xml:207
+#: random-bits.xml:182
#, no-c-format
msgid ""
"In both cases this is the actual disk space used <emphasis>after</emphasis> "
@@ -454,7 +372,7 @@ msgstr ""
"装和使用<emphasis>过程中</emphasis>,都会需要更多的磁盘空间。"
#. Tag: para
-#: random-bits.xml:216
+#: random-bits.xml:191
#, no-c-format
msgid ""
"The following table lists sizes reported by aptitude for the tasks listed in "
@@ -467,7 +385,7 @@ msgstr ""
"安装后所占的空间,可能会小于这两个软件集分别安装所占的空间。"
#. Tag: para
-#: random-bits.xml:223
+#: random-bits.xml:198
#, no-c-format
msgid ""
"By default the installer will install the GNOME desktop environment, but "
@@ -480,7 +398,7 @@ msgstr ""
"\"pkgsel\"/>)。"
#. Tag: para
-#: random-bits.xml:230
+#: random-bits.xml:205
#, no-c-format
msgid ""
"Note that you will need to add the sizes listed in the table to the size of "
@@ -496,291 +414,291 @@ msgstr ""
"var</filename> 里面。"
#. Tag: entry
-#: random-bits.xml:244
+#: random-bits.xml:219
#, no-c-format
msgid "Task"
msgstr "任务"
#. Tag: entry
-#: random-bits.xml:245
+#: random-bits.xml:220
#, no-c-format
msgid "Installed size (MB)"
msgstr "安装尺寸 (MB)"
#. Tag: entry
-#: random-bits.xml:246
+#: random-bits.xml:221
#, no-c-format
msgid "Download size (MB)"
msgstr "下载尺寸 (MB)"
#. Tag: entry
-#: random-bits.xml:247
+#: random-bits.xml:222
#, no-c-format
msgid "Space needed to install (MB)"
msgstr "用于安装所需空间 (MB)"
#. Tag: entry
-#: random-bits.xml:253
+#: random-bits.xml:228
#, no-c-format
msgid "Desktop environment"
msgstr "桌面环境"
#. Tag: entry
-#: random-bits.xml:254 random-bits.xml:255 random-bits.xml:256
+#: random-bits.xml:229 random-bits.xml:230 random-bits.xml:231
#, no-c-format
msgid "&nbsp;"
msgstr "&nbsp;"
#. Tag: entry
-#: random-bits.xml:259
+#: random-bits.xml:234
#, no-c-format
msgid "&nbsp;&nbsp;&bull;&nbsp;GNOME (default)"
msgstr "&nbsp;&nbsp;&bull;&nbsp;GNOME (default)"
#. Tag: entry
-#: random-bits.xml:260
+#: random-bits.xml:235
#, no-c-format
msgid "&task-desktop-gnome-inst;"
msgstr "&task-desktop-gnome-inst;"
#. Tag: entry
-#: random-bits.xml:261
+#: random-bits.xml:236
#, no-c-format
msgid "&task-desktop-gnome-dl;"
msgstr "&task-desktop-gnome-dl;"
#. Tag: entry
-#: random-bits.xml:262
+#: random-bits.xml:237
#, no-c-format
msgid "&task-desktop-gnome-tot;"
msgstr "&task-desktop-gnome-tot;"
#. Tag: entry
-#: random-bits.xml:265
+#: random-bits.xml:240
#, no-c-format
msgid "&nbsp;&nbsp;&bull;&nbsp;KDE"
msgstr "&nbsp;&nbsp;&bull;&nbsp;KDE"
#. Tag: entry
-#: random-bits.xml:266
+#: random-bits.xml:241
#, no-c-format
msgid "&task-desktop-kde-inst;"
msgstr "&task-desktop-kde-inst;"
#. Tag: entry
-#: random-bits.xml:267
+#: random-bits.xml:242
#, no-c-format
msgid "&task-desktop-kde-dl;"
msgstr "&task-desktop-kde-dl;"
#. Tag: entry
-#: random-bits.xml:268
+#: random-bits.xml:243
#, no-c-format
msgid "&task-desktop-kde-tot;"
msgstr "&task-desktop-kde-tot;"
#. Tag: entry
-#: random-bits.xml:271
+#: random-bits.xml:246
#, no-c-format
msgid "&nbsp;&nbsp;&bull;&nbsp;Xfce"
msgstr "&nbsp;&nbsp;&bull;&nbsp;Xfce"
#. Tag: entry
-#: random-bits.xml:272
+#: random-bits.xml:247
#, no-c-format
msgid "&task-desktop-xfce-inst;"
msgstr "&task-desktop-xfce-inst;"
#. Tag: entry
-#: random-bits.xml:273
+#: random-bits.xml:248
#, no-c-format
msgid "&task-desktop-xfce-dl;"
msgstr "&task-desktop-xfce-dl;"
#. Tag: entry
-#: random-bits.xml:274
+#: random-bits.xml:249
#, no-c-format
msgid "&task-desktop-xfce-tot;"
msgstr "&task-desktop-xfce-tot;"
#. Tag: entry
-#: random-bits.xml:277
+#: random-bits.xml:252
#, no-c-format
msgid "&nbsp;&nbsp;&bull;&nbsp;LXDE"
msgstr "&nbsp;&nbsp;&bull;&nbsp;LXDE"
#. Tag: entry
-#: random-bits.xml:278
+#: random-bits.xml:253
#, no-c-format
msgid "&task-desktop-lxde-inst;"
msgstr "&task-desktop-lxde-inst;"
#. Tag: entry
-#: random-bits.xml:279
+#: random-bits.xml:254
#, no-c-format
msgid "&task-desktop-lxde-dl;"
msgstr "&task-desktop-lxde-dl;"
#. Tag: entry
-#: random-bits.xml:280
+#: random-bits.xml:255
#, no-c-format
msgid "&task-desktop-lxde-tot;"
msgstr "&task-desktop-lxde-tot;"
#. Tag: entry
-#: random-bits.xml:283
+#: random-bits.xml:258
#, fuzzy, no-c-format
#| msgid "&nbsp;&nbsp;&bull;&nbsp;KDE"
msgid "&nbsp;&nbsp;&bull;&nbsp;MATE"
msgstr "&nbsp;&nbsp;&bull;&nbsp;KDE"
#. Tag: entry
-#: random-bits.xml:284
+#: random-bits.xml:259
#, fuzzy, no-c-format
#| msgid "&task-desktop-gnome-inst;"
msgid "&task-desktop-mate-inst;"
msgstr "&task-desktop-gnome-inst;"
#. Tag: entry
-#: random-bits.xml:285
+#: random-bits.xml:260
#, fuzzy, no-c-format
#| msgid "&task-desktop-gnome-dl;"
msgid "&task-desktop-mate-dl;"
msgstr "&task-desktop-gnome-dl;"
#. Tag: entry
-#: random-bits.xml:286
+#: random-bits.xml:261
#, fuzzy, no-c-format
#| msgid "&task-desktop-gnome-tot;"
msgid "&task-desktop-mate-tot;"
msgstr "&task-desktop-gnome-tot;"
#. Tag: entry
-#: random-bits.xml:289
+#: random-bits.xml:264
#, fuzzy, no-c-format
#| msgid "&nbsp;&nbsp;&bull;&nbsp;KDE"
msgid "&nbsp;&nbsp;&bull;&nbsp;Cinnamon"
msgstr "&nbsp;&nbsp;&bull;&nbsp;KDE"
#. Tag: entry
-#: random-bits.xml:290
+#: random-bits.xml:265
#, fuzzy, no-c-format
#| msgid "&task-desktop-gnome-inst;"
msgid "&task-desktop-cinnamon-inst;"
msgstr "&task-desktop-gnome-inst;"
#. Tag: entry
-#: random-bits.xml:291
+#: random-bits.xml:266
#, fuzzy, no-c-format
#| msgid "&task-desktop-gnome-dl;"
msgid "&task-desktop-cinnamon-dl;"
msgstr "&task-desktop-gnome-dl;"
#. Tag: entry
-#: random-bits.xml:292
+#: random-bits.xml:267
#, fuzzy, no-c-format
#| msgid "&task-desktop-gnome-tot;"
msgid "&task-desktop-cinnamon-tot;"
msgstr "&task-desktop-gnome-tot;"
#. Tag: entry
-#: random-bits.xml:296
+#: random-bits.xml:271
#, no-c-format
msgid "Laptop"
msgstr "便携机"
#. Tag: entry
-#: random-bits.xml:297
+#: random-bits.xml:272
#, no-c-format
msgid "&task-laptop-inst;"
msgstr "&task-laptop-inst;"
#. Tag: entry
-#: random-bits.xml:298
+#: random-bits.xml:273
#, no-c-format
msgid "&task-laptop-dl;"
msgstr "&task-laptop-dl;"
#. Tag: entry
-#: random-bits.xml:299
+#: random-bits.xml:274
#, no-c-format
msgid "&task-laptop-tot;"
msgstr "&task-laptop-tot;"
#. Tag: entry
-#: random-bits.xml:303
+#: random-bits.xml:278
#, no-c-format
msgid "Web server"
msgstr "Web 服务器"
#. Tag: entry
-#: random-bits.xml:304
+#: random-bits.xml:279
#, no-c-format
msgid "&task-web-inst;"
msgstr "&task-web-inst;"
#. Tag: entry
-#: random-bits.xml:305
+#: random-bits.xml:280
#, no-c-format
msgid "&task-web-dl;"
msgstr "&task-web-dl;"
#. Tag: entry
-#: random-bits.xml:306
+#: random-bits.xml:281
#, no-c-format
msgid "&task-web-tot;"
msgstr "&task-web-tot;"
#. Tag: entry
-#: random-bits.xml:310
+#: random-bits.xml:285
#, no-c-format
msgid "Print server"
msgstr "打印服务器"
#. Tag: entry
-#: random-bits.xml:311
+#: random-bits.xml:286
#, no-c-format
msgid "&task-print-inst;"
msgstr "&task-print-inst;"
#. Tag: entry
-#: random-bits.xml:312
+#: random-bits.xml:287
#, no-c-format
msgid "&task-print-dl;"
msgstr "&task-print-dl;"
#. Tag: entry
-#: random-bits.xml:313
+#: random-bits.xml:288
#, no-c-format
msgid "&task-print-tot;"
msgstr "&task-print-tot;"
#. Tag: entry
-#: random-bits.xml:317
+#: random-bits.xml:292
#, no-c-format
msgid "SSH server"
msgstr "SSH 服务器"
#. Tag: entry
-#: random-bits.xml:318
+#: random-bits.xml:293
#, no-c-format
msgid "&task-ssh-inst;"
msgstr "&task-ssh-inst;"
#. Tag: entry
-#: random-bits.xml:319
+#: random-bits.xml:294
#, no-c-format
msgid "&task-ssh-dl;"
msgstr "&task-ssh-dl;"
#. Tag: entry
-#: random-bits.xml:320
+#: random-bits.xml:295
#, no-c-format
msgid "&task-ssh-tot;"
msgstr "&task-ssh-tot;"
#. Tag: para
-#: random-bits.xml:326
+#: random-bits.xml:301
#, no-c-format
msgid ""
"If you install in a language other than English, <command>tasksel</command> "
@@ -793,13 +711,13 @@ msgstr ""
"同;您应该留有 350MB 以上的空间用来下载和安装。"
#. Tag: title
-#: random-bits.xml:341
+#: random-bits.xml:316
#, no-c-format
msgid "Installing &debian-gnu; from a Unix/Linux System"
msgstr "通过 Unix/Linux 系统来安装 &debian-gnu;"
#. Tag: para
-#: random-bits.xml:343
+#: random-bits.xml:318
#, no-c-format
msgid ""
"This section explains how to install &debian-gnu; from an existing Unix or "
@@ -820,7 +738,7 @@ msgstr ""
"输入的。"
#. Tag: para
-#: random-bits.xml:355
+#: random-bits.xml:330
#, no-c-format
msgid ""
"Once you've got the new &debian; system configured to your preference, you "
@@ -835,7 +753,7 @@ msgstr ""
"能通过任何引导或者安装介质完成安装的权宜之计。"
#. Tag: para
-#: random-bits.xml:366
+#: random-bits.xml:341
#, no-c-format
msgid ""
"As this is a mostly manual procedure, you should bear in mind that you will "
@@ -853,13 +771,13 @@ msgstr ""
"还需要额外的安装、或者配置步骤。"
#. Tag: title
-#: random-bits.xml:380
+#: random-bits.xml:355
#, no-c-format
msgid "Getting Started"
msgstr "准备开始"
#. Tag: para
-#: random-bits.xml:381
+#: random-bits.xml:356
#, no-c-format
msgid ""
"With your current *nix partitioning tools, repartition the hard drive as "
@@ -874,13 +792,20 @@ msgstr ""
"境,还要更多)。"
#. Tag: para
-#: random-bits.xml:389
-#, no-c-format
+#: random-bits.xml:364
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Next, create file systems on the partitions. For example, to create an "
+#| "ext3 file system on partition <filename>/dev/hda6</filename> (that's our "
+#| "example root partition): <informalexample><screen>\n"
+#| "# mke2fs -j /dev/<replaceable>hda6</replaceable>\n"
+#| "</screen></informalexample> To create an ext2 file system instead, omit "
+#| "<userinput>-j</userinput>."
msgid ""
"Next, create file systems on the partitions. For example, to create an ext3 "
-"file system on partition <filename>/dev/hda6</filename> (that's our example "
+"file system on partition <filename>/dev/sda6</filename> (that's our example "
"root partition): <informalexample><screen>\n"
-"# mke2fs -j /dev/<replaceable>hda6</replaceable>\n"
+"# mke2fs -j /dev/<replaceable>sda6</replaceable>\n"
"</screen></informalexample> To create an ext2 file system instead, omit "
"<userinput>-j</userinput>."
msgstr ""
@@ -892,14 +817,24 @@ msgstr ""
"userinput>。"
#. Tag: para
-#: random-bits.xml:399
-#, no-c-format
+#: random-bits.xml:374
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Initialize and activate swap (substitute the partition number for your "
+#| "intended &debian; swap partition): <informalexample><screen>\n"
+#| "# mkswap /dev/<replaceable>hda5</replaceable>\n"
+#| "# sync\n"
+#| "# swapon /dev/<replaceable>hda5</replaceable>\n"
+#| "</screen></informalexample> Mount one partition as <filename>/mnt/"
+#| "debinst</filename> (the installation point, to be the root (<filename>/</"
+#| "filename>) filesystem on your new system). The mount point name is "
+#| "strictly arbitrary, it is referenced later below."
msgid ""
"Initialize and activate swap (substitute the partition number for your "
"intended &debian; swap partition): <informalexample><screen>\n"
-"# mkswap /dev/<replaceable>hda5</replaceable>\n"
+"# mkswap /dev/<replaceable>sda5</replaceable>\n"
"# sync\n"
-"# swapon /dev/<replaceable>hda5</replaceable>\n"
+"# swapon /dev/<replaceable>sda5</replaceable>\n"
"</screen></informalexample> Mount one partition as <filename>/mnt/debinst</"
"filename> (the installation point, to be the root (<filename>/</filename>) "
"filesystem on your new system). The mount point name is strictly arbitrary, "
@@ -915,17 +850,20 @@ msgstr ""
"统)。挂载点的名称是任意的,后面的步骤将会用到。"
#. Tag: screen
-#: random-bits.xml:411
-#, no-c-format
+#: random-bits.xml:386
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# mkdir /mnt/debinst\n"
+#| "# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst"
msgid ""
"# mkdir /mnt/debinst\n"
-"# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst"
+"# mount /dev/<replaceable>sda6</replaceable> /mnt/debinst"
msgstr ""
"# mkdir /mnt/debinst\n"
"# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst"
#. Tag: para
-#: random-bits.xml:414
+#: random-bits.xml:389
#, no-c-format
msgid ""
"If you want to have parts of the filesystem (e.g. /usr) mounted on separate "
@@ -936,13 +874,13 @@ msgstr ""
"手动创建和加载这些目录。"
#. Tag: title
-#: random-bits.xml:424
+#: random-bits.xml:399
#, no-c-format
msgid "Install <command>debootstrap</command>"
msgstr "安装 <command>debootstrap</command>"
#. Tag: para
-#: random-bits.xml:425
+#: random-bits.xml:400
#, no-c-format
msgid ""
"The utility used by the &debian; installer, and recognized as the official "
@@ -965,7 +903,7 @@ msgstr ""
"装 <command>debootstrap</command>。"
#. Tag: para
-#: random-bits.xml:455
+#: random-bits.xml:430
#, no-c-format
msgid ""
"Or, you can use the following procedure to install it manually. Make a work "
@@ -990,7 +928,7 @@ msgstr ""
"些文件安装到系统,您需要 root 权限。"
#. Tag: screen
-#: random-bits.xml:470
+#: random-bits.xml:445
#, no-c-format
msgid ""
"# ar -x debootstrap_0.X.X_all.deb\n"
@@ -1002,13 +940,13 @@ msgstr ""
"# zcat /full-path-to-work/work/data.tar.gz | tar xv"
#. Tag: title
-#: random-bits.xml:476
+#: random-bits.xml:451
#, no-c-format
msgid "Run <command>debootstrap</command>"
msgstr "运行 <command>debootstrap</command>"
#. Tag: para
-#: random-bits.xml:477
+#: random-bits.xml:452
#, no-c-format
msgid ""
"<command>debootstrap</command> can download the needed files directly from "
@@ -1023,7 +961,7 @@ msgstr ""
"<ulink url=\"http://www.debian.org/mirror/list\"></ulink>。"
#. Tag: para
-#: random-bits.xml:486
+#: random-bits.xml:461
#, no-c-format
msgid ""
"If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
@@ -1035,7 +973,7 @@ msgstr ""
"<userinput>file:/cdrom/debian/</userinput>"
#. Tag: para
-#: random-bits.xml:492
+#: random-bits.xml:467
#, no-c-format
msgid ""
"Substitute one of the following for <replaceable>ARCH</replaceable> in the "
@@ -1053,7 +991,7 @@ msgstr ""
"<userinput>ppc64el</userinput>, or <userinput>s390x</userinput>。"
#. Tag: screen
-#: random-bits.xml:508
+#: random-bits.xml:483
#, no-c-format
msgid ""
"# /usr/sbin/debootstrap --arch ARCH &releasename; \\\n"
@@ -1063,13 +1001,13 @@ msgstr ""
" /mnt/debinst http://ftp.us.debian.org/debian"
#. Tag: title
-#: random-bits.xml:514
+#: random-bits.xml:489
#, no-c-format
msgid "Configure The Base System"
msgstr "基本系统的配置"
#. Tag: para
-#: random-bits.xml:515
+#: random-bits.xml:490
#, fuzzy, no-c-format
#| msgid ""
#| "Now you've got a real &debian; system, though rather lean, on disk. "
@@ -1097,13 +1035,13 @@ msgstr ""
"义,例如:"
#. Tag: title
-#: random-bits.xml:533
+#: random-bits.xml:508
#, no-c-format
msgid "Create device files"
msgstr "创建设备文件"
#. Tag: para
-#: random-bits.xml:534
+#: random-bits.xml:509
#, no-c-format
msgid ""
"At this point <filename>/dev/</filename> only contains very basic device "
@@ -1120,13 +1058,13 @@ msgstr ""
"静态设备文件。"
#. Tag: para
-#: random-bits.xml:544
+#: random-bits.xml:519
#, no-c-format
msgid "A few of the available options are:"
msgstr "可以使用的选项有:"
#. Tag: para
-#: random-bits.xml:549
+#: random-bits.xml:524
#, no-c-format
msgid ""
"install the makedev package, and create a default set of static device files "
@@ -1134,7 +1072,7 @@ msgid ""
msgstr "安装 makedev 软件包,并创建默认的静态设备文件,使用(chroot 以后)"
#. Tag: screen
-#: random-bits.xml:553
+#: random-bits.xml:528
#, no-c-format
msgid ""
"# apt-get install makedev\n"
@@ -1148,14 +1086,14 @@ msgstr ""
"# MAKEDEV generic"
#. Tag: para
-#: random-bits.xml:556
+#: random-bits.xml:531
#, no-c-format
msgid ""
"manually create only specific device files using <command>MAKEDEV</command>"
msgstr "手动创建指定的设备文件,使用 <command>MAKEDEV</command>"
#. Tag: para
-#: random-bits.xml:561
+#: random-bits.xml:536
#, no-c-format
msgid ""
"bind mount /dev from your host system on top of /dev in the target system; "
@@ -1166,13 +1104,13 @@ msgstr ""
"postinst 脚本会创建设备文件,所以要小心使用改选项。"
#. Tag: title
-#: random-bits.xml:574
+#: random-bits.xml:549
#, no-c-format
msgid "Mount Partitions"
msgstr "分区的挂载"
#. Tag: para
-#: random-bits.xml:575
+#: random-bits.xml:550
#, no-c-format
msgid ""
"You need to create <filename>/etc/fstab</filename>. "
@@ -1252,13 +1190,13 @@ msgstr ""
"<userinput>mount -a</userinput>,请在进入下一步前先将 proc 挂载:"
#. Tag: screen
-#: random-bits.xml:601
+#: random-bits.xml:576
#, no-c-format
msgid "# mount -t proc proc /proc"
msgstr "# mount -t proc proc /proc"
#. Tag: para
-#: random-bits.xml:603
+#: random-bits.xml:578
#, no-c-format
msgid ""
"The command <userinput>ls /proc</userinput> should now show a non-empty "
@@ -1269,19 +1207,19 @@ msgstr ""
"chroot: 以外加载 proc。"
#. Tag: screen
-#: random-bits.xml:609
+#: random-bits.xml:584
#, no-c-format
msgid "# mount -t proc proc /mnt/debinst/proc"
msgstr "# mount -t proc proc /mnt/debinst/proc"
#. Tag: title
-#: random-bits.xml:615
+#: random-bits.xml:590
#, no-c-format
msgid "Setting Timezone"
msgstr "设置时区"
#. Tag: para
-#: random-bits.xml:616
+#: random-bits.xml:591
#, fuzzy, no-c-format
#| msgid ""
#| "An option in the file <filename>/etc/default/rcS</filename> determines "
@@ -1305,7 +1243,7 @@ msgstr ""
"间解释硬件时钟。下面命令可以让您设定和选择时区。"
#. Tag: screen
-#: random-bits.xml:630
+#: random-bits.xml:605
#, fuzzy, no-c-format
#| msgid ""
#| "# editor /etc/default/rcS\n"
@@ -1316,13 +1254,13 @@ msgstr ""
"# dpkg-reconfigure tzdata"
#. Tag: title
-#: random-bits.xml:636
+#: random-bits.xml:611
#, no-c-format
msgid "Configure Networking"
msgstr "网络的配置"
#. Tag: para
-#: random-bits.xml:637
+#: random-bits.xml:612
#, no-c-format
msgid ""
"To configure networking, edit <filename>/etc/network/interfaces</filename>, "
@@ -1444,13 +1382,13 @@ msgstr ""
"with the interface name (eth0, eth1, etc.) that you expect."
#. Tag: title
-#: random-bits.xml:678
+#: random-bits.xml:653
#, no-c-format
msgid "Configure Apt"
msgstr "配置 Apt"
#. Tag: para
-#: random-bits.xml:679
+#: random-bits.xml:654
#, no-c-format
msgid ""
"Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
@@ -1475,13 +1413,13 @@ msgstr ""
"update</userinput>。"
#. Tag: title
-#: random-bits.xml:695
+#: random-bits.xml:670
#, no-c-format
msgid "Configure Locales and Keyboard"
msgstr "本地化和键盘的配置"
#. Tag: para
-#: random-bits.xml:696
+#: random-bits.xml:671
#, no-c-format
msgid ""
"To configure your locale settings to use a language other than English, "
@@ -1499,7 +1437,7 @@ msgstr ""
"</screen></informalexample> 配置您的键盘(如果需要):"
#. Tag: screen
-#: random-bits.xml:706
+#: random-bits.xml:681
#, no-c-format
msgid ""
"# aptitude install console-setup\n"
@@ -1509,7 +1447,7 @@ msgstr ""
"# dpkg-reconfigure keyboard-configuration"
#. Tag: para
-#: random-bits.xml:708
+#: random-bits.xml:683
#, no-c-format
msgid ""
"Note that the keyboard cannot be set while in the chroot, but will be "
@@ -1517,13 +1455,13 @@ msgid ""
msgstr "注意,在 chroot 里面不能设置键盘,但重新启动以后可以。"
#. Tag: title
-#: random-bits.xml:718
+#: random-bits.xml:693
#, no-c-format
msgid "Install a Kernel"
msgstr "内核的安装"
#. Tag: para
-#: random-bits.xml:719
+#: random-bits.xml:694
#, no-c-format
msgid ""
"If you intend to boot this system, you probably want a &arch-kernel; kernel "
@@ -1533,31 +1471,31 @@ msgstr ""
"以用下面指令找到那些预先打包的内核:"
#. Tag: screen
-#: random-bits.xml:724
+#: random-bits.xml:699
#, no-c-format
msgid "# apt-cache search &kernelpackage;"
msgstr "# apt-cache search &kernelpackage;"
#. Tag: para
-#: random-bits.xml:726
+#: random-bits.xml:701
#, no-c-format
msgid "Then install the kernel package of your choice using its package name."
msgstr "然后根据所选取的软件包名称安装内核软件包。"
#. Tag: screen
-#: random-bits.xml:730
+#: random-bits.xml:705
#, no-c-format
msgid "# aptitude install &kernelpackage;-<replaceable>arch-etc</replaceable>"
msgstr "# aptitude install &kernelpackage;-<replaceable>arch-etc</replaceable>"
#. Tag: title
-#: random-bits.xml:736
+#: random-bits.xml:711
#, no-c-format
msgid "Set up the Boot Loader"
msgstr "Boot Loader 的设置"
#. Tag: para
-#: random-bits.xml:737
+#: random-bits.xml:712
#, no-c-format
msgid ""
"To make your &debian-gnu; system bootable, set up your boot loader to load "
@@ -1571,7 +1509,7 @@ msgstr ""
"成。"
#. Tag: para
-#: random-bits.xml:744
+#: random-bits.xml:719
#, no-c-format
msgid ""
"Check <userinput>info grub</userinput> <phrase arch=\"x86\">or "
@@ -1594,16 +1532,26 @@ msgstr ""
"<filename>lilo.conf</filename> )</phrase>。"
#. Tag: para
-#: random-bits.xml:756
-#, no-c-format
+#: random-bits.xml:731
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Installing and setting up <classname>grub2</classname> is as easy as: "
+#| "<informalexample><screen>\n"
+#| "# aptitude install grub-pc\n"
+#| "# grub-install /dev/<replaceable>hda</replaceable>\n"
+#| "# update-grub\n"
+#| "</screen></informalexample> The second command will install "
+#| "<command>grub2</command> (in this case in the MBR of <literal>hda</"
+#| "literal>). The last command will create a sane and working <filename>/"
+#| "boot/grub/grub.cfg</filename>."
msgid ""
"Installing and setting up <classname>grub2</classname> is as easy as: "
"<informalexample><screen>\n"
"# aptitude install grub-pc\n"
-"# grub-install /dev/<replaceable>hda</replaceable>\n"
+"# grub-install /dev/<replaceable>sda</replaceable>\n"
"# update-grub\n"
"</screen></informalexample> The second command will install <command>grub2</"
-"command> (in this case in the MBR of <literal>hda</literal>). The last "
+"command> (in this case in the MBR of <literal>sda</literal>). The last "
"command will create a sane and working <filename>/boot/grub/grub.cfg</"
"filename>."
msgstr ""
@@ -1616,10 +1564,15 @@ msgstr ""
"boot/grub/grub.cfg</filename>。"
#. Tag: para
-#: random-bits.xml:766
-#, no-c-format
+#: random-bits.xml:741
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Note that this assumes that a <filename>/dev/hda</filename> device file "
+#| "has been created. There are alternative methods to install "
+#| "<command>grub2</command>, but those are outside the scope of this "
+#| "appendix."
msgid ""
-"Note that this assumes that a <filename>/dev/hda</filename> device file has "
+"Note that this assumes that a <filename>/dev/sda</filename> device file has "
"been created. There are alternative methods to install <command>grub2</"
"command>, but those are outside the scope of this appendix."
msgstr ""
@@ -1627,17 +1580,26 @@ msgstr ""
"是安装 <command>grub2</command>,但它不属于本附录讨论范围。"
#. Tag: para
-#: random-bits.xml:772
+#: random-bits.xml:747
#, no-c-format
msgid "Here is a basic <filename>/etc/lilo.conf</filename> as an example:"
msgstr "下面有一个简单的<filename>/etc/lilo.conf</filename> 作为例子:"
#. Tag: screen
-#: random-bits.xml:776
-#, no-c-format
-msgid ""
-"boot=/dev/<replaceable>hda6</replaceable>\n"
-"root=/dev/<replaceable>hda6</replaceable>\n"
+#: random-bits.xml:751
+#, fuzzy, no-c-format
+#| msgid ""
+#| "boot=/dev/<replaceable>hda6</replaceable>\n"
+#| "root=/dev/<replaceable>hda6</replaceable>\n"
+#| "install=menu\n"
+#| "delay=20\n"
+#| "lba32\n"
+#| "image=/vmlinuz\n"
+#| "initrd=/initrd.img\n"
+#| "label=Debian"
+msgid ""
+"boot=/dev/<replaceable>sda6</replaceable>\n"
+"root=/dev/<replaceable>sda6</replaceable>\n"
"install=menu\n"
"delay=20\n"
"lba32\n"
@@ -1655,7 +1617,7 @@ msgstr ""
"label=Debian"
#. Tag: para
-#: random-bits.xml:778
+#: random-bits.xml:753
#, no-c-format
msgid ""
"Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
@@ -1672,15 +1634,28 @@ msgstr ""
"行 ybin (请记住,您在哪个系统里运行 <filename>yaboot.conf</filename> )。"
#. Tag: para
-#: random-bits.xml:788
-#, no-c-format
+#: random-bits.xml:763
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
+#| "<informalexample><screen>\n"
+#| "boot=/dev/hda2\n"
+#| "device=hd:\n"
+#| "partition=6\n"
+#| "root=/dev/hda6\n"
+#| "magicboot=/usr/lib/yaboot/ofboot\n"
+#| "timeout=50\n"
+#| "image=/vmlinux\n"
+#| "label=Debian\n"
+#| "</screen></informalexample> On some machines, you may need to use "
+#| "<userinput>ide0:</userinput> instead of <userinput>hd:</userinput>."
msgid ""
"Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
"<informalexample><screen>\n"
-"boot=/dev/hda2\n"
+"boot=/dev/sda2\n"
"device=hd:\n"
"partition=6\n"
-"root=/dev/hda6\n"
+"root=/dev/sda6\n"
"magicboot=/usr/lib/yaboot/ofboot\n"
"timeout=50\n"
"image=/vmlinux\n"
@@ -1702,14 +1677,14 @@ msgstr ""
"userinput> 换成 <userinput>hd:</userinput>。"
#. Tag: title
-#: random-bits.xml:801
+#: random-bits.xml:776
#, fuzzy, no-c-format
#| msgid "Remote access: Installing SSH and setting a password"
msgid "Remote access: Installing SSH and setting up access"
msgstr "远程访问:安装 SSH 并设置密码"
#. Tag: para
-#: random-bits.xml:802
+#: random-bits.xml:777
#, no-c-format
msgid ""
"In case you can login to the system via console, you can skip this section. "
@@ -1735,7 +1710,7 @@ msgid ""
msgstr ""
#. Tag: screen
-#: random-bits.xml:826
+#: random-bits.xml:801
#, no-c-format
msgid ""
"# adduser joe\n"
@@ -1743,13 +1718,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: random-bits.xml:831
+#: random-bits.xml:806
#, no-c-format
msgid "Finishing touches"
msgstr "最后一笔"
#. Tag: para
-#: random-bits.xml:832
+#: random-bits.xml:807
#, no-c-format
msgid ""
"As mentioned earlier, the installed system will be very basic. If you would "
@@ -1768,7 +1743,7 @@ msgstr ""
"装单独的软件包。"
#. Tag: para
-#: random-bits.xml:843
+#: random-bits.xml:818
#, no-c-format
msgid ""
"After the installation there will be a lot of downloaded packages in "
@@ -1779,19 +1754,19 @@ msgstr ""
"件包。您可以运行下面命令释放空间:"
#. Tag: screen
-#: random-bits.xml:849
+#: random-bits.xml:824
#, no-c-format
msgid "# aptitude clean"
msgstr "# aptitude clean"
#. Tag: title
-#: random-bits.xml:860
+#: random-bits.xml:835
#, no-c-format
msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
msgstr "通过 Parallel Line IP (PLIP) 来安装 &debian-gnu;"
#. Tag: para
-#: random-bits.xml:862
+#: random-bits.xml:837
#, no-c-format
msgid ""
"This section explains how to install &debian-gnu; on a computer without an "
@@ -1805,7 +1780,7 @@ msgstr ""
"接到具有 &debian; 镜像的网络(比如,互联网)。"
#. Tag: para
-#: random-bits.xml:870
+#: random-bits.xml:845
#, no-c-format
msgid ""
"In the example in this appendix we will set up a PLIP connection using a "
@@ -1819,7 +1794,7 @@ msgstr ""
"IP 地址(这些地址在您的网络地址空间里面未被占用)。"
#. Tag: para
-#: random-bits.xml:878
+#: random-bits.xml:853
#, no-c-format
msgid ""
"The PLIP connection set up during the installation will also be available "
@@ -1830,7 +1805,7 @@ msgstr ""
"linkend=\"boot-new\"/>)。"
#. Tag: para
-#: random-bits.xml:883
+#: random-bits.xml:858
#, no-c-format
msgid ""
"Before you start, you will need to check the BIOS configuration (IO base "
@@ -1842,13 +1817,13 @@ msgstr ""
"为 <literal>io=0x378</literal>,<literal>irq=7</literal>。"
#. Tag: title
-#: random-bits.xml:893
+#: random-bits.xml:868
#, no-c-format
msgid "Requirements"
msgstr "需求"
#. Tag: para
-#: random-bits.xml:896
+#: random-bits.xml:871
#, no-c-format
msgid ""
"A target computer, called <emphasis>target</emphasis>, where &debian; will "
@@ -1856,13 +1831,13 @@ msgid ""
msgstr "目标计算机,称为 <emphasis>target</emphasis>,将要安装 &debian;。"
#. Tag: para
-#: random-bits.xml:902
+#: random-bits.xml:877
#, no-c-format
msgid "System installation media; see <xref linkend=\"installation-media\"/>."
msgstr "系统安装介质;参阅 <xref linkend=\"installation-media\"/>。"
#. Tag: para
-#: random-bits.xml:907
+#: random-bits.xml:882
#, no-c-format
msgid ""
"Another computer connected to the Internet, called <emphasis>source</"
@@ -1871,7 +1846,7 @@ msgstr ""
"另外一台连接到互联网的计算机,称为 <emphasis>source</emphasis>,功能是网关。"
#. Tag: para
-#: random-bits.xml:913
+#: random-bits.xml:888
#, no-c-format
msgid ""
"A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -1882,13 +1857,13 @@ msgstr ""
"Install-HOWTO</ulink> 了解这种线的更多信息,以及如何自己制作。"
#. Tag: title
-#: random-bits.xml:925
+#: random-bits.xml:900
#, no-c-format
msgid "Setting up source"
msgstr "建立源"
#. Tag: para
-#: random-bits.xml:926
+#: random-bits.xml:901
#, no-c-format
msgid ""
"The following shell script is a simple example of how to configure the "
@@ -1898,7 +1873,7 @@ msgstr ""
"算机。"
#. Tag: screen
-#: random-bits.xml:931
+#: random-bits.xml:906
#, no-c-format
msgid ""
"#!/bin/sh\n"
@@ -1940,13 +1915,13 @@ msgstr ""
"echo 1 > /proc/sys/net/ipv4/ip_forward"
#. Tag: title
-#: random-bits.xml:937
+#: random-bits.xml:912
#, no-c-format
msgid "Installing target"
msgstr "安装目标"
#. Tag: para
-#: random-bits.xml:938
+#: random-bits.xml:913
#, no-c-format
msgid ""
"Boot the installation media. The installation needs to be run in expert "
@@ -1970,13 +1945,13 @@ msgstr ""
"</screen></informalexample> 下面是安装过程中各阶段所要提供的答案。"
#. Tag: guimenuitem
-#: random-bits.xml:957
+#: random-bits.xml:932
#, no-c-format
msgid "Load installer components from CD"
msgstr "从光盘加载安装组件"
#. Tag: para
-#: random-bits.xml:959
+#: random-bits.xml:934
#, no-c-format
msgid ""
"Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -1986,13 +1961,13 @@ msgstr ""
"用 PLIP 驱动。"
#. Tag: guimenuitem
-#: random-bits.xml:967
+#: random-bits.xml:942
#, no-c-format
msgid "Detect network hardware"
msgstr "侦测网络硬件"
#. Tag: para
-#: random-bits.xml:972
+#: random-bits.xml:947
#, no-c-format
msgid ""
"If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -2005,7 +1980,7 @@ msgstr ""
"系统没有网卡,安装程序不会显示该列表。"
#. Tag: para
-#: random-bits.xml:981
+#: random-bits.xml:956
#, no-c-format
msgid ""
"Because no network card was detected/selected earlier, the installer will "
@@ -2016,19 +1991,19 @@ msgstr ""
"<userinput>plip</userinput> 模块。"
#. Tag: guimenuitem
-#: random-bits.xml:993
+#: random-bits.xml:968
#, no-c-format
msgid "Configure the network"
msgstr "配置网络"
#. Tag: para
-#: random-bits.xml:996
+#: random-bits.xml:971
#, no-c-format
msgid "Auto-configure network with DHCP: No"
msgstr "Auto-configure network with DHCP: No"
#. Tag: para
-#: random-bits.xml:1001
+#: random-bits.xml:976
#, no-c-format
msgid ""
"IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -2036,7 +2011,7 @@ msgstr ""
"IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
#. Tag: para
-#: random-bits.xml:1006
+#: random-bits.xml:981
#, no-c-format
msgid ""
"Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -2046,7 +2021,7 @@ msgstr ""
"userinput>"
#. Tag: para
-#: random-bits.xml:1012
+#: random-bits.xml:987
#, no-c-format
msgid ""
"Name server addresses: you can enter the same addresses used on source (see "
@@ -2056,13 +2031,13 @@ msgstr ""
"resolv.conf</filename>)"
#. Tag: title
-#: random-bits.xml:1031
+#: random-bits.xml:1006
#, no-c-format
msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
msgstr "通过 PPP over Ethernet (PPPPoE) 来安装 &debian-gnu;"
#. Tag: para
-#: random-bits.xml:1033
+#: random-bits.xml:1008
#, no-c-format
msgid ""
"In some countries PPP over Ethernet (PPPoE) is a common protocol for "
@@ -2076,7 +2051,7 @@ msgstr ""
"本节将说明操作方法。"
#. Tag: para
-#: random-bits.xml:1041
+#: random-bits.xml:1016
#, no-c-format
msgid ""
"The PPPoE connection set up during the installation will also be available "
@@ -2087,7 +2062,7 @@ msgstr ""
"linkend=\"boot-new\"/>)。"
#. Tag: para
-#: random-bits.xml:1046
+#: random-bits.xml:1021
#, no-c-format
msgid ""
"To have the option of setting up and using PPPoE during the installation, "
@@ -2100,7 +2075,7 @@ msgstr ""
"phrase>)。"
#. Tag: para
-#: random-bits.xml:1053
+#: random-bits.xml:1028
#, no-c-format
msgid ""
"Installing over PPPoE is mostly the same as any other installation. The "
@@ -2108,7 +2083,7 @@ msgid ""
msgstr "通过 PPPoE 进行安装,绝大部分与其他方式相同。下面步骤说明不同之处。"
#. Tag: para
-#: random-bits.xml:1061
+#: random-bits.xml:1036
#, no-c-format
msgid ""
"Boot the installer with the boot parameter <userinput>modules=ppp-udeb</"
@@ -2123,7 +2098,7 @@ msgstr ""
"udeb</classname>) 会被加载并自动运行。"
#. Tag: para
-#: random-bits.xml:1076
+#: random-bits.xml:1051
#, no-c-format
msgid ""
"Follow the regular initial steps of the installation (language, country and "
@@ -2141,7 +2116,7 @@ msgstr ""
"footnote>)。"
#. Tag: para
-#: random-bits.xml:1095
+#: random-bits.xml:1070
#, no-c-format
msgid ""
"The next step is the detection of network hardware, in order to identify any "
@@ -2149,7 +2124,7 @@ msgid ""
msgstr "下一步是侦测网络硬件,目的是识别当前系统中的网卡。"
#. Tag: para
-#: random-bits.xml:1101
+#: random-bits.xml:1076
#, no-c-format
msgid ""
"After this the actual setup of PPPoE is started. The installer will probe "
@@ -2160,7 +2135,7 @@ msgstr ""
"处理 PPPoE 连接的服务器)。"
#. Tag: para
-#: random-bits.xml:1107
+#: random-bits.xml:1082
#, no-c-format
msgid ""
"It is possible that the concentrator will not to be found at the first "
@@ -2174,7 +2149,7 @@ msgstr ""
"<guimenuitem>Configure and start a PPPoE connection</guimenuitem>。"
#. Tag: para
-#: random-bits.xml:1116
+#: random-bits.xml:1091
#, no-c-format
msgid ""
"After a concentrator is found, the user will be prompted to type the login "
@@ -2182,7 +2157,7 @@ msgid ""
msgstr "连接找到之后,用户需要提供登录信息(PPPoE 用户名和密码)。"
#. Tag: para
-#: random-bits.xml:1122
+#: random-bits.xml:1097
#, no-c-format
msgid ""
"At this point the installer will use the provided information to establish "
@@ -2198,6 +2173,63 @@ msgstr ""
"信息不正确或有错误出现,安装程序将停止,但可以选择 <guimenuitem>Configure "
"and start PPPoE connection</guimenuitem> 菜单项重新配置。"
+#~ msgid "<filename>hda</filename>"
+#~ msgstr "<filename>hda</filename>"
+
+#~ msgid "IDE Hard disk / CD-ROM on the first IDE port (Master)"
+#~ msgstr "在第一个 IDE 口(Master)的 IDE 硬盘/光驱"
+
+#~ msgid "<filename>hdb</filename>"
+#~ msgstr "<filename>hdb</filename>"
+
+#~ msgid "IDE Hard disk / CD-ROM on the first IDE port (Slave)"
+#~ msgstr "在第一个 IDE 口(Slave)的 IDE 硬盘/光驱"
+
+#~ msgid "<filename>hdc</filename>"
+#~ msgstr "<filename>hdc</filename>"
+
+#~ msgid "IDE Hard disk / CD-ROM on the second IDE port (Master)"
+#~ msgstr "在第二个 IDE 口(Master)的 IDE 硬盘/光驱"
+
+#~ msgid "<filename>hdd</filename>"
+#~ msgstr "<filename>hdd</filename>"
+
+#~ msgid "IDE Hard disk / CD-ROM on the second IDE port (Slave)"
+#~ msgstr "在第二个 IDE 口(Slave)的 IDE 硬盘/光驱"
+
+#~ msgid "hda1"
+#~ msgstr "hda1"
+
+#~ msgid "hdd15"
+#~ msgstr "hdd15"
+
+#~ msgid "Fifteenth partition of the fourth IDE hard disk"
+#~ msgstr "在第四块 IDE 硬盘上的第十五个分区"
+
+#~ msgid "SCSI Hard disk with lowest SCSI ID (e.g. 0)"
+#~ msgstr "SCSI ID (比如 0)最小的 SCSI 硬盘"
+
+#~ msgid "SCSI Hard disk with next higher SCSI ID (e.g. 1)"
+#~ msgstr "下一个 SCSI ID (比如 1)的 SCSI 硬盘"
+
+#~ msgid "<filename>sdc</filename>"
+#~ msgstr "<filename>sdc</filename>"
+
+#~ msgid "SCSI Hard disk with next higher SCSI ID (e.g. 2)"
+#~ msgstr "下一个 SCSI ID (比如 2)的 SCSI 硬盘"
+
+#~ msgid "First partition of the first SCSI hard disk"
+#~ msgstr "在第一块 SCSI 硬盘上的第一个分区"
+
+#~ msgid "sdd10"
+#~ msgstr "sdd10"
+
+#~ msgid "SCSI CD-ROM with the lowest SCSI ID"
+#~ msgstr "SCSI ID 最小的 SCSI 光驱"
+
+#~ msgid "SCSI CD-ROM with the next higher SCSI ID"
+#~ msgstr "下一个 SCSI ID 的 SCSI 光驱"
+
#~ msgid ""
#~ "There is some overlap of the Laptop task with the Desktop environment "
#~ "task. If you install both, the Laptop task will only require a few MB "
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index beb9b8bfe..c63408f68 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: 2015-01-09 19:07+0000\n"
+"POT-Creation-Date: 2015-04-15 20:29+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"
@@ -1544,13 +1544,22 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:1083
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If a hard disk has previously used under Solaris, the partitioner may not "
+#| "detect the size of the drive correctly. Creating a new partition table "
+#| "does not fix this issue. What does help, is to <quote>zero</quote> the "
+#| "first few sectors of the drive: <informalexample><screen>\n"
+#| "# dd if=/dev/zero of=/dev/hd<replaceable>X</replaceable> bs=512 count=2; "
+#| "sync\n"
+#| "</screen></informalexample> Note that this will make any existing data on "
+#| "that disk inaccessible."
msgid ""
"If a hard disk has previously used under Solaris, the partitioner may not "
"detect the size of the drive correctly. Creating a new partition table does "
"not fix this issue. What does help, is to <quote>zero</quote> the first few "
"sectors of the drive: <informalexample><screen>\n"
-"# dd if=/dev/zero of=/dev/hd<replaceable>X</replaceable> bs=512 count=2; "
+"# dd if=/dev/zero of=/dev/sd<replaceable>X</replaceable> bs=512 count=2; "
"sync\n"
"</screen></informalexample> Note that this will make any existing data on "
"that disk inaccessible."
@@ -2072,12 +2081,18 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:1367
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you choose guided partitioning for your IA-64 system, there will be an "
+#| "additional partition, formatted as a FAT16 bootable filesystem, for the "
+#| "EFI boot loader. There is also an additional menu item in the formatting "
+#| "menu to manually set up a partition as an EFI boot partition."
msgid ""
-"If you choose guided partitioning for your IA-64 system, there will be an "
-"additional partition, formatted as a FAT16 bootable filesystem, for the EFI "
-"boot loader. There is also an additional menu item in the formatting menu to "
-"manually set up a partition as an EFI boot partition."
+"If you have booted in EFI mode then within the guided partitioning setup "
+"there will be an additional partition, formatted as a FAT32 bootable "
+"filesystem, for the EFI boot loader. This partition is known as an EFI "
+"System Partition (ESP). There is also an additional menu item in the "
+"formatting menu to manually set up a partition as an ESP."
msgstr ""
"倘若您为 IA-64 系统选择了导引式分区,就会有一个额外的分区,该分区格式化为 "
"FAT16 可引导文件系统,用于 EFI boot loader。同时,菜单里也会加一项,让您可以"
@@ -2096,27 +2111,48 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:1381
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The list of partitions might look like this: <informalexample><screen>\n"
+#| " IDE1 master (hda) - 6.4 GB WDC AC36400L\n"
+#| " #1 primary 16.4 MB B f ext2 /boot\n"
+#| " #2 primary 551.0 MB swap swap\n"
+#| " #3 primary 5.8 GB ntfs\n"
+#| " pri/log 8.2 MB FREE SPACE\n"
+#| "\n"
+#| " IDE1 slave (hdb) - 80.0 GB ST380021A\n"
+#| " #1 primary 15.9 MB ext3\n"
+#| " #2 primary 996.0 MB fat16\n"
+#| " #3 primary 3.9 GB xfs /home\n"
+#| " #5 logical 6.0 GB f ext3 /\n"
+#| " #6 logical 1.0 GB f ext3 /var\n"
+#| " #7 logical 498.8 MB ext3\n"
+#| " #8 logical 551.5 MB swap swap\n"
+#| " #9 logical 65.8 GB ext2\n"
+#| "</screen></informalexample> This example shows two IDE harddrives divided "
+#| "into several partitions; the first disk has some free space. Each "
+#| "partition line consists of the partition number, its type, size, optional "
+#| "flags, file system, and mountpoint (if any). Note: this particular setup "
+#| "cannot be created using guided partitioning but it does show possible "
+#| "variation that can be achieved using manual partitioning."
msgid ""
"The list of partitions might look like this: <informalexample><screen>\n"
-" IDE1 master (hda) - 6.4 GB WDC AC36400L\n"
+" SCSI1 (0,0,0) (sda) - 6.4 GB WDC AC36400L\n"
" #1 primary 16.4 MB B f ext2 /boot\n"
" #2 primary 551.0 MB swap swap\n"
" #3 primary 5.8 GB ntfs\n"
" pri/log 8.2 MB FREE SPACE\n"
"\n"
-" IDE1 slave (hdb) - 80.0 GB ST380021A\n"
+" SCSI2 (1,0,0) (sdb) - 80.0 GB ST380021A\n"
" #1 primary 15.9 MB ext3\n"
" #2 primary 996.0 MB fat16\n"
" #3 primary 3.9 GB xfs /home\n"
-" #5 logical 6.0 GB f ext3 /\n"
+" #5 logical 6.0 GB f ext4 /\n"
" #6 logical 1.0 GB f ext3 /var\n"
" #7 logical 498.8 MB ext3\n"
-" #8 logical 551.5 MB swap swap\n"
-" #9 logical 65.8 GB ext2\n"
-"</screen></informalexample> This example shows two IDE harddrives divided "
-"into several partitions; the first disk has some free space. Each partition "
-"line consists of the partition number, its type, size, optional flags, file "
+"</screen></informalexample> This example shows two hard drives divided into "
+"several partitions; the first disk has some free space. Each partition line "
+"consists of the partition number, its type, size, optional flags, file "
"system, and mountpoint (if any). Note: this particular setup cannot be "
"created using guided partitioning but it does show possible variation that "
"can be achieved using manual partitioning."
@@ -2286,11 +2322,15 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:1465
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you forget to select and format an EFI boot partition, "
+#| "<command>partman</command> will detect this and will not let you continue "
+#| "until you allocate one."
msgid ""
-"If you forget to select and format an EFI boot partition, <command>partman</"
-"command> will detect this and will not let you continue until you allocate "
-"one."
+"If you boot in EFI mode but forget to select and format an EFI System "
+"Partition, <command>partman</command> will detect this and will not let you "
+"continue until you allocate one."
msgstr ""
"如果您忘记选择和格式化一个 EFI 启动分区 <command>partman</command> 会察觉这一"
"点,不让您继续操作,直到您划分出这样一个分区。"
@@ -2635,22 +2675,7 @@ msgstr ""
"<filename>/</filename> 同时 RAID1 给 <filename>/boot</filename> 是一种方式。"
#. Tag: para
-#: using-d-i.xml:1728
-#, no-c-format
-msgid ""
-"Support for MD is a relatively new addition to the installer. You may "
-"experience problems for some RAID levels and in combination with some "
-"bootloaders if you try to use MD for the root (<filename>/</filename>) file "
-"system. For experienced users, it may be possible to work around some of "
-"these problems by executing some configuration or installation steps "
-"manually from a shell."
-msgstr ""
-"在安装程序中支持 MD 是相对新的功能。如果您尝试结合一些 RAID 类型与启动引导器"
-"并将 MD 用于根(<filename>/</filename>)文件系统,您也许会经历一些挫折。对有经"
-"验的用户,从 shell 手动地处理一些配置和安装步骤,也许会绕开这些问题。"
-
-#. Tag: para
-#: using-d-i.xml:1737
+#: using-d-i.xml:1727
#, no-c-format
msgid ""
"Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> "
@@ -2670,7 +2695,7 @@ msgstr ""
"RAID1)。后续操作会根据您选择的 MD 类型而定。"
#. Tag: para
-#: using-d-i.xml:1750
+#: using-d-i.xml:1740
#, no-c-format
msgid ""
"RAID0 is simple &mdash; you will be issued with the list of available RAID "
@@ -2681,7 +2706,7 @@ msgstr ""
"组成 MD 的分区。"
#. Tag: para
-#: using-d-i.xml:1757
+#: using-d-i.xml:1747
#, no-c-format
msgid ""
"RAID1 is a bit more tricky. First, you will be asked to enter the number of "
@@ -2698,7 +2723,7 @@ msgstr ""
"将不会允许您继续下去,直到纠正错误。"
#. Tag: para
-#: using-d-i.xml:1769
+#: using-d-i.xml:1759
#, no-c-format
msgid ""
"RAID5 has a setup procedure similar to RAID1 with the exception that you "
@@ -2708,7 +2733,7 @@ msgstr ""
"区。"
#. Tag: para
-#: using-d-i.xml:1775
+#: using-d-i.xml:1765
#, no-c-format
msgid ""
"RAID6 also has a setup procedure similar to RAID1 except that at least "
@@ -2718,7 +2743,7 @@ msgstr ""
"区。"
#. Tag: para
-#: using-d-i.xml:1781
+#: using-d-i.xml:1771
#, no-c-format
msgid ""
"RAID10 again has a setup procedure similar to RAID1 except in expert mode. "
@@ -2736,7 +2761,7 @@ msgstr ""
"贝数。这些活动设备必须是让所有的拷贝可以分布到不同磁盘。"
#. Tag: para
-#: using-d-i.xml:1795
+#: using-d-i.xml:1785
#, no-c-format
msgid ""
"It is perfectly possible to have several types of MD at once. For example, "
@@ -2752,7 +2777,7 @@ msgstr ""
"RAID1 (相当可靠的 100 GB 分区用于 <filename>/home</filename>)。"
#. Tag: para
-#: using-d-i.xml:1804
+#: using-d-i.xml:1794
#, no-c-format
msgid ""
"After you set up MD devices to your liking, you can <guimenuitem>Finish</"
@@ -2765,13 +2790,13 @@ msgstr ""
"您的新 MD 设备,并分配挂载点这样的属性。"
#. Tag: title
-#: using-d-i.xml:1819
+#: using-d-i.xml:1809
#, no-c-format
msgid "Configuring the Logical Volume Manager (LVM)"
msgstr "配置逻辑卷管理(LVM)"
#. Tag: para
-#: using-d-i.xml:1820
+#: using-d-i.xml:1810
#, no-c-format
msgid ""
"If you are working with computers at the level of system administrator or "
@@ -2785,7 +2810,7 @@ msgstr ""
"或符号链接等方法来折腾。"
#. Tag: para
-#: using-d-i.xml:1828
+#: using-d-i.xml:1818
#, no-c-format
msgid ""
"To avoid the described situation you can use Logical Volume Manager (LVM). "
@@ -2803,7 +2828,7 @@ msgstr ""
"点在于它可以跨越多个物理磁盘。"
#. Tag: para
-#: using-d-i.xml:1838
+#: using-d-i.xml:1828
#, no-c-format
msgid ""
"Now when you realize you need more space for your old 160GB <filename>/home</"
@@ -2821,7 +2846,7 @@ msgstr ""
"阅 <ulink url=\"&url-lvm-howto;\">LVM HOWTO</ulink>。"
#. Tag: para
-#: using-d-i.xml:1849
+#: using-d-i.xml:1839
#, no-c-format
msgid ""
"LVM setup in &d-i; is quite simple and completely supported inside "
@@ -2836,7 +2861,7 @@ msgstr ""
"<guimenuitem>physical volume for LVM</guimenuitem> </menuchoice>"
#. Tag: para
-#: using-d-i.xml:1858
+#: using-d-i.xml:1848
#, no-c-format
msgid ""
"When you return to the main <command>partman</command> screen, you will see "
@@ -2853,7 +2878,7 @@ msgstr ""
"了 LVM 配置的小结。菜单项本身是与内容相关,只显示可用的操作。可能的操作有:"
#. Tag: para
-#: using-d-i.xml:1869
+#: using-d-i.xml:1859
#, no-c-format
msgid ""
"<guimenuitem>Display configuration details</guimenuitem>: shows LVM device "
@@ -2863,43 +2888,43 @@ msgstr ""
"名称和逻辑卷尺寸等"
#. Tag: guimenuitem
-#: using-d-i.xml:1874
+#: using-d-i.xml:1864
#, no-c-format
msgid "Create volume group"
msgstr "Create volume group"
#. Tag: guimenuitem
-#: using-d-i.xml:1877
+#: using-d-i.xml:1867
#, no-c-format
msgid "Create logical volume"
msgstr "Create logical volume"
#. Tag: guimenuitem
-#: using-d-i.xml:1880
+#: using-d-i.xml:1870
#, no-c-format
msgid "Delete volume group"
msgstr "Delete volume group"
#. Tag: guimenuitem
-#: using-d-i.xml:1883
+#: using-d-i.xml:1873
#, no-c-format
msgid "Delete logical volume"
msgstr "Delete logical volume"
#. Tag: guimenuitem
-#: using-d-i.xml:1886
+#: using-d-i.xml:1876
#, no-c-format
msgid "Extend volume group"
msgstr "Extend volume group"
#. Tag: guimenuitem
-#: using-d-i.xml:1889
+#: using-d-i.xml:1879
#, no-c-format
msgid "Reduce volume group"
msgstr "Reduce volume group"
#. Tag: para
-#: using-d-i.xml:1891
+#: using-d-i.xml:1881
#, no-c-format
msgid ""
"<guimenuitem>Finish</guimenuitem>: return to the main <command>partman</"
@@ -2908,7 +2933,7 @@ msgstr ""
"<guimenuitem>Finish</guimenuitem>: 返回 <command>partman</command> 主界面"
#. Tag: para
-#: using-d-i.xml:1897
+#: using-d-i.xml:1887
#, no-c-format
msgid ""
"Use the options in that menu to first create a volume group and then create "
@@ -2916,7 +2941,7 @@ msgid ""
msgstr "使用该菜单内的选项首先创建卷组,然后在里面创建逻辑卷。"
#. Tag: para
-#: using-d-i.xml:1902
+#: using-d-i.xml:1892
#, no-c-format
msgid ""
"After you return to the main <command>partman</command> screen, any created "
@@ -2927,13 +2952,13 @@ msgstr ""
"通的分区一样(您也应该这样对待它们)。"
#. Tag: title
-#: using-d-i.xml:1916
+#: using-d-i.xml:1906
#, no-c-format
msgid "Configuring Encrypted Volumes"
msgstr "配置加密卷"
#. Tag: para
-#: using-d-i.xml:1917
+#: using-d-i.xml:1907
#, no-c-format
msgid ""
"&d-i; allows you to set up encrypted partitions. Every file you write to "
@@ -2951,7 +2976,7 @@ msgstr ""
"许可以访问硬盘,但是没有正确的口令,硬盘上的数据看起来就像是随机的字符。"
#. Tag: para
-#: using-d-i.xml:1929
+#: using-d-i.xml:1919
#, no-c-format
msgid ""
"The two most important partitions to encrypt are: the home partition, where "
@@ -2974,7 +2999,7 @@ msgstr ""
"加载内核。"
#. Tag: para
-#: using-d-i.xml:1944
+#: using-d-i.xml:1934
#, no-c-format
msgid ""
"Please note that the performance of encrypted partitions will be less than "
@@ -2986,7 +3011,7 @@ msgstr ""
"密和解密。性能将与您的 CPU 速度、选择的加密算法和密钥长度紧密相关。"
#. Tag: para
-#: using-d-i.xml:1951
+#: using-d-i.xml:1941
#, no-c-format
msgid ""
"To use encryption, you have to create a new partition by selecting some free "
@@ -3004,7 +3029,7 @@ msgstr ""
"guimenu> </menuchoice> 选项。菜单将包含分区的加密选项。"
#. Tag: para
-#: using-d-i.xml:1962
+#: using-d-i.xml:1952
#, no-c-format
msgid ""
"The encryption method supported by &d-i; is <firstterm>dm-crypt</firstterm> "
@@ -3012,7 +3037,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:1971
+#: using-d-i.xml:1961
#, fuzzy, no-c-format
#| msgid ""
#| "First, let's have a look at the options available when you select "
@@ -3030,13 +3055,13 @@ msgstr ""
"的安全考虑的选择。"
#. Tag: term
-#: using-d-i.xml:1981
+#: using-d-i.xml:1971
#, no-c-format
msgid "Encryption: <userinput>aes</userinput>"
msgstr "Encryption: <userinput>aes</userinput>"
#. Tag: para
-#: using-d-i.xml:1983
+#: using-d-i.xml:1973
#, no-c-format
msgid ""
"This option lets you select the encryption algorithm (<firstterm>cipher</"
@@ -3059,13 +3084,13 @@ msgstr ""
"纪的敏感信息。"
#. Tag: term
-#: using-d-i.xml:2001
+#: using-d-i.xml:1991
#, no-c-format
msgid "Key size: <userinput>256</userinput>"
msgstr "Key size: <userinput>256</userinput>"
#. Tag: para
-#: using-d-i.xml:2003
+#: using-d-i.xml:1993
#, no-c-format
msgid ""
"Here you can specify the length of the encryption key. With a larger key "
@@ -3077,14 +3102,14 @@ msgstr ""
"加长度自然会降低性能。cipher 决定可用的密钥长度。"
#. Tag: term
-#: using-d-i.xml:2015
+#: using-d-i.xml:2005
#, fuzzy, no-c-format
#| msgid "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
msgid "IV algorithm: <userinput>xts-plain64</userinput>"
msgstr "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
#. Tag: para
-#: using-d-i.xml:2017
+#: using-d-i.xml:2007
#, no-c-format
msgid ""
"The <firstterm>Initialization Vector</firstterm> or <firstterm>IV</"
@@ -3100,7 +3125,7 @@ msgstr ""
"复模板推断信息。"
#. Tag: para
-#: using-d-i.xml:2027
+#: using-d-i.xml:2017
#, fuzzy, no-c-format
#| msgid ""
#| "From the provided alternatives, the default <userinput>cbc-essiv:sha256</"
@@ -3118,25 +3143,25 @@ msgstr ""
"法时,才使用其他的算法。"
#. Tag: term
-#: using-d-i.xml:2039
+#: using-d-i.xml:2029
#, no-c-format
msgid "Encryption key: <userinput>Passphrase</userinput>"
msgstr "Encryption key: <userinput>Passphrase</userinput>"
#. Tag: para
-#: using-d-i.xml:2041
+#: using-d-i.xml:2031
#, no-c-format
msgid "Here you can choose the type of the encryption key for this partition."
msgstr "这里您可以为分区选择所使用的加密密钥类型。"
#. Tag: term
-#: using-d-i.xml:2047
+#: using-d-i.xml:2037
#, no-c-format
msgid "Passphrase"
msgstr "Passphrase"
#. Tag: para
-#: using-d-i.xml:2048
+#: using-d-i.xml:2038
#, no-c-format
msgid ""
"The encryption key will be computed<footnote> <para> Using a passphrase as "
@@ -3149,13 +3174,13 @@ msgstr ""
"使用时要求输入。"
#. Tag: term
-#: using-d-i.xml:2063
+#: using-d-i.xml:2053
#, no-c-format
msgid "Random key"
msgstr "Random key"
#. Tag: para
-#: using-d-i.xml:2064
+#: using-d-i.xml:2054
#, no-c-format
msgid ""
"A new encryption key will be generated from random data each time you try to "
@@ -3170,7 +3195,7 @@ msgstr ""
"面临暴力破解,但是除非加密算法中有未知的弱点,这辈子也不会被攻破。)"
#. Tag: para
-#: using-d-i.xml:2073
+#: using-d-i.xml:2063
#, no-c-format
msgid ""
"Random keys are useful for swap partitions because you do not need to bother "
@@ -3187,13 +3212,13 @@ msgstr ""
"写入到交换分区的数据。"
#. Tag: term
-#: using-d-i.xml:2092
+#: using-d-i.xml:2082
#, no-c-format
msgid "Erase data: <userinput>yes</userinput>"
msgstr "Erase data: <userinput>yes</userinput>"
#. Tag: para
-#: using-d-i.xml:2094
+#: using-d-i.xml:2084
#, no-c-format
msgid ""
"Determines whether the content of this partition should be overwritten with "
@@ -3211,7 +3236,7 @@ msgstr ""
"备上的数据。</para></footnote>。"
#. Tag: para
-#: using-d-i.xml:2115
+#: using-d-i.xml:2105
#, no-c-format
msgid ""
"After you have selected the desired parameters for your encrypted "
@@ -3226,7 +3251,7 @@ msgstr ""
"标记分区上的数据,以及写新分区表等动作。对于大的分区,这会花一些时间。"
#. Tag: para
-#: using-d-i.xml:2125
+#: using-d-i.xml:2115
#, no-c-format
msgid ""
"Next you will be asked to enter a passphrase for partitions configured to "
@@ -3240,7 +3265,7 @@ msgstr ""
"(比如生日、爱好、宠物的名字、以及家里其他成员的名字,等等)。"
#. Tag: para
-#: using-d-i.xml:2134
+#: using-d-i.xml:2124
#, no-c-format
msgid ""
"Before you input any passphrases, you should have made sure that your "
@@ -3260,7 +3285,7 @@ msgstr ""
"所选择的键盘布局未能正确建立,而且是在为根文件系统输入 passphrase 的时候。"
#. Tag: para
-#: using-d-i.xml:2147
+#: using-d-i.xml:2137
#, no-c-format
msgid ""
"If you selected to use methods other than a passphrase to create encryption "
@@ -3279,7 +3304,7 @@ msgstr ""
"程在每个要加密的分区重复进行。"
#. Tag: para
-#: using-d-i.xml:2163
+#: using-d-i.xml:2153
#, fuzzy, no-c-format
#| msgid ""
#| "After returning to the main partitioning menu, you will see all encrypted "
@@ -3321,7 +3346,7 @@ msgstr ""
"您不合适,可以进行修改。"
#. Tag: para
-#: using-d-i.xml:2175
+#: using-d-i.xml:2165
#, fuzzy, no-c-format
#| msgid ""
#| "Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</"
@@ -3344,7 +3369,7 @@ msgstr ""
"面的 <xref linkend=\"mount-encrypted-volumes\"/> 说明。"
#. Tag: para
-#: using-d-i.xml:2185
+#: using-d-i.xml:2175
#, no-c-format
msgid ""
"Once you are satisfied with the partitioning scheme, continue with the "
@@ -3352,13 +3377,13 @@ msgid ""
msgstr "当您满意分区之后,可以继续安装过程。"
#. Tag: title
-#: using-d-i.xml:2196
+#: using-d-i.xml:2186
#, no-c-format
msgid "Installing the Base System"
msgstr "安装基本系统"
#. Tag: para
-#: using-d-i.xml:2197
+#: using-d-i.xml:2187
#, no-c-format
msgid ""
"Although this stage is the least problematic, it consumes a significant "
@@ -3370,7 +3395,7 @@ msgstr ""
"果您用较慢的计算机或网络,这要花费好一会儿时间。"
#. Tag: para
-#: using-d-i.xml:2210
+#: using-d-i.xml:2200
#, no-c-format
msgid ""
"During installation of the base system, package unpacking and setup messages "
@@ -3385,7 +3410,7 @@ msgstr ""
"Alt</keycap><keycap>F1</keycap></keycombo>。"
#. Tag: para
-#: using-d-i.xml:2219
+#: using-d-i.xml:2209
#, no-c-format
msgid ""
"The unpack/setup messages generated during this phase are also saved in "
@@ -3396,7 +3421,7 @@ msgstr ""
"<filename>/var/log/syslog</filename>。"
#. Tag: para
-#: using-d-i.xml:2225
+#: using-d-i.xml:2215
#, no-c-format
msgid ""
"As part of the installation, a &arch-kernel; kernel will be installed. At "
@@ -3409,7 +3434,7 @@ msgstr ""
"核。"
#. Tag: para
-#: using-d-i.xml:2232
+#: using-d-i.xml:2222
#, no-c-format
msgid ""
"When packages are installed using the package management system, it will by "
@@ -3424,7 +3449,7 @@ msgstr ""
"看,正常情况下应该安装这些软件。"
#. Tag: para
-#: using-d-i.xml:2242
+#: using-d-i.xml:2232
#, no-c-format
msgid ""
"For technical reasons packages installed during the installation of the base "
@@ -3436,13 +3461,13 @@ msgstr ""
"</quote>。上面提到的原则只适用于之后的安装过程。"
#. Tag: title
-#: using-d-i.xml:2254
+#: using-d-i.xml:2244
#, no-c-format
msgid "Installing Additional Software"
msgstr "安装额外的软件"
#. Tag: para
-#: using-d-i.xml:2255
+#: using-d-i.xml:2245
#, no-c-format
msgid ""
"At this point you have a usable but limited system. Most users will want to "
@@ -3455,13 +3480,13 @@ msgstr ""
"装基本系统还要花时间。"
#. Tag: title
-#: using-d-i.xml:2270
+#: using-d-i.xml:2260
#, no-c-format
msgid "Configuring apt"
msgstr "配置 apt"
#. Tag: para
-#: using-d-i.xml:2272
+#: using-d-i.xml:2262
#, fuzzy, no-c-format
#| msgid ""
#| "One of the tools used to install packages on a &debian-gnu; system is a "
@@ -3506,7 +3531,7 @@ msgstr ""
"软件包管理工具使用。"
#. Tag: para
-#: using-d-i.xml:2295
+#: using-d-i.xml:2285
#, no-c-format
msgid ""
"<command>apt</command> must be configured so that it knows from where to "
@@ -3519,7 +3544,7 @@ msgstr ""
"并编辑成自己喜欢的地方。"
#. Tag: para
-#: using-d-i.xml:2302
+#: using-d-i.xml:2292
#, fuzzy, no-c-format
#| msgid ""
#| "If you are installing at default priority, the installer will largely "
@@ -3541,7 +3566,7 @@ msgstr ""
"序程序会自动加上安全镜像,它是 <quote>volatile</quote> 更新服务的镜像。"
#. Tag: para
-#: using-d-i.xml:2311
+#: using-d-i.xml:2301
#, fuzzy, no-c-format
#| msgid ""
#| "If you are installing at a lower priority (e.g. in expert mode), you will "
@@ -3561,13 +3586,13 @@ msgstr ""
"和 <quote>non-free</quote> 软件仓库里面添加软件包。"
#. Tag: title
-#: using-d-i.xml:2322
+#: using-d-i.xml:2312
#, no-c-format
msgid "Installing from more than one CD or DVD"
msgstr "从多个 CD 或 DVD 安装"
#. Tag: para
-#: using-d-i.xml:2324
+#: using-d-i.xml:2314
#, no-c-format
msgid ""
"If you are installing from a CD or a DVD that is part of a larger set, the "
@@ -3580,7 +3605,7 @@ msgstr ""
"们里面的软件包了。"
#. Tag: para
-#: using-d-i.xml:2331
+#: using-d-i.xml:2321
#, no-c-format
msgid ""
"If you do not have any additional CDs or DVDs, that is no problem: using "
@@ -3592,7 +3617,7 @@ msgstr ""
"节说明),意味着下一步中选择的任务里面并非所有的软件包都会安装。"
#. Tag: para
-#: using-d-i.xml:2339
+#: using-d-i.xml:2329
#, no-c-format
msgid ""
"Packages are included on CDs (and DVDs) in the order of their popularity. "
@@ -3604,7 +3629,7 @@ msgstr ""
"常用的软件,而最后一张光盘里面包含的是很少有人用到的软件。"
#. Tag: para
-#: using-d-i.xml:2346
+#: using-d-i.xml:2336
#, no-c-format
msgid ""
"It also means that buying or downloading and burning a full CD set is just a "
@@ -3618,7 +3643,7 @@ msgstr ""
"DVD 的情况类似:只要一张,或者前两张 DVD 就能满足您大部分要求。"
#. Tag: para
-#: using-d-i.xml:2356
+#: using-d-i.xml:2346
#, no-c-format
msgid ""
"If you do scan multiple CDs or DVDs, the installer will prompt you to "
@@ -3633,13 +3658,13 @@ msgstr ""
"照次序来可以降低出错的几率。"
#. Tag: title
-#: using-d-i.xml:2369
+#: using-d-i.xml:2359
#, no-c-format
msgid "Using a network mirror"
msgstr "使用网络镜像"
#. Tag: para
-#: using-d-i.xml:2371
+#: using-d-i.xml:2361
#, no-c-format
msgid ""
"One question that will be asked during most installs is whether or not to "
@@ -3650,7 +3675,7 @@ msgstr ""
"默认答案会很好,但还是有一些例外。"
#. Tag: para
-#: using-d-i.xml:2377
+#: using-d-i.xml:2367
#, no-c-format
msgid ""
"If you are <emphasis>not</emphasis> installing from a full CD or DVD or "
@@ -3666,7 +3691,7 @@ msgstr ""
"<literal>desktop</literal> 任务。"
#. Tag: para
-#: using-d-i.xml:2386
+#: using-d-i.xml:2376
#, no-c-format
msgid ""
"If you are installing from a single full CD or using a full CD image, using "
@@ -3683,7 +3708,7 @@ msgstr ""
"装,以后(比如,重新启动到新系统)再安装额外的软件包。"
#. Tag: para
-#: using-d-i.xml:2397
+#: using-d-i.xml:2387
#, no-c-format
msgid ""
"If you are installing from a DVD or using a DVD image, any packages needed "
@@ -3696,7 +3721,7 @@ msgstr ""
"项。"
#. Tag: para
-#: using-d-i.xml:2404
+#: using-d-i.xml:2394
#, no-c-format
msgid ""
"One advantage of adding a network mirror is that updates that have occurred "
@@ -3709,7 +3734,7 @@ msgstr ""
"可以安装已经更新的内容,确保了系统的安全性和稳定性。。"
#. Tag: para
-#: using-d-i.xml:2411
+#: using-d-i.xml:2401
#, no-c-format
msgid ""
"In summary: selecting a network mirror is generally a good idea, except if "
@@ -3723,26 +3748,26 @@ msgstr ""
"的数据量取决于"
#. Tag: para
-#: using-d-i.xml:2420
+#: using-d-i.xml:2410
#, no-c-format
msgid "the tasks you select in the next step of the installation,"
msgstr "安装下一步选择的任务,"
#. Tag: para
-#: using-d-i.xml:2425
+#: using-d-i.xml:2415
#, no-c-format
msgid "which packages are needed for those tasks,"
msgstr "这些任务所需的软件包,"
#. Tag: para
-#: using-d-i.xml:2430
+#: using-d-i.xml:2420
#, 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:2435
+#: using-d-i.xml:2425
#, fuzzy, no-c-format
#| msgid ""
#| "whether any updated versions of packages included on the CDs or DVDs are "
@@ -3757,7 +3782,7 @@ msgstr ""
"安全更新的镜像)。"
#. Tag: para
-#: using-d-i.xml:2444
+#: using-d-i.xml:2434
#, fuzzy, no-c-format
#| msgid ""
#| "Note that the last point means that, even if you choose not to use a "
@@ -3774,13 +3799,13 @@ msgstr ""
"且软件包有安全更新,仍然会从互联网下载更新后的软件包。"
#. Tag: title
-#: using-d-i.xml:2455
+#: using-d-i.xml:2445
#, no-c-format
msgid "Choosing a network mirror"
msgstr "选择网络镜像"
#. Tag: para
-#: using-d-i.xml:2456
+#: using-d-i.xml:2446
#, no-c-format
msgid ""
"If you have selected to use a network mirror during the installation "
@@ -3794,7 +3819,7 @@ msgstr ""
"列表。通常选择默认的就行。"
#. Tag: para
-#: using-d-i.xml:2464
+#: using-d-i.xml:2454
#, no-c-format
msgid ""
"A mirror can also be specified by hand by choosing <quote>enter information "
@@ -3805,7 +3830,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:2472
+#: using-d-i.xml:2462
#, no-c-format
msgid ""
"If your computer is on an IPv6-only network (which is probably not the case "
@@ -3829,13 +3854,21 @@ msgstr ""
"快的哪个。"
#. Tag: para
-#: using-d-i.xml:2486
-#, no-c-format
+#: using-d-i.xml:2476
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Another option when choosing to specify the mirror manually is to use "
+#| "<quote>http.debian.net</quote> as your mirror. <quote>http.debian.net</"
+#| "quote> is not a physical mirror but a mirror redirection service, i.e. it "
+#| "automatically refers your system to a real mirror near you in terms of "
+#| "network topology. It takes into account by which protocol you connect to "
+#| "it, i.e. if you use IPv6, it will refer you to an IPv6-capable mirror "
+#| "near you."
msgid ""
"Another option when choosing to specify the mirror manually is to use "
-"<quote>http.debian.net</quote> as your mirror. <quote>http.debian.net</"
-"quote> is not a physical mirror but a mirror redirection service, i.e. it "
-"automatically refers your system to a real mirror near you in terms of "
+"<quote>httpredir.debian.org</quote> as your mirror. <quote>httpredir.debian."
+"org</quote> is not a physical mirror but a mirror redirection service, i.e. "
+"it automatically refers your system to a real mirror near you in terms of "
"network topology. It takes into account by which protocol you connect to it, "
"i.e. if you use IPv6, it will refer you to an IPv6-capable mirror near you."
msgstr ""
@@ -3845,13 +3878,13 @@ msgstr ""
"连接所采用的协议,比如使用 IPv6,它将自动将您引到最近的 IPv6 镜像服务器。"
#. Tag: title
-#: using-d-i.xml:2505
+#: using-d-i.xml:2495
#, no-c-format
msgid "Selecting and Installing Software"
msgstr "选择和安装软件"
#. Tag: para
-#: using-d-i.xml:2507
+#: using-d-i.xml:2497
#, no-c-format
msgid ""
"During the installation process, you are given the opportunity to select "
@@ -3866,7 +3899,7 @@ msgstr ""
"来快速建立您的计算机应对各种任务。"
#. Tag: para
-#: using-d-i.xml:2516
+#: using-d-i.xml:2506
#, no-c-format
msgid ""
"So, you have the ability to choose <emphasis>tasks</emphasis> first, and "
@@ -3896,7 +3929,7 @@ msgstr ""
"空间。"
#. Tag: para
-#: using-d-i.xml:2543
+#: using-d-i.xml:2533
#, no-c-format
msgid ""
"Some tasks may be pre-selected based on the characteristics of the computer "
@@ -3907,7 +3940,7 @@ msgstr ""
"些任务。此时甚至可以不选中任何任务。"
#. Tag: para
-#: using-d-i.xml:2550
+#: using-d-i.xml:2540
#, no-c-format
msgid ""
"In the standard user interface of the installer, you can use the space bar "
@@ -3915,7 +3948,7 @@ msgid ""
msgstr "在安装程序的标准用户界面下,您可以使用空格键切换任务的选择。"
#. Tag: para
-#: using-d-i.xml:2556
+#: using-d-i.xml:2546
#, fuzzy, no-c-format
#| msgid ""
#| "Unless you are using the special KDE or Xfce/LXDE CDs, the <quote>Desktop "
@@ -3928,7 +3961,7 @@ msgstr ""
"GNOME 桌面环境。"
#. Tag: para
-#: using-d-i.xml:2561
+#: using-d-i.xml:2551
#, no-c-format
msgid ""
"By default, &d-i; installs the <phrase arch=\"x86\">Gnome</phrase> <phrase "
@@ -3939,7 +3972,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:2569
+#: using-d-i.xml:2559
#, fuzzy, no-c-format
#| msgid ""
#| "Note that this will only work if the packages needed for the desired "
@@ -3962,7 +3995,7 @@ msgstr ""
"Xfce 或 LXDE 同样适用于 DVD 映象或其他的安装方法。"
#. Tag: para
-#: using-d-i.xml:2579
+#: using-d-i.xml:2569
#, no-c-format
msgid ""
"The various server tasks will install software roughly as follows. Web "
@@ -3971,7 +4004,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:2586
+#: using-d-i.xml:2576
#, no-c-format
msgid ""
"The <quote>Standard system</quote> task will install any package that has a "
@@ -3985,7 +4018,7 @@ msgstr ""
"并需要一个最小化的系统,您应该让该任务选中。"
#. Tag: para
-#: using-d-i.xml:2594
+#: using-d-i.xml:2584
#, no-c-format
msgid ""
"If during language selection a default locale other than the <quote>C</"
@@ -4002,7 +4035,7 @@ msgstr ""
"(如果存在)还会安装该桌面对应的本地化软件包。"
#. Tag: para
-#: using-d-i.xml:2604
+#: using-d-i.xml:2594
#, no-c-format
msgid ""
"Once you've selected your tasks, select &BTN-CONT;. At this point, "
@@ -4014,7 +4047,7 @@ msgstr ""
"选中任务的软件包。假如某个程序需要用户输入信息,它将提示您指定。"
#. Tag: para
-#: using-d-i.xml:2611
+#: using-d-i.xml:2601
#, no-c-format
msgid ""
"You should be aware that especially the Desktop task is very large. "
@@ -4029,7 +4062,7 @@ msgstr ""
"间。一旦启动,安装软件包过程将无法取消。"
#. Tag: para
-#: using-d-i.xml:2620
+#: using-d-i.xml:2610
#, no-c-format
msgid ""
"Even when packages are included on the CD-ROM, the installer may still "
@@ -4044,13 +4077,13 @@ msgstr ""
"新);如果您安装的是测试版本,这会出现在使用旧映像安装时。"
#. Tag: title
-#: using-d-i.xml:2635
+#: using-d-i.xml:2625
#, no-c-format
msgid "Making Your System Bootable"
msgstr "创建启动系统"
#. Tag: para
-#: using-d-i.xml:2637
+#: using-d-i.xml:2627
#, no-c-format
msgid ""
"If you are installing a diskless workstation, obviously, booting off the "
@@ -4063,13 +4096,13 @@ msgstr ""
"linkend=\"boot-dev-select-sun\"/>。</phrase>"
#. Tag: title
-#: using-d-i.xml:2652
+#: using-d-i.xml:2642
#, no-c-format
msgid "Detecting other operating systems"
msgstr "检测其他的操作系统"
#. Tag: para
-#: using-d-i.xml:2654
+#: using-d-i.xml:2644
#, no-c-format
msgid ""
"Before a boot loader is installed, the installer will attempt to probe for "
@@ -4083,7 +4116,7 @@ msgstr ""
"&debian; 一起,计算机也将配置为可以启动其他操作系统。"
#. Tag: para
-#: using-d-i.xml:2662
+#: using-d-i.xml:2652
#, no-c-format
msgid ""
"Note that multiple operating systems booting on a single machine is still "
@@ -4097,13 +4130,13 @@ msgstr ""
"管理器的文档了解更多信息。"
#. Tag: title
-#: using-d-i.xml:2680
+#: using-d-i.xml:2670
#, no-c-format
msgid "<command>palo</command>-installer"
msgstr "<command>palo</command>-installer"
#. Tag: para
-#: using-d-i.xml:2681
+#: using-d-i.xml:2671
#, no-c-format
msgid ""
"The bootloader on PA-RISC is <quote>palo</quote>. <command>PALO</command> is "
@@ -4118,19 +4151,19 @@ msgstr ""
"<command>PALO</command> 能真正地读 Linux 分区。"
#. Tag: para
-#: using-d-i.xml:2690
+#: using-d-i.xml:2680
#, no-c-format
msgid "hppa FIXME ( need more info )"
msgstr "hppa FIXME ( need more info )"
#. Tag: title
-#: using-d-i.xml:2702
+#: using-d-i.xml:2692 using-d-i.xml:3030
#, 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:2704
+#: using-d-i.xml:2694 using-d-i.xml:3032
#, no-c-format
msgid ""
"The main &architecture; boot loader is called <quote>grub</quote>. Grub is a "
@@ -4141,7 +4174,7 @@ msgstr ""
"定的 boot loader,它对新手和老手都是一个不错的缺省选择。"
#. Tag: para
-#: using-d-i.xml:2710
+#: using-d-i.xml:2700
#, no-c-format
msgid ""
"By default, grub will be installed into the Master Boot Record (MBR), where "
@@ -4153,7 +4186,7 @@ msgstr ""
"请参阅 grub 的手册。"
#. Tag: para
-#: using-d-i.xml:2716
+#: using-d-i.xml:2706
#, no-c-format
msgid ""
"If you do not want to install grub, use the &BTN-GOBACK; button to get to "
@@ -4164,13 +4197,13 @@ msgstr ""
"用的任何 bootloader。"
#. Tag: title
-#: using-d-i.xml:2729
+#: using-d-i.xml:2719
#, 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:2731
+#: using-d-i.xml:2721
#, no-c-format
msgid ""
"The second &architecture; boot loader is called <quote>LILO</quote>. It is "
@@ -4186,7 +4219,7 @@ msgstr ""
"HOWTO</ulink>。"
#. Tag: para
-#: using-d-i.xml:2741
+#: using-d-i.xml:2731
#, no-c-format
msgid ""
"Currently the LILO installation will only create menu entries for other "
@@ -4199,7 +4232,7 @@ msgstr ""
"统。"
#. Tag: para
-#: using-d-i.xml:2749
+#: using-d-i.xml:2739
#, no-c-format
msgid ""
"&d-i; offers you three choices on where to install the <command>LILO</"
@@ -4207,13 +4240,13 @@ msgid ""
msgstr "&d-i; 提供给您三种选择去哪安装 <command>LILO</command> boot loader:"
#. Tag: term
-#: using-d-i.xml:2756
+#: using-d-i.xml:2746
#, no-c-format
msgid "Master Boot Record (MBR)"
msgstr "主引导区(MBR)"
#. Tag: para
-#: using-d-i.xml:2756
+#: using-d-i.xml:2746
#, no-c-format
msgid ""
"This way the <command>LILO</command> will take complete control of the boot "
@@ -4221,13 +4254,13 @@ msgid ""
msgstr "这种方式 <command>LILO</command> 将完全控制启动过程。"
#. Tag: term
-#: using-d-i.xml:2763
+#: using-d-i.xml:2753
#, no-c-format
msgid "new &debian; partition"
msgstr "新 &debian; 分区"
#. Tag: para
-#: using-d-i.xml:2763
+#: using-d-i.xml:2753
#, no-c-format
msgid ""
"Choose this if you want to use another boot manager. <command>LILO</command> "
@@ -4238,26 +4271,30 @@ msgstr ""
"新 &debian; 分区的起始位置,并能作为第二 boot loader。"
#. Tag: term
-#: using-d-i.xml:2772
+#: using-d-i.xml:2762
#, no-c-format
msgid "Other choice"
msgstr "其它选择"
#. Tag: para
-#: using-d-i.xml:2772
-#, no-c-format
+#: using-d-i.xml:2762
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Useful for advanced users who want to install <command>LILO</command> "
+#| "somewhere else. In this case you will be asked for desired location. You "
+#| "can use traditional device names such as <filename>/dev/hda</filename> or "
+#| "<filename>/dev/sda</filename>."
msgid ""
"Useful for advanced users who want to install <command>LILO</command> "
"somewhere else. In this case you will be asked for desired location. You can "
-"use traditional device names such as <filename>/dev/hda</filename> or "
-"<filename>/dev/sda</filename>."
+"use traditional device names such as <filename>/dev/sda</filename>."
msgstr ""
"对于高级用户,把 <command>LILO</command> 安装到其它地方会很有用。这种方式下,"
"您会被问到需要安装的位置。您可以采用传统的设备命名,如 <filename>/dev/hda</"
"filename> 或 <filename>/dev/sda</filename>。"
#. Tag: para
-#: using-d-i.xml:2782
+#: using-d-i.xml:2772
#, no-c-format
msgid ""
"If you can no longer boot into Windows 9x (or DOS) after this step, you'll "
@@ -4271,13 +4308,13 @@ msgstr ""
"录 &mdash; 但这也意味着您要使用其他方法才能启动 &debian;!"
#. Tag: title
-#: using-d-i.xml:2798
+#: using-d-i.xml:2788
#, 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:2800
+#: using-d-i.xml:2790
#, no-c-format
msgid ""
"The &architecture; boot loader is called <quote>elilo</quote>. It is modeled "
@@ -4302,7 +4339,7 @@ msgstr ""
"和启动 Linux 内核的工作。"
#. Tag: para
-#: using-d-i.xml:2816
+#: using-d-i.xml:2806
#, no-c-format
msgid ""
"The <quote>elilo</quote> configuration and installation is done as the last "
@@ -4317,13 +4354,13 @@ msgstr ""
"<emphasis>root</emphasis> 文件系统相同的磁盘。"
#. Tag: title
-#: using-d-i.xml:2828
+#: using-d-i.xml:2818
#, no-c-format
msgid "Choose the correct partition!"
msgstr "选择正确的分区!"
#. Tag: para
-#: using-d-i.xml:2830
+#: using-d-i.xml:2820
#, no-c-format
msgid ""
"The criterion for selecting a partition is that it must be a FAT format "
@@ -4339,13 +4376,13 @@ msgstr ""
"容!"
#. Tag: title
-#: using-d-i.xml:2845
+#: using-d-i.xml:2835
#, no-c-format
msgid "EFI Partition Contents"
msgstr "EFI 分区内容"
#. Tag: para
-#: using-d-i.xml:2847
+#: using-d-i.xml:2837
#, no-c-format
msgid ""
"The EFI partition is a FAT filesystem format partition on one of the hard "
@@ -4371,13 +4408,13 @@ msgstr ""
"间,系统更新或重新配置,文件系统中也许会有其他文件。"
#. Tag: filename
-#: using-d-i.xml:2869
+#: using-d-i.xml:2859
#, no-c-format
msgid "elilo.conf"
msgstr "elilo.conf"
#. Tag: para
-#: using-d-i.xml:2870
+#: using-d-i.xml:2860
#, no-c-format
msgid ""
"This is the configuration file read by the boot loader when it starts. It is "
@@ -4388,13 +4425,13 @@ msgstr ""
"filename> 的复制,其文件名重写成 EFI 分区上的文件。"
#. Tag: filename
-#: using-d-i.xml:2879
+#: using-d-i.xml:2869
#, no-c-format
msgid "elilo.efi"
msgstr "elilo.efi"
#. Tag: para
-#: using-d-i.xml:2880
+#: using-d-i.xml:2870
#, no-c-format
msgid ""
"This is the boot loader program that the <quote>EFI Boot Manager</quote> "
@@ -4407,13 +4444,13 @@ msgstr ""
"<quote>EFI Boot Manager</quote> 命令菜单。"
#. Tag: filename
-#: using-d-i.xml:2890
+#: using-d-i.xml:2880
#, no-c-format
msgid "initrd.img"
msgstr "initrd.img"
#. Tag: para
-#: using-d-i.xml:2891
+#: using-d-i.xml:2881
#, no-c-format
msgid ""
"This is the initial root filesystem used to boot the kernel. It is a copy of "
@@ -4426,13 +4463,13 @@ msgstr ""
"filename> 符号链接 <filename>/initrd.img</filename> 指向的文件。"
#. Tag: filename
-#: using-d-i.xml:2903
+#: using-d-i.xml:2893
#, no-c-format
msgid "readme.txt"
msgstr "readme.txt"
#. Tag: para
-#: using-d-i.xml:2904
+#: using-d-i.xml:2894
#, no-c-format
msgid ""
"This is a small text file warning you that the contents of the directory are "
@@ -4443,13 +4480,13 @@ msgstr ""
"任何本地修改在下次 <filename>/usr/sbin/elilo</filename> 运行时将丢失。"
#. Tag: filename
-#: using-d-i.xml:2914
+#: using-d-i.xml:2904
#, no-c-format
msgid "vmlinuz"
msgstr "vmlinuz"
#. Tag: para
-#: using-d-i.xml:2915
+#: using-d-i.xml:2905
#, no-c-format
msgid ""
"This is the compressed kernel itself. It is a copy of the file referenced in "
@@ -4462,13 +4499,13 @@ msgstr ""
"<filename>/vmlinuz</filename> 指向的文件。"
#. Tag: title
-#: using-d-i.xml:2935
+#: using-d-i.xml:2925
#, no-c-format
msgid "<command>arcboot</command>-installer"
msgstr "<command>arcboot</command>-installer"
#. Tag: para
-#: using-d-i.xml:2936
+#: using-d-i.xml:2926
#, no-c-format
msgid ""
"The boot loader on SGI machines is <command>arcboot</command>. It has to be "
@@ -4508,13 +4545,13 @@ msgstr ""
"</screen></informalexample> ,然后键入 <command>boot</command>。"
#. Tag: replaceable
-#: using-d-i.xml:2955
+#: using-d-i.xml:2945
#, no-c-format
msgid "scsi"
msgstr "scsi"
#. Tag: para
-#: using-d-i.xml:2956
+#: using-d-i.xml:2946
#, no-c-format
msgid ""
"is the SCSI bus to be booted from, this is <userinput>0</userinput> for the "
@@ -4522,13 +4559,13 @@ msgid ""
msgstr "是启动的 SCSI 总线,<userinput>0</userinput> 为板载控制器"
#. Tag: replaceable
-#: using-d-i.xml:2964
+#: using-d-i.xml:2954
#, no-c-format
msgid "disk"
msgstr "disk"
#. Tag: para
-#: using-d-i.xml:2965
+#: using-d-i.xml:2955
#, no-c-format
msgid ""
"is the SCSI ID of the hard disk on which <command>arcboot</command> is "
@@ -4537,13 +4574,13 @@ msgstr "硬盘的 SCSI ID,<command>arcboot</command> 安装在其上"
# index.docbook:1643, index.docbook:1712
#. Tag: replaceable
-#: using-d-i.xml:2973
+#: using-d-i.xml:2963
#, no-c-format
msgid "partnr"
msgstr "partnr"
#. Tag: para
-#: using-d-i.xml:2974
+#: using-d-i.xml:2964
#, no-c-format
msgid ""
"is the number of the partition on which <filename>/etc/arcboot.conf</"
@@ -4551,13 +4588,13 @@ msgid ""
msgstr "分区号,<filename>/etc/arcboot.conf</filename> 处于该分区"
#. Tag: replaceable
-#: using-d-i.xml:2982
+#: using-d-i.xml:2972
#, no-c-format
msgid "config"
msgstr "config"
#. Tag: para
-#: using-d-i.xml:2983
+#: using-d-i.xml:2973
#, no-c-format
msgid ""
"is the name of the configuration entry in <filename>/etc/arcboot.conf</"
@@ -4567,13 +4604,13 @@ msgstr ""
"quote> 。"
#. Tag: title
-#: using-d-i.xml:3004
+#: using-d-i.xml:2994
#, no-c-format
msgid "Install <command>Yaboot</command> on a Hard Disk"
msgstr "安装 <command>Yaboot</command> 至硬盘"
#. Tag: para
-#: using-d-i.xml:3005
+#: using-d-i.xml:2995
#, no-c-format
msgid ""
"Newer (mid 1998 and on) PowerMacs use <command>yaboot</command> as their "
@@ -4591,13 +4628,13 @@ msgstr ""
"设为启动 &debian-gnu;。"
#. Tag: title
-#: using-d-i.xml:3023
+#: using-d-i.xml:3013
#, no-c-format
msgid "Install <command>Quik</command> on a Hard Disk"
msgstr "安装 <command>Quik</command> 至硬盘"
#. Tag: para
-#: using-d-i.xml:3024
+#: using-d-i.xml:3014
#, no-c-format
msgid ""
"The boot loader for OldWorld Power Macintosh machines is <command>quik</"
@@ -4609,14 +4646,30 @@ msgstr ""
"您可以将它用于 CHRP。安装程序会自动配置 <command>quik</command>。该配置已知可"
"以工作在 7200,7300 和 7600 Powermacs,以及一些 Power Computing 克隆。"
+#. Tag: para
+#: using-d-i.xml:3038
+#, fuzzy, no-c-format
+#| msgid ""
+#| "By default, grub will be installed into the Master Boot Record (MBR), "
+#| "where it will take over complete control of the boot process. If you "
+#| "prefer, you can install it elsewhere. See the grub manual for complete "
+#| "information."
+msgid ""
+"By default, Grub will be installed into the PReP partition, where it will "
+"over complete control of the boot process."
+msgstr ""
+"缺省情况下,grub 会被装在主引导区(MBR)。如果装在那里的话,它将会完全主宰启动"
+"的整个过程。如果喜欢的话,您可以把 grub 装在其他地方。若要全面和完整的信息,"
+"请参阅 grub 的手册。"
+
#. Tag: title
-#: using-d-i.xml:3040
+#: using-d-i.xml:3051
#, no-c-format
msgid "<command>zipl</command>-installer"
msgstr "<command>zipl</command>-installer"
#. Tag: para
-#: using-d-i.xml:3041
+#: using-d-i.xml:3052
#, no-c-format
msgid ""
"The boot loader on &arch-title; is <quote>zipl</quote>. <command>ZIPL</"
@@ -4631,13 +4684,13 @@ msgstr ""
"Commands</quote>,它位于 IBM 的 developerWorks 网站<command>ZIPL</command>。"
#. Tag: title
-#: using-d-i.xml:3058
+#: using-d-i.xml:3069
#, 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:3060
+#: using-d-i.xml:3071
#, no-c-format
msgid ""
"The standard &architecture; boot loader is called <quote>silo</quote>. It is "
@@ -4664,13 +4717,13 @@ msgstr ""
"区启动。这对于安装 GNU/Linux 到一个已经存在 SunOS/Solaris 的系统很有用。"
#. Tag: title
-#: using-d-i.xml:3085
+#: using-d-i.xml:3096
#, no-c-format
msgid "Making the system bootable with flash-kernel"
msgstr ""
#. Tag: para
-#: using-d-i.xml:3086
+#: using-d-i.xml:3097
#, no-c-format
msgid ""
"As there is no common firmware interface on all ARM platforms, the steps "
@@ -4683,7 +4736,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:3097
+#: using-d-i.xml:3108
#, no-c-format
msgid ""
"On devices which boot from internal NOR- or NAND-flash memory, flash-kernel "
@@ -4695,7 +4748,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: using-d-i.xml:3107
+#: using-d-i.xml:3118
#, no-c-format
msgid ""
"For ARM systems that use u-boot as their system firmware and boot the kernel "
@@ -4705,13 +4758,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: using-d-i.xml:3123
+#: using-d-i.xml:3134
#, no-c-format
msgid "Continue Without Boot Loader"
msgstr "不使用 boot loader 继续进行"
#. Tag: para
-#: using-d-i.xml:3125
+#: using-d-i.xml:3136
#, no-c-format
msgid ""
"This option can be used to complete the installation even when no boot "
@@ -4722,7 +4775,7 @@ msgstr ""
"是因为不想要(比如,您想使用已经存在的 boot loader)"
#. Tag: para
-#: using-d-i.xml:3132
+#: using-d-i.xml:3143
#, no-c-format
msgid ""
"If you plan to manually configure your bootloader, you should check the name "
@@ -4741,13 +4794,13 @@ msgstr ""
"filename> 到一个独立的分区,还需要 <filename>/boot</filename> 文件系统。"
#. Tag: title
-#: using-d-i.xml:3149
+#: using-d-i.xml:3160
#, no-c-format
msgid "Finishing the Installation"
msgstr "完成安装"
#. Tag: para
-#: using-d-i.xml:3150
+#: using-d-i.xml:3161
#, no-c-format
msgid ""
"This is the last step in the &debian; installation process during which the "
@@ -4758,13 +4811,13 @@ msgstr ""
"&d-i; 之后的清理。"
#. Tag: title
-#: using-d-i.xml:3163
+#: using-d-i.xml:3174
#, no-c-format
msgid "Setting the System Clock"
msgstr "设置系统时钟"
#. Tag: para
-#: using-d-i.xml:3165
+#: using-d-i.xml:3176
#, no-c-format
msgid ""
"The installer may ask you if the computer's clock is set to UTC. Normally "
@@ -4776,7 +4829,7 @@ msgstr ""
"装程序依据是否有其他系统已经安装这类事情,来决定时钟要不要设为 UTC。"
#. Tag: para
-#: using-d-i.xml:3172
+#: using-d-i.xml:3183
#, no-c-format
msgid ""
"In expert mode you will always be able to choose whether or not the clock is "
@@ -4792,7 +4845,7 @@ msgstr ""
"常设为本地时间。如果您需要多重引导,请选择本地时间而不是 GMT。</phrase>"
#. Tag: para
-#: using-d-i.xml:3183
+#: using-d-i.xml:3194
#, no-c-format
msgid ""
"At this point &d-i; will also attempt to save the current time to the "
@@ -4803,13 +4856,13 @@ msgstr ""
"决于刚才的选择。"
#. Tag: title
-#: using-d-i.xml:3198
+#: using-d-i.xml:3209
#, no-c-format
msgid "Reboot the System"
msgstr "重新启动系统"
#. Tag: para
-#: using-d-i.xml:3200
+#: using-d-i.xml:3211
#, no-c-format
msgid ""
"You will be prompted to remove the boot media (CD, floppy, etc) that you "
@@ -4820,7 +4873,7 @@ msgstr ""
"&debian; 系统。"
#. Tag: para
-#: using-d-i.xml:3206
+#: using-d-i.xml:3217
#, no-c-format
msgid ""
"After a final prompt the system will be halted because rebooting is not "
@@ -4832,13 +4885,13 @@ msgstr ""
"上的 IPL &debian-gnu;,它在安装步骤第一步里被选做根文件系统。"
#. Tag: title
-#: using-d-i.xml:3219
+#: using-d-i.xml:3230
#, no-c-format
msgid "Troubleshooting"
msgstr "排除故障"
#. Tag: para
-#: using-d-i.xml:3220
+#: using-d-i.xml:3231
#, no-c-format
msgid ""
"The components listed in this section are usually not involved in the "
@@ -4849,13 +4902,13 @@ msgstr ""
"题。"
#. Tag: title
-#: using-d-i.xml:3233
+#: using-d-i.xml:3244
#, no-c-format
msgid "Saving the installation logs"
msgstr "保存安装记录"
#. Tag: para
-#: using-d-i.xml:3235
+#: using-d-i.xml:3246
#, no-c-format
msgid ""
"If the installation is successful, the logfiles created during the "
@@ -4866,7 +4919,7 @@ msgstr ""
"的 <filename>/var/log/installer/</filename>。"
#. Tag: para
-#: using-d-i.xml:3242
+#: using-d-i.xml:3253
#, no-c-format
msgid ""
"Choosing <guimenuitem>Save debug logs</guimenuitem> from the main menu "
@@ -4880,13 +4933,13 @@ msgstr ""
"其它系统上研究记录,或者用于报告的附件。"
#. Tag: title
-#: using-d-i.xml:3262
+#: using-d-i.xml:3273
#, no-c-format
msgid "Using the Shell and Viewing the Logs"
msgstr "使用 Shell 查看记录"
#. Tag: para
-#: using-d-i.xml:3264
+#: using-d-i.xml:3275
#, no-c-format
msgid ""
"There are several methods you can use to get a shell while running an "
@@ -4910,13 +4963,13 @@ msgstr ""
"安装程序。"
#. Tag: para
-#: using-d-i.xml:3282
+#: using-d-i.xml:3293
#, 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:3286
+#: using-d-i.xml:3297
#, no-c-format
msgid ""
"If you cannot switch consoles, there is also an <guimenuitem>Execute a "
@@ -4931,7 +4984,7 @@ msgstr ""
"到安装程序。"
#. Tag: para
-#: using-d-i.xml:3294
+#: using-d-i.xml:3305
#, no-c-format
msgid ""
"At this point you are booted from the RAM disk, and there is a limited set "
@@ -4947,7 +5000,7 @@ msgstr ""
"Bourne shell 的克隆,有一些如自动完成与历史纪录这样的好特性。"
#. Tag: para
-#: using-d-i.xml:3303
+#: using-d-i.xml:3314
#, no-c-format
msgid ""
"To edit and view files, use the text editor <command>nano</command>. Log "
@@ -4958,7 +5011,7 @@ msgstr ""
"以在 <filename>/var/log</filename> 目录找到。"
#. Tag: para
-#: using-d-i.xml:3310
+#: using-d-i.xml:3321
#, no-c-format
msgid ""
"Although you can do basically anything in a shell that the available "
@@ -4969,7 +5022,7 @@ msgstr ""
"题时进行调试。"
#. Tag: para
-#: using-d-i.xml:3316
+#: using-d-i.xml:3327
#, no-c-format
msgid ""
"Doing things manually from the shell may interfere with the installation "
@@ -4981,13 +5034,13 @@ msgstr ""
"该让安装程序激活交换分区,而不是在 shell 里面自己动手。"
#. Tag: title
-#: using-d-i.xml:3332
+#: using-d-i.xml:3343
#, no-c-format
msgid "Installation Over the Network"
msgstr "通过网络安装"
#. Tag: para
-#: using-d-i.xml:3334
+#: using-d-i.xml:3345
#, no-c-format
msgid ""
"One of the more interesting components is <firstterm>network-console</"
@@ -5002,7 +5055,7 @@ msgstr ""
"先建立网络。(您可以使用 <xref linkend=\"automatic-install\"/> 做这部分工作。)"
#. Tag: para
-#: using-d-i.xml:3344
+#: using-d-i.xml:3355
#, no-c-format
msgid ""
"This component is not loaded into the main installation menu by default, so "
@@ -5022,7 +5075,7 @@ msgstr ""
"SSH</guimenuitem>。"
#. Tag: para
-#: using-d-i.xml:3357
+#: using-d-i.xml:3368
#, no-c-format
msgid ""
"For installations on &arch-title;, this is the default method after setting "
@@ -5030,7 +5083,7 @@ msgid ""
msgstr "在 &arch-title; 上安装,建立网络之后这是默认的方法。"
#. Tag: para
-#: using-d-i.xml:3362
+#: using-d-i.xml:3373
#, no-c-format
msgid ""
"<phrase arch=\"not-s390\">After selecting this new entry, you</phrase> "
@@ -5049,7 +5102,7 @@ msgstr ""
"fingerprint。您需要安全地传输该 fingerprint 给那些要继续远程安装的人。"
#. Tag: para
-#: using-d-i.xml:3374
+#: using-d-i.xml:3385
#, no-c-format
msgid ""
"Should you decide to continue with the installation locally, you can always "
@@ -5060,7 +5113,7 @@ msgstr ""
"他的组件。"
#. Tag: para
-#: using-d-i.xml:3380
+#: using-d-i.xml:3391
#, no-c-format
msgid ""
"Now let's switch to the other side of the wire. As a prerequisite, you need "
@@ -5088,7 +5141,7 @@ msgstr ""
"确认是否正确。"
#. Tag: para
-#: using-d-i.xml:3397
+#: using-d-i.xml:3408
#, no-c-format
msgid ""
"The <command>ssh</command> server in the installer uses a default "
@@ -5109,7 +5162,7 @@ msgstr ""
"接在安装过程中的哪一点断开,您在连接之后可能继续,也可能无法继续安装过程。"
#. Tag: para
-#: using-d-i.xml:3410
+#: using-d-i.xml:3421
#, no-c-format
msgid ""
"You may be able to avoid the connection being dropped by adding the option "
@@ -5129,7 +5182,7 @@ msgstr ""
"需要的时候采用。"
#. Tag: para
-#: using-d-i.xml:3423
+#: using-d-i.xml:3434
#, no-c-format
msgid ""
"If you install several computers in turn and they happen to have the same IP "
@@ -5151,7 +5204,7 @@ msgstr ""
"footnote>,再重新来过。"
#. Tag: para
-#: using-d-i.xml:3439
+#: using-d-i.xml:3450
#, no-c-format
msgid ""
"After the login you will be presented with an initial screen where you have "
@@ -5168,7 +5221,7 @@ msgstr ""
"的系统。在安装菜单只能打开一个 SSH 会话,但 shell 可以打开多个。"
#. Tag: para
-#: using-d-i.xml:3449
+#: using-d-i.xml:3460
#, no-c-format
msgid ""
"After you have started the installation remotely over SSH, you should not go "
@@ -5181,13 +5234,13 @@ msgstr ""
"配置的数据库。结果可能导致安装失败或者安装完成的系统出现问题。"
#. Tag: title
-#: using-d-i.xml:3468
+#: using-d-i.xml:3479
#, no-c-format
msgid "Loading Missing Firmware"
msgstr "加载缺失的固件"
#. Tag: para
-#: using-d-i.xml:3469
+#: using-d-i.xml:3480
#, no-c-format
msgid ""
"As described in <xref linkend=\"hardware-firmware\"/>, some devices require "
@@ -5200,7 +5253,7 @@ msgstr ""
"强功能就无法使用。"
#. Tag: para
-#: using-d-i.xml:3477
+#: using-d-i.xml:3488
#, no-c-format
msgid ""
"If a device driver requests firmware that is not available, &d-i; will "
@@ -5216,7 +5269,7 @@ msgstr ""
"序模块。"
#. Tag: para
-#: using-d-i.xml:3487
+#: using-d-i.xml:3498
#, no-c-format
msgid ""
"Which devices are scanned and which file systems are supported depends on "
@@ -5232,7 +5285,7 @@ msgstr ""
"phrase>"
#. Tag: para
-#: using-d-i.xml:3497
+#: using-d-i.xml:3508
#, no-c-format
msgid ""
"Note that it is possible to skip loading the firmware if you know the device "
@@ -5243,7 +5296,7 @@ msgstr ""
"固件。"
#. Tag: para
-#: using-d-i.xml:3503
+#: using-d-i.xml:3514
#, no-c-format
msgid ""
"&d-i; only prompts for firmware needed by kernel modules loaded during the "
@@ -5257,13 +5310,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: using-d-i.xml:3517
+#: using-d-i.xml:3528
#, no-c-format
msgid "Preparing a medium"
msgstr "准备介质"
#. Tag: para
-#: using-d-i.xml:3518
+#: using-d-i.xml:3529
#, no-c-format
msgid ""
"Official CD images do not include non-free firmware. The most common method "
@@ -5283,7 +5336,7 @@ msgstr ""
"下。推荐使用 FAT 文件系统,因为在安装过程的早期阶段它肯定能被支持。"
#. Tag: para
-#: using-d-i.xml:3531
+#: using-d-i.xml:3542
#, no-c-format
msgid ""
"Tarballs and zip files containing current packages for the most common "
@@ -5298,7 +5351,7 @@ msgstr ""
"件系统里面。"
#. Tag: para
-#: using-d-i.xml:3545
+#: using-d-i.xml:3556
#, no-c-format
msgid ""
"If the firmware you need is not included in the tarball, you can also "
@@ -5311,7 +5364,7 @@ msgstr ""
"件。以下概要列出大多数固件软件包,但不保证完整,有些还是非固件软件包:"
#. Tag: para
-#: using-d-i.xml:3559
+#: using-d-i.xml:3570
#, no-c-format
msgid ""
"It is also possible to copy individual firmware files to the medium. Loose "
@@ -5322,13 +5375,13 @@ msgstr ""
"造商那里获得。"
#. Tag: title
-#: using-d-i.xml:3568
+#: using-d-i.xml:3579
#, no-c-format
msgid "Firmware and the Installed System"
msgstr "固件和安装好的系统"
#. Tag: para
-#: using-d-i.xml:3569
+#: using-d-i.xml:3580
#, no-c-format
msgid ""
"Any firmware loaded during the installation will be copied automatically to "
@@ -5343,7 +5396,7 @@ msgstr ""
"序不同的内核版本,有可能由于版本的偏差造成固件不能加载。"
#. Tag: para
-#: using-d-i.xml:3578
+#: using-d-i.xml:3589
#, no-c-format
msgid ""
"If the firmware was loaded from a firmware package, &d-i; will also install "
@@ -5357,7 +5410,7 @@ msgstr ""
"做的优点在于如果有固件的新版本存在会自动更新。"
#. Tag: para
-#: using-d-i.xml:3586
+#: using-d-i.xml:3597
#, no-c-format
msgid ""
"If loading the firmware was skipped during the installation, the relevant "
@@ -5368,7 +5421,7 @@ msgstr ""
"安装好固件或软件包。"
#. Tag: para
-#: using-d-i.xml:3593
+#: using-d-i.xml:3604
#, no-c-format
msgid ""
"If the firmware was loaded from loose firmware files, the firmware copied to "
@@ -5379,6 +5432,18 @@ msgstr ""
"如果固件从不严格的固件文件加载,复制到安装好的系统的固件将<emphasis>不会</"
"emphasis>自动更新,除非对应的固件软件包(如果有的话)在系统安装之后安装。"
+#~ msgid ""
+#~ "Support for MD is a relatively new addition to the installer. You may "
+#~ "experience problems for some RAID levels and in combination with some "
+#~ "bootloaders if you try to use MD for the root (<filename>/</filename>) "
+#~ "file system. For experienced users, it may be possible to work around "
+#~ "some of these problems by executing some configuration or installation "
+#~ "steps manually from a shell."
+#~ msgstr ""
+#~ "在安装程序中支持 MD 是相对新的功能。如果您尝试结合一些 RAID 类型与启动引导"
+#~ "器并将 MD 用于根(<filename>/</filename>)文件系统,您也许会经历一些挫折。对"
+#~ "有经验的用户,从 shell 手动地处理一些配置和安装步骤,也许会绕开这些问题。"
+
#, fuzzy
#~| msgid ""
#~| "It is not possible to interactively select a different desktop during "