[SILENT_COMMIT] Update of POT and PO files for the installation-guide

4 files changed, 196 insertions, 78 deletions

diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 2834184a9..f5a3ea0d3 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -1035,9 +1035,10 @@ msgid ""
 "Orion chip. &debian; currently supports the following Orion based devices: "
 "<ulink url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</ulink>."
 msgstr ""
-"Orion 是 Marvell 的 SoC 产品，集成了 ARM CPU、Ethernet、SATA、USB，以及其他一些功能。市场上有很多 NAS "
-"设备基于 Orion 芯片。&debian; 目前支持以下几种基于 Orion 的设备：<ulink url=\"&url-arm-cyrius-"
-"kuroboxpro;\">Buffalo Kurobox</ulink> 。"
+"Orion 是 Marvell 的 SoC 产品，集成了 ARM CPU、Ethernet、SATA、USB，以及其他一"
+"些功能。市场上有很多 NAS 设备基于 Orion 芯片。&debian; 目前支持以下几种基于 "
+"Orion 的设备：<ulink url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</"
+"ulink> 。"
 
 #. Tag: term
 #: hardware.xml:712
@@ -1069,7 +1070,8 @@ msgid ""
 "&debian; 11, since the Linux kernel for them can no longer being built, due "
 "to hardware limitations."
 msgstr ""
-"&debian; 11 不再支持任何 QNAP Turbo Station 型号（TS-xxx），因为受硬件限制，已经无法构建其使用的 Linux 内核。"
+"&debian; 11 不再支持任何 QNAP Turbo Station 型号（TS-xxx），因为受硬件限制，"
+"已经无法构建其使用的 Linux 内核。"
 
 #. Tag: para
 #: hardware.xml:743
@@ -1078,7 +1080,9 @@ msgid ""
 "Support for HP Media Vault mv2120 has been dropped for &debian; 11, since "
 "the Linux kernel for it can no longer being built, due to hardware "
 "limitations."
-msgstr "&debian; 11 不再支持 HP Media Vault mv2120，因为受硬件限制，已经无法构建其使用的 Linux 内核。"
+msgstr ""
+"&debian; 11 不再支持 HP Media Vault mv2120，因为受硬件限制，已经无法构建其使"
+"用的 Linux 内核。"
 
 #. Tag: sect2
 #: hardware.xml:751
@@ -1089,9 +1093,9 @@ msgid ""
 "information#no-longer-supported-hardware\">the Release Notes for &debian; "
 "11</ulink>."
 msgstr ""
-"您可能可以使以上列出的设备继续运行一段时间，参见 <ulink url=\"https://www.debian.org/releases/"
-"bullseye/armel/release-notes/ch-information#no-longer-supported-hardware\""
-">&debian; 11 的发行说明</ulink>。"
+"您可能可以使以上列出的设备继续运行一段时间，参见 <ulink url=\"https://www."
+"debian.org/releases/bullseye/armel/release-notes/ch-information#no-longer-"
+"supported-hardware\">&debian; 11 的发行说明</ulink>。"
 
 # 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
@@ -2336,10 +2340,10 @@ msgid ""
 "additional <quote>firmware</quote> blobs (see <xref linkend=\"hardware-"
 "firmware\"/>)."
 msgstr ""
-"&debian; 能支持的显卡取决于底层的 X.Org 的 X11 系统以及内核的支持。基本的 framebuffer 由内核提供，而桌面环境使用 "
-"X11。至于高级的显卡功能，比如 3D "
-"硬件加速或硬件视频加速是否可用，由系统所使用的具体显示硬件和所要安装的额外<quote>固件(firmware)</quote>决定(参阅<xref "
-"linkend=\"hardware-firmware\"/>)。"
+"&debian; 能支持的显卡取决于底层的 X.Org 的 X11 系统以及内核的支持。基本的 "
+"framebuffer 由内核提供，而桌面环境使用 X11。至于高级的显卡功能，比如 3D 硬件"
+"加速或硬件视频加速是否可用，由系统所使用的具体显示硬件和所要安装的额外<quote>"
+"固件(firmware)</quote>决定(参阅<xref linkend=\"hardware-firmware\"/>)。"
 
 #. Tag: para
 #: hardware.xml:1639
@@ -2352,8 +2356,9 @@ msgid ""
 "of additional graphics card firmware was required even for basic graphics "
 "support."
 msgstr ""
-"对于现代的 PC 而言，图形显示器通常不需配置即可工作。对于许多硬件而言，3D "
-"加速也通常不需配置即可工作，但仍有一些硬件需要固件才可工作。一些情况下，甚至有基本的图形支持也需要安装额外的显卡固件的报告。"
+"对于现代的 PC 而言，图形显示器通常不需配置即可工作。对于许多硬件而言，3D 加速"
+"也通常不需配置即可工作，但仍有一些硬件需要固件才可工作。一些情况下，甚至有基"
+"本的图形支持也需要安装额外的显卡固件的报告。"
 
 #. Tag: para
 #: hardware.xml:1649
@@ -2787,9 +2792,9 @@ msgid ""
 "example some USB devices and even some hard disk controllers also require "
 "firmware."
 msgstr ""
-"除了需要设备驱动程序，有些硬件还要在使用之前加载 <firstterm>固件(firmware)</firstterm> 或 "
-"<firstterm>微码(microcode)</firstterm>。这对于网卡(特别是无线网卡)来说很常见，但有些 USB "
-"设备甚至是硬盘控制器也需要加载固件。"
+"除了需要设备驱动程序，有些硬件还要在使用之前加载 <firstterm>固件(firmware)</"
+"firstterm> 或 <firstterm>微码(microcode)</firstterm>。这对于网卡(特别是无线网"
+"卡)来说很常见，但有些 USB 设备甚至是硬盘控制器也需要加载固件。"
 
 #. Tag: para
 #: hardware.xml:1954
@@ -2803,8 +2808,10 @@ msgid ""
 "workarounds can be tried to log in anyway (see <xref linkend=\"completing-"
 "installed-system\"/>)."
 msgstr ""
-"对于很多显卡而言，基本功能不需要额外固件即可使用，但高级特性则需要系统装有合适的固件文件。有些情况下，一次成功的安装仍可能在重启后黑屏或出现显示错误。如果"
-"发生这种情况，可以采取一些临时措施以登录系统（参见<xref linkend=\"completing-installed-system\"/>）。"
+"对于很多显卡而言，基本功能不需要额外固件即可使用，但高级特性则需要系统装有合"
+"适的固件文件。有些情况下，一次成功的安装仍可能在重启后黑屏或出现显示错误。如"
+"果发生这种情况，可以采取一些临时措施以登录系统（参见<xref linkend="
+"\"completing-installed-system\"/>）。"
 
 #. Tag: para
 #: hardware.xml:1965
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index c624782ff..40a0d625a 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.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: 2021-04-14 23:02+0000\n"
+"POT-Creation-Date: 2021-09-11 23:02+0000\n"
 "PO-Revision-Date: 2021-08-18 09:32+0000\n"
 "Last-Translator: 吕文彬 <wenbin816@gmail.com>\n"
 "Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
@@ -2527,8 +2527,45 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:1067
-#, no-c-format
-msgid ""
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# You can choose to install non-free and contrib software.\n"
+#| "#d-i apt-setup/non-free boolean true\n"
+#| "#d-i apt-setup/contrib boolean true\n"
+#| "# Uncomment this if you don't want to use a network mirror.\n"
+#| "#d-i apt-setup/use_mirror boolean false\n"
+#| "# Select which update services to use; define the mirrors to be used.\n"
+#| "# Values shown below are the normal defaults.\n"
+#| "#d-i apt-setup/services-select multiselect security, updates\n"
+#| "#d-i apt-setup/security_host string security.debian.org\n"
+#| "\n"
+#| "# Additional repositories, local[0-9] available\n"
+#| "#d-i apt-setup/local0/repository string \\\n"
+#| "#       http://local.server/debian stable main\n"
+#| "#d-i apt-setup/local0/comment string local server\n"
+#| "# Enable deb-src lines\n"
+#| "#d-i apt-setup/local0/source boolean true\n"
+#| "# URL to the public key of the local repository; you must provide a key "
+#| "or\n"
+#| "# apt will complain about the unauthenticated repository and so the\n"
+#| "# sources.list line will be left commented out.\n"
+#| "#d-i apt-setup/local0/key string http://local.server/key\n"
+#| "# If the provided key file ends in \".asc\" the key file needs to be an\n"
+#| "# ASCII-armoured PGP key, if it ends in \".gpg\" it needs to use the\n"
+#| "# \"GPG key public keyring\" format, the \"keybox database\" format is\n"
+#| "# currently not supported.\n"
+#| "\n"
+#| "# By default the installer requires that repositories be authenticated\n"
+#| "# using a known gpg key. This setting can be used to disable that\n"
+#| "# authentication. Warning: Insecure, not recommended.\n"
+#| "#d-i debian-installer/allow_unauthenticated boolean true\n"
+#| "\n"
+#| "# Uncomment this to add multiarch configuration for i386\n"
+#| "#d-i apt-setup/multiarch string i386"
+msgid ""
+"# Choose, if you want to scan additional installation media\n"
+"# (default: false).\n"
+"d-i apt-setup/cdrom/set-first boolean false\n"
 "# You can choose to install non-free and contrib software.\n"
 "#d-i apt-setup/non-free boolean true\n"
 "#d-i apt-setup/contrib boolean true\n"
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 8965743b1..cf502b0c3 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2021-08-15 23:02+0000\n"
+"POT-Creation-Date: 2021-09-11 23:02+0000\n"
 "PO-Revision-Date: 2021-08-28 07:33+0000\n"
 "Last-Translator: 吕文彬 <wenbin816@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -3820,13 +3820,15 @@ msgid ""
 "package you are looking for. </para> </footnote>. <xref linkend=\"tasksel-"
 "size-list\"/> lists the space requirements for the available tasks."
 msgstr ""
-"任务松散地代表了您要在计算机上从事的一系列工作，比如<quote>桌面环境</quote>、<quote>Web 服务器</"
-"quote>或者<quote>SSH 服务器</quote><footnote> <para> 您应该知道，呈现这个列表，安装程序仅仅是执行 "
-"<command>tasksel</command> 程序。它可以在安装之后的任何时间安装(或删除)其他软件包，或者使用更精致的工具，例如 "
-"<command>aptitude</command>。如果您需要一个特定的软件包，在安装之后，只须执行 <userinput>aptitude "
-"install <replaceable>package</replaceable></userinput>，其中 "
-"<replaceable>package</replaceable> 是您需要的软件包名。</para> </footnote>。<xref "
-"linkend=\"tasksel-size-list\"/> 列出了各种任务所需的空间。"
+"任务松散地代表了您要在计算机上从事的一系列工作，比如<quote>桌面环境</quote>、"
+"<quote>Web 服务器</quote>或者<quote>SSH 服务器</quote><footnote> <para> 您应"
+"该知道，呈现这个列表，安装程序仅仅是执行 <command>tasksel</command> 程序。它"
+"可以在安装之后的任何时间安装(或删除)其他软件包，或者使用更精致的工具，例如 "
+"<command>aptitude</command>。如果您需要一个特定的软件包，在安装之后，只须执"
+"行 <userinput>aptitude install <replaceable>package</replaceable></"
+"userinput>，其中 <replaceable>package</replaceable> 是您需要的软件包名。</"
+"para> </footnote>。<xref linkend=\"tasksel-size-list\"/> 列出了各种任务所需的"
+"空间。"
 
 #. Tag: para
 #: using-d-i.xml:2564
@@ -3894,8 +3896,8 @@ msgid ""
 "server: <classname>apache2</classname>; SSH server: <classname>openssh</"
 "classname>."
 msgstr ""
-"各种服务器任务大致安装的软件如下。Web 服务器：<classname>apache2</classname>；SSH 服务器： "
-"<classname>openssh</classname>。"
+"各种服务器任务大致安装的软件如下。Web 服务器：<classname>apache2</"
+"classname>；SSH 服务器： <classname>openssh</classname>。"
 
 #. Tag: para
 #: using-d-i.xml:2606
@@ -5150,8 +5152,9 @@ msgid ""
 "black screen or a garbled display when rebooting into the installed system. "
 "When that happens, the following workarounds can be tried:"
 msgstr ""
-"取决于安装方式，可能有某些必需的固件在安装时没有检测到，对应的固件不可用，或者您当时选择不安装某些固件。有些情况下，一次成功的安装仍然可能在重启后黑屏或者"
-"出现显示错误。如果出现这种情况，可以尝试以下的临时解决办法："
+"取决于安装方式，可能有某些必需的固件在安装时没有检测到，对应的固件不可用，或"
+"者您当时选择不安装某些固件。有些情况下，一次成功的安装仍然可能在重启后黑屏或"
+"者出现显示错误。如果出现这种情况，可以尝试以下的临时解决办法："
 
 #. Tag: para
 #: using-d-i.xml:3526
@@ -5160,8 +5163,8 @@ msgid ""
 "Pass the <code>nomodeset</code> option on the kernel command line. This "
 "might help boot into a <quote>fallback graphics</quote> mode."
 msgstr ""
-"在内核命令行中添加 <code>nomodeset</code>。这可能可以帮助系统进入到<quote>fallback "
-"graphics</quote>模式。"
+"在内核命令行中添加 <code>nomodeset</code>。这可能可以帮助系统进入到"
+"<quote>fallback graphics</quote>模式。"
 
 #. Tag: para
 #: using-d-i.xml:3530
@@ -5181,7 +5184,9 @@ msgid ""
 "Once logged in into the installed system, it is possible to automate the "
 "detection of missing firmware, and to perform the required steps to enable "
 "them following this procedure:"
-msgstr "一旦登录进了已安装的系统，遵循以下步骤可能可以自动检测缺失的固件，并启用它们："
+msgstr ""
+"一旦登录进了已安装的系统，遵循以下步骤可能可以自动检测缺失的固件，并启用它"
+"们："
 
 #. Tag: para
 #: using-d-i.xml:3543
@@ -5196,7 +5201,8 @@ msgid ""
 "Run the <command>isenkram-autoinstall-firmware</command> command as the "
 "<quote>root</quote> user."
 msgstr ""
-"以<quote>root</quote>用户运行 <command>isenkram-autoinstall-firmware</command> 命令。"
+"以<quote>root</quote>用户运行 <command>isenkram-autoinstall-firmware</"
+"command> 命令。"
 
 #. Tag: para
 #: using-d-i.xml:3549
@@ -5206,8 +5212,8 @@ msgid ""
 "properly initialized; that's particularly important when one has booted the "
 "system with the <code>nomodeset</code> option as an interim measure."
 msgstr ""
-"通常，重启是保证各个内核模块已经正确初始化的最简单的方法；这在使用 <code>nomodeset</code> "
-"参数作为临时措施以启动系统的情况下尤为重要。"
+"通常，重启是保证各个内核模块已经正确初始化的最简单的方法；这在使用 "
+"<code>nomodeset</code> 参数作为临时措施以启动系统的情况下尤为重要。"
 
 #. Tag: para
 #: using-d-i.xml:3556
@@ -5220,9 +5226,43 @@ msgid ""
 "d/isenkram-autoinstall-firmware.list</filename>), pointing at a generic "
 "mirror."
 msgstr ""
-"安装固件软件包很可能需要启用软件仓库的 non-free 区。截至 &debian-gnu; 11.0，运行 <command>isenkram-"
-"autoinstall-firmware</command> 命令会自动完成该工作，这是通过创建一个指向通用镜像的专门文件（<filename>/etc/"
-"apt/sources.list.d/isenkram-autoinstall-firmware.list</filename>）实现的。"
+"安装固件软件包很可能需要启用软件仓库的 non-free 区。截至 &debian-gnu; 11.0，"
+"运行 <command>isenkram-autoinstall-firmware</command> 命令会自动完成该工作，"
+"这是通过创建一个指向通用镜像的专门文件（<filename>/etc/apt/sources.list.d/"
+"isenkram-autoinstall-firmware.list</filename>）实现的。"
+
+#. Tag: title
+#: using-d-i.xml:3575
+#, no-c-format
+msgid "Customization"
+msgstr ""
+
+#. Tag: para
+#: using-d-i.xml:3576
+#, no-c-format
+msgid ""
+"Using the shell (see <xref linkend=\"shell\"/>), the installation process "
+"can be carefully customized, to fit exceptional use cases:"
+msgstr ""
+
+#. Tag: title
+#: using-d-i.xml:3581
+#, fuzzy, no-c-format
+#| msgid "Installing the Base System"
+msgid "Installing an alternative init system"
+msgstr "安装基本系统"
+
+#. Tag: para
+#: using-d-i.xml:3582
+#, no-c-format
+msgid ""
+"&debian; uses systemd as its default init system. However, other init "
+"systems (such as sysvinit and OpenRC) are supported, and the easiest time to "
+"select an alternative init system is during the installation process. For "
+"detailed instructions on how to do so, please see the <ulink url=\"https://"
+"wiki.debian.org/Init#Changing_the_init_system_-_at_installation_time\">Init "
+"page on the Debian wiki</ulink>."
+msgstr ""
 
 #~ msgid "Install the <command>LILO</command> Boot Loader on a Hard Disk"
 #~ msgstr "硬盘上 <command>LILO</command> Boot Loader 的安装"
diff --git a/po/zh_CN/welcome.po b/po/zh_CN/welcome.po
index d8abd95b2..8754197fb 100644
--- a/po/zh_CN/welcome.po
+++ b/po/zh_CN/welcome.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: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2021-09-11 23:02+0000\n"
 "PO-Revision-Date: 2020-08-28 12:22+0000\n"
 "Last-Translator: tao wang <tonywang5@163.com>\n"
 "Language-Team: <debian-l10n-chinese@lists.debian.org>\n"
@@ -183,9 +183,12 @@ msgstr "什么是 GNU/Linux？"
 
 #. Tag: para
 #: welcome.xml:124
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Linux is an operating system: a series of programs that let you interact "
+#| "with your computer and run other programs."
 msgid ""
-"Linux is an operating system: a series of programs that let you interact "
+"GNU/Linux is an operating system: a series of programs that let you interact "
 "with your computer and run other programs."
 msgstr ""
 "Linux 是一种计算机操作系统：一系列能让您与计算机进行交互操作并运行其它程序的"
@@ -215,14 +218,21 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:143
-#, no-c-format
-msgid ""
-"Linux is modelled on the Unix operating system. From the start, Linux was "
-"designed to be a multi-tasking, multi-user system. These facts are enough to "
-"make Linux different from other well-known operating systems. However, Linux "
-"is even more different than you might imagine. In contrast to other "
-"operating systems, nobody owns Linux. Much of its development is done by "
-"unpaid volunteers."
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Linux is modelled on the Unix operating system. From the start, Linux was "
+#| "designed to be a multi-tasking, multi-user system. These facts are enough "
+#| "to make Linux different from other well-known operating systems. However, "
+#| "Linux is even more different than you might imagine. In contrast to other "
+#| "operating systems, nobody owns Linux. Much of its development is done by "
+#| "unpaid volunteers."
+msgid ""
+"GNU/Linux is modelled on the Unix operating system. From the start, GNU/"
+"Linux was designed to be a multi-tasking, multi-user system. These facts are "
+"enough to make GNU/Linux different from other well-known operating systems. "
+"However, GNU/Linux is even more different than you might imagine. In "
+"contrast to other operating systems, nobody owns GNU/Linux. Much of its "
+"development is done by unpaid volunteers."
 msgstr ""
 "Linux 是以 Unix 操作系统为原型创造的。自从诞生之日起，它就被设计成一种多任"
 "务、多用户的系统。这些特点使 Linux 完全不同于其它著名的操作系统。事实上，"
@@ -242,14 +252,21 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:158
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a "
+#| "comprehensive set of free software tools for use with Unix&trade; and "
+#| "Unix-like operating systems such as Linux. These tools enable users to "
+#| "perform tasks ranging from the mundane (such as copying or removing files "
+#| "from the system) to the arcane (such as writing and compiling programs or "
+#| "doing sophisticated editing in a variety of document formats)."
 msgid ""
 "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a "
 "comprehensive set of free software tools for use with Unix&trade; and Unix-"
-"like operating systems such as Linux. These tools enable users to perform "
-"tasks ranging from the mundane (such as copying or removing files from the "
-"system) to the arcane (such as writing and compiling programs or doing "
-"sophisticated editing in a variety of document formats)."
+"like operating systems such as GNU/Linux. These tools enable users to "
+"perform tasks ranging from the mundane (such as copying or removing files "
+"from the system) to the arcane (such as writing and compiling programs or "
+"doing sophisticated editing in a variety of document formats)."
 msgstr ""
 "<ulink url=\"&url-gnu;\">GNU 工程</ulink> 开发了大量用于 Unix&trade; 的自由软"
 "件工具和类 Unix 操作系统，例如 Linux。这些工具使用户能执行从日常俗事(例如在系"
@@ -258,12 +275,17 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:168
-#, no-c-format
-msgid ""
-"While many groups and individuals have contributed to Linux, the largest "
+#, fuzzy, no-c-format
+#| msgid ""
+#| "While many groups and individuals have contributed to Linux, the largest "
+#| "single contributor is still the Free Software Foundation, which created "
+#| "not only most of the tools used in Linux, but also the philosophy and the "
+#| "community that made Linux possible."
+msgid ""
+"While many groups and individuals have contributed to GNU/Linux, the largest "
 "single contributor is still the Free Software Foundation, which created not "
-"only most of the tools used in Linux, but also the philosophy and the "
-"community that made Linux possible."
+"only most of the tools used in GNU/Linux, but also the philosophy and the "
+"community that made GNU/Linux possible."
 msgstr ""
 "虽然有许多组织和个人都对 Linux 的发展作出了帮助，但是自由软件基金会依然是最大"
 "的单个贡献者。他不仅仅创造了绝大部分在 Linux 中使用的工具，还为 Linux 的存在"
@@ -304,13 +326,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:194
-#, no-c-format
-msgid ""
-"Linux users have immense freedom of choice in their software. For example, "
-"Linux users can choose from a dozen different command line shells and "
-"several graphical desktops. This selection is often bewildering to users of "
-"other operating systems, who are not used to thinking of the command line or "
-"desktop as something that they can change."
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Linux users have immense freedom of choice in their software. For "
+#| "example, Linux users can choose from a dozen different command line "
+#| "shells and several graphical desktops. This selection is often "
+#| "bewildering to users of other operating systems, who are not used to "
+#| "thinking of the command line or desktop as something that they can change."
+msgid ""
+"GNU/Linux users have immense freedom of choice in their software. For "
+"example, Linux users can choose from a dozen different command line shells "
+"and several graphical desktops. This selection is often bewildering to users "
+"of other operating systems, who are not used to thinking of the command line "
+"or desktop as something that they can change."
 msgstr ""
 "Linux 用户在挑选软件方面有着极大的自由。例如，Linux 用户可以选择几十种不同的"
 "命令行外壳和多种图形桌面。这通常让其它操作系统的用户手足无措，他们甚至从来没"
@@ -318,13 +346,19 @@ msgstr ""
 
 #. Tag: para
 #: welcome.xml:203
-#, no-c-format
-msgid ""
-"Linux is also less likely to crash, better able to run more than one program "
-"at the same time, and more secure than many operating systems. With these "
-"advantages, Linux is the fastest growing operating system in the server "
-"market. More recently, Linux has begun to be popular among home and business "
-"users as well."
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Linux is also less likely to crash, better able to run more than one "
+#| "program at the same time, and more secure than many operating systems. "
+#| "With these advantages, Linux is the fastest growing operating system in "
+#| "the server market. More recently, Linux has begun to be popular among "
+#| "home and business users as well."
+msgid ""
+"GNU/Linux is also less likely to crash, better able to run more than one "
+"program at the same time, and more secure than many operating systems. With "
+"these advantages, GNU/Linux is the fastest growing operating system in the "
+"server market. More recently, GNU/Linux has begun to be popular among home "
+"and business users as well."
 msgstr ""
 "Linux 很少会崩溃、适合在同一时间运行多个程序，而且比大多数操作系统更为安全。"
 "有了这些优势，Linux 成为在服务器市场上增长最快的操作系统。近来，它还开始在家"