summaryrefslogtreecommitdiff
path: root/po/zh_CN
diff options
context:
space:
mode:
authorHolger Wansing <linux@wansing-online.de>2012-12-04 08:30:04 +0000
committerHolger Wansing <linux@wansing-online.de>2012-12-04 08:30:04 +0000
commit0fdf2f2af9997ad243ca44aae833fb429050a1bc (patch)
tree4fddfc9f35be03ff0063786c37cc94ef432046b7 /po/zh_CN
parentff029b844c22527fbd3b96901e17cb5812b6ef77 (diff)
downloadinstallation-guide-0fdf2f2af9997ad243ca44aae833fb429050a1bc.zip
Update pot/po files:
M po/tl/boot-installer.po M po/ro/boot-installer.po M po/pt/install-methods.po M po/pt/boot-installer.po M po/da/boot-installer.po M po/ru/boot-installer.po M po/sv/boot-installer.po M po/ja/boot-installer.po M po/zh_TW/boot-installer.po M po/fi/boot-installer.po M po/el/boot-installer.po M po/zh_CN/install-methods.po M po/zh_CN/random-bits.po M po/zh_CN/preparing.po M po/zh_CN/preseed.po M po/zh_CN/welcome.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/boot-installer.pot M po/es/boot-installer.po M po/ko/boot-installer.po M po/nl/boot-installer.po M po/nn/boot-installer.po M po/hu/install-methods.po M po/hu/boot-installer.po M po/vi/boot-installer.po
Diffstat (limited to 'po/zh_CN')
-rw-r--r--po/zh_CN/boot-installer.po616
-rw-r--r--po/zh_CN/hardware.po296
-rw-r--r--po/zh_CN/install-methods.po150
-rw-r--r--po/zh_CN/installation-howto.po16
-rw-r--r--po/zh_CN/preparing.po322
-rw-r--r--po/zh_CN/preseed.po72
-rw-r--r--po/zh_CN/random-bits.po24
-rw-r--r--po/zh_CN/using-d-i.po92
-rw-r--r--po/zh_CN/welcome.po47
9 files changed, 774 insertions, 861 deletions
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index fe4d0e18b..6a787845f 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2012-11-24 22:10+0000\n"
+"POT-Creation-Date: 2012-12-04 08:21+0000\n"
"PO-Revision-Date: 2012-11-25 16:26+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -57,7 +57,7 @@ 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:586 boot-installer.xml:1127
-#: boot-installer.xml:1628 boot-installer.xml:1737
+#: boot-installer.xml:1648 boot-installer.xml:1757
#, no-c-format
msgid ""
"Booting from the network requires that you have a network connection and a "
@@ -69,7 +69,7 @@ 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:591 boot-installer.xml:1132
-#: boot-installer.xml:1633 boot-installer.xml:1742
+#: boot-installer.xml:1653 boot-installer.xml:1762
#, no-c-format
msgid ""
"Older systems such as the 715 might require the use of an RBOOT server "
@@ -79,7 +79,7 @@ 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:596 boot-installer.xml:1137
-#: boot-installer.xml:1638 boot-installer.xml:1747
+#: boot-installer.xml:1658 boot-installer.xml:1767
#, no-c-format
msgid ""
"The installation method to support network booting is described in <xref "
@@ -95,7 +95,7 @@ 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:746
-#: boot-installer.xml:1404 boot-installer.xml:1776
+#: boot-installer.xml:1424 boot-installer.xml:1796
#, no-c-format
msgid ""
"The easiest route for most people will be to use a set of &debian; CDs. If "
@@ -112,7 +112,7 @@ 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:757
-#: boot-installer.xml:1415 boot-installer.xml:1787
+#: boot-installer.xml:1435 boot-installer.xml:1807
#, no-c-format
msgid ""
"Note that certain CD drives may require special drivers, and thus be "
@@ -128,7 +128,7 @@ 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:765
-#: boot-installer.xml:1423 boot-installer.xml:1795
+#: boot-installer.xml:1443 boot-installer.xml:1815
#, no-c-format
msgid ""
"Even if you cannot boot from CD-ROM, you can probably install the &debian; "
@@ -144,7 +144,7 @@ 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:773
-#: boot-installer.xml:1431 boot-installer.xml:1803
+#: boot-installer.xml:1451 boot-installer.xml:1823
#, 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:740 boot-installer.xml:1398
-#: boot-installer.xml:1770
+#: boot-installer.xml:242 boot-installer.xml:740 boot-installer.xml:1418
+#: boot-installer.xml:1790
#, no-c-format
msgid "Booting from a CD-ROM"
msgstr "从 CD-ROM 启动"
@@ -391,16 +391,15 @@ msgstr "从 Windows 下启动安装程序,您可以"
#. Tag: para
#: boot-installer.xml:355
#, no-c-format
-#| msgid ""
-#| "obtain CD-ROM/DVD-ROM or USB memory stick installation media as described "
-#| "in <xref linkend=\"official-cdrom\"/> and <xref linkend=\"boot-usb-files"
-#| "\"/>, or"
msgid ""
"obtain CD-ROM/DVD-ROM<phrase condition=\"bootable-usb\"> or USB memory "
"stick</phrase> installation media as described in <xref linkend=\"official-"
"cdrom\"/><phrase condition=\"bootable-usb\"> respective <xref linkend=\"boot-"
"usb-files\"/></phrase> or"
-msgstr "从 <xref linkend=\"official-cdrom\"/><phrase condition=\"bootable-usb\"> 以及 <xref linkend=\"boot-usb-files\"/></phrase> 获取 CD-ROM/DVD-ROM<phrase condition=\"bootable-usb\"> 或 U 盘</phrase> 安装介质,或"
+msgstr ""
+"从 <xref linkend=\"official-cdrom\"/><phrase condition=\"bootable-usb\"> 以"
+"及 <xref linkend=\"boot-usb-files\"/></phrase> 获取 CD-ROM/DVD-ROM<phrase "
+"condition=\"bootable-usb\"> 或 U 盘</phrase> 安装介质,或"
#. Tag: para
#: boot-installer.xml:363
@@ -663,13 +662,6 @@ msgstr "从 U 盘引导"
#. Tag: para
#: boot-installer.xml:508
#, no-c-format
-#| msgid ""
-#| "Let's assume you have prepared everything from <xref linkend=\"boot-dev-"
-#| "select\"/> and <xref linkend=\"boot-usb-files\"/>. Now just plug your USB "
-#| "stick into some free USB connector and reboot the computer. The system "
-#| "should boot up, and you should be presented with the <prompt>boot:</"
-#| "prompt> prompt. Here you can enter optional boot arguments, or just hit "
-#| "&enterkey;."
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 "
@@ -677,18 +669,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\"/> 的所有步骤。现在只需插入 U 盘到一个空的 USB 插槽并重启。除非您使用了灵活方式创建 U 盘并不激活,系统应该引导,并看到一个 <prompt>boot:</prompt> 提示符。此时您可以输入一些引导选项,也可以直接按 &enterkey;。"
+msgstr ""
+"假设您已经准备好了从 <xref linkend=\"boot-dev-select\"/> 到 <xref linkend="
+"\"boot-usb-files\"/> 的所有步骤。现在只需插入 U 盘到一个空的 USB 插槽并重启。"
+"除非您使用了灵活方式创建 U 盘并不激活,系统应该引导,并看到一个 <prompt>boot:"
+"</prompt> 提示符。此时您可以输入一些引导选项,也可以直接按 &enterkey;。"
# index.docbook:723, index.docbook:1876, index.docbook:2278, index.docbook:2426
#. Tag: title
-#: boot-installer.xml:522 boot-installer.xml:1677
+#: boot-installer.xml:522 boot-installer.xml:1697
#, no-c-format
msgid "Booting from Floppies"
msgstr "从软盘引导"
# index.docbook:724, index.docbook:2286
#. Tag: para
-#: boot-installer.xml:523 boot-installer.xml:1685
+#: boot-installer.xml:523 boot-installer.xml:1705
#, no-c-format
msgid ""
"You will have already downloaded the floppy images you needed and created "
@@ -779,7 +775,7 @@ 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:580 boot-installer.xml:1109 boot-installer.xml:1250
-#: boot-installer.xml:1304 boot-installer.xml:1622 boot-installer.xml:1731
+#: boot-installer.xml:1304 boot-installer.xml:1642 boot-installer.xml:1751
#, no-c-format
msgid "Booting with TFTP"
msgstr "用 TFTP 引导"
@@ -935,23 +931,6 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:683
#, 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. To "
@@ -967,9 +946,16 @@ msgid ""
"method (the default is <userinput>install</userinput>) and a space before "
"the first parameter (e.g., <userinput>install fb=false</userinput>)."
msgstr ""
-"选择 <quote>Help</quote> 项将进入第一个帮助界面,显示可用的帮助界面概要。当出现帮助界面后要返回引导菜单,需要在引导提示符后输入 'menu' 并按 &enterkey;。所有的帮助界面在引导命令可以输入的地方都有一个引导提示: <informalexample><screen>\n"
+"选择 <quote>Help</quote> 项将进入第一个帮助界面,显示可用的帮助界面概要。当出"
+"现帮助界面后要返回引导菜单,需要在引导提示符后输入 'menu' 并按 &enterkey;。所"
+"有的帮助界面在引导命令可以输入的地方都有一个引导提示: "
+"<informalexample><screen>\n"
"Press F1 for the help index, or ENTER to boot:\n"
-"</screen></informalexample> 在这个引导提示的地方您可以按下 &enterkey; 使用默认的选项引导安装程序,或者输入指定的引导命令以及引导参数。一些可用的引导参数可能会在多个帮助界面看到。假如您要添加任何参数到引导命令行,确保首先输入的是引导方法(默认为 <userinput>install</userinput>),然后在第一个参数前要有空格(例如:<userinput>install fb=false</userinput>)。"
+"</screen></informalexample> 在这个引导提示的地方您可以按下 &enterkey; 使用默"
+"认的选项引导安装程序,或者输入指定的引导命令以及引导参数。一些可用的引导参数"
+"可能会在多个帮助界面看到。假如您要添加任何参数到引导命令行,确保首先输入的是"
+"引导方法(默认为 <userinput>install</userinput>),然后在第一个参数前要有空格"
+"(例如:<userinput>install fb=false</userinput>)。"
#. Tag: para
#: boot-installer.xml:701
@@ -1680,7 +1666,7 @@ msgstr ""
# index.docbook:1943, index.docbook:2477
#. Tag: title
-#: boot-installer.xml:1274 boot-installer.xml:1341 boot-installer.xml:1975
+#: boot-installer.xml:1274 boot-installer.xml:1341 boot-installer.xml:1995
#, no-c-format
msgid "Boot Parameters"
msgstr "引导参数"
@@ -1811,18 +1797,48 @@ msgstr "s390 引导参数"
#. Tag: para
#: boot-installer.xml:1378
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "On S/390 you can append boot parameters in the parm file. This file can "
+#| "either be in ASCII or EBCDIC format. A sample parm file "
+#| "<filename>parmfile.debian</filename> is provided with the installation "
+#| "images."
msgid ""
"On S/390 you can append boot parameters in the parm file. This file can "
-"either be in ASCII or EBCDIC format. A sample parm file <filename>parmfile."
-"debian</filename> is provided with the installation images."
+"either be in ASCII or EBCDIC format. It needs to be fixed-width with 80 "
+"characters per line. A sample parm file <filename>parmfile.debian</filename> "
+"is provided with the installation images. If a parameter is too long to fit "
+"into the 80 characters limit it can simply be continued in the first column "
+"of the next line. All the lines are concatenated without spaces when being "
+"passed to the kernel."
msgstr ""
"在 S/390 上您可以在参数文件下面附加一些引导参数。这个文件可以是 ASCII 或者 "
"EBCDIC 格式的。参数文件的示例 <filename>parmfile.debian</filename> 提供了安装"
"映像。"
#. Tag: para
-#: boot-installer.xml:1438
+#: boot-installer.xml:1395
+#, no-c-format
+msgid ""
+"If you boot the installer in a logical partition (LPAR) or virtual machine "
+"(VM) where a lot of devices are visible, you might want to instruct the "
+"kernel to restrict the list to a fixed set of devices. This is advised for "
+"the installer's boot process if a lot of disks are visible. The \"cio_ignore"
+"\" option supports both a blacklist (to only disallow a few devices) and a "
+"whitelist (to only allow specific devices): <informalexample role=\"example"
+"\"><screen>\n"
+" # blacklist: just ignore the two devices 300 and 301\n"
+" cio_ignore=0.0.0300-0.0.0301\n"
+" # whitelist: ignore everything but 1150, FD00, FD01 and FD02\n"
+" cio_ignore=all,!0.0.1150,!0.0.fd00-0.0.fd02\n"
+"</screen></informalexample> Please note that all devices numbers' hex digits "
+"need to be specified in lower case. To be considered during the installer's "
+"boot process the above option needs to be added to <filename>parmfile."
+"debian</filename>."
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:1458
#, no-c-format
msgid ""
"Currently, the only &arch-title; subarchitectures that support CD-ROM "
@@ -1838,7 +1854,7 @@ msgstr ""
"keycap> 和 <keycap>Delete</keycap> 组合键引导出厂默认的 CD/DVD 驱动器。"
#. Tag: para
-#: boot-installer.xml:1447
+#: boot-installer.xml:1467
#, no-c-format
msgid ""
"To boot a PowerMac from an external Firewire CD/DVD drive invoke Open "
@@ -1855,13 +1871,13 @@ msgstr ""
"</screen></informalexample> 另一种方法引导出厂默认的 CD/DVD 驱动器,键入"
#. Tag: screen
-#: boot-installer.xml:1458
+#: boot-installer.xml:1478
#, no-c-format
msgid "0 &gt; boot cd:,\\install\\yaboot"
msgstr "0 &gt; boot cd:,\\install\\yaboot"
#. Tag: para
-#: boot-installer.xml:1460
+#: boot-installer.xml:1480
#, no-c-format
msgid ""
"OldWorld PowerMacs will not boot a &debian; CD, because OldWorld computers "
@@ -1876,7 +1892,7 @@ msgstr ""
"安装程序 从 CD 上选择所需要的文件。"
#. Tag: para
-#: boot-installer.xml:1469
+#: boot-installer.xml:1489
#, no-c-format
msgid ""
"To boot &debian; CD/DVD on Pegasos II machine, hold <keycap>Esc</keycap> key "
@@ -1887,20 +1903,20 @@ msgstr ""
"<keycap>Esc</keycap> 键,出现 SmartFirmware 提示符后,键入"
#. Tag: screen
-#: boot-installer.xml:1475
+#: boot-installer.xml:1495
#, no-c-format
msgid "boot cd install/pegasos"
msgstr "boot cd install/pegasos"
#. Tag: title
-#: boot-installer.xml:1481
+#: boot-installer.xml:1501
#, no-c-format
msgid "Booting from Hard Disk"
msgstr "从硬盘引导"
# index.docbook:1591, index.docbook:2097
#. Tag: para
-#: boot-installer.xml:1487
+#: boot-installer.xml:1507
#, no-c-format
msgid ""
"Booting from an existing operating system is often a convenient option; for "
@@ -1911,7 +1927,7 @@ msgstr ""
# index.docbook:1597, index.docbook:2103
#. Tag: para
-#: boot-installer.xml:1493
+#: boot-installer.xml:1513
#, no-c-format
msgid ""
"To boot the installer from hard disk, you will have already completed "
@@ -1922,13 +1938,13 @@ msgstr ""
"下载并且安置所需文件。"
#. Tag: title
-#: boot-installer.xml:1513
+#: boot-installer.xml:1533
#, no-c-format
msgid "Booting OldWorld PowerMacs from MacOS"
msgstr "从 OldWorld PowerMacs 的 MacOS 上引导"
#. Tag: para
-#: boot-installer.xml:1514
+#: boot-installer.xml:1534
#, no-c-format
msgid ""
"If you set up BootX in <xref linkend=\"files-oldworld\"/>, you can use it to "
@@ -1949,13 +1965,13 @@ msgstr ""
"序。"
#. Tag: title
-#: boot-installer.xml:1532
+#: boot-installer.xml:1552
#, no-c-format
msgid "Booting NewWorld Macs from OpenFirmware"
msgstr "从 NewWorld Macs 的 OpenFirmware 引导"
#. Tag: para
-#: boot-installer.xml:1533
+#: boot-installer.xml:1553
#, no-c-format
msgid ""
"You will have already placed the <filename>vmlinux</filename>, "
@@ -1996,19 +2012,19 @@ msgstr ""
# index.docbook:700, index.docbook:2176
#. Tag: title
-#: boot-installer.xml:1565
+#: boot-installer.xml:1585
#, no-c-format
msgid "Booting from USB memory stick"
msgstr "从 U 盘引导"
#. Tag: para
-#: boot-installer.xml:1566
+#: boot-installer.xml:1586
#, no-c-format
msgid "Currently, NewWorld PowerMac systems are known to support USB booting."
msgstr "当前,New World PowerMac 系统支持从 USB 引导。"
#. Tag: para
-#: boot-installer.xml:1572
+#: boot-installer.xml:1592
#, no-c-format
msgid ""
"Make sure you have prepared everything from <xref linkend=\"boot-usb-files\"/"
@@ -2021,7 +2037,7 @@ msgstr ""
"Open Firmware 提示符。参阅 <xref linkend=\"invoking-openfirmware\"/>。"
#. Tag: para
-#: boot-installer.xml:1581
+#: boot-installer.xml:1601
#, no-c-format
msgid ""
"You will need to work out where the USB storage device appears in the device "
@@ -2042,7 +2058,7 @@ msgstr ""
"disk@1</filename> 。"
#. Tag: para
-#: boot-installer.xml:1593
+#: boot-installer.xml:1613
#, no-c-format
msgid ""
"Having worked out the device path, use a command like this to boot the "
@@ -2066,7 +2082,7 @@ msgstr ""
"command>。"
#. Tag: para
-#: boot-installer.xml:1607
+#: boot-installer.xml:1627
#, no-c-format
msgid ""
"The system should now boot up, and you should be presented with the "
@@ -2077,7 +2093,7 @@ msgstr ""
"动参数,或者只按下 &enterkey;。"
#. Tag: para
-#: boot-installer.xml:1613
+#: boot-installer.xml:1633
#, no-c-format
msgid ""
"This boot method is new, and may be difficult to get to work on some "
@@ -2088,13 +2104,13 @@ msgstr ""
"下安装报告,参阅 <xref linkend=\"submit-bug\"/>。"
#. Tag: para
-#: boot-installer.xml:1646
+#: boot-installer.xml:1666
#, no-c-format
msgid "Currently, PReP and New World PowerMac systems support netbooting."
msgstr "目前来说,PReP 以及 New World PowerMac 系统支持网络引导。"
#. Tag: para
-#: boot-installer.xml:1650
+#: boot-installer.xml:1670
#, no-c-format
msgid ""
"On machines with Open Firmware, such as NewWorld Power Macs, enter the boot "
@@ -2127,7 +2143,7 @@ msgstr ""
"<userinput>help boot</userinput> 命令可以给出语法和选项的说明。"
#. Tag: para
-#: boot-installer.xml:1678
+#: boot-installer.xml:1698
#, no-c-format
msgid ""
"Booting from floppies is supported for &arch-title;, although it is "
@@ -2139,7 +2155,7 @@ msgstr ""
"没有安装 软盘驱动器,并且附带的 USB 软盘并不支持引导。"
#. Tag: para
-#: boot-installer.xml:1690
+#: boot-installer.xml:1710
#, no-c-format
msgid ""
"To boot from the <filename>boot-floppy-hfs.img</filename> floppy, place it "
@@ -2150,7 +2166,7 @@ msgstr ""
"按下电源开关前把它放到软盘驱动器内。"
#. Tag: para
-#: boot-installer.xml:1696
+#: boot-installer.xml:1716
#, no-c-format
msgid ""
"For those not familiar with Macintosh floppy operations: a floppy placed in "
@@ -2162,7 +2178,7 @@ msgstr ""
"序。一个 没有有效引导系统的软盘将回被弹出,并且机器将检查硬盘分区。"
#. Tag: para
-#: boot-installer.xml:1703
+#: boot-installer.xml:1723
#, no-c-format
msgid ""
"After booting, the <filename>root.bin</filename> floppy is requested. Insert "
@@ -2173,13 +2189,13 @@ msgstr ""
"&enterkey;。安装程序将在根系统被装入内存后自动启动。"
#. Tag: title
-#: boot-installer.xml:1714
+#: boot-installer.xml:1734
#, no-c-format
msgid "PowerPC Boot Parameters"
msgstr "PowerPC 引导参数"
#. Tag: para
-#: boot-installer.xml:1715
+#: boot-installer.xml:1735
#, no-c-format
msgid ""
"Many older Apple monitors used a 640x480 67Hz mode. If your video appears "
@@ -2194,7 +2210,7 @@ msgstr ""
"128 来说,请改变其值为 <userinput>video=aty128fb:vmode:6</userinput> 。"
#. Tag: para
-#: boot-installer.xml:1755
+#: boot-installer.xml:1775
#, no-c-format
msgid ""
"On machines with OpenBoot, simply enter the boot monitor on the machine "
@@ -2213,7 +2229,7 @@ msgstr ""
"i; 。"
#. Tag: para
-#: boot-installer.xml:1810
+#: boot-installer.xml:1830
#, no-c-format
msgid ""
"Most OpenBoot versions support the <userinput>boot cdrom</userinput> command "
@@ -2225,13 +2241,13 @@ msgstr ""
"盘)。"
#. Tag: title
-#: boot-installer.xml:1819
+#: boot-installer.xml:1839
#, no-c-format
msgid "IDPROM Messages"
msgstr "IDPROM 消息"
#. Tag: para
-#: boot-installer.xml:1820
+#: boot-installer.xml:1840
#, no-c-format
msgid ""
"If you cannot boot because you get messages about a problem with "
@@ -2245,13 +2261,13 @@ msgstr ""
"nvram-faq;\">Sun NVRAM FAQ</ulink> 以获得更多信息。"
#. Tag: title
-#: boot-installer.xml:1839
+#: boot-installer.xml:1859
#, no-c-format
msgid "Accessibility"
msgstr "辅助功能"
#. Tag: para
-#: boot-installer.xml:1840
+#: boot-installer.xml:1860
#, no-c-format
msgid ""
"Some users may need specific support because of e.g. some visual impairment. "
@@ -2276,13 +2292,13 @@ msgstr ""
"要注意在大多数架构下 boot loader 将视您的键盘为 QWERTY 布局。"
#. Tag: title
-#: boot-installer.xml:1860
+#: boot-installer.xml:1880
#, no-c-format
msgid "USB Braille Displays"
msgstr "USB 盲文点显器"
#. Tag: para
-#: boot-installer.xml:1861
+#: boot-installer.xml:1881
#, no-c-format
msgid ""
"USB braille displays should be automatically detected. A textual version of "
@@ -2301,13 +2317,13 @@ msgstr ""
"website</ulink> 可以找到盲文点显器的键绑定文档。"
#. Tag: title
-#: boot-installer.xml:1876
+#: boot-installer.xml:1896
#, no-c-format
msgid "Serial Braille Displays"
msgstr "串口盲文点显器"
#. Tag: para
-#: boot-installer.xml:1877
+#: boot-installer.xml:1897
#, no-c-format
msgid ""
"Serial braille displays cannot safely be automatically detected (since that "
@@ -2342,13 +2358,13 @@ msgstr ""
"\"><classname>brltty</classname> website</ulink> 找到。"
#. Tag: title
-#: boot-installer.xml:1899 boot-installer.xml:2863
+#: boot-installer.xml:1919 boot-installer.xml:2883
#, no-c-format
msgid "Software Speech Synthesis"
msgstr "软件语音合成(Software Speech Synthesis)"
#. Tag: para
-#: boot-installer.xml:1900
+#: boot-installer.xml:1920
#, no-c-format
msgid ""
"Support for software speech synthesis can be activated by selecting it in "
@@ -2362,13 +2378,13 @@ msgstr ""
"<classname>espeak</classname>)。"
#. Tag: title
-#: boot-installer.xml:1911
+#: boot-installer.xml:1931
#, no-c-format
msgid "Hardware Speech Synthesis"
msgstr "硬件语音合成(Hardware Speech Synthesis)"
#. Tag: para
-#: boot-installer.xml:1912
+#: boot-installer.xml:1932
#, no-c-format
msgid ""
"Support for hardware speech synthesis devices is available only alongside "
@@ -2379,7 +2395,7 @@ msgstr ""
"择 <quote>Graphical install</quote> 项。"
#. Tag: para
-#: boot-installer.xml:1918
+#: boot-installer.xml:1938
#, no-c-format
msgid ""
"Hardware speech synthesis devices cannot be automatically detected. You thus "
@@ -2399,13 +2415,13 @@ msgstr ""
"对于语音合成设备的支持也会被自动安装到最终系统里面。"
#. Tag: title
-#: boot-installer.xml:1933
+#: boot-installer.xml:1953
#, no-c-format
msgid "Board Devices"
msgstr "板卡设备"
#. Tag: para
-#: boot-installer.xml:1934
+#: boot-installer.xml:1954
#, no-c-format
msgid ""
"Some accessibility devices are actual boards that are plugged inside the "
@@ -2420,7 +2436,7 @@ msgstr ""
"数量。"
#. Tag: para
-#: boot-installer.xml:1942
+#: boot-installer.xml:1962
#, no-c-format
msgid ""
"If desired a textual version of the bootloader can be activated before "
@@ -2430,13 +2446,13 @@ msgstr ""
"userinput> &enterkey;。"
#. Tag: title
-#: boot-installer.xml:1950
+#: boot-installer.xml:1970
#, no-c-format
msgid "High-Contrast Theme"
msgstr "高亮主题"
#. Tag: para
-#: boot-installer.xml:1951
+#: boot-installer.xml:1971
#, no-c-format
msgid ""
"For users with low vision, the installer can use a high-contrast theme that "
@@ -2447,13 +2463,13 @@ msgstr ""
"<userinput>theme=dark</userinput> 引导参数即可。"
#. Tag: title
-#: boot-installer.xml:1960
+#: boot-installer.xml:1980
#, no-c-format
msgid "Preseeding"
msgstr "预置"
#. Tag: para
-#: boot-installer.xml:1961
+#: boot-installer.xml:1981
#, no-c-format
msgid ""
"Alternatively, &debian; can be installed completely automatically by using "
@@ -2463,7 +2479,7 @@ msgstr ""
"\"appendix-preseed\"/>。"
#. Tag: para
-#: boot-installer.xml:1976
+#: boot-installer.xml:1996
#, no-c-format
msgid ""
"Boot parameters are Linux kernel parameters which are generally used to make "
@@ -2476,7 +2492,7 @@ msgstr ""
"要给内核一点小小的帮助。"
#. Tag: para
-#: boot-installer.xml:1983
+#: boot-installer.xml:2003
#, no-c-format
msgid ""
"If this is the first time you're booting the system, try the default boot "
@@ -2489,7 +2505,7 @@ msgstr ""
"的硬件特定参数。"
#. Tag: para
-#: boot-installer.xml:1990
+#: boot-installer.xml:2010
#, no-c-format
msgid ""
"Information on many boot parameters can be found in the <ulink url=\"http://"
@@ -2504,23 +2520,8 @@ msgstr ""
"linkend=\"boot-troubleshooting\"/>。"
#. Tag: para
-#: boot-installer.xml:2001
+#: boot-installer.xml:2021
#, 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 ""
"If you are booting with a serial console, generally the kernel will "
"autodetect this. If you have a videocard (framebuffer) and a keyboard also "
@@ -2529,26 +2530,15 @@ msgid ""
"userinput> argument to the kernel, where <replaceable>device</replaceable> "
"is your serial device, which is usually something like <filename>ttyS0</"
"filename>."
-msgstr "假如您用串口控制台引导,通常内核可以自动检测到。如果在串口引导的计算机上有视频卡(framebuffer)和键盘,您必须传递 <userinput>console=<replaceable>device</replaceable></userinput> 参数给内核,其中 <replaceable>device</replaceable> 是串口设备,通常是 <filename>ttyS0</filename> 形式。"
+msgstr ""
+"假如您用串口控制台引导,通常内核可以自动检测到。如果在串口引导的计算机上有视"
+"频卡(framebuffer)和键盘,您必须传递 <userinput>console=<replaceable>device</"
+"replaceable></userinput> 参数给内核,其中 <replaceable>device</replaceable> "
+"是串口设备,通常是 <filename>ttyS0</filename> 形式。"
#. Tag: para
-#: boot-installer.xml:2013
+#: boot-installer.xml:2033
#, 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</"
@@ -2561,10 +2551,18 @@ msgid ""
"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 "为了确保安装程序使用的终端类型与您的终端模拟程序匹配,可以添加一个 <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>。如果您使用的虚拟工具,比如 QEMU/KVM,不支持转换成这些终端类型,您可以从一个 <command>screen</command> 会话中启动。这会将其转换成 <literal>screen</literal> 终端类型,而它又非常接近于 <literal>vt102</literal> 类型。"
+msgstr ""
+"为了确保安装程序使用的终端类型与您的终端模拟程序匹配,可以添加一个 "
+"<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>。"
+"如果您使用的虚拟工具,比如 QEMU/KVM,不支持转换成这些终端类型,您可以从一个 "
+"<command>screen</command> 会话中启动。这会将其转换成 <literal>screen</"
+"literal> 终端类型,而它又非常接近于 <literal>vt102</literal> 类型。"
#. Tag: para
-#: boot-installer.xml:2029
+#: boot-installer.xml:2049
#, no-c-format
msgid ""
"For &arch-title; the serial devices are <filename>ttya</filename> or "
@@ -2577,13 +2575,13 @@ msgstr ""
"<envar>output-device</envar> OpenPROM 变量至 <filename>ttya</filename>。"
#. Tag: title
-#: boot-installer.xml:2040
+#: boot-installer.xml:2060
#, no-c-format
msgid "&debian; Installer Parameters"
msgstr "&debian; 安装程序的参数"
#. Tag: para
-#: boot-installer.xml:2041
+#: boot-installer.xml:2061
#, no-c-format
msgid ""
"The installation system recognizes a few additional boot "
@@ -2596,7 +2594,7 @@ msgstr ""
"para> </footnote>,它们很有用。"
#. Tag: para
-#: boot-installer.xml:2054
+#: boot-installer.xml:2074
#, no-c-format
msgid ""
"A number of parameters have a <quote>short form</quote> that helps avoid the "
@@ -2610,19 +2608,19 @@ msgstr ""
"用简写。"
#. Tag: term
-#: boot-installer.xml:2066
+#: boot-installer.xml:2086
#, no-c-format
msgid "debconf/priority (priority)"
msgstr "debconf/priority (priority)"
#. Tag: para
-#: boot-installer.xml:2067
+#: boot-installer.xml:2087
#, no-c-format
msgid "This parameter sets the lowest priority of messages to be displayed."
msgstr "这些参数设置将设置显示的信息为最低的级别。"
#. Tag: para
-#: boot-installer.xml:2071
+#: boot-installer.xml:2091
#, no-c-format
msgid ""
"The default installation uses <userinput>priority=high</userinput>. This "
@@ -2635,7 +2633,7 @@ msgstr ""
"将按照要求调整优先级别。"
#. Tag: para
-#: boot-installer.xml:2078
+#: boot-installer.xml:2098
#, no-c-format
msgid ""
"If you add <userinput>priority=medium</userinput> as boot parameter, you "
@@ -2653,13 +2651,13 @@ msgstr ""
"且尝试正确无误地执行各项事宜。"
#. Tag: term
-#: boot-installer.xml:2092
+#: boot-installer.xml:2112
#, no-c-format
msgid "DEBIAN_FRONTEND"
msgstr "DEBIAN_FRONTEND"
#. Tag: para
-#: boot-installer.xml:2093
+#: boot-installer.xml:2113
#, no-c-format
msgid ""
"This boot parameter controls the type of user interface used for the "
@@ -2692,13 +2690,13 @@ msgstr ""
"所支持的平台上使用 <userinput>gtk</userinput> 前端。"
#. Tag: term
-#: boot-installer.xml:2124
+#: boot-installer.xml:2144
#, no-c-format
msgid "BOOT_DEBUG"
msgstr "BOOT_DEBUG"
#. Tag: para
-#: boot-installer.xml:2125
+#: boot-installer.xml:2145
#, no-c-format
msgid ""
"Setting this boot parameter to 2 will cause the installer's boot process to "
@@ -2710,49 +2708,49 @@ msgstr ""
"debug shell。(退出 shell 以后会继续引导过程。)"
#. Tag: userinput
-#: boot-installer.xml:2134
+#: boot-installer.xml:2154
#, no-c-format
msgid "BOOT_DEBUG=0"
msgstr "BOOT_DEBUG=0"
#. Tag: para
-#: boot-installer.xml:2135
+#: boot-installer.xml:2155
#, no-c-format
msgid "This is the default."
msgstr "此为默认。"
#. Tag: userinput
-#: boot-installer.xml:2139
+#: boot-installer.xml:2159
#, no-c-format
msgid "BOOT_DEBUG=1"
msgstr "BOOT_DEBUG=1"
#. Tag: para
-#: boot-installer.xml:2140
+#: boot-installer.xml:2160
#, no-c-format
msgid "More verbose than usual."
msgstr "更多的信息。"
#. Tag: userinput
-#: boot-installer.xml:2144
+#: boot-installer.xml:2164
#, no-c-format
msgid "BOOT_DEBUG=2"
msgstr "BOOT_DEBUG=2"
#. Tag: para
-#: boot-installer.xml:2145
+#: boot-installer.xml:2165
#, no-c-format
msgid "Lots of debugging information."
msgstr "大量的调试信息。"
#. Tag: userinput
-#: boot-installer.xml:2149
+#: boot-installer.xml:2169
#, no-c-format
msgid "BOOT_DEBUG=3"
msgstr "BOOT_DEBUG=3"
#. Tag: para
-#: boot-installer.xml:2150
+#: boot-installer.xml:2170
#, no-c-format
msgid ""
"Shells are run at various points in the boot process to allow detailed "
@@ -2762,13 +2760,13 @@ msgstr ""
"Shell 将继续引导过程。"
#. Tag: term
-#: boot-installer.xml:2164
+#: boot-installer.xml:2184
#, no-c-format
msgid "INSTALL_MEDIA_DEV"
msgstr "INSTALL_MEDIA_DEV"
#. Tag: para
-#: boot-installer.xml:2165
+#: boot-installer.xml:2185
#, no-c-format
msgid ""
"The value of the parameter is the path to the device to load the &debian; "
@@ -2779,7 +2777,7 @@ msgstr ""
"<userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</userinput>"
#. Tag: para
-#: boot-installer.xml:2171
+#: boot-installer.xml:2191
#, no-c-format
msgid ""
"The boot floppy, which normally scans all floppies it can to find the root "
@@ -2788,19 +2786,19 @@ msgstr ""
"引导软盘通常会扫描所有的软盘来找到根软盘,可以通过此参数设置只查找一个设备。"
#. Tag: term
-#: boot-installer.xml:2182
+#: boot-installer.xml:2202
#, no-c-format
msgid "log_host"
msgstr "log_host"
#. Tag: term
-#: boot-installer.xml:2183
+#: boot-installer.xml:2203
#, no-c-format
msgid "log_port"
msgstr "log_port"
#. Tag: para
-#: boot-installer.xml:2184
+#: boot-installer.xml:2204
#, no-c-format
msgid ""
"Causes the installer to send log messages to a remote syslog on the "
@@ -2811,13 +2809,13 @@ msgstr ""
"定,默认端口是 syslog 标准端口 514。"
#. Tag: term
-#: boot-installer.xml:2195
+#: boot-installer.xml:2215
#, no-c-format
msgid "lowmem"
msgstr "lowmem"
#. Tag: para
-#: boot-installer.xml:2196
+#: boot-installer.xml:2216
#, no-c-format
msgid ""
"Can be used to force the installer to a lowmem level higher than the one the "
@@ -2828,13 +2826,13 @@ msgstr ""
"和 2。参阅 <xref linkend=\"lowmem\"/>。"
#. Tag: term
-#: boot-installer.xml:2206
+#: boot-installer.xml:2226
#, no-c-format
msgid "noshell"
msgstr "noshell"
#. Tag: para
-#: boot-installer.xml:2207
+#: boot-installer.xml:2227
#, no-c-format
msgid ""
"Prevents the installer from offering interactive shells on tty2 and tty3. "
@@ -2844,13 +2842,13 @@ msgstr ""
"处。"
#. Tag: term
-#: boot-installer.xml:2216
+#: boot-installer.xml:2236
#, no-c-format
msgid "debian-installer/framebuffer (fb)"
msgstr "debian-installer/framebuffer (fb)"
#. Tag: para
-#: boot-installer.xml:2217
+#: boot-installer.xml:2237
#, no-c-format
msgid ""
"Some architectures use the kernel framebuffer to offer installation in a "
@@ -2866,13 +2864,13 @@ msgstr ""
"bogl 的相关错误信息、一个空白的屏幕,或者在开始安装几分钟后停止。"
#. Tag: para
-#: boot-installer.xml:2226
+#: boot-installer.xml:2246
#, no-c-format
msgid "Such problems have been reported on hppa."
msgstr "在 hppa 上面报告过存在这些问题。"
#. Tag: para
-#: boot-installer.xml:2230
+#: boot-installer.xml:2250
#, no-c-format
msgid ""
"Because of display problems on some systems, framebuffer support is "
@@ -2889,13 +2887,13 @@ msgstr ""
"<userinput>fb=true</userinput>。"
#. Tag: term
-#: boot-installer.xml:2244
+#: boot-installer.xml:2264
#, no-c-format
msgid "debian-installer/theme (theme)"
msgstr "debian-installer/theme (theme)"
#. Tag: para
-#: boot-installer.xml:2245
+#: boot-installer.xml:2265
#, no-c-format
msgid ""
"A theme determines how the user interface of the installer looks (colors, "
@@ -2910,13 +2908,13 @@ msgstr ""
"<userinput>theme=<replaceable>dark</replaceable></userinput> 设置。"
#. Tag: term
-#: boot-installer.xml:2257 boot-installer.xml:2490
+#: boot-installer.xml:2277 boot-installer.xml:2510
#, no-c-format
msgid "netcfg/disable_dhcp"
msgstr "netcfg/disable_dhcp"
#. Tag: para
-#: boot-installer.xml:2258
+#: boot-installer.xml:2278
#, no-c-format
msgid ""
"By default, the &d-i; automatically probes for network configuration via "
@@ -2928,7 +2926,7 @@ msgstr ""
"视并且改变其获得的设定。您可以在 DHCP 检测失败的情况下手工配置网络。"
#. Tag: para
-#: boot-installer.xml:2265
+#: boot-installer.xml:2285
#, no-c-format
msgid ""
"If you have a DHCP server on your local network, but want to avoid it "
@@ -2941,13 +2939,13 @@ msgstr ""
"过 DHCP 配置网络,并手工输入信息。"
#. Tag: term
-#: boot-installer.xml:2276
+#: boot-installer.xml:2296
#, no-c-format
msgid "hw-detect/start_pcmcia"
msgstr "hw-detect/start_pcmcia"
#. Tag: para
-#: boot-installer.xml:2277
+#: boot-installer.xml:2297
#, no-c-format
msgid ""
"Set to <userinput>false</userinput> to prevent starting PCMCIA services, if "
@@ -2957,13 +2955,13 @@ msgstr ""
"携机会有这种现象。"
#. Tag: term
-#: boot-installer.xml:2287
+#: boot-installer.xml:2307
#, no-c-format
msgid "disk-detect/dmraid/enable (dmraid)"
msgstr "disk-detect/dmraid/enable (dmraid)"
#. Tag: para
-#: boot-installer.xml:2288
+#: boot-installer.xml:2308
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> to enable support for Serial ATA RAID "
@@ -2977,13 +2975,13 @@ msgstr ""
"ulink> 找到。"
#. Tag: term
-#: boot-installer.xml:2299
+#: boot-installer.xml:2319
#, no-c-format
msgid "preseed/url (url)"
msgstr "preseed/url (url)"
#. Tag: para
-#: boot-installer.xml:2300
+#: boot-installer.xml:2320
#, no-c-format
msgid ""
"Specify the url to a preconfiguration file to download and use for "
@@ -2993,13 +2991,13 @@ msgstr ""
"install\"/>。"
#. Tag: term
-#: boot-installer.xml:2309
+#: boot-installer.xml:2329
#, no-c-format
msgid "preseed/file (file)"
msgstr "preseed/file (file)"
#. Tag: para
-#: boot-installer.xml:2310
+#: boot-installer.xml:2330
#, no-c-format
msgid ""
"Specify the path to a preconfiguration file to load for automating the "
@@ -3009,13 +3007,13 @@ msgstr ""
">。"
#. Tag: term
-#: boot-installer.xml:2319
+#: boot-installer.xml:2339
#, no-c-format
msgid "preseed/interactive"
msgstr "preseed/interactive"
#. Tag: para
-#: boot-installer.xml:2320
+#: boot-installer.xml:2340
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> to display questions even if they have "
@@ -3029,13 +3027,13 @@ msgstr ""
"<xref linkend=\"preseed-seenflag\"/> 了解详细信息。"
#. Tag: term
-#: boot-installer.xml:2332
+#: boot-installer.xml:2352
#, no-c-format
msgid "auto-install/enable (auto)"
msgstr "auto-install/enable (auto)"
#. Tag: para
-#: boot-installer.xml:2333
+#: boot-installer.xml:2353
#, no-c-format
msgid ""
"Delay questions that are normally asked before preseeding is possible until "
@@ -3046,13 +3044,13 @@ msgstr ""
"auto\"/> 了解自动安装的详细信息。"
#. Tag: term
-#: boot-installer.xml:2344
+#: boot-installer.xml:2364
#, no-c-format
msgid "finish-install/keep-consoles"
msgstr "finish-install/keep-consoles"
#. Tag: para
-#: boot-installer.xml:2345
+#: boot-installer.xml:2365
#, no-c-format
msgid ""
"During installations from serial or management console, the regular virtual "
@@ -3063,13 +3061,13 @@ msgstr ""
"inittab</filename> 里已经关掉。将其改为 <userinput>true</userinput> 打开。"
#. Tag: term
-#: boot-installer.xml:2356
+#: boot-installer.xml:2376
#, no-c-format
msgid "cdrom-detect/eject"
msgstr "cdrom-detect/eject"
#. Tag: para
-#: boot-installer.xml:2357
+#: boot-installer.xml:2377
#, no-c-format
msgid ""
"By default, before rebooting, &d-i; automatically ejects the optical media "
@@ -3085,7 +3083,7 @@ msgstr ""
"新加载介质。"
#. Tag: para
-#: boot-installer.xml:2366
+#: boot-installer.xml:2386
#, no-c-format
msgid ""
"Set to <userinput>false</userinput> to disable automatic ejection, and be "
@@ -3096,13 +3094,13 @@ msgstr ""
"后,不会自动从光盘引导。"
#. Tag: term
-#: boot-installer.xml:2377
+#: boot-installer.xml:2397
#, no-c-format
msgid "base-installer/install-recommends (recommends)"
msgstr "base-installer/install-recommends (recommends)"
#. Tag: para
-#: boot-installer.xml:2378
+#: boot-installer.xml:2398
#, no-c-format
msgid ""
"By setting this option to <userinput>false</userinput>, the package "
@@ -3115,7 +3113,7 @@ msgstr ""
"<xref linkend=\"di-install-base\"/>。"
#. Tag: para
-#: boot-installer.xml:2385
+#: boot-installer.xml:2405
#, no-c-format
msgid ""
"Note that this option allows to have a leaner system, but can also result in "
@@ -3129,13 +3127,13 @@ msgstr ""
"非常有经验的用户来使用。"
#. Tag: term
-#: boot-installer.xml:2397
+#: boot-installer.xml:2417
#, no-c-format
msgid "debian-installer/allow_unauthenticated"
msgstr "debian-installer/allow_unauthenticated"
#. Tag: para
-#: boot-installer.xml:2398
+#: boot-installer.xml:2418
#, no-c-format
msgid ""
"By default the installer requires that repositories be authenticated using a "
@@ -3148,13 +3146,13 @@ msgstr ""
"emphasis>"
#. Tag: term
-#: boot-installer.xml:2409
+#: boot-installer.xml:2429
#, no-c-format
msgid "ramdisk_size"
msgstr "ramdisk_size"
#. Tag: para
-#: boot-installer.xml:2410
+#: boot-installer.xml:2430
#, no-c-format
msgid ""
"This parameter should already be set to a correct value where needed; set it "
@@ -3165,13 +3163,13 @@ msgstr ""
"置。该值的单位是 kB。"
#. Tag: term
-#: boot-installer.xml:2420
+#: boot-installer.xml:2440
#, no-c-format
msgid "rescue/enable"
msgstr "rescue/enable"
#. Tag: para
-#: boot-installer.xml:2421
+#: boot-installer.xml:2441
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> to enter rescue mode rather than "
@@ -3181,13 +3179,13 @@ msgstr ""
"<xref linkend=\"rescue\"/>。"
#. Tag: title
-#: boot-installer.xml:2434
+#: boot-installer.xml:2454
#, no-c-format
msgid "Using boot parameters to answer questions"
msgstr "使用内核模块参数回答提问"
#. Tag: para
-#: boot-installer.xml:2435
+#: boot-installer.xml:2455
#, no-c-format
msgid ""
"With some exceptions, a value can be set at the boot prompt for any question "
@@ -3200,25 +3198,25 @@ msgstr ""
"bootparms\"/> 找到。下面是一些具体的例子。"
#. Tag: term
-#: boot-installer.xml:2447
+#: boot-installer.xml:2467
#, no-c-format
msgid "debian-installer/language (language)"
msgstr "debian-installer/language (language)"
#. Tag: term
-#: boot-installer.xml:2448
+#: boot-installer.xml:2468
#, no-c-format
msgid "debian-installer/country (country)"
msgstr "debian-installer/country (country)"
#. Tag: term
-#: boot-installer.xml:2449
+#: boot-installer.xml:2469
#, no-c-format
msgid "debian-installer/locale (locale)"
msgstr "debian-installer/locale (locale)"
#. Tag: para
-#: boot-installer.xml:2450
+#: boot-installer.xml:2470
#, no-c-format
msgid ""
"There are two ways to specify the language, country and locale to use for "
@@ -3228,7 +3226,7 @@ msgstr ""
"和地方(locale)。"
#. Tag: para
-#: boot-installer.xml:2455
+#: boot-installer.xml:2475
#, no-c-format
msgid ""
"The first and easiest is to pass only the parameter <literal>locale</"
@@ -3246,7 +3244,7 @@ msgstr ""
"式组合。"
#. Tag: para
-#: boot-installer.xml:2464
+#: boot-installer.xml:2484
#, no-c-format
msgid ""
"The second, more flexible option is to specify <literal>language</literal> "
@@ -3261,13 +3259,13 @@ msgstr ""
"locale=en_GB.UTF-8</userinput>。"
#. Tag: term
-#: boot-installer.xml:2476
+#: boot-installer.xml:2496
#, no-c-format
msgid "anna/choose_modules (modules)"
msgstr "anna/choose_modules (modules)"
#. Tag: para
-#: boot-installer.xml:2477
+#: boot-installer.xml:2497
#, no-c-format
msgid ""
"Can be used to automatically load installer components that are not loaded "
@@ -3282,7 +3280,7 @@ msgstr ""
"classname> (参阅 <xref linkend=\"pppoe\"/>)</phrase>。"
#. Tag: para
-#: boot-installer.xml:2491
+#: boot-installer.xml:2511
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> if you want to disable DHCP and instead "
@@ -3291,13 +3289,13 @@ msgstr ""
"如果您想禁止 DHCP 使用静态网络设置,将它设为 <userinput>true</userinput>。"
#. Tag: term
-#: boot-installer.xml:2500
+#: boot-installer.xml:2520
#, no-c-format
msgid "mirror/protocol (protocol)"
msgstr "mirror/protocol (protocol)"
#. Tag: para
-#: boot-installer.xml:2501
+#: boot-installer.xml:2521
#, no-c-format
msgid ""
"By default the installer will use the http protocol to download files from "
@@ -3312,13 +3310,13 @@ msgstr ""
"序使用该协议。注意,必须手动输入主机名,而不是从列表中选择 ftp 镜像。"
#. Tag: term
-#: boot-installer.xml:2514
+#: boot-installer.xml:2534
#, no-c-format
msgid "tasksel:tasksel/first (tasks)"
msgstr "tasksel:tasksel/first (tasks)"
#. Tag: para
-#: boot-installer.xml:2515
+#: boot-installer.xml:2535
#, no-c-format
msgid ""
"Can be used to select tasks that are not available from the interactive task "
@@ -3329,13 +3327,13 @@ msgstr ""
"literal> 任务。参阅 <xref linkend=\"pkgsel\"/> 了解详细信息。"
#. Tag: title
-#: boot-installer.xml:2529
+#: boot-installer.xml:2549
#, no-c-format
msgid "Passing parameters to kernel modules"
msgstr "给内核模块传递参数"
#. Tag: para
-#: boot-installer.xml:2530
+#: boot-installer.xml:2550
#, no-c-format
msgid ""
"If drivers are compiled into the kernel, you can pass parameters to them as "
@@ -3355,7 +3353,7 @@ msgstr ""
"配置中。"
#. Tag: para
-#: boot-installer.xml:2543
+#: boot-installer.xml:2563
#, no-c-format
msgid ""
"Note that it is now quite rare that parameters need to be passed to modules. "
@@ -3367,7 +3365,7 @@ msgstr ""
"并很好地设置默认参数。然而,某些情况下还是需要手动设置参数。"
#. Tag: para
-#: boot-installer.xml:2550
+#: boot-installer.xml:2570
#, no-c-format
msgid ""
"The syntax to use to set parameters for modules is: "
@@ -3387,19 +3385,19 @@ msgstr ""
"用:"
#. Tag: screen
-#: boot-installer.xml:2560
+#: boot-installer.xml:2580
#, no-c-format
msgid "3c509.xcvr=3 3c509.irq=10"
msgstr "3c509.xcvr=3 3c509.irq=10"
#. Tag: title
-#: boot-installer.xml:2566
+#: boot-installer.xml:2586
#, no-c-format
msgid "Blacklisting kernel modules"
msgstr "内核模块黑名单"
#. Tag: para
-#: boot-installer.xml:2567
+#: boot-installer.xml:2587
#, no-c-format
msgid ""
"Sometimes it may be necessary to blacklist a module to prevent it from being "
@@ -3414,7 +3412,7 @@ msgstr ""
"间冲突或者错误的驱动先加载,将造成设备无法正常工作。"
#. Tag: para
-#: boot-installer.xml:2576
+#: boot-installer.xml:2596
#, no-c-format
msgid ""
"You can blacklist a module using the following syntax: "
@@ -3428,7 +3426,7 @@ msgstr ""
"入 <filename>/etc/modprobe.d/blacklist.local</filename> 文件的黑名单中。"
#. Tag: para
-#: boot-installer.xml:2584
+#: boot-installer.xml:2604
#, no-c-format
msgid ""
"Note that a module may still be loaded by the installation system itself. "
@@ -3440,19 +3438,19 @@ msgstr ""
"件检查过程中从显示的模块列表中取消该模块。"
#. Tag: title
-#: boot-installer.xml:2600
+#: boot-installer.xml:2620
#, no-c-format
msgid "Troubleshooting the Installation Process"
msgstr "安装过程中的故障修复"
#. Tag: title
-#: boot-installer.xml:2605
+#: boot-installer.xml:2625
#, no-c-format
msgid "CD-ROM Reliability"
msgstr "CD-ROM 的可靠性"
#. Tag: para
-#: boot-installer.xml:2606
+#: boot-installer.xml:2626
#, no-c-format
msgid ""
"Sometimes, especially with older CD-ROM drives, the installer may fail to "
@@ -3464,7 +3462,7 @@ msgstr ""
"&mdash; 即使是从 CD-ROM 成功引导 &mdash; 无法识别 CD-ROM 或在安装时读取错误。"
#. Tag: para
-#: boot-installer.xml:2613
+#: boot-installer.xml:2633
#, no-c-format
msgid ""
"There are many different possible causes for these problems. We can only "
@@ -3475,13 +3473,13 @@ msgstr ""
"下的由您来处理。"
#. Tag: para
-#: boot-installer.xml:2619
+#: boot-installer.xml:2639
#, no-c-format
msgid "There are two very simple things that you should try first."
msgstr "您首先应试试两种最简单的方法。"
#. Tag: para
-#: boot-installer.xml:2624
+#: boot-installer.xml:2644
#, no-c-format
msgid ""
"If the CD-ROM does not boot, check that it was inserted correctly and that "
@@ -3489,22 +3487,20 @@ msgid ""
msgstr "如果 CD-ROM 没有引导,检查一下它是否放好,并且没有弄脏。"
#. Tag: para
-#: boot-installer.xml:2630
+#: boot-installer.xml:2650
#, 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> </"
-#| "menuchoice> a second time. Some DMA related issues with older CD-ROM "
-#| "drives are known to be resolved in this way."
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 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 相关的问题可以用这种方法解决。"
+msgstr ""
+"如果安装程序无法识别 CD-ROM,再次运行 <menuchoice> <guimenuitem>Detect and "
+"mount CD-ROM</guimenuitem> </menuchoice> 选项。有些非常老的 CD-ROM 驱动器 "
+"DMA 相关的问题可以用这种方法解决。"
#. Tag: para
-#: boot-installer.xml:2640
+#: boot-installer.xml:2660
#, no-c-format
msgid ""
"If this does not work, then try the suggestions in the subsections below. "
@@ -3515,7 +3511,7 @@ msgstr ""
"CD-ROM 和 DVD,为了方便,只提到 CD-ROM。"
#. Tag: para
-#: boot-installer.xml:2646
+#: boot-installer.xml:2666
#, no-c-format
msgid ""
"If you cannot get the installation working from CD-ROM, try one of the other "
@@ -3523,13 +3519,13 @@ msgid ""
msgstr "如果您用 CD-ROM 无法安装,试试其他可用的安装方法。"
#. Tag: title
-#: boot-installer.xml:2654
+#: boot-installer.xml:2674
#, no-c-format
msgid "Common issues"
msgstr "常见问题"
#. Tag: para
-#: boot-installer.xml:2657
+#: boot-installer.xml:2677
#, no-c-format
msgid ""
"Some older CD-ROM drives do not support reading from discs that were burned "
@@ -3537,42 +3533,39 @@ msgid ""
msgstr "有些老 CD-ROM 驱动器不能读取新 CD 刻录机的高速模式下刻录的光盘。"
#. Tag: para
-#: boot-installer.xml:2674
+#: boot-installer.xml:2694
#, no-c-format
-#| msgid ""
-#| "Some older CD-ROM drives do not work correctly if <quote>direct memory "
-#| "access</quote> (DMA) is enabled."
msgid ""
"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) 下无法正常工作。"
+msgstr ""
+"一些非常老的 CD-ROM 驱动器在 <quote>direct memory access</quote> (DMA) 下无法"
+"正常工作。"
#. Tag: title
-#: boot-installer.xml:2685
+#: boot-installer.xml:2705
#, no-c-format
msgid "How to investigate and maybe solve issues"
msgstr "如何调查研究或许可以解决问题"
#. Tag: para
-#: boot-installer.xml:2686
+#: boot-installer.xml:2706
#, no-c-format
msgid "If the CD-ROM fails to boot, try the suggestions listed below."
msgstr "如果从 CD-ROM 引导失败,试试下面所列的建议。"
#. Tag: para
-#: boot-installer.xml:2691
+#: boot-installer.xml:2711
#, 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 (only an issue "
"for very old systems) and that CD booting is enabled in the BIOS."
-msgstr "检查您的 BIOS 的确支持从 CD-ROM 启动(仅有个别非常老的系统不行),并且 BIOS 打开支持从 CD 引导。"
+msgstr ""
+"检查您的 BIOS 的确支持从 CD-ROM 启动(仅有个别非常老的系统不行),并且 BIOS 打"
+"开支持从 CD 引导。"
#. Tag: para
-#: boot-installer.xml:2698
+#: boot-installer.xml:2718
#, no-c-format
msgid ""
"If you downloaded an iso image, check that the md5sum of that image matches "
@@ -3596,7 +3589,7 @@ msgstr ""
"用下面的命令。它使用映像的尺寸从 CD-ROM 读取正确的字节数。"
#. Tag: screen
-#: boot-installer.xml:2711
+#: boot-installer.xml:2731
#, no-c-format
msgid ""
"$ dd if=/dev/cdrom | \\\n"
@@ -3618,7 +3611,7 @@ msgstr ""
"134486016 bytes (134 MB) copied, 97.474 seconds, 1.4 MB/s"
#. Tag: para
-#: boot-installer.xml:2716
+#: boot-installer.xml:2736
#, no-c-format
msgid ""
"If, after the installer has been booted successfully, the CD-ROM is not "
@@ -3637,7 +3630,7 @@ msgstr ""
"shell。"
#. Tag: para
-#: boot-installer.xml:2728
+#: boot-installer.xml:2748
#, no-c-format
msgid ""
"Switch to VT4 or view the contents of <filename>/var/log/syslog</filename> "
@@ -3649,7 +3642,7 @@ msgstr ""
"<command>dmesg</command> 的输出。"
#. Tag: para
-#: boot-installer.xml:2735
+#: boot-installer.xml:2755
#, no-c-format
msgid ""
"Check in the output of <command>dmesg</command> if your CD-ROM drive was "
@@ -3677,7 +3670,7 @@ msgstr ""
"<command>modprobe</command> 手动加载。"
#. Tag: para
-#: boot-installer.xml:2749
+#: boot-installer.xml:2769
#, no-c-format
msgid ""
"Check that there is a device node for your CD-ROM drive under <filename>/dev/"
@@ -3689,7 +3682,7 @@ msgstr ""
"cdrom0</filename>。"
#. Tag: para
-#: boot-installer.xml:2757
+#: boot-installer.xml:2777
#, no-c-format
msgid ""
"Use the <command>mount</command> command to check if the CD-ROM is already "
@@ -3704,7 +3697,7 @@ msgstr ""
"</screen></informalexample> 检查命令后面是否有什么错误信息。"
#. Tag: para
-#: boot-installer.xml:2767
+#: boot-installer.xml:2787
#, no-c-format
msgid ""
"Check if DMA is currently enabled: <informalexample><screen>\n"
@@ -3729,7 +3722,7 @@ msgstr ""
"</screen></informalexample> 确保您所处的目录对应 CD-ROM 驱动器。"
#. Tag: para
-#: boot-installer.xml:2782
+#: boot-installer.xml:2802
#, no-c-format
msgid ""
"If there are any problems during the installation, try checking the "
@@ -3741,13 +3734,13 @@ msgstr ""
"性。如果 CD-ROM 可以读,该选项可以对其进行测试。"
#. Tag: title
-#: boot-installer.xml:2797
+#: boot-installer.xml:2817
#, no-c-format
msgid "Floppy Disk Reliability"
msgstr "软盘的可靠性"
#. Tag: para
-#: boot-installer.xml:2799
+#: boot-installer.xml:2819
#, no-c-format
msgid ""
"The biggest problem for people using floppy disks to install &debian; seems "
@@ -3756,7 +3749,7 @@ msgstr ""
"对于用软盘安装 &debian; 的人来说,他们遇到的最大的问题很可能是软盘的可靠性。"
#. Tag: para
-#: boot-installer.xml:2804
+#: boot-installer.xml:2824
#, no-c-format
msgid ""
"The boot floppy is the floppy with the worst problems, because it is read by "
@@ -3772,7 +3765,7 @@ msgstr ""
"息。"
#. Tag: para
-#: boot-installer.xml:2813
+#: boot-installer.xml:2833
#, no-c-format
msgid ""
"If you are having the installation stall at a particular floppy, the first "
@@ -3787,7 +3780,7 @@ msgstr ""
"化以后看起来没有错误。如果可能,在别的统上重写这些软盘更好一些。"
#. Tag: para
-#: boot-installer.xml:2822
+#: boot-installer.xml:2842
#, no-c-format
msgid ""
"One user reports he had to write the images to floppy <emphasis>three</"
@@ -3798,7 +3791,7 @@ msgstr ""
"软盘才算工作良好。"
#. Tag: para
-#: boot-installer.xml:2828
+#: boot-installer.xml:2848
#, no-c-format
msgid ""
"Normally you should not have to download a floppy image again, but if you "
@@ -3809,7 +3802,7 @@ msgstr ""
"来检验下载的映像是否正确。"
#. Tag: para
-#: boot-installer.xml:2834
+#: boot-installer.xml:2854
#, no-c-format
msgid ""
"Other users have reported that simply rebooting a few times with the same "
@@ -3820,13 +3813,13 @@ msgstr ""
"有缺陷的硬件或固件软盘驱动器驱动程序造成的。"
#. Tag: title
-#: boot-installer.xml:2843
+#: boot-installer.xml:2863
#, no-c-format
msgid "Boot Configuration"
msgstr "引导配置"
#. Tag: para
-#: boot-installer.xml:2845
+#: boot-installer.xml:2865
#, no-c-format
msgid ""
"If you have problems and the kernel hangs during the boot process, doesn't "
@@ -3839,16 +3832,18 @@ msgstr ""
"\"/> 讨论。"
#. Tag: para
-#: boot-installer.xml:2854
+#: boot-installer.xml:2874
#, no-c-format
msgid ""
"In some cases, malfunctions can be caused by missing device firmware (see "
"<xref linkend=\"hardware-firmware\"/> and <xref linkend=\"loading-firmware\"/"
">)."
-msgstr "有些情况下,设备固件的丢失可能会造成故障 (参阅 <xref linkend=\"hardware-firmware\"/> 和 <xref linkend=\"loading-firmware\"/>)。"
+msgstr ""
+"有些情况下,设备固件的丢失可能会造成故障 (参阅 <xref linkend=\"hardware-"
+"firmware\"/> 和 <xref linkend=\"loading-firmware\"/>)。"
#. Tag: para
-#: boot-installer.xml:2865
+#: boot-installer.xml:2885
#, no-c-format
msgid ""
"If software speech synthesis does not work, there is most probably an issue "
@@ -3863,37 +3858,37 @@ msgstr ""
"台机器上声音可以正常工作的 Linux 系统上(比如,live CD),运行下面命令的输出。"
#. Tag: userinput
-#: boot-installer.xml:2876
+#: boot-installer.xml:2896
#, no-c-format
msgid "dmesg"
msgstr "dmesg"
#. Tag: userinput
-#: boot-installer.xml:2878
+#: boot-installer.xml:2898
#, no-c-format
msgid "lspci"
msgstr "lspci"
#. Tag: userinput
-#: boot-installer.xml:2880
+#: boot-installer.xml:2900
#, no-c-format
msgid "lsmod"
msgstr "lsmod"
#. Tag: userinput
-#: boot-installer.xml:2882
+#: boot-installer.xml:2902
#, no-c-format
msgid "amixer"
msgstr "amixer"
#. Tag: title
-#: boot-installer.xml:2890 boot-installer.xml:3001
+#: boot-installer.xml:2910 boot-installer.xml:3021
#, no-c-format
msgid "Common &arch-title; Installation Problems"
msgstr "&arch-title; 常见安装问题"
#. Tag: para
-#: boot-installer.xml:2891
+#: boot-installer.xml:2911
#, no-c-format
msgid ""
"There are some common installation problems that can be solved or avoided by "
@@ -3901,7 +3896,7 @@ msgid ""
msgstr "有一些常见的安装问题,可以通过给安装程序特定的引导参数解决或避免。"
#. Tag: para
-#: boot-installer.xml:2942
+#: boot-installer.xml:2962
#, no-c-format
msgid ""
"If your screen begins to show a weird picture while the kernel boots, eg. "
@@ -3919,22 +3914,14 @@ msgstr ""
"\"boot-parms\"/> 来获得细节信息。"
#. Tag: title
-#: boot-installer.xml:2956
+#: boot-installer.xml:2976
#, no-c-format
msgid "System Freeze During the PCMCIA Configuration Phase"
msgstr "在 PCMCIA 配置阶段系统停止"
#. Tag: para
-#: boot-installer.xml:2957
+#: boot-installer.xml:2977
#, 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 "
-#| "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."
msgid ""
"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 "
@@ -3943,10 +3930,15 @@ msgid ""
"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 设备检测程序尝试访问某些硬件地址的时候死机。其他笔记本可能显示类似的问题。如果您遇到那样的问题,并且在安装的时候不需要 PCMCIA 的支持,可以用 <userinput>hw-detect/start_pcmcia=false</userinput> 启动参数来取消 PCMCIA 功能。您可以在安装后配置 PCMCIA,去掉造成问题的资源区段。"
+msgstr ""
+"一些非常老的 Dell 笔记本型号,会在 PCMCIA 设备检测程序尝试访问某些硬件地址的"
+"时候死机。其他笔记本可能显示类似的问题。如果您遇到那样的问题,并且在安装的时"
+"候不需要 PCMCIA 的支持,可以用 <userinput>hw-detect/start_pcmcia=false</"
+"userinput> 启动参数来取消 PCMCIA 功能。您可以在安装后配置 PCMCIA,去掉造成问"
+"题的资源区段。"
#. Tag: para
-#: boot-installer.xml:2967
+#: boot-installer.xml:2987
#, no-c-format
msgid ""
"Alternatively, you can boot the installer in expert mode. You will then be "
@@ -3966,19 +3958,19 @@ msgstr ""
"项。注意您在安装程序中,输入这些值的时候必须忽略逗号。"
#. Tag: para
-#: boot-installer.xml:3002
+#: boot-installer.xml:3022
#, no-c-format
msgid "There are some common installation problems that are worth mentioning."
msgstr "有一些常见的安装问题值得解释一下。"
#. Tag: title
-#: boot-installer.xml:3008
+#: boot-installer.xml:3028
#, no-c-format
msgid "Misdirected video output"
msgstr "错误的视频输出"
#. Tag: para
-#: boot-installer.xml:3009
+#: boot-installer.xml:3029
#, no-c-format
msgid ""
"It is fairly common for &arch-title; to have two video cards in one machine, "
@@ -4002,7 +3994,7 @@ msgstr ""
"<userinput>video=atyfb:off</userinput> 启动安装程序。"
#. Tag: para
-#: boot-installer.xml:3023
+#: boot-installer.xml:3043
#, no-c-format
msgid ""
"Note that you may also have to manually add this parameter to the silo "
@@ -4015,13 +4007,13 @@ msgstr ""
"xorg.conf</filename> 中的视频驱动。"
#. Tag: title
-#: boot-installer.xml:3034
+#: boot-installer.xml:3054
#, no-c-format
msgid "Failure to Boot or Install from CD-ROM"
msgstr "从 CD-ROM 上引导或安装失败"
#. Tag: para
-#: boot-installer.xml:3035
+#: boot-installer.xml:3055
#, no-c-format
msgid ""
"Some Sparc systems are notoriously difficult to boot from CD-ROM and even if "
@@ -4032,19 +4024,19 @@ msgstr ""
"费解的错误。SunBlade 系统被报告了很多问题。"
#. Tag: para
-#: boot-installer.xml:3041
+#: boot-installer.xml:3061
#, no-c-format
msgid "We recommend to install such systems by netbooting the installer."
msgstr "我们建议从网络安装这些系统。"
#. Tag: title
-#: boot-installer.xml:3050
+#: boot-installer.xml:3070
#, no-c-format
msgid "Interpreting the Kernel Startup Messages"
msgstr "内核起始信息注解"
#. Tag: para
-#: boot-installer.xml:3052
+#: boot-installer.xml:3072
#, no-c-format
msgid ""
"During the boot sequence, you may see many messages in the form "
@@ -4078,13 +4070,13 @@ msgstr ""
"linkend=\"kernel-baking\"/>)</phrase>。"
#. Tag: title
-#: boot-installer.xml:3077
+#: boot-installer.xml:3097
#, no-c-format
msgid "Reporting Installation Problems"
msgstr "报告安装问题"
#. Tag: para
-#: boot-installer.xml:3078
+#: boot-installer.xml:3098
#, no-c-format
msgid ""
"If you get through the initial boot phase but cannot complete the install, "
@@ -4101,7 +4093,7 @@ msgstr ""
"索。如果您正在提交一个 bug 报告,可以报告里附上该信息。"
#. Tag: para
-#: boot-installer.xml:3089
+#: boot-installer.xml:3109
#, no-c-format
msgid ""
"Other pertinent installation messages may be found in <filename>/var/log/</"
@@ -4112,13 +4104,13 @@ msgstr ""
"新安装的系统启动后,放在 <filename>/var/log/debian-installer/</filename> 里。"
#. Tag: title
-#: boot-installer.xml:3100
+#: boot-installer.xml:3120
#, no-c-format
msgid "Submitting Installation Reports"
msgstr "提交缺陷报告"
#. Tag: para
-#: boot-installer.xml:3101
+#: boot-installer.xml:3121
#, no-c-format
msgid ""
"If you still have problems, please submit an installation report. We also "
@@ -4130,7 +4122,7 @@ msgstr ""
"这让我们可以尽可能多地了解硬件的配置数量。"
#. Tag: para
-#: boot-installer.xml:3108
+#: boot-installer.xml:3128
#, no-c-format
msgid ""
"Note that your installation report will be published in the Debian Bug "
@@ -4141,7 +4133,7 @@ msgstr ""
"件列表。确保您使用的邮件地址可以被公开。"
#. Tag: para
-#: boot-installer.xml:3114
+#: boot-installer.xml:3134
#, no-c-format
msgid ""
"If you have a working &debian; system, the easiest way to send an "
@@ -4160,7 +4152,7 @@ msgstr ""
"command> 命令。"
#. Tag: para
-#: boot-installer.xml:3124
+#: boot-installer.xml:3144
#, no-c-format
msgid ""
"Alternatively you can use this template when filling out installation "
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 5339f20e1..c8b4c5532 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -118,7 +118,6 @@ msgstr "i386"
#. Tag: entry
#: hardware.xml:67 hardware.xml:197
#, no-c-format
-#| msgid "AMD64 &amp; Intel EM64T"
msgid "AMD64 &amp; Intel 64"
msgstr "AMD64 &amp; Intel 64"
@@ -221,7 +220,6 @@ msgstr "Freescale"
#. Tag: entry
#: hardware.xml:96
#, no-c-format
-#| msgid "<entry>32</entry>"
msgid "<entry>mx5</entry>"
msgstr "<entry>mx5</entry>"
@@ -330,7 +328,6 @@ msgstr "IBM/Motorola PowerPC"
#. Tag: entry
#: hardware.xml:137
#, no-c-format
-#| msgid "<entry morerows=\"1\">powerpc</entry>"
msgid "<entry>powerpc</entry>"
msgstr "<entry>powerpc</entry>"
@@ -427,14 +424,12 @@ msgstr "type"
#. Tag: entry
#: hardware.xml:165
#, no-c-format
-#| msgid "IBM S/390"
msgid "64bit IBM S/390"
msgstr "64bit IBM S/390"
#. Tag: entry
#: hardware.xml:166
#, no-c-format
-#| msgid "s390"
msgid "s390x"
msgstr "s390x"
@@ -473,19 +468,17 @@ msgstr ""
#. Tag: para
#: hardware.xml:213
#, no-c-format
-#| msgid ""
-#| "The &arch-title; architecture only supports Intel Itanium processors and "
-#| "not the much more common 64-bit processors from the EM64T family "
-#| "(including e.g. the Pentium&nbsp;D and the Core2&nbsp;Duo). Those systems "
-#| "are supported by the <emphasis>amd64</emphasis> architecture or, if you "
-#| "prefer a 32-bit userland, the <emphasis>i386</emphasis> architecture."
msgid ""
"The &arch-title; architecture only supports Intel Itanium processors and not "
"the much more common 64-bit processors from the Intel 64 family (including e."
"g. the Pentium&nbsp;D and the Core2&nbsp;Duo). Those systems are supported "
"by the <emphasis>amd64</emphasis> architecture or, if you prefer a 32-bit "
"userland, the <emphasis>i386</emphasis> architecture."
-msgstr "&arch-title; 体系只支持 Intel Itanium 处理器,而不是常见的属于 Intel 64 家族的 64 位处理器(包括像 Pentium&nbsp;D 和 Core2&nbsp;Duo)。它们是被 <emphasis>amd64</emphasis> 体系支持。如果您希望使用 32 位系统,可以选择 <emphasis>i386</emphasis> 体系。"
+msgstr ""
+"&arch-title; 体系只支持 Intel Itanium 处理器,而不是常见的属于 Intel 64 家族"
+"的 64 位处理器(包括像 Pentium&nbsp;D 和 Core2&nbsp;Duo)。它们是被 "
+"<emphasis>amd64</emphasis> 体系支持。如果您希望使用 32 位系统,可以选择 "
+"<emphasis>i386</emphasis> 体系。"
#. Tag: para
#: hardware.xml:223
@@ -517,7 +510,6 @@ msgstr "CPU 支持"
#. Tag: para
#: hardware.xml:246
#, no-c-format
-#| msgid "Both AMD64 and Intel EM64T processors are supported."
msgid "Both AMD64 and Intel 64 processors are supported."
msgstr "AMD64 和 Intel 64 处理器都获得支持。"
@@ -592,14 +584,6 @@ msgstr "Kirkwood"
#. Tag: para
#: hardware.xml:312
#, no-c-format
-#| msgid ""
-#| "Kirkwood is a system on a chip (SoC) from Marvell that integrates an ARM "
-#| "CPU, Ethernet, SATA, USB, and other functionality in one chip. We "
-#| "currently support the following Kirkwood based devices: OpenRD (OpenRD-"
-#| "Base, OpenRD-Client and OpenRD-Ultimate), <ulink url=\"&url-arm-cyrius-"
-#| "sheevaplug;\">plug computers (SheevaPlug and GuruPlug)</ulink>, and "
-#| "<ulink url=\"&url-arm-cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> "
-#| "(all TS-11x, TS-21x and TS-41x models)."
msgid ""
"Kirkwood is a system on a chip (SoC) from Marvell that integrates an ARM "
"CPU, Ethernet, SATA, USB, and other functionality in one chip. We currently "
@@ -609,7 +593,15 @@ msgid ""
"arm-cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> (all TS-11x, TS-21x "
"and TS-41x models), and LaCie NASes (Network Space v2, Network Space Max v2, "
"Internet Space v2, d2 Network v2, 2Big Network v2 and 5Big Network v2)."
-msgstr "Kirkwood 是 Marvell 的 SoC 产品,集成了 ARM CPU、Ethernet、SATA、USB,以及其他一些功能。当前我们能支持以下几种基于 Kirkwood 的设备:OpenRD (OpenRD-Base, OpenRD-Client 和 OpenRD-Ultimate)、<ulink url=\"&url-arm-cyrius-sheevaplug;\">plug computers (SheevaPlug、GuruPlug 和 DreamPlug)</ulink>, <ulink url=\"&url-arm-cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> (所有 TS-11x、TS-21x 和 TS-41x 型号),以及 LaCie NASes (Network Space v2、Network Space Max v2、Internet Space v2、d2 Network v2、2Big Network v2 和 5Big Network v2)。"
+msgstr ""
+"Kirkwood 是 Marvell 的 SoC 产品,集成了 ARM CPU、Ethernet、SATA、USB,以及其"
+"他一些功能。当前我们能支持以下几种基于 Kirkwood 的设备:OpenRD (OpenRD-Base, "
+"OpenRD-Client 和 OpenRD-Ultimate)、<ulink url=\"&url-arm-cyrius-sheevaplug;"
+"\">plug computers (SheevaPlug、GuruPlug 和 DreamPlug)</ulink>, <ulink url="
+"\"&url-arm-cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> (所有 TS-11x、"
+"TS-21x 和 TS-41x 型号),以及 LaCie NASes (Network Space v2、Network Space "
+"Max v2、Internet Space v2、d2 Network v2、2Big Network v2 和 5Big Network "
+"v2)。"
#. Tag: term
#: hardware.xml:328
@@ -736,15 +728,13 @@ msgstr ""
#. Tag: para
#: hardware.xml:431
#, no-c-format
-#| msgid ""
-#| "If your system has a 64-bit processor from the AMD64 or Intel EM64T "
-#| "families, you will probably want to use the installer for the amd64 "
-#| "architecture instead of the installer for the (32-bit) i386 architecture."
msgid ""
"If your system has a 64-bit processor from the AMD64 or Intel 64 families, "
"you will probably want to use the installer for the amd64 architecture "
"instead of the installer for the (32-bit) i386 architecture."
-msgstr "假如您的系统中有 64 位 AMD64、Intel 64 家族的处理器,那么您该用 amd64 架构的安装程序替代 (32位) i386 架构的安装程序。"
+msgstr ""
+"假如您的系统中有 64 位 AMD64、Intel 64 家族的处理器,那么您该用 amd64 架构的"
+"安装程序替代 (32位) i386 架构的安装程序。"
#. Tag: title
#: hardware.xml:440
@@ -1623,12 +1613,6 @@ msgstr "便携机"
#. Tag: para
#: hardware.xml:1109
#, 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 "
-#| "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>."
msgid ""
"From a technical point of view, laptops are normal PCs, so all information "
"regarding PC systems applies to laptops as well. Installations on laptops "
@@ -1639,7 +1623,13 @@ msgid ""
"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 "从技术的角度看,便携机也属于普通 PC,因此所有与 PC 系统相关的信息也同样适用于便携机。如今在便携机上安装通常很顺利,这包括那些合上盖子自己休眠系统和禁止 wifi 网卡 (<quote>airplane mode</quote>) 等便携机特有的按钮。虽然如此,有时硬件厂商使用一些特殊的或者专有硬件上便携机特制的功能还是无法支持。要了解您的便携机是否能在 GNU/Linux 下正常工作,请参考 <ulink url=\"&url-x86-laptop;\">Linux 便携机页面</ulink>。"
+msgstr ""
+"从技术的角度看,便携机也属于普通 PC,因此所有与 PC 系统相关的信息也同样适用于"
+"便携机。如今在便携机上安装通常很顺利,这包括那些合上盖子自己休眠系统和禁止 "
+"wifi 网卡 (<quote>airplane mode</quote>) 等便携机特有的按钮。虽然如此,有时硬"
+"件厂商使用一些特殊的或者专有硬件上便携机特制的功能还是无法支持。要了解您的便"
+"携机是否能在 GNU/Linux 下正常工作,请参考 <ulink url=\"&url-x86-laptop;"
+"\">Linux 便携机页面</ulink>。"
# index.docbook:1624, index.docbook:1649, index.docbook:1672
#. Tag: title
@@ -1651,13 +1641,6 @@ msgstr "多处理器"
#. Tag: para
#: hardware.xml:1127
#, 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. Having multiple "
@@ -1666,7 +1649,12 @@ msgid ""
"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; 在本体系架构下可以使用。在一台计算机上安装多处理器原来只是高端的服务器才具有,但近年来随着<quote>多核</quote>处理器的出现已经应用到相对低端的桌面计算机和便携机上。这种处理器包含两个或多个称为<quote>核心</quote>的处理器单元集成在一个物理芯片上。"
+msgstr ""
+"多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP "
+"&mdash; 在本体系架构下可以使用。在一台计算机上安装多处理器原来只是高端的服务"
+"器才具有,但近年来随着<quote>多核</quote>处理器的出现已经应用到相对低端的桌面"
+"计算机和便携机上。这种处理器包含两个或多个称为<quote>核心</quote>的处理器单元"
+"集成在一个物理芯片上。"
#. Tag: para
#: hardware.xml:1137
@@ -1674,18 +1662,13 @@ msgstr "多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quot
msgid ""
"The standard &debian; &release; kernel image has been compiled with SMP "
"support. It is also usable on non-SMP systems without problems."
-msgstr "标准的 &debian; &release; 内核映像编译时已经加入 SMP 支持。它在非 SMP 系统上使用也没有问题。"
+msgstr ""
+"标准的 &debian; &release; 内核映像编译时已经加入 SMP 支持。它在非 SMP 系统上"
+"使用也没有问题。"
#. Tag: para
#: hardware.xml:1148
#, 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 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."
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
"quote> or SMP &mdash; is available for this architecture. The standard "
@@ -1693,25 +1676,25 @@ 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; 内核映像已经编译进"
+"了 <firstterm>SMP-alternatives</firstterm> 支持。这样内核就可以侦测处理器(或"
+"者核心)数量,并可以在单处理器系统上关闭 SMP 功能。"
#. Tag: para
#: hardware.xml:1157
#, 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 "在一台计算机上安装多处理器原来只是高端的服务器才具有,但近年来随着<quote>多核</quote>处理器的出现已经应用到相对低端的桌面计算机和便携机上。这种处理器包含两个或多个称为<quote>核心</quote>的处理器单元集成在一个物理芯片上。"
+msgstr ""
+"在一台计算机上安装多处理器原来只是高端的服务器才具有,但近年来随着<quote>多核"
+"</quote>处理器的出现已经应用到相对低端的桌面计算机和便携机上。这种处理器包含"
+"两个或多个称为<quote>核心</quote>的处理器单元集成在一个物理芯片上。"
#. Tag: para
#: hardware.xml:1165
@@ -1724,20 +1707,17 @@ msgstr "&arch-title; 的 486 &debian; 内核映像软件包没有支持 SMP 。"
#. Tag: para
#: hardware.xml:1175
#, no-c-format
-#| msgid ""
-#| "Multiprocessor support &mdash; also called <quote>symmetric "
-#| "multiprocessing</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."
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
"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 only the first CPU."
-msgstr "多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP &mdash; 在本体系架构下可以使用。但是,标准的 &debian; &release; 内核映像并不支持 SMP。这不会影响安装,因为非 SMP 的内核也能在 SMP 的系统下启动,只不过内核仅使用第一个 CPU。"
+msgstr ""
+"多处理器支持 &mdash; 又称 <quote>symmetric multiprocessing</quote> 或 SMP "
+"&mdash; 在本体系架构下可以使用。但是,标准的 &debian; &release; 内核映像并不"
+"支持 SMP。这不会影响安装,因为非 SMP 的内核也能在 SMP 的系统下启动,只不过内"
+"核仅使用第一个 CPU。"
#. Tag: para
#: hardware.xml:1184
@@ -1817,22 +1797,23 @@ msgid ""
"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 "&debian; 能支持的显卡取决于底层的 X.Org's X11 的支持。流行的 PC 上,图形显示器通常工作地很好。至于高级的显卡功能,比如 3D 硬件加速或硬件视频加速是否可用,由系统所使用的具体显示硬件和所要安装的额外<quote>固件(firmware)</quote>决定(参阅 <xref linkend=\"hardware-firmware\"/>)。极个别的情况下使用基本的显示功能也需要安装额外的固件,但这是罕有的例子。"
+msgstr ""
+"&debian; 能支持的显卡取决于底层的 X.Org's X11 的支持。流行的 PC 上,图形显示"
+"器通常工作地很好。至于高级的显卡功能,比如 3D 硬件加速或硬件视频加速是否可"
+"用,由系统所使用的具体显示硬件和所要安装的额外<quote>固件(firmware)</quote>决"
+"定(参阅 <xref linkend=\"hardware-firmware\"/>)。极个别的情况下使用基本的显示"
+"功能也需要安装额外的固件,但这是罕有的例子。"
#. Tag: para
#: hardware.xml:1239
#, 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 "
-#| "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;."
msgid ""
"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 "对显卡和其他定点设备的具体支持情况,见 <ulink url=\"&url-xorg;\"></ulink>。 &debian; &release; 包含 X.Org &x11ver; 版。"
+msgstr ""
+"对显卡和其他定点设备的具体支持情况,见 <ulink url=\"&url-xorg;\"></ulink>。 "
+"&debian; &release; 包含 X.Org &x11ver; 版。"
#. Tag: para
#: hardware.xml:1244
@@ -1891,19 +1872,17 @@ msgstr "网络连接硬件"
#. Tag: para
#: hardware.xml:1282
#, 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 "
-#| "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>"
msgid ""
"Almost any network interface card (NIC) supported by the &arch-kernel; "
"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/PCI-Express 卡和便携机上的 PCMCIA/Express 卡。</phrase> <phrase arch=\"i386\">大多数老的 ISA 可也支持地很好。</phrase>"
+msgstr ""
+"几乎所有被 &arch-kernel; 内核支持的网卡 (NIC) 都被安装系统支持;驱动程序通常"
+"会自动加载。<phrase arch=\"x86\">这包括多数 PCI/PCI-Express 卡和便携机上的 "
+"PCMCIA/Express 卡。</phrase> <phrase arch=\"i386\">大多数老的 ISA 可也支持地"
+"很好。</phrase>"
#. Tag: para
#: hardware.xml:1292
@@ -1992,34 +1971,24 @@ msgstr "无线网卡"
#. Tag: para
#: hardware.xml:1362
#, 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 ""
"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."
-msgstr "无线网络也能得到很好地支持。虽然大多数都需要加载固件,正式的 &arch-kernel; 内核能支持的无线网卡也越来越多。"
+msgstr ""
+"无线网络也能得到很好地支持。虽然大多数都需要加载固件,正式的 &arch-kernel; 内"
+"核能支持的无线网卡也越来越多。"
#. Tag: para
#: hardware.xml:1369
#, 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 "如果需要固件,安装程序会提示您加载。参阅 <xref linkend=\"loading-firmware\"/> 了解如何在安装过程中加载固件的更多信息。"
+msgstr ""
+"如果需要固件,安装程序会提示您加载。参阅 <xref linkend=\"loading-firmware\"/"
+"> 了解如何在安装过程中加载固件的更多信息。"
#. Tag: para
#: hardware.xml:1374
@@ -2213,15 +2182,15 @@ msgstr ""
#. Tag: para
#: hardware.xml:1504
#, 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. 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 硬件通常工作正常。只有在一些特别老的 PC 系统上,一些 USB 键盘需要额外的配置 (参阅 <xref linkend=\"hardware-issues\"/>)。新 PC 上的 USB 键盘和鼠标不需要任何额外的配置就能工作。"
+msgstr ""
+"USB 硬件通常工作正常。只有在一些特别老的 PC 系统上,一些 USB 键盘需要额外的配"
+"置 (参阅 <xref linkend=\"hardware-issues\"/>)。新 PC 上的 USB 键盘和鼠标不需"
+"要任何额外的配置就能工作。"
#. Tag: para
#: hardware.xml:1513
@@ -2251,13 +2220,6 @@ msgstr "需要固件的设备"
#. Tag: para
#: hardware.xml:1532
#, no-c-format
-#| msgid ""
-#| "Besides the availability of a device driver, some hardware also requires "
-#| "so-called <firstterm>firmware</firstterm> or <firstterm>microcode</"
-#| "firstterm> 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."
msgid ""
"Besides the availability of a device driver, some hardware also requires so-"
"called <firstterm>firmware</firstterm> or <firstterm>microcode</firstterm> "
@@ -2267,7 +2229,12 @@ msgid ""
"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 设备甚至是硬盘控制器也需要加载固件。对于许多显卡,可以在毋须固件的情况下使用基本的功能,但使用高级功能就需要先安装合适的固件到系统中。"
+msgstr ""
+"除了需要设备驱动程序,有些硬件还要在使用之前加载 <firstterm>固件(firmware)</"
+"firstterm> 或 <firstterm>微码(microcode)</firstterm>。这对于网卡(特别是无线网"
+"卡)来说很常见,但有些 USB 设备甚至是硬盘控制器也需要加载固件。对于许多显卡,"
+"可以在毋须固件的情况下使用基本的功能,但使用高级功能就需要先安装合适的固件到"
+"系统中。"
#. Tag: para
#: hardware.xml:1543
@@ -2278,7 +2245,10 @@ msgid ""
"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 "有些老的设备需要固件才能工作,这些固件被厂商永久性地置于设备的 EEPROM/Flash 芯片中。现今新设备不再采用这种方式嵌入固件,因此固件必须在系统引导的时候从宿主系统上传到设备中。"
+msgstr ""
+"有些老的设备需要固件才能工作,这些固件被厂商永久性地置于设备的 EEPROM/Flash "
+"芯片中。现今新设备不再采用这种方式嵌入固件,因此固件必须在系统引导的时候从宿"
+"主系统上传到设备中。"
#. Tag: para
#: hardware.xml:1551
@@ -2298,13 +2268,6 @@ msgstr ""
#. Tag: para
#: hardware.xml:1560
#, 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 "
-#| "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 installation."
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 "
@@ -2312,7 +2275,10 @@ msgid ""
"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; 支持从可移动的介质,比如 U 盘,加载固件或包含固件的软件包。参阅 <xref linkend=\"loading-firmware\"/> 了解如何在安装时加载固件文件或软件包的的详细信息。"
+msgstr ""
+"然而,这并不意味着该硬件不能在安装时使用。从 &debian-gnu; 5.0 开始,&d-i; 支"
+"持从可移动的介质,比如 U 盘,加载固件或包含固件的软件包。参阅 <xref linkend="
+"\"loading-firmware\"/> 了解如何在安装时加载固件文件或软件包的的详细信息。"
#. Tag: para
#: hardware.xml:1569
@@ -2325,7 +2291,11 @@ msgid ""
"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 "假如 &d-i; 提示需要固件文件而您又没有该固件,或者不想装非自由的固件到系统上,您可以试着跳过固件加载。有些情况下驱动程序只是在特定情况下提示需要额外的固件,而这个设备在很多系统上可以不使用它就能工作(这通常出现在使用 tg3 驱动的网卡上)。"
+msgstr ""
+"假如 &d-i; 提示需要固件文件而您又没有该固件,或者不想装非自由的固件到系统上,"
+"您可以试着跳过固件加载。有些情况下驱动程序只是在特定情况下提示需要额外的固"
+"件,而这个设备在很多系统上可以不使用它就能工作(这通常出现在使用 tg3 驱动的网"
+"卡上)。"
#. Tag: title
#: hardware.xml:1586
@@ -2386,11 +2356,6 @@ msgstr "避免专有或封闭的硬件"
#. Tag: para
#: hardware.xml:1616
#, 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 "
-#| "a non-disclosure agreement that would prevent us from releasing the &arch-"
-#| "kernel; source code."
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 "
@@ -2398,7 +2363,10 @@ msgid ""
"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; 下工作。"
+msgstr ""
+"一些硬件制造商拒绝告诉我们如何给他们的硬件写驱动程序。另一些则要求签署不公开"
+"的契约才能接触文档,以阻止我们发布驱动程序源代码,这一自由软件的核心内容。由"
+"于我们未被授权使用这些文档,造成它们无法在 &arch-kernel; 下工作。"
#. Tag: para
#: hardware.xml:1626
@@ -2413,7 +2381,12 @@ msgid ""
"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 "很多情况下标准(或事实上的标准)讲述了操作系统和设备驱动程序如何进行通讯。所有遵循该(事实上)标准的设备可以使用一个通用的设备驱动程序而不需要设备独有的驱动程序。 对于一些硬件(例如 USB <quote>Human Interface Devices</quote>,像键盘、鼠标等等,和 USB 存储设备,像 U 盘和记忆卡读取器)工作很正常,并且市场上销售的所有设备都是符合标准的。"
+msgstr ""
+"很多情况下标准(或事实上的标准)讲述了操作系统和设备驱动程序如何进行通讯。所有"
+"遵循该(事实上)标准的设备可以使用一个通用的设备驱动程序而不需要设备独有的驱动"
+"程序。 对于一些硬件(例如 USB <quote>Human Interface Devices</quote>,像键盘、"
+"鼠标等等,和 USB 存储设备,像 U 盘和记忆卡读取器)工作很正常,并且市场上销售的"
+"所有设备都是符合标准的。"
#. Tag: para
#: hardware.xml:1638
@@ -2427,7 +2400,11 @@ msgid ""
"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 "非常不幸,另一些领域不属于这种情况,例如打印机。 有很多打印机可以借助一套(事实上的)标准控制语言处理,因此可以在任何系统上无障碍地使用。还有一些型号只遵从私有的无任何文档的控制命令,使得它们无法在自由的操作系统上使用,或者只能借助于厂商提供的闭源驱动程序。"
+msgstr ""
+"非常不幸,另一些领域不属于这种情况,例如打印机。 有很多打印机可以借助一套(事"
+"实上的)标准控制语言处理,因此可以在任何系统上无障碍地使用。还有一些型号只遵从"
+"私有的无任何文档的控制命令,使得它们无法在自由的操作系统上使用,或者只能借助"
+"于厂商提供的闭源驱动程序。"
#. Tag: para
#: hardware.xml:1649
@@ -2443,7 +2420,12 @@ msgid ""
"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 "即使购买硬件时有厂商提供的闭源驱动程序,设备实际可以使用的寿命仍受限于该驱动程序。现在产品的生产周期越来越短,一旦产品停止生产,厂商短期内就停止更新驱动的情况并不罕见。如果老的闭源驱动在系统更新后不再适用,工作良好的设备就会因为缺乏驱动程序不得不停止工作。您首先在购买的时候就应避开这类封闭的硬件,以免系统升级造成的不便。"
+msgstr ""
+"即使购买硬件时有厂商提供的闭源驱动程序,设备实际可以使用的寿命仍受限于该驱动"
+"程序。现在产品的生产周期越来越短,一旦产品停止生产,厂商短期内就停止更新驱动"
+"的情况并不罕见。如果老的闭源驱动在系统更新后不再适用,工作良好的设备就会因为"
+"缺乏驱动程序不得不停止工作。您首先在购买的时候就应避开这类封闭的硬件,以免系"
+"统升级造成的不便。"
#. Tag: para
#: hardware.xml:1662
@@ -2452,7 +2434,9 @@ 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 "您可以通过鼓励封闭硬件的厂商开放文档和其他资源,为我们提供硬件的自由驱动程序来改变这种状况。"
+msgstr ""
+"您可以通过鼓励封闭硬件的厂商开放文档和其他资源,为我们提供硬件的自由驱动程序"
+"来改变这种状况。"
#. Tag: title
#: hardware.xml:1677
@@ -2506,16 +2490,13 @@ msgstr "CD-ROM/DVD-ROM"
#. Tag: para
#: hardware.xml:1705
#, no-c-format
-#| msgid ""
-#| "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both "
-#| "CD-ROMs and DVD-ROMs, because both technologies are really the same from "
-#| "the operating system's point of view, except for some very old "
-#| "nonstandard CD-ROM drives which are neither SCSI nor IDE/ATAPI."
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."
-msgstr "每当在本手册中看到 <quote>CD-ROM</quote>,它泛指 CD-ROM 和 DVD-ROM。因为从操作系统的角度看,它们所用的技术是相同的。"
+msgstr ""
+"每当在本手册中看到 <quote>CD-ROM</quote>,它泛指 CD-ROM 和 DVD-ROM。因为从操"
+"作系统的角度看,它们所用的技术是相同的。"
#. Tag: para
#: hardware.xml:1711
@@ -2526,7 +2507,6 @@ msgstr "大多数体系都支持基于 CD-ROM 的安装程序"
#. Tag: para
#: hardware.xml:1715
#, 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 "PC 上的 SATA、IDE/ATAPI 和 SCSI CD-ROM 都获得支持。"
@@ -2580,7 +2560,10 @@ msgid ""
"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 "USB 闪存,也叫 U 盘已经成为常见的和廉价的存储设备。大多数现代计算机系统允许从它引导 &d-i;。大多数现代的计算机系统,特别是上网本和轻薄便携机,根本就不配备 CD/DVD-ROM 驱动器,从 U 盘引导是安装操作系统的标准方法。"
+msgstr ""
+"USB 闪存,也叫 U 盘已经成为常见的和廉价的存储设备。大多数现代计算机系统允许从"
+"它引导 &d-i;。大多数现代的计算机系统,特别是上网本和轻薄便携机,根本就不配备 "
+"CD/DVD-ROM 驱动器,从 U 盘引导是安装操作系统的标准方法。"
#. Tag: title
#: hardware.xml:1756
@@ -2617,7 +2600,12 @@ msgid ""
"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>启动</emphasis>安装系统而不需要任何本地的介质,比如 CDs/DVD 或 U 盘。如果您具备网络引导环境(比如,您的网络中可以使用 DHCP 和 TFTP 服务),将允许简单快速地部署大量机器。创建所需的环境需要一定的技术经验,所以不建议新手使用。<phrase arch=\"mips;mipsel\">对于 &arch-title; 此为推荐的安装技术。</phrase>"
+msgstr ""
+"您也可以通过网络<emphasis>启动</emphasis>安装系统而不需要任何本地的介质,比"
+"如 CDs/DVD 或 U 盘。如果您具备网络引导环境(比如,您的网络中可以使用 DHCP 和 "
+"TFTP 服务),将允许简单快速地部署大量机器。创建所需的环境需要一定的技术经验,"
+"所以不建议新手使用。<phrase arch=\"mips;mipsel\">对于 &arch-title; 此为推荐的"
+"安装技术。</phrase>"
#. Tag: para
#: hardware.xml:1781
@@ -2638,16 +2626,14 @@ msgstr "硬盘"
#. Tag: para
#: hardware.xml:1792
#, 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 "从硬盘启动安装系统是许多体系的另外一个选择。这将要求其他的操作系统从硬盘加载安装程序。该方式建议只用在没有其他安装方式可以选的情况下。"
+msgstr ""
+"从硬盘启动安装系统是许多体系的另外一个选择。这将要求其他的操作系统从硬盘加载"
+"安装程序。该方式建议只用在没有其他安装方式可以选的情况下。"
#. Tag: para
#: hardware.xml:1799
@@ -2668,13 +2654,6 @@ msgstr "Un*x 或 GNU 系统"
#. Tag: para
#: hardware.xml:1810
#, 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 "
-#| "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\"/"
-#| ">."
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 manual. "
@@ -2683,7 +2662,11 @@ msgid ""
"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; 使用方法。这类安装方法可能对那些因为硬件不支持或机器停产的用户有用。如果您对此技术感兴趣,请直接跳到 <xref linkend=\"linux-upgrade\"/>。这种安装方法只建议给高级用户在没有其他安装方法可选的情况下使用。"
+msgstr ""
+"如果您正在运行其它的类 Unix 系统,也可以用它来安装 &debian-gnu; 而无须本手册"
+"剩余部分讲述的 &d-i; 使用方法。这类安装方法可能对那些因为硬件不支持或机器停产"
+"的用户有用。如果您对此技术感兴趣,请直接跳到 <xref linkend=\"linux-upgrade\"/"
+">。这种安装方法只建议给高级用户在没有其他安装方法可选的情况下使用。"
#. Tag: title
#: hardware.xml:1823
@@ -2702,17 +2685,14 @@ msgstr "&debian; 安装程序包含的内核能运行在最大数量的系统上
#. Tag: para
#: hardware.xml:1829
#, 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 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)驱动器、SATA 和 SCSI 控制器和驱动器、USB 和 FireWire。支持的文件系统有 FAT、Win-32 FAT 扩展(VFAT) 和 NTFS。"
+msgstr ""
+"通常,&debian; 安装系统支持 IDE (也称为 PATA)驱动器、SATA 和 SCSI 控制器和驱"
+"动器、USB 和 FireWire。支持的文件系统有 FAT、Win-32 FAT 扩展(VFAT) 和 NTFS。"
#. Tag: para
#: hardware.xml:1846
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index f677271ba..f501bd457 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -21,27 +21,12 @@ msgstr "获取系统安装介质"
#. Tag: title
#: install-methods.xml:12
#, no-c-format
-#| msgid "Official &debian-gnu; CD-ROM Sets"
msgid "Official &debian-gnu; CD/DVD-ROM Sets"
msgstr "官方的 &debian-gnu; CD/DVD 光盘套装"
#. Tag: para
#: install-methods.xml:13
#, 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="
-#| "\"&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."
msgid ""
"By far the easiest way to install &debian-gnu; is from an Official &debian; "
"CD/DVD-ROM Set. You can buy a set from a vendor (see the <ulink url=\"&url-"
@@ -56,7 +41,17 @@ msgid ""
"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/DVD-ROM 套件。您可以从一个销售商处购买(参见<ulink url=\"&url-debian-cd-vendors;\">CD 销售商</ulink>)。 如果您有高速网络和 CD/DVD 刻录机,可以选择从 &debian; 镜像站点下载 CD/DVD-ROM 映像,然后自己刻录(参见 <ulink url=\"&url-debian-cd;\">Debian CD 页</ulink>和 <ulink url=\"&url-debian-cd-faq;\">Debian CD FAQ</ulink> 了解详细说明)。如果您已经有一套 &debian; CD/DVD 并能在机器上引导这些 CDs/DVD<phrase arch=\"x86\">,大多数现代 PC 都适用</phrase>,可以直接跳到 <xref linkend=\"boot-installer\"/>。我们尽力让最常用的文件包含在 CD 和 DVD 的第一张盘上,所以只使用第一张 DVD 就能完成基本的桌面安装,或者在有限的范围内可以只使用第一张 CD。"
+msgstr ""
+"目前安装 &debian-gnu; 最容易的方法是使用官方的 &debian; CD/DVD-ROM 套件。您可"
+"以从一个销售商处购买(参见<ulink url=\"&url-debian-cd-vendors;\">CD 销售商</"
+"ulink>)。 如果您有高速网络和 CD/DVD 刻录机,可以选择从 &debian; 镜像站点下载 "
+"CD/DVD-ROM 映像,然后自己刻录(参见 <ulink url=\"&url-debian-cd;\">Debian CD "
+"页</ulink>和 <ulink url=\"&url-debian-cd-faq;\">Debian CD FAQ</ulink> 了解详"
+"细说明)。如果您已经有一套 &debian; CD/DVD 并能在机器上引导这些 CDs/"
+"DVD<phrase arch=\"x86\">,大多数现代 PC 都适用</phrase>,可以直接跳到 <xref "
+"linkend=\"boot-installer\"/>。我们尽力让最常用的文件包含在 CD 和 DVD 的第一张"
+"盘上,所以只使用第一张 DVD 就能完成基本的桌面安装,或者在有限的范围内可以只使"
+"用第一张 CD。"
#. Tag: para
#: install-methods.xml:30
@@ -67,23 +62,13 @@ msgid ""
"some desktop environments a CD installation requires either network "
"connectivity during the installation to download the remaining files or "
"additional CDs."
-msgstr "由于当前标准对 CD 容量的限制,不是所有的桌面图形环境都能装到第一张 CD 里面;有些桌面环境 CD 安装方式要么通过网络连接下载其他文件要么使用额外的 CD。"
+msgstr ""
+"由于当前标准对 CD 容量的限制,不是所有的桌面图形环境都能装到第一张 CD 里面;"
+"有些桌面环境 CD 安装方式要么通过网络连接下载其他文件要么使用额外的 CD。"
#. Tag: para
#: install-methods.xml:38
#, 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-"
-#| "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."
msgid ""
"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 "
@@ -97,7 +82,15 @@ msgid ""
"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 引导<phrase arch=\"x86\"> (仅限于非常古老的 PC 系统)</phrase>,但您有一套 CD,可以使用替代的方案,例如:<phrase condition=\"supports-floppy-boot\">软盘、</phrase> <phrase arch=\"s390\">磁带、仿真磁带、</phrase> <phrase condition=\"bootable-disk\">硬盘、</phrase> <phrase condition=\"bootable-usb\">U 盘、</phrase> <phrase condition=\"supports-tftp\">网络引导、</phrase> 或者从 CD 手工装载内核来初始化系统安装程序。CD 的里已经包含了用其他方法引导所需的文件;&debian; 网络存档和 CD 文件夹组织方式相同。因此当引导需要特定的文件时,可以从 CD 的相同目录和子目录中找到。"
+msgstr ""
+"如果您的机器不支持 CD 引导<phrase arch=\"x86\"> (仅限于非常古老的 PC 系统)</"
+"phrase>,但您有一套 CD,可以使用替代的方案,例如:<phrase condition="
+"\"supports-floppy-boot\">软盘、</phrase> <phrase arch=\"s390\">磁带、仿真磁"
+"带、</phrase> <phrase condition=\"bootable-disk\">硬盘、</phrase> <phrase "
+"condition=\"bootable-usb\">U 盘、</phrase> <phrase condition=\"supports-tftp"
+"\">网络引导、</phrase> 或者从 CD 手工装载内核来初始化系统安装程序。CD 的里已"
+"经包含了用其他方法引导所需的文件;&debian; 网络存档和 CD 文件夹组织方式相同。"
+"因此当引导需要特定的文件时,可以从 CD 的相同目录和子目录中找到。"
#. Tag: para
#: install-methods.xml:61
@@ -273,36 +266,33 @@ msgstr "Plug Computer 和 OpenRD 安装文件"
#. Tag: para
#: install-methods.xml:182
#, 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, 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、DreamPlug 等) 和 OpenRD 设备的安装文件包含对应 U-Boot 的内核和 initrd。您可以从 &kirkwood-marvell-firmware-img; 取得这些文件。"
+msgstr ""
+"plug computers (SheevaPlug、GuruPlug、DreamPlug 等) 和 OpenRD 设备的安装文件"
+"包含对应 U-Boot 的内核和 initrd。您可以从 &kirkwood-marvell-firmware-img; 取"
+"得这些文件。"
#. Tag: title
#: install-methods.xml:192
#, no-c-format
-#| msgid "GLAN Tank Installation Files"
msgid "LaCie NASes Installation Files"
msgstr "LaCie NASes 安装文件"
#. Tag: para
#: install-methods.xml:193
#, 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 "LaCie NASes (Network Space v2、Network Space Max v2、Internet Space v2、d2 Network v2、2Big Network v2 和 5Big Network v2) 安装文件含有用于 U-Boot 的内核和 initrd。您可以从 &lacie-kirkwood-firmware-img; 获取这些文件。"
+msgstr ""
+"LaCie NASes (Network Space v2、Network Space Max v2、Internet Space v2、d2 "
+"Network v2、2Big Network v2 和 5Big Network v2) 安装文件含有用于 U-Boot 的内"
+"核和 initrd。您可以从 &lacie-kirkwood-firmware-img; 获取这些文件。"
#. Tag: title
#: install-methods.xml:244
@@ -934,15 +924,6 @@ msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
#. Tag: para
#: install-methods.xml:653
#, 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>),</"
@@ -952,7 +933,14 @@ msgid ""
"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=\"powerpc\">(<userinput>mount /dev/<replaceable>sdX2</replaceable> /mnt</userinput>),</phrase> 现在上面有了 <phrase arch=\"x86\">一个 FAT 文件系统</phrase> <phrase arch=\"powerpc\">一个 HFS 文件系统</phrase>,然后复制 &debian; ISO 映像 (netinst 或完整的 CD) 到里面。卸载 U 盘 (<userinput>umount /mnt</userinput>) 就完成了。"
+msgstr ""
+"然后,挂载 U 盘 <phrase arch=\"x86\">(<userinput>mount /dev/"
+"<replaceable>sdX</replaceable> /mnt</userinput>),</phrase> <phrase arch="
+"\"powerpc\">(<userinput>mount /dev/<replaceable>sdX2</replaceable> /mnt</"
+"userinput>),</phrase> 现在上面有了 <phrase arch=\"x86\">一个 FAT 文件系统</"
+"phrase> <phrase arch=\"powerpc\">一个 HFS 文件系统</phrase>,然后复制 "
+"&debian; ISO 映像 (netinst 或完整的 CD) 到里面。卸载 U 盘 "
+"(<userinput>umount /mnt</userinput>) 就完成了。"
#. Tag: title
#: install-methods.xml:670
@@ -990,18 +978,6 @@ msgstr "我们将展示如何使用 U 盘的第一个分区,而不是整个设
#. Tag: para
#: install-methods.xml:692
#, 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 "
-#| "to do that anyway, use <command>cfdisk</command> or any other "
-#| "partitioning tool to create a FAT16 partition<footnote> <para> Don't "
-#| "forget to set the <quote>bootable</quote> bootable flag. </para> </"
-#| "footnote>, and then create the filesystem using: "
-#| "<informalexample><screen>\n"
-#| "# mkdosfs /dev/<replaceable>sdX1</replaceable>\n"
-#| "</screen></informalexample> Take care that you use the correct device "
-#| "name for your USB stick. The <command>mkdosfs</command> command is "
-#| "contained in the <classname>dosfstools</classname> &debian; package."
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 to do "
@@ -1018,11 +994,18 @@ 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"
+"由于大多数 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"
+"</screen></informalexample> 其中 <command>install-mbr</command> 命令包含在 "
+"<classname>mbr</classname> &debian; 软件包内。然后建立文件系统:"
+"<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> 命令包含在 <classname>dosfstools</classname> "
+"&debian; 软件包内。"
#. Tag: para
#: install-methods.xml:716
@@ -1097,16 +1080,6 @@ msgstr ""
#. Tag: para
#: install-methods.xml:768
#, 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 "
-#| "(change the name of the kernel binary to <quote><filename>linux</"
-#| "filename></quote> if you used a <filename>netboot</filename> image): "
-#| "<informalexample><screen>\n"
-#| "default vmlinuz\n"
-#| "append initrd=initrd.gz\n"
-#| "</screen></informalexample> For the graphical installer you should add "
-#| "<userinput>vga=788</userinput> to the second line."
msgid ""
"Next you should create a <filename>syslinux.cfg</filename> configuration "
"file, which at a bare minimum should contain the following two lines (change "
@@ -1119,10 +1092,13 @@ 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:780
@@ -1130,19 +1106,12 @@ msgstr ""
msgid ""
"To enable the boot prompt to permit further parameter appending, add a "
"<userinput>prompt 1</userinput> line."
-msgstr "添加 <userinput>prompt 1</userinput> 一行,使得引导提示符可以允许附加参数。"
+msgstr ""
+"添加 <userinput>prompt 1</userinput> 一行,使得引导提示符可以允许附加参数。"
#. Tag: para
#: install-methods.xml:785 install-methods.xml:895
#, 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 "
@@ -1151,7 +1120,12 @@ msgid ""
"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> 您可以选择 netinst 或完整 CD 映像 (参阅 <xref linkend=\"official-cdrom\"/>)。确认选择合适的映象。注意 <quote>netboot <filename>mini.iso</filename></quote> 映象在这里并不适用。</para> </footnote> 到 U 盘。完成后,卸载 U 盘 (<userinput>umount /mnt</userinput>)。"
+msgstr ""
+"如果您使用 <filename>hd-media</filename> 映象,现在应该复制 &debian; ISO 映像"
+"文件<footnote> <para> 您可以选择 netinst 或完整 CD 映像 (参阅 <xref linkend="
+"\"official-cdrom\"/>)。确认选择合适的映象。注意 <quote>netboot "
+"<filename>mini.iso</filename></quote> 映象在这里并不适用。</para> </"
+"footnote> 到 U 盘。完成后,卸载 U 盘 (<userinput>umount /mnt</userinput>)。"
#. Tag: para
#: install-methods.xml:809
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index eb882358a..4519e5225 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.po
@@ -110,15 +110,6 @@ 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."
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 "
@@ -127,7 +118,12 @@ msgid ""
"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;。使用该映像文件让电脑从光盘启动,再由安装程序从网络上下载安装其它的软件包,因此称做 'netinst'。该映像含有运行安装程序的软件模块,以及提供一个最小 &releasename; 系统的基本软件包。如果您乐意,可以下载一个标准大小的 CD 映像文件,用它的话就可以不借助网络安装了。这只需要一套光盘中的第一张就行了。"
+msgstr ""
+"netinst CD 映像是常用的映像可以用来通过 &d-i; 安装 &releasename;。使用该映像"
+"文件让电脑从光盘启动,再由安装程序从网络上下载安装其它的软件包,因此称做 "
+"'netinst'。该映像含有运行安装程序的软件模块,以及提供一个最小 &releasename; "
+"系统的基本软件包。如果您乐意,可以下载一个标准大小的 CD 映像文件,用它的话就"
+"可以不借助网络安装了。这只需要一套光盘中的第一张就行了。"
#. Tag: para
#: installation-howto.xml:77
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 3da665e6d..ce964d7a7 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2012-09-18 17:24+0000\n"
+"POT-Creation-Date: 2012-10-24 19:53+0000\n"
"PO-Revision-Date: 2012-11-26 13:45+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -113,9 +113,6 @@ msgstr "在硬盘上为 &debian; 留出可以用来创建分区的空间;"
#. Tag: para
#: preparing.xml:73
#, no-c-format
-#| msgid ""
-#| "Locate and/or download the installer software and any specialized driver "
-#| "files your machine requires (except &debian; CD users)."
msgid ""
"Locate and/or download the installer software and any specialized driver or "
"firmware files your machine requires."
@@ -262,15 +259,6 @@ msgstr ""
#. Tag: para
#: preparing.xml:178
#, no-c-format
-#| msgid ""
-#| "One important option during the installation is whether or not to install "
-#| "a graphical desktop environment, consisting of the X Window System and "
-#| "one of the available graphical desktop environments. If you choose not to "
-#| "select the <quote>Desktop environment</quote> task, you will only have a "
-#| "relatively basic, command line driven system. Installing the Desktop "
-#| "environment task is optional because it requires a fairly large amount of "
-#| "disk space, and because many &debian-gnu; systems are servers which don't "
-#| "really have any need for a graphical user interface to do their job."
msgid ""
"One important option during the installation is whether or not to install a "
"graphical desktop environment, consisting of the X Window System and one of "
@@ -281,22 +269,25 @@ msgid ""
"comparatively large amount of disk space and because many &debian-gnu; "
"systems are servers which don't really have any need for a graphical user "
"interface to do their job."
-msgstr "安装过程中一个重要的选项是要不要安装图形桌面环境,它由 X Window System 和一个图形桌面环境组成。如果没有选择<quote>桌面环境</quote>任务,就只有一个相对基本的、命令行驱动的系统。把安装桌面环境任务作为选项,是因为相对文本系统它需要大量的磁盘空间,而且由于许多 &debian-gnu; 系统是作为服务器,并不需要图形用户界面来完成它们的工作。"
+msgstr ""
+"安装过程中一个重要的选项是要不要安装图形桌面环境,它由 X Window System 和一个"
+"图形桌面环境组成。如果没有选择<quote>桌面环境</quote>任务,就只有一个相对基本"
+"的、命令行驱动的系统。把安装桌面环境任务作为选项,是因为相对文本系统它需要大"
+"量的磁盘空间,而且由于许多 &debian-gnu; 系统是作为服务器,并不需要图形用户界"
+"面来完成它们的工作。"
#. Tag: para
#: preparing.xml:191
#, no-c-format
-#| msgid ""
-#| "Just be aware that the X Window System is completely separate from "
-#| "<classname>debian-installer</classname>, and in fact is much more "
-#| "complicated. Installation and troubleshooting of the X Window System is "
-#| "not within the scope of this manual."
msgid ""
"Just be aware that the X Window System is completely separate from "
"<classname>debian-installer</classname>, and in fact is much more "
"complicated. Troubleshooting of the X Window System is not within the scope "
"of this manual."
-msgstr "要知道,X Window System 是与 <classname>debian-installer</classname> 完全分开的,实际上它要复杂得多。X Window System 的故障解答不在本手册所关注的范围之内。"
+msgstr ""
+"要知道,X Window System 是与 <classname>debian-installer</classname> 完全分开"
+"的,实际上它要复杂得多。X Window System 的故障解答不在本手册所关注的范围之"
+"内。"
#. Tag: title
#: preparing.xml:206
@@ -307,17 +298,6 @@ msgstr "记得备份您所有的数据!"
#. Tag: para
#: preparing.xml:207
#, no-c-format
-#| msgid ""
-#| "Before you start, make sure to back up every file that is now on your "
-#| "system. If this is the first time a non-native operating system has been "
-#| "installed on your computer, it's quite likely you will need to re-"
-#| "partition your disk to make room for &debian-gnu;. Anytime you partition "
-#| "your disk, you run a risk of losing everything on the disk, no matter "
-#| "what program you use to do it. The programs used in installation are "
-#| "quite reliable and most have seen years of use; but they are also quite "
-#| "powerful and a false move can cost you. Even after backing up, be careful "
-#| "and think about your answers and actions. Two minutes of thinking can "
-#| "save hours of unnecessary work."
msgid ""
"Before you start, make sure to back up every file that is now on your "
"system. If this is the first time a non-native operating system is going to "
@@ -329,18 +309,17 @@ msgid ""
"and a false move can cost you. Even after backing up, be careful and think "
"about your answers and actions. Two minutes of thinking can save hours of "
"unnecessary work."
-msgstr "开始安装之前,请确定您已经把系统中所有数据都进行了备份。如果这是您首次安装非预装的操作系统,很可能需要对硬盘进行重新分区,来给 Debian 腾出安装的空间。不管使用什么程序,分区都会使硬盘上的所有数据全部丢失。在我们的安装过程中使用的分区程序经过多年使用,被证明非常可靠,但它的功能也非常强大,您可能会为一次错误操作而付出代价。即使是已经备份过数据,也要谨慎使用,最好在每次操作之前先认真考虑一下。两分钟的思考可能会为您节省几个小时的不必要的恢复工作。"
+msgstr ""
+"开始安装之前,请确定您已经把系统中所有数据都进行了备份。如果这是您首次安装非"
+"预装的操作系统,很可能需要对硬盘进行重新分区,来给 Debian 腾出安装的空间。不"
+"管使用什么程序,分区都会使硬盘上的所有数据全部丢失。在我们的安装过程中使用的"
+"分区程序经过多年使用,被证明非常可靠,但它的功能也非常强大,您可能会为一次错"
+"误操作而付出代价。即使是已经备份过数据,也要谨慎使用,最好在每次操作之前先认"
+"真考虑一下。两分钟的思考可能会为您节省几个小时的不必要的恢复工作。"
#. Tag: para
#: preparing.xml:220
#, no-c-format
-#| msgid ""
-#| "If you are creating a multi-boot system, make sure that you have the "
-#| "distribution media of any other present operating systems on hand. "
-#| "Especially if you repartition your boot drive, you might find that you "
-#| "have to reinstall your operating system's boot loader, or in many cases "
-#| "the whole operating system itself and all files on the affected "
-#| "partitions."
msgid ""
"If you are creating a multi-boot system, make sure that you have the "
"distribution media of any other present operating systems on hand. Even "
@@ -348,7 +327,11 @@ msgid ""
"you could be required to reinstall your operating system's boot loader to "
"make the system boot or in a worst case even have to reinstall the complete "
"operating system and restore your previously made backup."
-msgstr "如果您是想把电脑做成多重引导的系统,请先把电脑里存在的这些操作系统的安装介质放在手边。即使一般用不上,偶尔也会需要您重新安装操作系统的引导程序(boot loader)使系统可以启动,或者更糟的情况下,得重新安装该操作系统并恢复之前备份的文件。"
+msgstr ""
+"如果您是想把电脑做成多重引导的系统,请先把电脑里存在的这些操作系统的安装介质"
+"放在手边。即使一般用不上,偶尔也会需要您重新安装操作系统的引导程序(boot "
+"loader)使系统可以启动,或者更糟的情况下,得重新安装该操作系统并恢复之前备份的"
+"文件。"
#. Tag: title
#: preparing.xml:239
@@ -521,10 +504,6 @@ msgstr "每个硬件附带的手册。"
#. Tag: para
#: preparing.xml:386
#, no-c-format
-#| msgid ""
-#| "The BIOS setup screens of your computer. You can view these screens when "
-#| "you start your computer by pressing a combination of keys. Check your "
-#| "manual for the combination. Often, it is the <keycap>Delete</keycap> key."
msgid ""
"The BIOS setup screens of your computer. You can view these screens when you "
"start your computer by pressing a combination of keys. Check your manual for "
@@ -532,7 +511,11 @@ msgid ""
"keycap> key, but some manufacturers use other keys or key combinations. "
"Usually upon starting the computer there will be a message stating which key "
"to press to enter the setup screen."
-msgstr "您计算机的 BIOS 配置画面。在计算机启动时,可以通过按组合键查看这些画面。请确认您手册中的组合键。通常,它是 <keycap>Delete</keycap> 或 <keycap>F2</keycap> 键,但有些厂商会使用其他的组合键。一般在系统开机的时候会显示信息表明按哪些键来进入设置界面。"
+msgstr ""
+"您计算机的 BIOS 配置画面。在计算机启动时,可以通过按组合键查看这些画面。请确"
+"认您手册中的组合键。通常,它是 <keycap>Delete</keycap> 或 <keycap>F2</"
+"keycap> 键,但有些厂商会使用其他的组合键。一般在系统开机的时候会显示信息表明"
+"按哪些键来进入设置界面。"
#. Tag: para
#: preparing.xml:396
@@ -570,7 +553,6 @@ msgstr ""
#. Tag: title
#: preparing.xml:427
#, no-c-format
-#| msgid "Hardware Information Needed for an Install"
msgid "Hardware Information Helpful for an Install"
msgstr "有助于安装的硬件信息"
@@ -632,14 +614,12 @@ msgstr "安装有其他操作系统的分区。"
#. Tag: entry
#: preparing.xml:475
#, no-c-format
-#| msgid "Network Settings"
msgid "Network interfaces"
msgstr "网卡"
#. Tag: entry
#: preparing.xml:476
#, no-c-format
-#| msgid "Configure one network interface."
msgid "Type/model of available network interfaces."
msgstr "现有网卡的类型/型号。"
@@ -666,7 +646,6 @@ msgstr "视频卡"
#. Tag: entry
#: preparing.xml:486
#, no-c-format
-#| msgid "Model and manufacturer."
msgid "Type/model and manufacturer."
msgstr "类型/型号与制造商。"
@@ -717,16 +696,14 @@ msgstr "硬件兼容性"
#. Tag: para
#: preparing.xml:510
#, no-c-format
-#| msgid ""
-#| "Many brand name products work without trouble on &arch-kernel;. Moreover, "
-#| "hardware support in &arch-kernel; is improving daily. However, &arch-"
-#| "kernel; still does not run as many different types of hardware as some "
-#| "operating systems."
msgid ""
"Many products work without trouble on &arch-kernel;. Moreover, hardware "
"support in &arch-kernel; is improving daily. However, &arch-kernel; still "
"does not run as many different types of hardware as some operating systems."
-msgstr "多数产品在 &arch-kernel; 上运行不会有问题。而且,&arch-kernel; 对硬件支持每天都在改善。然而,&arch-kernel; 仍然不能像某些操作系统那样可以在各种不同的硬件上运行。"
+msgstr ""
+"多数产品在 &arch-kernel; 上运行不会有问题。而且,&arch-kernel; 对硬件支持每天"
+"都在改善。然而,&arch-kernel; 仍然不能像某些操作系统那样可以在各种不同的硬件"
+"上运行。"
#. Tag: para
#: preparing.xml:516
@@ -739,7 +716,12 @@ msgid ""
"manufacturers provide so-called <quote>reference designs</quote> for "
"products based on their chips which are then used by several different "
"device manufacturers and sold under lots of different product or brand names."
-msgstr "大多数情况下 &arch-kernel; 里面的驱动程序并不是为某一厂商特定的<quote>产品</quote>或<quote>品牌</quote>开发的,而是基于特定的硬件/芯片。许多表面上看起来不同的产品/品牌实际上是基于相同的硬件设计;芯片厂商为芯片提供称为<quote>公版</quote>的产品,其他设备制造商采用这种设计并以不同的产品和品牌来销售是常见的做法。"
+msgstr ""
+"大多数情况下 &arch-kernel; 里面的驱动程序并不是为某一厂商特定的<quote>产品</"
+"quote>或<quote>品牌</quote>开发的,而是基于特定的硬件/芯片。许多表面上看起来"
+"不同的产品/品牌实际上是基于相同的硬件设计;芯片厂商为芯片提供称为<quote>公版"
+"</quote>的产品,其他设备制造商采用这种设计并以不同的产品和品牌来销售是常见的"
+"做法。"
#. Tag: para
#: preparing.xml:527
@@ -755,7 +737,12 @@ msgid ""
"product name bought at different times, they can sometimes be based on two "
"different chipsets and therefore use two different drivers or there might be "
"no driver at all for one of them."
-msgstr "这样做有利也有弊。优点在于只要不同厂商生产的产品基于相同的芯片,驱动程序就可以用在多种产品上。不足之处是确定某一产品/品牌到底使用哪种芯片并不总是那么容易。更不幸的是设备厂商经常在修改产品设计的同时并不更改产品名称甚至是产品编号,以至于在不同时段购买的同一品牌/产品,它们会采用不同的芯片,造成需要使用两种不同的驱动程序,或者其中一个没有任何驱动程序。"
+msgstr ""
+"这样做有利也有弊。优点在于只要不同厂商生产的产品基于相同的芯片,驱动程序就可"
+"以用在多种产品上。不足之处是确定某一产品/品牌到底使用哪种芯片并不总是那么容"
+"易。更不幸的是设备厂商经常在修改产品设计的同时并不更改产品名称甚至是产品编"
+"号,以至于在不同时段购买的同一品牌/产品,它们会采用不同的芯片,造成需要使用两"
+"种不同的驱动程序,或者其中一个没有任何驱动程序。"
#. Tag: para
#: preparing.xml:540
@@ -766,7 +753,11 @@ msgid ""
"Express/ExpressCard devices have so called <quote>vendor</quote> and "
"<quote>product</quote> IDs, and the combination of these two is usually the "
"same for any product based on the same chipset."
-msgstr "对于 USB 和 PCI/PCI-Express/ExpressCard 设备,发现所采用芯片好的方法是查看它们的设备 ID。所有的 USB/PCI/PCI-Express/ExpressCard 设备具有一个称为 <quote>vendor</quote> 和 <quote>product</quote> 的 ID,使用相同芯片的产品这两个组成的数值通常是一样的。"
+msgstr ""
+"对于 USB 和 PCI/PCI-Express/ExpressCard 设备,发现所采用芯片好的方法是查看它"
+"们的设备 ID。所有的 USB/PCI/PCI-Express/ExpressCard 设备具有一个称为 "
+"<quote>vendor</quote> 和 <quote>product</quote> 的 ID,使用相同芯片的产品这两"
+"个组成的数值通常是一样的。"
#. Tag: para
#: preparing.xml:548
@@ -777,7 +768,11 @@ msgid ""
"for PCI/PCI-Express/ExpressCard devices. The vendor and product IDs are "
"usually given in the form of two hexadecimal numbers, seperated by a colon, "
"such as <quote>1d6b:0001</quote>."
-msgstr "在 Linux 系统上,该 ID 可以使用 <command>lsusb</command> 命令读取 USB 设备上的值,<command>lspci -nn</command> 命令用于 PCI/PCI-Express/ExpressCard 设备。vendor 和 product ID 通常是十六进制数值形式,用冒号隔开,例如 <quote>1d6b:0001</quote>。"
+msgstr ""
+"在 Linux 系统上,该 ID 可以使用 <command>lsusb</command> 命令读取 USB 设备上"
+"的值,<command>lspci -nn</command> 命令用于 PCI/PCI-Express/ExpressCard 设"
+"备。vendor 和 product ID 通常是十六进制数值形式,用冒号隔开,例如 "
+"<quote>1d6b:0001</quote>。"
#. Tag: para
#: preparing.xml:556
@@ -786,7 +781,10 @@ msgid ""
"An example for the output of <command>lsusb</command>: <quote>Bus 001 Device "
"001: ID 1d6b:0002 Linux Foundation 2.0 root hub</quote>, whereby 1d6b is the "
"vendor ID and 0002 is the product ID."
-msgstr "<command>lsusb</command> 命令的输出的形式为: <quote>Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub</quote>,其中 1d6b 是 vendor ID 而 0002 是 product ID。"
+msgstr ""
+"<command>lsusb</command> 命令的输出的形式为: <quote>Bus 001 Device 001: ID "
+"1d6b:0002 Linux Foundation 2.0 root hub</quote>,其中 1d6b 是 vendor ID 而 "
+"0002 是 product ID。"
#. Tag: para
#: preparing.xml:562
@@ -797,7 +795,11 @@ msgid ""
"Ltd. RTL8111/8168B PCI Express Gigabit Ethernet controller [10ec:8168] (rev "
"06)</quote>. The IDs are given inside the rightmost square brackets, i.e. "
"here 10ec is the vendor- and 8168 is the product ID."
-msgstr "<command>lspci -nn</command> 输出的网卡设备形式为:<quote>03:00.0 Ethernet controller [0200]: Realtek Semiconductor Co., Ltd. RTL8111/8168B PCI Express Gigabit Ethernet controller [10ec:8168] (rev 06)</quote>。ID 位于最右边的方括号里面,这里 10ec 是 vendor ID 而 8168 是 product ID。"
+msgstr ""
+"<command>lspci -nn</command> 输出的网卡设备形式为:<quote>03:00.0 Ethernet "
+"controller [0200]: Realtek Semiconductor Co., Ltd. RTL8111/8168B PCI Express "
+"Gigabit Ethernet controller [10ec:8168] (rev 06)</quote>。ID 位于最右边的方括"
+"号里面,这里 10ec 是 vendor ID 而 8168 是 product ID。"
#. Tag: para
#: preparing.xml:570
@@ -806,7 +808,10 @@ msgid ""
"As another example, a graphics card could give the following output: "
"<quote>04:00.0 VGA compatible controller [0300]: Advanced Micro Devices "
"[AMD] nee ATI RV710 [Radeon HD 4350] [1002:954f]</quote>."
-msgstr "再举一个例子,显卡设备的输出形式为: <quote>04:00.0 VGA compatible controller [0300]: Advanced Micro Devices [AMD] nee ATI RV710 [Radeon HD 4350] [1002:954f]</quote>。"
+msgstr ""
+"再举一个例子,显卡设备的输出形式为: <quote>04:00.0 VGA compatible "
+"controller [0300]: Advanced Micro Devices [AMD] nee ATI RV710 [Radeon HD "
+"4350] [1002:954f]</quote>。"
#. Tag: para
#: preparing.xml:576
@@ -818,7 +823,11 @@ msgid ""
"you have to select the property <quote>Hardware IDs</quote> in the device "
"manager's details tab to actually see the IDs, as they are not displayed by "
"default."
-msgstr "在 Windows 系统上,设备 ID 可以通过打开 Windows 设备管理器上的 <quote>details</quote> 页查看,其中 vendor ID 的前缀是 VEN_ 而 product ID 的前缀是 DEV_。在 Windows 7 系统上,您需要再打开设备管理器页上的 <quote>Hardware IDs</quote> 属性才能看到 ID,默认是不显示的。"
+msgstr ""
+"在 Windows 系统上,设备 ID 可以通过打开 Windows 设备管理器上的 "
+"<quote>details</quote> 页查看,其中 vendor ID 的前缀是 VEN_ 而 product ID 的"
+"前缀是 DEV_。在 Windows 7 系统上,您需要再打开设备管理器页上的 "
+"<quote>Hardware IDs</quote> 属性才能看到 ID,默认是不显示的。"
#. Tag: para
#: preparing.xml:586
@@ -831,7 +840,12 @@ msgid ""
"the chip code names, which are also often provided by lsusb and lspci "
"(<quote>RTL8111</quote>/<quote>RTL8168B</quote> in the network card example "
"and <quote>RV710</quote> in the graphics card example), can help."
-msgstr "通过互联网搜索 vendor/product ID,使用 <quote>&arch-kernel;</quote> 和 <quote>driver</quote> 作为搜索项得到的结果通常含有特定芯片对应驱动程序支持的情况。如果搜索 vendor/product ID 不能得到有用的结果,请换成芯片代码名称来搜索,该名称也是通过 lsusb 和 lspci(网卡例子中的 <quote>RTL8111</quote>/<quote>RTL8168B</quote> 和显卡例子中的 <quote>RV710</quote>) 命令查出。"
+msgstr ""
+"通过互联网搜索 vendor/product ID,使用 <quote>&arch-kernel;</quote> 和 "
+"<quote>driver</quote> 作为搜索项得到的结果通常含有特定芯片对应驱动程序支持的"
+"情况。如果搜索 vendor/product ID 不能得到有用的结果,请换成芯片代码名称来搜"
+"索,该名称也是通过 lsusb 和 lspci(网卡例子中的 <quote>RTL8111</quote>/"
+"<quote>RTL8168B</quote> 和显卡例子中的 <quote>RV710</quote>) 命令查出。"
#. Tag: title
#: preparing.xml:599
@@ -853,7 +867,14 @@ msgid ""
"again, everything is reset to its defaults. If you want to see whether your "
"hardware is supported by &debian-gnu;, the easiest way is to run a &debian; "
"live system on it and try it out."
-msgstr "&debian-gnu; 在一些架构上可以使用称为 <quote>live 系统(live system)</quote> 的形式。live 系统是一种经过压缩的预先配置好的系统,从只读的介质比如 CD 或 DVD 上直接引导就可以使用。它在默认的情况下并不对您的计算机进行永久性的改动。您可以在上面修改用户设置,安装额外的程序,但这些修改只存在于计算机的内存里面,也就是说,只要一关机,或者重启 live 系统,所有的东西都会恢复到默认状态。如果您想了解 &debian-gnu; 对硬件的支持情况,最简单的方法就是运行一个 &debian; live 系统来试试。"
+msgstr ""
+"&debian-gnu; 在一些架构上可以使用称为 <quote>live 系统(live system)</quote> "
+"的形式。live 系统是一种经过压缩的预先配置好的系统,从只读的介质比如 CD 或 "
+"DVD 上直接引导就可以使用。它在默认的情况下并不对您的计算机进行永久性的改动。"
+"您可以在上面修改用户设置,安装额外的程序,但这些修改只存在于计算机的内存里"
+"面,也就是说,只要一关机,或者重启 live 系统,所有的东西都会恢复到默认状态。"
+"如果您想了解 &debian-gnu; 对硬件的支持情况,最简单的方法就是运行一个 "
+"&debian; live 系统来试试。"
#. Tag: para
#: preparing.xml:614
@@ -869,7 +890,13 @@ msgid ""
"can of course be installed manually within the system, but there is no "
"automatic detection of required firmware files like in the &d-i;, so "
"installation of non-free components must be done manually if needed."
-msgstr "使用 live 系统有一些限制。首先,您所有的改动都只存在于内存之中,这就要求系统有足够的内存,像安装一个大的软件包就有可能因内存无法满足而失败。另外一个限制与硬件兼容性测试相关,因为官方的 &debian-gnu; live 系统只使用自由的组件,造成非自由的固件无法包含在里面。这些非自由的软件包当然可以通过手动方式安装,但这里没有 &d-i; 里可以自动检测所需固件的功能,因此需要的时候只能通过手动方式安装非自由的组件。"
+msgstr ""
+"使用 live 系统有一些限制。首先,您所有的改动都只存在于内存之中,这就要求系统"
+"有足够的内存,像安装一个大的软件包就有可能因内存无法满足而失败。另外一个限制"
+"与硬件兼容性测试相关,因为官方的 &debian-gnu; live 系统只使用自由的组件,造成"
+"非自由的固件无法包含在里面。这些非自由的软件包当然可以通过手动方式安装,但这"
+"里没有 &d-i; 里可以自动检测所需固件的功能,因此需要的时候只能通过手动方式安装"
+"非自由的组件。"
#. Tag: para
#: preparing.xml:627
@@ -878,7 +905,9 @@ msgid ""
"Information about the available variants of the &debian; live images can be "
"found at the <ulink url=\"&url-debian-live-cd;\">Debian Live Images website</"
"ulink>."
-msgstr "有关 &debian; live 映像的各种信息可以参考 <ulink url=\"&url-debian-live-cd;\">Debian Live Images website</ulink>。"
+msgstr ""
+"有关 &debian; live 映像的各种信息可以参考 <ulink url=\"&url-debian-live-cd;"
+"\">Debian Live Images website</ulink>。"
#. Tag: title
#: preparing.xml:641
@@ -889,16 +918,14 @@ msgstr "网络设置"
#. Tag: para
#: preparing.xml:643
#, no-c-format
-#| msgid ""
-#| "If your computer is connected to a network 24 hours a day (i.e., an "
-#| "Ethernet or equivalent connection &mdash; not a PPP connection), you "
-#| "should ask your network's system administrator for this information."
msgid ""
"If your computer is connected to a fixed network (i.e. an Ethernet or "
"equivalent connection &mdash; not a dialup/PPP connection) which is "
"administered by somebody else, you should ask your network's system "
"administrator for this information:"
-msgstr "如果您的计算机固定连接在其他人管理的网上(即,以太网或等价的连接 &mdash; 而不是拨号或 PPP 连接),您需要向网络系统管理员咨询这项信息。"
+msgstr ""
+"如果您的计算机固定连接在其他人管理的网上(即,以太网或等价的连接 &mdash; 而不"
+"是拨号或 PPP 连接),您需要向网络系统管理员咨询这项信息。"
#. Tag: para
#: preparing.xml:651
@@ -944,17 +971,14 @@ msgstr "您的网络中作为 DNS(域名服务) 服务器的系统。"
#. Tag: para
#: preparing.xml:685
#, no-c-format
-#| msgid ""
-#| "On the other hand, if your administrator tells you that a DHCP server is "
-#| "available and is recommended, then you don't need this information "
-#| "because the DHCP server will provide it directly to your computer during "
-#| "the installation process."
msgid ""
"If the network you are connected to uses DHCP (Dynamic Host Configuration "
"Protocol) for configuring network settings, you don't need this information "
"because the DHCP server will provide it directly to your computer during the "
"installation process."
-msgstr "如果通过 DHCP (Dynamic Host Configuration Protocol) 设置连接网络,您不需要这些信息,因为 DHCP 服务器将在安装过程中直接将它们提供给您的计算机。"
+msgstr ""
+"如果通过 DHCP (Dynamic Host Configuration Protocol) 设置连接网络,您不需要这"
+"些信息,因为 DHCP 服务器将在安装过程中直接将它们提供给您的计算机。"
#. Tag: para
#: preparing.xml:692
@@ -964,7 +988,9 @@ msgid ""
"network) and have a router (often provided preconfigured by your phone or "
"catv provider) which handles your network connectivity, DHCP is usually "
"available by default."
-msgstr "如果您通过 DSL 或有线猫(即使用有线电视网络)访问互联网,并由路由器(一般由电信或有线电视商预先设置)处理网络连接,通常默认都使用 DHCP。"
+msgstr ""
+"如果您通过 DSL 或有线猫(即使用有线电视网络)访问互联网,并由路由器(一般由电信"
+"或有线电视商预先设置)处理网络连接,通常默认都使用 DHCP。"
#. Tag: para
#: preparing.xml:700
@@ -974,26 +1000,25 @@ msgid ""
"not have to manually perform any network settings there to achieve Internet "
"access, network connectivity in &debian-gnu; will also be configured "
"automatically."
-msgstr "经验法则:如果您在家庭网络中使用 Windows 系统不需要手动设置就能访问互联网,那么在 &debian-gnu; 下也会自动进行网络配置。"
+msgstr ""
+"经验法则:如果您在家庭网络中使用 Windows 系统不需要手动设置就能访问互联网,那"
+"么在 &debian-gnu; 下也会自动进行网络配置。"
#. Tag: para
#: preparing.xml:707
#, no-c-format
-#| msgid "If you use a wireless network, you should also find out:"
msgid "If you use a WLAN/WiFi network, you should find out:"
msgstr "如果使用 WLAN/WiFi 网络,您应该找出:"
#. Tag: para
#: preparing.xml:712
#, no-c-format
-#| msgid "ESSID of your wireless network."
msgid "The ESSID (<quote>network name</quote>) of your wireless network."
msgstr "您无线网络的 ESSID (<quote>网络名称</quote>)。"
#. Tag: para
#: preparing.xml:717
#, no-c-format
-#| msgid "WEP or WPA/WPA2 security key (if applicable)."
msgid "The WEP or WPA/WPA2 security key to access the network (if applicable)."
msgstr "连接网络的 WEP 或 WPA/WPA2 安全密钥(如果可用)。"
@@ -1224,16 +1249,6 @@ msgstr ""
#. Tag: para
#: preparing.xml:855
#, no-c-format
-#| msgid ""
-#| "If you already have an operating system on your system <phrase arch=\"any-"
-#| "x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, "
-#| "Solaris, FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, "
-#| "OS/390, &hellip;) </phrase> and want to stick &debian; on the same disk, "
-#| "you will need to repartition the disk. &debian; requires its own hard "
-#| "disk partitions. It cannot be installed on Windows or MacOS partitions. "
-#| "It may be able to share some partitions with other Unix systems, but "
-#| "that's not covered here. At the very least you will need a dedicated "
-#| "partition for the &debian; root."
msgid ""
"If you already have an operating system on your system <phrase arch=\"any-"
"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
@@ -1244,18 +1259,18 @@ msgid ""
"It may be able to share some partitions with other Unix systems, but that's "
"not covered here. At the very least you will need a dedicated partition for "
"the &debian; root filesystem."
-msgstr "如果在您的机器中已经安装有操作系统<phrase arch=\"x86\"> (Windows 9x、Windows NT/2000/XP/2003/Vista/7、OS/2、MacOS、Solaris、FreeBSD,&hellip;) </phrase> <phrase arch=\"s390\"> (VM、z/OS、OS/390,&hellip;) </phrase>占用了整个磁盘,同时您也希望把 Linux 装在同一块硬盘上,那么就必须重新对硬盘分区。&debian; 需要它自己专用的硬盘分区。它不能被安装在 Windows 或者 MacOS 的分区上。它可以与其它 Unix 系统共享一些分区,但是我们在这里不会对此进行说明。最起码,您要为 &debian; 的根目录准备一个专用的分区。"
+msgstr ""
+"如果在您的机器中已经安装有操作系统<phrase arch=\"x86\"> (Windows 9x、Windows "
+"NT/2000/XP/2003/Vista/7、OS/2、MacOS、Solaris、FreeBSD,&hellip;) </phrase> "
+"<phrase arch=\"s390\"> (VM、z/OS、OS/390,&hellip;) </phrase>占用了整个磁盘,"
+"同时您也希望把 Linux 装在同一块硬盘上,那么就必须重新对硬盘分区。&debian; 需"
+"要它自己专用的硬盘分区。它不能被安装在 Windows 或者 MacOS 的分区上。它可以与"
+"其它 Unix 系统共享一些分区,但是我们在这里不会对此进行说明。最起码,您要为 "
+"&debian; 的根目录准备一个专用的分区。"
#. Tag: para
#: preparing.xml:874
#, no-c-format
-#| msgid ""
-#| "You can find information about your current partition setup by using a "
-#| "partitioning tool for your current operating system<phrase arch=\"any-"
-#| "x86\">, such as fdisk or PartitionMagic</phrase><phrase arch=\"powerpc"
-#| "\">, such as Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch="
-#| "\"s390\">, such as the VM diskmap</phrase>. Partitioning tools always "
-#| "provide a way to show existing partitions without making changes."
msgid ""
"You can find information about your current partition setup by using a "
"partitioning tool for your current operating system<phrase arch=\"any-"
@@ -1264,7 +1279,12 @@ msgid ""
"MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. "
"Partitioning tools always provide a way to show existing partitions without "
"making changes."
-msgstr "通过当前的操作系统中的分区工具,您可以获知现在的分区状况<phrase arch=\"any-x86\">,如 Windows 系统中的磁盘管理器或 DOS 下的 fdisk</phrase><phrase arch=\"powerpc\">,如 Drive Setup、HD Toolkit 和 MacTools</phrase><phrase arch=\"s390\">,如 VM diskmap</phrase>。分区工具总会提供一种办法让您查看现有的分区情况,而不作任何改动。"
+msgstr ""
+"通过当前的操作系统中的分区工具,您可以获知现在的分区状况<phrase arch=\"any-"
+"x86\">,如 Windows 系统中的磁盘管理器或 DOS 下的 fdisk</phrase><phrase arch="
+"\"powerpc\">,如 Drive Setup、HD Toolkit 和 MacTools</phrase><phrase arch="
+"\"s390\">,如 VM diskmap</phrase>。分区工具总会提供一种办法让您查看现有的分区"
+"情况,而不作任何改动。"
#. Tag: para
#: preparing.xml:884
@@ -1293,7 +1313,12 @@ msgid ""
"x86\">For FAT/FAT32 and NTFS partitions as used by DOS and Windows systems, "
"the ability to move and resize them losslessly is provided both by &d-i; as "
"well as by the integrated Disk Manager of Windows 7. </phrase>"
-msgstr "很多新的操作系统都提供无损移动和调节已有分区的功能。使得在不丢失任何数据的情况下就能添加分区空间。即使大多时候都可以正常使用,由于修改分区本身就是危险操作,应该在进行完整备份后再进行。<phrase arch=\"any-x86\">对于 DOS 和 Windows 系统使用的 FAT/FAT32 和 NTFS 分区,这种无损修改能力 &d-i; 和 Windows 7 上的磁盘管理器都提供。</phrase>"
+msgstr ""
+"很多新的操作系统都提供无损移动和调节已有分区的功能。使得在不丢失任何数据的情"
+"况下就能添加分区空间。即使大多时候都可以正常使用,由于修改分区本身就是危险操"
+"作,应该在进行完整备份后再进行。<phrase arch=\"any-x86\">对于 DOS 和 Windows "
+"系统使用的 FAT/FAT32 和 NTFS 分区,这种无损修改能力 &d-i; 和 Windows 7 上的磁"
+"盘管理器都提供。</phrase>"
#. Tag: para
#: preparing.xml:907
@@ -1302,7 +1327,9 @@ msgid ""
"To losslessly resize an existing FAT or NTFS partition from within &d-i;, go "
"to the partitioning step, select the option for manual partitioning, select "
"the partition to resize, and simply specify its new size."
-msgstr "在 &d-i; 里面无损调节已有的 FAT 或 NTFS 分区尺寸,要在分区设置步骤,选择手动分区选项,再选择修改大小,然后指定新尺寸。"
+msgstr ""
+"在 &d-i; 里面无损调节已有的 FAT 或 NTFS 分区尺寸,要在分区设置步骤,选择手动"
+"分区选项,再选择修改大小,然后指定新尺寸。"
#. Tag: emphasis
#: preparing.xml:915
@@ -1324,17 +1351,16 @@ msgid ""
"but there are a few rare corner cases in which this could cause problems, so "
"if you want to be sure, use the native partitioning tools to create "
"partitions for use by other operating systems."
-msgstr "创建和删除分区可以通过 &d-i; 也可以使用已有的操作系统进行。根据经验,分区应该由使用该分区的系统来创建,也就是说,&debian-gnu; 使用的分区应该用 &d-i; 创建,而别的分区则由别的操作系统来操作。&d-i; 可以创建非 &arch-kernel; 分区,这些分区在其他操作系统下工作也没有问题,但在极端罕见的情况也可能出错,所以如果要十拿九稳,就使用其操作系统上自带的工具来创建分区。"
+msgstr ""
+"创建和删除分区可以通过 &d-i; 也可以使用已有的操作系统进行。根据经验,分区应该"
+"由使用该分区的系统来创建,也就是说,&debian-gnu; 使用的分区应该用 &d-i; 创"
+"建,而别的分区则由别的操作系统来操作。&d-i; 可以创建非 &arch-kernel; 分区,这"
+"些分区在其他操作系统下工作也没有问题,但在极端罕见的情况也可能出错,所以如果"
+"要十拿九稳,就使用其操作系统上自带的工具来创建分区。"
#. Tag: para
#: preparing.xml:930
#, no-c-format
-#| msgid ""
-#| "If you are going to install more than one operating system on the same "
-#| "machine, you should install all other system(s) before proceeding with "
-#| "&debian; installation. Windows and other OS installations may destroy "
-#| "your ability to start &debian;, or encourage you to reformat non-native "
-#| "partitions."
msgid ""
"If you are going to install more than one operating system on the same "
"machine, you should install all other system(s) before proceeding with the "
@@ -1518,14 +1544,6 @@ msgstr "安装前的硬件和操作系统的相关设置"
#. Tag: para
#: preparing.xml:1111
#, no-c-format
-#| msgid ""
-#| "This section will walk you through pre-installation hardware setup, if "
-#| "any, that you will need to do prior to installing &debian;. Generally, "
-#| "this involves checking and possibly changing firmware settings for your "
-#| "system. The <quote>firmware</quote> is the core software used by the "
-#| "hardware; it is most critically invoked during the bootstrap process "
-#| "(after power-up). Known hardware issues affecting the reliability of "
-#| "&debian-gnu; on your system are also highlighted."
msgid ""
"This section will walk you through pre-installation hardware setup, if any, "
"that you will need to do prior to installing &debian;. Generally, this "
@@ -1533,7 +1551,12 @@ msgid ""
"your system. The <quote>BIOS</quote> or <quote>system firmware</quote> is "
"the core software used by the hardware; it is most critically invoked during "
"the bootstrap process (after power-up)."
-msgstr "在本节中,我们将讨论安装之前有关硬件设置的一些问题。如果这些问题的确存在的话,您就需要在安装 &debian; 前先做一些准备工作了。一般来说,准备工作包括:检查或者可能修改系统中 BIOS/系统固件(system firmware)的设定。所谓<quote>BIOS</quote> 或 <quote>系统固件</quote>就是硬件运行所需的核心软件。它在系统引导过程(即开机之后)中起到了至关重要的作用。"
+msgstr ""
+"在本节中,我们将讨论安装之前有关硬件设置的一些问题。如果这些问题的确存在的"
+"话,您就需要在安装 &debian; 前先做一些准备工作了。一般来说,准备工作包括:检"
+"查或者可能修改系统中 BIOS/系统固件(system firmware)的设定。所谓<quote>BIOS</"
+"quote> 或 <quote>系统固件</quote>就是硬件运行所需的核心软件。它在系统引导过程"
+"(即开机之后)中起到了至关重要的作用。"
#. Tag: title
#: preparing.xml:1126
@@ -1544,13 +1567,6 @@ msgstr "BIOS 设置菜单的使用"
#. Tag: para
#: preparing.xml:1128
#, no-c-format
-#| msgid ""
-#| "BIOS provides the basic functions needed to boot your machine to allow "
-#| "your operating system to access your hardware. Your system probably "
-#| "provides a BIOS setup menu, which is used to configure the BIOS. Before "
-#| "installing, you <emphasis>must</emphasis> ensure that your BIOS is set up "
-#| "correctly; not doing so can lead to intermittent crashes or an inability "
-#| "to install &debian;."
msgid ""
"The BIOS provides the basic functions needed to boot your machine and to "
"allow your operating system to access your hardware. Your system provides a "
@@ -1560,7 +1576,12 @@ msgid ""
"key, but some manufacturers use other keys. Usually upon starting the "
"computer there will be a message stating which key to press to enter the "
"setup screen."
-msgstr "BIOS 为启动机器提供了基本的功能,并允许您的操作系统可以访问硬件。系统提供了 BIOS 设置菜单,通过它可以配置 BIOS。要进入 BIOS 设置菜单,您需要在打开计算机的时候按下某组合键。通常这会是 <keycap>Delete</keycap> 或 <keycap>F2</keycap> 键,但也有厂商使用其他的键。一般在开机的时候会有信息显示使用哪些键可以进入设置界面。"
+msgstr ""
+"BIOS 为启动机器提供了基本的功能,并允许您的操作系统可以访问硬件。系统提供了 "
+"BIOS 设置菜单,通过它可以配置 BIOS。要进入 BIOS 设置菜单,您需要在打开计算机"
+"的时候按下某组合键。通常这会是 <keycap>Delete</keycap> 或 <keycap>F2</"
+"keycap> 键,但也有厂商使用其他的键。一般在开机的时候会有信息显示使用哪些键可"
+"以进入设置界面。"
# index.docbook:1522, index.docbook:1865
#. Tag: title
@@ -1578,7 +1599,10 @@ msgid ""
"include the internal harddisks, the CD/DVD-ROM drive and USB mass storage "
"devices such as USB sticks or external USB harddisks. On modern systems "
"there is also often a possibility to enable network booting via PXE."
-msgstr "在 BIOS 设置菜单上,您可以选择用什么次序来检测设备上的可引导操作系统。供选择的通常有内置硬盘、CD/DVD-ROM 驱动器和 USB 存储设备,如 U 盘和外置硬盘。在新的系统上还可能会有使用 PXE 打开网络引导。"
+msgstr ""
+"在 BIOS 设置菜单上,您可以选择用什么次序来检测设备上的可引导操作系统。供选择"
+"的通常有内置硬盘、CD/DVD-ROM 驱动器和 USB 存储设备,如 U 盘和外置硬盘。在新的"
+"系统上还可能会有使用 PXE 打开网络引导。"
#. Tag: para
#: preparing.xml:1152
@@ -1587,7 +1611,9 @@ msgid ""
"Depending on the installation media (CD/DVD ROM, USB stick, network boot) "
"you have chosen you should enable the appropriate boot devices if they are "
"not already enabled."
-msgstr "根据不同的安装介质(CD/DVD ROM、U 盘、网络引导),您可以选择打开哪些没有打开的引导设备。"
+msgstr ""
+"根据不同的安装介质(CD/DVD ROM、U 盘、网络引导),您可以选择打开哪些没有打开的"
+"引导设备。"
#. Tag: para
#: preparing.xml:1158
@@ -1603,7 +1629,13 @@ msgid ""
"the default boot order of the BIOS, i.e. you can start once from a USB stick "
"while having configured the internal harddisk as the normal primary boot "
"device."
-msgstr "多数 BIOS 版本允许在启动时调出引导菜单选择本次会话中所使用的引导设备。如果有这项功能,BIOS 通常启动时会显示一条类似 <quote>press <keycap>F12</keycap> for boot menu</quote> 的信息。具体的按键会因系统的不同而不同;常用的键有 <keycap>F12</keycap>、<keycap>F11</keycap> 和 <keycap>F8</keycap>。从这个菜单选择的设备不会影响 BIOS 中默认的引导次序,就是说,可以从 U 盘启动一次,而将内置硬盘作为主引导设备。"
+msgstr ""
+"多数 BIOS 版本允许在启动时调出引导菜单选择本次会话中所使用的引导设备。如果有"
+"这项功能,BIOS 通常启动时会显示一条类似 <quote>press <keycap>F12</keycap> "
+"for boot menu</quote> 的信息。具体的按键会因系统的不同而不同;常用的键有 "
+"<keycap>F12</keycap>、<keycap>F11</keycap> 和 <keycap>F8</keycap>。从这个菜单"
+"选择的设备不会影响 BIOS 中默认的引导次序,就是说,可以从 U 盘启动一次,而将内"
+"置硬盘作为主引导设备。"
#. Tag: para
#: preparing.xml:1172
@@ -1612,7 +1644,9 @@ msgid ""
"If your BIOS does not provide you with a boot menu to do ad-hoc choices of "
"the current boot device, you have to change your BIOS setup to make the "
"device from which the &d-i; shall be booted the primary boot device."
-msgstr "如果您的 BIOS 不提供引导菜单选择当前的启动设备,您只好从 BIOS 设置中将 &d-i; 设备设为主引导设备。"
+msgstr ""
+"如果您的 BIOS 不提供引导菜单选择当前的启动设备,您只好从 BIOS 设置中将 &d-i; "
+"设备设为主引导设备。"
#. Tag: para
#: preparing.xml:1178
@@ -1629,7 +1663,14 @@ msgid ""
"DVD image on a USB stick (see <xref linkend=\"usb-copy-isohybrid\"/>), "
"changing the device type to <quote>USB CDROM</quote> helps on some BIOSes "
"which will not boot from a USB stick in USB harddisk mode.</phrase>"
-msgstr "很不幸,有些计算机的 BIOS 版本有 bug。即使将 BIOS 的主设备改成从 U 盘引导,也无法另 &d-i; 成功启动。有些系统完全不能从 U 盘介质进行引导;其他的引导需要将 U 盘引导默认从 <quote>USB harddisk</quote> 或 <quote>USB stick</quote> 改成 <quote>USB ZIP</quote> 或 <quote>USB CDROM</quote> 才行。<phrase condition=\"isohybrid-supported\"> 特别是在您在 U 盘上使用 isohybrid CD/DVD 映像(参阅 <xref linkend=\"usb-copy-isohybrid\"/>),将设备类型改成 <quote>USB CDROM</quote> 有助于解决不能从 U 盘硬盘模式下的引导问题。</phrase>"
+msgstr ""
+"很不幸,有些计算机的 BIOS 版本有 bug。即使将 BIOS 的主设备改成从 U 盘引导,也"
+"无法另 &d-i; 成功启动。有些系统完全不能从 U 盘介质进行引导;其他的引导需要将 "
+"U 盘引导默认从 <quote>USB harddisk</quote> 或 <quote>USB stick</quote> 改成 "
+"<quote>USB ZIP</quote> 或 <quote>USB CDROM</quote> 才行。<phrase condition="
+"\"isohybrid-supported\"> 特别是在您在 U 盘上使用 isohybrid CD/DVD 映像(参阅 "
+"<xref linkend=\"usb-copy-isohybrid\"/>),将设备类型改成 <quote>USB CDROM</"
+"quote> 有助于解决不能从 U 盘硬盘模式下的引导问题。</phrase>"
#. Tag: title
#: preparing.xml:1203
@@ -2036,14 +2077,6 @@ msgstr "USB BIOS 支持与键盘"
#. Tag: para
#: preparing.xml:1464
#, no-c-format
-#| msgid ""
-#| "If you have no AT-style keyboard and only a USB model, you may need to "
-#| "enable legacy AT keyboard emulation in your BIOS setup. Only do this if "
-#| "the installation system fails to use your keyboard in USB mode. "
-#| "Conversely, for some systems (especially laptops) you may need to disable "
-#| "legacy USB support if your keyboard does not respond. Consult your main "
-#| "board manual and look in the BIOS for <quote>Legacy keyboard emulation</"
-#| "quote> or <quote>USB keyboard support</quote> options."
msgid ""
"If you have no PS/2-style keyboard, but only a USB model, on some very old "
"PCs you may need to enable legacy keyboard emulation in your BIOS setup to "
@@ -2051,7 +2084,12 @@ msgid ""
"issue for modern systems. If your keyboard does not work in the bootloader "
"menu, consult your mainboard manual and look in the BIOS for <quote>Legacy "
"keyboard emulation</quote> or <quote>USB keyboard support</quote> options."
-msgstr "假如您没有 PS/2 规格的键盘,而只有 USB 键盘,在一些很老的 PC 上您需要在 BIOS 设置里面打开 legacy keyboard emulation 设置,使得在引导菜单中可以使用键盘。当然新系统中不会遇到这种问题。如果您的键盘无法在引导菜单下工作,请参考主板手册,并在 BIOS 中查看 <quote>Legacy keyboard emulation</quote> 或 <quote>USB keyboard support</quote> 选项。"
+msgstr ""
+"假如您没有 PS/2 规格的键盘,而只有 USB 键盘,在一些很老的 PC 上您需要在 BIOS "
+"设置里面打开 legacy keyboard emulation 设置,使得在引导菜单中可以使用键盘。当"
+"然新系统中不会遇到这种问题。如果您的键盘无法在引导菜单下工作,请参考主板手"
+"册,并在 BIOS 中查看 <quote>Legacy keyboard emulation</quote> 或 <quote>USB "
+"keyboard support</quote> 选项。"
#. Tag: title
#: preparing.xml:1477
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 07971169b..5e2af97cf 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -816,7 +816,6 @@ msgstr "theme"
#. Tag: entry
#: preseed.xml:522
#, no-c-format
-#| msgid "debian-installer/locale"
msgid "debian-installer/theme"
msgstr "debian-installer/theme"
@@ -961,7 +960,6 @@ msgstr "tasksel:tasksel/first"
#. Tag: entry
#: preseed.xml:535
#, no-c-format
-#| msgid "<entry>yes</entry>"
msgid "<entry>desktop</entry>"
msgstr "<entry>desktop</entry>"
@@ -998,14 +996,12 @@ msgstr "keyboard-configuration/xkb-keymap"
#. Tag: entry
#: preseed.xml:538
#, no-c-format
-#| msgid "preseed/url"
msgid "preseed-md5"
msgstr "preseed-md5"
#. Tag: entry
#: preseed.xml:538
#, no-c-format
-#| msgid "preseed/file"
msgid "preseed/file/checksum"
msgstr "preseed/file/checksum"
@@ -1363,17 +1359,17 @@ msgstr ""
#. Tag: para
#: preseed.xml:739
#, 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. 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 来回切换。安装的时候只有几种基本的 keymap 可用。高级的要在安装好的系统下才能使用,使用 <command>dpkg-reconfigure keyboard-configuration</command> 配置。"
+msgstr ""
+"键盘配置包括选择的 keymap 和(对于非拉丁 keymap)切换键,该键用于非拉丁和 US "
+"keymap 来回切换。安装的时候只有几种基本的 keymap 可用。高级的要在安装好的系统"
+"下才能使用,使用 <command>dpkg-reconfigure keyboard-configuration</command> "
+"配置。"
#. Tag: screen
#: preseed.xml:747
@@ -1461,64 +1457,6 @@ msgstr "下面的 debconf 变量与网络配置相关。"
#. Tag: screen
#: preseed.xml:794
#, 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"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index fe6ac6732..4a39b9617 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2012-09-18 17:24+0000\n"
+"POT-Creation-Date: 2012-10-24 19:53+0000\n"
"PO-Revision-Date: 2012-11-26 13:55+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1082,15 +1082,6 @@ msgstr ""
#. Tag: para
#: random-bits.xml:516
#, no-c-format
-#| msgid ""
-#| "Substitute one of the following for <replaceable>ARCH</replaceable> in "
-#| "the <command>debootstrap</command> command: <userinput>alpha</userinput>, "
-#| "<userinput>amd64</userinput>, <userinput>arm</userinput>, "
-#| "<userinput>armel</userinput>, <userinput>hppa</userinput>, "
-#| "<userinput>i386</userinput>, <userinput>ia64</userinput>, "
-#| "<userinput>m68k</userinput>, <userinput>mips</userinput>, "
-#| "<userinput>mipsel</userinput>, <userinput>powerpc</userinput>, "
-#| "<userinput>s390</userinput>, or <userinput>sparc</userinput>."
msgid ""
"Substitute one of the following for <replaceable>ARCH</replaceable> in the "
"<command>debootstrap</command> command: <userinput>amd64</userinput>, "
@@ -1099,7 +1090,14 @@ msgid ""
"<userinput>mipsel</userinput>, <userinput>powerpc</userinput>, "
"<userinput>s390</userinput>, <userinput>s390x</userinput>, or "
"<userinput>sparc</userinput>."
-msgstr "用下面其中一个架构替换 <command>debootstrap</command> 命令中的 <replaceable>ARCH</replaceable> :<userinput>amd64</userinput>, <userinput>armel</userinput>, <userinput>armhf</userinput>, <userinput>i386</userinput>, <userinput>ia64</userinput>, <userinput>mips</userinput>, <userinput>mipsel</userinput>, <userinput>powerpc</userinput>, <userinput>s390</userinput>, <userinput>s390x</userinput>, or <userinput>sparc</userinput>。"
+msgstr ""
+"用下面其中一个架构替换 <command>debootstrap</command> 命令中的 "
+"<replaceable>ARCH</replaceable> :<userinput>amd64</userinput>, "
+"<userinput>armel</userinput>, <userinput>armhf</userinput>, <userinput>i386</"
+"userinput>, <userinput>ia64</userinput>, <userinput>mips</userinput>, "
+"<userinput>mipsel</userinput>, <userinput>powerpc</userinput>, "
+"<userinput>s390</userinput>, <userinput>s390x</userinput>, or "
+"<userinput>sparc</userinput>。"
#. Tag: screen
#: random-bits.xml:533
@@ -1746,7 +1744,9 @@ msgid ""
"In case you can login to the system via console, you can skip this section. "
"If the system should be accessible via the network later on, you need to "
"install SSH and set a password for root:"
-msgstr "如果您可以使用控制台访问系统,可以略过这一节。如果以后使用网络登录系统,您需要安装 SSH 并设置 root 密码:"
+msgstr ""
+"如果您可以使用控制台访问系统,可以略过这一节。如果以后使用网络登录系统,您需"
+"要安装 SSH 并设置 root 密码:"
#. Tag: screen
#: random-bits.xml:823
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 87732ed77..a388ff513 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -982,19 +982,14 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:636
#, 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."
-msgstr "将高亮显示部分移到您期望键盘选择,然后按下 &enterkey;。用箭头健移到高亮显示 &mdash; 它们位于所有国家键盘布局相同的地方,因此独立于键盘配置。"
+msgstr ""
+"将高亮显示部分移到您期望键盘选择,然后按下 &enterkey;。用箭头健移到高亮显示 "
+"&mdash; 它们位于所有国家键盘布局相同的地方,因此独立于键盘配置。"
#. Tag: title
#: using-d-i.xml:663
@@ -1103,16 +1098,6 @@ msgstr "自动网络配置"
#. Tag: para
#: using-d-i.xml:733
#, 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 "
"as far as possible. If the automatic configuration fails, that may be caused "
@@ -1124,7 +1109,13 @@ msgid ""
"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; 会尽力自动配置您的计算机网络。如果自动配置失败,会有多种因素造成,从没有插好网线到错误的自动配置环境都有。要了解更多的出错原因,请检查第四控制台上的信息。不管是什么情况,都会要求您再试一次,或者让您选择手动设置。有时用于网络自动配置的网络服务器响应比较慢,假如您确信都配置正确,可以简单地再重新进行一次自动配置。要是自动配置还是失败,您可以换成手动网络设置方式。"
+msgstr ""
+"默认情况下,&d-i; 会尽力自动配置您的计算机网络。如果自动配置失败,会有多种因"
+"素造成,从没有插好网线到错误的自动配置环境都有。要了解更多的出错原因,请检查"
+"第四控制台上的信息。不管是什么情况,都会要求您再试一次,或者让您选择手动设"
+"置。有时用于网络自动配置的网络服务器响应比较慢,假如您确信都配置正确,可以简"
+"单地再重新进行一次自动配置。要是自动配置还是失败,您可以换成手动网络设置方"
+"式。"
#. Tag: title
#: using-d-i.xml:752
@@ -1135,16 +1126,6 @@ msgstr "手动网络配置"
#. Tag: para
#: using-d-i.xml:753
#, 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>, "
@@ -1156,7 +1137,16 @@ msgid ""
"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)</computeroutput>、<computeroutput>网关(Gateway)</computeroutput>、<computeroutput>域名服务器地址(Name server addresses)</computeroutput>,以及<computeroutput>主机名(Hostname)</computeroutput>。另外,如果您有无线网卡,会被要求提供<computeroutput>Wireless ESSID</computeroutput> (<quote>无线网络名</quote>) 和 <computeroutput> WEP 密钥(WEP key)</computeroutput> 或者 <computeroutput>WPA/WPA2 密码(WPA/WPA2 passphrase)</computeroutput>。填写答案 <xref linkend=\"needed-info\"/>。"
+msgstr ""
+"手动配置网络会依次询问一些网络问题,特别是 <computeroutput>IP 地址(IP "
+"address)</computeroutput>、<computeroutput>网络掩码(Netmask)</"
+"computeroutput>、<computeroutput>网关(Gateway)</computeroutput>、"
+"<computeroutput>域名服务器地址(Name server addresses)</computeroutput>,以及"
+"<computeroutput>主机名(Hostname)</computeroutput>。另外,如果您有无线网卡,会"
+"被要求提供<computeroutput>Wireless ESSID</computeroutput> (<quote>无线网络名"
+"</quote>) 和 <computeroutput> WEP 密钥(WEP key)</computeroutput> 或者 "
+"<computeroutput>WPA/WPA2 密码(WPA/WPA2 passphrase)</computeroutput>。填写答"
+"案 <xref linkend=\"needed-info\"/>。"
#. Tag: para
#: using-d-i.xml:769
@@ -1190,7 +1180,10 @@ 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 "从 &debian-gnu; 7.0 (<quote>Wheezy</quote>) 以后,&d-i; 将同时支持 IPv6 和 <quote>经典的</quote> IPv4。IPv4 和 IPv6 的各种组合(仅 IPv4、仅 IPv6 和双栈(dual-stack)配置)都将支持。"
+msgstr ""
+"从 &debian-gnu; 7.0 (<quote>Wheezy</quote>) 以后,&d-i; 将同时支持 IPv6 和 "
+"<quote>经典的</quote> IPv4。IPv4 和 IPv6 的各种组合(仅 IPv4、仅 IPv6 和双栈"
+"(dual-stack)配置)都将支持。"
#. Tag: para
#: using-d-i.xml:791
@@ -1202,7 +1195,11 @@ msgid ""
"(RDNSS) assignment), stateful autoconfiguration via DHCPv6 and mixed "
"stateless/stateful autoconfiguration (address configuration via NDP, "
"additional parameters via DHCPv6)."
-msgstr "IPv4 通过 DHCP (Dynamic Host Configuration Protocol)进行自动配置。自动配置 IPv6 使用 NDP (Neighbor Discovery Protocol,包括 recursive DNS server (RDNSS) 设置) 支持无状态自动配置,有状态自动配置通过 DHCPv6 和混合自动配置(地址配置使用 NDP,额外参数使用 DHCPv6)。"
+msgstr ""
+"IPv4 通过 DHCP (Dynamic Host Configuration Protocol)进行自动配置。自动配置 "
+"IPv6 使用 NDP (Neighbor Discovery Protocol,包括 recursive DNS server "
+"(RDNSS) 设置) 支持无状态自动配置,有状态自动配置通过 DHCPv6 和混合自动配置(地"
+"址配置使用 NDP,额外参数使用 DHCPv6)。"
#. Tag: title
#: using-d-i.xml:837
@@ -3692,7 +3689,6 @@ msgstr ""
#. Tag: title
#: using-d-i.xml:2488
#, no-c-format
-#| msgid "Using a network mirror"
msgid "Choosing a network mirror"
msgstr "选择网络镜像"
@@ -3705,7 +3701,10 @@ msgid ""
"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 "如果在安装过程中选择网络镜像(CD/DVD 安装时为选项,netboot 为必须),根据安装步骤签名进行的国家选择,您将看到根据就近地理位置(也希望速度最快)列出的网络镜像列表。通常选择默认的就行。"
+msgstr ""
+"如果在安装过程中选择网络镜像(CD/DVD 安装时为选项,netboot 为必须),根据安装步"
+"骤签名进行的国家选择,您将看到根据就近地理位置(也希望速度最快)列出的网络镜像"
+"列表。通常选择默认的就行。"
#. Tag: para
#: using-d-i.xml:2497
@@ -3722,7 +3721,14 @@ msgid ""
"<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 "如果您的计算机处于仅有 IPv6 的网络(大多数用户不会遇到这种情况),使用所属国家默认的镜像可能无法正常工作。列出的网络镜像全部可以使用 IPv4 访问,但只有其中的某些可以通过 IPv6 访问。由于个别镜像连接的状况会不断更新,此信息可能在安装程序里面失效。如果还没有 IPv6 连接到所在国家的默认镜像,您可以试试其他的镜像,或者选择<quote>手动输入信息</quote>选项。您可以指定 <quote>ftp.ipv6.debian.org</quote> 作为镜像名,这是 IPv6 上的一个镜像别名,它有可能不是速度最快的哪个。"
+msgstr ""
+"如果您的计算机处于仅有 IPv6 的网络(大多数用户不会遇到这种情况),使用所属国家"
+"默认的镜像可能无法正常工作。列出的网络镜像全部可以使用 IPv4 访问,但只有其中"
+"的某些可以通过 IPv6 访问。由于个别镜像连接的状况会不断更新,此信息可能在安装"
+"程序里面失效。如果还没有 IPv6 连接到所在国家的默认镜像,您可以试试其他的镜"
+"像,或者选择<quote>手动输入信息</quote>选项。您可以指定 <quote>ftp.ipv6."
+"debian.org</quote> 作为镜像名,这是 IPv6 上的一个镜像别名,它有可能不是速度最"
+"快的哪个。"
#. Tag: para
#: using-d-i.xml:2511
@@ -3734,7 +3740,11 @@ msgid ""
"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 "另一种选择是手动选取镜像,指定 <quote>http.debian.net</quote> 作为您的镜像服务器。 <quote>http.debian.net</quote> 并不是一个物理镜像,而是一个重定向服务,也就是它能根据您的网络路径自动转换成一个真实的镜像服务器。它还能考虑到您连接所采用的协议,比如使用 IPv6,它将自动将您引到最近的 IPv6 镜像服务器。"
+msgstr ""
+"另一种选择是手动选取镜像,指定 <quote>http.debian.net</quote> 作为您的镜像服"
+"务器。 <quote>http.debian.net</quote> 并不是一个物理镜像,而是一个重定向服"
+"务,也就是它能根据您的网络路径自动转换成一个真实的镜像服务器。它还能考虑到您"
+"连接所采用的协议,比如使用 IPv6,它将自动将您引到最近的 IPv6 镜像服务器。"
#. Tag: title
#: using-d-i.xml:2530
@@ -3838,17 +3848,15 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:2597
#, 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 (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 映象(netinst 和 DVD)可以从图形引导菜单中选择所需的桌面环境。选择主菜单里面的 <quote>Advanced options</quote>,再找到 <quote>Alternative desktop environments</quote>。"
+msgstr ""
+"一些 CD 映象(netinst 和 DVD)可以从图形引导菜单中选择所需的桌面环境。选择主菜"
+"单里面的 <quote>Advanced options</quote>,再找到 <quote>Alternative desktop "
+"environments</quote>。"
#. Tag: para
#: using-d-i.xml:2604
diff --git a/po/zh_CN/welcome.po b/po/zh_CN/welcome.po
index 424021501..c407e2a30 100644
--- a/po/zh_CN/welcome.po
+++ b/po/zh_CN/welcome.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-09-18 17:24+0000\n"
+"POT-Creation-Date: 2012-10-24 19:53+0000\n"
"PO-Revision-Date: 2012-11-26 15:07+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -703,15 +703,6 @@ msgstr "讲述的是如何启动安装系统。本章还将讨论如何解决这
#. Tag: para
#: welcome.xml:484
#, no-c-format
-#| msgid ""
-#| "Perform the actual installation according to <xref linkend=\"d-i-intro\"/"
-#| ">. This involves choosing your language, configuring peripheral driver "
-#| "modules, configuring your network connection, so that remaining "
-#| "installation files can be obtained directly from a &debian; server (if "
-#| "you are not installing from a CD), partitioning your hard drives and "
-#| "installation of a base system, then selection and installation of tasks. "
-#| "(Some background about setting up the partitions for your &debian; system "
-#| "is explained in <xref linkend=\"partitioning\"/>.)"
msgid ""
"Perform the actual installation according to <xref linkend=\"d-i-intro\"/>. "
"This involves choosing your language, configuring peripheral driver modules, "
@@ -721,7 +712,11 @@ msgid ""
"system, then selection and installation of tasks. (Some background about "
"setting up the partitions for your &debian; system is explained in <xref "
"linkend=\"partitioning\"/>.)"
-msgstr "执行真正的安装是在 <xref linkend=\"d-i-intro\"/>。其中涉及选择语言、设置周边驱动模块、设置网络连接以从 &debian; 服务器上获得后续安装文件(如果您不是采用光盘方式安装),给硬盘分区和安装基本系统。(有关如何为 &debian; 系统建立分区的背景知识位于 <xref linkend=\"partitioning\"/>。)"
+msgstr ""
+"执行真正的安装是在 <xref linkend=\"d-i-intro\"/>。其中涉及选择语言、设置周边"
+"驱动模块、设置网络连接以从 &debian; 服务器上获得后续安装文件(如果您不是采用光"
+"盘方式安装),给硬盘分区和安装基本系统。(有关如何为 &debian; 系统建立分区的背"
+"景知识位于 <xref linkend=\"partitioning\"/>。)"
#. Tag: para
#: welcome.xml:497
@@ -816,14 +811,6 @@ msgstr ""
#. Tag: para
#: welcome.xml:566
#, no-c-format
-#| msgid ""
-#| "Calling software <emphasis>free</emphasis> doesn't mean that the software "
-#| "isn't copyrighted, and it doesn't mean that CDs containing that software "
-#| "must be distributed at no charge. Free software, in part, means that the "
-#| "licenses of individual programs do not require you to pay for the "
-#| "privilege of distributing or using those programs. Free software also "
-#| "means that not only may anyone extend, adapt, and modify the software, "
-#| "but that they may distribute the results of their work as well."
msgid ""
"Calling software <emphasis>free</emphasis> doesn't mean that the software "
"isn't copyrighted, and it doesn't mean that CDs/DVDs containing that "
@@ -832,20 +819,15 @@ msgid ""
"privilege of distributing or using those programs. Free software also means "
"that not only may anyone extend, adapt, and modify the software, but that "
"they may distribute the results of their work as well."
-msgstr "称软件为<emphasis>自由</emphasis>并不意味着该软件没有版权,也不是指包含该软件的 CD/DVD 必须免费分派。自由软件,某种程度上意味着您不须为分发和使用这些程序付费。自由软件还是指任何人可以扩展、改写、修改该软件,并且他们工作的成果也这样发布。"
+msgstr ""
+"称软件为<emphasis>自由</emphasis>并不意味着该软件没有版权,也不是指包含该软件"
+"的 CD/DVD 必须免费分派。自由软件,某种程度上意味着您不须为分发和使用这些程序"
+"付费。自由软件还是指任何人可以扩展、改写、修改该软件,并且他们工作的成果也这"
+"样发布。"
#. Tag: para
#: welcome.xml:577
#, no-c-format
-#| msgid ""
-#| "The &debian; project, as a pragmatic concession to its users, does make "
-#| "some packages available that do not meet our criteria for being free. "
-#| "These packages are not part of the official distribution, however, and "
-#| "are only available from the <userinput>contrib</userinput> or "
-#| "<userinput>non-free</userinput> areas of &debian; mirrors or on third-"
-#| "party CD-ROMs; see the <ulink url=\"&url-debian-faq;\">Debian FAQ</"
-#| "ulink>, under <quote>The Debian FTP archives</quote>, for more "
-#| "information about the layout and contents of the archives."
msgid ""
"The &debian; project, as a pragmatic concession to its users, does make some "
"packages available that do not meet our criteria for being free. These "
@@ -855,7 +837,12 @@ msgid ""
"<ulink url=\"&url-debian-faq;\">Debian FAQ</ulink>, under <quote>The Debian "
"FTP archives</quote>, for more information about the layout and contents of "
"the archives."
-msgstr "注意,&debian; 计划因为考虑用户实用性,也有不符合我们自由规则的软件包存在。这些软件包不属于官方发行版,只存在于 <userinput>contrib</userinput> 或 <userinput>non-free</userinput> &debian; 镜像区域或者第三方的 CD/DVD-ROM 中,请参阅 <ulink url=\"&url-debian-faq;\">Debian FAQ</ulink> 的 <quote>The Debian FTP archives</quote> 章节以了解档案布局和内容的更多信息。"
+msgstr ""
+"注意,&debian; 计划因为考虑用户实用性,也有不符合我们自由规则的软件包存在。这"
+"些软件包不属于官方发行版,只存在于 <userinput>contrib</userinput> 或 "
+"<userinput>non-free</userinput> &debian; 镜像区域或者第三方的 CD/DVD-ROM 中,"
+"请参阅 <ulink url=\"&url-debian-faq;\">Debian FAQ</ulink> 的 <quote>The "
+"Debian FTP archives</quote> 章节以了解档案布局和内容的更多信息。"
#. Tag: para
#: welcome.xml:591