Update of POT and PO files for the manual

4 files changed, 81 insertions, 75 deletions

diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 72fb8795c..74a5176ba 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.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-11-29 17:16+0000\n"
+"POT-Creation-Date: 2006-12-12 21:17+0000\n"
 "PO-Revision-Date: 2006-11-27 09:30+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1966,7 +1966,7 @@ msgstr ""
 "个屏幕显示常规的初始化信息。"
 
 #. Tag: para
-#: boot-installer.xml:1481
+#: boot-installer.xml:1481 boot-installer.xml:1617
 #, no-c-format
 msgid ""
 "Proceed to the next chapter to continue the installation where you will set "
@@ -1975,9 +1975,9 @@ msgstr "进入到下一章继续安装本地语言，网络和磁盘分区。"
 
 #. Tag: para
 #: boot-installer.xml:1492
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Booting an IA64 system from the network is similar to a CD boot. The only "
+"Booting an IA-64 system from the network is similar to a CD boot. The only "
 "difference is how the installation kernel is loaded. The EFI Boot Manager "
 "can load and start programs from a server on the network. Once the "
 "installation kernel is loaded and starts, the system install will proceed "
@@ -1991,9 +1991,9 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:1526
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Network booting an ia64 system requires two architecture-specific actions. "
+"Network booting an IA-64 system requires two architecture-specific actions. "
 "On the boot server, DHCP and TFTP must be configured to deliver "
 "<command>elilo</command>. On the client a new boot option must be defined in "
 "the EFI boot manager to enable loading over a network."
@@ -2010,9 +2010,9 @@ msgstr "配置网络服务器"
 
 #. Tag: para
 #: boot-installer.xml:1538
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"A suitable TFTP entry for network booting an ia64 system looks something "
+"A suitable TFTP entry for network booting an IA-64 system looks something "
 "like this: <informalexample><screen>\n"
 "host mcmuffin {\n"
 "        hardware ethernet 00:30:6e:1e:0e:83;\n"
@@ -2131,14 +2131,6 @@ msgstr ""
 "将和 CD 安装是 同样的过程。在内核已经完成从网络的自我安装后选择一个像上面提到"
 "的引导选项，它将开始 Debian 安装程序。"
 
-#. Tag: para
-#: boot-installer.xml:1617
-#, no-c-format
-msgid ""
-"Proceed to the next chapter to continue the installation where you will set "
-"up the language locale, network, and the disk partitions."
-msgstr "下一章将继续安装过程，在那里您将设置语言区域，网络以及磁盘分区。"
-
 #. Tag: title
 #: boot-installer.xml:1630
 #, no-c-format
@@ -4251,7 +4243,7 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:3351
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Check in the output of <command>dmesg</command> if your CD-ROM drive was "
 "recognized. You should see something like (the lines do not necessarily have "
@@ -4263,8 +4255,8 @@ msgid ""
 "Uniform CD-ROM driver Revision: 3.20\n"
 "</screen></informalexample> If you don't see something like that, chances "
 "are the controller your CD-ROM is connected to was not recognized or may be "
-"not supported at all. If you know what driver is needed for the drive, you "
-"can try loading it manually using <command>modprobe</command>."
+"not supported at all. If you know what driver is needed for the controller, "
+"you can try loading it manually using <command>modprobe</command>."
 msgstr ""
 "如果您的 CD-ROM 驱动器可以识别，检查 <command>dmesg</command> 的输出。您可以"
 "看到类似的信息(这些行不必是连续出现的)：<informalexample><screen>\n"
@@ -4306,14 +4298,15 @@ msgstr ""
 
 #. Tag: para
 #: boot-installer.xml:3383
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Check if DMA is currently enabled: <informalexample><screen>\n"
 "$ cd /proc/<replaceable>ide</replaceable>/<replaceable>hdc</replaceable>\n"
-"$ grep dma settings\n"
+"$ grep using_dma settings\n"
 "using_dma      1       0       1       rw\n"
-"</screen></informalexample> A <quote>1</quote> means it is enabled. If it "
-"is, try disabling it: <informalexample><screen>\n"
+"</screen></informalexample> A <quote>1</quote> in the first column after "
+"<literal>using_dma</literal> means it is enabled. If it is, try disabling "
+"it: <informalexample><screen>\n"
 "$ echo -n \"using_dma:0\" >settings\n"
 "</screen></informalexample> Make sure that you are in the directory for the "
 "device that corresponds to your CD-ROM drive."
@@ -4328,7 +4321,7 @@ msgstr ""
 "</screen></informalexample> 确保您所处的目录对应 CD-ROM 驱动器。"
 
 #. Tag: para
-#: boot-installer.xml:3397
+#: boot-installer.xml:3398
 #, no-c-format
 msgid ""
 "If there are any problems during the installation, try checking the "
@@ -4340,13 +4333,13 @@ msgstr ""
 "性。如果 CD-ROM 可以读，该选项可以对其进行测试。"
 
 #. Tag: title
-#: boot-installer.xml:3412
+#: boot-installer.xml:3413
 #, no-c-format
 msgid "Floppy Disk Reliability"
 msgstr "软盘的可靠性"
 
 #. Tag: para
-#: boot-installer.xml:3414
+#: boot-installer.xml:3415
 #, no-c-format
 msgid ""
 "The biggest problem for people using floppy disks to install Debian seems to "
@@ -4355,7 +4348,7 @@ msgstr ""
 "对于用软盘安装 Debian 的人来说，他们遇到的最大的问题很可能是软盘的可靠性。"
 
 #. Tag: para
-#: boot-installer.xml:3419
+#: boot-installer.xml:3420
 #, no-c-format
 msgid ""
 "The boot floppy is the floppy with the worst problems, because it is read by "
@@ -4371,7 +4364,7 @@ msgstr ""
 "息。"
 
 #. Tag: para
-#: boot-installer.xml:3428
+#: boot-installer.xml:3429
 #, no-c-format
 msgid ""
 "If you are having the installation stall at a particular floppy, the first "
@@ -4386,7 +4379,7 @@ msgstr ""
 "化以后看起来没有错误。如果可能，在别的统上重写这些软盘更好一些。"
 
 #. Tag: para
-#: boot-installer.xml:3437
+#: boot-installer.xml:3438
 #, no-c-format
 msgid ""
 "One user reports he had to write the images to floppy <emphasis>three</"
@@ -4397,7 +4390,7 @@ msgstr ""
 "软盘才算工作良好。"
 
 #. Tag: para
-#: boot-installer.xml:3443
+#: boot-installer.xml:3444
 #, no-c-format
 msgid ""
 "Normally you should not have to download a floppy image again, but if you "
@@ -4408,7 +4401,7 @@ msgstr ""
 "来检验下载的映像是否正确。"
 
 #. Tag: para
-#: boot-installer.xml:3449
+#: boot-installer.xml:3450
 #, no-c-format
 msgid ""
 "Other users have reported that simply rebooting a few times with the same "
@@ -4419,13 +4412,13 @@ msgstr ""
 "有缺陷的硬件或固件软盘驱动器驱动程序造成的。"
 
 #. Tag: title
-#: boot-installer.xml:3458
+#: boot-installer.xml:3459
 #, no-c-format
 msgid "Boot Configuration"
 msgstr "引导配置"
 
 #. Tag: para
-#: boot-installer.xml:3460
+#: boot-installer.xml:3461
 #, no-c-format
 msgid ""
 "If you have problems and the kernel hangs during the boot process, doesn't "
@@ -4438,7 +4431,7 @@ msgstr ""
 "\"/> 讨论。"
 
 #. Tag: para
-#: boot-installer.xml:3467
+#: boot-installer.xml:3468
 #, no-c-format
 msgid ""
 "If you are booting with your own kernel instead of the one supplied with the "
@@ -4450,7 +4443,7 @@ msgstr ""
 "<userinput>CONFIG_DEVFS</userinput>。"
 
 #. Tag: para
-#: boot-installer.xml:3474
+#: boot-installer.xml:3475
 #, no-c-format
 msgid ""
 "Often, problems can be solved by removing add-ons and peripherals, and then "
@@ -4461,7 +4454,7 @@ msgstr ""
 "arch=\"x86\">内置调制解调器、声卡以及即插即用设备特别容易引起问题。</phrase>"
 
 #. Tag: para
-#: boot-installer.xml:3480
+#: boot-installer.xml:3481
 #, no-c-format
 msgid ""
 "If you have a large amount of memory installed in your machine, more than "
@@ -4474,13 +4467,13 @@ msgstr ""
 "<userinput>mem=512m</userinput>。"
 
 #. Tag: title
-#: boot-installer.xml:3491
+#: boot-installer.xml:3492
 #, no-c-format
 msgid "Common &arch-title; Installation Problems"
 msgstr "&arch-title; 常见安装问题"
 
 #. Tag: para
-#: boot-installer.xml:3492
+#: boot-installer.xml:3493
 #, no-c-format
 msgid ""
 "There are some common installation problems that can be solved or avoided by "
@@ -4488,7 +4481,7 @@ msgid ""
 msgstr "有一些常见的安装问题，可以通过给安装程序特定的引导参数解决或避免。"
 
 #. Tag: para
-#: boot-installer.xml:3497
+#: boot-installer.xml:3498
 #, no-c-format
 msgid ""
 "Some systems have floppies with <quote>inverted DCLs</quote>. If you receive "
@@ -4499,7 +4492,7 @@ msgstr ""
 "息，并且知道软盘是好的，请尝试 <userinput>floppy=thinkpad</userinput> 参数。"
 
 #. Tag: para
-#: boot-installer.xml:3503
+#: boot-installer.xml:3504
 #, no-c-format
 msgid ""
 "On some systems, such as the IBM PS/1 or ValuePoint (which have ST-506 disk "
@@ -4517,7 +4510,7 @@ msgstr ""
 "replaceable>,<replaceable>sectors</replaceable></userinput>。"
 
 #. Tag: para
-#: boot-installer.xml:3512
+#: boot-installer.xml:3513
 #, no-c-format
 msgid ""
 "If you have a very old machine, and the kernel hangs after saying "
@@ -4530,7 +4523,7 @@ msgstr ""
 "userinput> 参数来取消这个测试。"
 
 #. Tag: para
-#: boot-installer.xml:3519
+#: boot-installer.xml:3520
 #, no-c-format
 msgid ""
 "If your screen begins to show a weird picture while the kernel boots, eg. "
@@ -4548,13 +4541,13 @@ msgstr ""
 "能用英语，请参见 <xref linkend=\"boot-parms\"/> 来获得细节信息。"
 
 #. Tag: title
-#: boot-installer.xml:3533
+#: boot-installer.xml:3534
 #, no-c-format
 msgid "System Freeze During the PCMCIA Configuration Phase"
 msgstr "在 PCMCIA 配置阶段系统停止"
 
 #. Tag: para
-#: boot-installer.xml:3534
+#: boot-installer.xml:3535
 #, no-c-format
 msgid ""
 "Some laptop models produced by Dell are known to crash when PCMCIA device "
@@ -4572,7 +4565,7 @@ msgstr ""
 "段。"
 
 #. Tag: para
-#: boot-installer.xml:3544
+#: boot-installer.xml:3545
 #, no-c-format
 msgid ""
 "Alternatively, you can boot the installer in expert mode. You will then be "
@@ -4592,13 +4585,13 @@ msgstr ""
 "装程序中，输入这些值的时候必须忽略逗号。"
 
 #. Tag: title
-#: boot-installer.xml:3561
+#: boot-installer.xml:3562
 #, no-c-format
 msgid "System Freeze while Loading the USB Modules"
 msgstr "在装入 USB 模块时系统停止"
 
 #. Tag: para
-#: boot-installer.xml:3562
+#: boot-installer.xml:3563
 #, no-c-format
 msgid ""
 "The kernel normally tries to install USB modules and the USB keyboard driver "
@@ -4615,13 +4608,13 @@ msgstr ""
 "installer/probe/usb=false</userinput> 参数，这将阻止装入此模块。"
 
 #. Tag: title
-#: boot-installer.xml:3576
+#: boot-installer.xml:3577
 #, no-c-format
 msgid "Interpreting the Kernel Startup Messages"
 msgstr "内核起始信息注解"
 
 #. Tag: para
-#: boot-installer.xml:3578
+#: boot-installer.xml:3579
 #, no-c-format
 msgid ""
 "During the boot sequence, you may see many messages in the form "
@@ -4654,13 +4647,13 @@ msgstr ""
 "linkend=\"kernel-baking\"/>)。"
 
 #. Tag: title
-#: boot-installer.xml:3603
+#: boot-installer.xml:3604
 #, no-c-format
 msgid "Bug Reporter"
 msgstr "Bug Reporter"
 
 #. Tag: para
-#: boot-installer.xml:3604
+#: boot-installer.xml:3605
 #, no-c-format
 msgid ""
 "If you get through the initial boot phase but cannot complete the install, "
@@ -4676,7 +4669,7 @@ msgstr ""
 "可以报告里附上该信息。"
 
 #. Tag: para
-#: boot-installer.xml:3615
+#: boot-installer.xml:3616
 #, no-c-format
 msgid ""
 "Other pertinent installation messages may be found in <filename>/var/log/</"
@@ -4687,13 +4680,13 @@ msgstr ""
 "新安装的系统启动后，放在 <filename>/var/log/debian-installer/</filename> 里。"
 
 #. Tag: title
-#: boot-installer.xml:3626
+#: boot-installer.xml:3627
 #, no-c-format
 msgid "Submitting Installation Reports"
 msgstr "提交缺陷报告"
 
 #. Tag: para
-#: boot-installer.xml:3627
+#: boot-installer.xml:3628
 #, no-c-format
 msgid ""
 "If you still have problems, please submit an installation report. We also "
@@ -4705,7 +4698,7 @@ msgstr ""
 "这让我们可以尽可能多地了解硬件的配置数量。"
 
 #. Tag: para
-#: boot-installer.xml:3634
+#: boot-installer.xml:3635
 #, no-c-format
 msgid ""
 "If you have a working Debian system, the easiest way to send an installation "
@@ -4719,7 +4712,7 @@ msgstr ""
 "installation-report</command> 命令。"
 
 #. Tag: para
-#: boot-installer.xml:3641
+#: boot-installer.xml:3642
 #, no-c-format
 msgid ""
 "Please use this template when filling out installation reports, and file the "
@@ -4804,3 +4797,8 @@ msgstr ""
 "      and ideas you had during the initial install.&gt;\n"
 "</screen></informalexample> 在 bug 报告内，请说明问题所在，包括内核挂起后最后"
 "见到的内核消息。描述进入问题状态所进行的步骤。"
+
+#~ msgid ""
+#~ "Proceed to the next chapter to continue the installation where you will "
+#~ "set up the language locale, network, and the disk partitions."
+#~ msgstr "下一章将继续安装过程，在那里您将设置语言区域，网络以及磁盘分区。"
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index bffa79a5e..7e25e8b85 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-12-04 17:31+0000\n"
+"POT-Creation-Date: 2006-12-12 21:17+0000\n"
 "PO-Revision-Date: 2006-10-31 21:18+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -115,8 +115,8 @@ msgstr "i386"
 
 #. Tag: entry
 #: hardware.xml:67
-#, no-c-format
-msgid "AMD64 &amp; Intel EM64t"
+#, fuzzy, no-c-format
+msgid "AMD64 &amp; Intel EM64T"
 msgstr "AMD64 &amp; Intel EM64t"
 
 #. Tag: entry
@@ -236,8 +236,8 @@ msgstr "<entry>64</entry>"
 #. Tag: entry
 #: hardware.xml:107
 #, no-c-format
-msgid "Intel ia64-based"
-msgstr "Intel ia64-based"
+msgid "Intel IA-64"
+msgstr ""
 
 #. Tag: entry
 #: hardware.xml:108
@@ -1783,8 +1783,8 @@ msgstr "<title>CPU</title>"
 
 #. Tag: para
 #: hardware.xml:703
-#, no-c-format
-msgid "Both AMD64 and Intel EM64t processors are supported."
+#, fuzzy, no-c-format
+msgid "Both AMD64 and Intel EM64T processors are supported."
 msgstr "AMD64 和 Intel EM64t 处理器都获得支持。"
 
 #. Tag: para
@@ -1931,9 +1931,9 @@ msgstr ""
 
 #. Tag: para
 #: hardware.xml:859
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"If your system has a 64-bit AMD64, Intel EM64t or Intel Core 2 Duo "
+"If your system has a 64-bit AMD64, Intel EM64T or Intel Core 2 Duo "
 "processor, you will probably want to use the installer for the amd64 "
 "architecture instead of the installer for the (32-bit) i386 architecture."
 msgstr ""
@@ -4408,6 +4408,9 @@ msgstr ""
 "任何受 Linux 内核支持的网络接口卡(NIC)也全都被引导盘所支持。您可能需要将网络"
 "驱动作为模块挂载。这意味着您不得不使用其他介质来安装操作系统内核。"
 
+#~ msgid "Intel ia64-based"
+#~ msgstr "Intel ia64-based"
+
 #~ msgid "Linksys NSLU2"
 #~ msgstr "Linksys NSLU2"
 
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index e4e230e4f..7b871fc7e 100644
--- a/po/zh_CN/partitioning.po
+++ b/po/zh_CN/partitioning.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-10-29 14:49+0000\n"
+"POT-Creation-Date: 2006-12-12 21:17+0000\n"
 "PO-Revision-Date: 2006-10-31 21:24+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1132,7 +1132,12 @@ msgid ""
 "get to the installer's partitioning step, select the option "
 "<guimenuitem>Manual</guimenuitem> and then simply select an existing "
 "partition and change its size."
-msgstr "如果您已经有 DOS 或 Windows 这样的其他操作系统存在，并想在安装 Debian 时保留它们，您应该重新设置分区大小，释放空间给 Debian 安装程序。安装程序支持修改 FAT 和 NTFS 文件系统的尺寸；当您进入安装程序的分区步骤，选择 <guimenuitem>Manual</guimenuitem> 选项，然后只需选择已有的分区，并更改其尺寸。"
+msgstr ""
+"如果您已经有 DOS 或 Windows 这样的其他操作系统存在，并想在安装 Debian 时保留"
+"它们，您应该重新设置分区大小，释放空间给 Debian 安装程序。安装程序支持修改 "
+"FAT 和 NTFS 文件系统的尺寸；当您进入安装程序的分区步骤，选择 "
+"<guimenuitem>Manual</guimenuitem> 选项，然后只需选择已有的分区，并更改其尺"
+"寸。"
 
 #. Tag: para
 #: partitioning.xml:697
@@ -1288,11 +1293,11 @@ msgstr "EFI 能够识别的格式"
 
 #. Tag: para
 #: partitioning.xml:797
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The IA64 EFI firmware supports two partition table (or disk label) formats, "
+"The IA-64 EFI firmware supports two partition table (or disk label) formats, "
 "GPT and MS-DOS. MS-DOS, the format typically used on i386 PCs, is no longer "
-"recommended for IA64 systems. Although the installer also provides "
+"recommended for IA-64 systems. Although the installer also provides "
 "<command>cfdisk</command>, you should only use <ulink url=\"parted.txt\"> "
 "<command>parted</command></ulink> because only it can manage both GPT and MS-"
 "DOS tables correctly."
@@ -1370,9 +1375,9 @@ msgstr "启动引导器分区要求"
 
 #. Tag: para
 #: partitioning.xml:843
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"ELILO, the ia64 boot loader, requires a partition containing a FAT file "
+"ELILO, the IA-64 boot loader, requires a partition containing a FAT file "
 "system with the <userinput>boot</userinput> flag set. The partition must be "
 "big enough to hold the boot loader and any kernels or RAMdisks you may wish "
 "to boot. A minimum size would be about 20MB, but if you expect to run with "
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 09e672c97..ed235ed34 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.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-12-04 17:31+0000\n"
+"POT-Creation-Date: 2006-12-12 21:17+0000\n"
 "PO-Revision-Date: 2006-11-22 16:46+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1273,9 +1273,9 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:865
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"If you choose guided partitioning for your IA64 system, there will be an "
+"If you choose guided partitioning for your IA-64 system, there will be an "
 "additional partition, formatted as a FAT16 bootable filesystem, for the EFI "
 "boot loader. There is also an additional menu item in the formatting menu to "
 "manually set up a partition as an EFI boot partition."