Remove 'Laptop' entry from table 'Disk Space Needed for Tasks' (there is no such task option in the installer anymore)

1 files changed, 128 insertions, 140 deletions

diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index addc8a6ed..ff9b1b692 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: 2018-10-21 10:09+0000\n"
+"POT-Creation-Date: 2018-11-09 16:26+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"
@@ -592,101 +592,77 @@ msgstr "&task-desktop-cinnamon-tot;"
 #. Tag: entry
 #: random-bits.xml:271
 #, no-c-format
-msgid "Laptop"
-msgstr "笔记本计算机"
-
-#. Tag: entry
-#: random-bits.xml:272
-#, no-c-format
-msgid "&task-laptop-inst;"
-msgstr "&task-laptop-inst;"
-
-#. Tag: entry
-#: random-bits.xml:273
-#, no-c-format
-msgid "&task-laptop-dl;"
-msgstr "&task-laptop-dl;"
-
-#. Tag: entry
-#: random-bits.xml:274
-#, no-c-format
-msgid "&task-laptop-tot;"
-msgstr "&task-laptop-tot;"
-
-#. Tag: entry
-#: random-bits.xml:278
-#, no-c-format
 msgid "Web server"
 msgstr "网页服务器"
 
 #. Tag: entry
-#: random-bits.xml:279
+#: random-bits.xml:272
 #, no-c-format
 msgid "&task-web-inst;"
 msgstr "&task-web-inst;"
 
 #. Tag: entry
-#: random-bits.xml:280
+#: random-bits.xml:273
 #, no-c-format
 msgid "&task-web-dl;"
 msgstr "&task-web-dl;"
 
 #. Tag: entry
-#: random-bits.xml:281
+#: random-bits.xml:274
 #, no-c-format
 msgid "&task-web-tot;"
 msgstr "&task-web-tot;"
 
 #. Tag: entry
-#: random-bits.xml:285
+#: random-bits.xml:278
 #, no-c-format
 msgid "Print server"
 msgstr "打印服务器"
 
 #. Tag: entry
-#: random-bits.xml:286
+#: random-bits.xml:279
 #, no-c-format
 msgid "&task-print-inst;"
 msgstr "&task-print-inst;"
 
 #. Tag: entry
-#: random-bits.xml:287
+#: random-bits.xml:280
 #, no-c-format
 msgid "&task-print-dl;"
 msgstr "&task-print-dl;"
 
 #. Tag: entry
-#: random-bits.xml:288
+#: random-bits.xml:281
 #, no-c-format
 msgid "&task-print-tot;"
 msgstr "&task-print-tot;"
 
 #. Tag: entry
-#: random-bits.xml:292
+#: random-bits.xml:285
 #, no-c-format
 msgid "SSH server"
 msgstr "SSH 服务器"
 
 #. Tag: entry
-#: random-bits.xml:293
+#: random-bits.xml:286
 #, no-c-format
 msgid "&task-ssh-inst;"
 msgstr "&task-ssh-inst;"
 
 #. Tag: entry
-#: random-bits.xml:294
+#: random-bits.xml:287
 #, no-c-format
 msgid "&task-ssh-dl;"
 msgstr "&task-ssh-dl;"
 
 #. Tag: entry
-#: random-bits.xml:295
+#: random-bits.xml:288
 #, no-c-format
 msgid "&task-ssh-tot;"
 msgstr "&task-ssh-tot;"
 
 #. Tag: para
-#: random-bits.xml:301
+#: random-bits.xml:294
 #, no-c-format
 msgid ""
 "If you install in a language other than English, <command>tasksel</command> "
@@ -699,13 +675,13 @@ msgstr ""
 "同；您应该留有 350MB 以上的空间用来下载和安装。"
 
 #. Tag: title
-#: random-bits.xml:316
+#: random-bits.xml:309
 #, no-c-format
 msgid "Installing &debian-gnu; from a Unix/Linux System"
 msgstr "通过 Unix/Linux 系统来安装 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:318
+#: random-bits.xml:311
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
@@ -726,7 +702,7 @@ msgstr ""
 "输入的。"
 
 #. Tag: para
-#: random-bits.xml:330
+#: random-bits.xml:323
 #, no-c-format
 msgid ""
 "Once you've got the new &debian; system configured to your preference, you "
@@ -741,7 +717,7 @@ msgstr ""
 "能通过任何引导或者安装介质完成安装的权宜之计。"
 
 #. Tag: para
-#: random-bits.xml:341
+#: random-bits.xml:334
 #, no-c-format
 msgid ""
 "As this is a mostly manual procedure, you should bear in mind that you will "
@@ -759,13 +735,13 @@ msgstr ""
 "还需要额外的安装、或者配置步骤。"
 
 #. Tag: title
-#: random-bits.xml:355
+#: random-bits.xml:348
 #, no-c-format
 msgid "Getting Started"
 msgstr "准备开始"
 
 #. Tag: para
-#: random-bits.xml:356
+#: random-bits.xml:349
 #, no-c-format
 msgid ""
 "With your current *nix partitioning tools, repartition the hard drive as "
@@ -780,7 +756,7 @@ msgstr ""
 "境，还要更多)。"
 
 #. Tag: para
-#: random-bits.xml:364
+#: random-bits.xml:357
 #, no-c-format
 msgid ""
 "Next, create file systems on the partitions. For example, to create an ext3 "
@@ -798,7 +774,7 @@ msgstr ""
 "userinput>。"
 
 #. Tag: para
-#: random-bits.xml:374
+#: random-bits.xml:367
 #, no-c-format
 msgid ""
 "Initialize and activate swap (substitute the partition number for your "
@@ -821,7 +797,7 @@ msgstr ""
 "统)。挂载点的名称是任意的，后面的步骤将会用到。"
 
 #. Tag: screen
-#: random-bits.xml:386
+#: random-bits.xml:379
 #, no-c-format
 msgid ""
 "# mkdir /mnt/debinst\n"
@@ -831,7 +807,7 @@ msgstr ""
 "# mount /dev/<replaceable>sda6</replaceable> /mnt/debinst"
 
 #. Tag: para
-#: random-bits.xml:389
+#: random-bits.xml:382
 #, no-c-format
 msgid ""
 "If you want to have parts of the filesystem (e.g. /usr) mounted on separate "
@@ -842,13 +818,13 @@ msgstr ""
 "手动创建和加载这些目录。"
 
 #. Tag: title
-#: random-bits.xml:399
+#: random-bits.xml:392
 #, no-c-format
 msgid "Install <command>debootstrap</command>"
 msgstr "安装 <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:400
+#: random-bits.xml:393
 #, no-c-format
 msgid ""
 "The utility used by the &debian; installer, and recognized as the official "
@@ -871,7 +847,7 @@ msgstr ""
 "装 <command>debootstrap</command>。"
 
 #. Tag: para
-#: random-bits.xml:430
+#: random-bits.xml:423
 #, no-c-format
 msgid ""
 "Or, you can use the following procedure to install it manually. Make a work "
@@ -896,7 +872,7 @@ msgstr ""
 "些文件安装到系统，您需要 root 权限。"
 
 #. Tag: screen
-#: random-bits.xml:445
+#: random-bits.xml:438
 #, no-c-format
 msgid ""
 "# ar -x debootstrap_0.X.X_all.deb\n"
@@ -908,13 +884,13 @@ msgstr ""
 "# zcat /full-path-to-work/work/data.tar.gz | tar xv"
 
 #. Tag: title
-#: random-bits.xml:451
+#: random-bits.xml:444
 #, no-c-format
 msgid "Run <command>debootstrap</command>"
 msgstr "运行 <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:452
+#: random-bits.xml:445
 #, no-c-format
 msgid ""
 "<command>debootstrap</command> can download the needed files directly from "
@@ -929,7 +905,7 @@ msgstr ""
 "<ulink url=\"http://www.debian.org/mirror/list\"></ulink>。"
 
 #. Tag: para
-#: random-bits.xml:461
+#: random-bits.xml:454
 #, no-c-format
 msgid ""
 "If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
@@ -941,7 +917,7 @@ msgstr ""
 "<userinput>file:/cdrom/debian/</userinput>"
 
 #. Tag: para
-#: random-bits.xml:467
+#: random-bits.xml:460
 #, no-c-format
 msgid ""
 "Substitute one of the following for <replaceable>ARCH</replaceable> in the "
@@ -964,13 +940,13 @@ msgstr ""
 "<userinput>ppc64el</userinput>, or <userinput>s390x</userinput>。"
 
 #. Tag: title
-#: random-bits.xml:493
+#: random-bits.xml:486
 #, no-c-format
 msgid "Configure The Base System"
 msgstr "基本系统的配置"
 
 #. Tag: para
-#: random-bits.xml:494
+#: random-bits.xml:487
 #, no-c-format
 msgid ""
 "Now you've got a real &debian; system, though rather lean, on disk. "
@@ -996,7 +972,7 @@ msgstr ""
 "义，例如："
 
 #. Tag: para
-#: random-bits.xml:514
+#: random-bits.xml:507
 #, no-c-format
 msgid ""
 "If the target architecture is different from the host, you need to finish "
@@ -1004,19 +980,19 @@ msgid ""
 msgstr "如果目标架构与主机不同，则需要完成多阶段自举："
 
 #. Tag: screen
-#: random-bits.xml:518
+#: random-bits.xml:511
 #, no-c-format
 msgid "/debootstrap/debootstrap --second-stage"
 msgstr "/debootstrap/debootstrap --second-stage"
 
 #. Tag: title
-#: random-bits.xml:523
+#: random-bits.xml:516
 #, no-c-format
 msgid "Create device files"
 msgstr "创建设备文件"
 
 #. Tag: para
-#: random-bits.xml:524
+#: random-bits.xml:517
 #, no-c-format
 msgid ""
 "At this point <filename>/dev/</filename> only contains very basic device "
@@ -1033,13 +1009,13 @@ msgstr ""
 "静态设备文件。"
 
 #. Tag: para
-#: random-bits.xml:534
+#: random-bits.xml:527
 #, no-c-format
 msgid "A few of the available options are:"
 msgstr "可以使用的选项有："
 
 #. Tag: para
-#: random-bits.xml:539
+#: random-bits.xml:532
 #, no-c-format
 msgid ""
 "install the makedev package, and create a default set of static device files "
@@ -1047,7 +1023,7 @@ msgid ""
 msgstr "安装 makedev 软件包，并创建默认的静态设备文件，使用(chroot 以后)"
 
 #. Tag: screen
-#: random-bits.xml:543
+#: random-bits.xml:536
 #, no-c-format
 msgid ""
 "# apt install makedev\n"
@@ -1061,14 +1037,14 @@ msgstr ""
 "# MAKEDEV generic"
 
 #. Tag: para
-#: random-bits.xml:546
+#: random-bits.xml:539
 #, no-c-format
 msgid ""
 "manually create only specific device files using <command>MAKEDEV</command>"
 msgstr "手动创建指定的设备文件，使用 <command>MAKEDEV</command>"
 
 #. Tag: para
-#: random-bits.xml:551
+#: random-bits.xml:544
 #, no-c-format
 msgid ""
 "bind mount /dev from your host system on top of /dev in the target system; "
@@ -1079,13 +1055,13 @@ msgstr ""
 "postinst 脚本会创建设备文件，所以要小心使用改选项。"
 
 #. Tag: title
-#: random-bits.xml:564
+#: random-bits.xml:557
 #, no-c-format
 msgid "Mount Partitions"
 msgstr "分区的挂载"
 
 #. Tag: para
-#: random-bits.xml:565
+#: random-bits.xml:558
 #, no-c-format
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
@@ -1165,13 +1141,13 @@ msgstr ""
 "<userinput>mount -a</userinput>，请在进入下一步前先将 proc 挂载："
 
 #. Tag: screen
-#: random-bits.xml:591
+#: random-bits.xml:584
 #, no-c-format
 msgid "# mount -t proc proc /proc"
 msgstr "# mount -t proc proc /proc"
 
 #. Tag: para
-#: random-bits.xml:593
+#: random-bits.xml:586
 #, no-c-format
 msgid ""
 "The command <userinput>ls /proc</userinput> should now show a non-empty "
@@ -1182,19 +1158,19 @@ msgstr ""
 "chroot: 以外加载 proc。"
 
 #. Tag: screen
-#: random-bits.xml:599
+#: random-bits.xml:592
 #, no-c-format
 msgid "# mount -t proc proc /mnt/debinst/proc"
 msgstr "# mount -t proc proc /mnt/debinst/proc"
 
 #. Tag: title
-#: random-bits.xml:605
+#: random-bits.xml:598
 #, no-c-format
 msgid "Setting Timezone"
 msgstr "设置时区"
 
 #. Tag: para
-#: random-bits.xml:606
+#: random-bits.xml:599
 #, no-c-format
 msgid ""
 "Setting the third line of the file <filename>/etc/adjtime</filename> to "
@@ -1213,19 +1189,19 @@ msgstr ""
 "间解释硬件时钟。下面命令可以让您设定和选择时区。"
 
 #. Tag: screen
-#: random-bits.xml:620
+#: random-bits.xml:613
 #, no-c-format
 msgid "# dpkg-reconfigure tzdata"
 msgstr "# dpkg-reconfigure tzdata"
 
 #. Tag: title
-#: random-bits.xml:626
+#: random-bits.xml:619
 #, no-c-format
 msgid "Configure Networking"
 msgstr "网络的配置"
 
 #. Tag: para
-#: random-bits.xml:627
+#: random-bits.xml:620
 #, fuzzy, no-c-format
 #| msgid ""
 #| "To configure networking, edit <filename>/etc/network/interfaces</"
@@ -1408,13 +1384,13 @@ msgstr ""
 "卡将会获得您期望的接口名称（eth0，eth1，等等）。"
 
 #. Tag: title
-#: random-bits.xml:668
+#: random-bits.xml:661
 #, no-c-format
 msgid "Configure Apt"
 msgstr "配置 Apt"
 
 #. Tag: para
-#: random-bits.xml:669
+#: random-bits.xml:662
 #, no-c-format
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
@@ -1439,13 +1415,13 @@ msgstr ""
 "update</userinput>。"
 
 #. Tag: title
-#: random-bits.xml:685
+#: random-bits.xml:678
 #, no-c-format
 msgid "Configure Locales and Keyboard"
 msgstr "本地化和键盘的配置"
 
 #. Tag: para
-#: random-bits.xml:686
+#: random-bits.xml:679
 #, no-c-format
 msgid ""
 "To configure your locale settings to use a language other than English, "
@@ -1463,7 +1439,7 @@ msgstr ""
 "</screen></informalexample>配置您的键盘(如果需要)："
 
 #. Tag: screen
-#: random-bits.xml:696
+#: random-bits.xml:689
 #, no-c-format
 msgid ""
 "# apt install console-setup\n"
@@ -1473,7 +1449,7 @@ msgstr ""
 "# dpkg-reconfigure keyboard-configuration"
 
 #. Tag: para
-#: random-bits.xml:698
+#: random-bits.xml:691
 #, no-c-format
 msgid ""
 "Note that the keyboard cannot be set while in the chroot, but will be "
@@ -1481,13 +1457,13 @@ msgid ""
 msgstr "注意，在 chroot 里面不能设置键盘，但重新启动以后可以。"
 
 #. Tag: title
-#: random-bits.xml:708
+#: random-bits.xml:701
 #, no-c-format
 msgid "Install a Kernel"
 msgstr "内核的安装"
 
 #. Tag: para
-#: random-bits.xml:709
+#: random-bits.xml:702
 #, no-c-format
 msgid ""
 "If you intend to boot this system, you probably want a &arch-kernel; kernel "
@@ -1497,31 +1473,31 @@ msgstr ""
 "以用下面指令找到那些预先打包的内核："
 
 #. Tag: screen
-#: random-bits.xml:714
+#: random-bits.xml:707
 #, no-c-format
 msgid "# apt search &kernelpackage;"
 msgstr "# apt search &kernelpackage;"
 
 #. Tag: para
-#: random-bits.xml:716
+#: random-bits.xml:709
 #, no-c-format
 msgid "Then install the kernel package of your choice using its package name."
 msgstr "然后根据所选取的软件包名称安装内核软件包。"
 
 #. Tag: screen
-#: random-bits.xml:720
+#: random-bits.xml:713
 #, no-c-format
 msgid "# apt install &kernelpackage;-<replaceable>arch-etc</replaceable>"
 msgstr "# apt install &kernelpackage;-<replaceable>arch-etc</replaceable>"
 
 #. Tag: title
-#: random-bits.xml:726
+#: random-bits.xml:719
 #, no-c-format
 msgid "Set up the Boot Loader"
 msgstr "Boot Loader 的设置"
 
 #. Tag: para
-#: random-bits.xml:727
+#: random-bits.xml:720
 #, no-c-format
 msgid ""
 "To make your &debian-gnu; system bootable, set up your boot loader to load "
@@ -1535,7 +1511,7 @@ msgstr ""
 "成。"
 
 #. Tag: para
-#: random-bits.xml:734
+#: random-bits.xml:727
 #, no-c-format
 msgid ""
 "Check <userinput>info grub</userinput> <phrase arch=\"x86\">or "
@@ -1558,7 +1534,7 @@ msgstr ""
 "<filename>lilo.conf</filename> )</phrase>。"
 
 #. Tag: para
-#: random-bits.xml:746
+#: random-bits.xml:739
 #, no-c-format
 msgid ""
 "Installing and setting up <classname>grub2</classname> is as easy as: "
@@ -1580,7 +1556,7 @@ msgstr ""
 "boot/grub/grub.cfg</filename>。"
 
 #. Tag: para
-#: random-bits.xml:756
+#: random-bits.xml:749
 #, no-c-format
 msgid ""
 "Note that this assumes that a <filename>/dev/sda</filename> device file has "
@@ -1591,13 +1567,13 @@ msgstr ""
 "是安装 <command>grub2</command>，但它不属于本附录讨论范围。"
 
 #. Tag: para
-#: random-bits.xml:762
+#: random-bits.xml:755
 #, 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:766
+#: random-bits.xml:759
 #, no-c-format
 msgid ""
 "boot=/dev/<replaceable>sda6</replaceable>\n"
@@ -1619,7 +1595,7 @@ msgstr ""
 "label=Debian"
 
 #. Tag: para
-#: random-bits.xml:768
+#: random-bits.xml:761
 #, no-c-format
 msgid ""
 "Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
@@ -1636,7 +1612,7 @@ msgstr ""
 "行 ybin（请记住您在哪个系统里运行的 <filename>yaboot.conf</filename>）。"
 
 #. Tag: para
-#: random-bits.xml:778
+#: random-bits.xml:771
 #, no-c-format
 msgid ""
 "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1666,13 +1642,13 @@ msgstr ""
 "userinput> 换成 <userinput>hd:</userinput>。"
 
 #. Tag: title
-#: random-bits.xml:791
+#: random-bits.xml:784
 #, no-c-format
 msgid "Remote access: Installing SSH and setting up access"
 msgstr "远程访问：安装 SSH 并设置密码"
 
 #. Tag: para
-#: random-bits.xml:792
+#: random-bits.xml:785
 #, no-c-format
 msgid ""
 "In case you can login to the system via console, you can skip this section. "
@@ -1715,7 +1691,7 @@ msgstr ""
 "问权限："
 
 #. Tag: screen
-#: random-bits.xml:816
+#: random-bits.xml:809
 #, no-c-format
 msgid ""
 "# adduser joe\n"
@@ -1725,13 +1701,13 @@ msgstr ""
 "# passwd joe"
 
 #. Tag: title
-#: random-bits.xml:821
+#: random-bits.xml:814
 #, no-c-format
 msgid "Finishing touches"
 msgstr "最后一笔"
 
 #. Tag: para
-#: random-bits.xml:822
+#: random-bits.xml:815
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
@@ -1750,7 +1726,7 @@ msgstr ""
 "的软件包。"
 
 #. Tag: para
-#: random-bits.xml:833
+#: random-bits.xml:826
 #, no-c-format
 msgid ""
 "After the installation there will be a lot of downloaded packages in "
@@ -1761,19 +1737,19 @@ msgstr ""
 "件包。您可以运行下面命令释放空间："
 
 #. Tag: screen
-#: random-bits.xml:839
+#: random-bits.xml:832
 #, no-c-format
 msgid "# apt clean"
 msgstr "# apt clean"
 
 #. Tag: title
-#: random-bits.xml:850
+#: random-bits.xml:843
 #, no-c-format
 msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
 msgstr "通过 Parallel Line IP（PLIP）安装 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:852
+#: random-bits.xml:845
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; on a computer without an "
@@ -1787,7 +1763,7 @@ msgstr ""
 "接到具有 &debian; 镜像的网络（比如，互联网）。"
 
 #. Tag: para
-#: random-bits.xml:860
+#: random-bits.xml:853
 #, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
@@ -1801,7 +1777,7 @@ msgstr ""
 "192.168.0.2 IP 地址（这些地址在您的网络地址空间里面未被占用）。"
 
 #. Tag: para
-#: random-bits.xml:868
+#: random-bits.xml:861
 #, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
@@ -1812,7 +1788,7 @@ msgstr ""
 "linkend=\"boot-new\"/>）。"
 
 #. Tag: para
-#: random-bits.xml:873
+#: random-bits.xml:866
 #, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
@@ -1824,13 +1800,13 @@ msgstr ""
 "值为 <literal>io=0x378</literal>，<literal>irq=7</literal>。"
 
 #. Tag: title
-#: random-bits.xml:883
+#: random-bits.xml:876
 #, no-c-format
 msgid "Requirements"
 msgstr "需求"
 
 #. Tag: para
-#: random-bits.xml:886
+#: random-bits.xml:879
 #, no-c-format
 msgid ""
 "A target computer, called <emphasis>target</emphasis>, where &debian; will "
@@ -1838,13 +1814,13 @@ msgid ""
 msgstr "目标计算机，称为 <emphasis>target</emphasis>，将要安装 &debian;。"
 
 #. Tag: para
-#: random-bits.xml:892
+#: random-bits.xml:885
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr "系统安装介质；参阅 <xref linkend=\"installation-media\"/>。"
 
 #. Tag: para
-#: random-bits.xml:897
+#: random-bits.xml:890
 #, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
@@ -1853,7 +1829,7 @@ msgstr ""
 "另外一台连接到互联网的计算机，称为 <emphasis>source</emphasis>，功能是网关。"
 
 #. Tag: para
-#: random-bits.xml:903
+#: random-bits.xml:896
 #, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -1864,13 +1840,13 @@ msgstr ""
 "Install-HOWTO</ulink> 了解这种线的更多信息，以及如何自己制作。"
 
 #. Tag: title
-#: random-bits.xml:915
+#: random-bits.xml:908
 #, no-c-format
 msgid "Setting up source"
 msgstr "建立源"
 
 #. Tag: para
-#: random-bits.xml:916
+#: random-bits.xml:909
 #, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
@@ -1880,7 +1856,7 @@ msgstr ""
 "算机。"
 
 #. Tag: screen
-#: random-bits.xml:921
+#: random-bits.xml:914
 #, no-c-format
 msgid ""
 "#!/bin/sh\n"
@@ -1922,13 +1898,13 @@ msgstr ""
 "echo 1 &gt; /proc/sys/net/ipv4/ip_forward"
 
 #. Tag: title
-#: random-bits.xml:927
+#: random-bits.xml:920
 #, no-c-format
 msgid "Installing target"
 msgstr "安装目标"
 
 #. Tag: para
-#: random-bits.xml:928
+#: random-bits.xml:921
 #, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
@@ -1952,13 +1928,13 @@ msgstr ""
 "</screen></informalexample> 下面是安装过程中各阶段所要提供的答案。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:947
+#: random-bits.xml:940
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr "从光盘加载安装组件"
 
 #. Tag: para
-#: random-bits.xml:949
+#: random-bits.xml:942
 #, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -1968,13 +1944,13 @@ msgstr ""
 "用 PLIP 驱动。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:957
+#: random-bits.xml:950
 #, no-c-format
 msgid "Detect network hardware"
 msgstr "探测网络硬件"
 
 #. Tag: para
-#: random-bits.xml:962
+#: random-bits.xml:955
 #, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -1987,7 +1963,7 @@ msgstr ""
 "统没有网卡，安装程序不会显示该列表。"
 
 #. Tag: para
-#: random-bits.xml:971
+#: random-bits.xml:964
 #, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
@@ -1998,19 +1974,19 @@ msgstr ""
 "<userinput>plip</userinput> 模块。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:983
+#: random-bits.xml:976
 #, no-c-format
 msgid "Configure the network"
 msgstr "配置网络"
 
 #. Tag: para
-#: random-bits.xml:986
+#: random-bits.xml:979
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr "Auto-configure network with DHCP: No"
 
 #. Tag: para
-#: random-bits.xml:991
+#: random-bits.xml:984
 #, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -2018,7 +1994,7 @@ msgstr ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:996
+#: random-bits.xml:989
 #, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -2028,7 +2004,7 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: random-bits.xml:1002
+#: random-bits.xml:995
 #, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
@@ -2038,13 +2014,13 @@ msgstr ""
 "resolv.conf</filename>）"
 
 #. Tag: title
-#: random-bits.xml:1021
+#: random-bits.xml:1014
 #, no-c-format
 msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
 msgstr "通过 PPP over Ethernet（PPPPoE）安装 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:1023
+#: random-bits.xml:1016
 #, no-c-format
 msgid ""
 "In some countries PPP over Ethernet (PPPoE) is a common protocol for "
@@ -2058,7 +2034,7 @@ msgstr ""
 "本节将说明操作方法。"
 
 #. Tag: para
-#: random-bits.xml:1031
+#: random-bits.xml:1024
 #, no-c-format
 msgid ""
 "The PPPoE connection set up during the installation will also be available "
@@ -2069,7 +2045,7 @@ msgstr ""
 "linkend=\"boot-new\"/>)。"
 
 #. Tag: para
-#: random-bits.xml:1036
+#: random-bits.xml:1029
 #, no-c-format
 msgid ""
 "To have the option of setting up and using PPPoE during the installation, "
@@ -2082,7 +2058,7 @@ msgstr ""
 "phrase>)。"
 
 #. Tag: para
-#: random-bits.xml:1043
+#: random-bits.xml:1036
 #, no-c-format
 msgid ""
 "Installing over PPPoE is mostly the same as any other installation. The "
@@ -2090,7 +2066,7 @@ msgid ""
 msgstr "通过 PPPoE 进行安装，绝大部分与其他方式相同。下面步骤说明不同之处。"
 
 #. Tag: para
-#: random-bits.xml:1051
+#: random-bits.xml:1044
 #, no-c-format
 msgid ""
 "Boot the installer with the boot parameter <userinput>modules=ppp-udeb</"
@@ -2105,7 +2081,7 @@ msgstr ""
 "udeb</classname>) 会被加载并自动运行。"
 
 #. Tag: para
-#: random-bits.xml:1066
+#: random-bits.xml:1059
 #, no-c-format
 msgid ""
 "Follow the regular initial steps of the installation (language, country and "
@@ -2123,7 +2099,7 @@ msgstr ""
 "footnote>）。"
 
 #. Tag: para
-#: random-bits.xml:1085
+#: random-bits.xml:1078
 #, no-c-format
 msgid ""
 "The next step is the detection of network hardware, in order to identify any "
@@ -2131,7 +2107,7 @@ msgid ""
 msgstr "下一步是探测网络硬件，目的是识别当前系统中的网卡。"
 
 #. Tag: para
-#: random-bits.xml:1091
+#: random-bits.xml:1084
 #, no-c-format
 msgid ""
 "After this the actual setup of PPPoE is started. The installer will probe "
@@ -2142,7 +2118,7 @@ msgstr ""
 "处理 PPPoE 连接的服务器)。"
 
 #. Tag: para
-#: random-bits.xml:1097
+#: random-bits.xml:1090
 #, no-c-format
 msgid ""
 "It is possible that the concentrator will not to be found at the first "
@@ -2156,7 +2132,7 @@ msgstr ""
 "<guimenuitem>Configure and start a PPPoE connection</guimenuitem>。"
 
 #. Tag: para
-#: random-bits.xml:1106
+#: random-bits.xml:1099
 #, no-c-format
 msgid ""
 "After a concentrator is found, the user will be prompted to type the login "
@@ -2164,7 +2140,7 @@ msgid ""
 msgstr "连接找到之后，用户需要提供登录信息（PPPoE 用户名和密码）。"
 
 #. Tag: para
-#: random-bits.xml:1112
+#: random-bits.xml:1105
 #, no-c-format
 msgid ""
 "At this point the installer will use the provided information to establish "
@@ -2180,6 +2156,18 @@ msgstr ""
 "信息不正确或有错误出现，安装程序将停止，但可以选择 <guimenuitem>Configure "
 "and start PPPoE connection</guimenuitem> 菜单项重新配置。"
 
+#~ msgid "Laptop"
+#~ msgstr "笔记本计算机"
+
+#~ msgid "&task-laptop-inst;"
+#~ msgstr "&task-laptop-inst;"
+
+#~ msgid "&task-laptop-dl;"
+#~ msgstr "&task-laptop-dl;"
+
+#~ msgid "&task-laptop-tot;"
+#~ msgstr "&task-laptop-tot;"
+
 #~ msgid ""
 #~ "# /usr/sbin/debootstrap --arch ARCH &releasename; \\\n"
 #~ "     /mnt/debinst http://ftp.us.debian.org/debian"