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

11 files changed, 454 insertions, 43 deletions

diff --git a/po/el/preseed.po b/po/el/preseed.po
index 1f3d4dc21..8cd8816bc 100644
--- a/po/el/preseed.po
+++ b/po/el/preseed.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preseed\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-17 00:12+0000\n"
+"POT-Creation-Date: 2010-03-28 00:13+0000\n"
 "PO-Revision-Date: 2009-11-26 15:12+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -2041,7 +2041,8 @@ msgid ""
 "# 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"
 msgstr ""
 "# Αν το σύστημα έχει ελεύθερο χώρο μπορείτε να επιλέξετε να διαμερίσετε μόνο "
 "αυτόν τον χώρο.\n"
@@ -2257,7 +2258,8 @@ msgid ""
 "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"
 msgstr ""
 "# ΣΗΜΕΙΩΣΗ: Η ποιότητα αυτής της επιλογής είναι έκδοσης beta και θα πρέπει "
 "να χρησιμοποιηθεί προσεκτικά\n"
diff --git a/po/fi/preseed.po b/po/fi/preseed.po
index aff4c7553..90df3050a 100644
--- a/po/fi/preseed.po
+++ b/po/fi/preseed.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Installation Guide preseed\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-17 00:12+0000\n"
+"POT-Creation-Date: 2010-03-28 00:13+0000\n"
 "PO-Revision-Date: 2009-09-09 22:01+0300\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -1934,7 +1934,8 @@ msgid ""
 "# 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"
 msgstr ""
 "# Jos järjestelmässä on vapaata tilaa voidaan valita osioitavaksi vain\n"
 "# tuo tila. Tämä huomioidaan vain jos partman-auto/method (edempänä)\n"
@@ -2135,7 +2136,8 @@ msgid ""
 "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"
 msgstr ""
 "# HUOMIO: tämä valinta on laadultaan testiversio ja käytettävä varoen\n"
 "\n"
diff --git a/po/hu/preseed.po b/po/hu/preseed.po
index 93b05f963..a1cd61265 100644
--- a/po/hu/preseed.po
+++ b/po/hu/preseed.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-17 00:12+0000\n"
+"POT-Creation-Date: 2010-03-28 00:13+0000\n"
 "PO-Revision-Date: 2007-03-18 19:17+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian\n"
@@ -1848,7 +1848,8 @@ msgid ""
 "# 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"
 msgstr ""
 "# Ha a rendszeren van szabad hely, választható particionálás csak ide.\n"
 "# Megjegyzés: ezt honosított (lefordított) értékkel kell előírni.\n"
@@ -2062,7 +2063,8 @@ msgid ""
 "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"
 msgstr ""
 "# Megjegyzés: e mód béta állapotú és óvatosan használandó\n"
 "\n"
diff --git a/po/ja/preseed.po b/po/ja/preseed.po
index bf8077912..5d6b931f8 100644
--- a/po/ja/preseed.po
+++ b/po/ja/preseed.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-17 00:12+0000\n"
+"POT-Creation-Date: 2010-03-28 00:13+0000\n"
 "PO-Revision-Date: 2010-03-03 23:24+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: \n"
@@ -1754,7 +1754,86 @@ msgstr "パーティション分割の例"
 
 #. Tag: screen
 #: preseed.xml:880
-#, no-c-format
+#, fuzzy, 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 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:\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"
+#| "# 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"
+#| "# 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"
+#| "# 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"
 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"
@@ -1826,7 +1905,8 @@ msgid ""
 "# 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"
 msgstr ""
 "# 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"
@@ -1940,7 +2020,58 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:905
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# 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. 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;devices&gt; &lt;sparedevices&gt;\n"
+#| "\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"
+#| "# 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"
 msgid ""
 "# The method should be set to \"raid\".\n"
 "#d-i partman-auto/method string raid\n"
@@ -1989,7 +2120,8 @@ msgid ""
 "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"
 msgstr ""
 "# The method should be set to \"raid\".\n"
 "#d-i partman-auto/method string raid\n"
diff --git a/po/ko/preseed.po b/po/ko/preseed.po
index 9724bc7a4..d2594d849 100644
--- a/po/ko/preseed.po
+++ b/po/ko/preseed.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preseed.xml\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-17 00:12+0000\n"
+"POT-Creation-Date: 2010-03-28 00:13+0000\n"
 "PO-Revision-Date: 2009-08-28 03:14+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-i10n-korean@lists.debian.org>\n"
@@ -1882,7 +1882,8 @@ msgid ""
 "# 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"
 msgstr ""
 "# 시스템에 빈 공간이 있으면 거기에 한 개의 파티션을 만들 수 있습니다.\n"
 "#d-i partman-auto/init_automatically_partition select biggest_free\n"
@@ -2079,7 +2080,8 @@ msgid ""
 "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"
 msgstr ""
 "# 주의: 이 옵션은 베타 상태이므로 주의해서 사용해야 합니다\n"
 "\n"
diff --git a/po/pot/preseed.pot b/po/pot/preseed.pot
index 1a224f99a..7c4cef180 100644
--- a/po/pot/preseed.pot
+++ b/po/pot/preseed.pot
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-17 00:12+0000\n"
+"POT-Creation-Date: 2010-03-28 00:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1066,7 +1066,8 @@ msgid ""
       "# 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"
 msgstr ""
 
 #. Tag: title
@@ -1137,7 +1138,8 @@ msgid ""
       "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"
 msgstr ""
 
 #. Tag: title
diff --git a/po/pt/preseed.po b/po/pt/preseed.po
index b52549606..f38a2fc3c 100644
--- a/po/pt/preseed.po
+++ b/po/pt/preseed.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preseed\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-17 00:12+0000\n"
+"POT-Creation-Date: 2010-03-28 00:13+0000\n"
 "PO-Revision-Date: 2010-03-21 10:34+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -1809,10 +1809,9 @@ msgid ""
 msgstr ""
 "Os exemplos abaixo apenas disponibilizam informação básica acerca da "
 "utilização de receitas. Para informação detalhada veja os ficheiros "
-"<filename>partman-auto-recipe.txt</filename> e <filename>"
-"partman-auto-raid-recipe.txt</filename> incluidos no pacote <classname>"
-"debian-installer</classname>. Ambos os ficheiros também estão também "
-"disponíveis a partir do "
+"<filename>partman-auto-recipe.txt</filename> e <filename>partman-auto-raid-"
+"recipe.txt</filename> incluidos no pacote <classname>debian-installer</"
+"classname>. Ambos os ficheiros também estão também disponíveis a partir do "
 "<ulink url=\"&url-d-i-websvn;/trunk/installer/doc/devel/\">repositório de "
 "código-fonte do &d-i;</ulink>. Note que a funcionalidade suportada pode ser "
 "alterada entre lançamentos."
@@ -1976,7 +1975,8 @@ msgid ""
 "# 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"
 msgstr ""
 "# Se o sistema tiver espaço livre pode escolher particionar apenas esse\n"
 "# espaço.\n"
@@ -2179,7 +2179,8 @@ msgid ""
 "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"
 msgstr ""
 "# NOTA: esta opção é de qualidade de lançamento beta e deve ser utilizada\n"
 "# cuidadosamente\n"
diff --git a/po/ru/preseed.po b/po/ru/preseed.po
index 2ad23d2e4..2370fbabb 100644
--- a/po/ru/preseed.po
+++ b/po/ru/preseed.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preseed\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-17 00:12+0000\n"
+"POT-Creation-Date: 2010-03-28 00:13+0000\n"
 "PO-Revision-Date: 2010-02-17 20:14+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -1812,7 +1812,86 @@ msgstr "Пример разметки"
 
 #. Tag: screen
 #: preseed.xml:880
-#, no-c-format
+#, fuzzy, 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 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:\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"
+#| "# 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"
+#| "# 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"
+#| "# 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"
 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"
@@ -1884,7 +1963,8 @@ msgid ""
 "# 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"
 msgstr ""
 "# Если система имеет свободное место, вы можете выбрать для разметки\n"
 "# только его.\n"
@@ -1998,7 +2078,58 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:905
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# 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. 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;devices&gt; &lt;sparedevices&gt;\n"
+#| "\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"
+#| "# 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"
 msgid ""
 "# The method should be set to \"raid\".\n"
 "#d-i partman-auto/method string raid\n"
@@ -2047,7 +2178,8 @@ msgid ""
 "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"
 msgstr ""
 "# Метод должен быть установлен в значение \"raid\".\n"
 "#d-i partman-auto/method string raid\n"
diff --git a/po/sv/preseed.po b/po/sv/preseed.po
index 8b7fe306a..c2737660c 100644
--- a/po/sv/preseed.po
+++ b/po/sv/preseed.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preseed\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-17 00:12+0000\n"
+"POT-Creation-Date: 2010-03-28 00:13+0000\n"
 "PO-Revision-Date: 2010-02-24 09:08+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -1971,7 +1971,8 @@ msgid ""
 "# 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"
 msgstr ""
 "# Om systemet har ledigt utrymme kan du välja att endast partitionera\n"
 "# det utrymmet.\n"
@@ -2176,7 +2177,8 @@ msgid ""
 "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"
 msgstr ""
 "# OBSERVERA: det här alternativet är i beta-fas och bör användas försiktigt\n"
 "\n"
diff --git a/po/vi/preseed.po b/po/vi/preseed.po
index 08f91c860..9d94d0b31 100644
--- a/po/vi/preseed.po
+++ b/po/vi/preseed.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preseed\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-03-17 00:12+0000\n"
+"POT-Creation-Date: 2010-03-28 00:13+0000\n"
 "PO-Revision-Date: 2010-03-19 00:03+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -1819,7 +1819,86 @@ msgstr "Mẫu phân vùng"
 
 #. Tag: screen
 #: preseed.xml:880
-#, no-c-format
+#, fuzzy, 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 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:\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"
+#| "# 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"
+#| "# 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"
+#| "# 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"
 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"
@@ -1891,7 +1970,8 @@ msgid ""
 "# 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"
 msgstr ""
 "# Nếu hệ thống vẫn có sức chứa trống, bạn có dịp chỉ phân vùng sức chứa đó.\n"
 "# Sự chọn này chỉ hoạt động nếu « partman-auto/method » (bên dưới)\n"
@@ -2007,7 +2087,58 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:905
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# 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. 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;devices&gt; &lt;sparedevices&gt;\n"
+#| "\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"
+#| "# 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"
 msgid ""
 "# The method should be set to \"raid\".\n"
 "#d-i partman-auto/method string raid\n"
@@ -2056,7 +2187,8 @@ msgid ""
 "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"
 msgstr ""
 "# Phương pháp nên được đặt thành « raid ».\n"
 "#d-i partman-auto/method string raid\n"
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 3e86e3c87..b48adeb6a 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: 2010-03-17 00:12+0000\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"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@debian.org>\n"
@@ -1800,7 +1800,8 @@ msgid ""
 "# 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"
 msgstr ""
 "# 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"
@@ -1998,7 +1999,8 @@ msgid ""
 "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"
 msgstr ""
 "# NOTE: this option is of beta release quality and should be used carefully\n"
 "\n"