Refresh po|pot files after changings in en

1 files changed, 111 insertions, 96 deletions

diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 2fef54688..4a467b24f 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-12-20 20:36+0000\n"
+"POT-Creation-Date: 2020-04-02 09:22+0000\n"
 "PO-Revision-Date: 2017-06-11 20:40+0800\n"
 "Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
 "Language-Team:  <debian-l10n-chinese@lists.debian.org>\n"
@@ -1537,29 +1537,29 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:717
-#, no-c-format
-msgid ""
-"Check <userinput>info grub</userinput> <phrase arch=\"x86\">or "
-"<userinput>man lilo.conf</userinput></phrase> for instructions on setting up "
-"the bootloader. If you are keeping the system you used to install &debian;, "
-"just add an entry for the &debian; install to your existing grub2 "
-"<filename>grub.cfg</filename><phrase arch=\"x86\"> or <filename>lilo.conf</"
-"filename>. For <filename>lilo.conf</filename>, you could also copy it to the "
-"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>."
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Check <userinput>man yaboot.conf</userinput> for instructions on setting "
+#| "up the bootloader. If you are keeping the system you used to install "
+#| "&debian;, just add an entry for the &debian; install to your existing "
+#| "<filename>yaboot.conf</filename>. You could also copy it to the new "
+#| "system and edit it there. After you are done editing, call ybin (remember "
+#| "it will use <filename>yaboot.conf</filename> relative to the system you "
+#| "call it from)."
+msgid ""
+"Check <userinput>info grub</userinput> for instructions on setting up the "
+"bootloader. If you are keeping the system you used to install &debian;, just "
+"add an entry for the &debian; install to your existing grub2 <filename>grub."
+"cfg</filename>."
 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>。"
+"通过查阅 <userinput>man yaboot.conf</userinput> 可以得到一些有关设置 "
+"bootloader 的提示。如果您希望继续保留用来安装 &debian; 的系统，那么在 "
+"<filename>yaboot.conf</filename> 里为 &debian; 系统添加一条配置就可以了。您也"
+"可以把这个文件拷贝到新的系统里，然后在新的系统里编辑它。当您修改完毕配置，运"
+"行 ybin（请记住您在哪个系统里运行的 <filename>yaboot.conf</filename>）。"
 
 #. Tag: para
-#: random-bits.xml:729
+#: random-bits.xml:725
 #, no-c-format
 msgid ""
 "Installing and setting up <classname>grub2</classname> is as easy as: "
@@ -1581,7 +1581,7 @@ msgstr ""
 "boot/grub/grub.cfg</filename>。"
 
 #. Tag: para
-#: random-bits.xml:739
+#: random-bits.xml:735
 #, no-c-format
 msgid ""
 "Note that this assumes that a <filename>/dev/sda</filename> device file has "
@@ -1592,35 +1592,7 @@ msgstr ""
 "是安装 <command>grub2</command>，但它不属于本附录讨论范围。"
 
 #. Tag: para
-#: random-bits.xml:745
-#, no-c-format
-msgid "Here is a basic <filename>/etc/lilo.conf</filename> as an example:"
-msgstr "下面有一个简单的 <filename>/etc/lilo.conf</filename> 作为例子："
-
-#. Tag: screen
-#: random-bits.xml:749
-#, no-c-format
-msgid ""
-"boot=/dev/<replaceable>sda6</replaceable>\n"
-"root=/dev/<replaceable>sda6</replaceable>\n"
-"install=menu\n"
-"delay=20\n"
-"lba32\n"
-"image=/vmlinuz\n"
-"initrd=/initrd.img\n"
-"label=Debian"
-msgstr ""
-"boot=/dev/<replaceable>sda6</replaceable>\n"
-"root=/dev/<replaceable>sda6</replaceable>\n"
-"install=menu\n"
-"delay=20\n"
-"lba32\n"
-"image=/vmlinuz\n"
-"initrd=/initrd.img\n"
-"label=Debian"
-
-#. Tag: para
-#: random-bits.xml:751
+#: random-bits.xml:741
 #, no-c-format
 msgid ""
 "Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
@@ -1637,7 +1609,7 @@ msgstr ""
 "行 ybin（请记住您在哪个系统里运行的 <filename>yaboot.conf</filename>）。"
 
 #. Tag: para
-#: random-bits.xml:761
+#: random-bits.xml:751
 #, no-c-format
 msgid ""
 "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1667,13 +1639,13 @@ msgstr ""
 "userinput> 换成 <userinput>hd:</userinput>。"
 
 #. Tag: title
-#: random-bits.xml:774
+#: random-bits.xml:764
 #, no-c-format
 msgid "Remote access: Installing SSH and setting up access"
 msgstr "远程访问：安装 SSH 并设置密码"
 
 #. Tag: para
-#: random-bits.xml:775
+#: random-bits.xml:765
 #, no-c-format
 msgid ""
 "In case you can login to the system via console, you can skip this section. "
@@ -1716,7 +1688,7 @@ msgstr ""
 "问权限："
 
 #. Tag: screen
-#: random-bits.xml:799
+#: random-bits.xml:789
 #, no-c-format
 msgid ""
 "# adduser joe\n"
@@ -1726,13 +1698,13 @@ msgstr ""
 "# passwd joe"
 
 #. Tag: title
-#: random-bits.xml:804
+#: random-bits.xml:794
 #, no-c-format
 msgid "Finishing touches"
 msgstr "最后一笔"
 
 #. Tag: para
-#: random-bits.xml:805
+#: random-bits.xml:795
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
@@ -1751,7 +1723,7 @@ msgstr ""
 "的软件包。"
 
 #. Tag: para
-#: random-bits.xml:816
+#: random-bits.xml:806
 #, no-c-format
 msgid ""
 "After the installation there will be a lot of downloaded packages in "
@@ -1762,19 +1734,19 @@ msgstr ""
 "件包。您可以运行下面命令释放空间："
 
 #. Tag: screen
-#: random-bits.xml:822
+#: random-bits.xml:812
 #, no-c-format
 msgid "# apt clean"
 msgstr "# apt clean"
 
 #. Tag: title
-#: random-bits.xml:833
+#: random-bits.xml:823
 #, no-c-format
 msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
 msgstr "通过 Parallel Line IP（PLIP）安装 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:835
+#: random-bits.xml:825
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; on a computer without an "
@@ -1788,7 +1760,7 @@ msgstr ""
 "接到具有 &debian; 镜像的网络（比如，互联网）。"
 
 #. Tag: para
-#: random-bits.xml:843
+#: random-bits.xml:833
 #, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
@@ -1802,7 +1774,7 @@ msgstr ""
 "192.168.0.2 IP 地址（这些地址在您的网络地址空间里面未被占用）。"
 
 #. Tag: para
-#: random-bits.xml:851
+#: random-bits.xml:841
 #, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
@@ -1813,7 +1785,7 @@ msgstr ""
 "linkend=\"boot-new\"/>）。"
 
 #. Tag: para
-#: random-bits.xml:856
+#: random-bits.xml:846
 #, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
@@ -1825,13 +1797,13 @@ msgstr ""
 "值为 <literal>io=0x378</literal>，<literal>irq=7</literal>。"
 
 #. Tag: title
-#: random-bits.xml:866
+#: random-bits.xml:856
 #, no-c-format
 msgid "Requirements"
 msgstr "需求"
 
 #. Tag: para
-#: random-bits.xml:869
+#: random-bits.xml:859
 #, no-c-format
 msgid ""
 "A target computer, called <emphasis>target</emphasis>, where &debian; will "
@@ -1839,13 +1811,13 @@ msgid ""
 msgstr "目标计算机，称为 <emphasis>target</emphasis>，将要安装 &debian;。"
 
 #. Tag: para
-#: random-bits.xml:875
+#: random-bits.xml:865
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr "系统安装介质；参阅 <xref linkend=\"installation-media\"/>。"
 
 #. Tag: para
-#: random-bits.xml:880
+#: random-bits.xml:870
 #, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
@@ -1854,7 +1826,7 @@ msgstr ""
 "另外一台连接到互联网的计算机，称为 <emphasis>source</emphasis>，功能是网关。"
 
 #. Tag: para
-#: random-bits.xml:886
+#: random-bits.xml:876
 #, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -1865,13 +1837,13 @@ msgstr ""
 "Install-HOWTO</ulink> 了解这种线的更多信息，以及如何自己制作。"
 
 #. Tag: title
-#: random-bits.xml:898
+#: random-bits.xml:888
 #, no-c-format
 msgid "Setting up source"
 msgstr "建立源"
 
 #. Tag: para
-#: random-bits.xml:899
+#: random-bits.xml:889
 #, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
@@ -1881,7 +1853,7 @@ msgstr ""
 "算机。"
 
 #. Tag: screen
-#: random-bits.xml:904
+#: random-bits.xml:894
 #, no-c-format
 msgid ""
 "#!/bin/sh\n"
@@ -1923,13 +1895,13 @@ msgstr ""
 "echo 1 &gt; /proc/sys/net/ipv4/ip_forward"
 
 #. Tag: title
-#: random-bits.xml:910
+#: random-bits.xml:900
 #, no-c-format
 msgid "Installing target"
 msgstr "安装目标"
 
 #. Tag: para
-#: random-bits.xml:911
+#: random-bits.xml:901
 #, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
@@ -1953,14 +1925,14 @@ msgstr ""
 "</screen></informalexample> 下面是安装过程中各阶段所要提供的答案。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:930
+#: random-bits.xml:920
 #, fuzzy, no-c-format
 #| msgid "Load installer components from CD"
 msgid "Load installer components from installation media"
 msgstr "从光盘加载安装组件"
 
 #. Tag: para
-#: random-bits.xml:932
+#: random-bits.xml:922
 #, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -1970,13 +1942,13 @@ msgstr ""
 "用 PLIP 驱动。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:940
+#: random-bits.xml:930
 #, no-c-format
 msgid "Detect network hardware"
 msgstr "探测网络硬件"
 
 #. Tag: para
-#: random-bits.xml:945
+#: random-bits.xml:935
 #, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -1989,7 +1961,7 @@ msgstr ""
 "统没有网卡，安装程序不会显示该列表。"
 
 #. Tag: para
-#: random-bits.xml:954
+#: random-bits.xml:944
 #, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
@@ -2000,19 +1972,19 @@ msgstr ""
 "<userinput>plip</userinput> 模块。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:966
+#: random-bits.xml:956
 #, no-c-format
 msgid "Configure the network"
 msgstr "配置网络"
 
 #. Tag: para
-#: random-bits.xml:969
+#: random-bits.xml:959
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr "Auto-configure network with DHCP: No"
 
 #. Tag: para
-#: random-bits.xml:974
+#: random-bits.xml:964
 #, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -2020,7 +1992,7 @@ msgstr ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:979
+#: random-bits.xml:969
 #, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -2030,7 +2002,7 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: random-bits.xml:985
+#: random-bits.xml:975
 #, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
@@ -2040,13 +2012,13 @@ msgstr ""
 "resolv.conf</filename>）"
 
 #. Tag: title
-#: random-bits.xml:1004
+#: random-bits.xml:994
 #, no-c-format
 msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
 msgstr "通过 PPP over Ethernet（PPPPoE）安装 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:1006
+#: random-bits.xml:996
 #, no-c-format
 msgid ""
 "In some countries PPP over Ethernet (PPPoE) is a common protocol for "
@@ -2060,7 +2032,7 @@ msgstr ""
 "本节将说明操作方法。"
 
 #. Tag: para
-#: random-bits.xml:1014
+#: random-bits.xml:1004
 #, no-c-format
 msgid ""
 "The PPPoE connection set up during the installation will also be available "
@@ -2071,7 +2043,7 @@ msgstr ""
 "linkend=\"boot-new\"/>)。"
 
 #. Tag: para
-#: random-bits.xml:1019
+#: random-bits.xml:1009
 #, fuzzy, no-c-format
 #| msgid ""
 #| "To have the option of setting up and using PPPoE during the installation, "
@@ -2088,7 +2060,7 @@ msgstr ""
 "phrase>)。"
 
 #. Tag: para
-#: random-bits.xml:1026
+#: random-bits.xml:1016
 #, no-c-format
 msgid ""
 "Installing over PPPoE is mostly the same as any other installation. The "
@@ -2096,7 +2068,7 @@ msgid ""
 msgstr "通过 PPPoE 进行安装，绝大部分与其他方式相同。下面步骤说明不同之处。"
 
 #. Tag: para
-#: random-bits.xml:1034
+#: random-bits.xml:1024
 #, no-c-format
 msgid ""
 "Boot the installer with the boot parameter <userinput>modules=ppp-udeb</"
@@ -2111,7 +2083,7 @@ msgstr ""
 "udeb</classname>) 会被加载并自动运行。"
 
 #. Tag: para
-#: random-bits.xml:1049
+#: random-bits.xml:1039
 #, no-c-format
 msgid ""
 "Follow the regular initial steps of the installation (language, country and "
@@ -2129,7 +2101,7 @@ msgstr ""
 "footnote>）。"
 
 #. Tag: para
-#: random-bits.xml:1068
+#: random-bits.xml:1058
 #, no-c-format
 msgid ""
 "The next step is the detection of network hardware, in order to identify any "
@@ -2137,7 +2109,7 @@ msgid ""
 msgstr "下一步是探测网络硬件，目的是识别当前系统中的网卡。"
 
 #. Tag: para
-#: random-bits.xml:1074
+#: random-bits.xml:1064
 #, no-c-format
 msgid ""
 "After this the actual setup of PPPoE is started. The installer will probe "
@@ -2148,7 +2120,7 @@ msgstr ""
 "处理 PPPoE 连接的服务器)。"
 
 #. Tag: para
-#: random-bits.xml:1080
+#: random-bits.xml:1070
 #, no-c-format
 msgid ""
 "It is possible that the concentrator will not to be found at the first "
@@ -2162,7 +2134,7 @@ msgstr ""
 "<guimenuitem>Configure and start a PPPoE connection</guimenuitem>。"
 
 #. Tag: para
-#: random-bits.xml:1089
+#: random-bits.xml:1079
 #, no-c-format
 msgid ""
 "After a concentrator is found, the user will be prompted to type the login "
@@ -2170,7 +2142,7 @@ msgid ""
 msgstr "连接找到之后，用户需要提供登录信息（PPPoE 用户名和密码）。"
 
 #. Tag: para
-#: random-bits.xml:1095
+#: random-bits.xml:1085
 #, no-c-format
 msgid ""
 "At this point the installer will use the provided information to establish "
@@ -2186,6 +2158,49 @@ msgstr ""
 "信息不正确或有错误出现，安装程序将停止，但可以选择 <guimenuitem>Configure "
 "and start PPPoE connection</guimenuitem> 菜单项重新配置。"
 
+#~ msgid ""
+#~ "Check <userinput>info grub</userinput> <phrase arch=\"x86\">or "
+#~ "<userinput>man lilo.conf</userinput></phrase> for instructions on setting "
+#~ "up the bootloader. If you are keeping the system you used to install "
+#~ "&debian;, just add an entry for the &debian; install to your existing "
+#~ "grub2 <filename>grub.cfg</filename><phrase arch=\"x86\"> or "
+#~ "<filename>lilo.conf</filename>. For <filename>lilo.conf</filename>, you "
+#~ "could also copy it to the 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; 系统添加一"
+#~ "条配置信息到现有 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>。"
+
+#~ msgid "Here is a basic <filename>/etc/lilo.conf</filename> as an example:"
+#~ msgstr "下面有一个简单的 <filename>/etc/lilo.conf</filename> 作为例子："
+
+#~ msgid ""
+#~ "boot=/dev/<replaceable>sda6</replaceable>\n"
+#~ "root=/dev/<replaceable>sda6</replaceable>\n"
+#~ "install=menu\n"
+#~ "delay=20\n"
+#~ "lba32\n"
+#~ "image=/vmlinuz\n"
+#~ "initrd=/initrd.img\n"
+#~ "label=Debian"
+#~ msgstr ""
+#~ "boot=/dev/<replaceable>sda6</replaceable>\n"
+#~ "root=/dev/<replaceable>sda6</replaceable>\n"
+#~ "install=menu\n"
+#~ "delay=20\n"
+#~ "lba32\n"
+#~ "image=/vmlinuz\n"
+#~ "initrd=/initrd.img\n"
+#~ "label=Debian"
+
 #~ msgid "<filename>fd0</filename>"
 #~ msgstr "<filename>fd0</filename>"