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

1 files changed, 272 insertions, 344 deletions

diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 57887947b..7a4367da5 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: 2007-01-22 23:21+0000\n"
+"POT-Creation-Date: 2007-01-23 19:59+0000\n"
 "PO-Revision-Date: 2007-01-12 11:00+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -400,20 +400,20 @@ msgid "Disk Space Needed for Tasks"
 msgstr "各软件集所需的磁盘空间"
 
 #. Tag: para
-#: random-bits.xml:215
+#: random-bits.xml:199
 #, no-c-format
 msgid ""
 "A standard installation for the i386 architecture, including all standard "
-"packages and using the default 2.6 kernel, takes up &std-system-size;MB of disk space. A "
-"minimal base installation, without the <quote>Standard system</quote> task "
-"selected, will take &base-system-size;MB."
+"packages and using the default 2.6 kernel, takes up &std-system-size;MB of "
+"disk space. A minimal base installation, without the <quote>Standard system</"
+"quote> task selected, will take &base-system-size;MB."
 msgstr ""
-"对于 i386 架构，基本安装默认使用 2.6 内核，包含了所有的标准软件包，需要 "
-"&std-system-size;MB 磁盘空间。最小化的基本安装，没有选择 <quote>Standard system</quote> 任"
-"务，需要 &base-system-size;MB。"
+"对于 i386 架构，基本安装默认使用 2.6 内核，包含了所有的标准软件包，需要 &std-"
+"system-size;MB 磁盘空间。最小化的基本安装，没有选择 <quote>Standard system</"
+"quote> 任务，需要 &base-system-size;MB。"
 
 #. Tag: para
-#: random-bits.xml:223
+#: random-bits.xml:207
 #, no-c-format
 msgid ""
 "In both cases this is the actual disk space used <emphasis>after</emphasis> "
@@ -427,7 +427,7 @@ msgstr ""
 "装和使用<emphasis>过程中</emphasis>，都会需要更多的磁盘空间。"
 
 #. Tag: para
-#: random-bits.xml:232
+#: random-bits.xml:216
 #, no-c-format
 msgid ""
 "The following table lists sizes reported by aptitude for the tasks listed in "
@@ -440,7 +440,7 @@ msgstr ""
 "装后所占的空间，可能会小于这两个软件集分别安装所占的空间。"
 
 #. Tag: para
-#: random-bits.xml:239
+#: random-bits.xml:223
 #, no-c-format
 msgid ""
 "Note that you will need to add the sizes listed in the table to the size of "
@@ -456,61 +456,61 @@ msgstr ""
 "地)用在 <filename>/var</filename> 里面。"
 
 #. Tag: entry
-#: random-bits.xml:253
+#: random-bits.xml:237
 #, no-c-format
 msgid "Task"
 msgstr "任务"
 
 #. Tag: entry
-#: random-bits.xml:254
+#: random-bits.xml:238
 #, no-c-format
 msgid "Installed size (MB)"
 msgstr "安装尺寸 (MB)"
 
 #. Tag: entry
-#: random-bits.xml:255
+#: random-bits.xml:239
 #, no-c-format
 msgid "Download size (MB)"
 msgstr "下载尺寸 (MB)"
 
 #. Tag: entry
-#: random-bits.xml:256
+#: random-bits.xml:240
 #, no-c-format
 msgid "Space needed to install (MB)"
 msgstr "用于安装所需空间 (MB)"
 
 #. Tag: entry
-#: random-bits.xml:262
+#: random-bits.xml:246
 #, no-c-format
 msgid "Desktop environment"
 msgstr "桌面环境"
 
 #. Tag: entry
-#: random-bits.xml:263
+#: random-bits.xml:247
 #, no-c-format
-msgid "1267"
-msgstr "1267"
+msgid "&task-desktop-inst;"
+msgstr "&task-desktop-inst;"
 
 #. Tag: entry
-#: random-bits.xml:264
+#: random-bits.xml:248
 #, no-c-format
-msgid "<entry>420</entry>"
-msgstr "<entry>420</entry>"
+msgid "&task-desktop-dl;"
+msgstr "&task-desktop-dl;"
 
 #. Tag: entry
-#: random-bits.xml:265
+#: random-bits.xml:249
 #, no-c-format
-msgid "1667"
-msgstr "1667"
+msgid "&task-desktop-tot;"
+msgstr "&task-desktop-tot;"
 
 #. Tag: entry
-#: random-bits.xml:269
+#: random-bits.xml:253
 #, no-c-format
 msgid "Laptop"
 msgstr "便携机"
 
 #. Tag: para
-#: random-bits.xml:271
+#: random-bits.xml:255
 #, no-c-format
 msgid ""
 "There is a large overlap of the Laptop task with the Destop environment "
@@ -521,169 +521,169 @@ msgstr ""
 "只需要很小的额外空间。"
 
 #. Tag: entry
-#: random-bits.xml:278
+#: random-bits.xml:262
 #, no-c-format
-msgid "<entry>50</entry>"
-msgstr "<entry>50</entry>"
+msgid "&task-laptop-inst;"
+msgstr "&task-laptop-inst;"
 
 #. Tag: entry
-#: random-bits.xml:279
+#: random-bits.xml:263
 #, no-c-format
-msgid "<entry>17</entry>"
-msgstr "<entry>17</entry>"
+msgid "&task-laptop-dl;"
+msgstr "&task-laptop-dl;"
 
 #. Tag: entry
-#: random-bits.xml:280
+#: random-bits.xml:264
 #, no-c-format
-msgid "<entry>67</entry>"
-msgstr "<entry>67</entry>"
+msgid "&task-laptop-tot;"
+msgstr "&task-laptop-tot;"
 
 #. Tag: entry
-#: random-bits.xml:284
+#: random-bits.xml:268
 #, no-c-format
 msgid "Web server"
 msgstr "Web 服务器"
 
 #. Tag: entry
-#: random-bits.xml:285
+#: random-bits.xml:269
 #, no-c-format
-msgid "<entry>35</entry>"
-msgstr "<entry>35</entry>"
+msgid "&task-web-inst;"
+msgstr "&task-web-inst;"
 
 #. Tag: entry
-#: random-bits.xml:286
+#: random-bits.xml:270
 #, no-c-format
-msgid "<entry>11</entry>"
-msgstr "<entry>11</entry>"
+msgid "&task-web-dl;"
+msgstr "&task-web-dl;"
 
 #. Tag: entry
-#: random-bits.xml:287
+#: random-bits.xml:271
 #, no-c-format
-msgid "<entry>46</entry>"
-msgstr "<entry>46</entry>"
+msgid "&task-web-tot;"
+msgstr "&task-web-tot;"
 
 #. Tag: entry
-#: random-bits.xml:291
+#: random-bits.xml:275
 #, no-c-format
 msgid "Print server"
 msgstr "打印服务器"
 
 #. Tag: entry
-#: random-bits.xml:292
+#: random-bits.xml:276
 #, no-c-format
-msgid "<entry>277</entry>"
-msgstr "<entry>277</entry>"
+msgid "&task-print-inst;"
+msgstr "&task-print-inst;"
 
 #. Tag: entry
-#: random-bits.xml:293
+#: random-bits.xml:277
 #, no-c-format
-msgid "<entry>79</entry>"
-msgstr "<entry>79</entry>"
+msgid "&task-print-dl;"
+msgstr "&task-print-dl;"
 
 #. Tag: entry
-#: random-bits.xml:294
+#: random-bits.xml:278
 #, no-c-format
-msgid "<entry>356</entry>"
-msgstr "<entry>356</entry>"
+msgid "&task-print-tot;"
+msgstr "&task-print-tot;"
 
 #. Tag: entry
-#: random-bits.xml:298
+#: random-bits.xml:282
 #, no-c-format
 msgid "DNS server"
 msgstr "DNS 服务器"
 
 #. Tag: entry
-#: random-bits.xml:299
+#: random-bits.xml:283
 #, no-c-format
-msgid "<entry>2</entry>"
-msgstr "<entry>2</entry>"
+msgid "&task-dns-inst;"
+msgstr "&task-dns-inst;"
 
 #. Tag: entry
-#: random-bits.xml:300
+#: random-bits.xml:284
 #, no-c-format
-msgid "<entry>1</entry>"
-msgstr "<entry>1</entry>"
+msgid "&task-dns-dl;"
+msgstr "&task-dns-dl;"
 
 #. Tag: entry
-#: random-bits.xml:301
+#: random-bits.xml:285
 #, no-c-format
-msgid "<entry>3</entry>"
-msgstr "<entry>3</entry>"
+msgid "&task-dns-tot;"
+msgstr "&task-dns-tot;"
 
 #. Tag: entry
-#: random-bits.xml:305
+#: random-bits.xml:289
 #, no-c-format
 msgid "File server"
 msgstr "文件服务器"
 
 #. Tag: entry
-#: random-bits.xml:306
+#: random-bits.xml:290
 #, no-c-format
-msgid "<entry>49</entry>"
-msgstr "<entry>49</entry>"
+msgid "&task-file-inst;"
+msgstr "&task-file-inst;"
 
 #. Tag: entry
-#: random-bits.xml:307
+#: random-bits.xml:291
 #, no-c-format
-msgid "<entry>21</entry>"
-msgstr "<entry>21</entry>"
+msgid "&task-file-dl;"
+msgstr "&task-file-dl;"
 
 #. Tag: entry
-#: random-bits.xml:308
+#: random-bits.xml:292
 #, no-c-format
-msgid "<entry>70</entry>"
-msgstr "<entry>70</entry>"
+msgid "&task-file-tot;"
+msgstr "&task-file-tot;"
 
 #. Tag: entry
-#: random-bits.xml:312
+#: random-bits.xml:296
 #, no-c-format
 msgid "Mail server"
 msgstr "邮件服务器"
 
 #. Tag: entry
-#: random-bits.xml:313
+#: random-bits.xml:297
 #, no-c-format
-msgid "<entry>13</entry>"
-msgstr "<entry>13</entry>"
+msgid "&task-mail-inst;"
+msgstr "&task-mail-inst;"
 
 #. Tag: entry
-#: random-bits.xml:314
+#: random-bits.xml:298
 #, no-c-format
-msgid "<entry>5</entry>"
-msgstr "<entry>5</entry>"
+msgid "&task-mail-dl;"
+msgstr "&task-mail-dl;"
 
 #. Tag: entry
-#: random-bits.xml:315
+#: random-bits.xml:299
 #, no-c-format
-msgid "<entry>18</entry>"
-msgstr "<entry>18</entry>"
+msgid "&task-mail-tot;"
+msgstr "&task-mail-tot;"
 
 #. Tag: entry
-#: random-bits.xml:319
+#: random-bits.xml:303
 #, no-c-format
 msgid "SQL database"
 msgstr "SQL 数据库"
 
 #. Tag: entry
-#: random-bits.xml:320
+#: random-bits.xml:304
 #, no-c-format
-msgid "<entry>24</entry>"
-msgstr "<entry>24</entry>"
+msgid "&task-sql-inst;"
+msgstr "&task-sql-inst;"
 
 #. Tag: entry
-#: random-bits.xml:321
+#: random-bits.xml:305
 #, no-c-format
-msgid "<entry>8</entry>"
-msgstr "<entry>8</entry>"
+msgid "&task-sql-dl;"
+msgstr "&task-sql-dl;"
 
 #. Tag: entry
-#: random-bits.xml:322
+#: random-bits.xml:306
 #, no-c-format
-msgid "<entry>32</entry>"
-msgstr "<entry>32</entry>"
+msgid "&task-sql-tot;"
+msgstr "&task-sql-tot;"
 
 #. Tag: para
-#: random-bits.xml:328
+#: random-bits.xml:312
 #, no-c-format
 msgid ""
 "The <emphasis>Desktop</emphasis> task will install the GNOME desktop "
@@ -691,7 +691,7 @@ msgid ""
 msgstr "<emphasis>桌面</emphasis> 任务将同时安装 GNOME 桌面环境。"
 
 #. Tag: para
-#: random-bits.xml:335
+#: random-bits.xml:319
 #, no-c-format
 msgid ""
 "If you install in a language other than English, <command>tasksel</command> "
@@ -704,13 +704,13 @@ msgstr ""
 "的空间不同；您应该留有 350MB 以上的空间用来下载和安装。"
 
 #. Tag: title
-#: random-bits.xml:350
+#: random-bits.xml:334
 #, no-c-format
 msgid "Installing &debian; from a Unix/Linux System"
 msgstr "通过 Unix/Linux 系统来安装 &debian;"
 
 #. Tag: para
-#: random-bits.xml:352
+#: random-bits.xml:336
 #, no-c-format
 msgid ""
 "This section explains how to install &debian; from an existing Unix or Linux "
@@ -731,7 +731,7 @@ msgstr ""
 "中输入的。"
 
 #. Tag: para
-#: random-bits.xml:364
+#: random-bits.xml:348
 #, no-c-format
 msgid ""
 "Once you've got the new Debian system configured to your preference, you can "
@@ -746,13 +746,13 @@ msgstr ""
 "过任何引导或者安装介质完成安装的权宜之计。"
 
 #. Tag: title
-#: random-bits.xml:376
+#: random-bits.xml:360
 #, no-c-format
 msgid "Getting Started"
 msgstr "准备开始"
 
 #. Tag: para
-#: random-bits.xml:377
+#: random-bits.xml:361
 #, no-c-format
 msgid ""
 "With your current *nix partitioning tools, repartition the hard drive as "
@@ -766,7 +766,7 @@ msgstr ""
 "空间了(安装 GNOME 或 KDE 这样的桌面环境，还要更多)。"
 
 #. Tag: para
-#: random-bits.xml:385
+#: random-bits.xml:369
 #, no-c-format
 msgid ""
 "Next, create file systems on the partitions. For example, to create an ext3 "
@@ -784,7 +784,7 @@ msgstr ""
 "userinput>。"
 
 #. Tag: para
-#: random-bits.xml:395
+#: random-bits.xml:379
 #, no-c-format
 msgid ""
 "Initialize and activate swap (substitute the partition number for your "
@@ -807,7 +807,7 @@ msgstr ""
 "统)。挂载点的名称是任意的，后面的步骤将会用到它。"
 
 #. Tag: screen
-#: random-bits.xml:407
+#: random-bits.xml:391
 #, no-c-format
 msgid ""
 "# mkdir /mnt/debinst\n"
@@ -817,7 +817,7 @@ msgstr ""
 "# mount /dev/<replaceable>hda6</replaceable> /mnt/debinst"
 
 #. Tag: para
-#: random-bits.xml:410
+#: random-bits.xml:394
 #, no-c-format
 msgid ""
 "If you want to have parts of the filesystem (e.g. /usr) mounted on separate "
@@ -828,13 +828,13 @@ msgstr ""
 "手动创建和加载这些目录。"
 
 #. Tag: title
-#: random-bits.xml:420
+#: random-bits.xml:404
 #, no-c-format
 msgid "Install <command>debootstrap</command>"
 msgstr "安装 <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:421
+#: random-bits.xml:405
 #, no-c-format
 msgid ""
 "The utility used by the Debian installer, and recognized as the official way "
@@ -857,7 +857,7 @@ msgstr ""
 "<command>debootstrap</command>。"
 
 #. Tag: para
-#: random-bits.xml:451
+#: random-bits.xml:435
 #, no-c-format
 msgid ""
 "Or, you can use the following procedure to install it manually. Make a work "
@@ -882,7 +882,7 @@ msgstr ""
 "并解压获得该文件。把二进制文件安装到系统中，您必须要拥有 root 的权限。"
 
 #. Tag: screen
-#: random-bits.xml:466
+#: random-bits.xml:450
 #, no-c-format
 msgid ""
 "# ar -x debootstrap_0.X.X_all.deb\n"
@@ -894,13 +894,13 @@ msgstr ""
 "# zcat /full-path-to-work/work/data.tar.gz | tar xv"
 
 #. Tag: title
-#: random-bits.xml:472
+#: random-bits.xml:456
 #, no-c-format
 msgid "Run <command>debootstrap</command>"
 msgstr "运行 <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:473
+#: random-bits.xml:457
 #, fuzzy, no-c-format
 msgid ""
 "<command>debootstrap</command> can download the needed files directly from "
@@ -916,7 +916,7 @@ msgstr ""
 "README.mirrors\"></ulink>。"
 
 #. Tag: para
-#: random-bits.xml:482
+#: random-bits.xml:466
 #, no-c-format
 msgid ""
 "If you have a &releasename; &debian; CD mounted at <filename>/cdrom</"
@@ -928,7 +928,7 @@ msgstr ""
 "debian/</userinput>"
 
 #. Tag: para
-#: random-bits.xml:488
+#: random-bits.xml:472
 #, no-c-format
 msgid ""
 "Substitute one of the following for <replaceable>ARCH</replaceable> in the "
@@ -948,7 +948,7 @@ msgstr ""
 "<userinput>sparc</userinput>。"
 
 #. Tag: screen
-#: random-bits.xml:506
+#: random-bits.xml:490
 #, no-c-format
 msgid ""
 "# /usr/sbin/debootstrap --arch ARCH &releasename; \\\n"
@@ -958,13 +958,13 @@ msgstr ""
 "     /mnt/debinst http://ftp.us.debian.org/debian"
 
 #. Tag: title
-#: random-bits.xml:512
+#: random-bits.xml:496
 #, no-c-format
 msgid "Configure The Base System"
 msgstr "基系统的配置"
 
 #. Tag: para
-#: random-bits.xml:513
+#: random-bits.xml:497
 #, no-c-format
 msgid ""
 "Now you've got a real Debian system, though rather lean, on disk. "
@@ -980,19 +980,19 @@ msgstr ""
 "例如："
 
 #. Tag: screen
-#: random-bits.xml:523
+#: random-bits.xml:507
 #, no-c-format
 msgid "# export TERM=<replaceable>xterm-color</replaceable>"
 msgstr "# export TERM=<replaceable>xterm-color</replaceable>"
 
 #. Tag: title
-#: random-bits.xml:528
+#: random-bits.xml:512
 #, no-c-format
 msgid "Mount Partitions"
 msgstr "分区的挂载"
 
 #. Tag: para
-#: random-bits.xml:529
+#: random-bits.xml:513
 #, no-c-format
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
@@ -1072,13 +1072,13 @@ msgstr ""
 "<userinput>mount -a</userinput>，请在下步前先将 proc 挂载："
 
 #. Tag: screen
-#: random-bits.xml:555
+#: random-bits.xml:539
 #, no-c-format
 msgid "# mount -t proc proc /proc"
 msgstr "# mount -t proc proc /proc"
 
 #. Tag: para
-#: random-bits.xml:557
+#: random-bits.xml:541
 #, no-c-format
 msgid ""
 "The command <userinput>ls /proc</userinput> should now show a non-empty "
@@ -1089,19 +1089,19 @@ msgstr ""
 "chroot: 以为加载 proc。"
 
 #. Tag: screen
-#: random-bits.xml:563
+#: random-bits.xml:547
 #, no-c-format
 msgid "# mount -t proc proc /mnt/debinst/proc"
 msgstr "# mount -t proc proc /mnt/debinst/proc"
 
 #. Tag: title
-#: random-bits.xml:569
+#: random-bits.xml:553
 #, no-c-format
 msgid "Setting Timezone"
 msgstr "设置时区"
 
 #. Tag: para
-#: random-bits.xml:570
+#: random-bits.xml:554
 #, no-c-format
 msgid ""
 "An option in the file <filename>/etc/default/rcS</filename> determines "
@@ -1115,7 +1115,7 @@ msgstr ""
 "timezone."
 
 #. Tag: screen
-#: random-bits.xml:577
+#: random-bits.xml:561
 #, no-c-format
 msgid ""
 "# editor /etc/default/rcS\n"
@@ -1125,13 +1125,13 @@ msgstr ""
 "# tzconfig"
 
 #. Tag: title
-#: random-bits.xml:583
+#: random-bits.xml:567
 #, no-c-format
 msgid "Configure Networking"
 msgstr "网络的配置"
 
 #. Tag: para
-#: random-bits.xml:584
+#: random-bits.xml:568
 #, no-c-format
 msgid ""
 "To configure networking, edit <filename>/etc/network/interfaces</filename>, "
@@ -1250,13 +1250,13 @@ msgstr ""
 "每块网卡就能获得所预期的 interface 名称了(eth0、eth1 等等)。"
 
 #. Tag: title
-#: random-bits.xml:625
+#: random-bits.xml:609
 #, no-c-format
 msgid "Configure Apt"
 msgstr "配置 Apt"
 
 #. Tag: para
-#: random-bits.xml:626
+#: random-bits.xml:610
 #, no-c-format
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
@@ -1281,13 +1281,13 @@ msgstr ""
 "update</userinput>。"
 
 #. Tag: title
-#: random-bits.xml:642
+#: random-bits.xml:626
 #, no-c-format
 msgid "Configure Locales and Keyboard"
 msgstr "本地化和键盘的配置"
 
 #. Tag: para
-#: random-bits.xml:643
+#: random-bits.xml:627
 #, no-c-format
 msgid ""
 "To configure your locale settings to use a language other than English, "
@@ -1305,7 +1305,7 @@ msgstr ""
 "</screen></informalexample> 要配置您的键盘(如果需要)："
 
 #. Tag: screen
-#: random-bits.xml:653
+#: random-bits.xml:637
 #, no-c-format
 msgid ""
 "# aptitude install console-data\n"
@@ -1315,7 +1315,7 @@ msgstr ""
 "# dpkg-reconfigure console-data"
 
 #. Tag: para
-#: random-bits.xml:655
+#: random-bits.xml:639
 #, no-c-format
 msgid ""
 "Note that the keyboard cannot be set while in the chroot, but will be "
@@ -1323,13 +1323,13 @@ msgid ""
 msgstr "注意，在 chroot 里面不能设置键盘，但重新启动以后可以。"
 
 #. Tag: title
-#: random-bits.xml:665
+#: random-bits.xml:649
 #, no-c-format
 msgid "Install a Kernel"
 msgstr "内核的安装"
 
 #. Tag: para
-#: random-bits.xml:666
+#: random-bits.xml:650
 #, no-c-format
 msgid ""
 "If you intend to boot this system, you probably want a Linux kernel and a "
@@ -1339,13 +1339,13 @@ msgstr ""
 "指令找到那些预先打包的内核："
 
 #. Tag: screen
-#: random-bits.xml:671
+#: random-bits.xml:655
 #, no-c-format
 msgid "# apt-cache search linux-image"
 msgstr "# apt-cache search linux-image"
 
 #. Tag: para
-#: random-bits.xml:673
+#: random-bits.xml:657
 #, no-c-format
 msgid ""
 "If you intend to use a pre-packaged kernel, you may want to create the "
@@ -1356,7 +1356,7 @@ msgstr ""
 "conf</filename> 配置文件。这里是一个示例文件："
 
 #. Tag: screen
-#: random-bits.xml:679
+#: random-bits.xml:663
 #, no-c-format
 msgid ""
 "# Kernel image management overrides\n"
@@ -1378,7 +1378,7 @@ msgstr ""
 "link_in_boot = no"
 
 #. Tag: para
-#: random-bits.xml:681
+#: random-bits.xml:665
 #, no-c-format
 msgid ""
 "For detailed information about this file and the various options, consult "
@@ -1390,7 +1390,7 @@ msgstr ""
 "件包后参考其手册(man)。我们建议您使用适合您系统的值。"
 
 #. Tag: para
-#: random-bits.xml:688
+#: random-bits.xml:672
 #, no-c-format
 msgid ""
 "Then install the kernel package of your choice using its package name. "
@@ -1408,13 +1408,13 @@ msgstr ""
 "etc/kernel-img.conf</filename> 文件，安装时会被问到相关的问题。"
 
 #. Tag: title
-#: random-bits.xml:702
+#: random-bits.xml:686
 #, no-c-format
 msgid "Set up the Boot Loader"
 msgstr "Boot Loader 的设置"
 
 #. Tag: para
-#: random-bits.xml:703
+#: random-bits.xml:687
 #, no-c-format
 msgid ""
 "To make your &debian; system bootable, set up your boot loader to load the "
@@ -1427,7 +1427,7 @@ msgstr ""
 "loader，因此您要在 Debian 的 chroot 中使用 <command>aptitude</command> 完成。"
 
 #. Tag: para
-#: random-bits.xml:710
+#: random-bits.xml:694
 #, no-c-format
 msgid ""
 "Check <userinput>info grub</userinput> or <userinput>man lilo.conf</"
@@ -1448,7 +1448,7 @@ msgstr ""
 "哪个系统里的 <filename>lilo.conf</filename>)。"
 
 #. Tag: para
-#: random-bits.xml:722
+#: random-bits.xml:706
 #, no-c-format
 msgid ""
 "Installing and setting up <classname>grub</classname> is as easy as: "
@@ -1470,13 +1470,13 @@ msgstr ""
 "boot/grub/menu.lst</filename>。"
 
 #. Tag: para
-#: random-bits.xml:732
+#: random-bits.xml:716
 #, 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:736
+#: random-bits.xml:720
 #, no-c-format
 msgid ""
 "boot=/dev/<replaceable>hda6</replaceable>\n"
@@ -1496,7 +1496,7 @@ msgstr ""
 "label=Debian"
 
 #. Tag: para
-#: random-bits.xml:738
+#: random-bits.xml:722
 #, no-c-format
 msgid ""
 "Depending on which bootloader you selected, you can now make some additional "
@@ -1506,7 +1506,7 @@ msgstr ""
 "做一些修改。"
 
 #. Tag: para
-#: random-bits.xml:743
+#: random-bits.xml:727
 #, no-c-format
 msgid ""
 "For the <classname>grub</classname> bootloader, you should set the "
@@ -1530,7 +1530,7 @@ msgstr ""
 "<literal>do_bootloader</literal> 的值应保留为 <quote>yes</quote>。"
 
 #. Tag: para
-#: random-bits.xml:755
+#: random-bits.xml:739
 #, no-c-format
 msgid ""
 "Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
@@ -1548,7 +1548,7 @@ msgstr ""
 "filename> )。"
 
 #. Tag: para
-#: random-bits.xml:765
+#: random-bits.xml:749
 #, no-c-format
 msgid ""
 "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1578,13 +1578,13 @@ msgstr ""
 "userinput> 换成 <userinput>hd:</userinput>。"
 
 #. Tag: title
-#: random-bits.xml:778
+#: random-bits.xml:762
 #, no-c-format
 msgid "Finishing touches"
 msgstr "最后一笔"
 
 #. Tag: para
-#: random-bits.xml:779
+#: random-bits.xml:763
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed system will be very basic. If you would "
@@ -1603,7 +1603,7 @@ msgstr ""
 "装单独的软件包。"
 
 #. Tag: para
-#: random-bits.xml:790
+#: random-bits.xml:774
 #, no-c-format
 msgid ""
 "After the installation there will be a lot of downloaded packages in "
@@ -1614,19 +1614,19 @@ msgstr ""
 "件包。您可以运行下面命令释放空间："
 
 #. Tag: screen
-#: random-bits.xml:796
+#: random-bits.xml:780
 #, no-c-format
 msgid "# aptitude clean"
 msgstr "# aptitude clean"
 
 #. Tag: title
-#: random-bits.xml:807
+#: random-bits.xml:791
 #, no-c-format
 msgid "Installing &debian; over Parallel Line IP (PLIP)"
 msgstr "通过 Parallel Line IP (PLIP) 来安装 &debian;"
 
 #. Tag: para
-#: random-bits.xml:809
+#: random-bits.xml:793
 #, no-c-format
 msgid ""
 "This section explains how to install &debian; on a computer without an "
@@ -1639,7 +1639,7 @@ msgstr ""
 "具有 Debian 镜像的网络(例如，互联网)。"
 
 #. Tag: para
-#: random-bits.xml:817
+#: random-bits.xml:801
 #, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
@@ -1653,7 +1653,7 @@ msgstr ""
 "IP 地址(这些地址在您的网络地址空间里面未被占用)。"
 
 #. Tag: para
-#: random-bits.xml:825
+#: random-bits.xml:809
 #, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
@@ -1664,7 +1664,7 @@ msgstr ""
 "linkend=\"boot-new\"/>)。"
 
 #. Tag: para
-#: random-bits.xml:830
+#: random-bits.xml:814
 #, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
@@ -1676,13 +1676,13 @@ msgstr ""
 "为 <literal>io=0x378</literal>，<literal>irq=7</literal>。"
 
 #. Tag: title
-#: random-bits.xml:840
+#: random-bits.xml:824
 #, no-c-format
 msgid "Requirements"
 msgstr "需求"
 
 #. Tag: para
-#: random-bits.xml:843
+#: random-bits.xml:827
 #, no-c-format
 msgid ""
 "A target computer, called <emphasis>target</emphasis>, where Debian will be "
@@ -1690,13 +1690,13 @@ msgid ""
 msgstr "目标计算机，称为 <emphasis>target</emphasis>，将安装 Debian 在上面。"
 
 #. Tag: para
-#: random-bits.xml:849
+#: random-bits.xml:833
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr "系统安装介质；参阅 <xref linkend=\"installation-media\"/>。"
 
 #. Tag: para
-#: random-bits.xml:854
+#: random-bits.xml:838
 #, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
@@ -1705,7 +1705,7 @@ msgstr ""
 "另外一台连接到互联网的计算机，称为 <emphasis>source</emphasis>，功能是网关。"
 
 #. Tag: para
-#: random-bits.xml:860
+#: random-bits.xml:844
 #, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -1716,13 +1716,13 @@ msgstr ""
 "Install-HOWTO</ulink> 了解这种线的更多信息，以及如何自己制作。"
 
 #. Tag: title
-#: random-bits.xml:872
+#: random-bits.xml:856
 #, no-c-format
 msgid "Setting up source"
 msgstr "建立源"
 
 #. Tag: para
-#: random-bits.xml:873
+#: random-bits.xml:857
 #, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
@@ -1732,7 +1732,7 @@ msgstr ""
 "算机。"
 
 #. Tag: screen
-#: random-bits.xml:878
+#: random-bits.xml:862
 #, no-c-format
 msgid ""
 "#!/bin/sh\n"
@@ -1774,13 +1774,13 @@ msgstr ""
 "echo 1 > /proc/sys/net/ipv4/ip_forward"
 
 #. Tag: title
-#: random-bits.xml:884
+#: random-bits.xml:868
 #, no-c-format
 msgid "Installing target"
 msgstr "安装目标"
 
 #. Tag: para
-#: random-bits.xml:885
+#: random-bits.xml:869
 #, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
@@ -1804,13 +1804,13 @@ msgstr ""
 "</screen></informalexample> 下面是安装过程中各阶段所要提供的答案。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:904
+#: random-bits.xml:888
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr "从光盘加载安装组件"
 
 #. Tag: para
-#: random-bits.xml:906
+#: random-bits.xml:890
 #, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -1820,13 +1820,13 @@ msgstr ""
 "用 PLIP 驱动。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:914
+#: random-bits.xml:898
 #, no-c-format
 msgid "Detect network hardware"
 msgstr "侦测网络硬件"
 
 #. Tag: para
-#: random-bits.xml:919
+#: random-bits.xml:903
 #, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -1839,7 +1839,7 @@ msgstr ""
 "系统没有网卡，安装程序不会显示该列表。"
 
 #. Tag: para
-#: random-bits.xml:928
+#: random-bits.xml:912
 #, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
@@ -1850,19 +1850,19 @@ msgstr ""
 "<userinput>plip</userinput> 模块。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:940
+#: random-bits.xml:924
 #, no-c-format
 msgid "Configure the network"
 msgstr "配置网络"
 
 #. Tag: para
-#: random-bits.xml:943
+#: random-bits.xml:927
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr "Auto-configure network with DHCP: No"
 
 #. Tag: para
-#: random-bits.xml:948
+#: random-bits.xml:932
 #, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -1870,7 +1870,7 @@ msgstr ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:953
+#: random-bits.xml:937
 #, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -1880,7 +1880,7 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: random-bits.xml:959
+#: random-bits.xml:943
 #, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
@@ -1890,13 +1890,13 @@ msgstr ""
 "resolv.conf</filename>)"
 
 #. Tag: title
-#: random-bits.xml:978
+#: random-bits.xml:962
 #, no-c-format
 msgid "The Graphical Installer"
 msgstr "图形安装程序"
 
 #. Tag: para
-#: random-bits.xml:979
+#: random-bits.xml:963
 #, no-c-format
 msgid ""
 "The graphical version of the installer is only available for a limited "
@@ -1909,7 +1909,7 @@ msgstr ""
 "前端。"
 
 #. Tag: para
-#: random-bits.xml:987
+#: random-bits.xml:971
 #, no-c-format
 msgid ""
 "Although the functionality is identical, the graphical installer still has a "
@@ -1924,7 +1924,7 @@ msgstr ""
 "有一些优点，比如可以使用鼠标，以及在一个屏幕下显示多个问题。"
 
 #. Tag: para
-#: random-bits.xml:996
+#: random-bits.xml:980
 #, no-c-format
 msgid ""
 "The graphical installer is available with all CD images and with the hd-"
@@ -1941,7 +1941,7 @@ msgstr ""
 "<userinput>expertgui</userinput> 和 <userinput>rescuegui</userinput> 来引导。"
 
 #. Tag: para
-#: random-bits.xml:1006
+#: random-bits.xml:990
 #, no-c-format
 msgid ""
 "It is also available as a special <quote>mini</quote> ISO image<footnote id="
@@ -1958,7 +1958,7 @@ msgstr ""
 "对应的图形安装程序。"
 
 #. Tag: para
-#: random-bits.xml:1020
+#: random-bits.xml:1004
 #, no-c-format
 msgid ""
 "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
@@ -1975,7 +1975,7 @@ msgstr ""
 "上，但其它的则不行。"
 
 #. Tag: para
-#: random-bits.xml:1033
+#: random-bits.xml:1017
 #, no-c-format
 msgid ""
 "The graphical installer requires significantly more memory to run than the "
@@ -1987,7 +1987,7 @@ msgstr ""
 "内存条件，它将自动回到普通的 <quote>newt</quote> 前端。"
 
 #. Tag: para
-#: random-bits.xml:1040
+#: random-bits.xml:1024
 #, no-c-format
 msgid ""
 "You can add boot parameters when starting the graphical installer, just as "
@@ -1999,13 +1999,13 @@ msgstr ""
 "许您设置鼠标为左手习惯。参阅 <xref linkend=\"boot-parms\"/> 了解可用的参数。"
 
 #. Tag: title
-#: random-bits.xml:1050
+#: random-bits.xml:1034
 #, no-c-format
 msgid "Using the graphical installer"
 msgstr "使用图形安装程序"
 
 #. Tag: para
-#: random-bits.xml:1051
+#: random-bits.xml:1035
 #, no-c-format
 msgid ""
 "As already mentioned, the graphical installer basically works the same as "
@@ -2016,7 +2016,7 @@ msgstr ""
 "用来给您的安装过程进行指导。"
 
 #. Tag: para
-#: random-bits.xml:1057
+#: random-bits.xml:1041
 #, no-c-format
 msgid ""
 "If you prefer using the keyboard over the mouse, there are two things you "
@@ -2034,7 +2034,7 @@ msgstr ""
 "guibutton>。"
 
 #. Tag: para
-#: random-bits.xml:1067
+#: random-bits.xml:1051
 #, no-c-format
 msgid ""
 "To switch to another console, you will also need to use the <keycap>Ctrl</"
@@ -2047,13 +2047,13 @@ msgstr ""
 "keycap> <keycap>Left Alt</keycap> <keycap>F1</keycap> </keycombo>。"
 
 #. Tag: title
-#: random-bits.xml:1078
+#: random-bits.xml:1062
 #, no-c-format
 msgid "Known issues"
 msgstr "已知事项"
 
 #. Tag: para
-#: random-bits.xml:1079
+#: random-bits.xml:1063
 #, no-c-format
 msgid ""
 "Etch is the first release that includes the graphical installer and uses "
@@ -2065,7 +2065,7 @@ msgstr ""
 "会出现在您的安装过程中。我们希望在下一个 &debian; 发布版中解决这些问题。"
 
 #. Tag: para
-#: random-bits.xml:1089
+#: random-bits.xml:1073
 #, no-c-format
 msgid ""
 "Information on some screens is not nicely formatted into columns as it "
@@ -2076,7 +2076,7 @@ msgstr ""
 "语言选择。另外一个例子是 partman 的主画面。"
 
 #. Tag: para
-#: random-bits.xml:1096
+#: random-bits.xml:1080
 #, no-c-format
 msgid ""
 "Typing some characters may not work and in some cases the wrong character "
@@ -2087,13 +2087,13 @@ msgstr ""
 "号之上/下的字母应该显示，但却没有。"
 
 #. Tag: para
-#: random-bits.xml:1103
+#: random-bits.xml:1087
 #, no-c-format
 msgid "Support for touchpads is not yet optimal."
 msgstr "还不支持触摸板"
 
 #. Tag: para
-#: random-bits.xml:1108
+#: random-bits.xml:1092
 #, no-c-format
 msgid ""
 "You should not switch to a different console while the installer is busy; "
@@ -2107,7 +2107,7 @@ msgstr ""
 "制台就不会造成任何问题。"
 
 #. Tag: para
-#: random-bits.xml:1117
+#: random-bits.xml:1101
 #, no-c-format
 msgid ""
 "Support for creating encrypted partitions is limited as it is not possible "
@@ -2117,6 +2117,78 @@ msgstr ""
 "由于无法生成随机的密钥，对于创建加密分区的支持仍然有限。但可以使用密码作为密"
 "钥来建立加密分区。"
 
+#~ msgid "1267"
+#~ msgstr "1267"
+
+#~ msgid "<entry>420</entry>"
+#~ msgstr "<entry>420</entry>"
+
+#~ msgid "1667"
+#~ msgstr "1667"
+
+#~ msgid "<entry>50</entry>"
+#~ msgstr "<entry>50</entry>"
+
+#~ msgid "<entry>17</entry>"
+#~ msgstr "<entry>17</entry>"
+
+#~ msgid "<entry>67</entry>"
+#~ msgstr "<entry>67</entry>"
+
+#~ msgid "<entry>35</entry>"
+#~ msgstr "<entry>35</entry>"
+
+#~ msgid "<entry>11</entry>"
+#~ msgstr "<entry>11</entry>"
+
+#~ msgid "<entry>46</entry>"
+#~ msgstr "<entry>46</entry>"
+
+#~ msgid "<entry>277</entry>"
+#~ msgstr "<entry>277</entry>"
+
+#~ msgid "<entry>79</entry>"
+#~ msgstr "<entry>79</entry>"
+
+#~ msgid "<entry>356</entry>"
+#~ msgstr "<entry>356</entry>"
+
+#~ msgid "<entry>2</entry>"
+#~ msgstr "<entry>2</entry>"
+
+#~ msgid "<entry>1</entry>"
+#~ msgstr "<entry>1</entry>"
+
+#~ msgid "<entry>3</entry>"
+#~ msgstr "<entry>3</entry>"
+
+#~ msgid "<entry>49</entry>"
+#~ msgstr "<entry>49</entry>"
+
+#~ msgid "<entry>21</entry>"
+#~ msgstr "<entry>21</entry>"
+
+#~ msgid "<entry>70</entry>"
+#~ msgstr "<entry>70</entry>"
+
+#~ msgid "<entry>13</entry>"
+#~ msgstr "<entry>13</entry>"
+
+#~ msgid "<entry>5</entry>"
+#~ msgstr "<entry>5</entry>"
+
+#~ msgid "<entry>18</entry>"
+#~ msgstr "<entry>18</entry>"
+
+#~ msgid "<entry>24</entry>"
+#~ msgstr "<entry>24</entry>"
+
+#~ msgid "<entry>8</entry>"
+#~ msgstr "<entry>8</entry>"
+
+#~ msgid "<entry>32</entry>"
+#~ msgstr "<entry>32</entry>"
+
 #~ msgid ""
 #~ "The mouse can be used in both the Linux console (with gpm) and the X "
 #~ "window environment. The two uses can be made compatible if the gpm "
@@ -2180,147 +2252,3 @@ msgstr ""
 #~ "对 PowerPC 来说，需要在<filename>/etc/X11/XF86Config</filename>或者 "
 #~ "<filename>/etc/X11/XF86Config-4</filename> 设置鼠标设备里或者 <userinput>"
 #~ "\"/dev/input/mice\"</userinput>。"
-
-#. Tag: entry
-#: random-bits.xml:247
-#, no-c-format
-msgid "&task-desktop-inst;"
-msgstr "&task-desktop-inst;"
-
-#. Tag: entry
-#: random-bits.xml:248
-#, no-c-format
-msgid "&task-desktop-dl;"
-msgstr "&task-desktop-dl;"
-
-#. Tag: entry
-#: random-bits.xml:249
-#, no-c-format
-msgid "&task-desktop-tot;"
-msgstr "&task-desktop-tot;"
-
-#. Tag: entry
-#: random-bits.xml:262
-#, no-c-format
-msgid "&task-laptop-inst;"
-msgstr "&task-laptop-inst;"
-
-#. Tag: entry
-#: random-bits.xml:263
-#, no-c-format
-msgid "&task-laptop-dl;"
-msgstr "&task-laptop-dl;"
-
-#. Tag: entry
-#: random-bits.xml:264
-#, no-c-format
-msgid "&task-laptop-tot;"
-msgstr "&task-laptop-tot;"
-
-#. Tag: entry
-#: random-bits.xml:269
-#, no-c-format
-msgid "&task-web-inst;"
-msgstr "&task-web-inst;"
-
-#. Tag: entry
-#: random-bits.xml:270
-#, no-c-format
-msgid "&task-web-dl;"
-msgstr "&task-web-dl;"
-
-#. Tag: entry
-#: random-bits.xml:271
-#, no-c-format
-msgid "&task-web-tot;"
-msgstr "&task-web-tot;"
-
-#. Tag: entry
-#: random-bits.xml:276
-#, no-c-format
-msgid "&task-print-inst;"
-msgstr "&task-print-inst;"
-
-#. Tag: entry
-#: random-bits.xml:277
-#, no-c-format
-msgid "&task-print-dl;"
-msgstr "&task-print-dl;"
-
-#. Tag: entry
-#: random-bits.xml:278
-#, no-c-format
-msgid "&task-print-tot;"
-msgstr "&task-print-tot;"
-
-#. Tag: entry
-#: random-bits.xml:283
-#, no-c-format
-msgid "&task-dns-inst;"
-msgstr "&task-dns-inst;"
-
-#. Tag: entry
-#: random-bits.xml:284
-#, no-c-format
-msgid "&task-dns-dl;"
-msgstr "&task-dns-dl;"
-
-#. Tag: entry
-#: random-bits.xml:285
-#, no-c-format
-msgid "&task-dns-tot;"
-msgstr "&task-dns-tot;"
-
-#. Tag: entry
-#: random-bits.xml:290
-#, no-c-format
-msgid "&task-file-inst;"
-msgstr "&task-file-inst;"
-
-#. Tag: entry
-#: random-bits.xml:291
-#, no-c-format
-msgid "&task-file-dl;"
-msgstr "&task-file-dl;"
-
-#. Tag: entry
-#: random-bits.xml:292
-#, no-c-format
-msgid "&task-file-tot;"
-msgstr "&task-file-tot;"
-
-#. Tag: entry
-#: random-bits.xml:297
-#, no-c-format
-msgid "&task-mail-inst;"
-msgstr "&task-mail-inst;"
-
-#. Tag: entry
-#: random-bits.xml:298
-#, no-c-format
-msgid "&task-mail-dl;"
-msgstr "&task-mail-dl;"
-
-#. Tag: entry
-#: random-bits.xml:299
-#, no-c-format
-msgid "&task-mail-tot;"
-msgstr "&task-mail-tot;"
-
-#. Tag: entry
-#: random-bits.xml:304
-#, no-c-format
-msgid "&task-sql-inst;"
-msgstr "&task-sql-inst;"
-
-#. Tag: entry
-#: random-bits.xml:305
-#, no-c-format
-msgid "&task-sql-dl;"
-msgstr "&task-sql-dl;"
-
-#. Tag: entry
-#: random-bits.xml:306
-#, no-c-format
-msgid "&task-sql-tot;"
-msgstr "&task-sql-tot;"