Regenerating po files:

- merge_xml
- update_pot
- update_po ro|pt|ru|sv|zh_TW|fi|el|zh_CN|es|ko|hu|vi

1 files changed, 63 insertions, 45 deletions

diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po
index 031ee201f..a4dcfaa11 100644
--- a/po/zh_CN/installation-howto.po
+++ b/po/zh_CN/installation-howto.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: 2010-12-29 12:07+0000\n"
+"POT-Creation-Date: 2012-06-16 09:12+0000\n"
 "PO-Revision-Date: 2011-01-16 23:32+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -236,11 +236,31 @@ msgstr ""
 #: installation-howto.xml:138
 #, no-c-format
 msgid ""
+"The easiest way to prepare your USB memory stick is to download any Debian "
+"CD or DVD image that will fit on it, and write the CD image directly to the "
+"memory stick. Of course this will destroy anything already on the memory "
+"stick. This works because Debian CD images are \"isohybrid\" images that can "
+"boot both from CD and from USB drives."
+msgstr ""
+
+#. Tag: para
+#: installation-howto.xml:146
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The easiest way to prepare your USB memory stick is to download "
+#| "<filename>hd-media/boot.img.gz</filename>, and use gunzip to extract the "
+#| "256 MB image from that file. Write this image directly to your memory "
+#| "stick, which must be at least 256 mb in size. Of course this will destroy "
+#| "anything already on the memory stick. Then mount the memory stick, which "
+#| "will now have a FAT filesystem on it. Next, download a &debian; netinst "
+#| "CD image, and copy that file to the memory stick; any filename is ok as "
+#| "long as it ends in <literal>.iso</literal>."
+msgid ""
 "The easiest way to prepare your USB memory stick is to download <filename>hd-"
-"media/boot.img.gz</filename>, and use gunzip to extract the 256 MB image "
-"from that file. Write this image directly to your memory stick, which must "
-"be at least 256 mb in size. Of course this will destroy anything already on "
-"the memory stick. Then mount the memory stick, which will now have a FAT "
+"media/boot.img.gz</filename>, and use gunzip to extract the 1 GB image from "
+"that file. Write this image directly to your memory stick, which must be at "
+"least 1 GB in size. Of course this will destroy anything already on the "
+"memory stick. Then mount the memory stick, which will now have a FAT "
 "filesystem on it. Next, download a &debian; netinst CD image, and copy that "
 "file to the memory stick; any filename is ok as long as it ends in <literal>."
 "iso</literal>."
@@ -254,7 +274,7 @@ msgstr ""
 "iso</literal> 结尾的就行。"
 
 #. Tag: para
-#: installation-howto.xml:149
+#: installation-howto.xml:157
 #, no-c-format
 msgid ""
 "There are other, more flexible ways to set up a memory stick to use the "
@@ -266,7 +286,7 @@ msgstr ""
 "files\"/>。"
 
 #. Tag: para
-#: installation-howto.xml:155
+#: installation-howto.xml:163
 #, no-c-format
 msgid ""
 "Some BIOSes can boot USB storage directly, and some cannot. You may need to "
@@ -280,7 +300,7 @@ msgstr ""
 "提示和具体的细节说明。"
 
 #. Tag: para
-#: installation-howto.xml:162
+#: installation-howto.xml:170
 #, no-c-format
 msgid ""
 "Booting Macintosh systems from USB storage devices involves manual use of "
@@ -290,13 +310,13 @@ msgstr ""
 "<xref linkend=\"usb-boot\"/>。"
 
 #. Tag: title
-#: installation-howto.xml:171
+#: installation-howto.xml:179
 #, no-c-format
 msgid "Booting from network"
 msgstr "从网络启动"
 
 #. Tag: para
-#: installation-howto.xml:172
+#: installation-howto.xml:180
 #, no-c-format
 msgid ""
 "It's also possible to boot &d-i; completely from the net. The various "
@@ -308,32 +328,30 @@ msgstr ""
 "filename> 目录里的文件是用来从网络启动 &d-i; 的。"
 
 #. Tag: para
-#: installation-howto.xml:178
+#: installation-howto.xml:186
 #, no-c-format
-#| msgid ""
-#| "The easiest thing to set up is probably PXE netbooting. Untar the file "
-#| "<filename>netboot/pxeboot.tar.gz</filename> into <filename>/var/lib/"
-#| "tftpboot</filename> or wherever is appropriate for your tftp server. Set "
-#| "up your DHCP server to pass filename <filename>pxelinux.0</filename> to "
-#| "clients, and with luck everything will just work. For detailed "
-#| "instructions, see <xref linkend=\"install-tftp\"/>."
 msgid ""
 "The easiest thing to set up is probably PXE netbooting. Untar the file "
 "<filename>netboot/pxeboot.tar.gz</filename> into <filename>/srv/tftp</"
 "filename> or wherever is appropriate for your tftp server. Set up your DHCP "
-"server to pass filename <filename>pxelinux.0</filename> to clients, and "
-"with luck everything will just work. For detailed instructions, see <xref "
-"linkend=\"install-tftp\"/>."
-msgstr "最简单的建立方式大概是使用 PXE 的网络启动。解压 <filename>netboot/pxeboot.tar.gz</filename> 文件，把它放到 <filename>/srv/tftp</filename>，或者您 tftp 服务器上合适的地方。然后再建立 DHCP 服务器，传送 <filename>pxelinux.0</filename> 这个文件名给客户端。老天保佑的话，就能顺利安装了。若要知道详细的操作步骤，请参阅 <xref linkend=\"install-tftp\"/>。"
+"server to pass filename <filename>pxelinux.0</filename> to clients, and with "
+"luck everything will just work. For detailed instructions, see <xref linkend="
+"\"install-tftp\"/>."
+msgstr ""
+"最简单的建立方式大概是使用 PXE 的网络启动。解压 <filename>netboot/pxeboot."
+"tar.gz</filename> 文件，把它放到 <filename>/srv/tftp</filename>，或者您 tftp "
+"服务器上合适的地方。然后再建立 DHCP 服务器，传送 <filename>pxelinux.0</"
+"filename> 这个文件名给客户端。老天保佑的话，就能顺利安装了。若要知道详细的操"
+"作步骤，请参阅 <xref linkend=\"install-tftp\"/>。"
 
 #. Tag: title
-#: installation-howto.xml:192
+#: installation-howto.xml:200
 #, no-c-format
 msgid "Booting from hard disk"
 msgstr "从硬盘启动"
 
 #. Tag: para
-#: installation-howto.xml:193
+#: installation-howto.xml:201
 #, no-c-format
 msgid ""
 "It's possible to boot the installer using no removable media, but just an "
@@ -353,13 +371,13 @@ msgstr ""
 "\"/> 说明了如何做这件事。</phrase>"
 
 #. Tag: title
-#: installation-howto.xml:210
+#: installation-howto.xml:218
 #, no-c-format
 msgid "Installation"
 msgstr "安装"
 
 #. Tag: para
-#: installation-howto.xml:211
+#: installation-howto.xml:219
 #, no-c-format
 msgid ""
 "Once the installer starts, you will be greeted with an initial screen. Press "
@@ -370,7 +388,7 @@ msgstr ""
 "一下其它的启动方式以及各种参数的说明(参阅 <xref linkend=\"boot-parms\"/>)。"
 
 #. Tag: para
-#: installation-howto.xml:217
+#: installation-howto.xml:225
 #, no-c-format
 msgid ""
 "After a while you will be asked to select your language. Use the arrow keys "
@@ -385,7 +403,7 @@ msgstr ""
 "上所有国家的列表以备选择。"
 
 #. Tag: para
-#: installation-howto.xml:225
+#: installation-howto.xml:233
 #, no-c-format
 msgid ""
 "You may be asked to confirm your keyboard layout. Choose the default unless "
@@ -395,7 +413,7 @@ msgstr ""
 "清楚更合适的布局。"
 
 #. Tag: para
-#: installation-howto.xml:230
+#: installation-howto.xml:238
 #, no-c-format
 msgid ""
 "Now sit back while debian-installer detects some of your hardware, and loads "
@@ -405,7 +423,7 @@ msgstr ""
 "件，并从 CD、软驱、USB 或其它设备里把它的其余部分加载进系统。"
 
 #. Tag: para
-#: installation-howto.xml:235
+#: installation-howto.xml:243
 #, no-c-format
 msgid ""
 "Next the installer will try to detect your network hardware and set up "
@@ -416,7 +434,7 @@ msgstr ""
 "果没有连接网络，或是没有用 DHCP，那么您也可以手动配置网络。"
 
 #. Tag: para
-#: installation-howto.xml:241
+#: installation-howto.xml:249
 #, no-c-format
 msgid ""
 "The next step is setting up your clock and time zone. The installer will try "
@@ -429,7 +447,7 @@ msgstr ""
 "的一个。"
 
 #. Tag: para
-#: installation-howto.xml:248
+#: installation-howto.xml:256
 #, no-c-format
 msgid ""
 "Now it is time to partition your disks. First you will be given the "
@@ -444,7 +462,7 @@ msgstr ""
 "guimenuitem>。"
 
 #. Tag: para
-#: installation-howto.xml:256
+#: installation-howto.xml:264
 #, no-c-format
 msgid ""
 "If you have an existing DOS or Windows partition that you want to preserve, "
@@ -458,7 +476,7 @@ msgstr ""
 "装空间：只需选择该分区，并指定它的新尺寸。"
 
 #. Tag: para
-#: installation-howto.xml:263
+#: installation-howto.xml:271
 #, no-c-format
 msgid ""
 "On the next screen you will see your partition table, how the partitions "
@@ -480,7 +498,7 @@ msgstr ""
 "\"partitioning\"/> 有更多关于分区方面的信息。"
 
 #. Tag: para
-#: installation-howto.xml:276
+#: installation-howto.xml:284
 #, no-c-format
 msgid ""
 "Now &d-i; formats your partitions and starts to install the base system, "
@@ -490,7 +508,7 @@ msgstr ""
 "装内核。"
 
 #. Tag: para
-#: installation-howto.xml:281
+#: installation-howto.xml:289
 #, no-c-format
 msgid ""
 "The base system that was installed earlier is a working, but very minimal "
@@ -510,7 +528,7 @@ msgstr ""
 "quote>任务。参阅 <xref linkend=\"pkgsel\"/> 了解本步骤的详细信息。"
 
 #. Tag: para
-#: installation-howto.xml:293
+#: installation-howto.xml:301
 #, no-c-format
 msgid ""
 "Installation of the base system is followed by setting up user accounts. By "
@@ -522,7 +540,7 @@ msgstr ""
 "理员) 帐号设置密码，并建立一个普通用户帐号。"
 
 #. Tag: para
-#: installation-howto.xml:300
+#: installation-howto.xml:308
 #, no-c-format
 msgid ""
 "The last step is to install a boot loader. If the installer detects other "
@@ -538,7 +556,7 @@ msgstr ""
 "它这样做，而是把 GRUB 装在其它什么地方。</phrase>"
 
 #. Tag: para
-#: installation-howto.xml:310
+#: installation-howto.xml:318
 #, no-c-format
 msgid ""
 "&d-i; will now tell you that the installation has finished. Remove the cdrom "
@@ -551,7 +569,7 @@ msgstr ""
 "<xref linkend=\"boot-new\"/> 有对它的详尽说明。"
 
 #. Tag: para
-#: installation-howto.xml:317
+#: installation-howto.xml:325
 #, no-c-format
 msgid ""
 "If you need more information on the install process, see <xref linkend=\"d-i-"
@@ -559,13 +577,13 @@ msgid ""
 msgstr "如果您想要更多的安装过程相关信息，请看 <xref linkend=\"d-i-intro\"/>。"
 
 #. Tag: title
-#: installation-howto.xml:326
+#: installation-howto.xml:334
 #, no-c-format
 msgid "Send us an installation report"
 msgstr "请给我们发一份安装报告"
 
 #. Tag: para
-#: installation-howto.xml:327
+#: installation-howto.xml:335
 #, no-c-format
 msgid ""
 "If you successfully managed an installation with &d-i;, please take time to "
@@ -580,7 +598,7 @@ msgstr ""
 "然后执行 <command>reportbug installation-reports</command>。"
 
 #. Tag: para
-#: installation-howto.xml:337
+#: installation-howto.xml:345
 #, no-c-format
 msgid ""
 "If you did not complete the install, you probably found a bug in debian-"
@@ -595,13 +613,13 @@ msgstr ""
 "\"problem-report\"/>。"
 
 #. Tag: title
-#: installation-howto.xml:349
+#: installation-howto.xml:357
 #, no-c-format
 msgid "And finally&hellip;"
 msgstr "末了&hellip;"
 
 #. Tag: para
-#: installation-howto.xml:350
+#: installation-howto.xml:358
 #, no-c-format
 msgid ""
 "We hope that your &debian; installation is pleasant and that you find "