remove Sarge phase tag.

1 files changed, 15 insertions, 48 deletions

diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index c133f4a15..5388303bb 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"
 "POT-Creation-Date: 2006-01-03 19:55+0000\n"
-"PO-Revision-Date: 2005-12-31 09:41+0800\n"
+"PO-Revision-Date: 2006-01-04 10:57+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -1058,7 +1058,7 @@ msgstr ""
 
 #. Tag: screen
 #: boot-installer.xml:777
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "image=/boot/newinstall/vmlinuz\n"
 "       label=newinstall\n"
@@ -1070,8 +1070,7 @@ msgstr ""
 "       label=newinstall\n"
 "       initrd=/boot/newinstall/initrd.gz\n"
 "       root=/dev/ram0\n"
-"       append=\"<phrase condition=\"sarge\">devfs=mount,dall </"
-"phrase>ramdisk_size=12000\""
+"       append=\"ramdisk_size=12000\""
 
 #. Tag: para
 #: boot-installer.xml:777
@@ -1090,7 +1089,7 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:786
-#, 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> "
@@ -1101,15 +1100,11 @@ msgid ""
 "initrd (hd0,0)/boot/newinstall/initrd.gz\n"
 "</screen></informalexample> and reboot."
 msgstr ""
-"采用 <command>GRUB</command> 的配置过程也很相似。在 <filename>/boot/grub/</"
-"filename> 目录下(有时会是 <filename>/boot/boot/grub/</filename>)找出您的 "
-"<filename>menu.lst</filename>，加入如下几行： <informalexample><screen>\n"
+"使用 <command>GRUB</command> 的过程也类似。在 <filename>/boot/grub/</filename> 目录下找到 <filename>menu.lst</filename> (有时位于 <filename>/boot/boot/grub/</filename>)，加入下面几行：<informalexample><screen>\n"
 "title  New Install\n"
 "kernel (hd0,0)/boot/newinstall/vmlinuz root=/dev/ram0 ramdisk_size=12000\n"
 "initrd (hd0,0)/boot/newinstall/initrd.gz\n"
-"</screen></informalexample> 并重启。<phrase condition=\"sarge\">如果引导失"
-"败，您可以尝试在 <quote>kernel</quote> 行添加 <userinput>devfs=mount,dall</"
-"userinput>。</phrase>"
+"</screen></informalexample> 然后重启。"
 
 #. Tag: para
 #: boot-installer.xml:797
@@ -1353,7 +1348,7 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:969
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Information on available boot methods and on boot parameters which might be "
 "useful can be found by pressing <keycap>F2</keycap> through <keycap>F8</"
@@ -1362,11 +1357,8 @@ msgid ""
 "before the first parameter (e.g., <userinput>linux debconf/priority=medium</"
 "userinput>)."
 msgstr ""
-"有关引导参数的信息可能会很有用。它可以通过 <keycap>F2</keycap> 到 <phrase "
-"condition=\"sarge\"><keycap>F7</keycap></phrase><phrase condition=\"etch"
-"\"><keycap>F8</keycap></phrase> 来找到。如果您加入任何参数至引导命令行，请确"
-"保在引导方法(缺省是 <userinput>linux</userinput>) 和第一个参数之间有一个空格"
-"(比如 <userinput>linux debconf/priority=medium</userinput>)。"
+"使用 <keycap>F2</keycap> 至 <keycap>F8</keycap> 键，可以查看有效的引导方法和引导参数的信息。如果您在引导命令行上添加任何参数，确保引导方法(默认是 <userinput>linux</userinput>)和第一个参数之间有一个空格(例如，<userinput>linux debconf/priority=medium</userinput>)。\n"
+"Information on available boot methods and on boot parameters which might be useful can be found by pressing <keycap>F2</keycap> through <keycap>F8</keycap>. If you add any parameters to the boot command line, be sure to type the boot method (the default is <userinput>linux</userinput>) and a space before the first parameter (e.g., <userinput>linux debconf/priority=medium</userinput>)."
 
 #. Tag: para
 #: boot-installer.xml:978
@@ -3257,7 +3249,7 @@ msgstr "Debian 安装程序的参数"
 
 #. Tag: para
 #: boot-installer.xml:2604
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "The installation system recognizes a few additional boot "
 "parameters<footnote> <para> Note that the kernel accepts a maximum of 8 "
@@ -3266,12 +3258,7 @@ msgid ""
 "will drop any excess options and 2.6 kernels will panic. With kernel 2.6.9 "
 "or newer, you can use 32 command line options and 32 environment options. </"
 "para> </footnote> which may be useful."
-msgstr ""
-"安装系统能识别一些比较有用的附加引导参数 <footnote> <para> 注意，内核最多可以"
-"接受 8 个命令行参数和 8 个环境变量选项(包括安装程序默认使用的选项)。如果超"
-"出，2.4 内核会丢弃过多的选项，2.6 内核则会崩溃。<phrase condition=\"etch"
-"\">2.6.9 以后的内核，您可以使用 32 个命令行参数和 32 个环境变量选项。</"
-"phrase></para> </footnote>，也许比较有用。"
+msgstr "安装系统能识别一些有用的额外引导参数 <footnote> <para> 注意，内核最多可以接受 8 个命令行参数和 8 个环境变量选项(包括安装程序默认使用的选项)。如果超出，2.4 内核会丢弃过多的选项，2.6 内核则会崩溃。2.6.9 以后的内核，您可以使用 32 个命令行参数和 32 个环境变量选项。</para> </footnote>。"
 
 #. Tag: term
 #: boot-installer.xml:2624
@@ -3996,7 +3983,7 @@ msgstr "Bug Reporter"
 
 #. Tag: para
 #: boot-installer.xml:3083
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "If you get through the initial boot phase but cannot complete the install, "
 "the bug reporter menu choice may be helpful. It lets you store system error "
@@ -4004,24 +3991,16 @@ msgid ""
 "download them in a web browser. This information may provide clues as to "
 "what went wrong and how to fix it. If you are submitting a bug report you "
 "may want to attach this information to the bug report."
-msgstr ""
-"如果您过了初始化引导，但还是不能安装，Bug Reporter 菜单选项可能会很有用。"
-"<phrase condition=\"sarge\">它复制系统的错误记录和配置信息到一张用户提供的软"
-"盘。</phrase> <phrase condition=\"etch\">它让您保存安装程序的系统错误记录和配"
-"置信息到一张软盘，或者用网络浏览器下载。</phrase>这个信息可能提供了一些关于错"
-"误的起因和如何解决它的线索。如果您正在提交一个 bug 报告，您可以附上这个信息。"
+msgstr "如果您过了初始化引导阶段，但还是不能安装，可以借助于 bug 报告菜单选项。它让您保存安装程序的系统错误记录和配置信息到软盘，或者用网络浏览器下载。该信息或许可以提供了一些关于错误的起因和如何解决它的线索。如果您正在提交一个 bug 报告，可以报告里附上该信息。"
 
 #. Tag: para
 #: boot-installer.xml:3094
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Other pertinent installation messages may be found in <filename>/var/log/</"
 "filename> during the installation, and <filename>/var/log/installer/</"
 "filename> after the computer has been booted into the installed system."
-msgstr ""
-"其他相关安装期间的安装信息可以在 <filename>/var/log/</filename> 找到，以及在"
-"计算机已经引导至安装后的系统的 <filename>/var/log/debian-installer/</"
-"filename> 中。"
+msgstr "其他安装期间相关的信息可以在 <filename>/var/log/</filename> 内找到，计算机用新安装的系统启动后，放在 <filename>/var/log/debian-installer/</filename> 里。"
 
 #. Tag: title
 #: boot-installer.xml:3105
@@ -4139,15 +4118,3 @@ msgstr ""
 "      and ideas you had during the initial install.&gt;\n"
 "</screen></informalexample> 在 bug 报告内，请说明问题所在，包括内核挂起后最后"
 "见到的内核消息。说明进入问题状态时您进行的步骤。"
-
-#~ msgid ""
-#~ "Also, if you are using a 2.2.x linux kernel, then you must make sure you "
-#~ "are using a ramdisk built to accommodate it, see the <ulink url="
-#~ "\"&disturl;/main/installer-&architecture;/current/images/MANIFEST"
-#~ "\">MANIFEST</ulink>. In general, this means you need to use the initrd22."
-#~ "gz ramdisk from the respective directory."
-#~ msgstr ""
-#~ "如果您使用 2.2.x linux 内核，那么必须确保 ramdisk 满足要求，参阅 <ulink "
-#~ "url=\"&disturl;/main/installer-&architecture;/current/images/MANIFEST"
-#~ "\">MANIFEST</ulink>。通常，这意味需要从各自的目录使用 initrd22.gz "
-#~ "ramdisk。"