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

2 files changed, 75 insertions, 31 deletions

diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 83099fc22..6c097b4df 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.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: 2008-10-05 00:05+0000\n"
+"POT-Creation-Date: 2008-10-06 00:09+0000\n"
 "PO-Revision-Date: 2008-09-26 11:28+0800\n"
 "Last-Translator: Ji YongGang <jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -1599,14 +1599,12 @@ msgstr ""
 #| "d-i partman/confirm boolean true"
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
-"# Note: this must be preseeded with a localized (translated) value.\n"
-"#d-i partman-auto/init_automatically_partition \\\n"
-"#      select Guided - use the largest continuous free space\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"
-"# For example, to use the first SCSI/SATA hard disk:\n"
 "# Note: A disk must be specified, unless the system has only one disk.\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"
@@ -1621,14 +1619,11 @@ msgid ""
 "# And the same goes for the confirmation to write the lvm partitions.\n"
 "d-i partman-lvm/confirm boolean true\n"
 "\n"
-"# You can choose from any of the predefined partitioning recipes.\n"
-"# Note: this must be preseeded with a localized (translated) value.\n"
-"d-i partman-auto/choose_recipe \\\n"
-"       select All files in one partition (recommended for new users)\n"
-"#d-i partman-auto/choose_recipe \\\n"
-"#       select Separate /home partition\n"
-"#d-i partman-auto/choose_recipe \\\n"
-"#       select Separate /home, /usr, /var, and /tmp partitions\n"
+"# You can choose one of the three predefined partitioning recipes:\n"
+"# - atomic: all files in one partition\n"
+"# - home:   separate /home partition\n"
+"# - multi:  separate /home, /usr, /var, and /tmp partitions\n"
+"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."
@@ -1661,8 +1656,7 @@ msgid ""
 "# 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/confirm_write_new_label boolean true\n"
-"d-i partman/choose_partition \\\n"
-"       select Finish partitioning and write changes to disk\n"
+"d-i partman/choose_partition select finish\n"
 "d-i partman/confirm boolean true"
 msgstr ""
 "# If the system has free space you can choose to only partition that space.\n"
@@ -1772,7 +1766,58 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:855
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# 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"
+#| "# so this will only work if the disks are the same size.\n"
+#| "#d-i partman-auto/disk string /dev/discs/disc0/disc /dev/discs/disc1/"
+#| "disc\n"
+#| "\n"
+#| "# Next you need to specify the physical partitions that will be used. \n"
+#| "#d-i partman-auto/expert_recipe string \\\n"
+#| "#      multiraid ::                                         \\\n"
+#| "#              1000 5000 4000 raid                          \\\n"
+#| "#                      $primary{ } method{ raid }           \\\n"
+#| "#              .                                            \\\n"
+#| "#              64 512 300% raid                             \\\n"
+#| "#                      method{ raid }                       \\\n"
+#| "#              .                                            \\\n"
+#| "#              500 10000 1000000000 raid                    \\\n"
+#| "#                      method{ raid }                       \\\n"
+#| "#              .\n"
+#| "\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"
+#| "# Parameters are:\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"
+#| "#d-i partman-auto-raid/recipe string \\\n"
+#| "#    1 2 0 ext3 /                                           \\\n"
+#| "#          /dev/discs/disc0/part1#/dev/discs/disc1/part1    \\\n"
+#| "#    .                                                      \\\n"
+#| "#    1 2 0 swap -                                           \\\n"
+#| "#          /dev/discs/disc0/part5#/dev/discs/disc1/part5    \\\n"
+#| "#    .                                                      \\\n"
+#| "#    0 2 0 ext3 /home                                       \\\n"
+#| "#          /dev/discs/disc0/part6#/dev/discs/disc1/part6    \\\n"
+#| "#    .\n"
+#| "\n"
+#| "# This makes partman automatically partition without confirmation.\n"
+#| "d-i partman-md/confirm boolean true\n"
+#| "d-i partman/confirm_write_new_label boolean true\n"
+#| "d-i partman/choose_partition \\\n"
+#| "       select Finish partitioning and write changes to disk\n"
+#| "d-i partman/confirm boolean true"
 msgid ""
 "# NOTE: this option is of beta release quality and should be used carefully\n"
 "\n"
@@ -1818,8 +1863,7 @@ msgid ""
 "# This makes partman automatically partition without confirmation.\n"
 "d-i partman-md/confirm boolean true\n"
 "d-i partman/confirm_write_new_label boolean true\n"
-"d-i partman/choose_partition \\\n"
-"       select Finish partitioning and write changes to disk\n"
+"d-i partman/choose_partition select finish\n"
 "d-i partman/confirm boolean true"
 msgstr ""
 "# NOTE: this option is of beta release quality and should be used carefully\n"
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index a9b014fbd..cebb3ec06 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: 2008-10-05 00:05+0000\n"
+"POT-Creation-Date: 2008-10-06 00:09+0000\n"
 "PO-Revision-Date: 2008-09-26 12:06+0800\n"
 "Last-Translator: Ji YongGang<jungle@soforge.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -4661,18 +4661,18 @@ msgid ""
 "Support for loading firmware is still relatively basic and is likely to be "
 "improved in future releases of the installer. Currently &d-i; will for "
 "example not display any warning if you choose to load missing firmware, but "
-"the requested firmware is not found. Please <xref linkend=\"submit-bug\"/"
-">report any issues you encounter."
+"the requested firmware is not found. Please report any issues you encounter "
+"by filing an installation report (see <xref linkend=\"submit-bug\"/>)."
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3253
+#: using-d-i.xml:3254
 #, no-c-format
 msgid "Preparing a medium"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3254
+#: using-d-i.xml:3255
 #, no-c-format
 msgid ""
 "Although in some cases the firmware can also be loaded from a partition on a "
@@ -4685,7 +4685,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3264
+#: using-d-i.xml:3265
 #, no-c-format
 msgid ""
 "Tarballs containing current packages for the most common firmware are "
@@ -4696,7 +4696,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3278
+#: using-d-i.xml:3279
 #, no-c-format
 msgid ""
 "If the firmware you need is not included in the tarball, you can also "
@@ -4707,7 +4707,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3292
+#: using-d-i.xml:3293
 #, no-c-format
 msgid ""
 "It is also possible to copy individual firmware files to the medium. Loose "
@@ -4716,13 +4716,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3301
+#: using-d-i.xml:3302
 #, no-c-format
 msgid "Firmware and the Installed System"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3302
+#: using-d-i.xml:3303
 #, no-c-format
 msgid ""
 "Any firmware loaded during the installation will be copied automatically to "
@@ -4734,7 +4734,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3311
+#: using-d-i.xml:3312
 #, no-c-format
 msgid ""
 "If the firmware was loaded from a firmware package, &d-i; will also install "
@@ -4745,7 +4745,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3319
+#: using-d-i.xml:3320
 #, no-c-format
 msgid ""
 "If loading the firmware was skipped during the installation, the relevant "
@@ -4754,7 +4754,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3326
+#: using-d-i.xml:3327
 #, no-c-format
 msgid ""
 "If the firmware was loaded from loose firmware files, the firmware copied to "