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

1 files changed, 91 insertions, 89 deletions

diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index b195dd527..296995896 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: 2007-05-05 22:00+0000\n"
+"POT-Creation-Date: 2007-05-10 19:09+0000\n"
 "PO-Revision-Date: 2007-04-08 18:40+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -221,10 +221,10 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:128
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"You can get to the main menu by selecting the <quote>Back</quote> button "
-"repeatedly to back all the way out of the currently running component."
+"You can get to the main menu by selecting the &BTN-GOBACK; button repeatedly "
+"to back all the way out of the currently running component."
 msgstr ""
 "您可以通过不断地按<quote>返回</quote>按钮，从当前运行的组件回到主菜单。"
 
@@ -2993,11 +2993,11 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2068
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"Once you've selected your tasks, select <guibutton>OK</guibutton>. At this "
-"point, <command>aptitude</command> will install the packages that are part "
-"of the tasks you've selected."
+"Once you've selected your tasks, select &BTN-CONT;. At this point, "
+"<command>aptitude</command> will install the packages that are part of the "
+"tasks you've selected."
 msgstr ""
 "一旦您确定了任务，请选择 <guibutton>OK</guibutton>。此时，<command>aptitude</"
 "command> 将安装选中的软件包。"
@@ -3166,10 +3166,10 @@ msgstr "硬盘上 <command>Grub</command> Boot Loader 的安装"
 
 #. Tag: para
 #: using-d-i.xml:2202
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "The main &architecture; boot loader is called <quote>grub</quote>. Grub is a "
-"flexible and robust boot loader and a good default choice for newbies and "
+"flexible and robust boot loader and a good default choice for new users and "
 "old hands alike."
 msgstr ""
 "&architecture; 上主要的 boot loader 是 <quote>grub</quote>。Grub 是个灵活和稳"
@@ -3189,22 +3189,23 @@ msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2214
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"If you do not want to install grub at all, use the Back button to get to the "
-"main menu, and from there select whatever bootloader you would like to use."
+"If you do not want to install grub, use the &BTN-GOBACK; button to get to "
+"the main menu, and from there select whatever bootloader you would like to "
+"use."
 msgstr ""
 "如果您并不想安装 grub，请使用返回按钮回到主菜单，并从中选择您想要使用的任何 "
 "bootloader。"
 
 #. Tag: title
-#: using-d-i.xml:2228
+#: using-d-i.xml:2227
 #, no-c-format
 msgid "Install the <command>LILO</command> Boot Loader on a Hard Disk"
 msgstr "硬盘上 <command>LILO</command> Boot Loader 的安装"
 
 #. Tag: para
-#: using-d-i.xml:2230
+#: using-d-i.xml:2229
 #, no-c-format
 msgid ""
 "The second &architecture; boot loader is called <quote>LILO</quote>. It is "
@@ -3220,7 +3221,7 @@ msgstr ""
 "HOWTO</ulink>。"
 
 #. Tag: para
-#: using-d-i.xml:2240
+#: using-d-i.xml:2239
 #, no-c-format
 msgid ""
 "Currently the LILO installation will only create menu entries for other "
@@ -3233,7 +3234,7 @@ msgstr ""
 "统。"
 
 #. Tag: para
-#: using-d-i.xml:2248
+#: using-d-i.xml:2247
 #, no-c-format
 msgid ""
 "&d-i; offers you three choices on where to install the <command>LILO</"
@@ -3241,13 +3242,13 @@ msgid ""
 msgstr "&d-i; 提供给您三种选择去哪安装 <command>LILO</command> boot loader："
 
 #. Tag: term
-#: using-d-i.xml:2255
+#: using-d-i.xml:2254
 #, no-c-format
 msgid "Master Boot Record (MBR)"
 msgstr "主引导区(MBR)"
 
 #. Tag: para
-#: using-d-i.xml:2255
+#: using-d-i.xml:2254
 #, no-c-format
 msgid ""
 "This way the <command>LILO</command> will take complete control of the boot "
@@ -3255,13 +3256,13 @@ msgid ""
 msgstr "这种方式 <command>LILO</command> 将完全控制启动过程。"
 
 #. Tag: term
-#: using-d-i.xml:2262
+#: using-d-i.xml:2261
 #, no-c-format
 msgid "new Debian partition"
 msgstr "新 Debian 分区"
 
 #. Tag: para
-#: using-d-i.xml:2262
+#: using-d-i.xml:2261
 #, no-c-format
 msgid ""
 "Choose this if you want to use another boot manager. <command>LILO</command> "
@@ -3272,13 +3273,13 @@ msgstr ""
 "新 Debian 分区的起始位置，并能作为第二 boot loader。"
 
 #. Tag: term
-#: using-d-i.xml:2271
+#: using-d-i.xml:2270
 #, no-c-format
 msgid "Other choice"
 msgstr "其它选择"
 
 #. Tag: para
-#: using-d-i.xml:2271
+#: using-d-i.xml:2270
 #, no-c-format
 msgid ""
 "Useful for advanced users who want to install <command>LILO</command> "
@@ -3295,7 +3296,7 @@ msgstr ""
 "<filename>/dev/sda</filename>。"
 
 #. Tag: para
-#: using-d-i.xml:2283
+#: using-d-i.xml:2282
 #, no-c-format
 msgid ""
 "If you can no longer boot into Windows 9x (or DOS) after this step, you'll "
@@ -3309,13 +3310,13 @@ msgstr ""
 "录 &mdash; 但这也意味着您要使用其他方法才能启动 Debian！"
 
 #. Tag: title
-#: using-d-i.xml:2299
+#: using-d-i.xml:2298
 #, no-c-format
 msgid "Install the <command>ELILO</command> Boot Loader on a Hard Disk"
 msgstr "安装 <command>ELILO</command> Boot Loader 到硬盘"
 
 #. Tag: para
-#: using-d-i.xml:2301
+#: using-d-i.xml:2300
 #, no-c-format
 msgid ""
 "The &architecture; boot loader is called <quote>elilo</quote>. It is modeled "
@@ -3340,7 +3341,7 @@ msgstr ""
 "和启动 Linux 内核的工作。"
 
 #. Tag: para
-#: using-d-i.xml:2317
+#: using-d-i.xml:2316
 #, no-c-format
 msgid ""
 "The <quote>elilo</quote> configuration and installation is done as the last "
@@ -3355,13 +3356,13 @@ msgstr ""
 "<emphasis>root</emphasis> 文件系统相同的磁盘。"
 
 #. Tag: title
-#: using-d-i.xml:2329
+#: using-d-i.xml:2328
 #, no-c-format
 msgid "Choose the correct partition!"
 msgstr "选择正确的分区！"
 
 #. Tag: para
-#: using-d-i.xml:2331
+#: using-d-i.xml:2330
 #, no-c-format
 msgid ""
 "The criteria for selecting a partition is that it is FAT format filesystem "
@@ -3377,13 +3378,13 @@ msgstr ""
 "有内容！"
 
 #. Tag: title
-#: using-d-i.xml:2346
+#: using-d-i.xml:2345
 #, no-c-format
 msgid "EFI Partition Contents"
 msgstr "EFI 分区内容"
 
 #. Tag: para
-#: using-d-i.xml:2348
+#: using-d-i.xml:2347
 #, no-c-format
 msgid ""
 "The EFI partition is a FAT filesystem format partition on one of the hard "
@@ -3409,13 +3410,13 @@ msgstr ""
 "间，系统更新或重新配置，文件系统中也许会有其他文件。"
 
 #. Tag: filename
-#: using-d-i.xml:2370
+#: using-d-i.xml:2369
 #, no-c-format
 msgid "elilo.conf"
 msgstr "elilo.conf"
 
 #. Tag: para
-#: using-d-i.xml:2371
+#: using-d-i.xml:2370
 #, no-c-format
 msgid ""
 "This is the configuration file read by the boot loader when it starts. It is "
@@ -3426,13 +3427,13 @@ msgstr ""
 "filename> 的复制，其文件名重写成 EFI 分区上的文件。"
 
 #. Tag: filename
-#: using-d-i.xml:2380
+#: using-d-i.xml:2379
 #, no-c-format
 msgid "elilo.efi"
 msgstr "elilo.efi"
 
 #. Tag: para
-#: using-d-i.xml:2381
+#: using-d-i.xml:2380
 #, no-c-format
 msgid ""
 "This is the boot loader program that the <quote>EFI Boot Manager</quote> "
@@ -3445,13 +3446,13 @@ msgstr ""
 "<quote>EFI Boot Manager</quote> 命令菜单。"
 
 #. Tag: filename
-#: using-d-i.xml:2391
+#: using-d-i.xml:2390
 #, no-c-format
 msgid "initrd.img"
 msgstr "initrd.img"
 
 #. Tag: para
-#: using-d-i.xml:2392
+#: using-d-i.xml:2391
 #, no-c-format
 msgid ""
 "This is the initial root filesystem used to boot the kernel. It is a copy of "
@@ -3464,13 +3465,13 @@ msgstr ""
 "filename> 符号链接 <filename>/initrd.img</filename> 指向的文件。"
 
 #. Tag: filename
-#: using-d-i.xml:2404
+#: using-d-i.xml:2403
 #, no-c-format
 msgid "readme.txt"
 msgstr "readme.txt"
 
 #. Tag: para
-#: using-d-i.xml:2405
+#: using-d-i.xml:2404
 #, no-c-format
 msgid ""
 "This is a small text file warning you that the contents of the directory are "
@@ -3481,13 +3482,13 @@ msgstr ""
 "任何本地修改在下次 <filename>/usr/sbin/elilo</filename> 运行时将丢失。"
 
 #. Tag: filename
-#: using-d-i.xml:2415
+#: using-d-i.xml:2414
 #, no-c-format
 msgid "vmlinuz"
 msgstr "vmlinuz"
 
 #. Tag: para
-#: using-d-i.xml:2416
+#: using-d-i.xml:2415
 #, no-c-format
 msgid ""
 "This is the compressed kernel itself. It is a copy of the file referenced in "
@@ -3500,13 +3501,13 @@ msgstr ""
 "<filename>/vmlinuz</filename> 指向的文件。"
 
 #. Tag: title
-#: using-d-i.xml:2436
+#: using-d-i.xml:2435
 #, no-c-format
 msgid "<command>arcboot</command>-installer"
 msgstr "<command>arcboot</command>-installer"
 
 #. Tag: para
-#: using-d-i.xml:2437
+#: using-d-i.xml:2436
 #, no-c-format
 msgid ""
 "The boot loader on SGI machines is <command>arcboot</command>. It has to be "
@@ -3546,13 +3547,13 @@ msgstr ""
 "</screen></informalexample> ，然后键入 <command>boot</command>。"
 
 #. Tag: replaceable
-#: using-d-i.xml:2456
+#: using-d-i.xml:2455
 #, no-c-format
 msgid "scsi"
 msgstr "scsi"
 
 #. Tag: para
-#: using-d-i.xml:2457
+#: using-d-i.xml:2456
 #, no-c-format
 msgid ""
 "is the SCSI bus to be booted from, this is <userinput>0</userinput> for the "
@@ -3560,13 +3561,13 @@ msgid ""
 msgstr "是启动的 SCSI 总线，<userinput>0</userinput> 为板载控制器"
 
 #. Tag: replaceable
-#: using-d-i.xml:2465
+#: using-d-i.xml:2464
 #, no-c-format
 msgid "disk"
 msgstr "disk"
 
 #. Tag: para
-#: using-d-i.xml:2466
+#: using-d-i.xml:2465
 #, no-c-format
 msgid ""
 "is the SCSI ID of the hard disk on which <command>arcboot</command> is "
@@ -3575,13 +3576,13 @@ msgstr "硬盘的 SCSI ID，<command>arcboot</command> 安装在其上"
 
 # index.docbook:1643, index.docbook:1712
 #. Tag: replaceable
-#: using-d-i.xml:2474 using-d-i.xml:2543
+#: using-d-i.xml:2473 using-d-i.xml:2542
 #, no-c-format
 msgid "partnr"
 msgstr "partnr"
 
 #. Tag: para
-#: using-d-i.xml:2475
+#: using-d-i.xml:2474
 #, no-c-format
 msgid ""
 "is the number of the partition on which <filename>/etc/arcboot.conf</"
@@ -3589,13 +3590,13 @@ msgid ""
 msgstr "分区号，<filename>/etc/arcboot.conf</filename> 处于该分区"
 
 #. Tag: replaceable
-#: using-d-i.xml:2483
+#: using-d-i.xml:2482
 #, no-c-format
 msgid "config"
 msgstr "config"
 
 #. Tag: para
-#: using-d-i.xml:2484
+#: using-d-i.xml:2483
 #, no-c-format
 msgid ""
 "is the name of the configuration entry in <filename>/etc/arcboot.conf</"
@@ -3605,13 +3606,13 @@ msgstr ""
 "quote> 。"
 
 #. Tag: title
-#: using-d-i.xml:2505
+#: using-d-i.xml:2504
 #, no-c-format
 msgid "<command>delo</command>-installer"
 msgstr "<command>delo</command>-installer"
 
 #. Tag: para
-#: using-d-i.xml:2506
+#: using-d-i.xml:2505
 #, no-c-format
 msgid ""
 "The boot loader on DECstations is <command>DELO</command>. It has to be "
@@ -3637,13 +3638,13 @@ msgstr ""
 "</screen></informalexample> 。"
 
 #. Tag: replaceable
-#: using-d-i.xml:2525
+#: using-d-i.xml:2524
 #, no-c-format
 msgid "<replaceable>#</replaceable>"
 msgstr "<replaceable>#</replaceable>"
 
 #. Tag: para
-#: using-d-i.xml:2526
+#: using-d-i.xml:2525
 #, no-c-format
 msgid ""
 "is the TurboChannel device to be booted from, on most DECstations this is "
@@ -3653,20 +3654,20 @@ msgstr ""
 "userinput>"
 
 #. Tag: replaceable
-#: using-d-i.xml:2534
+#: using-d-i.xml:2533
 #, no-c-format
 msgid "<replaceable>id</replaceable>"
 msgstr "<replaceable>id</replaceable>"
 
 #. Tag: para
-#: using-d-i.xml:2535
+#: using-d-i.xml:2534
 #, no-c-format
 msgid ""
 "is the SCSI ID of the hard disk on which <command>DELO</command> is installed"
 msgstr "硬盘上的 SCSI ID，<command>DELO</command> 安装在其上"
 
 #. Tag: para
-#: using-d-i.xml:2544
+#: using-d-i.xml:2543
 #, no-c-format
 msgid ""
 "is the number of the partition on which <filename>/etc/delo.conf</filename> "
@@ -3674,13 +3675,13 @@ msgid ""
 msgstr "分区号，<filename>/etc/delo.conf</filename> 处于此分区"
 
 #. Tag: replaceable
-#: using-d-i.xml:2552
+#: using-d-i.xml:2551
 #, no-c-format
 msgid "name"
 msgstr "name"
 
 #. Tag: para
-#: using-d-i.xml:2553
+#: using-d-i.xml:2552
 #, no-c-format
 msgid ""
 "is the name of the configuration entry in <filename>/etc/delo.conf</"
@@ -3690,7 +3691,7 @@ msgstr ""
 "quote>"
 
 #. Tag: para
-#: using-d-i.xml:2563
+#: using-d-i.xml:2562
 #, no-c-format
 msgid ""
 "In case <filename>/etc/delo.conf</filename> is on the first partition on the "
@@ -3700,19 +3701,19 @@ msgstr ""
 "认的设置，但也可以用"
 
 #. Tag: screen
-#: using-d-i.xml:2569
+#: using-d-i.xml:2568
 #, no-c-format
 msgid "<userinput>boot #/rz<replaceable>id</replaceable></userinput>"
 msgstr "<userinput>boot #/rz<replaceable>id</replaceable></userinput>"
 
 #. Tag: title
-#: using-d-i.xml:2579
+#: using-d-i.xml:2578
 #, no-c-format
 msgid "Install <command>Yaboot</command> on a Hard Disk"
 msgstr "安装 <command>Yaboot</command> 至硬盘"
 
 #. Tag: para
-#: using-d-i.xml:2580
+#: using-d-i.xml:2579
 #, no-c-format
 msgid ""
 "Newer (mid 1998 and on) PowerMacs use <command>yaboot</command> as their "
@@ -3730,13 +3731,13 @@ msgstr ""
 "设为启动 &debian;。"
 
 #. Tag: title
-#: using-d-i.xml:2598
+#: using-d-i.xml:2597
 #, no-c-format
 msgid "Install <command>Quik</command> on a Hard Disk"
 msgstr "安装 <command>Quik</command> 至硬盘"
 
 #. Tag: para
-#: using-d-i.xml:2599
+#: using-d-i.xml:2598
 #, no-c-format
 msgid ""
 "The boot loader for OldWorld Power Macintosh machines is <command>quik</"
@@ -3749,13 +3750,13 @@ msgstr ""
 "以工作在 7200，7300 和 7600 Powermacs，以及一些 Power Computing 克隆。"
 
 #. Tag: title
-#: using-d-i.xml:2615
+#: using-d-i.xml:2614
 #, no-c-format
 msgid "<command>zipl</command>-installer"
 msgstr "<command>zipl</command>-installer"
 
 #. Tag: para
-#: using-d-i.xml:2616
+#: using-d-i.xml:2615
 #, no-c-format
 msgid ""
 "The boot loader on &arch-title; is <quote>zipl</quote>. <command>ZIPL</"
@@ -3770,13 +3771,13 @@ msgstr ""
 "Commands</quote>，它位于 IBM 的 developerWorks 网站<command>ZIPL</command>。"
 
 #. Tag: title
-#: using-d-i.xml:2633
+#: using-d-i.xml:2632
 #, no-c-format
 msgid "Install the <command>SILO</command> Boot Loader on a Hard Disk"
 msgstr "安装 <command>SILO</command> Boot Loader 到硬盘"
 
 #. Tag: para
-#: using-d-i.xml:2635
+#: using-d-i.xml:2634
 #, no-c-format
 msgid ""
 "The standard &architecture; boot loader is called <quote>silo</quote>. It is "
@@ -3803,13 +3804,13 @@ msgstr ""
 "区启动。这对于安装 GNU/Linux 到一个已经存在 SunOS/Solaris 的系统很有用。"
 
 #. Tag: title
-#: using-d-i.xml:2660
+#: using-d-i.xml:2659
 #, no-c-format
 msgid "Continue Without Boot Loader"
 msgstr "不使用 boot loader 继续进行"
 
 #. Tag: para
-#: using-d-i.xml:2662
+#: using-d-i.xml:2661
 #, no-c-format
 msgid ""
 "This option can be used to complete the installation even when no boot "
@@ -3825,7 +3826,7 @@ msgstr ""
 "在机器上，以用于启动 GNU/Linux。</phrase>"
 
 #. Tag: para
-#: using-d-i.xml:2671
+#: using-d-i.xml:2670
 #, no-c-format
 msgid ""
 "If you plan to manually configure your bootloader, you should check the name "
@@ -3844,13 +3845,13 @@ msgstr ""
 "filename> 到一个独立的分区，还需要 <filename>/boot</filename> 文件系统。"
 
 #. Tag: title
-#: using-d-i.xml:2688
+#: using-d-i.xml:2687
 #, no-c-format
 msgid "Finishing the Installation"
 msgstr "完成安装"
 
 #. Tag: para
-#: using-d-i.xml:2689
+#: using-d-i.xml:2688
 #, no-c-format
 msgid ""
 "These are the last bits to do before rebooting to your new system. It mostly "
@@ -3858,13 +3859,13 @@ msgid ""
 msgstr "这是在您启动新系统之前的最后一些工作。主要进行一些 &d-i; 之后的清理。"
 
 #. Tag: title
-#: using-d-i.xml:2701
+#: using-d-i.xml:2700
 #, no-c-format
 msgid "Finish the Installation and Reboot"
 msgstr "完成安装并重启"
 
 #. Tag: para
-#: using-d-i.xml:2703
+#: using-d-i.xml:2702
 #, no-c-format
 msgid ""
 "This is the last step in the initial Debian installation process. You will "
@@ -3876,7 +3877,7 @@ msgstr ""
 "等)。安装程序将做最后几分钟的工作，然后启动到您的新 Debian 系统。"
 
 #. Tag: para
-#: using-d-i.xml:2710
+#: using-d-i.xml:2709
 #, no-c-format
 msgid ""
 "Select the <guimenuitem>Finish the installation</guimenuitem> menu item "
@@ -3889,13 +3890,13 @@ msgstr ""
 "安装步骤第一步里选做根文件系统。"
 
 #. Tag: title
-#: using-d-i.xml:2724
+#: using-d-i.xml:2723
 #, no-c-format
 msgid "Miscellaneous"
 msgstr "杂项"
 
 #. Tag: para
-#: using-d-i.xml:2725
+#: using-d-i.xml:2724
 #, no-c-format
 msgid ""
 "The components listed in this section are usually not involved in the "
@@ -3906,13 +3907,13 @@ msgstr ""
 "题。"
 
 #. Tag: title
-#: using-d-i.xml:2738
+#: using-d-i.xml:2737
 #, no-c-format
 msgid "Saving the installation logs"
 msgstr "保存安装记录"
 
 #. Tag: para
-#: using-d-i.xml:2740
+#: using-d-i.xml:2739
 #, no-c-format
 msgid ""
 "If the installation is successful, the logfiles created during the "
@@ -3923,7 +3924,7 @@ msgstr ""
 "<filename>/var/log/installer/</filename>。"
 
 #. Tag: para
-#: using-d-i.xml:2747
+#: using-d-i.xml:2746
 #, no-c-format
 msgid ""
 "Choosing <guimenuitem>Save debug logs</guimenuitem> from the main menu "
@@ -3937,13 +3938,13 @@ msgstr ""
 "其它系统上研究记录，或者用于报告的附件。"
 
 #. Tag: title
-#: using-d-i.xml:2767
+#: using-d-i.xml:2766
 #, no-c-format
 msgid "Using the Shell and Viewing the Logs"
 msgstr "使用 Shell 查看记录"
 
 #. Tag: para
-#: using-d-i.xml:2769
+#: using-d-i.xml:2768
 #, no-c-format
 msgid ""
 "There are several methods you can use to get a shell while running an "
@@ -3967,13 +3968,14 @@ msgstr ""
 "安装程序。"
 
 #. Tag: para
-#: using-d-i.xml:2787
-#, no-c-format
+#: using-d-i.xml:2786
+#, fuzzy, no-c-format
 msgid ""
 "If you cannot switch consoles, there is also an <guimenuitem>Execute a "
 "Shell</guimenuitem> item on the main menu that can be used to start a shell. "
-"To get back to the installer itself, type <userinput>exit</userinput> to "
-"close the shell."
+"You can get to the main menu from most dialogs by using the &BTN-GOBACK; "
+"button one or more times. Type <userinput>exit</userinput> to close the "
+"shell and return to the installer."
 msgstr ""
 "如果您无法切换控制台，还可以在主菜单上执行 <guimenuitem>Execute a Shell</"
 "guimenuitem> 选项，它可以启动一个 shell。回到安装程序，键入 <userinput>exit</"