summaryrefslogtreecommitdiff
path: root/po/zh_CN
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN')
-rw-r--r--po/zh_CN/installation-howto.po22
-rw-r--r--po/zh_CN/partitioning.po26
-rw-r--r--po/zh_CN/preparing.po260
-rw-r--r--po/zh_CN/random-bits.po16
-rw-r--r--po/zh_CN/using-d-i.po17
5 files changed, 201 insertions, 140 deletions
diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index e2c21a2f1..3efd65d52 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.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: 2022-05-19 22:02+0000\n"
+"POT-Creation-Date: 2023-08-04 23:04+0000\n"
"PO-Revision-Date: 2020-10-19 08:55+0000\n"
"Last-Translator: tao wang <tonywang5@163.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
@@ -402,13 +402,19 @@ msgstr ""
#. Tag: para
#: installation-howto.xml:244
-#, no-c-format
-msgid ""
-"If you have an existing DOS or Windows partition that you want to preserve, "
-"be very careful with automatic partitioning. If you choose manual "
-"partitioning, you can use the installer to resize existing FAT or NTFS "
-"partitions to create room for the &debian; install: simply select the "
-"partition and specify its new size."
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you have an existing DOS or Windows partition that you want to "
+#| "preserve, be very careful with automatic partitioning. If you choose "
+#| "manual partitioning, you can use the installer to resize existing FAT or "
+#| "NTFS partitions to create room for the &debian; install: simply select "
+#| "the partition and specify its new size."
+msgid ""
+"If you have an existing Windows partition that you want to preserve, be very "
+"careful with automatic partitioning. If you choose manual partitioning, you "
+"can use the installer to resize existing FAT or NTFS partitions to create "
+"room for the &debian; install: simply select the partition and specify its "
+"new size."
msgstr ""
"如果您有一个 DOS 或 Windows 分区并想保留它,要小心使用自动分区。如果选择手动"
"分区,可以使用安装程序重新设置 FAT 或 NTFS 分区的大小,分给 &debian; 更多的安"
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index eae88a6e0..08998a201 100644
--- a/po/zh_CN/partitioning.po
+++ b/po/zh_CN/partitioning.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: 2023-02-26 23:04+0000\n"
+"POT-Creation-Date: 2023-08-04 23:04+0000\n"
"PO-Revision-Date: 2023-03-15 14:41+0000\n"
"Last-Translator: Wenbin Lv <wenbin816@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -852,15 +852,23 @@ msgstr ""
#. Tag: para
#: partitioning.xml:529
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you have an existing other operating system such as DOS or Windows and "
+#| "you want to preserve that operating system while installing &debian;, you "
+#| "may need to resize its partition to free up space for the &debian; "
+#| "installation. The installer supports resizing of both FAT and NTFS "
+#| "filesystems; when you get to the installer's partitioning step, select "
+#| "the option <guimenuitem>Manual</guimenuitem> and then simply select an "
+#| "existing partition and change its size."
msgid ""
-"If you have an existing other operating system such as DOS or Windows and "
-"you want to preserve that operating system while installing &debian;, you "
-"may need to resize its partition to free up space for the &debian; "
-"installation. The installer supports resizing of both FAT and NTFS "
-"filesystems; when you get to the installer's partitioning step, select the "
-"option <guimenuitem>Manual</guimenuitem> and then simply select an existing "
-"partition and change its size."
+"If you have an existing other operating system such as Windows and you want "
+"to preserve that operating system while installing &debian;, you may need to "
+"resize its partition to free up space for the &debian; installation. The "
+"installer supports resizing of both FAT and NTFS filesystems; when you get "
+"to the installer's partitioning step, select the option <guimenuitem>Manual</"
+"guimenuitem> and then simply select an existing partition and change its "
+"size."
msgstr ""
"如果您已经有 DOS 或 Windows 这样的其他操作系统存在,并想在安装 &debian; 时保"
"留它们,应该重新设置分区大小,释放空间给 &debian; 安装程序。安装程序支持修改 "
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index aa39e4cd1..561172ca5 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2023-03-24 21:18+0000\n"
+"POT-Creation-Date: 2023-08-04 23:04+0000\n"
"PO-Revision-Date: 2021-12-15 18:22+0000\n"
"Last-Translator: 吕文彬 <wenbin816@gmail.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
@@ -825,11 +825,18 @@ msgstr ""
#. Tag: para
#: preparing.xml:576
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "On Windows systems, the IDs for a device can be found in the Windows "
+#| "device manager on the tab <quote>details</quote>, where the vendor ID is "
+#| "prefixed with VEN_ and the product ID is prefixed with DEV_. On Windows 7 "
+#| "systems, you have to select the property <quote>Hardware IDs</quote> in "
+#| "the device manager's details tab to actually see the IDs, as they are not "
+#| "displayed by default."
msgid ""
"On Windows systems, the IDs for a device can be found in the Windows device "
"manager on the tab <quote>details</quote>, where the vendor ID is prefixed "
-"with VEN_ and the product ID is prefixed with DEV_. On Windows 7 systems, "
+"with VEN_ and the product ID is prefixed with DEV_. On Windows 7/10 systems, "
"you have to select the property <quote>Hardware IDs</quote> in the device "
"manager's details tab to actually see the IDs, as they are not displayed by "
"default."
@@ -1263,17 +1270,26 @@ msgstr ""
#. Tag: para
#: preparing.xml:865
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "If you already have an operating system on your system <phrase arch=\"any-"
+#| "x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, "
+#| "Solaris, FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, "
+#| "OS/390, &hellip;) </phrase> which uses the whole disk and you want to "
+#| "stick &debian; on the same disk, you will need to repartition it. "
+#| "&debian; requires its own hard disk partitions. It cannot be installed on "
+#| "Windows or Mac OS X partitions. It may be able to share some partitions "
+#| "with other Unix systems, but that's not covered here. At the very least "
+#| "you will need a dedicated partition for the &debian; root filesystem."
msgid ""
"If you already have an operating system on your system <phrase arch=\"any-"
-"x86\"> (Windows 9x, Windows NT/2000/XP/2003/Vista/7, OS/2, MacOS, Solaris, "
-"FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
-"&hellip;) </phrase> which uses the whole disk and you want to stick &debian; "
-"on the same disk, you will need to repartition it. &debian; requires its own "
-"hard disk partitions. It cannot be installed on Windows or Mac OS X "
-"partitions. It may be able to share some partitions with other Unix systems, "
-"but that's not covered here. At the very least you will need a dedicated "
-"partition for the &debian; root filesystem."
+"x86\"> (Windows, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </phrase> <phrase "
+"arch=\"s390\"> (VM, z/OS, OS/390, &hellip;) </phrase> which uses the whole "
+"disk and you want to stick &debian; on the same disk, you will need to "
+"repartition it. &debian; requires its own hard disk partitions. It cannot be "
+"installed on Windows or Mac OS X partitions. It may be able to share some "
+"partitions with other Unix systems, but that's not covered here. At the very "
+"least you will need a dedicated partition for the &debian; root filesystem."
msgstr ""
"如果在您的机器中已经安装有操作系统<phrase arch=\"x86\"> (Windows 9x、Windows "
"NT/2000/XP/2003/Vista/7、OS/2、MacOS、Solaris、FreeBSD,&hellip;) </phrase> "
@@ -1285,15 +1301,23 @@ msgstr ""
#. Tag: para
#: preparing.xml:884
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "You can find information about your current partition setup by using a "
+#| "partitioning tool for your current operating system<phrase arch=\"any-"
+#| "x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
+#| "phrase><phrase arch=\"powerpc\">, such as Disk Utility, Drive Setup, HD "
+#| "Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as the VM "
+#| "diskmap</phrase>. Partitioning tools always provide a way to show "
+#| "existing partitions without making changes."
msgid ""
"You can find information about your current partition setup by using a "
"partitioning tool for your current operating system<phrase arch=\"any-"
-"x86\">, such as the integrated Disk Manager in Windows or fdisk in DOS</"
-"phrase><phrase arch=\"powerpc\">, such as Disk Utility, Drive Setup, HD "
-"Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as the VM diskmap</"
-"phrase>. Partitioning tools always provide a way to show existing partitions "
-"without making changes."
+"x86\">, such as the integrated Disk Manager in Windows</phrase><phrase arch="
+"\"powerpc\">, such as Disk Utility, Drive Setup, HD Toolkit, or MacTools</"
+"phrase><phrase arch=\"s390\">, such as the VM diskmap</phrase>. Partitioning "
+"tools always provide a way to show existing partitions without making "
+"changes."
msgstr ""
"通过当前的操作系统中的分区工具,您可以获知现在的分区状况<phrase arch=\"any-"
"x86\">,如 Windows 系统中的磁盘管理器或 DOS 下的 fdisk</phrase><phrase arch="
@@ -1302,7 +1326,7 @@ msgstr ""
"情况,而不作任何改动。"
#. Tag: para
-#: preparing.xml:894
+#: preparing.xml:893
#, no-c-format
msgid ""
"In general, changing a partition with a file system already on it will "
@@ -1316,8 +1340,18 @@ msgstr ""
"最好在把挡路的家具都移开,否则就要冒家具被毁坏的危险。"
#. Tag: para
-#: preparing.xml:902
-#, no-c-format
+#: preparing.xml:901
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Several modern operating systems offer the ability to move and resize "
+#| "certain existing partitions without destroying their contents. This "
+#| "allows making space for additional partitions without losing existing "
+#| "data. Even though this works quite well in most cases, making changes to "
+#| "the partitioning of a disk is an inherently dangerous action and should "
+#| "only be done after having made a full backup of all data. <phrase arch="
+#| "\"any-x86\">For FAT/FAT32 and NTFS partitions as used by DOS and Windows "
+#| "systems, the ability to move and resize them losslessly is provided both "
+#| "by &d-i; as well as by the integrated Disk Manager of Windows 7. </phrase>"
msgid ""
"Several modern operating systems offer the ability to move and resize "
"certain existing partitions without destroying their contents. This allows "
@@ -1325,9 +1359,9 @@ msgid ""
"though this works quite well in most cases, making changes to the "
"partitioning of a disk is an inherently dangerous action and should only be "
"done after having made a full backup of all data. <phrase arch=\"any-"
-"x86\">For FAT/FAT32 and NTFS partitions as used by DOS and Windows systems, "
-"the ability to move and resize them losslessly is provided both by &d-i; as "
-"well as by the integrated Disk Manager of Windows 7. </phrase>"
+"x86\">For FAT/FAT32 and NTFS partitions as used by Windows systems, the "
+"ability to move and resize them losslessly is provided both by &d-i; as well "
+"as by the integrated Disk Manager of Windows.</phrase>"
msgstr ""
"很多新的操作系统都提供无损移动和调节已有分区的功能。使得在不丢失任何数据的情"
"况下就能添加分区空间。即使大多时候都可以正常使用,由于修改分区本身就是危险操"
@@ -1336,7 +1370,7 @@ msgstr ""
"盘管理器都提供。</phrase>"
#. Tag: para
-#: preparing.xml:917
+#: preparing.xml:915
#, no-c-format
msgid ""
"To losslessly resize an existing FAT or NTFS partition from within &d-i;, go "
@@ -1347,13 +1381,13 @@ msgstr ""
"分区选项,再选择修改大小,然后指定新尺寸。"
#. Tag: title
-#: preparing.xml:990
+#: preparing.xml:988
#, no-c-format
msgid "Pre-Installation Hardware and Operating System Setup"
msgstr "安装前的硬件和操作系统的相关设置"
#. Tag: para
-#: preparing.xml:991
+#: preparing.xml:989
#, no-c-format
msgid ""
"This section will walk you through pre-installation hardware setup, if any, "
@@ -1370,13 +1404,13 @@ msgstr ""
"件。它在系统引导过程(即开机之后)中起到了至关重要的作用。"
#. Tag: title
-#: preparing.xml:1006
+#: preparing.xml:1004
#, no-c-format
msgid "Invoking the BIOS/UEFI Set-Up Menu"
msgstr "BIOS/UEFI 设置菜单的使用"
#. Tag: para
-#: preparing.xml:1008
+#: preparing.xml:1006
#, no-c-format
msgid ""
"The BIOS/UEFI provides the basic functions needed to boot your machine and "
@@ -1396,13 +1430,13 @@ msgstr ""
# index.docbook:1522, index.docbook:1865
#. Tag: title
-#: preparing.xml:1022 preparing.xml:1447
+#: preparing.xml:1020 preparing.xml:1445
#, no-c-format
msgid "Boot Device Selection"
msgstr "选择引导设备"
#. Tag: para
-#: preparing.xml:1024
+#: preparing.xml:1022
#, no-c-format
msgid ""
"Within the BIOS/UEFI setup menu, you can select which devices shall be "
@@ -1416,7 +1450,7 @@ msgstr ""
"新的系统上还可能会有使用 PXE 打开网络引导。"
#. Tag: para
-#: preparing.xml:1032
+#: preparing.xml:1030
#, no-c-format
msgid ""
"Depending on the installation media (CD/DVD ROM, USB stick, network boot) "
@@ -1427,7 +1461,7 @@ msgstr ""
"引导设备。"
#. Tag: para
-#: preparing.xml:1038
+#: preparing.xml:1036
#, no-c-format
msgid ""
"Most BIOS/UEFI versions allow you to call up a boot menu on system startup "
@@ -1449,7 +1483,7 @@ msgstr ""
"一次,而将内置硬盘作为主引导设备。"
#. Tag: para
-#: preparing.xml:1052
+#: preparing.xml:1050
#, no-c-format
msgid ""
"If your BIOS/UEFI does not provide you with a boot menu to do ad-hoc choices "
@@ -1460,7 +1494,7 @@ msgstr ""
"中将 &d-i; 设备设为主引导设备。"
#. Tag: para
-#: preparing.xml:1058
+#: preparing.xml:1056
#, no-c-format
msgid ""
"Unfortunately some computers may contain buggy BIOS/UEFI versions. Booting "
@@ -1487,7 +1521,7 @@ msgstr ""
"您会需要配置您的 BIOS/UEFI,来允许<quote>USB 旧版支持</quote>。"
#. Tag: para
-#: preparing.xml:1074
+#: preparing.xml:1072
#, no-c-format
msgid ""
"If you cannot manipulate the BIOS/UEFI to boot directly from a USB stick you "
@@ -1501,13 +1535,13 @@ msgstr ""
"安装程序 ISO 映像后,选择 USB 设备并选择安装映像。"
#. Tag: title
-#: preparing.xml:1140
+#: preparing.xml:1138
#, no-c-format
msgid "How to update bare metal ppc64el firmware"
msgstr "如何更新 ppc64el 裸机固件"
#. Tag: para
-#: preparing.xml:1141
+#: preparing.xml:1139
#, no-c-format
msgid ""
"This is an excerpt from <ulink url=\"&url-ibm-powerkvm;\">IBM PowerKVM on "
@@ -1517,7 +1551,7 @@ msgstr ""
"IBM POWER8</ulink>。"
#. Tag: para
-#: preparing.xml:1146
+#: preparing.xml:1144
#, no-c-format
msgid ""
"Open Power Abstraction Layer (OPAL) is the system firmware in the stack of "
@@ -1525,7 +1559,7 @@ msgid ""
msgstr "开放 Power 抽象层(OPAL)是基于 POWER 处理器的服务器的系统固件。"
#. Tag: para
-#: preparing.xml:1151
+#: preparing.xml:1149
#, no-c-format
msgid ""
"There may be instances when the user might have to upgrade the Power Systems "
@@ -1536,31 +1570,31 @@ msgstr ""
"时,可能会出现这种情况。"
#. Tag: para
-#: preparing.xml:1157
+#: preparing.xml:1155
#, no-c-format
msgid "Make sure that the following requirements are met:"
msgstr "确保满足以下要求:"
#. Tag: para
-#: preparing.xml:1162
+#: preparing.xml:1160
#, no-c-format
msgid "an OS to be running on the system;"
msgstr "系统上运行有操作系统;"
#. Tag: para
-#: preparing.xml:1164
+#: preparing.xml:1162
#, no-c-format
msgid "the .img file of the OPAL level that the user needs to update to;"
msgstr "用户将要更新到 OPAL 级别的 .img 文件;"
#. Tag: para
-#: preparing.xml:1166
+#: preparing.xml:1164
#, no-c-format
msgid "the machine isn't under HMC control."
msgstr "机器不在 HMC 控制下。"
#. Tag: para
-#: preparing.xml:1170
+#: preparing.xml:1168
#, no-c-format
msgid ""
"Power Systems has two sides of flash to boot firmware from, namely permanent "
@@ -1572,13 +1606,13 @@ msgstr ""
"一侧前,这提供了在临时侧测试更新固件的方法,然后再提交新的更新。"
#. Tag: para
-#: preparing.xml:1177
+#: preparing.xml:1175
#, no-c-format
msgid "Perform the following steps for the update:"
msgstr "执行以下更新步骤:"
#. Tag: para
-#: preparing.xml:1182
+#: preparing.xml:1180
#, no-c-format
msgid ""
"Save the level of the existing firmware before really updating. In ASM, in "
@@ -1589,13 +1623,13 @@ msgstr ""
"Aids -&gt; Service Processor Command Line</command>,并运行以下命令:"
#. Tag: screen
-#: preparing.xml:1186
+#: preparing.xml:1184
#, no-c-format
msgid "cupdcmd -f"
msgstr "cupdcmd -f"
#. Tag: para
-#: preparing.xml:1187
+#: preparing.xml:1185
#, no-c-format
msgid ""
"Download the .img file of the level of firmware to be updated to a location "
@@ -1606,7 +1640,7 @@ msgstr ""
"url=\"&url-ibm-fixcentral;\">IBM Fix Central</ulink> 下载映像文件。"
#. Tag: para
-#: preparing.xml:1192
+#: preparing.xml:1190
#, no-c-format
msgid ""
"Verify the image downloaded by running the following command and save the "
@@ -1614,38 +1648,38 @@ msgid ""
msgstr "运行下列命令验证下载的映像,并保存其输出。"
#. Tag: screen
-#: preparing.xml:1195
+#: preparing.xml:1193
#, no-c-format
msgid "$update_flash -v -f &lt;file_name.img&gt;"
msgstr "$update_flash -v -f &lt;file_name.img&gt;"
#. Tag: para
-#: preparing.xml:1197
+#: preparing.xml:1195
#, no-c-format
msgid "Update the firmware by running the following command."
msgstr "运行以下命令更新固件。"
#. Tag: screen
-#: preparing.xml:1199
+#: preparing.xml:1197
#, no-c-format
msgid "$update_flash -f &lt;file_name.img&gt;"
msgstr "$update_flash -f &lt;file_name.img&gt;"
#. Tag: para
-#: preparing.xml:1205
+#: preparing.xml:1203
#, no-c-format
msgid ""
"The command reboots the system and therefore, sessions if any, would be lost."
msgstr "该命令重启系统,因此,会话(如果有的话)将丢失。"
#. Tag: para
-#: preparing.xml:1208
+#: preparing.xml:1206
#, no-c-format
msgid "Do not reboot or switch off the system until it is back."
msgstr "不要重新启动或关闭系统,直到完成。"
#. Tag: para
-#: preparing.xml:1215
+#: preparing.xml:1213
#, no-c-format
msgid ""
"Verify the updated firmware level of the temporary side of the flash as in "
@@ -1653,7 +1687,7 @@ msgid ""
msgstr "验证闪存临时侧的更新固件级别,如步骤1所示。"
#. Tag: para
-#: preparing.xml:1218
+#: preparing.xml:1216
#, no-c-format
msgid ""
"In case the update has to be reverted, the user can do so by running this "
@@ -1670,7 +1704,7 @@ msgstr ""
"后,才能向永久侧提交。"
#. Tag: para
-#: preparing.xml:1225
+#: preparing.xml:1223
#, no-c-format
msgid ""
"The new updated level can be committed to the permanent side of the flash by "
@@ -1678,19 +1712,19 @@ msgid ""
msgstr "可以运行以下命令将新的更新级别提交到永久侧的闪存。"
#. Tag: screen
-#: preparing.xml:1228
+#: preparing.xml:1226
#, no-c-format
msgid "$update_flash -c"
msgstr "$update_flash -c"
#. Tag: title
-#: preparing.xml:1236
+#: preparing.xml:1234
#, no-c-format
msgid "Updating KVM guest firmware (SLOF)"
msgstr "更新 KVM 客户机固件(SLOF)"
#. Tag: para
-#: preparing.xml:1237
+#: preparing.xml:1235
#, no-c-format
msgid ""
"Slimline Open Firmware (SLOF) is an implementation of the IEEE 1275 "
@@ -1701,7 +1735,7 @@ msgstr ""
"KVM 上运行的 pSeries 机器的分区固件。"
#. Tag: para
-#: preparing.xml:1244
+#: preparing.xml:1242
#, no-c-format
msgid ""
"The package qemu-slof is, in fact, a dependency of package qemu-system-ppc "
@@ -1723,7 +1757,7 @@ msgstr ""
"SLOF\"></ulink> 中找到。"
#. Tag: para
-#: preparing.xml:1259
+#: preparing.xml:1257
#, no-c-format
msgid ""
"Thus, one can use a different SLOF file rather than the default, when "
@@ -1734,19 +1768,19 @@ msgstr ""
"&lt;slof_file&gt; </userinput>,可以使用不同的 SLOF 文件,而不是默认值。"
#. Tag: title
-#: preparing.xml:1269
+#: preparing.xml:1267
#, no-c-format
msgid "Updating PowerKVM hypervisor"
msgstr "更新 PowerKVM 管理程序"
#. Tag: title
-#: preparing.xml:1270
+#: preparing.xml:1268
#, no-c-format
msgid "Instructions for Netboot installation"
msgstr "Netboot 安装说明"
#. Tag: para
-#: preparing.xml:1271
+#: preparing.xml:1269
#, no-c-format
msgid ""
"You will need a DHCP/TFTP (BOOTP) server, as well as a web server. After "
@@ -1807,13 +1841,13 @@ msgstr ""
"</screen></informalexample>重启 dhcp 服务器。"
#. Tag: para
-#: preparing.xml:1295
+#: preparing.xml:1293
#, no-c-format
msgid "Boot your PowerLinux machine."
msgstr "启动您的 PowerLinux 机器。"
#. Tag: para
-#: preparing.xml:1299
+#: preparing.xml:1297
#, no-c-format
msgid ""
"There should be the following option at petitboot (select it): "
@@ -1826,13 +1860,13 @@ msgstr ""
"</screen></informalexample>安装程序菜单应该会自动显示。"
#. Tag: title
-#: preparing.xml:1310
+#: preparing.xml:1308
#, no-c-format
msgid "Instructions for DVD"
msgstr "DVD 说明"
#. Tag: para
-#: preparing.xml:1311
+#: preparing.xml:1309
#, no-c-format
msgid ""
"Boot the ISO ibm-powerkvm-*-ppc64-service-*.iso (either burn a DVD or make "
@@ -1842,7 +1876,7 @@ msgstr ""
"后只需等待启动完成。"
#. Tag: para
-#: preparing.xml:1314
+#: preparing.xml:1312
#, no-c-format
msgid ""
"There should be the following option at petitboot (select it): "
@@ -1855,13 +1889,13 @@ msgstr ""
"</screen></informalexample>安装程序菜单应该会自动显示。"
#. Tag: title
-#: preparing.xml:1335
+#: preparing.xml:1333
#, no-c-format
msgid "BIOS Setup"
msgstr "BIOS 设置"
#. Tag: para
-#: preparing.xml:1336
+#: preparing.xml:1334
#, no-c-format
msgid ""
"In order to install &debian-gnu; on a &arch-title; or zSeries machine you "
@@ -1880,7 +1914,7 @@ msgstr ""
"因于该系统上的 3215/3270 控制台是线型,而不是字符型的。"
#. Tag: para
-#: preparing.xml:1348
+#: preparing.xml:1346
#, no-c-format
msgid ""
"Linux on this platform runs either natively on the bare machine, in a so-"
@@ -1897,7 +1931,7 @@ msgstr ""
"上的 HMC 启动。"
#. Tag: para
-#: preparing.xml:1357
+#: preparing.xml:1355
#, no-c-format
msgid ""
"Before you actually perform an installation, you have to go over some design "
@@ -1918,13 +1952,13 @@ msgstr ""
"回到本文档查看 &debian; 规格的安装步骤。"
#. Tag: title
-#: preparing.xml:1374
+#: preparing.xml:1372
#, no-c-format
msgid "Native and LPAR installations"
msgstr "本地化(Native)和 LPAR 安装"
#. Tag: para
-#: preparing.xml:1375
+#: preparing.xml:1373
#, no-c-format
msgid ""
"Please refer to chapter 5 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -1940,13 +1974,13 @@ msgstr ""
"如何为 Linux 建立 LPAR 的部分。"
#. Tag: title
-#: preparing.xml:1389
+#: preparing.xml:1387
#, no-c-format
msgid "Installation as a VM guest"
msgstr "作为一个 VM guest 安装"
#. Tag: para
-#: preparing.xml:1391
+#: preparing.xml:1389
#, no-c-format
msgid ""
"Please refer to chapter 6 of the <ulink url=\"http://www.redbooks.ibm.com/"
@@ -1962,7 +1996,7 @@ msgstr ""
"如何为运行 Linux 建立 VM guest 的部分。"
#. Tag: para
-#: preparing.xml:1401
+#: preparing.xml:1399
#, no-c-format
msgid ""
"You need to copy all the files from the <filename>generic</filename> sub-"
@@ -1982,13 +2016,13 @@ msgstr ""
"<filename>debian.exec</filename> 示例脚本,用于按正确次序存放文件。"
#. Tag: title
-#: preparing.xml:1418
+#: preparing.xml:1416
#, no-c-format
msgid "Setting up an installation server"
msgstr "建立安装服务器"
#. Tag: para
-#: preparing.xml:1420
+#: preparing.xml:1418
#, no-c-format
msgid ""
"If you don't have a connection to the Internet (either directly or via a web "
@@ -2001,7 +2035,7 @@ msgstr ""
"HTTP 或 FTP 访问。"
#. Tag: para
-#: preparing.xml:1428
+#: preparing.xml:1426
#, no-c-format
msgid ""
"The installation server needs to copy the exact directory structure from any "
@@ -2013,19 +2047,19 @@ msgstr ""
"些独立于体系的文件。您也可以复制所有的安装映像到这样的目录树中。"
#. Tag: emphasis
-#: preparing.xml:1437
+#: preparing.xml:1435
#, no-c-format
msgid "FIXME: more information needed &mdash; from a Redbook?"
msgstr "FIXME: more information needed &mdash; from a Redbook?"
#. Tag: title
-#: preparing.xml:1454
+#: preparing.xml:1452
#, no-c-format
msgid "ARM firmware"
msgstr "ARM 固件"
#. Tag: para
-#: preparing.xml:1456
+#: preparing.xml:1454
#, no-c-format
msgid ""
"As already mentioned before, there is unfortunately no standard for system "
@@ -2045,7 +2079,7 @@ msgstr ""
"成到较新版本的原始固件中。"
#. Tag: para
-#: preparing.xml:1468
+#: preparing.xml:1466
#, no-c-format
msgid ""
"As a result even newly sold systems often use a firmware that is based on a "
@@ -2063,13 +2097,13 @@ msgstr ""
"不可能为基于ARM的系统提供可用的产品无关指令。"
#. Tag: title
-#: preparing.xml:1481
+#: preparing.xml:1479
#, no-c-format
msgid "Debian-provided U-Boot (system firmware) images"
msgstr "Debian 提供的 U-Boot(系统固件)映像"
#. Tag: para
-#: preparing.xml:1482
+#: preparing.xml:1480
#, no-c-format
msgid ""
"Debian provides U-Boot images for various armhf systems that can load their "
@@ -2092,7 +2126,7 @@ msgstr ""
"入到SD卡将擦除所有之前的内容!"
#. Tag: para
-#: preparing.xml:1497
+#: preparing.xml:1495
#, no-c-format
msgid ""
"If Debian provides a U-Boot image for your system, it is recommended that "
@@ -2103,13 +2137,13 @@ msgstr ""
"Boot,因为 Debian 中的版本通常较新,并且具有更多功能。"
#. Tag: title
-#: preparing.xml:1505
+#: preparing.xml:1503
#, no-c-format
msgid "Setting the ethernet MAC address in U-Boot"
msgstr "在 U-Boot 中设置以太网 MAC 地址"
#. Tag: para
-#: preparing.xml:1506
+#: preparing.xml:1504
#, no-c-format
msgid ""
"The MAC address of every ethernet interface should normally be globally "
@@ -2123,7 +2157,7 @@ msgstr ""
"(必须支付费用),并且为每个出售的商品从这些地址中选择其一,并预先配置上去。"
#. Tag: para
-#: preparing.xml:1514
+#: preparing.xml:1512
#, no-c-format
msgid ""
"In the case of development boards, sometimes the manufacturer wants to avoid "
@@ -2143,7 +2177,7 @@ msgstr ""
"态 IP 地址的 DHCP 显然不能可靠地工作。"
#. Tag: para
-#: preparing.xml:1525
+#: preparing.xml:1523
#, no-c-format
msgid ""
"To avoid conflicts with existing officially-assigned MAC addresses, there is "
@@ -2160,7 +2194,7 @@ msgstr ""
"制 ca 开头的任何地址(如 ca:ff:ee:12:34:56)都可以用作本地管理的地址。"
#. Tag: para
-#: preparing.xml:1535
+#: preparing.xml:1533
#, no-c-format
msgid ""
"On systems using U-Boot as system firmware, the ethernet MAC address is "
@@ -2176,13 +2210,13 @@ msgstr ""
"值后,命令 <quote>saveenv</quote> 可长久赋值。"
#. Tag: title
-#: preparing.xml:1546
+#: preparing.xml:1544
#, no-c-format
msgid "Kernel/Initrd/Device-Tree relocation issues in U-Boot"
msgstr "U-Boot 中的内核/Initrd/设备树的重定位问题"
#. Tag: para
-#: preparing.xml:1547
+#: preparing.xml:1545
#, no-c-format
msgid ""
"On some systems with older U-Boot versions there can be problems with "
@@ -2198,7 +2232,7 @@ msgstr ""
"v2014.07 更新的 U-Boot 版本上得到了解决。"
#. Tag: para
-#: preparing.xml:1556
+#: preparing.xml:1554
#, no-c-format
msgid ""
"If the system has originally used a U-Boot version older than v2014.07 and "
@@ -2219,7 +2253,7 @@ msgstr ""
"的默认值。"
#. Tag: para
-#: preparing.xml:1567
+#: preparing.xml:1565
#, no-c-format
msgid ""
"Another possibility to circumvent relocation-related problems is to run the "
@@ -2232,13 +2266,13 @@ msgstr ""
"始化内存盘和设备树 blob 重定位。"
#. Tag: title
-#: preparing.xml:1577
+#: preparing.xml:1575
#, no-c-format
msgid "Systems with UEFI firmware"
msgstr "具有 UEFI 固件的系统"
#. Tag: para
-#: preparing.xml:1578
+#: preparing.xml:1576
#, no-c-format
msgid ""
"UEFI (<quote>Unified Extensible Firmware Interface</quote>) is a new kind of "
@@ -2249,7 +2283,7 @@ msgstr ""
"统,并且 - 与其他用途一起 - 旨在取代传统的 PC BIOS。"
#. Tag: para
-#: preparing.xml:1584
+#: preparing.xml:1582
#, no-c-format
msgid ""
"Currently most PC systems that use UEFI also have a so-called "
@@ -2266,7 +2300,7 @@ msgstr ""
"BIOS,而不会完全向后兼容,并且已经有很多具有 UEFI 但没有 CSM 的系统。"
#. Tag: para
-#: preparing.xml:1594
+#: preparing.xml:1592
#, no-c-format
msgid ""
"On systems with UEFI there are a few things to take into consideration when "
@@ -2300,7 +2334,7 @@ msgstr ""
"载程序。"
#. Tag: para
-#: preparing.xml:1614
+#: preparing.xml:1612
#, no-c-format
msgid ""
"The latter becomes important when booting &d-i; on a UEFI system with CSM "
@@ -2327,13 +2361,13 @@ msgstr ""
"生 UEFI 模式下进行。"
#. Tag: title
-#: preparing.xml:1633
+#: preparing.xml:1631
#, no-c-format
msgid "Secure boot"
msgstr "安全引导"
#. Tag: para
-#: preparing.xml:1634
+#: preparing.xml:1632
#, no-c-format
msgid ""
"Another UEFI-related topic is the so-called <quote>secure boot</quote> "
@@ -2354,7 +2388,7 @@ msgstr ""
"统上正常工作。"
#. Tag: title
-#: preparing.xml:1649
+#: preparing.xml:1647
#, no-c-format
msgid ""
"Disabling the Windows <quote>fast boot</quote>/<quote>fast startup</quote> "
@@ -2362,7 +2396,7 @@ msgid ""
msgstr "禁用 Windows 的<quote>快速引导</quote>/<quote>快速启动</quote>功能"
#. Tag: para
-#: preparing.xml:1650
+#: preparing.xml:1648
#, no-c-format
msgid ""
"Windows offers a feature (called <quote>fast boot</quote> in Windows 8, "
@@ -2392,7 +2426,7 @@ msgstr ""
"quote>功能。"
#. Tag: para
-#: preparing.xml:1667
+#: preparing.xml:1665
#, no-c-format
msgid ""
"Furthermore, the Windows Update mechanism has (sometimes) been known to "
@@ -2403,7 +2437,7 @@ msgstr ""
"闭了。建议定期再次检查这个设置。"
#. Tag: para
-#: preparing.xml:1672
+#: preparing.xml:1670
#, no-c-format
msgid ""
"It may also be necessary to disable <quote>fast boot</quote> to even allow "
@@ -2419,19 +2453,19 @@ msgstr ""
"用此功能,以允许更改引导顺序。"
#. Tag: title
-#: preparing.xml:1684
+#: preparing.xml:1682
#, no-c-format
msgid "Hardware Issues to Watch Out For"
msgstr "需要留心的硬件问题"
#. Tag: title
-#: preparing.xml:1687
+#: preparing.xml:1685
#, no-c-format
msgid "USB BIOS support and keyboards"
msgstr "USB BIOS 支持与键盘"
#. Tag: para
-#: preparing.xml:1688
+#: preparing.xml:1686
#, no-c-format
msgid ""
"If you have no PS/2-style keyboard, but only a USB model, on some very old "
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 9f3cb1b85..0d09b25b3 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.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: 2022-05-19 22:02+0000\n"
+"POT-Creation-Date: 2023-08-04 23:04+0000\n"
"PO-Revision-Date: 2020-11-10 04:28+0000\n"
"Last-Translator: tao wang <tonywang5@163.com>\n"
"Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
@@ -127,8 +127,8 @@ msgstr "ttyS0"
#. Tag: entry
#: random-bits.xml:54
#, no-c-format
-msgid "Serial port 0, COM1 under MS-DOS"
-msgstr "串口 0,即 MS-DOS 下的 COM1"
+msgid "Serial port 0, also referred to as COM1"
+msgstr ""
#. Tag: filename
#: random-bits.xml:56
@@ -139,8 +139,8 @@ msgstr "ttyS1"
#. Tag: entry
#: random-bits.xml:57
#, no-c-format
-msgid "Serial port 1, COM2 under MS-DOS"
-msgstr "串口 1,即 MS-DOS 下的 COM2"
+msgid "Serial port 1, also referred to as COM2"
+msgstr ""
#. Tag: filename
#: random-bits.xml:59
@@ -1937,6 +1937,12 @@ msgstr ""
"信息不正确或有错误出现,安装程序将停止,但可以选择 <guimenuitem>Configure "
"and start PPPoE connection</guimenuitem> 菜单项重新配置。"
+#~ msgid "Serial port 0, COM1 under MS-DOS"
+#~ msgstr "串口 0,即 MS-DOS 下的 COM1"
+
+#~ msgid "Serial port 1, COM2 under MS-DOS"
+#~ msgstr "串口 1,即 MS-DOS 下的 COM2"
+
#~ msgid ""
#~ "Modern kernels give you the capability to emulate a three-button mouse "
#~ "when your mouse only has one button. Just add the following lines to "
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 22d8693f5..6295789d5 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: d-i-manual\n"
"Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2023-05-12 23:04+0000\n"
+"POT-Creation-Date: 2023-08-04 23:04+0000\n"
"PO-Revision-Date: 2023-05-17 09:51+0000\n"
"Last-Translator: Wenbin Lv <wenbin816@gmail.com>\n"
"Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -4143,14 +4143,21 @@ msgstr ""
#. Tag: para
#: using-d-i.xml:2795
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "In expert mode you will always be able to choose whether or not the clock "
+#| "is set to UTC. <phrase arch=\"powerpc\">Macintosh hardware clocks are "
+#| "normally set to local time. If you want to dual-boot, select local time "
+#| "instead of UTC.</phrase> <phrase arch=\"any-x86\">Systems that (also) run "
+#| "Dos or Windows are normally set to local time. If you want to dual-boot, "
+#| "select local time instead of UTC.</phrase>"
msgid ""
"In expert mode you will always be able to choose whether or not the clock is "
"set to UTC. <phrase arch=\"powerpc\">Macintosh hardware clocks are normally "
"set to local time. If you want to dual-boot, select local time instead of "
-"UTC.</phrase> <phrase arch=\"any-x86\">Systems that (also) run Dos or "
-"Windows are normally set to local time. If you want to dual-boot, select "
-"local time instead of UTC.</phrase>"
+"UTC.</phrase> <phrase arch=\"any-x86\">Systems that (also) run Windows are "
+"normally set to local time. If you want to dual-boot, select local time "
+"instead of UTC.</phrase>"
msgstr ""
"在 expert 模式下,您总是可以选择时钟是否设为 UTC。<phrase arch=\"powerpc"
"\">Macintosh 硬件时钟一般设为本地时间。如果您需要多重引导,请选择本地时间而不"