Fix incorrect creation of po files - take 2

(my first try (for pt) was not successful, corrupted characters in the po files):
- checkout rev. 68272 (revision before my commit with wrong po files)
- svn update en
- perform usual process to update po and pot files (with merge_xml.awk fixed by nabetaro, thanks!)
- copy changed files to my svn tree
- commit

M    po/ro/using-d-i.po
M    po/pt/partitioning.po
M    po/pt/install-methods.po
M    po/pt/random-bits.po
M    po/pt/preseed.po
M    po/pt/preparing.po
M    po/pt/welcome.po
M    po/pt/using-d-i.po
M    po/pt/hardware.po
M    po/pt/boot-installer.po
M    po/pt/installation-howto.po
M    po/da/boot-installer.po
M    po/ru/install-methods.po
M    po/ru/partitioning.po
M    po/ru/random-bits.po
M    po/ru/preseed.po
M    po/ru/welcome.po
M    po/ru/using-d-i.po
M    po/ru/hardware.po
M    po/ru/boot-installer.po
M    po/ru/installation-howto.po
M    po/sv/install-methods.po
M    po/sv/partitioning.po
M    po/sv/preseed.po
M    po/sv/using-d-i.po
M    po/sv/hardware.po
M    po/sv/boot-installer.po
M    po/sv/installation-howto.po
M    po/ja/install-methods.po
M    po/ja/partitioning.po
M    po/ja/preseed.po
M    po/ja/using-d-i.po
M    po/ja/hardware.po
M    po/ja/boot-installer.po
M    po/ja/installation-howto.po
M    po/zh_TW/install-methods.po
M    po/zh_TW/partitioning.po
M    po/zh_TW/using-d-i.po
M    po/zh_TW/hardware.po
M    po/zh_TW/boot-installer.po
M    po/zh_TW/installation-howto.po
M    po/fi/install-methods.po
M    po/fi/partitioning.po
M    po/fi/preseed.po
M    po/fi/using-d-i.po
M    po/fi/hardware.po
M    po/fi/boot-installer.po
M    po/fi/installation-howto.po
M    po/el/install-methods.po
M    po/el/partitioning.po
M    po/el/preseed.po
M    po/el/using-d-i.po
M    po/el/hardware.po
M    po/el/boot-installer.po
M    po/el/installation-howto.po
M    po/zh_CN/install-methods.po
M    po/zh_CN/partitioning.po
M    po/zh_CN/preseed.po
M    po/zh_CN/using-d-i.po
M    po/zh_CN/hardware.po
M    po/zh_CN/boot-installer.po
M    po/zh_CN/installation-howto.po
M    po/pot/random-bits.pot
M    po/pot/gpl.pot
M    po/pot/preseed.pot
M    po/pot/preparing.pot
M    po/pot/post-install.pot
M    po/pot/boot-new.pot
M    po/pot/welcome.pot
M    po/pot/using-d-i.pot
M    po/pot/hardware.pot
M    po/pot/boot-installer.pot
M    po/pot/installation-howto.pot
M    po/pot/administrivia.pot
M    po/pot/preface.pot
M    po/pot/bookinfo.pot
M    po/pot/install-methods.pot
M    po/pot/partitioning.pot
M    po/es/partitioning.po
M    po/es/install-methods.po
M    po/es/preseed.po
M    po/es/using-d-i.po
M    po/es/hardware.po
M    po/es/boot-installer.po
M    po/es/installation-howto.po
M    po/ko/install-methods.po
M    po/ko/partitioning.po
M    po/ko/preseed.po
M    po/ko/using-d-i.po
M    po/ko/hardware.po
M    po/ko/boot-installer.po
M    po/ko/installation-howto.po
M    po/hu/install-methods.po
M    po/hu/partitioning.po
M    po/hu/preseed.po
M    po/hu/using-d-i.po
M    po/hu/hardware.po
M    po/hu/boot-installer.po
M    po/hu/installation-howto.po
M    po/vi/install-methods.po
M    po/vi/partitioning.po
M    po/vi/preseed.po
M    po/vi/using-d-i.po
M    po/vi/hardware.po
M    po/vi/boot-installer.po
M    po/vi/installation-howto.po

1 files changed, 253 insertions, 156 deletions

diff --git a/po/pot/preseed.pot b/po/pot/preseed.pot
index 1ee1d7a5b..c1cc24263 100644
--- a/po/pot/preseed.pot
+++ b/po/pot/preseed.pot
@@ -6,12 +6,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2012-06-26 13:45+0000\n"
+"POT-Creation-Date: 2012-10-24 19:53+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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: application/x-xml2pot; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Tag: title
@@ -27,7 +27,7 @@ msgid "This appendix explains how to preseed answers to questions in &d-i; to au
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:23 preseed.xml:677
+#: preseed.xml:23 preseed.xml:685
 #, no-c-format
 msgid "The configuration fragments used in this appendix are also available as an example preconfiguration file from &urlset-example-preseed;."
 msgstr ""
@@ -81,7 +81,7 @@ msgid "initrd"
 msgstr ""
 
 #. Tag: entry
-#: preseed.xml:70 preseed.xml:524
+#: preseed.xml:70 preseed.xml:525
 #, no-c-format
 msgid "file"
 msgstr ""
@@ -99,7 +99,7 @@ msgid "CD/DVD"
 msgstr ""
 
 #. Tag: entry
-#: preseed.xml:77 preseed.xml:78 preseed.xml:79 preseed.xml:89 preseed.xml:91 preseed.xml:94 preseed.xml:95 preseed.xml:99 preseed.xml:100 preseed.xml:104 preseed.xml:106 preseed.xml:109 preseed.xml:111
+#: preseed.xml:77 preseed.xml:78 preseed.xml:79 preseed.xml:89 preseed.xml:91 preseed.xml:94 preseed.xml:95 preseed.xml:96 preseed.xml:99 preseed.xml:100 preseed.xml:101 preseed.xml:104 preseed.xml:106 preseed.xml:109 preseed.xml:111
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr ""
@@ -129,12 +129,6 @@ msgid "hd-media <phrase condition=\"bootable-usb\">(including usb-stick)</phrase
 msgstr ""
 
 #. Tag: entry
-#: preseed.xml:96 preseed.xml:101
-#, no-c-format
-msgid "yes<footnoteref linkend=\"apx-ps-net\"/>"
-msgstr ""
-
-#. Tag: entry
 #: preseed.xml:98
 #, no-c-format
 msgid "floppy based (cd-drivers)"
@@ -411,179 +405,275 @@ msgstr ""
 #. Tag: entry
 #: preseed.xml:517
 #, no-c-format
-msgid "auto"
+msgid "priority"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:517
 #, no-c-format
-msgid "auto-install/enable"
+msgid "debconf/priority"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:518
 #, no-c-format
-msgid "classes"
+msgid "<entry>fb</entry>"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:518
 #, no-c-format
-msgid "auto-install/classes"
+msgid "debian-installer/framebuffer"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:519
 #, no-c-format
-msgid "<entry>fb</entry>"
+msgid "language"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:519
 #, no-c-format
-msgid "debian-installer/framebuffer"
+msgid "debian-installer/language"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:520
 #, no-c-format
-msgid "language"
+msgid "country"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:520
 #, no-c-format
-msgid "debian-installer/language"
+msgid "debian-installer/country"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:521
 #, no-c-format
-msgid "country"
+msgid "locale"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:521
 #, no-c-format
-msgid "debian-installer/country"
+msgid "debian-installer/locale"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:522
 #, no-c-format
-msgid "locale"
+msgid "theme"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:522
 #, no-c-format
-msgid "debian-installer/locale"
+msgid "debian-installer/theme"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:523
 #, no-c-format
-msgid "priority"
+msgid "auto"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:523
 #, no-c-format
-msgid "debconf/priority"
+msgid "auto-install/enable"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:524
 #, no-c-format
-msgid "preseed/file"
+msgid "classes"
 msgstr ""
 
 #. Tag: entry
-#: preseed.xml:525
+#: preseed.xml:524
 #, no-c-format
-msgid "<entry>url</entry>"
+msgid "auto-install/classes"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:525
 #, no-c-format
-msgid "preseed/url"
+msgid "preseed/file"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:526
 #, no-c-format
-msgid "interface"
+msgid "<entry>url</entry>"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:526
 #, no-c-format
-msgid "netcfg/choose_interface"
+msgid "preseed/url"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:527
 #, no-c-format
-msgid "hostname&nbsp;&nbsp;&nbsp;"
+msgid "domain"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:527
 #, no-c-format
-msgid "netcfg/get_hostname"
+msgid "netcfg/get_domain"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:528
 #, no-c-format
-msgid "domain"
+msgid "hostname&nbsp;&nbsp;&nbsp;"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:528
 #, no-c-format
-msgid "netcfg/get_domain"
+msgid "netcfg/get_hostname"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:529
 #, no-c-format
-msgid "protocol"
+msgid "interface"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:529
 #, no-c-format
-msgid "mirror/protocol"
+msgid "netcfg/choose_interface"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:530
 #, no-c-format
-msgid "suite"
+msgid "protocol"
 msgstr ""
 
 #. Tag: entry
 #: preseed.xml:530
 #, no-c-format
+msgid "mirror/protocol"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:531
+#, no-c-format
+msgid "suite"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:531
+#, no-c-format
 msgid "mirror/suite"
 msgstr ""
 
-#. Tag: title
+#. Tag: entry
+#: preseed.xml:532
+#, no-c-format
+msgid "modules"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:532
+#, no-c-format
+msgid "anna/choose_modules"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:533
+#, no-c-format
+msgid "recommends"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:533
+#, no-c-format
+msgid "base-installer/install-recommends"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:534
+#, no-c-format
+msgid "tasks"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:534
+#, no-c-format
+msgid "tasksel:tasksel/first"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:535
+#, no-c-format
+msgid "<entry>desktop</entry>"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:535
+#, no-c-format
+msgid "tasksel:tasksel/desktop"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:536
+#, no-c-format
+msgid "dmraid"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:536
+#, no-c-format
+msgid "disk-detect/dmraid/enable"
+msgstr ""
+
+#. Tag: entry
 #: preseed.xml:537
 #, no-c-format
+msgid "keymap"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:537
+#, no-c-format
+msgid "keyboard-configuration/xkb-keymap"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:538
+#, no-c-format
+msgid "preseed-md5"
+msgstr ""
+
+#. Tag: entry
+#: preseed.xml:538
+#, no-c-format
+msgid "preseed/file/checksum"
+msgstr ""
+
+#. Tag: title
+#: preseed.xml:545
+#, no-c-format
 msgid "Using a DHCP server to specify preconfiguration files"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:538
+#: preseed.xml:546
 #, no-c-format
 msgid "It's also possible to use DHCP to specify a preconfiguration file to download from the network. DHCP allows specifying a filename. Normally this is a file to netboot, but if it appears to be an URL then installation media that support network preseeding will download the file from the URL and use it as a preconfiguration file. Here is an example of how to set it up in the dhcpd.conf for version 3 of the ISC DHCP server (the dhcp3-server &debian; package)."
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:549
+#: preseed.xml:557
 #, no-c-format
 msgid ""
       "if substring (option vendor-class-identifier, 0, 3) = \"d-i\" {\n"
@@ -592,85 +682,85 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:551
+#: preseed.xml:559
 #, no-c-format
 msgid "Note that the above example limits this filename to DHCP clients that identify themselves as \"d-i\", so it will not affect regular DHCP clients, but only the installer. You can also put the text in a stanza for only one particular host to avoid preseeding all installs on your network."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:558
+#: preseed.xml:566
 #, no-c-format
 msgid "A good way to use the DHCP preseeding is to only preseed values specific to your network, such as the &debian; mirror to use. This way installs on your network will automatically get a good mirror selected, but the rest of the installation can be performed interactively. Using DHCP preseeding to fully automate &debian; installs should only be done with care."
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:572
+#: preseed.xml:580
 #, no-c-format
 msgid "Creating a preconfiguration file"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:573
+#: preseed.xml:581
 #, no-c-format
 msgid "The preconfiguration file is in the format used by the <command>debconf-set-selections</command> command. The general format of a line in a preconfiguration file is:"
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:579
+#: preseed.xml:587
 #, no-c-format
 msgid "&lt;owner&gt; &lt;question name&gt; &lt;question type&gt; &lt;value&gt;"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:581
+#: preseed.xml:589
 #, no-c-format
 msgid "There are a few rules to keep in mind when writing a preconfiguration file."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:588
+#: preseed.xml:596
 #, no-c-format
 msgid "Put only a single space or tab between type and value: any additional whitespace will be interpreted as belonging to the value."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:592
+#: preseed.xml:600
 #, no-c-format
 msgid "A line can be split into multiple lines by appending a backslash (<quote><literal>\\</literal></quote>) as the line continuation character. A good place to split a line is after the question name; a bad place is between type and value. Split lines will be joined into a single line with all leading/trailing whitespace condensed to a single space."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:599
+#: preseed.xml:607
 #, no-c-format
 msgid "For debconf variables (templates) used only in the installer itself, the owner should be set to <quote>d-i</quote>; to preseed variables used in the installed system, the name of the package that contains the corresponding debconf template should be used. Only variables that have their owner set to something other than <quote>d-i</quote> will be propagated to the debconf database for the installed system."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:607
+#: preseed.xml:615
 #, no-c-format
 msgid "Most questions need to be preseeded using the values valid in English and not the translated values. However, there are some questions (for example in <classname>partman</classname>) where the translated values need to be used."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:613
+#: preseed.xml:621
 #, no-c-format
 msgid "Some questions take a code as value instead of the English text that is shown during installation."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:619
+#: preseed.xml:627
 #, no-c-format
 msgid "The easiest way to create a preconfiguration file is to use the example file linked in <xref linkend=\"preseed-contents\"/> as basis and work from there."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:624
+#: preseed.xml:632
 #, no-c-format
 msgid "An alternative method is to do a manual installation and then, after rebooting, use the <command>debconf-get-selections</command> from the <classname>debconf-utils</classname> package to dump both the debconf database and the installer's cdebconf database to a single file:"
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:631
+#: preseed.xml:639
 #, no-c-format
 msgid ""
       "$ debconf-get-selections --installer &gt; <replaceable>file</replaceable>\n"
@@ -678,79 +768,79 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:633
+#: preseed.xml:641
 #, no-c-format
 msgid "However, a file generated in this manner will have some items that should not be preseeded, and the example file is a better starting place for most users."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:641
+#: preseed.xml:649
 #, no-c-format
 msgid "This method relies on the fact that, at the end of the installation, the installer's cdebconf database is saved to the installed system in <filename>/var/log/installer/cdebconf</filename>. However, because the database may contain sensitive information, by default the files are only readable by root."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:649
+#: preseed.xml:657
 #, no-c-format
 msgid "The directory <filename>/var/log/installer</filename> and all files in it will be deleted from your system if you purge the package <classname>installation-report</classname>."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:657
+#: preseed.xml:665
 #, no-c-format
 msgid "To check possible values for questions, you can use <command>nano</command> to examine the files in <filename>/var/lib/cdebconf</filename> while an installation is in progress. View <filename>templates.dat</filename> for the raw templates and <filename>questions.dat</filename> for the current values and for the values assigned to variables."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:665
+#: preseed.xml:673
 #, no-c-format
 msgid "To check if the format of your preconfiguration file is valid before performing an install, you can use the command <command>debconf-set-selections -c <replaceable>preseed.cfg</replaceable></command>."
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:676
+#: preseed.xml:684
 #, no-c-format
 msgid "Contents of the preconfiguration file (for &releasename;)"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:682
+#: preseed.xml:690
 #, no-c-format
 msgid "Note that this example is based on an installation for the Intel x86 architecture. If you are installing a different architecture, some of the examples (like keyboard selection and bootloader installation) may not be relevant and will need to be replaced by debconf settings appropriate for your architecture."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:690
+#: preseed.xml:698
 #, no-c-format
 msgid "Details on how the different Debian Installer components actually work can be found in <xref linkend=\"module-details\"/>."
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:698
+#: preseed.xml:706
 #, no-c-format
 msgid "Localization"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:699
+#: preseed.xml:707
 #, no-c-format
 msgid "Setting localization values will only work if you are using initrd preseeding. With all other methods the preconfiguration file will only be loaded after these questions have been asked."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:705
+#: preseed.xml:713
 #, no-c-format
 msgid "The locale can be used to specify both language and country and can be any combination of a language supported by &d-i; and a recognized country. If the combination does not form a valid locale, the installer will automatically select a locale that is valid for the selected language. To specify the locale as a boot parameter, use <userinput>locale=<replaceable>en_US</replaceable></userinput>."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:714
+#: preseed.xml:722
 #, no-c-format
 msgid "Although this method is very easy to use, it does not allow preseeding of all possible combinations of language, country and locale<footnote> <para> Preseeding <literal>locale</literal> to <userinput>en_NL</userinput> would for example result in <literal>en_US.UTF-8</literal> as default locale for the installed system. If e.g. <literal>en_GB.UTF-8</literal> is preferred instead, the values will need to be preseeded individually. </para> </footnote>. So alternatively the values can be preseeded individually. Language and country can also be specified as boot parameters."
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:729
+#: preseed.xml:737
 #, no-c-format
 msgid ""
       "# Preseeding only locale sets language, country and locale.\n"
@@ -765,13 +855,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:731
+#: preseed.xml:739
 #, no-c-format
-msgid "Keyboard configuration consists of selecting a keymap and (for non-latin keymaps) a toggle key to switch between the non-latin keymap and the US keymap."
+msgid "Keyboard configuration consists of selecting a keymap and (for non-latin keymaps) a toggle key to switch between the non-latin keymap and the US keymap. Only basic keymap variants are available during installation. Advanced variants are available only in the installed system, through <command>dpkg-reconfigure keyboard-configuration</command>."
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:736
+#: preseed.xml:747
 #, no-c-format
 msgid ""
       "# Keyboard selection.\n"
@@ -781,49 +871,49 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:738
+#: preseed.xml:749
 #, no-c-format
 msgid "To skip keyboard configuration, preseed <classname>keymap</classname> with <userinput>skip-config</userinput>. This will result in the kernel keymap remaining active."
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:750
+#: preseed.xml:761
 #, no-c-format
 msgid "Network configuration"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:751
+#: preseed.xml:762
 #, no-c-format
 msgid "Of course, preseeding the network configuration won't work if you're loading your preconfiguration file from the network. But it's great when you're booting from CD or USB stick. If you are loading preconfiguration files from the network, you can pass network config parameters by using kernel boot parameters."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:759
+#: preseed.xml:770
 #, no-c-format
 msgid "If you need to pick a particular interface when netbooting before loading a preconfiguration file from the network, use a boot parameter such as <userinput>interface=<replaceable>eth1</replaceable></userinput>."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:765
+#: preseed.xml:776
 #, no-c-format
 msgid "Although preseeding the network configuration is normally not possible when using network preseeding (using <quote>preseed/url</quote>), you can use the following hack to work around that, for example if you'd like to set a static address for the network interface. The hack is to force the network configuration to run again after the preconfiguration file has been loaded by creating a <quote>preseed/run</quote> script containing the following commands:"
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:775
+#: preseed.xml:786
 #, no-c-format
 msgid "killall.sh; netcfg"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:777
+#: preseed.xml:788
 #, no-c-format
 msgid "The following debconf variables are relevant for network configuration."
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:783
+#: preseed.xml:794
 #, no-c-format
 msgid ""
       "# Disable network configuration entirely. This is useful for cdrom\n"
@@ -869,6 +959,11 @@ msgid ""
       "d-i netcfg/get_hostname string unassigned-hostname\n"
       "d-i netcfg/get_domain string unassigned-domain\n"
       "\n"
+      "# If you want to force a hostname, regardless of what either the DHCP\n"
+      "# server returns or what the reverse DNS entry for the IP is, uncomment\n"
+      "# and adjust the following line.\n"
+      "#d-i netcfg/hostname string somehost\n"
+      "\n"
       "# Disable that annoying WEP key dialog.\n"
       "d-i netcfg/wireless_wep string\n"
       "# The wacky dhcp hostname that some ISPs use as a password of sorts.\n"
@@ -881,55 +976,56 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:785
+#: preseed.xml:796
 #, no-c-format
 msgid "Please note that <command>netcfg</command> will automatically determine the netmask if <classname>netcfg/get_netmask</classname> is not preseeded. In this case, the variable has to be marked as <literal>seen</literal> for automatic installations. Similarly, <command>netcfg</command> will choose an appropriate address if <classname>netcfg/get_gateway</classname> is not set. As a special case, you can set <classname>netcfg/get_gateway</classname> to <quote>none</quote> to specify that no gateway should be used."
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:801
+#: preseed.xml:812
 #, no-c-format
 msgid "Network console"
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:803
+#: preseed.xml:814
 #, no-c-format
 msgid ""
       "# Use the following settings if you wish to make use of the network-console\n"
       "# component for remote installation over SSH. This only makes sense if you\n"
       "# intend to perform the remainder of the installation manually.\n"
       "#d-i anna/choose_modules string network-console\n"
+      "#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key\n"
       "#d-i network-console/password password r00tme\n"
       "#d-i network-console/password-again password r00tme"
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:808
+#: preseed.xml:819
 #, no-c-format
 msgid "Mirror settings"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:809
+#: preseed.xml:820
 #, no-c-format
 msgid "Depending on the installation method you use, a mirror may be used to download additional components of the installer, to install the base system, and to set up the <filename>/etc/apt/sources.list</filename> for the installed system."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:816
+#: preseed.xml:827
 #, no-c-format
 msgid "The parameter <classname>mirror/suite</classname> determines the suite for the installed system."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:821
+#: preseed.xml:832
 #, no-c-format
 msgid "The parameter <classname>mirror/udeb/suite</classname> determines the suite for additional components for the installer. It is only useful to set this if components are actually downloaded over the network and should match the suite that was used to build the initrd for the installation method used for the installation. Normally the installer will automatically use the correct value and there should be no need to set this."
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:832
+#: preseed.xml:843
 #, no-c-format
 msgid ""
       "# If you select ftp, the mirror/country string does not need to be set.\n"
@@ -946,25 +1042,25 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:837
+#: preseed.xml:848
 #, no-c-format
 msgid "Account setup"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:838
+#: preseed.xml:849
 #, 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:845
+#: preseed.xml:856
 #, 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:855
+#: preseed.xml:866
 #, no-c-format
 msgid ""
       "# Skip creation of a root account (normal user account will be able to\n"
@@ -996,31 +1092,31 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:857
+#: preseed.xml:868
 #, 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:867
+#: preseed.xml:878
 #, no-c-format
 msgid "The following command can be used to generate an MD5 hash for a password:"
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:871
+#: preseed.xml:882
 #, no-c-format
 msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:877
+#: preseed.xml:888
 #, no-c-format
 msgid "Clock and time zone setup"
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:879
+#: preseed.xml:890
 #, no-c-format
 msgid ""
       "# Controls whether or not the hardware clock is set to UTC.\n"
@@ -1037,43 +1133,43 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:884
+#: preseed.xml:895
 #, no-c-format
 msgid "Partitioning"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:885
+#: preseed.xml:896
 #, no-c-format
 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:893
+#: preseed.xml:904
 #, 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:899
+#: preseed.xml:910
 #, 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-gitweb-doc-devel;\">&d-i; source repository</ulink>. Note that the supported functionality may change between releases."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:913
+#: preseed.xml:924
 #, 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:922
+#: preseed.xml:933
 #, no-c-format
 msgid "Partitioning example"
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:924
+#: preseed.xml:935
 #, no-c-format
 msgid ""
       "# If the system has free space you can choose to only partition that space.\n"
@@ -1101,6 +1197,7 @@ msgid ""
       "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"
+      "d-i partman-lvm/confirm_nooverwrite boolean true\n"
       "\n"
       "# You can choose one of the three predefined partitioning recipes:\n"
       "# - atomic: all files in one partition\n"
@@ -1148,31 +1245,31 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:928
+#: preseed.xml:939
 #, no-c-format
 msgid "Partitioning using RAID"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:929
+#: preseed.xml:940
 #, 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."
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:935
+#: preseed.xml:946
 #, no-c-format
 msgid "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:942
+#: preseed.xml:953
 #, 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:952
+#: preseed.xml:963
 #, no-c-format
 msgid ""
       "# The method should be set to \"raid\".\n"
@@ -1226,31 +1323,31 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:957
+#: preseed.xml:968
 #, no-c-format
 msgid "Controlling how partitions are mounted"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:958
+#: preseed.xml:969
 #, 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:967
+#: preseed.xml:978
 #, 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:974
+#: preseed.xml:985
 #, 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:984
+#: preseed.xml:995
 #, no-c-format
 msgid ""
       "# The default is to mount by UUID, but you can also choose \"traditional\" to\n"
@@ -1260,19 +1357,19 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:990
+#: preseed.xml:1001
 #, no-c-format
 msgid "Base system installation"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:991
+#: preseed.xml:1002
 #, 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:998
+#: preseed.xml:1009
 #, no-c-format
 msgid ""
       "# Configure APT to not install recommended packages by default. Use of this\n"
@@ -1286,19 +1383,19 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:1003
+#: preseed.xml:1014
 #, no-c-format
 msgid "Apt setup"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:1004
+#: preseed.xml:1015
 #, 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:1012
+#: preseed.xml:1023
 #, no-c-format
 msgid ""
       "# You can choose to install non-free and contrib software.\n"
@@ -1330,97 +1427,97 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:1017
+#: preseed.xml:1028
 #, no-c-format
 msgid "Package selection"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:1018
+#: preseed.xml:1029
 #, 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:1027
+#: preseed.xml:1038
 #, no-c-format
 msgid "standard"
 msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:1030
+#: preseed.xml:1041
 #, no-c-format
-msgid "desktop"
+msgid "<userinput>desktop</userinput>"
 msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:1033
+#: preseed.xml:1044
 #, no-c-format
 msgid "gnome-desktop"
 msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:1036
+#: preseed.xml:1047
 #, no-c-format
 msgid "kde-desktop"
 msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:1039
+#: preseed.xml:1050
 #, no-c-format
 msgid "web-server"
 msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:1042
+#: preseed.xml:1053
 #, no-c-format
 msgid "print-server"
 msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:1045
+#: preseed.xml:1056
 #, no-c-format
 msgid "dns-server"
 msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:1048
+#: preseed.xml:1059
 #, no-c-format
 msgid "file-server"
 msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:1051
+#: preseed.xml:1062
 #, no-c-format
 msgid "mail-server"
 msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:1054
+#: preseed.xml:1065
 #, no-c-format
 msgid "sql-database"
 msgstr ""
 
 #. Tag: userinput
-#: preseed.xml:1057
+#: preseed.xml:1068
 #, no-c-format
 msgid "laptop"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:1061
+#: preseed.xml:1072
 #, 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:1067
+#: preseed.xml:1078
 #, 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:1077
+#: preseed.xml:1088
 #, no-c-format
 msgid ""
       "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -1442,13 +1539,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:1082
+#: preseed.xml:1093
 #, no-c-format
 msgid "Boot loader installation"
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:1084
+#: preseed.xml:1095
 #, no-c-format
 msgid ""
       "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If you want lilo installed\n"
@@ -1491,19 +1588,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:1086
+#: preseed.xml:1097
 #, 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:1096
+#: preseed.xml:1107
 #, no-c-format
 msgid "Finishing up the installation"
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:1098
+#: preseed.xml:1109
 #, no-c-format
 msgid ""
       "# During installations from serial console, the regular virtual consoles\n"
@@ -1526,13 +1623,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:1103
+#: preseed.xml:1114
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr ""
 
 #. Tag: screen
-#: preseed.xml:1105
+#: preseed.xml:1116
 #, no-c-format
 msgid ""
       "# Depending on what software you choose to install, or if things go wrong\n"
@@ -1545,25 +1642,25 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:1112
+#: preseed.xml:1123
 #, no-c-format
 msgid "Advanced options"
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:1115
+#: preseed.xml:1126
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:1116
+#: preseed.xml:1127
 #, 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:1124
+#: preseed.xml:1135
 #, no-c-format
 msgid ""
       "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -1589,13 +1686,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:1129
+#: preseed.xml:1140
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:1130
+#: preseed.xml:1141
 #, 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"
@@ -1605,37 +1702,37 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:1144
+#: preseed.xml:1155
 #, 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:1151
+#: preseed.xml:1162
 #, 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: para
-#: preseed.xml:1161
+#: preseed.xml:1172
 #, no-c-format
 msgid "For more debugging information, use the boot parameter <classname>DEBCONF_DEBUG=5</classname>. This will cause <classname>debconf</classname> to print much more detail about the current settings of each variable and about its progress through each package's installation scripts."
 msgstr ""
 
 #. Tag: title
-#: preseed.xml:1173
+#: preseed.xml:1184
 #, no-c-format
 msgid "Chainloading preconfiguration files"
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:1174
+#: preseed.xml:1185
 #, 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:1184
+#: preseed.xml:1195
 #, no-c-format
 msgid ""
       "# More than one file can be listed, separated by spaces; all will be\n"
@@ -1663,7 +1760,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: preseed.xml:1186
+#: preseed.xml:1197
 #, 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 ""