summaryrefslogtreecommitdiff
path: root/po/zh_CN
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN')
-rw-r--r--po/zh_CN/boot-installer.po444
-rw-r--r--po/zh_CN/hardware.po483
-rw-r--r--po/zh_CN/install-methods.po380
-rw-r--r--po/zh_CN/installation-howto.po13
-rw-r--r--po/zh_CN/post-install.po208
-rw-r--r--po/zh_CN/preparing.po41
-rw-r--r--po/zh_CN/preseed.po204
-rw-r--r--po/zh_CN/random-bits.po108
-rw-r--r--po/zh_CN/using-d-i.po99
9 files changed, 1085 insertions, 895 deletions
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 197e09f71..41a017b7a 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2015-05-07 17:01+0000\n"
+"POT-Creation-Date: 2016-04-08 20:25+0000\n"
"PO-Revision-Date: 2015-03-21 18:13+0100\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1164,8 +1164,8 @@ msgstr ""
msgid ""
"Installer boot menu\n"
"\n"
-"Install\n"
"Graphical install\n"
+"Install\n"
"Advanced options >\n"
"Help\n"
"Install with speech synthesis"
@@ -1202,8 +1202,8 @@ msgid ""
"For a normal installation, select either the <quote>Graphical install</"
"quote> or the <quote>Install</quote> entry &mdash; using either the arrow "
"keys on your keyboard or by typing the first (highlighted) letter &mdash; "
-"and press &enterkey; to boot the installer. The <quote>Install</quote> entry "
-"is already selected by default."
+"and press &enterkey; to boot the installer. The <quote>Graphical install</"
+"quote> entry is already selected by default."
msgstr ""
"普通安装时,选择 <quote>Install</quote> 或 <quote>Graphical install</quote> "
"入口 &mdash; 可以使用键盘方向键或者键入(高亮的)首字母,默认 <quote>Install</"
@@ -2013,10 +2013,10 @@ msgid ""
"To configure the client to support TFTP booting, start by booting to EFI and "
"entering the <guimenu>Boot Option Maintenance Menu</guimenu>. <itemizedlist> "
"<listitem><para> Add a boot option. </para></listitem> <listitem><para> You "
-"should see one or more lines with the text <guimenuitem>Load File [Acpi"
-"()/.../Mac()]</guimenuitem>. If more than one of these entries exist, choose "
-"the one containing the MAC address of the interface from which you'll be "
-"booting. Use the arrow keys to highlight your choice, then press enter. </"
+"should see one or more lines with the text <guimenuitem>Load File "
+"[Acpi()/.../Mac()]</guimenuitem>. If more than one of these entries exist, "
+"choose the one containing the MAC address of the interface from which you'll "
+"be booting. Use the arrow keys to highlight your choice, then press enter. </"
"para></listitem> <listitem><para> Name the entry <userinput>Netboot</"
"userinput> or something similar, save, and exit back to the boot options "
"menu. </para></listitem> </itemizedlist> You should see the new boot option "
@@ -2077,7 +2077,7 @@ msgstr ""
# index.docbook:1943, index.docbook:2477
#. Tag: title
-#: boot-installer.xml:1615 boot-installer.xml:2406
+#: boot-installer.xml:1615 boot-installer.xml:2421
#, no-c-format
msgid "Boot Parameters"
msgstr "引导参数"
@@ -2756,25 +2756,45 @@ msgstr "串口盲文点显器"
#. Tag: para
#: boot-installer.xml:2274
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Serial braille displays cannot safely be automatically detected (since "
+#| "that may damage some of them). You thus need to append the "
+#| "<userinput>brltty=<replaceable>driver</replaceable>,<replaceable>port</"
+#| "replaceable>,<replaceable>table</replaceable></userinput> boot parameter "
+#| "to tell <classname>brltty</classname> which driver it should use. "
+#| "<replaceable>driver</replaceable> should be replaced by the two-letter "
+#| "driver code for your terminal (see the <ulink url=\"&url-brltty-manual;"
+#| "\">BRLTTY manual</ulink>). <replaceable>port</replaceable> should be "
+#| "replaced by the name of the serial port the display is connected to, "
+#| "<userinput>ttyS0</userinput> is the default, <userinput>ttyUSB0</"
+#| "userinput> can be typically used when using a serial-to-USB converter. "
+#| "<replaceable>table</replaceable> is the name of the braille table to be "
+#| "used (see the <ulink url=\"&url-brltty-manual;\">BRLTTY manual</ulink>); "
+#| "the English table is the default. Note that the table can be changed "
+#| "later by entering the preference menu. Documentation on key bindings for "
+#| "braille devices is available on the <ulink url=\"&url-brltty-driver-help;"
+#| "\"><classname>brltty</classname> website</ulink>."
msgid ""
"Serial braille displays cannot safely be automatically detected (since that "
"may damage some of them). You thus need to append the "
"<userinput>brltty=<replaceable>driver</replaceable>,<replaceable>port</"
-"replaceable>,<replaceable>table</replaceable></userinput> boot parameter to "
-"tell <classname>brltty</classname> which driver it should use. "
-"<replaceable>driver</replaceable> should be replaced by the two-letter "
-"driver code for your terminal (see the <ulink url=\"&url-brltty-manual;"
-"\">BRLTTY manual</ulink>). <replaceable>port</replaceable> should be "
-"replaced by the name of the serial port the display is connected to, "
-"<userinput>ttyS0</userinput> is the default, <userinput>ttyUSB0</userinput> "
-"can be typically used when using a serial-to-USB converter. "
-"<replaceable>table</replaceable> is the name of the braille table to be used "
-"(see the <ulink url=\"&url-brltty-manual;\">BRLTTY manual</ulink>); the "
-"English table is the default. Note that the table can be changed later by "
-"entering the preference menu. Documentation on key bindings for braille "
-"devices is available on the <ulink url=\"&url-brltty-driver-help;"
-"\"><classname>brltty</classname> website</ulink>."
+"replaceable></userinput> boot parameter to tell <classname>brltty</"
+"classname> which driver and port it should use. <replaceable>driver</"
+"replaceable> should be replaced by the two-letter driver code for your "
+"terminal (see the <ulink url=\"&url-brltty-manual;\">BRLTTY manual</ulink>). "
+"<replaceable>port</replaceable> should be replaced by the name of the serial "
+"port the display is connected to, <userinput>ttyS0</userinput> is the "
+"default, <userinput>ttyUSB0</userinput> can be typically used when using a "
+"serial-to-USB converter. A third parameter can be provided, to choose the "
+"name of the braille table to be used (see the <ulink url=\"&url-brltty-"
+"manual;\">BRLTTY manual</ulink>); the English table is the default. Note "
+"that the table can be changed later by entering the preference menu. A "
+"fourth parameter can be provided to pass parameters to the braille driver, "
+"such as <userinput>protocol=foo</userinput> which is needed for some rare "
+"models. Documentation on key bindings for braille devices is available on "
+"the <ulink url=\"&url-brltty-driver-help;\"><classname>brltty</classname> "
+"website</ulink>."
msgstr ""
"系统无法安全地检测到串口盲文点显器(因为这可能会导致某些损坏)。您需要添加 "
"<userinput>brltty=<replaceable>driver</replaceable>,<replaceable>port</"
@@ -2790,13 +2810,13 @@ msgstr ""
"\"><classname>brltty</classname> website</ulink> 找到。"
#. Tag: title
-#: boot-installer.xml:2297 boot-installer.xml:3306
+#: boot-installer.xml:2301 boot-installer.xml:3321
#, no-c-format
msgid "Software Speech Synthesis"
msgstr "软件语音合成(Software Speech Synthesis)"
#. Tag: para
-#: boot-installer.xml:2298
+#: boot-installer.xml:2302
#, fuzzy, no-c-format
#| msgid ""
#| "Support for hardware speech synthesis devices is available only alongside "
@@ -2814,7 +2834,7 @@ msgstr ""
"择 <quote>Graphical install</quote> 项。"
#. Tag: para
-#: boot-installer.xml:2307
+#: boot-installer.xml:2311
#, fuzzy, no-c-format
#| msgid ""
#| "Support for software speech synthesis can be activated by selecting it in "
@@ -2832,7 +2852,7 @@ msgstr ""
"<classname>espeak</classname>)。"
#. Tag: para
-#: boot-installer.xml:2313
+#: boot-installer.xml:2317
#, no-c-format
msgid ""
"The default speech rate is quite slow. To make it faster, press "
@@ -2846,13 +2866,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: boot-installer.xml:2332
+#: boot-installer.xml:2336
#, no-c-format
msgid "Hardware Speech Synthesis"
msgstr "硬件语音合成(Hardware Speech Synthesis)"
#. Tag: para
-#: boot-installer.xml:2333
+#: boot-installer.xml:2337
#, fuzzy, no-c-format
#| msgid ""
#| "Support for hardware speech synthesis devices is available only alongside "
@@ -2868,7 +2888,7 @@ msgstr ""
"择 <quote>Graphical install</quote> 项。"
#. Tag: para
-#: boot-installer.xml:2340
+#: boot-installer.xml:2344
#, no-c-format
msgid ""
"Hardware speech synthesis devices cannot be automatically detected. You thus "
@@ -2888,13 +2908,13 @@ msgstr ""
"音合成设备的支持也会被自动安装到最终系统里面。"
#. Tag: title
-#: boot-installer.xml:2355
+#: boot-installer.xml:2359
#, no-c-format
msgid "Board Devices"
msgstr "板卡设备"
#. Tag: para
-#: boot-installer.xml:2356
+#: boot-installer.xml:2360
#, no-c-format
msgid ""
"Some accessibility devices are actual boards that are plugged inside the "
@@ -2909,7 +2929,7 @@ msgstr ""
"数量。"
#. Tag: para
-#: boot-installer.xml:2364
+#: boot-installer.xml:2368
#, no-c-format
msgid ""
"If desired a textual version of the bootloader can be activated before "
@@ -2919,13 +2939,13 @@ msgstr ""
"userinput> &enterkey;。"
#. Tag: title
-#: boot-installer.xml:2372
+#: boot-installer.xml:2376
#, no-c-format
msgid "High-Contrast Theme"
msgstr "高亮主题"
#. Tag: para
-#: boot-installer.xml:2373
+#: boot-installer.xml:2377
#, fuzzy, no-c-format
#| msgid ""
#| "For users with low vision, the installer can use a high-contrast theme "
@@ -2940,13 +2960,29 @@ msgstr ""
"<userinput>theme=dark</userinput> 引导参数即可。"
#. Tag: title
-#: boot-installer.xml:2382
+#: boot-installer.xml:2386
+#, no-c-format
+msgid "Zoom"
+msgstr ""
+
+#. Tag: para
+#: boot-installer.xml:2387
+#, no-c-format
+msgid ""
+"For users with low vision, the graphical installer has a very basic zoom "
+"support: the <keycombo><keycap>Control</keycap> <keycap>+</keycap></"
+"keycombo> and <keycombo><keycap>Control</keycap> <keycap>-</keycap></"
+"keycombo> shortcuts increase and decrease the font size."
+msgstr ""
+
+#. Tag: title
+#: boot-installer.xml:2397
#, no-c-format
msgid "Preseeding"
msgstr "预置"
#. Tag: para
-#: boot-installer.xml:2383
+#: boot-installer.xml:2398
#, no-c-format
msgid ""
"Alternatively, &debian; can be installed completely automatically by using "
@@ -2956,13 +2992,13 @@ msgstr ""
"\"appendix-preseed\"/>。"
#. Tag: title
-#: boot-installer.xml:2391
+#: boot-installer.xml:2406
#, no-c-format
msgid "Accessibility of the installed system"
msgstr ""
#. Tag: para
-#: boot-installer.xml:2392
+#: boot-installer.xml:2407
#, no-c-format
msgid ""
"Documentation on accessibility of the installed system is available on the "
@@ -2971,7 +3007,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-installer.xml:2407
+#: boot-installer.xml:2422
#, no-c-format
msgid ""
"Boot parameters are Linux kernel parameters which are generally used to make "
@@ -2984,7 +3020,7 @@ msgstr ""
"要给内核一点小小的帮助。"
#. Tag: para
-#: boot-installer.xml:2414
+#: boot-installer.xml:2429
#, no-c-format
msgid ""
"If this is the first time you're booting the system, try the default boot "
@@ -2997,7 +3033,7 @@ msgstr ""
"的硬件特定参数。"
#. Tag: para
-#: boot-installer.xml:2421
+#: boot-installer.xml:2436
#, no-c-format
msgid ""
"Information on many boot parameters can be found in the <ulink url=\"http://"
@@ -3012,13 +3048,13 @@ msgstr ""
"linkend=\"boot-troubleshooting\"/>。"
#. Tag: title
-#: boot-installer.xml:2433
+#: boot-installer.xml:2448
#, no-c-format
msgid "Boot console"
msgstr ""
#. Tag: para
-#: boot-installer.xml:2435
+#: boot-installer.xml:2450
#, no-c-format
msgid ""
"If you are booting with a serial console, generally the kernel will "
@@ -3035,7 +3071,7 @@ msgstr ""
"是串口设备,通常是 <filename>ttyS0</filename> 形式。"
#. Tag: para
-#: boot-installer.xml:2447
+#: boot-installer.xml:2462
#, no-c-format
msgid ""
"You may need to specify parameters for the serial port, such as speed and "
@@ -3046,7 +3082,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: boot-installer.xml:2455
+#: boot-installer.xml:2470
#, no-c-format
msgid ""
"In order to ensure the terminal type used by the installer matches your "
@@ -3071,7 +3107,7 @@ msgstr ""
"literal> 终端类型,而它又非常接近于 <literal>vt102</literal> 类型。"
#. Tag: para
-#: boot-installer.xml:2471
+#: boot-installer.xml:2486
#, no-c-format
msgid ""
"For &arch-title; the serial devices are <filename>ttya</filename> or "
@@ -3084,13 +3120,13 @@ msgstr ""
"<envar>output-device</envar> OpenPROM 变量至 <filename>ttya</filename>。"
#. Tag: title
-#: boot-installer.xml:2483
+#: boot-installer.xml:2498
#, no-c-format
msgid "&debian; Installer Parameters"
msgstr "&debian; 安装程序的参数"
#. Tag: para
-#: boot-installer.xml:2484
+#: boot-installer.xml:2499
#, no-c-format
msgid ""
"The installation system recognizes a few additional boot "
@@ -3103,7 +3139,7 @@ msgstr ""
"para> </footnote>,它们很有用。"
#. Tag: para
-#: boot-installer.xml:2497
+#: boot-installer.xml:2512
#, no-c-format
msgid ""
"A number of parameters have a <quote>short form</quote> that helps avoid the "
@@ -3117,19 +3153,19 @@ msgstr ""
"用简写。"
#. Tag: term
-#: boot-installer.xml:2509
+#: boot-installer.xml:2524
#, no-c-format
msgid "debconf/priority (priority)"
msgstr "debconf/priority (priority)"
#. Tag: para
-#: boot-installer.xml:2510
+#: boot-installer.xml:2525
#, no-c-format
msgid "This parameter sets the lowest priority of messages to be displayed."
msgstr "这些参数设置将设置显示的信息为最低的级别。"
#. Tag: para
-#: boot-installer.xml:2514
+#: boot-installer.xml:2529
#, no-c-format
msgid ""
"The default installation uses <userinput>priority=high</userinput>. This "
@@ -3142,7 +3178,7 @@ msgstr ""
"将按照要求调整优先级别。"
#. Tag: para
-#: boot-installer.xml:2521
+#: boot-installer.xml:2536
#, no-c-format
msgid ""
"If you add <userinput>priority=medium</userinput> as boot parameter, you "
@@ -3160,13 +3196,13 @@ msgstr ""
"且尝试正确无误地执行各项事宜。"
#. Tag: term
-#: boot-installer.xml:2535
+#: boot-installer.xml:2550
#, no-c-format
msgid "DEBIAN_FRONTEND"
msgstr "DEBIAN_FRONTEND"
#. Tag: para
-#: boot-installer.xml:2536
+#: boot-installer.xml:2551
#, no-c-format
msgid ""
"This boot parameter controls the type of user interface used for the "
@@ -3199,13 +3235,13 @@ msgstr ""
"所支持的平台上使用 <userinput>gtk</userinput> 前端。"
#. Tag: term
-#: boot-installer.xml:2567
+#: boot-installer.xml:2582
#, no-c-format
msgid "BOOT_DEBUG"
msgstr "BOOT_DEBUG"
#. Tag: para
-#: boot-installer.xml:2568
+#: boot-installer.xml:2583
#, no-c-format
msgid ""
"Setting this boot parameter to 2 will cause the installer's boot process to "
@@ -3217,49 +3253,49 @@ msgstr ""
"debug shell。(退出 shell 以后会继续引导过程。)"
#. Tag: userinput
-#: boot-installer.xml:2577
+#: boot-installer.xml:2592
#, no-c-format
msgid "BOOT_DEBUG=0"
msgstr "BOOT_DEBUG=0"
#. Tag: para
-#: boot-installer.xml:2578
+#: boot-installer.xml:2593
#, no-c-format
msgid "This is the default."
msgstr "此为默认。"
#. Tag: userinput
-#: boot-installer.xml:2582
+#: boot-installer.xml:2597
#, no-c-format
msgid "BOOT_DEBUG=1"
msgstr "BOOT_DEBUG=1"
#. Tag: para
-#: boot-installer.xml:2583
+#: boot-installer.xml:2598
#, no-c-format
msgid "More verbose than usual."
msgstr "更多的信息。"
#. Tag: userinput
-#: boot-installer.xml:2587
+#: boot-installer.xml:2602
#, no-c-format
msgid "BOOT_DEBUG=2"
msgstr "BOOT_DEBUG=2"
#. Tag: para
-#: boot-installer.xml:2588
+#: boot-installer.xml:2603
#, no-c-format
msgid "Lots of debugging information."
msgstr "大量的调试信息。"
#. Tag: userinput
-#: boot-installer.xml:2592
+#: boot-installer.xml:2607
#, no-c-format
msgid "BOOT_DEBUG=3"
msgstr "BOOT_DEBUG=3"
#. Tag: para
-#: boot-installer.xml:2593
+#: boot-installer.xml:2608
#, no-c-format
msgid ""
"Shells are run at various points in the boot process to allow detailed "
@@ -3269,13 +3305,13 @@ msgstr ""
"Shell 将继续引导过程。"
#. Tag: term
-#: boot-installer.xml:2607
+#: boot-installer.xml:2622
#, no-c-format
msgid "INSTALL_MEDIA_DEV"
msgstr "INSTALL_MEDIA_DEV"
#. Tag: para
-#: boot-installer.xml:2608
+#: boot-installer.xml:2623
#, no-c-format
msgid ""
"The value of the parameter is the path to the device to load the &debian; "
@@ -3286,7 +3322,7 @@ msgstr ""
"<userinput>INSTALL_MEDIA_DEV=/dev/floppy/0</userinput>"
#. Tag: para
-#: boot-installer.xml:2614
+#: boot-installer.xml:2629
#, no-c-format
msgid ""
"The boot floppy, which normally scans all floppies it can to find the root "
@@ -3295,19 +3331,19 @@ msgstr ""
"引导软盘通常会扫描所有的软盘来找到根软盘,可以通过此参数设置只查找一个设备。"
#. Tag: term
-#: boot-installer.xml:2625
+#: boot-installer.xml:2640
#, no-c-format
msgid "log_host"
msgstr "log_host"
#. Tag: term
-#: boot-installer.xml:2626
+#: boot-installer.xml:2641
#, no-c-format
msgid "log_port"
msgstr "log_port"
#. Tag: para
-#: boot-installer.xml:2627
+#: boot-installer.xml:2642
#, no-c-format
msgid ""
"Causes the installer to send log messages to a remote syslog on the "
@@ -3318,13 +3354,13 @@ msgstr ""
"定,默认端口是 syslog 标准端口 514。"
#. Tag: term
-#: boot-installer.xml:2638
+#: boot-installer.xml:2653
#, no-c-format
msgid "lowmem"
msgstr "lowmem"
#. Tag: para
-#: boot-installer.xml:2639
+#: boot-installer.xml:2654
#, no-c-format
msgid ""
"Can be used to force the installer to a lowmem level higher than the one the "
@@ -3335,13 +3371,13 @@ msgstr ""
"和 2。参阅 <xref linkend=\"lowmem\"/>。"
#. Tag: term
-#: boot-installer.xml:2649
+#: boot-installer.xml:2664
#, no-c-format
msgid "noshell"
msgstr "noshell"
#. Tag: para
-#: boot-installer.xml:2650
+#: boot-installer.xml:2665
#, no-c-format
msgid ""
"Prevents the installer from offering interactive shells on tty2 and tty3. "
@@ -3351,13 +3387,13 @@ msgstr ""
"处。"
#. Tag: term
-#: boot-installer.xml:2659
+#: boot-installer.xml:2674
#, no-c-format
msgid "debian-installer/framebuffer (fb)"
msgstr "debian-installer/framebuffer (fb)"
#. Tag: para
-#: boot-installer.xml:2660
+#: boot-installer.xml:2675
#, no-c-format
msgid ""
"Some architectures use the kernel framebuffer to offer installation in a "
@@ -3373,13 +3409,13 @@ msgstr ""
"bogl 的相关错误信息、一个空白的屏幕,或者在开始安装几分钟后停止。"
#. Tag: para
-#: boot-installer.xml:2669
+#: boot-installer.xml:2684
#, no-c-format
msgid "Such problems have been reported on hppa."
msgstr "在 hppa 上面报告过存在这些问题。"
#. Tag: para
-#: boot-installer.xml:2673
+#: boot-installer.xml:2688
#, no-c-format
msgid ""
"Because of display problems on some systems, framebuffer support is "
@@ -3396,13 +3432,13 @@ msgstr ""
"<userinput>fb=true</userinput>。"
#. Tag: term
-#: boot-installer.xml:2687
+#: boot-installer.xml:2702
#, no-c-format
msgid "debian-installer/theme (theme)"
msgstr "debian-installer/theme (theme)"
#. Tag: para
-#: boot-installer.xml:2688
+#: boot-installer.xml:2703
#, no-c-format
msgid ""
"A theme determines how the user interface of the installer looks (colors, "
@@ -3417,13 +3453,13 @@ msgstr ""
"<userinput>theme=<replaceable>dark</replaceable></userinput> 设置。"
#. Tag: term
-#: boot-installer.xml:2700 boot-installer.xml:2933
+#: boot-installer.xml:2715 boot-installer.xml:2948
#, no-c-format
msgid "netcfg/disable_autoconfig"
msgstr "netcfg/disable_autoconfig"
#. Tag: para
-#: boot-installer.xml:2701
+#: boot-installer.xml:2716
#, fuzzy, no-c-format
#| msgid ""
#| "By default, the &d-i; automatically probes for network configuration via "
@@ -3440,7 +3476,7 @@ msgstr ""
"视并且改变其获得的设定。您可以在 DHCP 检测失败的情况下手工配置网络。"
#. Tag: para
-#: boot-installer.xml:2708
+#: boot-installer.xml:2723
#, fuzzy, no-c-format
#| msgid ""
#| "If you have a DHCP server on your local network, but want to avoid it "
@@ -3459,13 +3495,13 @@ msgstr ""
"阻止通过 DHCP 配置网络,并手工输入信息。"
#. Tag: term
-#: boot-installer.xml:2719
+#: boot-installer.xml:2734
#, no-c-format
msgid "hw-detect/start_pcmcia"
msgstr "hw-detect/start_pcmcia"
#. Tag: para
-#: boot-installer.xml:2720
+#: boot-installer.xml:2735
#, no-c-format
msgid ""
"Set to <userinput>false</userinput> to prevent starting PCMCIA services, if "
@@ -3475,13 +3511,13 @@ msgstr ""
"携机会有这种现象。"
#. Tag: term
-#: boot-installer.xml:2730
+#: boot-installer.xml:2745
#, no-c-format
msgid "disk-detect/dmraid/enable (dmraid)"
msgstr "disk-detect/dmraid/enable (dmraid)"
#. Tag: para
-#: boot-installer.xml:2731
+#: boot-installer.xml:2746
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> to enable support for Serial ATA RAID "
@@ -3495,13 +3531,13 @@ msgstr ""
"ulink> 找到。"
#. Tag: term
-#: boot-installer.xml:2742
+#: boot-installer.xml:2757
#, no-c-format
msgid "preseed/url (url)"
msgstr "preseed/url (url)"
#. Tag: para
-#: boot-installer.xml:2743
+#: boot-installer.xml:2758
#, no-c-format
msgid ""
"Specify the url to a preconfiguration file to download and use for "
@@ -3511,13 +3547,13 @@ msgstr ""
"install\"/>。"
#. Tag: term
-#: boot-installer.xml:2752
+#: boot-installer.xml:2767
#, no-c-format
msgid "preseed/file (file)"
msgstr "preseed/file (file)"
#. Tag: para
-#: boot-installer.xml:2753
+#: boot-installer.xml:2768
#, no-c-format
msgid ""
"Specify the path to a preconfiguration file to load for automating the "
@@ -3527,13 +3563,13 @@ msgstr ""
">。"
#. Tag: term
-#: boot-installer.xml:2762
+#: boot-installer.xml:2777
#, no-c-format
msgid "preseed/interactive"
msgstr "preseed/interactive"
#. Tag: para
-#: boot-installer.xml:2763
+#: boot-installer.xml:2778
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> to display questions even if they have "
@@ -3547,13 +3583,13 @@ msgstr ""
"<xref linkend=\"preseed-seenflag\"/> 了解详细信息。"
#. Tag: term
-#: boot-installer.xml:2775
+#: boot-installer.xml:2790
#, no-c-format
msgid "auto-install/enable (auto)"
msgstr "auto-install/enable (auto)"
#. Tag: para
-#: boot-installer.xml:2776
+#: boot-installer.xml:2791
#, no-c-format
msgid ""
"Delay questions that are normally asked before preseeding is possible until "
@@ -3564,13 +3600,13 @@ msgstr ""
"auto\"/> 了解自动安装的详细信息。"
#. Tag: term
-#: boot-installer.xml:2787
+#: boot-installer.xml:2802
#, no-c-format
msgid "finish-install/keep-consoles"
msgstr "finish-install/keep-consoles"
#. Tag: para
-#: boot-installer.xml:2788
+#: boot-installer.xml:2803
#, no-c-format
msgid ""
"During installations from serial or management console, the regular virtual "
@@ -3581,13 +3617,13 @@ msgstr ""
"inittab</filename> 里已经关掉。将其改为 <userinput>true</userinput> 打开。"
#. Tag: term
-#: boot-installer.xml:2799
+#: boot-installer.xml:2814
#, no-c-format
msgid "cdrom-detect/eject"
msgstr "cdrom-detect/eject"
#. Tag: para
-#: boot-installer.xml:2800
+#: boot-installer.xml:2815
#, no-c-format
msgid ""
"By default, before rebooting, &d-i; automatically ejects the optical media "
@@ -3603,7 +3639,7 @@ msgstr ""
"新加载介质。"
#. Tag: para
-#: boot-installer.xml:2809
+#: boot-installer.xml:2824
#, no-c-format
msgid ""
"Set to <userinput>false</userinput> to disable automatic ejection, and be "
@@ -3614,13 +3650,13 @@ msgstr ""
"后,不会自动从光盘引导。"
#. Tag: term
-#: boot-installer.xml:2820
+#: boot-installer.xml:2835
#, no-c-format
msgid "base-installer/install-recommends (recommends)"
msgstr "base-installer/install-recommends (recommends)"
#. Tag: para
-#: boot-installer.xml:2821
+#: boot-installer.xml:2836
#, no-c-format
msgid ""
"By setting this option to <userinput>false</userinput>, the package "
@@ -3633,7 +3669,7 @@ msgstr ""
"<xref linkend=\"di-install-base\"/>。"
#. Tag: para
-#: boot-installer.xml:2828
+#: boot-installer.xml:2843
#, no-c-format
msgid ""
"Note that this option allows to have a leaner system, but can also result in "
@@ -3647,13 +3683,13 @@ msgstr ""
"非常有经验的用户来使用。"
#. Tag: term
-#: boot-installer.xml:2840
+#: boot-installer.xml:2855
#, no-c-format
msgid "debian-installer/allow_unauthenticated"
msgstr "debian-installer/allow_unauthenticated"
#. Tag: para
-#: boot-installer.xml:2841
+#: boot-installer.xml:2856
#, no-c-format
msgid ""
"By default the installer requires that repositories be authenticated using a "
@@ -3666,13 +3702,13 @@ msgstr ""
"emphasis>"
#. Tag: term
-#: boot-installer.xml:2852
+#: boot-installer.xml:2867
#, no-c-format
msgid "ramdisk_size"
msgstr "ramdisk_size"
#. Tag: para
-#: boot-installer.xml:2853
+#: boot-installer.xml:2868
#, no-c-format
msgid ""
"This parameter should already be set to a correct value where needed; set it "
@@ -3683,13 +3719,13 @@ msgstr ""
"置。该值的单位是 kB。"
#. Tag: term
-#: boot-installer.xml:2863
+#: boot-installer.xml:2878
#, no-c-format
msgid "rescue/enable"
msgstr "rescue/enable"
#. Tag: para
-#: boot-installer.xml:2864
+#: boot-installer.xml:2879
#, no-c-format
msgid ""
"Set to <userinput>true</userinput> to enter rescue mode rather than "
@@ -3699,13 +3735,13 @@ msgstr ""
"<xref linkend=\"rescue\"/>。"
#. Tag: title
-#: boot-installer.xml:2877
+#: boot-installer.xml:2892
#, no-c-format
msgid "Using boot parameters to answer questions"
msgstr "使用内核模块参数回答提问"
#. Tag: para
-#: boot-installer.xml:2878
+#: boot-installer.xml:2893
#, no-c-format
msgid ""
"With some exceptions, a value can be set at the boot prompt for any question "
@@ -3718,25 +3754,25 @@ msgstr ""
"bootparms\"/> 找到。下面是一些具体的例子。"
#. Tag: term
-#: boot-installer.xml:2890
+#: boot-installer.xml:2905
#, no-c-format
msgid "debian-installer/language (language)"
msgstr "debian-installer/language (language)"
#. Tag: term
-#: boot-installer.xml:2891
+#: boot-installer.xml:2906
#, no-c-format
msgid "debian-installer/country (country)"
msgstr "debian-installer/country (country)"
#. Tag: term
-#: boot-installer.xml:2892
+#: boot-installer.xml:2907
#, no-c-format
msgid "debian-installer/locale (locale)"
msgstr "debian-installer/locale (locale)"
#. Tag: para
-#: boot-installer.xml:2893
+#: boot-installer.xml:2908
#, no-c-format
msgid ""
"There are two ways to specify the language, country and locale to use for "
@@ -3746,7 +3782,7 @@ msgstr ""
"和地方(locale)。"
#. Tag: para
-#: boot-installer.xml:2898
+#: boot-installer.xml:2913
#, no-c-format
msgid ""
"The first and easiest is to pass only the parameter <literal>locale</"
@@ -3764,7 +3800,7 @@ msgstr ""
"式组合。"
#. Tag: para
-#: boot-installer.xml:2907
+#: boot-installer.xml:2922
#, no-c-format
msgid ""
"The second, more flexible option is to specify <literal>language</literal> "
@@ -3779,13 +3815,13 @@ msgstr ""
"locale=en_GB.UTF-8</userinput>。"
#. Tag: term
-#: boot-installer.xml:2919
+#: boot-installer.xml:2934
#, no-c-format
msgid "anna/choose_modules (modules)"
msgstr "anna/choose_modules (modules)"
#. Tag: para
-#: boot-installer.xml:2920
+#: boot-installer.xml:2935
#, no-c-format
msgid ""
"Can be used to automatically load installer components that are not loaded "
@@ -3800,7 +3836,7 @@ msgstr ""
"classname> (参阅 <xref linkend=\"pppoe\"/>)</phrase>。"
#. Tag: para
-#: boot-installer.xml:2934
+#: boot-installer.xml:2949
#, fuzzy, no-c-format
#| msgid ""
#| "Set to <userinput>true</userinput> if you want to disable DHCP and "
@@ -3812,13 +3848,13 @@ msgstr ""
"如果您想禁止 DHCP 使用静态网络设置,将它设为 <userinput>true</userinput>。"
#. Tag: term
-#: boot-installer.xml:2943
+#: boot-installer.xml:2958
#, no-c-format
msgid "mirror/protocol (protocol)"
msgstr "mirror/protocol (protocol)"
#. Tag: para
-#: boot-installer.xml:2944
+#: boot-installer.xml:2959
#, no-c-format
msgid ""
"By default the installer will use the http protocol to download files from "
@@ -3833,13 +3869,13 @@ msgstr ""
"序使用该协议。注意,必须手动输入主机名,而不是从列表中选择 ftp 镜像。"
#. Tag: term
-#: boot-installer.xml:2957
+#: boot-installer.xml:2972
#, no-c-format
msgid "tasksel:tasksel/first (tasks)"
msgstr "tasksel:tasksel/first (tasks)"
#. Tag: para
-#: boot-installer.xml:2958
+#: boot-installer.xml:2973
#, no-c-format
msgid ""
"Can be used to select tasks that are not available from the interactive task "
@@ -3850,13 +3886,13 @@ msgstr ""
"literal> 任务。参阅 <xref linkend=\"pkgsel\"/> 了解详细信息。"
#. Tag: title
-#: boot-installer.xml:2972
+#: boot-installer.xml:2987
#, no-c-format
msgid "Passing parameters to kernel modules"
msgstr "给内核模块传递参数"
#. Tag: para
-#: boot-installer.xml:2973
+#: boot-installer.xml:2988
#, no-c-format
msgid ""
"If drivers are compiled into the kernel, you can pass parameters to them as "
@@ -3876,7 +3912,7 @@ msgstr ""
"配置中。"
#. Tag: para
-#: boot-installer.xml:2986
+#: boot-installer.xml:3001
#, no-c-format
msgid ""
"Note that it is now quite rare that parameters need to be passed to modules. "
@@ -3888,7 +3924,7 @@ msgstr ""
"并很好地设置默认参数。然而,某些情况下还是需要手动设置参数。"
#. Tag: para
-#: boot-installer.xml:2993
+#: boot-installer.xml:3008
#, no-c-format
msgid ""
"The syntax to use to set parameters for modules is: "
@@ -3908,19 +3944,19 @@ msgstr ""
"用:"
#. Tag: screen
-#: boot-installer.xml:3003
+#: boot-installer.xml:3018
#, no-c-format
msgid "3c509.xcvr=3 3c509.irq=10"
msgstr "3c509.xcvr=3 3c509.irq=10"
#. Tag: title
-#: boot-installer.xml:3009
+#: boot-installer.xml:3024
#, no-c-format
msgid "Blacklisting kernel modules"
msgstr "内核模块黑名单"
#. Tag: para
-#: boot-installer.xml:3010
+#: boot-installer.xml:3025
#, no-c-format
msgid ""
"Sometimes it may be necessary to blacklist a module to prevent it from being "
@@ -3935,7 +3971,7 @@ msgstr ""
"间冲突或者错误的驱动先加载,将造成设备无法正常工作。"
#. Tag: para
-#: boot-installer.xml:3019
+#: boot-installer.xml:3034
#, no-c-format
msgid ""
"You can blacklist a module using the following syntax: "
@@ -3949,7 +3985,7 @@ msgstr ""
"入 <filename>/etc/modprobe.d/blacklist.local</filename> 文件的黑名单中。"
#. Tag: para
-#: boot-installer.xml:3027
+#: boot-installer.xml:3042
#, no-c-format
msgid ""
"Note that a module may still be loaded by the installation system itself. "
@@ -3961,19 +3997,19 @@ msgstr ""
"件检查过程中从显示的模块列表中取消该模块。"
#. Tag: title
-#: boot-installer.xml:3043
+#: boot-installer.xml:3058
#, no-c-format
msgid "Troubleshooting the Installation Process"
msgstr "安装过程中的故障修复"
#. Tag: title
-#: boot-installer.xml:3048
+#: boot-installer.xml:3063
#, no-c-format
msgid "CD-ROM Reliability"
msgstr "CD-ROM 的可靠性"
#. Tag: para
-#: boot-installer.xml:3049
+#: boot-installer.xml:3064
#, no-c-format
msgid ""
"Sometimes, especially with older CD-ROM drives, the installer may fail to "
@@ -3985,7 +4021,7 @@ msgstr ""
"&mdash; 即使是从 CD-ROM 成功引导 &mdash; 无法识别 CD-ROM 或在安装时读取错误。"
#. Tag: para
-#: boot-installer.xml:3056
+#: boot-installer.xml:3071
#, no-c-format
msgid ""
"There are many different possible causes for these problems. We can only "
@@ -3996,13 +4032,13 @@ msgstr ""
"下的由您来处理。"
#. Tag: para
-#: boot-installer.xml:3062
+#: boot-installer.xml:3077
#, no-c-format
msgid "There are two very simple things that you should try first."
msgstr "您首先应试试两种最简单的方法。"
#. Tag: para
-#: boot-installer.xml:3067
+#: boot-installer.xml:3082
#, no-c-format
msgid ""
"If the CD-ROM does not boot, check that it was inserted correctly and that "
@@ -4010,7 +4046,7 @@ msgid ""
msgstr "如果 CD-ROM 没有引导,检查一下它是否放好,并且没有弄脏。"
#. Tag: para
-#: boot-installer.xml:3073
+#: boot-installer.xml:3088
#, no-c-format
msgid ""
"If the installer fails to recognize a CD-ROM, try just running the option "
@@ -4023,7 +4059,7 @@ msgstr ""
"DMA 相关的问题可以用这种方法解决。"
#. Tag: para
-#: boot-installer.xml:3083
+#: boot-installer.xml:3098
#, no-c-format
msgid ""
"If this does not work, then try the suggestions in the subsections below. "
@@ -4034,7 +4070,7 @@ msgstr ""
"CD-ROM 和 DVD,为了方便,只提到 CD-ROM。"
#. Tag: para
-#: boot-installer.xml:3089
+#: boot-installer.xml:3104
#, no-c-format
msgid ""
"If you cannot get the installation working from CD-ROM, try one of the other "
@@ -4042,13 +4078,13 @@ msgid ""
msgstr "如果您用 CD-ROM 无法安装,试试其他可用的安装方法。"
#. Tag: title
-#: boot-installer.xml:3097
+#: boot-installer.xml:3112
#, no-c-format
msgid "Common issues"
msgstr "常见问题"
#. Tag: para
-#: boot-installer.xml:3100
+#: boot-installer.xml:3115
#, no-c-format
msgid ""
"Some older CD-ROM drives do not support reading from discs that were burned "
@@ -4056,7 +4092,7 @@ msgid ""
msgstr "有些老 CD-ROM 驱动器不能读取新 CD 刻录机的高速模式下刻录的光盘。"
#. Tag: para
-#: boot-installer.xml:3117
+#: boot-installer.xml:3132
#, no-c-format
msgid ""
"Some very old CD-ROM drives do not work correctly if <quote>direct memory "
@@ -4066,19 +4102,19 @@ msgstr ""
"正常工作。"
#. Tag: title
-#: boot-installer.xml:3128
+#: boot-installer.xml:3143
#, no-c-format
msgid "How to investigate and maybe solve issues"
msgstr "如何调查研究或许可以解决问题"
#. Tag: para
-#: boot-installer.xml:3129
+#: boot-installer.xml:3144
#, no-c-format
msgid "If the CD-ROM fails to boot, try the suggestions listed below."
msgstr "如果从 CD-ROM 引导失败,试试下面所列的建议。"
#. Tag: para
-#: boot-installer.xml:3134
+#: boot-installer.xml:3149
#, no-c-format
msgid ""
"Check that your BIOS actually supports booting from CD-ROM (only an issue "
@@ -4088,7 +4124,7 @@ msgstr ""
"开支持从 CD 引导。"
#. Tag: para
-#: boot-installer.xml:3141
+#: boot-installer.xml:3156
#, no-c-format
msgid ""
"If you downloaded an iso image, check that the md5sum of that image matches "
@@ -4112,7 +4148,7 @@ msgstr ""
"用下面的命令。它使用映像的尺寸从 CD-ROM 读取正确的字节数。"
#. Tag: screen
-#: boot-installer.xml:3154
+#: boot-installer.xml:3169
#, no-c-format
msgid ""
"$ dd if=/dev/cdrom | \\\n"
@@ -4134,7 +4170,7 @@ msgstr ""
"134486016 bytes (134 MB) copied, 97.474 seconds, 1.4 MB/s"
#. Tag: para
-#: boot-installer.xml:3159
+#: boot-installer.xml:3174
#, no-c-format
msgid ""
"If, after the installer has been booted successfully, the CD-ROM is not "
@@ -4153,7 +4189,7 @@ msgstr ""
"shell。"
#. Tag: para
-#: boot-installer.xml:3171
+#: boot-installer.xml:3186
#, no-c-format
msgid ""
"Switch to VT4 or view the contents of <filename>/var/log/syslog</filename> "
@@ -4165,7 +4201,7 @@ msgstr ""
"<command>dmesg</command> 的输出。"
#. Tag: para
-#: boot-installer.xml:3178
+#: boot-installer.xml:3193
#, no-c-format
msgid ""
"Check in the output of <command>dmesg</command> if your CD-ROM drive was "
@@ -4193,7 +4229,7 @@ msgstr ""
"<command>modprobe</command> 手动加载。"
#. Tag: para
-#: boot-installer.xml:3192
+#: boot-installer.xml:3207
#, no-c-format
msgid ""
"Check that there is a device node for your CD-ROM drive under <filename>/dev/"
@@ -4205,7 +4241,7 @@ msgstr ""
"cdrom0</filename>。"
#. Tag: para
-#: boot-installer.xml:3200
+#: boot-installer.xml:3215
#, no-c-format
msgid ""
"Use the <command>mount</command> command to check if the CD-ROM is already "
@@ -4220,7 +4256,7 @@ msgstr ""
"</screen></informalexample> 检查命令后面是否有什么错误信息。"
#. Tag: para
-#: boot-installer.xml:3210
+#: boot-installer.xml:3225
#, no-c-format
msgid ""
"Check if DMA is currently enabled: <informalexample><screen>\n"
@@ -4245,7 +4281,7 @@ msgstr ""
"</screen></informalexample> 确保您所处的目录对应 CD-ROM 驱动器。"
#. Tag: para
-#: boot-installer.xml:3225
+#: boot-installer.xml:3240
#, no-c-format
msgid ""
"If there are any problems during the installation, try checking the "
@@ -4257,13 +4293,13 @@ msgstr ""
"性。如果 CD-ROM 可以读,该选项可以对其进行测试。"
#. Tag: title
-#: boot-installer.xml:3240
+#: boot-installer.xml:3255
#, no-c-format
msgid "Floppy Disk Reliability"
msgstr "软盘的可靠性"
#. Tag: para
-#: boot-installer.xml:3242
+#: boot-installer.xml:3257
#, no-c-format
msgid ""
"The biggest problem for people using floppy disks to install &debian; seems "
@@ -4272,7 +4308,7 @@ msgstr ""
"对于用软盘安装 &debian; 的人来说,他们遇到的最大的问题很可能是软盘的可靠性。"
#. Tag: para
-#: boot-installer.xml:3247
+#: boot-installer.xml:3262
#, no-c-format
msgid ""
"The boot floppy is the floppy with the worst problems, because it is read by "
@@ -4288,7 +4324,7 @@ msgstr ""
"息。"
#. Tag: para
-#: boot-installer.xml:3256
+#: boot-installer.xml:3271
#, no-c-format
msgid ""
"If you are having the installation stall at a particular floppy, the first "
@@ -4303,7 +4339,7 @@ msgstr ""
"化以后看起来没有错误。如果可能,在别的统上重写这些软盘更好一些。"
#. Tag: para
-#: boot-installer.xml:3265
+#: boot-installer.xml:3280
#, no-c-format
msgid ""
"One user reports he had to write the images to floppy <emphasis>three</"
@@ -4314,7 +4350,7 @@ msgstr ""
"软盘才算工作良好。"
#. Tag: para
-#: boot-installer.xml:3271
+#: boot-installer.xml:3286
#, no-c-format
msgid ""
"Normally you should not have to download a floppy image again, but if you "
@@ -4325,7 +4361,7 @@ msgstr ""
"来检验下载的映像是否正确。"
#. Tag: para
-#: boot-installer.xml:3277
+#: boot-installer.xml:3292
#, no-c-format
msgid ""
"Other users have reported that simply rebooting a few times with the same "
@@ -4336,13 +4372,13 @@ msgstr ""
"有缺陷的硬件或固件软盘驱动器驱动程序造成的。"
#. Tag: title
-#: boot-installer.xml:3286
+#: boot-installer.xml:3301
#, no-c-format
msgid "Boot Configuration"
msgstr "引导配置"
#. Tag: para
-#: boot-installer.xml:3288
+#: boot-installer.xml:3303
#, no-c-format
msgid ""
"If you have problems and the kernel hangs during the boot process, doesn't "
@@ -4355,7 +4391,7 @@ msgstr ""
"\"/> 讨论。"
#. Tag: para
-#: boot-installer.xml:3297
+#: boot-installer.xml:3312
#, no-c-format
msgid ""
"In some cases, malfunctions can be caused by missing device firmware (see "
@@ -4366,7 +4402,7 @@ msgstr ""
"firmware\"/> 和 <xref linkend=\"loading-firmware\"/>)。"
#. Tag: para
-#: boot-installer.xml:3308
+#: boot-installer.xml:3323
#, no-c-format
msgid ""
"If software speech synthesis does not work, there is most probably an issue "
@@ -4381,37 +4417,37 @@ msgstr ""
"台机器上声音可以正常工作的 Linux 系统上(比如,live CD),运行下面命令的输出。"
#. Tag: userinput
-#: boot-installer.xml:3319
+#: boot-installer.xml:3334
#, no-c-format
msgid "dmesg"
msgstr "dmesg"
#. Tag: userinput
-#: boot-installer.xml:3321
+#: boot-installer.xml:3336
#, no-c-format
msgid "lspci"
msgstr "lspci"
#. Tag: userinput
-#: boot-installer.xml:3323
+#: boot-installer.xml:3338
#, no-c-format
msgid "lsmod"
msgstr "lsmod"
#. Tag: userinput
-#: boot-installer.xml:3325
+#: boot-installer.xml:3340
#, no-c-format
msgid "amixer"
msgstr "amixer"
#. Tag: title
-#: boot-installer.xml:3333 boot-installer.xml:3444
+#: boot-installer.xml:3348 boot-installer.xml:3459
#, no-c-format
msgid "Common &arch-title; Installation Problems"
msgstr "&arch-title; 常见安装问题"
#. Tag: para
-#: boot-installer.xml:3334
+#: boot-installer.xml:3349
#, no-c-format
msgid ""
"There are some common installation problems that can be solved or avoided by "
@@ -4419,7 +4455,7 @@ msgid ""
msgstr "有一些常见的安装问题,可以通过给安装程序特定的引导参数解决或避免。"
#. Tag: para
-#: boot-installer.xml:3385
+#: boot-installer.xml:3400
#, no-c-format
msgid ""
"If your screen begins to show a weird picture while the kernel boots, eg. "
@@ -4437,13 +4473,13 @@ msgstr ""
"\"boot-parms\"/> 来获得细节信息。"
#. Tag: title
-#: boot-installer.xml:3399
+#: boot-installer.xml:3414
#, no-c-format
msgid "System Freeze During the PCMCIA Configuration Phase"
msgstr "在 PCMCIA 配置阶段系统停止"
#. Tag: para
-#: boot-installer.xml:3400
+#: boot-installer.xml:3415
#, no-c-format
msgid ""
"Some very old laptop models produced by Dell are known to crash when PCMCIA "
@@ -4461,7 +4497,7 @@ msgstr ""
"题的资源区段。"
#. Tag: para
-#: boot-installer.xml:3410
+#: boot-installer.xml:3425
#, no-c-format
msgid ""
"Alternatively, you can boot the installer in expert mode. You will then be "
@@ -4481,19 +4517,19 @@ msgstr ""
"项。注意您在安装程序中,输入这些值的时候必须忽略逗号。"
#. Tag: para
-#: boot-installer.xml:3445
+#: boot-installer.xml:3460
#, no-c-format
msgid "There are some common installation problems that are worth mentioning."
msgstr "有一些常见的安装问题值得解释一下。"
#. Tag: title
-#: boot-installer.xml:3451
+#: boot-installer.xml:3466
#, no-c-format
msgid "Misdirected video output"
msgstr "错误的视频输出"
#. Tag: para
-#: boot-installer.xml:3452
+#: boot-installer.xml:3467
#, no-c-format
msgid ""
"It is fairly common for &arch-title; to have two video cards in one machine, "
@@ -4517,7 +4553,7 @@ msgstr ""
"<userinput>video=atyfb:off</userinput> 启动安装程序。"
#. Tag: para
-#: boot-installer.xml:3466
+#: boot-installer.xml:3481
#, no-c-format
msgid ""
"Note that you may also have to manually add this parameter to the silo "
@@ -4530,13 +4566,13 @@ msgstr ""
"xorg.conf</filename> 中的视频驱动。"
#. Tag: title
-#: boot-installer.xml:3477
+#: boot-installer.xml:3492
#, no-c-format
msgid "Failure to Boot or Install from CD-ROM"
msgstr "从 CD-ROM 上引导或安装失败"
#. Tag: para
-#: boot-installer.xml:3478
+#: boot-installer.xml:3493
#, no-c-format
msgid ""
"Some Sparc systems are notoriously difficult to boot from CD-ROM and even if "
@@ -4547,19 +4583,19 @@ msgstr ""
"费解的错误。SunBlade 系统被报告了很多问题。"
#. Tag: para
-#: boot-installer.xml:3484
+#: boot-installer.xml:3499
#, no-c-format
msgid "We recommend to install such systems by netbooting the installer."
msgstr "我们建议从网络安装这些系统。"
#. Tag: title
-#: boot-installer.xml:3493
+#: boot-installer.xml:3508
#, no-c-format
msgid "Interpreting the Kernel Startup Messages"
msgstr "内核起始信息注解"
#. Tag: para
-#: boot-installer.xml:3495
+#: boot-installer.xml:3510
#, no-c-format
msgid ""
"During the boot sequence, you may see many messages in the form "
@@ -4593,13 +4629,13 @@ msgstr ""
"linkend=\"kernel-baking\"/>)</phrase>。"
#. Tag: title
-#: boot-installer.xml:3520
+#: boot-installer.xml:3535
#, no-c-format
msgid "Reporting Installation Problems"
msgstr "报告安装问题"
#. Tag: para
-#: boot-installer.xml:3521
+#: boot-installer.xml:3536
#, no-c-format
msgid ""
"If you get through the initial boot phase but cannot complete the install, "
@@ -4616,7 +4652,7 @@ msgstr ""
"索。如果您正在提交一个 bug 报告,可以报告里附上该信息。"
#. Tag: para
-#: boot-installer.xml:3532
+#: boot-installer.xml:3547
#, no-c-format
msgid ""
"Other pertinent installation messages may be found in <filename>/var/log/</"
@@ -4627,13 +4663,13 @@ msgstr ""
"新安装的系统启动后,放在 <filename>/var/log/debian-installer/</filename> 里。"
#. Tag: title
-#: boot-installer.xml:3543
+#: boot-installer.xml:3558
#, no-c-format
msgid "Submitting Installation Reports"
msgstr "提交缺陷报告"
#. Tag: para
-#: boot-installer.xml:3544
+#: boot-installer.xml:3559
#, no-c-format
msgid ""
"If you still have problems, please submit an installation report. We also "
@@ -4645,7 +4681,7 @@ msgstr ""
"这让我们可以尽可能多地了解硬件的配置数量。"
#. Tag: para
-#: boot-installer.xml:3551
+#: boot-installer.xml:3566
#, no-c-format
msgid ""
"Note that your installation report will be published in the Debian Bug "
@@ -4656,12 +4692,20 @@ msgstr ""
"件列表。确保您使用的邮件地址可以被公开。"
#. Tag: para
-#: boot-installer.xml:3557
-#, no-c-format
+#: boot-installer.xml:3572
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you have a working &debian; system, the easiest way to send an "
+#| "installation report is to install the <classname>installation-report</"
+#| "classname> and <classname>reportbug</classname> packages "
+#| "(<command>aptitude install installation-report reportbug</command>), "
+#| "configure <classname>reportbug</classname> as explained in <xref linkend="
+#| "\"mail-outgoing\"/>, and run the command <command>reportbug installation-"
+#| "reports</command>."
msgid ""
"If you have a working &debian; system, the easiest way to send an "
"installation report is to install the <classname>installation-report</"
-"classname> and <classname>reportbug</classname> packages (<command>aptitude "
+"classname> and <classname>reportbug</classname> packages (<command>apt "
"install installation-report reportbug</command>), configure "
"<classname>reportbug</classname> as explained in <xref linkend=\"mail-"
"outgoing\"/>, and run the command <command>reportbug installation-reports</"
@@ -4675,7 +4719,7 @@ msgstr ""
"command> 命令。"
#. Tag: para
-#: boot-installer.xml:3567
+#: boot-installer.xml:3582
#, 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 8aa3feaf6..dbfb60dd2 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2015-12-24 22:12+0000\n"
+"POT-Creation-Date: 2016-04-08 20:25+0000\n"
"PO-Revision-Date: 2012-11-25 23:22+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -916,7 +916,7 @@ msgid "OpenRD (OpenRD-Base, OpenRD-Client and OpenRD-Ultimate)"
msgstr ""
#. Tag: term
-#: hardware.xml:608 hardware.xml:652
+#: hardware.xml:608 hardware.xml:653
#, no-c-format
msgid "Orion5x"
msgstr "Orion5x"
@@ -937,8 +937,9 @@ msgid ""
"Ethernet, SATA, USB, and other functionality in one chip. There are many "
"Network Attached Storage (NAS) devices on the market that are based on an "
"Orion chip. &debian; currently supports the following Orion based devices: "
-"<ulink url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</ulink> and "
-"<ulink url=\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink>."
+"<ulink url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</ulink>, <ulink "
+"url=\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink> and <ulink url=\"&url-arm-"
+"cyrius-qnap;\">QNAP TS-109, TS-209, TS-409 and TS-409U and variants</ulink>."
msgstr ""
"Orion 是 Marvell 的 SoC 产品,集成了 ARM CPU、Ethernet、SATA、USB,以及其他一"
"些功能。市场上有很多 NAS 设备基于 Orion 芯片。我们当前支持以下几种基于 Orion "
@@ -947,13 +948,13 @@ msgstr ""
"\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink>。"
#. Tag: term
-#: hardware.xml:623
+#: hardware.xml:624
#, no-c-format
msgid "<term>Versatile</term>"
msgstr "<term>Versatile</term>"
#. Tag: para
-#: hardware.xml:624
+#: hardware.xml:625
#, fuzzy, no-c-format
#| msgid ""
#| "The Versatile platform is emulated by QEMU and is therefore a nice way to "
@@ -966,19 +967,19 @@ msgstr ""
"&debian; 是一个不错的方法。"
#. Tag: title
-#: hardware.xml:637
+#: hardware.xml:638
#, no-c-format
msgid "Platforms and devices no longer supported by Debian/armel"
msgstr ""
#. Tag: term
-#: hardware.xml:641
+#: hardware.xml:642
#, no-c-format
msgid "IXP4xx"
msgstr "IXP4xx"
#. Tag: para
-#: hardware.xml:642
+#: hardware.xml:643
#, no-c-format
msgid ""
"Support for the Intel IXP4xx platform has been dropped in &debian; 9. The "
@@ -986,7 +987,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:653
+#: hardware.xml:654
#, no-c-format
msgid ""
"Support for the D-Link DNS-323 and Conceptronic CH3SNAS devices has been "
@@ -997,14 +998,14 @@ msgstr ""
# index.docbook:224, index.docbook:683, index.docbook:780, index.docbook:799, index.docbook:842, index.docbook:884, index.docbook:938, index.docbook:1085, index.docbook:1491
#. Tag: title
-#: hardware.xml:672 hardware.xml:722 hardware.xml:780 hardware.xml:810
-#: hardware.xml:1253
+#: hardware.xml:673 hardware.xml:723 hardware.xml:781 hardware.xml:811
+#: hardware.xml:1254
#, no-c-format
msgid "CPU, Main Boards, and Video Support"
msgstr "CPU,主板和视频支持"
#. Tag: para
-#: hardware.xml:673
+#: hardware.xml:674
#, no-c-format
msgid ""
"Complete information concerning supported peripherals can be found at <ulink "
@@ -1016,13 +1017,13 @@ msgstr ""
# index.docbook:808, index.docbook:914
#. Tag: title
-#: hardware.xml:681 hardware.xml:757
+#: hardware.xml:682 hardware.xml:758
#, no-c-format
msgid "<title>CPU</title>"
msgstr "<title>CPU</title>"
#. Tag: para
-#: hardware.xml:682
+#: hardware.xml:683
#, fuzzy, no-c-format
#| msgid ""
#| "Nearly all x86-based (IA-32) processors still in use in personal "
@@ -1039,7 +1040,7 @@ msgstr ""
"Athlon XP 和 Intel P4 Xeon 这些处理器。"
#. Tag: para
-#: hardware.xml:689
+#: hardware.xml:690
#, no-c-format
msgid ""
"However, &debian; GNU/Linux &releasename; will <emphasis>not</emphasis> run "
@@ -1047,7 +1048,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:695
+#: hardware.xml:696
#, no-c-format
msgid ""
"If your system has a 64-bit processor from the AMD64 or Intel 64 families, "
@@ -1058,13 +1059,13 @@ msgstr ""
"安装程序替代 (32位) i386 架构的安装程序。"
#. Tag: title
-#: hardware.xml:704
+#: hardware.xml:705
#, no-c-format
msgid "I/O Bus"
msgstr "I/O 总线"
#. Tag: para
-#: hardware.xml:705
+#: hardware.xml:706
#, fuzzy, no-c-format
#| msgid ""
#| "The system bus is the part of the motherboard which allows the CPU to "
@@ -1083,7 +1084,7 @@ msgstr ""
"线)。近年来出售的个人电脑都会使用里面的一种。"
#. Tag: para
-#: hardware.xml:723
+#: hardware.xml:724
#, no-c-format
msgid ""
"&debian; on &arch-title; supports the following platforms: <itemizedlist> "
@@ -1113,7 +1114,7 @@ msgstr ""
"\"> debian-&arch-listname; mailing list</ulink>。"
#. Tag: para
-#: hardware.xml:758
+#: hardware.xml:759
#, no-c-format
msgid ""
"On SGI IP22, SGI Indy, Indigo 2 and Challenge S with R4000, R4400, R4600 and "
@@ -1126,7 +1127,7 @@ msgstr ""
"持 R5000。"
#. Tag: para
-#: hardware.xml:764
+#: hardware.xml:765
#, no-c-format
msgid ""
"Some MIPS machines can be operated in both big and little endian mode. For "
@@ -1137,7 +1138,7 @@ msgstr ""
"endian MIPS,请阅读 mipsel 体系的相关文档。"
#. Tag: para
-#: hardware.xml:781
+#: hardware.xml:782
#, fuzzy, no-c-format
#| msgid ""
#| "&debian; on &arch-title; supports the following platforms: <itemizedlist> "
@@ -1174,7 +1175,7 @@ msgstr ""
"mailing list</ulink>。"
#. Tag: para
-#: hardware.xml:811
+#: hardware.xml:812
#, no-c-format
msgid ""
"For &debian-gnu; &release; only the PMac (Power-Macintosh or PowerMac) and "
@@ -1184,13 +1185,13 @@ msgstr ""
"PreP 子体系获得支持。"
#. Tag: title
-#: hardware.xml:832
+#: hardware.xml:833
#, no-c-format
msgid "Kernel Flavours"
msgstr "内核变种"
#. Tag: para
-#: hardware.xml:834
+#: hardware.xml:835
#, no-c-format
msgid ""
"There are two flavours of the powerpc kernel in &debian;, based on the CPU "
@@ -1198,13 +1199,13 @@ msgid ""
msgstr "在 &debian; 中有两种基于 CPU 类型的 powerpc 内核:"
#. Tag: term
-#: hardware.xml:841
+#: hardware.xml:842
#, no-c-format
msgid "<term>powerpc</term>"
msgstr "<term>powerpc</term>"
#. Tag: para
-#: hardware.xml:842
+#: hardware.xml:843
#, fuzzy, no-c-format
#| msgid ""
#| "Most systems use this kernel flavour, which supports the PowerPC 601, "
@@ -1219,31 +1220,31 @@ msgstr ""
"器。所有 Apple PowerMac 以后的系统包括 G4 都使用这其中的处理器。"
#. Tag: term
-#: hardware.xml:852
+#: hardware.xml:853
#, no-c-format
msgid "powerpc-smp"
msgstr ""
#. Tag: para
-#: hardware.xml:853
+#: hardware.xml:854
#, no-c-format
msgid "All Apple PowerMac G4 SMP machines."
msgstr ""
#. Tag: term
-#: hardware.xml:861
+#: hardware.xml:862
#, no-c-format
msgid "power64"
msgstr "power64"
#. Tag: para
-#: hardware.xml:862
+#: hardware.xml:863
#, no-c-format
msgid "The power64 kernel flavour supports the following CPUs:"
msgstr "power64 内核支持以下的 CPU:"
#. Tag: para
-#: hardware.xml:866
+#: hardware.xml:867
#, no-c-format
msgid ""
"The POWER3 processor is used in older IBM 64-bit server systems: known "
@@ -1255,7 +1256,7 @@ msgstr ""
"7044-270。"
#. Tag: para
-#: hardware.xml:872
+#: hardware.xml:873
#, no-c-format
msgid ""
"The POWER4 processor is used in more recent IBM 64-bit server systems: known "
@@ -1265,7 +1266,7 @@ msgstr ""
"630、650、655、670 和 690。"
#. Tag: para
-#: hardware.xml:877
+#: hardware.xml:878
#, fuzzy, no-c-format
#| msgid ""
#| "Systems using the Apple G5 (PPC970FX processor) are also based on the "
@@ -1278,19 +1279,19 @@ msgstr ""
"采用 Apple G5 (PPC970FX 处理器) 的系统也是基于 POWER4 体系,并使用这种内核。"
#. Tag: para
-#: hardware.xml:883
+#: hardware.xml:884
#, no-c-format
msgid "Newer IBM systems using POWER5, POWER6, and POWER7 processors."
msgstr ""
#. Tag: title
-#: hardware.xml:916
+#: hardware.xml:917
#, no-c-format
msgid "Power Macintosh (pmac) subarchitecture"
msgstr "Power Macintosh (pmac) 子体系"
#. Tag: para
-#: hardware.xml:918
+#: hardware.xml:919
#, no-c-format
msgid ""
"Apple (and briefly a few other manufacturers &mdash; Power Computing, for "
@@ -1303,7 +1304,7 @@ msgstr ""
"NuBus(&debian; 没有支持)、OldWorld PCI 和 NewWorld。"
#. Tag: para
-#: hardware.xml:925
+#: hardware.xml:926
#, no-c-format
msgid ""
"OldWorld systems are most Power Macintoshes with a floppy drive and a PCI "
@@ -1316,7 +1317,7 @@ msgstr ""
"些 Apple iMac PowerPC 前身使用 4 位数字命名方式,它们都是 OldWorld 的。"
#. Tag: para
-#: hardware.xml:933
+#: hardware.xml:934
#, no-c-format
msgid ""
"The so called NewWorld PowerMacs are any PowerMacs in translucent colored "
@@ -1331,7 +1332,7 @@ msgstr ""
"MacOS 的系统。"
#. Tag: para
-#: hardware.xml:941
+#: hardware.xml:942
#, no-c-format
msgid ""
"Specifications for Apple hardware are available at <ulink url=\"http://www."
@@ -1346,397 +1347,397 @@ msgstr ""
# index.docbook:1240, index.docbook:1375, index.docbook:1419, index.docbook:1448
#. Tag: entry
-#: hardware.xml:957 hardware.xml:1092 hardware.xml:1136 hardware.xml:1169
+#: hardware.xml:958 hardware.xml:1093 hardware.xml:1137 hardware.xml:1170
#, no-c-format
msgid "Model Name/Number"
msgstr "型号名称/编号"
#. Tag: entry
-#: hardware.xml:958
+#: hardware.xml:959
#, no-c-format
msgid "Generation"
msgstr "世代"
#. Tag: entry
-#: hardware.xml:964
+#: hardware.xml:965
#, no-c-format
msgid "Apple"
msgstr "Apple"
#. Tag: entry
-#: hardware.xml:965
+#: hardware.xml:966
#, no-c-format
msgid "iMac Bondi Blue, 5 Flavors, Slot Loading"
msgstr "iMac Bondi Blue, 5 Flavors, Slot Loading"
# index.docbook:1249, index.docbook:1252, index.docbook:1255, index.docbook:1258, index.docbook:1261, index.docbook:1264, index.docbook:1267, index.docbook:1270, index.docbook:1273, index.docbook:1276, index.docbook:1279, index.docbook:1282, index.docbook:1285, index.docbook:1288, index.docbook:1291, index.docbook:1294
#. Tag: entry
-#: hardware.xml:966 hardware.xml:969 hardware.xml:972 hardware.xml:975
-#: hardware.xml:978 hardware.xml:981 hardware.xml:984 hardware.xml:987
-#: hardware.xml:990 hardware.xml:993 hardware.xml:996 hardware.xml:999
-#: hardware.xml:1002 hardware.xml:1005 hardware.xml:1008 hardware.xml:1011
+#: hardware.xml:967 hardware.xml:970 hardware.xml:973 hardware.xml:976
+#: hardware.xml:979 hardware.xml:982 hardware.xml:985 hardware.xml:988
+#: hardware.xml:991 hardware.xml:994 hardware.xml:997 hardware.xml:1000
+#: hardware.xml:1003 hardware.xml:1006 hardware.xml:1009 hardware.xml:1012
#, no-c-format
msgid "NewWorld"
msgstr "NewWorld"
#. Tag: entry
-#: hardware.xml:968
+#: hardware.xml:969
#, no-c-format
msgid "iMac Summer 2000, Early 2001"
msgstr "iMac Summer 2000, Early 2001"
#. Tag: entry
-#: hardware.xml:971
+#: hardware.xml:972
#, no-c-format
msgid "iMac G5"
msgstr "iMac G5"
#. Tag: entry
-#: hardware.xml:974
+#: hardware.xml:975
#, no-c-format
msgid "iBook, iBook SE, iBook Dual USB"
msgstr "iBook, iBook SE, iBook Dual USB"
#. Tag: entry
-#: hardware.xml:977
+#: hardware.xml:978
#, no-c-format
msgid "iBook2"
msgstr "iBook2"
#. Tag: entry
-#: hardware.xml:980
+#: hardware.xml:981
#, no-c-format
msgid "iBook G4"
msgstr "iBook G4"
#. Tag: entry
-#: hardware.xml:983
+#: hardware.xml:984
#, no-c-format
msgid "Power Macintosh Blue and White (B&amp;W) G3"
msgstr "Power Macintosh Blue and White (B&amp;W) G3"
#. Tag: entry
-#: hardware.xml:986
+#: hardware.xml:987
#, no-c-format
msgid "Power Macintosh G4 PCI, AGP, Cube"
msgstr "Power Macintosh G4 PCI, AGP, Cube"
#. Tag: entry
-#: hardware.xml:989
+#: hardware.xml:990
#, no-c-format
msgid "Power Macintosh G4 Gigabit Ethernet"
msgstr "Power Macintosh G4 Gigabit Ethernet"
#. Tag: entry
-#: hardware.xml:992
+#: hardware.xml:993
#, no-c-format
msgid "Power Macintosh G4 Digital Audio, Quicksilver"
msgstr "Power Macintosh G4 Digital Audio, Quicksilver"
#. Tag: entry
-#: hardware.xml:995
+#: hardware.xml:996
#, no-c-format
msgid "Power Macintosh G5"
msgstr "Power Macintosh G5"
#. Tag: entry
-#: hardware.xml:998
+#: hardware.xml:999
#, no-c-format
msgid "PowerBook G3 FireWire Pismo (2000)"
msgstr "PowerBook G3 FireWire Pismo (2000)"
#. Tag: entry
-#: hardware.xml:1001
+#: hardware.xml:1002
#, no-c-format
msgid "PowerBook G3 Lombard (1999)"
msgstr "PowerBook G3 Lombard (1999)"
#. Tag: entry
-#: hardware.xml:1004
+#: hardware.xml:1005
#, no-c-format
msgid "PowerBook G4 Titanium"
msgstr "PowerBook G4 Titanium"
#. Tag: entry
-#: hardware.xml:1007
+#: hardware.xml:1008
#, no-c-format
msgid "PowerBook G4 Aluminum"
msgstr "PowerBook G4 Aluminum"
#. Tag: entry
-#: hardware.xml:1010
+#: hardware.xml:1011
#, no-c-format
msgid "Xserve G5"
msgstr "Xserve G5"
#. Tag: entry
-#: hardware.xml:1013
+#: hardware.xml:1014
#, no-c-format
msgid "Performa 4400, 54xx, 5500"
msgstr "Performa 4400, 54xx, 5500"
# index.docbook:1297, index.docbook:1300, index.docbook:1303, index.docbook:1306, index.docbook:1309, index.docbook:1312, index.docbook:1315, index.docbook:1318, index.docbook:1321, index.docbook:1324, index.docbook:1327, index.docbook:1330, index.docbook:1336, index.docbook:1339, index.docbook:1345, index.docbook:1351, index.docbook:1357
#. Tag: entry
-#: hardware.xml:1014 hardware.xml:1017 hardware.xml:1020 hardware.xml:1023
-#: hardware.xml:1026 hardware.xml:1029 hardware.xml:1032 hardware.xml:1035
-#: hardware.xml:1038 hardware.xml:1041 hardware.xml:1044 hardware.xml:1047
-#: hardware.xml:1053 hardware.xml:1056 hardware.xml:1062 hardware.xml:1068
-#: hardware.xml:1074
+#: hardware.xml:1015 hardware.xml:1018 hardware.xml:1021 hardware.xml:1024
+#: hardware.xml:1027 hardware.xml:1030 hardware.xml:1033 hardware.xml:1036
+#: hardware.xml:1039 hardware.xml:1042 hardware.xml:1045 hardware.xml:1048
+#: hardware.xml:1054 hardware.xml:1057 hardware.xml:1063 hardware.xml:1069
+#: hardware.xml:1075
#, no-c-format
msgid "OldWorld"
msgstr "OldWorld"
#. Tag: entry
-#: hardware.xml:1016
+#: hardware.xml:1017
#, no-c-format
msgid "Performa 6360, 6400, 6500"
msgstr "Performa 6360, 6400, 6500"
#. Tag: entry
-#: hardware.xml:1019
+#: hardware.xml:1020
#, no-c-format
msgid "Power Macintosh 4400, 5400"
msgstr "Power Macintosh 4400, 5400"
#. Tag: entry
-#: hardware.xml:1022
+#: hardware.xml:1023
#, no-c-format
msgid "Power Macintosh 7200, 7300, 7500, 7600"
msgstr "Power Macintosh 7200, 7300, 7500, 7600"
#. Tag: entry
-#: hardware.xml:1025
+#: hardware.xml:1026
#, no-c-format
msgid "Power Macintosh 8200, 8500, 8600"
msgstr "Power Macintosh 8200, 8500, 8600"
#. Tag: entry
-#: hardware.xml:1028
+#: hardware.xml:1029
#, no-c-format
msgid "Power Macintosh 9500, 9600"
msgstr "Power Macintosh 9500, 9600"
#. Tag: entry
-#: hardware.xml:1031
+#: hardware.xml:1032
#, no-c-format
msgid "Power Macintosh (Beige) G3 Minitower"
msgstr "Power Macintosh (Beige) G3 Minitower"
#. Tag: entry
-#: hardware.xml:1034
+#: hardware.xml:1035
#, no-c-format
msgid "Power Macintosh (Beige) Desktop, All-in-One"
msgstr "Power Macintosh (Beige) Desktop, All-in-One"
#. Tag: entry
-#: hardware.xml:1037
+#: hardware.xml:1038
#, no-c-format
msgid "PowerBook 2400, 3400, 3500"
msgstr "PowerBook 2400, 3400, 3500"
#. Tag: entry
-#: hardware.xml:1040
+#: hardware.xml:1041
#, no-c-format
msgid "PowerBook G3 Wallstreet (1998)"
msgstr "PowerBook G3 Wallstreet (1998)"
#. Tag: entry
-#: hardware.xml:1043
+#: hardware.xml:1044
#, no-c-format
msgid "Twentieth Anniversary Macintosh"
msgstr "Twentieth Anniversary Macintosh"
#. Tag: entry
-#: hardware.xml:1046
+#: hardware.xml:1047
#, no-c-format
msgid "Workgroup Server 7250, 7350, 8550, 9650, G3"
msgstr "Workgroup Server 7250, 7350, 8550, 9650, G3"
#. Tag: entry
-#: hardware.xml:1051
+#: hardware.xml:1052
#, no-c-format
msgid "Power Computing"
msgstr "Power Computing"
#. Tag: entry
-#: hardware.xml:1052
+#: hardware.xml:1053
#, no-c-format
msgid "PowerBase, PowerTower / Pro, PowerWave"
msgstr "PowerBase, PowerTower / Pro, PowerWave"
#. Tag: entry
-#: hardware.xml:1055
+#: hardware.xml:1056
#, no-c-format
msgid "PowerCenter / Pro, PowerCurve"
msgstr "PowerCenter / Pro, PowerCurve"
#. Tag: entry
-#: hardware.xml:1060
+#: hardware.xml:1061
#, no-c-format
msgid "UMAX"
msgstr "UMAX"
#. Tag: entry
-#: hardware.xml:1061
+#: hardware.xml:1062
#, no-c-format
msgid "C500, C600, J700, S900"
msgstr "C500, C600, J700, S900"
#. Tag: entry
-#: hardware.xml:1066
+#: hardware.xml:1067
#, no-c-format
msgid "<entry>APS</entry>"
msgstr "<entry>APS</entry>"
#. Tag: entry
-#: hardware.xml:1067
+#: hardware.xml:1068
#, no-c-format
msgid "APS Tech M*Power 604e/2000"
msgstr "APS Tech M*Power 604e/2000"
# index.docbook:1355, index.docbook:1381
#. Tag: entry
-#: hardware.xml:1072 hardware.xml:1098
+#: hardware.xml:1073 hardware.xml:1099
#, no-c-format
msgid "Motorola"
msgstr "Motorola"
#. Tag: entry
-#: hardware.xml:1073
+#: hardware.xml:1074
#, no-c-format
msgid "Starmax 3000, 4000, 5000, 5500"
msgstr "Starmax 3000, 4000, 5000, 5500"
#. Tag: title
-#: hardware.xml:1082
+#: hardware.xml:1083
#, no-c-format
msgid "PReP subarchitecture"
msgstr "PReP 子体系"
#. Tag: entry
-#: hardware.xml:1099
+#: hardware.xml:1100
#, no-c-format
msgid "Firepower, PowerStack Series E, PowerStack II"
msgstr "Firepower, PowerStack Series E, PowerStack II"
#. Tag: entry
-#: hardware.xml:1101
+#: hardware.xml:1102
#, no-c-format
msgid "MPC 7xx, 8xx"
msgstr "MPC 7xx, 8xx"
#. Tag: entry
-#: hardware.xml:1103
+#: hardware.xml:1104
#, no-c-format
msgid "MTX, MTX+"
msgstr "MTX, MTX+"
#. Tag: entry
-#: hardware.xml:1105
+#: hardware.xml:1106
#, no-c-format
msgid "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
msgstr "MVME2300(SC)/24xx/26xx/27xx/36xx/46xx"
#. Tag: entry
-#: hardware.xml:1107
+#: hardware.xml:1108
#, no-c-format
msgid "MCP(N)750"
msgstr "MCP(N)750"
# index.docbook:1394, index.docbook:1425
#. Tag: entry
-#: hardware.xml:1111 hardware.xml:1142
+#: hardware.xml:1112 hardware.xml:1143
#, no-c-format
msgid "IBM RS/6000"
msgstr "IBM RS/6000"
#. Tag: entry
-#: hardware.xml:1112
+#: hardware.xml:1113
#, no-c-format
msgid "40P, 43P"
msgstr "40P, 43P"
#. Tag: entry
-#: hardware.xml:1114
+#: hardware.xml:1115
#, no-c-format
msgid "Power 830/850/860 (6070, 6050)"
msgstr "Power 830/850/860 (6070, 6050)"
#. Tag: entry
-#: hardware.xml:1116
+#: hardware.xml:1117
#, no-c-format
msgid "6030, 7025, 7043"
msgstr "6030, 7025, 7043"
#. Tag: entry
-#: hardware.xml:1118
+#: hardware.xml:1119
#, no-c-format
msgid "p640"
msgstr "p640"
#. Tag: title
-#: hardware.xml:1126
+#: hardware.xml:1127
#, fuzzy, no-c-format
#| msgid "PReP subarchitecture"
msgid "CHRP subarchitecture"
msgstr "PReP 子体系"
#. Tag: entry
-#: hardware.xml:1143
+#: hardware.xml:1144
#, no-c-format
msgid "B50, 43P-150, 44P"
msgstr "B50, 43P-150, 44P"
#. Tag: entry
-#: hardware.xml:1146
+#: hardware.xml:1147
#, no-c-format
msgid "Genesi"
msgstr "Genesi"
#. Tag: entry
-#: hardware.xml:1147
+#: hardware.xml:1148
#, no-c-format
msgid "Pegasos I, Pegasos II"
msgstr "Pegasos I, Pegasos II"
#. Tag: entry
-#: hardware.xml:1150
+#: hardware.xml:1151
#, no-c-format
msgid "Fixstars"
msgstr ""
#. Tag: entry
-#: hardware.xml:1151
+#: hardware.xml:1152
#, no-c-format
msgid "YDL PowerStation"
msgstr ""
#. Tag: title
-#: hardware.xml:1159
+#: hardware.xml:1160
#, no-c-format
msgid "APUS subarchitecture (unsupported)"
msgstr "APUS 子体系 (不支持)"
#. Tag: entry
-#: hardware.xml:1175
+#: hardware.xml:1176
#, no-c-format
msgid "Amiga Power-UP Systems (APUS)"
msgstr "Amiga Power-UP Systems (APUS)"
#. Tag: entry
-#: hardware.xml:1176
+#: hardware.xml:1177
#, no-c-format
msgid "A1200, A3000, A4000"
msgstr "A1200, A3000, A4000"
#. Tag: title
-#: hardware.xml:1184
+#: hardware.xml:1185
#, no-c-format
msgid "Nubus PowerMac subarchitecture (unsupported)"
msgstr "Nubus PowerMac 子体系 (不支持)"
#. Tag: para
-#: hardware.xml:1186
+#: hardware.xml:1187
#, no-c-format
msgid ""
"NuBus systems are not currently supported by &debian;/powerpc. The "
@@ -1760,13 +1761,13 @@ msgstr ""
"nubus-pmac.sourceforge.net/\"></ulink>"
#. Tag: title
-#: hardware.xml:1223
+#: hardware.xml:1224
#, no-c-format
msgid "Non-PowerPC Macs"
msgstr "Non-PowerPC Macs"
#. Tag: para
-#: hardware.xml:1225
+#: hardware.xml:1226
#, no-c-format
msgid ""
"Macintosh computers using the 680x0 series of processors are <emphasis>not</"
@@ -1782,7 +1783,7 @@ msgstr ""
"字,像 Mac IIcx、LCIII 或 Quadra 950。"
#. Tag: para
-#: hardware.xml:1234
+#: hardware.xml:1235
#, no-c-format
msgid ""
"This model range started with the Mac II (Mac II, IIx, IIcx, IIci, IIsi, "
@@ -1797,7 +1798,7 @@ msgstr ""
"840AV, 900, 950), 最后是 Performa 200-640CD。"
#. Tag: para
-#: hardware.xml:1242
+#: hardware.xml:1243
#, no-c-format
msgid ""
"In laptops, it started with the Mac Portable, then the PowerBook 100-190cs "
@@ -1808,50 +1809,50 @@ msgstr ""
"Duo 210-550c (不包含带有 Nubus 的 PowerBook 500,见前面说明。)"
#. Tag: title
-#: hardware.xml:1256
+#: hardware.xml:1257
#, fuzzy, no-c-format
#| msgid "CPU/Machine types"
msgid "Machines"
msgstr "CPU/机器类型"
#. Tag: para
-#: hardware.xml:1259
+#: hardware.xml:1260
#, no-c-format
msgid "S822L"
msgstr ""
#. Tag: para
-#: hardware.xml:1264
+#: hardware.xml:1265
#, no-c-format
msgid "S821L"
msgstr ""
#. Tag: para
-#: hardware.xml:1269
+#: hardware.xml:1270
#, no-c-format
msgid "S822"
msgstr ""
#. Tag: para
-#: hardware.xml:1274
+#: hardware.xml:1275
#, no-c-format
msgid "S821"
msgstr ""
#. Tag: para
-#: hardware.xml:1279
+#: hardware.xml:1280
#, no-c-format
msgid "TYAN GN70-BP010"
msgstr ""
#. Tag: title
-#: hardware.xml:1294
+#: hardware.xml:1295
#, no-c-format
msgid "zSeries and System z machine types"
msgstr "zSeries 和 System z 机器类型"
#. Tag: para
-#: hardware.xml:1295
+#: hardware.xml:1296
#, fuzzy, no-c-format
#| msgid ""
#| "Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
@@ -1868,7 +1869,7 @@ msgid ""
"Your machine needs to support the z/Architecture, 64-bit support is "
"mandatory. The userland of the s390 port is still compiled for ESA/390, "
"though. All zSeries and System z hardware is fully supported. &arch-title; "
-"support software is included from the kernel 4.2 development stream. The "
+"support software is included from the kernel 4.3 development stream. The "
"most current information about IBM's Linux support can be found at the "
"<ulink url=\"http://www.ibm.com/developerworks/linux/linux390/"
"development_technical.html\"> Linux on <trademark class=\"registered"
@@ -1883,13 +1884,13 @@ msgstr ""
"ulink>。"
#. Tag: title
-#: hardware.xml:1312
+#: hardware.xml:1313
#, no-c-format
msgid "PAV and HyperPAV"
msgstr "PAV 和 HyperPAV"
#. Tag: para
-#: hardware.xml:1313
+#: hardware.xml:1314
#, no-c-format
msgid ""
"PAV and HyperPAV are supported transparently, multipathing is not needed to "
@@ -1902,13 +1903,13 @@ msgstr ""
# index.docbook:224, index.docbook:683, index.docbook:780, index.docbook:799, index.docbook:842, index.docbook:884, index.docbook:938, index.docbook:1085, index.docbook:1491
#. Tag: title
-#: hardware.xml:1329
+#: hardware.xml:1330
#, no-c-format
msgid "CPU and Main Boards Support"
msgstr "CPU 和主板支持"
#. Tag: para
-#: hardware.xml:1330
+#: hardware.xml:1331
#, no-c-format
msgid ""
"Sparc-based hardware is divided into a number of different subarchitectures, "
@@ -1920,13 +1921,13 @@ msgstr ""
"sun4m、sun4u 或 sun4v。下面说明包括哪些机器,以及每个获得支持的级别。"
#. Tag: term
-#: hardware.xml:1341
+#: hardware.xml:1342
#, no-c-format
msgid "sun4, sun4c, sun4d, sun4m"
msgstr "sun4, sun4c, sun4d, sun4m"
#. Tag: para
-#: hardware.xml:1343
+#: hardware.xml:1344
#, no-c-format
msgid ""
"None of these 32-bit sparc subarchitectures (sparc32) is supported. For a "
@@ -1939,7 +1940,7 @@ msgstr ""
"SPARCstation page</ulink>。"
#. Tag: para
-#: hardware.xml:1350
+#: hardware.xml:1351
#, no-c-format
msgid ""
"The last &debian; release to support sparc32 was Etch, but even then only "
@@ -1950,13 +1951,13 @@ msgstr ""
"32 位子体系在上一版本后已经停止支持。"
#. Tag: term
-#: hardware.xml:1360
+#: hardware.xml:1361
#, no-c-format
msgid "sun4u"
msgstr ""
#. Tag: para
-#: hardware.xml:1362
+#: hardware.xml:1363
#, no-c-format
msgid ""
"This subarchitecture includes all 64-bit machines (sparc64) based on the "
@@ -1972,13 +1973,13 @@ msgstr ""
"到 UP 和 SMP 配置中。"
#. Tag: term
-#: hardware.xml:1375
+#: hardware.xml:1376
#, no-c-format
msgid "sun4v"
msgstr ""
#. Tag: para
-#: hardware.xml:1377
+#: hardware.xml:1378
#, no-c-format
msgid ""
"This is the newest addition to the Sparc family, which includes machines "
@@ -1991,7 +1992,7 @@ msgstr ""
"smp 内核。"
#. Tag: para
-#: hardware.xml:1388
+#: hardware.xml:1389
#, no-c-format
msgid ""
"Note that Fujitsu's SPARC64 CPUs used in PRIMEPOWER family of servers are "
@@ -2001,13 +2002,13 @@ msgstr ""
"持而得不到支持。"
#. Tag: title
-#: hardware.xml:1397
+#: hardware.xml:1398
#, no-c-format
msgid "Laptops"
msgstr "便携机"
#. Tag: para
-#: hardware.xml:1398
+#: hardware.xml:1399
#, no-c-format
msgid ""
"From a technical point of view, laptops are normal PCs, so all information "
@@ -2029,13 +2030,13 @@ msgstr ""
# index.docbook:1624, index.docbook:1649, index.docbook:1672
#. Tag: title
-#: hardware.xml:1415 hardware.xml:1435 hardware.xml:1457 hardware.xml:1480
+#: hardware.xml:1416 hardware.xml:1436 hardware.xml:1458 hardware.xml:1481
#, no-c-format
msgid "Multiple Processors"
msgstr "多处理器"
#. Tag: para
-#: hardware.xml:1416
+#: hardware.xml:1417
#, fuzzy, no-c-format
#| msgid ""
#| "Multiprocessor support &mdash; also called <quote>symmetric "
@@ -2062,7 +2063,7 @@ msgstr ""
"集成在一个物理芯片上。"
#. Tag: para
-#: hardware.xml:1426
+#: hardware.xml:1427
#, no-c-format
msgid ""
"The standard &debian; &release; kernel image has been compiled with SMP "
@@ -2072,7 +2073,7 @@ msgstr ""
"使用也没有问题。"
#. Tag: para
-#: hardware.xml:1437
+#: hardware.xml:1438
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -2088,7 +2089,7 @@ msgstr ""
"者核心)数量,并可以在单处理器系统上关闭 SMP 功能。"
#. Tag: para
-#: hardware.xml:1446
+#: hardware.xml:1447
#, fuzzy, no-c-format
#| msgid ""
#| "Having multiple processors in a computer was originally only an issue for "
@@ -2108,7 +2109,7 @@ msgstr ""
"两个或多个称为<quote>核心</quote>的处理器单元集成在一个物理芯片上。"
#. Tag: para
-#: hardware.xml:1458
+#: hardware.xml:1459
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -2123,7 +2124,7 @@ msgstr ""
"核仅使用第一个 CPU。"
#. Tag: para
-#: hardware.xml:1467
+#: hardware.xml:1468
#, no-c-format
msgid ""
"In order to take advantage of multiple processors, you'll have to replace "
@@ -2139,7 +2140,7 @@ msgstr ""
"</quote> 中选中 <quote>&smp-config-option;</quote>。</phrase>"
#. Tag: para
-#: hardware.xml:1481
+#: hardware.xml:1482
#, no-c-format
msgid ""
"Multiprocessor support &mdash; also called <quote>symmetric multiprocessing</"
@@ -2155,7 +2156,7 @@ msgstr ""
"装,因为非 SMP 的内核也能在 SMP 的系统下启动,只不过内核只使用第一个 CPU。"
#. Tag: para
-#: hardware.xml:1491
+#: hardware.xml:1492
#, no-c-format
msgid ""
"In order to take advantage of multiple processors, you should check to see "
@@ -2166,7 +2167,7 @@ msgstr ""
"一个合适的内核软件包。"
#. Tag: para
-#: hardware.xml:1497
+#: hardware.xml:1498
#, no-c-format
msgid ""
"You can also build your own customized kernel to support SMP.<phrase arch="
@@ -2181,14 +2182,14 @@ msgstr ""
"<quote>&smp-config-option;</quote>。</phrase>"
#. Tag: title
-#: hardware.xml:1508
+#: hardware.xml:1509
#, fuzzy, no-c-format
#| msgid "Graphics Card Support"
msgid "Graphics Hardware Support"
msgstr "图形卡支持"
#. Tag: para
-#: hardware.xml:1509
+#: hardware.xml:1510
#, fuzzy, no-c-format
#| msgid ""
#| "&debian;'s support for graphical interfaces is determined by the "
@@ -2218,7 +2219,7 @@ msgstr ""
"功能也需要安装额外的固件,但这是罕有的例子。"
#. Tag: para
-#: hardware.xml:1521
+#: hardware.xml:1522
#, no-c-format
msgid ""
"On modern PCs, having a graphical display usually works out of the box. In "
@@ -2230,7 +2231,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:1532
+#: hardware.xml:1533
#, no-c-format
msgid ""
"Nearly all ARM machines have the graphics hardware built-in, rather than "
@@ -2246,7 +2247,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: hardware.xml:1546
+#: hardware.xml:1547
#, fuzzy, no-c-format
#| msgid ""
#| "Details on supported graphics cards and pointing devices can be found at "
@@ -2261,13 +2262,13 @@ msgstr ""
"&debian; &release; 包含 X.Org &x11ver; 版。"
#. Tag: para
-#: hardware.xml:1551
+#: hardware.xml:1552
#, no-c-format
msgid "The X.Org X Window System is only supported on the SGI Indy and the O2."
msgstr "X.Org 的 X 窗口系统仅支持 SGI Indy 和 O2。"
#. Tag: para
-#: hardware.xml:1556
+#: hardware.xml:1557
#, no-c-format
msgid ""
"Most graphics options commonly found on Sparc-based machines are supported. "
@@ -2286,7 +2287,7 @@ msgstr ""
"卡。"
#. Tag: para
-#: hardware.xml:1566
+#: hardware.xml:1567
#, no-c-format
msgid ""
"It is not uncommon for a Sparc machine to have two graphics cards in a "
@@ -2309,13 +2310,13 @@ msgstr ""
"自动激活串口控制台。"
#. Tag: title
-#: hardware.xml:1588
+#: hardware.xml:1589
#, no-c-format
msgid "Network Connectivity Hardware"
msgstr "网络连接硬件"
#. Tag: para
-#: hardware.xml:1589
+#: hardware.xml:1590
#, no-c-format
msgid ""
"Almost any network interface card (NIC) supported by the &arch-kernel; "
@@ -2330,7 +2331,7 @@ msgstr ""
"很好。</phrase>"
#. Tag: para
-#: hardware.xml:1599
+#: hardware.xml:1600
#, no-c-format
msgid ""
"This includes a lot of generic PCI cards (for systems that have PCI) and the "
@@ -2338,61 +2339,61 @@ msgid ""
msgstr "这包括一些通用 PCI 卡(对于支持 PCI 的系统)和来自 Sun 的网卡:"
#. Tag: para
-#: hardware.xml:1605
+#: hardware.xml:1606
#, no-c-format
msgid "Sun LANCE"
msgstr "Sun LANCE"
#. Tag: para
-#: hardware.xml:1610
+#: hardware.xml:1611
#, no-c-format
msgid "Sun Happy Meal"
msgstr "Sun Happy Meal"
#. Tag: para
-#: hardware.xml:1615
+#: hardware.xml:1616
#, no-c-format
msgid "Sun BigMAC"
msgstr "Sun BigMAC"
#. Tag: para
-#: hardware.xml:1620
+#: hardware.xml:1621
#, no-c-format
msgid "Sun QuadEthernet"
msgstr "Sun QuadEthernet"
#. Tag: para
-#: hardware.xml:1625
+#: hardware.xml:1626
#, no-c-format
msgid "MyriCOM Gigabit Ethernet"
msgstr "MyriCOM Gigabit Ethernet"
#. Tag: para
-#: hardware.xml:1632
+#: hardware.xml:1633
#, no-c-format
msgid "The list of supported network devices is:"
msgstr "支持的网络设备有:"
#. Tag: para
-#: hardware.xml:1637
+#: hardware.xml:1638
#, no-c-format
msgid "Channel to Channel (CTC) and ESCON connection (real or emulated)"
msgstr "Channel to Channel (CTC) 和 ESCON connection (实际或模拟)"
#. Tag: para
-#: hardware.xml:1642
+#: hardware.xml:1643
#, no-c-format
msgid "OSA-2 Token Ring/Ethernet and OSA-Express Fast Ethernet (non-QDIO)"
msgstr "OSA-2 Token Ring/Ethernet 和 OSA-Express Fast Ethernet (non-QDIO)"
#. Tag: para
-#: hardware.xml:1647
+#: hardware.xml:1648
#, no-c-format
msgid "OSA-Express in QDIO mode, HiperSockets and Guest-LANs"
msgstr "QDIO 模式的 OSA-Express,HiperSockets 和 Guest-LANs"
#. Tag: para
-#: hardware.xml:1656
+#: hardware.xml:1657
#, no-c-format
msgid ""
"On &arch-title;, most built-in Ethernet devices are supported and modules "
@@ -2402,19 +2403,19 @@ msgstr ""
"块。"
#. Tag: para
-#: hardware.xml:1661
+#: hardware.xml:1662
#, no-c-format
msgid "ISDN is supported, but not during the installation."
msgstr "ISDN 虽也获得支持,不过不能在安装阶段使用。"
#. Tag: title
-#: hardware.xml:1668
+#: hardware.xml:1669
#, no-c-format
msgid "Wireless Network Cards"
msgstr "无线网卡"
#. Tag: para
-#: hardware.xml:1669
+#: hardware.xml:1670
#, no-c-format
msgid ""
"Wireless networking is in general supported as well and a growing number of "
@@ -2425,7 +2426,7 @@ msgstr ""
"核能支持的无线网卡也越来越多。"
#. Tag: para
-#: hardware.xml:1676
+#: hardware.xml:1677
#, no-c-format
msgid ""
"If firmware is needed, the installer will prompt you to load firmware. See "
@@ -2436,7 +2437,7 @@ msgstr ""
"> 了解如何在安装过程中加载固件的更多信息。"
#. Tag: para
-#: hardware.xml:1681
+#: hardware.xml:1682
#, no-c-format
msgid ""
"Wireless NICs that are not supported by the official &arch-kernel; kernel "
@@ -2447,7 +2448,7 @@ msgstr ""
"作,但是却不能在安装过程中使用。"
#. Tag: para
-#: hardware.xml:1686
+#: hardware.xml:1687
#, no-c-format
msgid ""
"If there is a problem with wireless and there is no other NIC you can use "
@@ -2463,7 +2464,7 @@ msgstr ""
"件,并手动配置网络。"
#. Tag: para
-#: hardware.xml:1696
+#: hardware.xml:1697
#, no-c-format
msgid ""
"In some cases the driver you need may not be available as a &debian; "
@@ -2479,13 +2480,13 @@ msgstr ""
"classname> 软件包,它让您使用 Windows 的驱动程序。</phrase>"
#. Tag: title
-#: hardware.xml:1710
+#: hardware.xml:1711
#, no-c-format
msgid "Known Issues for &arch-title;"
msgstr "&arch-title; 的一些已知问题"
#. Tag: para
-#: hardware.xml:1711
+#: hardware.xml:1712
#, no-c-format
msgid ""
"There are a couple of issues with specific network cards that are worth "
@@ -2493,13 +2494,13 @@ msgid ""
msgstr "有些特定的网卡事项需要在此提及。"
#. Tag: title
-#: hardware.xml:1718
+#: hardware.xml:1719
#, no-c-format
msgid "Conflict between tulip and dfme drivers"
msgstr "tulip 和 dfme 驱动程序之间的冲突"
#. Tag: para
-#: hardware.xml:1720
+#: hardware.xml:1721
#, no-c-format
msgid ""
"There are various PCI network cards that have the same PCI identification, "
@@ -2515,7 +2516,7 @@ msgstr ""
"如果使用不正确的驱动程序,网卡可能不工作,或者工作不正常。"
#. Tag: para
-#: hardware.xml:1730
+#: hardware.xml:1731
#, no-c-format
msgid ""
"This is a common problem on Netra systems with a Davicom (DEC-Tulip "
@@ -2528,7 +2529,7 @@ msgstr ""
"\"module-blacklist\"/> 将错误的驱动模块加入黑名单,以阻止这种情况发生。"
#. Tag: para
-#: hardware.xml:1738
+#: hardware.xml:1739
#, no-c-format
msgid ""
"An alternative solution during the installation is to switch to a shell and "
@@ -2545,13 +2546,13 @@ msgstr ""
"之后错误的模块可能还会加载。"
#. Tag: title
-#: hardware.xml:1751
+#: hardware.xml:1752
#, no-c-format
msgid "Sun B100 blade"
msgstr "Sun B100 blade"
#. Tag: para
-#: hardware.xml:1753
+#: hardware.xml:1754
#, no-c-format
msgid ""
"The <literal>cassini</literal> network driver does not work with Sun B100 "
@@ -2560,13 +2561,13 @@ msgstr ""
"<literal>cassini</literal> 网络驱动程序不能工作在 Sun B100 刀片系统上。"
#. Tag: title
-#: hardware.xml:1768
+#: hardware.xml:1769
#, no-c-format
msgid "Braille Displays"
msgstr "盲文点触设备(Braille Display)"
#. Tag: para
-#: hardware.xml:1769
+#: hardware.xml:1770
#, no-c-format
msgid ""
"Support for braille displays is determined by the underlying support found "
@@ -2583,13 +2584,13 @@ msgstr ""
"的 <classname>brltty</classname> 版本是 &brlttyver; 。"
#. Tag: title
-#: hardware.xml:1783
+#: hardware.xml:1784
#, no-c-format
msgid "Hardware Speech Synthesis"
msgstr "硬件语音合成(Hardware Speech Synthesis)"
#. Tag: para
-#: hardware.xml:1784
+#: hardware.xml:1785
#, no-c-format
msgid ""
"Support for hardware speech synthesis devices is determined by the "
@@ -2608,13 +2609,13 @@ msgstr ""
"gnu; &release; 配备的 <classname>speakup</classname> 版本是 &speakupver;。"
#. Tag: title
-#: hardware.xml:1804
+#: hardware.xml:1805
#, no-c-format
msgid "Peripherals and Other Hardware"
msgstr "外围设备与其他硬件"
#. Tag: para
-#: hardware.xml:1805
+#: hardware.xml:1806
#, fuzzy, no-c-format
#| msgid ""
#| "&arch-kernel; supports a large variety of hardware devices such as mice, "
@@ -2629,7 +2630,7 @@ msgstr ""
"设备。然而,在安装系统的时候,并不需要其中的大部分设备。"
#. Tag: para
-#: hardware.xml:1811
+#: hardware.xml:1812
#, no-c-format
msgid ""
"USB hardware generally works fine. On some very old PC systems some USB "
@@ -2642,7 +2643,7 @@ msgstr ""
"要任何额外的配置就能工作。"
#. Tag: para
-#: hardware.xml:1820
+#: hardware.xml:1821
#, no-c-format
msgid ""
"Package installations from XPRAM and tape are not supported by this system. "
@@ -2653,13 +2654,13 @@ msgstr ""
"通过 NFS、HTTP、FTP 从网络上取得。"
#. Tag: title
-#: hardware.xml:1833
+#: hardware.xml:1834
#, no-c-format
msgid "Devices Requiring Firmware"
msgstr "需要固件的设备"
#. Tag: para
-#: hardware.xml:1834
+#: hardware.xml:1835
#, no-c-format
msgid ""
"Besides the availability of a device driver, some hardware also requires so-"
@@ -2678,7 +2679,7 @@ msgstr ""
"系统中。"
#. Tag: para
-#: hardware.xml:1845
+#: hardware.xml:1846
#, no-c-format
msgid ""
"On many older devices which require firmware to work, the firmware file was "
@@ -2692,7 +2693,7 @@ msgstr ""
"主系统上传到设备中。"
#. Tag: para
-#: hardware.xml:1853
+#: hardware.xml:1854
#, no-c-format
msgid ""
"In most cases firmware is non-free according to the criteria used by the "
@@ -2707,7 +2708,7 @@ msgstr ""
"gnu; 可以合法地发布固件,它通常被单独地放置在仓库的 non-free 区里面。"
#. Tag: para
-#: hardware.xml:1862
+#: hardware.xml:1863
#, no-c-format
msgid ""
"However, this does not mean that such hardware cannot be used during an "
@@ -2722,7 +2723,7 @@ msgstr ""
"\"loading-firmware\"/> 了解如何在安装时加载固件文件或软件包的的详细信息。"
#. Tag: para
-#: hardware.xml:1871
+#: hardware.xml:1872
#, no-c-format
msgid ""
"If the &d-i; prompts for a firmware file and you do not have this firmware "
@@ -2739,13 +2740,13 @@ msgstr ""
"卡上)。"
#. Tag: title
-#: hardware.xml:1888
+#: hardware.xml:1889
#, no-c-format
msgid "Purchasing Hardware Specifically for GNU/&arch-kernel;"
msgstr "特别为 GNU/&arch-kernel; 采购硬件"
#. Tag: para
-#: hardware.xml:1890
+#: hardware.xml:1891
#, no-c-format
msgid ""
"There are several vendors, who ship systems with &debian; or other "
@@ -2759,7 +2760,7 @@ msgstr ""
"心,因为这些硬件都已经确保能被 GNU/Linux 很好地支持。"
#. Tag: para
-#: hardware.xml:1898
+#: hardware.xml:1899
#, no-c-format
msgid ""
"If you do have to buy a machine with Windows bundled, carefully read the "
@@ -2773,7 +2774,7 @@ msgstr ""
"<quote>windows refund</quote> 搜索可以查到一些有益的信息。"
#. Tag: para
-#: hardware.xml:1906
+#: hardware.xml:1907
#, no-c-format
msgid ""
"Whether or not you are purchasing a system with &arch-kernel; bundled, or "
@@ -2789,13 +2790,13 @@ msgstr ""
"&arch-kernel; 友好的硬件销售商。"
#. Tag: title
-#: hardware.xml:1917
+#: hardware.xml:1918
#, no-c-format
msgid "Avoid Proprietary or Closed Hardware"
msgstr "避免专有或封闭的硬件"
#. Tag: para
-#: hardware.xml:1918
+#: hardware.xml:1919
#, no-c-format
msgid ""
"Some hardware manufacturers simply won't tell us how to write drivers for "
@@ -2810,7 +2811,7 @@ msgstr ""
"于我们未被授权使用这些文档,造成它们无法在 &arch-kernel; 下工作。"
#. Tag: para
-#: hardware.xml:1928
+#: hardware.xml:1929
#, no-c-format
msgid ""
"In many cases there are standards (or at least some de-facto standards) "
@@ -2830,7 +2831,7 @@ msgstr ""
"所有设备都是符合标准的。"
#. Tag: para
-#: hardware.xml:1940
+#: hardware.xml:1941
#, no-c-format
msgid ""
"In other fields, among them e.g. printers, this is unfortunately not the "
@@ -2848,7 +2849,7 @@ msgstr ""
"于厂商提供的闭源驱动程序。"
#. Tag: para
-#: hardware.xml:1951
+#: hardware.xml:1952
#, no-c-format
msgid ""
"Even if there is a vendor-provided closed-source driver for such hardware "
@@ -2869,7 +2870,7 @@ msgstr ""
"统升级造成的不便。"
#. Tag: para
-#: hardware.xml:1964
+#: hardware.xml:1965
#, no-c-format
msgid ""
"You can help improve this situation by encouraging manufacturers of closed "
@@ -2880,13 +2881,13 @@ msgstr ""
"来改变这种状况。"
#. Tag: title
-#: hardware.xml:1979
+#: hardware.xml:1980
#, no-c-format
msgid "Installation Media"
msgstr "安装介质"
#. Tag: para
-#: hardware.xml:1981
+#: hardware.xml:1982
#, no-c-format
msgid ""
"This section will help you determine which different media types you can use "
@@ -2900,13 +2901,13 @@ msgstr ""
"读那一章的时候,可能需要回过头来参考本页。"
#. Tag: title
-#: hardware.xml:1991
+#: hardware.xml:1992
#, no-c-format
msgid "Floppies"
msgstr "软盘"
#. Tag: para
-#: hardware.xml:1992
+#: hardware.xml:1993
#, no-c-format
msgid ""
"In some cases, you'll have to do your first boot from floppy disks. "
@@ -2917,20 +2918,20 @@ msgstr ""
"(1440 千字节)软驱。"
#. Tag: para
-#: hardware.xml:1998
+#: hardware.xml:1999
#, no-c-format
msgid "For CHRP, floppy support is currently broken."
msgstr "用于 CHRP 的软盘支持已经被停止。"
#. Tag: title
-#: hardware.xml:2005
+#: hardware.xml:2006
#, fuzzy, no-c-format
#| msgid "CD-ROM/DVD-ROM"
msgid "CD-ROM/DVD-ROM/BD-ROM"
msgstr "CD-ROM/DVD-ROM"
#. Tag: para
-#: hardware.xml:2007
+#: hardware.xml:2008
#, fuzzy, no-c-format
#| msgid ""
#| "Whenever you see <quote>CD-ROM</quote> in this manual, it applies to both "
@@ -2945,13 +2946,13 @@ msgstr ""
"作系统的角度看,它们所用的技术是相同的。"
#. Tag: para
-#: hardware.xml:2013
+#: hardware.xml:2014
#, no-c-format
msgid "CD-ROM based installation is supported for most architectures."
msgstr "大多数体系都支持基于 CD-ROM 的安装程序"
#. Tag: para
-#: hardware.xml:2017
+#: hardware.xml:2018
#, fuzzy, no-c-format
#| msgid ""
#| "USB CD-ROM drives are also supported, as are FireWire devices that are "
@@ -2964,7 +2965,7 @@ msgstr ""
"获得支持。"
#. Tag: para
-#: hardware.xml:2032
+#: hardware.xml:2033
#, no-c-format
msgid ""
"On SGI machines, booting from CD-ROM requires a SCSI CD-ROM drive capable of "
@@ -2982,13 +2983,13 @@ msgstr ""
"固件上选择 <quote>System installation</quote> 项。"
#. Tag: title
-#: hardware.xml:2046
+#: hardware.xml:2047
#, no-c-format
msgid "USB Memory Stick"
msgstr "U 盘"
#. Tag: para
-#: hardware.xml:2048
+#: hardware.xml:2049
#, no-c-format
msgid ""
"USB flash disks a.k.a. USB memory sticks have become a commonly used and "
@@ -3003,13 +3004,13 @@ msgstr ""
"CD/DVD-ROM 驱动器,从 U 盘引导是安装操作系统的标准方法。"
#. Tag: title
-#: hardware.xml:2060
+#: hardware.xml:2061
#, no-c-format
msgid "Network"
msgstr "网络"
#. Tag: para
-#: hardware.xml:2062
+#: hardware.xml:2063
#, no-c-format
msgid ""
"The network can be used during the installation to retrieve files needed for "
@@ -3026,7 +3027,7 @@ msgstr ""
"用 ISDN 和 PPP。"
#. Tag: para
-#: hardware.xml:2072
+#: hardware.xml:2073
#, no-c-format
msgid ""
"You can also <emphasis>boot</emphasis> the installation system over the "
@@ -3045,7 +3046,7 @@ msgstr ""
"安装技术。</phrase>"
#. Tag: para
-#: hardware.xml:2085
+#: hardware.xml:2086
#, no-c-format
msgid ""
"Diskless installation, using network booting from a local area network and "
@@ -3055,13 +3056,13 @@ msgstr ""
"择。"
#. Tag: title
-#: hardware.xml:2094
+#: hardware.xml:2095
#, no-c-format
msgid "Hard Disk"
msgstr "硬盘"
#. Tag: para
-#: hardware.xml:2096
+#: hardware.xml:2097
#, no-c-format
msgid ""
"Booting the installation system directly from a hard disk is another option "
@@ -3073,7 +3074,7 @@ msgstr ""
"安装程序。该方式建议只用在没有其他安装方式可以选的情况下。"
#. Tag: para
-#: hardware.xml:2103
+#: hardware.xml:2104
#, no-c-format
msgid ""
"Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -3083,13 +3084,13 @@ msgstr ""
"(UFS slices)进行安装。"
#. Tag: title
-#: hardware.xml:2112
+#: hardware.xml:2113
#, no-c-format
msgid "Un*x or GNU system"
msgstr "Un*x 或 GNU 系统"
#. Tag: para
-#: hardware.xml:2114
+#: hardware.xml:2115
#, no-c-format
msgid ""
"If you are running another Unix-like system, you could use it to install "
@@ -3106,13 +3107,13 @@ msgstr ""
">。这种安装方法只建议给高级用户在没有其他安装方法可选的情况下使用。"
#. Tag: title
-#: hardware.xml:2127
+#: hardware.xml:2128
#, no-c-format
msgid "Supported Storage Systems"
msgstr "受支持的存储系统"
#. Tag: para
-#: hardware.xml:2129
+#: hardware.xml:2130
#, no-c-format
msgid ""
"The &debian; installer contains a kernel which is built to maximize the "
@@ -3120,7 +3121,7 @@ msgid ""
msgstr "&debian; 安装程序包含的内核能运行在最大数量的系统上。"
#. Tag: para
-#: hardware.xml:2133
+#: hardware.xml:2134
#, no-c-format
msgid ""
"Generally, the &debian; installation system includes support for IDE (also "
@@ -3132,7 +3133,7 @@ msgstr ""
"动器、USB 和 FireWire。支持的文件系统有 FAT、Win-32 FAT 扩展(VFAT) 和 NTFS。"
#. Tag: para
-#: hardware.xml:2150
+#: hardware.xml:2151
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -3154,7 +3155,7 @@ msgstr ""
"以了解更多关于 SPARC 硬件被 Linux 内核支持的情况。"
#. Tag: para
-#: hardware.xml:2183
+#: hardware.xml:2184
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -3165,7 +3166,7 @@ msgstr ""
"支持 CHRP 系统上的软盘。"
#. Tag: para
-#: hardware.xml:2189
+#: hardware.xml:2190
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -3176,7 +3177,7 @@ msgstr ""
"支持软驱。"
#. Tag: para
-#: hardware.xml:2195
+#: hardware.xml:2196
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -3184,7 +3185,7 @@ msgid ""
msgstr "所有 Linux 内核支持的存储系统也都被启动系统所支持。"
#. Tag: para
-#: hardware.xml:2200
+#: hardware.xml:2201
#, no-c-format
msgid ""
"Any storage system supported by the Linux kernel is also supported by the "
@@ -3196,13 +3197,13 @@ msgstr ""
"持。"
#. Tag: title
-#: hardware.xml:2217
+#: hardware.xml:2218
#, no-c-format
msgid "Memory and Disk Space Requirements"
msgstr "内存与磁盘空间的需求"
#. Tag: para
-#: hardware.xml:2219
+#: hardware.xml:2220
#, no-c-format
msgid ""
"You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -3215,7 +3216,7 @@ msgstr ""
"hardware-reqts\"/>。"
#. Tag: para
-#: hardware.xml:2226
+#: hardware.xml:2227
#, fuzzy, no-c-format
#| msgid ""
#| "Installation on systems with less memory<footnote condition=\"gtk\"> "
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index 8695e6562..302db009b 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2015-04-15 20:29+0000\n"
+"POT-Creation-Date: 2016-04-08 20:25+0000\n"
"PO-Revision-Date: 2012-11-26 00:19+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -186,13 +186,13 @@ msgstr ""
"\">MANIFEST</ulink> 文件列出了每一个映像及其用途。"
#. Tag: title
-#: install-methods.xml:151
+#: install-methods.xml:121
#, no-c-format
msgid "Kurobox Pro Installation Files"
msgstr "Kurobox Pro 安装文件"
#. Tag: para
-#: install-methods.xml:152
+#: install-methods.xml:122
#, no-c-format
msgid ""
"The Kurobox Pro requires a kernel and ramdisk on an ext2 partition on the "
@@ -203,13 +203,13 @@ msgstr ""
"这些映象可以从 &kuroboxpro-firmware-img; 获得。"
#. Tag: title
-#: install-methods.xml:162
+#: install-methods.xml:132
#, no-c-format
msgid "HP mv2120 Installation Files"
msgstr "HP mv2120 安装文件"
#. Tag: para
-#: install-methods.xml:163
+#: install-methods.xml:133
#, no-c-format
msgid ""
"A firmware image is provided for the HP mv2120 which will automatically boot "
@@ -224,18 +224,25 @@ msgstr ""
"映象。"
#. Tag: title
-#: install-methods.xml:175
+#: install-methods.xml:145
#, no-c-format
msgid "QNAP Turbo Station Installation Files"
msgstr "QNAP Turbo Station 安装文件"
#. Tag: para
-#: install-methods.xml:176
-#, no-c-format
+#: install-methods.xml:146
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The installation files for the QNAP Turbo Station consist of a kernel and "
+#| "ramdisk as well as a script to write these images to flash. You can "
+#| "obtain the installation files for QNAP TS-11x, TS-21x and TS-41x models "
+#| "from &qnap-kirkwood-firmware-img;."
msgid ""
"The installation files for the QNAP Turbo Station consist of a kernel and "
"ramdisk as well as a script to write these images to flash. You can obtain "
-"the installation files for QNAP TS-11x, TS-21x and TS-41x models from &qnap-"
+"the installation files for QNAP TS-109, TS-209, TS-409 and TS-409U models "
+"from &qnap-orion-firmware-img;. The installation files for QNAP TS-11x/"
+"TS-12x, HS-210, TS-21x/TS-22x and TS-41x/TS-41x models can be found at &qnap-"
"kirkwood-firmware-img;."
msgstr ""
"QNAP Turbo Station 安装文件包括内核和 ramdisk,以及将这些映像写入 flash 的脚"
@@ -243,13 +250,13 @@ msgstr ""
"img; 取得。"
#. Tag: title
-#: install-methods.xml:187
+#: install-methods.xml:159
#, no-c-format
msgid "Plug Computer and OpenRD Installation Files"
msgstr "Plug Computer 和 OpenRD 安装文件"
#. Tag: para
-#: install-methods.xml:188
+#: install-methods.xml:160
#, no-c-format
msgid ""
"The installation files for plug computers (SheevaPlug, GuruPlug, DreamPlug "
@@ -261,13 +268,13 @@ msgstr ""
"得这些文件。"
#. Tag: title
-#: install-methods.xml:198
+#: install-methods.xml:170
#, no-c-format
msgid "LaCie NASes Installation Files"
msgstr "LaCie NASes 安装文件"
#. Tag: para
-#: install-methods.xml:199
+#: install-methods.xml:171
#, no-c-format
msgid ""
"The installation files for LaCie NASes (Network Space v2, Network Space Max "
@@ -280,14 +287,14 @@ msgstr ""
"核和 initrd。您可以从 &lacie-kirkwood-firmware-img; 获取这些文件。"
#. Tag: title
-#: install-methods.xml:210
+#: install-methods.xml:182
#, fuzzy, no-c-format
#| msgid "QNAP Turbo Station Installation Files"
msgid "Armhf Multiplatform Installation Files"
msgstr "QNAP Turbo Station 安装文件"
#. Tag: para
-#: install-methods.xml:211
+#: install-methods.xml:183
#, no-c-format
msgid ""
"The installation files for systems supported by the armhf multiplatform "
@@ -301,20 +308,20 @@ msgid ""
msgstr ""
#. Tag: para
-#: install-methods.xml:223
+#: install-methods.xml:195
#, no-c-format
msgid ""
"U-boot images for various armhf platforms are available at &armmp-uboot-img;."
msgstr ""
#. Tag: title
-#: install-methods.xml:269
+#: install-methods.xml:241
#, no-c-format
msgid "Creating Floppies from Disk Images"
msgstr "从软盘映像创建引导软盘"
#. Tag: para
-#: install-methods.xml:270
+#: install-methods.xml:242
#, no-c-format
msgid ""
"Bootable floppy disks are generally used as a last resort to boot the "
@@ -324,7 +331,7 @@ msgstr ""
"最后一种方法。"
#. Tag: para
-#: install-methods.xml:275
+#: install-methods.xml:247
#, no-c-format
msgid ""
"Booting the installer from floppy disk reportedly fails on Mac USB floppy "
@@ -332,7 +339,7 @@ msgid ""
msgstr "有报告说 Mac 上的 USB 软盘驱动器安装程序软盘引导失败。"
#. Tag: para
-#: install-methods.xml:280
+#: install-methods.xml:252
#, no-c-format
msgid ""
"Disk images are files containing the complete contents of a floppy disk in "
@@ -350,7 +357,7 @@ msgstr ""
"按扇区复制</emphasis>到软盘中。"
#. Tag: para
-#: install-methods.xml:291
+#: install-methods.xml:263
#, no-c-format
msgid ""
"There are different techniques for creating floppies from disk images. This "
@@ -361,7 +368,7 @@ msgstr ""
"像创建引导软盘。"
#. Tag: para
-#: install-methods.xml:297
+#: install-methods.xml:269
#, no-c-format
msgid ""
"Before you can create the floppies, you will first need to download them "
@@ -375,7 +382,7 @@ msgstr ""
"DVD,软盘映像可能已经包含在 CD/DVD 上面。</phrase>"
#. Tag: para
-#: install-methods.xml:305
+#: install-methods.xml:277
#, no-c-format
msgid ""
"No matter which method you use to create your floppies, you should remember "
@@ -386,13 +393,13 @@ msgstr ""
"保内容不会在无意被抹掉。"
#. Tag: title
-#: install-methods.xml:313
+#: install-methods.xml:285
#, no-c-format
msgid "Writing Disk Images From a Linux or Unix System"
msgstr "从 Linux 或者 Unix 系统写软盘映像"
#. Tag: para
-#: install-methods.xml:314
+#: install-methods.xml:286
#, no-c-format
msgid ""
"To write the floppy disk image files to the floppy disks, you will probably "
@@ -424,7 +431,7 @@ msgstr ""
"(Solaris 系统中使用 <command>eject</command> 命令,请参见其手册)</phrase>。"
#. Tag: para
-#: install-methods.xml:335
+#: install-methods.xml:307
#, no-c-format
msgid ""
"Some systems attempt to automatically mount a floppy disk when you place it "
@@ -454,7 +461,7 @@ msgstr ""
"统,请咨询您的系统管理员)。</phrase>"
#. Tag: para
-#: install-methods.xml:356
+#: install-methods.xml:328
#, no-c-format
msgid ""
"If writing a floppy on powerpc Linux, you will need to eject it. The "
@@ -465,13 +472,13 @@ msgstr ""
"command> 命令能够很好地对此进行控制,当然您可能需要先安装它。"
#. Tag: title
-#: install-methods.xml:374
+#: install-methods.xml:346
#, no-c-format
msgid "Writing Disk Images From DOS, Windows, or OS/2"
msgstr "在 DOS、Windows 或者 OS/2 下写磁盘映像"
#. Tag: para
-#: install-methods.xml:376
+#: install-methods.xml:348
#, no-c-format
msgid ""
"If you have access to an i386 or amd64 machine, you can use one of the "
@@ -480,7 +487,7 @@ msgstr ""
"如果您能操作一台 i386 或 amd64 机器,可以使用如下方法之一往软盘复制映像文件。"
#. Tag: para
-#: install-methods.xml:381
+#: install-methods.xml:353
#, no-c-format
msgid ""
"The <command>rawrite1</command> and <command>rawrite2</command> programs can "
@@ -494,7 +501,7 @@ msgstr ""
"或者在文件浏览器中双击使用这些程序是<emphasis>不能</emphasis>运行的。"
#. Tag: para
-#: install-methods.xml:389
+#: install-methods.xml:361
#, no-c-format
msgid ""
"The <command>rwwrtwin</command> program runs on Windows 95, NT, 98, 2000, "
@@ -505,7 +512,7 @@ msgstr ""
"可能最新的版本上运行。要使用它您需要解压 diskio.dll 至相同目录下。"
#. Tag: para
-#: install-methods.xml:395
+#: install-methods.xml:367
#, no-c-format
msgid ""
"These tools can be found on the Official &debian; CD-ROMs under the "
@@ -515,13 +522,13 @@ msgstr ""
"下。"
#. Tag: title
-#: install-methods.xml:408
+#: install-methods.xml:380
#, no-c-format
msgid "Writing Disk Images From MacOS"
msgstr "在 MacOS 上写磁盘映像"
#. Tag: para
-#: install-methods.xml:409
+#: install-methods.xml:381
#, no-c-format
msgid ""
"An AppleScript, <application>Make &debian; Floppy</application>, is "
@@ -541,7 +548,7 @@ msgstr ""
"您确认的确想要清空磁盘并写入磁盘映像。"
#. Tag: para
-#: install-methods.xml:420
+#: install-methods.xml:392
#, no-c-format
msgid ""
"You can also use the MacOS utility <command>Disk Copy</command> directly, or "
@@ -554,13 +561,13 @@ msgstr ""
"您可以使用以下方法之一来利用这些工具将磁盘映像写入软盘。"
#. Tag: title
-#: install-methods.xml:431
+#: install-methods.xml:403
#, no-c-format
msgid "Writing Disk Images with <command>Disk Copy</command>"
msgstr "写磁盘映像:使用<command>Disk Copy</command>"
#. Tag: para
-#: install-methods.xml:432
+#: install-methods.xml:404
#, no-c-format
msgid ""
"If you are creating the floppy image from files which were originally on the "
@@ -573,7 +580,7 @@ msgstr ""
"下载映像文件的情况。"
#. Tag: para
-#: install-methods.xml:441
+#: install-methods.xml:413
#, no-c-format
msgid ""
"Obtain <ulink url=\"&url-powerpc-creator-changer;\">Creator-Changer</ulink> "
@@ -583,7 +590,7 @@ msgstr ""
"且用它打开 <filename>root.bin</filename> 文件。"
#. Tag: para
-#: install-methods.xml:448
+#: install-methods.xml:420
#, no-c-format
msgid ""
"Change the Creator to <userinput>ddsk</userinput> (Disk Copy), and the Type "
@@ -594,7 +601,7 @@ msgstr ""
"<userinput>DDim</userinput> (binary floppy image)。注意此处大小写敏感。"
#. Tag: para
-#: install-methods.xml:455
+#: install-methods.xml:427
#, no-c-format
msgid ""
"<emphasis>Important:</emphasis> In the Finder, use <userinput>Get Info</"
@@ -609,7 +616,7 @@ msgstr ""
"会删除引导区。"
#. Tag: para
-#: install-methods.xml:464
+#: install-methods.xml:436
#, no-c-format
msgid ""
"Obtain <command>Disk Copy</command>; if you have a MacOS system or CD it "
@@ -621,7 +628,7 @@ msgstr ""
"ulink>。"
#. Tag: para
-#: install-methods.xml:471
+#: install-methods.xml:443
#, no-c-format
msgid ""
"Run <command>Disk Copy</command>, and select <menuchoice> "
@@ -636,13 +643,13 @@ msgstr ""
"删除它。完成后它应该会弹出软盘。"
#. Tag: title
-#: install-methods.xml:486
+#: install-methods.xml:458
#, no-c-format
msgid "Writing Disk Images with <command>suntar</command>"
msgstr "写磁盘映像:使用<command>suntar</command>"
#. Tag: para
-#: install-methods.xml:490
+#: install-methods.xml:462
#, no-c-format
msgid ""
"Obtain <command>suntar</command> from <ulink url=\"&url-powerpc-suntar;\"> </"
@@ -655,21 +662,21 @@ msgstr ""
"userinput> 菜单中选择<quote>Overwrite Sectors...</quote>。"
#. Tag: para
-#: install-methods.xml:498
+#: install-methods.xml:470
#, no-c-format
msgid ""
"Insert the floppy disk as requested, then hit &enterkey; (start at sector 0)."
msgstr "按照要求插入软盘,然后点击 &enterkey; (从0扇区开始)。"
#. Tag: para
-#: install-methods.xml:504
+#: install-methods.xml:476
#, no-c-format
msgid ""
"Select the <filename>root.bin</filename> file in the file-opening dialog."
msgstr "在打开文件对话框中选择 <filename>root.bin</filename> 文件。"
#. Tag: para
-#: install-methods.xml:509
+#: install-methods.xml:481
#, no-c-format
msgid ""
"After the floppy has been created successfully, select <menuchoice> "
@@ -682,7 +689,7 @@ msgstr ""
"换别的软盘试试。"
#. Tag: para
-#: install-methods.xml:517
+#: install-methods.xml:489
#, no-c-format
msgid ""
"Before using the floppy you created, <emphasis>set the write protect tab</"
@@ -693,13 +700,13 @@ msgstr ""
"然在 MacOS 中挂载了它,MacOS 将会将其毁坏。"
#. Tag: title
-#: install-methods.xml:536
+#: install-methods.xml:508
#, no-c-format
msgid "Preparing Files for USB Memory Stick Booting"
msgstr "为从 U 盘引导准备文件"
#. Tag: para
-#: install-methods.xml:538
+#: install-methods.xml:510
#, no-c-format
msgid ""
"To prepare the USB stick, you will need a system where GNU/Linux is already "
@@ -720,7 +727,7 @@ msgstr ""
"护开关。"
#. Tag: para
-#: install-methods.xml:551
+#: install-methods.xml:523
#, no-c-format
msgid ""
"The procedures described in this section will destroy anything already on "
@@ -732,13 +739,13 @@ msgstr ""
"搞错,比如写成硬盘,将造成该设备上的所有信息丢失。"
#. Tag: title
-#: install-methods.xml:561
+#: install-methods.xml:533
#, no-c-format
msgid "Preparing a USB stick using a hybrid CD or DVD image"
msgstr "使用混合 CD 或 DVD 映像制作 U 盘"
#. Tag: para
-#: install-methods.xml:562
+#: install-methods.xml:534
#, fuzzy, no-c-format
#| msgid ""
#| "Debian CD and DVD images can now be written directly a USB stick, which "
@@ -756,7 +763,7 @@ msgstr ""
"cdrom\"/> 获取 CD 或 DVD 映像。"
#. Tag: para
-#: install-methods.xml:570
+#: install-methods.xml:542
#, no-c-format
msgid ""
"Alternatively, for very small USB sticks, only a few megabytes in size, you "
@@ -769,7 +776,7 @@ msgstr ""
">)。"
#. Tag: para
-#: install-methods.xml:577
+#: install-methods.xml:549
#, fuzzy, no-c-format
#| msgid ""
#| "The CD or DVD image you choose should be written directly to the USB "
@@ -794,7 +801,7 @@ msgstr ""
"U 盘已经卸载:"
#. Tag: para
-#: install-methods.xml:591
+#: install-methods.xml:563
#, no-c-format
msgid ""
"The image must be written to the whole-disk device and not a partition, e."
@@ -803,7 +810,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: install-methods.xml:597
+#: install-methods.xml:569
#, no-c-format
msgid ""
"Simply writing the CD or DVD image to USB like this should work fine for "
@@ -814,7 +821,7 @@ msgstr ""
"项主要提供给有特殊需要的用户。"
#. Tag: para
-#: install-methods.xml:605
+#: install-methods.xml:577
#, no-c-format
msgid ""
"The hybrid image on the stick does not occupy all the storage space, so it "
@@ -824,7 +831,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: install-methods.xml:613
+#: install-methods.xml:585
#, no-c-format
msgid ""
"Create a second, FAT partition on the stick, mount the partition and copy or "
@@ -832,7 +839,7 @@ msgid ""
msgstr ""
#. Tag: screen
-#: install-methods.xml:618
+#: install-methods.xml:590
#, no-c-format
msgid ""
"# mount /dev/<replaceable>sdX2</replaceable> /mnt\n"
@@ -848,7 +855,7 @@ msgstr ""
"# umount /mnt"
#. Tag: para
-#: install-methods.xml:620
+#: install-methods.xml:592
#, no-c-format
msgid ""
"You might have written the <filename>mini.iso</filename> to the USB stick. "
@@ -858,13 +865,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: install-methods.xml:634
+#: install-methods.xml:606
#, no-c-format
msgid "Manually copying files to the USB stick"
msgstr "手动复制文件到 U 盘。"
#. Tag: para
-#: install-methods.xml:635
+#: install-methods.xml:607
#, no-c-format
msgid ""
"An alternative way to set up your USB stick is to manually copy the "
@@ -876,7 +883,7 @@ msgstr ""
"可以使用较少容量,请参考 <xref linkend=\"usb-copy-flexible\"/>)。"
#. Tag: para
-#: install-methods.xml:642
+#: install-methods.xml:614
#, no-c-format
msgid ""
"There is an all-in-one file <filename>hd-media/boot.img.gz</filename> which "
@@ -891,7 +898,7 @@ msgstr ""
"classname> 和对应的配置文件</phrase>。"
#. Tag: para
-#: install-methods.xml:651
+#: install-methods.xml:623
#, no-c-format
msgid ""
"Note that, although convenient, this method does have one major "
@@ -905,19 +912,19 @@ msgstr ""
"量创建一个新的文件系统。"
#. Tag: para
-#: install-methods.xml:659
+#: install-methods.xml:631
#, no-c-format
msgid "To use this image simply extract it directly to your USB stick:"
msgstr "使用该映象只须将它直接解压到 U 盘:"
#. Tag: screen
-#: install-methods.xml:663
+#: install-methods.xml:635
#, no-c-format
msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sdX</replaceable>"
msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX</replaceable>"
#. Tag: para
-#: install-methods.xml:665
+#: install-methods.xml:637
#, no-c-format
msgid ""
"Create a partition of type \"Apple_Bootstrap\" on your USB stick using "
@@ -928,23 +935,23 @@ msgstr ""
"的 <userinput>C</userinput> 命令,并直接解压映象:"
#. Tag: screen
-#: install-methods.xml:671
+#: install-methods.xml:643
#, no-c-format
msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
#. Tag: para
-#: install-methods.xml:673
+#: install-methods.xml:645
#, 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 or full "
-"CD) to it. Unmount the stick (<userinput>umount /mnt</userinput>) and you "
-"are done."
+"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 "
+"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="
@@ -955,13 +962,13 @@ msgstr ""
"(<userinput>umount /mnt</userinput>) 就完成了。"
#. Tag: title
-#: install-methods.xml:690
+#: install-methods.xml:662
#, no-c-format
msgid "Manually copying files to the USB stick &mdash; the flexible way"
msgstr "手动复制文件到 U 盘 &mdash; 灵活的方法"
#. Tag: para
-#: install-methods.xml:691
+#: install-methods.xml:663
#, fuzzy, no-c-format
#| msgid ""
#| "If you like more flexibility or just want to know what's going on, you "
@@ -980,13 +987,13 @@ msgstr ""
"文件放到 U 盘。"
#. Tag: title
-#: install-methods.xml:706 install-methods.xml:828
+#: install-methods.xml:678 install-methods.xml:800
#, no-c-format
msgid "Partitioning the USB stick"
msgstr "给 U 盘分区"
#. Tag: para
-#: install-methods.xml:707
+#: install-methods.xml:679
#, no-c-format
msgid ""
"We will show how to set up the memory stick to use the first partition, "
@@ -994,7 +1001,7 @@ msgid ""
msgstr "我们将展示如何使用 U 盘的第一个分区,而不是整个设备。"
#. Tag: para
-#: install-methods.xml:712
+#: install-methods.xml:684
#, no-c-format
msgid ""
"Since most USB sticks come pre-configured with a single FAT16 partition, you "
@@ -1026,7 +1033,7 @@ msgstr ""
"&debian; 软件包内。"
#. Tag: para
-#: install-methods.xml:736
+#: install-methods.xml:708
#, no-c-format
msgid ""
"In order to start the kernel after booting from the USB stick, we will put a "
@@ -1043,7 +1050,7 @@ msgstr ""
"用来改变 boot loader 的配置文件。"
#. Tag: para
-#: install-methods.xml:746
+#: install-methods.xml:718
#, no-c-format
msgid ""
"To put <classname>syslinux</classname> on the FAT16 partition on your USB "
@@ -1066,13 +1073,13 @@ msgstr ""
"filename> 文件。"
#. Tag: title
-#: install-methods.xml:763 install-methods.xml:875
+#: install-methods.xml:735 install-methods.xml:847
#, no-c-format
msgid "Adding the installer image"
msgstr "添加安装程序映像"
#. Tag: para
-#: install-methods.xml:764
+#: install-methods.xml:736
#, fuzzy, no-c-format
#| msgid ""
#| "Mount the partition (<userinput>mount /dev/<replaceable>sdX1</"
@@ -1107,19 +1114,28 @@ msgstr ""
"(8.3) 文件名。"
#. Tag: para
-#: install-methods.xml:788
-#, no-c-format
+#: install-methods.xml:760
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Next you should create a <filename>syslinux.cfg</filename> configuration "
+#| "file, which at a bare minimum should contain the following two lines "
+#| "(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. Other parameters can "
+#| "be appended as desired."
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"
+"file, which at a bare minimum should contain the following line (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 initrd=initrd.gz\n"
"</screen></informalexample> For the graphical installer you should add "
-"<userinput>vga=788</userinput> to the second line. Other parameters can be "
-"appended as desired."
+"<userinput>vga=788</userinput> to the line. Other parameters can be appended "
+"as desired."
msgstr ""
"接下来,您需要创建一个 <filename>syslinux.cfg</filename> 配置文件,里面最少要"
"包含下面两行(如果您使用 <filename>netboot</filename> 映象,修改内核文件名为 "
@@ -1130,7 +1146,7 @@ msgstr ""
"userinput> 到第二行尾部。还可以添加其他的参数。"
#. Tag: para
-#: install-methods.xml:800
+#: install-methods.xml:772
#, no-c-format
msgid ""
"To enable the boot prompt to permit further parameter appending, add a "
@@ -1139,7 +1155,7 @@ msgstr ""
"添加 <userinput>prompt 1</userinput> 一行,使得引导提示符可以允许附加参数。"
#. Tag: para
-#: install-methods.xml:805 install-methods.xml:915
+#: install-methods.xml:777 install-methods.xml:887
#, no-c-format
msgid ""
"If you used an <filename>hd-media</filename> image, you should now copy the "
@@ -1157,7 +1173,7 @@ msgstr ""
"footnote> 到 U 盘。完成后,卸载 U 盘 (<userinput>umount /mnt</userinput>)。"
#. Tag: para
-#: install-methods.xml:829
+#: install-methods.xml:801
#, no-c-format
msgid ""
"Most USB sticks do not come pre-configured in such a way that Open Firmware "
@@ -1184,7 +1200,7 @@ msgstr ""
"command> 命令包含在 &debian; 的 <classname>hfsutils</classname> 软件包中。"
#. Tag: para
-#: install-methods.xml:846
+#: install-methods.xml:818
#, no-c-format
msgid ""
"In order to start the kernel after booting from the USB stick, we will put a "
@@ -1199,7 +1215,7 @@ msgstr ""
"变启动引导器的配置文件。"
#. Tag: para
-#: install-methods.xml:855
+#: install-methods.xml:827
#, no-c-format
msgid ""
"The normal <command>ybin</command> tool that comes with <command>yaboot</"
@@ -1233,7 +1249,7 @@ msgstr ""
"就可以用普通的 Unix 工具来处理了。"
#. Tag: para
-#: install-methods.xml:876
+#: install-methods.xml:848
#, no-c-format
msgid ""
"Mount the partition (<userinput>mount /dev/<replaceable>sdX2</replaceable> /"
@@ -1243,31 +1259,31 @@ msgstr ""
"mnt</userinput>),然后复制下面的安装程序映象文件到 U 盘:"
#. Tag: para
-#: install-methods.xml:883
+#: install-methods.xml:855
#, no-c-format
msgid "<filename>vmlinux</filename> (kernel binary)"
msgstr "<filename>vmlinux</filename> (内核二进制文件)"
#. Tag: para
-#: install-methods.xml:888
+#: install-methods.xml:860
#, no-c-format
msgid "<filename>initrd.gz</filename> (initial ramdisk image)"
msgstr "<filename>initrd.gz</filename> (初始化内存映像)"
#. Tag: para
-#: install-methods.xml:893
+#: install-methods.xml:865
#, no-c-format
msgid "<filename>yaboot.conf</filename> (yaboot configuration file)"
msgstr "<filename>yaboot.conf</filename> (yaboot 配置文件)"
#. Tag: para
-#: install-methods.xml:898
+#: install-methods.xml:870
#, no-c-format
msgid "<filename>boot.msg</filename> (optional boot message)"
msgstr "<filename>boot.msg</filename> (可选的启动信息)"
#. Tag: para
-#: install-methods.xml:905
+#: install-methods.xml:877
#, no-c-format
msgid ""
"The <filename>yaboot.conf</filename> configuration file should contain the "
@@ -1303,13 +1319,13 @@ msgstr ""
"的大小。"
#. Tag: title
-#: install-methods.xml:943
+#: install-methods.xml:915
#, no-c-format
msgid "Preparing Files for Hard Disk Booting"
msgstr "为从硬盘引导准备文件"
#. Tag: para
-#: install-methods.xml:944
+#: install-methods.xml:916
#, no-c-format
msgid ""
"The installer may be booted using boot files placed on an existing hard "
@@ -1320,7 +1336,7 @@ msgstr ""
"者直接使用 BIOS 提供的引导装载程序直接启动。"
#. Tag: para
-#: install-methods.xml:950
+#: install-methods.xml:922
#, no-c-format
msgid ""
"A full, <quote>pure network</quote> installation can be achieved using this "
@@ -1333,7 +1349,7 @@ msgstr ""
"缠不清。"
#. Tag: para
-#: install-methods.xml:957
+#: install-methods.xml:929
#, no-c-format
msgid ""
"The installer cannot boot from files on an HFS+ file system. MacOS System "
@@ -1353,7 +1369,7 @@ msgstr ""
"Linux 之间交换文件,特别是那些您下载的安装文件。"
#. Tag: para
-#: install-methods.xml:968
+#: install-methods.xml:940
#, no-c-format
msgid ""
"Different programs are used for hard disk installation system booting, "
@@ -1364,7 +1380,7 @@ msgstr ""
"装程序的引导将使用不同的安装文件。"
#. Tag: title
-#: install-methods.xml:977
+#: install-methods.xml:949
#, fuzzy, no-c-format
#| msgid ""
#| "Hard disk installer booting using <command>LILO</command> or "
@@ -1376,7 +1392,7 @@ msgstr ""
"硬盘安装程序引导使用 <command>LILO</command> 或 <command>GRUB</command>"
#. Tag: para
-#: install-methods.xml:979
+#: install-methods.xml:951
#, no-c-format
msgid ""
"This section explains how to add to or even replace an existing linux "
@@ -1386,7 +1402,7 @@ msgstr ""
"command> 或 <command>GRUB</command>。"
#. Tag: para
-#: install-methods.xml:985
+#: install-methods.xml:957
#, no-c-format
msgid ""
"At boot time, both bootloaders support loading in memory not only the "
@@ -1397,7 +1413,7 @@ msgstr ""
"盘可以被用做内核的根文件系统。"
#. Tag: para
-#: install-methods.xml:991
+#: install-methods.xml:963
#, no-c-format
msgid ""
"Copy the following files from the &debian; archives to a convenient location "
@@ -1408,19 +1424,19 @@ msgstr ""
"newinstall/</filename>。"
#. Tag: para
-#: install-methods.xml:999
+#: install-methods.xml:971
#, no-c-format
msgid "<filename>vmlinuz</filename> (kernel binary)"
msgstr "<filename>vmlinuz</filename>(内核二进制文件)"
#. Tag: para
-#: install-methods.xml:1004
+#: install-methods.xml:976
#, no-c-format
msgid "<filename>initrd.gz</filename> (ramdisk image)"
msgstr "<filename>initrd.gz</filename> (内存虚拟磁盘映像)"
#. Tag: para
-#: install-methods.xml:1011
+#: install-methods.xml:983
#, no-c-format
msgid ""
"Finally, to configure the bootloader proceed to <xref linkend=\"boot-initrd"
@@ -1428,14 +1444,14 @@ msgid ""
msgstr "最后,要配置 bootloader,请进入 <xref linkend=\"boot-initrd\"/>。"
#. Tag: title
-#: install-methods.xml:1021
+#: install-methods.xml:993
#, fuzzy, no-c-format
#| msgid "Hard disk installer booting using <command>loadlin</command>"
msgid "Hard disk installer booting from DOS using <command>loadlin</command>"
msgstr "硬盘安装程序引导使用 <command>loadlin</command>"
#. Tag: para
-#: install-methods.xml:1022
+#: install-methods.xml:994
#, no-c-format
msgid ""
"This section explains how to prepare your hard drive for booting the "
@@ -1444,7 +1460,7 @@ msgstr ""
"本节将说明如何用 <command>loadlin</command> 从 DOS 启动安装程序准备您的硬盘。"
#. Tag: para
-#: install-methods.xml:1027
+#: install-methods.xml:999
#, no-c-format
msgid ""
"Copy the following directories from a &debian; CD image to <filename>c:\\</"
@@ -1452,26 +1468,26 @@ msgid ""
msgstr "从 &debian; CD 映象复制下列目录到 <filename>c:\\</filename>。"
#. Tag: para
-#: install-methods.xml:1032
+#: install-methods.xml:1004
#, no-c-format
msgid ""
"<filename>/&x86-install-dir;</filename> (kernel binary and ramdisk image)"
msgstr "<filename>/&x86-install-dir;</filename> (二进制和 ramdisk 映象)"
#. Tag: para
-#: install-methods.xml:1037
+#: install-methods.xml:1009
#, no-c-format
msgid "<filename>/tools</filename> (loadlin tool)"
msgstr "<filename>/tools</filename> (loadlin 工具)"
#. Tag: title
-#: install-methods.xml:1050
+#: install-methods.xml:1022
#, no-c-format
msgid "Hard Disk Installer Booting for OldWorld Macs"
msgstr "在 OldWorld Macs 上引导硬盘安装程序"
#. Tag: para
-#: install-methods.xml:1051
+#: install-methods.xml:1023
#, no-c-format
msgid ""
"The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
@@ -1493,7 +1509,7 @@ msgstr ""
"是必须的。"
#. Tag: para
-#: install-methods.xml:1064
+#: install-methods.xml:1036
#, no-c-format
msgid ""
"Download and unstuff the <application>BootX</application> distribution, "
@@ -1520,13 +1536,13 @@ msgstr ""
"的系统文件夹中。"
#. Tag: title
-#: install-methods.xml:1084
+#: install-methods.xml:1056
#, no-c-format
msgid "Hard Disk Installer Booting for NewWorld Macs"
msgstr "在 NewWorld Macs 上启动硬盘安装程序"
#. Tag: para
-#: install-methods.xml:1085
+#: install-methods.xml:1057
#, no-c-format
msgid ""
"NewWorld PowerMacs support booting from a network or an ISO9660 CD-ROM, as "
@@ -1544,7 +1560,7 @@ msgstr ""
"不能用在 NewWorld PowerMacs 上。"
#. Tag: para
-#: install-methods.xml:1096
+#: install-methods.xml:1068
#, no-c-format
msgid ""
"<emphasis>Copy</emphasis> (not move) the following four files which you "
@@ -1557,31 +1573,31 @@ msgstr ""
"硬盘图标的方法来完成)。"
#. Tag: filename
-#: install-methods.xml:1106 install-methods.xml:1432
+#: install-methods.xml:1078 install-methods.xml:1404
#, no-c-format
msgid "vmlinux"
msgstr "vmlinux"
#. Tag: filename
-#: install-methods.xml:1111 install-methods.xml:1437
+#: install-methods.xml:1083 install-methods.xml:1409
#, no-c-format
msgid "initrd.gz"
msgstr "initrd.gz"
#. Tag: filename
-#: install-methods.xml:1116 install-methods.xml:1442
+#: install-methods.xml:1088 install-methods.xml:1414
#, no-c-format
msgid "yaboot"
msgstr "yaboot"
#. Tag: filename
-#: install-methods.xml:1121 install-methods.xml:1447
+#: install-methods.xml:1093 install-methods.xml:1419
#, no-c-format
msgid "yaboot.conf"
msgstr "yaboot.conf"
#. Tag: para
-#: install-methods.xml:1126
+#: install-methods.xml:1098
#, no-c-format
msgid ""
"Make a note of the partition number of the MacOS partition where you place "
@@ -1595,19 +1611,19 @@ msgstr ""
"的时候,您需要这个分区号码在 Open Firmware 提示符下面输入命令。"
#. Tag: para
-#: install-methods.xml:1134
+#: install-methods.xml:1106
#, no-c-format
msgid "To boot the installer, proceed to <xref linkend=\"boot-newworld\"/>."
msgstr "要引导安装程序,请进入 <xref linkend=\"boot-newworld\"/>。"
#. Tag: title
-#: install-methods.xml:1147
+#: install-methods.xml:1119
#, no-c-format
msgid "Preparing Files for TFTP Net Booting"
msgstr "为使用 TFTP 网络引导准备文件"
#. Tag: para
-#: install-methods.xml:1148
+#: install-methods.xml:1120
#, no-c-format
msgid ""
"If your machine is connected to a local area network, you may be able to "
@@ -1621,7 +1637,7 @@ msgstr ""
"上面的某个特殊地方,并且配置好能够能够支持对您的机器进行引导。"
#. Tag: para
-#: install-methods.xml:1156
+#: install-methods.xml:1128
#, no-c-format
msgid ""
"You need to set up a TFTP server, and for many machines a DHCP server<phrase "
@@ -1633,7 +1649,7 @@ msgstr ""
"condition=\"supports-bootp\">,或 BOOTP 服务器</phrase>。"
#. Tag: para
-#: install-methods.xml:1163
+#: install-methods.xml:1135
#, no-c-format
msgid ""
"<phrase condition=\"supports-rarp\">The Reverse Address Resolution Protocol "
@@ -1652,7 +1668,7 @@ msgstr ""
"些系统只能通过 DHCP 来配置。"
#. Tag: para
-#: install-methods.xml:1177
+#: install-methods.xml:1149
#, no-c-format
msgid ""
"For PowerPC, if you have a NewWorld Power Macintosh machine, it is a good "
@@ -1663,7 +1679,7 @@ msgstr ""
"替 BOOTP 比较好。有些最新的机器不能从 BOOTP 引导。"
#. Tag: para
-#: install-methods.xml:1183
+#: install-methods.xml:1155
#, no-c-format
msgid ""
"Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. There "
@@ -1673,7 +1689,7 @@ msgstr ""
"个 <classname>rbootd</classname> 软件包。"
#. Tag: para
-#: install-methods.xml:1188
+#: install-methods.xml:1160
#, no-c-format
msgid ""
"The Trivial File Transfer Protocol (TFTP) is used to serve the boot image to "
@@ -1687,7 +1703,7 @@ msgstr ""
"Linux 上面的一些操作例子。"
#. Tag: para
-#: install-methods.xml:1196
+#: install-methods.xml:1168
#, no-c-format
msgid ""
"For a &debian-gnu; server we recommend <classname>tftpd-hpa</classname>. "
@@ -1700,13 +1716,13 @@ msgstr ""
"多问题。另一个好的选择是 <classname>atftpd</classname>。"
#. Tag: title
-#: install-methods.xml:1212
+#: install-methods.xml:1184
#, no-c-format
msgid "Setting up RARP server"
msgstr "设置 RARP 服务器"
#. Tag: para
-#: install-methods.xml:1213
+#: install-methods.xml:1185
#, no-c-format
msgid ""
"To set up RARP, you need to know the Ethernet address (a.k.a. the MAC "
@@ -1724,7 +1740,7 @@ msgstr ""
"addr show dev eth0</userinput> 命令。"
#. Tag: para
-#: install-methods.xml:1225
+#: install-methods.xml:1197
#, fuzzy, no-c-format
#| msgid ""
#| "On a RARP server system using a Linux 2.4 or 2.6 kernel, or Solaris/"
@@ -1758,13 +1774,13 @@ msgstr ""
"<userinput>/usr/etc/rarpd -a</userinput> 命令。"
#. Tag: title
-#: install-methods.xml:1246
+#: install-methods.xml:1218
#, no-c-format
msgid "Setting up a DHCP server"
msgstr "设置 DHCP 服务器"
#. Tag: para
-#: install-methods.xml:1247
+#: install-methods.xml:1219
#, no-c-format
msgid ""
"One free software DHCP server is ISC <command>dhcpd</command>. For &debian-"
@@ -1777,7 +1793,7 @@ msgstr ""
"配置示例文件(参阅 <filename>/etc/dhcp/dhcpd.conf</filename>):"
#. Tag: screen
-#: install-methods.xml:1254
+#: install-methods.xml:1226
#, no-c-format
msgid ""
"option domain-name \"example.com\";\n"
@@ -1821,7 +1837,7 @@ msgstr ""
"}"
#. Tag: para
-#: install-methods.xml:1256
+#: install-methods.xml:1228
#, no-c-format
msgid ""
"In this example, there is one server <replaceable>servername</replaceable> "
@@ -1837,7 +1853,7 @@ msgstr ""
"TFTP 获取的文件名。"
#. Tag: para
-#: install-methods.xml:1266
+#: install-methods.xml:1238
#, no-c-format
msgid ""
"After you have edited the <command>dhcpd</command> configuration file, "
@@ -1847,13 +1863,13 @@ msgstr ""
"<userinput>/etc/init.d/isc-dhcp-server restart</userinput>。"
#. Tag: title
-#: install-methods.xml:1274
+#: install-methods.xml:1246
#, no-c-format
msgid "Enabling PXE Booting in the DHCP configuration"
msgstr "在 DHCP 配置中打开 PXE 引导功能"
#. Tag: para
-#: install-methods.xml:1275
+#: install-methods.xml:1247
#, no-c-format
msgid ""
"Here is another example for a <filename>dhcp.conf</filename> using the Pre-"
@@ -1923,13 +1939,13 @@ msgstr ""
"的 <xref linkend=\"tftp-images\"/>)。"
#. Tag: title
-#: install-methods.xml:1295
+#: install-methods.xml:1267
#, no-c-format
msgid "Setting up a BOOTP server"
msgstr "架设 BOOTP 服务器"
#. Tag: para
-#: install-methods.xml:1296
+#: install-methods.xml:1268
#, no-c-format
msgid ""
"There are two BOOTP servers available for GNU/Linux. The first is CMU "
@@ -1944,7 +1960,7 @@ msgstr ""
"<classname>isc-dhcp-server</classname> 软件包。"
#. Tag: para
-#: install-methods.xml:1304
+#: install-methods.xml:1276
#, no-c-format
msgid ""
"To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
@@ -2006,7 +2022,7 @@ msgstr ""
"MAC 地址。</phrase>"
#. Tag: para
-#: install-methods.xml:1337
+#: install-methods.xml:1309
#, no-c-format
msgid ""
"By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
@@ -2028,13 +2044,13 @@ msgstr ""
"<command>dhcpd</command>。"
#. Tag: title
-#: install-methods.xml:1356
+#: install-methods.xml:1328
#, no-c-format
msgid "Enabling the TFTP Server"
msgstr "开启 TFTP 服务器"
#. Tag: para
-#: install-methods.xml:1357
+#: install-methods.xml:1329
#, no-c-format
msgid ""
"To get the TFTP server ready to go, you should first make sure that "
@@ -2043,7 +2059,7 @@ msgstr ""
"要准备好 TFTP 服务器,您首先需要确定 <command>tftpd</command> 已经启动。"
#. Tag: para
-#: install-methods.xml:1362
+#: install-methods.xml:1334
#, no-c-format
msgid ""
"In the case of <classname>tftpd-hpa</classname> there are two ways the "
@@ -2057,7 +2073,7 @@ msgstr ""
"以在安装软件包的时候选择,也可以用重新配置软件包方式修改。"
#. Tag: para
-#: install-methods.xml:1371
+#: install-methods.xml:1343
#, no-c-format
msgid ""
"Historically, TFTP servers used <filename>/tftpboot</filename> as directory "
@@ -2074,7 +2090,7 @@ msgstr ""
"置文件示例。"
#. Tag: para
-#: install-methods.xml:1381
+#: install-methods.xml:1353
#, no-c-format
msgid ""
"All <command>in.tftpd</command> alternatives available in &debian; should "
@@ -2088,7 +2104,7 @@ msgstr ""
"问题,建议先检查这些日志信息,这对于分析错误是一个好的起始点。"
#. Tag: para
-#: install-methods.xml:1389
+#: install-methods.xml:1361
#, no-c-format
msgid ""
"If you intend to install &debian; on an SGI machine and your TFTP server is "
@@ -2116,13 +2132,13 @@ msgstr ""
"错误。"
#. Tag: title
-#: install-methods.xml:1411
+#: install-methods.xml:1383
#, no-c-format
msgid "Move TFTP Images Into Place"
msgstr "将 TFTP 映像放到适当的位置"
#. Tag: para
-#: install-methods.xml:1412
+#: install-methods.xml:1384
#, no-c-format
msgid ""
"Next, place the TFTP boot image you need, as found in <xref linkend=\"where-"
@@ -2137,7 +2153,7 @@ msgstr ""
"完全决定于 TFTP 客户程序,而且没有一个强制的标准。"
#. Tag: para
-#: install-methods.xml:1421
+#: install-methods.xml:1393
#, no-c-format
msgid ""
"On NewWorld Power Macintosh machines, you will need to set up the "
@@ -2152,13 +2168,13 @@ msgstr ""
"件:"
#. Tag: filename
-#: install-methods.xml:1452
+#: install-methods.xml:1424
#, no-c-format
msgid "boot.msg"
msgstr "boot.msg"
#. Tag: para
-#: install-methods.xml:1457
+#: install-methods.xml:1429
#, no-c-format
msgid ""
"For PXE booting, everything you should need is set up in the "
@@ -2173,7 +2189,7 @@ msgstr ""
"需的文件名传递给 <command>tftpd</command>。"
#. Tag: para
-#: install-methods.xml:1465
+#: install-methods.xml:1437
#, no-c-format
msgid ""
"For PXE booting, everything you should need is set up in the "
@@ -2188,13 +2204,13 @@ msgstr ""
"efi</filename> 以启动所需的文件名传递至<command>tftpd</command>。"
#. Tag: title
-#: install-methods.xml:1477
+#: install-methods.xml:1449
#, no-c-format
msgid "SPARC TFTP Booting"
msgstr "SPARC TFTP 引导"
#. Tag: para
-#: install-methods.xml:1478
+#: install-methods.xml:1450
#, no-c-format
msgid ""
"Some SPARC architectures add the subarchitecture names, such as "
@@ -2222,7 +2238,7 @@ msgstr ""
"并在必要时加上子体系名。"
#. Tag: para
-#: install-methods.xml:1494
+#: install-methods.xml:1466
#, no-c-format
msgid ""
"If you've done all this correctly, giving the command <userinput>boot net</"
@@ -2234,7 +2250,7 @@ msgstr ""
"映像。假如映像找不到,查看 tftp 服务器的日志所需要的映像文件名。"
#. Tag: para
-#: install-methods.xml:1501
+#: install-methods.xml:1473
#, no-c-format
msgid ""
"You can also force some sparc systems to look for a specific file name by "
@@ -2247,13 +2263,13 @@ msgstr ""
"仍然必须被请放置在 TFTP 服务器要查找的目录中。"
#. Tag: title
-#: install-methods.xml:1512
+#: install-methods.xml:1484
#, no-c-format
msgid "SGI TFTP Booting"
msgstr "SGI TFTP 引导"
#. Tag: para
-#: install-methods.xml:1513
+#: install-methods.xml:1485
#, no-c-format
msgid ""
"On SGI machines you can rely on the <command>bootpd</command> to supply the "
@@ -2267,13 +2283,13 @@ msgstr ""
"现在 <filename>/etc/dhcpd.conf</filename>。"
#. Tag: title
-#: install-methods.xml:1621
+#: install-methods.xml:1593
#, no-c-format
msgid "Automatic Installation"
msgstr "自动化安装"
#. Tag: para
-#: install-methods.xml:1622
+#: install-methods.xml:1594
#, no-c-format
msgid ""
"For installing on multiple computers it's possible to do fully automatic "
@@ -2288,13 +2304,13 @@ msgstr ""
"更多细节。"
#. Tag: title
-#: install-methods.xml:1634
+#: install-methods.xml:1606
#, no-c-format
msgid "Automatic Installation Using the &debian; Installer"
msgstr "使用 &debian; 安装程序进行自动安装"
#. Tag: para
-#: install-methods.xml:1635
+#: install-methods.xml:1607
#, no-c-format
msgid ""
"The &debian; Installer supports automating installs via preconfiguration "
@@ -2306,7 +2322,7 @@ msgstr ""
"介质上加载,并自动回答安装过程中的问题。"
#. Tag: para
-#: install-methods.xml:1642
+#: install-methods.xml:1614
#, no-c-format
msgid ""
"Full documentation on preseeding including a working example that you can "
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index 070641b5f..4fb194528 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2012-12-29 10:09+0000\n"
+"POT-Creation-Date: 2016-04-08 20:25+0000\n"
"PO-Revision-Date: 2012-11-25 23:32+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -575,11 +575,18 @@ msgstr "请给我们发一份安装报告"
#. Tag: para
#: installation-howto.xml:336
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you successfully managed an installation with &d-i;, please take time "
+#| "to provide us with a report. The simplest way to do so is to install the "
+#| "reportbug package (<command>aptitude install reportbug</command>), "
+#| "configure <classname>reportbug</classname> as explained in <xref linkend="
+#| "\"mail-outgoing\"/>, and run <command>reportbug installation-reports</"
+#| "command>."
msgid ""
"If you successfully managed an installation with &d-i;, please take time to "
"provide us with a report. The simplest way to do so is to install the "
-"reportbug package (<command>aptitude install reportbug</command>), configure "
+"reportbug package (<command>apt install reportbug</command>), configure "
"<classname>reportbug</classname> as explained in <xref linkend=\"mail-"
"outgoing\"/>, and run <command>reportbug installation-reports</command>."
msgstr ""
diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po
index 919a221db..8abdbce41 100644
--- a/po/zh_CN/post-install.po
+++ b/po/zh_CN/post-install.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2015-05-25 11:27+0000\n"
+"POT-Creation-Date: 2016-04-08 20:25+0000\n"
"PO-Revision-Date: 2015-05-25 13:44+0200\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -42,16 +42,32 @@ msgstr ""
#. Tag: para
#: post-install.xml:25
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Alternatively you can press the key combination <keycombo> <keycap>Ctrl</"
+#| "keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase "
+#| "arch=\"powerpc\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</"
+#| "keycap> <keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. "
+#| "A last option is to log in as root and type one of the commands "
+#| "<command>poweroff</command>, <command>halt</command> or <command>shutdown "
+#| "-h now</command> if either of the key combinations do not work or you "
+#| "prefer to type commands; use <command>reboot</command> to reboot the "
+#| "system."
msgid ""
"Alternatively you can press the key combination <keycombo> <keycap>Ctrl</"
"keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch="
"\"powerpc\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> "
-"<keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A last "
-"option is to log in as root and type one of the commands <command>poweroff</"
-"command>, <command>halt</command> or <command>shutdown -h now</command> if "
-"either of the key combinations do not work or you prefer to type commands; "
-"use <command>reboot</command> to reboot the system."
+"<keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. If the key "
+"combinations do not work, a last option is to log in as root and type the "
+"necessary commands. Use <command>reboot</command> to reboot the system. Use "
+"<command>halt</command> to halt the system without powering it off "
+"<footnote> <para> Under the SysV init system <command>halt</command> had the "
+"same effect as <command>poweroff</command>, but with systemd as init system "
+"(the default in jessie) their effects are different. </para> </footnote>. To "
+"power off the machine, use <command>poweroff</command> or <command>shutdown -"
+"h now</command>. The systemd init system provides additional commands that "
+"perform the same functions; for example <command>systemctl reboot</command> "
+"or <command>systemctl poweroff</command>."
msgstr ""
"另外,您可以按下组合键 <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> "
"<keycap>Del</keycap> </keycombo> <phrase arch=\"powerpc\"> 或 <keycombo> "
@@ -62,13 +78,13 @@ msgstr ""
"<command>reboot</command> 可以重启系统。"
#. Tag: title
-#: post-install.xml:46
+#: post-install.xml:61
#, no-c-format
msgid "If You Are New to Unix"
msgstr "如果您不熟悉 Unix"
#. Tag: para
-#: post-install.xml:47
+#: post-install.xml:62
#, no-c-format
msgid ""
"If you are new to Unix, you probably should go out and buy some books and do "
@@ -83,7 +99,7 @@ msgstr ""
"提供了很好的历史参考。"
#. Tag: para
-#: post-install.xml:55
+#: post-install.xml:70
#, no-c-format
msgid ""
"Linux is an implementation of Unix. The <ulink url=\"&url-ldp;\">Linux "
@@ -103,13 +119,13 @@ msgstr ""
"HOWTO 的国际化版本。"
#. Tag: title
-#: post-install.xml:76
+#: post-install.xml:91
#, no-c-format
msgid "Orienting Yourself to &debian;"
msgstr "让自己适应 &debian;"
#. Tag: para
-#: post-install.xml:77
+#: post-install.xml:92
#, no-c-format
msgid ""
"&debian; is a little different from other distributions. Even if you're "
@@ -125,13 +141,13 @@ msgstr ""
"粗略的介绍。"
#. Tag: title
-#: post-install.xml:88
+#: post-install.xml:103
#, no-c-format
msgid "&debian; Packaging System"
msgstr "&debian; 软件包系统"
#. Tag: para
-#: post-install.xml:89
+#: post-install.xml:104
#, no-c-format
msgid ""
"The most important concept to grasp is the &debian; packaging system. In "
@@ -162,11 +178,17 @@ msgstr ""
"command> 里面将软件包设置为 <quote>hold</quote>状态,以避免这种情况。"
#. Tag: para
-#: post-install.xml:130
-#, no-c-format
+#: post-install.xml:145
+#, fuzzy, no-c-format
+#| msgid ""
+#| "One of the best installation methods is apt. You can use the command line "
+#| "version <command>apt-get</command> or full-screen text version "
+#| "<application>aptitude</application>. Note apt will also let you merge "
+#| "main, contrib, and non-free so you can have export-restricted packages as "
+#| "well as standard versions."
msgid ""
"One of the best installation methods is apt. You can use the command line "
-"version <command>apt-get</command> or full-screen text version "
+"version of <command>apt</command> or full-screen text version "
"<application>aptitude</application>. Note apt will also let you merge main, "
"contrib, and non-free so you can have export-restricted packages as well as "
"standard versions."
@@ -177,13 +199,13 @@ msgstr ""
"限制的软件包。"
#. Tag: title
-#: post-install.xml:141
+#: post-install.xml:156
#, no-c-format
msgid "Additional Software Available for &debian;"
msgstr "用于 &debian; 的额外软件"
#. Tag: para
-#: post-install.xml:142
+#: post-install.xml:157
#, no-c-format
msgid ""
"There are official and unofficial software repositories that are not enabled "
@@ -198,13 +220,13 @@ msgstr ""
"Release</ulink>。"
#. Tag: title
-#: post-install.xml:154
+#: post-install.xml:169
#, no-c-format
msgid "Application Version Management"
msgstr "应用程序版本管理"
#. Tag: para
-#: post-install.xml:155
+#: post-install.xml:170
#, no-c-format
msgid ""
"Alternative versions of applications are managed by update-alternatives. If "
@@ -215,13 +237,13 @@ msgstr ""
"多个版本,请阅读 update-alternatives 的 man 手册。"
#. Tag: title
-#: post-install.xml:165
+#: post-install.xml:180
#, no-c-format
msgid "Cron Job Management"
msgstr "定时任务管理"
#. Tag: para
-#: post-install.xml:166
+#: post-install.xml:181
#, no-c-format
msgid ""
"Any jobs under the purview of the system administrator should be in "
@@ -238,7 +260,7 @@ msgstr ""
"然后按照文件名的字典顺序依次运行。"
#. Tag: para
-#: post-install.xml:175
+#: post-install.xml:190
#, no-c-format
msgid ""
"On the other hand, if you have a cron job that (a) needs to run as a special "
@@ -253,7 +275,7 @@ msgstr ""
"件可以包含一个额外的域,允许您指定运行该定时任务的用户帐户。"
#. Tag: para
-#: post-install.xml:184
+#: post-install.xml:199
#, no-c-format
msgid ""
"In either case, you just edit the files and cron will notice them "
@@ -266,13 +288,13 @@ msgstr ""
"share/doc/cron/README.Debian</filename>。"
#. Tag: title
-#: post-install.xml:199
+#: post-install.xml:214
#, no-c-format
msgid "Further Reading and Information"
msgstr "更多信息"
#. Tag: para
-#: post-install.xml:200
+#: post-install.xml:215
#, no-c-format
msgid ""
"If you need information about a particular program, you should first try "
@@ -284,7 +306,7 @@ msgstr ""
"replaceable></userinput>。"
#. Tag: para
-#: post-install.xml:206
+#: post-install.xml:221
#, no-c-format
msgid ""
"There is lots of useful documentation in <filename>/usr/share/doc</filename> "
@@ -302,7 +324,7 @@ msgstr ""
"filename>。"
#. Tag: para
-#: post-install.xml:217
+#: post-install.xml:232
#, no-c-format
msgid ""
"The <ulink url=\"http://www.debian.org/\">Debian web site</ulink> contains a "
@@ -330,7 +352,7 @@ msgstr ""
"&debian; 丰富的信息。"
#. Tag: para
-#: post-install.xml:235
+#: post-install.xml:250
#, no-c-format
msgid ""
"A general source of information on GNU/Linux is the <ulink url=\"http://www."
@@ -343,13 +365,13 @@ msgstr ""
"系统各个部分的非常有价值的 HOWTO 文档以及其他指导。"
#. Tag: title
-#: post-install.xml:251
+#: post-install.xml:266
#, no-c-format
msgid "Setting Up Your System To Use E-Mail"
msgstr "让您的系统使用 E-Mail"
#. Tag: para
-#: post-install.xml:252
+#: post-install.xml:267
#, no-c-format
msgid ""
"Today, email is an important part of many people's life. As there are many "
@@ -361,7 +383,7 @@ msgstr ""
"多 &debian; 工具如何设置正确非常重要,我们将在本节介绍一些基本的知识。"
#. Tag: para
-#: post-install.xml:259
+#: post-install.xml:274
#, no-c-format
msgid ""
"There are three main functions that make up an e-mail system. First there is "
@@ -379,7 +401,7 @@ msgstr ""
"的收件箱。"
#. Tag: para
-#: post-install.xml:269
+#: post-install.xml:284
#, no-c-format
msgid ""
"These three functions can be performed by separate programs, but they can "
@@ -390,7 +412,7 @@ msgstr ""
"程序处理不同类型的邮件。"
#. Tag: para
-#: post-install.xml:275
+#: post-install.xml:290
#, no-c-format
msgid ""
"On Linux and Unix systems <command>mutt</command> is historically a very "
@@ -404,7 +426,7 @@ msgstr ""
"command> 一起使用。"
#. Tag: para
-#: post-install.xml:282
+#: post-install.xml:297
#, no-c-format
msgid ""
"With the increasing popularity of graphical desktop systems, the use of "
@@ -427,13 +449,13 @@ msgstr ""
"能 &mdash; 而且通常是 &mdash; 与传统的 Linux 工具一起使用。"
#. Tag: title
-#: post-install.xml:302
+#: post-install.xml:317
#, no-c-format
msgid "Default E-Mail Configuration"
msgstr "默认的 E-Mail 配置"
#. Tag: para
-#: post-install.xml:303
+#: post-install.xml:318
#, no-c-format
msgid ""
"Even if you are planning to use a graphical mail program, it is important "
@@ -451,7 +473,7 @@ msgstr ""
"footnote> 会通过邮件发送重要的提示通知系统管理员潜在的问题或变化。"
#. Tag: para
-#: post-install.xml:318
+#: post-install.xml:333
#, no-c-format
msgid ""
"For this reason the packages <classname>exim4</classname> and "
@@ -475,7 +497,7 @@ msgstr ""
"会发送给 root 帐号。</para> </footnote>。"
#. Tag: para
-#: post-install.xml:337
+#: post-install.xml:352
#, no-c-format
msgid ""
"When system e-mails are delivered they are added to a file in <filename>/var/"
@@ -487,13 +509,13 @@ msgstr ""
"<command>mutt</command> 读取。"
#. Tag: title
-#: post-install.xml:347
+#: post-install.xml:362
#, no-c-format
msgid "Sending E-Mails Outside The System"
msgstr "发送邮件到系统之外"
#. Tag: para
-#: post-install.xml:348
+#: post-install.xml:363
#, no-c-format
msgid ""
"As mentioned earlier, the installed &debian; system is only set up to handle "
@@ -504,7 +526,7 @@ msgstr ""
"收其他系统的邮件。"
#. Tag: para
-#: post-install.xml:354
+#: post-install.xml:369
#, no-c-format
msgid ""
"If you would like <classname>exim4</classname> to handle external e-mail, "
@@ -515,7 +537,7 @@ msgstr ""
"可以使用的基本配置选项。确认邮件可以正确地发送和接收。"
#. Tag: para
-#: post-install.xml:360
+#: post-install.xml:375
#, no-c-format
msgid ""
"If you intend to use a graphical mail program and use a mail server of your "
@@ -530,7 +552,7 @@ msgstr ""
"(配置方法超出了本手册的范围)。"
#. Tag: para
-#: post-install.xml:369
+#: post-install.xml:384
#, no-c-format
msgid ""
"However, in that case you may need to configure individual utilities to "
@@ -544,7 +566,7 @@ msgstr ""
"应的 bug 报告。它默认是使用 <classname>exim4</classname> 来提交 bug 报告。"
#. Tag: para
-#: post-install.xml:377
+#: post-install.xml:392
#, no-c-format
msgid ""
"To correctly set up <command>reportbug</command> to use an external mail "
@@ -557,13 +579,13 @@ msgstr ""
"<quote>no</quote>。您接着将会被问到使用哪个 SMTP 服务器来提交 bug 报告。"
#. Tag: title
-#: post-install.xml:388
+#: post-install.xml:403
#, no-c-format
msgid "Configuring the Exim4 Mail Transport Agent"
msgstr "配置 Exim4 MTA"
#. Tag: para
-#: post-install.xml:389
+#: post-install.xml:404
#, no-c-format
msgid ""
"If you would like your system to also handle external e-mail, you will need "
@@ -576,13 +598,13 @@ msgstr ""
"MTA/MDA。</para> </footnote>:"
#. Tag: screen
-#: post-install.xml:401
+#: post-install.xml:416
#, no-c-format
msgid "# dpkg-reconfigure exim4-config"
msgstr "# dpkg-reconfigure exim4-config"
#. Tag: para
-#: post-install.xml:403
+#: post-install.xml:418
#, no-c-format
msgid ""
"After entering that command (as root), you will be asked if you want split "
@@ -593,7 +615,7 @@ msgstr ""
"不准,就选择默认选项。"
#. Tag: para
-#: post-install.xml:409
+#: post-install.xml:424
#, no-c-format
msgid ""
"Next you will be presented with several common mail scenarios. Choose the "
@@ -601,13 +623,13 @@ msgid ""
msgstr "接着您将看到几个常见的邮件方案,请选择一个最近似您需求的那个。"
#. Tag: term
-#: post-install.xml:418
+#: post-install.xml:433
#, no-c-format
msgid "internet site"
msgstr "internet site"
#. Tag: para
-#: post-install.xml:419
+#: post-install.xml:434
#, no-c-format
msgid ""
"Your system is connected to a network and your mail is sent and received "
@@ -619,13 +641,13 @@ msgstr ""
"会询问您一些基本问题,如:您的机器的邮件名称、您接受或转发邮件的域等等。"
#. Tag: term
-#: post-install.xml:430
+#: post-install.xml:445
#, no-c-format
msgid "mail sent by smarthost"
msgstr "mail sent by smarthost"
#. Tag: para
-#: post-install.xml:431
+#: post-install.xml:446
#, no-c-format
msgid ""
"In this scenario your outgoing mail is forwarded to another machine, called "
@@ -641,7 +663,7 @@ msgstr ""
"载邮件。"
#. Tag: para
-#: post-install.xml:441
+#: post-install.xml:456
#, no-c-format
msgid ""
"In a lot of cases the smarthost will be your ISP's mail server, which makes "
@@ -652,13 +674,13 @@ msgstr ""
"司的邮件服务器,或是您自己网络中的另外一台机器。"
#. Tag: term
-#: post-install.xml:451
+#: post-install.xml:466
#, no-c-format
msgid "mail sent by smarthost; no local mail"
msgstr "mail sent by smarthost; no local mail"
#. Tag: para
-#: post-install.xml:452
+#: post-install.xml:467
#, no-c-format
msgid ""
"This option is basically the same as the previous one except that the system "
@@ -669,25 +691,25 @@ msgstr ""
"mail domain。在本系统上的邮件(比如,给系统管理员的)还是会被处理。"
#. Tag: term
-#: post-install.xml:463
+#: post-install.xml:478
#, no-c-format
msgid "local delivery only"
msgstr "local delivery only"
#. Tag: para
-#: post-install.xml:464
+#: post-install.xml:479
#, no-c-format
msgid "This is the option your system is configured for by default."
msgstr "本选项是系统默认的配置。"
#. Tag: term
-#: post-install.xml:472
+#: post-install.xml:487
#, no-c-format
msgid "no configuration at this time"
msgstr "no configuration at this time"
#. Tag: para
-#: post-install.xml:473
+#: post-install.xml:488
#, no-c-format
msgid ""
"Choose this if you are absolutely convinced you know what you are doing. "
@@ -700,7 +722,7 @@ msgstr ""
"工具发来的重要信息。"
#. Tag: para
-#: post-install.xml:484
+#: post-install.xml:499
#, no-c-format
msgid ""
"If none of these scenarios suits your needs, or if you need a finer grained "
@@ -718,7 +740,7 @@ msgstr ""
"classname> 配置方面的细节,并说明从哪里找到更多的文档。"
#. Tag: para
-#: post-install.xml:495
+#: post-install.xml:510
#, no-c-format
msgid ""
"Note that sending mail directly to the Internet when you don't have an "
@@ -736,13 +758,13 @@ msgstr ""
"filename>。"
#. Tag: title
-#: post-install.xml:513
+#: post-install.xml:528
#, no-c-format
msgid "Compiling a New Kernel"
msgstr "编译新内核"
#. Tag: para
-#: post-install.xml:514
+#: post-install.xml:529
#, no-c-format
msgid ""
"Why would someone want to compile a new kernel? It is often not necessary "
@@ -758,7 +780,7 @@ msgstr ""
"还是很有用的:"
#. Tag: para
-#: post-install.xml:524
+#: post-install.xml:539
#, no-c-format
msgid ""
"handle special hardware needs, or hardware conflicts with the pre-supplied "
@@ -766,7 +788,7 @@ msgid ""
msgstr "支持某些特殊的硬件,或者默认的内核配置和某些硬件冲突"
#. Tag: para
-#: post-install.xml:530
+#: post-install.xml:545
#, no-c-format
msgid ""
"use options of the kernel which are not supported in the pre-supplied "
@@ -774,43 +796,43 @@ msgid ""
msgstr "使用某些不为所提供的内核支持的选项 (例如,支持 high memory)"
#. Tag: para
-#: post-install.xml:536
+#: post-install.xml:551
#, no-c-format
msgid "optimize the kernel by removing useless drivers to speed up boot time"
msgstr "通过删除无用的驱动程序来优化内核,以减少启动时间"
#. Tag: para
-#: post-install.xml:541
+#: post-install.xml:556
#, no-c-format
msgid "create a monolithic instead of a modularized kernel"
msgstr "创建整体的而不是模块化的内核"
#. Tag: para
-#: post-install.xml:546
+#: post-install.xml:561
#, no-c-format
msgid "run an updated or development kernel"
msgstr "运行最新的内核或开发中的内核"
#. Tag: para
-#: post-install.xml:551
+#: post-install.xml:566
#, no-c-format
msgid "learn more about linux kernels"
msgstr "深入了解 linux 内核"
#. Tag: title
-#: post-install.xml:560
+#: post-install.xml:575
#, no-c-format
msgid "Kernel Image Management"
msgstr "内核映象管理"
#. Tag: para
-#: post-install.xml:561
+#: post-install.xml:576
#, no-c-format
msgid "Don't be afraid to try compiling the kernel. It's fun and profitable."
msgstr "不要害怕尝试编译内核。它很有趣而且很合算。"
#. Tag: para
-#: post-install.xml:565
+#: post-install.xml:580
#, no-c-format
msgid ""
"To compile a kernel the &debian; way, you need some packages: "
@@ -825,7 +847,7 @@ msgstr ""
"<filename>/usr/share/doc/kernel-package/README.gz</filename>)。"
#. Tag: para
-#: post-install.xml:574
+#: post-install.xml:589
#, no-c-format
msgid ""
"This method will make a .deb of your kernel source, and, if you have non-"
@@ -838,7 +860,7 @@ msgstr ""
"filename> 目录将保存内核,System.map,以及当前编译的活动配置文件的日志。"
#. Tag: para
-#: post-install.xml:582
+#: post-install.xml:597
#, no-c-format
msgid ""
"Note that you don't <emphasis>have</emphasis> to compile your kernel the "
@@ -854,7 +876,7 @@ msgstr ""
"源码,并仍使用 <classname>kernel-package</classname> 的编译方法。"
#. Tag: para
-#: post-install.xml:591
+#: post-install.xml:606
#, no-c-format
msgid ""
"Note that you'll find complete documentation on using <classname>kernel-"
@@ -866,7 +888,7 @@ msgstr ""
"入门指南。"
#. Tag: para
-#: post-install.xml:598
+#: post-install.xml:613
#, no-c-format
msgid ""
"Hereafter, we'll assume you have free rein over your machine and will "
@@ -888,7 +910,7 @@ msgstr ""
"<filename>linux-source-&kernelversion;</filename> 刚才创建的目录。"
#. Tag: para
-#: post-install.xml:618
+#: post-install.xml:633
#, no-c-format
msgid ""
"Now, you can configure your kernel. Run <userinput>make xconfig</userinput> "
@@ -914,7 +936,7 @@ msgstr ""
"quote> (它们默认并没有被选择)。否则,您的 &debian; 安装将会遇到问题。"
#. Tag: para
-#: post-install.xml:633
+#: post-install.xml:648
#, no-c-format
msgid ""
"Clean the source tree and reset the <classname>kernel-package</classname> "
@@ -924,7 +946,7 @@ msgstr ""
"<userinput>make-kpkg clean</userinput>。"
#. Tag: para
-#: post-install.xml:638
+#: post-install.xml:653
#, no-c-format
msgid ""
"Now, compile the kernel: <userinput>fakeroot make-kpkg --initrd --"
@@ -941,7 +963,7 @@ msgstr ""
"取决于您的机器的性能。"
#. Tag: para
-#: post-install.xml:648
+#: post-install.xml:663
#, no-c-format
msgid ""
"Once the compilation is complete, you can install your custom kernel like "
@@ -971,7 +993,7 @@ msgstr ""
"如果您创建了一个模块软件包,也要同时安装该软件包。"
#. Tag: para
-#: post-install.xml:668
+#: post-install.xml:683
#, no-c-format
msgid ""
"It is time to reboot the system: read carefully any warning that the above "
@@ -981,7 +1003,7 @@ msgstr ""
"<userinput>shutdown -r now</userinput>。"
#. Tag: para
-#: post-install.xml:673
+#: post-install.xml:688
#, no-c-format
msgid ""
"For more information on &debian; kernels and kernel compilation, see the "
@@ -995,13 +1017,13 @@ msgstr ""
"<filename>/usr/share/doc/kernel-package</filename>。"
#. Tag: title
-#: post-install.xml:689
+#: post-install.xml:704
#, no-c-format
msgid "Recovering a Broken System"
msgstr "修复损坏的系统"
#. Tag: para
-#: post-install.xml:690
+#: post-install.xml:705
#, no-c-format
msgid ""
"Sometimes, things go wrong, and the system you've carefully installed is no "
@@ -1017,7 +1039,7 @@ msgstr ""
"一个可以工作的系统,rescue 模式正好用于此目的。"
#. Tag: para
-#: post-install.xml:700
+#: post-install.xml:715
#, fuzzy, no-c-format
#| msgid ""
#| "To access rescue mode, type <userinput>rescue</userinput> at the "
@@ -1048,7 +1070,7 @@ msgstr ""
"用。"
#. Tag: para
-#: post-install.xml:717
+#: post-install.xml:732
#, no-c-format
msgid ""
"Instead of the partitioning tool, you should now be presented with a list of "
@@ -1062,7 +1084,7 @@ msgstr ""
"创建一样。"
#. Tag: para
-#: post-install.xml:725
+#: post-install.xml:740
#, no-c-format
msgid ""
"If possible, the installer will now present you with a shell prompt in the "
@@ -1078,7 +1100,7 @@ msgstr ""
"userinput> 完成。</phrase>"
#. Tag: para
-#: post-install.xml:737
+#: post-install.xml:752
#, no-c-format
msgid ""
"If the installer cannot run a usable shell in the root file system you "
@@ -1094,13 +1116,13 @@ msgstr ""
"统将挂载到 <filename>/target</filename> 目录。"
#. Tag: para
-#: post-install.xml:746
+#: post-install.xml:761
#, no-c-format
msgid "In either case, after you exit the shell, the system will reboot."
msgstr "无论哪种情况,退出 shell 之后,系统将重启。"
#. Tag: para
-#: post-install.xml:750
+#: post-install.xml:765
#, no-c-format
msgid ""
"Finally, note that repairing broken systems can be difficult, and this "
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 1c181f2c6..c65570604 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: 2015-05-07 17:01+0000\n"
+"POT-Creation-Date: 2016-04-08 20:25+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"
@@ -1143,13 +1143,20 @@ msgstr "10 GB"
#. Tag: para
#: preparing.xml:785
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The actual minimum memory requirements are a lot less than the numbers "
+#| "listed in this table. Depending on the architecture, it is possible to "
+#| "install &debian; with as little as 20MB (for s390) to 60MB (for amd64). "
+#| "The same goes for the disk space requirements, especially if you pick and "
+#| "choose which applications to install; see <xref linkend=\"tasksel-size-"
+#| "list\"/> for additional information on disk space requirements."
msgid ""
"The actual minimum memory requirements are a lot less than the numbers "
"listed in this table. Depending on the architecture, it is possible to "
-"install &debian; with as little as 20MB (for s390) to 60MB (for amd64). The "
-"same goes for the disk space requirements, especially if you pick and choose "
-"which applications to install; see <xref linkend=\"tasksel-size-list\"/> for "
+"install &debian; with as little as 60MB (for amd64). The same goes for the "
+"disk space requirements, especially if you pick and choose which "
+"applications to install; see <xref linkend=\"tasksel-size-list\"/> for "
"additional information on disk space requirements."
msgstr ""
"实际的内存最低要求会略低于表中的数字。根据各自的体系,&debian; 可以在 20MB "
@@ -1196,17 +1203,27 @@ msgstr ""
#. Tag: para
#: preparing.xml:817
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Disk space required for the smooth operation of the &debian-gnu; system "
+#| "itself is taken into account in these recommended system requirements. "
+#| "Notably, the <filename>/var</filename> partition contains a lot of state "
+#| "information specific to &debian; in addition to its regular contents, "
+#| "like logfiles. The <command>dpkg</command> files (with information on all "
+#| "installed packages) can easily consume 40MB. Also, <command>apt-get</"
+#| "command> puts downloaded packages here before they are installed. You "
+#| "should usually allocate at least 200MB for <filename>/var</filename>, and "
+#| "a lot more if you install a graphical desktop environment."
msgid ""
"Disk space required for the smooth operation of the &debian-gnu; system "
"itself is taken into account in these recommended system requirements. "
"Notably, the <filename>/var</filename> partition contains a lot of state "
"information specific to &debian; in addition to its regular contents, like "
"logfiles. The <command>dpkg</command> files (with information on all "
-"installed packages) can easily consume 40MB. Also, <command>apt-get</"
-"command> puts downloaded packages here before they are installed. You should "
-"usually allocate at least 200MB for <filename>/var</filename>, and a lot "
-"more if you install a graphical desktop environment."
+"installed packages) can easily consume 40MB. Also, <command>apt</command> "
+"puts downloaded packages here before they are installed. You should usually "
+"allocate at least 200MB for <filename>/var</filename>, and a lot more if you "
+"install a graphical desktop environment."
msgstr ""
"在推荐的系统需求中已经包含流畅运行 &debian-gnu; 所需的磁盘空间。尤其是 "
"<filename>/var</filename> 分区里装有许多 &debian; 的特定状态信息和类似日志文"
@@ -1981,9 +1998,9 @@ msgstr ""
msgid ""
"The package qemu-slof is, in fact, a dependency of package qemu-system-ppc "
"(which also provides the virtual package qemu-system-ppc64), and can be "
-"installed or updated via <command>apt-get</command> tool on Debian-based "
+"installed or updated via <command>apt</command> tool on Debian-based "
"distros. Like so: <informalexample><screen>\n"
-"# apt-get install qemu-slof\n"
+"# apt install qemu-slof\n"
"</screen></informalexample> SLOF can also be installed into rpm-based "
"distribution systems, given the proper repository or rpm package. "
"Additionally, the upstream source code is available at <ulink url=\"http://"
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index a0a03e1c5..f9025b000 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2015-12-24 22:15+0000\n"
+"POT-Creation-Date: 2016-04-08 20:25+0000\n"
"PO-Revision-Date: 2012-11-26 13:49+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -126,8 +126,8 @@ msgstr "CD/DVD"
#. Tag: entry
#: preseed.xml:77 preseed.xml:78 preseed.xml:79 preseed.xml:89 preseed.xml:91
-#: preseed.xml:94 preseed.xml:95 preseed.xml:99 preseed.xml:100 preseed.xml:104
-#: preseed.xml:106 preseed.xml:109 preseed.xml:111
+#: preseed.xml:94 preseed.xml:95 preseed.xml:99 preseed.xml:100
+#: preseed.xml:104 preseed.xml:106 preseed.xml:109 preseed.xml:111
#, no-c-format
msgid "<entry>yes</entry>"
msgstr "<entry>yes</entry>"
@@ -1367,14 +1367,16 @@ msgstr "本地化"
#: preseed.xml:723
#, no-c-format
msgid ""
-"Setting localization values will only work if you are using initrd "
-"preseeding. With all other methods the preconfiguration file will only be "
-"loaded after these questions have been asked."
+"During a normal install the questions about localization are asked first, so "
+"these values can only be preseeded via the initrd or kernel boot parameter "
+"methods. Auto mode (<xref linkend=\"preseed-auto\"/>) includes the setting "
+"of <literal>auto-install/enable=true</literal> (normally via the "
+"<literal>auto</literal> preseed alias). This delays the asking of the "
+"localisation questions, so that they can be preseeded by any method."
msgstr ""
-"设置本地信息只适用于使用 initrd 预置。其他方式下这些问题是在询问之后加载的。"
#. Tag: para
-#: preseed.xml:729
+#: preseed.xml:732
#, no-c-format
msgid ""
"The locale can be used to specify both language and country and can be any "
@@ -1390,7 +1392,7 @@ msgstr ""
"userinput>。"
#. Tag: para
-#: preseed.xml:738
+#: preseed.xml:741
#, no-c-format
msgid ""
"Although this method is very easy to use, it does not allow preseeding of "
@@ -1409,7 +1411,7 @@ msgstr ""
"因此另一种方法是单独预置各值。语言和国家可以在引导参数里面指定。"
#. Tag: screen
-#: preseed.xml:753
+#: preseed.xml:756
#, no-c-format
msgid ""
"# Preseeding only locale sets language, country and locale.\n"
@@ -1433,7 +1435,7 @@ msgstr ""
"#d-i localechooser/supported-locales multiselect en_US.UTF-8, nl_NL.UTF-8"
#. Tag: para
-#: preseed.xml:755
+#: preseed.xml:758
#, no-c-format
msgid ""
"Keyboard configuration consists of selecting a keymap and (for non-latin "
@@ -1448,7 +1450,7 @@ msgstr ""
"配置。"
#. Tag: screen
-#: preseed.xml:763
+#: preseed.xml:766
#, no-c-format
msgid ""
"# Keyboard selection.\n"
@@ -1460,7 +1462,7 @@ msgstr ""
"# d-i keyboard-configuration/toggle select No toggling"
#. Tag: para
-#: preseed.xml:765
+#: preseed.xml:768
#, no-c-format
msgid ""
"To skip keyboard configuration, preseed <classname>keymap</classname> with "
@@ -1471,13 +1473,13 @@ msgstr ""
"classname>。这将导致内核 keymap 保持活动。"
#. Tag: title
-#: preseed.xml:777
+#: preseed.xml:780
#, no-c-format
msgid "Network configuration"
msgstr "网络设置"
#. Tag: para
-#: preseed.xml:778
+#: preseed.xml:781
#, no-c-format
msgid ""
"Of course, preseeding the network configuration won't work if you're loading "
@@ -1490,7 +1492,7 @@ msgstr ""
"助。如果您计划从网络加载预置文件,应该使用传递网络设置给内核引导参数的方式。"
#. Tag: para
-#: preseed.xml:786
+#: preseed.xml:789
#, no-c-format
msgid ""
"If you need to pick a particular interface when netbooting before loading a "
@@ -1501,7 +1503,7 @@ msgstr ""
"<userinput>interface=<replaceable>eth1</replaceable></userinput>。"
#. Tag: para
-#: preseed.xml:792
+#: preseed.xml:795
#, no-c-format
msgid ""
"Although preseeding the network configuration is normally not possible when "
@@ -1517,19 +1519,19 @@ msgstr ""
"再运行一次,这需要将下面的命令包含在 <quote>preseed/run</quote> 脚本里面:"
#. Tag: screen
-#: preseed.xml:802
+#: preseed.xml:805
#, no-c-format
msgid "kill-all-dhcp; netcfg"
msgstr "kill-all-dhcp; netcfg"
#. Tag: para
-#: preseed.xml:804
+#: preseed.xml:807
#, no-c-format
msgid "The following debconf variables are relevant for network configuration."
msgstr "下面的 debconf 变量与网络配置相关。"
#. Tag: screen
-#: preseed.xml:810
+#: preseed.xml:813
#, fuzzy, no-c-format
#| msgid ""
#| "# Disable network configuration entirely. This is useful for cdrom\n"
@@ -1722,7 +1724,7 @@ msgstr ""
"#d-i hw-detect/load_firmware boolean true"
#. Tag: para
-#: preseed.xml:812
+#: preseed.xml:815
#, no-c-format
msgid ""
"Please note that <command>netcfg</command> will automatically determine the "
@@ -1741,13 +1743,13 @@ msgstr ""
"quote> 确定不使用网关。"
#. Tag: title
-#: preseed.xml:828
+#: preseed.xml:831
#, no-c-format
msgid "Network console"
msgstr "网络控制台"
#. Tag: screen
-#: preseed.xml:830
+#: preseed.xml:833
#, no-c-format
msgid ""
"# Use the following settings if you wish to make use of the network-console\n"
@@ -1767,13 +1769,13 @@ msgstr ""
"#d-i network-console/password-again password r00tme"
#. Tag: title
-#: preseed.xml:835
+#: preseed.xml:838
#, no-c-format
msgid "Mirror settings"
msgstr "镜像设置"
#. Tag: para
-#: preseed.xml:836
+#: preseed.xml:839
#, no-c-format
msgid ""
"Depending on the installation method you use, a mirror may be used to "
@@ -1785,7 +1787,7 @@ msgstr ""
"安装的系统建立 <filename>/etc/apt/sources.list</filename>。"
#. Tag: para
-#: preseed.xml:843
+#: preseed.xml:846
#, no-c-format
msgid ""
"The parameter <classname>mirror/suite</classname> determines the suite for "
@@ -1794,7 +1796,7 @@ msgstr ""
"参数 <classname>mirror/suite</classname> 决定了安装好的系统使用的套件。"
#. Tag: para
-#: preseed.xml:848
+#: preseed.xml:851
#, no-c-format
msgid ""
"The parameter <classname>mirror/udeb/suite</classname> determines the suite "
@@ -1809,7 +1811,7 @@ msgstr ""
"常安装程序会自动安装并使用正确的值而毋需手动设置。"
#. Tag: screen
-#: preseed.xml:859
+#: preseed.xml:862
#, no-c-format
msgid ""
"# If you select ftp, the mirror/country string does not need to be set.\n"
@@ -1837,13 +1839,13 @@ msgstr ""
"#d-i mirror/udeb/suite string testing"
#. Tag: title
-#: preseed.xml:864
+#: preseed.xml:867
#, no-c-format
msgid "Account setup"
msgstr "帐号设置"
#. Tag: para
-#: preseed.xml:865
+#: preseed.xml:868
#, fuzzy, no-c-format
#| msgid ""
#| "The password for the root account and name and password for a first "
@@ -1858,7 +1860,7 @@ msgstr ""
"或 MD5 <emphasis>哈希</emphasis> 值。"
#. Tag: para
-#: preseed.xml:872
+#: preseed.xml:875
#, fuzzy, no-c-format
#| msgid ""
#| "Be aware that preseeding passwords is not completely secure as everyone "
@@ -1877,7 +1879,7 @@ msgstr ""
"MD5 哈希值相对安全一些,但也会造成安全的假象,MD5 哈希值也可以被暴力破解。"
#. Tag: screen
-#: preseed.xml:882
+#: preseed.xml:885
#, fuzzy, no-c-format
#| msgid ""
#| "# Skip creation of a root account (normal user account will be able to\n"
@@ -1962,7 +1964,7 @@ msgstr ""
"#d-i passwd/user-default-groups string audio cdrom video"
#. Tag: para
-#: preseed.xml:884
+#: preseed.xml:887
#, no-c-format
msgid ""
"The <classname>passwd/root-password-crypted</classname> and "
@@ -1979,7 +1981,7 @@ msgstr ""
"root 登录(例如使用 SSH key 认证或 sudo)。"
#. Tag: para
-#: preseed.xml:894
+#: preseed.xml:897
#, fuzzy, no-c-format
#| msgid ""
#| "The following command can be used to generate an MD5 hash for a password:"
@@ -1990,19 +1992,19 @@ msgid ""
msgstr "下面的命令可用于生成密码的 MD5 值。"
#. Tag: screen
-#: preseed.xml:899
+#: preseed.xml:902
#, no-c-format
msgid "mkpasswd -m sha-512"
msgstr "mkpasswd -m sha-512"
#. Tag: title
-#: preseed.xml:905
+#: preseed.xml:908
#, no-c-format
msgid "Clock and time zone setup"
msgstr "时钟与时区设置"
#. Tag: screen
-#: preseed.xml:907
+#: preseed.xml:910
#, no-c-format
msgid ""
"# Controls whether or not the hardware clock is set to UTC.\n"
@@ -2030,13 +2032,13 @@ msgstr ""
"#d-i clock-setup/ntp-server string ntp.example.com"
#. Tag: title
-#: preseed.xml:912
+#: preseed.xml:915
#, no-c-format
msgid "Partitioning"
msgstr "分区"
#. Tag: para
-#: preseed.xml:913
+#: preseed.xml:916
#, no-c-format
msgid ""
"Using preseeding to partition the harddisk is limited to what is supported "
@@ -2050,7 +2052,7 @@ msgstr ""
"义方案,用户自定义的方案文件或预置文件包含的方案。"
#. Tag: para
-#: preseed.xml:921
+#: preseed.xml:924
#, no-c-format
msgid ""
"Preseeding of advanced partition setups using RAID, LVM and encryption is "
@@ -2061,7 +2063,7 @@ msgstr ""
"性不足。"
#. Tag: para
-#: preseed.xml:927
+#: preseed.xml:930
#, no-c-format
msgid ""
"The examples below only provide basic information on the use of recipes. For "
@@ -2079,7 +2081,7 @@ msgstr ""
"source repository</ulink>获取。注意不同发布版支持的功能会有所改变。"
#. Tag: para
-#: preseed.xml:941
+#: preseed.xml:944
#, no-c-format
msgid ""
"The identification of disks is dependent on the order in which their drivers "
@@ -2090,13 +2092,13 @@ msgstr ""
"确的那一个。"
#. Tag: title
-#: preseed.xml:950
+#: preseed.xml:953
#, no-c-format
msgid "Partitioning example"
msgstr "分区示例"
#. Tag: screen
-#: preseed.xml:952
+#: preseed.xml:955
#, fuzzy, no-c-format
#| msgid ""
#| "# If the system has free space you can choose to only partition that "
@@ -2329,13 +2331,13 @@ msgstr ""
"d-i partman/confirm_nooverwrite boolean true"
#. Tag: title
-#: preseed.xml:956
+#: preseed.xml:959
#, no-c-format
msgid "Partitioning using RAID"
msgstr "使用 RAID 分区"
#. Tag: para
-#: preseed.xml:957
+#: preseed.xml:960
#, no-c-format
msgid ""
"You can also use preseeding to set up partitions on software RAID arrays. "
@@ -2346,7 +2348,7 @@ msgstr ""
"列(degraded arrays)和指定额外设备。"
#. Tag: para
-#: preseed.xml:963
+#: preseed.xml:966
#, no-c-format
msgid ""
"If you are using RAID 1, you can preseed grub to install to all devices used "
@@ -2356,7 +2358,7 @@ msgstr ""
"linkend=\"preseed-bootloader\"/>。"
#. Tag: para
-#: preseed.xml:970
+#: preseed.xml:973
#, no-c-format
msgid ""
"This type of automated partitioning is easy to get wrong. It is also "
@@ -2370,7 +2372,7 @@ msgstr ""
"<filename>/var/log/syslog</filename>。"
#. Tag: screen
-#: preseed.xml:980
+#: preseed.xml:983
#, no-c-format
msgid ""
"# The method should be set to \"raid\".\n"
@@ -2474,13 +2476,13 @@ msgstr ""
"d-i partman/confirm_nooverwrite boolean true"
#. Tag: title
-#: preseed.xml:985
+#: preseed.xml:988
#, no-c-format
msgid "Controlling how partitions are mounted"
msgstr "分区挂载控制"
#. Tag: para
-#: preseed.xml:986
+#: preseed.xml:989
#, no-c-format
msgid ""
"Normally, filesystems are mounted using a universally unique identifier "
@@ -2496,7 +2498,7 @@ msgstr ""
"系统仍然使用 UUID 方式挂载。"
#. Tag: para
-#: preseed.xml:995
+#: preseed.xml:998
#, no-c-format
msgid ""
"Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2506,7 +2508,7 @@ msgstr ""
"挂载。"
#. Tag: para
-#: preseed.xml:1002
+#: preseed.xml:1005
#, no-c-format
msgid ""
"Traditional device names may change based on the order in which the kernel "
@@ -2520,7 +2522,7 @@ msgstr ""
"后会出现一些随机的情况。"
#. Tag: screen
-#: preseed.xml:1012
+#: preseed.xml:1015
#, no-c-format
msgid ""
"# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2538,13 +2540,13 @@ msgstr ""
"#d-i partman/mount_style select uuid"
#. Tag: title
-#: preseed.xml:1018
+#: preseed.xml:1021
#, no-c-format
msgid "Base system installation"
msgstr "基本系统安装"
#. Tag: para
-#: preseed.xml:1019
+#: preseed.xml:1022
#, no-c-format
msgid ""
"There is actually not very much that can be preseeded for this stage of the "
@@ -2553,7 +2555,7 @@ msgid ""
msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内核安装相关的问题。"
#. Tag: screen
-#: preseed.xml:1026
+#: preseed.xml:1029
#, no-c-format
msgid ""
"# Configure APT to not install recommended packages by default. Use of this\n"
@@ -2577,13 +2579,13 @@ msgstr ""
"#d-i base-installer/kernel/image string &kernelpackage;-686"
#. Tag: title
-#: preseed.xml:1031
+#: preseed.xml:1034
#, no-c-format
msgid "Apt setup"
msgstr "设置 apt"
#. Tag: para
-#: preseed.xml:1032
+#: preseed.xml:1035
#, no-c-format
msgid ""
"Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2596,7 +2598,7 @@ msgstr ""
"仓库。"
#. Tag: screen
-#: preseed.xml:1040
+#: preseed.xml:1043
#, fuzzy, no-c-format
#| msgid ""
#| "# You can choose to install non-free and contrib software.\n"
@@ -2684,13 +2686,13 @@ msgstr ""
"#d-i debian-installer/allow_unauthenticated boolean true"
#. Tag: title
-#: preseed.xml:1045
+#: preseed.xml:1048
#, no-c-format
msgid "Package selection"
msgstr "选择软件包"
#. Tag: para
-#: preseed.xml:1046
+#: preseed.xml:1049
#, no-c-format
msgid ""
"You can choose to install any combination of tasks that are available. "
@@ -2698,84 +2700,84 @@ msgid ""
msgstr "您可以选择安装存在的任务的组合。本文编撰时已有的任务包括:"
#. Tag: para
-#: preseed.xml:1054
+#: preseed.xml:1057
#, fuzzy, no-c-format
#| msgid "<userinput>desktop</userinput>"
msgid "<userinput>standard</userinput> (standard tools)"
msgstr "<userinput>desktop</userinput>"
#. Tag: para
-#: preseed.xml:1057
+#: preseed.xml:1060
#, fuzzy, no-c-format
#| msgid "<userinput>desktop</userinput>"
msgid "<userinput>desktop</userinput> (graphical desktop)"
msgstr "<userinput>desktop</userinput>"
#. Tag: para
-#: preseed.xml:1060
+#: preseed.xml:1063
#, fuzzy, no-c-format
#| msgid "<userinput>desktop</userinput>"
msgid "<userinput>gnome-desktop</userinput> (Gnome desktop)"
msgstr "<userinput>desktop</userinput>"
#. Tag: para
-#: preseed.xml:1063
+#: preseed.xml:1066
#, fuzzy, no-c-format
#| msgid "<userinput>desktop</userinput>"
msgid "<userinput>xfce-desktop</userinput> (XFCE desktop)"
msgstr "<userinput>desktop</userinput>"
#. Tag: para
-#: preseed.xml:1066
+#: preseed.xml:1069
#, fuzzy, no-c-format
#| msgid "<userinput>desktop</userinput>"
msgid "<userinput>kde-desktop</userinput> (KDE desktop)"
msgstr "<userinput>desktop</userinput>"
#. Tag: para
-#: preseed.xml:1069
+#: preseed.xml:1072
#, fuzzy, no-c-format
#| msgid "<userinput>desktop</userinput>"
msgid "<userinput>cinnamon-desktop</userinput> (Cinnamon desktop)"
msgstr "<userinput>desktop</userinput>"
#. Tag: para
-#: preseed.xml:1072
+#: preseed.xml:1075
#, fuzzy, no-c-format
#| msgid "<userinput>desktop</userinput>"
msgid "<userinput>mate-desktop</userinput> (MATE desktop)"
msgstr "<userinput>desktop</userinput>"
#. Tag: para
-#: preseed.xml:1075
+#: preseed.xml:1078
#, fuzzy, no-c-format
#| msgid "<userinput>desktop</userinput>"
msgid "<userinput>lxde-desktop</userinput> (LXDE desktop)"
msgstr "<userinput>desktop</userinput>"
#. Tag: para
-#: preseed.xml:1078
+#: preseed.xml:1081
#, fuzzy, no-c-format
#| msgid "<userinput>desktop</userinput>"
msgid "<userinput>web-server</userinput> (web server)"
msgstr "<userinput>desktop</userinput>"
#. Tag: para
-#: preseed.xml:1081
+#: preseed.xml:1084
#, fuzzy, no-c-format
#| msgid "<userinput>desktop</userinput>"
msgid "<userinput>print-server</userinput> (print server)"
msgstr "<userinput>desktop</userinput>"
#. Tag: para
-#: preseed.xml:1084
+#: preseed.xml:1087
#, fuzzy, no-c-format
#| msgid "<userinput>desktop</userinput>"
msgid "<userinput>ssh-server</userinput> (SSH server)"
msgstr "<userinput>desktop</userinput>"
#. Tag: para
-#: preseed.xml:1089
+#: preseed.xml:1092
#, no-c-format
msgid ""
"You can also choose to install no tasks, and force the installation of a set "
@@ -2786,7 +2788,7 @@ msgstr ""
"<userinput>standard</userinput> 任务。"
#. Tag: para
-#: preseed.xml:1095
+#: preseed.xml:1098
#, no-c-format
msgid ""
"If you want to install some individual packages in addition to packages "
@@ -2800,7 +2802,7 @@ msgstr ""
"命令行上使用。"
#. Tag: screen
-#: preseed.xml:1105
+#: preseed.xml:1108
#, no-c-format
msgid ""
"#tasksel tasksel/first multiselect standard, web-server, kde-desktop\n"
@@ -2832,13 +2834,13 @@ msgstr ""
"#popularity-contest popularity-contest/participate boolean false"
#. Tag: title
-#: preseed.xml:1110
+#: preseed.xml:1113
#, no-c-format
msgid "Boot loader installation"
msgstr "安装 bootloader"
#. Tag: screen
-#: preseed.xml:1112
+#: preseed.xml:1115
#, fuzzy, no-c-format
#| msgid ""
#| "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). "
@@ -2974,7 +2976,7 @@ msgstr ""
"#d-i debian-installer/add-kernel-opts string nousb"
#. Tag: para
-#: preseed.xml:1114
+#: preseed.xml:1117
#, no-c-format
msgid ""
"An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2986,13 +2988,13 @@ msgstr ""
"令。"
#. Tag: title
-#: preseed.xml:1124
+#: preseed.xml:1127
#, no-c-format
msgid "Finishing up the installation"
msgstr "完成安装"
#. Tag: screen
-#: preseed.xml:1126
+#: preseed.xml:1129
#, no-c-format
msgid ""
"# During installations from serial console, the regular virtual consoles\n"
@@ -3032,13 +3034,13 @@ msgstr ""
"#d-i debian-installer/exit/poweroff boolean true"
#. Tag: title
-#: preseed.xml:1131
+#: preseed.xml:1134
#, no-c-format
msgid "Preseeding other packages"
msgstr "预置其他的软件包"
#. Tag: screen
-#: preseed.xml:1133
+#: preseed.xml:1136
#, no-c-format
msgid ""
"# Depending on what software you choose to install, or if things go wrong\n"
@@ -3058,19 +3060,19 @@ msgstr ""
"# debconf-get-selections >> file"
#. Tag: title
-#: preseed.xml:1140
+#: preseed.xml:1143
#, no-c-format
msgid "Advanced options"
msgstr "高级选项"
#. Tag: title
-#: preseed.xml:1143
+#: preseed.xml:1146
#, no-c-format
msgid "Running custom commands during the installation"
msgstr "安装过程中运行用户命令"
#. Tag: para
-#: preseed.xml:1144
+#: preseed.xml:1147
#, no-c-format
msgid ""
"A very powerful and flexible option offered by the preconfiguration tools is "
@@ -3080,7 +3082,7 @@ msgstr ""
"本。"
#. Tag: para
-#: preseed.xml:1150
+#: preseed.xml:1153
#, no-c-format
msgid ""
"When the filesystem of the target system is mounted, it is available in "
@@ -3089,7 +3091,7 @@ msgid ""
msgstr ""
#. Tag: screen
-#: preseed.xml:1158
+#: preseed.xml:1161
#, no-c-format
msgid ""
"# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -3137,13 +3139,13 @@ msgstr ""
"#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
#. Tag: title
-#: preseed.xml:1163
+#: preseed.xml:1166
#, no-c-format
msgid "Using preseeding to change default values"
msgstr "使用预置修改默认值"
#. Tag: para
-#: preseed.xml:1164
+#: preseed.xml:1167
#, no-c-format
msgid ""
"It is possible to use preseeding to change the default answer for a "
@@ -3167,7 +3169,7 @@ msgstr ""
"这对于测试和调试您的预置文件很有帮助。"
#. Tag: para
-#: preseed.xml:1178
+#: preseed.xml:1181
#, no-c-format
msgid ""
"Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -3180,7 +3182,7 @@ msgstr ""
"\"preseed-bootparms\"/> 的脚注。"
#. Tag: para
-#: preseed.xml:1185
+#: preseed.xml:1188
#, no-c-format
msgid ""
"If you are preseeding using boot parameters, you can make the installer ask "
@@ -3201,7 +3203,7 @@ msgstr ""
"在安装时显示出来的问题对应的参数,而不是<quote>内部的</quote>参数。"
#. Tag: para
-#: preseed.xml:1195
+#: preseed.xml:1198
#, no-c-format
msgid ""
"For more debugging information, use the boot parameter "
@@ -3214,13 +3216,13 @@ msgstr ""
"件包安装脚本的进度。"
#. Tag: title
-#: preseed.xml:1207
+#: preseed.xml:1210
#, no-c-format
msgid "Chainloading preconfiguration files"
msgstr "预置文件链"
#. Tag: para
-#: preseed.xml:1208
+#: preseed.xml:1211
#, no-c-format
msgid ""
"It is possible to include other preconfiguration files from a "
@@ -3234,7 +3236,7 @@ msgstr ""
"外的文件里面。"
#. Tag: screen
-#: preseed.xml:1218
+#: preseed.xml:1221
#, no-c-format
msgid ""
"# More than one file can be listed, separated by spaces; all will be\n"
@@ -3284,7 +3286,7 @@ msgstr ""
"#d-i preseed/run string foo.sh"
#. Tag: para
-#: preseed.xml:1220
+#: preseed.xml:1223
#, no-c-format
msgid ""
"It is also possible to chainload from the initrd or file preseeding phase, "
@@ -3298,6 +3300,14 @@ msgstr ""
"使网络预置在网络连通时执行。您应该小心使用,因为这是两种预置,意味着您有机会"
"执行 preseed/early 命令,第二个可以在网络连通后使用。"
+#~ msgid ""
+#~ "Setting localization values will only work if you are using initrd "
+#~ "preseeding. With all other methods the preconfiguration file will only be "
+#~ "loaded after these questions have been asked."
+#~ msgstr ""
+#~ "设置本地信息只适用于使用 initrd 预置。其他方式下这些问题是在询问之后加载"
+#~ "的。"
+
#~ msgid "<entry>desktop</entry>"
#~ msgstr "<entry>desktop</entry>"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index cee720379..1ff870da8 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2015-04-15 20:29+0000\n"
+"POT-Creation-Date: 2016-04-08 20:25+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"
@@ -347,9 +347,9 @@ msgid ""
"space. A minimal base installation, without the <quote>Standard system</"
"quote> task selected, will take &base-system-size;MB."
msgstr ""
-"对于 amd64 架构,基本安装默认使用 内核,包含了所有的标准软件包,需要 "
-"&std-system-size;MB 磁盘空间。最小化的基本安装,没有选择 <quote>Standard "
-"system</quote> 任务,需要 &base-system-size;MB。"
+"对于 amd64 架构,基本安装默认使用 内核,包含了所有的标准软件包,需要 &std-"
+"system-size;MB 磁盘空间。最小化的基本安装,没有选择 <quote>Standard system</"
+"quote> 任务,需要 &base-system-size;MB。"
#. Tag: para
#: random-bits.xml:182
@@ -1039,9 +1039,14 @@ msgstr "安装 makedev 软件包,并创建默认的静态设备文件,使用
#. Tag: screen
#: random-bits.xml:528
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# apt-get install makedev\n"
+#| "# mount none /proc -t proc\n"
+#| "# cd /dev\n"
+#| "# MAKEDEV generic"
msgid ""
-"# apt-get install makedev\n"
+"# apt install makedev\n"
"# mount none /proc -t proc\n"
"# cd /dev\n"
"# MAKEDEV generic"
@@ -1350,7 +1355,18 @@ msgstr "配置 Apt"
#. Tag: para
#: random-bits.xml:654
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debootstrap will have created a very basic <filename>/etc/apt/sources."
+#| "list</filename> that will allow installing additional packages. However, "
+#| "you may want to add some additional sources, for example for source "
+#| "packages and security updates: <informalexample><screen>\n"
+#| "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
+#| "\n"
+#| "deb http://security.debian.org/ &releasename;/updates main\n"
+#| "deb-src http://security.debian.org/ &releasename;/updates main\n"
+#| "</screen></informalexample> Make sure to run <userinput>aptitude update</"
+#| "userinput> after you have made changes to the sources list."
msgid ""
"Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
"filename> that will allow installing additional packages. However, you may "
@@ -1360,7 +1376,7 @@ msgid ""
"\n"
"deb http://security.debian.org/ &releasename;/updates main\n"
"deb-src http://security.debian.org/ &releasename;/updates main\n"
-"</screen></informalexample> Make sure to run <userinput>aptitude update</"
+"</screen></informalexample> Make sure to run <userinput>apt update</"
"userinput> after you have made changes to the sources list."
msgstr ""
"debootstrap 会创建一个非常基本的 <filename>/etc/apt/sources.list</filename> "
@@ -1381,13 +1397,21 @@ msgstr "本地化和键盘的配置"
#. Tag: para
#: random-bits.xml:671
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "To configure your locale settings to use a language other than English, "
+#| "install the <classname>locales</classname> support package and configure "
+#| "it. Currently the use of UTF-8 locales is recommended. "
+#| "<informalexample><screen>\n"
+#| "# aptitude install locales\n"
+#| "# dpkg-reconfigure locales\n"
+#| "</screen></informalexample> To configure your keyboard (if needed):"
msgid ""
"To configure your locale settings to use a language other than English, "
"install the <classname>locales</classname> support package and configure it. "
"Currently the use of UTF-8 locales is recommended. "
"<informalexample><screen>\n"
-"# aptitude install locales\n"
+"# apt install locales\n"
"# dpkg-reconfigure locales\n"
"</screen></informalexample> To configure your keyboard (if needed):"
msgstr ""
@@ -1399,9 +1423,12 @@ msgstr ""
#. Tag: screen
#: random-bits.xml:681
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# aptitude install console-setup\n"
+#| "# dpkg-reconfigure keyboard-configuration"
msgid ""
-"# aptitude install console-setup\n"
+"# apt install console-setup\n"
"# dpkg-reconfigure keyboard-configuration"
msgstr ""
"# aptitude install console-setup\n"
@@ -1433,8 +1460,9 @@ msgstr ""
#. Tag: screen
#: random-bits.xml:699
-#, no-c-format
-msgid "# apt-cache search &kernelpackage;"
+#, fuzzy, no-c-format
+#| msgid "# apt-cache search &kernelpackage;"
+msgid "# apt search &kernelpackage;"
msgstr "# apt-cache search &kernelpackage;"
#. Tag: para
@@ -1445,8 +1473,10 @@ msgstr "然后根据所选取的软件包名称安装内核软件包。"
#. Tag: screen
#: random-bits.xml:705
-#, no-c-format
-msgid "# aptitude install &kernelpackage;-<replaceable>arch-etc</replaceable>"
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# aptitude install &kernelpackage;-<replaceable>arch-etc</replaceable>"
+msgid "# apt install &kernelpackage;-<replaceable>arch-etc</replaceable>"
msgstr "# aptitude install &kernelpackage;-<replaceable>arch-etc</replaceable>"
#. Tag: title
@@ -1457,12 +1487,17 @@ msgstr "Boot Loader 的设置"
#. Tag: para
#: random-bits.xml:712
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "To make your &debian-gnu; system bootable, set up your boot loader to "
+#| "load the installed kernel with your new root partition. Note that "
+#| "<command>debootstrap</command> does not install a boot loader, though you "
+#| "can use <command>aptitude</command> inside your &debian; chroot to do so."
msgid ""
"To make your &debian-gnu; system bootable, set up your boot loader to load "
"the installed kernel with your new root partition. Note that "
-"<command>debootstrap</command> does not install a boot loader, though you "
-"can use <command>aptitude</command> inside your &debian; chroot to do so."
+"<command>debootstrap</command> does not install a boot loader, but you can "
+"use <command>apt</command> inside your &debian; chroot to do so."
msgstr ""
"要让您的 &debian-gnu; 系统能够启动,还要创建 boot loader,好让它能加载安装的"
"内核并用上新的根分区。注意 <command>debootstrap</command> 不会安装 boot "
@@ -1494,11 +1529,21 @@ msgstr ""
#. Tag: para
#: random-bits.xml:731
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Installing and setting up <classname>grub2</classname> is as easy as: "
+#| "<informalexample><screen>\n"
+#| "# aptitude install grub-pc\n"
+#| "# grub-install /dev/<replaceable>sda</replaceable>\n"
+#| "# update-grub\n"
+#| "</screen></informalexample> The second command will install "
+#| "<command>grub2</command> (in this case in the MBR of <literal>sda</"
+#| "literal>). The last command will create a sane and working <filename>/"
+#| "boot/grub/grub.cfg</filename>."
msgid ""
"Installing and setting up <classname>grub2</classname> is as easy as: "
"<informalexample><screen>\n"
-"# aptitude install grub-pc\n"
+"# apt install grub-pc\n"
"# grub-install /dev/<replaceable>sda</replaceable>\n"
"# update-grub\n"
"</screen></informalexample> The second command will install <command>grub2</"
@@ -1614,7 +1659,7 @@ 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 up access. <informalexample><screen>\n"
-"# aptitude install ssh\n"
+"# apt install ssh\n"
"</screen></informalexample> Root login with password is disabled by default, "
"so setting up access can be done by setting a password and re-enable root "
"login with password: <informalexample><screen>\n"
@@ -1649,15 +1694,23 @@ msgstr "最后一笔"
#. Tag: para
#: random-bits.xml:807
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "As mentioned earlier, the installed system will be very basic. If you "
+#| "would like to make the system a bit more mature, there is an easy method "
+#| "to install all packages with <quote>standard</quote> priority: "
+#| "<informalexample><screen>\n"
+#| "# tasksel install standard\n"
+#| "</screen></informalexample> Of course, you can also just use "
+#| "<command>aptitude</command> to install packages individually."
msgid ""
"As mentioned earlier, the installed system will be very basic. If you would "
"like to make the system a bit more mature, there is an easy method to "
"install all packages with <quote>standard</quote> priority: "
"<informalexample><screen>\n"
"# tasksel install standard\n"
-"</screen></informalexample> Of course, you can also just use "
-"<command>aptitude</command> to install packages individually."
+"</screen></informalexample> Of course, you can also just use <command>apt</"
+"command> to install packages individually."
msgstr ""
"如前所述,安装的是很基本的系统。如果您想让它更成熟一些,有一个简单的方法,使"
"用 <quote>standard</quote> 优先级来安装所有的软件包:"
@@ -1679,8 +1732,9 @@ msgstr ""
#. Tag: screen
#: random-bits.xml:824
-#, no-c-format
-msgid "# aptitude clean"
+#, fuzzy, no-c-format
+#| msgid "# aptitude clean"
+msgid "# apt clean"
msgstr "# aptitude clean"
#. Tag: title
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index c427b94de..4968bcc87 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2015-04-15 20:29+0000\n"
+"POT-Creation-Date: 2016-04-08 20:25+0000\n"
"PO-Revision-Date: 2012-11-26 15:04+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -2135,10 +2135,10 @@ msgstr ""
" #5 logical 6.0 GB f ext4 /\n"
" #6 logical 1.0 GB f ext3 /var\n"
" #7 logical 498.8 MB ext3\n"
-"</screen></informalexample> 本例中有两块 硬盘,它们分别被分割成了几个分"
-"区。第一块硬盘上还有些空闲空间。表中每行列出了分区编号、类型、大小、选项标"
-"志、文件系统和挂载点(如果有的话)。注意:导引式分区方式不能创建这些特殊的设"
-"置,但使用手动方式分区的结果会有所不同。"
+"</screen></informalexample> 本例中有两块 硬盘,它们分别被分割成了几个分区。第"
+"一块硬盘上还有些空闲空间。表中每行列出了分区编号、类型、大小、选项标志、文件"
+"系统和挂载点(如果有的话)。注意:导引式分区方式不能创建这些特殊的设置,但使用"
+"手动方式分区的结果会有所不同。"
#. Tag: para
#: using-d-i.xml:1394
@@ -2223,9 +2223,8 @@ msgstr ""
"否显示由分区的使用方式决定。如果您不喜欢预选的缺省设置的话,尽可按照自己的喜"
"好更改。比如说,选中 <guimenuitem>Use as:</guimenuitem> 选项,然后您可以让这"
"个分区改用其他的文件系统,把它用作交换分区<phrase arch=\"linux-any\">、软 "
-"RAID、LVM</phrase>,或者根本就放着不用。"
-"一旦您对新分区的设置感到满意了,就可以选择 "
-"<guimenuitem>Done setting up the partition</guimenuitem>,然后退回到 "
+"RAID、LVM</phrase>,或者根本就放着不用。一旦您对新分区的设置感到满意了,就可"
+"以选择 <guimenuitem>Done setting up the partition</guimenuitem>,然后退回到 "
"<command>partman</command> 的主界面。"
#. Tag: para
@@ -3074,9 +3073,9 @@ msgid ""
"alternatives only when you need to ensure compatibility with some previously "
"installed system that is not able to use newer algorithms."
msgstr ""
-"与其替代者比较,默认的 <userinput>xts-plain64</userinput> 是当前已知的具"
-"有最少的攻击漏洞。您只有在需要保持与以前安装的系统兼容,而它们无法使用新的算"
-"法时,才使用其他的算法。"
+"与其替代者比较,默认的 <userinput>xts-plain64</userinput> 是当前已知的具有最"
+"少的攻击漏洞。您只有在需要保持与以前安装的系统兼容,而它们无法使用新的算法"
+"时,才使用其他的算法。"
#. Tag: term
#: using-d-i.xml:2029
@@ -3423,19 +3422,34 @@ msgstr "配置 apt"
#. Tag: para
#: using-d-i.xml:2262
-#, no-c-format
-msgid ""
-"One of the tools used to install packages on a &debian-gnu; system is a "
-"program called <command>apt-get</command>, from the <classname>apt</"
-"classname> package<footnote> <para> Note that the program which actually "
-"installs the packages is called <command>dpkg</command>. However, this "
-"program is more of a low-level tool. <command>apt-get</command> is a higher-"
-"level tool, which will invoke <command>dpkg</command> as appropriate. It "
-"knows how to retrieve packages from your CD, the network, or wherever. It is "
-"also able to automatically install other packages which are required to make "
-"the package you're trying to install work correctly. </para> </footnote>. "
-"Other front-ends for package management, like <command>aptitude</command> "
-"and <command>synaptic</command>, are also in use. These front-ends are "
+#, fuzzy, no-c-format
+#| msgid ""
+#| "One of the tools used to install packages on a &debian-gnu; system is a "
+#| "program called <command>apt-get</command>, from the <classname>apt</"
+#| "classname> package<footnote> <para> Note that the program which actually "
+#| "installs the packages is called <command>dpkg</command>. However, this "
+#| "program is more of a low-level tool. <command>apt-get</command> is a "
+#| "higher-level tool, which will invoke <command>dpkg</command> as "
+#| "appropriate. It knows how to retrieve packages from your CD, the network, "
+#| "or wherever. It is also able to automatically install other packages "
+#| "which are required to make the package you're trying to install work "
+#| "correctly. </para> </footnote>. Other front-ends for package management, "
+#| "like <command>aptitude</command> and <command>synaptic</command>, are "
+#| "also in use. These front-ends are recommended for new users, since they "
+#| "integrate some additional features (package searching and status checks) "
+#| "in a nice user interface."
+msgid ""
+"One of the tools used to install packages on a &debian-gnu; system is the "
+"program <command>apt</command>, from the <classname>apt</classname> "
+"package<footnote> <para> Note that the program which actually installs the "
+"packages is called <command>dpkg</command>. However, this program is more of "
+"a low-level tool. <command>apt</command> is a higher-level tool, which will "
+"invoke <command>dpkg</command> as appropriate. It knows how to retrieve "
+"packages from your CD, the network, or wherever. It is also able to "
+"automatically install other packages which are required to make the package "
+"you're trying to install work correctly. </para> </footnote>. Other front-"
+"ends for package management, like <command>aptitude</command> and "
+"<command>synaptic</command>, are also in use. These front-ends are "
"recommended for new users, since they integrate some additional features "
"(package searching and status checks) in a nice user interface."
msgstr ""
@@ -3488,8 +3502,8 @@ msgid ""
"sections of the archive."
msgstr ""
"如果您采用较低的优先级安装 (比如,expert 模式),就要自己做更多的判定。您可以"
-"选择是否使用安全、或者 stable-updates 更新服务,并能选择从 <quote>contrib</quote> "
-"和 <quote>non-free</quote> 软件仓库里面添加软件包。"
+"选择是否使用安全、或者 stable-updates 更新服务,并能选择从 <quote>contrib</"
+"quote> 和 <quote>non-free</quote> 软件仓库里面添加软件包。"
#. Tag: title
#: using-d-i.xml:2312
@@ -3770,10 +3784,11 @@ msgid ""
"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>httpredir.debian.org</quote> 作为您的镜像服"
-"务器。 <quote>httpredir.debian.org</quote> 并不是一个物理镜像,而是一个重定向服"
-"务,也就是它能根据您的网络路径自动转换成一个真实的镜像服务器。它还能考虑到您"
-"连接所采用的协议,比如使用 IPv6,它将自动将您引到最近的 IPv6 镜像服务器。"
+"另一种选择是手动选取镜像,指定 <quote>httpredir.debian.org</quote> 作为您的镜"
+"像服务器。 <quote>httpredir.debian.org</quote> 并不是一个物理镜像,而是一个重"
+"定向服务,也就是它能根据您的网络路径自动转换成一个真实的镜像服务器。它还能考"
+"虑到您连接所采用的协议,比如使用 IPv6,它将自动将您引到最近的 IPv6 镜像服务"
+"器。"
#. Tag: title
#: using-d-i.xml:2495
@@ -4414,11 +4429,13 @@ msgid ""
"After arcboot has been installed, the system can be booted from hard disk by "
"setting some firmware environment variables entering "
"<informalexample><screen>\n"
-"<userinput> setenv SystemPartition scsi(<replaceable>scsi</replaceable>)disk"
-"(<replaceable>disk</replaceable>)rdisk(0)partition(0)</userinput>\n"
-"<userinput> setenv OSLoadPartition scsi(<replaceable>scsi</replaceable>)disk"
-"(<replaceable>disk</replaceable>)rdisk(0)partition(<replaceable>partnr</"
-"replaceable>)</userinput>\n"
+"<userinput> setenv SystemPartition scsi(<replaceable>scsi</"
+"replaceable>)disk(<replaceable>disk</replaceable>)rdisk(0)partition(0)</"
+"userinput>\n"
+"<userinput> setenv OSLoadPartition scsi(<replaceable>scsi</"
+"replaceable>)disk(<replaceable>disk</"
+"replaceable>)rdisk(0)partition(<replaceable>partnr</replaceable>)</"
+"userinput>\n"
"<userinput> setenv OSLoader arcboot</userinput>\n"
"<userinput> setenv OSLoadFilename <replaceable>config</replaceable></"
"userinput>\n"
@@ -4431,11 +4448,13 @@ msgstr ""
"<filename>/etc/arcboot.conf</filename> 里建立。每个设置有单独的名称,安装程序"
"创建的默认设置为 <quote>linux</quote>。arcboot 安装之后,系统可以从硬盘启动,"
"这需要固件提示时设置一些固件环境变量 <informalexample><screen>\n"
-"<userinput> setenv SystemPartition scsi(<replaceable>scsi</replaceable>)disk"
-"(<replaceable>disk</replaceable>)rdisk(0)partition(0)</userinput>\n"
-"<userinput> setenv OSLoadPartition scsi(<replaceable>scsi</replaceable>)disk"
-"(<replaceable>disk</replaceable>)rdisk(0)partition(<replaceable>partnr</"
-"replaceable>)</userinput>\n"
+"<userinput> setenv SystemPartition scsi(<replaceable>scsi</"
+"replaceable>)disk(<replaceable>disk</replaceable>)rdisk(0)partition(0)</"
+"userinput>\n"
+"<userinput> setenv OSLoadPartition scsi(<replaceable>scsi</"
+"replaceable>)disk(<replaceable>disk</"
+"replaceable>)rdisk(0)partition(<replaceable>partnr</replaceable>)</"
+"userinput>\n"
"<userinput> setenv OSLoader arcboot</userinput>\n"
"<userinput> setenv OSLoadFilename <replaceable>config</replaceable></"
"userinput>\n"