summaryrefslogtreecommitdiff
path: root/po/zh_CN
diff options
context:
space:
mode:
authorHolger Wansing <linux@wansing-online.de>2012-10-24 20:39:47 +0000
committerHolger Wansing <linux@wansing-online.de>2012-10-24 20:39:47 +0000
commite703dbcf87c842337e4292f0dd2e43d647b1582d (patch)
tree5083f8f7219467b178247bdaef4e448b64eb3c0a /po/zh_CN
parentef9d121d36bfc06ef725987ff153b1481d78aed9 (diff)
downloadinstallation-guide-e703dbcf87c842337e4292f0dd2e43d647b1582d.zip
Fix incorrect creation of po files - take 2
(my first try (for pt) was not successful, corrupted characters in the po files): - checkout rev. 68272 (revision before my commit with wrong po files) - svn update en - perform usual process to update po and pot files (with merge_xml.awk fixed by nabetaro, thanks!) - copy changed files to my svn tree - commit M po/ro/using-d-i.po M po/pt/partitioning.po M po/pt/install-methods.po M po/pt/random-bits.po M po/pt/preseed.po M po/pt/preparing.po M po/pt/welcome.po M po/pt/using-d-i.po M po/pt/hardware.po M po/pt/boot-installer.po M po/pt/installation-howto.po M po/da/boot-installer.po M po/ru/install-methods.po M po/ru/partitioning.po M po/ru/random-bits.po M po/ru/preseed.po M po/ru/welcome.po M po/ru/using-d-i.po M po/ru/hardware.po M po/ru/boot-installer.po M po/ru/installation-howto.po M po/sv/install-methods.po M po/sv/partitioning.po M po/sv/preseed.po M po/sv/using-d-i.po M po/sv/hardware.po M po/sv/boot-installer.po M po/sv/installation-howto.po M po/ja/install-methods.po M po/ja/partitioning.po M po/ja/preseed.po M po/ja/using-d-i.po M po/ja/hardware.po M po/ja/boot-installer.po M po/ja/installation-howto.po M po/zh_TW/install-methods.po M po/zh_TW/partitioning.po M po/zh_TW/using-d-i.po M po/zh_TW/hardware.po M po/zh_TW/boot-installer.po M po/zh_TW/installation-howto.po M po/fi/install-methods.po M po/fi/partitioning.po M po/fi/preseed.po M po/fi/using-d-i.po M po/fi/hardware.po M po/fi/boot-installer.po M po/fi/installation-howto.po M po/el/install-methods.po M po/el/partitioning.po M po/el/preseed.po M po/el/using-d-i.po M po/el/hardware.po M po/el/boot-installer.po M po/el/installation-howto.po M po/zh_CN/install-methods.po M po/zh_CN/partitioning.po M po/zh_CN/preseed.po M po/zh_CN/using-d-i.po M po/zh_CN/hardware.po M po/zh_CN/boot-installer.po M po/zh_CN/installation-howto.po M po/pot/random-bits.pot M po/pot/gpl.pot M po/pot/preseed.pot M po/pot/preparing.pot M po/pot/post-install.pot M po/pot/boot-new.pot M po/pot/welcome.pot M po/pot/using-d-i.pot M po/pot/hardware.pot M po/pot/boot-installer.pot M po/pot/installation-howto.pot M po/pot/administrivia.pot M po/pot/preface.pot M po/pot/bookinfo.pot M po/pot/install-methods.pot M po/pot/partitioning.pot M po/es/partitioning.po M po/es/install-methods.po M po/es/preseed.po M po/es/using-d-i.po M po/es/hardware.po M po/es/boot-installer.po M po/es/installation-howto.po M po/ko/install-methods.po M po/ko/partitioning.po M po/ko/preseed.po M po/ko/using-d-i.po M po/ko/hardware.po M po/ko/boot-installer.po M po/ko/installation-howto.po M po/hu/install-methods.po M po/hu/partitioning.po M po/hu/preseed.po M po/hu/using-d-i.po M po/hu/hardware.po M po/hu/boot-installer.po M po/hu/installation-howto.po M po/vi/install-methods.po M po/vi/partitioning.po M po/vi/preseed.po M po/vi/using-d-i.po M po/vi/hardware.po M po/vi/boot-installer.po M po/vi/installation-howto.po
Diffstat (limited to 'po/zh_CN')
-rw-r--r--po/zh_CN/boot-installer.po976
-rw-r--r--po/zh_CN/hardware.po1347
-rw-r--r--po/zh_CN/install-methods.po496
-rw-r--r--po/zh_CN/installation-howto.po110
-rw-r--r--po/zh_CN/partitioning.po50
-rw-r--r--po/zh_CN/preseed.po637
-rw-r--r--po/zh_CN/using-d-i.po900
7 files changed, 2513 insertions, 2003 deletions
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index b982169f2..471d55ae5 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2012-07-20 14:12+0000\n"
-"PO-Revision-Date: 2012-10-21 14:06+0800\n"
+"POT-Creation-Date: 2012-10-24 19:53+0000\n"
+"PO-Revision-Date: 2012-07-25 16:38+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
"Language: \n"
@@ -56,8 +56,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:43 boot-installer.xml:584 boot-installer.xml:1126
-#: boot-installer.xml:1627 boot-installer.xml:1736
+#: boot-installer.xml:43 boot-installer.xml:584 boot-installer.xml:1125
+#: boot-installer.xml:1626 boot-installer.xml:1735
#, no-c-format
msgid ""
"Booting from the network requires that you have a network connection and a "
@@ -68,8 +68,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:48 boot-installer.xml:589 boot-installer.xml:1131
-#: boot-installer.xml:1632 boot-installer.xml:1741
+#: boot-installer.xml:48 boot-installer.xml:589 boot-installer.xml:1130
+#: boot-installer.xml:1631 boot-installer.xml:1740
#, no-c-format
msgid ""
"Older systems such as the 715 might require the use of an RBOOT server "
@@ -78,8 +78,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:53 boot-installer.xml:594 boot-installer.xml:1136
-#: boot-installer.xml:1637 boot-installer.xml:1746
+#: boot-installer.xml:53 boot-installer.xml:594 boot-installer.xml:1135
+#: boot-installer.xml:1636 boot-installer.xml:1745
#, no-c-format
msgid ""
"The installation method to support network booting is described in <xref "
@@ -94,8 +94,8 @@ msgstr "从 CD 光盘上引导"
# index.docbook:531, index.docbook:584, index.docbook:957, index.docbook:1776, index.docbook:2024, index.docbook:2378
#. Tag: para
-#: boot-installer.xml:70 boot-installer.xml:248 boot-installer.xml:745
-#: boot-installer.xml:1403 boot-installer.xml:1775
+#: boot-installer.xml:70 boot-installer.xml:248 boot-installer.xml:744
+#: boot-installer.xml:1402 boot-installer.xml:1774
#, no-c-format
msgid ""
"The easiest route for most people will be to use a set of &debian; CDs. If "
@@ -111,8 +111,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:81 boot-installer.xml:259 boot-installer.xml:756
-#: boot-installer.xml:1414 boot-installer.xml:1786
+#: boot-installer.xml:81 boot-installer.xml:259 boot-installer.xml:755
+#: boot-installer.xml:1413 boot-installer.xml:1785
#, no-c-format
msgid ""
"Note that certain CD drives may require special drivers, and thus be "
@@ -127,8 +127,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:89 boot-installer.xml:267 boot-installer.xml:764
-#: boot-installer.xml:1422 boot-installer.xml:1794
+#: boot-installer.xml:89 boot-installer.xml:267 boot-installer.xml:763
+#: boot-installer.xml:1421 boot-installer.xml:1793
#, no-c-format
msgid ""
"Even if you cannot boot from CD-ROM, you can probably install the &debian; "
@@ -143,8 +143,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:97 boot-installer.xml:275 boot-installer.xml:772
-#: boot-installer.xml:1430 boot-installer.xml:1802
+#: boot-installer.xml:97 boot-installer.xml:275 boot-installer.xml:771
+#: boot-installer.xml:1429 boot-installer.xml:1801
#, no-c-format
msgid ""
"If you have problems booting, see <xref linkend=\"boot-troubleshooting\"/>."
@@ -370,8 +370,8 @@ msgstr "安装程序将正常启动。"
# index.docbook:578, index.docbook:951, index.docbook:1764, index.docbook:2018, index.docbook:2372
#. Tag: title
-#: boot-installer.xml:242 boot-installer.xml:739 boot-installer.xml:1397
-#: boot-installer.xml:1769
+#: boot-installer.xml:242 boot-installer.xml:738 boot-installer.xml:1396
+#: boot-installer.xml:1768
#, no-c-format
msgid "Booting from a CD-ROM"
msgstr "从 CD-ROM 启动"
@@ -658,7 +658,7 @@ msgstr "从 U 盘引导"
#. Tag: para
#: boot-installer.xml:506
-#, no-c-format
+#, 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 "
@@ -673,18 +673,22 @@ msgid ""
"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\"/> 的所有步骤。现在只需要插入 USB 盘到一个空闲的 USB 插槽并且重启计算机。系统应该重新引导,除非是使用灵活方式创建启动 U 盘并没激活,您应当看到一个 <prompt>boot:</prompt> 提示符。这里可以输入一些引导选项,或者只是键入 &enterkey;。"
+msgstr ""
+"假设您已经准备好了从 <xref linkend=\"boot-dev-select\"/> 到 <xref linkend="
+"\"boot-usb-files\"/> 的所有步骤。现在只需要插入您的 USB 盘到一个空闲的 USB 插"
+"槽并且重启计算机。系统应该重新引导,并且得到一个 <prompt>boot:</prompt> 提示"
+"符。这里您可以输入一些引导选项,或者只是敲击 &enterkey;。"
# index.docbook:723, index.docbook:1876, index.docbook:2278, index.docbook:2426
#. Tag: title
-#: boot-installer.xml:520 boot-installer.xml:1676
+#: boot-installer.xml:520 boot-installer.xml:1675
#, no-c-format
msgid "Booting from Floppies"
msgstr "从软盘引导"
# index.docbook:724, index.docbook:2286
#. Tag: para
-#: boot-installer.xml:521 boot-installer.xml:1684
+#: boot-installer.xml:521 boot-installer.xml:1683
#, no-c-format
msgid ""
"You will have already downloaded the floppy images you needed and created "
@@ -774,8 +778,8 @@ 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:578 boot-installer.xml:1108 boot-installer.xml:1249
-#: boot-installer.xml:1303 boot-installer.xml:1621 boot-installer.xml:1730
+#: boot-installer.xml:578 boot-installer.xml:1107 boot-installer.xml:1248
+#: boot-installer.xml:1302 boot-installer.xml:1620 boot-installer.xml:1729
#, no-c-format
msgid "Booting with TFTP"
msgstr "用 TFTP 引导"
@@ -930,15 +934,30 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:681
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Choosing the <quote>Help</quote> entry will result in the first help "
+#| "screen being displayed which gives an overview of all available help "
+#| "screens. Note that it is not possible to return to the boot menu after "
+#| "the help screens have been displayed. However, the F3 and F4 help screens "
+#| "list commands that are equivalent to the boot methods listed in the menu. "
+#| "All help screens have a boot prompt at which the boot command can be "
+#| "typed: <informalexample><screen>\n"
+#| "Press F1 for the help index, or ENTER to boot:\n"
+#| "</screen></informalexample> At this boot prompt you can either just press "
+#| "&enterkey; to boot the installer with default options or enter a specific "
+#| "boot command and, optionally, boot parameters. A number of boot "
+#| "parameters which might be useful can be found on the various help "
+#| "screens. If you do add any parameters to the boot command line, be sure "
+#| "to first type the boot method (the default is <userinput>install</"
+#| "userinput>) and a space before the first parameter (e.g., "
+#| "<userinput>install fb=false</userinput>)."
msgid ""
"Choosing the <quote>Help</quote> entry will result in the first help screen "
-"being displayed which gives an overview of all available help screens. Note "
-"that it is not possible to return to the boot menu after the help screens "
-"have been displayed. However, the F3 and F4 help screens list commands that "
-"are equivalent to the boot methods listed in the menu. All help screens have "
-"a boot prompt at which the boot command can be typed: "
-"<informalexample><screen>\n"
+"being displayed which gives an overview of all available help screens. To "
+"return to the boot menu after the help screens have been displayed, type "
+"'menu' at the boot prompt and press &enterkey;. All help screens have a boot "
+"prompt at which the boot command can be typed: <informalexample><screen>\n"
"Press F1 for the help index, or ENTER to boot:\n"
"</screen></informalexample> At this boot prompt you can either just press "
"&enterkey; to boot the installer with default options or enter a specific "
@@ -960,7 +979,7 @@ msgstr ""
"(例如:<userinput>install fb=false</userinput>)。"
#. Tag: para
-#: boot-installer.xml:700
+#: boot-installer.xml:699
#, no-c-format
msgid ""
"The keyboard is assumed to have a default American English layout at this "
@@ -976,7 +995,7 @@ msgstr ""
"说明了如何找到要使用正确的键。"
#. Tag: para
-#: boot-installer.xml:710
+#: boot-installer.xml:709
#, no-c-format
msgid ""
"If you are using a system that has the BIOS configured to use serial "
@@ -994,7 +1013,7 @@ msgstr ""
"Assistant</quote> (IRA)。"
#. Tag: para
-#: boot-installer.xml:720
+#: boot-installer.xml:719
#, no-c-format
msgid ""
"To bypass the graphical boot screen you can either blindly press &escapekey; "
@@ -1012,13 +1031,13 @@ msgstr ""
"userinput>,这在帮助里面有说明。"
#. Tag: title
-#: boot-installer.xml:780
+#: boot-installer.xml:779
#, no-c-format
msgid "CD Contents"
msgstr "CD 的内容"
#. Tag: para
-#: boot-installer.xml:782
+#: boot-installer.xml:781
#, no-c-format
msgid ""
"There are three basic variations of &debian; Install CDs. The "
@@ -1039,7 +1058,7 @@ msgstr ""
"光盘套件,则可以不使用网络就能安装大量软件包,建立完整的系统。"
#. Tag: para
-#: boot-installer.xml:798
+#: boot-installer.xml:797
#, no-c-format
msgid ""
"The IA-64 architecture uses the next generation Extensible Firmware "
@@ -1062,7 +1081,7 @@ msgstr ""
"MBR 或者引导块记录。"
#. Tag: para
-#: boot-installer.xml:814
+#: boot-installer.xml:813
#, no-c-format
msgid ""
"The &debian; Installer CD contains a small EFI partition where the "
@@ -1077,7 +1096,7 @@ msgstr ""
"说明如下。"
#. Tag: para
-#: boot-installer.xml:823
+#: boot-installer.xml:822
#, no-c-format
msgid ""
"Most of the details of how <command>ELILO</command> actually loads and "
@@ -1096,7 +1115,7 @@ msgstr ""
"查一个 EFI 分区是否合适。"
#. Tag: para
-#: boot-installer.xml:835
+#: boot-installer.xml:834
#, no-c-format
msgid ""
"The EFI Boot Manager is presented as the last step of the firmware "
@@ -1116,13 +1135,13 @@ msgstr ""
"用第一个,当然,该选项不可用或者 CD 由于某种原因没法启动,使用第二个。"
#. Tag: title
-#: boot-installer.xml:854
+#: boot-installer.xml:853
#, no-c-format
msgid "IMPORTANT"
msgstr "重要"
#. Tag: para
-#: boot-installer.xml:855
+#: boot-installer.xml:854
#, no-c-format
msgid ""
"The EFI Boot Manager will select a default boot action, typically the first "
@@ -1139,13 +1158,13 @@ msgstr ""
"command>返回 Boot Manager。"
#. Tag: title
-#: boot-installer.xml:867
+#: boot-installer.xml:866
#, no-c-format
msgid "Option 1: Booting from the Boot Option Maintenance Menu"
msgstr "选项 1: 从 Boot Option Maintenance Menu 启动"
#. Tag: para
-#: boot-installer.xml:874
+#: boot-installer.xml:873
#, no-c-format
msgid ""
"Insert the CD in the DVD/CD drive and reboot the machine. The firmware will "
@@ -1156,7 +1175,7 @@ msgstr ""
"Boot Manager 页面和菜单。"
#. Tag: para
-#: boot-installer.xml:880
+#: boot-installer.xml:879
#, no-c-format
msgid ""
"Select <command>Boot Maintenance Menu</command> from the menu with the arrow "
@@ -1166,7 +1185,7 @@ msgstr ""
"<command>ENTER</command>。会显示一个新菜单。"
#. Tag: para
-#: boot-installer.xml:886
+#: boot-installer.xml:885
#, no-c-format
msgid ""
"Select <command>Boot From a File</command> from the menu with the arrow keys "
@@ -1182,7 +1201,7 @@ msgstr ""
"Boot</command>标签。如果您检查菜单行其他部分,会看到对应的设备和控制器信息。"
#. Tag: para
-#: boot-installer.xml:897
+#: boot-installer.xml:896
#, no-c-format
msgid ""
"You can choose either of the entries that refer to the CD/DVD drive. Select "
@@ -1198,7 +1217,7 @@ msgstr ""
"的 CD 目录列表,要求您进行(额外的)下一步。"
#. Tag: para
-#: boot-installer.xml:908
+#: boot-installer.xml:907
#, no-c-format
msgid ""
"You will only need this step if you chose <command>Debian Inst [Acpi ...</"
@@ -1212,7 +1231,7 @@ msgstr ""
"择,并按下 <command>ENTER</command>。这将进入启动步骤。"
#. Tag: para
-#: boot-installer.xml:920
+#: boot-installer.xml:919
#, no-c-format
msgid ""
"These steps start the &debian; boot loader which will display a menu page "
@@ -1223,13 +1242,13 @@ msgstr ""
"进入选择启动内核和选项。"
#. Tag: title
-#: boot-installer.xml:930
+#: boot-installer.xml:929
#, no-c-format
msgid "Option 2: Booting from the EFI Shell"
msgstr "选项 2: 从 EFI Shell 启动"
#. Tag: para
-#: boot-installer.xml:931
+#: boot-installer.xml:930
#, no-c-format
msgid ""
"If, for some reason, option 1 is not successful, reboot the machine and when "
@@ -1242,7 +1261,7 @@ msgstr ""
"来引导 &debian; 安装程序 CD :"
#. Tag: para
-#: boot-installer.xml:942
+#: boot-installer.xml:941
#, no-c-format
msgid ""
"Insert the CD in the DVD/CD drive and reboot the machine. The firmware will "
@@ -1251,7 +1270,7 @@ msgid ""
msgstr "把 CD 放入 DVD/CD 驱动器。"
#. Tag: para
-#: boot-installer.xml:948
+#: boot-installer.xml:947
#, no-c-format
msgid ""
"Select <command>EFI Shell</command> from the menu with the arrow keys and "
@@ -1271,7 +1290,7 @@ msgstr ""
"用于初始化 CD 驱动器。"
#. Tag: para
-#: boot-installer.xml:962
+#: boot-installer.xml:961
#, no-c-format
msgid ""
"Examine the output from the shell looking for the CDROM drive. It is most "
@@ -1284,7 +1303,7 @@ msgstr ""
"<filename>fs<replaceable>n</replaceable></filename>。"
#. Tag: para
-#: boot-installer.xml:969
+#: boot-installer.xml:968
#, no-c-format
msgid ""
"Enter <command>fs<replaceable>n</replaceable>:</command> and press "
@@ -1297,7 +1316,7 @@ msgstr ""
"光盘的分区号。Shell 现在将在提示符下显示分区号。"
#. Tag: para
-#: boot-installer.xml:976
+#: boot-installer.xml:975
#, no-c-format
msgid ""
"Enter <command>elilo</command> and press <command>ENTER</command>. This will "
@@ -1307,7 +1326,7 @@ msgstr ""
"骤。"
#. Tag: para
-#: boot-installer.xml:983
+#: boot-installer.xml:982
#, no-c-format
msgid ""
"As with option 1, these steps start the &debian; boot loader which will "
@@ -1321,13 +1340,13 @@ msgstr ""
"replaceable>:elilo</command>简短命令。进入选择启动内核和选项。"
#. Tag: title
-#: boot-installer.xml:997
+#: boot-installer.xml:996
#, no-c-format
msgid "Installing using a Serial Console"
msgstr "使用串口控制台安装"
#. Tag: para
-#: boot-installer.xml:999
+#: boot-installer.xml:998
#, no-c-format
msgid ""
"You may choose to perform an install using a monitor and keyboard or using a "
@@ -1345,7 +1364,7 @@ msgstr ""
"置。"
#. Tag: para
-#: boot-installer.xml:1010
+#: boot-installer.xml:1009
#, no-c-format
msgid ""
"In most circumstances, you will want the installer to use the same baud rate "
@@ -1357,7 +1376,7 @@ msgstr ""
"置,可以通过命令 <command>baud</command> 在 EFI shell 获得。"
#. Tag: para
-#: boot-installer.xml:1017
+#: boot-installer.xml:1016
#, no-c-format
msgid ""
"If there is not an option available that is configured for the serial device "
@@ -1372,7 +1391,7 @@ msgstr ""
"窗口。"
#. Tag: para
-#: boot-installer.xml:1028
+#: boot-installer.xml:1027
#, no-c-format
msgid ""
"Most IA-64 boxes ship with a default console setting of 9600 baud. This "
@@ -1387,7 +1406,7 @@ msgstr ""
"装。参考 <classname>Params</classname> 帮助菜单,获得启动文本模式安装的指导。"
#. Tag: para
-#: boot-installer.xml:1037
+#: boot-installer.xml:1036
#, no-c-format
msgid ""
"If you select the wrong console type, you will be able to select the kernel "
@@ -1399,13 +1418,13 @@ msgstr ""
"核启动后死掉,只有重新启动才能开始安装。"
#. Tag: title
-#: boot-installer.xml:1046
+#: boot-installer.xml:1045
#, no-c-format
msgid "Selecting the Boot Kernel and Options"
msgstr "选择启动内核与选项"
#. Tag: para
-#: boot-installer.xml:1048
+#: boot-installer.xml:1047
#, no-c-format
msgid ""
"The boot loader will display a form with a menu list and a text window with "
@@ -1422,7 +1441,7 @@ msgstr ""
"<classname>Params</classname>窗口解释命令行参数。"
#. Tag: para
-#: boot-installer.xml:1060
+#: boot-installer.xml:1059
#, no-c-format
msgid ""
"Consult the <classname>General</classname> help screen for the description "
@@ -1442,7 +1461,7 @@ msgstr ""
"始安装:"
#. Tag: para
-#: boot-installer.xml:1078
+#: boot-installer.xml:1077
#, no-c-format
msgid ""
"Select the kernel version and installation mode most appropriate to your "
@@ -1450,7 +1469,7 @@ msgid ""
msgstr "使用方向键选择您需要的内核版本和适合的安装模式。"
#. Tag: para
-#: boot-installer.xml:1083
+#: boot-installer.xml:1082
#, no-c-format
msgid ""
"Enter any boot parameters by typing at the keyboard. The text will be "
@@ -1461,7 +1480,7 @@ msgstr ""
"控制台)指定的。"
#. Tag: para
-#: boot-installer.xml:1090
+#: boot-installer.xml:1089
#, no-c-format
msgid ""
"Press <command>ENTER</command>. This will load and start the kernel. The "
@@ -1472,7 +1491,7 @@ msgstr ""
"一个屏幕显示常规的初始化信息。"
#. Tag: para
-#: boot-installer.xml:1099 boot-installer.xml:1235
+#: boot-installer.xml:1098 boot-installer.xml:1234
#, no-c-format
msgid ""
"Proceed to the next chapter to continue the installation where you will set "
@@ -1480,7 +1499,7 @@ msgid ""
msgstr "进入到下一章继续安装本地语言,网络和磁盘分区。"
#. Tag: para
-#: boot-installer.xml:1110
+#: boot-installer.xml:1109
#, no-c-format
msgid ""
"Booting an IA-64 system from the network is similar to a CD boot. The only "
@@ -1497,7 +1516,7 @@ msgstr ""
"器。"
#. Tag: para
-#: boot-installer.xml:1144
+#: boot-installer.xml:1143
#, no-c-format
msgid ""
"Network booting an IA-64 system requires two architecture-specific actions. "
@@ -1510,13 +1529,13 @@ msgstr ""
"必须在 EFI boot manager 下定义来打开网络的装入。"
#. Tag: title
-#: boot-installer.xml:1155
+#: boot-installer.xml:1154
#, no-c-format
msgid "Configuring the Server"
msgstr "配置网络服务器"
#. Tag: para
-#: boot-installer.xml:1156
+#: boot-installer.xml:1155
#, no-c-format
msgid ""
"A suitable TFTP entry for network booting an IA-64 system looks something "
@@ -1540,7 +1559,7 @@ msgstr ""
"在客户端运行。"
#. Tag: para
-#: boot-installer.xml:1166
+#: boot-installer.xml:1165
#, no-c-format
msgid ""
"Extract the <filename>netboot.tar.gz</filename> file into the directory used "
@@ -1555,7 +1574,7 @@ msgstr ""
"它包括 IA-64 系统需要的启动文件。"
#. Tag: screen
-#: boot-installer.xml:1176
+#: boot-installer.xml:1175
#, no-c-format
msgid ""
"# cd /var/lib/tftp\n"
@@ -1573,7 +1592,7 @@ msgstr ""
"[...]"
#. Tag: para
-#: boot-installer.xml:1176
+#: boot-installer.xml:1175
#, no-c-format
msgid ""
"The <filename>netboot.tar.gz</filename> contains an <filename>elilo.conf</"
@@ -1592,13 +1611,13 @@ msgstr ""
"filename>。请查看 <classname>elilo</classname> 软件包附带的文档以获得细节。"
#. Tag: title
-#: boot-installer.xml:1193
+#: boot-installer.xml:1192
#, no-c-format
msgid "Configuring the Client"
msgstr "配置客户机"
#. Tag: para
-#: boot-installer.xml:1194
+#: boot-installer.xml:1193
#, no-c-format
msgid ""
"To configure the client to support TFTP booting, start by booting to EFI and "
@@ -1625,7 +1644,7 @@ msgstr ""
"DHCP 查询,然后会从服务器装入 <filename>elilo.efi</filename>。"
#. Tag: para
-#: boot-installer.xml:1226
+#: boot-installer.xml:1225
#, no-c-format
msgid ""
"The boot loader will display its prompt after it has downloaded and "
@@ -1640,13 +1659,13 @@ msgstr ""
# index.docbook:1899, index.docbook:1946
#. Tag: title
-#: boot-installer.xml:1252 boot-installer.xml:1276
+#: boot-installer.xml:1251 boot-installer.xml:1275
#, no-c-format
msgid "SGI TFTP Booting"
msgstr "SGI TFTP 引导"
#. Tag: para
-#: boot-installer.xml:1253
+#: boot-installer.xml:1252
#, no-c-format
msgid ""
"After entering the command monitor use <informalexample><screen>\n"
@@ -1668,13 +1687,13 @@ msgstr ""
# index.docbook:1943, index.docbook:2477
#. Tag: title
-#: boot-installer.xml:1273 boot-installer.xml:1340 boot-installer.xml:1974
+#: boot-installer.xml:1272 boot-installer.xml:1339 boot-installer.xml:1973
#, no-c-format
msgid "Boot Parameters"
msgstr "引导参数"
#. Tag: para
-#: boot-installer.xml:1277
+#: boot-installer.xml:1276
#, no-c-format
msgid ""
"On SGI machines you can append boot parameters to the <command>bootp():</"
@@ -1684,7 +1703,7 @@ msgstr ""
"参数。"
#. Tag: para
-#: boot-installer.xml:1282
+#: boot-installer.xml:1281
#, no-c-format
msgid ""
"Following the <command>bootp():</command> command you can give the path and "
@@ -1702,20 +1721,20 @@ msgstr ""
"command>:"
#. Tag: screen
-#: boot-installer.xml:1292
+#: boot-installer.xml:1291
#, no-c-format
msgid "bootp(): append=\"root=/dev/sda1\""
msgstr "bootp(): append=\"root=/dev/sda1\""
# index.docbook:1899, index.docbook:1946
#. Tag: title
-#: boot-installer.xml:1306 boot-installer.xml:1343
+#: boot-installer.xml:1305 boot-installer.xml:1342
#, no-c-format
msgid "Cobalt TFTP Booting"
msgstr "Cobalt TFTP 引导"
#. Tag: para
-#: boot-installer.xml:1307
+#: boot-installer.xml:1306
#, no-c-format
msgid ""
"Strictly speaking, Cobalt does not use TFTP but NFS to boot. You need to "
@@ -1730,7 +1749,7 @@ msgstr ""
"键,机器就从 NFS 网络启动。它会在显示器上显示几个选项。有下面两种安装方法:"
#. Tag: para
-#: boot-installer.xml:1317
+#: boot-installer.xml:1316
#, no-c-format
msgid ""
"Via SSH (default): In this case, the installer will configure the network "
@@ -1744,7 +1763,7 @@ msgstr ""
"到机器就可以开始安装。"
#. Tag: para
-#: boot-installer.xml:1326
+#: boot-installer.xml:1325
#, no-c-format
msgid ""
"Via serial console: Using a null modem cable, you can connect to the serial "
@@ -1755,7 +1774,7 @@ msgstr ""
"115200 bps) 然后进行安装。"
#. Tag: para
-#: boot-installer.xml:1344
+#: boot-installer.xml:1343
#, no-c-format
msgid ""
"You cannot pass any boot parameters directly. Instead, you have to edit the "
@@ -1766,13 +1785,13 @@ msgstr ""
"default.colo</filename> 文件,将参数给 <replaceable>args</replaceable> 变量。"
#. Tag: title
-#: boot-installer.xml:1359
+#: boot-installer.xml:1358
#, no-c-format
msgid "s390 Limitations"
msgstr "s390 的限制"
#. Tag: para
-#: boot-installer.xml:1360
+#: boot-installer.xml:1359
#, no-c-format
msgid ""
"In order to run the installation system a working network setup and ssh "
@@ -1780,7 +1799,7 @@ msgid ""
msgstr "为了在 S/390 上安装系统,需要一个工作的网络设置和 ssh 会话。"
#. Tag: para
-#: boot-installer.xml:1365
+#: boot-installer.xml:1364
#, no-c-format
msgid ""
"The booting process starts with a network setup that prompts you for several "
@@ -1792,13 +1811,13 @@ msgstr ""
"一个 ssh 会话登录进入系统,并且开始一个标准系统安装。"
#. Tag: title
-#: boot-installer.xml:1376
+#: boot-installer.xml:1375
#, no-c-format
msgid "s390 Boot Parameters"
msgstr "s390 引导参数"
#. Tag: para
-#: boot-installer.xml:1377
+#: boot-installer.xml:1376
#, no-c-format
msgid ""
"On S/390 you can append boot parameters in the parm file. This file can "
@@ -1810,7 +1829,7 @@ msgstr ""
"映像。"
#. Tag: para
-#: boot-installer.xml:1437
+#: boot-installer.xml:1436
#, no-c-format
msgid ""
"Currently, the only &arch-title; subarchitectures that support CD-ROM "
@@ -1826,7 +1845,7 @@ msgstr ""
"keycap> 和 <keycap>Delete</keycap> 组合键引导出厂默认的 CD/DVD 驱动器。"
#. Tag: para
-#: boot-installer.xml:1446
+#: boot-installer.xml:1445
#, no-c-format
msgid ""
"To boot a PowerMac from an external Firewire CD/DVD drive invoke Open "
@@ -1843,13 +1862,13 @@ msgstr ""
"</screen></informalexample> 另一种方法引导出厂默认的 CD/DVD 驱动器,键入"
#. Tag: screen
-#: boot-installer.xml:1457
+#: boot-installer.xml:1456
#, no-c-format
msgid "0 &gt; boot cd:,\\install\\yaboot"
msgstr "0 &gt; boot cd:,\\install\\yaboot"
#. Tag: para
-#: boot-installer.xml:1459
+#: boot-installer.xml:1458
#, no-c-format
msgid ""
"OldWorld PowerMacs will not boot a &debian; CD, because OldWorld computers "
@@ -1864,7 +1883,7 @@ msgstr ""
"安装程序 从 CD 上选择所需要的文件。"
#. Tag: para
-#: boot-installer.xml:1468
+#: boot-installer.xml:1467
#, no-c-format
msgid ""
"To boot &debian; CD/DVD on Pegasos II machine, hold <keycap>Esc</keycap> key "
@@ -1875,20 +1894,20 @@ msgstr ""
"<keycap>Esc</keycap> 键,出现 SmartFirmware 提示符后,键入"
#. Tag: screen
-#: boot-installer.xml:1474
+#: boot-installer.xml:1473
#, no-c-format
msgid "boot cd install/pegasos"
msgstr "boot cd install/pegasos"
#. Tag: title
-#: boot-installer.xml:1480
+#: boot-installer.xml:1479
#, no-c-format
msgid "Booting from Hard Disk"
msgstr "从硬盘引导"
# index.docbook:1591, index.docbook:2097
#. Tag: para
-#: boot-installer.xml:1486
+#: boot-installer.xml:1485
#, no-c-format
msgid ""
"Booting from an existing operating system is often a convenient option; for "
@@ -1899,7 +1918,7 @@ msgstr ""
# index.docbook:1597, index.docbook:2103
#. Tag: para
-#: boot-installer.xml:1492
+#: boot-installer.xml:1491
#, no-c-format
msgid ""
"To boot the installer from hard disk, you will have already completed "
@@ -1910,13 +1929,13 @@ msgstr ""
"下载并且安置所需文件。"
#. Tag: title
-#: boot-installer.xml:1512
+#: boot-installer.xml:1511
#, no-c-format
msgid "Booting OldWorld PowerMacs from MacOS"
msgstr "从 OldWorld PowerMacs 的 MacOS 上引导"
#. Tag: para
-#: boot-installer.xml:1513
+#: boot-installer.xml:1512
#, no-c-format
msgid ""
"If you set up BootX in <xref linkend=\"files-oldworld\"/>, you can use it to "
@@ -1937,13 +1956,13 @@ msgstr ""
"序。"
#. Tag: title
-#: boot-installer.xml:1531
+#: boot-installer.xml:1530
#, no-c-format
msgid "Booting NewWorld Macs from OpenFirmware"
msgstr "从 NewWorld Macs 的 OpenFirmware 引导"
#. Tag: para
-#: boot-installer.xml:1532
+#: boot-installer.xml:1531
#, no-c-format
msgid ""
"You will have already placed the <filename>vmlinux</filename>, "
@@ -1984,19 +2003,19 @@ msgstr ""
# index.docbook:700, index.docbook:2176
#. Tag: title
-#: boot-installer.xml:1564
+#: boot-installer.xml:1563
#, no-c-format
msgid "Booting from USB memory stick"
msgstr "从 U 盘引导"
#. Tag: para
-#: boot-installer.xml:1565
+#: boot-installer.xml:1564
#, no-c-format
msgid "Currently, NewWorld PowerMac systems are known to support USB booting."
msgstr "当前,New World PowerMac 系统支持从 USB 引导。"
#. Tag: para
-#: boot-installer.xml:1571
+#: boot-installer.xml:1570
#, no-c-format
msgid ""
"Make sure you have prepared everything from <xref linkend=\"boot-usb-files\"/"
@@ -2009,7 +2028,7 @@ msgstr ""
"Open Firmware 提示符。参阅 <xref linkend=\"invoking-openfirmware\"/>。"
#. Tag: para
-#: boot-installer.xml:1580
+#: boot-installer.xml:1579
#, no-c-format
msgid ""
"You will need to work out where the USB storage device appears in the device "
@@ -2030,7 +2049,7 @@ msgstr ""
"disk@1</filename> 。"
#. Tag: para
-#: boot-installer.xml:1592
+#: boot-installer.xml:1591
#, no-c-format
msgid ""
"Having worked out the device path, use a command like this to boot the "
@@ -2054,7 +2073,7 @@ msgstr ""
"command>。"
#. Tag: para
-#: boot-installer.xml:1606
+#: boot-installer.xml:1605
#, no-c-format
msgid ""
"The system should now boot up, and you should be presented with the "
@@ -2065,7 +2084,7 @@ msgstr ""
"动参数,或者只按下 &enterkey;。"
#. Tag: para
-#: boot-installer.xml:1612
+#: boot-installer.xml:1611
#, no-c-format
msgid ""
"This boot method is new, and may be difficult to get to work on some "
@@ -2076,13 +2095,13 @@ msgstr ""
"下安装报告,参阅 <xref linkend=\"submit-bug\"/>。"
#. Tag: para
-#: boot-installer.xml:1645
+#: boot-installer.xml:1644
#, no-c-format
msgid "Currently, PReP and New World PowerMac systems support netbooting."
msgstr "目前来说,PReP 以及 New World PowerMac 系统支持网络引导。"
#. Tag: para
-#: boot-installer.xml:1649
+#: boot-installer.xml:1648
#, no-c-format
msgid ""
"On machines with Open Firmware, such as NewWorld Power Macs, enter the boot "
@@ -2115,7 +2134,7 @@ msgstr ""
"<userinput>help boot</userinput> 命令可以给出语法和选项的说明。"
#. Tag: para
-#: boot-installer.xml:1677
+#: boot-installer.xml:1676
#, no-c-format
msgid ""
"Booting from floppies is supported for &arch-title;, although it is "
@@ -2127,7 +2146,7 @@ msgstr ""
"没有安装 软盘驱动器,并且附带的 USB 软盘并不支持引导。"
#. Tag: para
-#: boot-installer.xml:1689
+#: boot-installer.xml:1688
#, no-c-format
msgid ""
"To boot from the <filename>boot-floppy-hfs.img</filename> floppy, place it "
@@ -2138,7 +2157,7 @@ msgstr ""
"按下电源开关前把它放到软盘驱动器内。"
#. Tag: para
-#: boot-installer.xml:1695
+#: boot-installer.xml:1694
#, no-c-format
msgid ""
"For those not familiar with Macintosh floppy operations: a floppy placed in "
@@ -2150,7 +2169,7 @@ msgstr ""
"序。一个 没有有效引导系统的软盘将回被弹出,并且机器将检查硬盘分区。"
#. Tag: para
-#: boot-installer.xml:1702
+#: boot-installer.xml:1701
#, no-c-format
msgid ""
"After booting, the <filename>root.bin</filename> floppy is requested. Insert "
@@ -2161,13 +2180,13 @@ msgstr ""
"&enterkey;。安装程序将在根系统被装入内存后自动启动。"
#. Tag: title
-#: boot-installer.xml:1713
+#: boot-installer.xml:1712
#, no-c-format
msgid "PowerPC Boot Parameters"
msgstr "PowerPC 引导参数"
#. Tag: para
-#: boot-installer.xml:1714
+#: boot-installer.xml:1713
#, no-c-format
msgid ""
"Many older Apple monitors used a 640x480 67Hz mode. If your video appears "
@@ -2182,7 +2201,7 @@ msgstr ""
"128 来说,请改变其值为 <userinput>video=aty128fb:vmode:6</userinput> 。"
#. Tag: para
-#: boot-installer.xml:1754
+#: boot-installer.xml:1753
#, no-c-format
msgid ""
"On machines with OpenBoot, simply enter the boot monitor on the machine "
@@ -2201,7 +2220,7 @@ msgstr ""
"i; 。"
#. Tag: para
-#: boot-installer.xml:1809
+#: boot-installer.xml:1808
#, no-c-format
msgid ""
"Most OpenBoot versions support the <userinput>boot cdrom</userinput> command "
@@ -2213,13 +2232,13 @@ msgstr ""
"盘)。"
#. Tag: title
-#: boot-installer.xml:1818
+#: boot-installer.xml:1817
#, no-c-format
msgid "IDPROM Messages"
msgstr "IDPROM 消息"
#. Tag: para
-#: boot-installer.xml:1819
+#: boot-installer.xml:1818
#, no-c-format
msgid ""
"If you cannot boot because you get messages about a problem with "
@@ -2233,13 +2252,13 @@ msgstr ""
"nvram-faq;\">Sun NVRAM FAQ</ulink> 以获得更多信息。"
#. Tag: title
-#: boot-installer.xml:1838
+#: boot-installer.xml:1837
#, no-c-format
msgid "Accessibility"
msgstr "辅助功能"
#. Tag: para
-#: boot-installer.xml:1839
+#: boot-installer.xml:1838
#, no-c-format
msgid ""
"Some users may need specific support because of e.g. some visual impairment. "
@@ -2264,13 +2283,13 @@ msgstr ""
"要注意在大多数架构下 boot loader 将视您的键盘为 QWERTY 布局。"
#. Tag: title
-#: boot-installer.xml:1859
+#: boot-installer.xml:1858
#, no-c-format
msgid "USB Braille Displays"
msgstr "USB 盲文点显器"
#. Tag: para
-#: boot-installer.xml:1860
+#: boot-installer.xml:1859
#, no-c-format
msgid ""
"USB braille displays should be automatically detected. A textual version of "
@@ -2289,13 +2308,13 @@ msgstr ""
"website</ulink> 可以找到盲文点显器的键绑定文档。"
#. Tag: title
-#: boot-installer.xml:1875
+#: boot-installer.xml:1874
#, no-c-format
msgid "Serial Braille Displays"
msgstr "串口盲文点显器"
#. Tag: para
-#: boot-installer.xml:1876
+#: boot-installer.xml:1875
#, no-c-format
msgid ""
"Serial braille displays cannot safely be automatically detected (since that "
@@ -2330,13 +2349,13 @@ msgstr ""
"\"><classname>brltty</classname> website</ulink> 找到。"
#. Tag: title
-#: boot-installer.xml:1898 boot-installer.xml:2873
+#: boot-installer.xml:1897 boot-installer.xml:2861
#, no-c-format
msgid "Software Speech Synthesis"
msgstr "软件语音合成(Software Speech Synthesis)"
#. Tag: para
-#: boot-installer.xml:1899
+#: boot-installer.xml:1898
#, no-c-format
msgid ""
"Support for software speech synthesis can be activated by selecting it in "
@@ -2350,13 +2369,13 @@ msgstr ""
"<classname>espeak</classname>)。"
#. Tag: title
-#: boot-installer.xml:1910
+#: boot-installer.xml:1909
#, no-c-format
msgid "Hardware Speech Synthesis"
msgstr "硬件语音合成(Hardware Speech Synthesis)"
#. Tag: para
-#: boot-installer.xml:1911
+#: boot-installer.xml:1910
#, no-c-format
msgid ""
"Support for hardware speech synthesis devices is available only alongside "
@@ -2367,7 +2386,7 @@ msgstr ""
"择 <quote>Graphical install</quote> 项。"
#. Tag: para
-#: boot-installer.xml:1917
+#: boot-installer.xml:1916
#, no-c-format
msgid ""
"Hardware speech synthesis devices cannot be automatically detected. You thus "
@@ -2387,13 +2406,13 @@ msgstr ""
"对于语音合成设备的支持也会被自动安装到最终系统里面。"
#. Tag: title
-#: boot-installer.xml:1932
+#: boot-installer.xml:1931
#, no-c-format
msgid "Board Devices"
msgstr "板卡设备"
#. Tag: para
-#: boot-installer.xml:1933
+#: boot-installer.xml:1932
#, no-c-format
msgid ""
"Some accessibility devices are actual boards that are plugged inside the "
@@ -2408,7 +2427,7 @@ msgstr ""
"数量。"
#. Tag: para
-#: boot-installer.xml:1941
+#: boot-installer.xml:1940
#, no-c-format
msgid ""
"If desired a textual version of the bootloader can be activated before "
@@ -2418,13 +2437,13 @@ msgstr ""
"userinput> &enterkey;。"
#. Tag: title
-#: boot-installer.xml:1949
+#: boot-installer.xml:1948
#, no-c-format
msgid "High-Contrast Theme"
msgstr "高亮主题"
#. Tag: para
-#: boot-installer.xml:1950
+#: boot-installer.xml:1949
#, no-c-format
msgid ""
"For users with low vision, the installer can use a high-contrast theme that "
@@ -2435,13 +2454,13 @@ msgstr ""
"<userinput>theme=dark</userinput> 引导参数即可。"
#. Tag: title
-#: boot-installer.xml:1959
+#: boot-installer.xml:1958
#, no-c-format
msgid "Preseeding"
msgstr "预置"
#. Tag: para
-#: boot-installer.xml:1960
+#: boot-installer.xml:1959
#, no-c-format
msgid ""
"Alternatively, &debian; can be installed completely automatically by using "
@@ -2451,7 +2470,7 @@ msgstr ""
"\"appendix-preseed\"/>。"
#. Tag: para
-#: boot-installer.xml:1975
+#: boot-installer.xml:1974
#, no-c-format
msgid ""
"Boot parameters are Linux kernel parameters which are generally used to make "
@@ -2464,7 +2483,7 @@ msgstr ""
"要给内核一点小小的帮助。"
#. Tag: para
-#: boot-installer.xml:1982
+#: boot-installer.xml:1981
#, no-c-format
msgid ""
"If this is the first time you're booting the system, try the default boot "
@@ -2477,7 +2496,7 @@ msgstr ""
"的硬件特定参数。"
#. Tag: para
-#: boot-installer.xml:1989
+#: boot-installer.xml:1988
#, no-c-format
msgid ""
"Information on many boot parameters can be found in the <ulink url=\"http://"
@@ -2492,35 +2511,8 @@ msgstr ""
"linkend=\"boot-troubleshooting\"/>。"
#. Tag: para
-#: boot-installer.xml:1998
-#, no-c-format
-msgid ""
-"When the kernel boots, a message <informalexample><screen>\n"
-"Memory:<replaceable>avail</replaceable>k/<replaceable>total</replaceable>k "
-"available\n"
-"</screen></informalexample> should be emitted early in the process. "
-"<replaceable>total</replaceable> should match the total amount of RAM, in "
-"kilobytes. If this doesn't match the actual amount of RAM you have "
-"installed, you need to use the <userinput>mem=<replaceable>ram</"
-"replaceable></userinput> parameter, where <replaceable>ram</replaceable> is "
-"set to the amount of memory, suffixed with <quote>k</quote> for kilobytes, "
-"or <quote>m</quote> for megabytes. For example, both <userinput>mem=65536k</"
-"userinput> and <userinput>mem=64m</userinput> mean 64MB of RAM."
-msgstr ""
-"当内核引导的时候,有一条消息 <informalexample><screen>\n"
-"Memory:<replaceable>avail</replaceable>k/<replaceable>total</replaceable>k "
-"available \n"
-"</screen></informalexample> 应该显示在引导过程的前面。其中 "
-"<replaceable>total</replaceable> 应该符合您内存的总量,单位为千字节。如果此参"
-"数不符合您实际的内存总数,需要使用 <userinput>mem=<replaceable>ram</"
-"replaceable></userinput> 参数。这里 <replaceable>ram</replaceable> 被设置为内"
-"存的数量。如是<quote>k</quote>则为千字节,<quote>m</quote>为兆字节。例如,"
-"<userinput>mem=65536k</userinput> 和 <userinput>mem=64m</userinput> 标明 "
-"64MB 内存。"
-
-#. Tag: para
-#: boot-installer.xml:2014
-#, no-c-format
+#: boot-installer.xml:1999
+#, fuzzy, no-c-format
#| msgid ""
#| "If you are booting with a serial console, generally the kernel will "
#| "autodetect this. If you have a videocard (framebuffer) and a keyboard "
@@ -2543,13 +2535,7 @@ msgid ""
"have to pass the <userinput>console=<replaceable>device</replaceable></"
"userinput> argument to the kernel, where <replaceable>device</replaceable> "
"is your serial device, which is usually something like <filename>ttyS0</"
-"filename><footnote> <para> In order to ensure the terminal type used by the "
-"installer matches your terminal emulator, the parameter "
-"<userinput>TERM=<replaceable>type</replaceable></userinput> can be added. "
-"Note that the installer only supports the following terminal types: "
-"<literal>linux</literal>, <literal>bterm</literal>, <literal>ansi</literal>, "
-"<literal>vt102</literal> and <literal>dumb</literal>. The default for serial "
-"console in &d-i; is <userinput>vt102</userinput>. </para> </footnote>."
+"filename>."
msgstr ""
"假如您用串口控制台引导,通常内核可以自动检测到。如果在串口引导的计算机上有视"
"频卡(framebuffer)和键盘,您必须传递 <userinput>console=<replaceable>device</"
@@ -2563,7 +2549,49 @@ msgstr ""
"para> </footnote>。"
#. Tag: para
-#: boot-installer.xml:2038
+#: boot-installer.xml:2011
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you are booting with a serial console, generally the kernel will "
+#| "autodetect this. If you have a videocard (framebuffer) and a keyboard "
+#| "also attached to the computer which you wish to boot via serial console, "
+#| "you may have to pass the <userinput>console=<replaceable>device</"
+#| "replaceable></userinput> argument to the kernel, where "
+#| "<replaceable>device</replaceable> is your serial device, which is usually "
+#| "something like <filename>ttyS0</filename><footnote> <para> In order to "
+#| "ensure the terminal type used by the installer matches your terminal "
+#| "emulator, the parameter <userinput>TERM=<replaceable>type</replaceable></"
+#| "userinput> can be added. Note that the installer only supports the "
+#| "following terminal types: <literal>linux</literal>, <literal>bterm</"
+#| "literal>, <literal>ansi</literal>, <literal>vt102</literal> and "
+#| "<literal>dumb</literal>. The default for serial console in &d-i; is "
+#| "<userinput>vt102</userinput>. </para> </footnote>."
+msgid ""
+"In order to ensure the terminal type used by the installer matches your "
+"terminal emulator, the parameter <userinput>TERM=<replaceable>type</"
+"replaceable></userinput> can be added. Note that the installer only supports "
+"the following terminal types: <literal>linux</literal>, <literal>bterm</"
+"literal>, <literal>ansi</literal>, <literal>vt102</literal> and "
+"<literal>dumb</literal>. The default for serial console in &d-i; is "
+"<userinput>vt102</userinput>. If you are using a virtualization tool which "
+"does not provide conversion into such terminals types itself, e.g. QEMU/KVM, "
+"you can start it inside a <command>screen</command> session. That will "
+"indeed perform translation into the <literal>screen</literal> terminal type, "
+"which is very close to <literal>vt102</literal>."
+msgstr ""
+"假如您用串口控制台引导,通常内核可以自动检测到。如果在串口引导的计算机上有视"
+"频卡(framebuffer)和键盘,您必须传递 <userinput>console=<replaceable>device</"
+"replaceable></userinput> 参数给内核,其中 <replaceable>device</replaceable> "
+"是串口设备,通常是 <filename>ttyS0</filename> 形式。<footnote> <para> 为了确"
+"保安装程序使用的终端类型与您的终端模拟程序匹配,可以添加一个 "
+"<userinput>TERM=<replaceable>type</replaceable></userinput> 参数。注意,安装"
+"程序仅支持下列终端类型: <literal>linux</literal>、<literal>bterm</literal>、"
+"<literal>ansi</literal>、<literal>vt102</literal> 和 <literal>dumb</"
+"literal>。&d-i; 中默认的串口控制台终端类型是 <userinput>vt102</userinput>。</"
+"para> </footnote>。"
+
+#. Tag: para
+#: boot-installer.xml:2027
#, no-c-format
msgid ""
"For &arch-title; the serial devices are <filename>ttya</filename> or "
@@ -2576,13 +2604,13 @@ msgstr ""
"<envar>output-device</envar> OpenPROM 变量至 <filename>ttya</filename>。"
#. Tag: title
-#: boot-installer.xml:2049
+#: boot-installer.xml:2038
#, no-c-format
msgid "&debian; Installer Parameters"
msgstr "&debian; 安装程序的参数"
#. Tag: para
-#: boot-installer.xml:2050
+#: boot-installer.xml:2039
#, no-c-format
msgid ""
"The installation system recognizes a few additional boot "
@@ -2595,7 +2623,7 @@ msgstr ""
"para> </footnote>,它们很有用。"
#. Tag: para
-#: boot-installer.xml:2063
+#: boot-installer.xml:2052
#, no-c-format
msgid ""
"A number of parameters have a <quote>short form</quote> that helps avoid the "
@@ -2609,19 +2637,19 @@ msgstr ""
"用简写。"
#. Tag: term
-#: boot-installer.xml:2075
+#: boot-installer.xml:2064
#, no-c-format
msgid "debconf/priority (priority)"
msgstr "debconf/priority (priority)"
#. Tag: para
-#: boot-installer.xml:2076
+#: boot-installer.xml:2065
#, no-c-format
msgid "This parameter sets the lowest priority of messages to be displayed."
msgstr "这些参数设置将设置显示的信息为最低的级别。"
#. Tag: para
-#: boot-installer.xml:2080
+#: boot-installer.xml:2069
#, no-c-format
msgid ""
"The default installation uses <userinput>priority=high</userinput>. This "
@@ -2634,7 +2662,7 @@ msgstr ""
"将按照要求调整优先级别。"
#. Tag: para
-#: boot-installer.xml:2087
+#: boot-installer.xml:2076
#, no-c-format
msgid ""
"If you add <userinput>priority=medium</userinput> as boot parameter, you "
@@ -2652,13 +2680,13 @@ msgstr ""
"且尝试正确无误地执行各项事宜。"
#. Tag: term
-#: boot-installer.xml:2101
+#: boot-installer.xml:2090
#, no-c-format
msgid "DEBIAN_FRONTEND"
msgstr "DEBIAN_FRONTEND"
#. Tag: para
-#: boot-installer.xml:2102
+#: boot-installer.xml:2091
#, no-c-format
msgid ""
"This boot parameter controls the type of user interface used for the "
@@ -2691,13 +2719,13 @@ msgstr ""
"所支持的平台上使用 <userinput>gtk</userinput> 前端。"
#. Tag: term
-#: boot-installer.xml:2133
+#: boot-installer.xml:2122
#, no-c-format
msgid "BOOT_DEBUG"
msgstr "BOOT_DEBUG"
#. Tag: para
-#: boot-installer.xml:2134
+#: boot-installer.xml:2123
#, no-c-format
msgid ""
"Setting this boot parameter to 2 will cause the installer's boot process to "
@@ -2709,49 +2737,49 @@ msgstr ""
"debug shell。(退出 shell 以后会继续引导过程。)"
#. Tag: userinput
-#: boot-installer.xml:2143
+#: boot-installer.xml:2132
#, no-c-format
msgid "BOOT_DEBUG=0"
msgstr "BOOT_DEBUG=0"
#. Tag: para
-#: boot-installer.xml:2144
+#: boot-installer.xml:2133
#, no-c-format
msgid "This is the default."
msgstr "此为默认。"
#. Tag: userinput
-#: boot-installer.xml:2148
+#: boot-installer.xml:2137
#, no-c-format
msgid "BOOT_DEBUG=1"
msgstr "BOOT_DEBUG=1"
#. Tag: para
-#: boot-installer.xml:2149
+#: boot-installer.xml:2138
#, no-c-format
msgid "More verbose than usual."
msgstr "更多的信息。"
#. Tag: userinput
-#: boot-installer.xml:2153
+#: boot-installer.xml:2142
#, no-c-format
msgid "BOOT_DEBUG=2"
msgstr "BOOT_DEBUG=2"
#. Tag: para
-#: boot-installer.xml:2154
+#: boot-installer.xml:2143
#, no-c-format
msgid "Lots of debugging information."
msgstr "大量的调试信息。"
#. Tag: userinput
-#: boot-installer.xml:2158
+#: boot-installer.xml:2147
#, no-c-format
msgid "BOOT_DEBUG=3"
msgstr "BOOT_DEBUG=3"
#. Tag: para
-#: boot-installer.xml:2159
+#: boot-installer.xml:2148
#, no-c-format
msgid ""
"Shells are run at various points in the boot process to allow detailed "
@@ -2761,13 +2789,13 @@ msgstr ""
"Shell 将继续引导过程。"
#. Tag: term
-#: boot-installer.xml:2173
+#: boot-installer.xml:2162
#, no-c-format
msgid "INSTALL_MEDIA_DEV"
msgstr "INSTALL_MEDIA_DEV"
#. Tag: para
-#: boot-installer.xml:2174
+#: boot-installer.xml:2163
#, no-c-format
msgid ""
"The value of the parameter is the path to the device to load the &debian; "
@@ -2778,7 +2806,7 @@ msgstr ""
"<userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</userinput>"
#. Tag: para
-#: boot-installer.xml:2180
+#: boot-installer.xml:2169
#, no-c-format
msgid ""
"The boot floppy, which normally scans all floppies it can to find the root "
@@ -2787,19 +2815,19 @@ msgstr ""
"引导软盘通常会扫描所有的软盘来找到根软盘,可以通过此参数设置只查找一个设备。"
#. Tag: term
-#: boot-installer.xml:2191
+#: boot-installer.xml:2180
#, no-c-format
msgid "log_host"
msgstr "log_host"
#. Tag: term
-#: boot-installer.xml:2192
+#: boot-installer.xml:2181
#, no-c-format
msgid "log_port"
msgstr "log_port"
#. Tag: para
-#: boot-installer.xml:2193
+#: boot-installer.xml:2182
#, no-c-format
msgid ""
"Causes the installer to send log messages to a remote syslog on the "
@@ -2810,13 +2838,13 @@ msgstr ""
"定,默认端口是 syslog 标准端口 514。"
#. Tag: term
-#: boot-installer.xml:2204
+#: boot-installer.xml:2193
#, no-c-format
msgid "lowmem"
msgstr "lowmem"
#. Tag: para
-#: boot-installer.xml:2205
+#: boot-installer.xml:2194
#, no-c-format
msgid ""
"Can be used to force the installer to a lowmem level higher than the one the "
@@ -2827,13 +2855,13 @@ msgstr ""
"和 2。参阅 <xref linkend=\"lowmem\"/>。"
#. Tag: term
-#: boot-installer.xml:2215
+#: boot-installer.xml:2204
#, no-c-format
msgid "noshell"
msgstr "noshell"
#. Tag: para
-#: boot-installer.xml:2216
+#: boot-installer.xml:2205
#, no-c-format
msgid ""
"Prevents the installer from offering interactive shells on tty2 and tty3. "
@@ -2843,13 +2871,13 @@ msgstr ""
"处。"
#. Tag: term
-#: boot-installer.xml:2225
+#: boot-installer.xml:2214
#, no-c-format
msgid "debian-installer/framebuffer (fb)"
msgstr "debian-installer/framebuffer (fb)"
#. Tag: para
-#: boot-installer.xml:2226
+#: boot-installer.xml:2215
#, no-c-format
msgid ""
"Some architectures use the kernel framebuffer to offer installation in a "
@@ -2865,13 +2893,13 @@ msgstr ""
"bogl 的相关错误信息、一个空白的屏幕,或者在开始安装几分钟后停止。"
#. Tag: para
-#: boot-installer.xml:2235
+#: boot-installer.xml:2224
#, no-c-format
msgid "Such problems have been reported on hppa."
msgstr "在 hppa 上面报告过存在这些问题。"
#. Tag: para
-#: boot-installer.xml:2239
+#: boot-installer.xml:2228
#, no-c-format
msgid ""
"Because of display problems on some systems, framebuffer support is "
@@ -2888,13 +2916,13 @@ msgstr ""
"<userinput>fb=true</userinput>。"
#. Tag: term
-#: boot-installer.xml:2253
+#: boot-installer.xml:2242
#, no-c-format
msgid "debian-installer/theme (theme)"
msgstr "debian-installer/theme (theme)"
#. Tag: para
-#: boot-installer.xml:2254
+#: boot-installer.xml:2243
#, no-c-format
msgid ""
"A theme determines how the user interface of the installer looks (colors, "
@@ -2909,13 +2937,13 @@ msgstr ""
"<userinput>theme=<replaceable>dark</replaceable></userinput> 设置。"
#. Tag: term
-#: boot-installer.xml:2266 boot-installer.xml:2499
+#: boot-installer.xml:2255 boot-installer.xml:2488
#, no-c-format
msgid "netcfg/disable_dhcp"
msgstr "netcfg/disable_dhcp"
#. Tag: para
-#: boot-installer.xml:2267
+#: boot-installer.xml:2256
#, no-c-format
msgid ""
"By default, the &d-i; automatically probes for network configuration via "
@@ -2927,7 +2955,7 @@ msgstr ""
"视并且改变其获得的设定。您可以在 DHCP 检测失败的情况下手工配置网络。"
#. Tag: para
-#: boot-installer.xml:2274
+#: boot-installer.xml:2263
#, no-c-format
msgid ""
"If you have a DHCP server on your local network, but want to avoid it "
@@ -2940,13 +2968,13 @@ msgstr ""
"过 DHCP 配置网络,并手工输入信息。"
#. Tag: term
-#: boot-installer.xml:2285
+#: boot-installer.xml:2274
#, no-c-format
msgid "hw-detect/start_pcmcia"
msgstr "hw-detect/start_pcmcia"
#. Tag: para
-#: boot-installer.xml:2286
+#: boot-installer.xml:2275
#, no-c-format
msgid ""
"Set to <userinput>false</userinput> to prevent starting PCMCIA services, if "
@@ -2956,13 +2984,13 @@ msgstr ""
"携机会有这种现象。"
#. Tag: term
-#: boot-installer.xml:2296
+#: boot-installer.xml:2285
#, no-c-format
msgid "disk-detect/dmraid/enable (dmraid)"
msgstr "disk-detect/dmraid/enable (dmraid)"
#. Tag: para
-#: boot-installer.xml:2297
+#: boot-installer.xml:2286
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> to enable support for Serial ATA RAID "
@@ -2976,13 +3004,13 @@ msgstr ""
"ulink> 找到。"
#. Tag: term
-#: boot-installer.xml:2308
+#: boot-installer.xml:2297
#, no-c-format
msgid "preseed/url (url)"
msgstr "preseed/url (url)"
#. Tag: para
-#: boot-installer.xml:2309
+#: boot-installer.xml:2298
#, no-c-format
msgid ""
"Specify the url to a preconfiguration file to download and use for "
@@ -2992,13 +3020,13 @@ msgstr ""
"install\"/>。"
#. Tag: term
-#: boot-installer.xml:2318
+#: boot-installer.xml:2307
#, no-c-format
msgid "preseed/file (file)"
msgstr "preseed/file (file)"
#. Tag: para
-#: boot-installer.xml:2319
+#: boot-installer.xml:2308
#, no-c-format
msgid ""
"Specify the path to a preconfiguration file to load for automating the "
@@ -3008,13 +3036,13 @@ msgstr ""
">。"
#. Tag: term
-#: boot-installer.xml:2328
+#: boot-installer.xml:2317
#, no-c-format
msgid "preseed/interactive"
msgstr "preseed/interactive"
#. Tag: para
-#: boot-installer.xml:2329
+#: boot-installer.xml:2318
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> to display questions even if they have "
@@ -3028,13 +3056,13 @@ msgstr ""
"<xref linkend=\"preseed-seenflag\"/> 了解详细信息。"
#. Tag: term
-#: boot-installer.xml:2341
+#: boot-installer.xml:2330
#, no-c-format
msgid "auto-install/enable (auto)"
msgstr "auto-install/enable (auto)"
#. Tag: para
-#: boot-installer.xml:2342
+#: boot-installer.xml:2331
#, no-c-format
msgid ""
"Delay questions that are normally asked before preseeding is possible until "
@@ -3045,13 +3073,13 @@ msgstr ""
"auto\"/> 了解自动安装的详细信息。"
#. Tag: term
-#: boot-installer.xml:2353
+#: boot-installer.xml:2342
#, no-c-format
msgid "finish-install/keep-consoles"
msgstr "finish-install/keep-consoles"
#. Tag: para
-#: boot-installer.xml:2354
+#: boot-installer.xml:2343
#, no-c-format
msgid ""
"During installations from serial or management console, the regular virtual "
@@ -3062,13 +3090,13 @@ msgstr ""
"inittab</filename> 里已经关掉。将其改为 <userinput>true</userinput> 打开。"
#. Tag: term
-#: boot-installer.xml:2365
+#: boot-installer.xml:2354
#, no-c-format
msgid "cdrom-detect/eject"
msgstr "cdrom-detect/eject"
#. Tag: para
-#: boot-installer.xml:2366
+#: boot-installer.xml:2355
#, no-c-format
msgid ""
"By default, before rebooting, &d-i; automatically ejects the optical media "
@@ -3084,7 +3112,7 @@ msgstr ""
"新加载介质。"
#. Tag: para
-#: boot-installer.xml:2375
+#: boot-installer.xml:2364
#, no-c-format
msgid ""
"Set to <userinput>false</userinput> to disable automatic ejection, and be "
@@ -3095,13 +3123,13 @@ msgstr ""
"后,不会自动从光盘引导。"
#. Tag: term
-#: boot-installer.xml:2386
+#: boot-installer.xml:2375
#, no-c-format
msgid "base-installer/install-recommends (recommends)"
msgstr "base-installer/install-recommends (recommends)"
#. Tag: para
-#: boot-installer.xml:2387
+#: boot-installer.xml:2376
#, no-c-format
msgid ""
"By setting this option to <userinput>false</userinput>, the package "
@@ -3114,7 +3142,7 @@ msgstr ""
"<xref linkend=\"di-install-base\"/>。"
#. Tag: para
-#: boot-installer.xml:2394
+#: boot-installer.xml:2383
#, no-c-format
msgid ""
"Note that this option allows to have a leaner system, but can also result in "
@@ -3128,13 +3156,13 @@ msgstr ""
"非常有经验的用户来使用。"
#. Tag: term
-#: boot-installer.xml:2406
+#: boot-installer.xml:2395
#, no-c-format
msgid "debian-installer/allow_unauthenticated"
msgstr "debian-installer/allow_unauthenticated"
#. Tag: para
-#: boot-installer.xml:2407
+#: boot-installer.xml:2396
#, no-c-format
msgid ""
"By default the installer requires that repositories be authenticated using a "
@@ -3147,13 +3175,13 @@ msgstr ""
"emphasis>"
#. Tag: term
-#: boot-installer.xml:2418
+#: boot-installer.xml:2407
#, no-c-format
msgid "ramdisk_size"
msgstr "ramdisk_size"
#. Tag: para
-#: boot-installer.xml:2419
+#: boot-installer.xml:2408
#, no-c-format
msgid ""
"This parameter should already be set to a correct value where needed; set it "
@@ -3164,13 +3192,13 @@ msgstr ""
"置。该值的单位是 kB。"
#. Tag: term
-#: boot-installer.xml:2429
+#: boot-installer.xml:2418
#, no-c-format
msgid "rescue/enable"
msgstr "rescue/enable"
#. Tag: para
-#: boot-installer.xml:2430
+#: boot-installer.xml:2419
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> to enter rescue mode rather than "
@@ -3180,13 +3208,13 @@ msgstr ""
"<xref linkend=\"rescue\"/>。"
#. Tag: title
-#: boot-installer.xml:2443
+#: boot-installer.xml:2432
#, no-c-format
msgid "Using boot parameters to answer questions"
msgstr "使用内核模块参数回答提问"
#. Tag: para
-#: boot-installer.xml:2444
+#: boot-installer.xml:2433
#, no-c-format
msgid ""
"With some exceptions, a value can be set at the boot prompt for any question "
@@ -3199,25 +3227,25 @@ msgstr ""
"bootparms\"/> 找到。下面是一些具体的例子。"
#. Tag: term
-#: boot-installer.xml:2456
+#: boot-installer.xml:2445
#, no-c-format
msgid "debian-installer/language (language)"
msgstr "debian-installer/language (language)"
#. Tag: term
-#: boot-installer.xml:2457
+#: boot-installer.xml:2446
#, no-c-format
msgid "debian-installer/country (country)"
msgstr "debian-installer/country (country)"
#. Tag: term
-#: boot-installer.xml:2458
+#: boot-installer.xml:2447
#, no-c-format
msgid "debian-installer/locale (locale)"
msgstr "debian-installer/locale (locale)"
#. Tag: para
-#: boot-installer.xml:2459
+#: boot-installer.xml:2448
#, no-c-format
msgid ""
"There are two ways to specify the language, country and locale to use for "
@@ -3227,7 +3255,7 @@ msgstr ""
"和地方(locale)。"
#. Tag: para
-#: boot-installer.xml:2464
+#: boot-installer.xml:2453
#, no-c-format
msgid ""
"The first and easiest is to pass only the parameter <literal>locale</"
@@ -3245,7 +3273,7 @@ msgstr ""
"式组合。"
#. Tag: para
-#: boot-installer.xml:2473
+#: boot-installer.xml:2462
#, no-c-format
msgid ""
"The second, more flexible option is to specify <literal>language</literal> "
@@ -3260,13 +3288,13 @@ msgstr ""
"locale=en_GB.UTF-8</userinput>。"
#. Tag: term
-#: boot-installer.xml:2485
+#: boot-installer.xml:2474
#, no-c-format
msgid "anna/choose_modules (modules)"
msgstr "anna/choose_modules (modules)"
#. Tag: para
-#: boot-installer.xml:2486
+#: boot-installer.xml:2475
#, no-c-format
msgid ""
"Can be used to automatically load installer components that are not loaded "
@@ -3281,7 +3309,7 @@ msgstr ""
"classname> (参阅 <xref linkend=\"pppoe\"/>)</phrase>。"
#. Tag: para
-#: boot-installer.xml:2500
+#: boot-installer.xml:2489
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> if you want to disable DHCP and instead "
@@ -3290,13 +3318,13 @@ msgstr ""
"如果您想禁止 DHCP 使用静态网络设置,将它设为 <userinput>true</userinput>。"
#. Tag: term
-#: boot-installer.xml:2509
+#: boot-installer.xml:2498
#, no-c-format
msgid "mirror/protocol (protocol)"
msgstr "mirror/protocol (protocol)"
#. Tag: para
-#: boot-installer.xml:2510
+#: boot-installer.xml:2499
#, no-c-format
msgid ""
"By default the installer will use the http protocol to download files from "
@@ -3311,13 +3339,13 @@ msgstr ""
"序使用该协议。注意,必须手动输入主机名,而不是从列表中选择 ftp 镜像。"
#. Tag: term
-#: boot-installer.xml:2523
+#: boot-installer.xml:2512
#, no-c-format
msgid "tasksel:tasksel/first (tasks)"
msgstr "tasksel:tasksel/first (tasks)"
#. Tag: para
-#: boot-installer.xml:2524
+#: boot-installer.xml:2513
#, no-c-format
msgid ""
"Can be used to select tasks that are not available from the interactive task "
@@ -3328,13 +3356,13 @@ msgstr ""
"literal> 任务。参阅 <xref linkend=\"pkgsel\"/> 了解详细信息。"
#. Tag: title
-#: boot-installer.xml:2538
+#: boot-installer.xml:2527
#, no-c-format
msgid "Passing parameters to kernel modules"
msgstr "给内核模块传递参数"
#. Tag: para
-#: boot-installer.xml:2539
+#: boot-installer.xml:2528
#, no-c-format
msgid ""
"If drivers are compiled into the kernel, you can pass parameters to them as "
@@ -3354,7 +3382,7 @@ msgstr ""
"配置中。"
#. Tag: para
-#: boot-installer.xml:2552
+#: boot-installer.xml:2541
#, no-c-format
msgid ""
"Note that it is now quite rare that parameters need to be passed to modules. "
@@ -3366,7 +3394,7 @@ msgstr ""
"并很好地设置默认参数。然而,某些情况下还是需要手动设置参数。"
#. Tag: para
-#: boot-installer.xml:2559
+#: boot-installer.xml:2548
#, no-c-format
msgid ""
"The syntax to use to set parameters for modules is: "
@@ -3386,19 +3414,19 @@ msgstr ""
"用:"
#. Tag: screen
-#: boot-installer.xml:2569
+#: boot-installer.xml:2558
#, no-c-format
msgid "3c509.xcvr=3 3c509.irq=10"
msgstr "3c509.xcvr=3 3c509.irq=10"
#. Tag: title
-#: boot-installer.xml:2575
+#: boot-installer.xml:2564
#, no-c-format
msgid "Blacklisting kernel modules"
msgstr "内核模块黑名单"
#. Tag: para
-#: boot-installer.xml:2576
+#: boot-installer.xml:2565
#, no-c-format
msgid ""
"Sometimes it may be necessary to blacklist a module to prevent it from being "
@@ -3413,7 +3441,7 @@ msgstr ""
"间冲突或者错误的驱动先加载,将造成设备无法正常工作。"
#. Tag: para
-#: boot-installer.xml:2585
+#: boot-installer.xml:2574
#, no-c-format
msgid ""
"You can blacklist a module using the following syntax: "
@@ -3427,7 +3455,7 @@ msgstr ""
"入 <filename>/etc/modprobe.d/blacklist.local</filename> 文件的黑名单中。"
#. Tag: para
-#: boot-installer.xml:2593
+#: boot-installer.xml:2582
#, no-c-format
msgid ""
"Note that a module may still be loaded by the installation system itself. "
@@ -3439,19 +3467,19 @@ msgstr ""
"件检查过程中从显示的模块列表中取消该模块。"
#. Tag: title
-#: boot-installer.xml:2609
+#: boot-installer.xml:2598
#, no-c-format
msgid "Troubleshooting the Installation Process"
msgstr "安装过程中的故障修复"
#. Tag: title
-#: boot-installer.xml:2614
+#: boot-installer.xml:2603
#, no-c-format
msgid "CD-ROM Reliability"
msgstr "CD-ROM 的可靠性"
#. Tag: para
-#: boot-installer.xml:2615
+#: boot-installer.xml:2604
#, no-c-format
msgid ""
"Sometimes, especially with older CD-ROM drives, the installer may fail to "
@@ -3463,7 +3491,7 @@ msgstr ""
"&mdash; 即使是从 CD-ROM 成功引导 &mdash; 无法识别 CD-ROM 或在安装时读取错误。"
#. Tag: para
-#: boot-installer.xml:2622
+#: boot-installer.xml:2611
#, no-c-format
msgid ""
"There are many different possible causes for these problems. We can only "
@@ -3474,13 +3502,13 @@ msgstr ""
"下的由您来处理。"
#. Tag: para
-#: boot-installer.xml:2628
+#: boot-installer.xml:2617
#, no-c-format
msgid "There are two very simple things that you should try first."
msgstr "您首先应试试两种最简单的方法。"
#. Tag: para
-#: boot-installer.xml:2633
+#: boot-installer.xml:2622
#, no-c-format
msgid ""
"If the CD-ROM does not boot, check that it was inserted correctly and that "
@@ -3488,8 +3516,8 @@ msgid ""
msgstr "如果 CD-ROM 没有引导,检查一下它是否放好,并且没有弄脏。"
#. Tag: para
-#: boot-installer.xml:2639
-#, no-c-format
+#: boot-installer.xml:2628
+#, fuzzy, no-c-format
#| msgid ""
#| "If the installer fails to recognize a CD-ROM, try just running the option "
#| "<menuchoice> <guimenuitem>Detect and mount CD-ROM</guimenuitem> </"
@@ -3498,15 +3526,15 @@ msgstr "如果 CD-ROM 没有引导,检查一下它是否放好,并且没有
msgid ""
"If the installer fails to recognize a CD-ROM, try just running the option "
"<menuchoice> <guimenuitem>Detect and mount CD-ROM</guimenuitem> </"
-"menuchoice> a second time. Some DMA related issues with older CD-ROM drives "
-"are known to be resolved in this way."
+"menuchoice> a second time. Some DMA related issues with very old CD-ROM "
+"drives are known to be resolved in this way."
msgstr ""
"如果安装程序无法识别 CD-ROM,再次运行 <menuchoice> <guimenuitem>Detect and "
"mount CD-ROM</guimenuitem> </menuchoice> 选项。有些旧 CD-ROM 驱动器 DMA 相关"
"的问题可以用这种方法解决。"
#. Tag: para
-#: boot-installer.xml:2649
+#: boot-installer.xml:2638
#, no-c-format
msgid ""
"If this does not work, then try the suggestions in the subsections below. "
@@ -3517,7 +3545,7 @@ msgstr ""
"CD-ROM 和 DVD,为了方便,只提到 CD-ROM。"
#. Tag: para
-#: boot-installer.xml:2655
+#: boot-installer.xml:2644
#, no-c-format
msgid ""
"If you cannot get the installation working from CD-ROM, try one of the other "
@@ -3525,13 +3553,13 @@ msgid ""
msgstr "如果您用 CD-ROM 无法安装,试试其他可用的安装方法。"
#. Tag: title
-#: boot-installer.xml:2663
+#: boot-installer.xml:2652
#, no-c-format
msgid "Common issues"
msgstr "常见问题"
#. Tag: para
-#: boot-installer.xml:2666
+#: boot-installer.xml:2655
#, no-c-format
msgid ""
"Some older CD-ROM drives do not support reading from discs that were burned "
@@ -3540,56 +3568,45 @@ msgstr "有些老 CD-ROM 驱动器不能读取新 CD 刻录机的高速模式下
#. Tag: para
#: boot-installer.xml:2672
-#, no-c-format
-msgid ""
-"If your system boots correctly from the CD-ROM, it does not necessarily mean "
-"that &arch-kernel; also supports the CD-ROM (or, more correctly, the "
-"controller that your CD-ROM drive is connected to)."
-msgstr ""
-"如果您的系统可以从 CD-ROM 引导,这并不是说 &arch-kernel; 就能支持该 CD-ROM "
-"(或者,更准确一点,CD-ROM 驱动器所连接的控制器)。"
-
-#. Tag: para
-#: boot-installer.xml:2679
-#, no-c-format
+#, fuzzy, no-c-format
#| msgid ""
#| "Some older CD-ROM drives do not work correctly if <quote>direct memory "
#| "access</quote> (DMA) is enabled."
msgid ""
-"Some older CD-ROM drives do not work correctly if <quote>direct memory "
-"access</quote> (DMA) is enabled."
+"Some very old CD-ROM drives do not work correctly if <quote>direct memory "
+"access</quote> (DMA) is enabled for them."
msgstr ""
"一些老式的 CD-ROM 驱动器在 <quote>direct memory access</quote> (DMA) 下无法正"
"常工作。"
#. Tag: title
-#: boot-installer.xml:2690
+#: boot-installer.xml:2683
#, no-c-format
msgid "How to investigate and maybe solve issues"
msgstr "如何调查研究或许可以解决问题"
#. Tag: para
-#: boot-installer.xml:2691
+#: boot-installer.xml:2684
#, no-c-format
msgid "If the CD-ROM fails to boot, try the suggestions listed below."
msgstr "如果从 CD-ROM 引导失败,试试下面所列的建议。"
#. Tag: para
-#: boot-installer.xml:2696
-#, no-c-format
+#: boot-installer.xml:2689
+#, fuzzy, no-c-format
#| msgid ""
#| "Check that your BIOS actually supports booting from CD-ROM (older systems "
#| "possibly don't) and that your CD-ROM drive supports the media you are "
#| "using."
msgid ""
-"Check that your BIOS actually supports booting from CD-ROM (older systems "
-"possibly don't) and that your CD-ROM drive supports the media you are using."
+"Check that your BIOS actually supports booting from CD-ROM (only an issue "
+"for very old systems) and that CD booting is enabled in the BIOS."
msgstr ""
"检查您的 BIOS 的确支持从 CD-ROM 启动(旧的系统可能不行),并且 CD-ROM 驱动器支"
"持您所使用的介质。"
#. Tag: para
-#: boot-installer.xml:2702
+#: boot-installer.xml:2696
#, no-c-format
msgid ""
"If you downloaded an iso image, check that the md5sum of that image matches "
@@ -3613,7 +3630,7 @@ msgstr ""
"用下面的命令。它使用映像的尺寸从 CD-ROM 读取正确的字节数。"
#. Tag: screen
-#: boot-installer.xml:2715
+#: boot-installer.xml:2709
#, no-c-format
msgid ""
"$ dd if=/dev/cdrom | \\\n"
@@ -3635,7 +3652,7 @@ msgstr ""
"134486016 bytes (134 MB) copied, 97.474 seconds, 1.4 MB/s"
#. Tag: para
-#: boot-installer.xml:2720
+#: boot-installer.xml:2714
#, no-c-format
msgid ""
"If, after the installer has been booted successfully, the CD-ROM is not "
@@ -3654,7 +3671,7 @@ msgstr ""
"shell。"
#. Tag: para
-#: boot-installer.xml:2732
+#: boot-installer.xml:2726
#, no-c-format
msgid ""
"Switch to VT4 or view the contents of <filename>/var/log/syslog</filename> "
@@ -3666,7 +3683,7 @@ msgstr ""
"<command>dmesg</command> 的输出。"
#. Tag: para
-#: boot-installer.xml:2739
+#: boot-installer.xml:2733
#, no-c-format
msgid ""
"Check in the output of <command>dmesg</command> if your CD-ROM drive was "
@@ -3694,7 +3711,7 @@ msgstr ""
"<command>modprobe</command> 手动加载。"
#. Tag: para
-#: boot-installer.xml:2753
+#: boot-installer.xml:2747
#, no-c-format
msgid ""
"Check that there is a device node for your CD-ROM drive under <filename>/dev/"
@@ -3706,7 +3723,7 @@ msgstr ""
"cdrom0</filename>。"
#. Tag: para
-#: boot-installer.xml:2761
+#: boot-installer.xml:2755
#, no-c-format
msgid ""
"Use the <command>mount</command> command to check if the CD-ROM is already "
@@ -3721,7 +3738,7 @@ msgstr ""
"</screen></informalexample> 检查命令后面是否有什么错误信息。"
#. Tag: para
-#: boot-installer.xml:2771
+#: boot-installer.xml:2765
#, no-c-format
msgid ""
"Check if DMA is currently enabled: <informalexample><screen>\n"
@@ -3746,7 +3763,7 @@ msgstr ""
"</screen></informalexample> 确保您所处的目录对应 CD-ROM 驱动器。"
#. Tag: para
-#: boot-installer.xml:2786
+#: boot-installer.xml:2780
#, no-c-format
msgid ""
"If there are any problems during the installation, try checking the "
@@ -3758,13 +3775,13 @@ msgstr ""
"性。如果 CD-ROM 可以读,该选项可以对其进行测试。"
#. Tag: title
-#: boot-installer.xml:2801
+#: boot-installer.xml:2795
#, no-c-format
msgid "Floppy Disk Reliability"
msgstr "软盘的可靠性"
#. Tag: para
-#: boot-installer.xml:2803
+#: boot-installer.xml:2797
#, no-c-format
msgid ""
"The biggest problem for people using floppy disks to install &debian; seems "
@@ -3773,7 +3790,7 @@ msgstr ""
"对于用软盘安装 &debian; 的人来说,他们遇到的最大的问题很可能是软盘的可靠性。"
#. Tag: para
-#: boot-installer.xml:2808
+#: boot-installer.xml:2802
#, no-c-format
msgid ""
"The boot floppy is the floppy with the worst problems, because it is read by "
@@ -3789,7 +3806,7 @@ msgstr ""
"息。"
#. Tag: para
-#: boot-installer.xml:2817
+#: boot-installer.xml:2811
#, no-c-format
msgid ""
"If you are having the installation stall at a particular floppy, the first "
@@ -3804,7 +3821,7 @@ msgstr ""
"化以后看起来没有错误。如果可能,在别的统上重写这些软盘更好一些。"
#. Tag: para
-#: boot-installer.xml:2826
+#: boot-installer.xml:2820
#, no-c-format
msgid ""
"One user reports he had to write the images to floppy <emphasis>three</"
@@ -3815,7 +3832,7 @@ msgstr ""
"软盘才算工作良好。"
#. Tag: para
-#: boot-installer.xml:2832
+#: boot-installer.xml:2826
#, no-c-format
msgid ""
"Normally you should not have to download a floppy image again, but if you "
@@ -3826,7 +3843,7 @@ msgstr ""
"来检验下载的映像是否正确。"
#. Tag: para
-#: boot-installer.xml:2838
+#: boot-installer.xml:2832
#, no-c-format
msgid ""
"Other users have reported that simply rebooting a few times with the same "
@@ -3837,13 +3854,13 @@ msgstr ""
"有缺陷的硬件或固件软盘驱动器驱动程序造成的。"
#. Tag: title
-#: boot-installer.xml:2847
+#: boot-installer.xml:2841
#, no-c-format
msgid "Boot Configuration"
msgstr "引导配置"
#. Tag: para
-#: boot-installer.xml:2849
+#: boot-installer.xml:2843
#, no-c-format
msgid ""
"If you have problems and the kernel hangs during the boot process, doesn't "
@@ -3856,32 +3873,16 @@ msgstr ""
"\"/> 讨论。"
#. Tag: para
-#: boot-installer.xml:2856
-#, no-c-format
-msgid ""
-"Often, problems can be solved by removing add-ons and peripherals, and then "
-"trying booting again. <phrase arch=\"any-x86\">Internal modems, sound cards, "
-"and Plug-n-Play devices can be especially problematic.</phrase>"
-msgstr ""
-"通常,可以通过移除外挂硬件或者外围设备来解决问题,然后再次重新引导。<phrase "
-"arch=\"any-x86\">内置调制解调器、声卡以及即插即用设备特别容易引起问题。</"
-"phrase>"
-
-#. Tag: para
-#: boot-installer.xml:2862
+#: boot-installer.xml:2852
#, no-c-format
msgid ""
-"If you have a large amount of memory installed in your machine, more than "
-"512M, and the installer hangs when booting the kernel, you may need to "
-"include a boot argument to limit the amount of memory the kernel sees, such "
-"as <userinput>mem=512m</userinput>."
+"In some cases, malfunctions can be caused by missing device firmware (see "
+"<xref linkend=\"hardware-firmware\"/> and <xref linkend=\"loading-firmware\"/"
+">)."
msgstr ""
-"如果您的机器上装有多于 512M 的大容量的内存,并且安装程序在引导内核时停止,您"
-"可能需要加入一个引导参数,来限制内核能够看到的内存数量,比如 "
-"<userinput>mem=512m</userinput>。"
#. Tag: para
-#: boot-installer.xml:2875
+#: boot-installer.xml:2863
#, no-c-format
msgid ""
"If software speech synthesis does not work, there is most probably an issue "
@@ -3896,37 +3897,37 @@ msgstr ""
"台机器上声音可以正常工作的 Linux 系统上(比如,live CD),运行下面命令的输出。"
#. Tag: userinput
-#: boot-installer.xml:2886
+#: boot-installer.xml:2874
#, no-c-format
msgid "dmesg"
msgstr "dmesg"
#. Tag: userinput
-#: boot-installer.xml:2888
+#: boot-installer.xml:2876
#, no-c-format
msgid "lspci"
msgstr "lspci"
#. Tag: userinput
-#: boot-installer.xml:2890
+#: boot-installer.xml:2878
#, no-c-format
msgid "lsmod"
msgstr "lsmod"
#. Tag: userinput
-#: boot-installer.xml:2892
+#: boot-installer.xml:2880
#, no-c-format
msgid "amixer"
msgstr "amixer"
#. Tag: title
-#: boot-installer.xml:2900 boot-installer.xml:3002
+#: boot-installer.xml:2888 boot-installer.xml:2999
#, no-c-format
msgid "Common &arch-title; Installation Problems"
msgstr "&arch-title; 常见安装问题"
#. Tag: para
-#: boot-installer.xml:2901
+#: boot-installer.xml:2889
#, no-c-format
msgid ""
"There are some common installation problems that can be solved or avoided by "
@@ -3934,72 +3935,7 @@ msgid ""
msgstr "有一些常见的安装问题,可以通过给安装程序特定的引导参数解决或避免。"
#. Tag: para
-#: boot-installer.xml:2906
-#, no-c-format
-msgid ""
-"Some systems have floppies with <quote>inverted DCLs</quote>. If you receive "
-"errors reading from the floppy, even when you know the floppy is good, try "
-"the parameter <userinput>floppy=thinkpad</userinput>."
-msgstr ""
-"一些系统的软盘会有 <quote>inverted DCLs</quote>。如果您在读软盘时遇到错误信"
-"息,并且知道软盘是好的,请尝试 <userinput>floppy=thinkpad</userinput> 参数。"
-
-#. Tag: para
-#: boot-installer.xml:2912
-#, no-c-format
-msgid ""
-"On some systems, such as the IBM PS/1 or ValuePoint (which have ST-506 disk "
-"drivers), the IDE drive may not be properly recognized. Again, try it first "
-"without the parameters and see if the IDE drive is recognized properly. If "
-"not, determine your drive geometry (cylinders, heads, and sectors), and use "
-"the parameter <userinput>hd=<replaceable>cylinders</replaceable>,"
-"<replaceable>heads</replaceable>,<replaceable>sectors</replaceable></"
-"userinput>."
-msgstr ""
-"在一些系统上,比如 IBM PS/1 或者 ValuePoint (具有 ST-506 驱动器),IDE 驱动器"
-"可能不被识别。请首先尝试没有参数的引导是否能够被识别。如果不行,请确定驱动器"
-"几何参数(柱面、磁头还有扇区)。然后使用参数 "
-"<userinput>hd=<replaceable>cylinders</replaceable>,<replaceable>heads</"
-"replaceable>,<replaceable>sectors</replaceable></userinput>。"
-
-#. Tag: para
-#: boot-installer.xml:2921
-#, no-c-format
-msgid ""
-"If you have a very old machine, and the kernel hangs after saying "
-"<computeroutput>Checking 'hlt' instruction...</computeroutput>, then you "
-"should try the <userinput>no-hlt</userinput> boot argument, which disables "
-"this test."
-msgstr ""
-"如果您有一台非常老的机器,并且内核在显示 <computeroutput>Checking 'hlt' "
-"instruction...</computeroutput> 时中断,需要尝试 <userinput>no-hlt</"
-"userinput> 参数来取消这个测试。"
-
-#. Tag: para
-#: boot-installer.xml:2928
-#, no-c-format
-msgid ""
-"Some systems (especially laptops) that have a native resolution that is not "
-"a 4:3 ratio (i.e. not for example 800x600 or 1024x768) may have a blank "
-"display after the installer has been booted. In that case adding the boot "
-"parameter <userinput>vga=788</userinput><footnote> <para> The parameter "
-"<userinput>vga=788</userinput> will activate the VESA framebuffer with a "
-"resolution of 800x600. This will probably work, but may not be the optimal "
-"resolution for your system. A list of supported resolutions can be obtained "
-"by using <userinput>vga=ask</userinput>, but you should be aware that list "
-"may not be complete. </para> </footnote> may help. If that does not work, "
-"try adding the boot parameter <userinput>fb=false</userinput>."
-msgstr ""
-"一些系统(特别是便携机)具有非 4:3 的原始比例(也就是那些非 800x600 或 "
-"1024x768),在安装程序启动之后出现屏幕空白。这种情况下,在 boot 参数后加上 "
-"<userinput>vga=788</userinput><footnote> <para> 该参数 <userinput>vga=788</"
-"userinput> 激活 VESA framebuffer 的 800x600 分辨率。它可能有效,但也可能不适"
-"用于您的系统。使用 <userinput>vga=ask</userinput> 可以列出所支持的分辨率,但"
-"要注意该列表可能不全。</para> </footnote> 可能解决问题。如果还不行,试试 "
-"boot 参数 <userinput>fb=false</userinput>。"
-
-#. Tag: para
-#: boot-installer.xml:2946
+#: boot-installer.xml:2940
#, no-c-format
msgid ""
"If your screen begins to show a weird picture while the kernel boots, eg. "
@@ -4017,14 +3953,14 @@ msgstr ""
"\"boot-parms\"/> 来获得细节信息。"
#. Tag: title
-#: boot-installer.xml:2960
+#: boot-installer.xml:2954
#, no-c-format
msgid "System Freeze During the PCMCIA Configuration Phase"
msgstr "在 PCMCIA 配置阶段系统停止"
#. Tag: para
-#: boot-installer.xml:2961
-#, no-c-format
+#: boot-installer.xml:2955
+#, fuzzy, no-c-format
#| msgid ""
#| "Some laptop models produced by Dell are known to crash when PCMCIA device "
#| "detection tries to access some hardware addresses. Other laptops may "
@@ -4034,13 +3970,13 @@ msgstr "在 PCMCIA 配置阶段系统停止"
#| "You can then configure PCMCIA after the installation is completed and "
#| "exclude the resource range causing the problems."
msgid ""
-"Some laptop models produced by Dell are known to crash when PCMCIA device "
-"detection tries to access some hardware addresses. Other laptops may display "
-"similar problems. If you experience such a problem and you don't need PCMCIA "
-"support during the installation, you can disable PCMCIA using the "
-"<userinput>hw-detect/start_pcmcia=false</userinput> boot parameter. You can "
-"then configure PCMCIA after the installation is completed and exclude the "
-"resource range causing the problems."
+"Some very old laptop models produced by Dell are known to crash when PCMCIA "
+"device detection tries to access some hardware addresses. Other laptops may "
+"display similar problems. If you experience such a problem and you don't "
+"need PCMCIA support during the installation, you can disable PCMCIA using "
+"the <userinput>hw-detect/start_pcmcia=false</userinput> boot parameter. You "
+"can then configure PCMCIA after the installation is completed and exclude "
+"the resource range causing the problems."
msgstr ""
"Dell 笔记本的一些型号,会在 PCMCIA 设备检测程序尝试访问一些硬件地址的时候死"
"机。其他笔记本可能显示类似的问题。如果您遇到那样的问题,并且在安装的时候不需"
@@ -4049,7 +3985,7 @@ msgstr ""
"段。"
#. Tag: para
-#: boot-installer.xml:2971
+#: boot-installer.xml:2965
#, no-c-format
msgid ""
"Alternatively, you can boot the installer in expert mode. You will then be "
@@ -4068,42 +4004,20 @@ msgstr ""
"resource settings section of the PCMCIA HOWTO</ulink> 处列出了一些资源范围选"
"项。注意您在安装程序中,输入这些值的时候必须忽略逗号。"
-#. Tag: title
-#: boot-installer.xml:2988
-#, no-c-format
-msgid "System Freeze while Loading USB Modules"
-msgstr "在装入 USB 模块时系统停止"
-
-#. Tag: para
-#: boot-installer.xml:2989
-#, no-c-format
-msgid ""
-"The kernel normally tries to install USB modules and the USB keyboard driver "
-"in order to support some non-standard USB keyboards. However, there are some "
-"broken USB systems where the driver hangs on loading. A possible workaround "
-"may be disabling the USB controller in your mainboard BIOS setup. Another "
-"option is passing the <userinput>nousb</userinput> parameter at the boot "
-"prompt."
-msgstr ""
-"内核正常情况下会尝试安装 USB 模块以及 USB 键盘驱动来支持一些非标准的 USB 键"
-"盘。但是,有些不完整的 USB 系统会在驱动程序装入时死机。一个可能的解决方法是设"
-"置主板的 BIOS 禁止 USB 控制器。另一种选择是在引导提示符处传入 "
-"<userinput>nousb</userinput> 参数。"
-
#. Tag: para
-#: boot-installer.xml:3003
+#: boot-installer.xml:3000
#, no-c-format
msgid "There are some common installation problems that are worth mentioning."
msgstr "有一些常见的安装问题值得解释一下。"
#. Tag: title
-#: boot-installer.xml:3009
+#: boot-installer.xml:3006
#, no-c-format
msgid "Misdirected video output"
msgstr "错误的视频输出"
#. Tag: para
-#: boot-installer.xml:3010
+#: boot-installer.xml:3007
#, no-c-format
msgid ""
"It is fairly common for &arch-title; to have two video cards in one machine, "
@@ -4127,7 +4041,7 @@ msgstr ""
"<userinput>video=atyfb:off</userinput> 启动安装程序。"
#. Tag: para
-#: boot-installer.xml:3024
+#: boot-installer.xml:3021
#, no-c-format
msgid ""
"Note that you may also have to manually add this parameter to the silo "
@@ -4140,13 +4054,13 @@ msgstr ""
"xorg.conf</filename> 中的视频驱动。"
#. Tag: title
-#: boot-installer.xml:3035
+#: boot-installer.xml:3032
#, no-c-format
msgid "Failure to Boot or Install from CD-ROM"
msgstr "从 CD-ROM 上引导或安装失败"
#. Tag: para
-#: boot-installer.xml:3036
+#: boot-installer.xml:3033
#, no-c-format
msgid ""
"Some Sparc systems are notoriously difficult to boot from CD-ROM and even if "
@@ -4157,19 +4071,19 @@ msgstr ""
"费解的错误。SunBlade 系统被报告了很多问题。"
#. Tag: para
-#: boot-installer.xml:3042
+#: boot-installer.xml:3039
#, no-c-format
msgid "We recommend to install such systems by netbooting the installer."
msgstr "我们建议从网络安装这些系统。"
#. Tag: title
-#: boot-installer.xml:3051
+#: boot-installer.xml:3048
#, no-c-format
msgid "Interpreting the Kernel Startup Messages"
msgstr "内核起始信息注解"
#. Tag: para
-#: boot-installer.xml:3053
+#: boot-installer.xml:3050
#, no-c-format
msgid ""
"During the boot sequence, you may see many messages in the form "
@@ -4203,13 +4117,13 @@ msgstr ""
"linkend=\"kernel-baking\"/>)</phrase>。"
#. Tag: title
-#: boot-installer.xml:3078
+#: boot-installer.xml:3075
#, no-c-format
msgid "Reporting Installation Problems"
msgstr "报告安装问题"
#. Tag: para
-#: boot-installer.xml:3079
+#: boot-installer.xml:3076
#, no-c-format
msgid ""
"If you get through the initial boot phase but cannot complete the install, "
@@ -4226,7 +4140,7 @@ msgstr ""
"索。如果您正在提交一个 bug 报告,可以报告里附上该信息。"
#. Tag: para
-#: boot-installer.xml:3090
+#: boot-installer.xml:3087
#, no-c-format
msgid ""
"Other pertinent installation messages may be found in <filename>/var/log/</"
@@ -4237,13 +4151,13 @@ msgstr ""
"新安装的系统启动后,放在 <filename>/var/log/debian-installer/</filename> 里。"
#. Tag: title
-#: boot-installer.xml:3101
+#: boot-installer.xml:3098
#, no-c-format
msgid "Submitting Installation Reports"
msgstr "提交缺陷报告"
#. Tag: para
-#: boot-installer.xml:3102
+#: boot-installer.xml:3099
#, no-c-format
msgid ""
"If you still have problems, please submit an installation report. We also "
@@ -4255,7 +4169,7 @@ msgstr ""
"这让我们可以尽可能多地了解硬件的配置数量。"
#. Tag: para
-#: boot-installer.xml:3109
+#: boot-installer.xml:3106
#, no-c-format
msgid ""
"Note that your installation report will be published in the Debian Bug "
@@ -4266,7 +4180,7 @@ msgstr ""
"件列表。确保您使用的邮件地址可以被公开。"
#. Tag: para
-#: boot-installer.xml:3115
+#: boot-installer.xml:3112
#, no-c-format
msgid ""
"If you have a working &debian; system, the easiest way to send an "
@@ -4285,7 +4199,7 @@ msgstr ""
"command> 命令。"
#. Tag: para
-#: boot-installer.xml:3125
+#: boot-installer.xml:3122
#, no-c-format
msgid ""
"Alternatively you can use this template when filling out installation "
@@ -4370,3 +4284,127 @@ msgstr ""
" and ideas you had during the initial install.&gt;\n"
"</screen></informalexample> 在 bug 报告中,请说明问题所在,包括内核挂起时最后"
"见到的内核消息。描述进入问题状态所进行的步骤。"
+
+#~ msgid ""
+#~ "When the kernel boots, a message <informalexample><screen>\n"
+#~ "Memory:<replaceable>avail</replaceable>k/<replaceable>total</"
+#~ "replaceable>k available\n"
+#~ "</screen></informalexample> should be emitted early in the process. "
+#~ "<replaceable>total</replaceable> should match the total amount of RAM, in "
+#~ "kilobytes. If this doesn't match the actual amount of RAM you have "
+#~ "installed, you need to use the <userinput>mem=<replaceable>ram</"
+#~ "replaceable></userinput> parameter, where <replaceable>ram</replaceable> "
+#~ "is set to the amount of memory, suffixed with <quote>k</quote> for "
+#~ "kilobytes, or <quote>m</quote> for megabytes. For example, both "
+#~ "<userinput>mem=65536k</userinput> and <userinput>mem=64m</userinput> mean "
+#~ "64MB of RAM."
+#~ msgstr ""
+#~ "当内核引导的时候,有一条消息 <informalexample><screen>\n"
+#~ "Memory:<replaceable>avail</replaceable>k/<replaceable>total</"
+#~ "replaceable>k available \n"
+#~ "</screen></informalexample> 应该显示在引导过程的前面。其中 "
+#~ "<replaceable>total</replaceable> 应该符合您内存的总量,单位为千字节。如果"
+#~ "此参数不符合您实际的内存总数,需要使用 <userinput>mem=<replaceable>ram</"
+#~ "replaceable></userinput> 参数。这里 <replaceable>ram</replaceable> 被设置"
+#~ "为内存的数量。如是<quote>k</quote>则为千字节,<quote>m</quote>为兆字节。例"
+#~ "如,<userinput>mem=65536k</userinput> 和 <userinput>mem=64m</userinput> 标"
+#~ "明 64MB 内存。"
+
+#~ msgid ""
+#~ "If your system boots correctly from the CD-ROM, it does not necessarily "
+#~ "mean that &arch-kernel; also supports the CD-ROM (or, more correctly, the "
+#~ "controller that your CD-ROM drive is connected to)."
+#~ msgstr ""
+#~ "如果您的系统可以从 CD-ROM 引导,这并不是说 &arch-kernel; 就能支持该 CD-"
+#~ "ROM (或者,更准确一点,CD-ROM 驱动器所连接的控制器)。"
+
+#~ msgid ""
+#~ "Often, problems can be solved by removing add-ons and peripherals, and "
+#~ "then trying booting again. <phrase arch=\"any-x86\">Internal modems, "
+#~ "sound cards, and Plug-n-Play devices can be especially problematic.</"
+#~ "phrase>"
+#~ msgstr ""
+#~ "通常,可以通过移除外挂硬件或者外围设备来解决问题,然后再次重新引导。"
+#~ "<phrase arch=\"any-x86\">内置调制解调器、声卡以及即插即用设备特别容易引起"
+#~ "问题。</phrase>"
+
+#~ msgid ""
+#~ "If you have a large amount of memory installed in your machine, more than "
+#~ "512M, and the installer hangs when booting the kernel, you may need to "
+#~ "include a boot argument to limit the amount of memory the kernel sees, "
+#~ "such as <userinput>mem=512m</userinput>."
+#~ msgstr ""
+#~ "如果您的机器上装有多于 512M 的大容量的内存,并且安装程序在引导内核时停止,"
+#~ "您可能需要加入一个引导参数,来限制内核能够看到的内存数量,比如 "
+#~ "<userinput>mem=512m</userinput>。"
+
+#~ msgid ""
+#~ "Some systems have floppies with <quote>inverted DCLs</quote>. If you "
+#~ "receive errors reading from the floppy, even when you know the floppy is "
+#~ "good, try the parameter <userinput>floppy=thinkpad</userinput>."
+#~ msgstr ""
+#~ "一些系统的软盘会有 <quote>inverted DCLs</quote>。如果您在读软盘时遇到错误"
+#~ "信息,并且知道软盘是好的,请尝试 <userinput>floppy=thinkpad</userinput> 参"
+#~ "数。"
+
+#~ msgid ""
+#~ "On some systems, such as the IBM PS/1 or ValuePoint (which have ST-506 "
+#~ "disk drivers), the IDE drive may not be properly recognized. Again, try "
+#~ "it first without the parameters and see if the IDE drive is recognized "
+#~ "properly. If not, determine your drive geometry (cylinders, heads, and "
+#~ "sectors), and use the parameter <userinput>hd=<replaceable>cylinders</"
+#~ "replaceable>,<replaceable>heads</replaceable>,<replaceable>sectors</"
+#~ "replaceable></userinput>."
+#~ msgstr ""
+#~ "在一些系统上,比如 IBM PS/1 或者 ValuePoint (具有 ST-506 驱动器),IDE 驱动"
+#~ "器可能不被识别。请首先尝试没有参数的引导是否能够被识别。如果不行,请确定驱"
+#~ "动器几何参数(柱面、磁头还有扇区)。然后使用参数 "
+#~ "<userinput>hd=<replaceable>cylinders</replaceable>,<replaceable>heads</"
+#~ "replaceable>,<replaceable>sectors</replaceable></userinput>。"
+
+#~ msgid ""
+#~ "If you have a very old machine, and the kernel hangs after saying "
+#~ "<computeroutput>Checking 'hlt' instruction...</computeroutput>, then you "
+#~ "should try the <userinput>no-hlt</userinput> boot argument, which "
+#~ "disables this test."
+#~ msgstr ""
+#~ "如果您有一台非常老的机器,并且内核在显示 <computeroutput>Checking 'hlt' "
+#~ "instruction...</computeroutput> 时中断,需要尝试 <userinput>no-hlt</"
+#~ "userinput> 参数来取消这个测试。"
+
+#~ msgid ""
+#~ "Some systems (especially laptops) that have a native resolution that is "
+#~ "not a 4:3 ratio (i.e. not for example 800x600 or 1024x768) may have a "
+#~ "blank display after the installer has been booted. In that case adding "
+#~ "the boot parameter <userinput>vga=788</userinput><footnote> <para> The "
+#~ "parameter <userinput>vga=788</userinput> will activate the VESA "
+#~ "framebuffer with a resolution of 800x600. This will probably work, but "
+#~ "may not be the optimal resolution for your system. A list of supported "
+#~ "resolutions can be obtained by using <userinput>vga=ask</userinput>, but "
+#~ "you should be aware that list may not be complete. </para> </footnote> "
+#~ "may help. If that does not work, try adding the boot parameter "
+#~ "<userinput>fb=false</userinput>."
+#~ msgstr ""
+#~ "一些系统(特别是便携机)具有非 4:3 的原始比例(也就是那些非 800x600 或 "
+#~ "1024x768),在安装程序启动之后出现屏幕空白。这种情况下,在 boot 参数后加上 "
+#~ "<userinput>vga=788</userinput><footnote> <para> 该参数 "
+#~ "<userinput>vga=788</userinput> 激活 VESA framebuffer 的 800x600 分辨率。它"
+#~ "可能有效,但也可能不适用于您的系统。使用 <userinput>vga=ask</userinput> 可"
+#~ "以列出所支持的分辨率,但要注意该列表可能不全。</para> </footnote> 可能解决"
+#~ "问题。如果还不行,试试 boot 参数 <userinput>fb=false</userinput>。"
+
+#~ msgid "System Freeze while Loading USB Modules"
+#~ msgstr "在装入 USB 模块时系统停止"
+
+#~ msgid ""
+#~ "The kernel normally tries to install USB modules and the USB keyboard "
+#~ "driver in order to support some non-standard USB keyboards. However, "
+#~ "there are some broken USB systems where the driver hangs on loading. A "
+#~ "possible workaround may be disabling the USB controller in your mainboard "
+#~ "BIOS setup. Another option is passing the <userinput>nousb</userinput> "
+#~ "parameter at the boot prompt."
+#~ msgstr ""
+#~ "内核正常情况下会尝试安装 USB 模块以及 USB 键盘驱动来支持一些非标准的 USB "
+#~ "键盘。但是,有些不完整的 USB 系统会在驱动程序装入时死机。一个可能的解决方"
+#~ "法是设置主板的 BIOS 禁止 USB 控制器。另一种选择是在引导提示符处传入 "
+#~ "<userinput>nousb</userinput> 参数。"
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 3b95ae413..84d44868a 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2012-07-20 14:12+0000\n"
-"PO-Revision-Date: 2012-10-21 13:59+0800\n"
+"POT-Creation-Date: 2012-10-24 19:53+0000\n"
+"PO-Revision-Date: 2012-07-25 21:40+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
"Language: \n"
@@ -80,13 +80,13 @@ msgstr ""
"quote> 的衍生品种。"
#. Tag: entry
-#: hardware.xml:53 hardware.xml:196
+#: hardware.xml:53 hardware.xml:186
#, no-c-format
msgid "Architecture"
msgstr "体系"
#. Tag: entry
-#: hardware.xml:53 hardware.xml:196
+#: hardware.xml:53 hardware.xml:186
#, no-c-format
msgid "&debian; Designation"
msgstr "&debian; 命名"
@@ -104,7 +104,7 @@ msgid "Flavor"
msgstr "Flavor"
#. Tag: entry
-#: hardware.xml:60 hardware.xml:202
+#: hardware.xml:60 hardware.xml:192
#, no-c-format
msgid "Intel x86-based"
msgstr "Intel x86-based"
@@ -116,7 +116,7 @@ msgid "i386"
msgstr "i386"
#. Tag: entry
-#: hardware.xml:67 hardware.xml:207
+#: hardware.xml:67 hardware.xml:197
#, no-c-format
msgid "AMD64 &amp; Intel EM64T"
msgstr "AMD64 &amp; Intel EM64T"
@@ -203,296 +203,260 @@ msgstr "versatile"
#: hardware.xml:93
#, no-c-format
msgid "ARM with hardware FPU"
-msgstr "带 FPU 的 ARM"
+msgstr ""
#. Tag: entry
#: hardware.xml:94
#, no-c-format
msgid "armhf"
-msgstr "armhf"
+msgstr ""
#. Tag: entry
#: hardware.xml:95
#, no-c-format
msgid "Freescale"
-msgstr "Freescale"
+msgstr ""
#. Tag: entry
#: hardware.xml:96
-#, no-c-format
+#, fuzzy, no-c-format
#| msgid "<entry>32</entry>"
msgid "<entry>mx5</entry>"
-msgstr "<entry>mx5</entry>"
-
-#. Tag: entry
-#: hardware.xml:100
-#, no-c-format
-msgid "HP PA-RISC"
-msgstr "HP PA-RISC"
-
-#. Tag: entry
-#: hardware.xml:101
-#, no-c-format
-msgid "hppa"
-msgstr "hppa"
-
-#. Tag: entry
-#: hardware.xml:102
-#, no-c-format
-msgid "PA-RISC 1.1"
-msgstr "PA-RISC 1.1"
-
-#. Tag: entry
-#: hardware.xml:103
-#, no-c-format
-#| msgid "<entry>64</entry>"
-msgid "<entry>32</entry>"
msgstr "<entry>32</entry>"
#. Tag: entry
-#: hardware.xml:105
-#, no-c-format
-msgid "PA-RISC 2.0"
-msgstr "PA-RISC 2.0"
-
-#. Tag: entry
-#: hardware.xml:106
-#, no-c-format
-msgid "<entry>64</entry>"
-msgstr "<entry>64</entry>"
-
-#. Tag: entry
-#: hardware.xml:110
+#: hardware.xml:100
#, no-c-format
msgid "Intel IA-64"
msgstr "Intel IA-64"
#. Tag: entry
-#: hardware.xml:111
+#: hardware.xml:101
#, no-c-format
msgid "ia64"
msgstr "ia64"
#. Tag: entry
-#: hardware.xml:117
+#: hardware.xml:107
#, no-c-format
msgid "MIPS (big endian)"
msgstr "MIPS (big endian)"
#. Tag: entry
-#: hardware.xml:118
+#: hardware.xml:108
#, no-c-format
msgid "mips"
msgstr "mips"
#. Tag: entry
-#: hardware.xml:119
+#: hardware.xml:109
#, no-c-format
msgid "SGI IP22 (Indy/Indigo 2)"
msgstr "SGI IP22 (Indy/Indigo 2)"
#. Tag: entry
-#: hardware.xml:120
+#: hardware.xml:110
#, no-c-format
msgid "r4k-ip22"
msgstr "r4k-ip22"
#. Tag: entry
-#: hardware.xml:122
+#: hardware.xml:112
#, no-c-format
msgid "SGI IP32 (O2)"
msgstr "SGI IP32 (O2)"
#. Tag: entry
-#: hardware.xml:123
+#: hardware.xml:113
#, no-c-format
msgid "r5k-ip32"
msgstr "r5k-ip32"
#. Tag: entry
-#: hardware.xml:125 hardware.xml:138
+#: hardware.xml:115 hardware.xml:128
#, no-c-format
msgid "MIPS Malta (32 bit)"
msgstr "MIPS Malta (32 bit)"
#. Tag: entry
-#: hardware.xml:126 hardware.xml:139
+#: hardware.xml:116 hardware.xml:129
#, no-c-format
msgid "4kc-malta"
msgstr "4kc-malta"
#. Tag: entry
-#: hardware.xml:128 hardware.xml:141
+#: hardware.xml:118 hardware.xml:131
#, no-c-format
msgid "MIPS Malta (64 bit)"
msgstr "MIPS Malta (64 bit)"
#. Tag: entry
-#: hardware.xml:129 hardware.xml:142
+#: hardware.xml:119 hardware.xml:132
#, no-c-format
msgid "5kc-malta"
msgstr "5kc-malta"
#. Tag: entry
-#: hardware.xml:133
+#: hardware.xml:123
#, no-c-format
msgid "MIPS (little endian)"
msgstr "MIPS (little endian)"
#. Tag: entry
-#: hardware.xml:134
+#: hardware.xml:124
#, no-c-format
msgid "mipsel"
msgstr "mipsel"
#. Tag: entry
-#: hardware.xml:135
+#: hardware.xml:125
#, no-c-format
msgid "Cobalt"
msgstr "Cobalt"
#. Tag: entry
-#: hardware.xml:136
+#: hardware.xml:126
#, no-c-format
msgid "cobalt"
msgstr "cobalt"
#. Tag: entry
-#: hardware.xml:146
+#: hardware.xml:136
#, no-c-format
msgid "IBM/Motorola PowerPC"
msgstr "IBM/Motorola PowerPC"
#. Tag: entry
-#: hardware.xml:147
-#, no-c-format
-msgid "<entry morerows=\"1\">powerpc</entry>"
+#: hardware.xml:137
+#, fuzzy, no-c-format
+#| msgid "<entry morerows=\"1\">powerpc</entry>"
+msgid "<entry>powerpc</entry>"
msgstr "<entry morerows=\"1\">powerpc</entry>"
#. Tag: entry
-#: hardware.xml:148
+#: hardware.xml:138
#, no-c-format
msgid "PowerMac"
msgstr "PowerMac"
#. Tag: entry
-#: hardware.xml:149
+#: hardware.xml:139
#, no-c-format
msgid "pmac"
msgstr "pmac"
#. Tag: entry
-#: hardware.xml:151
+#: hardware.xml:141
#, no-c-format
msgid "PReP"
msgstr "PReP"
#. Tag: entry
-#: hardware.xml:152
+#: hardware.xml:142
#, no-c-format
msgid "prep"
msgstr "prep"
#. Tag: entry
-#: hardware.xml:156
+#: hardware.xml:146
#, no-c-format
msgid "Sun SPARC"
msgstr "Sun SPARC"
#. Tag: entry
-#: hardware.xml:157
+#: hardware.xml:147
#, no-c-format
msgid "sparc"
msgstr "sparc"
#. Tag: entry
-#: hardware.xml:158
+#: hardware.xml:148
#, no-c-format
msgid "<entry>sun4u</entry>"
msgstr "<entry>sun4u</entry>"
#. Tag: entry
-#: hardware.xml:159
+#: hardware.xml:149
#, no-c-format
msgid "sparc64"
msgstr "sparc64"
#. Tag: entry
-#: hardware.xml:161
+#: hardware.xml:151
#, no-c-format
msgid "<entry>sun4v</entry>"
msgstr "<entry>sun4v</entry>"
#. Tag: entry
-#: hardware.xml:165
+#: hardware.xml:155
#, no-c-format
msgid "IBM S/390"
msgstr "IBM S/390"
#. Tag: entry
-#: hardware.xml:166
+#: hardware.xml:156
#, no-c-format
msgid "s390"
msgstr "s390"
#. Tag: entry
-#: hardware.xml:167 hardware.xml:177
+#: hardware.xml:157 hardware.xml:167
#, no-c-format
msgid "IPL from VM-reader and DASD"
msgstr "来自 VM-reader 和 DASD 的 IPL"
#. Tag: entry
-#: hardware.xml:168 hardware.xml:178
+#: hardware.xml:158 hardware.xml:168
#, no-c-format
msgid "generic"
msgstr "generic"
#. Tag: entry
-#: hardware.xml:170 hardware.xml:180
+#: hardware.xml:160 hardware.xml:170
#, no-c-format
msgid "IPL from tape"
msgstr "来自 tape 的 IPL"
#. Tag: entry
-#: hardware.xml:171 hardware.xml:181
+#: hardware.xml:161 hardware.xml:171
#, no-c-format
msgid "tape"
msgstr "type"
#. Tag: entry
-#: hardware.xml:175
-#, no-c-format
+#: hardware.xml:165
+#, fuzzy, no-c-format
#| msgid "IBM S/390"
msgid "64bit IBM S/390"
-msgstr "64bit IBM S/390"
+msgstr "IBM S/390"
#. Tag: entry
-#: hardware.xml:176
-#, no-c-format
+#: hardware.xml:166
+#, fuzzy, no-c-format
#| msgid "s390"
msgid "s390x"
-msgstr "s390x"
+msgstr "s390"
#. Tag: para
-#: hardware.xml:186
+#: hardware.xml:176
#, no-c-format
msgid "&debian; GNU/kFreeBSD &release; supports two architectures."
msgstr "&debian; GNU/kFreeBSD &release; 支持两种架构。"
#. Tag: entry
-#: hardware.xml:203
+#: hardware.xml:193
#, no-c-format
msgid "kfreebsd-i386"
msgstr "kfreebsd-i386"
#. Tag: entry
-#: hardware.xml:208
+#: hardware.xml:198
#, no-c-format
msgid "kfreebsd-amd64"
msgstr "kfreebsd-amd64"
#. Tag: para
-#: hardware.xml:213
+#: hardware.xml:203
#, no-c-format
msgid ""
"This document covers installation for the <emphasis>&arch-title;</emphasis> "
@@ -506,7 +470,7 @@ msgstr ""
"org/ports/\">&debian;-Ports</ulink> 网页。"
#. Tag: para
-#: hardware.xml:223
+#: hardware.xml:213
#, no-c-format
msgid ""
"The &arch-title; architecture only supports Intel Itanium processors and not "
@@ -521,7 +485,7 @@ msgstr ""
"<emphasis>i386</emphasis> 体系。"
#. Tag: para
-#: hardware.xml:233
+#: hardware.xml:223
#, no-c-format
msgid ""
"This is the first official release of &debian-gnu; for the &arch-title; "
@@ -541,40 +505,28 @@ msgstr ""
"<emphasis>&arch-kernel;</emphasis> 内核产生的。当然,您也可以用 <ulink url="
"\"&url-list-subscribe;\">debian-&arch-listname; 邮件列表</ulink> 来进行讨论。"
-# index.docbook:224, index.docbook:683, index.docbook:780, index.docbook:799, index.docbook:842, index.docbook:884, index.docbook:938, index.docbook:1085, index.docbook:1491
#. Tag: title
-#: hardware.xml:256 hardware.xml:292 hardware.xml:381 hardware.xml:400
-#: hardware.xml:483 hardware.xml:541 hardware.xml:594
-#, no-c-format
-msgid "CPU, Main Boards, and Video Support"
-msgstr "CPU,主板和视频支持"
-
-#. Tag: para
-#: hardware.xml:257 hardware.xml:401
+#: hardware.xml:246
#, no-c-format
-msgid ""
-"Complete information concerning supported peripherals can be found at <ulink "
-"url=\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</ulink>. "
-"This section merely outlines the basics."
+msgid "CPU Support"
msgstr ""
-"完整的周边设备支持情况信息可以在 <ulink url=\"&url-hardware-howto;\">Linux "
-"Hardware Compatibility HOWTO</ulink> 中找到。本节只是基本的概况。"
-
-# index.docbook:808, index.docbook:914
-#. Tag: title
-#: hardware.xml:265 hardware.xml:409 hardware.xml:518
-#, no-c-format
-msgid "<title>CPU</title>"
-msgstr "<title>CPU</title>"
#. Tag: para
-#: hardware.xml:266
+#: hardware.xml:247
#, no-c-format
msgid "Both AMD64 and Intel EM64T processors are supported."
msgstr "AMD64 和 Intel EM64T 处理器都获得支持。"
+# 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:272 hardware.xml:363 hardware.xml:382 hardware.xml:465
+#: hardware.xml:523 hardware.xml:576
+#, no-c-format
+msgid "CPU, Main Boards, and Video Support"
+msgstr "CPU,主板和视频支持"
+
#. Tag: para
-#: hardware.xml:294
+#: hardware.xml:274
#, no-c-format
msgid ""
"Each distinct ARM architecture requires its own kernel. Because of this the "
@@ -587,7 +539,7 @@ msgstr ""
"emphasis> ARM CPU 上。"
#. Tag: para
-#: hardware.xml:303
+#: hardware.xml:283
#, no-c-format
msgid ""
"Most ARM CPUs may be run in either endian mode (big or little). However, the "
@@ -599,19 +551,19 @@ msgstr ""
"ARM 系统。"
#. Tag: para
-#: hardware.xml:311
+#: hardware.xml:291
#, no-c-format
msgid "The supported platforms are:"
msgstr "获得支持的平台有:"
#. Tag: term
-#: hardware.xml:318
+#: hardware.xml:298
#, no-c-format
msgid "IOP32x"
msgstr "IOP32x"
#. Tag: para
-#: hardware.xml:319
+#: hardware.xml:299
#, no-c-format
msgid ""
"Intel's I/O Processor (IOP) line is found in a number of products related to "
@@ -628,14 +580,14 @@ msgstr ""
"cyrius-n2100;\">Thecus N2100</ulink>。"
#. Tag: term
-#: hardware.xml:332
+#: hardware.xml:312
#, no-c-format
msgid "Kirkwood"
msgstr "Kirkwood"
#. Tag: para
-#: hardware.xml:333
-#, no-c-format
+#: hardware.xml:313
+#, fuzzy, 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 "
@@ -649,9 +601,10 @@ msgid ""
"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 and GuruPlug)</ulink>, and <ulink url=\"&url-arm-"
-"cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> (all TS-11x, TS-21x and "
-"TS-41x models)."
+"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, "
@@ -661,13 +614,13 @@ msgstr ""
"和 TS-41x 型号)。"
#. Tag: term
-#: hardware.xml:347
+#: hardware.xml:329
#, no-c-format
msgid "Orion5x"
msgstr "Orion5x"
#. Tag: para
-#: hardware.xml:348
+#: hardware.xml:330
#, no-c-format
msgid ""
"Orion is a system on a chip (SoC) from Marvell that integrates an ARM CPU, "
@@ -685,13 +638,13 @@ msgstr ""
"\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink>。"
#. Tag: term
-#: hardware.xml:362
+#: hardware.xml:344
#, no-c-format
msgid "<term>Versatile</term>"
msgstr "<term>Versatile</term>"
#. Tag: para
-#: hardware.xml:363
+#: hardware.xml:345
#, no-c-format
msgid ""
"The Versatile platform is emulated by QEMU and is therefore a nice way to "
@@ -701,7 +654,7 @@ msgstr ""
"&debian; 是一个不错的方法。"
#. Tag: para
-#: hardware.xml:382
+#: hardware.xml:364
#, no-c-format
msgid ""
"There are two major support <emphasis>&architecture;</emphasis> flavors: PA-"
@@ -717,7 +670,25 @@ msgstr ""
"位的 userland。"
#. Tag: para
-#: hardware.xml:410
+#: hardware.xml:383
+#, no-c-format
+msgid ""
+"Complete information concerning supported peripherals can be found at <ulink "
+"url=\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</ulink>. "
+"This section merely outlines the basics."
+msgstr ""
+"完整的周边设备支持情况信息可以在 <ulink url=\"&url-hardware-howto;\">Linux "
+"Hardware Compatibility HOWTO</ulink> 中找到。本节只是基本的概况。"
+
+# index.docbook:808, index.docbook:914
+#. Tag: title
+#: hardware.xml:391 hardware.xml:500
+#, no-c-format
+msgid "<title>CPU</title>"
+msgstr "<title>CPU</title>"
+
+#. Tag: para
+#: hardware.xml:392
#, no-c-format
msgid ""
"Nearly all x86-based (IA-32) processors still in use in personal computers "
@@ -730,7 +701,7 @@ msgstr ""
"Athlon XP 和 Intel P4 Xeon 这些处理器。"
#. Tag: para
-#: hardware.xml:417
+#: hardware.xml:399
#, no-c-format
msgid ""
"However, &debian; GNU/Linux &releasename; will <emphasis>not</emphasis> run "
@@ -765,7 +736,7 @@ msgstr ""
"了。</para> </footnote>。"
#. Tag: para
-#: hardware.xml:450
+#: hardware.xml:432
#, no-c-format
msgid ""
"If your system has a 64-bit processor from the AMD64 or Intel EM64T "
@@ -776,13 +747,13 @@ msgstr ""
"的安装程序替代 (32位) i386 架构的安装程序。"
#. Tag: title
-#: hardware.xml:459
+#: hardware.xml:441
#, no-c-format
msgid "I/O Bus"
msgstr "I/O 总线"
#. Tag: para
-#: hardware.xml:460
+#: hardware.xml:442
#, no-c-format
msgid ""
"The system bus is the part of the motherboard which allows the CPU to "
@@ -796,7 +767,7 @@ msgstr ""
"线)。近年来出售的个人电脑都会使用里面的一种。"
#. Tag: para
-#: hardware.xml:484
+#: hardware.xml:466
#, no-c-format
msgid ""
"&debian; on &arch-title; supports the following platforms: <itemizedlist> "
@@ -826,7 +797,7 @@ msgstr ""
"\"> debian-&arch-listname; mailing list</ulink>。"
#. Tag: para
-#: hardware.xml:519
+#: hardware.xml:501
#, no-c-format
msgid ""
"On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 and "
@@ -839,7 +810,7 @@ msgstr ""
"持 R5000。"
#. Tag: para
-#: hardware.xml:525
+#: hardware.xml:507
#, no-c-format
msgid ""
"Some MIPS machines can be operated in both big and little endian mode. For "
@@ -850,7 +821,7 @@ msgstr ""
"endian MIPS,请阅读 mipsel 体系的相关文档。"
#. Tag: para
-#: hardware.xml:542
+#: hardware.xml:524
#, no-c-format
msgid ""
"&debian; on &arch-title; supports the following platforms: <itemizedlist> "
@@ -877,13 +848,13 @@ msgstr ""
"mailing list</ulink>。"
#. Tag: title
-#: hardware.xml:570
+#: hardware.xml:552
#, no-c-format
msgid "CPU/Machine types"
msgstr "CPU/机器类型"
#. Tag: para
-#: hardware.xml:572
+#: hardware.xml:554
#, no-c-format
msgid ""
"All MIPS based Cobalt machines are supported with the exception of the Qube "
@@ -891,19 +862,19 @@ msgid ""
msgstr "除了 Qube 2700 (Qube 1),其他所有基于 MIPS 的 Cobalt 机器都获得支持。"
#. Tag: title
-#: hardware.xml:580
+#: hardware.xml:562
#, no-c-format
msgid "Supported console options"
msgstr "支持的控制台选项"
#. Tag: para
-#: hardware.xml:581
+#: hardware.xml:563
#, no-c-format
msgid "Cobalt machines use 115200 bps."
msgstr "使用 115200 bps 的 Cobalt 机器。"
#. Tag: para
-#: hardware.xml:595
+#: hardware.xml:577
#, no-c-format
msgid ""
"For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and "
@@ -913,13 +884,13 @@ msgstr ""
"PreP 子体系获得支持。"
#. Tag: title
-#: hardware.xml:616
+#: hardware.xml:598
#, no-c-format
msgid "Kernel Flavours"
msgstr "内核变种"
#. Tag: para
-#: hardware.xml:618
+#: hardware.xml:600
#, no-c-format
msgid ""
"There are two flavours of the powerpc kernel in &debian;, based on the CPU "
@@ -927,13 +898,13 @@ msgid ""
msgstr "在 &debian; 中有两种基于 CPU 类型的 powerpc 内核:"
#. Tag: term
-#: hardware.xml:625
+#: hardware.xml:607
#, no-c-format
msgid "<term>powerpc</term>"
msgstr "<term>powerpc</term>"
#. Tag: para
-#: hardware.xml:626
+#: hardware.xml:608
#, no-c-format
msgid ""
"Most systems use this kernel flavour, which supports the PowerPC 601, 603, "
@@ -944,19 +915,19 @@ msgstr ""
"器。所有 Apple PowerMac 以后的系统包括 G4 都使用这其中的处理器。"
#. Tag: term
-#: hardware.xml:636
+#: hardware.xml:618
#, no-c-format
msgid "power64"
msgstr "power64"
#. Tag: para
-#: hardware.xml:637
+#: hardware.xml:619
#, no-c-format
msgid "The power64 kernel flavour supports the following CPUs:"
msgstr "power64 内核支持以下的 CPU:"
#. Tag: para
-#: hardware.xml:641
+#: hardware.xml:623
#, no-c-format
msgid ""
"The POWER3 processor is used in older IBM 64-bit server systems: known "
@@ -968,7 +939,7 @@ msgstr ""
"7044-270。"
#. Tag: para
-#: hardware.xml:647
+#: hardware.xml:629
#, no-c-format
msgid ""
"The POWER4 processor is used in more recent IBM 64-bit server systems: known "
@@ -978,7 +949,7 @@ msgstr ""
"630、650、655、670 和 690。"
#. Tag: para
-#: hardware.xml:652
+#: hardware.xml:634
#, no-c-format
msgid ""
"Systems using the Apple G5 (PPC970FX processor) are also based on the POWER4 "
@@ -987,13 +958,13 @@ msgstr ""
"采用 Apple G5 (PPC970FX 处理器) 的系统也是基于 POWER4 体系,并使用这种内核。"
#. Tag: title
-#: hardware.xml:686
+#: hardware.xml:668
#, no-c-format
msgid "Power Macintosh (pmac) subarchitecture"
msgstr "Power Macintosh (pmac) 子体系"
#. Tag: para
-#: hardware.xml:688
+#: hardware.xml:670
#, no-c-format
msgid ""
"Apple (and briefly a few other manufacturers &mdash; Power Computing, for "
@@ -1006,7 +977,7 @@ msgstr ""
"(&debian; 没有支持)、OldWorld PCI 和 NewWorld。"
#. Tag: para
-#: hardware.xml:695
+#: hardware.xml:677
#, no-c-format
msgid ""
"OldWorld systems are most Power Macintoshes with a floppy drive and a PCI "
@@ -1019,7 +990,7 @@ msgstr ""
"些 Apple iMac PowerPC 前身使用 4 位数字命名方式,它们都是 OldWorld 的。"
#. Tag: para
-#: hardware.xml:703
+#: hardware.xml:685
#, no-c-format
msgid ""
"The so called NewWorld PowerMacs are any PowerMacs in translucent colored "
@@ -1034,7 +1005,7 @@ msgstr ""
"MacOS 的系统。"
#. Tag: para
-#: hardware.xml:711
+#: hardware.xml:693
#, no-c-format
msgid ""
"Specifications for Apple hardware are available at <ulink url=\"http://www."
@@ -1049,384 +1020,384 @@ msgstr ""
# index.docbook:1240, index.docbook:1375, index.docbook:1419, index.docbook:1448
#. Tag: entry
-#: hardware.xml:727 hardware.xml:862 hardware.xml:906 hardware.xml:935
+#: hardware.xml:709 hardware.xml:844 hardware.xml:888 hardware.xml:917
#, no-c-format
msgid "Model Name/Number"
msgstr "型号名称/编号"
#. Tag: entry
-#: hardware.xml:728
+#: hardware.xml:710
#, no-c-format
msgid "Generation"
msgstr "世代"
#. Tag: entry
-#: hardware.xml:734
+#: hardware.xml:716
#, no-c-format
msgid "Apple"
msgstr "Apple"
#. Tag: entry
-#: hardware.xml:735
+#: hardware.xml:717
#, 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:736 hardware.xml:739 hardware.xml:742 hardware.xml:745
-#: hardware.xml:748 hardware.xml:751 hardware.xml:754 hardware.xml:757
-#: hardware.xml:760 hardware.xml:763 hardware.xml:766 hardware.xml:769
-#: hardware.xml:772 hardware.xml:775 hardware.xml:778 hardware.xml:781
+#: hardware.xml:718 hardware.xml:721 hardware.xml:724 hardware.xml:727
+#: hardware.xml:730 hardware.xml:733 hardware.xml:736 hardware.xml:739
+#: hardware.xml:742 hardware.xml:745 hardware.xml:748 hardware.xml:751
+#: hardware.xml:754 hardware.xml:757 hardware.xml:760 hardware.xml:763
#, no-c-format
msgid "NewWorld"
msgstr "NewWorld"
#. Tag: entry
-#: hardware.xml:738
+#: hardware.xml:720
#, no-c-format
msgid "iMac Summer 2000, Early 2001"
msgstr "iMac Summer 2000, Early 2001"
#. Tag: entry
-#: hardware.xml:741
+#: hardware.xml:723
#, no-c-format
msgid "iMac G5"
msgstr "iMac G5"
#. Tag: entry
-#: hardware.xml:744
+#: hardware.xml:726
#, no-c-format
msgid "iBook, iBook SE, iBook Dual USB"
msgstr "iBook, iBook SE, iBook Dual USB"
#. Tag: entry
-#: hardware.xml:747
+#: hardware.xml:729
#, no-c-format
msgid "iBook2"
msgstr "iBook2"
#. Tag: entry
-#: hardware.xml:750
+#: hardware.xml:732
#, no-c-format
msgid "iBook G4"
msgstr "iBook G4"
#. Tag: entry
-#: hardware.xml:753
+#: hardware.xml:735
#, 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:756
+#: hardware.xml:738
#, no-c-format
msgid "Power Macintosh G4 PCI, AGP, Cube"
msgstr "Power Macintosh G4 PCI, AGP, Cube"
#. Tag: entry
-#: hardware.xml:759
+#: hardware.xml:741
#, no-c-format
msgid "Power Macintosh G4 Gigabit Ethernet"
msgstr "Power Macintosh G4 Gigabit Ethernet"
#. Tag: entry
-#: hardware.xml:762
+#: hardware.xml:744
#, no-c-format
msgid "Power Macintosh G4 Digital Audio, Quicksilver"
msgstr "Power Macintosh G4 Digital Audio, Quicksilver"
#. Tag: entry
-#: hardware.xml:765
+#: hardware.xml:747
#, no-c-format
msgid "Power Macintosh G5"
msgstr "Power Macintosh G5"
#. Tag: entry
-#: hardware.xml:768
+#: hardware.xml:750
#, no-c-format
msgid "PowerBook G3 FireWire Pismo (2000)"
msgstr "PowerBook G3 FireWire Pismo (2000)"
#. Tag: entry
-#: hardware.xml:771
+#: hardware.xml:753
#, no-c-format
msgid "PowerBook G3 Lombard (1999)"
msgstr "PowerBook G3 Lombard (1999)"
#. Tag: entry
-#: hardware.xml:774
+#: hardware.xml:756
#, no-c-format
msgid "PowerBook G4 Titanium"
msgstr "PowerBook G4 Titanium"
#. Tag: entry
-#: hardware.xml:777
+#: hardware.xml:759
#, no-c-format
msgid "PowerBook G4 Aluminum"
msgstr "PowerBook G4 Aluminum"
#. Tag: entry
-#: hardware.xml:780
+#: hardware.xml:762
#, no-c-format
msgid "Xserve G5"
msgstr "Xserve G5"
#. Tag: entry
-#: hardware.xml:783
+#: hardware.xml:765
#, 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:784 hardware.xml:787 hardware.xml:790 hardware.xml:793
-#: hardware.xml:796 hardware.xml:799 hardware.xml:802 hardware.xml:805
-#: hardware.xml:808 hardware.xml:811 hardware.xml:814 hardware.xml:817
-#: hardware.xml:823 hardware.xml:826 hardware.xml:832 hardware.xml:838
-#: hardware.xml:844
+#: hardware.xml:766 hardware.xml:769 hardware.xml:772 hardware.xml:775
+#: hardware.xml:778 hardware.xml:781 hardware.xml:784 hardware.xml:787
+#: hardware.xml:790 hardware.xml:793 hardware.xml:796 hardware.xml:799
+#: hardware.xml:805 hardware.xml:808 hardware.xml:814 hardware.xml:820
+#: hardware.xml:826
#, no-c-format
msgid "OldWorld"
msgstr "OldWorld"
#. Tag: entry
-#: hardware.xml:786
+#: hardware.xml:768
#, no-c-format
msgid "Performa 6360, 6400, 6500"
msgstr "Performa 6360, 6400, 6500"
#. Tag: entry
-#: hardware.xml:789
+#: hardware.xml:771
#, no-c-format
msgid "Power Macintosh 4400, 5400"
msgstr "Power Macintosh 4400, 5400"
#. Tag: entry
-#: hardware.xml:792
+#: hardware.xml:774
#, no-c-format
msgid "Power Macintosh 7200, 7300, 7500, 7600"
msgstr "Power Macintosh 7200, 7300, 7500, 7600"
#. Tag: entry
-#: hardware.xml:795
+#: hardware.xml:777
#, no-c-format
msgid "Power Macintosh 8200, 8500, 8600"
msgstr "Power Macintosh 8200, 8500, 8600"
#. Tag: entry
-#: hardware.xml:798
+#: hardware.xml:780
#, no-c-format
msgid "Power Macintosh 9500, 9600"
msgstr "Power Macintosh 9500, 9600"
#. Tag: entry
-#: hardware.xml:801
+#: hardware.xml:783
#, no-c-format
msgid "Power Macintosh (Beige) G3 Minitower"
msgstr "Power Macintosh (Beige) G3 Minitower"
#. Tag: entry
-#: hardware.xml:804
+#: hardware.xml:786
#, no-c-format
msgid "Power Macintosh (Beige) Desktop, All-in-One"
msgstr "Power Macintosh (Beige) Desktop, All-in-One"
#. Tag: entry
-#: hardware.xml:807
+#: hardware.xml:789
#, no-c-format
msgid "PowerBook 2400, 3400, 3500"
msgstr "PowerBook 2400, 3400, 3500"
#. Tag: entry
-#: hardware.xml:810
+#: hardware.xml:792
#, no-c-format
msgid "PowerBook G3 Wallstreet (1998)"
msgstr "PowerBook G3 Wallstreet (1998)"
#. Tag: entry
-#: hardware.xml:813
+#: hardware.xml:795
#, no-c-format
msgid "Twentieth Anniversary Macintosh"
msgstr "Twentieth Anniversary Macintosh"
#. Tag: entry
-#: hardware.xml:816
+#: hardware.xml:798
#, no-c-format
msgid "Workgroup Server 7250, 7350, 8550, 9650, G3"
msgstr "Workgroup Server 7250, 7350, 8550, 9650, G3"
#. Tag: entry
-#: hardware.xml:821
+#: hardware.xml:803
#, no-c-format
msgid "Power Computing"
msgstr "Power Computing"
#. Tag: entry
-#: hardware.xml:822
+#: hardware.xml:804
#, no-c-format
msgid "PowerBase, PowerTower / Pro, PowerWave"
msgstr "PowerBase, PowerTower / Pro, PowerWave"
#. Tag: entry
-#: hardware.xml:825
+#: hardware.xml:807
#, no-c-format
msgid "PowerCenter / Pro, PowerCurve"
msgstr "PowerCenter / Pro, PowerCurve"
#. Tag: entry
-#: hardware.xml:830
+#: hardware.xml:812
#, no-c-format
msgid "UMAX"
msgstr "UMAX"
#. Tag: entry
-#: hardware.xml:831
+#: hardware.xml:813
#, no-c-format
msgid "C500, C600, J700, S900"
msgstr "C500, C600, J700, S900"
#. Tag: entry
-#: hardware.xml:836
+#: hardware.xml:818
#, no-c-format
msgid "<entry>APS</entry>"
msgstr "<entry>APS</entry>"
#. Tag: entry
-#: hardware.xml:837
+#: hardware.xml:819
#, 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:842 hardware.xml:868
+#: hardware.xml:824 hardware.xml:850
#, no-c-format
msgid "Motorola"
msgstr "Motorola"
#. Tag: entry
-#: hardware.xml:843
+#: hardware.xml:825
#, no-c-format
msgid "Starmax 3000, 4000, 5000, 5500"
msgstr "Starmax 3000, 4000, 5000, 5500"
#. Tag: title
-#: hardware.xml:852
+#: hardware.xml:834
#, no-c-format
msgid "PReP subarchitecture"
msgstr "PReP 子体系"
#. Tag: entry
-#: hardware.xml:869
+#: hardware.xml:851
#, no-c-format
msgid "Firepower, PowerStack Series E, PowerStack II"
msgstr "Firepower, PowerStack Series E, PowerStack II"
#. Tag: entry
-#: hardware.xml:871
+#: hardware.xml:853
#, no-c-format
msgid "MPC 7xx, 8xx"
msgstr "MPC 7xx, 8xx"
#. Tag: entry
-#: hardware.xml:873
+#: hardware.xml:855
#, no-c-format
msgid "MTX, MTX+"
msgstr "MTX, MTX+"
#. Tag: entry
-#: hardware.xml:875
+#: hardware.xml:857
#, no-c-format
msgid "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
msgstr "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
#. Tag: entry
-#: hardware.xml:877
+#: hardware.xml:859
#, no-c-format
msgid "MCP(N)750"
msgstr "MCP(N)750"
# index.docbook:1394, index.docbook:1425
#. Tag: entry
-#: hardware.xml:881 hardware.xml:912
+#: hardware.xml:863 hardware.xml:894
#, no-c-format
msgid "IBM RS/6000"
msgstr "IBM RS/6000"
#. Tag: entry
-#: hardware.xml:882
+#: hardware.xml:864
#, no-c-format
msgid "40P, 43P"
msgstr "40P, 43P"
#. Tag: entry
-#: hardware.xml:884
+#: hardware.xml:866
#, no-c-format
msgid "Power 830/850/860 (6070, 6050)"
msgstr "Power 830/850/860 (6070, 6050)"
#. Tag: entry
-#: hardware.xml:886
+#: hardware.xml:868
#, no-c-format
msgid "6030, 7025, 7043"
msgstr "6030, 7025, 7043"
#. Tag: entry
-#: hardware.xml:888
+#: hardware.xml:870
#, no-c-format
msgid "p640"
msgstr "p640"
#. Tag: title
-#: hardware.xml:896
+#: hardware.xml:878
#, no-c-format
msgid "CHRP subarchitecture (unsupported)"
msgstr "CHRP 子体系 (不支持)"
#. Tag: entry
-#: hardware.xml:913
+#: hardware.xml:895
#, no-c-format
msgid "B50, 43P-150, 44P"
msgstr "B50, 43P-150, 44P"
#. Tag: entry
-#: hardware.xml:916
+#: hardware.xml:898
#, no-c-format
msgid "Genesi"
msgstr "Genesi"
#. Tag: entry
-#: hardware.xml:917
+#: hardware.xml:899
#, no-c-format
msgid "Pegasos I, Pegasos II"
msgstr "Pegasos I, Pegasos II"
#. Tag: title
-#: hardware.xml:925
+#: hardware.xml:907
#, no-c-format
msgid "APUS subarchitecture (unsupported)"
msgstr "APUS 子体系 (不支持)"
#. Tag: entry
-#: hardware.xml:941
+#: hardware.xml:923
#, no-c-format
msgid "Amiga Power-UP Systems (APUS)"
msgstr "Amiga Power-UP Systems (APUS)"
#. Tag: entry
-#: hardware.xml:942
+#: hardware.xml:924
#, no-c-format
msgid "A1200, A3000, A4000"
msgstr "A1200, A3000, A4000"
#. Tag: title
-#: hardware.xml:950
+#: hardware.xml:932
#, no-c-format
msgid "Nubus PowerMac subarchitecture (unsupported)"
msgstr "Nubus PowerMac 子体系 (不支持)"
#. Tag: para
-#: hardware.xml:952
+#: hardware.xml:934
#, no-c-format
msgid ""
"NuBus systems are not currently supported by &debian;/powerpc. The "
@@ -1450,13 +1421,13 @@ msgstr ""
"nubus-pmac.sourceforge.net/\"></ulink>"
#. Tag: title
-#: hardware.xml:989
+#: hardware.xml:971
#, no-c-format
msgid "Non-PowerPC Macs"
msgstr "Non-PowerPC Macs"
#. Tag: para
-#: hardware.xml:991
+#: hardware.xml:973
#, no-c-format
msgid ""
"Macintosh computers using the 680x0 series of processors are <emphasis>not</"
@@ -1472,7 +1443,7 @@ msgstr ""
"字,像 Mac IIcx、LCIII 或 Quadra 950。"
#. Tag: para
-#: hardware.xml:1000
+#: hardware.xml:982
#, no-c-format
msgid ""
"This model range started with the Mac II (Mac II, IIx, IIcx, IIci, IIsi, "
@@ -1487,7 +1458,7 @@ msgstr ""
"840AV, 900, 950), 最后是 Performa 200-640CD。"
#. Tag: para
-#: hardware.xml:1008
+#: hardware.xml:990
#, no-c-format
msgid ""
"In laptops, it started with the Mac Portable, then the PowerBook 100-190cs "
@@ -1498,13 +1469,13 @@ msgstr ""
"Duo 210-550c (不包含带有 Nubus 的 PowerBook 500,见前面说明。)"
#. Tag: title
-#: hardware.xml:1024
+#: hardware.xml:1006
#, no-c-format
msgid "zSeries and System z machine types"
msgstr "zSeries 和 System z 机器类型"
#. Tag: para
-#: hardware.xml:1025
+#: hardware.xml:1007
#, no-c-format
msgid ""
"Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
@@ -1526,13 +1497,13 @@ msgstr ""
"ulink>。"
#. Tag: title
-#: hardware.xml:1042
+#: hardware.xml:1024
#, no-c-format
msgid "PAV and HyperPAV"
msgstr "PAV 和 HyperPAV"
#. Tag: para
-#: hardware.xml:1043
+#: hardware.xml:1025
#, no-c-format
msgid ""
"PAV and HyperPAV are supported transparently, multipathing is not needed to "
@@ -1545,13 +1516,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:1059
+#: hardware.xml:1041
#, no-c-format
msgid "CPU and Main Boards Support"
msgstr "CPU 和主板支持"
#. Tag: para
-#: hardware.xml:1060
+#: hardware.xml:1042
#, no-c-format
msgid ""
"Sparc-based hardware is divided into a number of different subarchitectures, "
@@ -1563,13 +1534,13 @@ msgstr ""
"sun4m、sun4u 或 sun4v。下面说明包括哪些机器,以及每个获得支持的级别。"
#. Tag: term
-#: hardware.xml:1071
+#: hardware.xml:1053
#, no-c-format
msgid "sun4, sun4c, sun4d, sun4m"
msgstr "sun4, sun4c, sun4d, sun4m"
#. Tag: para
-#: hardware.xml:1073
+#: hardware.xml:1055
#, no-c-format
msgid ""
"None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
@@ -1582,7 +1553,7 @@ msgstr ""
"SPARCstation page</ulink>。"
#. Tag: para
-#: hardware.xml:1080
+#: hardware.xml:1062
#, no-c-format
msgid ""
"The last &debian; release to support sparc32 was Etch, but even then only "
@@ -1593,13 +1564,13 @@ msgstr ""
"32 位子体系在上一版本后已经停止支持。"
#. Tag: term
-#: hardware.xml:1090
+#: hardware.xml:1072
#, no-c-format
msgid "<term>sun4u</term>"
msgstr "<term>sun4u</term>"
#. Tag: para
-#: hardware.xml:1092
+#: hardware.xml:1074
#, no-c-format
msgid ""
"This subarchitecture includes all 64-bit machines (sparc64) based on the "
@@ -1615,13 +1586,13 @@ msgstr ""
"到 UP 和 SMP 配置中。"
#. Tag: term
-#: hardware.xml:1105
+#: hardware.xml:1087
#, no-c-format
msgid "<term>sun4v</term>"
msgstr "<term>sun4v</term>"
#. Tag: para
-#: hardware.xml:1107
+#: hardware.xml:1089
#, no-c-format
msgid ""
"This is the newest addition to the Sparc family, which includes machines "
@@ -1634,7 +1605,7 @@ msgstr ""
"smp 内核。"
#. Tag: para
-#: hardware.xml:1118
+#: hardware.xml:1100
#, no-c-format
msgid ""
"Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
@@ -1644,14 +1615,14 @@ msgstr ""
"持而得不到支持。"
#. Tag: title
-#: hardware.xml:1127
+#: hardware.xml:1109
#, no-c-format
msgid "Laptops"
msgstr "便携机"
#. Tag: para
-#: hardware.xml:1128
-#, no-c-format
+#: hardware.xml:1110
+#, fuzzy, no-c-format
#| msgid ""
#| "Laptops are also supported and nowadays most laptops work out of the box. "
#| "In case a laptop contains specialized or proprietary hardware, some "
@@ -1659,11 +1630,15 @@ msgstr "便携机"
#| "works well with GNU/Linux, see for example the <ulink url=\"&url-x86-"
#| "laptop;\">Linux Laptop pages</ulink>."
msgid ""
-"Laptops are also supported and nowadays most laptops work out of the box. In "
-"case a laptop contains specialized or proprietary hardware, some specific "
-"functions may not be supported. To see if your particular laptop works well "
-"with GNU/Linux, see for example the <ulink url=\"&url-x86-laptop;\">Linux "
-"Laptop pages</ulink>."
+"From a technical point of view, laptops are normal PCs, so all information "
+"regarding PC systems applies to laptops as well. Installations on laptops "
+"nowadays usually work out of the box, including things like automatically "
+"suspending the system on closing the lid and laptop specfic hardware buttons "
+"like those for disabling the wifi interfaces (<quote>airplane mode</quote>). "
+"Nonetheless sometimes the hardware vendors use specialized or proprietary "
+"hardware for some laptop-specific functions which might not be supported. To "
+"see if your particular laptop works well with GNU/Linux, see for example the "
+"<ulink url=\"&url-x86-laptop;\">Linux Laptop pages</ulink>."
msgstr ""
"便携机也受到支持,而且现今大多数便携机都支持。因为便携机通常使用特制或专有的"
"硬件,因此有些特定的功能无法得到支持。要了解您的便携机是否能在 GNU/Linux 下正"
@@ -1671,47 +1646,46 @@ msgstr ""
# index.docbook:1624, index.docbook:1649, index.docbook:1672
#. Tag: title
-#: hardware.xml:1140 hardware.xml:1163 hardware.xml:1183 hardware.xml:1206
+#: hardware.xml:1127 hardware.xml:1147 hardware.xml:1175 hardware.xml:1198
#, no-c-format
msgid "Multiple Processors"
msgstr "多处理器"
#. Tag: para
-#: hardware.xml:1141
-#, no-c-format
+#: hardware.xml:1128
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Multiprocessor support &mdash; also called <quote>symmetric "
+#| "multiprocessing</quote> or SMP &mdash; is available for this "
+#| "architecture. The standard &debian; &release; kernel image has been "
+#| "compiled with <firstterm>SMP-alternatives</firstterm> support. This means "
+#| "that the kernel will detect the number of processors (or processor cores) "
+#| "and will automatically deactivate SMP on uniprocessor systems."
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
-"quote> or SMP &mdash; is available for this architecture. The standard "
-"&debian; &release; kernel image has been compiled with SMP support. The "
-"standard kernel is also usable on non-SMP systems, but has a slight overhead "
-"which will cause a small reduction in performance. For normal system use "
-"this will hardly be noticable."
+"quote> or SMP &mdash; is available for this architecture. Having multiple "
+"processors in a computer was originally only an issue for high-end server "
+"systems but has become quite common in recent years even for rather low-end "
+"desktop computers and laptops with the introduction of so called "
+"<quote>multi-core</quote> processors. These contain two or more processor "
+"units, called <quote>cores</quote>, in one physical chip."
msgstr ""
"多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP "
"&mdash; 在本体系架构下可以使用。标准的 &debian; &release; 内核映像在编译时已"
-"经加入了 SMP 功能。标准内核也可以在非 SMP 系统下使用,只不过多些系统开销降低"
-"了一些性能。在普通系统中使用时几乎不会察觉。"
+"经加入了 <firstterm>SMP-alternatives</firstterm> 支持。也就是内核可以侦测处理"
+"器的数量(或者处理器核心数),并在单处理器系统上自动关闭 SMP 的功能。"
#. Tag: para
-#: hardware.xml:1150
+#: hardware.xml:1138
#, no-c-format
msgid ""
-"In order to optimize the kernel for single CPU systems, you'll have to "
-"replace the standard &debian; kernel.<phrase arch=\"linux-any\"> You can "
-"find a discussion of how to do this in <xref linkend=\"kernel-baking\"/>. At "
-"this time (kernel version &kernelversion;) the way you disable SMP is to "
-"deselect <quote>&smp-config-option;</quote> in the <quote>&smp-config-"
-"section;</quote> section of the kernel config.</phrase>"
+"The standard &debian; &release; kernel image has been compiled with SMP "
+"support. It is also usable on non-SMP systems without problems."
msgstr ""
-"为了给单 CPU 系统优化内核,您需要替换标准的 &debian; 内核。<phrase arch="
-"\"linux-any\">您可以在<xref linkend=\"kernel-baking\"/> 找到相关的讨论。当前"
-"(内核版本 &kernelversion;),禁止 SMP 选项的方法是在内核配置的 <quote>&smp-"
-"config-section;</quote> 中取消选择 <quote>&smp-config-option;</quote>。</"
-"phrase>"
#. Tag: para
-#: hardware.xml:1165
-#, no-c-format
+#: hardware.xml:1149
+#, fuzzy, no-c-format
#| msgid ""
#| "Multiprocessor support &mdash; also called <quote>symmetric "
#| "multiprocessing</quote> or SMP &mdash; is available for this "
@@ -1726,10 +1700,36 @@ msgid ""
"alternatives</firstterm> support. This means that the kernel will detect the "
"number of processors (or processor cores) and will automatically deactivate "
"SMP on uniprocessor systems."
-msgstr "多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP &mdash; 在本体系架构下可以使用。标准的 &debian; &release; 内核映像在编译时已经加入 <firstterm>SMP-alternatives</firstterm> 支持。这意味内核将自动侦测处理器数目(或处理器核心数),并能在单处理器系统上自动关闭 SMP 功能。"
+msgstr ""
+"多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP "
+"&mdash; 在本体系架构下可以使用。标准的 &debian; &release; 内核映像在编译时已"
+"经加入了 SMP 功能。标准内核也可以在非 SMP 系统下使用,只不过多些系统开销降低"
+"了一些性能。在普通系统中使用时几乎不会察觉。"
#. Tag: para
-#: hardware.xml:1174
+#: hardware.xml:1158
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Multiprocessor support &mdash; also called <quote>symmetric "
+#| "multiprocessing</quote> or SMP &mdash; is available for this "
+#| "architecture. The standard &debian; &release; kernel image has been "
+#| "compiled with <firstterm>SMP-alternatives</firstterm> support. This means "
+#| "that the kernel will detect the number of processors (or processor cores) "
+#| "and will automatically deactivate SMP on uniprocessor systems."
+msgid ""
+"Having multiple processors in a computer was originally only an issue for "
+"high-end server systems but has become quite common in recent years even for "
+"rather low-end desktop computers and laptops with the introduction of so "
+"called <quote>multi-core</quote> processors. These contain two or more "
+"processor units, called <quote>cores</quote>, in one physical chip."
+msgstr ""
+"多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP "
+"&mdash; 在本体系架构下可以使用。标准的 &debian; &release; 内核映像在编译时已"
+"经加入了 <firstterm>SMP-alternatives</firstterm> 支持。也就是内核可以侦测处理"
+"器的数量(或者处理器核心数),并在单处理器系统上自动关闭 SMP 的功能。"
+
+#. Tag: para
+#: hardware.xml:1166
#, no-c-format
msgid ""
"The 486 flavour of the &debian; kernel image packages for &arch-title; is "
@@ -1737,8 +1737,8 @@ msgid ""
msgstr "&arch-title; 的 486 &debian; 内核映像软件包没有支持 SMP 。"
#. Tag: para
-#: hardware.xml:1184
-#, no-c-format
+#: hardware.xml:1176
+#, fuzzy, no-c-format
#| msgid ""
#| "Multiprocessor support &mdash; also called <quote>symmetric "
#| "multiprocessing</quote> or SMP &mdash; is available for this "
@@ -1751,7 +1751,7 @@ msgid ""
"quote> or SMP &mdash; is available for this architecture. However, the "
"standard &debian; &release; kernel image does not support SMP. This should "
"not prevent installation, since the standard, non-SMP kernel should boot on "
-"SMP systems; the kernel will simply use the first CPU."
+"SMP systems; the kernel will simply use only the first CPU."
msgstr ""
"多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP "
"&mdash; 在本体系架构下可以使用。但是,标准的 &debian; &release; 内核映像并不"
@@ -1759,7 +1759,7 @@ msgstr ""
"核只使用第一个 CPU。"
#. Tag: para
-#: hardware.xml:1193
+#: hardware.xml:1185
#, no-c-format
msgid ""
"In order to take advantage of multiple processors, you'll have to replace "
@@ -1775,7 +1775,7 @@ msgstr ""
"</quote> 中选中 <quote>&smp-config-option;</quote>。</phrase>"
#. Tag: para
-#: hardware.xml:1207
+#: hardware.xml:1199
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -1791,7 +1791,7 @@ msgstr ""
"装,因为非 SMP 的内核也能在 SMP 的系统下启动,只不过内核只使用第一个 CPU。"
#. Tag: para
-#: hardware.xml:1217
+#: hardware.xml:1209
#, no-c-format
msgid ""
"In order to take advantage of multiple processors, you should check to see "
@@ -1802,7 +1802,7 @@ msgstr ""
"一个合适的内核软件包。"
#. Tag: para
-#: hardware.xml:1223
+#: hardware.xml:1215
#, no-c-format
msgid ""
"You can also build your own customized kernel to support SMP.<phrase arch="
@@ -1817,29 +1817,30 @@ msgstr ""
"<quote>&smp-config-option;</quote>。</phrase>"
#. Tag: title
-#: hardware.xml:1234
+#: hardware.xml:1226
#, no-c-format
msgid "Graphics Card Support"
msgstr "图形卡支持"
#. Tag: para
-#: hardware.xml:1235
+#: hardware.xml:1227
#, no-c-format
msgid ""
-"You should be using a VGA-compatible display interface for the console "
-"terminal. Nearly every modern display card is compatible with VGA. Ancient "
-"standards such CGA, MDA, or HGA should also work, assuming you do not "
-"require X11 support. Note that X11 is not used during the installation "
-"process described in this document unless the graphical installer was "
-"explicitly selected."
+"&debian;'s support for graphical interfaces is determined by the underlying "
+"support found in X.Org's X11 system. On modern PCs, having a graphical "
+"display usually works out of the box. Whether advanced graphics card "
+"features such as 3D-hardware acceleration or hardware-accelerated video are "
+"available, depends on the actual graphics hardware used in the system and in "
+"some cases on the installation of additional <quote>firmware</quote> images "
+"(see <xref linkend=\"hardware-firmware\"/>). In very few cases there have "
+"been reports about hardware on which installation of additional graphics "
+"card firmware was required even for basic graphics support, but these have "
+"been rare exceptions."
msgstr ""
-"您应该给终端控制台使用 VGA 兼容的显示接口。几乎所有的新显卡都兼容 VGA。在不使"
-"用 X11 支持的情况下,您也可以用古老的 CGA、MDA 或 HGA 工作。注意,除非特意选"
-"择使用图形安装程序,本文所述的安装过程中并不会使用 X11 图形界面。"
#. Tag: para
-#: hardware.xml:1244
-#, no-c-format
+#: hardware.xml:1240
+#, fuzzy, no-c-format
#| msgid ""
#| "&debian;'s support for graphical interfaces is determined by the "
#| "underlying support found in X.Org's X11 system. Most AGP, PCI, PCIe, and "
@@ -1847,11 +1848,9 @@ msgstr ""
#| "cards, monitors, and pointing devices can be found at <ulink url=\"&url-"
#| "xorg;\"></ulink>. &debian; &release; ships with X.Org version &x11ver;."
msgid ""
-"&debian;'s support for graphical interfaces is determined by the underlying "
-"support found in X.Org's X11 system. Most AGP, PCI, PCIe, and PCI-X video "
-"cards work under X.Org. Details on supported graphics buses, cards, "
-"monitors, and pointing devices can be found at <ulink url=\"&url-xorg;\"></"
-"ulink>. &debian; &release; ships with X.Org version &x11ver;."
+"Details on supported graphics cards and pointing devices can be found at "
+"<ulink url=\"&url-xorg;\"></ulink>. &debian; &release; ships with X.Org "
+"version &x11ver;."
msgstr ""
"&debian; 对显卡的支持决定于 X.Org 的 X11 系统。大多数 AGP、PCI、PCIe 和 PCI-"
"X 视频卡都能在 X.Org 下工作。更多的关于图形总线、显卡、显示器和指点设备的支持"
@@ -1859,13 +1858,13 @@ msgstr ""
"&x11ver; 版。"
#. Tag: para
-#: hardware.xml:1253
+#: hardware.xml:1245
#, 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:1258
+#: hardware.xml:1250
#, no-c-format
msgid ""
"Most graphics options commonly found on Sparc-based machines are supported. "
@@ -1884,7 +1883,7 @@ msgstr ""
"卡。"
#. Tag: para
-#: hardware.xml:1268
+#: hardware.xml:1260
#, no-c-format
msgid ""
"It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -1907,14 +1906,14 @@ msgstr ""
"自动激活串口控制台。"
#. Tag: title
-#: hardware.xml:1290
+#: hardware.xml:1282
#, no-c-format
msgid "Network Connectivity Hardware"
msgstr "网络连接硬件"
#. Tag: para
-#: hardware.xml:1291
-#, no-c-format
+#: hardware.xml:1283
+#, fuzzy, no-c-format
#| msgid ""
#| "Almost any network interface card (NIC) supported by the &arch-kernel; "
#| "kernel should also be supported by the installation system; modular "
@@ -1923,17 +1922,17 @@ msgstr "网络连接硬件"
#| "\"i386\">Many older ISA cards are supported as well.</phrase>"
msgid ""
"Almost any network interface card (NIC) supported by the &arch-kernel; "
-"kernel should also be supported by the installation system; modular drivers "
-"should normally be loaded automatically. <phrase arch=\"x86\">This includes "
-"most PCI and PCMCIA cards.</phrase> <phrase arch=\"i386\">Many older ISA "
-"cards are supported as well.</phrase>"
+"kernel should also be supported by the installation system; drivers should "
+"normally be loaded automatically. <phrase arch=\"x86\">This includes most "
+"PCI/PCI-Express cards as well as PCMCIA/Express Cards on laptops.</phrase> "
+"<phrase arch=\"i386\">Many older ISA cards are supported as well.</phrase>"
msgstr ""
"几乎所有被 &arch-kernel; 内核支持的网络接口卡(NIC)也全都被安装系统所支持;驱"
"动模块通常会自动加载。<phrase arch=\"x86\">这包含大多数 PCI 和 PCMCIA 卡。</"
"phrase> <phrase arch=\"i386\">许多旧的 ISA 卡也能支持。</phrase>"
#. Tag: para
-#: hardware.xml:1300
+#: hardware.xml:1293
#, no-c-format
msgid ""
"This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -1941,61 +1940,61 @@ msgid ""
msgstr "这包括一些通用 PCI 卡(对于支持 PCI 的系统)和来自 Sun 的网卡:"
#. Tag: para
-#: hardware.xml:1306
+#: hardware.xml:1299
#, no-c-format
msgid "Sun LANCE"
msgstr "Sun LANCE"
#. Tag: para
-#: hardware.xml:1311
+#: hardware.xml:1304
#, no-c-format
msgid "Sun Happy Meal"
msgstr "Sun Happy Meal"
#. Tag: para
-#: hardware.xml:1316
+#: hardware.xml:1309
#, no-c-format
msgid "Sun BigMAC"
msgstr "Sun BigMAC"
#. Tag: para
-#: hardware.xml:1321
+#: hardware.xml:1314
#, no-c-format
msgid "Sun QuadEthernet"
msgstr "Sun QuadEthernet"
#. Tag: para
-#: hardware.xml:1326
+#: hardware.xml:1319
#, no-c-format
msgid "MyriCOM Gigabit Ethernet"
msgstr "MyriCOM Gigabit Ethernet"
#. Tag: para
-#: hardware.xml:1333
+#: hardware.xml:1326
#, no-c-format
msgid "The list of supported network devices is:"
msgstr "支持的网络设备有:"
#. Tag: para
-#: hardware.xml:1338
+#: hardware.xml:1331
#, 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:1343
+#: hardware.xml:1336
#, 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:1348
+#: hardware.xml:1341
#, no-c-format
msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
msgstr "QDIO 模式的 OSA-Express,HiperSockets 和 Guest-LANs"
#. Tag: para
-#: hardware.xml:1357
+#: hardware.xml:1350
#, no-c-format
msgid ""
"On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -2005,20 +2004,20 @@ msgstr ""
"块。"
#. Tag: para
-#: hardware.xml:1362
+#: hardware.xml:1355
#, no-c-format
msgid "ISDN is supported, but not during the installation."
msgstr "ISDN 虽也获得支持,不过不能在安装阶段使用。"
#. Tag: title
-#: hardware.xml:1369
+#: hardware.xml:1362
#, no-c-format
msgid "Wireless Network Cards"
msgstr "无线网卡"
#. Tag: para
-#: hardware.xml:1370
-#, no-c-format
+#: hardware.xml:1363
+#, fuzzy, no-c-format
#| msgid ""
#| "Wireless networking is in general supported as well and a growing number "
#| "of wireless adapters are supported by the official &arch-kernel; kernel, "
@@ -2029,17 +2028,33 @@ msgstr "无线网卡"
msgid ""
"Wireless networking is in general supported as well and a growing number of "
"wireless adapters are supported by the official &arch-kernel; kernel, "
-"although many of them do require firmware to be loaded. If firmware is "
-"needed, the installer will prompt you to load firmware. See <xref linkend="
-"\"loading-firmware\"/> for detailed information on how to load firmware "
-"during the installation."
+"although many of them do require firmware to be loaded."
msgstr ""
"无线网络也能得到很好地支持。虽然大多数都需要加载固件,正式的 &arch-kernel; 内"
"核能支持的无线网卡也越来越多。如果需要固件,安装程序会提示您加载。参阅 <xref "
"linkend=\"loading-firmware\"/> 了解如何在安装过程中加载固件的更多信息。"
#. Tag: para
-#: hardware.xml:1378
+#: hardware.xml:1370
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Wireless networking is in general supported as well and a growing number "
+#| "of wireless adapters are supported by the official &arch-kernel; kernel, "
+#| "although many of them do require firmware to be loaded. If firmware is "
+#| "needed, the installer will prompt you to load firmware. See <xref linkend="
+#| "\"loading-firmware\"/> for detailed information on how to load firmware "
+#| "during the installation."
+msgid ""
+"If firmware is needed, the installer will prompt you to load firmware. See "
+"<xref linkend=\"loading-firmware\"/> for detailed information on how to load "
+"firmware during the installation."
+msgstr ""
+"无线网络也能得到很好地支持。虽然大多数都需要加载固件,正式的 &arch-kernel; 内"
+"核能支持的无线网卡也越来越多。如果需要固件,安装程序会提示您加载。参阅 <xref "
+"linkend=\"loading-firmware\"/> 了解如何在安装过程中加载固件的更多信息。"
+
+#. Tag: para
+#: hardware.xml:1375
#, no-c-format
msgid ""
"Wireless NICs that are not supported by the official &arch-kernel; kernel "
@@ -2050,7 +2065,7 @@ msgstr ""
"作,但是却不能在安装过程中使用。"
#. Tag: para
-#: hardware.xml:1383
+#: hardware.xml:1380
#, no-c-format
msgid ""
"If there is a problem with wireless and there is no other NIC you can use "
@@ -2066,7 +2081,7 @@ msgstr ""
"件,并手动配置网络。"
#. Tag: para
-#: hardware.xml:1393
+#: hardware.xml:1390
#, no-c-format
msgid ""
"In some cases the driver you need may not be available as a &debian; "
@@ -2082,13 +2097,13 @@ msgstr ""
"classname> 软件包,它让您使用 Windows 的驱动程序。</phrase>"
#. Tag: title
-#: hardware.xml:1407
+#: hardware.xml:1404
#, no-c-format
msgid "Known Issues for &arch-title;"
msgstr "&arch-title; 的一些已知问题"
#. Tag: para
-#: hardware.xml:1408
+#: hardware.xml:1405
#, no-c-format
msgid ""
"There are a couple of issues with specific network cards that are worth "
@@ -2096,13 +2111,13 @@ msgid ""
msgstr "有些特定的网卡事项需要在此提及。"
#. Tag: title
-#: hardware.xml:1415
+#: hardware.xml:1412
#, no-c-format
msgid "Conflict between tulip and dfme drivers"
msgstr "tulip 和 dfme 驱动程序之间的冲突"
#. Tag: para
-#: hardware.xml:1417
+#: hardware.xml:1414
#, no-c-format
msgid ""
"There are various PCI network cards that have the same PCI identification, "
@@ -2118,7 +2133,7 @@ msgstr ""
"如果使用不正确的驱动程序,网卡可能不工作,或者工作不正常。"
#. Tag: para
-#: hardware.xml:1427
+#: hardware.xml:1424
#, no-c-format
msgid ""
"This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -2131,7 +2146,7 @@ msgstr ""
"\"module-blacklist\"/> 将错误的驱动模块加入黑名单,以阻止这种情况发生。"
#. Tag: para
-#: hardware.xml:1435
+#: hardware.xml:1432
#, no-c-format
msgid ""
"An alternative solution during the installation is to switch to a shell and "
@@ -2148,13 +2163,13 @@ msgstr ""
"之后错误的模块可能还会加载。"
#. Tag: title
-#: hardware.xml:1448
+#: hardware.xml:1445
#, no-c-format
msgid "Sun B100 blade"
msgstr "Sun B100 blade"
#. Tag: para
-#: hardware.xml:1450
+#: hardware.xml:1447
#, no-c-format
msgid ""
"The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -2163,13 +2178,13 @@ msgstr ""
"<literal>cassini</literal> 网络驱动程序不能工作在 Sun B100 刀片系统上。"
#. Tag: title
-#: hardware.xml:1465
+#: hardware.xml:1462
#, no-c-format
msgid "Braille Displays"
msgstr "盲文点触设备(Braille Display)"
#. Tag: para
-#: hardware.xml:1466
+#: hardware.xml:1463
#, no-c-format
msgid ""
"Support for braille displays is determined by the underlying support found "
@@ -2186,13 +2201,13 @@ msgstr ""
"的 <classname>brltty</classname> 版本是 &brlttyver; 。"
#. Tag: title
-#: hardware.xml:1480
+#: hardware.xml:1477
#, no-c-format
msgid "Hardware Speech Synthesis"
msgstr "硬件语音合成(Hardware Speech Synthesis)"
#. Tag: para
-#: hardware.xml:1481
+#: hardware.xml:1478
#, no-c-format
msgid ""
"Support for hardware speech synthesis devices is determined by the "
@@ -2211,13 +2226,13 @@ msgstr ""
"gnu; &release; 配备的 <classname>speakup</classname> 版本是 &speakupver;。"
#. Tag: title
-#: hardware.xml:1501
+#: hardware.xml:1498
#, no-c-format
msgid "Peripherals and Other Hardware"
msgstr "外围设备与其他硬件"
#. Tag: para
-#: hardware.xml:1502
+#: hardware.xml:1499
#, no-c-format
msgid ""
"&arch-kernel; supports a large variety of hardware devices such as mice, "
@@ -2228,14 +2243,16 @@ msgstr ""
"设备。然而,在安装系统的时候,并不需要其中的大部分设备。"
#. Tag: para
-#: hardware.xml:1508
-#, no-c-format
+#: hardware.xml:1505
+#, fuzzy, no-c-format
#| msgid ""
#| "USB hardware generally works fine, only some USB keyboards may require "
#| "additional configuration (see <xref linkend=\"hardware-issues\"/>)."
msgid ""
-"USB hardware generally works fine, only some USB keyboards may require "
-"additional configuration (see <xref linkend=\"hardware-issues\"/>)."
+"USB hardware generally works fine. On some very old PC systems some USB "
+"keyboards may require additional configuration (see <xref linkend=\"hardware-"
+"issues\"/>). On modern PCs, USB keyboards and mice work without requiring "
+"any specific configuration."
msgstr ""
"USB 硬件通常工作得很好,只有一些 USB 键盘需要额外的配置(参阅 <xref linkend="
"\"hardware-issues\"/>)。"
@@ -2244,17 +2261,6 @@ msgstr ""
#: hardware.xml:1514
#, no-c-format
msgid ""
-"Again, see the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
-"Compatibility HOWTO</ulink> to determine whether your specific hardware is "
-"supported by Linux."
-msgstr ""
-"另外,请查考 <ulink url=\"&url-hardware-howto;\">Linux Hardware "
-"Compatibility HOWTO</ulink> 来判断您的硬件是否被 Linux 支持。"
-
-#. Tag: para
-#: hardware.xml:1520
-#, no-c-format
-msgid ""
"Package installations from XPRAM and tape are not supported by this system. "
"All packages that you want to install need to be available on a DASD or over "
"the network using NFS, HTTP or FTP."
@@ -2263,7 +2269,7 @@ msgstr ""
"通过 NFS、HTTP、FTP 从网络上取得。"
#. Tag: para
-#: hardware.xml:1526
+#: hardware.xml:1520
#, no-c-format
msgid ""
"The Cobalt RaQ has no support for additional devices but the Qube has one "
@@ -2271,14 +2277,14 @@ msgid ""
msgstr "Cobalt RaQ 不支持外加设备,但 Qube 有一个 PCI 插槽。"
#. Tag: title
-#: hardware.xml:1538
+#: hardware.xml:1532
#, no-c-format
msgid "Devices Requiring Firmware"
msgstr "需要固件的设备"
#. Tag: para
-#: hardware.xml:1539
-#, no-c-format
+#: hardware.xml:1533
+#, fuzzy, no-c-format
#| msgid ""
#| "Besides the availability of a device driver, some hardware also requires "
#| "so-called <firstterm>firmware</firstterm> or <firstterm>microcode</"
@@ -2292,14 +2298,27 @@ msgid ""
"to be loaded into the device before it can become operational. This is most "
"common for network interface cards (especially wireless NICs), but for "
"example some USB devices and even some hard disk controllers also require "
-"firmware."
+"firmware. With many graphics cards, basic functionality is available without "
+"additional firmware, but the use of advanced features requires an "
+"appropriate firmware file to be installed in the system."
msgstr ""
"除了需要设备驱动程序,有些硬件还要在使用之前加载 <firstterm>firmware</"
"firstterm> 或 <firstterm>microcode</firstterm>。这对于网卡(特别是无线网卡)来"
"说很常见,但有些 USB 设备甚至是硬盘控制器也需要加载固件(firmware)。"
#. Tag: para
-#: hardware.xml:1547
+#: hardware.xml:1544
+#, no-c-format
+msgid ""
+"On many older devices which require firmware to work, the firmware file was "
+"permanently placed in an EEPROM/Flash chip on the device itself by the "
+"manufacturer. Nowadays most new devices do not have the firmware embedded "
+"this way anymore, so the firmware file must be uploaded into the device by "
+"the host operating system every time the system boots."
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:1552
#, no-c-format
msgid ""
"In most cases firmware is non-free according to the criteria used by the "
@@ -2314,8 +2333,8 @@ msgstr ""
"gnu; 可以合法地发布固件,它通常被单独地放置在仓库的 non-free 区里面。"
#. Tag: para
-#: hardware.xml:1556
-#, no-c-format
+#: hardware.xml:1561
+#, fuzzy, no-c-format
#| msgid ""
#| "However, this does not mean that such hardware cannot be used during an "
#| "installation. Starting with &debian-gnu; 5.0, &d-i; supports loading "
@@ -2327,8 +2346,8 @@ msgid ""
"However, this does not mean that such hardware cannot be used during an "
"installation. Starting with &debian-gnu; 5.0, &d-i; supports loading "
"firmware files or packages containing firmware from a removable medium, such "
-"as a floppy disk or USB stick. See <xref linkend=\"loading-firmware\"/> for "
-"detailed information on how to load firmware files or packages during the "
+"as a USB stick. See <xref linkend=\"loading-firmware\"/> for detailed "
+"information on how to load firmware files or packages during the "
"installation."
msgstr ""
"然而,这并不意味着该硬件不能在安装时使用。从 &debian-gnu; 5.0 开始,&d-i; 支"
@@ -2336,14 +2355,27 @@ msgstr ""
"linkend=\"loading-firmware\"/> 了解如何在安装时加载固件文件或软件包的的详细信"
"息。"
+#. Tag: para
+#: hardware.xml:1570
+#, no-c-format
+msgid ""
+"If the &d-i; prompts for a firmware file and you do not have this firmware "
+"file available or do not want to install a non-free firmware file on your "
+"system, you can try to proceed without loading the firmware. There are "
+"several cases where a driver prompts for additional firmware because it may "
+"be needed under certain circumstances, but the device does work without it "
+"on most systems (this e.g. happens with certain network cards using the tg3 "
+"driver)."
+msgstr ""
+
#. Tag: title
-#: hardware.xml:1572
+#: hardware.xml:1587
#, no-c-format
msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
msgstr "特别为 GNU/&arch-kernel; 采购硬件"
#. Tag: para
-#: hardware.xml:1574
+#: hardware.xml:1589
#, no-c-format
msgid ""
"There are several vendors, who ship systems with &debian; or other "
@@ -2357,7 +2389,7 @@ msgstr ""
"心,因为这些硬件都已经确保能被 GNU/Linux 很好地支持。"
#. Tag: para
-#: hardware.xml:1582
+#: hardware.xml:1597
#, no-c-format
msgid ""
"If you do have to buy a machine with Windows bundled, carefully read the "
@@ -2371,7 +2403,7 @@ msgstr ""
"<quote>windows refund</quote> 搜索可以查到一些有益的信息。"
#. Tag: para
-#: hardware.xml:1590
+#: hardware.xml:1605
#, no-c-format
msgid ""
"Whether or not you are purchasing a system with &arch-kernel; bundled, or "
@@ -2387,14 +2419,14 @@ msgstr ""
"&arch-kernel; 友好的硬件销售商。"
#. Tag: title
-#: hardware.xml:1601
+#: hardware.xml:1616
#, no-c-format
msgid "Avoid Proprietary or Closed Hardware"
msgstr "避免专有或封闭的硬件"
#. Tag: para
-#: hardware.xml:1602
-#, no-c-format
+#: hardware.xml:1617
+#, fuzzy, no-c-format
#| msgid ""
#| "Some hardware manufacturers simply won't tell us how to write drivers for "
#| "their hardware. Others won't allow us access to the documentation without "
@@ -2403,110 +2435,76 @@ msgstr "避免专有或封闭的硬件"
msgid ""
"Some hardware manufacturers simply won't tell us how to write drivers for "
"their hardware. Others won't allow us access to the documentation without a "
-"non-disclosure agreement that would prevent us from releasing the &arch-"
-"kernel; source code."
+"non-disclosure agreement that would prevent us from releasing the driver's "
+"source code, which is one of the central elements of free software. Since we "
+"haven't been granted access to usable documentation on these devices, they "
+"simply won't work under &arch-kernel;."
msgstr ""
"一些硬件制造商愚蠢地拒绝告诉我们如何给他们的硬件写驱动程序。其他的则要求签署"
"不公开的契约才能接触文档,以阻止我们发布 &arch-kernel; 驱动程序源代码。"
#. Tag: para
-#: hardware.xml:1609
+#: hardware.xml:1627
#, no-c-format
msgid ""
-"Since we haven't been granted access to the documentation on these devices, "
-"they simply won't work under &arch-kernel;. You can help by asking the "
-"manufacturers of such hardware to release the documentation. If enough "
-"people ask, they will realize that the free software community is an "
-"important market."
+"In many cases there are standards (or at least some de-facto standards) "
+"describing how an operating system and its device drivers communicate with a "
+"certain class of devices. All devices which comply to such a (de-facto-)"
+"standard can be used with a single generic device driver and no device-"
+"specific drivers are required. With some kinds of hardware (e.g. USB "
+"<quote>Human Interface Devices</quote>, i.e. keyboards, mice, etc., and USB "
+"mass storage devices like USB flash disks and memory card readers) this "
+"works very well and practically every device sold in the market is standards-"
+"compliant."
msgstr ""
-"因为我们没有被授权查看这些设备的文档,它们自然不会在 &arch-kernel; 下工作。您"
-"可以帮我们去告诉那些制造商,要求他们发布文档。如果有足够多的人要求,他们将认"
-"识到自由软件社区也是一个重要的市场。"
-#. Tag: title
-#: hardware.xml:1621
-#, no-c-format
-msgid "Windows-specific Hardware"
-msgstr "Windows 专用硬件"
-
-#. Tag: para
-#: hardware.xml:1622
-#, no-c-format
-msgid ""
-"A disturbing trend is the proliferation of Windows-specific modems and "
-"printers. In some cases these are specially designed to be operated by the "
-"Microsoft Windows operating system and bear the legend <quote>WinModem</"
-"quote> or <quote>Made especially for Windows-based computers</quote>. This "
-"is generally done by removing the embedded processors of the hardware and "
-"shifting the work they do over to a Windows driver that is run by your "
-"computer's main CPU. This strategy makes the hardware less expensive, but "
-"the savings are often <emphasis>not</emphasis> passed on to the user and "
-"this hardware may even be more expensive than equivalent devices that retain "
-"their embedded intelligence."
-msgstr ""
-"一个令人不安的趋势是 Windows 规格的调制解调器和打印机的增长。在某些情况下它们"
-"专为微软的 Windows 操作系统设计并且标有 <quote>WinModem</quote> 或 <quote>专"
-"为基于 Windows 的计算机制造</quote> 字样。这通常是省掉硬件的内嵌处理器,将它"
-"的工作交给 Windows 驱动程序并由您计算机中的 CPU 来完成。这样做是为了降低硬件"
-"成本,但是常常并<emphasis>不能</emphasis>为用户节省任何开销,并且可能还会比同"
-"等功能的保留内嵌处理器的设备昂贵。"
-
-#. Tag: para
-#: hardware.xml:1635
-#, no-c-format
-msgid ""
-"You should avoid Windows-specific hardware for two reasons. The first is "
-"that the manufacturers do not generally make the resources available to "
-"write a &arch-kernel; driver. Generally, the hardware and software interface "
-"to the device is proprietary, and documentation is not available without a "
-"non-disclosure agreement, if it is available at all. This precludes it being "
-"used for free software, since free software writers disclose the source code "
-"of their programs. The second reason is that when devices like these have "
-"had their embedded processors removed, the operating system must perform the "
-"work of the embedded processors, often at <emphasis>real-time</emphasis> "
-"priority, and thus the CPU is not available to run your programs while it is "
-"driving these devices. Since the typical Windows user does not multi-process "
-"as intensively as a &arch-kernel; user, the manufacturers hope that the "
-"Windows user simply won't notice the burden this hardware places on their "
-"CPU. However, any multi-processing operating system, even Windows 2000 or "
-"XP, suffers from degraded performance when peripheral manufacturers skimp on "
-"the embedded processing power of their hardware."
-msgstr ""
-"有两个原因让您应当避免使用 Windows 规格的硬件。首先,这些制造商一般不提供相应"
-"资料用于编写 &arch-kernel; 驱动程序。通常,这些设备的软硬件接口是专有的,即使"
-"相关资料存在,但不签署封闭的契约也无法得到它们。这就排除了被自由软件使用的可"
-"能,因为自由软件的开发者不会将它们的软件源码封闭起来。其次,这些设备是没有内"
-"嵌处理器的,操作系统必须承担本该由这些处理器完成的工作,并且经常是在"
-"<emphasis>实时</emphasis>优先级下,因此 CPU 在驱动这些设备时就无法运行您的程"
-"序。因为典型的 Windows 用户并不像 &arch-kernel; 用户那样对多任务有强烈要求,"
-"这些制造商希望 Windows 用户不会注意到 CPU 为他们硬件的开销。但是,任何多任务"
-"操作系统,甚至是 Windows 2000 或 XP,都要忍受这些制造商克扣内嵌处理器造成的性"
-"能下降。"
-
-#. Tag: para
-#: hardware.xml:1656
-#, no-c-format
-msgid ""
-"You can help improve this situation by encouraging these manufacturers to "
-"release the documentation and other resources necessary for us to program "
-"their hardware, but the best strategy is simply to avoid this sort of "
-"hardware<phrase arch=\"linux-any\"> until it is listed as working in the "
-"<ulink url=\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</"
-"ulink></phrase>."
-msgstr ""
-"您可以帮助改变这种状况,要求制造商发布相应的文档和资料,让我们可以编写他们硬"
-"件的程序,但最好还是避免使用这些硬件<phrase arch=\"linux-any\">,直到它们被列"
-"入 <ulink url=\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</"
-"ulink></phrase>。"
+#. Tag: para
+#: hardware.xml:1639
+#, no-c-format
+msgid ""
+"In other fields, among them e.g. printers, this is unfortunately not the "
+"case. While there are many printers which can be addressed via a small set "
+"of (de-facto-)standard control languages and therefore can be made to work "
+"without problems in any operating system, there are quite a few models which "
+"only understand proprietary control commands for which no usable "
+"documentation is available and therefore either cannot be used at all on "
+"free operating systems or can only be used with a vendor-supplied closed-"
+"source driver."
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:1650
+#, no-c-format
+msgid ""
+"Even if there is a vendor-provided closed-source driver for such hardware "
+"when purchasing the device, the practical lifespan of the device is limited "
+"by driver availability. Nowadays product cycles have become short and it is "
+"not uncommon that a short time after a consumer device has ceased "
+"production, no driver updates get made available any more by the "
+"manufacturer. If the old closed-source driver does not work anymore after a "
+"system update, an otherwise perfectly working device becomes unusable due to "
+"lacking driver support and there is nothing that can be done in this case. "
+"You should therefore avoid buying closed hardware in the first place, "
+"regardless of the operating system you want to use it with."
+msgstr ""
+
+#. Tag: para
+#: hardware.xml:1663
+#, no-c-format
+msgid ""
+"You can help improve this situation by encouraging manufacturers of closed "
+"hardware to release the documentation and other resources necessary for us "
+"to provide free drivers for their hardware."
+msgstr ""
#. Tag: title
-#: hardware.xml:1674
+#: hardware.xml:1678
#, no-c-format
msgid "Installation Media"
msgstr "安装介质"
#. Tag: para
-#: hardware.xml:1676
+#: hardware.xml:1680
#, no-c-format
msgid ""
"This section will help you determine which different media types you can use "
@@ -2520,13 +2518,13 @@ msgstr ""
"读那一章的时候,可能需要回过头来参考本页。"
#. Tag: title
-#: hardware.xml:1686
+#: hardware.xml:1690
#, no-c-format
msgid "Floppies"
msgstr "软盘"
#. Tag: para
-#: hardware.xml:1687
+#: hardware.xml:1691
#, no-c-format
msgid ""
"In some cases, you'll have to do your first boot from floppy disks. "
@@ -2537,20 +2535,20 @@ msgstr ""
"(1440 千字节)软驱。"
#. Tag: para
-#: hardware.xml:1693
+#: hardware.xml:1697
#, no-c-format
msgid "For CHRP, floppy support is currently broken."
msgstr "用于 CHRP 的软盘支持已经被停止。"
#. Tag: title
-#: hardware.xml:1700
+#: hardware.xml:1704
#, no-c-format
msgid "CD-ROM/DVD-ROM"
msgstr "CD-ROM/DVD-ROM"
#. Tag: para
-#: hardware.xml:1702
-#, no-c-format
+#: hardware.xml:1706
+#, 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 "
@@ -2559,44 +2557,27 @@ msgstr "CD-ROM/DVD-ROM"
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, except for some very old nonstandard CD-"
-"ROM drives which are neither SCSI nor IDE/ATAPI."
+"operating system's point of view."
msgstr ""
"每当在本手册中看到 <quote>CD-ROM</quote>,它泛指 CD-ROM 和 DVD-ROM。因为从操"
"作系统的角度看,它们所用的技术是相同的。这里面除去那些既不属于 SCSI 也不属于 "
"IDE/ATAPI 的老式的非标准 CD-ROM 驱动器。"
#. Tag: para
-#: hardware.xml:1709
+#: hardware.xml:1712
#, no-c-format
-msgid ""
-"CD-ROM based installation is supported for some architectures. On machines "
-"which support bootable CD-ROMs, you should be able to do a completely "
-"<phrase arch=\"not-s390\">floppy-less</phrase> <phrase arch=\"s390\">tape-"
-"less</phrase> installation. Even if your system doesn't support booting from "
-"a CD-ROM, you can use the CD-ROM in conjunction with the other techniques to "
-"install your system, once you've booted up by other means; see <xref linkend="
-"\"boot-installer\"/>."
+msgid "CD-ROM based installation is supported for most architectures."
msgstr ""
-"一些体系支持基于 CD-ROM 的安装。在支持 CD-ROM 启动的机器上,您可以完成"
-"<phrase arch=\"not-s390\">无软盘(floppy-less)</phrase> <phrase arch=\"s390\">"
-"无磁带(tape-less)</phrase>的安装。即使您的系统不支持从 CD-ROM 启动,您也可以"
-"结合其他技术在启动后,使用 CD-ROM 来安装系统,参阅 <xref linkend=\"boot-"
-"installer\"/>。"
#. Tag: para
-#: hardware.xml:1721
-#, no-c-format
-msgid ""
-"SCSI, SATA and IDE/ATAPI CD-ROMs are supported. The <ulink url=\"&url-cd-"
-"howto;\">Linux CD-ROM HOWTO</ulink> contains in-depth information on using "
-"CD-ROMs with Linux."
-msgstr ""
-"SCSI、SATA 和 IDE/ATAPI CD-ROMs 都获得支持。<ulink url=\"&url-cd-howto;"
-"\">Linux CD-ROM HOWTO</ulink> 包含在 Linux 下使用 CD-ROM 的进一步信息。"
+#: hardware.xml:1716
+#, fuzzy, no-c-format
+#| msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
+msgid "On PCs SATA, IDE/ATAPI and SCSI CD-ROMs are supported."
+msgstr "所有的 ARM 机器都支持 IDE/ATAPI CD-ROM。"
#. Tag: para
-#: hardware.xml:1727
+#: hardware.xml:1720
#, no-c-format
msgid ""
"USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -2606,13 +2587,13 @@ msgstr ""
"获得支持。"
#. Tag: para
-#: hardware.xml:1732
+#: hardware.xml:1725
#, no-c-format
msgid "IDE/ATAPI CD-ROMs are supported on all ARM machines."
msgstr "所有的 ARM 机器都支持 IDE/ATAPI CD-ROM。"
#. Tag: para
-#: hardware.xml:1736
+#: hardware.xml:1729
#, no-c-format
msgid ""
"On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -2630,65 +2611,31 @@ msgstr ""
"固件上选择 <quote>System installation</quote> 项。"
#. Tag: title
-#: hardware.xml:1750
-#, no-c-format
-msgid "Hard Disk"
-msgstr "硬盘"
-
-#. Tag: para
-#: hardware.xml:1752
-#, no-c-format
-#| msgid ""
-#| "Booting the installation system directly from a hard disk is another "
-#| "option for many architectures. This will require some other operating "
-#| "system to load the installer onto the hard disk."
-msgid ""
-"Booting the installation system directly from a hard disk is another option "
-"for many architectures. This will require some other operating system to "
-"load the installer onto the hard disk."
-msgstr ""
-"从硬盘启动安装系统是许多体系的另外一个选择。这将要求其他的操作系统从硬盘加载"
-"安装程序。"
-
-#. Tag: para
-#: hardware.xml:1758
-#, no-c-format
-msgid ""
-"Although the &arch-title; does not allow booting from SunOS (Solaris), you "
-"can install from a SunOS partition (UFS slices)."
-msgstr ""
-"虽然 &arch-title; 不允许从 SunOS(Solaris) 启动,但您可以从一个 SunOS 的分区 "
-"(UFS slices)进行安装。"
-
-#. Tag: title
-#: hardware.xml:1766
+#: hardware.xml:1743
#, no-c-format
msgid "USB Memory Stick"
msgstr "U 盘"
#. Tag: para
-#: hardware.xml:1768
+#: hardware.xml:1745
#, no-c-format
msgid ""
-"Many &debian; boxes need their floppy and/or CD-ROM drives only for setting "
-"up the system and for rescue purposes. If you operate some servers, you will "
-"probably already have thought about omitting those drives and using an USB "
-"memory stick for installing and (when necessary) for recovering the system. "
-"This is also useful for small systems which have no room for unnecessary "
-"drives."
+"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."
msgstr ""
-"许多 &debian; 机器只在设置系统和急救用途时才需要软盘和 CD-ROM 驱动器。如果使"
-"用过服务器,您也许已经想过怎么样省掉这些驱动器,而用 U 盘来安装和(在必需时)恢"
-"复系统。这对那些没有足够空间容纳不必要驱动器的小型系统非常有用。"
#. Tag: title
-#: hardware.xml:1780
+#: hardware.xml:1757
#, no-c-format
msgid "Network"
msgstr "网络"
#. Tag: para
-#: hardware.xml:1782
+#: hardware.xml:1759
#, no-c-format
msgid ""
"The network can be used during the installation to retrieve files needed for "
@@ -2705,18 +2652,21 @@ msgstr ""
"用 ISDN 和 PPP。"
#. Tag: para
-#: hardware.xml:1792
+#: hardware.xml:1769
#, no-c-format
msgid ""
"You can also <emphasis>boot</emphasis> the installation system over the "
-"network. <phrase arch=\"mips;mipsel\">This is the preferred installation "
-"technique for &arch-title;.</phrase>"
+"network without needing any local media like CDs/DVDs or USB sticks. If you "
+"already have a netboot-infrastructure available (i.e. you are already "
+"running DHCP and TFTP services in your network), this allows an easy and "
+"fast deployment of a large number of machines. Setting up the necessary "
+"infrastructure requires a certain level of technical experience, so this is "
+"not recommended for novice users. <phrase arch=\"mips;mipsel\">This is the "
+"preferred installation technique for &arch-title;.</phrase>"
msgstr ""
-"您还可以从网络<emphasis>引导(boot)</emphasis>系统。<phrase arch=\"mips;mipsel"
-"\">在 &arch-title; 下此为推荐的安装技术。</phrase>"
#. Tag: para
-#: hardware.xml:1798
+#: hardware.xml:1782
#, no-c-format
msgid ""
"Diskless installation, using network booting from a local area network and "
@@ -2726,14 +2676,46 @@ msgstr ""
"择。"
#. Tag: title
-#: hardware.xml:1806
+#: hardware.xml:1791
+#, no-c-format
+msgid "Hard Disk"
+msgstr "硬盘"
+
+#. Tag: para
+#: hardware.xml:1793
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Booting the installation system directly from a hard disk is another "
+#| "option for many architectures. This will require some other operating "
+#| "system to load the installer onto the hard disk."
+msgid ""
+"Booting the installation system directly from a hard disk is another option "
+"for many architectures. This will require some other operating system to "
+"load the installer onto the hard disk. This method is only recommended for "
+"special cases when no other installation method is available."
+msgstr ""
+"从硬盘启动安装系统是许多体系的另外一个选择。这将要求其他的操作系统从硬盘加载"
+"安装程序。"
+
+#. Tag: para
+#: hardware.xml:1800
+#, no-c-format
+msgid ""
+"Although the &arch-title; does not allow booting from SunOS (Solaris), you "
+"can install from a SunOS partition (UFS slices)."
+msgstr ""
+"虽然 &arch-title; 不允许从 SunOS(Solaris) 启动,但您可以从一个 SunOS 的分区 "
+"(UFS slices)进行安装。"
+
+#. Tag: title
+#: hardware.xml:1809
#, no-c-format
msgid "Un*x or GNU system"
msgstr "Un*x 或 GNU 系统"
#. Tag: para
-#: hardware.xml:1808
-#, no-c-format
+#: hardware.xml:1811
+#, fuzzy, no-c-format
#| msgid ""
#| "If you are running another Unix-like system, you could use it to install "
#| "&debian-gnu; without using the &d-i; described in the rest of this "
@@ -2746,7 +2728,9 @@ msgid ""
"&debian-gnu; without using the &d-i; described in the rest of this manual. "
"This kind of install may be useful for users with otherwise unsupported "
"hardware or on hosts which can't afford downtime. If you are interested in "
-"this technique, skip to the <xref linkend=\"linux-upgrade\"/>."
+"this technique, skip to the <xref linkend=\"linux-upgrade\"/>. This "
+"installation method is only recommended for advanced users when no other "
+"installation method is available."
msgstr ""
"如果您正在运行其它的类 Unix 系统,也可以用它来安装 &debian-gnu; 而无须本手册"
"剩余部分讲述的 &d-i; 使用方法。这类安装方法可能对那些因为硬件不支持或机器停产"
@@ -2754,63 +2738,38 @@ msgstr ""
">。"
#. Tag: title
-#: hardware.xml:1820
+#: hardware.xml:1824
#, no-c-format
msgid "Supported Storage Systems"
msgstr "受支持的存储系统"
#. Tag: para
-#: hardware.xml:1822
+#: hardware.xml:1826
#, no-c-format
msgid ""
-"The &debian; boot disks contain a kernel which is built to maximize the "
-"number of systems it runs on. Unfortunately, this makes for a larger kernel, "
-"which includes many drivers that won't be used for your machine<phrase arch="
-"\"linux-any\"> (see <xref linkend=\"kernel-baking\"/> to learn how to build "
-"your own kernel)</phrase>. Support for the widest possible range of devices "
-"is desirable in general, to ensure that &debian; can be installed on the "
-"widest array of hardware."
+"The &debian; installer contains a kernel which is built to maximize the "
+"number of systems it runs on."
msgstr ""
-"&debian; 启动盘包括一个用于最大可能数量系统的内核。不幸的是,这将产生一个大内"
-"核,其中包括许多您的机器并不需要的驱动程序<phrase arch=\"linux-any\">(参考"
-"<xref linkend=\"kernel-baking\"/>学习如何创建自己的内核)</phrase>。在通常情况"
-"下,支持最大范围内的设备是一种较合适的设计,这将使得 &debian; 可以在尽可能多"
-"的硬件上安装。"
#. Tag: para
-#: hardware.xml:1832
-#, no-c-format
+#: hardware.xml:1830
+#, fuzzy, no-c-format
#| msgid ""
#| "Generally, the &debian; installation system includes support for "
#| "floppies, IDE (also known as PATA) drives, IDE floppies, parallel port "
#| "IDE devices, SATA and SCSI controllers and drives, USB, and FireWire. The "
#| "supported file systems include FAT, Win-32 FAT extensions (VFAT) and NTFS."
msgid ""
-"Generally, the &debian; installation system includes support for floppies, "
-"IDE (also known as PATA) drives, IDE floppies, parallel port IDE devices, "
-"SATA and SCSI controllers and drives, USB, and FireWire. The supported file "
-"systems include FAT, Win-32 FAT extensions (VFAT) and NTFS."
+"Generally, the &debian; installation system includes support for IDE (also "
+"known as PATA) drives, SATA and SCSI controllers and drives, USB, and "
+"FireWire. The supported file systems include FAT, Win-32 FAT extensions "
+"(VFAT) and NTFS."
msgstr ""
"通常,&debian; 安装系统支持软盘、IDE (也称为 PATA)驱动器、IDE 软盘、并口 IDE "
"驱动器、SATA 和 SCSI 控制器和驱动器、USB 和 FireWire。支持的文件系统有 FAT、"
"Win-32 FAT 扩展(VFAT) 和 NTFS。"
#. Tag: para
-#: hardware.xml:1839
-#, no-c-format
-msgid ""
-"Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
-"&mdash; often called MFM, RLL, IDE, or PATA &mdash; are supported. SATA and "
-"SCSI disk controllers from many different manufacturers are supported. See "
-"the <ulink url=\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</"
-"ulink> for more details."
-msgstr ""
-"模拟 <quote>AT</quote> 硬盘接口的磁盘接口 &mdash; 称为 MFM、RLL、IDE 或 PATA "
-"&mdash; 可以得到支持。大部分厂商生产的 SATA 和 SCSI 磁盘控制器都能获得支持。"
-"请参阅 <ulink url=\"&url-hardware-howto;\">Linux Hardware Compatibility "
-"HOWTO</ulink> 以获得更详细信息。"
-
-#. Tag: para
#: hardware.xml:1847
#, no-c-format
msgid ""
@@ -2909,3 +2868,199 @@ msgstr ""
"本界面需要更多的内存,并且内存不应少于 &minimum-memory; 。如果可以在普通和图"
"形界面两种方式之间选择,应选择普通方式。</para> </footnote>或磁盘空间上安装系"
"统或许可行,但只针对有经验的用户。"
+
+#~ msgid "HP PA-RISC"
+#~ msgstr "HP PA-RISC"
+
+#~ msgid "hppa"
+#~ msgstr "hppa"
+
+#~ msgid "PA-RISC 1.1"
+#~ msgstr "PA-RISC 1.1"
+
+#~ msgid "PA-RISC 2.0"
+#~ msgstr "PA-RISC 2.0"
+
+#~ msgid "<entry>64</entry>"
+#~ msgstr "<entry>64</entry>"
+
+#~ msgid ""
+#~ "In order to optimize the kernel for single CPU systems, you'll have to "
+#~ "replace the standard &debian; kernel.<phrase arch=\"linux-any\"> You can "
+#~ "find a discussion of how to do this in <xref linkend=\"kernel-baking\"/>. "
+#~ "At this time (kernel version &kernelversion;) the way you disable SMP is "
+#~ "to deselect <quote>&smp-config-option;</quote> in the <quote>&smp-config-"
+#~ "section;</quote> section of the kernel config.</phrase>"
+#~ msgstr ""
+#~ "为了给单 CPU 系统优化内核,您需要替换标准的 &debian; 内核。<phrase arch="
+#~ "\"linux-any\">您可以在<xref linkend=\"kernel-baking\"/> 找到相关的讨论。当"
+#~ "前(内核版本 &kernelversion;),禁止 SMP 选项的方法是在内核配置的 "
+#~ "<quote>&smp-config-section;</quote> 中取消选择 <quote>&smp-config-option;"
+#~ "</quote>。</phrase>"
+
+#~ msgid ""
+#~ "You should be using a VGA-compatible display interface for the console "
+#~ "terminal. Nearly every modern display card is compatible with VGA. "
+#~ "Ancient standards such CGA, MDA, or HGA should also work, assuming you do "
+#~ "not require X11 support. Note that X11 is not used during the "
+#~ "installation process described in this document unless the graphical "
+#~ "installer was explicitly selected."
+#~ msgstr ""
+#~ "您应该给终端控制台使用 VGA 兼容的显示接口。几乎所有的新显卡都兼容 VGA。在"
+#~ "不使用 X11 支持的情况下,您也可以用古老的 CGA、MDA 或 HGA 工作。注意,除非"
+#~ "特意选择使用图形安装程序,本文所述的安装过程中并不会使用 X11 图形界面。"
+
+#~ msgid ""
+#~ "Again, see the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
+#~ "Compatibility HOWTO</ulink> to determine whether your specific hardware "
+#~ "is supported by Linux."
+#~ msgstr ""
+#~ "另外,请查考 <ulink url=\"&url-hardware-howto;\">Linux Hardware "
+#~ "Compatibility HOWTO</ulink> 来判断您的硬件是否被 Linux 支持。"
+
+#~ msgid ""
+#~ "Since we haven't been granted access to the documentation on these "
+#~ "devices, they simply won't work under &arch-kernel;. You can help by "
+#~ "asking the manufacturers of such hardware to release the documentation. "
+#~ "If enough people ask, they will realize that the free software community "
+#~ "is an important market."
+#~ msgstr ""
+#~ "因为我们没有被授权查看这些设备的文档,它们自然不会在 &arch-kernel; 下工"
+#~ "作。您可以帮我们去告诉那些制造商,要求他们发布文档。如果有足够多的人要求,"
+#~ "他们将认识到自由软件社区也是一个重要的市场。"
+
+#~ msgid "Windows-specific Hardware"
+#~ msgstr "Windows 专用硬件"
+
+#~ msgid ""
+#~ "A disturbing trend is the proliferation of Windows-specific modems and "
+#~ "printers. In some cases these are specially designed to be operated by "
+#~ "the Microsoft Windows operating system and bear the legend "
+#~ "<quote>WinModem</quote> or <quote>Made especially for Windows-based "
+#~ "computers</quote>. This is generally done by removing the embedded "
+#~ "processors of the hardware and shifting the work they do over to a "
+#~ "Windows driver that is run by your computer's main CPU. This strategy "
+#~ "makes the hardware less expensive, but the savings are often "
+#~ "<emphasis>not</emphasis> passed on to the user and this hardware may even "
+#~ "be more expensive than equivalent devices that retain their embedded "
+#~ "intelligence."
+#~ msgstr ""
+#~ "一个令人不安的趋势是 Windows 规格的调制解调器和打印机的增长。在某些情况下"
+#~ "它们专为微软的 Windows 操作系统设计并且标有 <quote>WinModem</quote> 或 "
+#~ "<quote>专为基于 Windows 的计算机制造</quote> 字样。这通常是省掉硬件的内嵌"
+#~ "处理器,将它的工作交给 Windows 驱动程序并由您计算机中的 CPU 来完成。这样做"
+#~ "是为了降低硬件成本,但是常常并<emphasis>不能</emphasis>为用户节省任何开"
+#~ "销,并且可能还会比同等功能的保留内嵌处理器的设备昂贵。"
+
+#~ msgid ""
+#~ "You should avoid Windows-specific hardware for two reasons. The first is "
+#~ "that the manufacturers do not generally make the resources available to "
+#~ "write a &arch-kernel; driver. Generally, the hardware and software "
+#~ "interface to the device is proprietary, and documentation is not "
+#~ "available without a non-disclosure agreement, if it is available at all. "
+#~ "This precludes it being used for free software, since free software "
+#~ "writers disclose the source code of their programs. The second reason is "
+#~ "that when devices like these have had their embedded processors removed, "
+#~ "the operating system must perform the work of the embedded processors, "
+#~ "often at <emphasis>real-time</emphasis> priority, and thus the CPU is not "
+#~ "available to run your programs while it is driving these devices. Since "
+#~ "the typical Windows user does not multi-process as intensively as a &arch-"
+#~ "kernel; user, the manufacturers hope that the Windows user simply won't "
+#~ "notice the burden this hardware places on their CPU. However, any multi-"
+#~ "processing operating system, even Windows 2000 or XP, suffers from "
+#~ "degraded performance when peripheral manufacturers skimp on the embedded "
+#~ "processing power of their hardware."
+#~ msgstr ""
+#~ "有两个原因让您应当避免使用 Windows 规格的硬件。首先,这些制造商一般不提供"
+#~ "相应资料用于编写 &arch-kernel; 驱动程序。通常,这些设备的软硬件接口是专有"
+#~ "的,即使相关资料存在,但不签署封闭的契约也无法得到它们。这就排除了被自由软"
+#~ "件使用的可能,因为自由软件的开发者不会将它们的软件源码封闭起来。其次,这些"
+#~ "设备是没有内嵌处理器的,操作系统必须承担本该由这些处理器完成的工作,并且经"
+#~ "常是在<emphasis>实时</emphasis>优先级下,因此 CPU 在驱动这些设备时就无法运"
+#~ "行您的程序。因为典型的 Windows 用户并不像 &arch-kernel; 用户那样对多任务有"
+#~ "强烈要求,这些制造商希望 Windows 用户不会注意到 CPU 为他们硬件的开销。但"
+#~ "是,任何多任务操作系统,甚至是 Windows 2000 或 XP,都要忍受这些制造商克扣"
+#~ "内嵌处理器造成的性能下降。"
+
+#~ msgid ""
+#~ "You can help improve this situation by encouraging these manufacturers to "
+#~ "release the documentation and other resources necessary for us to program "
+#~ "their hardware, but the best strategy is simply to avoid this sort of "
+#~ "hardware<phrase arch=\"linux-any\"> until it is listed as working in the "
+#~ "<ulink url=\"&url-hardware-howto;\">Linux Hardware Compatibility HOWTO</"
+#~ "ulink></phrase>."
+#~ msgstr ""
+#~ "您可以帮助改变这种状况,要求制造商发布相应的文档和资料,让我们可以编写他们"
+#~ "硬件的程序,但最好还是避免使用这些硬件<phrase arch=\"linux-any\">,直到它"
+#~ "们被列入 <ulink url=\"&url-hardware-howto;\">Linux Hardware Compatibility "
+#~ "HOWTO</ulink></phrase>。"
+
+#~ msgid ""
+#~ "CD-ROM based installation is supported for some architectures. On "
+#~ "machines which support bootable CD-ROMs, you should be able to do a "
+#~ "completely <phrase arch=\"not-s390\">floppy-less</phrase> <phrase arch="
+#~ "\"s390\">tape-less</phrase> installation. Even if your system doesn't "
+#~ "support booting from a CD-ROM, you can use the CD-ROM in conjunction with "
+#~ "the other techniques to install your system, once you've booted up by "
+#~ "other means; see <xref linkend=\"boot-installer\"/>."
+#~ msgstr ""
+#~ "一些体系支持基于 CD-ROM 的安装。在支持 CD-ROM 启动的机器上,您可以完成"
+#~ "<phrase arch=\"not-s390\">无软盘(floppy-less)</phrase> <phrase arch="
+#~ "\"s390\">无磁带(tape-less)</phrase>的安装。即使您的系统不支持从 CD-ROM 启"
+#~ "动,您也可以结合其他技术在启动后,使用 CD-ROM 来安装系统,参阅 <xref "
+#~ "linkend=\"boot-installer\"/>。"
+
+#~ msgid ""
+#~ "SCSI, SATA and IDE/ATAPI CD-ROMs are supported. The <ulink url=\"&url-cd-"
+#~ "howto;\">Linux CD-ROM HOWTO</ulink> contains in-depth information on "
+#~ "using CD-ROMs with Linux."
+#~ msgstr ""
+#~ "SCSI、SATA 和 IDE/ATAPI CD-ROMs 都获得支持。<ulink url=\"&url-cd-howto;"
+#~ "\">Linux CD-ROM HOWTO</ulink> 包含在 Linux 下使用 CD-ROM 的进一步信息。"
+
+#~ msgid ""
+#~ "Many &debian; boxes need their floppy and/or CD-ROM drives only for "
+#~ "setting up the system and for rescue purposes. If you operate some "
+#~ "servers, you will probably already have thought about omitting those "
+#~ "drives and using an USB memory stick for installing and (when necessary) "
+#~ "for recovering the system. This is also useful for small systems which "
+#~ "have no room for unnecessary drives."
+#~ msgstr ""
+#~ "许多 &debian; 机器只在设置系统和急救用途时才需要软盘和 CD-ROM 驱动器。如果"
+#~ "使用过服务器,您也许已经想过怎么样省掉这些驱动器,而用 U 盘来安装和(在必需"
+#~ "时)恢复系统。这对那些没有足够空间容纳不必要驱动器的小型系统非常有用。"
+
+#~ msgid ""
+#~ "You can also <emphasis>boot</emphasis> the installation system over the "
+#~ "network. <phrase arch=\"mips;mipsel\">This is the preferred installation "
+#~ "technique for &arch-title;.</phrase>"
+#~ msgstr ""
+#~ "您还可以从网络<emphasis>引导(boot)</emphasis>系统。<phrase arch=\"mips;"
+#~ "mipsel\">在 &arch-title; 下此为推荐的安装技术。</phrase>"
+
+#~ msgid ""
+#~ "The &debian; boot disks contain a kernel which is built to maximize the "
+#~ "number of systems it runs on. Unfortunately, this makes for a larger "
+#~ "kernel, which includes many drivers that won't be used for your "
+#~ "machine<phrase arch=\"linux-any\"> (see <xref linkend=\"kernel-baking\"/> "
+#~ "to learn how to build your own kernel)</phrase>. Support for the widest "
+#~ "possible range of devices is desirable in general, to ensure that "
+#~ "&debian; can be installed on the widest array of hardware."
+#~ msgstr ""
+#~ "&debian; 启动盘包括一个用于最大可能数量系统的内核。不幸的是,这将产生一个"
+#~ "大内核,其中包括许多您的机器并不需要的驱动程序<phrase arch=\"linux-any\">"
+#~ "(参考<xref linkend=\"kernel-baking\"/>学习如何创建自己的内核)</phrase>。在"
+#~ "通常情况下,支持最大范围内的设备是一种较合适的设计,这将使得 &debian; 可以"
+#~ "在尽可能多的硬件上安装。"
+
+#~ msgid ""
+#~ "Disk interfaces that emulate the <quote>AT</quote> hard disk interface "
+#~ "&mdash; often called MFM, RLL, IDE, or PATA &mdash; are supported. SATA "
+#~ "and SCSI disk controllers from many different manufacturers are "
+#~ "supported. See the <ulink url=\"&url-hardware-howto;\">Linux Hardware "
+#~ "Compatibility HOWTO</ulink> for more details."
+#~ msgstr ""
+#~ "模拟 <quote>AT</quote> 硬盘接口的磁盘接口 &mdash; 称为 MFM、RLL、IDE 或 "
+#~ "PATA &mdash; 可以得到支持。大部分厂商生产的 SATA 和 SCSI 磁盘控制器都能获"
+#~ "得支持。请参阅 <ulink url=\"&url-hardware-howto;\">Linux Hardware "
+#~ "Compatibility HOWTO</ulink> 以获得更详细信息。"
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index 8012145de..57bb59c30 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2012-07-20 14:12+0000\n"
-"PO-Revision-Date: 2012-10-21 13:47+0800\n"
+"POT-Creation-Date: 2012-10-24 19:53+0000\n"
+"PO-Revision-Date: 2012-07-25 22:21+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
"Language: \n"
@@ -20,14 +20,14 @@ msgstr "获取系统安装介质"
#. Tag: title
#: install-methods.xml:12
-#, no-c-format
+#, fuzzy, no-c-format
#| msgid "Official &debian-gnu; CD-ROM Sets"
-msgid "Official &debian-gnu; CD-ROM Sets"
+msgid "Official &debian-gnu; CD/DVD-ROM Sets"
msgstr "官方的 &debian-gnu; 光盘套装"
#. Tag: para
#: install-methods.xml:13
-#, no-c-format
+#, fuzzy, no-c-format
#| msgid ""
#| "By far the easiest way to install &debian-gnu; is from an Official "
#| "&debian; CD-ROM Set. You can buy a set from a vendor (see the <ulink url="
@@ -44,17 +44,18 @@ msgstr "官方的 &debian-gnu; 光盘套装"
#| "and you avoid the CD shuffling marathon."
msgid ""
"By far the easiest way to install &debian-gnu; is from an Official &debian; "
-"CD-ROM Set. You can buy a set from a vendor (see the <ulink url=\"&url-"
-"debian-cd-vendors;\">CD vendors page</ulink>). You may also download the CD-"
-"ROM images from a &debian; mirror and make your own set, if you have a fast "
-"network connection and a CD burner (see the <ulink url=\"&url-debian-cd;"
-"\">Debian CD page</ulink> for detailed instructions). If you have a &debian; "
-"CD set and CDs are bootable on your machine, you can skip right to <xref "
-"linkend=\"boot-installer\"/>; much effort has been expended to ensure the "
-"files most people need are there on the CD. Although a full set of binary "
-"packages requires several CDs, it is unlikely you will need packages on the "
-"third CD and above. You may also consider using the DVD version, which saves "
-"a lot of space on your shelf and you avoid the CD shuffling marathon."
+"CD/DVD-ROM Set. You can buy a set from a vendor (see the <ulink url=\"&url-"
+"debian-cd-vendors;\">CD vendors page</ulink>). You may also download the CD/"
+"DVD-ROM images from a &debian; mirror and make your own set, if you have a "
+"fast network connection and a CD/DVD burner (see the <ulink url=\"&url-"
+"debian-cd;\">Debian CD page</ulink> and <ulink url=\"&url-debian-cd-faq;"
+"\">Debian CD FAQ</ulink> for detailed instructions). If you have a &debian; "
+"CD/DVD set and CDs/DVDs are bootable on your machine<phrase arch=\"x86\">, "
+"which is the case on all modern PCs</phrase>, you can skip right to <xref "
+"linkend=\"boot-installer\"/>. Much effort has been expended to ensure the "
+"most-used files are on the first CDs and DVDs, so that a basic desktop "
+"installation can be done with only the first DVD or - to a limited extent - "
+"even with only the first CD."
msgstr ""
"目前安装 &debian-gnu; 最容易的方法是使用官方的 &debian; CD-ROM 套件。您可以从"
"一个销售商处购买(参见<ulink url=\"&url-debian-cd-vendors;\">CD 销售商</"
@@ -69,6 +70,18 @@ msgstr ""
#. Tag: para
#: install-methods.xml:30
#, no-c-format
+msgid ""
+"As CDs have a rather limited capacity by today's standards, not all "
+"graphical desktop environments are installable with only the first CD; only "
+"XFCE (which is the default desktop environment installed by &debian-gnu; "
+"&release;) completely fits on the first CD. For all other desktop "
+"environments a CD installation requires either network connectivity during "
+"the installation to download the remaining files or additional CDs."
+msgstr ""
+
+#. Tag: para
+#: install-methods.xml:39
+#, fuzzy, no-c-format
#| msgid ""
#| "If your machine doesn't support CD booting, but you do have a CD set, you "
#| "can use an alternative strategy such as <phrase condition=\"supports-"
@@ -82,17 +95,18 @@ msgstr ""
#| "given below for particular files you need for booting, look for those "
#| "files in the same directories and subdirectories on your CD."
msgid ""
-"If your machine doesn't support CD booting, but you do have a CD set, you "
-"can use an alternative strategy such as <phrase condition=\"supports-floppy-"
-"boot\">floppy disk,</phrase> <phrase arch=\"s390\">tape, emulated tape,</"
-"phrase> <phrase condition=\"bootable-disk\">hard disk,</phrase> <phrase "
-"condition=\"bootable-usb\">usb stick,</phrase> <phrase condition=\"supports-"
-"tftp\">net boot,</phrase> or manually loading the kernel from the CD to "
-"initially boot the system installer. The files you need for booting by "
-"another means are also on the CD; the &debian; network archive and CD folder "
-"organization are identical. So when archive file paths are given below for "
-"particular files you need for booting, look for those files in the same "
-"directories and subdirectories on your CD."
+"If your machine doesn't support CD booting<phrase arch=\"x86\"> (only "
+"relevant on very old PC systems)</phrase>, but you do have a CD set, you can "
+"use an alternative strategy such as <phrase condition=\"supports-floppy-boot"
+"\">floppy disk,</phrase> <phrase arch=\"s390\">tape, emulated tape,</phrase> "
+"<phrase condition=\"bootable-disk\">hard disk,</phrase> <phrase condition="
+"\"bootable-usb\">usb stick,</phrase> <phrase condition=\"supports-tftp\">net "
+"boot,</phrase> or manually loading the kernel from the CD to initially boot "
+"the system installer. The files you need for booting by another means are "
+"also on the CD; the &debian; network archive and CD folder organization are "
+"identical. So when archive file paths are given below for particular files "
+"you need for booting, look for those files in the same directories and "
+"subdirectories on your CD."
msgstr ""
"如果您的机器不支持 CD 盘引导,但是您有一套 CD 光盘套件,可以使用其他的方法比"
"如:<phrase condition=\"supports-floppy-boot\">软盘、</phrase> <phrase arch="
@@ -104,7 +118,7 @@ msgstr ""
"件路径时,请在 CD 中同样的文件目录和子目录下查找它们。"
#. Tag: para
-#: install-methods.xml:52
+#: install-methods.xml:62
#, no-c-format
msgid ""
"Once the installer is booted, it will be able to obtain all the other files "
@@ -112,7 +126,7 @@ msgid ""
msgstr "一旦安装程序被引导,它将能够获得 CD 中其他所有必需的文件。"
#. Tag: para
-#: install-methods.xml:57
+#: install-methods.xml:67
#, no-c-format
msgid ""
"If you don't have a CD set, then you will need to download the installer "
@@ -129,13 +143,13 @@ msgstr ""
"\">一台连网的计算机上</phrase>,然后它们可以被用来引导安装程序。"
#. Tag: title
-#: install-methods.xml:83
+#: install-methods.xml:93
#, no-c-format
msgid "Downloading Files from &debian; Mirrors"
msgstr "从 &debian; 镜像服务器下载文件"
#. Tag: para
-#: install-methods.xml:85
+#: install-methods.xml:95
#, no-c-format
msgid ""
"To find the nearest (and thus probably the fastest) mirror, see the <ulink "
@@ -145,7 +159,7 @@ msgstr ""
"debian-mirrors;\">&debian; 镜像列表</ulink>。"
#. Tag: para
-#: install-methods.xml:90
+#: install-methods.xml:100
#, no-c-format
msgid ""
"When downloading files from a &debian; mirror using FTP, be sure to download "
@@ -155,13 +169,13 @@ msgstr ""
"<emphasis>二进制</emphasis>模式,而不是文本或者自动模式。"
#. Tag: title
-#: install-methods.xml:98
+#: install-methods.xml:108
#, no-c-format
msgid "Where to Find Installation Images"
msgstr "在哪里能找到安装映像"
#. Tag: para
-#: install-methods.xml:100
+#: install-methods.xml:110
#, no-c-format
msgid ""
"The installation images are located on each &debian; mirror in the directory "
@@ -176,13 +190,13 @@ msgstr ""
"\">MANIFEST</ulink> 文件列出了每一个映像及其用途。"
#. Tag: title
-#: install-methods.xml:113
+#: install-methods.xml:123
#, no-c-format
msgid "Thecus N2100 Installation Files"
msgstr "Thecus N2100 安装文件"
#. Tag: para
-#: install-methods.xml:114
+#: install-methods.xml:124
#, no-c-format
msgid ""
"A firmware image is provided for the Thecus N2100 which will automatically "
@@ -195,13 +209,13 @@ msgstr ""
"firmware-img; 获得。"
#. Tag: title
-#: install-methods.xml:125
+#: install-methods.xml:135
#, no-c-format
msgid "GLAN Tank Installation Files"
msgstr "GLAN Tank 安装文件"
#. Tag: para
-#: install-methods.xml:126
+#: install-methods.xml:136
#, no-c-format
msgid ""
"The GLAN Tank requires a kernel and ramdisk on an ext2 partition on the disk "
@@ -212,13 +226,13 @@ msgstr ""
"些映象可以从 &glantank-firmware-img; 获得。"
#. Tag: title
-#: install-methods.xml:136
+#: install-methods.xml:146
#, no-c-format
msgid "Kurobox Pro Installation Files"
msgstr "Kurobox Pro 安装文件"
#. Tag: para
-#: install-methods.xml:137
+#: install-methods.xml:147
#, no-c-format
msgid ""
"The Kurobox Pro requires a kernel and ramdisk on an ext2 partition on the "
@@ -229,13 +243,13 @@ msgstr ""
"这些映象可以从 &kuroboxpro-firmware-img; 获得。"
#. Tag: title
-#: install-methods.xml:147
+#: install-methods.xml:157
#, no-c-format
msgid "HP mv2120 Installation Files"
msgstr "HP mv2120 安装文件"
#. Tag: para
-#: install-methods.xml:148
+#: install-methods.xml:158
#, no-c-format
msgid ""
"A firmware image is provided for the HP mv2120 which will automatically boot "
@@ -250,13 +264,13 @@ msgstr ""
"映象。"
#. Tag: title
-#: install-methods.xml:160
+#: install-methods.xml:170
#, no-c-format
msgid "QNAP Turbo Station Installation Files"
msgstr "QNAP Turbo Station 安装文件"
#. Tag: para
-#: install-methods.xml:161
+#: install-methods.xml:171
#, no-c-format
msgid ""
"The installation files for the QNAP Turbo Station consist of a kernel and "
@@ -269,34 +283,57 @@ msgstr ""
"img; 取得。"
#. Tag: title
-#: install-methods.xml:172
+#: install-methods.xml:182
#, no-c-format
msgid "Plug Computer and OpenRD Installation Files"
msgstr "Plug Computer 和 OpenRD 安装文件"
#. Tag: para
-#: install-methods.xml:173
-#, no-c-format
+#: install-methods.xml:183
+#, fuzzy, no-c-format
#| msgid ""
#| "The installation files for plug computers (SheevaPlug, GuruPlug, etc) and "
#| "OpenRD devices consist of a kernel and initrd for U-Boot. You can obtain "
#| "these files from &kirkwood-marvell-firmware-img;."
msgid ""
-"The installation files for plug computers (SheevaPlug, GuruPlug, etc) and "
-"OpenRD devices consist of a kernel and initrd for U-Boot. You can obtain "
-"these files from &kirkwood-marvell-firmware-img;."
+"The installation files for plug computers (SheevaPlug, GuruPlug, DreamPlug "
+"etc) and OpenRD devices consist of a kernel and initrd for U-Boot. You can "
+"obtain these files from &kirkwood-marvell-firmware-img;."
msgstr ""
"plug computers (SheevaPlug、GuruPlug 等) 和 OpenRD 设备的安装文件包含对应 U-"
"Boot 的内核和 initrd。您可以从 &kirkwood-marvell-firmware-img; 取得这些文件。"
#. Tag: title
-#: install-methods.xml:223
+#: install-methods.xml:193
+#, fuzzy, no-c-format
+#| msgid "GLAN Tank Installation Files"
+msgid "LaCie NASes Installation Files"
+msgstr "GLAN Tank 安装文件"
+
+#. Tag: para
+#: install-methods.xml:194
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The installation files for plug computers (SheevaPlug, GuruPlug, etc) and "
+#| "OpenRD devices consist of a kernel and initrd for U-Boot. You can obtain "
+#| "these files from &kirkwood-marvell-firmware-img;."
+msgid ""
+"The installation files for LaCie NASes (Network Space v2, Network Space Max "
+"v2, Internet Space v2, d2 Network v2, 2Big Network v2 and 5Big Network v2) "
+"consist of a kernel and initrd for U-Boot. You can obtain these files from "
+"&lacie-kirkwood-firmware-img;."
+msgstr ""
+"plug computers (SheevaPlug、GuruPlug 等) 和 OpenRD 设备的安装文件包含对应 U-"
+"Boot 的内核和 initrd。您可以从 &kirkwood-marvell-firmware-img; 取得这些文件。"
+
+#. Tag: title
+#: install-methods.xml:245
#, no-c-format
msgid "Creating an IPL tape"
msgstr "创建一个 IPL 磁带"
#. Tag: para
-#: install-methods.xml:225
+#: install-methods.xml:247
#, no-c-format
msgid ""
"If you can't boot (IPL) from the CD-ROM and you are not using VM you need to "
@@ -317,13 +354,13 @@ msgstr ""
"linkend=\"where-files\"/>,"
#. Tag: title
-#: install-methods.xml:249
+#: install-methods.xml:271
#, no-c-format
msgid "Creating Floppies from Disk Images"
msgstr "从软盘映像创建引导软盘"
#. Tag: para
-#: install-methods.xml:250
+#: install-methods.xml:272
#, no-c-format
msgid ""
"Bootable floppy disks are generally used as a last resort to boot the "
@@ -333,7 +370,7 @@ msgstr ""
"最后一种方法。"
#. Tag: para
-#: install-methods.xml:255
+#: install-methods.xml:277
#, no-c-format
msgid ""
"Booting the installer from floppy disk reportedly fails on Mac USB floppy "
@@ -341,7 +378,7 @@ msgid ""
msgstr "有报告说 Mac 上的 USB 软盘驱动器安装程序软盘引导失败。"
#. Tag: para
-#: install-methods.xml:260
+#: install-methods.xml:282
#, no-c-format
msgid ""
"Disk images are files containing the complete contents of a floppy disk in "
@@ -359,7 +396,7 @@ msgstr ""
"按扇区复制</emphasis>到软盘中。"
#. Tag: para
-#: install-methods.xml:271
+#: install-methods.xml:293
#, no-c-format
msgid ""
"There are different techniques for creating floppies from disk images. This "
@@ -370,7 +407,7 @@ msgstr ""
"像创建引导软盘。"
#. Tag: para
-#: install-methods.xml:277
+#: install-methods.xml:299
#, no-c-format
msgid ""
"Before you can create the floppies, you will first need to download them "
@@ -384,7 +421,7 @@ msgstr ""
"DVD,软盘映像可能已经包含在 CD/DVD 上面。</phrase>"
#. Tag: para
-#: install-methods.xml:285
+#: install-methods.xml:307
#, no-c-format
msgid ""
"No matter which method you use to create your floppies, you should remember "
@@ -395,13 +432,13 @@ msgstr ""
"保内容不会在无意被抹掉。"
#. Tag: title
-#: install-methods.xml:293
+#: install-methods.xml:315
#, no-c-format
msgid "Writing Disk Images From a Linux or Unix System"
msgstr "从 Linux 或者 Unix 系统写软盘映像"
#. Tag: para
-#: install-methods.xml:294
+#: install-methods.xml:316
#, no-c-format
msgid ""
"To write the floppy disk image files to the floppy disks, you will probably "
@@ -433,7 +470,7 @@ msgstr ""
"(Solaris 系统中使用 <command>eject</command> 命令,请参见其手册)</phrase>。"
#. Tag: para
-#: install-methods.xml:315
+#: install-methods.xml:337
#, no-c-format
msgid ""
"Some systems attempt to automatically mount a floppy disk when you place it "
@@ -463,7 +500,7 @@ msgstr ""
"统,请咨询您的系统管理员)。</phrase>"
#. Tag: para
-#: install-methods.xml:336
+#: install-methods.xml:358
#, no-c-format
msgid ""
"If writing a floppy on powerpc Linux, you will need to eject it. The "
@@ -474,13 +511,13 @@ msgstr ""
"command> 命令能够很好地对此进行控制,当然您可能需要先安装它。"
#. Tag: title
-#: install-methods.xml:354
+#: install-methods.xml:376
#, no-c-format
msgid "Writing Disk Images From DOS, Windows, or OS/2"
msgstr "在 DOS、Windows 或者 OS/2 下写磁盘映像"
#. Tag: para
-#: install-methods.xml:356
+#: install-methods.xml:378
#, no-c-format
msgid ""
"If you have access to an i386 or amd64 machine, you can use one of the "
@@ -489,7 +526,7 @@ msgstr ""
"如果您能操作一台 i386 或 amd64 机器,可以使用如下方法之一往软盘复制映像文件。"
#. Tag: para
-#: install-methods.xml:361
+#: install-methods.xml:383
#, no-c-format
msgid ""
"The <command>rawrite1</command> and <command>rawrite2</command> programs can "
@@ -503,7 +540,7 @@ msgstr ""
"或者在文件浏览器中双击使用这些程序是<emphasis>不能</emphasis>运行的。"
#. Tag: para
-#: install-methods.xml:369
+#: install-methods.xml:391
#, no-c-format
msgid ""
"The <command>rwwrtwin</command> program runs on Windows 95, NT, 98, 2000, "
@@ -514,7 +551,7 @@ msgstr ""
"可能最新的版本上运行。要使用它您需要解压 diskio.dll 至相同目录下。"
#. Tag: para
-#: install-methods.xml:375
+#: install-methods.xml:397
#, no-c-format
msgid ""
"These tools can be found on the Official &debian; CD-ROMs under the "
@@ -524,13 +561,13 @@ msgstr ""
"下。"
#. Tag: title
-#: install-methods.xml:388
+#: install-methods.xml:410
#, no-c-format
msgid "Writing Disk Images From MacOS"
msgstr "在 MacOS 上写磁盘映像"
#. Tag: para
-#: install-methods.xml:389
+#: install-methods.xml:411
#, no-c-format
msgid ""
"An AppleScript, <application>Make &debian; Floppy</application>, is "
@@ -550,7 +587,7 @@ msgstr ""
"您确认的确想要清空磁盘并写入磁盘映像。"
#. Tag: para
-#: install-methods.xml:400
+#: install-methods.xml:422
#, no-c-format
msgid ""
"You can also use the MacOS utility <command>Disk Copy</command> directly, or "
@@ -563,13 +600,13 @@ msgstr ""
"您可以使用以下方法之一来利用这些工具将磁盘映像写入软盘。"
#. Tag: title
-#: install-methods.xml:411
+#: install-methods.xml:433
#, no-c-format
msgid "Writing Disk Images with <command>Disk Copy</command>"
msgstr "写磁盘映像:使用<command>Disk Copy</command>"
#. Tag: para
-#: install-methods.xml:412
+#: install-methods.xml:434
#, no-c-format
msgid ""
"If you are creating the floppy image from files which were originally on the "
@@ -582,7 +619,7 @@ msgstr ""
"下载映像文件的情况。"
#. Tag: para
-#: install-methods.xml:421
+#: install-methods.xml:443
#, no-c-format
msgid ""
"Obtain <ulink url=\"&url-powerpc-creator-changer;\">Creator-Changer</ulink> "
@@ -592,7 +629,7 @@ msgstr ""
"且用它打开 <filename>root.bin</filename> 文件。"
#. Tag: para
-#: install-methods.xml:428
+#: install-methods.xml:450
#, no-c-format
msgid ""
"Change the Creator to <userinput>ddsk</userinput> (Disk Copy), and the Type "
@@ -603,7 +640,7 @@ msgstr ""
"<userinput>DDim</userinput> (binary floppy image)。注意此处大小写敏感。"
#. Tag: para
-#: install-methods.xml:435
+#: install-methods.xml:457
#, no-c-format
msgid ""
"<emphasis>Important:</emphasis> In the Finder, use <userinput>Get Info</"
@@ -618,7 +655,7 @@ msgstr ""
"会删除引导区。"
#. Tag: para
-#: install-methods.xml:444
+#: install-methods.xml:466
#, no-c-format
msgid ""
"Obtain <command>Disk Copy</command>; if you have a MacOS system or CD it "
@@ -630,7 +667,7 @@ msgstr ""
"ulink>。"
#. Tag: para
-#: install-methods.xml:451
+#: install-methods.xml:473
#, no-c-format
msgid ""
"Run <command>Disk Copy</command>, and select <menuchoice> "
@@ -645,13 +682,13 @@ msgstr ""
"删除它。完成后它应该会弹出软盘。"
#. Tag: title
-#: install-methods.xml:466
+#: install-methods.xml:488
#, no-c-format
msgid "Writing Disk Images with <command>suntar</command>"
msgstr "写磁盘映像:使用<command>suntar</command>"
#. Tag: para
-#: install-methods.xml:470
+#: install-methods.xml:492
#, no-c-format
msgid ""
"Obtain <command>suntar</command> from <ulink url=\"&url-powerpc-suntar;\"> </"
@@ -664,21 +701,21 @@ msgstr ""
"userinput> 菜单中选择<quote>Overwrite Sectors...</quote>。"
#. Tag: para
-#: install-methods.xml:478
+#: install-methods.xml:500
#, 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:484
+#: install-methods.xml:506
#, 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:489
+#: install-methods.xml:511
#, no-c-format
msgid ""
"After the floppy has been created successfully, select <menuchoice> "
@@ -691,7 +728,7 @@ msgstr ""
"换别的软盘试试。"
#. Tag: para
-#: install-methods.xml:497
+#: install-methods.xml:519
#, no-c-format
msgid ""
"Before using the floppy you created, <emphasis>set the write protect tab</"
@@ -702,13 +739,13 @@ msgstr ""
"然在 MacOS 中挂载了它,MacOS 将会将其毁坏。"
#. Tag: title
-#: install-methods.xml:516
+#: install-methods.xml:538
#, no-c-format
msgid "Preparing Files for USB Memory Stick Booting"
msgstr "为从 U 盘引导准备文件"
#. Tag: para
-#: install-methods.xml:518
+#: install-methods.xml:540
#, no-c-format
msgid ""
"To prepare the USB stick, you will need a system where GNU/Linux is already "
@@ -729,7 +766,7 @@ msgstr ""
"护开关。"
#. Tag: para
-#: install-methods.xml:531
+#: install-methods.xml:553
#, no-c-format
msgid ""
"The procedures described in this section will destroy anything already on "
@@ -741,13 +778,13 @@ msgstr ""
"搞错,比如写成硬盘,将造成该设备上的所有信息丢失。"
#. Tag: title
-#: install-methods.xml:541
+#: install-methods.xml:563
#, no-c-format
msgid "Preparing a USB stick using a hybrid CD or DVD image"
msgstr "使用混合 CD 或 DVD 映像制作 U 盘"
#. Tag: para
-#: install-methods.xml:542
+#: install-methods.xml:564
#, no-c-format
msgid ""
"Debian CD and DVD images can now be written directly a USB stick, which is a "
@@ -760,7 +797,7 @@ msgstr ""
"cdrom\"/> 获取 CD 或 DVD 映像。"
#. Tag: para
-#: install-methods.xml:549
+#: install-methods.xml:571
#, no-c-format
msgid ""
"Alternatively, for very small USB sticks, only a few megabytes in size, you "
@@ -773,7 +810,7 @@ msgstr ""
">)。"
#. Tag: para
-#: install-methods.xml:557
+#: install-methods.xml:579
#, no-c-format
msgid ""
"A special method can be used to add firmware to the <filename>mini.iso</"
@@ -789,7 +826,7 @@ msgstr ""
"在 U 盘上。您应该挂载第二个分区,并将固件解压到里面。"
#. Tag: screen
-#: install-methods.xml:567
+#: install-methods.xml:589
#, no-c-format
msgid ""
"# mount /dev/<replaceable>sdX2</replaceable> /mnt\n"
@@ -805,7 +842,7 @@ msgstr ""
"# umount"
#. Tag: para
-#: install-methods.xml:573
+#: install-methods.xml:595
#, no-c-format
msgid ""
"The CD or DVD image you choose should be written directly to the USB stick, "
@@ -818,7 +855,7 @@ msgstr ""
"U 盘已经卸载:"
#. Tag: screen
-#: install-methods.xml:580
+#: install-methods.xml:602
#, no-c-format
msgid ""
"<prompt>#</prompt> <userinput>cp <replaceable>debian.iso</replaceable> /dev/"
@@ -830,7 +867,7 @@ msgstr ""
"<prompt>#</prompt> <userinput>sync</userinput>"
#. Tag: para
-#: install-methods.xml:582
+#: install-methods.xml:604
#, no-c-format
msgid ""
"Simply writing the CD or DVD image to USB like this should work fine for "
@@ -841,13 +878,13 @@ msgstr ""
"项主要提供给有特殊需要的用户。"
#. Tag: title
-#: install-methods.xml:593
+#: install-methods.xml:615
#, no-c-format
msgid "Manually copying files to the USB stick"
msgstr "手动复制文件到 U 盘。"
#. Tag: para
-#: install-methods.xml:594
+#: install-methods.xml:616
#, no-c-format
msgid ""
"An alternative way to set up your USB stick is to manually copy the "
@@ -859,7 +896,7 @@ msgstr ""
"可以使用较少容量,请参考 <xref linkend=\"usb-copy-flexible\"/>)。"
#. Tag: para
-#: install-methods.xml:601
+#: install-methods.xml:623
#, no-c-format
msgid ""
"There is an all-in-one file <filename>hd-media/boot.img.gz</filename> which "
@@ -874,7 +911,7 @@ msgstr ""
"classname> 和对应的配置文件</phrase>。"
#. Tag: para
-#: install-methods.xml:610
+#: install-methods.xml:632
#, no-c-format
msgid ""
"Note that, although convenient, this method does have one major "
@@ -888,19 +925,19 @@ msgstr ""
"量创建一个新的文件系统。"
#. Tag: para
-#: install-methods.xml:618
+#: install-methods.xml:640
#, no-c-format
msgid "To use this image simply extract it directly to your USB stick:"
msgstr "使用该映象只须将它直接解压到 U 盘:"
#. Tag: screen
-#: install-methods.xml:622
+#: install-methods.xml:644
#, 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:624
+#: install-methods.xml:646
#, no-c-format
msgid ""
"Create a partition of type \"Apple_Bootstrap\" on your USB stick using "
@@ -911,23 +948,32 @@ msgstr ""
"的 <userinput>C</userinput> 命令,并直接解压映象:"
#. Tag: screen
-#: install-methods.xml:630
+#: install-methods.xml:652
#, 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:632
-#, no-c-format
+#: install-methods.xml:654
+#, fuzzy, no-c-format
+#| msgid ""
+#| "After that, mount the USB memory stick <phrase arch=\"x86\">"
+#| "(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
+#| "phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/"
+#| "<replaceable>sdX2</replaceable> /mnt</userinput>),</phrase> which will "
+#| "now have <phrase arch=\"x86\">a FAT filesystem</phrase> <phrase arch="
+#| "\"powerpc\">an HFS filesystem</phrase> on it, and copy a &debian; ISO "
+#| "image (netinst, businesscard, or full CD) to it. Unmount the stick "
+#| "(<userinput>umount /mnt</userinput>) and you are done."
msgid ""
"After that, mount the USB memory stick <phrase arch=\"x86\">"
"(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
"phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/<replaceable>sdX2</"
"replaceable> /mnt</userinput>),</phrase> which will now have <phrase arch="
"\"x86\">a FAT filesystem</phrase> <phrase arch=\"powerpc\">an HFS "
-"filesystem</phrase> on it, and copy a &debian; ISO image (netinst, "
-"businesscard, or full CD) to it. Unmount the stick (<userinput>umount /mnt</"
-"userinput>) and you are done."
+"filesystem</phrase> on it, and copy a &debian; ISO image (netinst or full "
+"CD) to it. Unmount the stick (<userinput>umount /mnt</userinput>) and you "
+"are done."
msgstr ""
"然后,挂载 U 盘 <phrase arch=\"x86\">(<userinput>mount /dev/"
"<replaceable>sdX</replaceable> /mnt</userinput>),</phrase> <phrase arch="
@@ -938,13 +984,13 @@ msgstr ""
"(<userinput>umount /mnt</userinput>) 就完成了。"
#. Tag: title
-#: install-methods.xml:649
+#: install-methods.xml:671
#, no-c-format
msgid "Manually copying files to the USB stick &mdash; the flexible way"
msgstr "手动复制文件到 U 盘 &mdash; 灵活的方法"
#. Tag: para
-#: install-methods.xml:650
+#: install-methods.xml:672
#, no-c-format
msgid ""
"If you like more flexibility or just want to know what's going on, you "
@@ -957,13 +1003,13 @@ msgstr ""
"文件放到 U 盘。"
#. Tag: title
-#: install-methods.xml:665 install-methods.xml:787
+#: install-methods.xml:687 install-methods.xml:809
#, no-c-format
msgid "Partitioning the USB stick"
msgstr "给 U 盘分区"
#. Tag: para
-#: install-methods.xml:666
+#: install-methods.xml:688
#, no-c-format
msgid ""
"We will show how to set up the memory stick to use the first partition, "
@@ -971,8 +1017,8 @@ msgid ""
msgstr "我们将展示如何使用 U 盘的第一个分区,而不是整个设备。"
#. Tag: para
-#: install-methods.xml:671
-#, no-c-format
+#: install-methods.xml:693
+#, fuzzy, no-c-format
#| msgid ""
#| "Since most USB sticks come pre-configured with a single FAT16 partition, "
#| "you probably won't have to repartition or reformat the stick. If you have "
@@ -1001,14 +1047,17 @@ msgid ""
"for your USB stick. The <command>mkdosfs</command> command is contained in "
"the <classname>dosfstools</classname> &debian; package."
msgstr ""
-"由于大多数 U 盘预先设置了一个单独的 FAT16 分区,您可能不需要重新分区或者格式化 U 盘。如果必须格式化,请使用 <command>cfdisk</command> 或者其他的分区工具来创建一个 FAT16 分区<footnote> <para> 别忘了设置 <quote>bootable</quote> 引导标记。</para> </footnote>,安装 MBR 使用: <informalexample><screen>\n"
-"# install-mbr /dev/<replaceable>sdX</replaceable>\n"
-"</screen></informalexample> 其中 <command>install-mbr</command> 命令属于 <classname>mbr</classname> &debian; 软件包。然后建立文件系统: <informalexample><screen>\n"
+"由于大多数 U 盘预先设置了一个单独的 FAT16 分区,您可能不需要重新分区或者格式"
+"化 U 盘。如果必须要做,请使用 <command>cfdisk</command> 或者其他的分区工具来"
+"创建一个 FAT16 分区<footnote> <para> 别忘记设置 <quote>bootable</quote> 引导"
+"标记。</para> </footnote>,然后建立文件系统:<informalexample><screen>\n"
"# mkdosfs /dev/<replaceable>sdX1</replaceable>\n"
-"</screen></informalexample> 注意,请使用 U 盘正确的设备名称。<command>mkdosfs</command> 命令属于 <classname>dosfstools</classname> &debian; 软件包。"
+"</screen></informalexample> 注意,请使用 U 盘正确的设备名称。"
+"<command>mkdosfs</command> 命令包含在 &debian; 的 <classname>dosfstools</"
+"classname> 软件包中。"
#. Tag: para
-#: install-methods.xml:695
+#: install-methods.xml:717
#, no-c-format
msgid ""
"In order to start the kernel after booting from the USB stick, we will put a "
@@ -1025,7 +1074,7 @@ msgstr ""
"用来改变 boot loader 的配置文件。"
#. Tag: para
-#: install-methods.xml:705
+#: install-methods.xml:727
#, no-c-format
msgid ""
"To put <classname>syslinux</classname> on the FAT16 partition on your USB "
@@ -1048,13 +1097,13 @@ msgstr ""
"filename> 文件。"
#. Tag: title
-#: install-methods.xml:722 install-methods.xml:834
+#: install-methods.xml:744 install-methods.xml:856
#, no-c-format
msgid "Adding the installer image"
msgstr "添加安装程序映像"
#. Tag: para
-#: install-methods.xml:723
+#: install-methods.xml:745
#, no-c-format
msgid ""
"Mount the partition (<userinput>mount /dev/<replaceable>sdX1</replaceable> /"
@@ -1078,8 +1127,8 @@ msgstr ""
"(8.3) 文件名。"
#. Tag: para
-#: install-methods.xml:747
-#, no-c-format
+#: install-methods.xml:769
+#, fuzzy, no-c-format
#| msgid ""
#| "Next you should create a <filename>syslinux.cfg</filename> configuration "
#| "file, which at a bare minimum should contain the following two lines "
@@ -1102,30 +1151,41 @@ msgid ""
"<userinput>vga=788</userinput> to the second line. Other parameters can be "
"appended as desired."
msgstr ""
-"接下来,您需要创建一个 <filename>syslinux.cfg</filename> 配置文件,里面最少要包含下面两行(如果您使用 <filename>netboot</filename> 映象,修改内核文件名为 <quote><filename>linux</filename></quote> ):<informalexample><screen>\n"
+"接下来,您需要创建一个 <filename>syslinux.cfg</filename> 配置文件,里面最少要"
+"包含下面两行(如果您使用 <filename>netboot</filename> 映象,修改内核文件名为 "
+"<quote><filename>linux</filename></quote> ):<informalexample><screen>\n"
"default vmlinuz\n"
"append initrd=initrd.gz\n"
-"</screen></informalexample> 对于图形安装程序,您需要添加 <userinput>vga=788</userinput> 到第二行尾部。还可以添加其他参数到行尾。"
+"</screen></informalexample> 对于图形安装程序,您需要添加 <userinput>vga=788</"
+"userinput> 到第二行尾部。"
#. Tag: para
-#: install-methods.xml:759
+#: install-methods.xml:781
#, no-c-format
msgid ""
"To enable the boot prompt to permit further parameter appending, add a "
"<userinput>prompt 1</userinput> line."
-msgstr "在启动提示符后允许添加参数,需要加上 <userinput>prompt 1</userinput>。"
+msgstr ""
#. Tag: para
-#: install-methods.xml:764 install-methods.xml:874
-#, no-c-format
+#: install-methods.xml:786 install-methods.xml:896
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you used an <filename>hd-media</filename> image, you should now copy "
+#| "the ISO file of a &debian; ISO image<footnote> <para> You can use either "
+#| "a businesscard, a netinst or a full CD image (see <xref linkend="
+#| "\"official-cdrom\"/>). Be sure to select one that fits. Note that the "
+#| "<quote>netboot <filename>mini.iso</filename></quote> image is not usable "
+#| "for this purpose. </para> </footnote> onto the stick. When you are done, "
+#| "unmount the USB memory stick (<userinput>umount /mnt</userinput>)."
msgid ""
"If you used an <filename>hd-media</filename> image, you should now copy the "
"ISO file of a &debian; ISO image<footnote> <para> You can use either a "
-"businesscard, a netinst or a full CD image (see <xref linkend=\"official-"
-"cdrom\"/>). Be sure to select one that fits. Note that the <quote>netboot "
-"<filename>mini.iso</filename></quote> image is not usable for this purpose. "
-"</para> </footnote> onto the stick. When you are done, unmount the USB "
-"memory stick (<userinput>umount /mnt</userinput>)."
+"netinst or a full CD image (see <xref linkend=\"official-cdrom\"/>). Be sure "
+"to select one that fits. Note that the <quote>netboot <filename>mini.iso</"
+"filename></quote> image is not usable for this purpose. </para> </footnote> "
+"onto the stick. When you are done, unmount the USB memory stick "
+"(<userinput>umount /mnt</userinput>)."
msgstr ""
"如果您使用 <filename>hd-media</filename> 映象,现在应该复制 &debian; ISO 映像"
"文件<footnote> <para> 您可以选择 businesscard、netinst 或完整 CD 映像 (参阅 "
@@ -1134,7 +1194,7 @@ msgstr ""
"footnote> 到 U 盘。完成后,卸载 U 盘 (<userinput>umount /mnt</userinput>)。"
#. Tag: para
-#: install-methods.xml:788
+#: install-methods.xml:810
#, no-c-format
msgid ""
"Most USB sticks do not come pre-configured in such a way that Open Firmware "
@@ -1161,7 +1221,7 @@ msgstr ""
"command> 命令包含在 &debian; 的 <classname>hfsutils</classname> 软件包中。"
#. Tag: para
-#: install-methods.xml:805
+#: install-methods.xml:827
#, no-c-format
msgid ""
"In order to start the kernel after booting from the USB stick, we will put a "
@@ -1176,7 +1236,7 @@ msgstr ""
"变启动引导器的配置文件。"
#. Tag: para
-#: install-methods.xml:814
+#: install-methods.xml:836
#, no-c-format
msgid ""
"The normal <command>ybin</command> tool that comes with <command>yaboot</"
@@ -1210,7 +1270,7 @@ msgstr ""
"就可以用普通的 Unix 工具来处理了。"
#. Tag: para
-#: install-methods.xml:835
+#: install-methods.xml:857
#, no-c-format
msgid ""
"Mount the partition (<userinput>mount /dev/<replaceable>sdX2</replaceable> /"
@@ -1220,31 +1280,31 @@ msgstr ""
"mnt</userinput>),然后复制下面的安装程序映象文件到 U 盘:"
#. Tag: para
-#: install-methods.xml:842
+#: install-methods.xml:864
#, no-c-format
msgid "<filename>vmlinux</filename> (kernel binary)"
msgstr "<filename>vmlinux</filename> (内核二进制文件)"
#. Tag: para
-#: install-methods.xml:847
+#: install-methods.xml:869
#, no-c-format
msgid "<filename>initrd.gz</filename> (initial ramdisk image)"
msgstr "<filename>initrd.gz</filename> (初始化内存映像)"
#. Tag: para
-#: install-methods.xml:852
+#: install-methods.xml:874
#, no-c-format
msgid "<filename>yaboot.conf</filename> (yaboot configuration file)"
msgstr "<filename>yaboot.conf</filename> (yaboot 配置文件)"
#. Tag: para
-#: install-methods.xml:857
+#: install-methods.xml:879
#, no-c-format
msgid "<filename>boot.msg</filename> (optional boot message)"
msgstr "<filename>boot.msg</filename> (可选的启动信息)"
#. Tag: para
-#: install-methods.xml:864
+#: install-methods.xml:886
#, no-c-format
msgid ""
"The <filename>yaboot.conf</filename> configuration file should contain the "
@@ -1280,13 +1340,13 @@ msgstr ""
"的大小。"
#. Tag: title
-#: install-methods.xml:902
+#: install-methods.xml:924
#, no-c-format
msgid "Preparing Files for Hard Disk Booting"
msgstr "为从硬盘引导准备文件"
#. Tag: para
-#: install-methods.xml:903
+#: install-methods.xml:925
#, no-c-format
msgid ""
"The installer may be booted using boot files placed on an existing hard "
@@ -1297,7 +1357,7 @@ msgstr ""
"者直接使用 BIOS 提供的引导装载程序直接启动。"
#. Tag: para
-#: install-methods.xml:909
+#: install-methods.xml:931
#, no-c-format
msgid ""
"A full, <quote>pure network</quote> installation can be achieved using this "
@@ -1310,7 +1370,7 @@ msgstr ""
"缠不清。"
#. Tag: para
-#: install-methods.xml:916
+#: install-methods.xml:938
#, no-c-format
msgid ""
"The installer cannot boot from files on an HFS+ file system. MacOS System "
@@ -1330,7 +1390,7 @@ msgstr ""
"Linux 之间交换文件,特别是那些您下载的安装文件。"
#. Tag: para
-#: install-methods.xml:927
+#: install-methods.xml:949
#, no-c-format
msgid ""
"Different programs are used for hard disk installation system booting, "
@@ -1341,7 +1401,7 @@ msgstr ""
"装程序的引导将使用不同的安装文件。"
#. Tag: title
-#: install-methods.xml:936
+#: install-methods.xml:958
#, no-c-format
msgid ""
"Hard disk installer booting using <command>LILO</command> or <command>GRUB</"
@@ -1350,7 +1410,7 @@ msgstr ""
"硬盘安装程序引导使用 <command>LILO</command> 或 <command>GRUB</command>"
#. Tag: para
-#: install-methods.xml:938
+#: install-methods.xml:960
#, no-c-format
msgid ""
"This section explains how to add to or even replace an existing linux "
@@ -1360,7 +1420,7 @@ msgstr ""
"command> 或 <command>GRUB</command>。"
#. Tag: para
-#: install-methods.xml:944
+#: install-methods.xml:966
#, no-c-format
msgid ""
"At boot time, both bootloaders support loading in memory not only the "
@@ -1371,7 +1431,7 @@ msgstr ""
"盘可以被用做内核的根文件系统。"
#. Tag: para
-#: install-methods.xml:950
+#: install-methods.xml:972
#, no-c-format
msgid ""
"Copy the following files from the &debian; archives to a convenient location "
@@ -1382,19 +1442,19 @@ msgstr ""
"newinstall/</filename>。"
#. Tag: para
-#: install-methods.xml:958
+#: install-methods.xml:980
#, no-c-format
msgid "<filename>vmlinuz</filename> (kernel binary)"
msgstr "<filename>vmlinuz</filename>(内核二进制文件)"
#. Tag: para
-#: install-methods.xml:963
+#: install-methods.xml:985
#, no-c-format
msgid "<filename>initrd.gz</filename> (ramdisk image)"
msgstr "<filename>initrd.gz</filename> (内存虚拟磁盘映像)"
#. Tag: para
-#: install-methods.xml:970
+#: install-methods.xml:992
#, no-c-format
msgid ""
"Finally, to configure the bootloader proceed to <xref linkend=\"boot-initrd"
@@ -1402,13 +1462,13 @@ msgid ""
msgstr "最后,要配置 bootloader,请进入 <xref linkend=\"boot-initrd\"/>。"
#. Tag: title
-#: install-methods.xml:980
+#: install-methods.xml:1002
#, no-c-format
msgid "Hard disk installer booting using <command>loadlin</command>"
msgstr "硬盘安装程序引导使用 <command>loadlin</command>"
#. Tag: para
-#: install-methods.xml:981
+#: install-methods.xml:1003
#, no-c-format
msgid ""
"This section explains how to prepare your hard drive for booting the "
@@ -1417,7 +1477,7 @@ msgstr ""
"本节将说明如何用 <command>loadlin</command> 从 DOS 启动安装程序准备您的硬盘。"
#. Tag: para
-#: install-methods.xml:986
+#: install-methods.xml:1008
#, no-c-format
msgid ""
"Copy the following directories from a &debian; CD image to <filename>c:\\</"
@@ -1425,26 +1485,26 @@ msgid ""
msgstr "从 &debian; CD 映象复制下列目录到 <filename>c:\\</filename>。"
#. Tag: para
-#: install-methods.xml:991
+#: install-methods.xml:1013
#, 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:996
+#: install-methods.xml:1018
#, no-c-format
msgid "<filename>/tools</filename> (loadlin tool)"
msgstr "<filename>/tools</filename> (loadlin 工具)"
#. Tag: title
-#: install-methods.xml:1009
+#: install-methods.xml:1031
#, no-c-format
msgid "Hard Disk Installer Booting for OldWorld Macs"
msgstr "在 OldWorld Macs 上引导硬盘安装程序"
#. Tag: para
-#: install-methods.xml:1010
+#: install-methods.xml:1032
#, no-c-format
msgid ""
"The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
@@ -1466,7 +1526,7 @@ msgstr ""
"是必须的。"
#. Tag: para
-#: install-methods.xml:1023
+#: install-methods.xml:1045
#, no-c-format
msgid ""
"Download and unstuff the <application>BootX</application> distribution, "
@@ -1493,13 +1553,13 @@ msgstr ""
"的系统文件夹中。"
#. Tag: title
-#: install-methods.xml:1043
+#: install-methods.xml:1065
#, no-c-format
msgid "Hard Disk Installer Booting for NewWorld Macs"
msgstr "在 NewWorld Macs 上启动硬盘安装程序"
#. Tag: para
-#: install-methods.xml:1044
+#: install-methods.xml:1066
#, no-c-format
msgid ""
"NewWorld PowerMacs support booting from a network or an ISO9660 CD-ROM, as "
@@ -1517,7 +1577,7 @@ msgstr ""
"不能用在 NewWorld PowerMacs 上。"
#. Tag: para
-#: install-methods.xml:1055
+#: install-methods.xml:1077
#, no-c-format
msgid ""
"<emphasis>Copy</emphasis> (not move) the following four files which you "
@@ -1530,31 +1590,31 @@ msgstr ""
"硬盘图标的方法来完成)。"
#. Tag: filename
-#: install-methods.xml:1065 install-methods.xml:1391
+#: install-methods.xml:1087 install-methods.xml:1413
#, no-c-format
msgid "vmlinux"
msgstr "vmlinux"
#. Tag: filename
-#: install-methods.xml:1070 install-methods.xml:1396
+#: install-methods.xml:1092 install-methods.xml:1418
#, no-c-format
msgid "initrd.gz"
msgstr "initrd.gz"
#. Tag: filename
-#: install-methods.xml:1075 install-methods.xml:1401
+#: install-methods.xml:1097 install-methods.xml:1423
#, no-c-format
msgid "yaboot"
msgstr "yaboot"
#. Tag: filename
-#: install-methods.xml:1080 install-methods.xml:1406
+#: install-methods.xml:1102 install-methods.xml:1428
#, no-c-format
msgid "yaboot.conf"
msgstr "yaboot.conf"
#. Tag: para
-#: install-methods.xml:1085
+#: install-methods.xml:1107
#, no-c-format
msgid ""
"Make a note of the partition number of the MacOS partition where you place "
@@ -1568,19 +1628,19 @@ msgstr ""
"的时候,您需要这个分区号码在 Open Firmware 提示符下面输入命令。"
#. Tag: para
-#: install-methods.xml:1093
+#: install-methods.xml:1115
#, no-c-format
msgid "To boot the installer, proceed to <xref linkend=\"boot-newworld\"/>."
msgstr "要引导安装程序,请进入 <xref linkend=\"boot-newworld\"/>。"
#. Tag: title
-#: install-methods.xml:1106
+#: install-methods.xml:1128
#, no-c-format
msgid "Preparing Files for TFTP Net Booting"
msgstr "为使用 TFTP 网络引导准备文件"
#. Tag: para
-#: install-methods.xml:1107
+#: install-methods.xml:1129
#, no-c-format
msgid ""
"If your machine is connected to a local area network, you may be able to "
@@ -1594,7 +1654,7 @@ msgstr ""
"上面的某个特殊地方,并且配置好能够能够支持对您的机器进行引导。"
#. Tag: para
-#: install-methods.xml:1115
+#: install-methods.xml:1137
#, no-c-format
msgid ""
"You need to set up a TFTP server, and for many machines a DHCP server<phrase "
@@ -1606,7 +1666,7 @@ msgstr ""
"condition=\"supports-bootp\">,或 BOOTP 服务器</phrase>。"
#. Tag: para
-#: install-methods.xml:1122
+#: install-methods.xml:1144
#, no-c-format
msgid ""
"<phrase condition=\"supports-rarp\">The Reverse Address Resolution Protocol "
@@ -1625,7 +1685,7 @@ msgstr ""
"些系统只能通过 DHCP 来配置。"
#. Tag: para
-#: install-methods.xml:1136
+#: install-methods.xml:1158
#, no-c-format
msgid ""
"For PowerPC, if you have a NewWorld Power Macintosh machine, it is a good "
@@ -1636,7 +1696,7 @@ msgstr ""
"替 BOOTP 比较好。有些最新的机器不能从 BOOTP 引导。"
#. Tag: para
-#: install-methods.xml:1142
+#: install-methods.xml:1164
#, no-c-format
msgid ""
"Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. There "
@@ -1646,7 +1706,7 @@ msgstr ""
"个 <classname>rbootd</classname> 软件包。"
#. Tag: para
-#: install-methods.xml:1147
+#: install-methods.xml:1169
#, no-c-format
msgid ""
"The Trivial File Transfer Protocol (TFTP) is used to serve the boot image to "
@@ -1660,7 +1720,7 @@ msgstr ""
"Linux 上面的一些操作例子。"
#. Tag: para
-#: install-methods.xml:1155
+#: install-methods.xml:1177
#, no-c-format
msgid ""
"For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. "
@@ -1673,13 +1733,13 @@ msgstr ""
"多问题。另一个好的选择是 <classname>atftpd</classname>。"
#. Tag: title
-#: install-methods.xml:1171
+#: install-methods.xml:1193
#, no-c-format
msgid "Setting up RARP server"
msgstr "设置 RARP 服务器"
#. Tag: para
-#: install-methods.xml:1172
+#: install-methods.xml:1194
#, no-c-format
msgid ""
"To set up RARP, you need to know the Ethernet address (a.k.a. the MAC "
@@ -1697,7 +1757,7 @@ msgstr ""
"addr show dev eth0</userinput> 命令。"
#. Tag: para
-#: install-methods.xml:1184
+#: install-methods.xml:1206
#, no-c-format
msgid ""
"On a RARP server system using a Linux 2.4 or 2.6 kernel, or Solaris/SunOS, "
@@ -1720,13 +1780,13 @@ msgstr ""
"<userinput>/usr/etc/rarpd -a</userinput> 命令。"
#. Tag: title
-#: install-methods.xml:1205
+#: install-methods.xml:1227
#, no-c-format
msgid "Setting up a DHCP server"
msgstr "设置 DHCP 服务器"
#. Tag: para
-#: install-methods.xml:1206
+#: install-methods.xml:1228
#, no-c-format
msgid ""
"One free software DHCP server is ISC <command>dhcpd</command>. For &debian-"
@@ -1739,7 +1799,7 @@ msgstr ""
"示例文件(参阅 <filename>/etc/dhcp3/dhcpd.conf</filename>):"
#. Tag: screen
-#: install-methods.xml:1213
+#: install-methods.xml:1235
#, no-c-format
msgid ""
"option domain-name \"example.com\";\n"
@@ -1783,7 +1843,7 @@ msgstr ""
"}"
#. Tag: para
-#: install-methods.xml:1215
+#: install-methods.xml:1237
#, no-c-format
msgid ""
"In this example, there is one server <replaceable>servername</replaceable> "
@@ -1799,7 +1859,7 @@ msgstr ""
"TFTP 获取的文件名。"
#. Tag: para
-#: install-methods.xml:1225
+#: install-methods.xml:1247
#, no-c-format
msgid ""
"After you have edited the <command>dhcpd</command> configuration file, "
@@ -1809,13 +1869,13 @@ msgstr ""
"<userinput>/etc/init.d/dhcp3-server restart</userinput>。"
#. Tag: title
-#: install-methods.xml:1233
+#: install-methods.xml:1255
#, no-c-format
msgid "Enabling PXE Booting in the DHCP configuration"
msgstr "在 DHCP 配置中打开 PXE 引导功能"
#. Tag: para
-#: install-methods.xml:1234
+#: install-methods.xml:1256
#, no-c-format
msgid ""
"Here is another example for a <filename>dhcp.conf</filename> using the Pre-"
@@ -1885,13 +1945,13 @@ msgstr ""
"的 <xref linkend=\"tftp-images\"/>)。"
#. Tag: title
-#: install-methods.xml:1254
+#: install-methods.xml:1276
#, no-c-format
msgid "Setting up a BOOTP server"
msgstr "架设 BOOTP 服务器"
#. Tag: para
-#: install-methods.xml:1255
+#: install-methods.xml:1277
#, no-c-format
msgid ""
"There are two BOOTP servers available for GNU/Linux. The first is CMU "
@@ -1906,7 +1966,7 @@ msgstr ""
"<classname>dhcp3-server</classname> 软件包。"
#. Tag: para
-#: install-methods.xml:1263
+#: install-methods.xml:1285
#, no-c-format
msgid ""
"To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
@@ -1968,7 +2028,7 @@ msgstr ""
"MAC 地址。</phrase>"
#. Tag: para
-#: install-methods.xml:1296
+#: install-methods.xml:1318
#, no-c-format
msgid ""
"By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
@@ -1990,13 +2050,13 @@ msgstr ""
"<command>dhcpd</command>。"
#. Tag: title
-#: install-methods.xml:1315
+#: install-methods.xml:1337
#, no-c-format
msgid "Enabling the TFTP Server"
msgstr "开启 TFTP 服务器"
#. Tag: para
-#: install-methods.xml:1316
+#: install-methods.xml:1338
#, no-c-format
msgid ""
"To get the TFTP server ready to go, you should first make sure that "
@@ -2005,7 +2065,7 @@ msgstr ""
"要准备好 TFTP 服务器,您首先需要确定 <command>tftpd</command> 已经启动。"
#. Tag: para
-#: install-methods.xml:1321
+#: install-methods.xml:1343
#, no-c-format
msgid ""
"In the case of <classname>tftpd-hpa</classname> there are two ways the "
@@ -2019,7 +2079,7 @@ msgstr ""
"以在安装软件包的时候选择,也可以用重新配置软件包方式修改。"
#. Tag: para
-#: install-methods.xml:1330
+#: install-methods.xml:1352
#, no-c-format
msgid ""
"Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
@@ -2036,7 +2096,7 @@ msgstr ""
"置文件示例。"
#. Tag: para
-#: install-methods.xml:1340
+#: install-methods.xml:1362
#, no-c-format
msgid ""
"All <command>in.tftpd</command> alternatives available in &debian; should "
@@ -2050,7 +2110,7 @@ msgstr ""
"问题,建议先检查这些日志信息,这对于分析错误是一个好的起始点。"
#. Tag: para
-#: install-methods.xml:1348
+#: install-methods.xml:1370
#, no-c-format
msgid ""
"If you intend to install &debian; on an SGI machine and your TFTP server is "
@@ -2078,13 +2138,13 @@ msgstr ""
"错误。"
#. Tag: title
-#: install-methods.xml:1370
+#: install-methods.xml:1392
#, no-c-format
msgid "Move TFTP Images Into Place"
msgstr "将 TFTP 映像放到适当的位置"
#. Tag: para
-#: install-methods.xml:1371
+#: install-methods.xml:1393
#, no-c-format
msgid ""
"Next, place the TFTP boot image you need, as found in <xref linkend=\"where-"
@@ -2099,7 +2159,7 @@ msgstr ""
"完全决定于 TFTP 客户程序,而且没有一个强制的标准。"
#. Tag: para
-#: install-methods.xml:1380
+#: install-methods.xml:1402
#, no-c-format
msgid ""
"On NewWorld Power Macintosh machines, you will need to set up the "
@@ -2114,13 +2174,13 @@ msgstr ""
"件:"
#. Tag: filename
-#: install-methods.xml:1411
+#: install-methods.xml:1433
#, no-c-format
msgid "boot.msg"
msgstr "boot.msg"
#. Tag: para
-#: install-methods.xml:1416
+#: install-methods.xml:1438
#, no-c-format
msgid ""
"For PXE booting, everything you should need is set up in the "
@@ -2135,7 +2195,7 @@ msgstr ""
"需的文件名传递给 <command>tftpd</command>。"
#. Tag: para
-#: install-methods.xml:1424
+#: install-methods.xml:1446
#, no-c-format
msgid ""
"For PXE booting, everything you should need is set up in the "
@@ -2150,13 +2210,13 @@ msgstr ""
"efi</filename> 以启动所需的文件名传递至<command>tftpd</command>。"
#. Tag: title
-#: install-methods.xml:1436
+#: install-methods.xml:1458
#, no-c-format
msgid "SPARC TFTP Booting"
msgstr "SPARC TFTP 引导"
#. Tag: para
-#: install-methods.xml:1437
+#: install-methods.xml:1459
#, no-c-format
msgid ""
"Some SPARC architectures add the subarchitecture names, such as "
@@ -2184,7 +2244,7 @@ msgstr ""
"并在必要时加上子体系名。"
#. Tag: para
-#: install-methods.xml:1453
+#: install-methods.xml:1475
#, no-c-format
msgid ""
"If you've done all this correctly, giving the command <userinput>boot net</"
@@ -2196,7 +2256,7 @@ msgstr ""
"映像。假如映像找不到,查看 tftp 服务器的日志所需要的映像文件名。"
#. Tag: para
-#: install-methods.xml:1460
+#: install-methods.xml:1482
#, no-c-format
msgid ""
"You can also force some sparc systems to look for a specific file name by "
@@ -2209,13 +2269,13 @@ msgstr ""
"仍然必须被请放置在 TFTP 服务器要查找的目录中。"
#. Tag: title
-#: install-methods.xml:1471
+#: install-methods.xml:1493
#, no-c-format
msgid "SGI TFTP Booting"
msgstr "SGI TFTP 引导"
#. Tag: para
-#: install-methods.xml:1472
+#: install-methods.xml:1494
#, no-c-format
msgid ""
"On SGI machines you can rely on the <command>bootpd</command> to supply the "
@@ -2229,13 +2289,13 @@ msgstr ""
"现在 <filename>/etc/dhcpd.conf</filename>。"
#. Tag: title
-#: install-methods.xml:1580
+#: install-methods.xml:1602
#, no-c-format
msgid "Automatic Installation"
msgstr "自动化安装"
#. Tag: para
-#: install-methods.xml:1581
+#: install-methods.xml:1603
#, no-c-format
msgid ""
"For installing on multiple computers it's possible to do fully automatic "
@@ -2250,13 +2310,13 @@ msgstr ""
"更多细节。"
#. Tag: title
-#: install-methods.xml:1593
+#: install-methods.xml:1615
#, no-c-format
msgid "Automatic Installation Using the &debian; Installer"
msgstr "使用 &debian; 安装程序进行自动安装"
#. Tag: para
-#: install-methods.xml:1594
+#: install-methods.xml:1616
#, no-c-format
msgid ""
"The &debian; Installer supports automating installs via preconfiguration "
@@ -2268,7 +2328,7 @@ msgstr ""
"介质上加载,并自动回答安装过程中的问题。"
#. Tag: para
-#: install-methods.xml:1601
+#: install-methods.xml:1623
#, no-c-format
msgid ""
"Full documentation on preseeding including a working example that you can "
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index f6dceed9a..2061c2126 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-16 09:12+0000\n"
+"POT-Creation-Date: 2012-10-24 19:53+0000\n"
"PO-Revision-Date: 2012-07-25 14:25+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -109,16 +109,24 @@ msgstr "CDROM"
#. Tag: para
#: installation-howto.xml:67
-#, no-c-format
-msgid ""
-"There are two different netinst CD images which can be used to install "
-"&releasename; with the &d-i;. These images are intended to boot from CD and "
-"install additional packages over a network, hence the name 'netinst'. The "
-"difference between the two images is that on the full netinst image the base "
-"packages are included, whereas you have to download these from the web if "
-"you are using the business card image. If you'd rather, you can get a full "
-"size CD image which will not need the network to install. You only need the "
-"first CD of the set."
+#, fuzzy, no-c-format
+#| msgid ""
+#| "There are two different netinst CD images which can be used to install "
+#| "&releasename; with the &d-i;. These images are intended to boot from CD "
+#| "and install additional packages over a network, hence the name 'netinst'. "
+#| "The difference between the two images is that on the full netinst image "
+#| "the base packages are included, whereas you have to download these from "
+#| "the web if you are using the business card image. If you'd rather, you "
+#| "can get a full size CD image which will not need the network to install. "
+#| "You only need the first CD of the set."
+msgid ""
+"The netinst CD image is a popular image which can be used to install "
+"&releasename; with the &d-i;. This image is intended to boot from CD and "
+"install additional packages over a network; hence the name 'netinst'. The "
+"image has the software components needed to run the installer and the base "
+"packages to provide a minimal &releasename; system. If you'd rather, you can "
+"get a full size CD image which will not need the network to install. You "
+"only need the first CD of the set."
msgstr ""
"现在有两种不同的 netinst CD 映像可以用来通过 &d-i; 安装 &releasename;。这些映"
"像文件是被用来刻成光盘的。然后让电脑从光盘启动,再由安装程序从网络上下载安装"
@@ -128,7 +136,7 @@ msgstr ""
"安装了。这只需要一套光盘中的第一张就行了。"
#. Tag: para
-#: installation-howto.xml:78
+#: installation-howto.xml:77
#, no-c-format
msgid ""
"Download whichever type you prefer and burn it to a CD. <phrase arch=\"any-"
@@ -145,13 +153,13 @@ msgstr ""
"CD 的方法。</phrase>"
#. Tag: title
-#: installation-howto.xml:92
+#: installation-howto.xml:91
#, no-c-format
msgid "Floppy"
msgstr "软盘"
#. Tag: para
-#: installation-howto.xml:93
+#: installation-howto.xml:92
#, no-c-format
msgid ""
"If you can't boot from CD, you can download floppy images to install "
@@ -163,7 +171,7 @@ msgstr ""
"filename>,也许还要一个或多个驱动盘。"
#. Tag: para
-#: installation-howto.xml:99
+#: installation-howto.xml:98
#, no-c-format
msgid ""
"The boot floppy is the one with <filename>boot.img</filename> on it. This "
@@ -175,7 +183,7 @@ msgstr ""
"img</filename> 的那张盘。"
#. Tag: para
-#: installation-howto.xml:105
+#: installation-howto.xml:104
#, no-c-format
msgid ""
"If you're planning to install over the network, you will usually need the "
@@ -188,7 +196,7 @@ msgstr ""
"盘,<filename>floppy/net-drivers-2.img</filename>。"
#. Tag: para
-#: installation-howto.xml:112
+#: installation-howto.xml:111
#, no-c-format
msgid ""
"If you have a CD, but cannot boot from it, then boot from floppies and use "
@@ -199,7 +207,7 @@ msgstr ""
"<filename>floppy/cd-drivers.img</filename> 来接着完成基于光盘的安装。"
#. Tag: para
-#: installation-howto.xml:118
+#: installation-howto.xml:117
#, no-c-format
msgid ""
"Floppy disks are one of the least reliable media around, so be prepared for "
@@ -216,13 +224,13 @@ msgstr ""
"张软盘,不妨给它们加上标签吧。"
#. Tag: title
-#: installation-howto.xml:131
+#: installation-howto.xml:130
#, no-c-format
msgid "USB memory stick"
msgstr "U 盘"
#. Tag: para
-#: installation-howto.xml:132
+#: installation-howto.xml:131
#, no-c-format
msgid ""
"It's also possible to install from removable USB storage devices. For "
@@ -233,7 +241,7 @@ msgstr ""
"涯海角的同时,它还可以成为方便趁手的 &debian; 安装介质。"
#. Tag: para
-#: installation-howto.xml:138
+#: installation-howto.xml:137
#, no-c-format
msgid ""
"The easiest way to prepare your USB memory stick is to download any Debian "
@@ -247,7 +255,7 @@ msgstr ""
"\"混合(isohybrid)\"映像,可以从 CD 或者 U 盘引导。"
#. Tag: para
-#: installation-howto.xml:146
+#: installation-howto.xml:145
#, no-c-format
msgid ""
"The easiest way to prepare your USB memory stick is to download <filename>hd-"
@@ -266,7 +274,7 @@ msgstr ""
"复制该文件到 U 盘,只要文件后缀是 <literal>.iso</literal>,用什么名字都可以。"
#. Tag: para
-#: installation-howto.xml:157
+#: installation-howto.xml:156
#, no-c-format
msgid ""
"There are other, more flexible ways to set up a memory stick to use the "
@@ -278,7 +286,7 @@ msgstr ""
"files\"/>。"
#. Tag: para
-#: installation-howto.xml:163
+#: installation-howto.xml:162
#, no-c-format
msgid ""
"Some BIOSes can boot USB storage directly, and some cannot. You may need to "
@@ -292,7 +300,7 @@ msgstr ""
"提示和具体的细节说明。"
#. Tag: para
-#: installation-howto.xml:170
+#: installation-howto.xml:169
#, no-c-format
msgid ""
"Booting Macintosh systems from USB storage devices involves manual use of "
@@ -302,13 +310,13 @@ msgstr ""
"<xref linkend=\"usb-boot\"/>。"
#. Tag: title
-#: installation-howto.xml:179
+#: installation-howto.xml:178
#, no-c-format
msgid "Booting from network"
msgstr "从网络启动"
#. Tag: para
-#: installation-howto.xml:180
+#: installation-howto.xml:179
#, no-c-format
msgid ""
"It's also possible to boot &d-i; completely from the net. The various "
@@ -320,7 +328,7 @@ msgstr ""
"filename> 目录里的文件是用来从网络启动 &d-i; 的。"
#. Tag: para
-#: installation-howto.xml:186
+#: installation-howto.xml:185
#, no-c-format
msgid ""
"The easiest thing to set up is probably PXE netbooting. Untar the file "
@@ -337,13 +345,13 @@ msgstr ""
"作步骤,请参阅 <xref linkend=\"install-tftp\"/>。"
#. Tag: title
-#: installation-howto.xml:200
+#: installation-howto.xml:199
#, no-c-format
msgid "Booting from hard disk"
msgstr "从硬盘启动"
#. Tag: para
-#: installation-howto.xml:201
+#: installation-howto.xml:200
#, no-c-format
msgid ""
"It's possible to boot the installer using no removable media, but just an "
@@ -363,13 +371,13 @@ msgstr ""
"\"/> 说明了如何做这件事。</phrase>"
#. Tag: title
-#: installation-howto.xml:218
+#: installation-howto.xml:217
#, no-c-format
msgid "Installation"
msgstr "安装"
#. Tag: para
-#: installation-howto.xml:219
+#: installation-howto.xml:218
#, no-c-format
msgid ""
"Once the installer starts, you will be greeted with an initial screen. Press "
@@ -380,7 +388,7 @@ msgstr ""
"一下其它的启动方式以及各种参数的说明(参阅 <xref linkend=\"boot-parms\"/>)。"
#. Tag: para
-#: installation-howto.xml:225
+#: installation-howto.xml:224
#, no-c-format
msgid ""
"After a while you will be asked to select your language. Use the arrow keys "
@@ -395,7 +403,7 @@ msgstr ""
"上所有国家的列表以备选择。"
#. Tag: para
-#: installation-howto.xml:233
+#: installation-howto.xml:232
#, no-c-format
msgid ""
"You may be asked to confirm your keyboard layout. Choose the default unless "
@@ -405,7 +413,7 @@ msgstr ""
"清楚更合适的布局。"
#. Tag: para
-#: installation-howto.xml:238
+#: installation-howto.xml:237
#, no-c-format
msgid ""
"Now sit back while debian-installer detects some of your hardware, and loads "
@@ -415,7 +423,7 @@ msgstr ""
"件,并从 CD、软驱、USB 或其它设备里把它的其余部分加载进系统。"
#. Tag: para
-#: installation-howto.xml:243
+#: installation-howto.xml:242
#, no-c-format
msgid ""
"Next the installer will try to detect your network hardware and set up "
@@ -426,7 +434,7 @@ msgstr ""
"果没有连接网络,或是没有用 DHCP,那么您也可以手动配置网络。"
#. Tag: para
-#: installation-howto.xml:249
+#: installation-howto.xml:248
#, no-c-format
msgid ""
"The next step is setting up your clock and time zone. The installer will try "
@@ -439,7 +447,7 @@ msgstr ""
"的一个。"
#. Tag: para
-#: installation-howto.xml:256
+#: installation-howto.xml:255
#, no-c-format
msgid ""
"Now it is time to partition your disks. First you will be given the "
@@ -454,7 +462,7 @@ msgstr ""
"guimenuitem>。"
#. Tag: para
-#: installation-howto.xml:264
+#: installation-howto.xml:263
#, no-c-format
msgid ""
"If you have an existing DOS or Windows partition that you want to preserve, "
@@ -468,7 +476,7 @@ msgstr ""
"装空间:只需选择该分区,并指定它的新尺寸。"
#. Tag: para
-#: installation-howto.xml:271
+#: installation-howto.xml:270
#, no-c-format
msgid ""
"On the next screen you will see your partition table, how the partitions "
@@ -490,7 +498,7 @@ msgstr ""
"\"partitioning\"/> 有更多关于分区方面的信息。"
#. Tag: para
-#: installation-howto.xml:284
+#: installation-howto.xml:283
#, no-c-format
msgid ""
"Now &d-i; formats your partitions and starts to install the base system, "
@@ -500,7 +508,7 @@ msgstr ""
"装内核。"
#. Tag: para
-#: installation-howto.xml:289
+#: installation-howto.xml:288
#, no-c-format
msgid ""
"The base system that was installed earlier is a working, but very minimal "
@@ -520,7 +528,7 @@ msgstr ""
"quote>任务。参阅 <xref linkend=\"pkgsel\"/> 了解本步骤的详细信息。"
#. Tag: para
-#: installation-howto.xml:301
+#: installation-howto.xml:300
#, no-c-format
msgid ""
"Installation of the base system is followed by setting up user accounts. By "
@@ -532,7 +540,7 @@ msgstr ""
"理员) 帐号设置密码,并建立一个普通用户帐号。"
#. Tag: para
-#: installation-howto.xml:308
+#: installation-howto.xml:307
#, no-c-format
msgid ""
"The last step is to install a boot loader. If the installer detects other "
@@ -548,7 +556,7 @@ msgstr ""
"它这样做,而是把 GRUB 装在其它什么地方。</phrase>"
#. Tag: para
-#: installation-howto.xml:318
+#: installation-howto.xml:317
#, no-c-format
msgid ""
"&d-i; will now tell you that the installation has finished. Remove the cdrom "
@@ -561,7 +569,7 @@ msgstr ""
"<xref linkend=\"boot-new\"/> 有对它的详尽说明。"
#. Tag: para
-#: installation-howto.xml:325
+#: installation-howto.xml:324
#, no-c-format
msgid ""
"If you need more information on the install process, see <xref linkend=\"d-i-"
@@ -569,13 +577,13 @@ msgid ""
msgstr "如果您想要更多的安装过程相关信息,请看 <xref linkend=\"d-i-intro\"/>。"
#. Tag: title
-#: installation-howto.xml:334
+#: installation-howto.xml:333
#, no-c-format
msgid "Send us an installation report"
msgstr "请给我们发一份安装报告"
#. Tag: para
-#: installation-howto.xml:335
+#: installation-howto.xml:334
#, no-c-format
msgid ""
"If you successfully managed an installation with &d-i;, please take time to "
@@ -590,7 +598,7 @@ msgstr ""
"然后执行 <command>reportbug installation-reports</command>。"
#. Tag: para
-#: installation-howto.xml:345
+#: installation-howto.xml:344
#, no-c-format
msgid ""
"If you did not complete the install, you probably found a bug in debian-"
@@ -605,13 +613,13 @@ msgstr ""
"\"problem-report\"/>。"
#. Tag: title
-#: installation-howto.xml:357
+#: installation-howto.xml:356
#, no-c-format
msgid "And finally&hellip;"
msgstr "末了&hellip;"
#. Tag: para
-#: installation-howto.xml:358
+#: installation-howto.xml:357
#, no-c-format
msgid ""
"We hope that your &debian; installation is pleasant and that you find "
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index c4fec9bdf..29c67c720 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: 2012-06-16 09:12+0000\n"
+"POT-Creation-Date: 2012-10-24 19:53+0000\n"
"PO-Revision-Date: 2012-07-25 22:31+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -774,6 +774,12 @@ msgstr ""
"&debian; 开发人员选用了几种在不同硬盘和不同体系结构上的分区程序。下面是一个适"
"合您的体系的程序列表。"
+#. Tag: command
+#: partitioning.xml:448
+#, no-c-format
+msgid "partman"
+msgstr ""
+
#. Tag: para
#: partitioning.xml:449
#, no-c-format
@@ -787,6 +793,12 @@ msgstr ""
"arch=\"any-x86\">(Windows 下的说法是 <quote>format</quote>)</phrase>和关联分"
"区至挂接点。"
+#. Tag: command
+#: partitioning.xml:460
+#, no-c-format
+msgid "fdisk"
+msgstr ""
+
#. Tag: para
#: partitioning.xml:461
#, no-c-format
@@ -807,6 +819,12 @@ msgstr ""
"是 <command>fdisk</command> 表示他们的设备名称方式可能有所不同(也可能不是)。"
"参阅 <ulink url=\"&url-linux-freebsd;\">Linux+FreeBSD HOWTO</ulink>。"
+#. Tag: command
+#: partitioning.xml:477
+#, no-c-format
+msgid "cfdisk"
+msgstr ""
+
#. Tag: para
#: partitioning.xml:478
#, no-c-format
@@ -823,24 +841,48 @@ msgstr ""
"请注意 <command>cfdisk</command> 完全不了解 FreeBSD 的分区,因此,再说一次,"
"设备名称与结果可能不同。"
+#. Tag: command
+#: partitioning.xml:491
+#, no-c-format
+msgid "atari-fdisk"
+msgstr ""
+
#. Tag: para
#: partitioning.xml:492
#, no-c-format
msgid "Atari-aware version of <command>fdisk</command>."
msgstr "Atari 版本的 <command>fdisk</command>。"
+#. Tag: command
+#: partitioning.xml:500
+#, no-c-format
+msgid "amiga-fdisk"
+msgstr ""
+
#. Tag: para
#: partitioning.xml:501
#, no-c-format
msgid "Amiga-aware version of <command>fdisk</command>."
msgstr "Amiga-aware 版本的 <command>fdisk</command>。"
+#. Tag: command
+#: partitioning.xml:509
+#, no-c-format
+msgid "mac-fdisk"
+msgstr ""
+
#. Tag: para
#: partitioning.xml:510
#, no-c-format
msgid "Mac-aware version of <command>fdisk</command>."
msgstr "Mac-aware 版本的 <command>fdisk</command>。"
+#. Tag: command
+#: partitioning.xml:518
+#, no-c-format
+msgid "pmac-fdisk"
+msgstr ""
+
#. Tag: para
#: partitioning.xml:519
#, no-c-format
@@ -851,6 +893,12 @@ msgstr ""
"PowerMac 的 <command>fdisk</command>版本,同时也用于 BVM 以及 Motorola "
"VMEbus 系统。"
+#. Tag: command
+#: partitioning.xml:528
+#, no-c-format
+msgid "fdasd"
+msgstr ""
+
#. Tag: para
#: partitioning.xml:529
#, no-c-format
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index ab03819e4..4c274a6b1 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-26 13:45+0000\n"
-"PO-Revision-Date: 2012-10-21 13:04+0800\n"
+"POT-Creation-Date: 2012-10-24 19:53+0000\n"
+"PO-Revision-Date: 2012-07-25 22:54+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
"Language: \n"
@@ -27,7 +27,7 @@ msgid ""
msgstr "本附录说明如何预置 &d-i; 中提问的答案,让安装过程自动化。"
#. Tag: para
-#: preseed.xml:23 preseed.xml:677
+#: preseed.xml:23 preseed.xml:685
#, no-c-format
msgid ""
"The configuration fragments used in this appendix are also available as an "
@@ -107,7 +107,7 @@ msgid "initrd"
msgstr "initrd"
#. Tag: entry
-#: preseed.xml:70 preseed.xml:524
+#: preseed.xml:70 preseed.xml:525
#, no-c-format
msgid "file"
msgstr "file"
@@ -126,8 +126,9 @@ msgstr "CD/DVD"
#. Tag: entry
#: preseed.xml:77 preseed.xml:78 preseed.xml:79 preseed.xml:89 preseed.xml:91
-#: preseed.xml:94 preseed.xml:95 preseed.xml:99 preseed.xml:100
-#: preseed.xml:104 preseed.xml:106 preseed.xml:109 preseed.xml:111
+#: preseed.xml:94 preseed.xml:95 preseed.xml:96 preseed.xml:99 preseed.xml:100
+#: preseed.xml:101 preseed.xml:104 preseed.xml:106 preseed.xml:109
+#: preseed.xml:111
#, no-c-format
msgid "<entry>yes</entry>"
msgstr "<entry>yes</entry>"
@@ -160,12 +161,6 @@ msgid ""
msgstr "硬盘 <phrase condition=\"bootable-usb\">(包括 U 盘)</phrase>"
#. Tag: entry
-#: preseed.xml:96 preseed.xml:101
-#, no-c-format
-msgid "yes<footnoteref linkend=\"apx-ps-net\"/>"
-msgstr "yes<footnoteref linkend=\"apx-ps-net\"/>"
-
-#. Tag: entry
#: preseed.xml:98
#, no-c-format
msgid "floppy based (cd-drivers)"
@@ -755,173 +750,273 @@ msgstr ""
#. Tag: entry
#: preseed.xml:517
#, no-c-format
-msgid "auto"
-msgstr "auto"
+msgid "priority"
+msgstr "priority"
#. Tag: entry
#: preseed.xml:517
#, no-c-format
-msgid "auto-install/enable"
-msgstr "auto-install/enable"
-
-#. Tag: entry
-#: preseed.xml:518
-#, no-c-format
-msgid "classes"
-msgstr "classes"
+msgid "debconf/priority"
+msgstr "debconf/priority"
#. Tag: entry
#: preseed.xml:518
#, no-c-format
-msgid "auto-install/classes"
-msgstr "auto-install/classes"
-
-#. Tag: entry
-#: preseed.xml:519
-#, no-c-format
msgid "<entry>fb</entry>"
msgstr "<entry>fb</entry>"
#. Tag: entry
-#: preseed.xml:519
+#: preseed.xml:518
#, no-c-format
msgid "debian-installer/framebuffer"
msgstr "debian-installer/framebuffer"
#. Tag: entry
-#: preseed.xml:520
+#: preseed.xml:519
#, no-c-format
msgid "language"
msgstr "language"
#. Tag: entry
-#: preseed.xml:520
+#: preseed.xml:519
#, no-c-format
msgid "debian-installer/language"
msgstr "debian-installer/language"
#. Tag: entry
-#: preseed.xml:521
+#: preseed.xml:520
#, no-c-format
msgid "country"
msgstr "country"
#. Tag: entry
-#: preseed.xml:521
+#: preseed.xml:520
#, no-c-format
msgid "debian-installer/country"
msgstr "debian-installer/country"
#. Tag: entry
-#: preseed.xml:522
+#: preseed.xml:521
#, no-c-format
msgid "locale"
msgstr "locale"
#. Tag: entry
-#: preseed.xml:522
+#: preseed.xml:521
#, no-c-format
msgid "debian-installer/locale"
msgstr "debian-installer/locale"
#. Tag: entry
+#: preseed.xml:522
+#, no-c-format
+msgid "theme"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:522
+#, fuzzy, no-c-format
+#| msgid "debian-installer/locale"
+msgid "debian-installer/theme"
+msgstr "debian-installer/locale"
+
+#. Tag: entry
#: preseed.xml:523
#, no-c-format
-msgid "priority"
-msgstr "priority"
+msgid "auto"
+msgstr "auto"
#. Tag: entry
#: preseed.xml:523
#, no-c-format
-msgid "debconf/priority"
-msgstr "debconf/priority"
+msgid "auto-install/enable"
+msgstr "auto-install/enable"
#. Tag: entry
#: preseed.xml:524
#, no-c-format
+msgid "classes"
+msgstr "classes"
+
+#. Tag: entry
+#: preseed.xml:524
+#, no-c-format
+msgid "auto-install/classes"
+msgstr "auto-install/classes"
+
+#. Tag: entry
+#: preseed.xml:525
+#, no-c-format
msgid "preseed/file"
msgstr "preseed/file"
#. Tag: entry
-#: preseed.xml:525
+#: preseed.xml:526
#, no-c-format
msgid "<entry>url</entry>"
msgstr "<entry>url</entry>"
#. Tag: entry
-#: preseed.xml:525
+#: preseed.xml:526
#, no-c-format
msgid "preseed/url"
msgstr "preseed/url"
#. Tag: entry
-#: preseed.xml:526
+#: preseed.xml:527
#, no-c-format
-msgid "interface"
-msgstr "interface"
+msgid "domain"
+msgstr "domain"
#. Tag: entry
-#: preseed.xml:526
+#: preseed.xml:527
#, no-c-format
-msgid "netcfg/choose_interface"
-msgstr "netcfg/choose_interface"
+msgid "netcfg/get_domain"
+msgstr "netcfg/get_domain"
#. Tag: entry
-#: preseed.xml:527
+#: preseed.xml:528
#, no-c-format
msgid "hostname&nbsp;&nbsp;&nbsp;"
msgstr "hostname&nbsp;&nbsp;&nbsp;"
#. Tag: entry
-#: preseed.xml:527
+#: preseed.xml:528
#, no-c-format
msgid "netcfg/get_hostname"
msgstr "netcfg/get_hostname"
#. Tag: entry
-#: preseed.xml:528
+#: preseed.xml:529
#, no-c-format
-msgid "domain"
-msgstr "domain"
+msgid "interface"
+msgstr "interface"
#. Tag: entry
-#: preseed.xml:528
+#: preseed.xml:529
#, no-c-format
-msgid "netcfg/get_domain"
-msgstr "netcfg/get_domain"
+msgid "netcfg/choose_interface"
+msgstr "netcfg/choose_interface"
#. Tag: entry
-#: preseed.xml:529
+#: preseed.xml:530
#, no-c-format
msgid "protocol"
msgstr "protocol"
#. Tag: entry
-#: preseed.xml:529
+#: preseed.xml:530
#, no-c-format
msgid "mirror/protocol"
msgstr "mirror/protocol"
#. Tag: entry
-#: preseed.xml:530
+#: preseed.xml:531
#, no-c-format
msgid "suite"
msgstr "suite"
#. Tag: entry
-#: preseed.xml:530
+#: preseed.xml:531
#, no-c-format
msgid "mirror/suite"
msgstr "mirror/suite"
-#. Tag: title
+#. Tag: entry
+#: preseed.xml:532
+#, no-c-format
+msgid "modules"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:532
+#, no-c-format
+msgid "anna/choose_modules"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:533
+#, no-c-format
+msgid "recommends"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:533
+#, no-c-format
+msgid "base-installer/install-recommends"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:534
+#, no-c-format
+msgid "tasks"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:534
+#, no-c-format
+msgid "tasksel:tasksel/first"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:535
+#, fuzzy, no-c-format
+#| msgid "<entry>yes</entry>"
+msgid "<entry>desktop</entry>"
+msgstr "<entry>yes</entry>"
+
+#. Tag: entry
+#: preseed.xml:535
+#, no-c-format
+msgid "tasksel:tasksel/desktop"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:536
+#, no-c-format
+msgid "dmraid"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:536
+#, no-c-format
+msgid "disk-detect/dmraid/enable"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:537
+#, no-c-format
+msgid "keymap"
+msgstr ""
+
+#. Tag: entry
#: preseed.xml:537
#, no-c-format
+msgid "keyboard-configuration/xkb-keymap"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:538
+#, fuzzy, no-c-format
+#| msgid "preseed/url"
+msgid "preseed-md5"
+msgstr "preseed/url"
+
+#. Tag: entry
+#: preseed.xml:538
+#, fuzzy, no-c-format
+#| msgid "preseed/file"
+msgid "preseed/file/checksum"
+msgstr "preseed/file"
+
+#. Tag: title
+#: preseed.xml:545
+#, no-c-format
msgid "Using a DHCP server to specify preconfiguration files"
msgstr "使用 DHCP 服务器指定预置文件"
#. Tag: para
-#: preseed.xml:538
+#: preseed.xml:546
#, no-c-format
msgid ""
"It's also possible to use DHCP to specify a preconfiguration file to "
@@ -938,7 +1033,7 @@ msgstr ""
"务器第 3 版(&debian; 里面是 dhcp3-server 软件包)。"
#. Tag: screen
-#: preseed.xml:549
+#: preseed.xml:557
#, no-c-format
msgid ""
"if substring (option vendor-class-identifier, 0, 3) = \"d-i\" {\n"
@@ -950,7 +1045,7 @@ msgstr ""
"}"
#. Tag: para
-#: preseed.xml:551
+#: preseed.xml:559
#, no-c-format
msgid ""
"Note that the above example limits this filename to DHCP clients that "
@@ -963,7 +1058,7 @@ msgstr ""
"段,以避免预置网络中的其他安装。"
#. Tag: para
-#: preseed.xml:558
+#: preseed.xml:566
#, no-c-format
msgid ""
"A good way to use the DHCP preseeding is to only preseed values specific to "
@@ -977,13 +1072,13 @@ msgstr ""
"进行。使用 DHCP 预置进行完整的 &debian; 自动安装应该特别小心。"
#. Tag: title
-#: preseed.xml:572
+#: preseed.xml:580
#, no-c-format
msgid "Creating a preconfiguration file"
msgstr "创建预置文件"
#. Tag: para
-#: preseed.xml:573
+#: preseed.xml:581
#, no-c-format
msgid ""
"The preconfiguration file is in the format used by the <command>debconf-set-"
@@ -994,21 +1089,21 @@ msgstr ""
"文件中每一行的格式为:"
#. Tag: screen
-#: preseed.xml:579
+#: preseed.xml:587
#, no-c-format
msgid "&lt;owner&gt; &lt;question name&gt; &lt;question type&gt; &lt;value&gt;"
msgstr ""
"&lt;owner&gt; &lt;question name&gt; &lt;question type&gt; &lt;value&gt;"
#. Tag: para
-#: preseed.xml:581
+#: preseed.xml:589
#, no-c-format
msgid ""
"There are a few rules to keep in mind when writing a preconfiguration file."
msgstr "编写预置文件的时候要留意几条规则。"
#. Tag: para
-#: preseed.xml:588
+#: preseed.xml:596
#, no-c-format
msgid ""
"Put only a single space or tab between type and value: any additional "
@@ -1017,7 +1112,7 @@ msgstr ""
"在类型和值之间只有一个空格或者 tab:任何额外的空格将被解释为值的一部分。"
#. Tag: para
-#: preseed.xml:592
+#: preseed.xml:600
#, no-c-format
msgid ""
"A line can be split into multiple lines by appending a backslash "
@@ -1031,7 +1126,7 @@ msgstr ""
"割的行连接时会把行首和行尾的空格缩减为一个空格,再组成单独一行。"
#. Tag: para
-#: preseed.xml:599
+#: preseed.xml:607
#, no-c-format
msgid ""
"For debconf variables (templates) used only in the installer itself, the "
@@ -1047,7 +1142,7 @@ msgstr ""
"debconf 数据库里面。"
#. Tag: para
-#: preseed.xml:607
+#: preseed.xml:615
#, no-c-format
msgid ""
"Most questions need to be preseeded using the values valid in English and "
@@ -1058,7 +1153,7 @@ msgstr ""
"<classname>partman</classname>),需要使用翻译过的值。"
#. Tag: para
-#: preseed.xml:613
+#: preseed.xml:621
#, no-c-format
msgid ""
"Some questions take a code as value instead of the English text that is "
@@ -1066,7 +1161,7 @@ msgid ""
msgstr "有些问题在安装过程中显示值的代码而不是英文文本。"
#. Tag: para
-#: preseed.xml:619
+#: preseed.xml:627
#, no-c-format
msgid ""
"The easiest way to create a preconfiguration file is to use the example file "
@@ -1076,7 +1171,7 @@ msgstr ""
"\"preseed-contents\"/>。"
#. Tag: para
-#: preseed.xml:624
+#: preseed.xml:632
#, no-c-format
msgid ""
"An alternative method is to do a manual installation and then, after "
@@ -1089,7 +1184,7 @@ msgstr ""
"程序的 cdebconf 数据库到一个文件:"
#. Tag: screen
-#: preseed.xml:631
+#: preseed.xml:639
#, no-c-format
msgid ""
"$ debconf-get-selections --installer &gt; <replaceable>file</replaceable>\n"
@@ -1099,7 +1194,7 @@ msgstr ""
"$ debconf-get-selections &gt;&gt; <replaceable>file</replaceable>"
#. Tag: para
-#: preseed.xml:633
+#: preseed.xml:641
#, no-c-format
msgid ""
"However, a file generated in this manner will have some items that should "
@@ -1110,7 +1205,7 @@ msgstr ""
"始。"
#. Tag: para
-#: preseed.xml:641
+#: preseed.xml:649
#, no-c-format
msgid ""
"This method relies on the fact that, at the end of the installation, the "
@@ -1124,7 +1219,7 @@ msgstr ""
"感的信息,默认只为 root 可读。"
#. Tag: para
-#: preseed.xml:649
+#: preseed.xml:657
#, no-c-format
msgid ""
"The directory <filename>/var/log/installer</filename> and all files in it "
@@ -1135,7 +1230,7 @@ msgstr ""
"log/installer</filename> 目录及其中的文件将从您的系统中删除。"
#. Tag: para
-#: preseed.xml:657
+#: preseed.xml:665
#, no-c-format
msgid ""
"To check possible values for questions, you can use <command>nano</command> "
@@ -1150,7 +1245,7 @@ msgstr ""
"值。"
#. Tag: para
-#: preseed.xml:665
+#: preseed.xml:673
#, no-c-format
msgid ""
"To check if the format of your preconfiguration file is valid before "
@@ -1161,13 +1256,13 @@ msgstr ""
"selections -c <replaceable>preseed.cfg</replaceable></command> 命令。"
#. Tag: title
-#: preseed.xml:676
+#: preseed.xml:684
#, no-c-format
msgid "Contents of the preconfiguration file (for &releasename;)"
msgstr "预置文件的内容(&releasename;)"
#. Tag: para
-#: preseed.xml:682
+#: preseed.xml:690
#, no-c-format
msgid ""
"Note that this example is based on an installation for the Intel x86 "
@@ -1181,7 +1276,7 @@ msgstr ""
"debconf 设置替换。"
#. Tag: para
-#: preseed.xml:690
+#: preseed.xml:698
#, no-c-format
msgid ""
"Details on how the different Debian Installer components actually work can "
@@ -1191,13 +1286,13 @@ msgstr ""
"\"/>。"
#. Tag: title
-#: preseed.xml:698
+#: preseed.xml:706
#, no-c-format
msgid "Localization"
msgstr "本地化"
#. Tag: para
-#: preseed.xml:699
+#: preseed.xml:707
#, no-c-format
msgid ""
"Setting localization values will only work if you are using initrd "
@@ -1207,7 +1302,7 @@ msgstr ""
"设置本地信息只适用于使用 initrd 预置。其他方式下这些问题是在询问之后加载的。"
#. Tag: para
-#: preseed.xml:705
+#: preseed.xml:713
#, no-c-format
msgid ""
"The locale can be used to specify both language and country and can be any "
@@ -1223,7 +1318,7 @@ msgstr ""
"userinput>。"
#. Tag: para
-#: preseed.xml:714
+#: preseed.xml:722
#, no-c-format
msgid ""
"Although this method is very easy to use, it does not allow preseeding of "
@@ -1242,7 +1337,7 @@ msgstr ""
"因此另一种方法是单独预置各值。语言和国家可以在引导参数里面指定。"
#. Tag: screen
-#: preseed.xml:729
+#: preseed.xml:737
#, no-c-format
msgid ""
"# Preseeding only locale sets language, country and locale.\n"
@@ -1266,18 +1361,24 @@ msgstr ""
"#d-i localechooser/supported-locales multiselect en_US.UTF-8, nl_NL.UTF-8"
#. Tag: para
-#: preseed.xml:731
-#, no-c-format
+#: preseed.xml:739
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Keyboard configuration consists of selecting a keymap and (for non-latin "
+#| "keymaps) a toggle key to switch between the non-latin keymap and the US "
+#| "keymap."
msgid ""
"Keyboard configuration consists of selecting a keymap and (for non-latin "
"keymaps) a toggle key to switch between the non-latin keymap and the US "
-"keymap."
+"keymap. Only basic keymap variants are available during installation. "
+"Advanced variants are available only in the installed system, through "
+"<command>dpkg-reconfigure keyboard-configuration</command>."
msgstr ""
"键盘配置包括选择的 keymap 和(对于非拉丁 keymap)切换键,该键用于非拉丁和 US "
"keymap 来回切换。"
#. Tag: screen
-#: preseed.xml:736
+#: preseed.xml:747
#, no-c-format
msgid ""
"# Keyboard selection.\n"
@@ -1291,7 +1392,7 @@ msgstr ""
"# d-i keyboard-configuration/toggle select No toggling"
#. Tag: para
-#: preseed.xml:738
+#: preseed.xml:749
#, no-c-format
msgid ""
"To skip keyboard configuration, preseed <classname>keymap</classname> with "
@@ -1302,13 +1403,13 @@ msgstr ""
"classname>。这将导致内核 keymap 保持活动。"
#. Tag: title
-#: preseed.xml:750
+#: preseed.xml:761
#, no-c-format
msgid "Network configuration"
msgstr "网络设置"
#. Tag: para
-#: preseed.xml:751
+#: preseed.xml:762
#, no-c-format
msgid ""
"Of course, preseeding the network configuration won't work if you're loading "
@@ -1321,7 +1422,7 @@ msgstr ""
"助。如果您计划从网络加载预置文件,应该使用传递网络设置给内核引导参数的方式。"
#. Tag: para
-#: preseed.xml:759
+#: preseed.xml:770
#, no-c-format
msgid ""
"If you need to pick a particular interface when netbooting before loading a "
@@ -1332,7 +1433,7 @@ msgstr ""
"<userinput>interface=<replaceable>eth1</replaceable></userinput>。"
#. Tag: para
-#: preseed.xml:765
+#: preseed.xml:776
#, no-c-format
msgid ""
"Although preseeding the network configuration is normally not possible when "
@@ -1348,20 +1449,78 @@ msgstr ""
"再运行一次,这需要将下面的命令包含在 <quote>preseed/run</quote> 脚本里面:"
#. Tag: screen
-#: preseed.xml:775
+#: preseed.xml:786
#, no-c-format
msgid "killall.sh; netcfg"
msgstr "killall.sh; netcfg"
#. Tag: para
-#: preseed.xml:777
+#: preseed.xml:788
#, no-c-format
msgid "The following debconf variables are relevant for network configuration."
msgstr "下面的 debconf 变量与网络配置相关。"
#. Tag: screen
-#: preseed.xml:783
-#, no-c-format
+#: preseed.xml:794
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# Disable network configuration entirely. This is useful for cdrom\n"
+#| "# installations on non-networked devices where the network questions,\n"
+#| "# warning and long timeouts are a nuisance.\n"
+#| "#d-i netcfg/enable boolean false\n"
+#| "\n"
+#| "# netcfg will choose an interface that has link if possible. This makes "
+#| "it\n"
+#| "# skip displaying a list if there is more than one interface.\n"
+#| "d-i netcfg/choose_interface select auto\n"
+#| "\n"
+#| "# To pick a particular interface instead:\n"
+#| "#d-i netcfg/choose_interface select eth1\n"
+#| "\n"
+#| "# To set a different link detection timeout (default is 3 seconds).\n"
+#| "# Values are interpreted as seconds.\n"
+#| "#di netcfg/link_detection_timeout string 10\n"
+#| "\n"
+#| "# If you have a slow dhcp server and the installer times out waiting for\n"
+#| "# it, this might be useful.\n"
+#| "#d-i netcfg/dhcp_timeout string 60\n"
+#| "\n"
+#| "# If you prefer to configure the network manually, uncomment this line "
+#| "and\n"
+#| "# the static network configuration below.\n"
+#| "#d-i netcfg/disable_dhcp boolean true\n"
+#| "\n"
+#| "# If you want the preconfiguration file to work on systems both with and\n"
+#| "# without a dhcp server, uncomment these lines and the static network\n"
+#| "# configuration below.\n"
+#| "#d-i netcfg/dhcp_failed note\n"
+#| "#d-i netcfg/dhcp_options select Configure network manually\n"
+#| "\n"
+#| "# Static network configuration.\n"
+#| "#d-i netcfg/get_nameservers string 192.168.1.1\n"
+#| "#d-i netcfg/get_ipaddress string 192.168.1.42\n"
+#| "#d-i netcfg/get_netmask string 255.255.255.0\n"
+#| "#d-i netcfg/get_gateway string 192.168.1.1\n"
+#| "#d-i netcfg/confirm_static boolean true\n"
+#| "\n"
+#| "# Any hostname and domain names assigned from dhcp take precedence over\n"
+#| "# values set here. However, setting the values still prevents the "
+#| "questions\n"
+#| "# from being shown, even if values come from dhcp.\n"
+#| "d-i netcfg/get_hostname string unassigned-hostname\n"
+#| "d-i netcfg/get_domain string unassigned-domain\n"
+#| "\n"
+#| "# Disable that annoying WEP key dialog.\n"
+#| "d-i netcfg/wireless_wep string\n"
+#| "# The wacky dhcp hostname that some ISPs use as a password of sorts.\n"
+#| "#d-i netcfg/dhcp_hostname string radish\n"
+#| "\n"
+#| "# If non-free firmware is needed for the network or other hardware, you "
+#| "can\n"
+#| "# configure the installer to always try to load it, without prompting. "
+#| "Or\n"
+#| "# change to false to disable asking.\n"
+#| "#d-i hw-detect/load_firmware boolean true"
msgid ""
"# Disable network configuration entirely. This is useful for cdrom\n"
"# installations on non-networked devices where the network questions,\n"
@@ -1406,6 +1565,11 @@ msgid ""
"d-i netcfg/get_hostname string unassigned-hostname\n"
"d-i netcfg/get_domain string unassigned-domain\n"
"\n"
+"# If you want to force a hostname, regardless of what either the DHCP\n"
+"# server returns or what the reverse DNS entry for the IP is, uncomment\n"
+"# and adjust the following line.\n"
+"#d-i netcfg/hostname string somehost\n"
+"\n"
"# Disable that annoying WEP key dialog.\n"
"d-i netcfg/wireless_wep string\n"
"# The wacky dhcp hostname that some ISPs use as a password of sorts.\n"
@@ -1430,7 +1594,7 @@ msgstr ""
"\n"
"# To set a different link detection timeout (default is 3 seconds).\n"
"# Values are interpreted as seconds.\n"
-"#d-i netcfg/link_detection_timeout string 10\n"
+"#di netcfg/link_detection_timeout string 10\n"
"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
@@ -1470,7 +1634,7 @@ msgstr ""
"#d-i hw-detect/load_firmware boolean true"
#. Tag: para
-#: preseed.xml:785
+#: preseed.xml:796
#, no-c-format
msgid ""
"Please note that <command>netcfg</command> will automatically determine the "
@@ -1489,30 +1653,20 @@ msgstr ""
"quote> 确定不使用网关。"
#. Tag: title
-#: preseed.xml:801
+#: preseed.xml:812
#, no-c-format
msgid "Network console"
msgstr "网络控制台"
#. Tag: screen
-#: preseed.xml:803
+#: preseed.xml:814
#, no-c-format
-#| msgid ""
-#| "# Use the following settings if you wish to make use of the network-"
-#| "console\n"
-#| "# component for remote installation over SSH. This only makes sense if "
-#| "you\n"
-#| "# intend to perform the remainder of the installation manually.\n"
-#| "#d-i anna/choose_modules string network-console\n"
-#| "#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-"
-#| "key\n"
-#| "#d-i network-console/password password r00tme\n"
-#| "#d-i network-console/password-again password r00tme"
msgid ""
"# Use the following settings if you wish to make use of the network-console\n"
"# component for remote installation over SSH. This only makes sense if you\n"
"# intend to perform the remainder of the installation manually.\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
msgstr ""
@@ -1520,17 +1674,18 @@ msgstr ""
"# component for remote installation over SSH. This only makes sense if you\n"
"# intend to perform the remainder of the installation manually.\n"
"#d-i anna/choose_modules string network-console\n"
+"#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
"#d-i network-console/password password r00tme\n"
"#d-i network-console/password-again password r00tme"
#. Tag: title
-#: preseed.xml:808
+#: preseed.xml:819
#, no-c-format
msgid "Mirror settings"
msgstr "镜像设置"
#. Tag: para
-#: preseed.xml:809
+#: preseed.xml:820
#, no-c-format
msgid ""
"Depending on the installation method you use, a mirror may be used to "
@@ -1542,7 +1697,7 @@ msgstr ""
"安装的系统建立 <filename>/etc/apt/sources.list</filename>。"
#. Tag: para
-#: preseed.xml:816
+#: preseed.xml:827
#, no-c-format
msgid ""
"The parameter <classname>mirror/suite</classname> determines the suite for "
@@ -1551,7 +1706,7 @@ msgstr ""
"参数 <classname>mirror/suite</classname> 决定了安装好的系统使用的套件。"
#. Tag: para
-#: preseed.xml:821
+#: preseed.xml:832
#, no-c-format
msgid ""
"The parameter <classname>mirror/udeb/suite</classname> determines the suite "
@@ -1566,7 +1721,7 @@ msgstr ""
"常安装程序会自动安装并使用正确的值而毋需手动设置。"
#. Tag: screen
-#: preseed.xml:832
+#: preseed.xml:843
#, no-c-format
msgid ""
"# If you select ftp, the mirror/country string does not need to be set.\n"
@@ -1594,13 +1749,13 @@ msgstr ""
"#d-i mirror/udeb/suite string testing"
#. Tag: title
-#: preseed.xml:837
+#: preseed.xml:848
#, no-c-format
msgid "Account setup"
msgstr "帐号设置"
#. Tag: para
-#: preseed.xml:838
+#: preseed.xml:849
#, no-c-format
msgid ""
"The password for the root account and name and password for a first regular "
@@ -1611,7 +1766,7 @@ msgstr ""
"或 MD5 <emphasis>哈希</emphasis> 值。"
#. Tag: para
-#: preseed.xml:845
+#: preseed.xml:856
#, no-c-format
msgid ""
"Be aware that preseeding passwords is not completely secure as everyone with "
@@ -1624,7 +1779,7 @@ msgstr ""
"MD5 哈希值相对安全一些,但也会造成安全的假象,MD5 哈希值也可以被暴力破解。"
#. Tag: screen
-#: preseed.xml:855
+#: preseed.xml:866
#, no-c-format
msgid ""
"# Skip creation of a root account (normal user account will be able to\n"
@@ -1682,7 +1837,7 @@ msgstr ""
"#d-i passwd/user-default-groups string audio cdrom video"
#. Tag: para
-#: preseed.xml:857
+#: preseed.xml:868
#, no-c-format
msgid ""
"The <classname>passwd/root-password-crypted</classname> and "
@@ -1699,26 +1854,26 @@ msgstr ""
"root 登录(例如使用 SSH key 认证或 sudo)。"
#. Tag: para
-#: preseed.xml:867
+#: preseed.xml:878
#, no-c-format
msgid ""
"The following command can be used to generate an MD5 hash for a password:"
msgstr "下面的命令可用于生成密码的 MD5 值。"
#. Tag: screen
-#: preseed.xml:871
+#: preseed.xml:882
#, no-c-format
msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
#. Tag: title
-#: preseed.xml:877
+#: preseed.xml:888
#, no-c-format
msgid "Clock and time zone setup"
msgstr "时钟与时区设置"
#. Tag: screen
-#: preseed.xml:879
+#: preseed.xml:890
#, no-c-format
msgid ""
"# Controls whether or not the hardware clock is set to UTC.\n"
@@ -1746,13 +1901,13 @@ msgstr ""
"#d-i clock-setup/ntp-server string ntp.example.com"
#. Tag: title
-#: preseed.xml:884
+#: preseed.xml:895
#, no-c-format
msgid "Partitioning"
msgstr "分区"
#. Tag: para
-#: preseed.xml:885
+#: preseed.xml:896
#, no-c-format
msgid ""
"Using preseeding to partition the harddisk is limited to what is supported "
@@ -1766,7 +1921,7 @@ msgstr ""
"义方案,用户自定义的方案文件或预置文件包含的方案。"
#. Tag: para
-#: preseed.xml:893
+#: preseed.xml:904
#, no-c-format
msgid ""
"Preseeding of advanced partition setups using RAID, LVM and encryption is "
@@ -1777,7 +1932,7 @@ msgstr ""
"性不足。"
#. Tag: para
-#: preseed.xml:899
+#: preseed.xml:910
#, no-c-format
msgid ""
"The examples below only provide basic information on the use of recipes. For "
@@ -1795,7 +1950,7 @@ msgstr ""
"source repository</ulink>获取。注意不同发布版支持的功能会有所改变。"
#. Tag: para
-#: preseed.xml:913
+#: preseed.xml:924
#, no-c-format
msgid ""
"The identification of disks is dependent on the order in which their drivers "
@@ -1806,95 +1961,14 @@ msgstr ""
"确的那一个。"
#. Tag: title
-#: preseed.xml:922
+#: preseed.xml:933
#, no-c-format
msgid "Partitioning example"
msgstr "分区示例"
#. Tag: screen
-#: preseed.xml:924
+#: preseed.xml:935
#, no-c-format
-#| msgid ""
-#| "# If the system has free space you can choose to only partition that "
-#| "space.\n"
-#| "# This is only honoured if partman-auto/method (below) is not set.\n"
-#| "#d-i partman-auto/init_automatically_partition select biggest_free\n"
-#| "\n"
-#| "# Alternatively, you may specify a disk to partition. If the system has "
-#| "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"
-#| "# 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"
-#| "# The presently available methods are:\n"
-#| "# - regular: use the usual partition types for your architecture\n"
-#| "# - lvm: use LVM to partition the disk\n"
-#| "# - crypto: use LVM within an encrypted partition\n"
-#| "d-i partman-auto/method string lvm\n"
-#| "\n"
-#| "# If one of the disks that are going to be automatically partitioned\n"
-#| "# contains an old LVM configuration, the user will normally receive a\n"
-#| "# warning. This can be preseeded away...\n"
-#| "d-i partman-lvm/device_remove_lvm boolean true\n"
-#| "# The same applies to pre-existing software RAID array:\n"
-#| "d-i partman-md/device_remove_md boolean true\n"
-#| "# And the same goes for the confirmation to write the lvm partitions.\n"
-#| "d-i partman-lvm/confirm boolean true\n"
-#| "d-i partman-lvm/confirm_nooverwrite boolean true\n"
-#| "\n"
-#| "# You can choose one of the three predefined partitioning recipes:\n"
-#| "# - atomic: all files in one partition\n"
-#| "# - home: separate /home partition\n"
-#| "# - multi: separate /home, /usr, /var, and /tmp partitions\n"
-#| "d-i partman-auto/choose_recipe select atomic\n"
-#| "\n"
-#| "# Or provide a recipe of your own...\n"
-#| "# If you have a way to get a recipe file into the d-i environment, you "
-#| "can\n"
-#| "# just point at it.\n"
-#| "#d-i partman-auto/expert_recipe_file string /hd-media/recipe\n"
-#| "\n"
-#| "# If not, you can put an entire recipe into the preconfiguration file in "
-#| "one\n"
-#| "# (logical) line. This example creates a small /boot partition, suitable\n"
-#| "# swap, and uses the rest of the space for the root partition:\n"
-#| "#d-i partman-auto/expert_recipe string \\\n"
-#| "# boot-root :: \\\n"
-#| "# 40 50 100 ext3 \\\n"
-#| "# $primary{ } $bootable{ } \\\n"
-#| "# method{ format } format{ } \\\n"
-#| "# use_filesystem{ } filesystem{ ext3 } \\\n"
-#| "# mountpoint{ /boot } \\\n"
-#| "# . \\\n"
-#| "# 500 10000 1000000000 ext3 \\\n"
-#| "# method{ format } format{ } \\\n"
-#| "# use_filesystem{ } filesystem{ ext3 } \\\n"
-#| "# mountpoint{ / } \\\n"
-#| "# . \\\n"
-#| "# 64 512 300% linux-swap \\\n"
-#| "# method{ swap } format{ } \\\n"
-#| "# .\n"
-#| "\n"
-#| "# The full recipe format is documented in the file partman-auto-recipe."
-#| "txt\n"
-#| "# included in the 'debian-installer' package or available from D-I "
-#| "source\n"
-#| "# repository. This also documents how to specify settings such as file\n"
-#| "# system labels, volume group names and which physical devices to "
-#| "include\n"
-#| "# in a volume group.\n"
-#| "\n"
-#| "# This makes partman automatically partition without confirmation, "
-#| "provided\n"
-#| "# that you told it what to do using one of the methods above.\n"
-#| "d-i partman-partitioning/confirm_write_new_label boolean true\n"
-#| "d-i partman/choose_partition select finish\n"
-#| "d-i partman/confirm boolean true\n"
-#| "d-i partman/confirm_nooverwrite boolean true"
msgid ""
"# If the system has free space you can choose to only partition that space.\n"
"# This is only honoured if partman-auto/method (below) is not set.\n"
@@ -1923,6 +1997,7 @@ msgid ""
"d-i partman-md/device_remove_md boolean true\n"
"# And the same goes for the confirmation to write the lvm partitions.\n"
"d-i partman-lvm/confirm boolean true\n"
+"d-i partman-lvm/confirm_nooverwrite boolean true\n"
"\n"
"# You can choose one of the three predefined partitioning recipes:\n"
"# - atomic: all files in one partition\n"
@@ -1973,8 +2048,10 @@ msgstr ""
"# This is only honoured if partman-auto/method (below) is not set.\n"
"#d-i partman-auto/init_automatically_partition select biggest_free\n"
"\n"
-"# Alternatively, you may specify a disk to partition. If the system has only\n"
-"# one disk the installer will default to using that, but otherwise the device\n"
+"# Alternatively, you may specify a disk to partition. If the system has "
+"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"
"# For example, to use the first SCSI/SATA hard disk:\n"
@@ -1994,6 +2071,7 @@ msgstr ""
"d-i partman-md/device_remove_md boolean true\n"
"# And the same goes for the confirmation to write the lvm partitions.\n"
"d-i partman-lvm/confirm boolean true\n"
+"d-i partman-lvm/confirm_nooverwrite boolean true\n"
"\n"
"# You can choose one of the three predefined partitioning recipes:\n"
"# - atomic: all files in one partition\n"
@@ -2006,7 +2084,8 @@ msgstr ""
"# just point at it.\n"
"#d-i partman-auto/expert_recipe_file string /hd-media/recipe\n"
"\n"
-"# If not, you can put an entire recipe into the preconfiguration file in one\n"
+"# If not, you can put an entire recipe into the preconfiguration file in "
+"one\n"
"# (logical) line. This example creates a small /boot partition, suitable\n"
"# swap, and uses the rest of the space for the root partition:\n"
"#d-i partman-auto/expert_recipe string \\\n"
@@ -2040,13 +2119,13 @@ msgstr ""
"d-i partman/confirm_nooverwrite boolean true"
#. Tag: title
-#: preseed.xml:928
+#: preseed.xml:939
#, no-c-format
msgid "Partitioning using RAID"
msgstr "使用 RAID 分区"
#. Tag: para
-#: preseed.xml:929
+#: preseed.xml:940
#, no-c-format
msgid ""
"You can also use preseeding to set up partitions on software RAID arrays. "
@@ -2057,7 +2136,7 @@ msgstr ""
"列(degraded arrays)和指定额外设备。"
#. Tag: para
-#: preseed.xml:935
+#: preseed.xml:946
#, no-c-format
msgid ""
"If you are using RAID 1, you can preseed grub to install to all devices used "
@@ -2067,7 +2146,7 @@ msgstr ""
"linkend=\"preseed-bootloader\"/>。"
#. Tag: para
-#: preseed.xml:942
+#: preseed.xml:953
#, no-c-format
msgid ""
"This type of automated partitioning is easy to get wrong. It is also "
@@ -2081,7 +2160,7 @@ msgstr ""
"<filename>/var/log/syslog</filename>。"
#. Tag: screen
-#: preseed.xml:952
+#: preseed.xml:963
#, no-c-format
msgid ""
"# The method should be set to \"raid\".\n"
@@ -2185,13 +2264,13 @@ msgstr ""
"d-i partman/confirm_nooverwrite boolean true"
#. Tag: title
-#: preseed.xml:957
+#: preseed.xml:968
#, no-c-format
msgid "Controlling how partitions are mounted"
msgstr "分区挂载控制"
#. Tag: para
-#: preseed.xml:958
+#: preseed.xml:969
#, no-c-format
msgid ""
"Normally, filesystems are mounted using a universally unique identifier "
@@ -2207,7 +2286,7 @@ msgstr ""
"系统仍然使用 UUID 方式挂载。"
#. Tag: para
-#: preseed.xml:967
+#: preseed.xml:978
#, no-c-format
msgid ""
"Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2217,7 +2296,7 @@ msgstr ""
"挂载。"
#. Tag: para
-#: preseed.xml:974
+#: preseed.xml:985
#, no-c-format
msgid ""
"Traditional device names may change based on the order in which the kernel "
@@ -2231,7 +2310,7 @@ msgstr ""
"后会出现一些随机的情况。"
#. Tag: screen
-#: preseed.xml:984
+#: preseed.xml:995
#, no-c-format
msgid ""
"# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2249,13 +2328,13 @@ msgstr ""
"#d-i partman/mount_style select uuid"
#. Tag: title
-#: preseed.xml:990
+#: preseed.xml:1001
#, no-c-format
msgid "Base system installation"
msgstr "基本系统安装"
#. Tag: para
-#: preseed.xml:991
+#: preseed.xml:1002
#, no-c-format
msgid ""
"There is actually not very much that can be preseeded for this stage of the "
@@ -2264,7 +2343,7 @@ msgid ""
msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内核安装相关的问题。"
#. Tag: screen
-#: preseed.xml:998
+#: preseed.xml:1009
#, no-c-format
msgid ""
"# Configure APT to not install recommended packages by default. Use of this\n"
@@ -2288,13 +2367,13 @@ msgstr ""
"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486"
#. Tag: title
-#: preseed.xml:1003
+#: preseed.xml:1014
#, no-c-format
msgid "Apt setup"
msgstr "设置 apt"
#. Tag: para
-#: preseed.xml:1004
+#: preseed.xml:1015
#, no-c-format
msgid ""
"Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2307,7 +2386,7 @@ msgstr ""
"仓库。"
#. Tag: screen
-#: preseed.xml:1012
+#: preseed.xml:1023
#, no-c-format
msgid ""
"# You can choose to install non-free and contrib software.\n"
@@ -2365,13 +2444,13 @@ msgstr ""
"#d-i debian-installer/allow_unauthenticated boolean true"
#. Tag: title
-#: preseed.xml:1017
+#: preseed.xml:1028
#, no-c-format
msgid "Package selection"
msgstr "选择软件包"
#. Tag: para
-#: preseed.xml:1018
+#: preseed.xml:1029
#, no-c-format
msgid ""
"You can choose to install any combination of tasks that are available. "
@@ -2379,73 +2458,73 @@ msgid ""
msgstr "您可以选择安装存在的任务的组合。本文编撰时已有的任务包括:"
#. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1038
#, no-c-format
msgid "standard"
msgstr "standard"
#. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1041
#, no-c-format
-msgid "desktop"
-msgstr "desktop"
+msgid "<userinput>desktop</userinput>"
+msgstr ""
#. Tag: userinput
-#: preseed.xml:1033
+#: preseed.xml:1044
#, no-c-format
msgid "gnome-desktop"
msgstr "gnome-desktop"
#. Tag: userinput
-#: preseed.xml:1036
+#: preseed.xml:1047
#, no-c-format
msgid "kde-desktop"
msgstr "kde-desktop"
#. Tag: userinput
-#: preseed.xml:1039
+#: preseed.xml:1050
#, no-c-format
msgid "web-server"
msgstr "web-server"
#. Tag: userinput
-#: preseed.xml:1042
+#: preseed.xml:1053
#, no-c-format
msgid "print-server"
msgstr "print-server"
#. Tag: userinput
-#: preseed.xml:1045
+#: preseed.xml:1056
#, no-c-format
msgid "dns-server"
msgstr "dns-server"
#. Tag: userinput
-#: preseed.xml:1048
+#: preseed.xml:1059
#, no-c-format
msgid "file-server"
msgstr "file-server"
#. Tag: userinput
-#: preseed.xml:1051
+#: preseed.xml:1062
#, no-c-format
msgid "mail-server"
msgstr "mail-server"
#. Tag: userinput
-#: preseed.xml:1054
+#: preseed.xml:1065
#, no-c-format
msgid "sql-database"
msgstr "sql-database"
#. Tag: userinput
-#: preseed.xml:1057
+#: preseed.xml:1068
#, no-c-format
msgid "laptop"
msgstr "laptop"
#. Tag: para
-#: preseed.xml:1061
+#: preseed.xml:1072
#, no-c-format
msgid ""
"You can also choose to install no tasks, and force the installation of a set "
@@ -2456,7 +2535,7 @@ msgstr ""
"<userinput>standard</userinput> 任务。"
#. Tag: para
-#: preseed.xml:1067
+#: preseed.xml:1078
#, no-c-format
msgid ""
"If you want to install some individual packages in addition to packages "
@@ -2470,7 +2549,7 @@ msgstr ""
"命令行上使用。"
#. Tag: screen
-#: preseed.xml:1077
+#: preseed.xml:1088
#, no-c-format
msgid ""
"#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2508,13 +2587,13 @@ msgstr ""
"#popularity-contest popularity-contest/participate boolean false"
#. Tag: title
-#: preseed.xml:1082
+#: preseed.xml:1093
#, no-c-format
msgid "Boot loader installation"
msgstr "安装 bootloader"
#. Tag: screen
-#: preseed.xml:1084
+#: preseed.xml:1095
#, no-c-format
msgid ""
"<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If "
@@ -2602,7 +2681,7 @@ msgstr ""
"#d-i debian-installer/add-kernel-opts string nousb"
#. Tag: para
-#: preseed.xml:1086
+#: preseed.xml:1097
#, no-c-format
msgid ""
"An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2614,13 +2693,13 @@ msgstr ""
"令。"
#. Tag: title
-#: preseed.xml:1096
+#: preseed.xml:1107
#, no-c-format
msgid "Finishing up the installation"
msgstr "完成安装"
#. Tag: screen
-#: preseed.xml:1098
+#: preseed.xml:1109
#, no-c-format
msgid ""
"# During installations from serial console, the regular virtual consoles\n"
@@ -2660,13 +2739,13 @@ msgstr ""
"#d-i debian-installer/exit/poweroff boolean true"
#. Tag: title
-#: preseed.xml:1103
+#: preseed.xml:1114
#, no-c-format
msgid "Preseeding other packages"
msgstr "预置其他的软件包"
#. Tag: screen
-#: preseed.xml:1105
+#: preseed.xml:1116
#, no-c-format
msgid ""
"# Depending on what software you choose to install, or if things go wrong\n"
@@ -2686,19 +2765,19 @@ msgstr ""
"# debconf-get-selections >> file"
#. Tag: title
-#: preseed.xml:1112
+#: preseed.xml:1123
#, no-c-format
msgid "Advanced options"
msgstr "高级选项"
#. Tag: title
-#: preseed.xml:1115
+#: preseed.xml:1126
#, no-c-format
msgid "Running custom commands during the installation"
msgstr "安装过程中运行用户命令"
#. Tag: para
-#: preseed.xml:1116
+#: preseed.xml:1127
#, no-c-format
msgid ""
"A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2708,7 +2787,7 @@ msgstr ""
"本。"
#. Tag: screen
-#: preseed.xml:1124
+#: preseed.xml:1135
#, no-c-format
msgid ""
"# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2756,13 +2835,13 @@ msgstr ""
"#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
#. Tag: title
-#: preseed.xml:1129
+#: preseed.xml:1140
#, no-c-format
msgid "Using preseeding to change default values"
msgstr "使用预置修改默认值"
#. Tag: para
-#: preseed.xml:1130
+#: preseed.xml:1141
#, no-c-format
msgid ""
"It is possible to use preseeding to change the default answer for a "
@@ -2786,7 +2865,7 @@ msgstr ""
"这对于测试和调试您的预置文件很有帮助。"
#. Tag: para
-#: preseed.xml:1144
+#: preseed.xml:1155
#, no-c-format
msgid ""
"Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2799,7 +2878,7 @@ msgstr ""
"\"preseed-bootparms\"/> 的脚注。"
#. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1162
#, no-c-format
msgid ""
"If you are preseeding using boot parameters, you can make the installer ask "
@@ -2820,7 +2899,7 @@ msgstr ""
"在安装时显示出来的问题对应的参数,而不是<quote>内部的</quote>参数。"
#. Tag: para
-#: preseed.xml:1161
+#: preseed.xml:1172
#, no-c-format
msgid ""
"For more debugging information, use the boot parameter "
@@ -2833,13 +2912,13 @@ msgstr ""
"件包安装脚本的进度。"
#. Tag: title
-#: preseed.xml:1173
+#: preseed.xml:1184
#, no-c-format
msgid "Chainloading preconfiguration files"
msgstr "预置文件链"
#. Tag: para
-#: preseed.xml:1174
+#: preseed.xml:1185
#, no-c-format
msgid ""
"It is possible to include other preconfiguration files from a "
@@ -2853,7 +2932,7 @@ msgstr ""
"外的文件里面。"
#. Tag: screen
-#: preseed.xml:1184
+#: preseed.xml:1195
#, no-c-format
msgid ""
"# More than one file can be listed, separated by spaces; all will be\n"
@@ -2903,7 +2982,7 @@ msgstr ""
"#d-i preseed/run string foo.sh"
#. Tag: para
-#: preseed.xml:1186
+#: preseed.xml:1197
#, no-c-format
msgid ""
"It is also possible to chainload from the initrd or file preseeding phase, "
@@ -2916,3 +2995,9 @@ msgstr ""
"也可以通过在前面设置 preseed/url 从 initrd 或者文件预置链载进入网络预置。这将"
"使网络预置在网络连通时执行。您应该小心使用,因为这是两种预置,意味着您有机会"
"执行 preseed/early 命令,第二个可以在网络连通后使用。"
+
+#~ msgid "yes<footnoteref linkend=\"apx-ps-net\"/>"
+#~ msgstr "yes<footnoteref linkend=\"apx-ps-net\"/>"
+
+#~ msgid "desktop"
+#~ msgstr "desktop"
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index cfef974a4..6d48e532a 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-16 09:12+0000\n"
+"POT-Creation-Date: 2012-10-24 19:53+0000\n"
"PO-Revision-Date: 2012-07-25 14:07+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -981,44 +981,32 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:636
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Move the highlight to the keyboard selection you desire and press "
+#| "&enterkey;. Use the arrow keys to move the highlight &mdash; they are in "
+#| "the same place in all national language keyboard layouts, so they are "
+#| "independent of the keyboard configuration. An 'extended' keyboard is one "
+#| "with <keycap>F1</keycap> through <keycap>F10</keycap> keys along the top "
+#| "row."
msgid ""
"Move the highlight to the keyboard selection you desire and press "
"&enterkey;. Use the arrow keys to move the highlight &mdash; they are in the "
"same place in all national language keyboard layouts, so they are "
-"independent of the keyboard configuration. An 'extended' keyboard is one "
-"with <keycap>F1</keycap> through <keycap>F10</keycap> keys along the top row."
+"independent of the keyboard configuration."
msgstr ""
"将高亮显示部分移到您期望键盘选择,然后按下 &enterkey;。用箭头健移到高亮显示 "
"&mdash; 它们位于所有国家键盘布局相同的地方,因此独立于键盘配置。'扩展的'键盘"
"具有 <keycap>F1</keycap> 到 <keycap>F10</keycap> 健,与顶端平行。"
-#. Tag: para
-#: using-d-i.xml:645
-#, no-c-format
-msgid ""
-"There are two keyboard layouts for US keyboards; the qwerty/mac-usb-us "
-"(Apple USB) layout will place the Alt function on the <keycap>Command/Apple</"
-"keycap> key (in the keyboard position next to the <keycap>space</keycap> key "
-"similar to <keycap>Alt</keycap> on PC keyboards), while the qwerty/us "
-"(Standard) layout will place the Alt function on the <keycap>Option</keycap> "
-"key (engraved with 'alt' on most Mac keyboards). In other respects the two "
-"layouts are similar."
-msgstr ""
-"有两种 US 键盘布局;qwerty/mac-usb-us (Apple USB) 将 Alt 功能放在 "
-"<keycap>Command/Apple</keycap> 健 (处于键盘的 <keycap>空格</keycap> 健旁,类"
-"似于 PC 键盘的 <keycap>Alt</keycap> ),另外 qwerty/us (Standard) 布局将 Alt "
-"功能放在 <keycap>Option</keycap> 健上(在大多数 Mac 键盘上标明 'alt')。其余地"
-"方这两种布局相似。"
-
#. Tag: title
-#: using-d-i.xml:675
+#: using-d-i.xml:663
#, no-c-format
msgid "Looking for the &debian; Installer ISO Image"
msgstr "寻找 &debian; 安装程序 ISO 映像"
#. Tag: para
-#: using-d-i.xml:676
+#: using-d-i.xml:664
#, no-c-format
msgid ""
"When installing via the <emphasis>hd-media</emphasis> method, there will be "
@@ -1031,7 +1019,7 @@ msgstr ""
"scan</command> 正是用来完成此任务。"
#. Tag: para
-#: using-d-i.xml:683
+#: using-d-i.xml:671
#, no-c-format
msgid ""
"At first, <command>iso-scan</command> automatically mounts all block devices "
@@ -1058,7 +1046,7 @@ msgstr ""
"command> 搜索其它的映象。"
#. Tag: para
-#: using-d-i.xml:700
+#: using-d-i.xml:688
#, no-c-format
msgid ""
"In case the previous attempt to find an installer iso image fails, "
@@ -1070,7 +1058,7 @@ msgstr ""
"行完整的搜索。这次不只查看最上级目录,而是真正地贯穿整个文件系统。"
#. Tag: para
-#: using-d-i.xml:707
+#: using-d-i.xml:695
#, no-c-format
msgid ""
"If <command>iso-scan</command> does not discover your installer iso image, "
@@ -1086,13 +1074,13 @@ msgstr ""
"用户可以在第二个控制台上完成这些动作,而毋须重新启动。"
#. Tag: title
-#: using-d-i.xml:728
+#: using-d-i.xml:716
#, no-c-format
msgid "Configuring the Network"
msgstr "配置网络"
#. Tag: para
-#: using-d-i.xml:730
+#: using-d-i.xml:718
#, no-c-format
msgid ""
"As you enter this step, if the system detects that you have more than one "
@@ -1109,19 +1097,36 @@ msgstr ""
"<refentrytitle>interfaces</refentrytitle> <manvolnum>5</manvolnum> </"
"citerefentry> man 手册。"
-#. Tag: para
-#: using-d-i.xml:741
+#. Tag: title
+#: using-d-i.xml:732
#, no-c-format
+msgid "Automatic network configuration"
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:733
+#, fuzzy, no-c-format
+#| msgid ""
+#| "By default, &d-i; tries to configure your computer's network "
+#| "automatically via DHCP. If the DHCP probe succeeds, you are done. If the "
+#| "probe fails, it may be caused by many factors ranging from unplugged "
+#| "network cable, to a misconfigured DHCP setup. Or maybe you don't have a "
+#| "DHCP server in your local network at all. For further explanation, check "
+#| "the error messages on the fourth console. In any case, you will be asked "
+#| "if you want to retry, or if you want to perform a manual setup. DHCP "
+#| "servers are sometimes really slow in their responses, so if you are sure "
+#| "everything is in place, try again."
msgid ""
"By default, &d-i; tries to configure your computer's network automatically "
-"via DHCP. If the DHCP probe succeeds, you are done. If the probe fails, it "
-"may be caused by many factors ranging from unplugged network cable, to a "
-"misconfigured DHCP setup. Or maybe you don't have a DHCP server in your "
-"local network at all. For further explanation, check the error messages on "
-"the fourth console. In any case, you will be asked if you want to retry, or "
-"if you want to perform a manual setup. DHCP servers are sometimes really "
-"slow in their responses, so if you are sure everything is in place, try "
-"again."
+"as far as possible. If the automatic configuration fails, that may be caused "
+"by many factors ranging from an unplugged network cable to missing "
+"infrastructure for automatic configuration. For further explanation in case "
+"of errors, check the error messages on the fourth console. In any case, you "
+"will be asked if you want to retry, or if you want to perform a manual "
+"setup. Sometimes the network services used for autoconfiguration can be slow "
+"in their responses, so if you are sure everything is in place, simply start "
+"the autoconfiguration attempt again. If autoconfiguration fails repeatedly, "
+"you can instead choose the manual network setup."
msgstr ""
"默认情况下,&d-i; 会试着用 DHCP 自动配置您的计算机网络。如果侦测 DHCP 成功,"
"这一步就完成。如果失败,造成的原因会有多种因素,从没有接网线到错误设置的 "
@@ -1129,9 +1134,25 @@ msgstr ""
"息,了解更多的说明。不管怎样,您都会被要求选择是再试一次,还是手动配置。DHCP "
"服务器有时候响应很慢,如果您确定都正常,请再试一次。"
+#. Tag: title
+#: using-d-i.xml:752
+#, no-c-format
+msgid "Manual network configuration"
+msgstr ""
+
#. Tag: para
#: using-d-i.xml:753
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The manual network setup in turn asks you a number of questions about "
+#| "your network, notably <computeroutput>IP address</computeroutput>, "
+#| "<computeroutput>Netmask</computeroutput>, <computeroutput>Gateway</"
+#| "computeroutput>, <computeroutput>Name server addresses</computeroutput>, "
+#| "and a <computeroutput>Hostname</computeroutput>. Moreover, if you have a "
+#| "wireless network interface, you will be asked to provide your "
+#| "<computeroutput>Wireless ESSID</computeroutput> and a <computeroutput>WEP "
+#| "key</computeroutput> or <computeroutput>WPA/WPA2 passphrase</"
+#| "computeroutput>. Fill in the answers from <xref linkend=\"needed-info\"/>."
msgid ""
"The manual network setup in turn asks you a number of questions about your "
"network, notably <computeroutput>IP address</computeroutput>, "
@@ -1139,9 +1160,10 @@ msgid ""
"computeroutput>, <computeroutput>Name server addresses</computeroutput>, and "
"a <computeroutput>Hostname</computeroutput>. Moreover, if you have a "
"wireless network interface, you will be asked to provide your "
-"<computeroutput>Wireless ESSID</computeroutput> and a <computeroutput>WEP "
-"key</computeroutput> or <computeroutput>WPA/WPA2 passphrase</"
-"computeroutput>. Fill in the answers from <xref linkend=\"needed-info\"/>."
+"<computeroutput>Wireless ESSID</computeroutput> (<quote>wireless network "
+"name</quote>) and a <computeroutput>WEP key</computeroutput> or "
+"<computeroutput>WPA/WPA2 passphrase</computeroutput>. Fill in the answers "
+"from <xref linkend=\"needed-info\"/>."
msgstr ""
"手动配置网络会依次询问一些网络问题,特别是 <computeroutput>IP 地址(IP "
"address)</computeroutput>、<computeroutput>网络掩码(Netmask)</"
@@ -1173,13 +1195,40 @@ msgstr ""
"filename> 文件进行修改。"
#. Tag: title
-#: using-d-i.xml:815
+#: using-d-i.xml:784
+#, no-c-format
+msgid "IPv4 and IPv6"
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:785
+#, no-c-format
+msgid ""
+"From &debian-gnu; 7.0 (<quote>Wheezy</quote>) onwards, &d-i; supports IPv6 "
+"as well as the <quote>classic</quote> IPv4. All combinations of IPv4 and "
+"IPv6 (IPv4-only, IPv6-only and dual-stack configurations) are supported."
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:791
+#, no-c-format
+msgid ""
+"Autoconfiguration for IPv4 is done via DHCP (Dynamic Host Configuration "
+"Protocol). Autoconfiguration for IPv6 supports stateless autoconfiguration "
+"using NDP (Neighbor Discovery Protocol, including recursive DNS server "
+"(RDNSS) assignment), stateful autoconfiguration via DHCPv6 and mixed "
+"stateless/stateful autoconfiguration (address configuration via NDP, "
+"additional parameters via DHCPv6)."
+msgstr ""
+
+#. Tag: title
+#: using-d-i.xml:837
#, no-c-format
msgid "Configuring the Clock and Time Zone"
msgstr "配置时钟和时区"
#. Tag: para
-#: using-d-i.xml:817
+#: using-d-i.xml:839
#, no-c-format
msgid ""
"The installer will first attempt to connect to a time server on the Internet "
@@ -1194,13 +1243,13 @@ msgstr ""
"的。在安装过程中没法手动对系统时间进行设置。"
#. Tag: para
-#: using-d-i.xml:826
+#: using-d-i.xml:848
#, no-c-format
msgid "The installer does not modify the system clock on the s390 platform."
msgstr "在 s390 平台,安装程序不会修改系统时钟。"
#. Tag: para
-#: using-d-i.xml:839
+#: using-d-i.xml:861
#, no-c-format
msgid ""
"Depending on the location selected earlier in the installation process, you "
@@ -1212,7 +1261,7 @@ msgstr ""
"如果该地只对应一个时区并且是默认安装,那么系统就不会询问而直接使用该时区。"
#. Tag: para
-#: using-d-i.xml:847
+#: using-d-i.xml:869
#, no-c-format
msgid ""
"In expert mode or when installing at medium priority, you will have the "
@@ -1223,7 +1272,7 @@ msgstr ""
"<quote>Coordinated Universal Time</quote> (UTC) 作为时区。"
#. Tag: para
-#: using-d-i.xml:853
+#: using-d-i.xml:875
#, no-c-format
msgid ""
"If for some reason you wish to set a time zone for the installed system that "
@@ -1234,7 +1283,7 @@ msgstr ""
"选项。"
#. Tag: para
-#: using-d-i.xml:864
+#: using-d-i.xml:886
#, no-c-format
msgid ""
"The simplest option is to just select a different time zone after the "
@@ -1245,13 +1294,13 @@ msgstr ""
"为:"
#. Tag: screen
-#: using-d-i.xml:870
+#: using-d-i.xml:892
#, no-c-format
msgid "# dpkg-reconfigure tzdata"
msgstr "# dpkg-reconfigure tzdata"
#. Tag: para
-#: using-d-i.xml:876
+#: using-d-i.xml:898
#, no-c-format
msgid ""
"Alternatively, the time zone can be set at the very start of the "
@@ -1266,7 +1315,7 @@ msgstr ""
"userinput> 或 <userinput>UTC</userinput>。"
#. Tag: para
-#: using-d-i.xml:890
+#: using-d-i.xml:912
#, no-c-format
msgid ""
"For automated installations the time zone can be set to any desired value "
@@ -1274,13 +1323,13 @@ msgid ""
msgstr "自动安装可以通过预置设置任何所需的时区。"
#. Tag: title
-#: using-d-i.xml:904
+#: using-d-i.xml:926
#, no-c-format
msgid "Setting Up Users And Passwords"
msgstr "设置用户和密码"
#. Tag: para
-#: using-d-i.xml:905
+#: using-d-i.xml:927
#, no-c-format
msgid ""
"Just before configuring the clock, the installer will allow you to set up "
@@ -1291,13 +1340,13 @@ msgstr ""
"号。其他的用户帐号可以在安装完成之后创建。"
#. Tag: title
-#: using-d-i.xml:919
+#: using-d-i.xml:941
#, no-c-format
msgid "Set the Root Password"
msgstr "设置 root 密码"
#. Tag: para
-#: using-d-i.xml:923
+#: using-d-i.xml:945
#, no-c-format
msgid ""
"The <emphasis>root</emphasis> account is also called the <emphasis>super-"
@@ -1310,7 +1359,7 @@ msgstr ""
"理,而且使用时间应该尽可能短。"
#. Tag: para
-#: using-d-i.xml:931
+#: using-d-i.xml:953
#, no-c-format
msgid ""
"Any password you create should contain at least 6 characters, and should "
@@ -1324,7 +1373,7 @@ msgstr ""
"小心。请避免采用能够在字典中查到的单词或者很容易猜测的个人信息。"
#. Tag: para
-#: using-d-i.xml:939
+#: using-d-i.xml:961
#, no-c-format
msgid ""
"If anyone ever tells you they need your root password, be extremely wary. "
@@ -1335,13 +1384,13 @@ msgstr ""
"员,否则通常不应该将超级用户密码交给别人。"
#. Tag: title
-#: using-d-i.xml:949
+#: using-d-i.xml:971
#, no-c-format
msgid "Create an Ordinary User"
msgstr "创建一个普通用户"
#. Tag: para
-#: using-d-i.xml:951
+#: using-d-i.xml:973
#, no-c-format
msgid ""
"The system will ask you whether you wish to create an ordinary user account "
@@ -1353,7 +1402,7 @@ msgstr ""
"记,平时<emphasis>不要</emphasis>使用 root 帐户登录或者将其作为个人帐号使用。"
#. Tag: para
-#: using-d-i.xml:960
+#: using-d-i.xml:982
#, no-c-format
msgid ""
"Why not? Well, one reason to avoid using root's privileges is that it is "
@@ -1371,7 +1420,7 @@ msgstr ""
"容,建议找一本进行学习。"
#. Tag: para
-#: using-d-i.xml:970
+#: using-d-i.xml:992
#, no-c-format
msgid ""
"You will first be prompted for the user's full name. Then you'll be asked "
@@ -1383,7 +1432,7 @@ msgstr ""
"便满足要求,并为缺省值。最后,您将要求输入该帐号的密码。"
#. Tag: para
-#: using-d-i.xml:977
+#: using-d-i.xml:999
#, no-c-format
msgid ""
"If at any point after installation you would like to create another account, "
@@ -1393,13 +1442,13 @@ msgstr ""
"令。"
#. Tag: title
-#: using-d-i.xml:988
+#: using-d-i.xml:1010
#, no-c-format
msgid "Partitioning and Mount Point Selection"
msgstr "分区与选择挂载点"
#. Tag: para
-#: using-d-i.xml:989
+#: using-d-i.xml:1011
#, no-c-format
msgid ""
"At this time, after hardware detection has been executed a final time, &d-i; "
@@ -1414,7 +1463,7 @@ msgstr ""
"排挂载点,还可以选择为 RAID、LVM 或加密设备这组选项进行配置。"
#. Tag: para
-#: using-d-i.xml:1010
+#: using-d-i.xml:1032
#, no-c-format
msgid ""
"If you are uncomfortable with partitioning, or just want to know more "
@@ -1424,7 +1473,7 @@ msgstr ""
"\"partitioning\"/>。"
#. Tag: para
-#: using-d-i.xml:1016
+#: using-d-i.xml:1038
#, no-c-format
msgid ""
"If a hard disk has previously used under Solaris, the partitioner may not "
@@ -1444,7 +1493,7 @@ msgstr ""
"</screen></informalexample> 注意,这会是磁盘上已有的数据无法访问。"
#. Tag: para
-#: using-d-i.xml:1029
+#: using-d-i.xml:1051
#, no-c-format
msgid ""
"First you will be given the opportunity to automatically partition either an "
@@ -1457,13 +1506,13 @@ msgstr ""
"<guimenuitem>Manual</guimenuitem> 手动分区。"
#. Tag: title
-#: using-d-i.xml:1039
+#: using-d-i.xml:1061
#, no-c-format
msgid "Supported partitioning options"
msgstr "支持的分区选项"
#. Tag: para
-#: using-d-i.xml:1040
+#: using-d-i.xml:1062
#, no-c-format
msgid ""
"The partitioner used in &d-i; is fairly versatile. It allows to create many "
@@ -1474,7 +1523,7 @@ msgstr ""
"块设备创建多种分区方案。"
#. Tag: para
-#: using-d-i.xml:1046
+#: using-d-i.xml:1068
#, no-c-format
msgid ""
"Exactly which options are available depends mainly on the architecture, but "
@@ -1491,7 +1540,7 @@ msgstr ""
"装下改变;高优先级下会采用默认值。"
#. Tag: para
-#: using-d-i.xml:1057
+#: using-d-i.xml:1079
#, no-c-format
msgid ""
"The installer supports various forms of advanced partitioning and use of "
@@ -1499,31 +1548,31 @@ msgid ""
msgstr "安装程序支持多种高级分区和存储设备,很多情况下可以组合使用。"
#. Tag: emphasis
-#: using-d-i.xml:1064
+#: using-d-i.xml:1086
#, no-c-format
msgid "Logical Volume Management (LVM)"
msgstr "逻辑卷管理(LVM)"
#. Tag: emphasis
-#: using-d-i.xml:1067
+#: using-d-i.xml:1089
#, no-c-format
msgid "Software RAID"
msgstr "Software RAID"
#. Tag: para
-#: using-d-i.xml:1068
+#: using-d-i.xml:1090
#, no-c-format
msgid "Supported are RAID levels 0, 1, 4, 5, 6 and 10."
msgstr "支持 RAID levels 0, 1, 4, 5, 6 和 10。"
#. Tag: emphasis
-#: using-d-i.xml:1072
+#: using-d-i.xml:1094
#, no-c-format
msgid "Encryption"
msgstr "加密"
#. Tag: para
-#: using-d-i.xml:1074
+#: using-d-i.xml:1096
#, no-c-format
msgid ""
"<emphasis>Serial ATA RAID</emphasis> (using <classname>dmraid</classname>)"
@@ -1531,7 +1580,7 @@ msgstr ""
"<emphasis>Serial ATA RAID</emphasis> (采用 <classname>dmraid</classname>)"
#. Tag: para
-#: using-d-i.xml:1076
+#: using-d-i.xml:1098
#, no-c-format
msgid ""
"Also called <quote>fake RAID</quote> or <quote>BIOS RAID</quote>. Support "
@@ -1544,13 +1593,13 @@ msgstr ""
"sataraid;\">我们的 Wiki</ulink>。"
#. Tag: para
-#: using-d-i.xml:1082
+#: using-d-i.xml:1104
#, no-c-format
msgid "<emphasis>Multipath</emphasis> (experimental)"
msgstr "<emphasis>Multipath</emphasis> (experimental)"
#. Tag: para
-#: using-d-i.xml:1084
+#: using-d-i.xml:1106
#, no-c-format
msgid ""
"See <ulink url=\"&url-d-i-multipath;\">our Wiki</ulink> for information. "
@@ -1561,13 +1610,13 @@ msgstr ""
"于 multipath 只在安装程序启动时打开才支持。"
#. Tag: para
-#: using-d-i.xml:1091
+#: using-d-i.xml:1113
#, no-c-format
msgid "The following file systems are supported."
msgstr "支持下列的文件系统。"
#. Tag: para
-#: using-d-i.xml:1096
+#: using-d-i.xml:1118
#, no-c-format
msgid ""
"<phrase arch=\"arm;mipsel\"><emphasis>ext2r0</emphasis>,</phrase> "
@@ -1581,7 +1630,7 @@ msgstr ""
"phrase>"
#. Tag: para
-#: using-d-i.xml:1101
+#: using-d-i.xml:1123
#, no-c-format
msgid ""
"The default file system selected in most cases is ext3; for <filename>/boot</"
@@ -1592,37 +1641,37 @@ msgstr ""
"filename> 分区选择 ext2 作为默认值。"
#. Tag: para
-#: using-d-i.xml:1106
+#: using-d-i.xml:1128
#, no-c-format
msgid "<emphasis>jfs</emphasis> (not available on all architectures)"
msgstr "<emphasis>jfs</emphasis> (并不是所有架构都支持)"
#. Tag: emphasis
-#: using-d-i.xml:1110
+#: using-d-i.xml:1132
#, no-c-format
msgid "<emphasis>ufs</emphasis>"
msgstr "<emphasis>ufs</emphasis>"
#. Tag: para
-#: using-d-i.xml:1111
+#: using-d-i.xml:1133
#, no-c-format
msgid "The default file system is UFS."
msgstr "默认文件系统是 UFS。"
#. Tag: para
-#: using-d-i.xml:1114
+#: using-d-i.xml:1136
#, no-c-format
msgid "<emphasis>xfs</emphasis> (not available on all architectures)"
msgstr "<emphasis>xfs</emphasis> (并不是所有架构都支持)"
#. Tag: emphasis
-#: using-d-i.xml:1118
+#: using-d-i.xml:1140
#, no-c-format
msgid "<emphasis>zfs</emphasis>"
msgstr "<emphasis>zfs</emphasis>"
#. Tag: para
-#: using-d-i.xml:1119
+#: using-d-i.xml:1141
#, no-c-format
msgid ""
"As ZFS support in the installer is still in development, only a basic subset "
@@ -1633,7 +1682,7 @@ msgstr ""
"通过手动方式在初始安装之后打开,但仍有一些地方需要注意:"
#. Tag: para
-#: using-d-i.xml:1124
+#: using-d-i.xml:1146
#, no-c-format
msgid ""
"Each ZFS pool will host only one filesystem. After install is finished, more "
@@ -1644,7 +1693,7 @@ msgstr ""
"create</quote> 命令在这个 pool 中创建更多的文件系统。"
#. Tag: para
-#: using-d-i.xml:1129
+#: using-d-i.xml:1151
#, no-c-format
msgid ""
"Each ZFS pool will be composed of exactly one partition. After install is "
@@ -1660,7 +1709,7 @@ msgstr ""
"件系统的 pool 执行这种操作,那样 GRUB 将无法引导您的系统。"
#. Tag: para
-#: using-d-i.xml:1137
+#: using-d-i.xml:1159
#, no-c-format
msgid ""
"Compression is not currently supported. After the install is finished, "
@@ -1674,14 +1723,14 @@ msgstr ""
"pool 上,使用异于默认的压缩算法(lzjb)将导致 GRUB 无法引导您的系统。"
#. Tag: para
-#: using-d-i.xml:1146
+#: using-d-i.xml:1168
#, no-c-format
msgid ""
"<emphasis>reiserfs</emphasis> (optional; not available on all architectures)"
msgstr "<emphasis>reiserfs</emphasis> (选项;并不是所有架构都支持)"
#. Tag: para
-#: using-d-i.xml:1148
+#: using-d-i.xml:1170
#, no-c-format
msgid ""
"Support for the Reiser file system is no longer available by default. When "
@@ -1694,13 +1743,13 @@ msgstr ""
"版本 3。"
#. Tag: emphasis
-#: using-d-i.xml:1155
+#: using-d-i.xml:1177
#, no-c-format
msgid "jffs2"
msgstr "jffs2"
#. Tag: para
-#: using-d-i.xml:1156
+#: using-d-i.xml:1178
#, no-c-format
msgid ""
"Used on some systems to read flash memory. It is not possible to create new "
@@ -1708,13 +1757,13 @@ msgid ""
msgstr "在一些系统上用于读取闪存。不可以创建新的 jffs2 分区。"
#. Tag: emphasis
-#: using-d-i.xml:1161
+#: using-d-i.xml:1183
#, no-c-format
msgid "qnx4"
msgstr "qnx4"
#. Tag: para
-#: using-d-i.xml:1162
+#: using-d-i.xml:1184
#, no-c-format
msgid ""
"Existing partitions will be recognized and it is possible to assign mount "
@@ -1722,19 +1771,19 @@ msgid ""
msgstr "识别已存在的分区并挂载它们。不可以创建新的 qnx4 分区。"
#. Tag: para
-#: using-d-i.xml:1166
+#: using-d-i.xml:1188
#, no-c-format
msgid "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
msgstr "<emphasis>FAT16</emphasis>, <emphasis>FAT32</emphasis>"
#. Tag: para
-#: using-d-i.xml:1169
+#: using-d-i.xml:1191
#, no-c-format
msgid "<emphasis>NTFS</emphasis> (read-only)"
msgstr "<emphasis>NTFS</emphasis> (只读)"
#. Tag: para
-#: using-d-i.xml:1171
+#: using-d-i.xml:1193
#, no-c-format
msgid ""
"Existing NTFS partitions can be resized and it is possible to assign mount "
@@ -1742,13 +1791,13 @@ msgid ""
msgstr "已存在的 NTFS 分区可以调整大小,并挂载它们。不能创建新的 NTFS 分区。"
#. Tag: title
-#: using-d-i.xml:1181
+#: using-d-i.xml:1203
#, no-c-format
msgid "Guided Partitioning"
msgstr "导引式分区"
#. Tag: para
-#: using-d-i.xml:1182
+#: using-d-i.xml:1204
#, no-c-format
msgid ""
"If you choose guided partitioning, you may have three options: to create "
@@ -1764,14 +1813,14 @@ msgstr ""
"footnote>"
#. Tag: para
-#: using-d-i.xml:1197
+#: using-d-i.xml:1219
#, no-c-format
msgid ""
"The option to use (encrypted) LVM may not be available on all architectures."
msgstr "(加密) LVM 的选项并不是在所有体系下都可用。"
#. Tag: para
-#: using-d-i.xml:1202
+#: using-d-i.xml:1224
#, no-c-format
msgid ""
"When using LVM or encrypted LVM, the installer will create most partitions "
@@ -1785,7 +1834,7 @@ msgstr ""
"大分区将无法读取,对您的(私有)数据提供了额外的安全性。"
#. Tag: para
-#: using-d-i.xml:1211
+#: using-d-i.xml:1233
#, no-c-format
msgid ""
"When using encrypted LVM, the installer will also automatically erase the "
@@ -1799,7 +1848,7 @@ msgstr ""
"时间。"
#. Tag: para
-#: using-d-i.xml:1220
+#: using-d-i.xml:1242
#, no-c-format
msgid ""
"If you choose guided partitioning using LVM or encrypted LVM, some changes "
@@ -1814,7 +1863,7 @@ msgstr ""
"安装程序会在写入磁盘之前让您确认。"
#. Tag: para
-#: using-d-i.xml:1230
+#: using-d-i.xml:1252
#, no-c-format
msgid ""
"If you choose guided partitioning<phrase arch=\"linux-any\"> (either classic "
@@ -1830,7 +1879,7 @@ msgstr ""
"但磁盘的尺寸将会协助您辨别它们。"
#. Tag: para
-#: using-d-i.xml:1239
+#: using-d-i.xml:1261
#, no-c-format
msgid ""
"Any data on the disk you select will eventually be lost, but you will always "
@@ -1844,7 +1893,7 @@ msgstr ""
"用(加密) LVM 方式则不能撤销。</phrase>"
#. Tag: para
-#: using-d-i.xml:1249
+#: using-d-i.xml:1271
#, no-c-format
msgid ""
"Next, you will be able to choose from the schemes listed in the table below. "
@@ -1860,73 +1909,73 @@ msgstr ""
"1GB 以上的空间(具体大小视所选的方式而不同),那么导引式分区将以失败告终。"
#. Tag: entry
-#: using-d-i.xml:1265
+#: using-d-i.xml:1287
#, no-c-format
msgid "Partitioning scheme"
msgstr "分区方式"
#. Tag: entry
-#: using-d-i.xml:1266
+#: using-d-i.xml:1288
#, no-c-format
msgid "Minimum space"
msgstr "所需最小空间"
#. Tag: entry
-#: using-d-i.xml:1267
+#: using-d-i.xml:1289
#, no-c-format
msgid "Created partitions"
msgstr "所新建的分区"
#. Tag: entry
-#: using-d-i.xml:1273
+#: using-d-i.xml:1295
#, no-c-format
msgid "All files in one partition"
msgstr "所有文件在同一分区"
#. Tag: entry
-#: using-d-i.xml:1274
+#: using-d-i.xml:1296
#, no-c-format
msgid "600MB"
msgstr "600MB"
#. Tag: entry
-#: using-d-i.xml:1275
+#: using-d-i.xml:1297
#, no-c-format
msgid "<filename>/</filename>, swap"
msgstr "<filename>/</filename>, swap"
#. Tag: entry
-#: using-d-i.xml:1277
+#: using-d-i.xml:1299
#, no-c-format
msgid "Separate /home partition"
msgstr "建立 /home 分区"
#. Tag: entry
-#: using-d-i.xml:1278
+#: using-d-i.xml:1300
#, no-c-format
msgid "500MB"
msgstr "500MB"
#. Tag: entry
-#: using-d-i.xml:1279
+#: using-d-i.xml:1301
#, no-c-format
msgid "<filename>/</filename>, <filename>/home</filename>, swap"
msgstr "<filename>/</filename>, <filename>/home</filename>, swap"
#. Tag: entry
-#: using-d-i.xml:1283
+#: using-d-i.xml:1305
#, no-c-format
msgid "Separate /home, /usr, /var and /tmp partitions"
msgstr "分别建立 /home、/usr、/var 和 /tmp 分区"
#. Tag: entry
-#: using-d-i.xml:1284
+#: using-d-i.xml:1306
#, no-c-format
msgid "<entry>1GB</entry>"
msgstr "<entry>1GB</entry>"
#. Tag: entry
-#: using-d-i.xml:1285
+#: using-d-i.xml:1307
#, no-c-format
msgid ""
"<filename>/</filename>, <filename>/home</filename>, <filename>/usr</"
@@ -1936,7 +1985,7 @@ msgstr ""
"filename>, <filename>/var</filename>, <filename>/tmp</filename>, swap"
#. Tag: para
-#: using-d-i.xml:1294
+#: using-d-i.xml:1316
#, no-c-format
msgid ""
"If you choose guided partitioning using (encrypted) LVM, the installer will "
@@ -1948,7 +1997,7 @@ msgstr ""
"boot</filename> 分区。其他的分区,除了交换分区,都会建在 LVM 分区之内。"
#. Tag: para
-#: using-d-i.xml:1300
+#: using-d-i.xml:1322
#, no-c-format
msgid ""
"If you choose guided partitioning for your IA-64 system, there will be an "
@@ -1961,7 +2010,7 @@ msgstr ""
"手动把某个分区作为 EFI 引导分区。"
#. Tag: para
-#: using-d-i.xml:1308
+#: using-d-i.xml:1330
#, no-c-format
msgid ""
"After selecting a scheme, the next screen will show your new partition "
@@ -1972,7 +2021,7 @@ msgstr ""
"区是否将被格式化,将以何种方式格式化,以及它们将被挂载到哪里的相关信息。"
#. Tag: para
-#: using-d-i.xml:1314
+#: using-d-i.xml:1336
#, no-c-format
msgid ""
"The list of partitions might look like this: <informalexample><screen>\n"
@@ -2020,7 +2069,7 @@ msgstr ""
"置,但使用手动方式分区的结果会有所不同。"
#. Tag: para
-#: using-d-i.xml:1327
+#: using-d-i.xml:1349
#, no-c-format
msgid ""
"This concludes the guided partitioning. If you are satisfied with the "
@@ -2038,13 +2087,13 @@ msgstr ""
"后再次运行导引式分区,或者按照下面的介绍进行手动分区。"
#. Tag: title
-#: using-d-i.xml:1341
+#: using-d-i.xml:1363
#, no-c-format
msgid "Manual Partitioning"
msgstr "手动分区"
#. Tag: para
-#: using-d-i.xml:1342
+#: using-d-i.xml:1364
#, no-c-format
msgid ""
"A similar screen to the one shown just above will be displayed if you choose "
@@ -2059,7 +2108,7 @@ msgstr ""
"面谈到。"
#. Tag: para
-#: using-d-i.xml:1350
+#: using-d-i.xml:1372
#, no-c-format
msgid ""
"If you select a pristine disk which has neither partitions nor free space on "
@@ -2072,7 +2121,7 @@ msgstr ""
"的磁盘条目下出现一个新行,上面写着 <quote>FREE SPACE</quote>。"
#. Tag: para
-#: using-d-i.xml:1358
+#: using-d-i.xml:1380
#, no-c-format
msgid ""
"If you select some free space, you will have the opportunity to create a new "
@@ -2109,7 +2158,7 @@ msgstr ""
"<command>partman</command> 的主界面。"
#. Tag: para
-#: using-d-i.xml:1380
+#: using-d-i.xml:1402
#, no-c-format
msgid ""
"If you decide you want to change something about your partition, simply "
@@ -2128,7 +2177,7 @@ msgstr ""
"这个菜单中,您还可以删除分区。"
#. Tag: para
-#: using-d-i.xml:1391
+#: using-d-i.xml:1413
#, no-c-format
msgid ""
"Be sure to create at least two partitions: one for the <emphasis>root</"
@@ -2143,7 +2192,7 @@ msgstr ""
"面的步骤,直到您纠正了这个错误。"
#. Tag: para
-#: using-d-i.xml:1399
+#: using-d-i.xml:1421
#, no-c-format
msgid ""
"If you forget to select and format an EFI boot partition, <command>partman</"
@@ -2154,7 +2203,7 @@ msgstr ""
"点,不让您继续操作,直到您划分出这样一个分区。"
#. Tag: para
-#: using-d-i.xml:1405
+#: using-d-i.xml:1427
#, no-c-format
msgid ""
"Capabilities of <command>partman</command> can be extended with installer "
@@ -2170,7 +2219,7 @@ msgstr ""
"filename> 或者 <filename>partman-lvm</filename>)。"
#. Tag: para
-#: using-d-i.xml:1413
+#: using-d-i.xml:1435
#, no-c-format
msgid ""
"After you are satisfied with partitioning, select <guimenuitem>Finish "
@@ -2184,13 +2233,13 @@ msgstr ""
"此分区。"
#. Tag: title
-#: using-d-i.xml:1441
+#: using-d-i.xml:1463
#, no-c-format
msgid "Configuring Multidisk Devices (Software RAID)"
msgstr "配置多磁盘设备(软 RAID)"
#. Tag: para
-#: using-d-i.xml:1442
+#: using-d-i.xml:1464
#, no-c-format
msgid ""
"If you have more than one harddrive<footnote><para> To be honest, you can "
@@ -2208,7 +2257,7 @@ msgstr ""
"<firstterm>软 RAID</firstterm>)。"
#. Tag: para
-#: using-d-i.xml:1455
+#: using-d-i.xml:1477
#, no-c-format
msgid ""
"MD is basically a bunch of partitions located on different disks and "
@@ -2221,7 +2270,7 @@ msgstr ""
"command> 格式化,分配挂载点,等等)。"
#. Tag: para
-#: using-d-i.xml:1463
+#: using-d-i.xml:1485
#, no-c-format
msgid ""
"What benefits this brings depends on the type of MD device you are creating. "
@@ -2313,101 +2362,101 @@ msgstr ""
"listitem> </varlistentry></variablelist> 总结:"
#. Tag: entry
-#: using-d-i.xml:1577
+#: using-d-i.xml:1599
#, no-c-format
msgid "Type"
msgstr "类型"
#. Tag: entry
-#: using-d-i.xml:1578
+#: using-d-i.xml:1600
#, no-c-format
msgid "Minimum Devices"
msgstr "最少设备"
#. Tag: entry
-#: using-d-i.xml:1579
+#: using-d-i.xml:1601
#, no-c-format
msgid "Spare Device"
msgstr "备用设备"
#. Tag: entry
-#: using-d-i.xml:1580
+#: using-d-i.xml:1602
#, no-c-format
msgid "Survives disk failure?"
msgstr "幸免于磁盘损坏?"
#. Tag: entry
-#: using-d-i.xml:1581
+#: using-d-i.xml:1603
#, no-c-format
msgid "Available Space"
msgstr "可用空间"
#. Tag: entry
-#: using-d-i.xml:1587
+#: using-d-i.xml:1609
#, no-c-format
msgid "RAID0"
msgstr "RAID0"
# index.docbook:1105, index.docbook:1113
#. Tag: entry
-#: using-d-i.xml:1588 using-d-i.xml:1596 using-d-i.xml:1626
+#: using-d-i.xml:1610 using-d-i.xml:1618 using-d-i.xml:1648
#, no-c-format
msgid "<entry>2</entry>"
msgstr "<entry>2</entry>"
# index.docbook:1106, index.docbook:1107
#. Tag: entry
-#: using-d-i.xml:1589 using-d-i.xml:1590
+#: using-d-i.xml:1611 using-d-i.xml:1612
#, no-c-format
msgid "<entry>no</entry>"
msgstr "<entry>否</entry>"
#. Tag: entry
-#: using-d-i.xml:1591
+#: using-d-i.xml:1613
#, no-c-format
msgid "Size of the smallest partition multiplied by number of devices in RAID"
msgstr "容量为最小分区乘以 RAID 设备数"
#. Tag: entry
-#: using-d-i.xml:1595
+#: using-d-i.xml:1617
#, no-c-format
msgid "RAID1"
msgstr "RAID1"
# index.docbook:1114, index.docbook:1122
#. Tag: entry
-#: using-d-i.xml:1597 using-d-i.xml:1605 using-d-i.xml:1616 using-d-i.xml:1627
+#: using-d-i.xml:1619 using-d-i.xml:1627 using-d-i.xml:1638 using-d-i.xml:1649
#, no-c-format
msgid "optional"
msgstr "可选"
# index.docbook:1115, index.docbook:1123
#. Tag: entry
-#: using-d-i.xml:1598 using-d-i.xml:1606 using-d-i.xml:1617 using-d-i.xml:1628
+#: using-d-i.xml:1620 using-d-i.xml:1628 using-d-i.xml:1639 using-d-i.xml:1650
#, no-c-format
msgid "<entry>yes</entry>"
msgstr "<entry>是</entry>"
#. Tag: entry
-#: using-d-i.xml:1599
+#: using-d-i.xml:1621
#, no-c-format
msgid "Size of the smallest partition in RAID"
msgstr "容量为 RAID 最小分区"
#. Tag: entry
-#: using-d-i.xml:1603
+#: using-d-i.xml:1625
#, no-c-format
msgid "RAID5"
msgstr "RAID5"
#. Tag: entry
-#: using-d-i.xml:1604
+#: using-d-i.xml:1626
#, no-c-format
msgid "<entry>3</entry>"
msgstr "<entry>3</entry>"
#. Tag: entry
-#: using-d-i.xml:1607
+#: using-d-i.xml:1629
#, no-c-format
msgid ""
"Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2415,20 +2464,20 @@ msgid ""
msgstr "容量为最小分区乘以(RAID 设备数量减一)"
#. Tag: entry
-#: using-d-i.xml:1614
+#: using-d-i.xml:1636
#, no-c-format
msgid "RAID6"
msgstr "RAID6"
# index.docbook:1105, index.docbook:1113
#. Tag: entry
-#: using-d-i.xml:1615
+#: using-d-i.xml:1637
#, no-c-format
msgid "<entry>4</entry>"
msgstr "<entry>4</entry>"
#. Tag: entry
-#: using-d-i.xml:1618
+#: using-d-i.xml:1640
#, no-c-format
msgid ""
"Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2436,13 +2485,13 @@ msgid ""
msgstr "容量为最小分区乘以(RAID 设备数量减二)"
#. Tag: entry
-#: using-d-i.xml:1625
+#: using-d-i.xml:1647
#, no-c-format
msgid "RAID10"
msgstr "RAID10"
#. Tag: entry
-#: using-d-i.xml:1629
+#: using-d-i.xml:1651
#, no-c-format
msgid ""
"Total of all partitions divided by the number of chunk copies (defaults to "
@@ -2450,7 +2499,7 @@ msgid ""
msgstr "所有的分区数除以 chunk 拷贝数(默认为二)"
#. Tag: para
-#: using-d-i.xml:1636
+#: using-d-i.xml:1658
#, no-c-format
msgid ""
"If you want to know more about Software RAID, have a look at <ulink url="
@@ -2460,7 +2509,7 @@ msgstr ""
"\">Software RAID HOWTO</ulink>。"
#. Tag: para
-#: using-d-i.xml:1641
+#: using-d-i.xml:1663
#, no-c-format
msgid ""
"To create an MD device, you need to have the desired partitions it should "
@@ -2475,7 +2524,7 @@ msgstr ""
"volume for RAID</guimenuitem> </menuchoice>。)"
#. Tag: para
-#: using-d-i.xml:1650
+#: using-d-i.xml:1672
#, no-c-format
msgid ""
"Make sure that the system can be booted with the partitioning scheme you are "
@@ -2493,7 +2542,7 @@ msgstr ""
"<filename>/</filename> 同时 RAID1 给 <filename>/boot</filename> 是一种方式。"
#. Tag: para
-#: using-d-i.xml:1662
+#: using-d-i.xml:1684
#, no-c-format
msgid ""
"Support for MD is a relatively new addition to the installer. You may "
@@ -2508,7 +2557,7 @@ msgstr ""
"验的用户,从 shell 手动地处理一些配置和安装步骤,也许会绕开这些问题。"
#. Tag: para
-#: using-d-i.xml:1671
+#: using-d-i.xml:1693
#, no-c-format
msgid ""
"Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> "
@@ -2528,7 +2577,7 @@ msgstr ""
"RAID1)。后续操作会根据您选择的 MD 类型而定。"
#. Tag: para
-#: using-d-i.xml:1684
+#: using-d-i.xml:1706
#, no-c-format
msgid ""
"RAID0 is simple &mdash; you will be issued with the list of available RAID "
@@ -2539,7 +2588,7 @@ msgstr ""
"组成 MD 的分区。"
#. Tag: para
-#: using-d-i.xml:1691
+#: using-d-i.xml:1713
#, no-c-format
msgid ""
"RAID1 is a bit more tricky. First, you will be asked to enter the number of "
@@ -2556,7 +2605,7 @@ msgstr ""
"将不会允许您继续下去,直到纠正错误。"
#. Tag: para
-#: using-d-i.xml:1703
+#: using-d-i.xml:1725
#, no-c-format
msgid ""
"RAID5 has a setup procedure similar to RAID1 with the exception that you "
@@ -2566,7 +2615,7 @@ msgstr ""
"区。"
#. Tag: para
-#: using-d-i.xml:1709
+#: using-d-i.xml:1731
#, no-c-format
msgid ""
"RAID6 also has a setup procedure similar to RAID1 except that at least "
@@ -2576,7 +2625,7 @@ msgstr ""
"区。"
#. Tag: para
-#: using-d-i.xml:1715
+#: using-d-i.xml:1737
#, no-c-format
msgid ""
"RAID10 again has a setup procedure similar to RAID1 except in expert mode. "
@@ -2594,7 +2643,7 @@ msgstr ""
"贝数。这些活动设备必须是让所有的拷贝可以分布到不同磁盘。"
#. Tag: para
-#: using-d-i.xml:1729
+#: using-d-i.xml:1751
#, no-c-format
msgid ""
"It is perfectly possible to have several types of MD at once. For example, "
@@ -2610,7 +2659,7 @@ msgstr ""
"RAID1 (相当可靠的 100 GB 分区用于 <filename>/home</filename>)。"
#. Tag: para
-#: using-d-i.xml:1738
+#: using-d-i.xml:1760
#, no-c-format
msgid ""
"After you set up MD devices to your liking, you can <guimenuitem>Finish</"
@@ -2623,13 +2672,13 @@ msgstr ""
"您的新 MD 设备,并分配挂载点这样的属性。"
#. Tag: title
-#: using-d-i.xml:1753
+#: using-d-i.xml:1775
#, no-c-format
msgid "Configuring the Logical Volume Manager (LVM)"
msgstr "配置逻辑卷管理(LVM)"
#. Tag: para
-#: using-d-i.xml:1754
+#: using-d-i.xml:1776
#, no-c-format
msgid ""
"If you are working with computers at the level of system administrator or "
@@ -2643,7 +2692,7 @@ msgstr ""
"或符号链接等方法来折腾。"
#. Tag: para
-#: using-d-i.xml:1762
+#: using-d-i.xml:1784
#, no-c-format
msgid ""
"To avoid the described situation you can use Logical Volume Manager (LVM). "
@@ -2661,7 +2710,7 @@ msgstr ""
"点在于它可以跨越多个物理磁盘。"
#. Tag: para
-#: using-d-i.xml:1772
+#: using-d-i.xml:1794
#, no-c-format
msgid ""
"Now when you realize you need more space for your old 160GB <filename>/home</"
@@ -2679,7 +2728,7 @@ msgstr ""
"阅 <ulink url=\"&url-lvm-howto;\">LVM HOWTO</ulink>。"
#. Tag: para
-#: using-d-i.xml:1783
+#: using-d-i.xml:1805
#, no-c-format
msgid ""
"LVM setup in &d-i; is quite simple and completely supported inside "
@@ -2694,7 +2743,7 @@ msgstr ""
"<guimenuitem>physical volume for LVM</guimenuitem> </menuchoice>"
#. Tag: para
-#: using-d-i.xml:1792
+#: using-d-i.xml:1814
#, no-c-format
msgid ""
"When you return to the main <command>partman</command> screen, you will see "
@@ -2711,7 +2760,7 @@ msgstr ""
"了 LVM 配置的小结。菜单项本身是与内容相关,只显示可用的操作。可能的操作有:"
#. Tag: para
-#: using-d-i.xml:1803
+#: using-d-i.xml:1825
#, no-c-format
msgid ""
"<guimenuitem>Display configuration details</guimenuitem>: shows LVM device "
@@ -2721,43 +2770,43 @@ msgstr ""
"名称和逻辑卷尺寸等"
#. Tag: guimenuitem
-#: using-d-i.xml:1808
+#: using-d-i.xml:1830
#, no-c-format
msgid "Create volume group"
msgstr "Create volume group"
#. Tag: guimenuitem
-#: using-d-i.xml:1811
+#: using-d-i.xml:1833
#, no-c-format
msgid "Create logical volume"
msgstr "Create logical volume"
#. Tag: guimenuitem
-#: using-d-i.xml:1814
+#: using-d-i.xml:1836
#, no-c-format
msgid "Delete volume group"
msgstr "Delete volume group"
#. Tag: guimenuitem
-#: using-d-i.xml:1817
+#: using-d-i.xml:1839
#, no-c-format
msgid "Delete logical volume"
msgstr "Delete logical volume"
#. Tag: guimenuitem
-#: using-d-i.xml:1820
+#: using-d-i.xml:1842
#, no-c-format
msgid "Extend volume group"
msgstr "Extend volume group"
#. Tag: guimenuitem
-#: using-d-i.xml:1823
+#: using-d-i.xml:1845
#, no-c-format
msgid "Reduce volume group"
msgstr "Reduce volume group"
#. Tag: para
-#: using-d-i.xml:1825
+#: using-d-i.xml:1847
#, no-c-format
msgid ""
"<guimenuitem>Finish</guimenuitem>: return to the main <command>partman</"
@@ -2766,7 +2815,7 @@ msgstr ""
"<guimenuitem>Finish</guimenuitem>: 返回 <command>partman</command> 主界面"
#. Tag: para
-#: using-d-i.xml:1831
+#: using-d-i.xml:1853
#, no-c-format
msgid ""
"Use the options in that menu to first create a volume group and then create "
@@ -2774,7 +2823,7 @@ msgid ""
msgstr "使用该菜单内的选项首先创建卷组,然后在里面创建逻辑卷。"
#. Tag: para
-#: using-d-i.xml:1836
+#: using-d-i.xml:1858
#, no-c-format
msgid ""
"After you return to the main <command>partman</command> screen, any created "
@@ -2785,13 +2834,13 @@ msgstr ""
"通的分区一样(您也应该这样对待它们)。"
#. Tag: title
-#: using-d-i.xml:1850
+#: using-d-i.xml:1872
#, no-c-format
msgid "Configuring Encrypted Volumes"
msgstr "配置加密卷"
#. Tag: para
-#: using-d-i.xml:1851
+#: using-d-i.xml:1873
#, no-c-format
msgid ""
"&d-i; allows you to set up encrypted partitions. Every file you write to "
@@ -2809,7 +2858,7 @@ msgstr ""
"许可以访问硬盘,但是没有正确的口令,硬盘上的数据看起来就像是随机的字符。"
#. Tag: para
-#: using-d-i.xml:1863
+#: using-d-i.xml:1885
#, no-c-format
msgid ""
"The two most important partitions to encrypt are: the home partition, where "
@@ -2832,7 +2881,7 @@ msgstr ""
"加载内核。"
#. Tag: para
-#: using-d-i.xml:1878
+#: using-d-i.xml:1900
#, no-c-format
msgid ""
"Please note that the performance of encrypted partitions will be less than "
@@ -2844,7 +2893,7 @@ msgstr ""
"密和解密。性能将与您的 CPU 速度、选择的加密算法和密钥长度紧密相关。"
#. Tag: para
-#: using-d-i.xml:1885
+#: using-d-i.xml:1907
#, no-c-format
msgid ""
"To use encryption, you have to create a new partition by selecting some free "
@@ -2862,7 +2911,7 @@ msgstr ""
"guimenu> </menuchoice> 选项。菜单将包含分区的加密选项。"
#. Tag: para
-#: using-d-i.xml:1896
+#: using-d-i.xml:1918
#, no-c-format
msgid ""
"&d-i; supports several encryption methods. The default method is "
@@ -2877,7 +2926,7 @@ msgstr ""
"使用默认的方法。"
#. Tag: para
-#: using-d-i.xml:1908
+#: using-d-i.xml:1930
#, no-c-format
msgid ""
"First, let's have a look at the options available when you select "
@@ -2890,13 +2939,13 @@ msgstr ""
"的安全考虑的选择。"
#. Tag: term
-#: using-d-i.xml:1918
+#: using-d-i.xml:1940
#, no-c-format
msgid "Encryption: <userinput>aes</userinput>"
msgstr "Encryption: <userinput>aes</userinput>"
#. Tag: para
-#: using-d-i.xml:1920
+#: using-d-i.xml:1942
#, no-c-format
msgid ""
"This option lets you select the encryption algorithm (<firstterm>cipher</"
@@ -2919,13 +2968,13 @@ msgstr ""
"纪的敏感信息。"
#. Tag: term
-#: using-d-i.xml:1938
+#: using-d-i.xml:1960
#, no-c-format
msgid "Key size: <userinput>256</userinput>"
msgstr "Key size: <userinput>256</userinput>"
#. Tag: para
-#: using-d-i.xml:1940
+#: using-d-i.xml:1962
#, no-c-format
msgid ""
"Here you can specify the length of the encryption key. With a larger key "
@@ -2937,13 +2986,13 @@ msgstr ""
"加长度自然会降低性能。cipher 决定可用的密钥长度。"
#. Tag: term
-#: using-d-i.xml:1952
+#: using-d-i.xml:1974
#, no-c-format
msgid "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
msgstr "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
#. Tag: para
-#: using-d-i.xml:1954
+#: using-d-i.xml:1976
#, no-c-format
msgid ""
"The <firstterm>Initialization Vector</firstterm> or <firstterm>IV</"
@@ -2959,7 +3008,7 @@ msgstr ""
"复模板推断信息。"
#. Tag: para
-#: using-d-i.xml:1964
+#: using-d-i.xml:1986
#, no-c-format
msgid ""
"From the provided alternatives, the default <userinput>cbc-essiv:sha256</"
@@ -2972,25 +3021,25 @@ msgstr ""
"法时,才使用其他的算法。"
#. Tag: term
-#: using-d-i.xml:1976
+#: using-d-i.xml:1998
#, no-c-format
msgid "Encryption key: <userinput>Passphrase</userinput>"
msgstr "Encryption key: <userinput>Passphrase</userinput>"
#. Tag: para
-#: using-d-i.xml:1978
+#: using-d-i.xml:2000
#, no-c-format
msgid "Here you can choose the type of the encryption key for this partition."
msgstr "这里您可以为分区选择所使用的加密密钥类型。"
#. Tag: term
-#: using-d-i.xml:1984
+#: using-d-i.xml:2006
#, no-c-format
msgid "Passphrase"
msgstr "Passphrase"
#. Tag: para
-#: using-d-i.xml:1985
+#: using-d-i.xml:2007
#, no-c-format
msgid ""
"The encryption key will be computed<footnote> <para> Using a passphrase as "
@@ -3003,13 +3052,13 @@ msgstr ""
"使用时要求输入。"
#. Tag: term
-#: using-d-i.xml:2000 using-d-i.xml:2093
+#: using-d-i.xml:2022 using-d-i.xml:2115
#, no-c-format
msgid "Random key"
msgstr "Random key"
#. Tag: para
-#: using-d-i.xml:2001
+#: using-d-i.xml:2023
#, no-c-format
msgid ""
"A new encryption key will be generated from random data each time you try to "
@@ -3024,7 +3073,7 @@ msgstr ""
"面临暴力破解,但是除非加密算法中有未知的弱点,这辈子也不会被攻破。)"
#. Tag: para
-#: using-d-i.xml:2010
+#: using-d-i.xml:2032
#, no-c-format
msgid ""
"Random keys are useful for swap partitions because you do not need to bother "
@@ -3041,13 +3090,13 @@ msgstr ""
"写入到交换分区的数据。"
#. Tag: term
-#: using-d-i.xml:2029 using-d-i.xml:2106
+#: using-d-i.xml:2051 using-d-i.xml:2128
#, no-c-format
msgid "Erase data: <userinput>yes</userinput>"
msgstr "Erase data: <userinput>yes</userinput>"
#. Tag: para
-#: using-d-i.xml:2031
+#: using-d-i.xml:2053
#, no-c-format
msgid ""
"Determines whether the content of this partition should be overwritten with "
@@ -3065,7 +3114,7 @@ msgstr ""
"备上的数据。</para></footnote>。"
#. Tag: para
-#: using-d-i.xml:2051
+#: using-d-i.xml:2073
#, no-c-format
msgid ""
"If you select <menuchoice> <guimenu>Encryption method:</guimenu> "
@@ -3077,13 +3126,13 @@ msgstr ""
"下面内容:"
#. Tag: term
-#: using-d-i.xml:2060
+#: using-d-i.xml:2082
#, no-c-format
msgid "Encryption: <userinput>AES256</userinput>"
msgstr "Encryption: <userinput>AES256</userinput>"
#. Tag: para
-#: using-d-i.xml:2062
+#: using-d-i.xml:2084
#, no-c-format
msgid ""
"For loop-AES, unlike dm-crypt, the options for cipher and key size are "
@@ -3094,25 +3143,25 @@ msgstr ""
"时选取。请查阅前面关于 cipher 和密钥长度的章节了解更多信息。"
#. Tag: term
-#: using-d-i.xml:2072
+#: using-d-i.xml:2094
#, no-c-format
msgid "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
msgstr "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
#. Tag: para
-#: using-d-i.xml:2074
+#: using-d-i.xml:2096
#, no-c-format
msgid "Here you can select the type of the encryption key for this partition."
msgstr "这里您可以为分区选择加密密钥的类型。"
#. Tag: term
-#: using-d-i.xml:2080
+#: using-d-i.xml:2102
#, no-c-format
msgid "Keyfile (GnuPG)"
msgstr "Keyfile (GnuPG)"
#. Tag: para
-#: using-d-i.xml:2081
+#: using-d-i.xml:2103
#, no-c-format
msgid ""
"The encryption key will be generated from random data during the "
@@ -3124,19 +3173,19 @@ msgstr ""
"application> 加密。要使用它,您需要输入正确的 passphrase (在以后会要求提供)。"
#. Tag: para
-#: using-d-i.xml:2094
+#: using-d-i.xml:2116
#, no-c-format
msgid "Please see the section on random keys above."
msgstr "请查阅前面有关随机密钥的章节。"
#. Tag: para
-#: using-d-i.xml:2108
+#: using-d-i.xml:2130
#, no-c-format
msgid "Please see the the section on erasing data above."
msgstr "请查阅前面有关删除数据的章节。"
#. Tag: para
-#: using-d-i.xml:2117
+#: using-d-i.xml:2139
#, no-c-format
msgid ""
"After you have selected the desired parameters for your encrypted "
@@ -3151,7 +3200,7 @@ msgstr ""
"标记分区上的数据,以及写新分区表等动作。对于大的分区,这会花一些时间。"
#. Tag: para
-#: using-d-i.xml:2127
+#: using-d-i.xml:2149
#, no-c-format
msgid ""
"Next you will be asked to enter a passphrase for partitions configured to "
@@ -3165,7 +3214,7 @@ msgstr ""
"(比如生日、爱好、宠物的名字、以及家里其他成员的名字,等等)。"
#. Tag: para
-#: using-d-i.xml:2136
+#: using-d-i.xml:2158
#, no-c-format
msgid ""
"Before you input any passphrases, you should have made sure that your "
@@ -3185,7 +3234,7 @@ msgstr ""
"所选择的键盘布局未能正确建立,而且是在为根文件系统输入 passphrase 的时候。"
#. Tag: para
-#: using-d-i.xml:2149
+#: using-d-i.xml:2171
#, no-c-format
msgid ""
"If you selected to use methods other than a passphrase to create encryption "
@@ -3204,7 +3253,7 @@ msgstr ""
"程在每个要加密的分区重复进行。"
#. Tag: para
-#: using-d-i.xml:2165
+#: using-d-i.xml:2187
#, no-c-format
msgid ""
"After returning to the main partitioning menu, you will see all encrypted "
@@ -3235,7 +3284,7 @@ msgstr ""
"您不合适,可以进行修改。"
#. Tag: para
-#: using-d-i.xml:2178
+#: using-d-i.xml:2200
#, no-c-format
msgid ""
"Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</"
@@ -3251,7 +3300,7 @@ msgstr ""
"面的 <xref linkend=\"mount-encrypted-volumes\"/> 说明。"
#. Tag: para
-#: using-d-i.xml:2188
+#: using-d-i.xml:2210
#, no-c-format
msgid ""
"Once you are satisfied with the partitioning scheme, continue with the "
@@ -3259,13 +3308,13 @@ msgid ""
msgstr "当您满意分区之后,可以继续安装过程。"
#. Tag: title
-#: using-d-i.xml:2199
+#: using-d-i.xml:2221
#, no-c-format
msgid "Installing the Base System"
msgstr "安装基本系统"
#. Tag: para
-#: using-d-i.xml:2200
+#: using-d-i.xml:2222
#, no-c-format
msgid ""
"Although this stage is the least problematic, it consumes a significant "
@@ -3277,7 +3326,7 @@ msgstr ""
"果您用较慢的计算机或网络,这要花费好一会儿时间。"
#. Tag: para
-#: using-d-i.xml:2213
+#: using-d-i.xml:2235
#, no-c-format
msgid ""
"During installation of the base system, package unpacking and setup messages "
@@ -3292,7 +3341,7 @@ msgstr ""
"Alt</keycap><keycap>F1</keycap></keycombo>。"
#. Tag: para
-#: using-d-i.xml:2222
+#: using-d-i.xml:2244
#, no-c-format
msgid ""
"The unpack/setup messages generated during this phase are also saved in "
@@ -3303,7 +3352,7 @@ msgstr ""
"<filename>/var/log/syslog</filename>。"
#. Tag: para
-#: using-d-i.xml:2228
+#: using-d-i.xml:2250
#, no-c-format
msgid ""
"As part of the installation, a &arch-kernel; kernel will be installed. At "
@@ -3316,7 +3365,7 @@ msgstr ""
"核。"
#. Tag: para
-#: using-d-i.xml:2235
+#: using-d-i.xml:2257
#, no-c-format
msgid ""
"When packages are installed using the package management system, it will by "
@@ -3331,7 +3380,7 @@ msgstr ""
"看,正常情况下应该安装这些软件。"
#. Tag: para
-#: using-d-i.xml:2245
+#: using-d-i.xml:2267
#, no-c-format
msgid ""
"For technical reasons packages installed during the installation of the base "
@@ -3343,13 +3392,13 @@ msgstr ""
"</quote>。上面提到的原则只适用于之后的安装过程。"
#. Tag: title
-#: using-d-i.xml:2257
+#: using-d-i.xml:2279
#, no-c-format
msgid "Installing Additional Software"
msgstr "安装额外的软件"
#. Tag: para
-#: using-d-i.xml:2258
+#: using-d-i.xml:2280
#, no-c-format
msgid ""
"At this point you have a usable but limited system. Most users will want to "
@@ -3362,13 +3411,13 @@ msgstr ""
"装基本系统还要花时间。"
#. Tag: title
-#: using-d-i.xml:2273
+#: using-d-i.xml:2295
#, no-c-format
msgid "Configuring apt"
msgstr "配置 apt"
#. Tag: para
-#: using-d-i.xml:2275
+#: using-d-i.xml:2297
#, no-c-format
msgid ""
"One of the tools used to install packages on a &debian-gnu; system is a "
@@ -3399,7 +3448,7 @@ msgstr ""
"软件包管理工具使用。"
#. Tag: para
-#: using-d-i.xml:2299
+#: using-d-i.xml:2321
#, no-c-format
msgid ""
"<command>apt</command> must be configured so that it knows from where to "
@@ -3412,7 +3461,7 @@ msgstr ""
"并编辑成自己喜欢的地方。"
#. Tag: para
-#: using-d-i.xml:2306
+#: using-d-i.xml:2328
#, no-c-format
msgid ""
"If you are installing at default priority, the installer will largely take "
@@ -3427,7 +3476,7 @@ msgstr ""
"序程序会自动加上安全镜像,它是 <quote>volatile</quote> 更新服务的镜像。"
#. Tag: para
-#: using-d-i.xml:2315
+#: using-d-i.xml:2337
#, no-c-format
msgid ""
"If you are installing at a lower priority (e.g. in expert mode), you will be "
@@ -3441,13 +3490,13 @@ msgstr ""
"和 <quote>non-free</quote> 软件仓库里面添加软件包。"
#. Tag: title
-#: using-d-i.xml:2326
+#: using-d-i.xml:2348
#, no-c-format
msgid "Installing from more than one CD or DVD"
msgstr "从多个 CD 或 DVD 安装"
#. Tag: para
-#: using-d-i.xml:2328
+#: using-d-i.xml:2350
#, no-c-format
msgid ""
"If you are installing from a CD or a DVD that is part of a larger set, the "
@@ -3460,7 +3509,7 @@ msgstr ""
"们里面的软件包了。"
#. Tag: para
-#: using-d-i.xml:2335
+#: using-d-i.xml:2357
#, no-c-format
msgid ""
"If you do not have any additional CDs or DVDs, that is no problem: using "
@@ -3472,7 +3521,7 @@ msgstr ""
"节说明),意味着下一步中选择的任务里面并非所有的软件包都会安装。"
#. Tag: para
-#: using-d-i.xml:2343
+#: using-d-i.xml:2365
#, no-c-format
msgid ""
"Packages are included on CDs (and DVDs) in the order of their popularity. "
@@ -3484,7 +3533,7 @@ msgstr ""
"常用的软件,而最后一张光盘里面包含的是很少有人用到的软件。"
#. Tag: para
-#: using-d-i.xml:2350
+#: using-d-i.xml:2372
#, no-c-format
msgid ""
"It also means that buying or downloading and burning a full CD set is just a "
@@ -3498,7 +3547,7 @@ msgstr ""
"DVD 的情况类似:只要一张,或者前两张 DVD 就能满足您大部分要求。"
#. Tag: para
-#: using-d-i.xml:2359
+#: using-d-i.xml:2381
#, no-c-format
msgid ""
"A good rule of thumb is that for a regular desktop installation (using the "
@@ -3511,7 +3560,7 @@ msgstr ""
"境。"
#. Tag: para
-#: using-d-i.xml:2367
+#: using-d-i.xml:2389
#, no-c-format
msgid ""
"If you do scan multiple CDs or DVDs, the installer will prompt you to "
@@ -3526,13 +3575,13 @@ msgstr ""
"照次序来可以降低出错的几率。"
#. Tag: title
-#: using-d-i.xml:2380
+#: using-d-i.xml:2402
#, no-c-format
msgid "Using a network mirror"
msgstr "使用网络镜像"
#. Tag: para
-#: using-d-i.xml:2382
+#: using-d-i.xml:2404
#, no-c-format
msgid ""
"One question that will be asked during most installs is whether or not to "
@@ -3543,7 +3592,7 @@ msgstr ""
"默认答案会很好,但还是有一些例外。"
#. Tag: para
-#: using-d-i.xml:2388
+#: using-d-i.xml:2410
#, no-c-format
msgid ""
"If you are <emphasis>not</emphasis> installing from a full CD or DVD or "
@@ -3559,7 +3608,7 @@ msgstr ""
"<literal>desktop</literal> 任务。"
#. Tag: para
-#: using-d-i.xml:2397
+#: using-d-i.xml:2419
#, no-c-format
msgid ""
"If you are installing from a single full CD or using a full CD image, using "
@@ -3576,7 +3625,7 @@ msgstr ""
"装,以后(比如,重新启动到新系统)再安装额外的软件包。"
#. Tag: para
-#: using-d-i.xml:2408
+#: using-d-i.xml:2430
#, no-c-format
msgid ""
"If you are installing from a DVD or using a DVD image, any packages needed "
@@ -3589,7 +3638,7 @@ msgstr ""
"项。"
#. Tag: para
-#: using-d-i.xml:2415
+#: using-d-i.xml:2437
#, no-c-format
msgid ""
"One advantage of adding a network mirror is that updates that have occurred "
@@ -3602,7 +3651,7 @@ msgstr ""
"可以安装已经更新的内容,确保了系统的安全性和稳定性。。"
#. Tag: para
-#: using-d-i.xml:2422
+#: using-d-i.xml:2444
#, no-c-format
msgid ""
"In summary: selecting a network mirror is generally a good idea, except if "
@@ -3616,26 +3665,26 @@ msgstr ""
"的数据量取决于"
#. Tag: para
-#: using-d-i.xml:2431
+#: using-d-i.xml:2453
#, no-c-format
msgid "the tasks you select in the next step of the installation,"
msgstr "安装下一步选择的任务,"
#. Tag: para
-#: using-d-i.xml:2436
+#: using-d-i.xml:2458
#, no-c-format
msgid "which packages are needed for those tasks,"
msgstr "这些任务所需的软件包,"
#. Tag: para
-#: using-d-i.xml:2441
+#: using-d-i.xml:2463
#, 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:2446
+#: using-d-i.xml:2468
#, no-c-format
msgid ""
"whether any updated versions of packages included on the CDs or DVDs are "
@@ -3646,7 +3695,7 @@ msgstr ""
"安全更新的镜像)。"
#. Tag: para
-#: using-d-i.xml:2455
+#: using-d-i.xml:2477
#, no-c-format
msgid ""
"Note that the last point means that, even if you choose not to use a network "
@@ -3658,13 +3707,60 @@ msgstr ""
"且软件包有安全更新,仍然会从互联网下载更新后的软件包。"
#. Tag: title
-#: using-d-i.xml:2471
+#: using-d-i.xml:2488
+#, fuzzy, no-c-format
+#| msgid "Using a network mirror"
+msgid "Choosing a network mirror"
+msgstr "使用网络镜像"
+
+#. Tag: para
+#: using-d-i.xml:2489
+#, no-c-format
+msgid ""
+"If you have selected to use a network mirror during the installation "
+"(optional for CD/DVD installs, required for netboot images), you will be "
+"presented with a list of geographically nearby (and therefore hopefully "
+"fast) network mirrors, based upon your country selection earlier in the "
+"installation process. Choosing the offered default is usually fine."
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:2497
+#, no-c-format
+msgid ""
+"If your computer is on an IPv6-only network (which is probably not the case "
+"for the vast majority of users), using the default mirror for your country "
+"might not work. All the mirrors in the list are reachable via IPv4, but only "
+"some of them can be used via IPv6. As connectivity of individual mirrors can "
+"change over time, this information is not available in the installer. If "
+"there is no IPv6 connectivity for the default mirror for your country, you "
+"can either try some of the other mirrors offered to you or choose the "
+"<quote>enter information manually</quote> option. You can then specify "
+"<quote>ftp.ipv6.debian.org</quote> as the mirror name, which is an alias for "
+"a mirror available via IPv6, although it will probably not be the fastest "
+"possible one."
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:2511
+#, 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."
+msgstr ""
+
+#. Tag: title
+#: using-d-i.xml:2530
#, no-c-format
msgid "Selecting and Installing Software"
msgstr "选择和安装软件"
#. Tag: para
-#: using-d-i.xml:2473
+#: using-d-i.xml:2532
#, no-c-format
msgid ""
"During the installation process, you are given the opportunity to select "
@@ -3679,7 +3775,7 @@ msgstr ""
"来快速建立您的计算机应对各种任务。"
#. Tag: para
-#: using-d-i.xml:2482
+#: using-d-i.xml:2541
#, no-c-format
msgid ""
"So, you have the ability to choose <emphasis>tasks</emphasis> first, and "
@@ -3709,7 +3805,7 @@ msgstr ""
"空间。"
#. Tag: para
-#: using-d-i.xml:2509
+#: using-d-i.xml:2568
#, no-c-format
msgid ""
"Some tasks may be pre-selected based on the characteristics of the computer "
@@ -3720,7 +3816,7 @@ msgstr ""
"些任务。此时甚至可以不选中任何任务。"
#. Tag: para
-#: using-d-i.xml:2516
+#: using-d-i.xml:2575
#, no-c-format
msgid ""
"In the standard user interface of the installer, you can use the space bar "
@@ -3728,7 +3824,7 @@ msgid ""
msgstr "在安装程序的标准用户界面下,您可以使用空格键切换任务的选择。"
#. Tag: para
-#: using-d-i.xml:2522
+#: using-d-i.xml:2581
#, no-c-format
msgid ""
"Unless you are using the special KDE or Xfce/LXDE CDs, the <quote>Desktop "
@@ -3738,7 +3834,7 @@ msgstr ""
"GNOME 桌面环境。"
#. Tag: para
-#: using-d-i.xml:2527
+#: using-d-i.xml:2586
#, no-c-format
msgid ""
"It is not possible to interactively select a different desktop during the "
@@ -3757,20 +3853,25 @@ msgstr ""
"literal> 或 <literal>desktop=lxde</literal> 进行选择。"
#. Tag: para
-#: using-d-i.xml:2538
-#, no-c-format
+#: using-d-i.xml:2597
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Some CD images (businesscard, netinst and DVD) also allow selection of "
+#| "the desired desktop environment from the graphical boot menu. Select the "
+#| "<quote>Advanced options</quote> option in the main menu and look for "
+#| "<quote>Alternative desktop environments</quote>."
msgid ""
-"Some CD images (businesscard, netinst and DVD) also allow selection of the "
-"desired desktop environment from the graphical boot menu. Select the "
-"<quote>Advanced options</quote> option in the main menu and look for "
-"<quote>Alternative desktop environments</quote>."
+"Some CD images (netinst and DVD) also allow selection of the desired desktop "
+"environment from the graphical boot menu. Select the <quote>Advanced "
+"options</quote> option in the main menu and look for <quote>Alternative "
+"desktop environments</quote>."
msgstr ""
"一些 CD 映象(businesscard, netinst 和 DVD)可以从图形引导菜单中选择所需的桌面"
"环境。选择主菜单里面的 <quote>Advanced options</quote> 选项,再找到 "
"<quote>Alternative desktop environments</quote>。"
#. Tag: para
-#: using-d-i.xml:2545
+#: using-d-i.xml:2604
#, no-c-format
msgid ""
"Note that this will only work if the packages needed for the desired desktop "
@@ -3785,7 +3886,7 @@ msgstr ""
"Xfce 或 LXDE 同样适用于 DVD 映象或其他的安装方法。"
#. Tag: para
-#: using-d-i.xml:2555
+#: using-d-i.xml:2614
#, no-c-format
msgid ""
"The various server tasks will install software roughly as follows. DNS "
@@ -3804,7 +3905,7 @@ msgstr ""
"classname>。"
#. Tag: para
-#: using-d-i.xml:2566
+#: using-d-i.xml:2625
#, no-c-format
msgid ""
"The <quote>Standard system</quote> task will install any package that has a "
@@ -3818,7 +3919,7 @@ msgstr ""
"并需要一个最小化的系统,您应该让该任务选中。"
#. Tag: para
-#: using-d-i.xml:2574
+#: using-d-i.xml:2633
#, no-c-format
msgid ""
"If during language selection a default locale other than the <quote>C</"
@@ -3835,7 +3936,7 @@ msgstr ""
"(如果存在)还会安装该桌面对应的本地化软件包。"
#. Tag: para
-#: using-d-i.xml:2584
+#: using-d-i.xml:2643
#, no-c-format
msgid ""
"Once you've selected your tasks, select &BTN-CONT;. At this point, "
@@ -3847,7 +3948,7 @@ msgstr ""
"选中任务的软件包。假如某个程序需要用户输入信息,它将提示您指定。"
#. Tag: para
-#: using-d-i.xml:2591
+#: using-d-i.xml:2650
#, no-c-format
msgid ""
"You should be aware that especially the Desktop task is very large. "
@@ -3862,7 +3963,7 @@ msgstr ""
"间。一旦启动,安装软件包过程将无法取消。"
#. Tag: para
-#: using-d-i.xml:2600
+#: using-d-i.xml:2659
#, no-c-format
msgid ""
"Even when packages are included on the CD-ROM, the installer may still "
@@ -3877,13 +3978,13 @@ msgstr ""
"新);如果您安装的是测试版本,这会出现在使用旧映像安装时。"
#. Tag: title
-#: using-d-i.xml:2615
+#: using-d-i.xml:2674
#, no-c-format
msgid "Making Your System Bootable"
msgstr "创建启动系统"
#. Tag: para
-#: using-d-i.xml:2617
+#: using-d-i.xml:2676
#, no-c-format
msgid ""
"If you are installing a diskless workstation, obviously, booting off the "
@@ -3896,13 +3997,13 @@ msgstr ""
"linkend=\"boot-dev-select-sun\"/>。</phrase>"
#. Tag: title
-#: using-d-i.xml:2632
+#: using-d-i.xml:2691
#, no-c-format
msgid "Detecting other operating systems"
msgstr "检测其他的操作系统"
#. Tag: para
-#: using-d-i.xml:2634
+#: using-d-i.xml:2693
#, no-c-format
msgid ""
"Before a boot loader is installed, the installer will attempt to probe for "
@@ -3916,7 +4017,7 @@ msgstr ""
"&debian; 一起,计算机也将配置为可以启动其他操作系统。"
#. Tag: para
-#: using-d-i.xml:2642
+#: using-d-i.xml:2701
#, no-c-format
msgid ""
"Note that multiple operating systems booting on a single machine is still "
@@ -3930,13 +4031,13 @@ msgstr ""
"管理器的文档了解更多信息。"
#. Tag: title
-#: using-d-i.xml:2660
+#: using-d-i.xml:2719
#, no-c-format
msgid "<command>palo</command>-installer"
msgstr "<command>palo</command>-installer"
#. Tag: para
-#: using-d-i.xml:2661
+#: using-d-i.xml:2720
#, no-c-format
msgid ""
"The bootloader on PA-RISC is <quote>palo</quote>. <command>PALO</command> is "
@@ -3951,19 +4052,19 @@ msgstr ""
"<command>PALO</command> 能真正地读 Linux 分区。"
#. Tag: para
-#: using-d-i.xml:2670
+#: using-d-i.xml:2729
#, no-c-format
msgid "hppa FIXME ( need more info )"
msgstr "hppa FIXME ( need more info )"
#. Tag: title
-#: using-d-i.xml:2682
+#: using-d-i.xml:2741
#, 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:2684
+#: using-d-i.xml:2743
#, no-c-format
msgid ""
"The main &architecture; boot loader is called <quote>grub</quote>. Grub is a "
@@ -3974,7 +4075,7 @@ msgstr ""
"定的 boot loader,它对新手和老手都是一个不错的缺省选择。"
#. Tag: para
-#: using-d-i.xml:2690
+#: using-d-i.xml:2749
#, no-c-format
msgid ""
"By default, grub will be installed into the Master Boot Record (MBR), where "
@@ -3986,7 +4087,7 @@ msgstr ""
"请参阅 grub 的手册。"
#. Tag: para
-#: using-d-i.xml:2696
+#: using-d-i.xml:2755
#, no-c-format
msgid ""
"If you do not want to install grub, use the &BTN-GOBACK; button to get to "
@@ -3997,13 +4098,13 @@ msgstr ""
"用的任何 bootloader。"
#. Tag: title
-#: using-d-i.xml:2709
+#: using-d-i.xml:2768
#, 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:2711
+#: using-d-i.xml:2770
#, no-c-format
msgid ""
"The second &architecture; boot loader is called <quote>LILO</quote>. It is "
@@ -4019,7 +4120,7 @@ msgstr ""
"HOWTO</ulink>。"
#. Tag: para
-#: using-d-i.xml:2721
+#: using-d-i.xml:2780
#, no-c-format
msgid ""
"Currently the LILO installation will only create menu entries for other "
@@ -4032,7 +4133,7 @@ msgstr ""
"统。"
#. Tag: para
-#: using-d-i.xml:2729
+#: using-d-i.xml:2788
#, no-c-format
msgid ""
"&d-i; offers you three choices on where to install the <command>LILO</"
@@ -4040,13 +4141,13 @@ msgid ""
msgstr "&d-i; 提供给您三种选择去哪安装 <command>LILO</command> boot loader:"
#. Tag: term
-#: using-d-i.xml:2736
+#: using-d-i.xml:2795
#, no-c-format
msgid "Master Boot Record (MBR)"
msgstr "主引导区(MBR)"
#. Tag: para
-#: using-d-i.xml:2736
+#: using-d-i.xml:2795
#, no-c-format
msgid ""
"This way the <command>LILO</command> will take complete control of the boot "
@@ -4054,13 +4155,13 @@ msgid ""
msgstr "这种方式 <command>LILO</command> 将完全控制启动过程。"
#. Tag: term
-#: using-d-i.xml:2743
+#: using-d-i.xml:2802
#, no-c-format
msgid "new &debian; partition"
msgstr "新 &debian; 分区"
#. Tag: para
-#: using-d-i.xml:2743
+#: using-d-i.xml:2802
#, no-c-format
msgid ""
"Choose this if you want to use another boot manager. <command>LILO</command> "
@@ -4071,13 +4172,13 @@ msgstr ""
"新 &debian; 分区的起始位置,并能作为第二 boot loader。"
#. Tag: term
-#: using-d-i.xml:2752
+#: using-d-i.xml:2811
#, no-c-format
msgid "Other choice"
msgstr "其它选择"
#. Tag: para
-#: using-d-i.xml:2752
+#: using-d-i.xml:2811
#, no-c-format
msgid ""
"Useful for advanced users who want to install <command>LILO</command> "
@@ -4090,7 +4191,7 @@ msgstr ""
"filename> 或 <filename>/dev/sda</filename>。"
#. Tag: para
-#: using-d-i.xml:2762
+#: using-d-i.xml:2821
#, no-c-format
msgid ""
"If you can no longer boot into Windows 9x (or DOS) after this step, you'll "
@@ -4104,13 +4205,13 @@ msgstr ""
"录 &mdash; 但这也意味着您要使用其他方法才能启动 &debian;!"
#. Tag: title
-#: using-d-i.xml:2778
+#: using-d-i.xml:2837
#, 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:2780
+#: using-d-i.xml:2839
#, no-c-format
msgid ""
"The &architecture; boot loader is called <quote>elilo</quote>. It is modeled "
@@ -4135,7 +4236,7 @@ msgstr ""
"和启动 Linux 内核的工作。"
#. Tag: para
-#: using-d-i.xml:2796
+#: using-d-i.xml:2855
#, no-c-format
msgid ""
"The <quote>elilo</quote> configuration and installation is done as the last "
@@ -4150,13 +4251,13 @@ msgstr ""
"<emphasis>root</emphasis> 文件系统相同的磁盘。"
#. Tag: title
-#: using-d-i.xml:2808
+#: using-d-i.xml:2867
#, no-c-format
msgid "Choose the correct partition!"
msgstr "选择正确的分区!"
#. Tag: para
-#: using-d-i.xml:2810
+#: using-d-i.xml:2869
#, no-c-format
msgid ""
"The criterion for selecting a partition is that it must be a FAT format "
@@ -4172,13 +4273,13 @@ msgstr ""
"容!"
#. Tag: title
-#: using-d-i.xml:2825
+#: using-d-i.xml:2884
#, no-c-format
msgid "EFI Partition Contents"
msgstr "EFI 分区内容"
#. Tag: para
-#: using-d-i.xml:2827
+#: using-d-i.xml:2886
#, no-c-format
msgid ""
"The EFI partition is a FAT filesystem format partition on one of the hard "
@@ -4204,13 +4305,13 @@ msgstr ""
"间,系统更新或重新配置,文件系统中也许会有其他文件。"
#. Tag: filename
-#: using-d-i.xml:2849
+#: using-d-i.xml:2908
#, no-c-format
msgid "elilo.conf"
msgstr "elilo.conf"
#. Tag: para
-#: using-d-i.xml:2850
+#: using-d-i.xml:2909
#, no-c-format
msgid ""
"This is the configuration file read by the boot loader when it starts. It is "
@@ -4221,13 +4322,13 @@ msgstr ""
"filename> 的复制,其文件名重写成 EFI 分区上的文件。"
#. Tag: filename
-#: using-d-i.xml:2859
+#: using-d-i.xml:2918
#, no-c-format
msgid "elilo.efi"
msgstr "elilo.efi"
#. Tag: para
-#: using-d-i.xml:2860
+#: using-d-i.xml:2919
#, no-c-format
msgid ""
"This is the boot loader program that the <quote>EFI Boot Manager</quote> "
@@ -4240,13 +4341,13 @@ msgstr ""
"<quote>EFI Boot Manager</quote> 命令菜单。"
#. Tag: filename
-#: using-d-i.xml:2870
+#: using-d-i.xml:2929
#, no-c-format
msgid "initrd.img"
msgstr "initrd.img"
#. Tag: para
-#: using-d-i.xml:2871
+#: using-d-i.xml:2930
#, no-c-format
msgid ""
"This is the initial root filesystem used to boot the kernel. It is a copy of "
@@ -4259,13 +4360,13 @@ msgstr ""
"filename> 符号链接 <filename>/initrd.img</filename> 指向的文件。"
#. Tag: filename
-#: using-d-i.xml:2883
+#: using-d-i.xml:2942
#, no-c-format
msgid "readme.txt"
msgstr "readme.txt"
#. Tag: para
-#: using-d-i.xml:2884
+#: using-d-i.xml:2943
#, no-c-format
msgid ""
"This is a small text file warning you that the contents of the directory are "
@@ -4276,13 +4377,13 @@ msgstr ""
"任何本地修改在下次 <filename>/usr/sbin/elilo</filename> 运行时将丢失。"
#. Tag: filename
-#: using-d-i.xml:2894
+#: using-d-i.xml:2953
#, no-c-format
msgid "vmlinuz"
msgstr "vmlinuz"
#. Tag: para
-#: using-d-i.xml:2895
+#: using-d-i.xml:2954
#, no-c-format
msgid ""
"This is the compressed kernel itself. It is a copy of the file referenced in "
@@ -4295,13 +4396,13 @@ msgstr ""
"<filename>/vmlinuz</filename> 指向的文件。"
#. Tag: title
-#: using-d-i.xml:2915
+#: using-d-i.xml:2974
#, no-c-format
msgid "<command>arcboot</command>-installer"
msgstr "<command>arcboot</command>-installer"
#. Tag: para
-#: using-d-i.xml:2916
+#: using-d-i.xml:2975
#, no-c-format
msgid ""
"The boot loader on SGI machines is <command>arcboot</command>. It has to be "
@@ -4341,13 +4442,13 @@ msgstr ""
"</screen></informalexample> ,然后键入 <command>boot</command>。"
#. Tag: replaceable
-#: using-d-i.xml:2935
+#: using-d-i.xml:2994
#, no-c-format
msgid "scsi"
msgstr "scsi"
#. Tag: para
-#: using-d-i.xml:2936
+#: using-d-i.xml:2995
#, no-c-format
msgid ""
"is the SCSI bus to be booted from, this is <userinput>0</userinput> for the "
@@ -4355,13 +4456,13 @@ msgid ""
msgstr "是启动的 SCSI 总线,<userinput>0</userinput> 为板载控制器"
#. Tag: replaceable
-#: using-d-i.xml:2944
+#: using-d-i.xml:3003
#, no-c-format
msgid "disk"
msgstr "disk"
#. Tag: para
-#: using-d-i.xml:2945
+#: using-d-i.xml:3004
#, no-c-format
msgid ""
"is the SCSI ID of the hard disk on which <command>arcboot</command> is "
@@ -4370,13 +4471,13 @@ msgstr "硬盘的 SCSI ID,<command>arcboot</command> 安装在其上"
# index.docbook:1643, index.docbook:1712
#. Tag: replaceable
-#: using-d-i.xml:2953
+#: using-d-i.xml:3012
#, no-c-format
msgid "partnr"
msgstr "partnr"
#. Tag: para
-#: using-d-i.xml:2954
+#: using-d-i.xml:3013
#, no-c-format
msgid ""
"is the number of the partition on which <filename>/etc/arcboot.conf</"
@@ -4384,13 +4485,13 @@ msgid ""
msgstr "分区号,<filename>/etc/arcboot.conf</filename> 处于该分区"
#. Tag: replaceable
-#: using-d-i.xml:2962
+#: using-d-i.xml:3021
#, no-c-format
msgid "config"
msgstr "config"
#. Tag: para
-#: using-d-i.xml:2963
+#: using-d-i.xml:3022
#, no-c-format
msgid ""
"is the name of the configuration entry in <filename>/etc/arcboot.conf</"
@@ -4400,13 +4501,13 @@ msgstr ""
"quote> 。"
#. Tag: title
-#: using-d-i.xml:2984
+#: using-d-i.xml:3043
#, no-c-format
msgid "Install <command>Yaboot</command> on a Hard Disk"
msgstr "安装 <command>Yaboot</command> 至硬盘"
#. Tag: para
-#: using-d-i.xml:2985
+#: using-d-i.xml:3044
#, no-c-format
msgid ""
"Newer (mid 1998 and on) PowerMacs use <command>yaboot</command> as their "
@@ -4424,13 +4525,13 @@ msgstr ""
"设为启动 &debian-gnu;。"
#. Tag: title
-#: using-d-i.xml:3003
+#: using-d-i.xml:3062
#, no-c-format
msgid "Install <command>Quik</command> on a Hard Disk"
msgstr "安装 <command>Quik</command> 至硬盘"
#. Tag: para
-#: using-d-i.xml:3004
+#: using-d-i.xml:3063
#, no-c-format
msgid ""
"The boot loader for OldWorld Power Macintosh machines is <command>quik</"
@@ -4443,13 +4544,13 @@ msgstr ""
"以工作在 7200,7300 和 7600 Powermacs,以及一些 Power Computing 克隆。"
#. Tag: title
-#: using-d-i.xml:3020
+#: using-d-i.xml:3079
#, no-c-format
msgid "<command>zipl</command>-installer"
msgstr "<command>zipl</command>-installer"
#. Tag: para
-#: using-d-i.xml:3021
+#: using-d-i.xml:3080
#, no-c-format
msgid ""
"The boot loader on &arch-title; is <quote>zipl</quote>. <command>ZIPL</"
@@ -4464,13 +4565,13 @@ msgstr ""
"Commands</quote>,它位于 IBM 的 developerWorks 网站<command>ZIPL</command>。"
#. Tag: title
-#: using-d-i.xml:3038
+#: using-d-i.xml:3097
#, 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:3040
+#: using-d-i.xml:3099
#, no-c-format
msgid ""
"The standard &architecture; boot loader is called <quote>silo</quote>. It is "
@@ -4497,13 +4598,13 @@ msgstr ""
"区启动。这对于安装 GNU/Linux 到一个已经存在 SunOS/Solaris 的系统很有用。"
#. Tag: title
-#: using-d-i.xml:3065
+#: using-d-i.xml:3124
#, no-c-format
msgid "Continue Without Boot Loader"
msgstr "不使用 boot loader 继续进行"
#. Tag: para
-#: using-d-i.xml:3067
+#: using-d-i.xml:3126
#, no-c-format
msgid ""
"This option can be used to complete the installation even when no boot "
@@ -4514,7 +4615,7 @@ msgstr ""
"是因为不想要(比如,您想使用已经存在的 boot loader)"
#. Tag: para
-#: using-d-i.xml:3074
+#: using-d-i.xml:3133
#, no-c-format
msgid ""
"If you plan to manually configure your bootloader, you should check the name "
@@ -4533,13 +4634,13 @@ msgstr ""
"filename> 到一个独立的分区,还需要 <filename>/boot</filename> 文件系统。"
#. Tag: title
-#: using-d-i.xml:3091
+#: using-d-i.xml:3150
#, no-c-format
msgid "Finishing the Installation"
msgstr "完成安装"
#. Tag: para
-#: using-d-i.xml:3092
+#: using-d-i.xml:3151
#, no-c-format
msgid ""
"This is the last step in the &debian; installation process during which the "
@@ -4550,13 +4651,13 @@ msgstr ""
"&d-i; 之后的清理。"
#. Tag: title
-#: using-d-i.xml:3105
+#: using-d-i.xml:3164
#, no-c-format
msgid "Setting the System Clock"
msgstr "设置系统时钟"
#. Tag: para
-#: using-d-i.xml:3107
+#: using-d-i.xml:3166
#, no-c-format
msgid ""
"The installer may ask you if the computer's clock is set to UTC. Normally "
@@ -4568,7 +4669,7 @@ msgstr ""
"装程序依据是否有其他系统已经安装这类事情,来决定时钟要不要设为 UTC。"
#. Tag: para
-#: using-d-i.xml:3114
+#: using-d-i.xml:3173
#, no-c-format
msgid ""
"In expert mode you will always be able to choose whether or not the clock is "
@@ -4584,7 +4685,7 @@ msgstr ""
"常设为本地时间。如果您需要多重引导,请选择本地时间而不是 GMT。</phrase>"
#. Tag: para
-#: using-d-i.xml:3125
+#: using-d-i.xml:3184
#, no-c-format
msgid ""
"At this point &d-i; will also attempt to save the current time to the "
@@ -4595,13 +4696,13 @@ msgstr ""
"决于刚才的选择。"
#. Tag: title
-#: using-d-i.xml:3140
+#: using-d-i.xml:3199
#, no-c-format
msgid "Reboot the System"
msgstr "重新启动系统"
#. Tag: para
-#: using-d-i.xml:3142
+#: using-d-i.xml:3201
#, no-c-format
msgid ""
"You will be prompted to remove the boot media (CD, floppy, etc) that you "
@@ -4612,7 +4713,7 @@ msgstr ""
"&debian; 系统。"
#. Tag: para
-#: using-d-i.xml:3148
+#: using-d-i.xml:3207
#, no-c-format
msgid ""
"After a final prompt the system will be halted because rebooting is not "
@@ -4624,13 +4725,13 @@ msgstr ""
"上的 IPL &debian-gnu;,它在安装步骤第一步里被选做根文件系统。"
#. Tag: title
-#: using-d-i.xml:3161
+#: using-d-i.xml:3220
#, no-c-format
msgid "Troubleshooting"
msgstr "排除故障"
#. Tag: para
-#: using-d-i.xml:3162
+#: using-d-i.xml:3221
#, no-c-format
msgid ""
"The components listed in this section are usually not involved in the "
@@ -4641,13 +4742,13 @@ msgstr ""
"题。"
#. Tag: title
-#: using-d-i.xml:3175
+#: using-d-i.xml:3234
#, no-c-format
msgid "Saving the installation logs"
msgstr "保存安装记录"
#. Tag: para
-#: using-d-i.xml:3177
+#: using-d-i.xml:3236
#, no-c-format
msgid ""
"If the installation is successful, the logfiles created during the "
@@ -4658,7 +4759,7 @@ msgstr ""
"的 <filename>/var/log/installer/</filename>。"
#. Tag: para
-#: using-d-i.xml:3184
+#: using-d-i.xml:3243
#, no-c-format
msgid ""
"Choosing <guimenuitem>Save debug logs</guimenuitem> from the main menu "
@@ -4672,13 +4773,13 @@ msgstr ""
"其它系统上研究记录,或者用于报告的附件。"
#. Tag: title
-#: using-d-i.xml:3204
+#: using-d-i.xml:3263
#, no-c-format
msgid "Using the Shell and Viewing the Logs"
msgstr "使用 Shell 查看记录"
#. Tag: para
-#: using-d-i.xml:3206
+#: using-d-i.xml:3265
#, no-c-format
msgid ""
"There are several methods you can use to get a shell while running an "
@@ -4702,13 +4803,13 @@ msgstr ""
"安装程序。"
#. Tag: para
-#: using-d-i.xml:3224
+#: using-d-i.xml:3283
#, 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:3228
+#: using-d-i.xml:3287
#, no-c-format
msgid ""
"If you cannot switch consoles, there is also an <guimenuitem>Execute a "
@@ -4723,7 +4824,7 @@ msgstr ""
"到安装程序。"
#. Tag: para
-#: using-d-i.xml:3236
+#: using-d-i.xml:3295
#, no-c-format
msgid ""
"At this point you are booted from the RAM disk, and there is a limited set "
@@ -4739,7 +4840,7 @@ msgstr ""
"Bourne shell 的克隆,有一些如自动完成与历史纪录这样的好特性。"
#. Tag: para
-#: using-d-i.xml:3245
+#: using-d-i.xml:3304
#, no-c-format
msgid ""
"To edit and view files, use the text editor <command>nano</command>. Log "
@@ -4750,7 +4851,7 @@ msgstr ""
"以在 <filename>/var/log</filename> 目录找到。"
#. Tag: para
-#: using-d-i.xml:3252
+#: using-d-i.xml:3311
#, no-c-format
msgid ""
"Although you can do basically anything in a shell that the available "
@@ -4761,7 +4862,7 @@ msgstr ""
"题时进行调试。"
#. Tag: para
-#: using-d-i.xml:3258
+#: using-d-i.xml:3317
#, no-c-format
msgid ""
"Doing things manually from the shell may interfere with the installation "
@@ -4773,13 +4874,13 @@ msgstr ""
"该让安装程序激活交换分区,而不是在 shell 里面自己动手。"
#. Tag: title
-#: using-d-i.xml:3274
+#: using-d-i.xml:3333
#, no-c-format
msgid "Installation Over the Network"
msgstr "通过网络安装"
#. Tag: para
-#: using-d-i.xml:3276
+#: using-d-i.xml:3335
#, no-c-format
msgid ""
"One of the more interesting components is <firstterm>network-console</"
@@ -4794,7 +4895,7 @@ msgstr ""
"先建立网络。(您可以使用 <xref linkend=\"automatic-install\"/> 做这部分工作。)"
#. Tag: para
-#: using-d-i.xml:3286
+#: using-d-i.xml:3345
#, no-c-format
msgid ""
"This component is not loaded into the main installation menu by default, so "
@@ -4814,7 +4915,7 @@ msgstr ""
"SSH</guimenuitem>。"
#. Tag: para
-#: using-d-i.xml:3299
+#: using-d-i.xml:3358
#, no-c-format
msgid ""
"For installations on &arch-title;, this is the default method after setting "
@@ -4822,7 +4923,7 @@ msgid ""
msgstr "在 &arch-title; 上安装,建立网络之后这是默认的方法。"
#. Tag: para
-#: using-d-i.xml:3304
+#: using-d-i.xml:3363
#, no-c-format
msgid ""
"<phrase arch=\"not-s390\">After selecting this new entry, you</phrase> "
@@ -4841,7 +4942,7 @@ msgstr ""
"fingerprint。您需要安全地传输该 fingerprint 给那些要继续远程安装的人。"
#. Tag: para
-#: using-d-i.xml:3316
+#: using-d-i.xml:3375
#, no-c-format
msgid ""
"Should you decide to continue with the installation locally, you can always "
@@ -4852,7 +4953,7 @@ msgstr ""
"他的组件。"
#. Tag: para
-#: using-d-i.xml:3322
+#: using-d-i.xml:3381
#, no-c-format
msgid ""
"Now let's switch to the other side of the wire. As a prerequisite, you need "
@@ -4880,7 +4981,7 @@ msgstr ""
"确认是否正确。"
#. Tag: para
-#: using-d-i.xml:3339
+#: using-d-i.xml:3398
#, no-c-format
msgid ""
"The <command>ssh</command> server in the installer uses a default "
@@ -4901,7 +5002,7 @@ msgstr ""
"接在安装过程中的哪一点断开,您在连接之后可能继续,也可能无法继续安装过程。"
#. Tag: para
-#: using-d-i.xml:3352
+#: using-d-i.xml:3411
#, no-c-format
msgid ""
"You may be able to avoid the connection being dropped by adding the option "
@@ -4921,7 +5022,7 @@ msgstr ""
"需要的时候采用。"
#. Tag: para
-#: using-d-i.xml:3365
+#: using-d-i.xml:3424
#, no-c-format
msgid ""
"If you install several computers in turn and they happen to have the same IP "
@@ -4943,7 +5044,7 @@ msgstr ""
"footnote>,再重新来过。"
#. Tag: para
-#: using-d-i.xml:3381
+#: using-d-i.xml:3440
#, no-c-format
msgid ""
"After the login you will be presented with an initial screen where you have "
@@ -4960,7 +5061,7 @@ msgstr ""
"的系统。在安装菜单只能打开一个 SSH 会话,但 shell 可以打开多个。"
#. Tag: para
-#: using-d-i.xml:3391
+#: using-d-i.xml:3450
#, no-c-format
msgid ""
"After you have started the installation remotely over SSH, you should not go "
@@ -4973,13 +5074,13 @@ msgstr ""
"配置的数据库。结果可能导致安装失败或者安装完成的系统出现问题。"
#. Tag: title
-#: using-d-i.xml:3410
+#: using-d-i.xml:3469
#, no-c-format
msgid "Loading Missing Firmware"
msgstr "加载缺失的固件"
#. Tag: para
-#: using-d-i.xml:3411
+#: using-d-i.xml:3470
#, no-c-format
msgid ""
"As described in <xref linkend=\"hardware-firmware\"/>, some devices require "
@@ -4992,7 +5093,7 @@ msgstr ""
"强功能就无法使用。"
#. Tag: para
-#: using-d-i.xml:3419
+#: using-d-i.xml:3478
#, no-c-format
msgid ""
"If a device driver requests firmware that is not available, &d-i; will "
@@ -5008,7 +5109,7 @@ msgstr ""
"序模块。"
#. Tag: para
-#: using-d-i.xml:3429
+#: using-d-i.xml:3488
#, no-c-format
msgid ""
"Which devices are scanned and which file systems are supported depends on "
@@ -5024,7 +5125,7 @@ msgstr ""
"phrase>"
#. Tag: para
-#: using-d-i.xml:3439
+#: using-d-i.xml:3498
#, no-c-format
msgid ""
"Note that it is possible to skip loading the firmware if you know the device "
@@ -5035,13 +5136,13 @@ msgstr ""
"固件。"
#. Tag: title
-#: using-d-i.xml:3447
+#: using-d-i.xml:3506
#, no-c-format
msgid "Preparing a medium"
msgstr "准备介质"
#. Tag: para
-#: using-d-i.xml:3448
+#: using-d-i.xml:3507
#, no-c-format
msgid ""
"Official CD images do not include non-free firmware. The most common method "
@@ -5061,7 +5162,7 @@ msgstr ""
"下。推荐使用 FAT 文件系统,因为在安装过程的早期阶段它肯定能被支持。"
#. Tag: para
-#: using-d-i.xml:3461
+#: using-d-i.xml:3520
#, no-c-format
msgid ""
"Tarballs and zip files containing current packages for the most common "
@@ -5076,7 +5177,7 @@ msgstr ""
"件系统里面。"
#. Tag: para
-#: using-d-i.xml:3475
+#: using-d-i.xml:3534
#, no-c-format
msgid ""
"If the firmware you need is not included in the tarball, you can also "
@@ -5089,7 +5190,7 @@ msgstr ""
"件。以下概要列出大多数固件软件包,但不保证完整,有些还是非固件软件包:"
#. Tag: para
-#: using-d-i.xml:3489
+#: using-d-i.xml:3548
#, no-c-format
msgid ""
"It is also possible to copy individual firmware files to the medium. Loose "
@@ -5100,13 +5201,13 @@ msgstr ""
"造商那里获得。"
#. Tag: title
-#: using-d-i.xml:3498
+#: using-d-i.xml:3557
#, no-c-format
msgid "Firmware and the Installed System"
msgstr "固件和安装好的系统"
#. Tag: para
-#: using-d-i.xml:3499
+#: using-d-i.xml:3558
#, no-c-format
msgid ""
"Any firmware loaded during the installation will be copied automatically to "
@@ -5121,7 +5222,7 @@ msgstr ""
"序不同的内核版本,有可能由于版本的偏差造成固件不能加载。"
#. Tag: para
-#: using-d-i.xml:3508
+#: using-d-i.xml:3567
#, no-c-format
msgid ""
"If the firmware was loaded from a firmware package, &d-i; will also install "
@@ -5135,7 +5236,7 @@ msgstr ""
"做的优点在于如果有固件的新版本存在会自动更新。"
#. Tag: para
-#: using-d-i.xml:3516
+#: using-d-i.xml:3575
#, no-c-format
msgid ""
"If loading the firmware was skipped during the installation, the relevant "
@@ -5146,7 +5247,7 @@ msgstr ""
"安装好固件或软件包。"
#. Tag: para
-#: using-d-i.xml:3523
+#: using-d-i.xml:3582
#, no-c-format
msgid ""
"If the firmware was loaded from loose firmware files, the firmware copied to "
@@ -5156,3 +5257,18 @@ msgid ""
msgstr ""
"如果固件从不严格的固件文件加载,复制到安装好的系统的固件将<emphasis>不会</"
"emphasis>自动更新,除非对应的固件软件包(如果有的话)在系统安装之后安装。"
+
+#~ msgid ""
+#~ "There are two keyboard layouts for US keyboards; the qwerty/mac-usb-us "
+#~ "(Apple USB) layout will place the Alt function on the <keycap>Command/"
+#~ "Apple</keycap> key (in the keyboard position next to the <keycap>space</"
+#~ "keycap> key similar to <keycap>Alt</keycap> on PC keyboards), while the "
+#~ "qwerty/us (Standard) layout will place the Alt function on the "
+#~ "<keycap>Option</keycap> key (engraved with 'alt' on most Mac keyboards). "
+#~ "In other respects the two layouts are similar."
+#~ msgstr ""
+#~ "有两种 US 键盘布局;qwerty/mac-usb-us (Apple USB) 将 Alt 功能放在 "
+#~ "<keycap>Command/Apple</keycap> 健 (处于键盘的 <keycap>空格</keycap> 健旁,"
+#~ "类似于 PC 键盘的 <keycap>Alt</keycap> ),另外 qwerty/us (Standard) 布局将 "
+#~ "Alt 功能放在 <keycap>Option</keycap> 健上(在大多数 Mac 键盘上标明 'alt')。"
+#~ "其余地方这两种布局相似。"