[SILENT_COMMIT] Update of POT and PO files for the manual

4 files changed, 105 insertions, 108 deletions

diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 358242728..4a2eac59e 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -1161,21 +1161,20 @@ msgstr "从 CD-ROM 启动"
 #. Tag: title
 #: boot-installer.xml:844
 #, no-c-format
-#| msgid "Booting from Firmware"
 msgid "Booting from Windows"
 msgstr "从 Windows 引导"
 
 #. Tag: para
 #: boot-installer.xml:845
 #, no-c-format
-#| msgid ""
-#| "To boot the installer from hard disk, you must first download and place "
-#| "the needed files as described in <xref linkend=\"boot-drive-files\"/>."
 msgid ""
 "To start the installer from Windows, you must first obtain CD-ROM/DVD-ROM or "
 "USB memory stick installation media as described in <xref linkend=\"official-"
 "cdrom\"/> and <xref linkend=\"boot-usb-files\"/>."
-msgstr "为了从 Windows 启动安装程序，您首先需要按照 <xref linkend=\"official-cdrom\"/> 和 <xref linkend=\"boot-usb-files\"/> 所述获取 CD-ROM/DVD-ROM 或者 USB 存储卡安装介质。"
+msgstr ""
+"为了从 Windows 启动安装程序，您首先需要按照 <xref linkend=\"official-cdrom\"/"
+"> 和 <xref linkend=\"boot-usb-files\"/> 所述获取 CD-ROM/DVD-ROM 或者 USB 存储"
+"卡安装介质。"
 
 #. Tag: para
 #: boot-installer.xml:851
@@ -1186,7 +1185,10 @@ msgid ""
 "start it automatically, or if you are using a USB memory stick, you can run "
 "it manually by accessing the device and executing <command>setup.exe</"
 "command>."
-msgstr "假如您使用的是安装 CD 或 DVD，在插入盘片的时候，预安装程序会自动加载。如果 Windows 没有自动运行，或者您使用的是 USB 存储卡，您可以访问该设备手动执行 <command>setup.exe</command> 程序。"
+msgstr ""
+"假如您使用的是安装 CD 或 DVD，在插入盘片的时候，预安装程序会自动加载。如果 "
+"Windows 没有自动运行，或者您使用的是 USB 存储卡，您可以访问该设备手动执行 "
+"<command>setup.exe</command> 程序。"
 
 #. Tag: para
 #: boot-installer.xml:859
@@ -1194,7 +1196,9 @@ msgstr "假如您使用的是安装 CD 或 DVD，在插入盘片的时候，预�
 msgid ""
 "After the program has been started, a few preliminary questions will be "
 "asked and the system will be prepared to start the &debian; installer."
-msgstr "程序运行后，会先询问一些预备问题，接着系统就准备开始启动 &debian; 安装程序了。"
+msgstr ""
+"程序运行后，会先询问一些预备问题，接着系统就准备开始启动 &debian; 安装程序"
+"了。"
 
 #. Tag: title
 #: boot-installer.xml:899
@@ -3963,12 +3967,19 @@ msgid ""
 "<userinput>MS</userinput>, <userinput>MS3</userinput>, <userinput>MouseMan</"
 "userinput> and <userinput>MouseSystems</userinput>. In most cases the "
 "default protocol should work correctly."
-msgstr "对于 gtk 前端 (图形安装程序)，用户可以通过设置该参数选择所使用的鼠标协议。支持的协议有<footnote> <para> 请参阅 man <citerefentry><refentrytitle>directfbrc</refentrytitle> <manvolnum>5</manvolnum></citerefentry> 了解更多信息。</para> </footnote>: <userinput>PS/2</userinput>、<userinput>IMPS/2</userinput>、<userinput>MS</userinput>、<userinput>MS3</userinput>、<userinput>MouseMan</userinput> 和 <userinput>MouseSystems</userinput>。大多数情况下，默认的协议就可以正常地工作。"
+msgstr ""
+"对于 gtk 前端 (图形安装程序)，用户可以通过设置该参数选择所使用的鼠标协议。支"
+"持的协议有<footnote> <para> 请参阅 man "
+"<citerefentry><refentrytitle>directfbrc</refentrytitle> <manvolnum>5</"
+"manvolnum></citerefentry> 了解更多信息。</para> </footnote>: "
+"<userinput>PS/2</userinput>、<userinput>IMPS/2</userinput>、<userinput>MS</"
+"userinput>、<userinput>MS3</userinput>、<userinput>MouseMan</userinput> 和 "
+"<userinput>MouseSystems</userinput>。大多数情况下，默认的协议就可以正常地工"
+"作。"
 
 #. Tag: term
 #: boot-installer.xml:3183
 #, no-c-format
-#| msgid "mouse/left"
 msgid "mouse/device"
 msgstr "mouse/device"
 
@@ -3980,7 +3991,10 @@ msgid ""
 "device to be used by setting this parameter. This is mostly useful if the "
 "mouse is connected to a serial port (serial mouse). Example: "
 "<userinput>mouse/device=<replaceable>/dev/ttyS1</replaceable></userinput>."
-msgstr "对于 gtk 前端 (图形安装程序)，用户可以通过设置该参数指定所使用的鼠标设备。通常对通过串口 (串口鼠标) 连接的鼠标有用。例如: <userinput>mouse/device=<replaceable>/dev/ttyS1</replaceable></userinput>。"
+msgstr ""
+"对于 gtk 前端 (图形安装程序)，用户可以通过设置该参数指定所使用的鼠标设备。通"
+"常对通过串口 (串口鼠标) 连接的鼠标有用。例如: <userinput>mouse/"
+"device=<replaceable>/dev/ttyS1</replaceable></userinput>。"
 
 #. Tag: term
 #: boot-installer.xml:3195
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 4364a731d..8c8a57e06 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2008-02-27 01:09+0000\n"
+"POT-Creation-Date: 2008-04-06 00:11+0000\n"
 "PO-Revision-Date: 2008-04-20 13:41+0800\n"
 "Last-Translator: Ji YongGang <jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -60,7 +60,9 @@ msgid ""
 "will behave just the same way as in a normal manual installation. Each "
 "question you preseed will (if you got it right!) modify the installation in "
 "some way from that baseline."
-msgstr "预置文件并非必须。如果您使用空的预置文件，安装程序就会跟正常手动安装一样。每个问题的预置(如果使用正确!)都会以同样的方式修改对应的基准。"
+msgstr ""
+"预置文件并非必须。如果您使用空的预置文件，安装程序就会跟正常手动安装一样。每"
+"个问题的预置(如果使用正确!)都会以同样的方式修改对应的基准。"
 
 #. Tag: title
 #: preseed.xml:50
@@ -1927,34 +1929,6 @@ msgstr ""
 #. Tag: screen
 #: preseed.xml:903
 #, 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 multi-select security, volatile\n"
-#| "#d-i apt-setup/security_host string security.debian.org\n"
-#| "#d-i apt-setup/volatile_host string volatile.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"
-#| "\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 string true"
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
 "#d-i apt-setup/non-free boolean true\n"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index ba8124bac..ada73db11 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -532,10 +532,6 @@ msgstr "便携机"
 #. Tag: para
 #: random-bits.xml:255
 #, no-c-format
-#| msgid ""
-#| "There is some overlap of the Laptop task with the Destop environment "
-#| "task. If you install both, the Laptop task will only require a few MB "
-#| "additional disk space."
 msgid ""
 "There is some overlap of the Laptop task with the Desktop environment task. "
 "If you install both, the Laptop task will only require a few MB additional "
@@ -2303,11 +2299,6 @@ msgstr ""
 #. Tag: para
 #: random-bits.xml:1223
 #, no-c-format
-#| msgid ""
-#| "To switch to another console, you will also need to use the <keycap>Ctrl</"
-#| "keycap> key, just as with the X Window System. For example, to switch to "
-#| "VT1 you would use: <keycombo> <keycap>Ctrl</keycap> <keycap>Left Alt</"
-#| "keycap> <keycap>F1</keycap> </keycombo>."
 msgid ""
 "To switch to another console, you will also need to use the <keycap>Ctrl</"
 "keycap> key, just as with the X Window System. For example, to switch to VT2 "
@@ -2315,7 +2306,13 @@ msgid ""
 "<keycap>Left Alt</keycap> <keycap>F2</keycap> </keycombo>. The graphical "
 "installer itself runs on VT5, so you can use <keycombo> <keycap>Left Alt</"
 "keycap> <keycap>F5</keycap> </keycombo> to switch back."
-msgstr "要切换到另外一个控制台，您也需要使用 <keycap>Ctrl</keycap> 键，就像在 X Window 系统一样。例如，要切换到 VT2(测试用的第一个 shell)，需要使用：<keycombo> <keycap>Ctrl</keycap> <keycap>Left Alt</keycap> <keycap>F2</keycap> </keycombo>。图形安装程序自己运行在 VT5，所以您可以使用 <keycombo> <keycap>Ctrl</keycap> <keycap>Left Alt</keycap> <keycap>F5</keycap> </keycombo> 切换回去。"
+msgstr ""
+"要切换到另外一个控制台，您也需要使用 <keycap>Ctrl</keycap> 键，就像在 X "
+"Window 系统一样。例如，要切换到 VT2(测试用的第一个 shell)，需要使用："
+"<keycombo> <keycap>Ctrl</keycap> <keycap>Left Alt</keycap> <keycap>F2</"
+"keycap> </keycombo>。图形安装程序自己运行在 VT5，所以您可以使用 <keycombo> "
+"<keycap>Ctrl</keycap> <keycap>Left Alt</keycap> <keycap>F5</keycap> </"
+"keycombo> 切换回去。"
 
 #. Tag: title
 #: random-bits.xml:1237
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 4167a6871..066fbbc68 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -1909,18 +1909,16 @@ msgid ""
 "lilo and grub)</phrase> do support mirrored (not striped!) RAID1, so using "
 "for example RAID5 for <filename>/</filename> and RAID1 for <filename>/boot</"
 "filename> can be an option."
-msgstr "请确保系统可以从您规划的分区引导。当使用 RAID 作为根 (<filename>/</filename>) 文件系统时，通常需要创建一个单独的文件系统给 <filename>/boot</filename>。多数的 boot loaders <phrase arch=\"x86\">(包括 lilo 和 grub)</phrase> 支持 mirrored (而非 striped!) RAID1，所以例如使用 RAID5 给 <filename>/</filename> 同时 RAID1 给 <filename>/boot</filename> 是一种方式。"
+msgstr ""
+"请确保系统可以从您规划的分区引导。当使用 RAID 作为根 (<filename>/</"
+"filename>) 文件系统时，通常需要创建一个单独的文件系统给 <filename>/boot</"
+"filename>。多数的 boot loaders <phrase arch=\"x86\">(包括 lilo 和 grub)</"
+"phrase> 支持 mirrored (而非 striped!) RAID1，所以例如使用 RAID5 给 "
+"<filename>/</filename> 同时 RAID1 给 <filename>/boot</filename> 是一种方式。"
 
 #. Tag: para
 #: using-d-i.xml:1309
 #, no-c-format
-#| msgid ""
-#| "Support for MD is a relatively new addition to the installer. You may "
-#| "experience problems for some RAID levels and in combination with some "
-#| "bootloaders if you try to use MD for the root (<filename>/</filename>) "
-#| "filesystem. For experienced users, it may be possible to work around some "
-#| "of these problems by executing some configuration or installation steps "
-#| "manually from a shell."
 msgid ""
 "Support for MD is a relatively new addition to the installer. You may "
 "experience problems for some RAID levels and in combination with some "
@@ -1928,7 +1926,10 @@ msgid ""
 "system. For experienced users, it may be possible to work around some of "
 "these problems by executing some configuration or installation steps "
 "manually from a shell."
-msgstr "在安装程序中支持 MD 是相对新的功能。如果您尝试结合一些 RAID 类型与启动引导器并将 MD 用于根(<filename>/</filename>)文件系统，您也许会经历一些挫折。对有经验的用户，从 shell 手动地处理一些配置和安装步骤，也许会绕开这些问题。"
+msgstr ""
+"在安装程序中支持 MD 是相对新的功能。如果您尝试结合一些 RAID 类型与启动引导器"
+"并将 MD 用于根(<filename>/</filename>)文件系统，您也许会经历一些挫折。对有经"
+"验的用户，从 shell 手动地处理一些配置和安装步骤，也许会绕开这些问题。"
 
 #. Tag: para
 #: using-d-i.xml:1318
@@ -2953,7 +2954,10 @@ msgid ""
 "installer will ask if you want to scan additional CDs or DVDs. If you have "
 "additional CDs or DVDs available, you probably want to do this so the "
 "installer can use the packages included on them."
-msgstr "假如从一张 CD 或 DVD 安装，而它只属于所要安装程序的一部分，安装程序会询问您是否需要检测其他的 CD 或 DVD。如果您手头有这些光盘，检测后安装程序就可以使用它们里面的软件包了。"
+msgstr ""
+"假如从一张 CD 或 DVD 安装，而它只属于所要安装程序的一部分，安装程序会询问您是"
+"否需要检测其他的 CD 或 DVD。如果您手头有这些光盘，检测后安装程序就可以使用它"
+"们里面的软件包了。"
 
 #. Tag: para
 #: using-d-i.xml:2040
@@ -2963,7 +2967,9 @@ msgid ""
 "them is not required. If you also do not use a network mirror (as explained "
 "in the next section), it can mean that not all packages belonging to the "
 "tasks you select in the next step of the installation can be installed."
-msgstr "假如您没有这些 CD 或 DVD，也没关系：它们不是必须的。如果您也不使用网络镜像(下节说明)，意味着下一步中选择的任务里面并非所有的软件包都会安装。"
+msgstr ""
+"假如您没有这些 CD 或 DVD，也没关系：它们不是必须的。如果您也不使用网络镜像(下"
+"节说明)，意味着下一步中选择的任务里面并非所有的软件包都会安装。"
 
 #. Tag: para
 #: using-d-i.xml:2048
@@ -2973,7 +2979,9 @@ msgid ""
 "This means that for most uses only the first CDs in a set are needed and "
 "that only very few people actually use any of the packages included on the "
 "last CDs in a set."
-msgstr "CD(和 DVD) 里面包含的软件包按照流行程度排列次序。也就是说，第一张光盘里面是最常用的软件，而最后一张光盘里面包含的是很少有人用到的软件。"
+msgstr ""
+"CD(和 DVD) 里面包含的软件包按照流行程度排列次序。也就是说，第一张光盘里面是最"
+"常用的软件，而最后一张光盘里面包含的是很少有人用到的软件。"
 
 #. Tag: para
 #: using-d-i.xml:2055
@@ -2984,7 +2992,10 @@ msgid ""
 "better off getting only the first 3 to 8 CDs and installing any additional "
 "packages you may need from the Internet by using a mirror. The same goes for "
 "DVD sets: the first DVD, or maybe the first two DVDs will cover most needs."
-msgstr "这也意味着购买或者下载刻录所有 CD 是一种浪费，因为大部分光盘您根本不会用到。多数情况下，只需要使用前 3 到 8 张 CD，然后从网络镜像安装其他要用的软件包。DVD 的情况类似：只要一张，或者前两张 DVD 就能满足您大部分要求。"
+msgstr ""
+"这也意味着购买或者下载刻录所有 CD 是一种浪费，因为大部分光盘您根本不会用到。"
+"多数情况下，只需要使用前 3 到 8 张 CD，然后从网络镜像安装其他要用的软件包。"
+"DVD 的情况类似：只要一张，或者前两张 DVD 就能满足您大部分要求。"
 
 #. Tag: para
 #: using-d-i.xml:2064
@@ -2994,7 +3005,10 @@ msgid ""
 "GNOME desktop environment) only the first three CDs are needed. For the "
 "alternative desktop environments (KDE or Xfce), additional CDs are needed. "
 "The first DVD easily covers all three desktop environments."
-msgstr "根据经验，常见的桌面安装(使用 GNOME 桌面环境)只需要前三张 CD。其他的桌面环境(KDE 或 Xfce)，就需要额外的 CD。而第一张 DVD 就可以轻松地满足所有的三种桌面环境。"
+msgstr ""
+"根据经验，常见的桌面安装(使用 GNOME 桌面环境)只需要前三张 CD。其他的桌面环境"
+"(KDE 或 Xfce)，就需要额外的 CD。而第一张 DVD 就可以轻松地满足所有的三种桌面环"
+"境。"
 
 #. Tag: para
 #: using-d-i.xml:2072
@@ -3006,7 +3020,10 @@ msgid ""
 "set should be scanned. The order in which they are scanned does not really "
 "matter, but scanning them in ascending order will reduce the chance of "
 "mistakes."
-msgstr "如果您检测了多张 CD 或 DVD，安装程序会在需要其他盘上的软件包时，提示您换盘。注意，只有同属于一个套件的 CD 或 DVD 需要检测。检测的次序并不是非常重要，但按照次序来可以降低出错的几率。"
+msgstr ""
+"如果您检测了多张 CD 或 DVD，安装程序会在需要其他盘上的软件包时，提示您换盘。"
+"注意，只有同属于一个套件的 CD 或 DVD 需要检测。检测的次序并不是非常重要，但按"
+"照次序来可以降低出错的几率。"
 
 #. Tag: title
 #: using-d-i.xml:2085
@@ -3017,15 +3034,13 @@ msgstr "使用网络镜像"
 #. Tag: para
 #: using-d-i.xml:2087
 #, no-c-format
-#| msgid ""
-#| "One question that will be asked in most cases is whether or not to use a "
-#| "network mirror as a source for packages. In most cases the default answer "
-#| "should be fine, but there are some exceptions."
 msgid ""
 "One question that will be asked during most installs is whether or not to "
 "use a network mirror as a source for packages. In most cases the default "
 "answer should be fine, but there are some exceptions."
-msgstr "多数安装下会有一个问题被问到，是否需要使用网络镜像作为软件包的源。多数情况下默认答案会很好，但还是有一些例外。"
+msgstr ""
+"多数安装下会有一个问题被问到，是否需要使用网络镜像作为软件包的源。多数情况下"
+"默认答案会很好，但还是有一些例外。"
 
 #. Tag: para
 #: using-d-i.xml:2093
@@ -3046,17 +3061,6 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:2102
 #, no-c-format
-#| msgid ""
-#| "If you are installing from a full CD or using a CD image (not DVD), using "
-#| "a network mirror is not required, but is still strongly recommended "
-#| "because a single CD contains only a fairly limited number of packages. "
-#| "The installer currently does not support using multiple CD or DVD images "
-#| "during the installation<footnote> <para> Adding that option is planned. </"
-#| "para> </footnote>. If you have a limited Internet connection it may still "
-#| "be best to <emphasis>not</emphasis> select a network mirror here, but to "
-#| "finish the installation using only what's available on the CD and install "
-#| "additional packages after the installation (i.e. after you have rebooted "
-#| "into the new system)."
 msgid ""
 "If you are installing from a single full CD or using a full CD image, using "
 "a network mirror is not required, but is still strongly recommended because "
@@ -3065,7 +3069,11 @@ msgid ""
 "select a network mirror here, but to finish the installation using only "
 "what's available on the CD and selectively install additional packages after "
 "the installation (i.e. after you have rebooted into the new system)."
-msgstr "如果您是从完整的 CD 或 CD 映像安装，虽然添加网络镜像并不是必须的，但仍建议您采用，这是因为单张 CD 所能容纳的软件包数量是有限的。假如您有互联网连接限制，这里最好<emphasis>不要</emphasis>选择网络镜像，只使用当前 CD 上的软件包完成安装，以后(比如，重新启动到新系统)再安装额外的软件包。"
+msgstr ""
+"如果您是从完整的 CD 或 CD 映像安装，虽然添加网络镜像并不是必须的，但仍建议您"
+"采用，这是因为单张 CD 所能容纳的软件包数量是有限的。假如您有互联网连接限制，"
+"这里最好<emphasis>不要</emphasis>选择网络镜像，只使用当前 CD 上的软件包完成安"
+"装，以后(比如，重新启动到新系统)再安装额外的软件包。"
 
 #. Tag: para
 #: using-d-i.xml:2113
@@ -3075,7 +3083,10 @@ msgid ""
 "during the installation should be present on the first DVD. The same is true "
 "if you have scanned multiple CDs as explained in the previous section. Use "
 "of a network mirror is optional."
-msgstr "如果您从 DVD 或使用 DVD 映象安装，安装过程中需要的软件包都应该在第一张 DVD 里面。如果您如前面章节所述检测了多张 CD，情况也是一样的。网络镜像的使用是一个选项。"
+msgstr ""
+"如果您从 DVD 或使用 DVD 映象安装，安装过程中需要的软件包都应该在第一张 DVD 里"
+"面。如果您如前面章节所述检测了多张 CD，情况也是一样的。网络镜像的使用是一个选"
+"项。"
 
 #. Tag: para
 #: using-d-i.xml:2120
@@ -3086,26 +3097,23 @@ msgid ""
 "will become available for installation, thus extending the life of your CD/"
 "DVD set without compromising the security or stability of the installed "
 "system."
-msgstr "添加网络镜像的优势在于有些内容已经更新，而 CD/DVD 只是在版本发布时创建，所以可以安装已经更新的内容，确保了系统的安全性和稳定性。。"
+msgstr ""
+"添加网络镜像的优势在于有些内容已经更新，而 CD/DVD 只是在版本发布时创建，所以"
+"可以安装已经更新的内容，确保了系统的安全性和稳定性。。"
 
 #. Tag: para
 #: using-d-i.xml:2127
 #, no-c-format
-#| msgid ""
-#| "In summary: selecting a network mirror is generally a good idea, except "
-#| "if you do not have a good Internet connection. If the current version of "
-#| "a package is available on the CD/DVD, the installer will always use that. "
-#| "The amount of data that will be downloaded if you do select a mirror thus "
-#| "depends on a) the tasks you select in the next step of the installation, "
-#| "b) which packages are needed for those tasks, and c) which of those "
-#| "packages are present on the CD/DVD."
 msgid ""
 "In summary: selecting a network mirror is generally a good idea, except if "
 "you do not have a good Internet connection. If the current version of a "
 "package is available from CD/DVD, the installer will always use that. The "
 "amount of data that will be downloaded if you do select a mirror thus "
 "depends on"
-msgstr "总结：除非您不具备良好的互联网连接，选择网络镜像通常是一个好主意。如果 CD/DVD 上有软件包当前的版本，安装程序总会从这里安装。如果您选择了镜像，需要下载的数据量取决于"
+msgstr ""
+"总结：除非您不具备良好的互联网连接，选择网络镜像通常是一个好主意。如果 CD/"
+"DVD 上有软件包当前的版本，安装程序总会从这里安装。如果您选择了镜像，需要下载"
+"的数据量取决于"
 
 #. Tag: para
 #: using-d-i.xml:2136
@@ -3133,22 +3141,21 @@ msgid ""
 "whether any updated versions of packages included on the CDs or DVDs are "
 "available from a mirror (either a regular package mirror, or a mirror for "
 "security or volatile updates)."
-msgstr "CD 或 DVD 上面的软件包在网络镜像里面是否有更新版本(普通软件包的网络镜像，或者安全更新的镜像)。"
+msgstr ""
+"CD 或 DVD 上面的软件包在网络镜像里面是否有更新版本(普通软件包的网络镜像，或者"
+"安全更新的镜像)。"
 
 #. Tag: para
 #: using-d-i.xml:2160
 #, no-c-format
-#| msgid ""
-#| "Note that even if you choose not to use a network mirror, some packages "
-#| "may still be downloaded from the Internet if there is a security or "
-#| "volatile update available for them and those services have been "
-#| "configured."
 msgid ""
 "Note that the last point means that, even if you choose not to use a network "
 "mirror, some packages may still be downloaded from the Internet if there is "
 "a security or volatile update available for them and those services have "
 "been configured."
-msgstr "注意，最后一点意味着，即使您没有选择使用网络镜像，如果配置了安全检测服务，并且软件包有安全更新，仍然会从互联网下载更新后的软件包。"
+msgstr ""
+"注意，最后一点意味着，即使您没有选择使用网络镜像，如果配置了安全检测服务，并"
+"且软件包有安全更新，仍然会从互联网下载更新后的软件包。"
 
 #. Tag: title
 #: using-d-i.xml:2176
@@ -3204,11 +3211,6 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:2214
 #, no-c-format
-#| msgid ""
-#| "Some tasks may be pre-selected based on the characteristics of the "
-#| "computer you are installing. If you disagree with these selections you "
-#| "can un-select the tasks. You can even opt to install no tasks at all at "
-#| "this point."
 msgid ""
 "Some tasks may be pre-selected based on the characteristics of the computer "
 "you are installing. If you disagree with these selections you can deselect "
@@ -3223,7 +3225,9 @@ msgstr ""
 msgid ""
 "Unless you are using the special KDE or Xfce CDs, the <quote>Desktop "
 "environment</quote> task will install the GNOME desktop environment."
-msgstr "除非选择 KDE 或 Xfce CD，<quote>Desktop environment</quote> 任务将安装 GNOME 桌面环境。"
+msgstr ""
+"除非选择 KDE 或 Xfce CD，<quote>Desktop environment</quote> 任务将安装 GNOME "
+"桌面环境。"
 
 #. Tag: para
 #: using-d-i.xml:2228
@@ -3236,7 +3240,12 @@ msgid ""
 "<literal>desktop=kde</literal> at the boot prompt when starting the "
 "installer. Alternatively the more lightweight Xfce desktop environment can "
 "be selected by using <literal>desktop=xfce</literal>."
-msgstr "在安装过程中无法交互式地选择另外一种桌面。然而，却 <emphasis>可以</emphasis> 通过预置(见 <xref linkend=\"preseed-pkgsel\"/>)或添加一个 <literal>desktop=kde</literal> 引导参数给安装程序，让 &d-i; 安装 KDE 桌面环境而不是 GNOME。另外，轻量级的 Xfce 桌面环境可以选为 <literal>desktop=xfce</literal>。"
+msgstr ""
+"在安装过程中无法交互式地选择另外一种桌面。然而，却 <emphasis>可以</emphasis> "
+"通过预置(见 <xref linkend=\"preseed-pkgsel\"/>)或添加一个 "
+"<literal>desktop=kde</literal> 引导参数给安装程序，让 &d-i; 安装 KDE 桌面环境"
+"而不是 GNOME。另外，轻量级的 Xfce 桌面环境可以选为 <literal>desktop=xfce</"
+"literal>。"
 
 #. Tag: para
 #: using-d-i.xml:2238
@@ -3247,7 +3256,10 @@ msgid ""
 "will need to be downloaded from a mirror as most needed packages are only "
 "included on later CDs; installing KDE or Xfce this way should work fine if "
 "you are using a DVD image or any other installation method."
-msgstr "注意，这只在 KDE 或 Xfce 软件包可以获得的情况下有效。假如您安装时使用单个 CD 映象，它们就像其他光盘上的软件包一样需要从网络镜像下载；这种方式安装 KDE 或 Xfce 同样适用于 DVD 映象或其他的安装方法。"
+msgstr ""
+"注意，这只在 KDE 或 Xfce 软件包可以获得的情况下有效。假如您安装时使用单个 CD "
+"映象，它们就像其他光盘上的软件包一样需要从网络镜像下载；这种方式安装 KDE 或 "
+"Xfce 同样适用于 DVD 映象或其他的安装方法。"
 
 #. Tag: para
 #: using-d-i.xml:2246