summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--po/zh_CN/boot-installer.po248
-rw-r--r--po/zh_CN/hardware.po105
-rw-r--r--po/zh_CN/install-methods.po172
-rw-r--r--po/zh_CN/installation-howto.po15
-rw-r--r--po/zh_CN/partitioning.po36
-rw-r--r--po/zh_CN/post-install.po6
-rw-r--r--po/zh_CN/preparing.po15
-rw-r--r--po/zh_CN/preseed.po80
-rw-r--r--po/zh_CN/random-bits.po37
-rw-r--r--po/zh_CN/using-d-i.po33
10 files changed, 162 insertions, 585 deletions
diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 5094fe43b..987abcea8 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2012-07-01 14:46+0000\n"
-"PO-Revision-Date: 2010-10-26 20:28+0800\n"
+"PO-Revision-Date: 2012-07-25 16:38+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
"Language: \n"
@@ -325,7 +325,7 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:213
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "This will seemingly restart the machine; but in reality, it loads reboot "
#| "to RAM and restarts it from there. Not doing this step will cause the "
@@ -334,9 +334,7 @@ msgid ""
"This will seemingly restart the machine; but in reality, it loads redboot to "
"RAM and restarts it from there. Not doing this step will cause the system to "
"hang in the necessary ip_address step that comes next."
-msgstr ""
-"表面上看这在重新启动机器;但实际上是重新启动到 RAM,让它来启动。不进行这一步"
-"将导致系统在接下来需要 ip_address 时挂起。"
+msgstr "表面上看这在重新启动机器;但实际上是加载 redboot 到 RAM,让它来重新启动。不进行这一步将导致系统在接下来需要 ip_address 时挂起。"
#. Tag: para
#: boot-installer.xml:219
@@ -390,11 +388,11 @@ msgstr "从 Windows 引导"
#: boot-installer.xml:350
#, no-c-format
msgid "To start the installer from Windows, you can either"
-msgstr ""
+msgstr "从 Windows 下启动安装程序,您可以"
#. Tag: para
#: boot-installer.xml:355
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "To start the installer from Windows, you must first obtain CD-ROM/DVD-ROM "
#| "or USB memory stick installation media as described in <xref linkend="
@@ -402,10 +400,7 @@ msgstr ""
msgid ""
"obtain CD-ROM/DVD-ROM or USB memory stick installation media as described in "
"<xref linkend=\"official-cdrom\"/> and <xref linkend=\"boot-usb-files\"/>, or"
-msgstr ""
-"为了从 Windows 启动安装程序,您首先需要按照 <xref linkend=\"official-cdrom\"/"
-"> 和 <xref linkend=\"boot-usb-files\"/> 所述获取 CD-ROM/DVD-ROM 或者 USB 存储"
-"卡安装介质。"
+msgstr "从 <xref linkend=\"official-cdrom\"/> 和 <xref linkend=\"boot-usb-files\"/> 获取 CD-ROM/DVD-ROM 或 U 盘安装映像,或者"
#. Tag: para
#: boot-installer.xml:361
@@ -413,7 +408,7 @@ msgstr ""
msgid ""
"download a standalone Windows executable, which is available as tools/win32-"
"loader/stable/win32-loader.exe on the &debian; mirrors,"
-msgstr ""
+msgstr "下载独立的 Windows 可执行程序,它位于 &debian; 镜像网站 tools/win32-loader/stable/win32-loader.exe,"
#. Tag: para
#: boot-installer.xml:369
@@ -431,7 +426,7 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:377
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "After the program has been started, a few preliminary questions will be "
#| "asked and the system will be prepared to start the &debian-gnu; installer."
@@ -439,9 +434,7 @@ msgid ""
"After the program has been started, a few preliminary questions will be "
"asked and the system will be prepared to reboot into the &debian-gnu; "
"installer."
-msgstr ""
-"程序运行后,会先询问一些预备问题,接着系统就准备开始启动 &debian-gnu; 安装程"
-"序了。"
+msgstr "程序运行后,会先询问一些预备问题,接着系统就准备重启进入 &debian-gnu; 安装程序。"
#. Tag: title
#: boot-installer.xml:387
@@ -591,7 +584,7 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:478
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "The procedure for <command>GRUB</command> is quite similar. Locate your "
#| "<filename>menu.lst</filename> in the <filename>/boot/grub/</filename> "
@@ -604,11 +597,7 @@ msgid ""
"directory (or sometimes <filename>/boot/boot/grub/</filename>) and add an "
"entry for the installer, for example (assuming <filename>/boot</filename> is "
"on the first partition of the first disk in the system):"
-msgstr ""
-"使用 <command>GRUB</command> 的过程也类似。在 <filename>/boot/grub/</"
-"filename> 目录下找到 <filename>menu.lst</filename> (或者位于 <filename>/boot/"
-"boot/grub/</filename>),然后给安装程序增添一个入口,例如(假设 <filename>/"
-"boot</filename> 位于系统中第一个磁盘的第一个分区上面):"
+msgstr "使用 <command>GRUB1</command> 的过程也类似。在 <filename>/boot/grub/</filename> 目录下找到 <filename>menu.lst</filename> (或者位于 <filename>/boot/boot/grub/</filename>),然后给安装程序增添一个入口,例如(假设 <filename>/boot</filename> 位于系统中第一个磁盘的第一个分区上面):"
#. Tag: screen
#: boot-installer.xml:486
@@ -626,7 +615,7 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:488
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "The procedure for <command>GRUB</command> is quite similar. Locate your "
#| "<filename>menu.lst</filename> in the <filename>/boot/grub/</filename> "
@@ -637,15 +626,11 @@ msgid ""
"The procedure for <command>GRUB2</command> is very similar. The file is "
"named <filename>grub.cfg</filename> instead of <filename>menu.lst</"
"filename>. An entry for the installer would be for instance for example:"
-msgstr ""
-"使用 <command>GRUB</command> 的过程也类似。在 <filename>/boot/grub/</"
-"filename> 目录下找到 <filename>menu.lst</filename> (或者位于 <filename>/boot/"
-"boot/grub/</filename>),然后给安装程序增添一个入口,例如(假设 <filename>/"
-"boot</filename> 位于系统中第一个磁盘的第一个分区上面):"
+msgstr "使用 <command>GRUB2</command> 的过程类似。它使用 <filename>grub.cfg</filename> 替代 <filename>menu.lst</filename> 文件。安装程序的入口,例如:"
#. Tag: screen
#: boot-installer.xml:494
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "title New Install\n"
#| "root (hd0,0)\n"
@@ -660,10 +645,13 @@ msgid ""
"initrd /boot/newinstall/initrd.gz\n"
"}"
msgstr ""
-"title New Install\n"
-"root (hd0,0)\n"
-"kernel /boot/newinstall/vmlinuz\n"
-"initrd /boot/newinstall/initrd.gz"
+"menuentry 'New Install' {\n"
+"insmod part_msdos\n"
+"insmod ext2\n"
+"set root='(hd0,msdos1)'\n"
+"linux /boot/newinstall/vmlinuz\n"
+"initrd /boot/newinstall/initrd.gz\n"
+"}"
#. Tag: para
#: boot-installer.xml:496
@@ -876,7 +864,7 @@ msgstr "引导界面"
#. Tag: para
#: boot-installer.xml:645
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "When the installer boots, you should be presented with a friendly "
#| "graphical screen showing the &debian; logo and a menu: "
@@ -908,22 +896,21 @@ msgid ""
"arch images additionally have a 64 bit variant for each install option, "
"right below it, thus almost doubling the number of options."
msgstr ""
-"安装程序引导后,您应该看到友好的图形界面显示出 &debian; 图标和一个菜单:"
-"<informalexample><screen>\n"
+"安装程序引导后,您应该看到界面友好的图形画面显示着 &debian; 图标和菜单:<informalexample><screen>\n"
"Installer boot menu\n"
"\n"
"Install\n"
"Graphical install\n"
-"Advanced options >\n"
+"Advanced options >\n"
"Help\n"
+"Install with speech synthesis\n"
"\n"
"Press ENTER to boot or TAB to edit a menu entry\n"
-"</screen></informalexample> 由于您采用的安装方式不同,<quote>Graphical "
-"install</quote> 选项可能不会出现。"
+"</screen></informalexample> 根据您使用的不同安装方法,<quote>Graphical install</quote> 选项可能不会出现。双体系(bi-arch)映像会额外有一个 64 位安装选项,在其下方,因此会有双倍的选项。"
#. Tag: para
#: boot-installer.xml:657
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "For a normal installation, select either the <quote>Install</quote> or "
#| "the <quote>Graphical install</quote> entry &mdash; using either the arrow "
@@ -935,10 +922,7 @@ msgid ""
"on your keyboard or by typing the first (highlighted) letter, the "
"<quote>Install</quote> entry is already selected by default &mdash; and "
"press &enterkey; to boot the installer."
-msgstr ""
-"普通安装,选择 <quote>Install</quote> 或者 <quote>Graphical install</quote> "
-"项 &mdash; 使用箭头键或者输入单词(高亮的)第一个字母 &mdash; 然后按 "
-"&enterkey; 启动安装程序。"
+msgstr "普通安装时,选择 <quote>Install</quote> 或 <quote>Graphical install</quote> 入口 &mdash; 可以使用键盘方向键或者键入(高亮的)首字母,默认 <quote>Install</quote> 入口已经选中 &mdash; 然后按下 &enterkey; 引导安装程序。"
#. Tag: para
#: boot-installer.xml:665
@@ -1850,7 +1834,7 @@ msgstr ""
#. Tag: para
#: boot-installer.xml:1436
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "Currently, the only &arch-title; subarchitectures that support CD-ROM "
#| "booting are PReP (though not all systems) and New World PowerMacs. On "
@@ -1865,11 +1849,7 @@ msgid ""
"<keycap>Command</keycap>, <keycap>Option</keycap>, <keycap>Shift</keycap>, "
"and <keycap>Delete</keycap> keys together while booting to boot from the "
"factory default CD/DVD drive."
-msgstr ""
-"当前来说,&arch-title; 下的子体系结构只有 PReP(不是所有的系统) 和 New World "
-"PowerMacs 支持 CD 光盘引导。在 PowerMacs 下,从 CD 光盘引导时,按住 "
-"<keycap>c</keycap> 键,或者组合键 <keycap>Command</keycap>、<keycap>Option</"
-"keycap>、<keycap>Shift</keycap> 和 <keycap>Delete</keycap>。"
+msgstr "目前,&arch-title; 下的子体系只有 PReP/CHRP (并非所有系统)和 New World PowerMacs 支持 CD-ROM 引导。在 PowerMacs 上,启动时按住 <keycap>c</keycap> 键,或者 <keycap>Command</keycap>、<keycap>Option</keycap>、<keycap>Shift</keycap> 和 <keycap>Delete</keycap> 组合键引导出厂默认的 CD/DVD 驱动器。"
#. Tag: para
#: boot-installer.xml:1445
@@ -1882,6 +1862,9 @@ msgid ""
"</screen></informalexample> for an alternative way to boot from the internal "
"factory default CD/DVD drive type"
msgstr ""
+"从外置固件 CD/DVD 驱动器引导 PowerMac 首先打开 Open Firmware 提示符 (参见 <xref linkend=\"invoking-openfirmware\"/>),然后键入 <informalexample><screen>\n"
+"0 &gt; boot fw/node/sbp-2/disk:,\\install\\yaboot\n"
+"</screen></informalexample> 另一种方法引导出厂默认的 CD/DVD 驱动器,键入"
#. Tag: screen
#: boot-installer.xml:1456
@@ -1911,13 +1894,13 @@ msgid ""
"To boot &debian; CD/DVD on Pegasos II machine, hold <keycap>Esc</keycap> key "
"immediately after pressing the power-on button, when SmartFirmware prompt "
"appears, type"
-msgstr ""
+msgstr "要在 Pegasos II 机器上引导 &debian; CD/DVD,按下电源按钮同时按住 <keycap>Esc</keycap> 键,出现 SmartFirmware 提示符后,键入"
#. Tag: screen
#: boot-installer.xml:1473
#, no-c-format
msgid "boot cd install/pegasos"
-msgstr ""
+msgstr "boot cd install/pegasos"
#. Tag: title
#: boot-installer.xml:1479
@@ -2279,7 +2262,7 @@ msgstr "辅助功能"
#. Tag: para
#: boot-installer.xml:1838
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "Some users may need specific support because of e.g. some visual "
#| "impairment. <phrase arch=\"ia64;powerpc;x86\">USB braille displays are "
@@ -2303,15 +2286,7 @@ msgid ""
"arch=\"x86\"> (see also <xref linkend=\"boot-screen\"/>)</phrase>. Note that "
"on most architectures the boot loader interprets your keyboard as a QWERTY "
"keyboard."
-msgstr ""
-"一些用户,比如有视觉障碍的,可能需要特别的支持。<phrase arch=\"ia64;powerpc;"
-"x86\">USB 盲文点字显示器(braille displays)可以自动检测到,但多数情况下其他的"
-"</phrase> <phrase arch=\"arm;hppa;mips;mipsel;sparc\">多数情况下</phrase> 辅"
-"助功能不得不通过手动进行设置。<phrase arch=\"x86\">在可以支持的机器上,可以接"
-"收输入的时候,引导菜单会哔一声。</phrase> 一些引导参数可以 <phrase arch="
-"\"x86\">接着</phrase> 被添加到后面打开这些辅助功能<phrase arch=\"x86\"> (参"
-"阅 <xref linkend=\"boot-screen\"/>)</phrase>。需要注意在大多数架构下 boot "
-"loader 将视您的键盘为 QWERTY 布局。"
+msgstr "一些用户,比如有视觉障碍的,可能需要特别的支持。<phrase arch=\"ia64;powerpc;x86\">USB(不含通过串口 USB 转换口转换的) 盲文点字显示器(braille displays)可以自动检测到,但多数情况下其他的</phrase> <phrase arch=\"arm;hppa;mips;mipsel;sparc\">多数情况下</phrase>辅助功能不得不通过手动进行设置。<phrase arch=\"x86\">在可以支持的机器上,可以接收输入的时候,引导菜单会哔一声。</phrase> 一些引导参数可以 <phrase arch=\"x86\">接着</phrase> 被添加到后面打开这些辅助功能<phrase arch=\"x86\"> (参阅 <xref linkend=\"boot-screen\"/>)</phrase>。需要注意在大多数架构下 boot loader 将视您的键盘为 QWERTY 布局。"
#. Tag: title
#: boot-installer.xml:1858
@@ -2346,7 +2321,7 @@ msgstr "串口盲文点显器"
#. Tag: para
#: boot-installer.xml:1875
-#, fuzzy, no-c-format
+#, 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 "
@@ -2382,25 +2357,14 @@ msgid ""
"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>."
-msgstr ""
-"系统无法安全地检测到串口盲文点显器(因为这可能会导致某些损坏)。您需要添加 "
-"<userinput>brltty=<replaceable>driver</replaceable>,<replaceable>port</"
-"replaceable>,<replaceable>table</replaceable></userinput> 引导参数说明 "
-"<classname>brltty</classname> 该使用哪个驱动程序。<replaceable>driver</"
-"replaceable> 应该替换为您终端的两个字母的驱动程序代码(参阅 <ulink url=\"&url-"
-"brltty-driver-codes;\">driver code list</ulink>)。<replaceable>port</"
-"replaceable> 应该替换为该设备连接使用的串口名,默认为 <userinput>ttyS0</"
-"userinput>。 <replaceable>table</replaceable> 是使用的 braille table 名(参阅 "
-"<ulink url=\"&url-brltty-manual;\">table code list</ulink>);默认为英语。注意"
-"该表可以在后续菜单中选择修改。该设备的键绑定文档可以在 <ulink url=\"&url-"
-"brltty-driver-help;\"><classname>brltty</classname> website</ulink> 找到。"
+msgstr "系统无法安全地检测到串口盲文点显器(因为这可能会导致某些损坏)。您需要添加 <userinput>brltty=<replaceable>driver</replaceable>,<replaceable>port</replaceable>,<replaceable>table</replaceable></userinput> 引导参数指明 <classname>brltty</classname> 该使用哪个驱动程序。<replaceable>driver</replaceable> 应该替换为您终端的两个字母的驱动程序代码(参阅 <ulink url=\"&url-brltty-manual;\">BRLTTY manual</ulink>). <replaceable>port</replaceable> 应该替换为该设备连接使用的串口名,默认为 <userinput>ttyS0</userinput> ,如果通过串口转 USB 转接应使用 <userinput>ttyUSB0</userinput> 。 <replaceable>table</replaceable> 是使用的 braille table 名 (参阅 <ulink url=\"&url-brltty-manual;\">BRLTTY manual</ulink>); 默认为英语。注意该表可以在后续菜单中选择修改。该设备的键绑定文档可以在 <ulink url=\"&url-brltty-driver-help;\"><classname>brltty</classname> website</ulink> 找到。"
#. Tag: title
#: boot-installer.xml:1897 boot-installer.xml:2872
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid "Hardware Speech Synthesis"
msgid "Software Speech Synthesis"
-msgstr "硬件语音合成(Hardware Speech Synthesis)"
+msgstr "软件语音合成(Software Speech Synthesis)"
#. Tag: para
#: boot-installer.xml:1898
@@ -2411,7 +2375,7 @@ msgid ""
"question (language) is spoken in english, and the remainder of installation "
"is spoken in the selected language (if available in <classname>espeak</"
"classname>)."
-msgstr ""
+msgstr "要支持软件语音合成,可以在引导菜单键入 <userinput>s</userinput> &enterkey; 激活。第一个问题(语言)使用英语发音,其余的问题则根据所选的语言来发音(如果存在 <classname>espeak</classname>)。"
#. Tag: title
#: boot-installer.xml:1909
@@ -2421,7 +2385,7 @@ msgstr "硬件语音合成(Hardware Speech Synthesis)"
#. Tag: para
#: boot-installer.xml:1910
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "Support for hardware speech synthesis devices is available only alongside "
#| "support for graphical installer. You thus need to select the "
@@ -2506,7 +2470,7 @@ msgstr ""
#: boot-installer.xml:1958
#, no-c-format
msgid "Preseeding"
-msgstr ""
+msgstr "预置"
#. Tag: para
#: boot-installer.xml:1959
@@ -2514,7 +2478,7 @@ msgstr ""
msgid ""
"Alternatively, &debian; can be installed completely automatically by using "
"preseeding. This is documented in <xref linkend=\"appendix-preseed\"/>."
-msgstr ""
+msgstr "另外,&debian; 可以使用预置进行完全自动安装。相关文档参见 <xref linkend=\"appendix-preseed\"/>。"
#. Tag: para
#: boot-installer.xml:1974
@@ -2710,7 +2674,7 @@ msgstr "DEBIAN_FRONTEND"
#. Tag: para
#: boot-installer.xml:2101
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "This boot parameter controls the type of user interface used for the "
#| "installer. The current possible parameter settings are: <itemizedlist> "
@@ -2742,18 +2706,7 @@ msgid ""
"<userinput>text</userinput> frontends are available on most default install "
"media. On architectures that support it, the graphical installer uses the "
"<userinput>gtk</userinput> frontend."
-msgstr ""
-"这个引导参数控制用于安装程序的用户界面的类型。当前可能参数设置有:"
-"<itemizedlist> <listitem> <para><userinput>DEBIAN_FRONTEND=noninteractive</"
-"userinput></para> </listitem><listitem> "
-"<para><userinput>DEBIAN_FRONTEND=text</userinput></para> </"
-"listitem><listitem> <para><userinput>DEBIAN_FRONTEND=newt</userinput></para> "
-"</listitem><listitem> <para><userinput>DEBIAN_FRONTEND=gtk</userinput></"
-"para> </listitem> </itemizedlist> 缺省的前端是 "
-"<userinput>DEBIAN_FRONTEND=newt</userinput>。"
-"<userinput>DEBIAN_FRONTEND=text</userinput> 可以用于串口控制台的安装。一般来"
-"说在缺省安装介质上只有 <userinput>newt</userinput> 前端,因此目前这个并非很有"
-"用。图形安装程序可以在所支持的平台上使用 <userinput>gtk</userinput> 前端。"
+msgstr "这个引导参数控制用于安装程序的用户界面的类型。当前可能参数设置有:<itemizedlist> <listitem> <para><userinput>DEBIAN_FRONTEND=noninteractive</userinput></para> </listitem><listitem> <para><userinput>DEBIAN_FRONTEND=text</userinput></para> </listitem><listitem> <para><userinput>DEBIAN_FRONTEND=newt</userinput></para> </listitem><listitem> <para><userinput>DEBIAN_FRONTEND=gtk</userinput></para> </listitem> </itemizedlist> 缺省的前端是 <userinput>DEBIAN_FRONTEND=newt</userinput>。 <userinput>DEBIAN_FRONTEND=text</userinput> 可以用于串口控制台的安装。一些特殊类型的安装介质可能只含有限的几个前端,但是 <userinput>newt</userinput> 和 <userinput>text</userinput> 在多少安装介质上都是默认采用。图形安装程序可以在所支持的平台上使用 <userinput>gtk</userinput> 前端。"
#. Tag: term
#: boot-installer.xml:2132
@@ -2855,13 +2808,13 @@ msgstr ""
#: boot-installer.xml:2190
#, no-c-format
msgid "log_host"
-msgstr ""
+msgstr "log_host"
#. Tag: term
#: boot-installer.xml:2191
#, no-c-format
msgid "log_port"
-msgstr ""
+msgstr "log_port"
#. Tag: para
#: boot-installer.xml:2192
@@ -2870,7 +2823,7 @@ msgid ""
"Causes the installer to send log messages to a remote syslog on the "
"specified host and port as well as to a local file. If not specified, the "
"port defaults to the standard syslog port 514."
-msgstr ""
+msgstr "使得安装程序可以在本地记录同时发送日志到指定主机和端口的远端 syslog。如果不指定,默认端口是 syslog 标准端口 514。"
#. Tag: term
#: boot-installer.xml:2203
@@ -3941,31 +3894,31 @@ msgid ""
"are set to muted by default. You should thus submit a bug report which "
"includes the output of the following commands, run on the same machine from "
"a Linux system which is known to have sound working (e.g., a live CD)."
-msgstr ""
+msgstr "如果软件语音合成不工作,最大可能是由声卡所致,通常要么是驱动没有被包含到安装程序,要么是不常见的合成器默认设置为静音。您可以提交一份 bug 报告,并包含同一台机器上声音可以正常工作的 Linux 系统上(比如,live CD),运行下面命令的输出。"
#. Tag: userinput
#: boot-installer.xml:2885
#, no-c-format
msgid "dmesg"
-msgstr ""
+msgstr "dmesg"
#. Tag: userinput
#: boot-installer.xml:2887
#, no-c-format
msgid "lspci"
-msgstr ""
+msgstr "lspci"
#. Tag: userinput
#: boot-installer.xml:2889
#, no-c-format
msgid "lsmod"
-msgstr ""
+msgstr "lsmod"
#. Tag: userinput
#: boot-installer.xml:2891
#, no-c-format
msgid "amixer"
-msgstr ""
+msgstr "amixer"
#. Tag: title
#: boot-installer.xml:2899 boot-installer.xml:3001
@@ -4410,94 +4363,3 @@ msgstr ""
" and ideas you had during the initial install.&gt;\n"
"</screen></informalexample> 在 bug 报告中,请说明问题所在,包括内核挂起时最后"
"见到的内核消息。描述进入问题状态所进行的步骤。"
-
-#~ msgid "Booting the NSLU2"
-#~ msgstr "引导 NSLU2"
-
-#~ msgid "There are three ways how to put the installer firmware into flash:"
-#~ msgstr "有三种方式可以将安装程序的固件放入闪存:"
-
-#~ msgid "Using the NSLU2 web interface"
-#~ msgstr "使用 NSLU2 的 web 界面"
-
-#~ msgid ""
-#~ "Go to the administration section and choose the menu item "
-#~ "<literal>Upgrade</literal>. You can then browse your disk for the "
-#~ "installer image you have previously downloaded. Then press the "
-#~ "<literal>Start Upgrade</literal> button, confirm, wait for a few minutes "
-#~ "and confirm again. The system will then boot straight into the installer."
-#~ msgstr ""
-#~ "进入管理部分然后选择菜单项 <literal>Upgrade</literal>。接着从您的磁盘上找"
-#~ "到前面下载安装程序映像。然后按下 <literal>Start Upgrade</literal> 按钮,确"
-#~ "认,等几分钟再次确认。系统将直接启动进入安装程序。"
-
-#~ msgid "Via the network using Linux/Unix"
-#~ msgstr "通过网络使用 Linux/Unix"
-
-#~ msgid ""
-#~ "You can use <command>upslug2</command> from any Linux or Unix machine to "
-#~ "upgrade the machine via the network. This software is packaged for "
-#~ "&debian;. First, you have to put your NSLU2 in upgrade mode: "
-#~ "<orderedlist> <listitem><para> Disconnect any disks and/or devices from "
-#~ "the USB ports. </para></listitem> <listitem><para> Power off the NSLU2 </"
-#~ "para></listitem> <listitem><para> Press and hold the reset button "
-#~ "(accessible through the small hole on the back just above the power "
-#~ "input). </para></listitem> <listitem><para> Press and release the power "
-#~ "button to power on the NSLU2. </para></listitem> <listitem><para> Wait "
-#~ "for 10 seconds watching the ready/status LED. After 10 seconds it will "
-#~ "change from amber to red. Immediately release the reset button. </para></"
-#~ "listitem> <listitem><para> The NSLU2 ready/status LED will flash "
-#~ "alternately red/green (there is a 1 second delay before the first green). "
-#~ "The NSLU2 is now in upgrade mode. </para></listitem> </orderedlist> See "
-#~ "the <ulink url=\"http://www.nslu2-linux.org/wiki/OpenSlug/UsingTheBinary"
-#~ "\">NSLU2-Linux pages</ulink> if you have problems with this. Once your "
-#~ "NSLU2 is in upgrade mode, you can flash the new image: "
-#~ "<informalexample><screen>\n"
-#~ "sudo upslug2 -i di-nslu2.bin\n"
-#~ "</screen></informalexample> Note that the tool also shows the MAC address "
-#~ "of your NSLU2, which may come in handy to configure your DHCP server. "
-#~ "After the whole image has been written and verified, the system will "
-#~ "automatically reboot. Make sure you connect your USB disk again now, "
-#~ "otherwise the installer won't be able to find it."
-#~ msgstr ""
-#~ "您可以从任一 Linux 或 Unix 机器上使用 <command>upslug2</command> 通过网络"
-#~ "来升级机器。&debian; 下有该软件包。首先,您必须将 NSLU2 置于升级模式: "
-#~ "<orderedlist> <listitem><para> 去除所有连接在 USB 口上的磁盘和/或设备。</"
-#~ "para></listitem> <listitem><para> 关闭 NSLU2 电源 </para></listitem> "
-#~ "<listitem><para> 按住复位按钮 (位于后面电源输入上方的小孔)。 </para></"
-#~ "listitem> <listitem><para> 按下和松开开关键打开 NSLU2。 </para></"
-#~ "listitem> <listitem><para> 等待 10 秒监视就绪/状态 LED。 10 秒钟后它会从琥"
-#~ "珀色变成红色。立即松开复位按钮。 </para></listitem> <listitem><para> "
-#~ "NSLU2 就绪/状态 LED 将会红/绿交替闪烁 (在首次出现绿色时会有 1 秒钟的延"
-#~ "迟)。NSLU2 现在处于升级模式。</para></listitem> </orderedlist> 如果您遇到"
-#~ "问题,请参考 <ulink url=\"http://www.nslu2-linux.org/wiki/OpenSlug/"
-#~ "UsingTheBinary\">NSLU2-Linux pages</ulink>。一旦 NSLU2 处于升级模式,您就"
-#~ "可以刷人新的映像:<informalexample><screen>\n"
-#~ "sudo upslug2 -i di-nslu2.bin\n"
-#~ "</screen></informalexample> 注意,该工具还会显示 NSLU2 的 MAC 地址,它可以"
-#~ "用来配置 DHCP 服务器。整个映像写入和检验后,系统将自动重启。确保 USB 磁盘"
-#~ "再次连接,否则将无法找到安装程序。"
-
-#~ msgid "Via the network using Windows"
-#~ msgstr "通过网络使用 Windows"
-
-#~ msgid ""
-#~ "There is <ulink url=\"http://www.everbesthk.com/8-download/sercomm/"
-#~ "firmware/all_router_utility.zip\">a tool</ulink> for Windows to upgrade "
-#~ "the firmware via the network."
-#~ msgstr ""
-#~ "有一个 <ulink url=\"http://www.everbesthk.com/8-download/sercomm/firmware/"
-#~ "all_router_utility.zip\">工具</ulink> 用于 Windows 通过网络升级固件。"
-
-#~ msgid ""
-#~ "If your system doesn't boot directly from CD-ROM, you can still use the "
-#~ "CD-ROM to install the system. On NewWorlds, you can also use an "
-#~ "OpenFirmware command to boot from the CD-ROM manually. Follow the "
-#~ "instructions in <xref linkend=\"boot-newworld\"/> for booting from the "
-#~ "hard disk, except use the path to <command>yaboot</command> on the CD at "
-#~ "the OF prompt, such as"
-#~ msgstr ""
-#~ "如果您的系统不支持直接从 CD 光盘启动,仍然可以采用 CD 光盘来安装系统。在 "
-#~ "NewWorlds 上面,可以使用一个 OpenFirmware 命令来手工从 CD 光盘引导。按照 "
-#~ "<xref linkend=\"boot-newworld\"/> 的方法从硬盘来进行引导,只是在 OF 提示符"
-#~ "下使用 CD 上的 <command>yaboot</command> 路径,比如:"
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 75f09e994..3bf10106b 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2012-06-22 15:03+0000\n"
-"PO-Revision-Date: 2010-11-04 16:56+0800\n"
+"PO-Revision-Date: 2012-07-25 21:40+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
"Language: \n"
@@ -339,10 +339,10 @@ msgstr "IBM/Motorola PowerPC"
#. Tag: entry
#: hardware.xml:140
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid "<entry>powerpc</entry>"
msgid "<entry morerows=\"1\">powerpc</entry>"
-msgstr "<entry>powerpc</entry>"
+msgstr "<entry morerows=\"1\">powerpc</entry>"
#. Tag: entry
#: hardware.xml:141
@@ -596,7 +596,7 @@ msgstr "Kirkwood"
#. Tag: para
#: hardware.xml:316
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "Kirkwood is a system on a chip (SoC) from Marvell that integrates an ARM "
#| "CPU, Ethernet, SATA, USB, and other functionality in one chip. We "
@@ -613,13 +613,7 @@ msgid ""
"computers (SheevaPlug and GuruPlug)</ulink>, and <ulink url=\"&url-arm-"
"cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> (all TS-11x, TS-21x and "
"TS-41x models)."
-msgstr ""
-"Kirkwood 是 Marvell 的 SoC (system on a chip) 产品,该芯片上集成了 ARM CPU、"
-"Ethernet、SATA、USB,以及一些其他的功能。当前我们能支持以下几种基于 Kirkwood "
-"的设备: OpenRD (OpenRD-Base 和 OpenRD-Client)、<ulink url=\"&url-arm-cyrius-"
-"sheevaplug;\">SheevaPlug</ulink> 和 <ulink url=\"&url-arm-cyrius-qnap-"
-"kirkwood;\">QNAP Turbo Station</ulink> (TS-110, TS-119, TS-210, TS-219 和 "
-"TS-219P; TS-410 和 TS-419P 仍然不被支持)。"
+msgstr "Kirkwood 是 Marvell 的 SoC 产品,集成了 ARM CPU、Ethernet、SATA、USB,以及其他一些功能。当前我们能支持以下几种基于 Kirkwood 的设备:OpenRD (OpenRD-Base, OpenRD-Client 和 OpenRD-Ultimate)、<ulink url=\"&url-arm-cyrius-sheevaplug;\">plug computers (SheevaPlug 和 GuruPlug)</ulink>,还有 <ulink url=\"&url-arm-cyrius-qnap-kirkwood;\">QNAP Turbo Station</ulink> (所有 TS-11x、TS-21x 和 TS-41x 型号)。"
#. Tag: term
#: hardware.xml:330
@@ -629,7 +623,7 @@ msgstr "Orion5x"
#. Tag: para
#: hardware.xml:331
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "Orion is a system on a chip (SoC) from Marvell that integrates an ARM "
#| "CPU, Ethernet, SATA, USB, and other functionality in one chip. There are "
@@ -647,13 +641,7 @@ msgid ""
"url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</ulink>, <ulink url="
"\"&url-arm-cyrius-dns323;\">D-Link DNS-323</ulink> and <ulink url=\"&url-arm-"
"cyrius-mv2120;\">HP mv2120</ulink>."
-msgstr ""
-"Orion 是 Marvell 的 SoC (system on a chip) 产品,芯片上集成了 ARM CPU、以太"
-"网、SATA、USB,以及一些其他的功能。现在市场上有很多 NAS (Network Attached "
-"Storage) 设备基于 Orion 芯片。我们能支持以下几种基于 Orion 的设备: <ulink "
-"url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</ulink>、<ulink url="
-"\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink>、 <ulink url=\"&url-arm-cyrius-"
-"qnap;\">QNAP Turbo Station</ulink> (TS-109, TS-209 and TS-409)。"
+msgstr "Orion 是 Marvell 的 SoC 产品,集成了 ARM CPU、Ethernet、SATA、USB,以及其他一些功能。市场上有很多 NAS 设备基于 Orion 芯片。我们当前支持以下几种基于 Orion 的设备: <ulink url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</ulink>、<ulink url=\"&url-arm-cyrius-dns323;\">D-Link DNS-323</ulink> 和 <ulink url=\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink>。"
#. Tag: term
#: hardware.xml:345
@@ -1470,14 +1458,14 @@ msgstr ""
#. Tag: title
#: hardware.xml:1007
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid "S/390 and zSeries machine types"
msgid "zSeries and System z machine types"
-msgstr "S/390 与 zSeries 机器类型"
+msgstr "zSeries 和 System z 机器类型"
#. Tag: para
#: hardware.xml:1008
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
#| "Your machine needs to support for at least the z/Architecture, "
@@ -1498,20 +1486,13 @@ msgid ""
"<ulink url=\"http://www.ibm.com/developerworks/linux/linux390/"
"development_technical.html\"> Linux on <trademark class=\"registered"
"\">System z</trademark> page on developerWorks</ulink>."
-msgstr ""
-"&debian; Squeeze 已不再支持 ESA/390 模式的引导。您的机器至少要支持 z/"
-"Architecture、Architecture Level Set 2。不过 userland 仍然为 ESA/390 编译。所"
-"有的 zSeries 硬件完全获得支持。&arch-title; 支持的软件源自 2.6.32 内核开发"
-"流。有关 IBM 支持 Linux 的最新信息可以在 <ulink url=\"http://www.ibm.com/"
-"developerworks/linux/linux390/development_technical.html\"> Linux on "
-"<trademark class=\"registered\">System z</trademark> page on developerWorks</"
-"ulink> 找到。"
+msgstr "从 &debian; Squeeze 起已不再支持 ESA/390 模式的引导。您的机器至少要支持 z/Architecture,必须支持 64 位。不过 s390 移植的 userland 仍然为 ESA/390 编译。所有的 zSeries 和 System z 硬件完全获得支持。&arch-title; 支持的软件源自 3.1 内核开发流。关于 IBM Linux 最新的支持信息位于 <ulink url=\"http://www.ibm.com/developerworks/linux/linux390/development_technical.html\"> Linux on <trademark class=\"registered\">System z</trademark> page on developerWorks</ulink>。"
#. Tag: title
#: hardware.xml:1025
#, no-c-format
msgid "PAV and HyperPAV"
-msgstr ""
+msgstr "PAV 和 HyperPAV"
#. Tag: para
#: hardware.xml:1026
@@ -1521,7 +1502,7 @@ msgid ""
"take advantage of these storage system features. Be sure to configure the "
"devices during DASD device selection. The alias devices will not be offered "
"neither for formatting, partitioning nor direct use."
-msgstr ""
+msgstr "PAV 和 HyperPAV 都透明支持,不需要通过多路(multipathing)获得这些存储系统的特性。要在 DASD 设备选取时配置。设备别名将无法格式化、分区和直接使用。"
# 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
@@ -1952,7 +1933,7 @@ msgstr "QDIO 模式的 OSA-Express,HiperSockets 和 Guest-LANs"
msgid ""
"On &arch-title;, most built-in Ethernet devices are supported and modules "
"for additional PCI and USB devices are provided."
-msgstr ""
+msgstr "&arch-title; 上,支持大多数内置的以太网设备,并提供额外的 PCI 和 USB 设备模块。"
#. Tag: para
#: hardware.xml:1345
@@ -2136,7 +2117,7 @@ msgstr "硬件语音合成(Hardware Speech Synthesis)"
#. Tag: para
#: hardware.xml:1464
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "Support for hardware speech synthesis devices is determined by the "
#| "underlying support found in <classname>speakup</classname>. "
@@ -2155,12 +2136,7 @@ msgid ""
"be found on the <ulink url=\"&url-speakup;\"><classname>speakup</classname> "
"website</ulink>. &debian-gnu; &release; ships with <classname>speakup</"
"classname> version &speakupver;."
-msgstr ""
-"对于硬件语音合成设备的支持取决于 <classname>speakup</classname> 的支持。"
-"<classname>speakup</classname> 只支持板卡集成和外部串口设备(支持非 USB 或 "
-"serial-to-USB 适配器)。支持硬件语音合成设备的详细情况可以查阅 <ulink url="
-"\"&url-speakup;\"><classname>speakup</classname> website</ulink>。&debian-"
-"gnu; &release; 使用的 <classname>speakup</classname> 版本是 &speakupver;。"
+msgstr "对于硬件语音合成设备的支持取决于底层 <classname>speakup</classname> 的支持。<classname>speakup</classname> 只支持板卡集成和外部串口设备(支持非 USB、串口转 USB 适配器或 PCI 卡)。 支持硬件语音合成设备的详细情况可以查阅 <ulink url=\"&url-speakup;\"><classname>speakup</classname> website</ulink>。 &debian-gnu; &release; 配备的 <classname>speakup</classname> 版本是 &speakupver;。"
#. Tag: title
#: hardware.xml:1484
@@ -2437,7 +2413,7 @@ msgstr "安装介质"
#. Tag: para
#: hardware.xml:1659
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "This section will help you determine which different media types you can "
#| "use to install &debian;. For example, if you have a floppy disk drive on "
@@ -2451,11 +2427,7 @@ msgid ""
"linkend=\"install-methods\"/>, which lists the advantages and disadvantages "
"of each media type. You may want to refer back to this page once you reach "
"that section."
-msgstr ""
-"本章将助您选则安装 &debian; 所采用的介质。例如,您的电脑上有一个软驱,它就可"
-"以用来安装 &debian;。有一整章专门用于说明介质:<xref linkend=\"install-"
-"methods\"/>,里面列出了每种类型的优缺点。当您阅读那一章的时候,可能要返回参考"
-"本页。"
+msgstr "本节将帮助您决定使用哪种介质的版本来安装 &debian;。有一整章专门用于说明介质: <xref linkend=\"install-methods\"/>,里面列出了每种类型的优缺点。当您阅读那一章的时候,可能需要回过头来参考本页。"
#. Tag: title
#: hardware.xml:1669
@@ -2826,44 +2798,3 @@ msgstr ""
"本界面需要更多的内存,并且内存不应少于 &minimum-memory; 。如果可以在普通和图"
"形界面两种方式之间选择,应选择普通方式。</para> </footnote>或磁盘空间上安装系"
"统或许可行,但只针对有经验的用户。"
-
-#~ msgid "IXP4xx"
-#~ msgstr "IXP4xx"
-
-#~ msgid ""
-#~ "The IXP4xx platform is based on Intel's XScale ARM core. Currently, only "
-#~ "one IXP4xx based system is supported, the Linksys NSLU2. The Linksys "
-#~ "NSLU2 (Network Storage Link for USB 2.0 Disk Drives) is a small device "
-#~ "which allows you to easily provide storage via the network. It comes with "
-#~ "an Ethernet connection and two USB ports to which hard drives can be "
-#~ "connected. There is an external site with <ulink url=\"&url-arm-cyrius-"
-#~ "nslu2;\">installation instructions</ulink>."
-#~ msgstr ""
-#~ "IXP4xx 平台基于 Intel XScale ARM 核心。当前,只有一个基于 IXP4xx 的系统被"
-#~ "支持,Linksys NSLU2。Linksys NSLU2 (Network Storage Link for USB 2.0 Disk "
-#~ "Drives) 是一个通过网络提供易用存储的小型设备。它提供了一个以太网接口和两"
-#~ "个 USB 端口来连接硬盘。这里有一个外部网站 <ulink url=\"&url-arm-cyrius-"
-#~ "nslu2;\">installation instructions</ulink>。"
-
-#~ msgid ""
-#~ "On &arch-title;, most built-in Ethernet devices are supported and modules "
-#~ "for additional PCI and USB devices are provided. The major exception is "
-#~ "the IXP4xx platform (featuring devices such as the Linksys NSLU2) which "
-#~ "needs a proprietary microcode for the operation of its built-in Ethernet "
-#~ "device. Unofficial images for Linksys NSLU2 with this proprietary "
-#~ "microcode can be obtained from the <ulink url=\"&url-slug-firmware;"
-#~ "\">Slug-Firmware site</ulink>."
-#~ msgstr ""
-#~ "在 &arch-title; 上,多数内建的以太网设备都支持,并提供额外的 PCI 和 USB 设"
-#~ "备模块。主要的例外是 IXP4xx 平台(典型的设备是 Linksys NSLU2),它需要专用"
-#~ "的 microcode 来操作内建的以太网设备。包含该专有 microcode 的 Linksys "
-#~ "NSLU2 非正式映像可以从 <ulink url=\"&url-slug-firmware;\">Slug-Firmware "
-#~ "site</ulink> 地址获得。"
-
-#~ msgid ""
-#~ "Support for encrypted wireless during installation is currently limited "
-#~ "to WEP. If your access point uses stronger encryption, it cannot be used "
-#~ "during the installation process."
-#~ msgstr ""
-#~ "加密无线网络在安装过程中还有所限制,现在仅可以使用 WEP。如果您的 AP 采用了"
-#~ "更健壮的加密方法,在安装时就无法使用。"
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index 1a184bb57..8a58be57c 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2012-06-16 09:12+0000\n"
-"PO-Revision-Date: 2010-11-04 16:56+0800\n"
+"PO-Revision-Date: 2012-07-25 22:21+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
"Language: \n"
@@ -230,7 +230,7 @@ msgstr "QNAP Turbo Station 安装文件"
#. Tag: para
#: install-methods.xml:161
-#, fuzzy, no-c-format
+#, 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 "
@@ -242,22 +242,18 @@ msgid ""
"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;."
-msgstr ""
-"QNAP Turbo Station 安装文件包括内核和 ramdisk 以及将这些映象写入 flash 的脚"
-"本。您可以从 &qnap-orion-firmware-img; 获得 QNAP TS-109 和 TS-209 的安装文"
-"件。从 &qnap-kirkwood-firmware-img; 获得 QNAP TS-110, TS-119, TS-210, "
-"TS-219, TS-219P 的。"
+msgstr "QNAP Turbo Station 安装文件包括内核和 ramdisk,以及将这些映像写入 flash 的脚本。QNAP TS-11x、TS-21x 和 TS-41x 型号安装文件可以从 &qnap-kirkwood-firmware-img; 取得。"
#. Tag: title
#: install-methods.xml:172
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid "SheevaPlug and OpenRD Installation Files"
msgid "Plug Computer and OpenRD Installation Files"
-msgstr "SheevaPlug 和 OpenRD 安装文件"
+msgstr "Plug Computer 和 OpenRD 安装文件"
#. Tag: para
#: install-methods.xml:173
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "The installation files for the Marvell SheevaPlug and OpenRD devices "
#| "consist of a kernel and initrd for U-Boot. You can obtain these files "
@@ -266,9 +262,7 @@ msgid ""
"The installation files for plug computers (SheevaPlug, GuruPlug, etc) and "
"OpenRD devices consist of a kernel and initrd for U-Boot. You can obtain "
"these files from &kirkwood-marvell-firmware-img;."
-msgstr ""
-"Marvell SheevaPlug 和 OpenRD 设备的安装文件包括内核和 initrd 用于 U-Boot。您"
-"可以从 &kirkwood-marvell-firmware-img; 获得这些文件。"
+msgstr "plug computers (SheevaPlug、GuruPlug 等) 和 OpenRD 设备的安装文件包含对应 U-Boot 的内核和 initrd。您可以从 &kirkwood-marvell-firmware-img; 取得这些文件。"
#. Tag: title
#: install-methods.xml:223
@@ -725,7 +719,7 @@ msgstr ""
#: install-methods.xml:541
#, no-c-format
msgid "Preparing a USB stick using a hybrid CD or DVD image"
-msgstr ""
+msgstr "使用混合 CD 或 DVD 映像制作 U 盘"
#. Tag: para
#: install-methods.xml:542
@@ -735,7 +729,7 @@ msgid ""
"very easy way to make a bootable USB stick. Simply choose a CD or DVD image "
"that will fit on your USB stick. See <xref linkend=\"official-cdrom\"/> to "
"get a CD or DVD image."
-msgstr ""
+msgstr "现在 Debian CD 和 DVD 映像可以直接写入 U 盘,这是非常简单的制作启动 U 盘的方法。只需为 U 盘选择一个合适的 CD 或 DVD 映像。参阅 <xref linkend=\"official-cdrom\"/> 获取 CD 或 DVD 映像。"
#. Tag: para
#: install-methods.xml:549
@@ -745,11 +739,11 @@ msgid ""
"can download the <filename>mini.iso</filename> image from the "
"<filename>netboot</filename> directory (at the location mentioned in <xref "
"linkend=\"where-files\"/>)."
-msgstr ""
+msgstr "另外,对于只有几 M 的小容量 U 盘,您可以从 <filename>netboot</filename> 目录下载 <filename>mini.iso</filename> 映像(位于 <xref linkend=\"where-files\"/>)。"
#. Tag: para
#: install-methods.xml:557
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "For example, when using an existing GNU/Linux system, the <filename>mini."
#| "iso</filename> file can be written to a USB stick as follows: "
@@ -769,16 +763,7 @@ msgid ""
"firmware\"/> for more information about firmware. Now unplug and replug the "
"USB stick, and two partitions should now be visible on it. You should mount "
"the second of the two partitions, and unpack the firmware onto it."
-msgstr ""
-"例如,当您使用一个现有的 GNU/Linux 系统时, <filename>mini.iso</filename> 文件"
-"可以写如到一个 U 盘里面: <informalexample><screen>\n"
-"<prompt>#</prompt> <userinput>dd if=<replaceable>debian.iso</replaceable> "
-"of=/dev/<replaceable>sdX</replaceable></userinput>\n"
-"<prompt>#</prompt> <userinput>sync</userinput>\n"
-"</screen></informalexample> 要将固件(firmware)加入到这个 U 盘,需要先取得固件"
-"文件。参阅 <xref linkend=\"loading-firmware\"/> 了解更多信息。现在拔下再插上 "
-"U 盘,就可以看到有两个分区在上面。您应挂载第二个分区,然后将固件解开放在上"
-"面。"
+msgstr "有一个特殊的方法可以将固件加入 <filename>mini.iso</filename>。首先将 <filename>mini.iso</filename> 写入 U 盘。接着取得所需的固件。参阅 <xref linkend=\"loading-firmware\"/> 了解固件信息。然后拔插 U 盘,会有两个分区出现在 U 盘上。您应该挂载第二个分区,并将固件解压到里面。"
#. Tag: screen
#: install-methods.xml:567
@@ -804,7 +789,7 @@ msgid ""
"overwriting its current contents. For example, when using an existing GNU/"
"Linux system, the CD or DVD image file can be written to a USB stick as "
"follows, after having made sure that the stick is unmounted:"
-msgstr ""
+msgstr "您选中的 CD 或 DVD 映像应该被直接写入 U 盘,覆盖它当前的内容。例如,使用已有的 GNU/Linux 系统,CD 或 DVD 映像文件可以参照下面方法写入 U 盘,写之前请确认 U 盘已经卸载:"
#. Tag: screen
#: install-methods.xml:580
@@ -814,6 +799,8 @@ msgid ""
"<replaceable>sdX</replaceable></userinput>\n"
"<prompt>#</prompt> <userinput>sync</userinput>"
msgstr ""
+"<prompt>#</prompt> <userinput>cp <replaceable>debian.iso</replaceable> /dev/<replaceable>sdX</replaceable></userinput>\n"
+"<prompt>#</prompt> <userinput>sync</userinput>"
#. Tag: para
#: install-methods.xml:582
@@ -822,18 +809,18 @@ msgid ""
"Simply writing the CD or DVD image to USB like this should work fine for "
"most users. The other options below are more complex, mainly for people with "
"specialised needs."
-msgstr ""
+msgstr "对大多数用户来说,简单地把 CD 或 DVD 映像写入 U 盘已经够用。下面更为复杂的选项主要提供给有特殊需要的用户。"
#. Tag: title
#: install-methods.xml:593
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid "Booting the USB stick"
msgid "Manually copying files to the USB stick"
-msgstr "从 U 盘启动"
+msgstr "手动复制文件到 U 盘。"
#. Tag: para
#: install-methods.xml:594
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "Note that the USB stick should be at least 256 MB in size (smaller setups "
#| "are possible if you follow <xref linkend=\"usb-copy-flexible\"/>)."
@@ -842,9 +829,7 @@ msgid ""
"installer files, and also a CD image to it. Note that the USB stick should "
"be at least 1 GB in size (smaller setups are possible if you follow <xref "
"linkend=\"usb-copy-flexible\"/>)."
-msgstr ""
-"注意,U 盘至少要有 256MB 的容量(更小的尺寸安装也是可能的,请参阅 <xref "
-"linkend=\"usb-copy-flexible\"/>)。"
+msgstr "另一种方法制作 U 盘是手动复制安装文件和 CD 映像。注意 U 盘最小容量为 1 GB (也可以使用较少容量,请参考 <xref linkend=\"usb-copy-flexible\"/>)。"
#. Tag: para
#: install-methods.xml:601
@@ -863,7 +848,7 @@ msgstr ""
#. Tag: para
#: install-methods.xml:610
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "Note that, although convenient, this method does have one major "
#| "disadvantage: the logical size of the device will be limited to 256 MB, "
@@ -878,11 +863,7 @@ msgid ""
"if the capacity of the USB stick is larger. You will need to repartition the "
"USB stick and create new file systems to get its full capacity back if you "
"ever want to use it for some different purpose."
-msgstr ""
-"需要注意的是,虽然方便,但该方法有一个主要的缺点: 即使 U 盘很大,设备的逻辑"
-"尺寸还是限制在 256 MB。如果您要将该 U 盘用作其他用途,需要为它重新分区,为其"
-"余容量创建一个新的文件系统。次要的缺点是您无法复制完整的 CD 映象到 U 盘,只能"
-"使用较小的 businesscard 或 netinst CD 映象。"
+msgstr "需要注意的是,虽然方便,但该方法有一个主要缺点:即使 U 盘容量更大,该设备的逻辑尺寸还是限制在 1 GB。如果您要该 U 盘作其他用途,需要为它重新分区,为剩余容量创建一个新的文件系统。"
#. Tag: para
#: install-methods.xml:618
@@ -915,7 +896,7 @@ msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
#. Tag: para
#: install-methods.xml:632
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "After that, mount the USB memory stick <phrase arch=\"x86\">"
#| "(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
@@ -934,21 +915,14 @@ msgid ""
"filesystem</phrase> on it, and copy a &debian; ISO image (netinst, "
"businesscard, or full CD) to it. Unmount the stick (<userinput>umount /mnt</"
"userinput>) and you are done."
-msgstr ""
-"然后,挂载 U 盘 <phrase arch=\"x86\">(<userinput>mount /dev/"
-"<replaceable>sdX</replaceable> /mnt</userinput>),</phrase> <phrase arch="
-"\"powerpc\">(<userinput>mount /dev/<replaceable>sdX2</replaceable> /mnt</"
-"userinput>),</phrase> 现在上面有了 <phrase arch=\"x86\">一个 FAT 文件系统</"
-"phrase> <phrase arch=\"powerpc\">一个 HFS 文件系统</phrase>,复制 &debian; "
-"netinst 或 businesscard ISO 映象到里面。卸载 U 盘 (<userinput>umount /mnt</"
-"userinput>) 就完成了。"
+msgstr "然后,挂载 U 盘 <phrase arch=\"x86\">(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/<replaceable>sdX2</replaceable> /mnt</userinput>),</phrase> 现在上面有了 <phrase arch=\"x86\">一个 FAT 文件系统</phrase> <phrase arch=\"powerpc\">一个 HFS 文件系统</phrase>,然后复制 &debian; ISO 映像 (netinst、businesscard 或完整的 CD) 到里面。卸载 U 盘 (<userinput>umount /mnt</userinput>) 就完成了。"
#. Tag: title
#: install-methods.xml:649
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid "Copying the files &mdash; the flexible way"
msgid "Manually copying files to the USB stick &mdash; the flexible way"
-msgstr "复制文件 &mdash; 灵活的方法"
+msgstr "手动复制文件到 U 盘 &mdash; 灵活的方法"
#. Tag: para
#: install-methods.xml:650
@@ -1095,7 +1069,7 @@ msgstr ""
#. Tag: para
#: install-methods.xml:754 install-methods.xml:864
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "If you used an <filename>hd-media</filename> image, you should now copy a "
#| "&debian; ISO image<footnote> <para> You can use either a businesscard, a "
@@ -1112,12 +1086,7 @@ msgid ""
"<filename>mini.iso</filename></quote> image is not usable for this purpose. "
"</para> </footnote> onto the stick. When you are done, unmount the USB "
"memory stick (<userinput>umount /mnt</userinput>)."
-msgstr ""
-"如果您使用 <filename>hd-media</filename> 映象,现在应该复制 &debian; ISO 映象"
-"<footnote> <para> 您可以使用 businesscard、netinst 或完整的 CD 映象 (参阅 "
-"<xref linkend=\"official-cdrom\"/>)。确认选择合适的映象。注意 <quote>netboot "
-"<filename>mini.iso</filename></quote> 映象并不用在这里。</para> </footnote> "
-"到 U 盘上。然后卸载 U 盘(<userinput>umount /mnt</userinput>)。"
+msgstr "如果您使用 <filename>hd-media</filename> 映象,现在应该复制 &debian; ISO 映像文件<footnote> <para> 您可以选择 businesscard、netinst 或完整 CD 映像 (参阅 <xref linkend=\"official-cdrom\"/>)。确认选择合适的映象。注意 <quote>netboot <filename>mini.iso</filename></quote> 映象并在这里并不适用。</para> </footnote> 到 U 盘。完成后,卸载 U 盘 (<userinput>umount /mnt</userinput>)。"
#. Tag: para
#: install-methods.xml:778
@@ -2262,88 +2231,3 @@ msgid ""
msgstr ""
"在 <xref linkend=\"appendix-preseed\"/> 是有关预置文件的完整文档,并有一些可"
"以使用的例子供您修改。"
-
-#~ msgid "NSLU2 Installation Files"
-#~ msgstr "NSLU2 安装文件"
-
-#~ msgid ""
-#~ "A firmware image is provided for the Linksys NSLU2 which will "
-#~ "automatically boot <classname>debian-installer</classname>. This image "
-#~ "can be uploaded via the Linksys web frontend or with upslug2. This "
-#~ "firmware image can be obtained from &nslu2-firmware-img;."
-#~ msgstr ""
-#~ "用于 Linksys NSLU2 的固件映像将自动引导 <classname>debian-installer</"
-#~ "classname>。该映象可以用 Linksys web 前端或 upslug2 加载。固件映像可以从 "
-#~ "&nslu2-firmware-img; 获得。"
-
-#~ msgid ""
-#~ "There are two installation methods possible when booting from USB stick. "
-#~ "The first is to only use the USB stick to boot the installer, and then "
-#~ "install completely from the network. The second is to also copy a CD "
-#~ "image onto the USB stick and use that as a source for packages, possibly "
-#~ "in combination with a mirror."
-#~ msgstr ""
-#~ "从 U 盘启动安装系统有两种方式。第一种是只用 U 盘启动安装程序,然后完全通过"
-#~ "网络安装。第二种是将 CD 映象也复制到 U 盘作为软件包的源,还可以结合其他镜"
-#~ "像。"
-
-#~ msgid ""
-#~ "To prepare a USB stick that only boots the installer, which then proceeds "
-#~ "to install entirely from the network, you'll need to download the "
-#~ "<filename>mini.iso</filename> image from the <filename>netboot</filename> "
-#~ "directory (at the location mentioned in <xref linkend=\"where-files\"/>), "
-#~ "and write this file directly to the USB stick, overwriting its current "
-#~ "contents. This method will work with very small USB sticks, only a few "
-#~ "megabytes in size."
-#~ msgstr ""
-#~ "要制作一个仅启动安装程序的 U 盘,之后完全从网络安装,您需要从 "
-#~ "<filename>netboot</filename> 目录下载 <filename>mini.iso</filename> 映象"
-#~ "(它位于 <xref linkend=\"where-files\"/>),然后将该文件直接写入 U 盘,覆盖"
-#~ "里面的内容。此方法适用于容量很小的 U 盘,它只需要几 M 的字节。"
-
-#~ msgid ""
-#~ "To prepare a USB stick that installs packages from a CD image included on "
-#~ "the stick, use the installer images found in the <filename>hd-media</"
-#~ "filename> directory. Either the <quote>easy way</quote> or the "
-#~ "<quote>flexible way</quote> can be used to copy the image to the USB "
-#~ "stick. For this installation method you will also need to download a CD "
-#~ "image. The installation image and the CD image must be based on the same "
-#~ "release of &d-i;. If they do not match you are likely to get "
-#~ "errors<footnote> <para> The error message that is most likely to be "
-#~ "displayed is that no kernel modules can be found. This means that the "
-#~ "version of the kernel module udebs included on the CD image is different "
-#~ "from the version of the running kernel. </para> </footnote> during the "
-#~ "installation."
-#~ msgstr ""
-#~ "制作包含 CD 映象软件包的 U 盘,需要使用的安装映象放在 <filename>hd-media</"
-#~ "filename> 目录。可以采用<quote>简易方法</quote>或<quote>灵活方法</quote>将"
-#~ "它复制到 U 盘上。这种安装方式下您还需要下载一份 CD 映象。安装映象和 CD 映"
-#~ "象应该是相同的 &d-i; 发行版。如果不同则在安装中会出现错误<footnote> "
-#~ "<para> 错误信息大概会显示为找不到内核模块。意思是说在 CD 映象里面包含的内"
-#~ "核模块 udeb 版本与正在运行的内核不符。</para> </footnote>。"
-
-#~ msgid "Copying the files &mdash; the easy way"
-#~ msgstr "复制文件 &mdash; 轻松的途径"
-
-#~ msgid ""
-#~ "If you used an <filename>hd-media</filename> image, you should now copy a "
-#~ "&debian; ISO image (businesscard, netinst or full CD image; be sure to "
-#~ "select one that fits) onto the stick. When you are done, unmount the USB "
-#~ "memory stick (<userinput>umount /mnt</userinput>)."
-#~ msgstr ""
-#~ "如果您使用 <filename>hd-media</filename> 映象,现在应该复制 &debian; ISO "
-#~ "映象(businesscard、netinst 或者完整的 CD 映象;确认适合的一种)到 U 盘上。"
-#~ "然后,卸载 U 盘 (<userinput>umount /mnt</userinput>)。"
-
-#~ msgid ""
-#~ "If your system refuses to boot from the memory stick, the stick may "
-#~ "contain an invalid master boot record (MBR). To fix this, use the "
-#~ "<command>install-mbr</command> command from the package <classname>mbr</"
-#~ "classname>:"
-#~ msgstr ""
-#~ "如果您的系统拒绝从 U 盘引导,那么可能是因为它含有无效的主引导扇区记录"
-#~ "(MBR)。您可以使用 <command>install-mbr</command> 命令来修复这个问题,该命"
-#~ "令来自 <classname>mbr</classname> 软件包:"
-
-#~ msgid "# install-mbr /dev/<replaceable>sdX</replaceable>"
-#~ msgstr "# install-mbr /dev/<replaceable>sdX</replaceable>"
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index a4dcfaa11..254b86af5 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2012-06-16 09:12+0000\n"
-"PO-Revision-Date: 2011-01-16 23:32+0800\n"
+"PO-Revision-Date: 2012-07-25 14:25+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
"Language: \n"
@@ -241,11 +241,11 @@ msgid ""
"memory stick. Of course this will destroy anything already on the memory "
"stick. This works because Debian CD images are \"isohybrid\" images that can "
"boot both from CD and from USB drives."
-msgstr ""
+msgstr "制作 U 盘安装盘最简单的方法是,下载任何 Debian CD 或 DVD 映像,并将 CD 映像直接写入 U 盘。这会覆盖掉 U 盘上的所有数据。它可以启动是因为 Debian CD 映像都是\"混合(isohybrid)\"映像,可以从 CD 或者 U 盘引导。"
#. Tag: para
#: installation-howto.xml:146
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "The easiest way to prepare your USB memory stick is to download "
#| "<filename>hd-media/boot.img.gz</filename>, and use gunzip to extract the "
@@ -264,14 +264,7 @@ msgid ""
"filesystem on it. Next, download a &debian; netinst CD image, and copy that "
"file to the memory stick; any filename is ok as long as it ends in <literal>."
"iso</literal>."
-msgstr ""
-"要把您的 U 盘做成安装盘,最简单的办法就是下载 <filename>hd-media/boot.img."
-"gz</filename>,然后用 gunzip 把这个文件解压,生成 256 MB 的映像文件。再把生成"
-"的映像文件直接写到 U盘。对了,这个 U 盘的容量至少要有 256 mb。当然了,上面所"
-"说的操作会把 U 盘里的原有数据全部毁掉。以后再挂载这个 U 盘的话,它上面就不再"
-"是 FAT 文件系统了。写完 U 盘后,接着要下载一个 &debian; netinst CD 映像文件,"
-"再把这个映像复制到 U 盘里。哪个映像文件都可以用,只要它的文件名是 <literal>."
-"iso</literal> 结尾的就行。"
+msgstr "制作 U 盘安装盘最简单的方法是:下载 <filename>hd-media/boot.img.gz</filename>,然后使用 gunzip 从这个文件解压出 1 GB 映像。直接写该映像到您的 U 盘,要求这个 U 盘容量要大于 1 GB。当然,这将覆盖掉您 U 盘上所有资料。然后挂载这个 U 盘,它不再是 FAT 文件系统了。接下来,下载 &debian; netinst CD 映像,并复制该文件到 U 盘,只要文件后缀是 <literal>.iso</literal>,用什么名字都可以。"
#. Tag: para
#: installation-howto.xml:157
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index 8de582f2c..a77682d88 100644
--- a/po/zh_CN/partitioning.po
+++ b/po/zh_CN/partitioning.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2012-06-16 09:12+0000\n"
-"PO-Revision-Date: 2011-01-16 23:40+0800\n"
+"PO-Revision-Date: 2012-07-25 22:31+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
"Language: \n"
@@ -954,7 +954,7 @@ msgstr ""
#. Tag: para
#: partitioning.xml:601
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "The PC BIOS generally adds additional constraints for disk partitioning. "
#| "There is a limit to how many <quote>primary</quote> and <quote>logical</"
@@ -972,13 +972,7 @@ msgid ""
"information can be found in the <ulink url=\"&url-partition-howto;\">Linux "
"Partition HOWTO</ulink>, but this section will include a brief overview to "
"help you plan most situations."
-msgstr ""
-"PC BIOS 一般会对磁盘分区加入一些约束。比如一个磁盘驱动可以含有多少个<quote>主"
-"</quote>分区和<quote>逻辑</quote>分区。在 1994$ndash;98 年的 BIOS 里,还有关"
-"于 BIOS 能够从什么地方引导的限制。详细的信息可以在 <ulink url=\"&url-"
-"partition-howto;\">Linux Partition HOWTO</ulink> 以及 <ulink url=\"&url-"
-"phoenix-bios-faq-large-disk;\">Phoenix BIOS FAQ</ulink> 中找到。但是这一节将"
-"包含一个简单的介绍,帮助您在大多数情况下进行规划。"
+msgstr "PC BIOS 通常会对磁盘分区加入一些额外约束。一个是限制单一磁盘可以包含多少个<quote>主分区</quote>和<quote>逻辑分区</quote>。还有,在 1994&ndash;98 前的 BIOS 里,限制 BIOS 可以引导的磁盘。详细的信息可以在 <ulink url=\"&url-partition-howto;\">Linux Partition HOWTO</ulink> 找到,但是本节将包含一个简单的介绍,帮助您在大多数情况下进行规划。"
#. Tag: para
#: partitioning.xml:611
@@ -1416,27 +1410,3 @@ msgstr ""
"这里建议第三个分区应该是 <quote>Whole disk</quote>(type 5),并且包含整个磁盘 "
"(从第一个柱面至最后一个),这是 Sun 磁盘格式的惯例,并且确保 <command>SILO</"
"command> 启动引导器工作良好。"
-
-#~ msgid "partman"
-#~ msgstr "partman"
-
-#~ msgid "fdisk"
-#~ msgstr "fdisk"
-
-#~ msgid "cfdisk"
-#~ msgstr "cfdisk"
-
-#~ msgid "atari-fdisk"
-#~ msgstr "atari-fdisk"
-
-#~ msgid "amiga-fdisk"
-#~ msgstr "amiga-fdisk"
-
-#~ msgid "mac-fdisk"
-#~ msgstr "mac-fdisk"
-
-#~ msgid "pmac-fdisk"
-#~ msgstr "pmac-fdisk"
-
-#~ msgid "fdasd"
-#~ msgstr "fdasd"
diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po
index e4d69101f..8a265c140 100644
--- a/po/zh_CN/post-install.po
+++ b/po/zh_CN/post-install.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2012-06-16 09:12+0000\n"
-"PO-Revision-Date: 2010-10-27 23:19+0800\n"
+"PO-Revision-Date: 2012-07-25 22:38+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
"Language: \n"
@@ -180,7 +180,7 @@ msgstr ""
#: post-install.xml:141
#, no-c-format
msgid "Additional Software Available for &debian;"
-msgstr ""
+msgstr "用于 &debian; 的额外软件"
#. Tag: para
#: post-install.xml:142
@@ -191,7 +191,7 @@ msgid ""
"important and expect to have. Information on these additional repositories "
"can be found on the &debian; Wiki page titled <ulink url=\"&url-debian-wiki-"
"software;\">The Software Available for &debian;'s Stable Release</ulink>."
-msgstr ""
+msgstr "有一些官方或非官方的软件库,在默认的 &debian; 安装下并未打开。它们之中含有一些重要的必备软件。关于这些软件库的信息放在 &debian; Wiki 页面 <ulink url=\"&url-debian-wiki-software;\">The Software Available for &debian;'s Stable Release</ulink>。"
#. Tag: title
#: post-install.xml:154
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 49fcd8e57..1451c0df0 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2012-06-16 09:12+0000\n"
-"PO-Revision-Date: 2010-11-04 17:18+0800\n"
+"PO-Revision-Date: 2012-07-25 14:34+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
"Language: \n"
@@ -913,10 +913,10 @@ msgstr "您的无线网络的 ESSID。"
#. Tag: para
#: preparing.xml:620
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid "WEP security key (if applicable)."
msgid "WEP or WPA/WPA2 security key (if applicable)."
-msgstr "WEP 安全密钥(如果可用)。"
+msgstr "WEP 或 WPA/WPA2 安全密钥(如果可用)。"
#. Tag: title
#: preparing.xml:637
@@ -2558,7 +2558,7 @@ msgstr ""
#. Tag: para
#: preparing.xml:1710
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "You need to copy all the files from the <filename>generic</filename> sub-"
#| "directory to your CMS disk. Be sure to transfer <filename>kernel.debian</"
@@ -2576,12 +2576,7 @@ msgid ""
"<filename>parmfile.debian</filename> can be in either ASCII or EBCDIC "
"format. A sample <filename>debian.exec</filename> script, which will punch "
"the files in the proper order, is included with the images."
-msgstr ""
-"您需要从 <filename>generic</filename> 子目录复制所有的文件到 CMS 磁盘。确保 "
-"<filename>kernel.debian</filename> 和 <filename>initrd.debian</filename> 是"
-"以 80 字符固定记录长度的二进制模式传输。<filename>parmfile.debian</filename> "
-"可以是 ASCII 或 EBCDIC 格式。有一个例子脚本 <filename>debian.exec</"
-"filename>,用来将文件按正确次序存放,也包含在映象里面。"
+msgstr "您需要从 <filename>generic</filename> 子目录复制所有的文件到 CMS 磁盘。并确保 <filename>kernel.debian</filename> 和 <filename>initrd.debian</filename> 以 80 字符固定长度二进制模式传输(FTP 客户端使用 <userinput>BINARY</userinput> 和 <userinput>LOCSITE FIX 80</userinput>)。<filename>parmfile.debian</filename> 可以是 ASCII 或 EBCDIC 格式。映像里面包含有一个 <filename>debian.exec</filename> 示例脚本,用于按正确次序存放文件。"
#. Tag: title
#: preparing.xml:1727
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 2f8f1bedf..f67dd0e45 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2012-06-26 13:45+0000\n"
-"PO-Revision-Date: 2011-01-16 23:42+0800\n"
+"PO-Revision-Date: 2012-07-25 22:54+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
"Language: \n"
@@ -163,7 +163,7 @@ msgstr "硬盘 <phrase condition=\"bootable-usb\">(包括 U 盘)</phrase>"
#: preseed.xml:96 preseed.xml:101
#, no-c-format
msgid "yes<footnoteref linkend=\"apx-ps-net\"/>"
-msgstr ""
+msgstr "yes<footnoteref linkend=\"apx-ps-net\"/>"
#. Tag: entry
#: preseed.xml:98
@@ -386,7 +386,7 @@ msgstr ""
#. Tag: para
#: preseed.xml:285
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "Note that <filename>preseed/url</filename> can be shortened to just "
#| "<filename>url</filename> and <filename>preseed/file</filename> to just "
@@ -397,10 +397,7 @@ msgid ""
"<filename>file</filename> and <filename>preseed/file/checksum</filename> to "
"just <filename>preseed-md5</filename> when they are passed as boot "
"parameters."
-msgstr ""
-"注意,在作为引导参数的时候,<filename>preseed/url</filename> 可以简写为 "
-"<filename>url</filename>,<filename>preseed/file</filename> 简写为 "
-"<filename>file</filename>。"
+msgstr "注意,作为引导参数时 <filename>preseed/url</filename> 可以缩写为 <filename>url</filename>、<filename>preseed/file</filename> 缩写为 <filename>file</filename>、<filename>preseed/file/checksum</filename> 缩写为 <filename>preseed-md5</filename>。"
#. Tag: title
#: preseed.xml:296
@@ -1035,7 +1032,7 @@ msgstr ""
#. Tag: para
#: preseed.xml:599
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "For debconf variables (templates) used in the installer itself, the owner "
#| "should be set to <quote>d-i</quote>; to preseed variables used in the "
@@ -1050,11 +1047,7 @@ msgid ""
"debconf template should be used. Only variables that have their owner set to "
"something other than <quote>d-i</quote> will be propagated to the debconf "
"database for the installed system."
-msgstr ""
-"对于安装程序自己使用的 debconf 变量(模板),owner 应该设置为 <quote>d-i</"
-"quote>;要在安装后的系统里面预置变量,应该使用名称中包含对应 debconf 模板的软"
-"件包。只有那些 owner 为非 <quote>d-i</quote> 的变量将被保存到安装后系统的 "
-"debconf 数据库里面。"
+msgstr "只在安装程序自己使用的 debconf 变量(模板),owner 应该设置为 <quote>d-i</quote>; 要在安装后的系统里面预置变量,应该使用名称中包含对应 debconf 模板的软件包。只有那些 owner 为非 <quote>d-i</quote> 的变量将被保存到安装后系统的 debconf 数据库里面。"
#. Tag: para
#: preseed.xml:607
@@ -1253,7 +1246,7 @@ msgstr ""
#. Tag: screen
#: preseed.xml:729
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "# Preseeding only locale sets language, country and locale.\n"
#| "d-i debian-installer/locale string en_US\n"
@@ -1283,11 +1276,11 @@ msgstr ""
"#d-i debian-installer/country string NL\n"
"#d-i debian-installer/locale string en_GB.UTF-8\n"
"# Optionally specify additional locales to be generated.\n"
-"#d-i localechooser/supported-locales en_US.UTF-8, nl_NL.UTF-8"
+"#d-i localechooser/supported-locales multiselect en_US.UTF-8, nl_NL.UTF-8"
#. Tag: para
#: preseed.xml:731
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "Keyboard configuration consists of selecting a keyboard architecture and "
#| "a keymap."
@@ -1295,11 +1288,11 @@ msgid ""
"Keyboard configuration consists of selecting a keymap and (for non-latin "
"keymaps) a toggle key to switch between the non-latin keymap and the US "
"keymap."
-msgstr "键盘设置由键盘体系和 keymap 组成。"
+msgstr "键盘配置包括选择的 keymap 和(对于非拉丁 keymap)切换键,该键用于非拉丁和 US keymap 来回切换。"
#. Tag: screen
#: preseed.xml:736
-#, fuzzy, no-c-format
+#, no-c-format
msgid ""
"# Keyboard selection.\n"
"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
@@ -1308,8 +1301,8 @@ msgid ""
msgstr ""
"# Keyboard selection.\n"
"# keymap is an alias for keyboard-configuration/xkb-keymap\n"
-"d-i keymap select cn\n"
-"# d-i keyboard-configuration/toggle select No toggling\n"
+"d-i keymap select us\n"
+"# d-i keyboard-configuration/toggle select No toggling"
#. Tag: para
#: preseed.xml:738
@@ -1382,7 +1375,7 @@ msgstr "下面的 debconf 变量与网络配置相关。"
#. Tag: screen
#: preseed.xml:783
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "# Disable network configuration entirely. This is useful for cdrom\n"
#| "# installations on non-networked devices where the network questions,\n"
@@ -1503,6 +1496,10 @@ msgstr ""
"# To pick a particular interface instead:\n"
"#d-i netcfg/choose_interface select eth1\n"
"\n"
+"# To set a different link detection timeout (default is 3 seconds).\n"
+"# Values are interpreted as seconds.\n"
+"#di netcfg/link_detection_timeout string 10\n"
+"\n"
"# If you have a slow dhcp server and the installer times out waiting for\n"
"# it, this might be useful.\n"
"#d-i netcfg/dhcp_timeout string 60\n"
@@ -1838,7 +1835,7 @@ msgstr ""
#. Tag: para
#: preseed.xml:899
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "The examples below only provide basic information on the use of recipes. "
#| "For detailed information see the files <filename>partman-auto-recipe.txt</"
@@ -1855,13 +1852,7 @@ msgid ""
"available from the <ulink url=\"&url-d-i-gitweb-doc-devel;\">&d-i; source "
"repository</ulink>. Note that the supported functionality may change between "
"releases."
-msgstr ""
-"下面的例子仅提供了使用方案的最基本信息。详细的内容清参考文件 "
-"<filename>partman-auto-recipe.txt</filename> 和 <filename>partman-auto-raid-"
-"recipe.txt</filename>,它们包含在 <classname>debian-installer</classname> 软"
-"件包内。这两个文件也可以从 <ulink url=\"&url-d-i-websvn;/trunk/installer/doc/"
-"devel/\">&d-i; source repository</ulink> 获取。注意不同发布版支持的功能会有所"
-"改变。"
+msgstr "下面的例子仅提供了使用方案的最基本信息。详细的内容清参考文件 <filename>partman-auto-recipe.txt</filename> 和 <filename>partman-auto-raid-recipe.txt</filename>,它们含在 <classname>debian-installer</classname> 软件包里。这两个文件也可以从 <ulink url=\"&url-d-i-gitweb-doc-devel;\">&d-i; source repository</ulink>获取。注意不同发布版支持的功能会有所改变。"
#. Tag: para
#: preseed.xml:913
@@ -2256,7 +2247,7 @@ msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内
#. Tag: screen
#: preseed.xml:998
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "# Configure APT to not install recommended packages by default. Use of "
#| "this\n"
@@ -2290,13 +2281,7 @@ msgstr ""
"# experienced users.\n"
"#d-i base-installer/install-recommends boolean false\n"
"\n"
-"# Select the initramfs generator used to generate the initrd for 2.6 "
-"kernels.\n"
-"#d-i base-installer/kernel/linux/initramfs-generators string initramfs-"
-"tools\n"
-"\n"
-"# The kernel image (meta) package to be installed; \"none\" can be used if "
-"no\n"
+"# The kernel image (meta) package to be installed; \"none\" can be used if no\n"
"# kernel is to be installed.\n"
"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486"
@@ -2528,7 +2513,7 @@ msgstr "安装 bootloader"
#. Tag: screen
#: preseed.xml:1084
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). "
#| "If you want lilo installed\n"
@@ -2622,29 +2607,20 @@ msgid ""
"# Note: options passed to the installer will be added automatically.\n"
"#d-i debian-installer/add-kernel-opts string nousb"
msgstr ""
-"<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If "
-"you want lilo installed\n"
+"<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If you want lilo installed\n"
"# instead, uncomment this:\n"
"#d-i grub-installer/skip boolean true\n"
"# To also skip installing lilo, and install no bootloader, uncomment this\n"
"# too:\n"
"#d-i lilo-installer/skip boolean true</phrase>\n"
-"<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, uncomment "
-"this\n"
+"<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, uncomment this\n"
"#d-i grub-installer/skip boolean true</phrase>\n"
"\n"
-"# With a few exceptions for unusual partitioning setups, GRUB 2 is now the\n"
-"# default. If you need GRUB Legacy for some particular reason, then\n"
-"# uncomment this:\n"
-"#d-i grub-installer/grub2_instead_of_grub_legacy boolean false\n"
-"\n"
-"# This is fairly safe to set, it makes grub install automatically to the "
-"MBR\n"
+"# This is fairly safe to set, it makes grub install automatically to the MBR\n"
"# if no other operating system is detected on the machine.\n"
"d-i grub-installer/only_debian boolean true\n"
"\n"
-"# This one makes grub-installer install to the MBR if it also finds some "
-"other\n"
+"# This one makes grub-installer install to the MBR if it also finds some other\n"
"# OS, which is less safe as it might not be able to boot that other OS.\n"
"d-i grub-installer/with_other_os boolean true\n"
"\n"
@@ -2895,7 +2871,7 @@ msgid ""
"<classname>DEBCONF_DEBUG=5</classname>. This will cause <classname>debconf</"
"classname> to print much more detail about the current settings of each "
"variable and about its progress through each package's installation scripts."
-msgstr ""
+msgstr "获得更多的调试信息,需使用引导参数 <classname>DEBCONF_DEBUG=5</classname>。这将让 <classname>debconf</classname> 打印更多的细节,包括当前变量设置和每个软件包安装脚本的进度。"
#. Tag: title
#: preseed.xml:1173
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index fc74bdd05..02b47f1d8 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2012-06-16 09:12+0000\n"
-"PO-Revision-Date: 2010-11-04 18:18+0800\n"
+"PO-Revision-Date: 2012-07-25 23:07+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
"Language: \n"
@@ -1167,16 +1167,16 @@ msgstr "可以使用的选项有:"
#. Tag: para
#: random-bits.xml:573
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid "create a default set of static device files using"
msgid ""
"install the makedev package, and create a default set of static device files "
"using (after chrooting)"
-msgstr "创建默认的静态设备文件,使用"
+msgstr "安装 makedev 软件包,并创建默认的静态设备文件,使用(chroot 以后)"
#. Tag: screen
#: random-bits.xml:577
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "# cd /dev\n"
#| "# MAKEDEV generic"
@@ -1185,6 +1185,7 @@ msgid ""
"# cd /dev\n"
"# MAKEDEV generic"
msgstr ""
+"# apt-get install makedev\n"
"# cd /dev\n"
"# MAKEDEV generic"
@@ -1604,7 +1605,7 @@ msgstr ""
#. Tag: para
#: random-bits.xml:761
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "Check <userinput>info grub</userinput> <phrase arch=\"x86\">or "
#| "<userinput>man lilo.conf</userinput></phrase> for instructions on setting "
@@ -1625,19 +1626,11 @@ msgid ""
"new system and edit it there. After you are done editing, call "
"<command>lilo</command> (remember it will use <filename>lilo.conf</filename> "
"relative to the system you call it from)</phrase>."
-msgstr ""
-"通过 <userinput>info grub</userinput> <phrase arch=\"x86\"> 或 "
-"<userinput>man lilo.conf</userinput></phrase> 可以看到有关设置 bootloader 的"
-"指导。如果希望保留用来安装 &debian; 的系统,只需要为 &debian; 系统添加一条配"
-"置信息到在现有的 grub <filename>menu.lst</filename><phrase arch=\"x86\"> 或 "
-"<filename>lilo.conf</filename>。对于 <filename>lilo.conf</filename>,您也可以"
-"把这个文件拷贝到新的系统里,然后在新的系统里编辑它。修改好配置,运行 "
-"<command>lilo</command>(请记住,在哪个系统里运行 lilo,它就会用哪个系统里的 "
-"<filename>lilo.conf</filename>)</phrase>。"
+msgstr "通过 <userinput>info grub</userinput> <phrase arch=\"x86\"> 或 <userinput>man lilo.conf</userinput></phrase> 可以看到有关设置 bootloader 的指导。如果希望保留用来安装 &debian; 的系统,只需要为 &debian; 系统添加一条配置信息到现有 grub2 的 <filename>grub.cfg</filename><phrase arch=\"x86\"> 或 <filename>lilo.conf</filename>。对于 <filename>lilo.conf</filename>,您也可以把这个文件拷贝到新的系统里,然后在新的系统里编辑它。修改好配置,运行 <command>lilo</command> (请记住,在哪个系统里运行 lilo,它就会用哪个系统里的 <filename>lilo.conf</filename> )</phrase>。"
#. Tag: para
#: random-bits.xml:773
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "Installing and setting up <classname>grub</classname> is as easy as: "
#| "<informalexample><screen>\n"
@@ -1659,17 +1652,15 @@ msgid ""
"command will create a sane and working <filename>/boot/grub/grub.cfg</"
"filename>."
msgstr ""
-"安装和建立 <classname>grub</classname> 非常容易:<informalexample><screen>\n"
-"# aptitude install grub\n"
+"安装和建立 <classname>grub2</classname> 非常容易:<informalexample><screen>\n"
+"# aptitude install grub-pc\n"
"# grub-install /dev/<replaceable>hda</replaceable>\n"
"# update-grub\n"
-"</screen></informalexample> 第二个命令将安装 <command>grub</command> (本例中"
-"是 <literal>hda</literal> 的 MBR)。最后的命令是创建一个胜任的 <filename>/"
-"boot/grub/menu.lst</filename>。"
+"</screen></informalexample> 第二个命令将安装 <command>grub2</command> (本例中是 <literal>hda</literal> 的 MBR)。最后的命令是创建一个可用的 <filename>/boot/grub/grub.cfg</filename>。"
#. Tag: para
#: random-bits.xml:783
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "Note that this assumes that a <filename>/dev/hda</filename> device file "
#| "has been created. There are alternative methods to install <command>grub</"
@@ -1678,9 +1669,7 @@ msgid ""
"Note that this assumes that a <filename>/dev/hda</filename> device file has "
"been created. There are alternative methods to install <command>grub2</"
"command>, but those are outside the scope of this appendix."
-msgstr ""
-"注意,这里假设已经创建了 <filename>/dev/hda</filename> 设备文件。另外一种方法"
-"是安装 <command>grub</command>,但本附录中不讨论。"
+msgstr "注意,这里假设已经创建了 <filename>/dev/hda</filename> 设备文件。另外一种方法是安装 <command>grub2</command>,但它不属于本附录讨论范围。"
#. Tag: para
#: random-bits.xml:789
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 0b77e4b9b..5d0ce8818 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
"POT-Creation-Date: 2012-06-16 09:12+0000\n"
-"PO-Revision-Date: 2011-01-17 00:39+0800\n"
+"PO-Revision-Date: 2012-07-25 14:07+0800\n"
"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
"Language: \n"
@@ -1131,7 +1131,7 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:753
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "The manual network setup in turn asks you a number of questions about "
#| "your network, notably <computeroutput>IP address</computeroutput>, "
@@ -1152,14 +1152,7 @@ msgid ""
"<computeroutput>Wireless ESSID</computeroutput> and a <computeroutput>WEP "
"key</computeroutput> or <computeroutput>WPA/WPA2 passphrase</"
"computeroutput>. Fill in the answers from <xref linkend=\"needed-info\"/>."
-msgstr ""
-"手动配置网络会依次询问一些您网络的问题,值得注意的是 <computeroutput>IP 地址"
-"</computeroutput>、<computeroutput>网络掩码</computeroutput>、"
-"<computeroutput>网关</computeroutput>、<computeroutput>域名服务器地址</"
-"computeroutput>和<computeroutput>主机名</computeroutput>。此外,如果您有无线"
-"网络接口,会被要求提供您的 <computeroutput>无线 ESSID</computeroutput> 和一"
-"个 <computeroutput>WEP 密钥</computeroutput>。填写答案 <xref linkend="
-"\"needed-info\"/>。"
+msgstr "手动配置网络会依次询问一些网络问题,特别是 <computeroutput>IP 地址(IP address)</computeroutput>、<computeroutput>网络掩码(Netmask)</computeroutput>、<computeroutput>网关(Gateway)</computeroutput>、<computeroutput>域名服务器地址(Name server addresses)</computeroutput>,以及<computeroutput>主机名(Hostname)</computeroutput>。另外,如果您有无线网卡,会被要求提供<computeroutput>无线 ESSID(Wireless ESSID)</computeroutput> 和 <computeroutput> WEP 密钥(WEP key)</computeroutput> 或者 <computeroutput>WPA/WPA2 密码(WPA/WPA2 passphrase)</computeroutput>。填写答案 <xref linkend=\"needed-info\"/>。"
#. Tag: para
#: using-d-i.xml:769
@@ -5050,7 +5043,7 @@ msgstr "准备介质"
#. Tag: para
#: using-d-i.xml:3448
-#, fuzzy, no-c-format
+#, no-c-format
#| msgid ""
#| "Although in some cases the firmware can also be loaded from a partition "
#| "on a hard disk, the most common method to load firmware will be from some "
@@ -5069,11 +5062,7 @@ msgid ""
"named <filename>/firmware</filename> of the file system on the medium. The "
"recommended file system to use is FAT as that is most certain to be "
"supported during the early stages of the installation."
-msgstr ""
-"虽然有些情况下固件可以从硬盘的某个分区加载,但常用的方法是从移动的介质,比如"
-"软盘或 U 盘加载固件。固件文件或者软件包必须放在该介质文件系统的根目录,或者名"
-"为 <filename>/firmware</filename> 的目录下。推荐的文件系统是 FAT,它是安装过"
-"程最初阶段最可能支持的文件系统。"
+msgstr "官方的 CD 映像不含商用的固件。这些固件通常是从移动介质,比如 U 盘来加载。另外,包含这些商用固件的非官方的 CD 位于 <ulink url=\"&url-firmware-cds;\"></ulink>。制作这种 U 盘(或者其他的介质,比如硬盘分区或者软盘)时,固件文件或软件包必须放置在文件系统的根目录或者名为 <filename>/firmware</filename> 的目录下。推荐使用 FAT 文件系统,因为在安装过程的早期阶段它肯定能被支持。"
#. Tag: para
#: using-d-i.xml:3461
@@ -5171,15 +5160,3 @@ msgid ""
msgstr ""
"如果固件从不严格的固件文件加载,复制到安装好的系统的固件将<emphasis>不会</"
"emphasis>自动更新,除非对应的固件软件包(如果有的话)在系统安装之后安装。"
-
-#~ msgid ""
-#~ "Support for loading firmware is still relatively basic and is likely to "
-#~ "be improved in future releases of the installer. Currently &d-i; will for "
-#~ "example not display any warning if you choose to load missing firmware, "
-#~ "but the requested firmware is not found. Please report any issues you "
-#~ "encounter by filing an installation report (see <xref linkend=\"submit-bug"
-#~ "\"/>)."
-#~ msgstr ""
-#~ "加载固件的支持相对简单,在以后的安装程序版本中会得到加强。例如,当前 &d-"
-#~ "i; 中如果选择加载缺失的固件,但固件却无法找到,不会显示任何警告。请您填写"
-#~ "安装报告反应遇到的任何问题(参阅 <xref linkend=\"submit-bug\"/>)。"