Refresh po and pot files after changings in en

1 files changed, 183 insertions, 130 deletions

diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 7f5b016ef..7594cd2be 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.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: 2014-10-05 18:15+0000\n"
+"POT-Creation-Date: 2015-01-09 19:07+0000\n"
 "PO-Revision-Date: 2012-11-26 13:55+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -628,114 +628,159 @@ msgid "&task-desktop-lxde-tot;"
 msgstr "&task-desktop-lxde-tot;"
 
 #. Tag: entry
+#: random-bits.xml:283
+#, fuzzy, no-c-format
+#| msgid "&nbsp;&nbsp;&bull;&nbsp;KDE"
+msgid "&nbsp;&nbsp;&bull;&nbsp;MATE"
+msgstr "&nbsp;&nbsp;&bull;&nbsp;KDE"
+
+#. Tag: entry
 #: random-bits.xml:284
-#, no-c-format
-msgid "Laptop"
-msgstr "便携机"
+#, fuzzy, no-c-format
+#| msgid "&task-desktop-gnome-inst;"
+msgid "&task-desktop-mate-inst;"
+msgstr "&task-desktop-gnome-inst;"
 
-#. Tag: para
+#. Tag: entry
+#: random-bits.xml:285
+#, fuzzy, no-c-format
+#| msgid "&task-desktop-gnome-dl;"
+msgid "&task-desktop-mate-dl;"
+msgstr "&task-desktop-gnome-dl;"
+
+#. Tag: entry
 #: random-bits.xml:286
+#, fuzzy, no-c-format
+#| msgid "&task-desktop-gnome-tot;"
+msgid "&task-desktop-mate-tot;"
+msgstr "&task-desktop-gnome-tot;"
+
+#. Tag: entry
+#: random-bits.xml:289
+#, fuzzy, no-c-format
+#| msgid "&nbsp;&nbsp;&bull;&nbsp;KDE"
+msgid "&nbsp;&nbsp;&bull;&nbsp;Cinnamon"
+msgstr "&nbsp;&nbsp;&bull;&nbsp;KDE"
+
+#. Tag: entry
+#: random-bits.xml:290
+#, fuzzy, no-c-format
+#| msgid "&task-desktop-gnome-inst;"
+msgid "&task-desktop-cinnamon-inst;"
+msgstr "&task-desktop-gnome-inst;"
+
+#. Tag: entry
+#: random-bits.xml:291
+#, fuzzy, no-c-format
+#| msgid "&task-desktop-gnome-dl;"
+msgid "&task-desktop-cinnamon-dl;"
+msgstr "&task-desktop-gnome-dl;"
+
+#. Tag: entry
+#: random-bits.xml:292
+#, fuzzy, no-c-format
+#| msgid "&task-desktop-gnome-tot;"
+msgid "&task-desktop-cinnamon-tot;"
+msgstr "&task-desktop-gnome-tot;"
+
+#. Tag: entry
+#: random-bits.xml:296
 #, no-c-format
-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 "
-"disk space."
-msgstr ""
-"便携机(Laptop)任务与桌面环境任务有大量重复的内容，如果两个都安装，便携机任务"
-"只需要很小的额外空间。"
+msgid "Laptop"
+msgstr "便携机"
 
 #. Tag: entry
-#: random-bits.xml:293
+#: random-bits.xml:297
 #, no-c-format
 msgid "&task-laptop-inst;"
 msgstr "&task-laptop-inst;"
 
 #. Tag: entry
-#: random-bits.xml:294
+#: random-bits.xml:298
 #, no-c-format
 msgid "&task-laptop-dl;"
 msgstr "&task-laptop-dl;"
 
 #. Tag: entry
-#: random-bits.xml:295
+#: random-bits.xml:299
 #, no-c-format
 msgid "&task-laptop-tot;"
 msgstr "&task-laptop-tot;"
 
 #. Tag: entry
-#: random-bits.xml:299
+#: random-bits.xml:303
 #, no-c-format
 msgid "Web server"
 msgstr "Web 服务器"
 
 #. Tag: entry
-#: random-bits.xml:300
+#: random-bits.xml:304
 #, no-c-format
 msgid "&task-web-inst;"
 msgstr "&task-web-inst;"
 
 #. Tag: entry
-#: random-bits.xml:301
+#: random-bits.xml:305
 #, no-c-format
 msgid "&task-web-dl;"
 msgstr "&task-web-dl;"
 
 #. Tag: entry
-#: random-bits.xml:302
+#: random-bits.xml:306
 #, no-c-format
 msgid "&task-web-tot;"
 msgstr "&task-web-tot;"
 
 #. Tag: entry
-#: random-bits.xml:306
+#: random-bits.xml:310
 #, no-c-format
 msgid "Print server"
 msgstr "打印服务器"
 
 #. Tag: entry
-#: random-bits.xml:307
+#: random-bits.xml:311
 #, no-c-format
 msgid "&task-print-inst;"
 msgstr "&task-print-inst;"
 
 #. Tag: entry
-#: random-bits.xml:308
+#: random-bits.xml:312
 #, no-c-format
 msgid "&task-print-dl;"
 msgstr "&task-print-dl;"
 
 #. Tag: entry
-#: random-bits.xml:309
+#: random-bits.xml:313
 #, no-c-format
 msgid "&task-print-tot;"
 msgstr "&task-print-tot;"
 
 #. Tag: entry
-#: random-bits.xml:341
+#: random-bits.xml:317
 #, no-c-format
 msgid "SSH server"
 msgstr "SSH 服务器"
 
 #. Tag: entry
-#: random-bits.xml:342
+#: random-bits.xml:318
 #, no-c-format
 msgid "&task-ssh-inst;"
 msgstr "&task-ssh-inst;"
 
 #. Tag: entry
-#: random-bits.xml:343
+#: random-bits.xml:319
 #, no-c-format
 msgid "&task-ssh-dl;"
 msgstr "&task-ssh-dl;"
 
 #. Tag: entry
-#: random-bits.xml:344
+#: random-bits.xml:320
 #, no-c-format
 msgid "&task-ssh-tot;"
 msgstr "&task-ssh-tot;"
 
 #. Tag: para
-#: random-bits.xml:350
+#: random-bits.xml:326
 #, no-c-format
 msgid ""
 "If you install in a language other than English, <command>tasksel</command> "
@@ -748,13 +793,13 @@ msgstr ""
 "同；您应该留有 350MB 以上的空间用来下载和安装。"
 
 #. Tag: title
-#: random-bits.xml:365
+#: random-bits.xml:341
 #, no-c-format
 msgid "Installing &debian-gnu; from a Unix/Linux System"
 msgstr "通过 Unix/Linux 系统来安装 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:367
+#: random-bits.xml:343
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; from an existing Unix or "
@@ -775,7 +820,7 @@ msgstr ""
 "输入的。"
 
 #. Tag: para
-#: random-bits.xml:379
+#: random-bits.xml:355
 #, no-c-format
 msgid ""
 "Once you've got the new &debian; system configured to your preference, you "
@@ -790,7 +835,7 @@ msgstr ""
 "能通过任何引导或者安装介质完成安装的权宜之计。"
 
 #. Tag: para
-#: random-bits.xml:390
+#: random-bits.xml:366
 #, no-c-format
 msgid ""
 "As this is a mostly manual procedure, you should bear in mind that you will "
@@ -808,13 +853,13 @@ msgstr ""
 "还需要额外的安装、或者配置步骤。"
 
 #. Tag: title
-#: random-bits.xml:404
+#: random-bits.xml:380
 #, no-c-format
 msgid "Getting Started"
 msgstr "准备开始"
 
 #. Tag: para
-#: random-bits.xml:405
+#: random-bits.xml:381
 #, no-c-format
 msgid ""
 "With your current *nix partitioning tools, repartition the hard drive as "
@@ -829,7 +874,7 @@ msgstr ""
 "境，还要更多)。"
 
 #. Tag: para
-#: random-bits.xml:413
+#: random-bits.xml:389
 #, no-c-format
 msgid ""
 "Next, create file systems on the partitions. For example, to create an ext3 "
@@ -847,7 +892,7 @@ msgstr ""
 "userinput>。"
 
 #. Tag: para
-#: random-bits.xml:423
+#: random-bits.xml:399
 #, no-c-format
 msgid ""
 "Initialize and activate swap (substitute the partition number for your "
@@ -870,7 +915,7 @@ msgstr ""
 "统)。挂载点的名称是任意的，后面的步骤将会用到。"
 
 #. Tag: screen
-#: random-bits.xml:435
+#: random-bits.xml:411
 #, no-c-format
 msgid ""
 "# mkdir /mnt/debinst\n"
@@ -880,7 +925,7 @@ msgstr ""
 "# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst"
 
 #. Tag: para
-#: random-bits.xml:438
+#: random-bits.xml:414
 #, no-c-format
 msgid ""
 "If you want to have parts of the filesystem (e.g. /usr) mounted on separate "
@@ -891,13 +936,13 @@ msgstr ""
 "手动创建和加载这些目录。"
 
 #. Tag: title
-#: random-bits.xml:448
+#: random-bits.xml:424
 #, no-c-format
 msgid "Install <command>debootstrap</command>"
 msgstr "安装 <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:449
+#: random-bits.xml:425
 #, no-c-format
 msgid ""
 "The utility used by the &debian; installer, and recognized as the official "
@@ -920,7 +965,7 @@ msgstr ""
 "装 <command>debootstrap</command>。"
 
 #. Tag: para
-#: random-bits.xml:479
+#: random-bits.xml:455
 #, no-c-format
 msgid ""
 "Or, you can use the following procedure to install it manually. Make a work "
@@ -945,7 +990,7 @@ msgstr ""
 "些文件安装到系统，您需要 root 权限。"
 
 #. Tag: screen
-#: random-bits.xml:494
+#: random-bits.xml:470
 #, no-c-format
 msgid ""
 "# ar -x debootstrap_0.X.X_all.deb\n"
@@ -957,13 +1002,13 @@ msgstr ""
 "# zcat /full-path-to-work/work/data.tar.gz | tar xv"
 
 #. Tag: title
-#: random-bits.xml:500
+#: random-bits.xml:476
 #, no-c-format
 msgid "Run <command>debootstrap</command>"
 msgstr "运行 <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:501
+#: random-bits.xml:477
 #, no-c-format
 msgid ""
 "<command>debootstrap</command> can download the needed files directly from "
@@ -978,7 +1023,7 @@ msgstr ""
 "<ulink url=\"http://www.debian.org/mirror/list\"></ulink>。"
 
 #. Tag: para
-#: random-bits.xml:510
+#: random-bits.xml:486
 #, no-c-format
 msgid ""
 "If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
@@ -990,7 +1035,7 @@ msgstr ""
 "<userinput>file:/cdrom/debian/</userinput>"
 
 #. Tag: para
-#: random-bits.xml:516
+#: random-bits.xml:492
 #, no-c-format
 msgid ""
 "Substitute one of the following for <replaceable>ARCH</replaceable> in the "
@@ -1008,7 +1053,7 @@ msgstr ""
 "<userinput>ppc64el</userinput>, or <userinput>s390x</userinput>。"
 
 #. Tag: screen
-#: random-bits.xml:532
+#: random-bits.xml:508
 #, no-c-format
 msgid ""
 "# /usr/sbin/debootstrap --arch ARCH &releasename; \\\n"
@@ -1018,13 +1063,13 @@ msgstr ""
 "     /mnt/debinst http://ftp.us.debian.org/debian"
 
 #. Tag: title
-#: random-bits.xml:538
+#: random-bits.xml:514
 #, no-c-format
 msgid "Configure The Base System"
 msgstr "基本系统的配置"
 
 #. Tag: para
-#: random-bits.xml:539
+#: random-bits.xml:515
 #, fuzzy, no-c-format
 #| msgid ""
 #| "Now you've got a real &debian; system, though rather lean, on disk. "
@@ -1052,13 +1097,13 @@ msgstr ""
 "义，例如："
 
 #. Tag: title
-#: random-bits.xml:557
+#: random-bits.xml:533
 #, no-c-format
 msgid "Create device files"
 msgstr "创建设备文件"
 
 #. Tag: para
-#: random-bits.xml:558
+#: random-bits.xml:534
 #, no-c-format
 msgid ""
 "At this point <filename>/dev/</filename> only contains very basic device "
@@ -1075,13 +1120,13 @@ msgstr ""
 "静态设备文件。"
 
 #. Tag: para
-#: random-bits.xml:568
+#: random-bits.xml:544
 #, no-c-format
 msgid "A few of the available options are:"
 msgstr "可以使用的选项有："
 
 #. Tag: para
-#: random-bits.xml:573
+#: random-bits.xml:549
 #, no-c-format
 msgid ""
 "install the makedev package, and create a default set of static device files "
@@ -1089,7 +1134,7 @@ msgid ""
 msgstr "安装 makedev 软件包，并创建默认的静态设备文件，使用(chroot 以后)"
 
 #. Tag: screen
-#: random-bits.xml:577
+#: random-bits.xml:553
 #, no-c-format
 msgid ""
 "# apt-get install makedev\n"
@@ -1103,14 +1148,14 @@ msgstr ""
 "# MAKEDEV generic"
 
 #. Tag: para
-#: random-bits.xml:580
+#: random-bits.xml:556
 #, no-c-format
 msgid ""
 "manually create only specific device files using <command>MAKEDEV</command>"
 msgstr "手动创建指定的设备文件，使用 <command>MAKEDEV</command>"
 
 #. Tag: para
-#: random-bits.xml:585
+#: random-bits.xml:561
 #, no-c-format
 msgid ""
 "bind mount /dev from your host system on top of /dev in the target system; "
@@ -1121,13 +1166,13 @@ msgstr ""
 "postinst 脚本会创建设备文件，所以要小心使用改选项。"
 
 #. Tag: title
-#: random-bits.xml:598
+#: random-bits.xml:574
 #, no-c-format
 msgid "Mount Partitions"
 msgstr "分区的挂载"
 
 #. Tag: para
-#: random-bits.xml:599
+#: random-bits.xml:575
 #, no-c-format
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
@@ -1207,13 +1252,13 @@ msgstr ""
 "<userinput>mount -a</userinput>，请在进入下一步前先将 proc 挂载："
 
 #. Tag: screen
-#: random-bits.xml:625
+#: random-bits.xml:601
 #, no-c-format
 msgid "# mount -t proc proc /proc"
 msgstr "# mount -t proc proc /proc"
 
 #. Tag: para
-#: random-bits.xml:627
+#: random-bits.xml:603
 #, no-c-format
 msgid ""
 "The command <userinput>ls /proc</userinput> should now show a non-empty "
@@ -1224,19 +1269,19 @@ msgstr ""
 "chroot: 以外加载 proc。"
 
 #. Tag: screen
-#: random-bits.xml:633
+#: random-bits.xml:609
 #, no-c-format
 msgid "# mount -t proc proc /mnt/debinst/proc"
 msgstr "# mount -t proc proc /mnt/debinst/proc"
 
 #. Tag: title
-#: random-bits.xml:639
+#: random-bits.xml:615
 #, no-c-format
 msgid "Setting Timezone"
 msgstr "设置时区"
 
 #. Tag: para
-#: random-bits.xml:640
+#: random-bits.xml:616
 #, fuzzy, no-c-format
 #| msgid ""
 #| "An option in the file <filename>/etc/default/rcS</filename> determines "
@@ -1260,7 +1305,7 @@ msgstr ""
 "间解释硬件时钟。下面命令可以让您设定和选择时区。"
 
 #. Tag: screen
-#: random-bits.xml:654
+#: random-bits.xml:630
 #, fuzzy, no-c-format
 #| msgid ""
 #| "# editor /etc/default/rcS\n"
@@ -1271,13 +1316,13 @@ msgstr ""
 "# dpkg-reconfigure tzdata"
 
 #. Tag: title
-#: random-bits.xml:660
+#: random-bits.xml:636
 #, no-c-format
 msgid "Configure Networking"
 msgstr "网络的配置"
 
 #. Tag: para
-#: random-bits.xml:661
+#: random-bits.xml:637
 #, no-c-format
 msgid ""
 "To configure networking, edit <filename>/etc/network/interfaces</filename>, "
@@ -1399,13 +1444,13 @@ msgstr ""
 "with the interface name (eth0, eth1, etc.) that you expect."
 
 #. Tag: title
-#: random-bits.xml:702
+#: random-bits.xml:678
 #, no-c-format
 msgid "Configure Apt"
 msgstr "配置 Apt"
 
 #. Tag: para
-#: random-bits.xml:703
+#: random-bits.xml:679
 #, no-c-format
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
@@ -1430,13 +1475,13 @@ msgstr ""
 "update</userinput>。"
 
 #. Tag: title
-#: random-bits.xml:719
+#: random-bits.xml:695
 #, no-c-format
 msgid "Configure Locales and Keyboard"
 msgstr "本地化和键盘的配置"
 
 #. Tag: para
-#: random-bits.xml:720
+#: random-bits.xml:696
 #, no-c-format
 msgid ""
 "To configure your locale settings to use a language other than English, "
@@ -1454,7 +1499,7 @@ msgstr ""
 "</screen></informalexample> 配置您的键盘(如果需要)："
 
 #. Tag: screen
-#: random-bits.xml:730
+#: random-bits.xml:706
 #, no-c-format
 msgid ""
 "# aptitude install console-setup\n"
@@ -1464,7 +1509,7 @@ msgstr ""
 "# dpkg-reconfigure keyboard-configuration"
 
 #. Tag: para
-#: random-bits.xml:732
+#: random-bits.xml:708
 #, no-c-format
 msgid ""
 "Note that the keyboard cannot be set while in the chroot, but will be "
@@ -1472,13 +1517,13 @@ msgid ""
 msgstr "注意，在 chroot 里面不能设置键盘，但重新启动以后可以。"
 
 #. Tag: title
-#: random-bits.xml:742
+#: random-bits.xml:718
 #, no-c-format
 msgid "Install a Kernel"
 msgstr "内核的安装"
 
 #. Tag: para
-#: random-bits.xml:743
+#: random-bits.xml:719
 #, no-c-format
 msgid ""
 "If you intend to boot this system, you probably want a &arch-kernel; kernel "
@@ -1488,31 +1533,31 @@ msgstr ""
 "以用下面指令找到那些预先打包的内核："
 
 #. Tag: screen
-#: random-bits.xml:748
+#: random-bits.xml:724
 #, no-c-format
 msgid "# apt-cache search &kernelpackage;"
 msgstr "# apt-cache search &kernelpackage;"
 
 #. Tag: para
-#: random-bits.xml:750
+#: random-bits.xml:726
 #, no-c-format
 msgid "Then install the kernel package of your choice using its package name."
 msgstr "然后根据所选取的软件包名称安装内核软件包。"
 
 #. Tag: screen
-#: random-bits.xml:754
+#: random-bits.xml:730
 #, no-c-format
 msgid "# aptitude install &kernelpackage;-<replaceable>arch-etc</replaceable>"
 msgstr "# aptitude install &kernelpackage;-<replaceable>arch-etc</replaceable>"
 
 #. Tag: title
-#: random-bits.xml:760
+#: random-bits.xml:736
 #, no-c-format
 msgid "Set up the Boot Loader"
 msgstr "Boot Loader 的设置"
 
 #. Tag: para
-#: random-bits.xml:761
+#: random-bits.xml:737
 #, no-c-format
 msgid ""
 "To make your &debian-gnu; system bootable, set up your boot loader to load "
@@ -1526,7 +1571,7 @@ msgstr ""
 "成。"
 
 #. Tag: para
-#: random-bits.xml:768
+#: random-bits.xml:744
 #, no-c-format
 msgid ""
 "Check <userinput>info grub</userinput> <phrase arch=\"x86\">or "
@@ -1549,7 +1594,7 @@ msgstr ""
 "<filename>lilo.conf</filename> )</phrase>。"
 
 #. Tag: para
-#: random-bits.xml:780
+#: random-bits.xml:756
 #, no-c-format
 msgid ""
 "Installing and setting up <classname>grub2</classname> is as easy as: "
@@ -1571,7 +1616,7 @@ msgstr ""
 "boot/grub/grub.cfg</filename>。"
 
 #. Tag: para
-#: random-bits.xml:790
+#: random-bits.xml:766
 #, no-c-format
 msgid ""
 "Note that this assumes that a <filename>/dev/hda</filename> device file has "
@@ -1582,13 +1627,13 @@ msgstr ""
 "是安装 <command>grub2</command>，但它不属于本附录讨论范围。"
 
 #. Tag: para
-#: random-bits.xml:796
+#: random-bits.xml:772
 #, 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:800
+#: random-bits.xml:776
 #, no-c-format
 msgid ""
 "boot=/dev/<replaceable>hda6</replaceable>\n"
@@ -1610,7 +1655,7 @@ msgstr ""
 "label=Debian"
 
 #. Tag: para
-#: random-bits.xml:802
+#: random-bits.xml:778
 #, no-c-format
 msgid ""
 "Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
@@ -1627,7 +1672,7 @@ msgstr ""
 "行 ybin (请记住，您在哪个系统里运行 <filename>yaboot.conf</filename> )。"
 
 #. Tag: para
-#: random-bits.xml:812
+#: random-bits.xml:788
 #, no-c-format
 msgid ""
 "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1657,14 +1702,14 @@ msgstr ""
 "userinput> 换成 <userinput>hd:</userinput>。"
 
 #. Tag: title
-#: random-bits.xml:825
+#: random-bits.xml:801
 #, fuzzy, no-c-format
 #| msgid "Remote access: Installing SSH and setting a password"
 msgid "Remote access: Installing SSH and setting up access"
 msgstr "远程访问：安装 SSH 并设置密码"
 
 #. Tag: para
-#: random-bits.xml:826
+#: random-bits.xml:802
 #, no-c-format
 msgid ""
 "In case you can login to the system via console, you can skip this section. "
@@ -1690,7 +1735,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: random-bits.xml:850
+#: random-bits.xml:826
 #, no-c-format
 msgid ""
 "# adduser joe\n"
@@ -1698,13 +1743,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: random-bits.xml:855
+#: random-bits.xml:831
 #, no-c-format
 msgid "Finishing touches"
 msgstr "最后一笔"
 
 #. Tag: para
-#: random-bits.xml:856
+#: random-bits.xml:832
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
@@ -1723,7 +1768,7 @@ msgstr ""
 "装单独的软件包。"
 
 #. Tag: para
-#: random-bits.xml:867
+#: random-bits.xml:843
 #, no-c-format
 msgid ""
 "After the installation there will be a lot of downloaded packages in "
@@ -1734,19 +1779,19 @@ msgstr ""
 "件包。您可以运行下面命令释放空间："
 
 #. Tag: screen
-#: random-bits.xml:873
+#: random-bits.xml:849
 #, no-c-format
 msgid "# aptitude clean"
 msgstr "# aptitude clean"
 
 #. Tag: title
-#: random-bits.xml:884
+#: random-bits.xml:860
 #, no-c-format
 msgid "Installing &debian-gnu; over Parallel Line IP (PLIP)"
 msgstr "通过 Parallel Line IP (PLIP) 来安装 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:886
+#: random-bits.xml:862
 #, no-c-format
 msgid ""
 "This section explains how to install &debian-gnu; on a computer without an "
@@ -1760,7 +1805,7 @@ msgstr ""
 "接到具有 &debian; 镜像的网络(比如，互联网)。"
 
 #. Tag: para
-#: random-bits.xml:894
+#: random-bits.xml:870
 #, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
@@ -1774,7 +1819,7 @@ msgstr ""
 "IP 地址(这些地址在您的网络地址空间里面未被占用)。"
 
 #. Tag: para
-#: random-bits.xml:902
+#: random-bits.xml:878
 #, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
@@ -1785,7 +1830,7 @@ msgstr ""
 "linkend=\"boot-new\"/>)。"
 
 #. Tag: para
-#: random-bits.xml:907
+#: random-bits.xml:883
 #, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
@@ -1797,13 +1842,13 @@ msgstr ""
 "为 <literal>io=0x378</literal>，<literal>irq=7</literal>。"
 
 #. Tag: title
-#: random-bits.xml:917
+#: random-bits.xml:893
 #, no-c-format
 msgid "Requirements"
 msgstr "需求"
 
 #. Tag: para
-#: random-bits.xml:920
+#: random-bits.xml:896
 #, no-c-format
 msgid ""
 "A target computer, called <emphasis>target</emphasis>, where &debian; will "
@@ -1811,13 +1856,13 @@ msgid ""
 msgstr "目标计算机，称为 <emphasis>target</emphasis>，将要安装 &debian;。"
 
 #. Tag: para
-#: random-bits.xml:926
+#: random-bits.xml:902
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr "系统安装介质；参阅 <xref linkend=\"installation-media\"/>。"
 
 #. Tag: para
-#: random-bits.xml:931
+#: random-bits.xml:907
 #, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
@@ -1826,7 +1871,7 @@ msgstr ""
 "另外一台连接到互联网的计算机，称为 <emphasis>source</emphasis>，功能是网关。"
 
 #. Tag: para
-#: random-bits.xml:937
+#: random-bits.xml:913
 #, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -1837,13 +1882,13 @@ msgstr ""
 "Install-HOWTO</ulink> 了解这种线的更多信息，以及如何自己制作。"
 
 #. Tag: title
-#: random-bits.xml:949
+#: random-bits.xml:925
 #, no-c-format
 msgid "Setting up source"
 msgstr "建立源"
 
 #. Tag: para
-#: random-bits.xml:950
+#: random-bits.xml:926
 #, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
@@ -1853,7 +1898,7 @@ msgstr ""
 "算机。"
 
 #. Tag: screen
-#: random-bits.xml:955
+#: random-bits.xml:931
 #, no-c-format
 msgid ""
 "#!/bin/sh\n"
@@ -1895,13 +1940,13 @@ msgstr ""
 "echo 1 > /proc/sys/net/ipv4/ip_forward"
 
 #. Tag: title
-#: random-bits.xml:961
+#: random-bits.xml:937
 #, no-c-format
 msgid "Installing target"
 msgstr "安装目标"
 
 #. Tag: para
-#: random-bits.xml:962
+#: random-bits.xml:938
 #, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
@@ -1925,13 +1970,13 @@ msgstr ""
 "</screen></informalexample> 下面是安装过程中各阶段所要提供的答案。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:981
+#: random-bits.xml:957
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr "从光盘加载安装组件"
 
 #. Tag: para
-#: random-bits.xml:983
+#: random-bits.xml:959
 #, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -1941,13 +1986,13 @@ msgstr ""
 "用 PLIP 驱动。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:991
+#: random-bits.xml:967
 #, no-c-format
 msgid "Detect network hardware"
 msgstr "侦测网络硬件"
 
 #. Tag: para
-#: random-bits.xml:996
+#: random-bits.xml:972
 #, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -1960,7 +2005,7 @@ msgstr ""
 "系统没有网卡，安装程序不会显示该列表。"
 
 #. Tag: para
-#: random-bits.xml:1005
+#: random-bits.xml:981
 #, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
@@ -1971,19 +2016,19 @@ msgstr ""
 "<userinput>plip</userinput> 模块。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:1017
+#: random-bits.xml:993
 #, no-c-format
 msgid "Configure the network"
 msgstr "配置网络"
 
 #. Tag: para
-#: random-bits.xml:1020
+#: random-bits.xml:996
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr "Auto-configure network with DHCP: No"
 
 #. Tag: para
-#: random-bits.xml:1025
+#: random-bits.xml:1001
 #, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -1991,7 +2036,7 @@ msgstr ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:1030
+#: random-bits.xml:1006
 #, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -2001,7 +2046,7 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: random-bits.xml:1036
+#: random-bits.xml:1012
 #, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
@@ -2011,13 +2056,13 @@ msgstr ""
 "resolv.conf</filename>)"
 
 #. Tag: title
-#: random-bits.xml:1055
+#: random-bits.xml:1031
 #, no-c-format
 msgid "Installing &debian-gnu; using PPP over Ethernet (PPPoE)"
 msgstr "通过 PPP over Ethernet (PPPPoE) 来安装 &debian-gnu;"
 
 #. Tag: para
-#: random-bits.xml:1057
+#: random-bits.xml:1033
 #, no-c-format
 msgid ""
 "In some countries PPP over Ethernet (PPPoE) is a common protocol for "
@@ -2031,7 +2076,7 @@ msgstr ""
 "本节将说明操作方法。"
 
 #. Tag: para
-#: random-bits.xml:1065
+#: random-bits.xml:1041
 #, no-c-format
 msgid ""
 "The PPPoE connection set up during the installation will also be available "
@@ -2042,7 +2087,7 @@ msgstr ""
 "linkend=\"boot-new\"/>)。"
 
 #. Tag: para
-#: random-bits.xml:1070
+#: random-bits.xml:1046
 #, no-c-format
 msgid ""
 "To have the option of setting up and using PPPoE during the installation, "
@@ -2055,7 +2100,7 @@ msgstr ""
 "phrase>)。"
 
 #. Tag: para
-#: random-bits.xml:1077
+#: random-bits.xml:1053
 #, no-c-format
 msgid ""
 "Installing over PPPoE is mostly the same as any other installation. The "
@@ -2063,7 +2108,7 @@ msgid ""
 msgstr "通过 PPPoE 进行安装，绝大部分与其他方式相同。下面步骤说明不同之处。"
 
 #. Tag: para
-#: random-bits.xml:1085
+#: random-bits.xml:1061
 #, no-c-format
 msgid ""
 "Boot the installer with the boot parameter <userinput>modules=ppp-udeb</"
@@ -2078,7 +2123,7 @@ msgstr ""
 "udeb</classname>) 会被加载并自动运行。"
 
 #. Tag: para
-#: random-bits.xml:1100
+#: random-bits.xml:1076
 #, no-c-format
 msgid ""
 "Follow the regular initial steps of the installation (language, country and "
@@ -2096,7 +2141,7 @@ msgstr ""
 "footnote>)。"
 
 #. Tag: para
-#: random-bits.xml:1119
+#: random-bits.xml:1095
 #, no-c-format
 msgid ""
 "The next step is the detection of network hardware, in order to identify any "
@@ -2104,7 +2149,7 @@ msgid ""
 msgstr "下一步是侦测网络硬件，目的是识别当前系统中的网卡。"
 
 #. Tag: para
-#: random-bits.xml:1125
+#: random-bits.xml:1101
 #, no-c-format
 msgid ""
 "After this the actual setup of PPPoE is started. The installer will probe "
@@ -2115,7 +2160,7 @@ msgstr ""
 "处理 PPPoE 连接的服务器)。"
 
 #. Tag: para
-#: random-bits.xml:1131
+#: random-bits.xml:1107
 #, no-c-format
 msgid ""
 "It is possible that the concentrator will not to be found at the first "
@@ -2129,7 +2174,7 @@ msgstr ""
 "<guimenuitem>Configure and start a PPPoE connection</guimenuitem>。"
 
 #. Tag: para
-#: random-bits.xml:1140
+#: random-bits.xml:1116
 #, no-c-format
 msgid ""
 "After a concentrator is found, the user will be prompted to type the login "
@@ -2137,7 +2182,7 @@ msgid ""
 msgstr "连接找到之后，用户需要提供登录信息(PPPoE 用户名和密码)。"
 
 #. Tag: para
-#: random-bits.xml:1146
+#: random-bits.xml:1122
 #, no-c-format
 msgid ""
 "At this point the installer will use the provided information to establish "
@@ -2154,6 +2199,14 @@ msgstr ""
 "and start PPPoE connection</guimenuitem> 菜单项重新配置。"
 
 #~ 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 disk space."
+#~ msgstr ""
+#~ "便携机(Laptop)任务与桌面环境任务有大量重复的内容，如果两个都安装，便携机任"
+#~ "务只需要很小的额外空间。"
+
+#~ msgid ""
 #~ "In case you can login to the system via console, you can skip this "
 #~ "section. If the system should be accessible via the network later on, you "
 #~ "need to install SSH and set a password for root:"