Update of POT and PO files for the manual

3 files changed, 95 insertions, 88 deletions

diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index fd400e996..79ca50151 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.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: 2006-09-08 22:58+0000\n"
+"POT-Creation-Date: 2006-10-11 02:03+0000\n"
 "PO-Revision-Date: 2006-09-29 14:09+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -73,7 +73,9 @@ msgstr "支持的体系"
 msgid ""
 "Debian &release; supports twelve major architectures and several variations "
 "of each architecture known as <quote>flavors</quote>."
-msgstr "Debian &release; 支持十二种主要的体系和一些称为 <quote>flavors</quote> 的变种。"
+msgstr ""
+"Debian &release; 支持十二种主要的体系和一些称为 <quote>flavors</quote> 的变"
+"种。"
 
 #. Tag: entry
 #: hardware.xml:53
@@ -1870,9 +1872,9 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:803
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The are two major support <emphasis>&architecture;</emphasis> flavors: PA-"
+"There are two major support <emphasis>&architecture;</emphasis> flavors: PA-"
 "RISC 1.1 and PA-RISC 2.0. The PA-RISC 1.1 architecture is targeted at 32-bit "
 "processors whereas the 2.0 architecture is targeted to the 64-bit "
 "processors. Some systems are able to run either kernel. In both cases, the "
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 7bf031c19..044fc2ee9 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: 2006-09-07 13:39+0000\n"
+"POT-Creation-Date: 2006-10-11 02:03+0000\n"
 "PO-Revision-Date: 2006-09-29 14:14+0800\n"
 "Last-Translator: Ji YongGang <jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -645,7 +645,9 @@ msgid ""
 "Most questions need to be preseeded using the values valid in English and "
 "not the translated values. However, there are some questions (for example in "
 "<classname>partman</classname>) where the translated values need to be used."
-msgstr "大多数问题需要使用有效的英文预置值，而不是翻译过的值。但有些问题(例如 <classname>partman</classname>)，需要使用翻译过的值。"
+msgstr ""
+"大多数问题需要使用有效的英文预置值，而不是翻译过的值。但有些问题(例如 "
+"<classname>partman</classname>)，需要使用翻译过的值。"
 
 #. Tag: para
 #: preseed.xml:441
@@ -1189,7 +1191,8 @@ msgstr ""
 "#       select Separate /home, /usr, /var, and /tmp partitions\n"
 "\n"
 "# Or provide a recipe of your own...\n"
-"# The recipe format is documented in the file devel/partman-auto-recipe.txt.\n"
+"# The recipe format is documented in the file devel/partman-auto-recipe."
+"txt.\n"
 "# If you have a way to get a recipe file into the d-i environment, you can\n"
 "# just point at it.\n"
 "#d-i partman-auto/expert_recipe_file string /hd-media/recipe\n"
@@ -1265,7 +1268,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:669
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
 "#d-i apt-setup/non-free boolean true\n"
@@ -1275,9 +1278,11 @@ msgid ""
 "#d-i apt-setup/security_host string\n"
 "\n"
 "# Additional repositories, local[0-9] available\n"
-"#d-i apt-setup/local0/comment string local server\n"
-"#d-i apt-setup/local0/source string \\\n"
+"#d-i apt-setup/local0/repository string \\\n"
 "#       deb 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\n"
 "#d-i apt-setup/local0/key string http://local.server/key"
 msgstr ""
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index bffcb87a6..ae3e56fd2 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: 2006-09-28 13:02+0000\n"
+"POT-Creation-Date: 2006-10-11 02:03+0000\n"
 "PO-Revision-Date: 2006-09-29 13:58+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -834,7 +834,7 @@ msgstr ""
 
 #. Tag: para
 #: random-bits.xml:396
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Or, you can use the following procedure to install it manually. Make a work "
 "folder for extracting the .deb into: <informalexample><screen>\n"
@@ -844,8 +844,8 @@ msgid ""
 "located in the Debian archive (be sure to select the proper file for your "
 "architecture). Download the <command>debootstrap</command> .deb from the "
 "<ulink url=\"http://ftp.debian.org/debian/pool/main/d/debootstrap/\"> pool</"
-"ulink>, copy the package to the work folder, and extract the binary files "
-"from it. You will need to have root privileges to install the binaries."
+"ulink>, copy the package to the work folder, and extract the files from it. "
+"You will need to have root privileges to install the files."
 msgstr ""
 "或者您也可以通过下面的步骤手动安装它。先新建一个工作目录，它被用来安放解压缩"
 "后的 .deb 文件： <informalexample><screen>\n"
@@ -860,9 +860,9 @@ msgstr ""
 
 #. Tag: screen
 #: random-bits.xml:411
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"# ar -x debootstrap_0.X.X_arch.deb\n"
+"# ar -x debootstrap_0.X.X_all.deb\n"
 "# cd /\n"
 "# zcat /full-path-to-work/work/data.tar.gz | tar xv"
 msgstr ""
@@ -870,28 +870,14 @@ msgstr ""
 "# cd /\n"
 "# zcat /full-path-to-work/work/data.tar.gz | tar xv"
 
-#. Tag: para
-#: random-bits.xml:413
-#, no-c-format
-msgid ""
-"Note that running <command>debootstrap</command> may require you to have a "
-"minimal version of <classname>glibc</classname> installed (currently "
-"GLIBC_2.3). <command>debootstrap</command> itself is a shell script, but it "
-"calls various utilities that require <classname>glibc</classname>."
-msgstr ""
-"注意，运行 <command>debootstrap</command> 可能需要您有最小版本的 "
-"<classname>glibc</classname> (当前为 GLIBC_2.3)。 <command>debootstrap</"
-"command> 本身是一个 shell 脚本，但它会调用 <classname>glibc</classname> 的一"
-"下工具。"
-
 #. Tag: title
-#: random-bits.xml:424
+#: random-bits.xml:417
 #, no-c-format
 msgid "Run <command>debootstrap</command>"
 msgstr "运行 <command>debootstrap</command>"
 
 #. Tag: para
-#: random-bits.xml:425
+#: random-bits.xml:418
 #, no-c-format
 msgid ""
 "<command>debootstrap</command> can download the needed files directly from "
@@ -907,7 +893,7 @@ msgstr ""
 "README.mirrors\"></ulink>。"
 
 #. Tag: para
-#: random-bits.xml:434
+#: random-bits.xml:427
 #, no-c-format
 msgid ""
 "If you have a &releasename; &debian; CD mounted at <filename>/cdrom</"
@@ -919,7 +905,7 @@ msgstr ""
 "debian/</userinput>"
 
 #. Tag: para
-#: random-bits.xml:440
+#: random-bits.xml:433
 #, no-c-format
 msgid ""
 "Substitute one of the following for <replaceable>ARCH</replaceable> in the "
@@ -939,7 +925,7 @@ msgstr ""
 "<userinput>sparc</userinput>。"
 
 #. Tag: screen
-#: random-bits.xml:457
+#: random-bits.xml:450
 #, no-c-format
 msgid ""
 "# /usr/sbin/debootstrap --arch ARCH &releasename; \\\n"
@@ -949,13 +935,13 @@ msgstr ""
 "http://http.us.debian.org/debian"
 
 #. Tag: title
-#: random-bits.xml:463
+#: random-bits.xml:456
 #, no-c-format
 msgid "Configure The Base System"
 msgstr "基系统的配置"
 
 #. Tag: para
-#: random-bits.xml:464
+#: random-bits.xml:457
 #, no-c-format
 msgid ""
 "Now you've got a real Debian system, though rather lean, on disk. "
@@ -965,19 +951,19 @@ msgstr ""
 "<command>Chroot</command> 用来进入该系统："
 
 #. Tag: screen
-#: random-bits.xml:469
+#: random-bits.xml:462
 #, no-c-format
 msgid "# LANG= chroot /mnt/debinst /bin/bash"
 msgstr "# LANG= chroot /mnt/debinst /bin/bash"
 
 #. Tag: title
-#: random-bits.xml:474
+#: random-bits.xml:467
 #, no-c-format
 msgid "Mount Partitions"
 msgstr "分区的挂载"
 
 #. Tag: para
-#: random-bits.xml:475
+#: random-bits.xml:468
 #, no-c-format
 msgid ""
 "You need to create <filename>/etc/fstab</filename>. "
@@ -1039,13 +1025,13 @@ msgstr ""
 "a</userinput>，那么请一定要再接着做之前先把 proc 挂载好："
 
 #. Tag: screen
-#: random-bits.xml:495
+#: random-bits.xml:488
 #, no-c-format
 msgid "# mount -t proc proc /proc"
 msgstr "# mount -t proc proc /proc"
 
 #. Tag: para
-#: random-bits.xml:497
+#: random-bits.xml:490
 #, no-c-format
 msgid ""
 "The command <userinput>ls /proc</userinput> should now show a non-empty "
@@ -1056,31 +1042,31 @@ msgstr ""
 "chroot: 以为加载 proc。"
 
 #. Tag: screen
-#: random-bits.xml:503
+#: random-bits.xml:496
 #, no-c-format
 msgid "# mount -t proc proc /mnt/debinst/proc"
 msgstr "# mount -t proc proc /mnt/debinst/proc"
 
 #. Tag: title
-#: random-bits.xml:509
+#: random-bits.xml:502
 #, no-c-format
 msgid "Configure Keyboard"
 msgstr "键盘的配置"
 
 #. Tag: para
-#: random-bits.xml:510
+#: random-bits.xml:503
 #, no-c-format
 msgid "To configure your keyboard:"
 msgstr "若要配置您的键盘，请："
 
 #. Tag: screen
-#: random-bits.xml:514
+#: random-bits.xml:507
 #, no-c-format
 msgid "# dpkg-reconfigure console-data"
 msgstr "# dpkg-reconfigure console-data"
 
 #. Tag: para
-#: random-bits.xml:516
+#: random-bits.xml:509
 #, no-c-format
 msgid ""
 "Note that the keyboard cannot be set while in the chroot, but will be "
@@ -1088,13 +1074,13 @@ msgid ""
 msgstr "注意，在 chroot 里面不能设置键盘，但重新启动以后可以。"
 
 #. Tag: title
-#: random-bits.xml:525
+#: random-bits.xml:518
 #, no-c-format
 msgid "Configure Networking"
 msgstr "网络的配置"
 
 #. Tag: para
-#: random-bits.xml:526
+#: random-bits.xml:519
 #, no-c-format
 msgid ""
 "To configure networking, edit <filename>/etc/network/interfaces</filename>, "
@@ -1191,13 +1177,13 @@ msgstr ""
 "统启动时，每块网卡就能获得您所预期的 interface 名称了 (eth0、eth1 等等)。"
 
 #. Tag: title
-#: random-bits.xml:563
+#: random-bits.xml:556
 #, no-c-format
 msgid "Configure Locales"
 msgstr "locales 的设置"
 
 #. Tag: para
-#: random-bits.xml:564
+#: random-bits.xml:557
 #, no-c-format
 msgid ""
 "To configure your locale settings to use a language other than English, "
@@ -1221,13 +1207,13 @@ msgstr ""
 "locale 之前，请先参阅相应的本地化指南(localization HOWTO)。"
 
 #. Tag: title
-#: random-bits.xml:582
+#: random-bits.xml:575
 #, no-c-format
 msgid "Install a Kernel"
 msgstr "内核的安装"
 
 #. Tag: para
-#: random-bits.xml:583
+#: random-bits.xml:576
 #, no-c-format
 msgid ""
 "If you intend to boot this system, you probably want a Linux kernel and a "
@@ -1236,26 +1222,29 @@ msgid ""
 "# apt-cache search linux-image\n"
 "</screen></informalexample> Then install your choice using its package name."
 msgstr ""
-"若想启动这个系统，您很可能还需要一个 Linux 内核和一个 boot loader。可以用下面指令找到那些预先打包的内核 <informalexample><screen>\n"
+"若想启动这个系统，您很可能还需要一个 Linux 内核和一个 boot loader。可以用下面"
+"指令找到那些预先打包的内核 <informalexample><screen>\n"
 "# apt-cache search linux-image\n"
 "</screen></informalexample> 接下来使用所选包名来安装。"
 
 #. Tag: screen
-#: random-bits.xml:592
+#: random-bits.xml:585
 #, no-c-format
 msgid ""
 "# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</"
 "replaceable>"
-msgstr "# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</replaceable>"
+msgstr ""
+"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</"
+"replaceable>"
 
 #. Tag: title
-#: random-bits.xml:598
+#: random-bits.xml:591
 #, no-c-format
 msgid "Set up the Boot Loader"
 msgstr "Boot Loader 的设置"
 
 #. Tag: para
-#: random-bits.xml:599
+#: random-bits.xml:592
 #, no-c-format
 msgid ""
 "To make your &debian; system bootable, set up your boot loader to load the "
@@ -1268,7 +1257,7 @@ msgstr ""
 "loader，因此您要在 Debian 的 chroot 中使用 <command>aptitude</command> 完成。"
 
 #. Tag: para
-#: random-bits.xml:606
+#: random-bits.xml:599
 #, no-c-format
 msgid ""
 "Check <userinput>info grub</userinput> or <userinput>man lilo.conf</"
@@ -1289,13 +1278,13 @@ msgstr ""
 "它就会用哪个系统里的 <filename>lilo.conf</filename> )。"
 
 #. Tag: para
-#: random-bits.xml:617
+#: random-bits.xml:610
 #, 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:621
+#: random-bits.xml:614
 #, no-c-format
 msgid ""
 "boot=/dev/hda6\n"
@@ -1315,7 +1304,7 @@ msgstr ""
 "label=Debian"
 
 #. Tag: para
-#: random-bits.xml:623
+#: random-bits.xml:616
 #, no-c-format
 msgid ""
 "Check <userinput>man yaboot.conf</userinput> for instructions on setting up "
@@ -1333,7 +1322,7 @@ msgstr ""
 "filename> )。"
 
 #. Tag: para
-#: random-bits.xml:633
+#: random-bits.xml:626
 #, no-c-format
 msgid ""
 "Here is a basic <filename>/etc/yaboot.conf</filename> as an example: "
@@ -1363,13 +1352,13 @@ msgstr ""
 "userinput> 换成 <userinput>hd:</userinput>。"
 
 #. Tag: title
-#: random-bits.xml:651
+#: random-bits.xml:644
 #, no-c-format
 msgid "Installing &debian; over Parallel Line IP (PLIP)"
 msgstr "通过 Parallel Line IP (PLIP) 来安装 &debian;"
 
 #. Tag: para
-#: random-bits.xml:653
+#: random-bits.xml:646
 #, no-c-format
 msgid ""
 "This section explains how to install &debian; on a computer without an "
@@ -1382,7 +1371,7 @@ msgstr ""
 "具有 Debian 镜像的网络(例如，互联网)。"
 
 #. Tag: para
-#: random-bits.xml:661
+#: random-bits.xml:654
 #, no-c-format
 msgid ""
 "In the example in this appendix we will set up a PLIP connection using a "
@@ -1396,7 +1385,7 @@ msgstr ""
 "IP 地址(这些地址在您的网络地址空间里面未被占用)。"
 
 #. Tag: para
-#: random-bits.xml:669
+#: random-bits.xml:662
 #, no-c-format
 msgid ""
 "The PLIP connection set up during the installation will also be available "
@@ -1407,7 +1396,7 @@ msgstr ""
 "linkend=\"boot-new\"/>)。"
 
 #. Tag: para
-#: random-bits.xml:674
+#: random-bits.xml:667
 #, no-c-format
 msgid ""
 "Before you start, you will need to check the BIOS configuration (IO base "
@@ -1419,13 +1408,13 @@ msgstr ""
 "为 <literal>io=0x378</literal>，<literal>irq=7</literal>。"
 
 #. Tag: title
-#: random-bits.xml:684
+#: random-bits.xml:677
 #, no-c-format
 msgid "Requirements"
 msgstr "需求"
 
 #. Tag: para
-#: random-bits.xml:687
+#: random-bits.xml:680
 #, no-c-format
 msgid ""
 "A target computer, called <emphasis>target</emphasis>, where Debian will be "
@@ -1433,13 +1422,13 @@ msgid ""
 msgstr "目标计算机，称为 <emphasis>target</emphasis>，将安装 Debian 在上面。"
 
 #. Tag: para
-#: random-bits.xml:693
+#: random-bits.xml:686
 #, no-c-format
 msgid "System installation media; see <xref linkend=\"installation-media\"/>."
 msgstr "系统安装介质；参阅 <xref linkend=\"installation-media\"/>。"
 
 #. Tag: para
-#: random-bits.xml:698
+#: random-bits.xml:691
 #, no-c-format
 msgid ""
 "Another computer connected to the Internet, called <emphasis>source</"
@@ -1448,7 +1437,7 @@ msgstr ""
 "另外一台连接到互联网的计算机，称为 <emphasis>source</emphasis>，功能是网关。"
 
 #. Tag: para
-#: random-bits.xml:704
+#: random-bits.xml:697
 #, no-c-format
 msgid ""
 "A DB-25 Null-Modem cable. See the <ulink url=\"&url-plip-install-howto;"
@@ -1459,13 +1448,13 @@ msgstr ""
 "Install-HOWTO</ulink> 了解这种线的更多信息，以及如何自己制作。"
 
 #. Tag: title
-#: random-bits.xml:716
+#: random-bits.xml:709
 #, no-c-format
 msgid "Setting up source"
 msgstr "建立源"
 
 #. Tag: para
-#: random-bits.xml:717
+#: random-bits.xml:710
 #, no-c-format
 msgid ""
 "The following shell script is a simple example of how to configure the "
@@ -1475,7 +1464,7 @@ msgstr ""
 "算机。"
 
 #. Tag: screen
-#: random-bits.xml:722
+#: random-bits.xml:715
 #, no-c-format
 msgid ""
 "#!/bin/sh\n"
@@ -1517,13 +1506,13 @@ msgstr ""
 "echo 1 > /proc/sys/net/ipv4/ip_forward"
 
 #. Tag: title
-#: random-bits.xml:728
+#: random-bits.xml:721
 #, no-c-format
 msgid "Installing target"
 msgstr "安装目标"
 
 #. Tag: para
-#: random-bits.xml:729
+#: random-bits.xml:722
 #, no-c-format
 msgid ""
 "Boot the installation media. The installation needs to be run in expert "
@@ -1547,13 +1536,13 @@ msgstr ""
 "</screen></informalexample> 下面是安装过程中各阶段所要提供的答案。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:748
+#: random-bits.xml:741
 #, no-c-format
 msgid "Load installer components from CD"
 msgstr "从光盘加载安装组件"
 
 #. Tag: para
-#: random-bits.xml:750
+#: random-bits.xml:743
 #, no-c-format
 msgid ""
 "Select the <userinput>plip-modules</userinput> option from the list; this "
@@ -1563,13 +1552,13 @@ msgstr ""
 "用 PLIP 驱动。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:758
+#: random-bits.xml:751
 #, no-c-format
 msgid "Detect network hardware"
 msgstr "侦测网络硬件"
 
 #. Tag: para
-#: random-bits.xml:763
+#: random-bits.xml:756
 #, no-c-format
 msgid ""
 "If target <emphasis>does</emphasis> have a network card, a list of driver "
@@ -1582,7 +1571,7 @@ msgstr ""
 "系统没有网卡，安装程序不会显示该列表。"
 
 #. Tag: para
-#: random-bits.xml:772
+#: random-bits.xml:765
 #, no-c-format
 msgid ""
 "Because no network card was detected/selected earlier, the installer will "
@@ -1593,19 +1582,19 @@ msgstr ""
 "<userinput>plip</userinput> 模块。"
 
 #. Tag: guimenuitem
-#: random-bits.xml:784
+#: random-bits.xml:777
 #, no-c-format
 msgid "Configure the network"
 msgstr "配置网络"
 
 #. Tag: para
-#: random-bits.xml:787
+#: random-bits.xml:780
 #, no-c-format
 msgid "Auto-configure network with DHCP: No"
 msgstr "Auto-configure network with DHCP: No"
 
 #. Tag: para
-#: random-bits.xml:792
+#: random-bits.xml:785
 #, no-c-format
 msgid ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
@@ -1613,7 +1602,7 @@ msgstr ""
 "IP address: <userinput><replaceable>192.168.0.1</replaceable></userinput>"
 
 #. Tag: para
-#: random-bits.xml:797
+#: random-bits.xml:790
 #, no-c-format
 msgid ""
 "Point-to-point address: <userinput><replaceable>192.168.0.2</replaceable></"
@@ -1623,7 +1612,7 @@ msgstr ""
 "userinput>"
 
 #. Tag: para
-#: random-bits.xml:803
+#: random-bits.xml:796
 #, no-c-format
 msgid ""
 "Name server addresses: you can enter the same addresses used on source (see "
@@ -1631,3 +1620,14 @@ msgid ""
 msgstr ""
 "Name server addresses: 您可以使用与源计算机相同的地址 (参阅 <filename>/etc/"
 "resolv.conf</filename>)"
+
+#~ msgid ""
+#~ "Note that running <command>debootstrap</command> may require you to have "
+#~ "a minimal version of <classname>glibc</classname> installed (currently "
+#~ "GLIBC_2.3). <command>debootstrap</command> itself is a shell script, but "
+#~ "it calls various utilities that require <classname>glibc</classname>."
+#~ msgstr ""
+#~ "注意，运行 <command>debootstrap</command> 可能需要您有最小版本的 "
+#~ "<classname>glibc</classname> (当前为 GLIBC_2.3)。 <command>debootstrap</"
+#~ "command> 本身是一个 shell 脚本，但它会调用 <classname>glibc</classname> 的"
+#~ "一下工具。"