Clean-up - sync translations, where possible

1 files changed, 148 insertions, 165 deletions

diff --git a/po/zh_CN/boot-new.po b/po/zh_CN/boot-new.po
index 33436be4d..921408ceb 100644
--- a/po/zh_CN/boot-new.po
+++ b/po/zh_CN/boot-new.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2020-04-02 09:22+0000\n"
+"POT-Creation-Date: 2022-05-19 22:02+0000\n"
 "PO-Revision-Date: 2021-01-02 14:29+0000\n"
 "Last-Translator: tao wang <tonywang5@163.com>\n"
 "Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
@@ -106,155 +106,13 @@ msgstr ""
 "告。"
 
 #. Tag: title
-#: boot-new.xml:56
-#, no-c-format
-msgid "OldWorld PowerMacs"
-msgstr "旧世界的 PowerMacs"
-
-#. Tag: para
-#: boot-new.xml:57
-#, no-c-format
-msgid ""
-"If the machine fails to boot after completing the installation, and stops "
-"with a <prompt>boot:</prompt> prompt, try typing <userinput>Linux</"
-"userinput> followed by &enterkey;. (The default boot configuration in "
-"<filename>quik.conf</filename> is labeled Linux). The labels defined in "
-"<filename>quik.conf</filename> will be displayed if you press the "
-"<keycap>Tab</keycap> key at the <prompt>boot:</prompt> prompt. You can also "
-"try booting back into the installer, and editing the <filename>/target/etc/"
-"quik.conf</filename> placed there by the <guimenuitem>Install Quik on a Hard "
-"Disk</guimenuitem> step. Clues for dealing with <command>quik</command> are "
-"available at <ulink url=\"&url-powerpc-quik-faq;\"></ulink>."
-msgstr ""
-"如果在完成安装后机器引导失败，并停在 <prompt>boot:</prompt> 提示符，那么请尝"
-"试键入 <userinput>Linux</userinput>，然后按 &enterkey;。（在 <filename>quik."
-"conf</filename> 中的默认引导配置被标为 Linux）。如果在 <prompt>boot:</"
-"prompt> 提示符后按 <keycap>Tab</keycap> 键，那么 <filename>quik.conf</"
-"filename> 中定义的标签会显示出来。也可以尝试引导回到安装程序，并通过 "
-"<guimenuitem>Install Quik on a Hard Disk</guimenuitem> （在硬盘上安装 Quik）"
-"步骤，来编辑放在那里的 <filename>/target/etc/quik.conf</filename>。处理 "
-"<command>quik</command> 的线索可以在 <ulink url=\"&url-powerpc-quik-faq;\"></"
-"ulink> 找到。"
-
-#. Tag: para
-#: boot-new.xml:71
-#, no-c-format
-msgid ""
-"To boot back into MacOS without resetting the nvram, type <userinput>bye</"
-"userinput> at the OpenFirmware prompt (assuming MacOS has not been removed "
-"from the machine). To obtain an OpenFirmware prompt, hold down the "
-"<keycombo> <keycap>command</keycap> <keycap>option</keycap> <keycap>o</"
-"keycap> <keycap>f</keycap> </keycombo> keys while cold booting the machine. "
-"If you need to reset the OpenFirmware nvram changes to the MacOS default in "
-"order to boot back to MacOS, hold down the <keycombo> <keycap>command</"
-"keycap> <keycap>option</keycap> <keycap>p</keycap> <keycap>r</keycap> </"
-"keycombo> keys while cold booting the machine."
-msgstr ""
-"为了引导回 MacOS 而不重设 nvram，需要在 OpenFirmware 提示符下键入 "
-"<userinput>bye</userinput>（假设 MacOS 没有从机器里面删除）。为了得到 "
-"OpenFirmware 提示符，需要在机器冷启动的时候，按住 <keycombo> "
-"<keycap>command</keycap> <keycap>option</keycap> <keycap>o</keycap> "
-"<keycap>f</keycap> </keycombo> 组合键。如果需要重置 OpenFirmware nvram 更改为"
-"默认 MacOS，从而引导回到 MacOS，那么在机器冷启动的时候，按下 <keycombo> "
-"<keycap>command</keycap> <keycap>option</keycap> <keycap>p</keycap> "
-"<keycap>r</keycap> </keycombo> 组合键。"
-
-#. Tag: para
-#: boot-new.xml:84
-#, no-c-format
-msgid ""
-"If you use <command>BootX</command> to boot into the installed system, just "
-"select your desired kernel in the <filename>Linux Kernels</filename> folder, "
-"un-choose the ramdisk option, and add a root device corresponding to your "
-"installation; e.g. <userinput>/dev/sda8</userinput>."
-msgstr ""
-"如果使用 <command>BootX</command> 来引导到安装好的系统，那么只需要选择在 "
-"<filename>Linux Kernels</filename> 文件夹中的所需内核，去掉 ramdisk 选项，并"
-"添加与您安装相应的根设备，例如 <userinput>/dev/sda8</userinput>。"
-
-#. Tag: title
-#: boot-new.xml:96
-#, no-c-format
-msgid "NewWorld PowerMacs"
-msgstr "新世界的 PowerMacs"
-
-#. Tag: para
-#: boot-new.xml:97
-#, no-c-format
-msgid ""
-"On G4 machines and iBooks, you can hold down the <keycap>option</keycap> key "
-"and get a graphical screen with a button for each bootable OS, &debian-gnu; "
-"will be a button with a small penguin icon."
-msgstr ""
-"在 G4 机器和 iBooks 上，可以按住 <keycap>option</keycap> 键，并得到一个图形界"
-"面，上面的每个可启动 OS 对应一个按钮，&debian-gnu; 是一个带有小企鹅图标的按"
-"钮。"
-
-#. Tag: para
-#: boot-new.xml:104
-#, no-c-format
-msgid ""
-"If you kept MacOS and at some point it changes the OpenFirmware <envar>boot-"
-"device</envar> variable you should reset OpenFirmware to its default "
-"configuration. To do this hold down the <keycombo> <keycap>command</keycap> "
-"<keycap>option</keycap> <keycap>p</keycap> <keycap>r</keycap> </keycombo> "
-"keys while cold booting the machine."
-msgstr ""
-"如果保留 MacOS，并且某些时候它修改 OpenFirmware <envar>boot-device</envar> 变"
-"量，那么应该将 OpenFirmware 重置为其默认配置。如果要这样做，那么需要在机器冷"
-"启动的时候按住 <keycombo> <keycap>command</keycap> <keycap>option</keycap> "
-"<keycap>p</keycap> <keycap>r</keycap> </keycombo> 组合键。"
-
-#. Tag: para
-#: boot-new.xml:112
-#, no-c-format
-msgid ""
-"The labels defined in <filename>yaboot.conf</filename> will be displayed if "
-"you press the <keycap>Tab</keycap> key at the <prompt>boot:</prompt> prompt."
-msgstr ""
-"当在 <prompt>boot:</prompt> 提示符下按 <keycap>Tab</keycap> 键时，会显示 "
-"<filename>yaboot.conf</filename> 中定义的标签。"
-
-#. Tag: para
-#: boot-new.xml:118
-#, no-c-format
-msgid ""
-"Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian-"
-"gnu; by default (if you correctly partitioned and placed the Apple_Bootstrap "
-"partition first). If you have &debian-gnu; on a SCSI disk and MacOS on an "
-"IDE disk this may not work and you will have to enter OpenFirmware and set "
-"the <envar>boot-device</envar> variable, <command>ybin</command> normally "
-"does this automatically."
-msgstr ""
-"重置 G3 或 G4 硬件上的 OpenFirmware 将导致默认引导 &debian-gnu;（如果分区正"
-"确，并首先放置了 Apple_Bootstrap 分区的话）。如果将 &debian-gnu; 放在 SCSI 磁"
-"盘，而 MacOS 位于 IDE 磁盘，那么这也许不工作，而您不得不进入 OpenFirmware 并"
-"设置 <envar>boot-device</envar> 变量，<command>ybin</command> 通常会自动完"
-"成。"
-
-#. Tag: para
-#: boot-new.xml:127
-#, no-c-format
-msgid ""
-"After you boot &debian-gnu; for the first time you can add any additional "
-"options you desire (such as dual boot options) to <filename>/etc/yaboot."
-"conf</filename> and run <command>ybin</command> to update your boot "
-"partition with the changed configuration. Please read the <ulink url=\"&url-"
-"powerpc-yaboot-faq;\">yaboot HOWTO</ulink> for more information."
-msgstr ""
-"在首次引导 &debian-gnu; 后，可以将想要的额外选项（如双启动选项）添加到 "
-"<filename>/etc/yaboot.conf</filename> 中，并运行 <command>ybin</command>，以"
-"修改过的配置来更新引导分区。更多信息请阅读 <ulink url=\"&url-powerpc-yaboot-"
-"faq;\">yaboot HOWTO</ulink>。"
-
-#. Tag: title
-#: boot-new.xml:145
+#: boot-new.xml:150
 #, no-c-format
 msgid "Mounting encrypted volumes"
 msgstr "挂载加密的卷"
 
 #. Tag: para
-#: boot-new.xml:147
+#: boot-new.xml:152
 #, no-c-format
 msgid ""
 "If you created encrypted volumes during the installation and assigned them "
@@ -265,7 +123,7 @@ msgstr ""
 "这样的卷输入密码。"
 
 #. Tag: para
-#: boot-new.xml:155
+#: boot-new.xml:160
 #, no-c-format
 msgid ""
 "For partitions encrypted using dm-crypt you will be shown the following "
@@ -303,7 +161,7 @@ msgstr ""
 "filename> 和 <filename>/etc/fstab</filename> 里面找到它。"
 
 #. Tag: para
-#: boot-new.xml:178
+#: boot-new.xml:183
 #, no-c-format
 msgid ""
 "The prompt may look somewhat different when an encrypted root file system is "
@@ -316,7 +174,7 @@ msgstr ""
 "<classname>initramfs-tools</classname> 来生成 initrd："
 
 #. Tag: screen
-#: boot-new.xml:185
+#: boot-new.xml:190
 #, no-c-format
 msgid ""
 "Begin: Mounting <emphasis>root file system</emphasis>... ...\n"
@@ -328,7 +186,7 @@ msgstr ""
 "Enter LUKS passphrase:"
 
 #. Tag: para
-#: boot-new.xml:187
+#: boot-new.xml:192
 #, no-c-format
 msgid ""
 "No characters (even asterisks) will be shown while entering the passphrase. "
@@ -342,19 +200,19 @@ msgstr ""
 "见 <xref linkend=\"crypto-troubleshooting\"/>。"
 
 #. Tag: para
-#: boot-new.xml:195
+#: boot-new.xml:200
 #, no-c-format
 msgid "After entering all passphrases the boot should continue as usual."
 msgstr "在输入所有密码之后，引导过程应该像通常一样继续。"
 
 #. Tag: title
-#: boot-new.xml:202
+#: boot-new.xml:207
 #, no-c-format
 msgid "Troubleshooting"
 msgstr "故障处理"
 
 #. Tag: para
-#: boot-new.xml:204
+#: boot-new.xml:209
 #, no-c-format
 msgid ""
 "If some of the encrypted volumes could not be mounted because a wrong "
@@ -365,7 +223,7 @@ msgstr ""
 "种情况。"
 
 #. Tag: para
-#: boot-new.xml:213
+#: boot-new.xml:218
 #, no-c-format
 msgid ""
 "The first case concerns the root partition. When it is not mounted "
@@ -376,7 +234,7 @@ msgstr ""
 "计算机并再次尝试。"
 
 #. Tag: para
-#: boot-new.xml:220
+#: boot-new.xml:225
 #, no-c-format
 msgid ""
 "The easiest case is for encrypted volumes holding data like <filename>/home</"
@@ -387,7 +245,7 @@ msgstr ""
 "filename> 数据的加密的卷。引导后可以简单地手动挂载它们。"
 
 #. Tag: para
-#: boot-new.xml:226
+#: boot-new.xml:231
 #, no-c-format
 msgid ""
 "However for dm-crypt this is a bit tricky. First you need to register the "
@@ -410,7 +268,7 @@ msgstr ""
 "以后，就可以按一般的方式来挂载这些卷了："
 
 #. Tag: screen
-#: boot-new.xml:241
+#: boot-new.xml:246
 #, no-c-format
 msgid ""
 "<prompt>#</prompt> <userinput>mount <replaceable>/mount_point</replaceable></"
@@ -420,7 +278,7 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: boot-new.xml:244
+#: boot-new.xml:249
 #, no-c-format
 msgid ""
 "If any volume holding noncritical system files could not be mounted "
@@ -436,13 +294,13 @@ msgstr ""
 "可能没有启动。最简单的做法只是重新引导计算机。"
 
 #. Tag: title
-#: boot-new.xml:262
+#: boot-new.xml:267
 #, no-c-format
 msgid "Log In"
 msgstr "登录"
 
 #. Tag: para
-#: boot-new.xml:264
+#: boot-new.xml:269
 #, no-c-format
 msgid ""
 "Once your system boots, you'll be presented with the login prompt. Log in "
@@ -453,7 +311,7 @@ msgstr ""
 "录。现在系统就能使用了。"
 
 #. Tag: para
-#: boot-new.xml:270
+#: boot-new.xml:275
 #, no-c-format
 msgid ""
 "If you are a new user, you may want to explore the documentation which is "
@@ -465,7 +323,7 @@ msgstr ""
 "统，而将不同类型文档集成的工作仍在继续。这里是一些起点。"
 
 #. Tag: para
-#: boot-new.xml:278
+#: boot-new.xml:283
 #, no-c-format
 msgid ""
 "Documentation accompanying programs you have installed can be found in "
@@ -484,7 +342,7 @@ msgstr ""
 "<classname>apt-doc</classname> 或 <classname>apt-howto</classname> 软件包内。"
 
 #. Tag: para
-#: boot-new.xml:289
+#: boot-new.xml:294
 #, no-c-format
 msgid ""
 "In addition, there are some special folders within the <filename>/usr/share/"
@@ -501,7 +359,7 @@ msgstr ""
 "索引。"
 
 #. Tag: para
-#: boot-new.xml:298
+#: boot-new.xml:303
 #, no-c-format
 msgid ""
 "One easy way to view these documents using a text based browser is to enter "
@@ -519,7 +377,7 @@ msgstr ""
 "当前目录的内容。"
 
 #. Tag: para
-#: boot-new.xml:308
+#: boot-new.xml:313
 #, no-c-format
 msgid ""
 "If you have a graphical desktop environment installed, you can also use its "
@@ -530,7 +388,7 @@ msgstr ""
 "web 浏览器，并在地址栏内键入 <userinput>/usr/share/doc/</userinput>。"
 
 #. Tag: para
-#: boot-new.xml:314
+#: boot-new.xml:319
 #, no-c-format
 msgid ""
 "You can also type <userinput>info <replaceable>command</replaceable></"
@@ -552,6 +410,131 @@ msgstr ""
 "&nbsp;more</userinput>，则可以在滚动超出屏幕顶部之前将结果暂停。要查看以某字"
 "母开始的所有可用命令的列表，则键入该字母，然后按两次 tab 按键。"
 
+#, no-c-format
+#~ msgid "OldWorld PowerMacs"
+#~ msgstr "旧世界的 PowerMacs"
+
+#, no-c-format
+#~ msgid ""
+#~ "If the machine fails to boot after completing the installation, and stops "
+#~ "with a <prompt>boot:</prompt> prompt, try typing <userinput>Linux</"
+#~ "userinput> followed by &enterkey;. (The default boot configuration in "
+#~ "<filename>quik.conf</filename> is labeled Linux). The labels defined in "
+#~ "<filename>quik.conf</filename> will be displayed if you press the "
+#~ "<keycap>Tab</keycap> key at the <prompt>boot:</prompt> prompt. You can "
+#~ "also try booting back into the installer, and editing the <filename>/"
+#~ "target/etc/quik.conf</filename> placed there by the <guimenuitem>Install "
+#~ "Quik on a Hard Disk</guimenuitem> step. Clues for dealing with "
+#~ "<command>quik</command> are available at <ulink url=\"&url-powerpc-quik-"
+#~ "faq;\"></ulink>."
+#~ msgstr ""
+#~ "如果在完成安装后机器引导失败，并停在 <prompt>boot:</prompt> 提示符，那么请"
+#~ "尝试键入 <userinput>Linux</userinput>，然后按 &enterkey;。（在 "
+#~ "<filename>quik.conf</filename> 中的默认引导配置被标为 Linux）。如果在 "
+#~ "<prompt>boot:</prompt> 提示符后按 <keycap>Tab</keycap> 键，那么 "
+#~ "<filename>quik.conf</filename> 中定义的标签会显示出来。也可以尝试引导回到"
+#~ "安装程序，并通过 <guimenuitem>Install Quik on a Hard Disk</guimenuitem> "
+#~ "（在硬盘上安装 Quik）步骤，来编辑放在那里的 <filename>/target/etc/quik."
+#~ "conf</filename>。处理 <command>quik</command> 的线索可以在 <ulink url="
+#~ "\"&url-powerpc-quik-faq;\"></ulink> 找到。"
+
+#, no-c-format
+#~ msgid ""
+#~ "To boot back into MacOS without resetting the nvram, type <userinput>bye</"
+#~ "userinput> at the OpenFirmware prompt (assuming MacOS has not been "
+#~ "removed from the machine). To obtain an OpenFirmware prompt, hold down "
+#~ "the <keycombo> <keycap>command</keycap> <keycap>option</keycap> "
+#~ "<keycap>o</keycap> <keycap>f</keycap> </keycombo> keys while cold booting "
+#~ "the machine. If you need to reset the OpenFirmware nvram changes to the "
+#~ "MacOS default in order to boot back to MacOS, hold down the <keycombo> "
+#~ "<keycap>command</keycap> <keycap>option</keycap> <keycap>p</keycap> "
+#~ "<keycap>r</keycap> </keycombo> keys while cold booting the machine."
+#~ msgstr ""
+#~ "为了引导回 MacOS 而不重设 nvram，需要在 OpenFirmware 提示符下键入 "
+#~ "<userinput>bye</userinput>（假设 MacOS 没有从机器里面删除）。为了得到 "
+#~ "OpenFirmware 提示符，需要在机器冷启动的时候，按住 <keycombo> "
+#~ "<keycap>command</keycap> <keycap>option</keycap> <keycap>o</keycap> "
+#~ "<keycap>f</keycap> </keycombo> 组合键。如果需要重置 OpenFirmware nvram 更"
+#~ "改为默认 MacOS，从而引导回到 MacOS，那么在机器冷启动的时候，按下 "
+#~ "<keycombo> <keycap>command</keycap> <keycap>option</keycap> <keycap>p</"
+#~ "keycap> <keycap>r</keycap> </keycombo> 组合键。"
+
+#, no-c-format
+#~ msgid ""
+#~ "If you use <command>BootX</command> to boot into the installed system, "
+#~ "just select your desired kernel in the <filename>Linux Kernels</filename> "
+#~ "folder, un-choose the ramdisk option, and add a root device corresponding "
+#~ "to your installation; e.g. <userinput>/dev/sda8</userinput>."
+#~ msgstr ""
+#~ "如果使用 <command>BootX</command> 来引导到安装好的系统，那么只需要选择在 "
+#~ "<filename>Linux Kernels</filename> 文件夹中的所需内核，去掉 ramdisk 选项，"
+#~ "并添加与您安装相应的根设备，例如 <userinput>/dev/sda8</userinput>。"
+
+#, no-c-format
+#~ msgid "NewWorld PowerMacs"
+#~ msgstr "新世界的 PowerMacs"
+
+#, no-c-format
+#~ msgid ""
+#~ "On G4 machines and iBooks, you can hold down the <keycap>option</keycap> "
+#~ "key and get a graphical screen with a button for each bootable OS, "
+#~ "&debian-gnu; will be a button with a small penguin icon."
+#~ msgstr ""
+#~ "在 G4 机器和 iBooks 上，可以按住 <keycap>option</keycap> 键，并得到一个图"
+#~ "形界面，上面的每个可启动 OS 对应一个按钮，&debian-gnu; 是一个带有小企鹅图"
+#~ "标的按钮。"
+
+#, no-c-format
+#~ msgid ""
+#~ "If you kept MacOS and at some point it changes the OpenFirmware "
+#~ "<envar>boot-device</envar> variable you should reset OpenFirmware to its "
+#~ "default configuration. To do this hold down the <keycombo> "
+#~ "<keycap>command</keycap> <keycap>option</keycap> <keycap>p</keycap> "
+#~ "<keycap>r</keycap> </keycombo> keys while cold booting the machine."
+#~ msgstr ""
+#~ "如果保留 MacOS，并且某些时候它修改 OpenFirmware <envar>boot-device</"
+#~ "envar> 变量，那么应该将 OpenFirmware 重置为其默认配置。如果要这样做，那么"
+#~ "需要在机器冷启动的时候按住 <keycombo> <keycap>command</keycap> "
+#~ "<keycap>option</keycap> <keycap>p</keycap> <keycap>r</keycap> </keycombo> "
+#~ "组合键。"
+
+#, no-c-format
+#~ msgid ""
+#~ "The labels defined in <filename>yaboot.conf</filename> will be displayed "
+#~ "if you press the <keycap>Tab</keycap> key at the <prompt>boot:</prompt> "
+#~ "prompt."
+#~ msgstr ""
+#~ "当在 <prompt>boot:</prompt> 提示符下按 <keycap>Tab</keycap> 键时，会显示 "
+#~ "<filename>yaboot.conf</filename> 中定义的标签。"
+
+#, no-c-format
+#~ msgid ""
+#~ "Resetting OpenFirmware on G3 or G4 hardware will cause it to boot &debian-"
+#~ "gnu; by default (if you correctly partitioned and placed the "
+#~ "Apple_Bootstrap partition first). If you have &debian-gnu; on a SCSI disk "
+#~ "and MacOS on an IDE disk this may not work and you will have to enter "
+#~ "OpenFirmware and set the <envar>boot-device</envar> variable, "
+#~ "<command>ybin</command> normally does this automatically."
+#~ msgstr ""
+#~ "重置 G3 或 G4 硬件上的 OpenFirmware 将导致默认引导 &debian-gnu;（如果分区"
+#~ "正确，并首先放置了 Apple_Bootstrap 分区的话）。如果将 &debian-gnu; 放在 "
+#~ "SCSI 磁盘，而 MacOS 位于 IDE 磁盘，那么这也许不工作，而您不得不进入 "
+#~ "OpenFirmware 并设置 <envar>boot-device</envar> 变量，<command>ybin</"
+#~ "command> 通常会自动完成。"
+
+#, no-c-format
+#~ msgid ""
+#~ "After you boot &debian-gnu; for the first time you can add any additional "
+#~ "options you desire (such as dual boot options) to <filename>/etc/yaboot."
+#~ "conf</filename> and run <command>ybin</command> to update your boot "
+#~ "partition with the changed configuration. Please read the <ulink url="
+#~ "\"&url-powerpc-yaboot-faq;\">yaboot HOWTO</ulink> for more information."
+#~ msgstr ""
+#~ "在首次引导 &debian-gnu; 后，可以将想要的额外选项（如双启动选项）添加到 "
+#~ "<filename>/etc/yaboot.conf</filename> 中，并运行 <command>ybin</command>，"
+#~ "以修改过的配置来更新引导分区。更多信息请阅读 <ulink url=\"&url-powerpc-"
+#~ "yaboot-faq;\">yaboot HOWTO</ulink>。"
+
 #~ msgid "dm-crypt"
 #~ msgstr "dm-crypt"