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

1 files changed, 26 insertions, 172 deletions

diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 438bd6cb6..cd3e4806b 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -1599,21 +1599,16 @@ msgstr "分区"
 #. Tag: para
 #: preseed.xml:841
 #, 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 "
-#| "partition either 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. It is currently not possible to partition multiple "
-#| "disks using preseeding."
 msgid ""
 "Using preseeding to partition the harddisk is limited to what is supported "
 "by <classname>partman-auto</classname>. You can choose to partition either "
 "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
@@ -1622,7 +1617,9 @@ 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 "已经支持包括 RAID、LVM 和加密高级分区设置的预置，但对于非预置安装的分区仍然弹性不足。"
+msgstr ""
+"已经支持包括 RAID、LVM 和加密高级分区设置的预置，但对于非预置安装的分区仍然弹"
+"性不足。"
 
 #. Tag: para
 #: preseed.xml:855
@@ -1635,7 +1632,13 @@ 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 "下面的例子仅提供了使用方案的最基本信息。详细的内容清参考文件 <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> 获取。注意不同发布版支持的功能会有所改变。"
+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
@@ -1651,80 +1654,12 @@ msgstr ""
 #. Tag: title
 #: preseed.xml:878
 #, no-c-format
-#| msgid "Partitioning"
 msgid "Partitioning example"
 msgstr "分区示例"
 
 #. Tag: screen
 #: preseed.xml:880
 #, no-c-format
-#| msgid ""
-#| "# If the system has free space you can choose to only partition that "
-#| "space.\n"
-#| "# 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"
-#| "# 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"
-#| "d-i partman-auto/method string lvm\n"
-#| "\n"
-#| "# If one of the disks that are going to be automatically partitioned\n"
-#| "# contains an old LVM configuration, the user will normally receive a\n"
-#| "# warning. This can be preseeded away...\n"
-#| "d-i partman-lvm/device_remove_lvm boolean true\n"
-#| "# The same applies to pre-existing software RAID array:\n"
-#| "d-i partman-md/device_remove_md boolean true\n"
-#| "# 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 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."
-#| "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"
-#| "# (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"
-#| "#      boot-root ::                                            \\\n"
-#| "#              40 50 100 ext3                                  \\\n"
-#| "#                      $primary{ } $bootable{ }                \\\n"
-#| "#                      method{ format } format{ }              \\\n"
-#| "#                      use_filesystem{ } filesystem{ ext3 }    \\\n"
-#| "#                      mountpoint{ /boot }                     \\\n"
-#| "#              .                                               \\\n"
-#| "#              500 10000 1000000000 ext3                       \\\n"
-#| "#                      method{ format } format{ }              \\\n"
-#| "#                      use_filesystem{ } filesystem{ ext3 }    \\\n"
-#| "#                      mountpoint{ / }                         \\\n"
-#| "#              .                                               \\\n"
-#| "#              64 512 300% linux-swap                          \\\n"
-#| "#                      method{ swap } format{ }                \\\n"
-#| "#              .\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"
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
 "# This is only honoured if partman-auto/method (below) is not set.\n"
@@ -1803,8 +1738,10 @@ 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 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"
+"# 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"
@@ -1836,7 +1773,8 @@ msgstr ""
 "# 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"
@@ -1906,55 +1844,6 @@ msgstr ""
 #. Tag: screen
 #: preseed.xml:905
 #, 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/sda /dev/sdb\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/sda1#/dev/sdb1       \\\n"
-#| "#    .                               \\\n"
-#| "#    1 2 0 swap -                    \\\n"
-#| "#          /dev/sda5#/dev/sdb5       \\\n"
-#| "#    .                               \\\n"
-#| "#    0 2 0 ext3 /home                \\\n"
-#| "#          /dev/sda6#/dev/sdb6       \\\n"
-#| "#    .\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"
 msgid ""
 "# The method should be set to \"raid\".\n"
 "#d-i partman-auto/method string raid\n"
@@ -2030,7 +1919,8 @@ msgstr ""
 "# 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"
 "\n"
 "#d-i partman-auto-raid/recipe string \\\n"
@@ -2513,44 +2403,6 @@ msgstr "安装 bootloader"
 #. Tag: screen
 #: preseed.xml:1077
 #, no-c-format
-#| msgid ""
-#| "# Grub is the default boot loader (for x86). If you want lilo installed\n"
-#| "# instead, uncomment this:\n"
-#| "#d-i grub-installer/skip boolean true\n"
-#| "# To also skip installing lilo, and install no bootloader, uncomment "
-#| "this\n"
-#| "# 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"
-#| "# 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"
-#| "# 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"
-#| "# Alternatively, if you want to install to a location other than the "
-#| "mbr,\n"
-#| "# uncomment and edit these lines:\n"
-#| "#d-i grub-installer/only_debian boolean false\n"
-#| "#d-i grub-installer/with_other_os boolean false\n"
-#| "#d-i grub-installer/bootdev  string (hd0,0)\n"
-#| "# To install grub to multiple disks:\n"
-#| "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)\n"
-#| "\n"
-#| "# Optional password for grub, either in clear text\n"
-#| "#d-i grub-installer/password password r00tme\n"
-#| "#d-i grub-installer/password-again password r00tme\n"
-#| "# or encrypted using an MD5 hash, see grub-md5-crypt(8).\n"
-#| "#d-i grub-installer/password-crypted password [MD5 hash]\n"
-#| "\n"
-#| "# Use the following option to add additional boot parameters for the\n"
-#| "# installed system (if supported by the bootloader installer).\n"
-#| "# Note: options passed to the installer will be added automatically.\n"
-#| "#d-i debian-installer/add-kernel-opts string nousb"
 msgid ""
 "# Grub is the default boot loader (for x86). If you want lilo installed\n"
 "# instead, uncomment this:\n"
@@ -2605,11 +2457,13 @@ msgstr ""
 "# 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"
+"# 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"