Updated po|pot files after changings in en

1 files changed, 285 insertions, 292 deletions

diff --git a/po/nn/using-d-i.po b/po/nn/using-d-i.po
index d37cd36fb..382011875 100644
--- a/po/nn/using-d-i.po
+++ b/po/nn/using-d-i.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_using-d-i\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2013-05-22 19:06+0000\n"
+"POT-Creation-Date: 2014-08-03 08: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"
@@ -1788,15 +1788,14 @@ msgid ""
 "feel free to change them to your liking. E.g. by selecting the option "
 "<guimenuitem>Use as:</guimenuitem>, you can choose a different filesystem "
 "for this partition, including options to use the partition for swap,<phrase "
-"arch=\"linux-any\"> software RAID, LVM,</phrase> or not use it at all. "
-"Another nice feature is the ability to copy data from an existing partition "
-"onto this one. When you are satisfied with your new partition, select "
-"<guimenuitem>Done setting up the partition</guimenuitem> and you will return "
-"to <command>partman</command>'s main screen."
+"arch=\"linux-any\"> software RAID, LVM,</phrase> or not use it at all. When "
+"you are satisfied with your new partition, select <guimenuitem>Done setting "
+"up the partition</guimenuitem> and you will return to <command>partman</"
+"command>'s main screen."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1403
+#: using-d-i.xml:1402
 #, no-c-format
 msgid ""
 "If you decide you want to change something about your partition, simply "
@@ -1810,7 +1809,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1414
+#: using-d-i.xml:1413
 #, no-c-format
 msgid ""
 "Be sure to create at least two partitions: one for the <emphasis>root</"
@@ -1821,7 +1820,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1422
+#: using-d-i.xml:1421
 #, no-c-format
 msgid ""
 "If you forget to select and format an EFI boot partition, <command>partman</"
@@ -1830,7 +1829,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1428
+#: using-d-i.xml:1427
 #, no-c-format
 msgid ""
 "Capabilities of <command>partman</command> can be extended with installer "
@@ -1841,7 +1840,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1436
+#: using-d-i.xml:1435
 #, no-c-format
 msgid ""
 "After you are satisfied with partitioning, select <guimenuitem>Finish "
@@ -1851,13 +1850,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:1464
+#: using-d-i.xml:1463
 #, no-c-format
 msgid "Configuring Multidisk Devices (Software RAID)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1465
+#: using-d-i.xml:1464
 #, no-c-format
 msgid ""
 "If you have more than one harddrive<footnote><para> To be honest, you can "
@@ -1870,7 +1869,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1478
+#: using-d-i.xml:1477
 #, no-c-format
 msgid ""
 "MD is basically a bunch of partitions located on different disks and "
@@ -1880,7 +1879,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1486
+#: using-d-i.xml:1485
 #, no-c-format
 msgid ""
 "What benefits this brings depends on the type of MD device you are creating. "
@@ -1938,97 +1937,97 @@ msgid ""
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1600
+#: using-d-i.xml:1599
 #, no-c-format
 msgid "Type"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1601
+#: using-d-i.xml:1600
 #, no-c-format
 msgid "Minimum Devices"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1602
+#: using-d-i.xml:1601
 #, no-c-format
 msgid "Spare Device"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1603
+#: using-d-i.xml:1602
 #, no-c-format
 msgid "Survives disk failure?"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1604
+#: using-d-i.xml:1603
 #, no-c-format
 msgid "Available Space"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1610
+#: using-d-i.xml:1609
 #, no-c-format
 msgid "RAID0"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1611 using-d-i.xml:1619 using-d-i.xml:1649
+#: using-d-i.xml:1610 using-d-i.xml:1618 using-d-i.xml:1648
 #, no-c-format
 msgid "<entry>2</entry>"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1612 using-d-i.xml:1613
+#: using-d-i.xml:1611 using-d-i.xml:1612
 #, no-c-format
 msgid "<entry>no</entry>"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1614
+#: using-d-i.xml:1613
 #, no-c-format
 msgid "Size of the smallest partition multiplied by number of devices in RAID"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1618
+#: using-d-i.xml:1617
 #, no-c-format
 msgid "RAID1"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1620 using-d-i.xml:1628 using-d-i.xml:1639 using-d-i.xml:1650
+#: using-d-i.xml:1619 using-d-i.xml:1627 using-d-i.xml:1638 using-d-i.xml:1649
 #, no-c-format
 msgid "optional"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1621 using-d-i.xml:1629 using-d-i.xml:1640 using-d-i.xml:1651
+#: using-d-i.xml:1620 using-d-i.xml:1628 using-d-i.xml:1639 using-d-i.xml:1650
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1622
+#: using-d-i.xml:1621
 #, no-c-format
 msgid "Size of the smallest partition in RAID"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1626
+#: using-d-i.xml:1625
 #, no-c-format
 msgid "RAID5"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1627
+#: using-d-i.xml:1626
 #, no-c-format
 msgid "<entry>3</entry>"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1630
+#: using-d-i.xml:1629
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2036,19 +2035,19 @@ msgid ""
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1637
+#: using-d-i.xml:1636
 #, no-c-format
 msgid "RAID6"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1638
+#: using-d-i.xml:1637
 #, no-c-format
 msgid "<entry>4</entry>"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1641
+#: using-d-i.xml:1640
 #, no-c-format
 msgid ""
 "Size of the smallest partition multiplied by (number of devices in RAID "
@@ -2056,13 +2055,13 @@ msgid ""
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1648
+#: using-d-i.xml:1647
 #, no-c-format
 msgid "RAID10"
 msgstr ""
 
 #. Tag: entry
-#: using-d-i.xml:1652
+#: using-d-i.xml:1651
 #, no-c-format
 msgid ""
 "Total of all partitions divided by the number of chunk copies (defaults to "
@@ -2070,7 +2069,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1659
+#: using-d-i.xml:1658
 #, no-c-format
 msgid ""
 "If you want to know more about Software RAID, have a look at <ulink url="
@@ -2078,7 +2077,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1664
+#: using-d-i.xml:1663
 #, no-c-format
 msgid ""
 "To create an MD device, you need to have the desired partitions it should "
@@ -2089,7 +2088,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1673
+#: using-d-i.xml:1672
 #, no-c-format
 msgid ""
 "Make sure that the system can be booted with the partitioning scheme you are "
@@ -2102,7 +2101,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1685
+#: using-d-i.xml:1684
 #, no-c-format
 msgid ""
 "Support for MD is a relatively new addition to the installer. You may "
@@ -2114,7 +2113,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1694
+#: using-d-i.xml:1693
 #, no-c-format
 msgid ""
 "Next, you should choose <guimenuitem>Configure software RAID</guimenuitem> "
@@ -2128,7 +2127,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1707
+#: using-d-i.xml:1706
 #, no-c-format
 msgid ""
 "RAID0 is simple &mdash; you will be issued with the list of available RAID "
@@ -2137,7 +2136,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1714
+#: using-d-i.xml:1713
 #, no-c-format
 msgid ""
 "RAID1 is a bit more tricky. First, you will be asked to enter the number of "
@@ -2150,7 +2149,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1726
+#: using-d-i.xml:1725
 #, no-c-format
 msgid ""
 "RAID5 has a setup procedure similar to RAID1 with the exception that you "
@@ -2158,7 +2157,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1732
+#: using-d-i.xml:1731
 #, no-c-format
 msgid ""
 "RAID6 also has a setup procedure similar to RAID1 except that at least "
@@ -2166,7 +2165,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1738
+#: using-d-i.xml:1737
 #, no-c-format
 msgid ""
 "RAID10 again has a setup procedure similar to RAID1 except in expert mode. "
@@ -2179,7 +2178,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1752
+#: using-d-i.xml:1751
 #, no-c-format
 msgid ""
 "It is perfectly possible to have several types of MD at once. For example, "
@@ -2191,7 +2190,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1761
+#: using-d-i.xml:1760
 #, no-c-format
 msgid ""
 "After you set up MD devices to your liking, you can <guimenuitem>Finish</"
@@ -2201,13 +2200,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:1776
+#: using-d-i.xml:1775
 #, no-c-format
 msgid "Configuring the Logical Volume Manager (LVM)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1777
+#: using-d-i.xml:1776
 #, no-c-format
 msgid ""
 "If you are working with computers at the level of system administrator or "
@@ -2218,7 +2217,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1785
+#: using-d-i.xml:1784
 #, no-c-format
 msgid ""
 "To avoid the described situation you can use Logical Volume Manager (LVM). "
@@ -2231,7 +2230,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1795
+#: using-d-i.xml:1794
 #, no-c-format
 msgid ""
 "Now when you realize you need more space for your old 160GB <filename>/home</"
@@ -2244,7 +2243,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1806
+#: using-d-i.xml:1805
 #, no-c-format
 msgid ""
 "LVM setup in &d-i; is quite simple and completely supported inside "
@@ -2255,7 +2254,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1815
+#: using-d-i.xml:1814
 #, no-c-format
 msgid ""
 "When you return to the main <command>partman</command> screen, you will see "
@@ -2268,7 +2267,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1826
+#: using-d-i.xml:1825
 #, no-c-format
 msgid ""
 "<guimenuitem>Display configuration details</guimenuitem>: shows LVM device "
@@ -2276,43 +2275,43 @@ msgid ""
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1831
+#: using-d-i.xml:1830
 #, no-c-format
 msgid "Create volume group"
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1834
+#: using-d-i.xml:1833
 #, no-c-format
 msgid "Create logical volume"
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1837
+#: using-d-i.xml:1836
 #, no-c-format
 msgid "Delete volume group"
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1840
+#: using-d-i.xml:1839
 #, no-c-format
 msgid "Delete logical volume"
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1843
+#: using-d-i.xml:1842
 #, no-c-format
 msgid "Extend volume group"
 msgstr ""
 
 #. Tag: guimenuitem
-#: using-d-i.xml:1846
+#: using-d-i.xml:1845
 #, no-c-format
 msgid "Reduce volume group"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1848
+#: using-d-i.xml:1847
 #, no-c-format
 msgid ""
 "<guimenuitem>Finish</guimenuitem>: return to the main <command>partman</"
@@ -2320,7 +2319,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1854
+#: using-d-i.xml:1853
 #, no-c-format
 msgid ""
 "Use the options in that menu to first create a volume group and then create "
@@ -2328,7 +2327,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1859
+#: using-d-i.xml:1858
 #, no-c-format
 msgid ""
 "After you return to the main <command>partman</command> screen, any created "
@@ -2337,13 +2336,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:1873
+#: using-d-i.xml:1872
 #, no-c-format
 msgid "Configuring Encrypted Volumes"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1874
+#: using-d-i.xml:1873
 #, no-c-format
 msgid ""
 "&d-i; allows you to set up encrypted partitions. Every file you write to "
@@ -2357,7 +2356,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1886
+#: using-d-i.xml:1885
 #, no-c-format
 msgid ""
 "The two most important partitions to encrypt are: the home partition, where "
@@ -2374,7 +2373,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1901
+#: using-d-i.xml:1900
 #, no-c-format
 msgid ""
 "Please note that the performance of encrypted partitions will be less than "
@@ -2384,7 +2383,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1908
+#: using-d-i.xml:1907
 #, no-c-format
 msgid ""
 "To use encryption, you have to create a new partition by selecting some free "
@@ -2397,7 +2396,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1919
+#: using-d-i.xml:1918
 #, no-c-format
 msgid ""
 "&d-i; supports several encryption methods. The default method is "
@@ -2408,7 +2407,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1931
+#: using-d-i.xml:1930
 #, no-c-format
 msgid ""
 "First, let's have a look at the options available when you select "
@@ -2418,13 +2417,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1941
+#: using-d-i.xml:1940
 #, no-c-format
 msgid "Encryption: <userinput>aes</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1943
+#: using-d-i.xml:1942
 #, no-c-format
 msgid ""
 "This option lets you select the encryption algorithm (<firstterm>cipher</"
@@ -2440,13 +2439,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1961
+#: using-d-i.xml:1960
 #, no-c-format
 msgid "Key size: <userinput>256</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1963
+#: using-d-i.xml:1962
 #, no-c-format
 msgid ""
 "Here you can specify the length of the encryption key. With a larger key "
@@ -2456,13 +2455,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1975
+#: using-d-i.xml:1974
 #, no-c-format
 msgid "IV algorithm: <userinput>cbc-essiv:sha256</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1977
+#: using-d-i.xml:1976
 #, no-c-format
 msgid ""
 "The <firstterm>Initialization Vector</firstterm> or <firstterm>IV</"
@@ -2474,7 +2473,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:1987
+#: using-d-i.xml:1986
 #, no-c-format
 msgid ""
 "From the provided alternatives, the default <userinput>cbc-essiv:sha256</"
@@ -2484,25 +2483,25 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:1999
+#: using-d-i.xml:1998
 #, no-c-format
 msgid "Encryption key: <userinput>Passphrase</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2001
+#: using-d-i.xml:2000
 #, no-c-format
 msgid "Here you can choose the type of the encryption key for this partition."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:2007
+#: using-d-i.xml:2006
 #, no-c-format
 msgid "Passphrase"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2008
+#: using-d-i.xml:2007
 #, no-c-format
 msgid ""
 "The encryption key will be computed<footnote> <para> Using a passphrase as "
@@ -2512,13 +2511,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:2023 using-d-i.xml:2116
+#: using-d-i.xml:2022 using-d-i.xml:2115
 #, no-c-format
 msgid "Random key"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2024
+#: using-d-i.xml:2023
 #, no-c-format
 msgid ""
 "A new encryption key will be generated from random data each time you try to "
@@ -2530,7 +2529,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2033
+#: using-d-i.xml:2032
 #, no-c-format
 msgid ""
 "Random keys are useful for swap partitions because you do not need to bother "
@@ -2543,13 +2542,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:2052 using-d-i.xml:2129
+#: using-d-i.xml:2051 using-d-i.xml:2128
 #, no-c-format
 msgid "Erase data: <userinput>yes</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2054
+#: using-d-i.xml:2053
 #, no-c-format
 msgid ""
 "Determines whether the content of this partition should be overwritten with "
@@ -2563,7 +2562,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2074
+#: using-d-i.xml:2073
 #, no-c-format
 msgid ""
 "If you select <menuchoice> <guimenu>Encryption method:</guimenu> "
@@ -2572,13 +2571,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:2083
+#: using-d-i.xml:2082
 #, no-c-format
 msgid "Encryption: <userinput>AES256</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2085
+#: using-d-i.xml:2084
 #, no-c-format
 msgid ""
 "For loop-AES, unlike dm-crypt, the options for cipher and key size are "
@@ -2587,25 +2586,25 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:2095
+#: using-d-i.xml:2094
 #, no-c-format
 msgid "Encryption key: <userinput>Keyfile (GnuPG)</userinput>"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2097
+#: using-d-i.xml:2096
 #, no-c-format
 msgid "Here you can select the type of the encryption key for this partition."
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:2103
+#: using-d-i.xml:2102
 #, no-c-format
 msgid "Keyfile (GnuPG)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2104
+#: using-d-i.xml:2103
 #, no-c-format
 msgid ""
 "The encryption key will be generated from random data during the "
@@ -2615,19 +2614,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2117
+#: using-d-i.xml:2116
 #, no-c-format
 msgid "Please see the section on random keys above."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2131
+#: using-d-i.xml:2130
 #, no-c-format
-msgid "Please see the the section on erasing data above."
+msgid "Please see the section on erasing data above."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2140
+#: using-d-i.xml:2139
 #, no-c-format
 msgid ""
 "After you have selected the desired parameters for your encrypted "
@@ -2639,7 +2638,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2150
+#: using-d-i.xml:2149
 #, no-c-format
 msgid ""
 "Next you will be asked to enter a passphrase for partitions configured to "
@@ -2650,7 +2649,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2159
+#: using-d-i.xml:2158
 #, no-c-format
 msgid ""
 "Before you input any passphrases, you should have made sure that your "
@@ -2665,7 +2664,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2172
+#: using-d-i.xml:2171
 #, no-c-format
 msgid ""
 "If you selected to use methods other than a passphrase to create encryption "
@@ -2679,7 +2678,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2188
+#: using-d-i.xml:2187
 #, no-c-format
 msgid ""
 "After returning to the main partitioning menu, you will see all encrypted "
@@ -2699,7 +2698,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2201
+#: using-d-i.xml:2200
 #, no-c-format
 msgid ""
 "Pay attention to the identifiers in parentheses (<replaceable>sda2_crypt</"
@@ -2711,7 +2710,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2211
+#: using-d-i.xml:2210
 #, no-c-format
 msgid ""
 "Once you are satisfied with the partitioning scheme, continue with the "
@@ -2719,13 +2718,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2222
+#: using-d-i.xml:2221
 #, no-c-format
 msgid "Installing the Base System"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2223
+#: using-d-i.xml:2222
 #, no-c-format
 msgid ""
 "Although this stage is the least problematic, it consumes a significant "
@@ -2735,7 +2734,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2236
+#: using-d-i.xml:2235
 #, no-c-format
 msgid ""
 "During installation of the base system, package unpacking and setup messages "
@@ -2746,7 +2745,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2245
+#: using-d-i.xml:2244
 #, no-c-format
 msgid ""
 "The unpack/setup messages generated during this phase are also saved in "
@@ -2755,7 +2754,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2251
+#: using-d-i.xml:2250
 #, no-c-format
 msgid ""
 "As part of the installation, a &arch-kernel; kernel will be installed. At "
@@ -2765,7 +2764,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2258
+#: using-d-i.xml:2257
 #, no-c-format
 msgid ""
 "When packages are installed using the package management system, it will by "
@@ -2777,7 +2776,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2268
+#: using-d-i.xml:2267
 #, no-c-format
 msgid ""
 "For technical reasons packages installed during the installation of the base "
@@ -2787,13 +2786,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2280
+#: using-d-i.xml:2279
 #, no-c-format
 msgid "Installing Additional Software"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2281
+#: using-d-i.xml:2280
 #, no-c-format
 msgid ""
 "At this point you have a usable but limited system. Most users will want to "
@@ -2803,13 +2802,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2296
+#: using-d-i.xml:2295
 #, no-c-format
 msgid "Configuring apt"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2298
+#: using-d-i.xml:2297
 #, no-c-format
 msgid ""
 "One of the tools used to install packages on a &debian-gnu; system is a "
@@ -2830,7 +2829,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2322
+#: using-d-i.xml:2321
 #, no-c-format
 msgid ""
 "<command>apt</command> must be configured so that it knows from where to "
@@ -2840,7 +2839,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2329
+#: using-d-i.xml:2328
 #, no-c-format
 msgid ""
 "If you are installing at default priority, the installer will largely take "
@@ -2852,7 +2851,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2338
+#: using-d-i.xml:2337
 #, no-c-format
 msgid ""
 "If you are installing at a lower priority (e.g. in expert mode), you will be "
@@ -2863,13 +2862,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2349
+#: using-d-i.xml:2348
 #, no-c-format
 msgid "Installing from more than one CD or DVD"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2351
+#: using-d-i.xml:2350
 #, no-c-format
 msgid ""
 "If you are installing from a CD or a DVD that is part of a larger set, the "
@@ -2879,7 +2878,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2358
+#: using-d-i.xml:2357
 #, no-c-format
 msgid ""
 "If you do not have any additional CDs or DVDs, that is no problem: using "
@@ -2889,7 +2888,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2366
+#: using-d-i.xml:2365
 #, no-c-format
 msgid ""
 "Packages are included on CDs (and DVDs) in the order of their popularity. "
@@ -2899,7 +2898,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2373
+#: using-d-i.xml:2372
 #, no-c-format
 msgid ""
 "It also means that buying or downloading and burning a full CD set is just a "
@@ -2913,16 +2912,6 @@ msgstr ""
 #: using-d-i.xml:2382
 #, no-c-format
 msgid ""
-"A good rule of thumb is that for a regular desktop installation (using the "
-"GNOME desktop environment) only the first three CDs are needed. For the "
-"alternative desktop environments (KDE or Xfce), additional CDs are needed. "
-"The first DVD easily covers all three desktop environments."
-msgstr ""
-
-#. Tag: para
-#: using-d-i.xml:2390
-#, no-c-format
-msgid ""
 "If you do scan multiple CDs or DVDs, the installer will prompt you to "
 "exchange them when it needs packages from another CD/DVD than the one "
 "currently in the drive. Note that only CDs or DVDs that belong to the same "
@@ -2932,13 +2921,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2403
+#: using-d-i.xml:2395
 #, no-c-format
 msgid "Using a network mirror"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2405
+#: using-d-i.xml:2397
 #, no-c-format
 msgid ""
 "One question that will be asked during most installs is whether or not to "
@@ -2947,7 +2936,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2411
+#: using-d-i.xml:2403
 #, no-c-format
 msgid ""
 "If you are <emphasis>not</emphasis> installing from a full CD or DVD or "
@@ -2959,7 +2948,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2420
+#: using-d-i.xml:2412
 #, no-c-format
 msgid ""
 "If you are installing from a single full CD or using a full CD image, using "
@@ -2972,7 +2961,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2431
+#: using-d-i.xml:2423
 #, no-c-format
 msgid ""
 "If you are installing from a DVD or using a DVD image, any packages needed "
@@ -2982,7 +2971,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2438
+#: using-d-i.xml:2430
 #, no-c-format
 msgid ""
 "One advantage of adding a network mirror is that updates that have occurred "
@@ -2993,7 +2982,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2445
+#: using-d-i.xml:2437
 #, no-c-format
 msgid ""
 "In summary: selecting a network mirror is generally a good idea, except if "
@@ -3004,26 +2993,26 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2454
+#: using-d-i.xml:2446
 #, no-c-format
 msgid "the tasks you select in the next step of the installation,"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2459
+#: using-d-i.xml:2451
 #, no-c-format
 msgid "which packages are needed for those tasks,"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2464
+#: using-d-i.xml:2456
 #, no-c-format
 msgid ""
 "which of those packages are present on the CDs or DVDs you have scanned, and"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2469
+#: using-d-i.xml:2461
 #, no-c-format
 msgid ""
 "whether any updated versions of packages included on the CDs or DVDs are "
@@ -3032,7 +3021,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2478
+#: using-d-i.xml:2470
 #, no-c-format
 msgid ""
 "Note that the last point means that, even if you choose not to use a network "
@@ -3042,13 +3031,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2489
+#: using-d-i.xml:2481
 #, no-c-format
 msgid "Choosing a network mirror"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2490
+#: using-d-i.xml:2482
 #, no-c-format
 msgid ""
 "If you have selected to use a network mirror during the installation "
@@ -3059,7 +3048,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2498
+#: using-d-i.xml:2490
 #, no-c-format
 msgid ""
 "A mirror can also be specified by hand by choosing <quote>enter information "
@@ -3070,7 +3059,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2506
+#: using-d-i.xml:2498
 #, no-c-format
 msgid ""
 "If your computer is on an IPv6-only network (which is probably not the case "
@@ -3087,7 +3076,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2520
+#: using-d-i.xml:2512
 #, no-c-format
 msgid ""
 "Another option when choosing to specify the mirror manually is to use "
@@ -3099,13 +3088,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2539
+#: using-d-i.xml:2531
 #, no-c-format
 msgid "Selecting and Installing Software"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2541
+#: using-d-i.xml:2533
 #, no-c-format
 msgid ""
 "During the installation process, you are given the opportunity to select "
@@ -3117,7 +3106,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2550
+#: using-d-i.xml:2542
 #, no-c-format
 msgid ""
 "So, you have the ability to choose <emphasis>tasks</emphasis> first, and "
@@ -3137,7 +3126,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2577
+#: using-d-i.xml:2569
 #, no-c-format
 msgid ""
 "Some tasks may be pre-selected based on the characteristics of the computer "
@@ -3146,7 +3135,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2584
+#: using-d-i.xml:2576
 #, no-c-format
 msgid ""
 "In the standard user interface of the installer, you can use the space bar "
@@ -3154,51 +3143,55 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2590
+#: using-d-i.xml:2582
 #, no-c-format
 msgid ""
-"Unless you are using the special KDE or Xfce/LXDE CDs, the <quote>Desktop "
-"environment</quote> task will install the GNOME desktop environment."
+"The <quote>Desktop environment</quote> task will install a graphical desktop "
+"environment."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2595
+#: using-d-i.xml:2587
 #, no-c-format
 msgid ""
-"It is not possible to interactively select a different desktop during the "
-"installation. However, it <emphasis>is</emphasis> possible to get &d-i; to "
-"install a KDE desktop environment instead of GNOME by using preseeding (see "
+"By default, &d-i; installs the Xfce desktop environment. It is not possible "
+"to interactively select a different desktop environment during the "
+"installation, however, it <emphasis>is</emphasis> possible to have the "
+"installer install a different desktop environment by using preseeding (see "
 "<xref linkend=\"preseed-pkgsel\"/>) or by adding the parameter "
-"<literal>desktop=kde</literal> at the boot prompt when starting the "
-"installer. Alternatively the more lightweight Xfce and LXDE desktop "
-"environments can be selected by using <literal>desktop=xfce</literal> or "
-"<literal>desktop=lxde</literal>."
+"<literal>desktop=name_of_the_desktop_environment</literal> at the boot "
+"prompt when starting the installer. Possible variants in this case are "
+"<literal>desktop=gnome</literal>, <literal>desktop=kde</literal>, "
+"<literal>desktop=lxde</literal> or <literal>desktop=xfce</literal>."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2606
+#: using-d-i.xml:2601
 #, no-c-format
 msgid ""
-"Some CD images (netinst and DVD) also allow selection of the desired desktop "
-"environment from the graphical boot menu. Select the <quote>Advanced "
-"options</quote> option in the main menu and look for <quote>Alternative "
-"desktop environments</quote>."
+"If you use the special GNOME-, KDE- or LXDE-variant of the first CD in the "
+"full CD set, the installer installs the respective desktop environment "
+"instead of the default. Some CD images (netinst and DVD) also allow "
+"selection of the desired desktop environment from the graphical boot menu. "
+"Select the <quote>Advanced options</quote> option in the main menu and look "
+"for <quote>Alternative desktop environments</quote>."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2613
+#: using-d-i.xml:2612
 #, no-c-format
 msgid ""
 "Note that this will only work if the packages needed for the desired desktop "
 "environment are actually available. If you are installing using a single "
-"full CD image, they will need to be downloaded from a mirror as most needed "
-"packages are only included on later CDs; installing KDE, Xfce or LXDE this "
-"way should work fine if you are using a DVD image or any other installation "
+"full CD image, they will possibly need to be downloaded from a network "
+"mirror as some of the needed packages for your choice might only be included "
+"on later CDs. Installing any of the available desktop environments this way "
+"should work fine if you are using a DVD image or any other installation "
 "method."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2623
+#: using-d-i.xml:2622
 #, no-c-format
 msgid ""
 "The various server tasks will install software roughly as follows. DNS "
@@ -3211,7 +3204,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2634
+#: using-d-i.xml:2633
 #, no-c-format
 msgid ""
 "The <quote>Standard system</quote> task will install any package that has a "
@@ -3222,7 +3215,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2642
+#: using-d-i.xml:2641
 #, no-c-format
 msgid ""
 "If during language selection a default locale other than the <quote>C</"
@@ -3235,7 +3228,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2652
+#: using-d-i.xml:2651
 #, no-c-format
 msgid ""
 "Once you've selected your tasks, select &BTN-CONT;. At this point, "
@@ -3245,7 +3238,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2659
+#: using-d-i.xml:2658
 #, no-c-format
 msgid ""
 "You should be aware that especially the Desktop task is very large. "
@@ -3257,7 +3250,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2668
+#: using-d-i.xml:2667
 #, no-c-format
 msgid ""
 "Even when packages are included on the CD-ROM, the installer may still "
@@ -3269,13 +3262,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2683
+#: using-d-i.xml:2682
 #, no-c-format
 msgid "Making Your System Bootable"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2685
+#: using-d-i.xml:2684
 #, no-c-format
 msgid ""
 "If you are installing a diskless workstation, obviously, booting off the "
@@ -3285,13 +3278,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2700
+#: using-d-i.xml:2699
 #, no-c-format
 msgid "Detecting other operating systems"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2702
+#: using-d-i.xml:2701
 #, no-c-format
 msgid ""
 "Before a boot loader is installed, the installer will attempt to probe for "
@@ -3302,7 +3295,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2710
+#: using-d-i.xml:2709
 #, no-c-format
 msgid ""
 "Note that multiple operating systems booting on a single machine is still "
@@ -3313,13 +3306,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2728
+#: using-d-i.xml:2727
 #, no-c-format
 msgid "<command>palo</command>-installer"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2729
+#: using-d-i.xml:2728
 #, no-c-format
 msgid ""
 "The bootloader on PA-RISC is <quote>palo</quote>. <command>PALO</command> is "
@@ -3330,19 +3323,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2738
+#: using-d-i.xml:2737
 #, no-c-format
 msgid "hppa FIXME ( need more info )"
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2750
+#: using-d-i.xml:2749
 #, no-c-format
 msgid "Install the <command>Grub</command> Boot Loader on a Hard Disk"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2752
+#: using-d-i.xml:2751
 #, no-c-format
 msgid ""
 "The main &architecture; boot loader is called <quote>grub</quote>. Grub is a "
@@ -3351,7 +3344,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2758
+#: using-d-i.xml:2757
 #, no-c-format
 msgid ""
 "By default, grub will be installed into the Master Boot Record (MBR), where "
@@ -3360,7 +3353,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2764
+#: using-d-i.xml:2763
 #, no-c-format
 msgid ""
 "If you do not want to install grub, use the &BTN-GOBACK; button to get to "
@@ -3369,13 +3362,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2777
+#: using-d-i.xml:2776
 #, no-c-format
 msgid "Install the <command>LILO</command> Boot Loader on a Hard Disk"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2779
+#: using-d-i.xml:2778
 #, no-c-format
 msgid ""
 "The second &architecture; boot loader is called <quote>LILO</quote>. It is "
@@ -3386,7 +3379,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2789
+#: using-d-i.xml:2788
 #, no-c-format
 msgid ""
 "Currently the LILO installation will only create menu entries for other "
@@ -3396,7 +3389,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2797
+#: using-d-i.xml:2796
 #, no-c-format
 msgid ""
 "&d-i; offers you three choices on where to install the <command>LILO</"
@@ -3404,13 +3397,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:2804
+#: using-d-i.xml:2803
 #, no-c-format
 msgid "Master Boot Record (MBR)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2804
+#: using-d-i.xml:2803
 #, no-c-format
 msgid ""
 "This way the <command>LILO</command> will take complete control of the boot "
@@ -3418,13 +3411,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:2811
+#: using-d-i.xml:2810
 #, no-c-format
 msgid "new &debian; partition"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2811
+#: using-d-i.xml:2810
 #, no-c-format
 msgid ""
 "Choose this if you want to use another boot manager. <command>LILO</command> "
@@ -3433,13 +3426,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:2820
+#: using-d-i.xml:2819
 #, no-c-format
 msgid "Other choice"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2820
+#: using-d-i.xml:2819
 #, no-c-format
 msgid ""
 "Useful for advanced users who want to install <command>LILO</command> "
@@ -3449,7 +3442,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2830
+#: using-d-i.xml:2829
 #, no-c-format
 msgid ""
 "If you can no longer boot into Windows 9x (or DOS) after this step, you'll "
@@ -3460,13 +3453,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2846
+#: using-d-i.xml:2845
 #, no-c-format
 msgid "Install the <command>ELILO</command> Boot Loader on a Hard Disk"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2848
+#: using-d-i.xml:2847
 #, no-c-format
 msgid ""
 "The &architecture; boot loader is called <quote>elilo</quote>. It is modeled "
@@ -3483,7 +3476,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2864
+#: using-d-i.xml:2863
 #, no-c-format
 msgid ""
 "The <quote>elilo</quote> configuration and installation is done as the last "
@@ -3495,13 +3488,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2876
+#: using-d-i.xml:2875
 #, no-c-format
 msgid "Choose the correct partition!"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2878
+#: using-d-i.xml:2877
 #, no-c-format
 msgid ""
 "The criterion for selecting a partition is that it must be a FAT format "
@@ -3513,13 +3506,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2893
+#: using-d-i.xml:2892
 #, no-c-format
 msgid "EFI Partition Contents"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2895
+#: using-d-i.xml:2894
 #, no-c-format
 msgid ""
 "The EFI partition is a FAT filesystem format partition on one of the hard "
@@ -3537,13 +3530,13 @@ msgid ""
 msgstr ""
 
 #. Tag: filename
-#: using-d-i.xml:2917
+#: using-d-i.xml:2916
 #, no-c-format
 msgid "elilo.conf"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2918
+#: using-d-i.xml:2917
 #, no-c-format
 msgid ""
 "This is the configuration file read by the boot loader when it starts. It is "
@@ -3552,13 +3545,13 @@ msgid ""
 msgstr ""
 
 #. Tag: filename
-#: using-d-i.xml:2927
+#: using-d-i.xml:2926
 #, no-c-format
 msgid "elilo.efi"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2928
+#: using-d-i.xml:2927
 #, no-c-format
 msgid ""
 "This is the boot loader program that the <quote>EFI Boot Manager</quote> "
@@ -3568,13 +3561,13 @@ msgid ""
 msgstr ""
 
 #. Tag: filename
-#: using-d-i.xml:2938
+#: using-d-i.xml:2937
 #, no-c-format
 msgid "initrd.img"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2939
+#: using-d-i.xml:2938
 #, no-c-format
 msgid ""
 "This is the initial root filesystem used to boot the kernel. It is a copy of "
@@ -3584,13 +3577,13 @@ msgid ""
 msgstr ""
 
 #. Tag: filename
-#: using-d-i.xml:2951
+#: using-d-i.xml:2950
 #, no-c-format
 msgid "readme.txt"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2952
+#: using-d-i.xml:2951
 #, no-c-format
 msgid ""
 "This is a small text file warning you that the contents of the directory are "
@@ -3599,13 +3592,13 @@ msgid ""
 msgstr ""
 
 #. Tag: filename
-#: using-d-i.xml:2962
+#: using-d-i.xml:2961
 #, no-c-format
 msgid "vmlinuz"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2963
+#: using-d-i.xml:2962
 #, no-c-format
 msgid ""
 "This is the compressed kernel itself. It is a copy of the file referenced in "
@@ -3615,13 +3608,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2983
+#: using-d-i.xml:2982
 #, no-c-format
 msgid "<command>arcboot</command>-installer"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2984
+#: using-d-i.xml:2983
 #, no-c-format
 msgid ""
 "The boot loader on SGI machines is <command>arcboot</command>. It has to be "
@@ -3646,13 +3639,13 @@ msgid ""
 msgstr ""
 
 #. Tag: replaceable
-#: using-d-i.xml:3003
+#: using-d-i.xml:3002
 #, no-c-format
 msgid "scsi"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3004
+#: using-d-i.xml:3003
 #, no-c-format
 msgid ""
 "is the SCSI bus to be booted from, this is <userinput>0</userinput> for the "
@@ -3660,13 +3653,13 @@ msgid ""
 msgstr ""
 
 #. Tag: replaceable
-#: using-d-i.xml:3012
+#: using-d-i.xml:3011
 #, no-c-format
 msgid "disk"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3013
+#: using-d-i.xml:3012
 #, no-c-format
 msgid ""
 "is the SCSI ID of the hard disk on which <command>arcboot</command> is "
@@ -3674,13 +3667,13 @@ msgid ""
 msgstr ""
 
 #. Tag: replaceable
-#: using-d-i.xml:3021
+#: using-d-i.xml:3020
 #, no-c-format
 msgid "partnr"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3022
+#: using-d-i.xml:3021
 #, no-c-format
 msgid ""
 "is the number of the partition on which <filename>/etc/arcboot.conf</"
@@ -3688,13 +3681,13 @@ msgid ""
 msgstr ""
 
 #. Tag: replaceable
-#: using-d-i.xml:3030
+#: using-d-i.xml:3029
 #, no-c-format
 msgid "config"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3031
+#: using-d-i.xml:3030
 #, no-c-format
 msgid ""
 "is the name of the configuration entry in <filename>/etc/arcboot.conf</"
@@ -3702,13 +3695,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3052
+#: using-d-i.xml:3051
 #, no-c-format
 msgid "Install <command>Yaboot</command> on a Hard Disk"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3053
+#: using-d-i.xml:3052
 #, no-c-format
 msgid ""
 "Newer (mid 1998 and on) PowerMacs use <command>yaboot</command> as their "
@@ -3721,13 +3714,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3071
+#: using-d-i.xml:3070
 #, no-c-format
 msgid "Install <command>Quik</command> on a Hard Disk"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3072
+#: using-d-i.xml:3071
 #, no-c-format
 msgid ""
 "The boot loader for OldWorld Power Macintosh machines is <command>quik</"
@@ -3737,13 +3730,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3088
+#: using-d-i.xml:3087
 #, no-c-format
 msgid "<command>zipl</command>-installer"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3089
+#: using-d-i.xml:3088
 #, no-c-format
 msgid ""
 "The boot loader on &arch-title; is <quote>zipl</quote>. <command>ZIPL</"
@@ -3754,13 +3747,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3106
+#: using-d-i.xml:3105
 #, no-c-format
 msgid "Install the <command>SILO</command> Boot Loader on a Hard Disk"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3108
+#: using-d-i.xml:3107
 #, no-c-format
 msgid ""
 "The standard &architecture; boot loader is called <quote>silo</quote>. It is "
@@ -3778,13 +3771,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3133
+#: using-d-i.xml:3132
 #, no-c-format
 msgid "Continue Without Boot Loader"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3135
+#: using-d-i.xml:3134
 #, no-c-format
 msgid ""
 "This option can be used to complete the installation even when no boot "
@@ -3793,7 +3786,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3142
+#: using-d-i.xml:3141
 #, no-c-format
 msgid ""
 "If you plan to manually configure your bootloader, you should check the name "
@@ -3807,13 +3800,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3159
+#: using-d-i.xml:3158
 #, no-c-format
 msgid "Finishing the Installation"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3160
+#: using-d-i.xml:3159
 #, no-c-format
 msgid ""
 "This is the last step in the &debian; installation process during which the "
@@ -3822,13 +3815,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3173
+#: using-d-i.xml:3172
 #, no-c-format
 msgid "Setting the System Clock"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3175
+#: using-d-i.xml:3174
 #, no-c-format
 msgid ""
 "The installer may ask you if the computer's clock is set to UTC. Normally "
@@ -3838,7 +3831,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3182
+#: using-d-i.xml:3181
 #, no-c-format
 msgid ""
 "In expert mode you will always be able to choose whether or not the clock is "
@@ -3850,7 +3843,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3193
+#: using-d-i.xml:3192
 #, no-c-format
 msgid ""
 "At this point &d-i; will also attempt to save the current time to the "
@@ -3859,13 +3852,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3208
+#: using-d-i.xml:3207
 #, no-c-format
 msgid "Reboot the System"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3210
+#: using-d-i.xml:3209
 #, no-c-format
 msgid ""
 "You will be prompted to remove the boot media (CD, floppy, etc) that you "
@@ -3874,7 +3867,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3216
+#: using-d-i.xml:3215
 #, no-c-format
 msgid ""
 "After a final prompt the system will be halted because rebooting is not "
@@ -3884,13 +3877,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3229
+#: using-d-i.xml:3228
 #, no-c-format
 msgid "Troubleshooting"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3230
+#: using-d-i.xml:3229
 #, no-c-format
 msgid ""
 "The components listed in this section are usually not involved in the "
@@ -3899,13 +3892,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3243
+#: using-d-i.xml:3242
 #, no-c-format
 msgid "Saving the installation logs"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3245
+#: using-d-i.xml:3244
 #, no-c-format
 msgid ""
 "If the installation is successful, the logfiles created during the "
@@ -3914,7 +3907,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3252
+#: using-d-i.xml:3251
 #, no-c-format
 msgid ""
 "Choosing <guimenuitem>Save debug logs</guimenuitem> from the main menu "
@@ -3925,13 +3918,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3272
+#: using-d-i.xml:3271
 #, no-c-format
 msgid "Using the Shell and Viewing the Logs"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3274
+#: using-d-i.xml:3273
 #, no-c-format
 msgid ""
 "There are several methods you can use to get a shell while running an "
@@ -3947,13 +3940,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3292
+#: using-d-i.xml:3291
 #, no-c-format
 msgid "For the graphical installer see also <xref linkend=\"gtk-using\"/>."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3296
+#: using-d-i.xml:3295
 #, no-c-format
 msgid ""
 "If you cannot switch consoles, there is also an <guimenuitem>Execute a "
@@ -3964,7 +3957,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3304
+#: using-d-i.xml:3303
 #, no-c-format
 msgid ""
 "At this point you are booted from the RAM disk, and there is a limited set "
@@ -3976,7 +3969,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3313
+#: using-d-i.xml:3312
 #, no-c-format
 msgid ""
 "To edit and view files, use the text editor <command>nano</command>. Log "
@@ -3985,7 +3978,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3320
+#: using-d-i.xml:3319
 #, no-c-format
 msgid ""
 "Although you can do basically anything in a shell that the available "
@@ -3994,7 +3987,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3326
+#: using-d-i.xml:3325
 #, no-c-format
 msgid ""
 "Doing things manually from the shell may interfere with the installation "
@@ -4004,13 +3997,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3342
+#: using-d-i.xml:3341
 #, no-c-format
 msgid "Installation Over the Network"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3344
+#: using-d-i.xml:3343
 #, no-c-format
 msgid ""
 "One of the more interesting components is <firstterm>network-console</"
@@ -4022,7 +4015,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3354
+#: using-d-i.xml:3353
 #, no-c-format
 msgid ""
 "This component is not loaded into the main installation menu by default, so "
@@ -4036,7 +4029,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3367
+#: using-d-i.xml:3366
 #, no-c-format
 msgid ""
 "For installations on &arch-title;, this is the default method after setting "
@@ -4044,7 +4037,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3372
+#: using-d-i.xml:3371
 #, no-c-format
 msgid ""
 "<phrase arch=\"not-s390\">After selecting this new entry, you</phrase> "
@@ -4058,7 +4051,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3384
+#: using-d-i.xml:3383
 #, no-c-format
 msgid ""
 "Should you decide to continue with the installation locally, you can always "
@@ -4067,7 +4060,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3390
+#: using-d-i.xml:3389
 #, no-c-format
 msgid ""
 "Now let's switch to the other side of the wire. As a prerequisite, you need "
@@ -4086,7 +4079,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3407
+#: using-d-i.xml:3406
 #, no-c-format
 msgid ""
 "The <command>ssh</command> server in the installer uses a default "
@@ -4102,7 +4095,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3420
+#: using-d-i.xml:3419
 #, no-c-format
 msgid ""
 "You may be able to avoid the connection being dropped by adding the option "
@@ -4116,7 +4109,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3433
+#: using-d-i.xml:3432
 #, no-c-format
 msgid ""
 "If you install several computers in turn and they happen to have the same IP "
@@ -4131,7 +4124,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3449
+#: using-d-i.xml:3448
 #, no-c-format
 msgid ""
 "After the login you will be presented with an initial screen where you have "
@@ -4144,7 +4137,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3459
+#: using-d-i.xml:3458
 #, no-c-format
 msgid ""
 "After you have started the installation remotely over SSH, you should not go "
@@ -4155,13 +4148,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3478
+#: using-d-i.xml:3477
 #, no-c-format
 msgid "Loading Missing Firmware"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3479
+#: using-d-i.xml:3478
 #, no-c-format
 msgid ""
 "As described in <xref linkend=\"hardware-firmware\"/>, some devices require "
@@ -4171,7 +4164,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3487
+#: using-d-i.xml:3486
 #, no-c-format
 msgid ""
 "If a device driver requests firmware that is not available, &d-i; will "
@@ -4183,7 +4176,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3497
+#: using-d-i.xml:3496
 #, no-c-format
 msgid ""
 "Which devices are scanned and which file systems are supported depends on "
@@ -4195,7 +4188,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3507
+#: using-d-i.xml:3506
 #, no-c-format
 msgid ""
 "Note that it is possible to skip loading the firmware if you know the device "
@@ -4204,7 +4197,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3513
+#: using-d-i.xml:3512
 #, no-c-format
 msgid ""
 "&d-i; only prompts for firmware needed by kernel modules loaded during the "
@@ -4218,13 +4211,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3527
+#: using-d-i.xml:3526
 #, no-c-format
 msgid "Preparing a medium"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3528
+#: using-d-i.xml:3527
 #, no-c-format
 msgid ""
 "Official CD images do not include non-free firmware. The most common method "
@@ -4239,7 +4232,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3541
+#: using-d-i.xml:3540
 #, no-c-format
 msgid ""
 "Tarballs and zip files containing current packages for the most common "
@@ -4250,7 +4243,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3555
+#: using-d-i.xml:3554
 #, no-c-format
 msgid ""
 "If the firmware you need is not included in the tarball, you can also "
@@ -4261,7 +4254,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3569
+#: using-d-i.xml:3568
 #, no-c-format
 msgid ""
 "It is also possible to copy individual firmware files to the medium. Loose "
@@ -4270,13 +4263,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3578
+#: using-d-i.xml:3577
 #, no-c-format
 msgid "Firmware and the Installed System"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3579
+#: using-d-i.xml:3578
 #, no-c-format
 msgid ""
 "Any firmware loaded during the installation will be copied automatically to "
@@ -4288,7 +4281,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3588
+#: using-d-i.xml:3587
 #, no-c-format
 msgid ""
 "If the firmware was loaded from a firmware package, &d-i; will also install "
@@ -4299,7 +4292,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3596
+#: using-d-i.xml:3595
 #, no-c-format
 msgid ""
 "If loading the firmware was skipped during the installation, the relevant "
@@ -4308,7 +4301,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3603
+#: using-d-i.xml:3602
 #, no-c-format
 msgid ""
 "If the firmware was loaded from loose firmware files, the firmware copied to "