po/zh_CN: Translate partitioner options

1 files changed, 45 insertions, 36 deletions

diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index b48adeb6a..438bd6cb6 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
 "POT-Creation-Date: 2010-03-28 00:13+0000\n"
-"PO-Revision-Date: 2010-01-18 18:22+0800\n"
-"Last-Translator: Ji YongGang <jungle@soforge.com>\n"
+"PO-Revision-Date: 2010-04-07 12:22+0800\n"
+"Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: application/x-xml2pot; charset=UTF-8\n"
@@ -1598,7 +1598,7 @@ msgstr "分区"
 
 #. Tag: para
 #: preseed.xml:841
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "Using preseeding to partition the harddisk is very much limited to what "
 #| "is supported by <classname>partman-auto</classname>. You can choose to "
@@ -1613,11 +1613,7 @@ msgid ""
 "existing free space on a disk or a whole disk. The layout of the disk can be "
 "determined by using a predefined recipe, a custom recipe from a recipe file "
 "or a recipe included in the preconfiguration file."
-msgstr ""
-"使用预置进行硬盘分区受限于 <classname>partman-auto</classname> 提供的支持。您"
-"可以选择使用磁盘上已有的空闲分区或者整个磁盘。磁盘的布局将取决于所使用的预定"
-"义方案，用户自定义的方案文件或预置文件包含的方案。当前还不能使用预置配置多个"
-"磁盘。"
+msgstr "使用预置进行硬盘分区受限于 <classname>partman-auto</classname> 提供的支持。您可以选择使用磁盘上已有的空闲分区或者整个磁盘。磁盘的布局将取决于所使用的预定义方案，用户自定义的方案文件或预置文件包含的方案。"
 
 #. Tag: para
 #: preseed.xml:849
@@ -1626,7 +1622,7 @@ msgid ""
 "Preseeding of advanced partition setups using RAID, LVM and encryption is "
 "supported, but not with the full flexibility possible when partitioning "
 "during a non-preseeded install."
-msgstr ""
+msgstr "已经支持包括 RAID、LVM 和加密高级分区设置的预置，但对于非预置安装的分区仍然弹性不足。"
 
 #. Tag: para
 #: preseed.xml:855
@@ -1639,7 +1635,7 @@ msgid ""
 "available from the <ulink url=\"&url-d-i-websvn;/trunk/installer/doc/devel/"
 "\">&d-i; source repository</ulink>. Note that the supported functionality "
 "may change between releases."
-msgstr ""
+msgstr "下面的例子仅提供了使用方案的最基本信息。详细的内容清参考文件 <filename>partman-auto-recipe.txt</filename> 和 <filename>partman-auto-raid-recipe.txt</filename>，它们包含在 <classname>debian-installer</classname> 软件包内。这两个文件也可以从 <ulink url=\"&url-d-i-websvn;/trunk/installer/doc/devel/\">&d-i; source repository</ulink> 获取。注意不同发布版支持的功能会有所改变。"
 
 #. Tag: para
 #: preseed.xml:869
@@ -1654,14 +1650,14 @@ msgstr ""
 
 #. Tag: title
 #: preseed.xml:878
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid "Partitioning"
 msgid "Partitioning example"
-msgstr "分区"
+msgstr "分区示例"
 
 #. Tag: screen
 #: preseed.xml:880
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "# If the system has free space you can choose to only partition that "
 #| "space.\n"
@@ -1807,13 +1803,17 @@ msgstr ""
 "# This is only honoured if partman-auto/method (below) is not set.\n"
 "#d-i partman-auto/init_automatically_partition select biggest_free\n"
 "\n"
-"# Alternatively, you can specify a disk to partition. The device name must\n"
-"# be given in traditional non-devfs format.\n"
-"# Note: A disk must be specified, unless the system has only one disk.\n"
+"# Alternatively, you may specify a disk to partition. If the system has only\n"
+"# one disk the installer will default to using that, but otherwise the device\n"
+"# name must be given in traditional, non-devfs format (so e.g. /dev/hda or\n"
+"# /dev/sda, and not e.g. /dev/discs/disc0/disc).\n"
 "# For example, to use the first SCSI/SATA hard disk:\n"
 "#d-i partman-auto/disk string /dev/sda\n"
 "# In addition, you'll need to specify the method to use.\n"
-"# The presently available methods are: \"regular\", \"lvm\" and \"crypto\"\n"
+"# The presently available methods are:\n"
+"# - regular: use the usual partition types for your architecture\n"
+"# - lvm:     use LVM to partition the disk\n"
+"# - crypto:  use LVM within an encrypted partition\n"
 "d-i partman-auto/method string lvm\n"
 "\n"
 "# If one of the disks that are going to be automatically partitioned\n"
@@ -1832,14 +1832,11 @@ msgstr ""
 "d-i partman-auto/choose_recipe select atomic\n"
 "\n"
 "# Or provide a recipe of your own...\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"
 "\n"
-"# If not, you can put an entire recipe into the preconfiguration file in "
-"one\n"
+"# If not, you can put an entire recipe into the preconfiguration file in one\n"
 "# (logical) line. This example creates a small /boot partition, suitable\n"
 "# swap, and uses the rest of the space for the root partition:\n"
 "#d-i partman-auto/expert_recipe string                         \\\n"
@@ -1859,11 +1856,18 @@ msgstr ""
 "#                      method{ swap } format{ }                \\\n"
 "#              .\n"
 "\n"
+"# The full recipe format is documented in the file partman-auto-recipe.txt\n"
+"# included in the 'debian-installer' package or available from D-I source\n"
+"# repository. This also documents how to specify settings such as file\n"
+"# system labels, volume group names and which physical devices to include\n"
+"# in a volume group.\n"
+"\n"
 "# This makes partman automatically partition without confirmation, provided\n"
 "# that you told it what to do using one of the methods above.\n"
 "d-i partman-partitioning/confirm_write_new_label boolean true\n"
 "d-i partman/choose_partition select finish\n"
-"d-i partman/confirm boolean true"
+"d-i partman/confirm boolean true\n"
+"d-i partman/confirm_nooverwrite boolean true"
 
 #. Tag: title
 #: preseed.xml:884
@@ -1901,7 +1905,7 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:905
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "# NOTE: this option is of beta release quality and should be used "
 #| "carefully\n"
@@ -2002,8 +2006,6 @@ msgid ""
 "d-i partman/confirm boolean true\n"
 "d-i partman/confirm_nooverwrite boolean true"
 msgstr ""
-"# NOTE: this option is of beta release quality and should be used carefully\n"
-"\n"
 "# The method should be set to \"raid\".\n"
 "#d-i partman-auto/method string raid\n"
 "# Specify the disks to be partitioned. They will all get the same layout,\n"
@@ -2025,13 +2027,12 @@ msgstr ""
 "\n"
 "# Last you need to specify how the previously defined partitions will be\n"
 "# used in the RAID setup. Remember to use the correct partition numbers\n"
-"# for logical partitions.\n"
+"# for logical partitions. RAID levels 0, 1, 5, 6 and 10 are supported;\n"
+"# devices are separated using \"#\".\n"
 "# Parameters are:\n"
-"# &lt;raidtype&gt; &lt;devcount&gt; &lt;sparecount&gt; &lt;fstype&gt; &lt;"
-"mountpoint&gt; \\\n"
+"# &lt;raidtype&gt; &lt;devcount&gt; &lt;sparecount&gt; &lt;fstype&gt; &lt;mountpoint&gt; \\\n"
 "#          &lt;devices&gt; &lt;sparedevices&gt;\n"
-"# RAID levels 0, 1, 5, 6 and 10 are supported; devices are separated using "
-"\"#\"\n"
+"\n"
 "#d-i partman-auto-raid/recipe string \\\n"
 "#    1 2 0 ext3 /                    \\\n"
 "#          /dev/sda1#/dev/sdb1       \\\n"
@@ -2043,11 +2044,16 @@ msgstr ""
 "#          /dev/sda6#/dev/sdb6       \\\n"
 "#    .\n"
 "\n"
+"# For additional information see the file partman-auto-raid-recipe.txt\n"
+"# included in the 'debian-installer' package or available from D-I source\n"
+"# repository.\n"
+"\n"
 "# This makes partman automatically partition without confirmation.\n"
 "d-i partman-md/confirm boolean true\n"
 "d-i partman-partitioning/confirm_write_new_label boolean true\n"
 "d-i partman/choose_partition select finish\n"
-"d-i partman/confirm boolean true"
+"d-i partman/confirm boolean true\n"
+"d-i partman/confirm_nooverwrite boolean true"
 
 #. Tag: title
 #: preseed.xml:910
@@ -2506,7 +2512,7 @@ msgstr "安装 bootloader"
 
 #. Tag: screen
 #: preseed.xml:1077
-#, fuzzy, no-c-format
+#, no-c-format
 #| msgid ""
 #| "# Grub is the default boot loader (for x86). If you want lilo installed\n"
 #| "# instead, uncomment this:\n"
@@ -2594,13 +2600,16 @@ msgstr ""
 "# too:\n"
 "#d-i lilo-installer/skip boolean true\n"
 "\n"
-"# This is fairly safe to set, it makes grub install automatically to the "
-"MBR\n"
+"# With a few exceptions for unusual partitioning setups, GRUB 2 is now the\n"
+"# default. If you need GRUB Legacy for some particular reason, then\n"
+"# uncomment this:\n"
+"#d-i grub-installer/grub2_instead_of_grub_legacy boolean false\n"
+"\n"
+"# This is fairly safe to set, it makes grub install automatically to the MBR\n"
 "# if no other operating system is detected on the machine.\n"
 "d-i grub-installer/only_debian boolean true\n"
 "\n"
-"# This one makes grub-installer install to the MBR if it also finds some "
-"other\n"
+"# This one makes grub-installer install to the MBR if it also finds some other\n"
 "# OS, which is less safe as it might not be able to boot that other OS.\n"
 "d-i grub-installer/with_other_os boolean true\n"
 "\n"