Update pot/po files:

M    po/tl/boot-installer.po
M    po/ro/boot-installer.po
M    po/pt/install-methods.po
M    po/pt/boot-installer.po
M    po/da/boot-installer.po
M    po/ru/boot-installer.po
M    po/sv/boot-installer.po
M    po/ja/boot-installer.po
M    po/zh_TW/boot-installer.po
M    po/fi/boot-installer.po
M    po/el/boot-installer.po
M    po/zh_CN/install-methods.po
M    po/zh_CN/random-bits.po
M    po/zh_CN/preparing.po
M    po/zh_CN/preseed.po
M    po/zh_CN/welcome.po
M    po/zh_CN/using-d-i.po
M    po/zh_CN/hardware.po
M    po/zh_CN/boot-installer.po
M    po/zh_CN/installation-howto.po
M    po/pot/boot-installer.pot
M    po/es/boot-installer.po
M    po/ko/boot-installer.po
M    po/nl/boot-installer.po
M    po/nn/boot-installer.po
M    po/hu/install-methods.po
M    po/hu/boot-installer.po
M    po/vi/boot-installer.po

1 files changed, 62 insertions, 88 deletions

diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index f677271ba..f501bd457 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -21,27 +21,12 @@ msgstr "获取系统安装介质"
 #. Tag: title
 #: install-methods.xml:12
 #, no-c-format
-#| msgid "Official &debian-gnu; CD-ROM Sets"
 msgid "Official &debian-gnu; CD/DVD-ROM Sets"
 msgstr "官方的 &debian-gnu; CD/DVD 光盘套装"
 
 #. Tag: para
 #: install-methods.xml:13
 #, no-c-format
-#| msgid ""
-#| "By far the easiest way to install &debian-gnu; is from an Official "
-#| "&debian; CD-ROM Set. You can buy a set from a vendor (see the <ulink url="
-#| "\"&url-debian-cd-vendors;\">CD vendors page</ulink>). You may also "
-#| "download the CD-ROM images from a &debian; mirror and make your own set, "
-#| "if you have a fast network connection and a CD burner (see the <ulink url="
-#| "\"&url-debian-cd;\">Debian CD page</ulink> for detailed instructions). If "
-#| "you have a &debian; CD set and CDs are bootable on your machine, you can "
-#| "skip right to <xref linkend=\"boot-installer\"/>; much effort has been "
-#| "expended to ensure the files most people need are there on the CD. "
-#| "Although a full set of binary packages requires several CDs, it is "
-#| "unlikely you will need packages on the third CD and above. You may also "
-#| "consider using the DVD version, which saves a lot of space on your shelf "
-#| "and you avoid the CD shuffling marathon."
 msgid ""
 "By far the easiest way to install &debian-gnu; is from an Official &debian; "
 "CD/DVD-ROM Set. You can buy a set from a vendor (see the <ulink url=\"&url-"
@@ -56,7 +41,17 @@ msgid ""
 "most-used files are on the first CDs and DVDs, so that a basic desktop "
 "installation can be done with only the first DVD or - to a limited extent - "
 "even with only the first CD."
-msgstr "目前安装 &debian-gnu; 最容易的方法是使用官方的 &debian; CD/DVD-ROM 套件。您可以从一个销售商处购买(参见<ulink url=\"&url-debian-cd-vendors;\">CD 销售商</ulink>)。 如果您有高速网络和 CD/DVD 刻录机，可以选择从 &debian; 镜像站点下载 CD/DVD-ROM 映像，然后自己刻录(参见 <ulink url=\"&url-debian-cd;\">Debian CD 页</ulink>和 <ulink url=\"&url-debian-cd-faq;\">Debian CD FAQ</ulink> 了解详细说明)。如果您已经有一套 &debian; CD/DVD 并能在机器上引导这些 CDs/DVD<phrase arch=\"x86\">，大多数现代 PC 都适用</phrase>，可以直接跳到 <xref linkend=\"boot-installer\"/>。我们尽力让最常用的文件包含在 CD 和 DVD 的第一张盘上，所以只使用第一张 DVD 就能完成基本的桌面安装，或者在有限的范围内可以只使用第一张 CD。"
+msgstr ""
+"目前安装 &debian-gnu; 最容易的方法是使用官方的 &debian; CD/DVD-ROM 套件。您可"
+"以从一个销售商处购买(参见<ulink url=\"&url-debian-cd-vendors;\">CD 销售商</"
+"ulink>)。 如果您有高速网络和 CD/DVD 刻录机，可以选择从 &debian; 镜像站点下载 "
+"CD/DVD-ROM 映像，然后自己刻录(参见 <ulink url=\"&url-debian-cd;\">Debian CD "
+"页</ulink>和 <ulink url=\"&url-debian-cd-faq;\">Debian CD FAQ</ulink> 了解详"
+"细说明)。如果您已经有一套 &debian; CD/DVD 并能在机器上引导这些 CDs/"
+"DVD<phrase arch=\"x86\">，大多数现代 PC 都适用</phrase>，可以直接跳到 <xref "
+"linkend=\"boot-installer\"/>。我们尽力让最常用的文件包含在 CD 和 DVD 的第一张"
+"盘上，所以只使用第一张 DVD 就能完成基本的桌面安装，或者在有限的范围内可以只使"
+"用第一张 CD。"
 
 #. Tag: para
 #: install-methods.xml:30
@@ -67,23 +62,13 @@ msgid ""
 "some desktop environments a CD installation requires either network "
 "connectivity during the installation to download the remaining files or "
 "additional CDs."
-msgstr "由于当前标准对 CD 容量的限制，不是所有的桌面图形环境都能装到第一张 CD 里面；有些桌面环境 CD 安装方式要么通过网络连接下载其他文件要么使用额外的 CD。"
+msgstr ""
+"由于当前标准对 CD 容量的限制，不是所有的桌面图形环境都能装到第一张 CD 里面；"
+"有些桌面环境 CD 安装方式要么通过网络连接下载其他文件要么使用额外的 CD。"
 
 #. Tag: para
 #: install-methods.xml:38
 #, no-c-format
-#| msgid ""
-#| "If your machine doesn't support CD booting, but you do have a CD set, you "
-#| "can use an alternative strategy such as <phrase condition=\"supports-"
-#| "floppy-boot\">floppy disk,</phrase> <phrase arch=\"s390\">tape, emulated "
-#| "tape,</phrase> <phrase condition=\"bootable-disk\">hard disk,</phrase> "
-#| "<phrase condition=\"bootable-usb\">usb stick,</phrase> <phrase condition="
-#| "\"supports-tftp\">net boot,</phrase> or manually loading the kernel from "
-#| "the CD to initially boot the system installer. The files you need for "
-#| "booting by another means are also on the CD; the &debian; network archive "
-#| "and CD folder organization are identical. So when archive file paths are "
-#| "given below for particular files you need for booting, look for those "
-#| "files in the same directories and subdirectories on your CD."
 msgid ""
 "If your machine doesn't support CD booting<phrase arch=\"x86\"> (only "
 "relevant on very old PC systems)</phrase>, but you do have a CD set, you can "
@@ -97,7 +82,15 @@ msgid ""
 "identical. So when archive file paths are given below for particular files "
 "you need for booting, look for those files in the same directories and "
 "subdirectories on your CD."
-msgstr "如果您的机器不支持 CD 引导<phrase arch=\"x86\"> (仅限于非常古老的 PC 系统)</phrase>，但您有一套 CD，可以使用替代的方案，例如：<phrase condition=\"supports-floppy-boot\">软盘、</phrase> <phrase arch=\"s390\">磁带、仿真磁带、</phrase> <phrase condition=\"bootable-disk\">硬盘、</phrase> <phrase condition=\"bootable-usb\">U 盘、</phrase> <phrase condition=\"supports-tftp\">网络引导、</phrase> 或者从 CD 手工装载内核来初始化系统安装程序。CD 的里已经包含了用其他方法引导所需的文件；&debian; 网络存档和 CD 文件夹组织方式相同。因此当引导需要特定的文件时，可以从 CD 的相同目录和子目录中找到。"
+msgstr ""
+"如果您的机器不支持 CD 引导<phrase arch=\"x86\"> (仅限于非常古老的 PC 系统)</"
+"phrase>，但您有一套 CD，可以使用替代的方案，例如：<phrase condition="
+"\"supports-floppy-boot\">软盘、</phrase> <phrase arch=\"s390\">磁带、仿真磁"
+"带、</phrase> <phrase condition=\"bootable-disk\">硬盘、</phrase> <phrase "
+"condition=\"bootable-usb\">U 盘、</phrase> <phrase condition=\"supports-tftp"
+"\">网络引导、</phrase> 或者从 CD 手工装载内核来初始化系统安装程序。CD 的里已"
+"经包含了用其他方法引导所需的文件；&debian; 网络存档和 CD 文件夹组织方式相同。"
+"因此当引导需要特定的文件时，可以从 CD 的相同目录和子目录中找到。"
 
 #. Tag: para
 #: install-methods.xml:61
@@ -273,36 +266,33 @@ msgstr "Plug Computer 和 OpenRD 安装文件"
 #. Tag: para
 #: install-methods.xml:182
 #, no-c-format
-#| msgid ""
-#| "The installation files for plug computers (SheevaPlug, GuruPlug, etc) and "
-#| "OpenRD devices consist of a kernel and initrd for U-Boot. You can obtain "
-#| "these files from &kirkwood-marvell-firmware-img;."
 msgid ""
 "The installation files for plug computers (SheevaPlug, GuruPlug, DreamPlug "
 "etc) and OpenRD devices consist of a kernel and initrd for U-Boot. You can "
 "obtain these files from &kirkwood-marvell-firmware-img;."
-msgstr "plug computers (SheevaPlug、GuruPlug、DreamPlug 等) 和 OpenRD 设备的安装文件包含对应 U-Boot 的内核和 initrd。您可以从 &kirkwood-marvell-firmware-img; 取得这些文件。"
+msgstr ""
+"plug computers (SheevaPlug、GuruPlug、DreamPlug 等) 和 OpenRD 设备的安装文件"
+"包含对应 U-Boot 的内核和 initrd。您可以从 &kirkwood-marvell-firmware-img; 取"
+"得这些文件。"
 
 #. Tag: title
 #: install-methods.xml:192
 #, no-c-format
-#| msgid "GLAN Tank Installation Files"
 msgid "LaCie NASes Installation Files"
 msgstr "LaCie NASes 安装文件"
 
 #. Tag: para
 #: install-methods.xml:193
 #, no-c-format
-#| msgid ""
-#| "The installation files for plug computers (SheevaPlug, GuruPlug, etc) and "
-#| "OpenRD devices consist of a kernel and initrd for U-Boot. You can obtain "
-#| "these files from &kirkwood-marvell-firmware-img;."
 msgid ""
 "The installation files for LaCie NASes (Network Space v2, Network Space Max "
 "v2, Internet Space v2, d2 Network v2, 2Big Network v2 and 5Big Network v2) "
 "consist of a kernel and initrd for U-Boot. You can obtain these files from "
 "&lacie-kirkwood-firmware-img;."
-msgstr "LaCie NASes (Network Space v2、Network Space Max v2、Internet Space v2、d2 Network v2、2Big Network v2 和 5Big Network v2) 安装文件含有用于 U-Boot 的内核和 initrd。您可以从 &lacie-kirkwood-firmware-img; 获取这些文件。"
+msgstr ""
+"LaCie NASes (Network Space v2、Network Space Max v2、Internet Space v2、d2 "
+"Network v2、2Big Network v2 和 5Big Network v2) 安装文件含有用于 U-Boot 的内"
+"核和 initrd。您可以从 &lacie-kirkwood-firmware-img; 获取这些文件。"
 
 #. Tag: title
 #: install-methods.xml:244
@@ -934,15 +924,6 @@ msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sdX2</replaceable>"
 #. Tag: para
 #: install-methods.xml:653
 #, no-c-format
-#| msgid ""
-#| "After that, mount the USB memory stick <phrase arch=\"x86\">"
-#| "(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
-#| "phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/"
-#| "<replaceable>sdX2</replaceable> /mnt</userinput>),</phrase> which will "
-#| "now have <phrase arch=\"x86\">a FAT filesystem</phrase> <phrase arch="
-#| "\"powerpc\">an HFS filesystem</phrase> on it, and copy a &debian; ISO "
-#| "image (netinst, businesscard, or full CD) to it. Unmount the stick "
-#| "(<userinput>umount /mnt</userinput>) and you are done."
 msgid ""
 "After that, mount the USB memory stick <phrase arch=\"x86\">"
 "(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</"
@@ -952,7 +933,14 @@ msgid ""
 "filesystem</phrase> on it, and copy a &debian; ISO image (netinst or full "
 "CD) to it. Unmount the stick (<userinput>umount /mnt</userinput>) and you "
 "are done."
-msgstr "然后，挂载 U 盘 <phrase arch=\"x86\">(<userinput>mount /dev/<replaceable>sdX</replaceable> /mnt</userinput>),</phrase> <phrase arch=\"powerpc\">(<userinput>mount /dev/<replaceable>sdX2</replaceable> /mnt</userinput>),</phrase> 现在上面有了 <phrase arch=\"x86\">一个 FAT 文件系统</phrase> <phrase arch=\"powerpc\">一个 HFS 文件系统</phrase>，然后复制 &debian; ISO 映像 (netinst 或完整的 CD) 到里面。卸载 U 盘 (<userinput>umount /mnt</userinput>) 就完成了。"
+msgstr ""
+"然后，挂载 U 盘 <phrase arch=\"x86\">(<userinput>mount /dev/"
+"<replaceable>sdX</replaceable> /mnt</userinput>),</phrase> <phrase arch="
+"\"powerpc\">(<userinput>mount /dev/<replaceable>sdX2</replaceable> /mnt</"
+"userinput>),</phrase> 现在上面有了 <phrase arch=\"x86\">一个 FAT 文件系统</"
+"phrase> <phrase arch=\"powerpc\">一个 HFS 文件系统</phrase>，然后复制 "
+"&debian; ISO 映像 (netinst 或完整的 CD) 到里面。卸载 U 盘 "
+"(<userinput>umount /mnt</userinput>) 就完成了。"
 
 #. Tag: title
 #: install-methods.xml:670
@@ -990,18 +978,6 @@ msgstr "我们将展示如何使用 U 盘的第一个分区，而不是整个设
 #. Tag: para
 #: install-methods.xml:692
 #, no-c-format
-#| msgid ""
-#| "Since most USB sticks come pre-configured with a single FAT16 partition, "
-#| "you probably won't have to repartition or reformat the stick. If you have "
-#| "to do that anyway, use <command>cfdisk</command> or any other "
-#| "partitioning tool to create a FAT16 partition<footnote> <para> Don't "
-#| "forget to set the <quote>bootable</quote> bootable flag. </para> </"
-#| "footnote>, and then create the filesystem using: "
-#| "<informalexample><screen>\n"
-#| "# mkdosfs /dev/<replaceable>sdX1</replaceable>\n"
-#| "</screen></informalexample> Take care that you use the correct device "
-#| "name for your USB stick. The <command>mkdosfs</command> command is "
-#| "contained in the <classname>dosfstools</classname> &debian; package."
 msgid ""
 "Since most USB sticks come pre-configured with a single FAT16 partition, you "
 "probably won't have to repartition or reformat the stick. If you have to do "
@@ -1018,11 +994,18 @@ msgid ""
 "for your USB stick. The <command>mkdosfs</command> command is contained in "
 "the <classname>dosfstools</classname> &debian; package."
 msgstr ""
-"由于大多数 U 盘预先设置了一个单独的 FAT16 分区，您可能不需要重新分区或者格式化 U 盘。如果必须要做，请使用 <command>cfdisk</command> 或者其他的分区工具来创建一个 FAT16 分区<footnote> <para> 别忘记设置 <quote>bootable</quote> 引导标记。</para> </footnote>，安装 MBR 使用：<informalexample><screen>\n"
+"由于大多数 U 盘预先设置了一个单独的 FAT16 分区，您可能不需要重新分区或者格式"
+"化 U 盘。如果必须要做，请使用 <command>cfdisk</command> 或者其他的分区工具来"
+"创建一个 FAT16 分区<footnote> <para> 别忘记设置 <quote>bootable</quote> 引导"
+"标记。</para> </footnote>，安装 MBR 使用：<informalexample><screen>\n"
 "# install-mbr /dev/<replaceable>sdX</replaceable>\n"
-"</screen></informalexample> 其中 <command>install-mbr</command> 命令包含在 <classname>mbr</classname> &debian; 软件包内。然后建立文件系统：<informalexample><screen>\n"
+"</screen></informalexample> 其中 <command>install-mbr</command> 命令包含在 "
+"<classname>mbr</classname> &debian; 软件包内。然后建立文件系统："
+"<informalexample><screen>\n"
 "# mkdosfs /dev/<replaceable>sdX1</replaceable>\n"
-"</screen></informalexample> 注意，请使用 U 盘正确的设备名称。<command>mkdosfs</command> 命令包含在 <classname>dosfstools</classname> &debian; 软件包内。"
+"</screen></informalexample> 注意，请使用 U 盘正确的设备名称。"
+"<command>mkdosfs</command> 命令包含在 <classname>dosfstools</classname> "
+"&debian; 软件包内。"
 
 #. Tag: para
 #: install-methods.xml:716
@@ -1097,16 +1080,6 @@ msgstr ""
 #. Tag: para
 #: install-methods.xml:768
 #, no-c-format
-#| msgid ""
-#| "Next you should create a <filename>syslinux.cfg</filename> configuration "
-#| "file, which at a bare minimum should contain the following two lines "
-#| "(change the name of the kernel binary to <quote><filename>linux</"
-#| "filename></quote> if you used a <filename>netboot</filename> image): "
-#| "<informalexample><screen>\n"
-#| "default vmlinuz\n"
-#| "append initrd=initrd.gz\n"
-#| "</screen></informalexample> For the graphical installer you should add "
-#| "<userinput>vga=788</userinput> to the second line."
 msgid ""
 "Next you should create a <filename>syslinux.cfg</filename> configuration "
 "file, which at a bare minimum should contain the following two lines (change "
@@ -1119,10 +1092,13 @@ msgid ""
 "<userinput>vga=788</userinput> to the second line. Other parameters can be "
 "appended as desired."
 msgstr ""
-"接下来，您需要创建一个 <filename>syslinux.cfg</filename> 配置文件，里面最少要包含下面两行(如果您使用 <filename>netboot</filename> 映象，修改内核文件名为  <quote><filename>linux</filename></quote> )：<informalexample><screen>\n"
+"接下来，您需要创建一个 <filename>syslinux.cfg</filename> 配置文件，里面最少要"
+"包含下面两行(如果您使用 <filename>netboot</filename> 映象，修改内核文件名为  "
+"<quote><filename>linux</filename></quote> )：<informalexample><screen>\n"
 "default vmlinuz\n"
 "append initrd=initrd.gz\n"
-"</screen></informalexample> 对于图形安装程序，您需要添加 <userinput>vga=788</userinput> 到第二行尾部。还可以添加其他的参数。"
+"</screen></informalexample> 对于图形安装程序，您需要添加 <userinput>vga=788</"
+"userinput> 到第二行尾部。还可以添加其他的参数。"
 
 #. Tag: para
 #: install-methods.xml:780
@@ -1130,19 +1106,12 @@ msgstr ""
 msgid ""
 "To enable the boot prompt to permit further parameter appending, add a "
 "<userinput>prompt 1</userinput> line."
-msgstr "添加 <userinput>prompt 1</userinput> 一行，使得引导提示符可以允许附加参数。"
+msgstr ""
+"添加 <userinput>prompt 1</userinput> 一行，使得引导提示符可以允许附加参数。"
 
 #. Tag: para
 #: install-methods.xml:785 install-methods.xml:895
 #, no-c-format
-#| msgid ""
-#| "If you used an <filename>hd-media</filename> image, you should now copy "
-#| "the ISO file of a &debian; ISO image<footnote> <para> You can use either "
-#| "a businesscard, a netinst or a full CD image (see <xref linkend="
-#| "\"official-cdrom\"/>). Be sure to select one that fits. Note that the "
-#| "<quote>netboot <filename>mini.iso</filename></quote> image is not usable "
-#| "for this purpose. </para> </footnote> onto the stick. When you are done, "
-#| "unmount the USB memory stick (<userinput>umount /mnt</userinput>)."
 msgid ""
 "If you used an <filename>hd-media</filename> image, you should now copy the "
 "ISO file of a &debian; ISO image<footnote> <para> You can use either a "
@@ -1151,7 +1120,12 @@ msgid ""
 "filename></quote> image is not usable for this purpose. </para> </footnote> "
 "onto the stick. When you are done, unmount the USB memory stick "
 "(<userinput>umount /mnt</userinput>)."
-msgstr "如果您使用 <filename>hd-media</filename> 映象，现在应该复制 &debian; ISO 映像文件<footnote> <para> 您可以选择 netinst 或完整 CD 映像 (参阅 <xref linkend=\"official-cdrom\"/>)。确认选择合适的映象。注意 <quote>netboot <filename>mini.iso</filename></quote> 映象在这里并不适用。</para> </footnote> 到 U 盘。完成后，卸载 U 盘 (<userinput>umount /mnt</userinput>)。"
+msgstr ""
+"如果您使用 <filename>hd-media</filename> 映象，现在应该复制 &debian; ISO 映像"
+"文件<footnote> <para> 您可以选择 netinst 或完整 CD 映像 (参阅 <xref linkend="
+"\"official-cdrom\"/>)。确认选择合适的映象。注意 <quote>netboot "
+"<filename>mini.iso</filename></quote> 映象在这里并不适用。</para> </"
+"footnote> 到 U 盘。完成后，卸载 U 盘 (<userinput>umount /mnt</userinput>)。"
 
 #. Tag: para
 #: install-methods.xml:809