summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--po/el/preseed.po326
-rw-r--r--po/fi/preseed.po326
-rw-r--r--po/hu/preseed.po206
-rw-r--r--po/ja/preseed.po206
-rw-r--r--po/ko/preseed.po257
-rw-r--r--po/pot/preseed.pot170
-rw-r--r--po/pt/preseed.po257
-rw-r--r--po/ru/preseed.po326
-rw-r--r--po/sv/preseed.po326
-rw-r--r--po/vi/preseed.po206
-rw-r--r--po/zh_CN/preseed.po326
11 files changed, 2060 insertions, 872 deletions
diff --git a/po/el/preseed.po b/po/el/preseed.po
index aec5995f0..059fe7b17 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-01-18 00:44+0000\n"
+"POT-Creation-Date: 2010-02-08 01:11+0000\n"
"PO-Revision-Date: 2009-11-26 15:12+0200\n"
"Last-Translator: \n"
"Language-Team: <en@li.org>\n"
@@ -1834,14 +1834,21 @@ 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."
+#, fuzzy, 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 ""
"Η χρήση preseeding για την διαμέριση του σκληρού δίσκου είναι ιδιαίτερα "
"περιορισμένο σε ό,τι υποστηρίζει το πρόγραμμα <classname>partman-auto</"
@@ -1853,7 +1860,29 @@ msgstr ""
"διαμέριση πολλών δίσκων με χρήση προρύθμισης."
#. Tag: para
-#: preseed.xml:852
+#: preseed.xml:849
+#, no-c-format
+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 ""
+
+#. Tag: para
+#: preseed.xml:855
+#, no-c-format
+msgid ""
+"The examples below only provide basic information on the use of recipes. For "
+"detailed information see the files <filename>partman-auto-recipe.txt</"
+"filename> and <filename>partman-auto-raid-recipe.txt</filename> included in "
+"the <classname>debian-installer</classname> package. Both files are also "
+"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 ""
+
+#. Tag: para
+#: preseed.xml:869
#, no-c-format
msgid ""
"The identification of disks is dependent on the order in which their drivers "
@@ -1864,21 +1893,101 @@ msgstr ""
"οι οδηγοί τους. Αν υπάρχουν πολλαπλοί δίσκοι στο σύστημα, βεβαιωθείτε ότι θα "
"επιλεχθεί ο σωστός πριν να χρησιμοποιήσετε preseeding."
+#. Tag: title
+#: preseed.xml:878
+#, fuzzy, no-c-format
+#| msgid "Partitioning"
+msgid "Partitioning example"
+msgstr "Διαμέριση"
+
#. Tag: screen
-#: preseed.xml:860
-#, no-c-format
+#: preseed.xml:880
+#, 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 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"
"#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"
@@ -1897,8 +2006,6 @@ msgid ""
"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"
@@ -1924,6 +2031,12 @@ msgid ""
"# 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"
@@ -2004,13 +2117,13 @@ msgstr ""
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:865
+#: preseed.xml:884
#, no-c-format
msgid "Partitioning using RAID"
msgstr "Διαμέριση με χρήση RAID"
#. Tag: para
-#: preseed.xml:866
+#: preseed.xml:885
#, no-c-format
msgid ""
"You can also use preseeding to set up partitions on software RAID arrays. "
@@ -2028,7 +2141,7 @@ msgstr ""
"\"/>."
#. Tag: para
-#: preseed.xml:876
+#: preseed.xml:895
#, no-c-format
msgid ""
"This type of automated partitioning is easy to get wrong. It is also "
@@ -2045,11 +2158,58 @@ msgstr ""
"αντιμετωπίσετε προβλήματα."
#. Tag: screen
-#: preseed.xml:886
-#, no-c-format
+#: preseed.xml:905
+#, 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/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 ""
-"# 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"
@@ -2071,13 +2231,13 @@ msgid ""
"\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;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"
@@ -2089,6 +2249,10 @@ msgid ""
"# /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"
@@ -2150,13 +2314,13 @@ msgstr ""
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:891
+#: preseed.xml:910
#, no-c-format
msgid "Controlling how partitions are mounted"
msgstr "Έλεγχος του πώς έχουν προσαρτηθεί οι κατατμήσεις"
#. Tag: para
-#: preseed.xml:892
+#: preseed.xml:911
#, no-c-format
msgid ""
"Normally, filesystems are mounted using a universally unique identifier "
@@ -2177,7 +2341,7 @@ msgstr ""
"τέτοια θα προσαρτηθούν με βάση το UUID."
#. Tag: para
-#: preseed.xml:901
+#: preseed.xml:920
#, no-c-format
msgid ""
"Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2187,7 +2351,7 @@ msgstr ""
"να χρησιμοποιούν τα παραδοσιακά ονόματά τους αντί των UUID."
#. Tag: para
-#: preseed.xml:908
+#: preseed.xml:927
#, no-c-format
msgid ""
"Traditional device names may change based on the order in which the kernel "
@@ -2205,7 +2369,7 @@ msgstr ""
"απρόβλεπτη."
#. Tag: screen
-#: preseed.xml:918
+#: preseed.xml:937
#, no-c-format
msgid ""
"# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2223,13 +2387,13 @@ msgstr ""
"#d-i partman/mount_style select uuid"
#. Tag: title
-#: preseed.xml:923
+#: preseed.xml:943
#, no-c-format
msgid "Base system installation"
msgstr "Εγκατάσταση του βασικού συστήματος"
#. Tag: para
-#: preseed.xml:924
+#: preseed.xml:944
#, no-c-format
msgid ""
"There is actually not very much that can be preseeded for this stage of the "
@@ -2241,7 +2405,7 @@ msgstr ""
"ερωτήσεις που γίνονται αφορούν την εγκατάσταση του πυρήνα."
#. Tag: screen
-#: preseed.xml:931
+#: preseed.xml:951
#, no-c-format
msgid ""
"# Configure APT to not install recommended packages by default. Use of this\n"
@@ -2275,13 +2439,13 @@ msgstr ""
"#d-i base-installer/kernel/image string linux-image-2.6-486"
#. Tag: title
-#: preseed.xml:936
+#: preseed.xml:956
#, no-c-format
msgid "Account setup"
msgstr "Ρύθμιση Λογαριασμού"
#. Tag: para
-#: preseed.xml:937
+#: preseed.xml:957
#, no-c-format
msgid ""
"The password for the root account and name and password for a first regular "
@@ -2294,7 +2458,7 @@ msgstr ""
"κρυπτογραφημένο (clear text) είτε MD5 <emphasis>hashes</emphasis>."
#. Tag: para
-#: preseed.xml:944
+#: preseed.xml:964
#, no-c-format
msgid ""
"Be aware that preseeding passwords is not completely secure as everyone with "
@@ -2311,7 +2475,7 @@ msgstr ""
"force attacks)."
#. Tag: screen
-#: preseed.xml:954
+#: preseed.xml:974
#, no-c-format
msgid ""
"# Skip creation of a root account (normal user account will be able to\n"
@@ -2373,7 +2537,7 @@ msgstr ""
"#d-i passwd/user-default-groups string audio cdrom video"
#. Tag: para
-#: preseed.xml:956
+#: preseed.xml:976
#, no-c-format
msgid ""
"The <classname>passwd/root-password-crypted</classname> and "
@@ -2394,7 +2558,7 @@ msgstr ""
"την εντολή <command>sudo</command>)."
#. Tag: para
-#: preseed.xml:966
+#: preseed.xml:986
#, no-c-format
msgid ""
"The following command can be used to generate an MD5 hash for a password:"
@@ -2403,19 +2567,19 @@ msgstr ""
"(hash) MD5 για ένα συνθηματικό χρήστη:"
#. Tag: screen
-#: preseed.xml:970
+#: preseed.xml:990
#, no-c-format
msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
#. Tag: title
-#: preseed.xml:976
+#: preseed.xml:996
#, no-c-format
msgid "Apt setup"
msgstr "Ρύθμιση setup"
#. Tag: para
-#: preseed.xml:977
+#: preseed.xml:997
#, no-c-format
msgid ""
"Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2429,7 +2593,7 @@ msgstr ""
"προαιρετικά να προσθέσετε και άλλες (τοπικές) \"αποθήκες\" πακέτων."
#. Tag: screen
-#: preseed.xml:985
+#: preseed.xml:1005
#, no-c-format
msgid ""
"# You can choose to install non-free and contrib software.\n"
@@ -2493,13 +2657,13 @@ msgstr ""
"#d-i debian-installer/allow_unauthenticated boolean true"
#. Tag: title
-#: preseed.xml:990
+#: preseed.xml:1010
#, no-c-format
msgid "Package selection"
msgstr "Επιλογή πακέτων"
#. Tag: para
-#: preseed.xml:991
+#: preseed.xml:1011
#, no-c-format
msgid ""
"You can choose to install any combination of tasks that are available. "
@@ -2510,73 +2674,73 @@ msgstr ""
"αυτό το κείμενο:"
#. Tag: userinput
-#: preseed.xml:1000
+#: preseed.xml:1020
#, no-c-format
msgid "standard"
msgstr "Κανονικό σύστημα"
#. Tag: userinput
-#: preseed.xml:1003
+#: preseed.xml:1023
#, no-c-format
msgid "desktop"
msgstr "επιφάνεια εργασίας"
#. Tag: userinput
-#: preseed.xml:1006
+#: preseed.xml:1026
#, no-c-format
msgid "gnome-desktop"
msgstr "επιφάνεια εργασίας gnome"
#. Tag: userinput
-#: preseed.xml:1009
+#: preseed.xml:1029
#, no-c-format
msgid "kde-desktop"
msgstr "επιφάνεια εργασίας kde"
#. Tag: userinput
-#: preseed.xml:1012
+#: preseed.xml:1032
#, no-c-format
msgid "web-server"
msgstr "Server ιστοσελίδων"
#. Tag: userinput
-#: preseed.xml:1015
+#: preseed.xml:1035
#, no-c-format
msgid "print-server"
msgstr "Server εκτυπώσεων"
#. Tag: userinput
-#: preseed.xml:1018
+#: preseed.xml:1038
#, no-c-format
msgid "dns-server"
msgstr "server oνοματοδοσίας (dns-server)"
#. Tag: userinput
-#: preseed.xml:1021
+#: preseed.xml:1041
#, no-c-format
msgid "file-server"
msgstr "Server αρχείων"
#. Tag: userinput
-#: preseed.xml:1024
+#: preseed.xml:1044
#, no-c-format
msgid "mail-server"
msgstr "Server αλληλογραφίας"
#. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1047
#, no-c-format
msgid "sql-database"
msgstr "Βάση δεδομένων SQL"
#. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1050
#, no-c-format
msgid "laptop"
msgstr "Φορητός υπολογιστής"
#. Tag: para
-#: preseed.xml:1034
+#: preseed.xml:1054
#, no-c-format
msgid ""
"You can also choose to install no tasks, and force the installation of a set "
@@ -2589,7 +2753,7 @@ msgstr ""
"<userinput>Κανονικό σύστημα</userinput>."
#. Tag: para
-#: preseed.xml:1040
+#: preseed.xml:1060
#, no-c-format
msgid ""
"If you want to install some individual packages in addition to packages "
@@ -2606,7 +2770,7 @@ msgstr ""
"γραμμή εντολών του πυρήνα."
#. Tag: screen
-#: preseed.xml:1050
+#: preseed.xml:1070
#, fuzzy, no-c-format
#| msgid ""
#| "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2675,13 +2839,13 @@ msgstr ""
"#popularity-contest popularity-contest/participate boolean false"
#. Tag: title
-#: preseed.xml:1055
+#: preseed.xml:1075
#, no-c-format
msgid "Boot loader installation"
msgstr "Εγκατάσταση φορτωτή εκκίνησης"
#. Tag: screen
-#: preseed.xml:1057
+#: preseed.xml:1077
#, no-c-format
msgid ""
"# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -2762,7 +2926,7 @@ msgstr ""
"#d-i debian-installer/add-kernel-opts string nousb"
#. Tag: para
-#: preseed.xml:1059
+#: preseed.xml:1079
#, no-c-format
msgid ""
"An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2775,13 +2939,13 @@ msgstr ""
"\"preseed-account\"/>."
#. Tag: title
-#: preseed.xml:1069
+#: preseed.xml:1089
#, no-c-format
msgid "Finishing up the installation"
msgstr "Ολοκλήρωση της εγκατάστασης"
#. Tag: screen
-#: preseed.xml:1071
+#: preseed.xml:1091
#, no-c-format
msgid ""
"# During installations from serial console, the regular virtual consoles\n"
@@ -2826,13 +2990,13 @@ msgstr ""
"#d-i debian-installer/exit/poweroff boolean true"
#. Tag: title
-#: preseed.xml:1076
+#: preseed.xml:1096
#, no-c-format
msgid "Preseeding other packages"
msgstr "Χρήση preseeding για άλλα πακέτα"
#. Tag: screen
-#: preseed.xml:1078
+#: preseed.xml:1098
#, no-c-format
msgid ""
"# Depending on what software you choose to install, or if things go wrong\n"
@@ -2855,19 +3019,19 @@ msgstr ""
"# debconf-get-selections >> file"
#. Tag: title
-#: preseed.xml:1085
+#: preseed.xml:1105
#, no-c-format
msgid "Advanced options"
msgstr "Προχωρημένες επιλογές"
#. Tag: title
-#: preseed.xml:1088
+#: preseed.xml:1108
#, no-c-format
msgid "Running custom commands during the installation"
msgstr "Εκτέλεση προσαρμοσμένων εντολών κατά την διάρκεια της εγκατάστασης."
#. Tag: para
-#: preseed.xml:1089
+#: preseed.xml:1109
#, no-c-format
msgid ""
"A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2878,7 +3042,7 @@ msgstr ""
"σημεία της εγκατάστασης."
#. Tag: screen
-#: preseed.xml:1097
+#: preseed.xml:1117
#, no-c-format
msgid ""
"# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2936,13 +3100,13 @@ msgstr ""
"#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
#. Tag: title
-#: preseed.xml:1102
+#: preseed.xml:1122
#, no-c-format
msgid "Using preseeding to change default values"
msgstr "Χρήση preseeding για την αλλαγή των προκαθορισμένων τιμών"
#. Tag: para
-#: preseed.xml:1103
+#: preseed.xml:1123
#, no-c-format
msgid ""
"It is possible to use preseeding to change the default answer for a "
@@ -2970,7 +3134,7 @@ msgstr ""
"προρύθμισης."
#. Tag: para
-#: preseed.xml:1117
+#: preseed.xml:1137
#, no-c-format
msgid ""
"Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2985,7 +3149,7 @@ msgstr ""
"Δείτε την υποσημείωση στο κεφάλαιο <xref linkend=\"preseed-bootparms\"/>."
#. Tag: para
-#: preseed.xml:1124
+#: preseed.xml:1144
#, no-c-format
msgid ""
"If you are preseeding using boot parameters, you can make the installer ask "
@@ -3009,13 +3173,13 @@ msgstr ""
"quote> παραμέτρους."
#. Tag: title
-#: preseed.xml:1138
+#: preseed.xml:1158
#, no-c-format
msgid "Chainloading preconfiguration files"
msgstr "Αλυσιδωτή φόρτωση (chainloading) αρχείων προρυθμίσεων"
#. Tag: para
-#: preseed.xml:1139
+#: preseed.xml:1159
#, no-c-format
msgid ""
"It is possible to include other preconfiguration files from a "
@@ -3032,7 +3196,7 @@ msgstr ""
"συγκεκριμένες διαμορφώσεις σε άλλα αρχεία."
#. Tag: screen
-#: preseed.xml:1149
+#: preseed.xml:1169
#, no-c-format
msgid ""
"# More than one file can be listed, separated by spaces; all will be\n"
@@ -3094,7 +3258,7 @@ msgstr ""
" #d-i preseed/run string foo.sh"
#. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1171
#, no-c-format
msgid ""
"It is also possible to chainload from the initrd or file preseeding phase, "
diff --git a/po/fi/preseed.po b/po/fi/preseed.po
index 476bd98ea..e8e900d7f 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-01-18 00:44+0000\n"
+"POT-Creation-Date: 2010-02-08 01:11+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"
@@ -1729,14 +1729,21 @@ msgstr "Osiointi"
#. 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."
+#, fuzzy, 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 ""
"Valmiiden vastausten käyttämistä levyn osioinnissa rajoittaa se, mitä "
"<classname>partman-auto</classname> tukee. Voidaan osioida joko levyllä jo "
@@ -1746,7 +1753,29 @@ msgstr ""
"ole mahdollista käyttää valmiita vastauksia useiden levyjen osioimiseen."
#. Tag: para
-#: preseed.xml:852
+#: preseed.xml:849
+#, no-c-format
+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 ""
+
+#. Tag: para
+#: preseed.xml:855
+#, no-c-format
+msgid ""
+"The examples below only provide basic information on the use of recipes. For "
+"detailed information see the files <filename>partman-auto-recipe.txt</"
+"filename> and <filename>partman-auto-raid-recipe.txt</filename> included in "
+"the <classname>debian-installer</classname> package. Both files are also "
+"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 ""
+
+#. Tag: para
+#: preseed.xml:869
#, no-c-format
msgid ""
"The identification of disks is dependent on the order in which their drivers "
@@ -1757,21 +1786,101 @@ msgstr ""
"järjestelmässä on useinta kiintolevyjä, varmistu huolellisesti oikean levyn "
"tulevan valituksi valmiita vastauksia käytettäessä."
+#. Tag: title
+#: preseed.xml:878
+#, fuzzy, no-c-format
+#| msgid "Partitioning"
+msgid "Partitioning example"
+msgstr "Osiointi"
+
#. Tag: screen
-#: preseed.xml:860
-#, no-c-format
+#: preseed.xml:880
+#, 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 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"
"#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"
@@ -1790,8 +1899,6 @@ msgid ""
"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"
@@ -1817,6 +1924,12 @@ msgid ""
"# 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"
@@ -1885,13 +1998,13 @@ msgstr ""
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:865
+#: preseed.xml:884
#, no-c-format
msgid "Partitioning using RAID"
msgstr "Osiointi käyttäen RAIDia"
#. Tag: para
-#: preseed.xml:866
+#: preseed.xml:885
#, no-c-format
msgid ""
"You can also use preseeding to set up partitions on software RAID arrays. "
@@ -1907,7 +2020,7 @@ msgstr ""
"pakassa käytetyille laitteille; katso <xref linkend=\"preseed-bootloader\"/>."
#. Tag: para
-#: preseed.xml:876
+#: preseed.xml:895
#, no-c-format
msgid ""
"This type of automated partitioning is easy to get wrong. It is also "
@@ -1923,11 +2036,58 @@ msgstr ""
"<filename>/var/log/syslog</filename> jos pulmia ilmenee."
#. Tag: screen
-#: preseed.xml:886
-#, no-c-format
+#: preseed.xml:905
+#, 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/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 ""
-"# 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"
@@ -1949,13 +2109,13 @@ msgid ""
"\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;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"
@@ -1967,6 +2127,10 @@ msgid ""
"# /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"
@@ -2020,13 +2184,13 @@ msgstr ""
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:891
+#: preseed.xml:910
#, no-c-format
msgid "Controlling how partitions are mounted"
msgstr "Määritellään miten osiot liitetään"
#. Tag: para
-#: preseed.xml:892
+#: preseed.xml:911
#, no-c-format
msgid ""
"Normally, filesystems are mounted using a universally unique identifier "
@@ -2045,7 +2209,7 @@ msgstr ""
"liitetään kaikki nimiöttömät osiot UUID:n perusteella."
#. Tag: para
-#: preseed.xml:901
+#: preseed.xml:920
#, no-c-format
msgid ""
"Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2055,7 +2219,7 @@ msgstr ""
"perinteisten nimien käyttämistä eivätkä käytä UUID:tä."
#. Tag: para
-#: preseed.xml:908
+#: preseed.xml:927
#, no-c-format
msgid ""
"Traditional device names may change based on the order in which the kernel "
@@ -2071,7 +2235,7 @@ msgstr ""
"toiminta käynnistyksessä satunnaista. "
#. Tag: screen
-#: preseed.xml:918
+#: preseed.xml:937
#, no-c-format
msgid ""
"# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2089,13 +2253,13 @@ msgstr ""
"#d-i partman/mount_style select uuid"
#. Tag: title
-#: preseed.xml:923
+#: preseed.xml:943
#, no-c-format
msgid "Base system installation"
msgstr "Perusjärjestelmän asennus"
#. Tag: para
-#: preseed.xml:924
+#: preseed.xml:944
#, no-c-format
msgid ""
"There is actually not very much that can be preseeded for this stage of the "
@@ -2106,7 +2270,7 @@ msgstr ""
"käyttää valmiita vastauksia. Ainoat kysymykset koskevat ytimen asentamista."
#. Tag: screen
-#: preseed.xml:931
+#: preseed.xml:951
#, fuzzy, no-c-format
#| msgid ""
#| "# Select the initramfs generator used to generate the initrd for 2.6 "
@@ -2139,13 +2303,13 @@ msgstr ""
"#d-i base-installer/kernel/image string linux-image-2.6-486"
#. Tag: title
-#: preseed.xml:936
+#: preseed.xml:956
#, no-c-format
msgid "Account setup"
msgstr "Käyttäjätunnusten luonti"
#. Tag: para
-#: preseed.xml:937
+#: preseed.xml:957
#, no-c-format
msgid ""
"The password for the root account and name and password for a first regular "
@@ -2157,7 +2321,7 @@ msgstr ""
"käyttää joko ilmitekstiä tai MD5 <emphasis>tiivistettä</emphasis> (hash)."
#. Tag: para
-#: preseed.xml:944
+#: preseed.xml:964
#, no-c-format
msgid ""
"Be aware that preseeding passwords is not completely secure as everyone with "
@@ -2174,7 +2338,7 @@ msgstr ""
"mahdollisuudet."
#. Tag: screen
-#: preseed.xml:954
+#: preseed.xml:974
#, no-c-format
msgid ""
"# Skip creation of a root account (normal user account will be able to\n"
@@ -2232,7 +2396,7 @@ msgstr ""
"#d-i passwd/user-default-groups string audio cdrom video"
#. Tag: para
-#: preseed.xml:956
+#: preseed.xml:976
#, no-c-format
msgid ""
"The <classname>passwd/root-password-crypted</classname> and "
@@ -2252,26 +2416,26 @@ msgstr ""
"<command>sudo</command>)."
#. Tag: para
-#: preseed.xml:966
+#: preseed.xml:986
#, no-c-format
msgid ""
"The following command can be used to generate an MD5 hash for a password:"
msgstr "Seuraavalla komennolla saadaan tehtyä salasanan MD5-tiiviste:"
#. Tag: screen
-#: preseed.xml:970
+#: preseed.xml:990
#, no-c-format
msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
#. Tag: title
-#: preseed.xml:976
+#: preseed.xml:996
#, no-c-format
msgid "Apt setup"
msgstr "Apt:n asetukset"
#. Tag: para
-#: preseed.xml:977
+#: preseed.xml:997
#, no-c-format
msgid ""
"Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2284,7 +2448,7 @@ msgstr ""
"perusteella. Muiden (paikallisten) varastoalueiden lisääminen on valinnaista."
#. Tag: screen
-#: preseed.xml:985
+#: preseed.xml:1005
#, no-c-format
msgid ""
"# You can choose to install non-free and contrib software.\n"
@@ -2342,13 +2506,13 @@ msgstr ""
"#d-i debian-installer/allow_unauthenticated boolean true"
#. Tag: title
-#: preseed.xml:990
+#: preseed.xml:1010
#, no-c-format
msgid "Package selection"
msgstr "Pakettien valinta"
#. Tag: para
-#: preseed.xml:991
+#: preseed.xml:1011
#, no-c-format
msgid ""
"You can choose to install any combination of tasks that are available. "
@@ -2358,73 +2522,73 @@ msgstr ""
"Tätä kirjoitettaessa saatavilla olevia tehtäviä ovat ainakin:"
#. Tag: userinput
-#: preseed.xml:1000
+#: preseed.xml:1020
#, no-c-format
msgid "standard"
msgstr "standard"
#. Tag: userinput
-#: preseed.xml:1003
+#: preseed.xml:1023
#, no-c-format
msgid "desktop"
msgstr "desktop"
#. Tag: userinput
-#: preseed.xml:1006
+#: preseed.xml:1026
#, no-c-format
msgid "gnome-desktop"
msgstr "gnome-desktop"
#. Tag: userinput
-#: preseed.xml:1009
+#: preseed.xml:1029
#, no-c-format
msgid "kde-desktop"
msgstr "kde-desktop"
#. Tag: userinput
-#: preseed.xml:1012
+#: preseed.xml:1032
#, no-c-format
msgid "web-server"
msgstr "web-server"
#. Tag: userinput
-#: preseed.xml:1015
+#: preseed.xml:1035
#, no-c-format
msgid "print-server"
msgstr "print-server"
#. Tag: userinput
-#: preseed.xml:1018
+#: preseed.xml:1038
#, no-c-format
msgid "dns-server"
msgstr "dns-server"
#. Tag: userinput
-#: preseed.xml:1021
+#: preseed.xml:1041
#, no-c-format
msgid "file-server"
msgstr "file-server"
#. Tag: userinput
-#: preseed.xml:1024
+#: preseed.xml:1044
#, no-c-format
msgid "mail-server"
msgstr "mail-server"
#. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1047
#, no-c-format
msgid "sql-database"
msgstr "sql-database"
#. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1050
#, no-c-format
msgid "laptop"
msgstr "laptop"
#. Tag: para
-#: preseed.xml:1034
+#: preseed.xml:1054
#, no-c-format
msgid ""
"You can also choose to install no tasks, and force the installation of a set "
@@ -2436,7 +2600,7 @@ msgstr ""
"<userinput>standard</userinput>."
#. Tag: para
-#: preseed.xml:1040
+#: preseed.xml:1060
#, no-c-format
msgid ""
"If you want to install some individual packages in addition to packages "
@@ -2452,7 +2616,7 @@ msgstr ""
"käynnistysparametrinakin."
#. Tag: screen
-#: preseed.xml:1050
+#: preseed.xml:1070
#, fuzzy, no-c-format
#| msgid ""
#| "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2519,13 +2683,13 @@ msgstr ""
"#popularity-contest popularity-contest/participate boolean false"
#. Tag: title
-#: preseed.xml:1055
+#: preseed.xml:1075
#, no-c-format
msgid "Boot loader installation"
msgstr "Käynnistyslataimen asennus"
#. Tag: screen
-#: preseed.xml:1057
+#: preseed.xml:1077
#, no-c-format
msgid ""
"# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -2599,7 +2763,7 @@ msgstr ""
"#d-i debian-installer/add-kernel-opts string nousb"
#. Tag: para
-#: preseed.xml:1059
+#: preseed.xml:1079
#, no-c-format
msgid ""
"An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2611,13 +2775,13 @@ msgstr ""
"esimerkistä <xref linkend=\"preseed-account\"/>."
#. Tag: title
-#: preseed.xml:1069
+#: preseed.xml:1089
#, no-c-format
msgid "Finishing up the installation"
msgstr "Asennuksen lopetus"
#. Tag: screen
-#: preseed.xml:1071
+#: preseed.xml:1091
#, no-c-format
msgid ""
"# During installations from serial console, the regular virtual consoles\n"
@@ -2658,13 +2822,13 @@ msgstr ""
"#d-i debian-installer/exit/poweroff boolean true"
#. Tag: title
-#: preseed.xml:1076
+#: preseed.xml:1096
#, no-c-format
msgid "Preseeding other packages"
msgstr "Valmiit vastaukset muille paketeille"
#. Tag: screen
-#: preseed.xml:1078
+#: preseed.xml:1098
#, no-c-format
msgid ""
"# Depending on what software you choose to install, or if things go wrong\n"
@@ -2684,19 +2848,19 @@ msgstr ""
"# debconf-get-selections >> file"
#. Tag: title
-#: preseed.xml:1085
+#: preseed.xml:1105
#, no-c-format
msgid "Advanced options"
msgstr "Lisäasetukset"
#. Tag: title
-#: preseed.xml:1088
+#: preseed.xml:1108
#, no-c-format
msgid "Running custom commands during the installation"
msgstr "Mielivaltaisten komentojen käynnistämien asennuksen aikana"
#. Tag: para
-#: preseed.xml:1089
+#: preseed.xml:1109
#, no-c-format
msgid ""
"A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2706,7 +2870,7 @@ msgstr ""
"komentotiedostojen suorittaminen tietyissä paikoissa asennuksen aikana."
#. Tag: screen
-#: preseed.xml:1097
+#: preseed.xml:1117
#, no-c-format
msgid ""
"# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2757,13 +2921,13 @@ msgstr ""
"#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
#. Tag: title
-#: preseed.xml:1102
+#: preseed.xml:1122
#, no-c-format
msgid "Using preseeding to change default values"
msgstr "Oletusarvojen muuttaminen valmiilla vastauksilla"
#. Tag: para
-#: preseed.xml:1103
+#: preseed.xml:1123
#, no-c-format
msgid ""
"It is possible to use preseeding to change the default answer for a "
@@ -2789,7 +2953,7 @@ msgstr ""
"jäljitettäessä vikaa valmiiden vastausten tiedostosta."
#. Tag: para
-#: preseed.xml:1117
+#: preseed.xml:1137
#, no-c-format
msgid ""
"Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2803,7 +2967,7 @@ msgstr ""
"<xref linkend=\"preseed-bootparms\"/>."
#. Tag: para
-#: preseed.xml:1124
+#: preseed.xml:1144
#, no-c-format
msgid ""
"If you are preseeding using boot parameters, you can make the installer ask "
@@ -2824,13 +2988,13 @@ msgstr ""
"sisäisiin (<quote>internal</quote>) parametreihin."
#. Tag: title
-#: preseed.xml:1138
+#: preseed.xml:1158
#, no-c-format
msgid "Chainloading preconfiguration files"
msgstr "Valmiiden vastausten tiedostojen lataaminen ketjussa"
#. Tag: para
-#: preseed.xml:1139
+#: preseed.xml:1159
#, no-c-format
msgid ""
"It is possible to include other preconfiguration files from a "
@@ -2846,7 +3010,7 @@ msgstr ""
"asetukset tiettyihin kokoonpanoihin toisiin tiedostoihin."
#. Tag: screen
-#: preseed.xml:1149
+#: preseed.xml:1169
#, no-c-format
msgid ""
"# More than one file can be listed, separated by spaces; all will be\n"
@@ -2898,7 +3062,7 @@ msgstr ""
"#d-i preseed/run string foo.sh"
#. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1171
#, no-c-format
msgid ""
"It is also possible to chainload from the initrd or file preseeding phase, "
diff --git a/po/hu/preseed.po b/po/hu/preseed.po
index c8a2b221d..36669be76 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-01-18 00:44+0000\n"
+"POT-Creation-Date: 2010-02-08 01:11+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"
@@ -1712,14 +1712,21 @@ msgstr "Particionálás"
#. 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."
+#, fuzzy, 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 ""
"Az előírás használata merevlemez particionálására nagyon függ a "
"<classname>partman-auto</classname> támogatásától. Létező szabad hely vagy "
@@ -1728,7 +1735,29 @@ msgstr ""
"recepttel. Jelenleg nem lehet több lemezt particionálni előírással."
#. Tag: para
-#: preseed.xml:852
+#: preseed.xml:849
+#, no-c-format
+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 ""
+
+#. Tag: para
+#: preseed.xml:855
+#, no-c-format
+msgid ""
+"The examples below only provide basic information on the use of recipes. For "
+"detailed information see the files <filename>partman-auto-recipe.txt</"
+"filename> and <filename>partman-auto-raid-recipe.txt</filename> included in "
+"the <classname>debian-installer</classname> package. Both files are also "
+"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 ""
+
+#. Tag: para
+#: preseed.xml:869
#, no-c-format
msgid ""
"The identification of disks is dependent on the order in which their drivers "
@@ -1738,21 +1767,34 @@ msgstr ""
"A lemezek azonosítása függ betöltött meghajtójuk sorrendjétől. Több lemez "
"esetén ügyelj nagyon, hogy a helyeset válaszd az előírás előtt."
+#. Tag: title
+#: preseed.xml:878
+#, fuzzy, no-c-format
+#| msgid "Partitioning"
+msgid "Partitioning example"
+msgstr "Particionálás"
+
#. Tag: screen
-#: preseed.xml:860
+#: preseed.xml:880
#, 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 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"
@@ -1771,8 +1813,6 @@ msgid ""
"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"
@@ -1798,6 +1838,12 @@ msgid ""
"# 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"
@@ -1866,13 +1912,13 @@ msgstr ""
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:865
+#: preseed.xml:884
#, no-c-format
msgid "Partitioning using RAID"
msgstr "Particionálás RAID használatával"
#. Tag: para
-#: preseed.xml:866
+#: preseed.xml:885
#, fuzzy, no-c-format
#| msgid ""
#| "You can also use preseeding to set up partitions on software RAID arrays. "
@@ -1893,7 +1939,7 @@ msgstr ""
"itt: <xref linkend=\"preseed-bootloader\"/>."
#. Tag: para
-#: preseed.xml:876
+#: preseed.xml:895
#, fuzzy, no-c-format
#| msgid ""
#| "This type of automated partitioning is easy to get wrong. It is also a "
@@ -1915,7 +1961,7 @@ msgstr ""
"filename> fájlt."
#. Tag: screen
-#: preseed.xml:886
+#: preseed.xml:905
#, fuzzy, no-c-format
#| msgid ""
#| "# NOTE: this option is of beta release quality and should be used "
@@ -1969,8 +2015,6 @@ msgstr ""
#| " 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"
"# 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"
@@ -1992,13 +2036,13 @@ msgid ""
"\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;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"
@@ -2010,6 +2054,10 @@ msgid ""
"# /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"
@@ -2064,13 +2112,13 @@ msgstr ""
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:891
+#: preseed.xml:910
#, no-c-format
msgid "Controlling how partitions are mounted"
msgstr ""
#. Tag: para
-#: preseed.xml:892
+#: preseed.xml:911
#, no-c-format
msgid ""
"Normally, filesystems are mounted using a universally unique identifier "
@@ -2082,7 +2130,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: preseed.xml:901
+#: preseed.xml:920
#, no-c-format
msgid ""
"Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2090,7 +2138,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: preseed.xml:908
+#: preseed.xml:927
#, no-c-format
msgid ""
"Traditional device names may change based on the order in which the kernel "
@@ -2101,7 +2149,7 @@ msgid ""
msgstr ""
#. Tag: screen
-#: preseed.xml:918
+#: preseed.xml:937
#, no-c-format
msgid ""
"# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2113,13 +2161,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: preseed.xml:923
+#: preseed.xml:943
#, no-c-format
msgid "Base system installation"
msgstr "Az Alaprendszer telepítése"
#. Tag: para
-#: preseed.xml:924
+#: preseed.xml:944
#, no-c-format
msgid ""
"There is actually not very much that can be preseeded for this stage of the "
@@ -2130,7 +2178,7 @@ msgstr ""
"telepítéséhez vannak kérdések."
#. Tag: screen
-#: preseed.xml:931
+#: preseed.xml:951
#, fuzzy, no-c-format
msgid ""
"# Configure APT to not install recommended packages by default. Use of this\n"
@@ -2151,13 +2199,13 @@ msgstr ""
"#d-i base-installer/kernel/linux/initramfs-generators string yaird"
#. Tag: title
-#: preseed.xml:936
+#: preseed.xml:956
#, no-c-format
msgid "Account setup"
msgstr "Fiók beállítások"
#. Tag: para
-#: preseed.xml:937
+#: preseed.xml:957
#, no-c-format
msgid ""
"The password for the root account and name and password for a first regular "
@@ -2169,7 +2217,7 @@ msgstr ""
"emphasis> kódok."
#. Tag: para
-#: preseed.xml:944
+#: preseed.xml:964
#, no-c-format
msgid ""
"Be aware that preseeding passwords is not completely secure as everyone with "
@@ -2184,7 +2232,7 @@ msgstr ""
"elkövetett nyers erejű támadást."
#. Tag: screen
-#: preseed.xml:954
+#: preseed.xml:974
#, fuzzy, no-c-format
msgid ""
"# Skip creation of a root account (normal user account will be able to\n"
@@ -2236,7 +2284,7 @@ msgstr ""
"#d-i passwd/user-password-crypted password [MD5 hash]"
#. Tag: para
-#: preseed.xml:956
+#: preseed.xml:976
#, no-c-format
msgid ""
"The <classname>passwd/root-password-crypted</classname> and "
@@ -2255,26 +2303,26 @@ msgstr ""
"command>)."
#. Tag: para
-#: preseed.xml:966
+#: preseed.xml:986
#, no-c-format
msgid ""
"The following command can be used to generate an MD5 hash for a password:"
msgstr ""
#. Tag: screen
-#: preseed.xml:970
+#: preseed.xml:990
#, no-c-format
msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
msgstr "$ printf \"r00tmagam\" | mkpasswd -s -m md5"
#. Tag: title
-#: preseed.xml:976
+#: preseed.xml:996
#, no-c-format
msgid "Apt setup"
msgstr "Az APT beállítása"
#. Tag: para
-#: preseed.xml:977
+#: preseed.xml:997
#, no-c-format
msgid ""
"Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2287,7 +2335,7 @@ msgstr ""
"válaszoktól függően. További (úgynevezett helyi) tárak is megadhatók."
#. Tag: screen
-#: preseed.xml:985
+#: preseed.xml:1005
#, fuzzy, no-c-format
msgid ""
"# You can choose to install non-free and contrib software.\n"
@@ -2343,13 +2391,13 @@ msgstr ""
"#d-i debian-installer/allow_unauthenticated boolean true"
#. Tag: title
-#: preseed.xml:990
+#: preseed.xml:1010
#, no-c-format
msgid "Package selection"
msgstr "Csomag választás"
#. Tag: para
-#: preseed.xml:991
+#: preseed.xml:1011
#, no-c-format
msgid ""
"You can choose to install any combination of tasks that are available. "
@@ -2357,73 +2405,73 @@ msgid ""
msgstr "Az elérhető feladatok bármely kombinációja használható. Például:"
#. Tag: userinput
-#: preseed.xml:1000
+#: preseed.xml:1020
#, no-c-format
msgid "standard"
msgstr "szabvány"
#. Tag: userinput
-#: preseed.xml:1003
+#: preseed.xml:1023
#, no-c-format
msgid "desktop"
msgstr "asztal"
#. Tag: userinput
-#: preseed.xml:1006
+#: preseed.xml:1026
#, no-c-format
msgid "gnome-desktop"
msgstr "gnome-desktop"
#. Tag: userinput
-#: preseed.xml:1009
+#: preseed.xml:1029
#, no-c-format
msgid "kde-desktop"
msgstr "kde-desktop"
#. Tag: userinput
-#: preseed.xml:1012
+#: preseed.xml:1032
#, no-c-format
msgid "web-server"
msgstr "web-kiszolgáló"
#. Tag: userinput
-#: preseed.xml:1015
+#: preseed.xml:1035
#, no-c-format
msgid "print-server"
msgstr "nyomtató-kiszolgáló"
#. Tag: userinput
-#: preseed.xml:1018
+#: preseed.xml:1038
#, no-c-format
msgid "dns-server"
msgstr "dns-kiszolgáló"
#. Tag: userinput
-#: preseed.xml:1021
+#: preseed.xml:1041
#, no-c-format
msgid "file-server"
msgstr "fájl-kiszolgáló"
#. Tag: userinput
-#: preseed.xml:1024
+#: preseed.xml:1044
#, no-c-format
msgid "mail-server"
msgstr "levél-kiszolgáló"
#. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1047
#, no-c-format
msgid "sql-database"
msgstr "sql-adatbázis"
#. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1050
#, no-c-format
msgid "laptop"
msgstr "laptop"
#. Tag: para
-#: preseed.xml:1034
+#: preseed.xml:1054
#, no-c-format
msgid ""
"You can also choose to install no tasks, and force the installation of a set "
@@ -2435,7 +2483,7 @@ msgstr ""
"<userinput>szabvány</userinput> feladatot."
#. Tag: para
-#: preseed.xml:1040
+#: preseed.xml:1060
#, no-c-format
msgid ""
"If you want to install some individual packages in addition to packages "
@@ -2450,7 +2498,7 @@ msgstr ""
"listája, mely lehetővé teszi, hogy a kernelnek is könnyen átadható legyen."
#. Tag: screen
-#: preseed.xml:1050
+#: preseed.xml:1070
#, fuzzy, no-c-format
msgid ""
"#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2484,13 +2532,13 @@ msgstr ""
"#popularity-contest popularity-contest/participate boolean false"
#. Tag: title
-#: preseed.xml:1055
+#: preseed.xml:1075
#, no-c-format
msgid "Boot loader installation"
msgstr "Boot betöltő telepítés"
#. Tag: screen
-#: preseed.xml:1057
+#: preseed.xml:1077
#, fuzzy, no-c-format
msgid ""
"# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -2551,7 +2599,7 @@ msgstr ""
"#d-i grub-installer/bootdev string (hd0,0) (hd1,0) (hd2,0)"
#. Tag: para
-#: preseed.xml:1059
+#: preseed.xml:1079
#, no-c-format
msgid ""
"An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2560,13 +2608,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: preseed.xml:1069
+#: preseed.xml:1089
#, fuzzy, no-c-format
msgid "Finishing up the installation"
msgstr "A telepítés első szakaszának vége"
#. Tag: screen
-#: preseed.xml:1071
+#: preseed.xml:1091
#, fuzzy, no-c-format
msgid ""
"# During installations from serial console, the regular virtual consoles\n"
@@ -2595,13 +2643,13 @@ msgstr ""
"#d-i cdrom-detect/eject boolean false"
#. Tag: title
-#: preseed.xml:1076
+#: preseed.xml:1096
#, no-c-format
msgid "Preseeding other packages"
msgstr "Más csomagok előírása"
#. Tag: screen
-#: preseed.xml:1078
+#: preseed.xml:1098
#, no-c-format
msgid ""
"# Depending on what software you choose to install, or if things go wrong\n"
@@ -2621,19 +2669,19 @@ msgstr ""
"# debconf-get-selections >> fájl"
#. Tag: title
-#: preseed.xml:1085
+#: preseed.xml:1105
#, no-c-format
msgid "Advanced options"
msgstr "Haladó lehetőségek"
#. Tag: title
-#: preseed.xml:1088
+#: preseed.xml:1108
#, no-c-format
msgid "Running custom commands during the installation"
msgstr "Egyéni parancs futtatása telepítéskor"
#. Tag: para
-#: preseed.xml:1089
+#: preseed.xml:1109
#, no-c-format
msgid ""
"A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2643,7 +2691,7 @@ msgstr ""
"szkriptek futtatása a telepítés egyes pontjain."
#. Tag: screen
-#: preseed.xml:1097
+#: preseed.xml:1117
#, fuzzy, no-c-format
#| msgid ""
#| "# d-i preseeding is inherently not secure. Nothing in the installer "
@@ -2711,13 +2759,13 @@ msgstr ""
"#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
#. Tag: title
-#: preseed.xml:1102
+#: preseed.xml:1122
#, no-c-format
msgid "Using preseeding to change default values"
msgstr "Előírás használata alap értékek módosítására"
#. Tag: para
-#: preseed.xml:1103
+#: preseed.xml:1123
#, fuzzy, no-c-format
msgid ""
"It is possible to use preseeding to change the default answer for a "
@@ -2748,7 +2796,7 @@ msgstr ""
"quote> paraméterekre nem."
#. Tag: para
-#: preseed.xml:1117
+#: preseed.xml:1137
#, no-c-format
msgid ""
"Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2758,7 +2806,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: preseed.xml:1124
+#: preseed.xml:1144
#, fuzzy, no-c-format
msgid ""
"If you are preseeding using boot parameters, you can make the installer ask "
@@ -2788,13 +2836,13 @@ msgstr ""
"quote> paraméterekre nem."
#. Tag: title
-#: preseed.xml:1138
+#: preseed.xml:1158
#, no-c-format
msgid "Chainloading preconfiguration files"
msgstr "Előíró fájlok lánc-betöltése"
#. Tag: para
-#: preseed.xml:1139
+#: preseed.xml:1159
#, no-c-format
msgid ""
"It is possible to include other preconfiguration files from a "
@@ -2809,7 +2857,7 @@ msgstr ""
"fájlba és pontosabb beállításokat egyes konfigurációkhoz más fájlokba."
#. Tag: screen
-#: preseed.xml:1149
+#: preseed.xml:1169
#, fuzzy, no-c-format
msgid ""
"# More than one file can be listed, separated by spaces; all will be\n"
@@ -2860,7 +2908,7 @@ msgstr ""
"#d-i preseed/run string foo.sh"
#. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1171
#, no-c-format
msgid ""
"It is also possible to chainload from the initrd or file preseeding phase, "
diff --git a/po/ja/preseed.po b/po/ja/preseed.po
index 08e8f6100..498c9a6cf 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-01-18 00:44+0000\n"
+"POT-Creation-Date: 2010-02-08 01:11+0000\n"
"PO-Revision-Date: 2009-06-13 17:33+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
"Language-Team: \n"
@@ -1727,14 +1727,21 @@ 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."
+#, fuzzy, 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 ""
"ハードディスクのパーティション分割に preseed を使用するのは、"
"<classname>partman-auto</classname> でサポートしている機能に限定されていま"
@@ -1744,7 +1751,29 @@ msgstr ""
"パーティションに preseed を用いて複数のディスクを割り当てることはできません。"
#. Tag: para
-#: preseed.xml:852
+#: preseed.xml:849
+#, no-c-format
+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 ""
+
+#. Tag: para
+#: preseed.xml:855
+#, no-c-format
+msgid ""
+"The examples below only provide basic information on the use of recipes. For "
+"detailed information see the files <filename>partman-auto-recipe.txt</"
+"filename> and <filename>partman-auto-raid-recipe.txt</filename> included in "
+"the <classname>debian-installer</classname> package. Both files are also "
+"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 ""
+
+#. Tag: para
+#: preseed.xml:869
#, no-c-format
msgid ""
"The identification of disks is dependent on the order in which their drivers "
@@ -1755,8 +1784,15 @@ msgstr ""
"にある場合、preseed を使用する前に、正しいディスクを確実に選択できるようにし"
"なければなりません。"
+#. Tag: title
+#: preseed.xml:878
+#, fuzzy, no-c-format
+#| msgid "Partitioning"
+msgid "Partitioning example"
+msgstr "パーティション分割"
+
#. Tag: screen
-#: preseed.xml:860
+#: preseed.xml:880
#, fuzzy, no-c-format
#| msgid ""
#| "# If the system has free space you can choose to only partition that "
@@ -1829,13 +1865,19 @@ msgid ""
"# 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"
@@ -1854,8 +1896,6 @@ msgid ""
"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"
@@ -1881,6 +1921,12 @@ msgid ""
"# 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"
@@ -1949,13 +1995,13 @@ msgstr ""
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:865
+#: preseed.xml:884
#, no-c-format
msgid "Partitioning using RAID"
msgstr "RAID を用いたパーティション分割"
#. Tag: para
-#: preseed.xml:866
+#: preseed.xml:885
#, no-c-format
msgid ""
"You can also use preseeding to set up partitions on software RAID arrays. "
@@ -1971,7 +2017,7 @@ msgstr ""
"bootloader\"/> をご覧ください。"
#. Tag: para
-#: preseed.xml:876
+#: preseed.xml:895
#, no-c-format
msgid ""
"This type of automated partitioning is easy to get wrong. It is also "
@@ -1987,7 +2033,7 @@ msgstr ""
"い。"
#. Tag: screen
-#: preseed.xml:886
+#: preseed.xml:905
#, fuzzy, no-c-format
#| msgid ""
#| "# NOTE: this option is of beta release quality and should be used "
@@ -2039,8 +2085,6 @@ msgstr ""
#| "d-i partman/choose_partition select finish\n"
#| "d-i partman/confirm boolean true"
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"
@@ -2062,13 +2106,13 @@ msgid ""
"\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;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"
@@ -2080,6 +2124,10 @@ msgid ""
"# /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"
@@ -2134,13 +2182,13 @@ msgstr ""
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:891
+#: preseed.xml:910
#, no-c-format
msgid "Controlling how partitions are mounted"
msgstr "パーティションマウント法の制御"
#. Tag: para
-#: preseed.xml:892
+#: preseed.xml:911
#, no-c-format
msgid ""
"Normally, filesystems are mounted using a universally unique identifier "
@@ -2158,7 +2206,7 @@ msgstr ""
"マウントされます。"
#. Tag: para
-#: preseed.xml:901
+#: preseed.xml:920
#, no-c-format
msgid ""
"Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2168,7 +2216,7 @@ msgstr ""
"され続けます。"
#. Tag: para
-#: preseed.xml:908
+#: preseed.xml:927
#, no-c-format
msgid ""
"Traditional device names may change based on the order in which the kernel "
@@ -2183,7 +2231,7 @@ msgstr ""
"す。こうなってしまうと、起動時の挙動が不定になってしまいます。"
#. Tag: screen
-#: preseed.xml:918
+#: preseed.xml:937
#, no-c-format
msgid ""
"# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2201,13 +2249,13 @@ msgstr ""
"#d-i partman/mount_style select uuid"
#. Tag: title
-#: preseed.xml:923
+#: preseed.xml:943
#, no-c-format
msgid "Base system installation"
msgstr "基本システムのインストール"
#. Tag: para
-#: preseed.xml:924
+#: preseed.xml:944
#, no-c-format
msgid ""
"There is actually not very much that can be preseeded for this stage of the "
@@ -2218,7 +2266,7 @@ msgstr ""
"カーネルのインストールに関するものだけです。"
#. Tag: screen
-#: preseed.xml:931
+#: preseed.xml:951
#, fuzzy, no-c-format
#| msgid ""
#| "# Select the initramfs generator used to generate the initrd for 2.6 "
@@ -2254,13 +2302,13 @@ msgstr ""
"#d-i base-installer/kernel/image string linux-image-2.6-486"
#. Tag: title
-#: preseed.xml:936
+#: preseed.xml:956
#, no-c-format
msgid "Account setup"
msgstr "アカウント設定"
#. Tag: para
-#: preseed.xml:937
+#: preseed.xml:957
#, no-c-format
msgid ""
"The password for the root account and name and password for a first regular "
@@ -2272,7 +2320,7 @@ msgstr ""
"どちらかを使用できます。"
#. Tag: para
-#: preseed.xml:944
+#: preseed.xml:964
#, no-c-format
msgid ""
"Be aware that preseeding passwords is not completely secure as everyone with "
@@ -2288,7 +2336,7 @@ msgstr ""
"ん。"
#. Tag: screen
-#: preseed.xml:954
+#: preseed.xml:974
#, no-c-format
msgid ""
"# Skip creation of a root account (normal user account will be able to\n"
@@ -2346,7 +2394,7 @@ msgstr ""
"#d-i passwd/user-default-groups string audio cdrom video"
#. Tag: para
-#: preseed.xml:956
+#: preseed.xml:976
#, no-c-format
msgid ""
"The <classname>passwd/root-password-crypted</classname> and "
@@ -2365,7 +2413,7 @@ msgstr ""
"利です。"
#. Tag: para
-#: preseed.xml:966
+#: preseed.xml:986
#, no-c-format
msgid ""
"The following command can be used to generate an MD5 hash for a password:"
@@ -2373,19 +2421,19 @@ msgstr ""
"以下のコマンドを、パスワードの MD5 ハッシュを生成するのに利用できます。"
#. Tag: screen
-#: preseed.xml:970
+#: preseed.xml:990
#, no-c-format
msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
#. Tag: title
-#: preseed.xml:976
+#: preseed.xml:996
#, no-c-format
msgid "Apt setup"
msgstr "apt 設定"
#. Tag: para
-#: preseed.xml:977
+#: preseed.xml:997
#, no-c-format
msgid ""
"Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2398,7 +2446,7 @@ msgstr ""
"に、他の (ローカルな) リポジトリを追加できます。"
#. Tag: screen
-#: preseed.xml:985
+#: preseed.xml:1005
#, no-c-format
msgid ""
"# You can choose to install non-free and contrib software.\n"
@@ -2456,13 +2504,13 @@ msgstr ""
"#d-i debian-installer/allow_unauthenticated boolean true"
#. Tag: title
-#: preseed.xml:990
+#: preseed.xml:1010
#, no-c-format
msgid "Package selection"
msgstr "パッケージ選択"
#. Tag: para
-#: preseed.xml:991
+#: preseed.xml:1011
#, no-c-format
msgid ""
"You can choose to install any combination of tasks that are available. "
@@ -2472,73 +2520,73 @@ msgstr ""
"スクを以下に書き出します。"
#. Tag: userinput
-#: preseed.xml:1000
+#: preseed.xml:1020
#, no-c-format
msgid "standard"
msgstr "standard"
#. Tag: userinput
-#: preseed.xml:1003
+#: preseed.xml:1023
#, no-c-format
msgid "desktop"
msgstr "desktop"
#. Tag: userinput
-#: preseed.xml:1006
+#: preseed.xml:1026
#, no-c-format
msgid "gnome-desktop"
msgstr "gnome-desktop"
#. Tag: userinput
-#: preseed.xml:1009
+#: preseed.xml:1029
#, no-c-format
msgid "kde-desktop"
msgstr "kde-desktop"
#. Tag: userinput
-#: preseed.xml:1012
+#: preseed.xml:1032
#, no-c-format
msgid "web-server"
msgstr "web-server"
#. Tag: userinput
-#: preseed.xml:1015
+#: preseed.xml:1035
#, no-c-format
msgid "print-server"
msgstr "print-server"
#. Tag: userinput
-#: preseed.xml:1018
+#: preseed.xml:1038
#, no-c-format
msgid "dns-server"
msgstr "dns-server"
#. Tag: userinput
-#: preseed.xml:1021
+#: preseed.xml:1041
#, no-c-format
msgid "file-server"
msgstr "file-server"
#. Tag: userinput
-#: preseed.xml:1024
+#: preseed.xml:1044
#, no-c-format
msgid "mail-server"
msgstr "mail-server"
#. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1047
#, no-c-format
msgid "sql-database"
msgstr "sql-database"
#. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1050
#, no-c-format
msgid "laptop"
msgstr "laptop"
#. Tag: para
-#: preseed.xml:1034
+#: preseed.xml:1054
#, no-c-format
msgid ""
"You can also choose to install no tasks, and force the installation of a set "
@@ -2550,7 +2598,7 @@ msgstr ""
"クは常に含めるのをお奨めします。"
#. Tag: para
-#: preseed.xml:1040
+#: preseed.xml:1060
#, no-c-format
msgid ""
"If you want to install some individual packages in addition to packages "
@@ -2565,7 +2613,7 @@ msgstr ""
"で区切ったパッケージのリストを取れます。"
#. Tag: screen
-#: preseed.xml:1050
+#: preseed.xml:1070
#, fuzzy, no-c-format
#| msgid ""
#| "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2633,13 +2681,13 @@ msgstr ""
"#popularity-contest popularity-contest/participate boolean false"
#. Tag: title
-#: preseed.xml:1055
+#: preseed.xml:1075
#, no-c-format
msgid "Boot loader installation"
msgstr "ブートローダのインストール"
#. Tag: screen
-#: preseed.xml:1057
+#: preseed.xml:1077
#, no-c-format
msgid ""
"# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -2715,7 +2763,7 @@ msgstr ""
"#d-i debian-installer/add-kernel-opts string nousb"
#. Tag: para
-#: preseed.xml:1059
+#: preseed.xml:1079
#, no-c-format
msgid ""
"An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2727,13 +2775,13 @@ msgstr ""
"\"preseed-account\"/> にあるコマンドを使用して生成します。"
#. Tag: title
-#: preseed.xml:1069
+#: preseed.xml:1089
#, no-c-format
msgid "Finishing up the installation"
msgstr "インストールの仕上げ"
#. Tag: screen
-#: preseed.xml:1071
+#: preseed.xml:1091
#, no-c-format
msgid ""
"# During installations from serial console, the regular virtual consoles\n"
@@ -2773,13 +2821,13 @@ msgstr ""
"#d-i debian-installer/exit/poweroff boolean true"
#. Tag: title
-#: preseed.xml:1076
+#: preseed.xml:1096
#, no-c-format
msgid "Preseeding other packages"
msgstr "他パッケージの preseed"
#. Tag: screen
-#: preseed.xml:1078
+#: preseed.xml:1098
#, no-c-format
msgid ""
"# Depending on what software you choose to install, or if things go wrong\n"
@@ -2799,19 +2847,19 @@ msgstr ""
"# debconf-get-selections >> file"
#. Tag: title
-#: preseed.xml:1085
+#: preseed.xml:1105
#, no-c-format
msgid "Advanced options"
msgstr "高度なオプション"
#. Tag: title
-#: preseed.xml:1088
+#: preseed.xml:1108
#, no-c-format
msgid "Running custom commands during the installation"
msgstr "インストール中のカスタムコマンド実行"
#. Tag: para
-#: preseed.xml:1089
+#: preseed.xml:1109
#, no-c-format
msgid ""
"A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2821,7 +2869,7 @@ msgstr ""
"るといった、とても強力で柔軟なオプションが存在します。"
#. Tag: screen
-#: preseed.xml:1097
+#: preseed.xml:1117
#, no-c-format
msgid ""
"# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2869,13 +2917,13 @@ msgstr ""
"#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
#. Tag: title
-#: preseed.xml:1102
+#: preseed.xml:1122
#, no-c-format
msgid "Using preseeding to change default values"
msgstr "preseed を用いたデフォルト値変更"
#. Tag: para
-#: preseed.xml:1103
+#: preseed.xml:1123
#, no-c-format
msgid ""
"It is possible to use preseeding to change the default answer for a "
@@ -2901,7 +2949,7 @@ msgstr ""
"やデバッグにも便利です。"
#. Tag: para
-#: preseed.xml:1117
+#: preseed.xml:1137
#, no-c-format
msgid ""
"Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2915,7 +2963,7 @@ msgstr ""
"linkend=\"preseed-bootparms\"/> の脚注をご覧ください。"
#. Tag: para
-#: preseed.xml:1124
+#: preseed.xml:1144
#, no-c-format
msgid ""
"If you are preseeding using boot parameters, you can make the installer ask "
@@ -2938,13 +2986,13 @@ msgstr ""
"果を及ぼしません。"
#. Tag: title
-#: preseed.xml:1138
+#: preseed.xml:1158
#, no-c-format
msgid "Chainloading preconfiguration files"
msgstr "事前設定ファイルの多重読み込み"
#. Tag: para
-#: preseed.xml:1139
+#: preseed.xml:1159
#, no-c-format
msgid ""
"It is possible to include other preconfiguration files from a "
@@ -2959,7 +3007,7 @@ msgstr ""
"確かな設定を指定するという使い方ができます。"
#. Tag: screen
-#: preseed.xml:1149
+#: preseed.xml:1169
#, no-c-format
msgid ""
"# More than one file can be listed, separated by spaces; all will be\n"
@@ -3009,7 +3057,7 @@ msgstr ""
"#d-i preseed/run string foo.sh"
#. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1171
#, no-c-format
msgid ""
"It is also possible to chainload from the initrd or file preseeding phase, "
diff --git a/po/ko/preseed.po b/po/ko/preseed.po
index e943fe209..e2192b3dd 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-01-18 00:44+0000\n"
+"POT-Creation-Date: 2010-02-08 01:11+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"
@@ -1677,14 +1677,21 @@ 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."
+#, fuzzy, 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>"
"에서 지원하는 방식만 쓸 수 있습니다. 디스크의 빈 공간을 파티션하거나, 전체 디"
@@ -1694,7 +1701,29 @@ msgstr ""
"티션할 수 없습니다."
#. Tag: para
-#: preseed.xml:852
+#: preseed.xml:849
+#, no-c-format
+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 ""
+
+#. Tag: para
+#: preseed.xml:855
+#, no-c-format
+msgid ""
+"The examples below only provide basic information on the use of recipes. For "
+"detailed information see the files <filename>partman-auto-recipe.txt</"
+"filename> and <filename>partman-auto-raid-recipe.txt</filename> included in "
+"the <classname>debian-installer</classname> package. Both files are also "
+"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 ""
+
+#. Tag: para
+#: preseed.xml:869
#, no-c-format
msgid ""
"The identification of disks is dependent on the order in which their drivers "
@@ -1705,9 +1734,16 @@ msgstr ""
"디스크가 여러 개 있는 경우, 미리 설정을 이용하기 전에 올바른 디스크를 선택하"
"도록 하십시오."
+#. Tag: title
+#: preseed.xml:878
+#, fuzzy, no-c-format
+#| msgid "Partitioning"
+msgid "Partitioning example"
+msgstr "파티션하기"
+
# 주의: 메세지 번역과 통일
#. Tag: screen
-#: preseed.xml:860
+#: preseed.xml:880
#, fuzzy, no-c-format
#| msgid ""
#| "# If the system has free space you can choose to only partition that "
@@ -1780,13 +1816,19 @@ msgid ""
"# 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"
@@ -1805,8 +1847,6 @@ msgid ""
"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"
@@ -1832,6 +1872,12 @@ msgid ""
"# 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"
@@ -1898,13 +1944,13 @@ msgstr ""
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:865
+#: preseed.xml:884
#, no-c-format
msgid "Partitioning using RAID"
msgstr "RAID를 사용해 파티션하기"
#. Tag: para
-#: preseed.xml:866
+#: preseed.xml:885
#, no-c-format
msgid ""
"You can also use preseeding to set up partitions on software RAID arrays. "
@@ -1919,7 +1965,7 @@ msgstr ""
"<xref linkend=\"preseed-bootloader\"/> 부분을 참고하십시오."
#. Tag: para
-#: preseed.xml:876
+#: preseed.xml:895
#, no-c-format
msgid ""
"This type of automated partitioning is easy to get wrong. It is also "
@@ -1934,11 +1980,58 @@ msgstr ""
"var/log/syslog</filename> 파일을 확인하십시오."
#. Tag: screen
-#: preseed.xml:886
-#, no-c-format
+#: preseed.xml:905
+#, 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/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 ""
-"# 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"
@@ -1960,13 +2053,13 @@ msgid ""
"\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;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"
@@ -1978,6 +2071,10 @@ msgid ""
"# /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"
@@ -2030,13 +2127,13 @@ msgstr ""
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:891
+#: preseed.xml:910
#, no-c-format
msgid "Controlling how partitions are mounted"
msgstr "파티션 마운트 방법 조정하기"
#. Tag: para
-#: preseed.xml:892
+#: preseed.xml:911
#, no-c-format
msgid ""
"Normally, filesystems are mounted using a universally unique identifier "
@@ -2052,7 +2149,7 @@ msgstr ""
"따라 마운트할 경우, 레이블이 없는 파일 시스템은 UUID를 사용해 마운트합니다."
#. Tag: para
-#: preseed.xml:901
+#: preseed.xml:920
#, no-c-format
msgid ""
"Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2062,7 +2159,7 @@ msgstr ""
"용합니다."
#. Tag: para
-#: preseed.xml:908
+#: preseed.xml:927
#, no-c-format
msgid ""
"Traditional device names may change based on the order in which the kernel "
@@ -2077,7 +2174,7 @@ msgstr ""
"있고 그 경우 시스템이 어떻게 동작할지 확신할 수 없습니다."
#. Tag: screen
-#: preseed.xml:918
+#: preseed.xml:937
#, no-c-format
msgid ""
"# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2093,13 +2190,13 @@ msgstr ""
"#d-i partman/mount_style select uuid"
#. Tag: title
-#: preseed.xml:923
+#: preseed.xml:943
#, no-c-format
msgid "Base system installation"
msgstr "기본 시스템 설치"
#. Tag: para
-#: preseed.xml:924
+#: preseed.xml:944
#, no-c-format
msgid ""
"There is actually not very much that can be preseeded for this stage of the "
@@ -2110,7 +2207,7 @@ msgstr ""
"쓸 부분은 커널 설치에 관한 질문입니다."
#. Tag: screen
-#: preseed.xml:931
+#: preseed.xml:951
#, fuzzy, no-c-format
#| msgid ""
#| "# Select the initramfs generator used to generate the initrd for 2.6 "
@@ -2145,13 +2242,13 @@ msgstr ""
"#d-i base-installer/kernel/image string linux-image-2.6-486"
#. Tag: title
-#: preseed.xml:936
+#: preseed.xml:956
#, no-c-format
msgid "Account setup"
msgstr "계정 설정"
#. Tag: para
-#: preseed.xml:937
+#: preseed.xml:957
#, no-c-format
msgid ""
"The password for the root account and name and password for a first regular "
@@ -2163,7 +2260,7 @@ msgstr ""
"값</emphasis>을 쓸 수도 있습니다."
#. Tag: para
-#: preseed.xml:944
+#: preseed.xml:964
#, no-c-format
msgid ""
"Be aware that preseeding passwords is not completely secure as everyone with "
@@ -2178,7 +2275,7 @@ msgstr ""
"안이라고 할 수 없습니다."
#. Tag: screen
-#: preseed.xml:954
+#: preseed.xml:974
#, no-c-format
msgid ""
"# Skip creation of a root account (normal user account will be able to\n"
@@ -2236,7 +2333,7 @@ msgstr ""
"#d-i passwd/user-default-groups string audio cdrom video"
#. Tag: para
-#: preseed.xml:956
+#: preseed.xml:976
#, no-c-format
msgid ""
"The <classname>passwd/root-password-crypted</classname> and "
@@ -2256,26 +2353,26 @@ msgstr ""
"법)"
#. Tag: para
-#: preseed.xml:966
+#: preseed.xml:986
#, no-c-format
msgid ""
"The following command can be used to generate an MD5 hash for a password:"
msgstr "암호에 대한 MD5 해시를 만드려면 다음 명령을 사용할 수 있습니다:"
#. Tag: screen
-#: preseed.xml:970
+#: preseed.xml:990
#, no-c-format
msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
#. Tag: title
-#: preseed.xml:976
+#: preseed.xml:996
#, no-c-format
msgid "Apt setup"
msgstr "APT 설정"
#. Tag: para
-#: preseed.xml:977
+#: preseed.xml:997
#, no-c-format
msgid ""
"Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2288,7 +2385,7 @@ msgstr ""
"른 저장소를 지정할 수 있습니다."
#. Tag: screen
-#: preseed.xml:985
+#: preseed.xml:1005
#, no-c-format
msgid ""
"# You can choose to install non-free and contrib software.\n"
@@ -2346,13 +2443,13 @@ msgstr ""
"#d-i debian-installer/allow_unauthenticated boolean true"
#. Tag: title
-#: preseed.xml:990
+#: preseed.xml:1010
#, no-c-format
msgid "Package selection"
msgstr "패키지 선택"
#. Tag: para
-#: preseed.xml:991
+#: preseed.xml:1011
#, no-c-format
msgid ""
"You can choose to install any combination of tasks that are available. "
@@ -2362,73 +2459,73 @@ msgstr ""
"수 있는 태스크는 다음과 같습니다:"
#. Tag: userinput
-#: preseed.xml:1000
+#: preseed.xml:1020
#, no-c-format
msgid "standard"
msgstr "표준 시스템"
#. Tag: userinput
-#: preseed.xml:1003
+#: preseed.xml:1023
#, no-c-format
msgid "desktop"
msgstr "데스크탑"
#. Tag: userinput
-#: preseed.xml:1006
+#: preseed.xml:1026
#, no-c-format
msgid "gnome-desktop"
msgstr "gnome-desktop"
#. Tag: userinput
-#: preseed.xml:1009
+#: preseed.xml:1029
#, no-c-format
msgid "kde-desktop"
msgstr "kde-desktop"
#. Tag: userinput
-#: preseed.xml:1012
+#: preseed.xml:1032
#, no-c-format
msgid "web-server"
msgstr "웹 서버"
#. Tag: userinput
-#: preseed.xml:1015
+#: preseed.xml:1035
#, no-c-format
msgid "print-server"
msgstr "인쇄 서버"
#. Tag: userinput
-#: preseed.xml:1018
+#: preseed.xml:1038
#, no-c-format
msgid "dns-server"
msgstr "DNS 서버"
#. Tag: userinput
-#: preseed.xml:1021
+#: preseed.xml:1041
#, no-c-format
msgid "file-server"
msgstr "파일 서버"
#. Tag: userinput
-#: preseed.xml:1024
+#: preseed.xml:1044
#, no-c-format
msgid "mail-server"
msgstr "메일 서버"
#. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1047
#, no-c-format
msgid "sql-database"
msgstr "SQL 데이터베이스"
#. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1050
#, no-c-format
msgid "laptop"
msgstr "노트북 컴퓨터"
#. Tag: para
-#: preseed.xml:1034
+#: preseed.xml:1054
#, no-c-format
msgid ""
"You can also choose to install no tasks, and force the installation of a set "
@@ -2439,7 +2536,7 @@ msgstr ""
"<userinput>표준 시스템</userinput> 태스크는 항상 포함하시길 권장합니다."
#. Tag: para
-#: preseed.xml:1040
+#: preseed.xml:1060
#, no-c-format
msgid ""
"If you want to install some individual packages in addition to packages "
@@ -2453,7 +2550,7 @@ msgstr ""
"백으로 구분할 수 있으므로, 커널 명령행에서도 쉽게 사용할 수 있습니다."
#. Tag: screen
-#: preseed.xml:1050
+#: preseed.xml:1070
#, fuzzy, no-c-format
#| msgid ""
#| "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2520,13 +2617,13 @@ msgstr ""
"#popularity-contest popularity-contest/participate boolean false"
#. Tag: title
-#: preseed.xml:1055
+#: preseed.xml:1075
#, no-c-format
msgid "Boot loader installation"
msgstr "부트로더 설치"
#. Tag: screen
-#: preseed.xml:1057
+#: preseed.xml:1077
#, no-c-format
msgid ""
"# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -2600,7 +2697,7 @@ msgstr ""
"#d-i debian-installer/add-kernel-opts string nousb"
#. Tag: para
-#: preseed.xml:1059
+#: preseed.xml:1079
#, no-c-format
msgid ""
"An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2612,13 +2709,13 @@ msgstr ""
"\"preseed-account\"/> 부분의 예제 명령을 사용해서 만들어 낼 수 있습니다."
#. Tag: title
-#: preseed.xml:1069
+#: preseed.xml:1089
#, no-c-format
msgid "Finishing up the installation"
msgstr "설치 마치기"
#. Tag: screen
-#: preseed.xml:1071
+#: preseed.xml:1091
#, no-c-format
msgid ""
"# During installations from serial console, the regular virtual consoles\n"
@@ -2657,13 +2754,13 @@ msgstr ""
"#d-i debian-installer/exit/poweroff boolean true"
#. Tag: title
-#: preseed.xml:1076
+#: preseed.xml:1096
#, no-c-format
msgid "Preseeding other packages"
msgstr "기타 패키지 미리 설정"
#. Tag: screen
-#: preseed.xml:1078
+#: preseed.xml:1098
#, no-c-format
msgid ""
"# Depending on what software you choose to install, or if things go wrong\n"
@@ -2682,19 +2779,19 @@ msgstr ""
"# debconf-get-selections >> file"
#. Tag: title
-#: preseed.xml:1085
+#: preseed.xml:1105
#, no-c-format
msgid "Advanced options"
msgstr "고급 옵션"
#. Tag: title
-#: preseed.xml:1088
+#: preseed.xml:1108
#, no-c-format
msgid "Running custom commands during the installation"
msgstr "설치할 때 임의의 명령어 실행하기"
#. Tag: para
-#: preseed.xml:1089
+#: preseed.xml:1109
#, no-c-format
msgid ""
"A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2704,7 +2801,7 @@ msgstr ""
"크립트를 실행하는 기능입니다."
#. Tag: screen
-#: preseed.xml:1097
+#: preseed.xml:1117
#, no-c-format
msgid ""
"# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2755,13 +2852,13 @@ msgstr ""
"#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
#. Tag: title
-#: preseed.xml:1102
+#: preseed.xml:1122
#, no-c-format
msgid "Using preseeding to change default values"
msgstr "미리 설정을 이용해 기본값 바꾸기"
#. Tag: para
-#: preseed.xml:1103
+#: preseed.xml:1123
#, no-c-format
msgid ""
"It is possible to use preseeding to change the default answer for a "
@@ -2787,7 +2884,7 @@ msgstr ""
"버깅하는 데도 좋습니다."
#. Tag: para
-#: preseed.xml:1117
+#: preseed.xml:1137
#, no-c-format
msgid ""
"Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2801,7 +2898,7 @@ msgstr ""
"주를 보십시오."
#. Tag: para
-#: preseed.xml:1124
+#: preseed.xml:1144
#, no-c-format
msgid ""
"If you are preseeding using boot parameters, you can make the installer ask "
@@ -2822,13 +2919,13 @@ msgstr ""
"replaceable>?=<replaceable>값</replaceable></userinput>) 합니다."
#. Tag: title
-#: preseed.xml:1138
+#: preseed.xml:1158
#, no-c-format
msgid "Chainloading preconfiguration files"
msgstr "미리 설정 파일을 분리해서 사용하기"
#. Tag: para
-#: preseed.xml:1139
+#: preseed.xml:1159
#, no-c-format
msgid ""
"It is possible to include other preconfiguration files from a "
@@ -2843,7 +2940,7 @@ msgstr ""
"다른 파일에 집어 넣는 식으로 활용이 가능합니다."
#. Tag: screen
-#: preseed.xml:1149
+#: preseed.xml:1169
#, no-c-format
msgid ""
"# More than one file can be listed, separated by spaces; all will be\n"
@@ -2893,7 +2990,7 @@ msgstr ""
"#d-i preseed/run string foo.sh"
#. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1171
#, no-c-format
msgid ""
"It is also possible to chainload from the initrd or file preseeding phase, "
diff --git a/po/pot/preseed.pot b/po/pot/preseed.pot
index 55cd0ade7..330d19a6a 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-01-18 00:44+0000\n"
+"POT-Creation-Date: 2010-02-08 01:11+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"
@@ -968,30 +968,52 @@ 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 ""
#. Tag: para
-#: preseed.xml:852
+#: preseed.xml:849
+#, no-c-format
+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 ""
+
+#. Tag: para
+#: preseed.xml:855
+#, no-c-format
+msgid "The examples below only provide basic information on the use of recipes. For detailed information see the files <filename>partman-auto-recipe.txt</filename> and <filename>partman-auto-raid-recipe.txt</filename> included in the <classname>debian-installer</classname> package. Both files are also 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 ""
+
+#. Tag: para
+#: preseed.xml:869
#, no-c-format
msgid "The identification of disks is dependent on the order in which their drivers are loaded. If there are multiple disks in the system, make very sure the correct one will be selected before using preseeding."
msgstr ""
+#. Tag: title
+#: preseed.xml:878
+#, no-c-format
+msgid "Partitioning example"
+msgstr ""
+
#. Tag: screen
-#: preseed.xml:860
+#: 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"
+ "# 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"
@@ -1010,7 +1032,6 @@ msgid ""
"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"
@@ -1035,6 +1056,12 @@ msgid ""
"# 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"
@@ -1043,29 +1070,27 @@ msgid ""
msgstr ""
#. Tag: title
-#: preseed.xml:865
+#: preseed.xml:884
#, no-c-format
msgid "Partitioning using RAID"
msgstr ""
#. Tag: para
-#: preseed.xml:866
+#: preseed.xml:885
#, no-c-format
msgid "You can also use preseeding to set up partitions on software RAID arrays. Supported are RAID levels 0, 1, 5, 6 and 10, creating degraded arrays and specifying spare devices. If you are using RAID 1, you can preseed grub to install to all devices used in the array; see <xref linkend=\"preseed-bootloader\"/>."
msgstr ""
#. Tag: para
-#: preseed.xml:876
+#: preseed.xml:895
#, no-c-format
msgid "This type of automated partitioning is easy to get wrong. It is also functionality that receives relatively little testing from the developers of &d-i;. The responsibility to get the various recipes right (so they make sense and don't conflict) lies with the user. Check <filename>/var/log/syslog</filename> if you run into problems."
msgstr ""
#. Tag: screen
-#: preseed.xml:886
+#: 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"
@@ -1087,11 +1112,12 @@ msgid ""
"\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;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"
@@ -1103,6 +1129,10 @@ msgid ""
"# /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"
@@ -1111,31 +1141,31 @@ msgid ""
msgstr ""
#. Tag: title
-#: preseed.xml:891
+#: preseed.xml:910
#, no-c-format
msgid "Controlling how partitions are mounted"
msgstr ""
#. Tag: para
-#: preseed.xml:892
+#: preseed.xml:911
#, no-c-format
msgid "Normally, filesystems are mounted using a universally unique identifier (UUID) as a key; this allows them to be mounted properly even if their device name changes. UUIDs are long and difficult to read, so, if you prefer, the installer can mount filesystems based on the traditional device names, or based on a label you assign. If you ask the installer to mount by label, any filesystems without a label will be mounted using a UUID instead."
msgstr ""
#. Tag: para
-#: preseed.xml:901
+#: preseed.xml:920
#, no-c-format
msgid "Devices with stable names, such as LVM logical volumes, will continue to use their traditional names rather than UUIDs."
msgstr ""
#. Tag: para
-#: preseed.xml:908
+#: preseed.xml:927
#, no-c-format
msgid "Traditional device names may change based on the order in which the kernel discovers devices at boot, which may cause the wrong filesystem to be mounted. Similarly, labels are likely to clash if you plug in a new disk or a USB drive, and if that happens your system's behaviour when started will be random."
msgstr ""
#. Tag: screen
-#: preseed.xml:918
+#: preseed.xml:937
#, no-c-format
msgid ""
"# The default is to mount by UUID, but you can also choose \"traditional\" to\n"
@@ -1145,19 +1175,19 @@ msgid ""
msgstr ""
#. Tag: title
-#: preseed.xml:923
+#: preseed.xml:943
#, no-c-format
msgid "Base system installation"
msgstr ""
#. Tag: para
-#: preseed.xml:924
+#: preseed.xml:944
#, no-c-format
msgid "There is actually not very much that can be preseeded for this stage of the installation. The only questions asked concern the installation of the kernel."
msgstr ""
#. Tag: screen
-#: preseed.xml:931
+#: preseed.xml:951
#, no-c-format
msgid ""
"# Configure APT to not install recommended packages by default. Use of this\n"
@@ -1174,25 +1204,25 @@ msgid ""
msgstr ""
#. Tag: title
-#: preseed.xml:936
+#: preseed.xml:956
#, no-c-format
msgid "Account setup"
msgstr ""
#. Tag: para
-#: preseed.xml:937
+#: preseed.xml:957
#, no-c-format
msgid "The password for the root account and name and password for a first regular user's account can be preseeded. For the passwords you can use either clear text values or MD5 <emphasis>hashes</emphasis>."
msgstr ""
#. Tag: para
-#: preseed.xml:944
+#: preseed.xml:964
#, no-c-format
msgid "Be aware that preseeding passwords is not completely secure as everyone with access to the preconfiguration file will have the knowledge of these passwords. Using MD5 hashes is considered slightly better in terms of security but it might also give a false sense of security as access to a MD5 hash allows for brute force attacks."
msgstr ""
#. Tag: screen
-#: preseed.xml:954
+#: preseed.xml:974
#, no-c-format
msgid ""
"# Skip creation of a root account (normal user account will be able to\n"
@@ -1224,37 +1254,37 @@ msgid ""
msgstr ""
#. Tag: para
-#: preseed.xml:956
+#: preseed.xml:976
#, no-c-format
msgid "The <classname>passwd/root-password-crypted</classname> and <classname>passwd/user-password-crypted</classname> variables can also be preseeded with <quote>!</quote> as their value. In that case, the corresponding account is disabled. This may be convenient for the root account, provided of course that an alternative method is set up to allow administrative activities or root login (for instance by using SSH key authentication or <command>sudo</command>)."
msgstr ""
#. Tag: para
-#: preseed.xml:966
+#: preseed.xml:986
#, no-c-format
msgid "The following command can be used to generate an MD5 hash for a password:"
msgstr ""
#. Tag: screen
-#: preseed.xml:970
+#: preseed.xml:990
#, no-c-format
msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
msgstr ""
#. Tag: title
-#: preseed.xml:976
+#: preseed.xml:996
#, no-c-format
msgid "Apt setup"
msgstr ""
#. Tag: para
-#: preseed.xml:977
+#: preseed.xml:997
#, no-c-format
msgid "Setup of the <filename>/etc/apt/sources.list</filename> and basic configuration options is fully automated based on your installation method and answers to earlier questions. You can optionally add other (local) repositories."
msgstr ""
#. Tag: screen
-#: preseed.xml:985
+#: preseed.xml:1005
#, no-c-format
msgid ""
"# You can choose to install non-free and contrib software.\n"
@@ -1286,97 +1316,97 @@ msgid ""
msgstr ""
#. Tag: title
-#: preseed.xml:990
+#: preseed.xml:1010
#, no-c-format
msgid "Package selection"
msgstr ""
#. Tag: para
-#: preseed.xml:991
+#: preseed.xml:1011
#, no-c-format
msgid "You can choose to install any combination of tasks that are available. Available tasks as of this writing include:"
msgstr ""
#. Tag: userinput
-#: preseed.xml:1000
+#: preseed.xml:1020
#, no-c-format
msgid "standard"
msgstr ""
#. Tag: userinput
-#: preseed.xml:1003
+#: preseed.xml:1023
#, no-c-format
msgid "desktop"
msgstr ""
#. Tag: userinput
-#: preseed.xml:1006
+#: preseed.xml:1026
#, no-c-format
msgid "gnome-desktop"
msgstr ""
#. Tag: userinput
-#: preseed.xml:1009
+#: preseed.xml:1029
#, no-c-format
msgid "kde-desktop"
msgstr ""
#. Tag: userinput
-#: preseed.xml:1012
+#: preseed.xml:1032
#, no-c-format
msgid "web-server"
msgstr ""
#. Tag: userinput
-#: preseed.xml:1015
+#: preseed.xml:1035
#, no-c-format
msgid "print-server"
msgstr ""
#. Tag: userinput
-#: preseed.xml:1018
+#: preseed.xml:1038
#, no-c-format
msgid "dns-server"
msgstr ""
#. Tag: userinput
-#: preseed.xml:1021
+#: preseed.xml:1041
#, no-c-format
msgid "file-server"
msgstr ""
#. Tag: userinput
-#: preseed.xml:1024
+#: preseed.xml:1044
#, no-c-format
msgid "mail-server"
msgstr ""
#. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1047
#, no-c-format
msgid "sql-database"
msgstr ""
#. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1050
#, no-c-format
msgid "laptop"
msgstr ""
#. Tag: para
-#: preseed.xml:1034
+#: preseed.xml:1054
#, no-c-format
msgid "You can also choose to install no tasks, and force the installation of a set of packages in some other way. We recommend always including the <userinput>standard</userinput> task."
msgstr ""
#. Tag: para
-#: preseed.xml:1040
+#: preseed.xml:1060
#, no-c-format
msgid "If you want to install some individual packages in addition to packages installed by tasks, you can use the parameter <classname>pkgsel/include</classname>. The value of this parameter can be a list of packages separated by either commas or spaces, which allows it to be used easily on the kernel command line as well."
msgstr ""
#. Tag: screen
-#: preseed.xml:1050
+#: preseed.xml:1070
#, no-c-format
msgid ""
"#tasksel tasksel/first multiselect standard, web-server\n"
@@ -1398,13 +1428,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: preseed.xml:1055
+#: preseed.xml:1075
#, no-c-format
msgid "Boot loader installation"
msgstr ""
#. Tag: screen
-#: preseed.xml:1057
+#: preseed.xml:1077
#, no-c-format
msgid ""
"# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -1443,19 +1473,19 @@ msgid ""
msgstr ""
#. Tag: para
-#: preseed.xml:1059
+#: preseed.xml:1079
#, no-c-format
msgid "An MD5 hash for a password for <classname>grub</classname> can be generated using <command>grub-md5-crypt</command>, or using the command from the example in <xref linkend=\"preseed-account\"/>."
msgstr ""
#. Tag: title
-#: preseed.xml:1069
+#: preseed.xml:1089
#, no-c-format
msgid "Finishing up the installation"
msgstr ""
#. Tag: screen
-#: preseed.xml:1071
+#: preseed.xml:1091
#, no-c-format
msgid ""
"# During installations from serial console, the regular virtual consoles\n"
@@ -1478,13 +1508,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: preseed.xml:1076
+#: preseed.xml:1096
#, no-c-format
msgid "Preseeding other packages"
msgstr ""
#. Tag: screen
-#: preseed.xml:1078
+#: preseed.xml:1098
#, no-c-format
msgid ""
"# Depending on what software you choose to install, or if things go wrong\n"
@@ -1497,25 +1527,25 @@ msgid ""
msgstr ""
#. Tag: title
-#: preseed.xml:1085
+#: preseed.xml:1105
#, no-c-format
msgid "Advanced options"
msgstr ""
#. Tag: title
-#: preseed.xml:1088
+#: preseed.xml:1108
#, no-c-format
msgid "Running custom commands during the installation"
msgstr ""
#. Tag: para
-#: preseed.xml:1089
+#: preseed.xml:1109
#, no-c-format
msgid "A very powerful and flexible option offered by the preconfiguration tools is the ability to run commands or scripts at certain points in the installation."
msgstr ""
#. Tag: screen
-#: preseed.xml:1097
+#: preseed.xml:1117
#, no-c-format
msgid ""
"# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -1541,13 +1571,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: preseed.xml:1102
+#: preseed.xml:1122
#, no-c-format
msgid "Using preseeding to change default values"
msgstr ""
#. Tag: para
-#: preseed.xml:1103
+#: preseed.xml:1123
#, no-c-format
msgid ""
"It is possible to use preseeding to change the default answer for a question, but still have the question asked. To do this the <firstterm>seen</firstterm> flag must be reset to <quote>false</quote> after setting the value for a question. <informalexample><screen>\n"
@@ -1557,31 +1587,31 @@ msgid ""
msgstr ""
#. Tag: para
-#: preseed.xml:1117
+#: preseed.xml:1137
#, no-c-format
msgid "Note that the <quote>d-i</quote> owner should only be used for variables used in the installer itself. For variables belonging to packages installed on the target system, you should use the name of that package instead. See the footnote to <xref linkend=\"preseed-bootparms\"/>."
msgstr ""
#. Tag: para
-#: preseed.xml:1124
+#: preseed.xml:1144
#, no-c-format
msgid "If you are preseeding using boot parameters, you can make the installer ask the corresponding question by using the <quote>?=</quote> operator, i.e. <userinput><replaceable>foo</replaceable>/<replaceable>bar</replaceable>?=<replaceable>value</replaceable></userinput> (or <userinput><replaceable>owner</replaceable>:<replaceable>foo/bar</replaceable>?=<replaceable>value</replaceable></userinput>). This will of course only have effect for parameters that correspond to questions that are actually displayed during an installation and not for <quote>internal</quote> parameters."
msgstr ""
#. Tag: title
-#: preseed.xml:1138
+#: preseed.xml:1158
#, no-c-format
msgid "Chainloading preconfiguration files"
msgstr ""
#. Tag: para
-#: preseed.xml:1139
+#: preseed.xml:1159
#, no-c-format
msgid "It is possible to include other preconfiguration files from a preconfiguration file. Any settings in those files will override pre-existing settings from files loaded earlier. This makes it possible to put, for example, general networking settings for your location in one file and more specific settings for certain configurations in other files."
msgstr ""
#. Tag: screen
-#: preseed.xml:1149
+#: preseed.xml:1169
#, no-c-format
msgid ""
"# More than one file can be listed, separated by spaces; all will be\n"
@@ -1609,7 +1639,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1171
#, no-c-format
msgid "It is also possible to chainload from the initrd or file preseeding phase, into network preseeding by setting preseed/url in the earlier files. This will cause network preseeding to be performed when the network comes up. You need to be careful when doing this, since there will be two distinct runs at preseeding, meaning for example that you get another chance to run the preseed/early command, the second one happening after the network comes up."
msgstr ""
diff --git a/po/pt/preseed.po b/po/pt/preseed.po
index 88f72904a..284c49332 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-01-18 00:44+0000\n"
+"POT-Creation-Date: 2010-02-08 01:11+0000\n"
"PO-Revision-Date: 2009-12-14 21:11+0000\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -1768,14 +1768,21 @@ msgstr "Particionamento"
#. 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."
+#, fuzzy, 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 ""
"Utilizar o preseed para particionar o disco rígido é bastante limitado ao "
"que é suportado pelo <classname>partman-auto</classname>. Pode escolher "
@@ -1786,7 +1793,29 @@ msgstr ""
"utilizando o preseeding."
#. Tag: para
-#: preseed.xml:852
+#: preseed.xml:849
+#, no-c-format
+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 ""
+
+#. Tag: para
+#: preseed.xml:855
+#, no-c-format
+msgid ""
+"The examples below only provide basic information on the use of recipes. For "
+"detailed information see the files <filename>partman-auto-recipe.txt</"
+"filename> and <filename>partman-auto-raid-recipe.txt</filename> included in "
+"the <classname>debian-installer</classname> package. Both files are also "
+"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 ""
+
+#. Tag: para
+#: preseed.xml:869
#, no-c-format
msgid ""
"The identification of disks is dependent on the order in which their drivers "
@@ -1798,8 +1827,15 @@ msgstr ""
"certifique-se que o disco correcto será seleccionado antes de utilizar o "
"preseeding."
+#. Tag: title
+#: preseed.xml:878
+#, fuzzy, no-c-format
+#| msgid "Partitioning"
+msgid "Partitioning example"
+msgstr "Particionamento"
+
#. Tag: screen
-#: preseed.xml:860
+#: preseed.xml:880
#, fuzzy, no-c-format
#| msgid ""
#| "# If the system has free space you can choose to only partition that "
@@ -1872,13 +1908,19 @@ msgid ""
"# 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"
@@ -1897,8 +1939,6 @@ msgid ""
"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"
@@ -1924,6 +1964,12 @@ msgid ""
"# 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"
@@ -1994,13 +2040,13 @@ msgstr ""
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:865
+#: preseed.xml:884
#, no-c-format
msgid "Partitioning using RAID"
msgstr "Particionamento utilizando RAID"
#. Tag: para
-#: preseed.xml:866
+#: preseed.xml:885
#, no-c-format
msgid ""
"You can also use preseeding to set up partitions on software RAID arrays. "
@@ -2016,7 +2062,7 @@ msgstr ""
"no array; veja <xref linkend=\"preseed-bootloader\"/>."
#. Tag: para
-#: preseed.xml:876
+#: preseed.xml:895
#, no-c-format
msgid ""
"This type of automated partitioning is easy to get wrong. It is also "
@@ -2032,11 +2078,58 @@ msgstr ""
"<filename>/var/log/syslog</filename>."
#. Tag: screen
-#: preseed.xml:886
-#, no-c-format
+#: preseed.xml:905
+#, 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/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 ""
-"# 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"
@@ -2058,13 +2151,13 @@ msgid ""
"\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;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"
@@ -2076,6 +2169,10 @@ msgid ""
"# /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"
@@ -2132,13 +2229,13 @@ msgstr ""
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:891
+#: preseed.xml:910
#, no-c-format
msgid "Controlling how partitions are mounted"
msgstr "Controlar como são montadas as partições"
#. Tag: para
-#: preseed.xml:892
+#: preseed.xml:911
#, no-c-format
msgid ""
"Normally, filesystems are mounted using a universally unique identifier "
@@ -2157,7 +2254,7 @@ msgstr ""
"qualquer sistema de ficheiros sem a etiqueta será montado utilizando um UUID."
#. Tag: para
-#: preseed.xml:901
+#: preseed.xml:920
#, no-c-format
msgid ""
"Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2167,7 +2264,7 @@ msgstr ""
"continuar a utilizar os seus nomes tradicionais em vez de UUIDs."
#. Tag: para
-#: preseed.xml:908
+#: preseed.xml:927
#, no-c-format
msgid ""
"Traditional device names may change based on the order in which the kernel "
@@ -2184,7 +2281,7 @@ msgstr ""
"aleatório."
#. Tag: screen
-#: preseed.xml:918
+#: preseed.xml:937
#, no-c-format
msgid ""
"# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2200,13 +2297,13 @@ msgstr ""
"# d-i partman/mount_style select uuid"
#. Tag: title
-#: preseed.xml:923
+#: preseed.xml:943
#, no-c-format
msgid "Base system installation"
msgstr "Instalação do sistema base"
#. Tag: para
-#: preseed.xml:924
+#: preseed.xml:944
#, no-c-format
msgid ""
"There is actually not very much that can be preseeded for this stage of the "
@@ -2217,7 +2314,7 @@ msgstr ""
"instalação. As únicas perguntas colocadas referem-se à instalação do kernel."
#. Tag: screen
-#: preseed.xml:931
+#: preseed.xml:951
#, no-c-format
msgid ""
"# Configure APT to not install recommended packages by default. Use of this\n"
@@ -2248,13 +2345,13 @@ msgstr ""
"#d-i base-installer/kernel/image string linux-image-2.6-486"
#. Tag: title
-#: preseed.xml:936
+#: preseed.xml:956
#, no-c-format
msgid "Account setup"
msgstr "Configuração de contas"
#. Tag: para
-#: preseed.xml:937
+#: preseed.xml:957
#, no-c-format
msgid ""
"The password for the root account and name and password for a first regular "
@@ -2266,7 +2363,7 @@ msgstr ""
"texto simples ou <emphasis>hashes</emphasis> MD5."
#. Tag: para
-#: preseed.xml:944
+#: preseed.xml:964
#, no-c-format
msgid ""
"Be aware that preseeding passwords is not completely secure as everyone with "
@@ -2282,7 +2379,7 @@ msgstr ""
"segurança já que o acesso a hashes MD5 permite ataques \"à bruta\"."
#. Tag: screen
-#: preseed.xml:954
+#: preseed.xml:974
#, no-c-format
msgid ""
"# Skip creation of a root account (normal user account will be able to\n"
@@ -2341,7 +2438,7 @@ msgstr ""
"#d-i passwd/user-default-groups string audio cdrom video"
#. Tag: para
-#: preseed.xml:956
+#: preseed.xml:976
#, no-c-format
msgid ""
"The <classname>passwd/root-password-crypted</classname> and "
@@ -2361,7 +2458,7 @@ msgstr ""
"autenticação SSH ou <command>sudo</command>)."
#. Tag: para
-#: preseed.xml:966
+#: preseed.xml:986
#, no-c-format
msgid ""
"The following command can be used to generate an MD5 hash for a password:"
@@ -2370,19 +2467,19 @@ msgstr ""
"palavra-passe:"
#. Tag: screen
-#: preseed.xml:970
+#: preseed.xml:990
#, no-c-format
msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
#. Tag: title
-#: preseed.xml:976
+#: preseed.xml:996
#, no-c-format
msgid "Apt setup"
msgstr "Configuração do Apt"
#. Tag: para
-#: preseed.xml:977
+#: preseed.xml:997
#, no-c-format
msgid ""
"Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2396,7 +2493,7 @@ msgstr ""
"acrescentar outros repositórios (locais)."
#. Tag: screen
-#: preseed.xml:985
+#: preseed.xml:1005
#, no-c-format
msgid ""
"# You can choose to install non-free and contrib software.\n"
@@ -2456,13 +2553,13 @@ msgstr ""
"#d-i debian-installer/allow_unauthenticated boolean true"
#. Tag: title
-#: preseed.xml:990
+#: preseed.xml:1010
#, no-c-format
msgid "Package selection"
msgstr "Selecção de pacotes"
#. Tag: para
-#: preseed.xml:991
+#: preseed.xml:1011
#, no-c-format
msgid ""
"You can choose to install any combination of tasks that are available. "
@@ -2472,73 +2569,73 @@ msgstr ""
"tarefas disponíveis neste momento incluem:"
#. Tag: userinput
-#: preseed.xml:1000
+#: preseed.xml:1020
#, no-c-format
msgid "standard"
msgstr "standard"
#. Tag: userinput
-#: preseed.xml:1003
+#: preseed.xml:1023
#, no-c-format
msgid "desktop"
msgstr "desktop"
#. Tag: userinput
-#: preseed.xml:1006
+#: preseed.xml:1026
#, no-c-format
msgid "gnome-desktop"
msgstr "gnome-desktop"
#. Tag: userinput
-#: preseed.xml:1009
+#: preseed.xml:1029
#, no-c-format
msgid "kde-desktop"
msgstr "kde-desktop"
#. Tag: userinput
-#: preseed.xml:1012
+#: preseed.xml:1032
#, no-c-format
msgid "web-server"
msgstr "web-server"
#. Tag: userinput
-#: preseed.xml:1015
+#: preseed.xml:1035
#, no-c-format
msgid "print-server"
msgstr "print-server"
#. Tag: userinput
-#: preseed.xml:1018
+#: preseed.xml:1038
#, no-c-format
msgid "dns-server"
msgstr "dns-server"
#. Tag: userinput
-#: preseed.xml:1021
+#: preseed.xml:1041
#, no-c-format
msgid "file-server"
msgstr "file-server"
#. Tag: userinput
-#: preseed.xml:1024
+#: preseed.xml:1044
#, no-c-format
msgid "mail-server"
msgstr "mail-server"
#. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1047
#, no-c-format
msgid "sql-database"
msgstr "sql-database"
#. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1050
#, no-c-format
msgid "laptop"
msgstr "laptop"
#. Tag: para
-#: preseed.xml:1034
+#: preseed.xml:1054
#, no-c-format
msgid ""
"You can also choose to install no tasks, and force the installation of a set "
@@ -2550,7 +2647,7 @@ msgstr ""
"inclusão da tarefa <userinput>standard</userinput>."
#. Tag: para
-#: preseed.xml:1040
+#: preseed.xml:1060
#, no-c-format
msgid ""
"If you want to install some individual packages in addition to packages "
@@ -2566,7 +2663,7 @@ msgstr ""
"linha de comandos do kernel."
#. Tag: screen
-#: preseed.xml:1050
+#: preseed.xml:1070
#, fuzzy, no-c-format
#| msgid ""
#| "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2634,13 +2731,13 @@ msgstr ""
"#popularity-contest popularity-contest/participate boolean false"
#. Tag: title
-#: preseed.xml:1055
+#: preseed.xml:1075
#, no-c-format
msgid "Boot loader installation"
msgstr "Instalação do gestor de arranque"
#. Tag: screen
-#: preseed.xml:1057
+#: preseed.xml:1077
#, no-c-format
msgid ""
"# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -2718,7 +2815,7 @@ msgstr ""
"#d-i debian-installer/add-kernel-opts string nousb"
#. Tag: para
-#: preseed.xml:1059
+#: preseed.xml:1079
#, no-c-format
msgid ""
"An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2730,13 +2827,13 @@ msgstr ""
"comando do exemplo em <xref linkend=\"preseed-account\"/>."
#. Tag: title
-#: preseed.xml:1069
+#: preseed.xml:1089
#, no-c-format
msgid "Finishing up the installation"
msgstr "A terminar a instalação"
#. Tag: screen
-#: preseed.xml:1071
+#: preseed.xml:1091
#, no-c-format
msgid ""
"# During installations from serial console, the regular virtual consoles\n"
@@ -2779,13 +2876,13 @@ msgstr ""
"#d-i debian-installer/exit/poweroff boolean true"
#. Tag: title
-#: preseed.xml:1076
+#: preseed.xml:1096
#, no-c-format
msgid "Preseeding other packages"
msgstr "Preseed de outros pacotes"
#. Tag: screen
-#: preseed.xml:1078
+#: preseed.xml:1098
#, no-c-format
msgid ""
"# Depending on what software you choose to install, or if things go wrong\n"
@@ -2805,19 +2902,19 @@ msgstr ""
"# debconf-get-selections >> file"
#. Tag: title
-#: preseed.xml:1085
+#: preseed.xml:1105
#, no-c-format
msgid "Advanced options"
msgstr "Opções avançadas"
#. Tag: title
-#: preseed.xml:1088
+#: preseed.xml:1108
#, no-c-format
msgid "Running custom commands during the installation"
msgstr "Executar comandos personalizados durante a instalação"
#. Tag: para
-#: preseed.xml:1089
+#: preseed.xml:1109
#, no-c-format
msgid ""
"A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2828,7 +2925,7 @@ msgstr ""
"da instalação."
#. Tag: screen
-#: preseed.xml:1097
+#: preseed.xml:1117
#, no-c-format
msgid ""
"# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2879,13 +2976,13 @@ msgstr ""
"#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
#. Tag: title
-#: preseed.xml:1102
+#: preseed.xml:1122
#, no-c-format
msgid "Using preseeding to change default values"
msgstr "Utilizar o preseed para alterar valores por omissão"
#. Tag: para
-#: preseed.xml:1103
+#: preseed.xml:1123
#, no-c-format
msgid ""
"It is possible to use preseeding to change the default answer for a "
@@ -2911,7 +3008,7 @@ msgstr ""
"ser útil para testar ou depurar o seu ficheiro de pré-configuração."
#. Tag: para
-#: preseed.xml:1117
+#: preseed.xml:1137
#, no-c-format
msgid ""
"Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2925,7 +3022,7 @@ msgstr ""
"rodapé para <xref linkend=\"preseed-bootparms\"/>."
#. Tag: para
-#: preseed.xml:1124
+#: preseed.xml:1144
#, no-c-format
msgid ""
"If you are preseeding using boot parameters, you can make the installer ask "
@@ -2948,13 +3045,13 @@ msgstr ""
"mostradas durante a instalação e não para parâmetros <quote>internos</quote>."
#. Tag: title
-#: preseed.xml:1138
+#: preseed.xml:1158
#, no-c-format
msgid "Chainloading preconfiguration files"
msgstr "Carregamento em série dos ficheiros de pré-configuração"
#. Tag: para
-#: preseed.xml:1139
+#: preseed.xml:1159
#, no-c-format
msgid ""
"It is possible to include other preconfiguration files from a "
@@ -2971,7 +3068,7 @@ msgstr ""
"ficheiros."
#. Tag: screen
-#: preseed.xml:1149
+#: preseed.xml:1169
#, no-c-format
msgid ""
"# More than one file can be listed, separated by spaces; all will be\n"
@@ -3024,7 +3121,7 @@ msgstr ""
"#d-i preseed/run string foo.sh"
#. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1171
#, no-c-format
msgid ""
"It is also possible to chainload from the initrd or file preseeding phase, "
diff --git a/po/ru/preseed.po b/po/ru/preseed.po
index 638c63563..1d24d3ab5 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-01-18 00:44+0000\n"
+"POT-Creation-Date: 2010-02-08 01:11+0000\n"
"PO-Revision-Date: 2009-12-25 20:20+0300\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -1745,14 +1745,21 @@ 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."
+#, fuzzy, 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-"
@@ -1763,7 +1770,29 @@ msgstr ""
"разметка нескольких дисков."
#. Tag: para
-#: preseed.xml:852
+#: preseed.xml:849
+#, no-c-format
+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 ""
+
+#. Tag: para
+#: preseed.xml:855
+#, no-c-format
+msgid ""
+"The examples below only provide basic information on the use of recipes. For "
+"detailed information see the files <filename>partman-auto-recipe.txt</"
+"filename> and <filename>partman-auto-raid-recipe.txt</filename> included in "
+"the <classname>debian-installer</classname> package. Both files are also "
+"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 ""
+
+#. Tag: para
+#: preseed.xml:869
#, no-c-format
msgid ""
"The identification of disks is dependent on the order in which their drivers "
@@ -1774,21 +1803,101 @@ msgstr ""
"есть несколько дисков, проверьте, что выбирается правильный диск перед тем "
"как использовать автоматическую установку."
+#. Tag: title
+#: preseed.xml:878
+#, fuzzy, no-c-format
+#| msgid "Partitioning"
+msgid "Partitioning example"
+msgstr "Разметка дисков"
+
#. Tag: screen
-#: preseed.xml:860
-#, no-c-format
+#: preseed.xml:880
+#, 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 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"
"#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"
@@ -1807,8 +1916,6 @@ msgid ""
"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"
@@ -1834,6 +1941,12 @@ msgid ""
"# 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"
@@ -1904,13 +2017,13 @@ msgstr ""
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:865
+#: preseed.xml:884
#, no-c-format
msgid "Partitioning using RAID"
msgstr "Разметка с использованием RAID"
#. Tag: para
-#: preseed.xml:866
+#: preseed.xml:885
#, no-c-format
msgid ""
"You can also use preseeding to set up partitions on software RAID arrays. "
@@ -1926,7 +2039,7 @@ msgstr ""
"см. <xref linkend=\"preseed-bootloader\"/>."
#. Tag: para
-#: preseed.xml:876
+#: preseed.xml:895
#, no-c-format
msgid ""
"This type of automated partitioning is easy to get wrong. It is also "
@@ -1942,11 +2055,58 @@ msgstr ""
"<filename>/var/log/syslog</filename>."
#. Tag: screen
-#: preseed.xml:886
-#, no-c-format
+#: preseed.xml:905
+#, 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/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 ""
-"# 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"
@@ -1968,13 +2128,13 @@ msgid ""
"\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;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"
@@ -1986,6 +2146,10 @@ msgid ""
"# /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"
@@ -2040,13 +2204,13 @@ msgstr ""
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:891
+#: preseed.xml:910
#, no-c-format
msgid "Controlling how partitions are mounted"
msgstr "Управление монтированием разделов"
#. Tag: para
-#: preseed.xml:892
+#: preseed.xml:911
#, no-c-format
msgid ""
"Normally, filesystems are mounted using a universally unique identifier "
@@ -2066,7 +2230,7 @@ msgstr ""
"на основе UUID."
#. Tag: para
-#: preseed.xml:901
+#: preseed.xml:920
#, no-c-format
msgid ""
"Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2077,7 +2241,7 @@ msgstr ""
"ы."
#. Tag: para
-#: preseed.xml:908
+#: preseed.xml:927
#, no-c-format
msgid ""
"Traditional device names may change based on the order in which the kernel "
@@ -2093,7 +2257,7 @@ msgstr ""
"ваша система начинает работать непредсказуемым образом."
#. Tag: screen
-#: preseed.xml:918
+#: preseed.xml:937
#, no-c-format
msgid ""
"# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2110,13 +2274,13 @@ msgstr ""
"#d-i partman/mount_style select uuid"
#. Tag: title
-#: preseed.xml:923
+#: preseed.xml:943
#, no-c-format
msgid "Base system installation"
msgstr "Установка базовой системы"
#. Tag: para
-#: preseed.xml:924
+#: preseed.xml:944
#, no-c-format
msgid ""
"There is actually not very much that can be preseeded for this stage of the "
@@ -2127,7 +2291,7 @@ msgstr ""
"основном они касаются установки ядра."
#. Tag: screen
-#: preseed.xml:931
+#: preseed.xml:951
#, no-c-format
msgid ""
"# Configure APT to not install recommended packages by default. Use of this\n"
@@ -2159,13 +2323,13 @@ msgstr ""
"#d-i base-installer/kernel/image string linux-image-2.6-486"
#. Tag: title
-#: preseed.xml:936
+#: preseed.xml:956
#, no-c-format
msgid "Account setup"
msgstr "Настройка учётной записи"
#. Tag: para
-#: preseed.xml:937
+#: preseed.xml:957
#, no-c-format
msgid ""
"The password for the root account and name and password for a first regular "
@@ -2177,7 +2341,7 @@ msgstr ""
"виде или в виде <emphasis>хешей</emphasis> MD5."
#. Tag: para
-#: preseed.xml:944
+#: preseed.xml:964
#, no-c-format
msgid ""
"Be aware that preseeding passwords is not completely secure as everyone with "
@@ -2193,7 +2357,7 @@ msgstr ""
"пароль прямым перебором."
#. Tag: screen
-#: preseed.xml:954
+#: preseed.xml:974
#, no-c-format
msgid ""
"# Skip creation of a root account (normal user account will be able to\n"
@@ -2252,7 +2416,7 @@ msgstr ""
"#d-i passwd/user-default-groups string audio cdrom video"
#. Tag: para
-#: preseed.xml:956
+#: preseed.xml:976
#, no-c-format
msgid ""
"The <classname>passwd/root-password-crypted</classname> and "
@@ -2273,26 +2437,26 @@ msgstr ""
"<command>sudo</command>)."
#. Tag: para
-#: preseed.xml:966
+#: preseed.xml:986
#, no-c-format
msgid ""
"The following command can be used to generate an MD5 hash for a password:"
msgstr "С помощью следующей команды можно сгенерировать MD5 хеш для пароля:"
#. Tag: screen
-#: preseed.xml:970
+#: preseed.xml:990
#, no-c-format
msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
#. Tag: title
-#: preseed.xml:976
+#: preseed.xml:996
#, no-c-format
msgid "Apt setup"
msgstr "Настройка Apt"
#. Tag: para
-#: preseed.xml:977
+#: preseed.xml:997
#, no-c-format
msgid ""
"Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2306,7 +2470,7 @@ msgstr ""
"добавить другие (локальные) репозитории."
#. Tag: screen
-#: preseed.xml:985
+#: preseed.xml:1005
#, no-c-format
msgid ""
"# You can choose to install non-free and contrib software.\n"
@@ -2366,13 +2530,13 @@ msgstr ""
"#d-i debian-installer/allow_unauthenticated boolean true"
#. Tag: title
-#: preseed.xml:990
+#: preseed.xml:1010
#, no-c-format
msgid "Package selection"
msgstr "Выбор пакетов"
#. Tag: para
-#: preseed.xml:991
+#: preseed.xml:1011
#, no-c-format
msgid ""
"You can choose to install any combination of tasks that are available. "
@@ -2382,73 +2546,73 @@ msgstr ""
"Доступные задачи:"
#. Tag: userinput
-#: preseed.xml:1000
+#: preseed.xml:1020
#, no-c-format
msgid "standard"
msgstr "standard (стандартная система)"
#. Tag: userinput
-#: preseed.xml:1003
+#: preseed.xml:1023
#, no-c-format
msgid "desktop"
msgstr "desktop (рабочий стол)"
#. Tag: userinput
-#: preseed.xml:1006
+#: preseed.xml:1026
#, no-c-format
msgid "gnome-desktop"
msgstr "gnome-desktop (рабочий стол gnome)"
#. Tag: userinput
-#: preseed.xml:1009
+#: preseed.xml:1029
#, no-c-format
msgid "kde-desktop"
msgstr "kde-desktop (рабочий стол kde)"
#. Tag: userinput
-#: preseed.xml:1012
+#: preseed.xml:1032
#, no-c-format
msgid "web-server"
msgstr "web-server (веб сервер)"
#. Tag: userinput
-#: preseed.xml:1015
+#: preseed.xml:1035
#, no-c-format
msgid "print-server"
msgstr "print-server (сервер печати)"
#. Tag: userinput
-#: preseed.xml:1018
+#: preseed.xml:1038
#, no-c-format
msgid "dns-server"
msgstr "dns-server (DNS-сервер)"
#. Tag: userinput
-#: preseed.xml:1021
+#: preseed.xml:1041
#, no-c-format
msgid "file-server"
msgstr "file-server (файловый сервер)"
#. Tag: userinput
-#: preseed.xml:1024
+#: preseed.xml:1044
#, no-c-format
msgid "mail-server"
msgstr "mail-server (почтовый сервер)"
#. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1047
#, no-c-format
msgid "sql-database"
msgstr "sql-database (база данных SQL)"
#. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1050
#, no-c-format
msgid "laptop"
msgstr "laptop (для ноутбука)"
#. Tag: para
-#: preseed.xml:1034
+#: preseed.xml:1054
#, no-c-format
msgid ""
"You can also choose to install no tasks, and force the installation of a set "
@@ -2460,7 +2624,7 @@ msgstr ""
"<userinput>standard</userinput>."
#. Tag: para
-#: preseed.xml:1040
+#: preseed.xml:1060
#, no-c-format
msgid ""
"If you want to install some individual packages in addition to packages "
@@ -2476,7 +2640,7 @@ msgstr ""
"указать в командной строке ядра."
#. Tag: screen
-#: preseed.xml:1050
+#: preseed.xml:1070
#, fuzzy, no-c-format
#| msgid ""
#| "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2540,13 +2704,13 @@ msgstr ""
"#popularity-contest popularity-contest/participate boolean false"
#. Tag: title
-#: preseed.xml:1055
+#: preseed.xml:1075
#, no-c-format
msgid "Boot loader installation"
msgstr "Установка загрузчика"
#. Tag: screen
-#: preseed.xml:1057
+#: preseed.xml:1077
#, no-c-format
msgid ""
"# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -2623,7 +2787,7 @@ msgstr ""
"#d-i debian-installer/add-kernel-opts string nousb"
#. Tag: para
-#: preseed.xml:1059
+#: preseed.xml:1079
#, no-c-format
msgid ""
"An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2635,13 +2799,13 @@ msgstr ""
"linkend=\"preseed-account\"/>."
#. Tag: title
-#: preseed.xml:1069
+#: preseed.xml:1089
#, no-c-format
msgid "Finishing up the installation"
msgstr "Завершение установки"
#. Tag: screen
-#: preseed.xml:1071
+#: preseed.xml:1091
#, no-c-format
msgid ""
"# During installations from serial console, the regular virtual consoles\n"
@@ -2681,13 +2845,13 @@ msgstr ""
"#d-i debian-installer/exit/poweroff boolean true"
#. Tag: title
-#: preseed.xml:1076
+#: preseed.xml:1096
#, no-c-format
msgid "Preseeding other packages"
msgstr "Автоматизация других пакетов"
#. Tag: screen
-#: preseed.xml:1078
+#: preseed.xml:1098
#, no-c-format
msgid ""
"# Depending on what software you choose to install, or if things go wrong\n"
@@ -2710,19 +2874,19 @@ msgstr ""
"# debconf-get-selections >> файл"
#. Tag: title
-#: preseed.xml:1085
+#: preseed.xml:1105
#, no-c-format
msgid "Advanced options"
msgstr "Дополнительные параметры"
#. Tag: title
-#: preseed.xml:1088
+#: preseed.xml:1108
#, no-c-format
msgid "Running custom commands during the installation"
msgstr "Запуск пользовательских команд во время установки"
#. Tag: para
-#: preseed.xml:1089
+#: preseed.xml:1109
#, no-c-format
msgid ""
"A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2733,7 +2897,7 @@ msgstr ""
"моменты установки."
#. Tag: screen
-#: preseed.xml:1097
+#: preseed.xml:1117
#, no-c-format
msgid ""
"# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2783,14 +2947,14 @@ msgstr ""
"#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
#. Tag: title
-#: preseed.xml:1102
+#: preseed.xml:1122
#, no-c-format
msgid "Using preseeding to change default values"
msgstr ""
"Использование автоматической установки для изменения значений по умолчанию"
#. Tag: para
-#: preseed.xml:1103
+#: preseed.xml:1123
#, no-c-format
msgid ""
"It is possible to use preseeding to change the default answer for a "
@@ -2816,7 +2980,7 @@ msgstr ""
"помочь при отладке или тестировании вашего файла ответов."
#. Tag: para
-#: preseed.xml:1117
+#: preseed.xml:1137
#, no-c-format
msgid ""
"Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2830,7 +2994,7 @@ msgstr ""
"этого пакета. См. сноску к <xref linkend=\"preseed-bootparms\"/>."
#. Tag: para
-#: preseed.xml:1124
+#: preseed.xml:1144
#, no-c-format
msgid ""
"If you are preseeding using boot parameters, you can make the installer ask "
@@ -2854,13 +3018,13 @@ msgstr ""
"<quote>внутренние</quote> параметры."
#. Tag: title
-#: preseed.xml:1138
+#: preseed.xml:1158
#, no-c-format
msgid "Chainloading preconfiguration files"
msgstr "Последовательная загрузка нескольких файлов ответов"
#. Tag: para
-#: preseed.xml:1139
+#: preseed.xml:1159
#, no-c-format
msgid ""
"It is possible to include other preconfiguration files from a "
@@ -2876,7 +3040,7 @@ msgstr ""
"конфигураций в другие файлы."
#. Tag: screen
-#: preseed.xml:1149
+#: preseed.xml:1169
#, no-c-format
msgid ""
"# More than one file can be listed, separated by spaces; all will be\n"
@@ -2929,7 +3093,7 @@ msgstr ""
"#d-i preseed/run string foo.sh"
#. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1171
#, no-c-format
msgid ""
"It is also possible to chainload from the initrd or file preseeding phase, "
diff --git a/po/sv/preseed.po b/po/sv/preseed.po
index 297e5cc63..93c7e2bc1 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-01-18 00:44+0000\n"
+"POT-Creation-Date: 2010-02-08 01:11+0000\n"
"PO-Revision-Date: 2009-11-25 17:50+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -1766,14 +1766,21 @@ msgstr "Partitionering"
#. 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."
+#, fuzzy, 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 ""
"Använda förinställning för att partitionera hårddisken är till stor del "
"begränsat till vad som stöds av <classname>partman-auto</classname>. Du kan "
@@ -1784,7 +1791,29 @@ msgstr ""
"partitionera flera diskar med förinställning."
#. Tag: para
-#: preseed.xml:852
+#: preseed.xml:849
+#, no-c-format
+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 ""
+
+#. Tag: para
+#: preseed.xml:855
+#, no-c-format
+msgid ""
+"The examples below only provide basic information on the use of recipes. For "
+"detailed information see the files <filename>partman-auto-recipe.txt</"
+"filename> and <filename>partman-auto-raid-recipe.txt</filename> included in "
+"the <classname>debian-installer</classname> package. Both files are also "
+"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 ""
+
+#. Tag: para
+#: preseed.xml:869
#, no-c-format
msgid ""
"The identification of disks is dependent on the order in which their drivers "
@@ -1795,21 +1824,101 @@ msgstr ""
"läses in i. Om det finns flera diskar i systemet, bör du vara mycket säker "
"på att den rätta disken kommer att väljas före förinställningen används."
+#. Tag: title
+#: preseed.xml:878
+#, fuzzy, no-c-format
+#| msgid "Partitioning"
+msgid "Partitioning example"
+msgstr "Partitionering"
+
#. Tag: screen
-#: preseed.xml:860
-#, no-c-format
+#: preseed.xml:880
+#, 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 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"
"#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"
@@ -1828,8 +1937,6 @@ msgid ""
"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"
@@ -1855,6 +1962,12 @@ msgid ""
"# 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"
@@ -1927,13 +2040,13 @@ msgstr ""
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:865
+#: preseed.xml:884
#, no-c-format
msgid "Partitioning using RAID"
msgstr "Partitionering med RAID"
#. Tag: para
-#: preseed.xml:866
+#: preseed.xml:885
#, no-c-format
msgid ""
"You can also use preseeding to set up partitions on software RAID arrays. "
@@ -1949,7 +2062,7 @@ msgstr ""
"<xref linkend=\"preseed-bootloader\"/>."
#. Tag: para
-#: preseed.xml:876
+#: preseed.xml:895
#, no-c-format
msgid ""
"This type of automated partitioning is easy to get wrong. It is also "
@@ -1965,11 +2078,58 @@ msgstr ""
"var/log/syslog</filename> om du springer på problem."
#. Tag: screen
-#: preseed.xml:886
-#, no-c-format
+#: preseed.xml:905
+#, 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/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 ""
-"# 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"
@@ -1991,13 +2151,13 @@ msgid ""
"\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;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"
@@ -2009,6 +2169,10 @@ msgid ""
"# /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"
@@ -2063,13 +2227,13 @@ msgstr ""
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:891
+#: preseed.xml:910
#, no-c-format
msgid "Controlling how partitions are mounted"
msgstr "Kontrollera hur partitioner monteras"
#. Tag: para
-#: preseed.xml:892
+#: preseed.xml:911
#, no-c-format
msgid ""
"Normally, filesystems are mounted using a universally unique identifier "
@@ -2089,7 +2253,7 @@ msgstr ""
"istället."
#. Tag: para
-#: preseed.xml:901
+#: preseed.xml:920
#, no-c-format
msgid ""
"Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2099,7 +2263,7 @@ msgstr ""
"att använda deras traditionella namn istället för UUID."
#. Tag: para
-#: preseed.xml:908
+#: preseed.xml:927
#, no-c-format
msgid ""
"Traditional device names may change based on the order in which the kernel "
@@ -2115,7 +2279,7 @@ msgstr ""
"slumpmässigt."
#. Tag: screen
-#: preseed.xml:918
+#: preseed.xml:937
#, no-c-format
msgid ""
"# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2133,13 +2297,13 @@ msgstr ""
"#d-i partman/mount_style select uuid"
#. Tag: title
-#: preseed.xml:923
+#: preseed.xml:943
#, no-c-format
msgid "Base system installation"
msgstr "Installation av grundsystem"
#. Tag: para
-#: preseed.xml:924
+#: preseed.xml:944
#, no-c-format
msgid ""
"There is actually not very much that can be preseeded for this stage of the "
@@ -2151,7 +2315,7 @@ msgstr ""
"installationen av kärnan."
#. Tag: screen
-#: preseed.xml:931
+#: preseed.xml:951
#, no-c-format
msgid ""
"# Configure APT to not install recommended packages by default. Use of this\n"
@@ -2185,13 +2349,13 @@ msgstr ""
"#d-i base-installer/kernel/image string linux-image-2.6-486"
#. Tag: title
-#: preseed.xml:936
+#: preseed.xml:956
#, no-c-format
msgid "Account setup"
msgstr "Kontoinställning"
#. Tag: para
-#: preseed.xml:937
+#: preseed.xml:957
#, no-c-format
msgid ""
"The password for the root account and name and password for a first regular "
@@ -2203,7 +2367,7 @@ msgstr ""
"klartextvärden eller <emphasis>MD5-hashar</emphasis>."
#. Tag: para
-#: preseed.xml:944
+#: preseed.xml:964
#, no-c-format
msgid ""
"Be aware that preseeding passwords is not completely secure as everyone with "
@@ -2219,7 +2383,7 @@ msgstr ""
"kan utsättas för en \"brute force\"-attack."
#. Tag: screen
-#: preseed.xml:954
+#: preseed.xml:974
#, no-c-format
msgid ""
"# Skip creation of a root account (normal user account will be able to\n"
@@ -2277,7 +2441,7 @@ msgstr ""
"#d-i passwd/user-default-groups string audio cdrom video"
#. Tag: para
-#: preseed.xml:956
+#: preseed.xml:976
#, no-c-format
msgid ""
"The <classname>passwd/root-password-crypted</classname> and "
@@ -2298,7 +2462,7 @@ msgstr ""
"command>)."
#. Tag: para
-#: preseed.xml:966
+#: preseed.xml:986
#, no-c-format
msgid ""
"The following command can be used to generate an MD5 hash for a password:"
@@ -2306,19 +2470,19 @@ msgstr ""
"Följande kommando kan användas för att generera en MD5-hash för ett lösenord:"
#. Tag: screen
-#: preseed.xml:970
+#: preseed.xml:990
#, no-c-format
msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
#. Tag: title
-#: preseed.xml:976
+#: preseed.xml:996
#, no-c-format
msgid "Apt setup"
msgstr "Apt-inställning"
#. Tag: para
-#: preseed.xml:977
+#: preseed.xml:997
#, no-c-format
msgid ""
"Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2332,7 +2496,7 @@ msgstr ""
"kan valfritt lägga till andra (lokala) förråd."
#. Tag: screen
-#: preseed.xml:985
+#: preseed.xml:1005
#, no-c-format
msgid ""
"# You can choose to install non-free and contrib software.\n"
@@ -2393,13 +2557,13 @@ msgstr ""
"#d-i debian-installer/allow_unauthenticated boolean true"
#. Tag: title
-#: preseed.xml:990
+#: preseed.xml:1010
#, no-c-format
msgid "Package selection"
msgstr "Paketval"
#. Tag: para
-#: preseed.xml:991
+#: preseed.xml:1011
#, no-c-format
msgid ""
"You can choose to install any combination of tasks that are available. "
@@ -2409,73 +2573,73 @@ msgstr ""
"tillgängliga. Tillgängliga funktioner just nu inkluderar:"
#. Tag: userinput
-#: preseed.xml:1000
+#: preseed.xml:1020
#, no-c-format
msgid "standard"
msgstr "standard"
#. Tag: userinput
-#: preseed.xml:1003
+#: preseed.xml:1023
#, no-c-format
msgid "desktop"
msgstr "desktop"
#. Tag: userinput
-#: preseed.xml:1006
+#: preseed.xml:1026
#, no-c-format
msgid "gnome-desktop"
msgstr "gnome-desktop"
#. Tag: userinput
-#: preseed.xml:1009
+#: preseed.xml:1029
#, no-c-format
msgid "kde-desktop"
msgstr "kde-desktop"
#. Tag: userinput
-#: preseed.xml:1012
+#: preseed.xml:1032
#, no-c-format
msgid "web-server"
msgstr "web-server"
#. Tag: userinput
-#: preseed.xml:1015
+#: preseed.xml:1035
#, no-c-format
msgid "print-server"
msgstr "print-server"
#. Tag: userinput
-#: preseed.xml:1018
+#: preseed.xml:1038
#, no-c-format
msgid "dns-server"
msgstr "dns-server"
#. Tag: userinput
-#: preseed.xml:1021
+#: preseed.xml:1041
#, no-c-format
msgid "file-server"
msgstr "file-server"
#. Tag: userinput
-#: preseed.xml:1024
+#: preseed.xml:1044
#, no-c-format
msgid "mail-server"
msgstr "mail-server"
#. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1047
#, no-c-format
msgid "sql-database"
msgstr "sql-database"
#. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1050
#, no-c-format
msgid "laptop"
msgstr "laptop"
#. Tag: para
-#: preseed.xml:1034
+#: preseed.xml:1054
#, no-c-format
msgid ""
"You can also choose to install no tasks, and force the installation of a set "
@@ -2487,7 +2651,7 @@ msgstr ""
"alltid att inkludera funktionen <userinput>standard</userinput>."
#. Tag: para
-#: preseed.xml:1040
+#: preseed.xml:1060
#, no-c-format
msgid ""
"If you want to install some individual packages in addition to packages "
@@ -2503,7 +2667,7 @@ msgstr ""
"kan användas på kommandoraden för kärnan."
#. Tag: screen
-#: preseed.xml:1050
+#: preseed.xml:1070
#, fuzzy, no-c-format
#| msgid ""
#| "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2571,13 +2735,13 @@ msgstr ""
"#popularity-contest popularity-contest/participate boolean false"
#. Tag: title
-#: preseed.xml:1055
+#: preseed.xml:1075
#, no-c-format
msgid "Boot loader installation"
msgstr "Installation av starthanteraren"
#. Tag: screen
-#: preseed.xml:1057
+#: preseed.xml:1077
#, no-c-format
msgid ""
"# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -2660,7 +2824,7 @@ msgstr ""
"#d-i debian-installer/add-kernel-opts string nousb"
#. Tag: para
-#: preseed.xml:1059
+#: preseed.xml:1079
#, no-c-format
msgid ""
"An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2672,13 +2836,13 @@ msgstr ""
"exemplet i <xref linkend=\"preseed-account\"/>."
#. Tag: title
-#: preseed.xml:1069
+#: preseed.xml:1089
#, no-c-format
msgid "Finishing up the installation"
msgstr "Färdigställande av installationen"
#. Tag: screen
-#: preseed.xml:1071
+#: preseed.xml:1091
#, no-c-format
msgid ""
"# During installations from serial console, the regular virtual consoles\n"
@@ -2721,13 +2885,13 @@ msgstr ""
"#d-i debian-installer/exit/poweroff boolean true"
#. Tag: title
-#: preseed.xml:1076
+#: preseed.xml:1096
#, no-c-format
msgid "Preseeding other packages"
msgstr "Förinställning av andra paket"
#. Tag: screen
-#: preseed.xml:1078
+#: preseed.xml:1098
#, no-c-format
msgid ""
"# Depending on what software you choose to install, or if things go wrong\n"
@@ -2749,19 +2913,19 @@ msgstr ""
"# debconf-get-selections >> fil"
#. Tag: title
-#: preseed.xml:1085
+#: preseed.xml:1105
#, no-c-format
msgid "Advanced options"
msgstr "Avancerade inställningar"
#. Tag: title
-#: preseed.xml:1088
+#: preseed.xml:1108
#, no-c-format
msgid "Running custom commands during the installation"
msgstr "Kör anpassade kommandon under installationen"
#. Tag: para
-#: preseed.xml:1089
+#: preseed.xml:1109
#, no-c-format
msgid ""
"A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2772,7 +2936,7 @@ msgstr ""
"vid vissa punkter i installationen."
#. Tag: screen
-#: preseed.xml:1097
+#: preseed.xml:1117
#, no-c-format
msgid ""
"# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2828,13 +2992,13 @@ msgstr ""
"#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
#. Tag: title
-#: preseed.xml:1102
+#: preseed.xml:1122
#, no-c-format
msgid "Using preseeding to change default values"
msgstr "Användning av förinställningar för att ändra på standardvärden"
#. Tag: para
-#: preseed.xml:1103
+#: preseed.xml:1123
#, no-c-format
msgid ""
"It is possible to use preseeding to change the default answer for a "
@@ -2860,7 +3024,7 @@ msgstr ""
"användbart för testning eller felsökning av din förkonfigurationsfil."
#. Tag: para
-#: preseed.xml:1117
+#: preseed.xml:1137
#, no-c-format
msgid ""
"Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2874,7 +3038,7 @@ msgstr ""
"paketet. Se sidfoten på <xref linkend=\"preseed-bootparms\"/>."
#. Tag: para
-#: preseed.xml:1124
+#: preseed.xml:1144
#, no-c-format
msgid ""
"If you are preseeding using boot parameters, you can make the installer ask "
@@ -2897,13 +3061,13 @@ msgstr ""
"under en installation och inte för <quote>interna</quote> parametrar."
#. Tag: title
-#: preseed.xml:1138
+#: preseed.xml:1158
#, no-c-format
msgid "Chainloading preconfiguration files"
msgstr "Kedjeinläsning av förkonfigurationsfiler"
#. Tag: para
-#: preseed.xml:1139
+#: preseed.xml:1159
#, no-c-format
msgid ""
"It is possible to include other preconfiguration files from a "
@@ -2920,7 +3084,7 @@ msgstr ""
"andra filer."
#. Tag: screen
-#: preseed.xml:1149
+#: preseed.xml:1169
#, no-c-format
msgid ""
"# More than one file can be listed, separated by spaces; all will be\n"
@@ -2973,7 +3137,7 @@ msgstr ""
"#d-i preseed/run string foo.sh"
#. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1171
#, no-c-format
msgid ""
"It is also possible to chainload from the initrd or file preseeding phase, "
diff --git a/po/vi/preseed.po b/po/vi/preseed.po
index a8e783500..9e5b67107 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-01-18 00:44+0000\n"
+"POT-Creation-Date: 2010-02-08 01:11+0000\n"
"PO-Revision-Date: 2009-02-12 19:17+1030\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -1793,14 +1793,21 @@ msgstr "Phân vùng"
#. 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."
+#, fuzzy, 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 ""
"Khả năng dùng tiến trình chèn sẵn để phân vùng đĩa cứng rất bị hạn chế thành "
"khả năng được hỗ trợ bởi <classname>partman-auto</classname>. Bạn có thể "
@@ -1810,7 +1817,29 @@ msgstr ""
"hình sẵn. HIện thời không thể phân vùng nhiều đĩa bằng chèn sẵn."
#. Tag: para
-#: preseed.xml:852
+#: preseed.xml:849
+#, no-c-format
+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 ""
+
+#. Tag: para
+#: preseed.xml:855
+#, no-c-format
+msgid ""
+"The examples below only provide basic information on the use of recipes. For "
+"detailed information see the files <filename>partman-auto-recipe.txt</"
+"filename> and <filename>partman-auto-raid-recipe.txt</filename> included in "
+"the <classname>debian-installer</classname> package. Both files are also "
+"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 ""
+
+#. Tag: para
+#: preseed.xml:869
#, no-c-format
msgid ""
"The identification of disks is dependent on the order in which their drivers "
@@ -1821,8 +1850,15 @@ msgstr ""
"nhiều đĩa trong hệ thống, hãy chắc là đĩa đúng sẽ được chọn, trước khi dùng "
"khả năng chèn sẵn."
+#. Tag: title
+#: preseed.xml:878
+#, fuzzy, no-c-format
+#| msgid "Partitioning"
+msgid "Partitioning example"
+msgstr "Phân vùng"
+
#. Tag: screen
-#: preseed.xml:860
+#: preseed.xml:880
#, fuzzy, no-c-format
#| msgid ""
#| "# If the system has free space you can choose to only partition that "
@@ -1895,13 +1931,19 @@ msgid ""
"# 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"
@@ -1920,8 +1962,6 @@ msgid ""
"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"
@@ -1947,6 +1987,12 @@ msgid ""
"# 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"
@@ -2020,13 +2066,13 @@ msgstr ""
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:865
+#: preseed.xml:884
#, no-c-format
msgid "Partitioning using RAID"
msgstr "Phân vùng bằng RAID"
#. Tag: para
-#: preseed.xml:866
+#: preseed.xml:885
#, no-c-format
msgid ""
"You can also use preseeding to set up partitions on software RAID arrays. "
@@ -2042,7 +2088,7 @@ msgstr ""
"xem <xref linkend=\"preseed-bootloader\"/>."
#. Tag: para
-#: preseed.xml:876
+#: preseed.xml:895
#, no-c-format
msgid ""
"This type of automated partitioning is easy to get wrong. It is also "
@@ -2057,7 +2103,7 @@ msgstr ""
"chịu. Xem <filename>/var/log/syslog</filename> nếu bạn gặp vấn đề."
#. Tag: screen
-#: preseed.xml:886
+#: preseed.xml:905
#, fuzzy, no-c-format
#| msgid ""
#| "# NOTE: this option is of beta release quality and should be used "
@@ -2110,8 +2156,6 @@ msgstr ""
#| "d-i partman/choose_partition select finish\n"
#| "d-i partman/confirm boolean true"
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"
@@ -2133,13 +2177,13 @@ msgid ""
"\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;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"
@@ -2151,6 +2195,10 @@ msgid ""
"# /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"
@@ -2207,13 +2255,13 @@ msgstr ""
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:891
+#: preseed.xml:910
#, no-c-format
msgid "Controlling how partitions are mounted"
msgstr ""
#. Tag: para
-#: preseed.xml:892
+#: preseed.xml:911
#, no-c-format
msgid ""
"Normally, filesystems are mounted using a universally unique identifier "
@@ -2225,7 +2273,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: preseed.xml:901
+#: preseed.xml:920
#, no-c-format
msgid ""
"Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2233,7 +2281,7 @@ msgid ""
msgstr ""
#. Tag: para
-#: preseed.xml:908
+#: preseed.xml:927
#, no-c-format
msgid ""
"Traditional device names may change based on the order in which the kernel "
@@ -2244,7 +2292,7 @@ msgid ""
msgstr ""
#. Tag: screen
-#: preseed.xml:918
+#: preseed.xml:937
#, no-c-format
msgid ""
"# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2256,13 +2304,13 @@ msgid ""
msgstr ""
#. Tag: title
-#: preseed.xml:923
+#: preseed.xml:943
#, no-c-format
msgid "Base system installation"
msgstr "Cài đặt hệ thống cơ bản"
#. Tag: para
-#: preseed.xml:924
+#: preseed.xml:944
#, no-c-format
msgid ""
"There is actually not very much that can be preseeded for this stage of the "
@@ -2273,7 +2321,7 @@ msgstr ""
"cách cài đặt hạt nhân."
#. Tag: screen
-#: preseed.xml:931
+#: preseed.xml:951
#, fuzzy, no-c-format
#| msgid ""
#| "# Select the initramfs generator used to generate the initrd for 2.6 "
@@ -2307,13 +2355,13 @@ msgstr ""
"#d-i base-installer/kernel/image string linux-image-2.6-486"
#. Tag: title
-#: preseed.xml:936
+#: preseed.xml:956
#, no-c-format
msgid "Account setup"
msgstr "Thiết lập tài khoản"
#. Tag: para
-#: preseed.xml:937
+#: preseed.xml:957
#, no-c-format
msgid ""
"The password for the root account and name and password for a first regular "
@@ -2325,7 +2373,7 @@ msgstr ""
"dùng giá trị nhập thô (không mật mã) hay <emphasis>băm</emphasis> kiểu MD5."
#. Tag: para
-#: preseed.xml:944
+#: preseed.xml:964
#, no-c-format
msgid ""
"Be aware that preseeding passwords is not completely secure as everyone with "
@@ -2341,7 +2389,7 @@ msgstr ""
"truy cập băm MD5 cho phép người khác tấn công bằng sức mạnh vũ phu."
#. Tag: screen
-#: preseed.xml:954
+#: preseed.xml:974
#, no-c-format
msgid ""
"# Skip creation of a root account (normal user account will be able to\n"
@@ -2399,7 +2447,7 @@ msgstr ""
"#d-i passwd/user-default-groups string audio cdrom video"
#. Tag: para
-#: preseed.xml:956
+#: preseed.xml:976
#, no-c-format
msgid ""
"The <classname>passwd/root-password-crypted</classname> and "
@@ -2419,7 +2467,7 @@ msgstr ""
"<command>sudo</command>)."
#. Tag: para
-#: preseed.xml:966
+#: preseed.xml:986
#, no-c-format
msgid ""
"The following command can be used to generate an MD5 hash for a password:"
@@ -2428,19 +2476,19 @@ msgstr ""
# Literal: don't translate / Nghĩa chữ: đừng dịch
#. Tag: screen
-#: preseed.xml:970
+#: preseed.xml:990
#, no-c-format
msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
#. Tag: title
-#: preseed.xml:976
+#: preseed.xml:996
#, no-c-format
msgid "Apt setup"
msgstr "Thiết lập apt"
#. Tag: para
-#: preseed.xml:977
+#: preseed.xml:997
#, no-c-format
msgid ""
"Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2454,7 +2502,7 @@ msgstr ""
"năng thêm kho phần mềm (cục bộ) khác."
#. Tag: screen
-#: preseed.xml:985
+#: preseed.xml:1005
#, no-c-format
msgid ""
"# You can choose to install non-free and contrib software.\n"
@@ -2515,13 +2563,13 @@ msgstr ""
"#d-i debian-installer/allow_unauthenticated boolean true"
#. Tag: title
-#: preseed.xml:990
+#: preseed.xml:1010
#, no-c-format
msgid "Package selection"
msgstr "Chọn gói phần mềm"
#. Tag: para
-#: preseed.xml:991
+#: preseed.xml:1011
#, no-c-format
msgid ""
"You can choose to install any combination of tasks that are available. "
@@ -2531,73 +2579,73 @@ msgstr ""
"lúc viết câu này, các công việc sẵn sàng gồm:"
#. Tag: userinput
-#: preseed.xml:1000
+#: preseed.xml:1020
#, no-c-format
msgid "standard"
msgstr "chuẩn"
#. Tag: userinput
-#: preseed.xml:1003
+#: preseed.xml:1023
#, no-c-format
msgid "desktop"
msgstr "môi trường làm việc"
#. Tag: userinput
-#: preseed.xml:1006
+#: preseed.xml:1026
#, no-c-format
msgid "gnome-desktop"
msgstr "môi trường làm việc Gnome"
#. Tag: userinput
-#: preseed.xml:1009
+#: preseed.xml:1029
#, no-c-format
msgid "kde-desktop"
msgstr "môi trường làm việc KDE"
#. Tag: userinput
-#: preseed.xml:1012
+#: preseed.xml:1032
#, no-c-format
msgid "web-server"
msgstr "trình phục vụ Mạng"
#. Tag: userinput
-#: preseed.xml:1015
+#: preseed.xml:1035
#, no-c-format
msgid "print-server"
msgstr "trình phục vụ in"
#. Tag: userinput
-#: preseed.xml:1018
+#: preseed.xml:1038
#, no-c-format
msgid "dns-server"
msgstr "trình phục vụ DNS"
#. Tag: userinput
-#: preseed.xml:1021
+#: preseed.xml:1041
#, no-c-format
msgid "file-server"
msgstr "trình phục vụ tập tin"
#. Tag: userinput
-#: preseed.xml:1024
+#: preseed.xml:1044
#, no-c-format
msgid "mail-server"
msgstr "trình phục vụ thư tín"
#. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1047
#, no-c-format
msgid "sql-database"
msgstr "cơ sở dữ liệu SQL"
#. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1050
#, no-c-format
msgid "laptop"
msgstr "máy tính xách tay"
#. Tag: para
-#: preseed.xml:1034
+#: preseed.xml:1054
#, no-c-format
msgid ""
"You can also choose to install no tasks, and force the installation of a set "
@@ -2609,7 +2657,7 @@ msgstr ""
"<userinput>chuẩn</userinput>."
#. Tag: para
-#: preseed.xml:1040
+#: preseed.xml:1060
#, no-c-format
msgid ""
"If you want to install some individual packages in addition to packages "
@@ -2624,7 +2672,7 @@ msgstr ""
"giới bằng hoặc dấu phẩy hoặc dấu cách, cũng dễ dàng dùng trên dòng lệnh."
#. Tag: screen
-#: preseed.xml:1050
+#: preseed.xml:1070
#, fuzzy, no-c-format
#| msgid ""
#| "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2685,13 +2733,13 @@ msgstr ""
"#popularity-contest popularity-contest/participate boolean false"
#. Tag: title
-#: preseed.xml:1055
+#: preseed.xml:1075
#, no-c-format
msgid "Boot loader installation"
msgstr "Cài đặt bộ nạp khởi động"
#. Tag: screen
-#: preseed.xml:1057
+#: preseed.xml:1077
#, fuzzy, no-c-format
#| msgid ""
#| "# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -2796,7 +2844,7 @@ msgstr ""
"#d-i grub-installer/password-crypted password [mẫu_MD5]"
#. Tag: para
-#: preseed.xml:1059
+#: preseed.xml:1079
#, no-c-format
msgid ""
"An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2808,13 +2856,13 @@ msgstr ""
"<xref linkend=\"preseed-account\"/>."
#. Tag: title
-#: preseed.xml:1069
+#: preseed.xml:1089
#, no-c-format
msgid "Finishing up the installation"
msgstr "Làm xong tiến trình cài đặt"
#. Tag: screen
-#: preseed.xml:1071
+#: preseed.xml:1091
#, no-c-format
msgid ""
"# During installations from serial console, the regular virtual consoles\n"
@@ -2856,13 +2904,13 @@ msgstr ""
"#d-i debian-installer/exit/poweroff boolean true"
#. Tag: title
-#: preseed.xml:1076
+#: preseed.xml:1096
#, no-c-format
msgid "Preseeding other packages"
msgstr "Chèn trước gói khác"
#. Tag: screen
-#: preseed.xml:1078
+#: preseed.xml:1098
#, no-c-format
msgid ""
"# Depending on what software you choose to install, or if things go wrong\n"
@@ -2881,19 +2929,19 @@ msgstr ""
"# debconf-get-selections >> file"
#. Tag: title
-#: preseed.xml:1085
+#: preseed.xml:1105
#, no-c-format
msgid "Advanced options"
msgstr "Tùy chọn cấp cao"
#. Tag: title
-#: preseed.xml:1088
+#: preseed.xml:1108
#, no-c-format
msgid "Running custom commands during the installation"
msgstr "Chạy lệnh riêng trong khi cài đặt"
#. Tag: para
-#: preseed.xml:1089
+#: preseed.xml:1109
#, no-c-format
msgid ""
"A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2903,7 +2951,7 @@ msgstr ""
"chạy lệnh hay văn lệnh tại một số điểm thời riêng trong tiến trình cài đặt."
#. Tag: screen
-#: preseed.xml:1097
+#: preseed.xml:1117
#, fuzzy, no-c-format
#| msgid ""
#| "# d-i preseeding is inherently not secure. Nothing in the installer "
@@ -2990,13 +3038,13 @@ msgstr ""
"#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
#. Tag: title
-#: preseed.xml:1102
+#: preseed.xml:1122
#, no-c-format
msgid "Using preseeding to change default values"
msgstr "Dùng khả năng chèn sẵn để thay đổi giá trị mặc định"
#. Tag: para
-#: preseed.xml:1103
+#: preseed.xml:1123
#, no-c-format
msgid ""
"It is possible to use preseeding to change the default answer for a "
@@ -3022,7 +3070,7 @@ msgstr ""
"thử hay gỡ lỗi tập tin cấu hình sẵn."
#. Tag: para
-#: preseed.xml:1117
+#: preseed.xml:1137
#, no-c-format
msgid ""
"Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -3036,7 +3084,7 @@ msgstr ""
"<xref linkend=\"preseed-bootparms\"/>."
#. Tag: para
-#: preseed.xml:1124
+#: preseed.xml:1144
#, no-c-format
msgid ""
"If you are preseeding using boot parameters, you can make the installer ask "
@@ -3059,13 +3107,13 @@ msgstr ""
"đặt, không phải đối với tham số <quote>nội bộ</quote>."
#. Tag: title
-#: preseed.xml:1138
+#: preseed.xml:1158
#, no-c-format
msgid "Chainloading preconfiguration files"
msgstr "Tải dây chuyền tập tin định cấu hình sẵn"
#. Tag: para
-#: preseed.xml:1139
+#: preseed.xml:1159
#, no-c-format
msgid ""
"It is possible to include other preconfiguration files from a "
@@ -3081,7 +3129,7 @@ msgstr ""
"để thiết lập chi tiết hơn cho một số cấu hình riêng trong các tập tin khác."
#. Tag: screen
-#: preseed.xml:1149
+#: preseed.xml:1169
#, no-c-format
msgid ""
"# More than one file can be listed, separated by spaces; all will be\n"
@@ -3134,7 +3182,7 @@ msgstr ""
"#d-i preseed/run string foo.sh"
#. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1171
#, no-c-format
msgid ""
"It is also possible to chainload from the initrd or file preseeding phase, "
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 31b2d197b..4267741fa 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-01-18 00:44+0000\n"
+"POT-Creation-Date: 2010-02-08 01:11+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"
@@ -1598,14 +1598,21 @@ 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."
+#, fuzzy, 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> 提供的支持。您"
"可以选择使用磁盘上已有的空闲分区或者整个磁盘。磁盘的布局将取决于所使用的预定"
@@ -1613,7 +1620,29 @@ msgstr ""
"磁盘。"
#. Tag: para
-#: preseed.xml:852
+#: preseed.xml:849
+#, no-c-format
+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 ""
+
+#. Tag: para
+#: preseed.xml:855
+#, no-c-format
+msgid ""
+"The examples below only provide basic information on the use of recipes. For "
+"detailed information see the files <filename>partman-auto-recipe.txt</"
+"filename> and <filename>partman-auto-raid-recipe.txt</filename> included in "
+"the <classname>debian-installer</classname> package. Both files are also "
+"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 ""
+
+#. Tag: para
+#: preseed.xml:869
#, no-c-format
msgid ""
"The identification of disks is dependent on the order in which their drivers "
@@ -1623,21 +1652,101 @@ msgstr ""
"磁盘的标识基于对应驱动加载的次序。如果系统里面有多个磁盘,要确定预置使用了正"
"确的那一个。"
+#. Tag: title
+#: preseed.xml:878
+#, fuzzy, no-c-format
+#| msgid "Partitioning"
+msgid "Partitioning example"
+msgstr "分区"
+
#. Tag: screen
-#: preseed.xml:860
-#, no-c-format
+#: preseed.xml:880
+#, 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 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"
"#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"
@@ -1656,8 +1765,6 @@ msgid ""
"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"
@@ -1683,6 +1790,12 @@ msgid ""
"# 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"
@@ -1752,13 +1865,13 @@ msgstr ""
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:865
+#: preseed.xml:884
#, no-c-format
msgid "Partitioning using RAID"
msgstr "使用 RAID 分区"
#. Tag: para
-#: preseed.xml:866
+#: preseed.xml:885
#, no-c-format
msgid ""
"You can also use preseeding to set up partitions on software RAID arrays. "
@@ -1772,7 +1885,7 @@ msgstr ""
"阵列中的所有设备;参见 <xref linkend=\"preseed-bootloader\"/>。"
#. Tag: para
-#: preseed.xml:876
+#: preseed.xml:895
#, no-c-format
msgid ""
"This type of automated partitioning is easy to get wrong. It is also "
@@ -1786,11 +1899,58 @@ msgstr ""
"<filename>/var/log/syslog</filename>。"
#. Tag: screen
-#: preseed.xml:886
-#, no-c-format
+#: preseed.xml:905
+#, 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/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 ""
-"# 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"
@@ -1812,13 +1972,13 @@ msgid ""
"\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;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"
@@ -1830,6 +1990,10 @@ msgid ""
"# /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"
@@ -1884,13 +2048,13 @@ msgstr ""
"d-i partman/confirm boolean true"
#. Tag: title
-#: preseed.xml:891
+#: preseed.xml:910
#, no-c-format
msgid "Controlling how partitions are mounted"
msgstr "分区挂载控制"
#. Tag: para
-#: preseed.xml:892
+#: preseed.xml:911
#, no-c-format
msgid ""
"Normally, filesystems are mounted using a universally unique identifier "
@@ -1906,7 +2070,7 @@ msgstr ""
"系统仍然使用 UUID 方式挂载。"
#. Tag: para
-#: preseed.xml:901
+#: preseed.xml:920
#, no-c-format
msgid ""
"Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -1916,7 +2080,7 @@ msgstr ""
"挂载。"
#. Tag: para
-#: preseed.xml:908
+#: preseed.xml:927
#, no-c-format
msgid ""
"Traditional device names may change based on the order in which the kernel "
@@ -1930,7 +2094,7 @@ msgstr ""
"后会出现一些随机的情况。"
#. Tag: screen
-#: preseed.xml:918
+#: preseed.xml:937
#, no-c-format
msgid ""
"# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -1948,13 +2112,13 @@ msgstr ""
"#d-i partman/mount_style select uuid"
#. Tag: title
-#: preseed.xml:923
+#: preseed.xml:943
#, no-c-format
msgid "Base system installation"
msgstr "基本系统安装"
#. Tag: para
-#: preseed.xml:924
+#: preseed.xml:944
#, no-c-format
msgid ""
"There is actually not very much that can be preseeded for this stage of the "
@@ -1963,7 +2127,7 @@ msgid ""
msgstr "本阶段的安装并没有多少东西需要预置。仅有一个与内核安装相关的问题。"
#. Tag: screen
-#: preseed.xml:931
+#: preseed.xml:951
#, no-c-format
msgid ""
"# Configure APT to not install recommended packages by default. Use of this\n"
@@ -1995,13 +2159,13 @@ msgstr ""
"#d-i base-installer/kernel/image string linux-image-2.6-486"
#. Tag: title
-#: preseed.xml:936
+#: preseed.xml:956
#, no-c-format
msgid "Account setup"
msgstr "帐号设置"
#. Tag: para
-#: preseed.xml:937
+#: preseed.xml:957
#, no-c-format
msgid ""
"The password for the root account and name and password for a first regular "
@@ -2012,7 +2176,7 @@ msgstr ""
"或 MD5 <emphasis>哈希</emphasis> 值。"
#. Tag: para
-#: preseed.xml:944
+#: preseed.xml:964
#, no-c-format
msgid ""
"Be aware that preseeding passwords is not completely secure as everyone with "
@@ -2025,7 +2189,7 @@ msgstr ""
"MD5 哈希值相对安全一些,但也会造成安全的假象,MD5 哈希值也可以被暴力破解。"
#. Tag: screen
-#: preseed.xml:954
+#: preseed.xml:974
#, no-c-format
msgid ""
"# Skip creation of a root account (normal user account will be able to\n"
@@ -2083,7 +2247,7 @@ msgstr ""
"#d-i passwd/user-default-groups string audio cdrom video"
#. Tag: para
-#: preseed.xml:956
+#: preseed.xml:976
#, no-c-format
msgid ""
"The <classname>passwd/root-password-crypted</classname> and "
@@ -2100,26 +2264,26 @@ msgstr ""
"root 登录(例如使用 SSH key 认证或 sudo)。"
#. Tag: para
-#: preseed.xml:966
+#: preseed.xml:986
#, no-c-format
msgid ""
"The following command can be used to generate an MD5 hash for a password:"
msgstr "下面的命令可用于生成密码的 MD5 值。"
#. Tag: screen
-#: preseed.xml:970
+#: preseed.xml:990
#, no-c-format
msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
#. Tag: title
-#: preseed.xml:976
+#: preseed.xml:996
#, no-c-format
msgid "Apt setup"
msgstr "设置 apt"
#. Tag: para
-#: preseed.xml:977
+#: preseed.xml:997
#, no-c-format
msgid ""
"Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2132,7 +2296,7 @@ msgstr ""
"仓库。"
#. Tag: screen
-#: preseed.xml:985
+#: preseed.xml:1005
#, no-c-format
msgid ""
"# You can choose to install non-free and contrib software.\n"
@@ -2190,13 +2354,13 @@ msgstr ""
"#d-i debian-installer/allow_unauthenticated boolean true"
#. Tag: title
-#: preseed.xml:990
+#: preseed.xml:1010
#, no-c-format
msgid "Package selection"
msgstr "选择软件包"
#. Tag: para
-#: preseed.xml:991
+#: preseed.xml:1011
#, no-c-format
msgid ""
"You can choose to install any combination of tasks that are available. "
@@ -2204,73 +2368,73 @@ msgid ""
msgstr "您可以选择安装存在的任务的组合。本文编撰时已有的任务包括:"
#. Tag: userinput
-#: preseed.xml:1000
+#: preseed.xml:1020
#, no-c-format
msgid "standard"
msgstr "standard"
#. Tag: userinput
-#: preseed.xml:1003
+#: preseed.xml:1023
#, no-c-format
msgid "desktop"
msgstr "desktop"
#. Tag: userinput
-#: preseed.xml:1006
+#: preseed.xml:1026
#, no-c-format
msgid "gnome-desktop"
msgstr "gnome-desktop"
#. Tag: userinput
-#: preseed.xml:1009
+#: preseed.xml:1029
#, no-c-format
msgid "kde-desktop"
msgstr "kde-desktop"
#. Tag: userinput
-#: preseed.xml:1012
+#: preseed.xml:1032
#, no-c-format
msgid "web-server"
msgstr "web-server"
#. Tag: userinput
-#: preseed.xml:1015
+#: preseed.xml:1035
#, no-c-format
msgid "print-server"
msgstr "print-server"
#. Tag: userinput
-#: preseed.xml:1018
+#: preseed.xml:1038
#, no-c-format
msgid "dns-server"
msgstr "dns-server"
#. Tag: userinput
-#: preseed.xml:1021
+#: preseed.xml:1041
#, no-c-format
msgid "file-server"
msgstr "file-server"
#. Tag: userinput
-#: preseed.xml:1024
+#: preseed.xml:1044
#, no-c-format
msgid "mail-server"
msgstr "mail-server"
#. Tag: userinput
-#: preseed.xml:1027
+#: preseed.xml:1047
#, no-c-format
msgid "sql-database"
msgstr "sql-database"
#. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1050
#, no-c-format
msgid "laptop"
msgstr "laptop"
#. Tag: para
-#: preseed.xml:1034
+#: preseed.xml:1054
#, no-c-format
msgid ""
"You can also choose to install no tasks, and force the installation of a set "
@@ -2281,7 +2445,7 @@ msgstr ""
"<userinput>standard</userinput> 任务。"
#. Tag: para
-#: preseed.xml:1040
+#: preseed.xml:1060
#, no-c-format
msgid ""
"If you want to install some individual packages in addition to packages "
@@ -2295,7 +2459,7 @@ msgstr ""
"命令行上使用。"
#. Tag: screen
-#: preseed.xml:1050
+#: preseed.xml:1070
#, no-c-format
msgid ""
"#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2333,13 +2497,13 @@ msgstr ""
"#popularity-contest popularity-contest/participate boolean false"
#. Tag: title
-#: preseed.xml:1055
+#: preseed.xml:1075
#, no-c-format
msgid "Boot loader installation"
msgstr "安装 bootloader"
#. Tag: screen
-#: preseed.xml:1057
+#: preseed.xml:1077
#, no-c-format
msgid ""
"# Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -2415,7 +2579,7 @@ msgstr ""
"#d-i debian-installer/add-kernel-opts string nousb"
#. Tag: para
-#: preseed.xml:1059
+#: preseed.xml:1079
#, no-c-format
msgid ""
"An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2427,13 +2591,13 @@ msgstr ""
"令。"
#. Tag: title
-#: preseed.xml:1069
+#: preseed.xml:1089
#, no-c-format
msgid "Finishing up the installation"
msgstr "完成安装"
#. Tag: screen
-#: preseed.xml:1071
+#: preseed.xml:1091
#, no-c-format
msgid ""
"# During installations from serial console, the regular virtual consoles\n"
@@ -2473,13 +2637,13 @@ msgstr ""
"#d-i debian-installer/exit/poweroff boolean true"
#. Tag: title
-#: preseed.xml:1076
+#: preseed.xml:1096
#, no-c-format
msgid "Preseeding other packages"
msgstr "预置其他的软件包"
#. Tag: screen
-#: preseed.xml:1078
+#: preseed.xml:1098
#, no-c-format
msgid ""
"# Depending on what software you choose to install, or if things go wrong\n"
@@ -2499,19 +2663,19 @@ msgstr ""
"# debconf-get-selections >> file"
#. Tag: title
-#: preseed.xml:1085
+#: preseed.xml:1105
#, no-c-format
msgid "Advanced options"
msgstr "高级选项"
#. Tag: title
-#: preseed.xml:1088
+#: preseed.xml:1108
#, no-c-format
msgid "Running custom commands during the installation"
msgstr "安装过程中运行用户命令"
#. Tag: para
-#: preseed.xml:1089
+#: preseed.xml:1109
#, no-c-format
msgid ""
"A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2521,7 +2685,7 @@ msgstr ""
"本。"
#. Tag: screen
-#: preseed.xml:1097
+#: preseed.xml:1117
#, no-c-format
msgid ""
"# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2569,13 +2733,13 @@ msgstr ""
"#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
#. Tag: title
-#: preseed.xml:1102
+#: preseed.xml:1122
#, no-c-format
msgid "Using preseeding to change default values"
msgstr "使用预置修改默认值"
#. Tag: para
-#: preseed.xml:1103
+#: preseed.xml:1123
#, no-c-format
msgid ""
"It is possible to use preseeding to change the default answer for a "
@@ -2599,7 +2763,7 @@ msgstr ""
"这对于测试和调试您的预置文件很有帮助。"
#. Tag: para
-#: preseed.xml:1117
+#: preseed.xml:1137
#, no-c-format
msgid ""
"Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2612,7 +2776,7 @@ msgstr ""
"\"preseed-bootparms\"/> 的脚注。"
#. Tag: para
-#: preseed.xml:1124
+#: preseed.xml:1144
#, no-c-format
msgid ""
"If you are preseeding using boot parameters, you can make the installer ask "
@@ -2633,13 +2797,13 @@ msgstr ""
"在安装时显示出来的问题对应的参数,而不是<quote>内部的</quote>参数。"
#. Tag: title
-#: preseed.xml:1138
+#: preseed.xml:1158
#, no-c-format
msgid "Chainloading preconfiguration files"
msgstr "预置文件链"
#. Tag: para
-#: preseed.xml:1139
+#: preseed.xml:1159
#, no-c-format
msgid ""
"It is possible to include other preconfiguration files from a "
@@ -2653,7 +2817,7 @@ msgstr ""
"外的文件里面。"
#. Tag: screen
-#: preseed.xml:1149
+#: preseed.xml:1169
#, no-c-format
msgid ""
"# More than one file can be listed, separated by spaces; all will be\n"
@@ -2703,7 +2867,7 @@ msgstr ""
"#d-i preseed/run string foo.sh"
#. Tag: para
-#: preseed.xml:1151
+#: preseed.xml:1171
#, no-c-format
msgid ""
"It is also possible to chainload from the initrd or file preseeding phase, "