Sync po|pot files after changings in en

54 files changed, 1795 insertions, 1617 deletions

diff --git a/po/ca/random-bits.po b/po/ca/random-bits.po
index eca53b60a..1f6ef4d87 100644
--- a/po/ca/random-bits.po
+++ b/po/ca/random-bits.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2019-06-17 22:40+0200\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: \n"
@@ -1445,7 +1445,18 @@ msgstr "Configurar Apt"
 
 #. Tag: para
 #: random-bits.xml:652
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debootstrap will have created a very basic <filename>/etc/apt/sources."
+#| "list</filename> that will allow installing additional packages. However, "
+#| "you may want to add some additional sources, for example for source "
+#| "packages and security updates: <informalexample><screen>\n"
+#| "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
+#| "\n"
+#| "deb http://security.debian.org/ &releasename;/updates main\n"
+#| "deb-src http://security.debian.org/ &releasename;/updates main\n"
+#| "</screen></informalexample> Make sure to run <userinput>apt update</"
+#| "userinput> after you have made changes to the sources list."
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
 "filename> that will allow installing additional packages. However, you may "
@@ -1453,8 +1464,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
diff --git a/po/cs/random-bits.po b/po/cs/random-bits.po
index 1d798672a..be9d8994f 100644
--- a/po/cs/random-bits.po
+++ b/po/cs/random-bits.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2018-05-21 10:18+0200\n"
 "Last-Translator: Miroslav Kure <kurem@upcase.inf.upol.cz>\n"
 "Language-Team: \n"
@@ -1474,7 +1474,18 @@ msgstr "Nastavení APT"
 
 #. Tag: para
 #: random-bits.xml:652
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debootstrap will have created a very basic <filename>/etc/apt/sources."
+#| "list</filename> that will allow installing additional packages. However, "
+#| "you may want to add some additional sources, for example for source "
+#| "packages and security updates: <informalexample><screen>\n"
+#| "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
+#| "\n"
+#| "deb http://security.debian.org/ &releasename;/updates main\n"
+#| "deb-src http://security.debian.org/ &releasename;/updates main\n"
+#| "</screen></informalexample> Make sure to run <userinput>apt update</"
+#| "userinput> after you have made changes to the sources list."
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
 "filename> that will allow installing additional packages. However, you may "
@@ -1482,8 +1493,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
diff --git a/po/da/random-bits.po b/po/da/random-bits.po
index 001e57941..53ce208a7 100644
--- a/po/da/random-bits.po
+++ b/po/da/random-bits.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2018-12-28 10:15+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -1437,7 +1437,18 @@ msgstr "Konfigurer Apt"
 
 #. Tag: para
 #: random-bits.xml:652
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debootstrap will have created a very basic <filename>/etc/apt/sources."
+#| "list</filename> that will allow installing additional packages. However, "
+#| "you may want to add some additional sources, for example for source "
+#| "packages and security updates: <informalexample><screen>\n"
+#| "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
+#| "\n"
+#| "deb http://security.debian.org/ &releasename;/updates main\n"
+#| "deb-src http://security.debian.org/ &releasename;/updates main\n"
+#| "</screen></informalexample> Make sure to run <userinput>apt update</"
+#| "userinput> after you have made changes to the sources list."
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
 "filename> that will allow installing additional packages. However, you may "
@@ -1445,8 +1456,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
diff --git a/po/de/random-bits.po b/po/de/random-bits.po
index 59b16eb63..1e4d731fa 100644
--- a/po/de/random-bits.po
+++ b/po/de/random-bits.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2019-09-28 09:10+0100\n"
 "Last-Translator: Holger Wansing <hwansing@mailbox.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1411,7 +1411,18 @@ msgstr "Apt konfigurieren"
 
 #. Tag: para
 #: random-bits.xml:652
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debootstrap will have created a very basic <filename>/etc/apt/sources."
+#| "list</filename> that will allow installing additional packages. However, "
+#| "you may want to add some additional sources, for example for source "
+#| "packages and security updates: <informalexample><screen>\n"
+#| "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
+#| "\n"
+#| "deb http://security.debian.org/ &releasename;/updates main\n"
+#| "deb-src http://security.debian.org/ &releasename;/updates main\n"
+#| "</screen></informalexample> Make sure to run <userinput>apt update</"
+#| "userinput> after you have made changes to the sources list."
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
 "filename> that will allow installing additional packages. However, you may "
@@ -1419,8 +1430,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
diff --git a/po/el/random-bits.po b/po/el/random-bits.po
index d2a0ee3a6..e730803ff 100644
--- a/po/el/random-bits.po
+++ b/po/el/random-bits.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2019-07-06 17:58+0200\n"
 "Last-Translator: galaxico <galas@tee.gr>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -1470,7 +1470,18 @@ msgstr "Ρύθμιση του Apt"
 
 #. Tag: para
 #: random-bits.xml:652
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debootstrap will have created a very basic <filename>/etc/apt/sources."
+#| "list</filename> that will allow installing additional packages. However, "
+#| "you may want to add some additional sources, for example for source "
+#| "packages and security updates: <informalexample><screen>\n"
+#| "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
+#| "\n"
+#| "deb http://security.debian.org/ &releasename;/updates main\n"
+#| "deb-src http://security.debian.org/ &releasename;/updates main\n"
+#| "</screen></informalexample> Make sure to run <userinput>apt update</"
+#| "userinput> after you have made changes to the sources list."
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
 "filename> that will allow installing additional packages. However, you may "
@@ -1478,8 +1489,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
diff --git a/po/es/random-bits.po b/po/es/random-bits.po
index a62dccd7b..bdfee7ebc 100644
--- a/po/es/random-bits.po
+++ b/po/es/random-bits.po
@@ -36,7 +36,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2019-11-28 17:05+0000\n"
 "Last-Translator: Adolfo Jayme Barrientos <fitojb@ubuntu.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1575,8 +1575,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
diff --git a/po/fi/random-bits.po b/po/fi/random-bits.po
index 4327f88c8..908293d13 100644
--- a/po/fi/random-bits.po
+++ b/po/fi/random-bits.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian Installation Guide random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2010-05-11 08:40+0300\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -1518,8 +1518,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
diff --git a/po/fr/random-bits.po b/po/fr/random-bits.po
index 38b31cf74..329d4d385 100644
--- a/po/fr/random-bits.po
+++ b/po/fr/random-bits.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2019-10-15 12:14+0100\n"
 "Last-Translator: Baptiste Jammet <baptiste@mailoo.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1395,7 +1395,18 @@ msgstr "Configurer Apt"
 
 #. Tag: para
 #: random-bits.xml:652
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debootstrap will have created a very basic <filename>/etc/apt/sources."
+#| "list</filename> that will allow installing additional packages. However, "
+#| "you may want to add some additional sources, for example for source "
+#| "packages and security updates: <informalexample><screen>\n"
+#| "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
+#| "\n"
+#| "deb http://security.debian.org/ &releasename;/updates main\n"
+#| "deb-src http://security.debian.org/ &releasename;/updates main\n"
+#| "</screen></informalexample> Make sure to run <userinput>apt update</"
+#| "userinput> after you have made changes to the sources list."
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
 "filename> that will allow installing additional packages. However, you may "
@@ -1403,8 +1414,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
diff --git a/po/hu/random-bits.po b/po/hu/random-bits.po
index 09ac49ce0..551cf7f84 100644
--- a/po/hu/random-bits.po
+++ b/po/hu/random-bits.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2014-03-09 23:25+0100\n"
 "Last-Translator: Judit Gyimesi <judit.gyimesi.x@gmail.com>\n"
 "Language-Team: Hungarian\n"
@@ -1515,8 +1515,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
diff --git a/po/it/random-bits.po b/po/it/random-bits.po
index 8e9935c66..95dbbbcb3 100644
--- a/po/it/random-bits.po
+++ b/po/it/random-bits.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2019-09-26 22:44+0200\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -1397,7 +1397,18 @@ msgstr "Configurazione di Apt"
 
 #. Tag: para
 #: random-bits.xml:652
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debootstrap will have created a very basic <filename>/etc/apt/sources."
+#| "list</filename> that will allow installing additional packages. However, "
+#| "you may want to add some additional sources, for example for source "
+#| "packages and security updates: <informalexample><screen>\n"
+#| "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
+#| "\n"
+#| "deb http://security.debian.org/ &releasename;/updates main\n"
+#| "deb-src http://security.debian.org/ &releasename;/updates main\n"
+#| "</screen></informalexample> Make sure to run <userinput>apt update</"
+#| "userinput> after you have made changes to the sources list."
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
 "filename> that will allow installing additional packages. However, you may "
@@ -1405,8 +1416,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
diff --git a/po/ja/random-bits.po b/po/ja/random-bits.po
index 7e84c8ca5..da03c2e2f 100644
--- a/po/ja/random-bits.po
+++ b/po/ja/random-bits.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2018-12-22 14:40+0900\n"
 "Last-Translator: Hideki Yamane <henrich@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -1420,7 +1420,18 @@ msgstr "apt の設定"
 
 #. Tag: para
 #: random-bits.xml:652
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debootstrap will have created a very basic <filename>/etc/apt/sources."
+#| "list</filename> that will allow installing additional packages. However, "
+#| "you may want to add some additional sources, for example for source "
+#| "packages and security updates: <informalexample><screen>\n"
+#| "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
+#| "\n"
+#| "deb http://security.debian.org/ &releasename;/updates main\n"
+#| "deb-src http://security.debian.org/ &releasename;/updates main\n"
+#| "</screen></informalexample> Make sure to run <userinput>apt update</"
+#| "userinput> after you have made changes to the sources list."
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
 "filename> that will allow installing additional packages. However, you may "
@@ -1428,8 +1439,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
diff --git a/po/ko/random-bits.po b/po/ko/random-bits.po
index 8d8c6b7a4..eb5881458 100644
--- a/po/ko/random-bits.po
+++ b/po/ko/random-bits.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: random-bits.xml\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2019-06-03 02:08+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -1413,7 +1413,18 @@ msgstr "APT 설정하기"
 
 #. Tag: para
 #: random-bits.xml:652
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debootstrap will have created a very basic <filename>/etc/apt/sources."
+#| "list</filename> that will allow installing additional packages. However, "
+#| "you may want to add some additional sources, for example for source "
+#| "packages and security updates: <informalexample><screen>\n"
+#| "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
+#| "\n"
+#| "deb http://security.debian.org/ &releasename;/updates main\n"
+#| "deb-src http://security.debian.org/ &releasename;/updates main\n"
+#| "</screen></informalexample> Make sure to run <userinput>apt update</"
+#| "userinput> after you have made changes to the sources list."
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
 "filename> that will allow installing additional packages. However, you may "
@@ -1421,8 +1432,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
diff --git a/po/nb/administrivia.po b/po/nb/administrivia.po
index b80326230..2847de375 100644
--- a/po/nb/administrivia.po
+++ b/po/nb/administrivia.po
@@ -51,8 +51,8 @@ msgid ""
 "classname> and <classname>docbook-xsl</classname> packages."
 msgstr ""
 "Dette dokumentet er skrevet i DocBook-XML. Utdataformater er generert av "
-"forskjellige programmer ved bruk av info fra <classname>docbook-"
-"xml</classname> og <classname>docbook-xsl</classname> -pakkene."
+"forskjellige programmer ved bruk av info fra <classname>docbook-xml</"
+"classname> og <classname>docbook-xsl</classname> -pakkene."
 
 #. Tag: para
 #: administrivia.xml:25
@@ -108,13 +108,13 @@ msgid ""
 "reported bug."
 msgstr ""
 "Hvis du har problemer eller forslag til dette dokumentet, bør du antagelig "
-"sende dem inn som feilrapporter mot pakken <classname>installation-"
-"guide</classname>. Sjekk <classname>reportbug</classname>-pakken, eller les "
-"den nettbaserte dokumentasjonen tilhørende <ulink url=\"&url-bts;\">Debian-"
-"feilsporingssystemet</ulink>. Det hadde vært fint om du kunne se etter <"
-"ulink url=\"&url-bts;installation-guide\">åpne feil i installation-"
-"guide</ulink> for å se om problemet allerede har blitt innrapportert. Hvis "
-"så er tilfelle, kan du angi ytterligere utledende eller nyttig info til "
+"sende dem inn som feilrapporter mot pakken <classname>installation-guide</"
+"classname>. Sjekk <classname>reportbug</classname>-pakken, eller les den "
+"nettbaserte dokumentasjonen tilhørende <ulink url=\"&url-bts;\">Debian-"
+"feilsporingssystemet</ulink>. Det hadde vært fint om du kunne se etter "
+"<ulink url=\"&url-bts;installation-guide\">åpne feil i installation-guide</"
+"ulink> for å se om problemet allerede har blitt innrapportert. Hvis så er "
+"tilfelle, kan du angi ytterligere utledende eller nyttig info til "
 "<email><replaceable>XXXX</replaceable>@bugs.debian.org</email>, der "
 "<replaceable>XXXX</replaceable> er nummeret for den allerede innrapporterte "
 "feilen."
diff --git a/po/nb/bookinfo.po b/po/nb/bookinfo.po
index 3696ece7c..7a2939414 100644
--- a/po/nb/bookinfo.po
+++ b/po/nb/bookinfo.po
@@ -53,8 +53,8 @@ msgid ""
 "may also be able to find additional translations there."
 msgstr ""
 "Denne installasjonskandidaten er basert på den tidligere manualen skrevet "
-"for det gamle Debian-installasjonssystemet (<quote>oppstartsdisketter</quote>"
-", og har blitt oppdatert for å dokumentere den nye Debian-"
+"for det gamle Debian-installasjonssystemet (<quote>oppstartsdisketter</"
+"quote>, og har blitt oppdatert for å dokumentere den nye Debian-"
 "installasjonskandidaten. Dog for &architecture;, har ikke manualen blitt "
 "oppdatert helt, og ei heller faktasjekket for den nye "
 "installasjonskandidaten. Deler av manualen er ufullstendig eller utdatert, "
@@ -96,10 +96,9 @@ msgstr ""
 "nåværende form er det ingen som arbeider med å oppdatere den. Ha dette i "
 "minnet siden det kan hende den inneholder feilaktig og foreldet info. Les "
 "eler dobbelsjekk den engelske varianten, hvis du er usikker. Hvis du kan "
-"hjelpe oss med å oppdatere oversettelsen, kontakt <email>debian-"
-"boot@lists.debian.org</email> eller <ulink url=\"https://lists.debian.org/"
-"i18n.html\">debian-l10n-xxx mailinglist</ulink> for dette språket. Mange "
-"takk."
+"hjelpe oss med å oppdatere oversettelsen, kontakt <email>debian-boot@lists."
+"debian.org</email> eller <ulink url=\"https://lists.debian.org/i18n.html"
+"\">debian-l10n-xxx mailinglist</ulink> for dette språket. Mange takk."
 
 #. Tag: para
 #: bookinfo.xml:53
@@ -111,9 +110,9 @@ msgid ""
 "should be sent!). See build/lang-options/README on how to enable this "
 "paragraph. Its condition is \"translation-status\"."
 msgstr ""
-"Oversettelse ved <emphasis>Allan Nordhøy "
-"&lt;epost@anotheragency.no&gt;</emphasis>, med flere. Vi jobber med saken. "
-"https://hosted.weblate.org/languages/nb_NO/debian-installation-guide/"
+"Oversettelse ved <emphasis>Allan Nordhøy &lt;epost@anotheragency.no&gt;</"
+"emphasis>, med flere. Vi jobber med saken. https://hosted.weblate.org/"
+"languages/nb_NO/debian-installation-guide/"
 
 #. Tag: holder
 #: bookinfo.xml:66
diff --git a/po/nb/boot-installer.po b/po/nb/boot-installer.po
index c199b0b87..8c88c79eb 100644
--- a/po/nb/boot-installer.po
+++ b/po/nb/boot-installer.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: boot-installer_nb\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-09-22 23:04+0000\n"
 "PO-Revision-Date: 2019-08-31 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Norwegian Bokmål\n"
+"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
@@ -160,10 +160,10 @@ msgstr ""
 #: boot-installer.xml:116
 #, no-c-format
 msgid ""
-"Prepare a standard arm64 CD image on a USB stick. Insert it in one of the "
-"USB ports on the back. Plug a serial cable into the upper 9-pin serial port "
-"on the back. If you need networking (netboot image) plug the ethernet cable "
-"into the socket on the front of the machine."
+"Prepare a standard arm64 CD/DVD image on a USB stick. Insert it in one of "
+"the USB ports on the back. Plug a serial cable into the upper 9-pin serial "
+"port on the back. If you need networking (netboot image) plug the ethernet "
+"cable into the socket on the front of the machine."
 msgstr ""
 
 #. Tag: para
@@ -226,8 +226,8 @@ msgid "Booting by TFTP"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:169 boot-installer.xml:779 boot-installer.xml:1416
-#: boot-installer.xml:1546 boot-installer.xml:1939
+#: boot-installer.xml:169 boot-installer.xml:778 boot-installer.xml:1415
+#: boot-installer.xml:1545 boot-installer.xml:1938
 #, no-c-format
 msgid ""
 "Booting from the network requires that you have a network connection and a "
@@ -236,8 +236,8 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:175 boot-installer.xml:785 boot-installer.xml:1422
-#: boot-installer.xml:1552 boot-installer.xml:1945
+#: boot-installer.xml:175 boot-installer.xml:784 boot-installer.xml:1421
+#: boot-installer.xml:1551 boot-installer.xml:1944
 #, no-c-format
 msgid ""
 "Older systems such as the 715 might require the use of an RBOOT server "
@@ -245,8 +245,8 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:180 boot-installer.xml:790 boot-installer.xml:1427
-#: boot-installer.xml:1557 boot-installer.xml:1950
+#: boot-installer.xml:180 boot-installer.xml:789 boot-installer.xml:1426
+#: boot-installer.xml:1556 boot-installer.xml:1949
 #, no-c-format
 msgid ""
 "The server-side setup to support network booting is described in <xref "
@@ -594,45 +594,46 @@ msgid "Booting from USB Memory Stick"
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:573 boot-installer.xml:1030 boot-installer.xml:1973
+#: boot-installer.xml:573
 #, no-c-format
-msgid "Booting from a CD-ROM"
+msgid "Booting from optical disc (CD/DVD)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:579 boot-installer.xml:1036 boot-installer.xml:1979
+#: boot-installer.xml:579 boot-installer.xml:1035 boot-installer.xml:1978
 #, no-c-format
 msgid ""
-"If you have a CD set, and if your machine supports booting directly off the "
-"CD, great! Simply <phrase arch=\"x86\"> configure your system for booting "
-"off a CD as described in <xref linkend=\"boot-dev-select-x86\"/>, </phrase> "
-"insert your CD, reboot, and proceed to the next chapter."
+"If you have a set of optical discs, and your machine supports booting "
+"directly off those, great! Simply <phrase arch=\"x86\"> configure your "
+"system for booting off an optical disc as described in <xref linkend=\"boot-"
+"dev-select-x86\"/>, </phrase> insert the disc, reboot, and proceed to the "
+"next chapter."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:589 boot-installer.xml:1046 boot-installer.xml:1989
+#: boot-installer.xml:589 boot-installer.xml:1045 boot-installer.xml:1988
 #, no-c-format
 msgid ""
-"Note that certain CD drives may require special drivers, and thus be "
+"Note that certain optical drives may require special drivers, and thus be "
 "inaccessible in the early installation stages. If it turns out the standard "
-"way of booting off a CD doesn't work for your hardware, revisit this chapter "
-"and read about alternate kernels and installation methods which may work for "
-"you."
+"way of booting off an optical disc doesn't work for your hardware, revisit "
+"this chapter and read about alternate kernels and installation methods which "
+"may work for you."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:597 boot-installer.xml:1054 boot-installer.xml:1997
+#: boot-installer.xml:597 boot-installer.xml:1053 boot-installer.xml:1996
 #, no-c-format
 msgid ""
-"Even if you cannot boot from CD-ROM, you can probably install the &debian; "
-"system components and any packages you want from CD-ROM. Simply boot using a "
-"different medium and when it's time to install the operating system, base "
-"system, and any additional packages, point the installation system at the CD-"
-"ROM drive."
+"Even if you cannot boot from optical disc, you can probably install the "
+"&debian; system components and any packages you want from such disc. Simply "
+"boot using a different medium and when it's time to install the operating "
+"system, base system, and any additional packages, point the installation "
+"system at the optical drive."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:605 boot-installer.xml:1062 boot-installer.xml:2005
+#: boot-installer.xml:605 boot-installer.xml:1061 boot-installer.xml:2004
 #, no-c-format
 msgid ""
 "If you have problems booting, see <xref linkend=\"boot-troubleshooting\"/>."
@@ -654,14 +655,13 @@ msgstr ""
 #: boot-installer.xml:621
 #, no-c-format
 msgid ""
-"obtain CD-ROM/DVD-ROM<phrase condition=\"bootable-usb\"> or USB memory "
-"stick</phrase> installation media as described in <xref linkend=\"official-"
-"cdrom\"/><phrase condition=\"bootable-usb\"> respective <xref linkend=\"boot-"
-"usb-files\"/></phrase> or"
+"obtain installation media as described in <xref linkend=\"official-cdrom\"/"
+"><phrase condition=\"bootable-usb\"> or <xref linkend=\"boot-usb-files\"/></"
+"phrase> or"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:629
+#: boot-installer.xml:628
 #, no-c-format
 msgid ""
 "download a standalone Windows executable, which is available as <ulink url="
@@ -670,10 +670,10 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:638
+#: boot-installer.xml:637
 #, no-c-format
 msgid ""
-"If you use an installation CD or DVD, a pre-installation program should be "
+"If you use optical installation media, a pre-installation program should be "
 "launched automatically when you insert the disc. In case Windows does not "
 "start it automatically, or if you are using a USB memory stick, you can run "
 "it manually by accessing the device and executing <command>setup.exe</"
@@ -681,7 +681,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:646
+#: boot-installer.xml:645
 #, no-c-format
 msgid ""
 "After the program has been started, a few preliminary questions will be "
@@ -690,13 +690,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:656
+#: boot-installer.xml:655
 #, no-c-format
 msgid "Booting from DOS using loadlin"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:657
+#: boot-installer.xml:656
 #, no-c-format
 msgid ""
 "Boot into DOS (not Windows). To do this, you can for instance boot from a "
@@ -704,7 +704,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:662
+#: boot-installer.xml:661
 #, no-c-format
 msgid ""
 "If you can access the installation CD, change the current drive to the CD-"
@@ -716,7 +716,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:672
+#: boot-installer.xml:671
 #, no-c-format
 msgid ""
 "Enter the subdirectory for the flavor you chose, e.g., "
@@ -730,14 +730,14 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:690
+#: boot-installer.xml:689
 #, no-c-format
 msgid ""
 "Booting from Linux using <command>LILO</command> or <command>GRUB</command>"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:693
+#: boot-installer.xml:692
 #, no-c-format
 msgid ""
 "To boot the installer from hard disk, you must first download and place the "
@@ -745,7 +745,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:698
+#: boot-installer.xml:697
 #, no-c-format
 msgid ""
 "If you intend to use the hard drive only for booting and then download "
@@ -757,19 +757,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:708
+#: boot-installer.xml:707
 #, no-c-format
 msgid ""
 "Alternatively, if you intend to keep an existing partition on the hard drive "
 "unchanged during the install, you can download the <filename>hd-media/initrd."
-"gz</filename> file and its kernel, as well as copy a CD (or DVD) iso to the "
-"drive (make sure the file is named ending in <literal>.iso</literal>). The "
-"installer can then boot from the drive and install from the CD/DVD image, "
-"without needing the network."
+"gz</filename> file and its kernel, as well as copy an installation image to "
+"the hard drive (make sure the file is named ending in <literal>.iso</"
+"literal>). The installer can then boot from the hard drive and install from "
+"the installation image, without needing the network."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:717
+#: boot-installer.xml:716
 #, no-c-format
 msgid ""
 "For <command>LILO</command>, you will need to configure two essential things "
@@ -781,7 +781,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: boot-installer.xml:738
+#: boot-installer.xml:737
 #, no-c-format
 msgid ""
 "image=/boot/newinstall/vmlinuz\n"
@@ -790,7 +790,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:738
+#: boot-installer.xml:737
 #, no-c-format
 msgid ""
 "For more details, refer to the <citerefentry><refentrytitle>initrd</"
@@ -801,7 +801,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:747
+#: boot-installer.xml:746
 #, no-c-format
 msgid ""
 "The procedure for <command>GRUB1</command> is quite similar. Locate your "
@@ -812,7 +812,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: boot-installer.xml:755
+#: boot-installer.xml:754
 #, no-c-format
 msgid ""
 "title  New Install\n"
@@ -822,7 +822,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:757
+#: boot-installer.xml:756
 #, no-c-format
 msgid ""
 "The procedure for <command>GRUB2</command> is very similar. The file is "
@@ -831,7 +831,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: boot-installer.xml:763
+#: boot-installer.xml:762
 #, no-c-format
 msgid ""
 "menuentry 'New Install' {\n"
@@ -844,7 +844,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:765
+#: boot-installer.xml:764
 #, no-c-format
 msgid ""
 "From here on, there should be no difference between <command>GRUB</command> "
@@ -852,26 +852,26 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:773 boot-installer.xml:1398 boot-installer.xml:1540
-#: boot-installer.xml:1933
+#: boot-installer.xml:772 boot-installer.xml:1397 boot-installer.xml:1539
+#: boot-installer.xml:1932
 #, no-c-format
 msgid "Booting with TFTP"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:798
+#: boot-installer.xml:797
 #, no-c-format
 msgid "There are various ways to do a TFTP boot on i386."
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:804
+#: boot-installer.xml:803
 #, no-c-format
 msgid "NIC or Motherboard that support PXE"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:805
+#: boot-installer.xml:804
 #, no-c-format
 msgid ""
 "It could be that your Network Interface Card or Motherboard provides PXE "
@@ -881,13 +881,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:816
+#: boot-installer.xml:815
 #, no-c-format
 msgid "NIC with Network BootROM"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:817
+#: boot-installer.xml:816
 #, no-c-format
 msgid ""
 "It could be that your Network Interface Card provides TFTP boot "
@@ -895,7 +895,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:822
+#: boot-installer.xml:821
 #, no-c-format
 msgid ""
 "Let us (<email>&email-debian-boot-list;</email>) know how did you manage it. "
@@ -903,13 +903,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:830
+#: boot-installer.xml:829
 #, no-c-format
 msgid "Etherboot"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:831
+#: boot-installer.xml:830
 #, no-c-format
 msgid ""
 "The <ulink url=\"http://www.etherboot.org\">etherboot project</ulink> "
@@ -917,13 +917,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:841
+#: boot-installer.xml:840
 #, no-c-format
 msgid "The Boot Screen"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:842
+#: boot-installer.xml:841
 #, no-c-format
 msgid ""
 "When the installer boots, you should be presented with a friendly graphical "
@@ -931,7 +931,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: boot-installer.xml:847
+#: boot-installer.xml:846
 #, no-c-format
 msgid ""
 "&debian-gnu; installer boot menu\n"
@@ -944,7 +944,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:851
+#: boot-installer.xml:850
 #, no-c-format
 msgid ""
 "This graphical screen will look very slightly different depending on how "
@@ -952,7 +952,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:859
+#: boot-installer.xml:858
 #, no-c-format
 msgid ""
 "Depending on the installation method you are using, the <quote>Graphical "
@@ -962,7 +962,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:866
+#: boot-installer.xml:865
 #, no-c-format
 msgid ""
 "For a normal installation, select either the <quote>Graphical install</"
@@ -973,7 +973,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:874
+#: boot-installer.xml:873
 #, no-c-format
 msgid ""
 "The <quote>Advanced options</quote> entry gives access to a second menu that "
@@ -982,7 +982,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:880
+#: boot-installer.xml:879
 #, no-c-format
 msgid ""
 "If you wish or need to add any boot parameters for either the installer or "
@@ -996,7 +996,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:893
+#: boot-installer.xml:892
 #, no-c-format
 msgid ""
 "Choosing the <quote>Help</quote> entry will result in the first help screen "
@@ -1016,7 +1016,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:911
+#: boot-installer.xml:910
 #, no-c-format
 msgid ""
 "The keyboard is assumed to have a default American English layout at this "
@@ -1028,7 +1028,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:921
+#: boot-installer.xml:920
 #, no-c-format
 msgid ""
 "If you are using a system that has the BIOS configured to use serial "
@@ -1041,7 +1041,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:931
+#: boot-installer.xml:930
 #, no-c-format
 msgid ""
 "To bypass the graphical boot screen you can either blindly press &escapekey; "
@@ -1054,13 +1054,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:947
+#: boot-installer.xml:946
 #, no-c-format
 msgid "The Graphical Installer"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:948
+#: boot-installer.xml:947
 #, no-c-format
 msgid ""
 "The graphical version of the installer is only available for a limited "
@@ -1071,7 +1071,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:956
+#: boot-installer.xml:955
 #, no-c-format
 msgid ""
 "Although the functionality is identical, the graphical installer still has a "
@@ -1083,10 +1083,10 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:965
+#: boot-installer.xml:964
 #, no-c-format
 msgid ""
-"The graphical installer is available with all CD images and with the hd-"
+"The graphical installer is available with all CD/DVD images and with the hd-"
 "media installation method. To boot the graphical installer simply select the "
 "relevant option from the boot menu. Expert and rescue mode for the graphical "
 "installer can be selected from the <quote>Advanced options</quote> menu. The "
@@ -1097,7 +1097,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:976
+#: boot-installer.xml:975
 #, no-c-format
 msgid ""
 "There is also a graphical installer image that can be netbooted. And there "
@@ -1109,7 +1109,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:989
+#: boot-installer.xml:988
 #, no-c-format
 msgid ""
 "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
@@ -1121,7 +1121,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1003
+#: boot-installer.xml:1002
 #, no-c-format
 msgid ""
 "Just as with the text-based installer it is possible to add boot parameters "
@@ -1129,7 +1129,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1009
+#: boot-installer.xml:1008
 #, no-c-format
 msgid ""
 "The graphical installer requires significantly more memory to run than the "
@@ -1139,7 +1139,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1016
+#: boot-installer.xml:1015
 #, no-c-format
 msgid ""
 "If the amount of memory in your system is below &minimum-memory;, the "
@@ -1149,13 +1149,19 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1070
+#: boot-installer.xml:1029 boot-installer.xml:1972
+#, no-c-format
+msgid "Booting from a CD-ROM"
+msgstr ""
+
+#. Tag: title
+#: boot-installer.xml:1069
 #, no-c-format
 msgid "CD Contents"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1072
+#: boot-installer.xml:1071
 #, no-c-format
 msgid ""
 "There are three basic variations of &debian; Install CDs. The "
@@ -1170,7 +1176,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1088
+#: boot-installer.xml:1087
 #, no-c-format
 msgid ""
 "The IA-64 architecture uses the next generation Extensible Firmware "
@@ -1186,7 +1192,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1104
+#: boot-installer.xml:1103
 #, no-c-format
 msgid ""
 "The &debian; Installer CD contains a small EFI partition where the "
@@ -1197,7 +1203,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1113
+#: boot-installer.xml:1112
 #, no-c-format
 msgid ""
 "Most of the details of how <command>ELILO</command> actually loads and "
@@ -1211,7 +1217,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1125
+#: boot-installer.xml:1124
 #, no-c-format
 msgid ""
 "The EFI Boot Manager is presented as the last step of the firmware "
@@ -1226,13 +1232,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1144
+#: boot-installer.xml:1143
 #, no-c-format
 msgid "IMPORTANT"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1145
+#: boot-installer.xml:1144
 #, no-c-format
 msgid ""
 "The EFI Boot Manager will select a default boot action, typically the first "
@@ -1245,13 +1251,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1157
+#: boot-installer.xml:1156
 #, no-c-format
 msgid "Option 1: Booting from the Boot Option Maintenance Menu"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1164
+#: boot-installer.xml:1163
 #, no-c-format
 msgid ""
 "Insert the CD in the DVD/CD drive and reboot the machine. The firmware will "
@@ -1260,7 +1266,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1170
+#: boot-installer.xml:1169
 #, no-c-format
 msgid ""
 "Select <command>Boot Maintenance Menu</command> from the menu with the arrow "
@@ -1268,7 +1274,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1176
+#: boot-installer.xml:1175
 #, no-c-format
 msgid ""
 "Select <command>Boot From a File</command> from the menu with the arrow keys "
@@ -1280,7 +1286,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1187
+#: boot-installer.xml:1186
 #, no-c-format
 msgid ""
 "You can choose either of the entries that refer to the CD/DVD drive. Select "
@@ -1292,7 +1298,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1198
+#: boot-installer.xml:1197
 #, no-c-format
 msgid ""
 "You will only need this step if you chose <command>Debian Inst [Acpi ...</"
@@ -1303,7 +1309,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1210
+#: boot-installer.xml:1209
 #, no-c-format
 msgid ""
 "These steps start the &debian; boot loader which will display a menu page "
@@ -1312,13 +1318,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1220
+#: boot-installer.xml:1219
 #, no-c-format
 msgid "Option 2: Booting from the EFI Shell"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1221
+#: boot-installer.xml:1220
 #, no-c-format
 msgid ""
 "If, for some reason, option 1 is not successful, reboot the machine and when "
@@ -1328,7 +1334,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1232
+#: boot-installer.xml:1231
 #, no-c-format
 msgid ""
 "Insert the CD in the DVD/CD drive and reboot the machine. The firmware will "
@@ -1337,7 +1343,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1238
+#: boot-installer.xml:1237
 #, no-c-format
 msgid ""
 "Select <command>EFI Shell</command> from the menu with the arrow keys and "
@@ -1351,7 +1357,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1252
+#: boot-installer.xml:1251
 #, no-c-format
 msgid ""
 "Examine the output from the shell looking for the CDROM drive. It is most "
@@ -1361,7 +1367,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1259
+#: boot-installer.xml:1258
 #, no-c-format
 msgid ""
 "Enter <command>fs<replaceable>n</replaceable>:</command> and press "
@@ -1371,7 +1377,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1266
+#: boot-installer.xml:1265
 #, no-c-format
 msgid ""
 "Enter <command>elilo</command> and press <command>ENTER</command>. This will "
@@ -1379,7 +1385,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1273
+#: boot-installer.xml:1272
 #, no-c-format
 msgid ""
 "As with option 1, these steps start the &debian; boot loader which will "
@@ -1390,13 +1396,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1287
+#: boot-installer.xml:1286
 #, no-c-format
 msgid "Installing using a Serial Console"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1289
+#: boot-installer.xml:1288
 #, no-c-format
 msgid ""
 "You may choose to perform an install using a monitor and keyboard or using a "
@@ -1409,7 +1415,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1300
+#: boot-installer.xml:1299
 #, no-c-format
 msgid ""
 "In most circumstances, you will want the installer to use the same baud rate "
@@ -1419,7 +1425,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1307
+#: boot-installer.xml:1306
 #, no-c-format
 msgid ""
 "If there is not an option available that is configured for the serial device "
@@ -1430,7 +1436,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1318
+#: boot-installer.xml:1317
 #, no-c-format
 msgid ""
 "Most IA-64 boxes ship with a default console setting of 9600 baud. This "
@@ -1442,7 +1448,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1327
+#: boot-installer.xml:1326
 #, no-c-format
 msgid ""
 "If you select the wrong console type, you will be able to select the kernel "
@@ -1452,13 +1458,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1336
+#: boot-installer.xml:1335
 #, no-c-format
 msgid "Selecting the Boot Kernel and Options"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1338
+#: boot-installer.xml:1337
 #, no-c-format
 msgid ""
 "The boot loader will display a form with a menu list and a text window with "
@@ -1471,7 +1477,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1350
+#: boot-installer.xml:1349
 #, no-c-format
 msgid ""
 "Consult the <classname>General</classname> help screen for the description "
@@ -1486,7 +1492,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1368
+#: boot-installer.xml:1367
 #, no-c-format
 msgid ""
 "Select the kernel version and installation mode most appropriate to your "
@@ -1494,7 +1500,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1373
+#: boot-installer.xml:1372
 #, no-c-format
 msgid ""
 "Enter any boot parameters by typing at the keyboard. The text will be "
@@ -1503,7 +1509,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1380
+#: boot-installer.xml:1379
 #, no-c-format
 msgid ""
 "Press <command>ENTER</command>. This will load and start the kernel. The "
@@ -1512,7 +1518,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1389 boot-installer.xml:1526
+#: boot-installer.xml:1388 boot-installer.xml:1525
 #, no-c-format
 msgid ""
 "Proceed to the next chapter to continue the installation where you will set "
@@ -1520,7 +1526,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1400
+#: boot-installer.xml:1399
 #, no-c-format
 msgid ""
 "Booting an IA-64 system from the network is similar to a CD boot. The only "
@@ -1533,7 +1539,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1435
+#: boot-installer.xml:1434
 #, no-c-format
 msgid ""
 "Network booting an IA-64 system requires two architecture-specific actions. "
@@ -1543,13 +1549,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1446
+#: boot-installer.xml:1445
 #, no-c-format
 msgid "Configuring the Server"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1447
+#: boot-installer.xml:1446
 #, no-c-format
 msgid ""
 "A suitable TFTP entry for network booting an IA-64 system looks something "
@@ -1564,7 +1570,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1457
+#: boot-installer.xml:1456
 #, no-c-format
 msgid ""
 "Extract the <filename>netboot.tar.gz</filename> file into the directory used "
@@ -1575,7 +1581,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: boot-installer.xml:1467
+#: boot-installer.xml:1466
 #, no-c-format
 msgid ""
 "# cd /var/lib/tftp\n"
@@ -1587,7 +1593,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1467
+#: boot-installer.xml:1466
 #, no-c-format
 msgid ""
 "The <filename>netboot.tar.gz</filename> contains an <filename>elilo.conf</"
@@ -1601,13 +1607,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1484
+#: boot-installer.xml:1483
 #, no-c-format
 msgid "Configuring the Client"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1485
+#: boot-installer.xml:1484
 #, no-c-format
 msgid ""
 "To configure the client to support TFTP booting, start by booting to EFI and "
@@ -1625,7 +1631,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1517
+#: boot-installer.xml:1516
 #, no-c-format
 msgid ""
 "The boot loader will display its prompt after it has downloaded and "
@@ -1636,13 +1642,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1571
+#: boot-installer.xml:1570
 #, no-c-format
 msgid "S/390 Limitations"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1572
+#: boot-installer.xml:1571
 #, no-c-format
 msgid ""
 "In order to run the installation system a working network setup and ssh "
@@ -1650,7 +1656,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1577
+#: boot-installer.xml:1576
 #, no-c-format
 msgid ""
 "The booting process starts with a network setup that prompts you for several "
@@ -1660,13 +1666,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1588
+#: boot-installer.xml:1587
 #, no-c-format
 msgid "S/390 Boot Parameters"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1589
+#: boot-installer.xml:1588
 #, no-c-format
 msgid ""
 "On S/390 you can append boot parameters in the parm file. This file can "
@@ -1679,7 +1685,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1606
+#: boot-installer.xml:1605
 #, no-c-format
 msgid ""
 "If you boot the installer in a logical partition (LPAR) or virtual machine "
@@ -1702,25 +1708,25 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1891
+#: boot-installer.xml:1890
 #, no-c-format
 msgid "Booting a ppc64el machine"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1892
+#: boot-installer.xml:1891
 #, no-c-format
 msgid "How to boot a ppc64el machine:"
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1898
+#: boot-installer.xml:1897
 #, no-c-format
 msgid "Petitboot"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1899
+#: boot-installer.xml:1898
 #, no-c-format
 msgid ""
 "Petitboot is a platform independent bootloader based on the Linux kexec. "
@@ -1731,7 +1737,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1907
+#: boot-installer.xml:1906
 #, no-c-format
 msgid ""
 "Petitboot looks for bootloader configuration files on mountable devices in "
@@ -1740,7 +1746,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1958
+#: boot-installer.xml:1957
 #, no-c-format
 msgid ""
 "On machines with OpenBoot, simply enter the boot monitor on the machine "
@@ -1753,7 +1759,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2012
+#: boot-installer.xml:2011
 #, no-c-format
 msgid ""
 "Most OpenBoot versions support the <userinput>boot cdrom</userinput> command "
@@ -1762,13 +1768,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2021
+#: boot-installer.xml:2020
 #, no-c-format
 msgid "IDPROM Messages"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2022
+#: boot-installer.xml:2021
 #, no-c-format
 msgid ""
 "If you cannot boot because you get messages about a problem with "
@@ -1779,13 +1785,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2041
+#: boot-installer.xml:2040
 #, no-c-format
 msgid "Accessibility"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2042
+#: boot-installer.xml:2041
 #, no-c-format
 msgid ""
 "Some users may need specific support because of e.g. some visual impairment. "
@@ -1803,13 +1809,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2062
+#: boot-installer.xml:2061
 #, no-c-format
 msgid "Installer front-end"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2063
+#: boot-installer.xml:2062
 #, no-c-format
 msgid ""
 "The &debian; installer supports several front-ends for asking questions, "
@@ -1821,13 +1827,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2075
+#: boot-installer.xml:2074
 #, no-c-format
 msgid "USB Braille Displays"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2076
+#: boot-installer.xml:2075
 #, no-c-format
 msgid ""
 "USB braille displays should be automatically detected. A textual version of "
@@ -1841,13 +1847,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2091
+#: boot-installer.xml:2090
 #, no-c-format
 msgid "Serial Braille Displays"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2092
+#: boot-installer.xml:2091
 #, no-c-format
 msgid ""
 "Serial braille displays cannot safely be automatically detected (since that "
@@ -1872,13 +1878,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2119 boot-installer.xml:3109
+#: boot-installer.xml:2118 boot-installer.xml:3107
 #, no-c-format
 msgid "Software Speech Synthesis"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2120
+#: boot-installer.xml:2119
 #, no-c-format
 msgid ""
 "Support for software speech synthesis is available on all installer images "
@@ -1890,7 +1896,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2129
+#: boot-installer.xml:2128
 #, no-c-format
 msgid ""
 "If several sound cards are detected, you will be prompted to press "
@@ -1898,7 +1904,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2134
+#: boot-installer.xml:2133
 #, no-c-format
 msgid ""
 "The first question (language) is spoken in english, and the remainder of "
@@ -1907,7 +1913,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2140
+#: boot-installer.xml:2139
 #, no-c-format
 msgid ""
 "The default speech rate is quite slow. To make it faster, press "
@@ -1925,13 +1931,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2168
+#: boot-installer.xml:2167
 #, no-c-format
 msgid "Hardware Speech Synthesis"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2169
+#: boot-installer.xml:2168
 #, no-c-format
 msgid ""
 "Support for hardware speech synthesis devices is available on all installer "
@@ -1941,7 +1947,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2176
+#: boot-installer.xml:2175
 #, no-c-format
 msgid ""
 "Hardware speech synthesis devices cannot be automatically detected. You thus "
@@ -1955,13 +1961,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2191
+#: boot-installer.xml:2190
 #, no-c-format
 msgid "Board Devices"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2192
+#: boot-installer.xml:2191
 #, no-c-format
 msgid ""
 "Some accessibility devices are actual boards that are plugged inside the "
@@ -1972,7 +1978,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2200
+#: boot-installer.xml:2199
 #, no-c-format
 msgid ""
 "If desired a textual version of the bootloader can be activated before "
@@ -1980,13 +1986,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2208
+#: boot-installer.xml:2207
 #, no-c-format
 msgid "High-Contrast Theme"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2209
+#: boot-installer.xml:2208
 #, no-c-format
 msgid ""
 "For users with low vision, the installer can use a high-contrast color theme "
@@ -1997,13 +2003,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2220
+#: boot-installer.xml:2219
 #, no-c-format
 msgid "Zoom"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2221
+#: boot-installer.xml:2220
 #, no-c-format
 msgid ""
 "For users with low vision, the graphical installer has a very basic zoom "
@@ -2013,13 +2019,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2231
+#: boot-installer.xml:2230
 #, no-c-format
 msgid "Expert install, rescue mode, automated install"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2232
+#: boot-installer.xml:2231
 #, no-c-format
 msgid ""
 "Expert, Rescue, and Automated installation choices are also available with "
@@ -2037,7 +2043,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2247
+#: boot-installer.xml:2246
 #, no-c-format
 msgid ""
 "The automated install choice allows to install &debian; completely "
@@ -2047,13 +2053,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2257
+#: boot-installer.xml:2256
 #, no-c-format
 msgid "Accessibility of the installed system"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2258
+#: boot-installer.xml:2257
 #, no-c-format
 msgid ""
 "Documentation on accessibility of the installed system is available on the "
@@ -2062,13 +2068,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2272
+#: boot-installer.xml:2271
 #, no-c-format
 msgid "Boot Parameters"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2273
+#: boot-installer.xml:2272
 #, no-c-format
 msgid ""
 "Boot parameters are Linux kernel parameters which are generally used to make "
@@ -2078,7 +2084,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2280
+#: boot-installer.xml:2279
 #, no-c-format
 msgid ""
 "If this is the first time you're booting the system, try the default boot "
@@ -2088,7 +2094,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2287
+#: boot-installer.xml:2286
 #, no-c-format
 msgid ""
 "Information on many boot parameters can be found in the <ulink url=\"http://"
@@ -2099,13 +2105,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2299
+#: boot-installer.xml:2298
 #, no-c-format
 msgid "Boot console"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2301
+#: boot-installer.xml:2300
 #, no-c-format
 msgid ""
 "If you are booting with a serial console, generally the kernel will "
@@ -2118,7 +2124,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2313
+#: boot-installer.xml:2312
 #, no-c-format
 msgid ""
 "You may need to specify parameters for the serial port, such as speed and "
@@ -2129,7 +2135,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2321
+#: boot-installer.xml:2320
 #, no-c-format
 msgid ""
 "In order to ensure the terminal type used by the installer matches your "
@@ -2147,7 +2153,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2337
+#: boot-installer.xml:2336
 #, no-c-format
 msgid ""
 "For &arch-title; the serial devices are <filename>ttya</filename> or "
@@ -2157,13 +2163,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2349
+#: boot-installer.xml:2348
 #, no-c-format
 msgid "&debian; Installer Parameters"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2350
+#: boot-installer.xml:2349
 #, no-c-format
 msgid ""
 "The installation system recognizes a few additional boot "
@@ -2175,7 +2181,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2365
+#: boot-installer.xml:2364
 #, no-c-format
 msgid ""
 "A number of parameters have a <quote>short form</quote> that helps avoid the "
@@ -2186,19 +2192,19 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2377
+#: boot-installer.xml:2376
 #, no-c-format
 msgid "debconf/priority (priority)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2378
+#: boot-installer.xml:2377
 #, no-c-format
 msgid "This parameter sets the lowest priority of messages to be displayed."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2382
+#: boot-installer.xml:2381
 #, no-c-format
 msgid ""
 "The default installation uses <userinput>priority=high</userinput>. This "
@@ -2208,7 +2214,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2389
+#: boot-installer.xml:2388
 #, no-c-format
 msgid ""
 "If you add <userinput>priority=medium</userinput> as boot parameter, you "
@@ -2221,13 +2227,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2403
+#: boot-installer.xml:2402
 #, no-c-format
 msgid "DEBIAN_FRONTEND"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2404
+#: boot-installer.xml:2403
 #, no-c-format
 msgid ""
 "This boot parameter controls the type of user interface used for the "
@@ -2248,13 +2254,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2435
+#: boot-installer.xml:2434
 #, no-c-format
 msgid "BOOT_DEBUG"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2436
+#: boot-installer.xml:2435
 #, no-c-format
 msgid ""
 "Setting this boot parameter to 2 will cause the installer's boot process to "
@@ -2264,49 +2270,49 @@ msgid ""
 msgstr ""
 
 #. Tag: userinput
-#: boot-installer.xml:2445
+#: boot-installer.xml:2444
 #, no-c-format
 msgid "BOOT_DEBUG=0"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2446
+#: boot-installer.xml:2445
 #, no-c-format
 msgid "This is the default."
 msgstr ""
 
 #. Tag: userinput
-#: boot-installer.xml:2450
+#: boot-installer.xml:2449
 #, no-c-format
 msgid "BOOT_DEBUG=1"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2451
+#: boot-installer.xml:2450
 #, no-c-format
 msgid "More verbose than usual."
 msgstr ""
 
 #. Tag: userinput
-#: boot-installer.xml:2455
+#: boot-installer.xml:2454
 #, no-c-format
 msgid "BOOT_DEBUG=2"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2456
+#: boot-installer.xml:2455
 #, no-c-format
 msgid "Lots of debugging information."
 msgstr ""
 
 #. Tag: userinput
-#: boot-installer.xml:2460
+#: boot-installer.xml:2459
 #, no-c-format
 msgid "BOOT_DEBUG=3"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2461
+#: boot-installer.xml:2460
 #, no-c-format
 msgid ""
 "Shells are run at various points in the boot process to allow detailed "
@@ -2314,19 +2320,19 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2475
+#: boot-installer.xml:2474
 #, no-c-format
 msgid "log_host"
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2476
+#: boot-installer.xml:2475
 #, no-c-format
 msgid "log_port"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2477
+#: boot-installer.xml:2476
 #, no-c-format
 msgid ""
 "Causes the installer to send log messages to a remote syslog on the "
@@ -2335,13 +2341,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2488
+#: boot-installer.xml:2487
 #, no-c-format
 msgid "lowmem"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2489
+#: boot-installer.xml:2488
 #, no-c-format
 msgid ""
 "Can be used to force the installer to a lowmem level higher than the one the "
@@ -2350,13 +2356,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2499
+#: boot-installer.xml:2498
 #, no-c-format
 msgid "noshell"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2500
+#: boot-installer.xml:2499
 #, no-c-format
 msgid ""
 "Prevents the installer from offering interactive shells on tty2 and tty3. "
@@ -2364,13 +2370,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2509
+#: boot-installer.xml:2508
 #, no-c-format
 msgid "debian-installer/framebuffer (fb)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2510
+#: boot-installer.xml:2509
 #, no-c-format
 msgid ""
 "Some architectures use the kernel framebuffer to offer installation in a "
@@ -2382,13 +2388,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2519
+#: boot-installer.xml:2518
 #, no-c-format
 msgid "Such problems have been reported on hppa."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2523
+#: boot-installer.xml:2522
 #, no-c-format
 msgid ""
 "Because of display problems on some systems, framebuffer support is "
@@ -2400,13 +2406,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2537
+#: boot-installer.xml:2536
 #, no-c-format
 msgid "debian-installer/theme (theme)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2538
+#: boot-installer.xml:2537
 #, no-c-format
 msgid ""
 "A theme determines how the user interface of the installer looks (colors, "
@@ -2417,13 +2423,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2550 boot-installer.xml:2783
+#: boot-installer.xml:2549 boot-installer.xml:2782
 #, no-c-format
 msgid "netcfg/disable_autoconfig"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2551
+#: boot-installer.xml:2550
 #, no-c-format
 msgid ""
 "By default, the &d-i; automatically probes for network configuration via "
@@ -2433,7 +2439,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2558
+#: boot-installer.xml:2557
 #, no-c-format
 msgid ""
 "If you have an IPv6 router or a DHCP server on your local network, but want "
@@ -2444,13 +2450,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2569
+#: boot-installer.xml:2568
 #, no-c-format
 msgid "hw-detect/start_pcmcia"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2570
+#: boot-installer.xml:2569
 #, no-c-format
 msgid ""
 "Set to <userinput>false</userinput> to prevent starting PCMCIA services, if "
@@ -2458,13 +2464,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2580
+#: boot-installer.xml:2579
 #, no-c-format
 msgid "disk-detect/dmraid/enable (dmraid)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2581
+#: boot-installer.xml:2580
 #, no-c-format
 msgid ""
 "Set to <userinput>true</userinput> to enable support for Serial ATA RAID "
@@ -2474,13 +2480,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2592
+#: boot-installer.xml:2591
 #, no-c-format
 msgid "preseed/url (url)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2593
+#: boot-installer.xml:2592
 #, no-c-format
 msgid ""
 "Specify the url to a preconfiguration file to download and use for "
@@ -2488,13 +2494,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2602
+#: boot-installer.xml:2601
 #, no-c-format
 msgid "preseed/file (file)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2603
+#: boot-installer.xml:2602
 #, no-c-format
 msgid ""
 "Specify the path to a preconfiguration file to load for automating the "
@@ -2502,13 +2508,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2612
+#: boot-installer.xml:2611
 #, no-c-format
 msgid "preseed/interactive"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2613
+#: boot-installer.xml:2612
 #, no-c-format
 msgid ""
 "Set to <userinput>true</userinput> to display questions even if they have "
@@ -2519,13 +2525,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2625
+#: boot-installer.xml:2624
 #, no-c-format
 msgid "auto-install/enable (auto)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2626
+#: boot-installer.xml:2625
 #, no-c-format
 msgid ""
 "Delay questions that are normally asked before preseeding is possible until "
@@ -2534,13 +2540,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2637
+#: boot-installer.xml:2636
 #, no-c-format
 msgid "finish-install/keep-consoles"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2638
+#: boot-installer.xml:2637
 #, no-c-format
 msgid ""
 "During installations from serial or management console, the regular virtual "
@@ -2549,25 +2555,25 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2649
+#: boot-installer.xml:2648
 #, no-c-format
 msgid "cdrom-detect/eject"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2650
+#: boot-installer.xml:2649
 #, no-c-format
 msgid ""
 "By default, before rebooting, &d-i; automatically ejects the optical media "
 "used during the installation. This can be unnecessary if the system does not "
-"automatically boot off the CD. In some cases it may even be undesirable, for "
-"example if the optical drive cannot reinsert the media itself and the user "
-"is not there to do it manually. Many slot loading, slim-line, and caddy "
+"automatically boot off such media. In some cases it may even be undesirable, "
+"for example if the optical drive cannot reinsert the media itself and the "
+"user is not there to do it manually. Many slot loading, slim-line, and caddy "
 "style drives cannot reload media automatically."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2659
+#: boot-installer.xml:2658
 #, no-c-format
 msgid ""
 "Set to <userinput>false</userinput> to disable automatic ejection, and be "
@@ -2576,13 +2582,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2670
+#: boot-installer.xml:2669
 #, no-c-format
 msgid "base-installer/install-recommends (recommends)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2671
+#: boot-installer.xml:2670
 #, no-c-format
 msgid ""
 "By setting this option to <userinput>false</userinput>, the package "
@@ -2592,7 +2598,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2678
+#: boot-installer.xml:2677
 #, no-c-format
 msgid ""
 "Note that this option allows to have a leaner system, but can also result in "
@@ -2603,13 +2609,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2690
+#: boot-installer.xml:2689
 #, no-c-format
 msgid "debian-installer/allow_unauthenticated"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2691
+#: boot-installer.xml:2690
 #, no-c-format
 msgid ""
 "By default the installer requires that repositories be authenticated using a "
@@ -2619,13 +2625,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2702
+#: boot-installer.xml:2701
 #, no-c-format
 msgid "ramdisk_size"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2703
+#: boot-installer.xml:2702
 #, no-c-format
 msgid ""
 "This parameter should already be set to a correct value where needed; set it "
@@ -2634,13 +2640,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2713
+#: boot-installer.xml:2712
 #, no-c-format
 msgid "rescue/enable"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2714
+#: boot-installer.xml:2713
 #, no-c-format
 msgid ""
 "Set to <userinput>true</userinput> to enter rescue mode rather than "
@@ -2648,13 +2654,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2727
+#: boot-installer.xml:2726
 #, no-c-format
 msgid "Using boot parameters to answer questions"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2728
+#: boot-installer.xml:2727
 #, no-c-format
 msgid ""
 "With some exceptions, a value can be set at the boot prompt for any question "
@@ -2664,25 +2670,25 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2740
+#: boot-installer.xml:2739
 #, no-c-format
 msgid "debian-installer/language (language)"
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2741
+#: boot-installer.xml:2740
 #, no-c-format
 msgid "debian-installer/country (country)"
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2742
+#: boot-installer.xml:2741
 #, no-c-format
 msgid "debian-installer/locale (locale)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2743
+#: boot-installer.xml:2742
 #, no-c-format
 msgid ""
 "There are two ways to specify the language, country and locale to use for "
@@ -2690,7 +2696,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2748
+#: boot-installer.xml:2747
 #, no-c-format
 msgid ""
 "The first and easiest is to pass only the parameter <literal>locale</"
@@ -2703,7 +2709,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2757
+#: boot-installer.xml:2756
 #, no-c-format
 msgid ""
 "The second, more flexible option is to specify <literal>language</literal> "
@@ -2714,13 +2720,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2769
+#: boot-installer.xml:2768
 #, no-c-format
 msgid "anna/choose_modules (modules)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2770
+#: boot-installer.xml:2769
 #, no-c-format
 msgid ""
 "Can be used to automatically load installer components that are not loaded "
@@ -2731,7 +2737,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2784
+#: boot-installer.xml:2783
 #, no-c-format
 msgid ""
 "Set to <userinput>true</userinput> if you want to disable IPv6 "
@@ -2739,13 +2745,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2793
+#: boot-installer.xml:2792
 #, no-c-format
 msgid "mirror/protocol (protocol)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2794
+#: boot-installer.xml:2793
 #, no-c-format
 msgid ""
 "By default the installer will use the http protocol to download files from "
@@ -2757,13 +2763,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2807
+#: boot-installer.xml:2806
 #, no-c-format
 msgid "tasksel:tasksel/first (tasks)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2808
+#: boot-installer.xml:2807
 #, no-c-format
 msgid ""
 "Can be used to select tasks that are not available from the interactive task "
@@ -2772,13 +2778,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2822
+#: boot-installer.xml:2821
 #, no-c-format
 msgid "Passing parameters to kernel modules"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2823
+#: boot-installer.xml:2822
 #, no-c-format
 msgid ""
 "If drivers are compiled into the kernel, you can pass parameters to them as "
@@ -2793,7 +2799,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2836
+#: boot-installer.xml:2835
 #, no-c-format
 msgid ""
 "Note that it is now quite rare that parameters need to be passed to modules. "
@@ -2803,7 +2809,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2843
+#: boot-installer.xml:2842
 #, no-c-format
 msgid ""
 "The syntax to use to set parameters for modules is: "
@@ -2817,19 +2823,19 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: boot-installer.xml:2853
+#: boot-installer.xml:2852
 #, no-c-format
 msgid "3c509.xcvr=3 3c509.irq=10"
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2859
+#: boot-installer.xml:2858
 #, no-c-format
 msgid "Blacklisting kernel modules"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2860
+#: boot-installer.xml:2859
 #, no-c-format
 msgid ""
 "Sometimes it may be necessary to blacklist a module to prevent it from being "
@@ -2841,7 +2847,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2869
+#: boot-installer.xml:2868
 #, no-c-format
 msgid ""
 "You can blacklist a module using the following syntax: "
@@ -2852,7 +2858,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2877
+#: boot-installer.xml:2876
 #, no-c-format
 msgid ""
 "Note that a module may still be loaded by the installation system itself. "
@@ -2862,29 +2868,29 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2893
+#: boot-installer.xml:2892
 #, no-c-format
 msgid "Troubleshooting the Installation Process"
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2898
+#: boot-installer.xml:2897
 #, no-c-format
-msgid "CD-ROM Reliability"
+msgid "Reliability of optical media"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2899
+#: boot-installer.xml:2898
 #, no-c-format
 msgid ""
-"Sometimes, especially with older CD-ROM drives, the installer may fail to "
-"boot from a CD-ROM. The installer may also &mdash; even after booting "
-"successfully from CD-ROM &mdash; fail to recognize the CD-ROM or return "
+"Sometimes, especially with older drives, the installer may fail to boot from "
+"an optical disc. The installer may also &mdash; even after booting "
+"successfully from such disc &mdash; fail to recognize the disc or return "
 "errors while reading from it during the installation."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2906
+#: boot-installer.xml:2905
 #, no-c-format
 msgid ""
 "There are many different possible causes for these problems. We can only "
@@ -2893,54 +2899,53 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2912
+#: boot-installer.xml:2911
 #, no-c-format
 msgid "There are two very simple things that you should try first."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2917
+#: boot-installer.xml:2916
 #, no-c-format
 msgid ""
-"If the CD-ROM does not boot, check that it was inserted correctly and that "
-"it is not dirty."
+"If the disc does not boot, check that it was inserted correctly and that it "
+"is not dirty."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2923
+#: boot-installer.xml:2922
 #, no-c-format
 msgid ""
-"If the installer fails to recognize a CD-ROM, try just running the option "
-"<menuchoice> <guimenuitem>Detect and mount CD-ROM</guimenuitem> </"
-"menuchoice> a second time. Some DMA related issues with very old CD-ROM "
+"If the installer fails to recognize the disc, try just running the option "
+"<menuchoice> <guimenuitem>Detect and mount installation media</guimenuitem> "
+"</menuchoice> a second time. Some DMA related issues with very old CD-ROM "
 "drives are known to be resolved in this way."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2933
+#: boot-installer.xml:2932
 #, no-c-format
 msgid ""
 "If this does not work, then try the suggestions in the subsections below. "
-"Most, but not all, suggestions discussed there are valid for both CD-ROM and "
-"DVD, but we'll use the term CD-ROM for simplicity."
+"Most, but not all, suggestions discussed there are valid for CD-ROM and DVD."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2939
+#: boot-installer.xml:2937
 #, no-c-format
 msgid ""
-"If you cannot get the installation working from CD-ROM, try one of the other "
-"installation methods that are available."
+"If you cannot get the installation working from optical disc, try one of the "
+"other installation methods that are available."
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2947
+#: boot-installer.xml:2945
 #, no-c-format
 msgid "Common issues"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2950
+#: boot-installer.xml:2948
 #, no-c-format
 msgid ""
 "Some older CD-ROM drives do not support reading from discs that were burned "
@@ -2948,7 +2953,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2967
+#: boot-installer.xml:2965
 #, no-c-format
 msgid ""
 "Some very old CD-ROM drives do not work correctly if <quote>direct memory "
@@ -2956,27 +2961,28 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2978
+#: boot-installer.xml:2976
 #, no-c-format
 msgid "How to investigate and maybe solve issues"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2979
+#: boot-installer.xml:2977
 #, no-c-format
-msgid "If the CD-ROM fails to boot, try the suggestions listed below."
+msgid "If the optical disc fails to boot, try the suggestions listed below."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2984
+#: boot-installer.xml:2982
 #, no-c-format
 msgid ""
-"Check that your BIOS actually supports booting from CD-ROM (only an issue "
-"for very old systems) and that CD booting is enabled in the BIOS."
+"Check that your BIOS actually supports booting from optical disc (only an "
+"issue for very old systems) and that booting from such media is enabled in "
+"the BIOS."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2991
+#: boot-installer.xml:2989
 #, no-c-format
 msgid ""
 "If you downloaded an iso image, check that the md5sum of that image matches "
@@ -2986,13 +2992,13 @@ msgid ""
 "$ md5sum <replaceable>debian-testing-i386-netinst.iso</replaceable>\n"
 "a20391b12f7ff22ef705cee4059c6b92  <replaceable>debian-testing-i386-netinst."
 "iso</replaceable>\n"
-"</screen></informalexample> Next, check that the md5sum of the burned CD-ROM "
+"</screen></informalexample> Next, check that the md5sum of the burned disc "
 "matches as well. The following command should work. It uses the size of the "
-"image to read the correct number of bytes from the CD-ROM."
+"image to read the correct number of bytes from the disc."
 msgstr ""
 
 #. Tag: screen
-#: boot-installer.xml:3004
+#: boot-installer.xml:3002
 #, no-c-format
 msgid ""
 "$ dd if=/dev/cdrom | \\\n"
@@ -3006,13 +3012,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3009
+#: boot-installer.xml:3007
 #, no-c-format
 msgid ""
-"If, after the installer has been booted successfully, the CD-ROM is not "
+"If, after the installer has been booted successfully, the disc is not "
 "detected, sometimes simply trying again may solve the problem. If you have "
-"more than one CD-ROM drive, try changing the CD-ROM to the other drive. If "
-"that does not work or if the CD-ROM is recognized but there are errors when "
+"more than one optical drive, try changing the disc to the other drive. If "
+"that does not work or if the disc is recognized but there are errors when "
 "reading from it, try the suggestions listed below. Some basic knowledge of "
 "&arch-kernel; is required for this. To execute any of the commands, you "
 "should first switch to the second virtual console (VT2) and activate the "
@@ -3020,7 +3026,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3021
+#: boot-installer.xml:3019
 #, no-c-format
 msgid ""
 "Switch to VT4 or view the contents of <filename>/var/log/syslog</filename> "
@@ -3029,10 +3035,10 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3028
+#: boot-installer.xml:3026
 #, no-c-format
 msgid ""
-"Check in the output of <command>dmesg</command> if your CD-ROM drive was "
+"Check in the output of <command>dmesg</command> if your optical drive was "
 "recognized. You should see something like (the lines do not necessarily have "
 "to be consecutive): <informalexample><screen>\n"
 "ata1.00: ATAPI: MATSHITADVD-RAM UJ-822S, 1.61, max UDMA/33\n"
@@ -3042,33 +3048,34 @@ msgid ""
 "sr0: scsi3-mmc drive: 24x/24x writer dvd-ram cd/rw xa/form2 cdda tray\n"
 "cdrom: Uniform CD-ROM driver Revision: 3.20\n"
 "</screen></informalexample> If you don't see something like that, chances "
-"are the controller your CD-ROM is connected to was not recognized or may be "
+"are the controller your drive is connected to was not recognized or may be "
 "not supported at all. If you know what driver is needed for the controller, "
 "you can try loading it manually using <command>modprobe</command>."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3042
+#: boot-installer.xml:3040
 #, no-c-format
 msgid ""
-"Check that there is a device node for your CD-ROM drive under <filename>/dev/"
-"</filename>. In the example above, this would be <filename>/dev/sr0</"
+"Check that there is a device node for your optical drive under <filename>/"
+"dev/</filename>. In the example above, this would be <filename>/dev/sr0</"
 "filename>. There should also be a <filename>/dev/cdrom</filename>."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3050
+#: boot-installer.xml:3048
 #, no-c-format
 msgid ""
-"Use the <command>mount</command> command to check if the CD-ROM is already "
-"mounted; if not, try mounting it manually: <informalexample><screen>\n"
+"Use the <command>mount</command> command to check if the optical disc is "
+"already mounted; if not, try mounting it manually: "
+"<informalexample><screen>\n"
 "$ mount /dev/<replaceable>hdc</replaceable> /cdrom\n"
 "</screen></informalexample> Check if there are any error messages after that "
 "command."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3060
+#: boot-installer.xml:3058
 #, no-c-format
 msgid ""
 "Check if DMA is currently enabled: <informalexample><screen>\n"
@@ -3080,27 +3087,27 @@ msgid ""
 "it: <informalexample><screen>\n"
 "$ echo -n \"using_dma:0\" &gt;settings\n"
 "</screen></informalexample> Make sure that you are in the directory for the "
-"device that corresponds to your CD-ROM drive."
+"device that corresponds to your optical drive."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3075
+#: boot-installer.xml:3073
 #, no-c-format
 msgid ""
 "If there are any problems during the installation, try checking the "
-"integrity of the CD-ROM using the option near the bottom of the installer's "
-"main menu. This option can also be used as a general test if the CD-ROM can "
-"be read reliably."
+"integrity of the installation media using the option near the bottom of the "
+"installer's main menu. This option can also be used as a general test if the "
+"disc can be read reliably."
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:3089
+#: boot-installer.xml:3087
 #, no-c-format
 msgid "Boot Configuration"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3091
+#: boot-installer.xml:3089
 #, no-c-format
 msgid ""
 "If you have problems and the kernel hangs during the boot process, doesn't "
@@ -3110,7 +3117,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3100
+#: boot-installer.xml:3098
 #, no-c-format
 msgid ""
 "In some cases, malfunctions can be caused by missing device firmware (see "
@@ -3119,7 +3126,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3111
+#: boot-installer.xml:3109
 #, no-c-format
 msgid ""
 "If software speech synthesis does not work, there is most probably an issue "
@@ -3131,37 +3138,37 @@ msgid ""
 msgstr ""
 
 #. Tag: userinput
-#: boot-installer.xml:3122
+#: boot-installer.xml:3120
 #, no-c-format
 msgid "dmesg"
 msgstr ""
 
 #. Tag: userinput
-#: boot-installer.xml:3124
+#: boot-installer.xml:3122
 #, no-c-format
 msgid "lspci"
 msgstr ""
 
 #. Tag: userinput
-#: boot-installer.xml:3126
+#: boot-installer.xml:3124
 #, no-c-format
 msgid "lsmod"
 msgstr ""
 
 #. Tag: userinput
-#: boot-installer.xml:3128
+#: boot-installer.xml:3126
 #, no-c-format
 msgid "amixer"
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:3136 boot-installer.xml:3241
+#: boot-installer.xml:3134 boot-installer.xml:3239
 #, no-c-format
 msgid "Common &arch-title; Installation Problems"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3137
+#: boot-installer.xml:3135
 #, no-c-format
 msgid ""
 "There are some common installation problems that can be solved or avoided by "
@@ -3169,7 +3176,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3182
+#: boot-installer.xml:3180
 #, no-c-format
 msgid ""
 "If your screen begins to show a weird picture while the kernel boots, eg. "
@@ -3182,13 +3189,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:3196
+#: boot-installer.xml:3194
 #, no-c-format
 msgid "System Freeze During the PCMCIA Configuration Phase"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3197
+#: boot-installer.xml:3195
 #, no-c-format
 msgid ""
 "Some very old laptop models produced by Dell are known to crash when PCMCIA "
@@ -3201,7 +3208,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3207
+#: boot-installer.xml:3205
 #, no-c-format
 msgid ""
 "Alternatively, you can boot the installer in expert mode. You will then be "
@@ -3215,19 +3222,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3242
+#: boot-installer.xml:3240
 #, no-c-format
 msgid "There are some common installation problems that are worth mentioning."
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:3248
+#: boot-installer.xml:3246
 #, no-c-format
 msgid "Misdirected video output"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3249
+#: boot-installer.xml:3247
 #, no-c-format
 msgid ""
 "It is fairly common for &arch-title; to have two video cards in one machine, "
@@ -3243,7 +3250,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3263
+#: boot-installer.xml:3261
 #, no-c-format
 msgid ""
 "Note that you may also have to manually add this parameter to the silo "
@@ -3253,13 +3260,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:3274
+#: boot-installer.xml:3272
 #, no-c-format
 msgid "Failure to Boot or Install from CD-ROM"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3275
+#: boot-installer.xml:3273
 #, no-c-format
 msgid ""
 "Some Sparc systems are notoriously difficult to boot from CD-ROM and even if "
@@ -3268,19 +3275,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3281
+#: boot-installer.xml:3279
 #, no-c-format
 msgid "We recommend to install such systems by netbooting the installer."
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:3290
+#: boot-installer.xml:3288
 #, no-c-format
 msgid "Interpreting the Kernel Startup Messages"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3292
+#: boot-installer.xml:3290
 #, no-c-format
 msgid ""
 "During the boot sequence, you may see many messages in the form "
@@ -3302,13 +3309,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:3317
+#: boot-installer.xml:3315
 #, no-c-format
 msgid "Reporting Installation Problems"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3318
+#: boot-installer.xml:3316
 #, no-c-format
 msgid ""
 "If you get through the initial boot phase but cannot complete the install, "
@@ -3321,7 +3328,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3329
+#: boot-installer.xml:3327
 #, no-c-format
 msgid ""
 "Other pertinent installation messages may be found in <filename>/var/log/</"
@@ -3330,13 +3337,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:3340
+#: boot-installer.xml:3338
 #, no-c-format
 msgid "Submitting Installation Reports"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3341
+#: boot-installer.xml:3339
 #, no-c-format
 msgid ""
 "If you still have problems, please submit an installation report. We also "
@@ -3346,7 +3353,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3348
+#: boot-installer.xml:3346
 #, no-c-format
 msgid ""
 "Note that your installation report will be published in the Debian Bug "
@@ -3355,7 +3362,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3354
+#: boot-installer.xml:3352
 #, no-c-format
 msgid ""
 "If you have a working &debian; system, the easiest way to send an "
@@ -3368,7 +3375,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3364
+#: boot-installer.xml:3362
 #, no-c-format
 msgid ""
 "Alternatively you can use this template when filling out installation "
@@ -3377,7 +3384,7 @@ msgid ""
 "<email>submit@bugs.debian.org</email>. <informalexample><screen>\n"
 "Package: installation-reports\n"
 "\n"
-"Boot method: &lt;How did you boot the installer? CD? USB stick? Network?"
+"Boot method: &lt;How did you boot the installer? CD/DVD? USB stick? Network?"
 "&gt;\n"
 "Image version: &lt;Full URL to image you downloaded is best&gt;\n"
 "Date: &lt;Date and time of the install&gt;\n"
@@ -3395,7 +3402,7 @@ msgid ""
 "Initial boot:           [ ]\n"
 "Detect network card:    [ ]\n"
 "Configure network:      [ ]\n"
-"Detect CD:              [ ]\n"
+"Detect media:           [ ]\n"
 "Load installer modules: [ ]\n"
 "Detect hard drives:     [ ]\n"
 "Partition hard drives:  [ ]\n"
diff --git a/po/nb/gpl.po b/po/nb/gpl.po
index a7ee2eac5..a727c66a5 100644
--- a/po/nb/gpl.po
+++ b/po/nb/gpl.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gpl nb\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-08-07 21:24+0000\n"
 "PO-Revision-Date: 2019-08-31 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Norwegian Bokmål\n"
+"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
diff --git a/po/nb/hardware.po b/po/nb/hardware.po
index 29f2824b6..936c05710 100644
--- a/po/nb/hardware.po
+++ b/po/nb/hardware.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hardware_nb\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-09-22 23:04+0000\n"
 "PO-Revision-Date: 2019-10-30 18:03+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål\n"
@@ -2663,52 +2663,43 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:2109
 #, no-c-format
-msgid ""
-"Whenever you see <quote>CD-ROM</quote> in this manual, it applies to all of "
-"CD-ROMs, DVD-ROMs and BD-ROMs, because all these technologies are really the "
-"same from the operating system's point of view."
+msgid "Installation from optical disc is supported for most architectures."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2115
-#, no-c-format
-msgid "CD-ROM based installation is supported for most architectures."
-msgstr ""
-
-#. Tag: para
-#: hardware.xml:2119
+#: hardware.xml:2113
 #, no-c-format
 msgid ""
-"On PCs SATA, IDE/ATAPI, USB and SCSI CD-ROMs are supported, as are FireWire "
-"devices that are supported by the ohci1394 and sbp2 drivers."
+"On PCs SATA, IDE/ATAPI, USB and SCSI optical drives are supported, as are "
+"FireWire devices that are supported by the ohci1394 and sbp2 drivers."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:2136
+#: hardware.xml:2130
 #, no-c-format
 msgid "USB Memory Stick"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2138
+#: hardware.xml:2132
 #, no-c-format
 msgid ""
 "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
 "cheap storage device. Most modern computer systems also allow booting the &d-"
 "i; from such a stick. Many modern computer systems, in particular netbooks "
-"and thin laptops, do not have a CD/DVD-ROM drive anymore at all and booting "
+"and thin laptops, do not have an optical drive anymore at all and booting "
 "from USB media is the standard way of installing a new operating system on "
 "them."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:2150
+#: hardware.xml:2144
 #, no-c-format
 msgid "Network"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2152
+#: hardware.xml:2146
 #, no-c-format
 msgid ""
 "The network can be used during the installation to retrieve files needed for "
@@ -2721,7 +2712,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2162
+#: hardware.xml:2156
 #, no-c-format
 msgid ""
 "You can also <emphasis>boot</emphasis> the installation system over the "
@@ -2735,7 +2726,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2175
+#: hardware.xml:2169
 #, no-c-format
 msgid ""
 "Diskless installation, using network booting from a local area network and "
@@ -2743,13 +2734,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:2184
+#: hardware.xml:2178
 #, no-c-format
 msgid "Hard Disk"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2186
+#: hardware.xml:2180
 #, no-c-format
 msgid ""
 "Booting the installation system directly from a hard disk is another option "
@@ -2759,7 +2750,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2193
+#: hardware.xml:2187
 #, no-c-format
 msgid ""
 "Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -2767,13 +2758,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:2202
+#: hardware.xml:2196
 #, no-c-format
 msgid "Un*x or GNU system"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2204
+#: hardware.xml:2198
 #, no-c-format
 msgid ""
 "If you are running another Unix-like system, you could use it to install "
@@ -2786,13 +2777,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:2217
+#: hardware.xml:2211
 #, no-c-format
 msgid "Supported Storage Systems"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2219
+#: hardware.xml:2213
 #, no-c-format
 msgid ""
 "The &debian; installer contains a kernel which is built to maximize the "
@@ -2800,7 +2791,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2223
+#: hardware.xml:2217
 #, no-c-format
 msgid ""
 "Generally, the &debian; installation system includes support for IDE (also "
@@ -2810,7 +2801,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2240
+#: hardware.xml:2234
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2825,7 +2816,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2285
+#: hardware.xml:2279
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2833,7 +2824,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2290
+#: hardware.xml:2284
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2842,13 +2833,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:2307
+#: hardware.xml:2301
 #, no-c-format
 msgid "Memory and Disk Space Requirements"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2309
+#: hardware.xml:2303
 #, no-c-format
 msgid ""
 "You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -2858,7 +2849,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2316
+#: hardware.xml:2310
 #, no-c-format
 msgid ""
 "Installation on systems with less memory<footnote condition=\"gtk\"> <para> "
diff --git a/po/nb/install-methods.po b/po/nb/install-methods.po
index 3798a0a73..1e0258719 100644
--- a/po/nb/install-methods.po
+++ b/po/nb/install-methods.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: install-methods_nb\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-09-22 23:04+0000\n"
 "PO-Revision-Date: 2019-08-31 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Norwegian Bokmål\n"
+"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
@@ -23,26 +23,27 @@ msgstr ""
 #. Tag: title
 #: install-methods.xml:12
 #, no-c-format
-msgid "Official &debian-gnu; CD/DVD-ROM Sets"
+msgid "Official &debian-gnu; installation images"
 msgstr ""
 
 #. Tag: para
 #: install-methods.xml:13
 #, no-c-format
 msgid ""
-"By far the easiest way to install &debian-gnu; is from an Official &debian; "
-"CD/DVD-ROM Set. You can buy a set from a vendor (see the <ulink url=\"&url-"
-"debian-cd-vendors;\">CD vendors page</ulink>). You may also download the CD/"
-"DVD-ROM images from a &debian; mirror and make your own set, if you have a "
-"fast network connection and a CD/DVD burner (see the <ulink url=\"&url-"
-"debian-cd;\">Debian CD page</ulink> and <ulink url=\"&url-debian-cd-faq;"
-"\">Debian CD FAQ</ulink> for detailed instructions). If you have a &debian; "
-"CD/DVD set and CDs/DVDs are bootable on your machine<phrase arch=\"x86\">, "
-"which is the case on all modern PCs</phrase>, you can skip right to <xref "
-"linkend=\"boot-installer\"/>. Much effort has been expended to ensure the "
-"most-used files are on the first CDs and DVDs, so that a basic desktop "
-"installation can be done with only the first DVD or - to a limited extent - "
-"even with only the first CD."
+"By far the easiest way to install &debian-gnu; is from a set of official "
+"&debian; installation images. You can buy a set of CDs/DVDs from a vendor "
+"(see the <ulink url=\"&url-debian-cd-vendors;\">CD vendors page</ulink>). "
+"You may also download the installation images from a &debian; mirror and "
+"make your own set, if you have a fast network connection and a CD/DVD burner "
+"(see the <ulink url=\"&url-debian-cd;\">Debian CD/DVD page</ulink> and "
+"<ulink url=\"&url-debian-cd-faq;\">Debian CD FAQ</ulink> for detailed "
+"instructions). If you have such optical installation media, and they are "
+"bootable on your machine<phrase arch=\"x86\">, which is the case on all "
+"modern PCs</phrase>, you can skip right to <xref linkend=\"boot-installer\"/"
+">. Much effort has been expended to ensure the most-used files are on the "
+"first CD and DVD image, so that a basic desktop installation can be done "
+"with only the first DVD or - to a limited extent - even with only the first "
+"CD image."
 msgstr ""
 
 #. Tag: para
@@ -60,29 +61,30 @@ msgstr ""
 #: install-methods.xml:38
 #, no-c-format
 msgid ""
-"Also, keep in mind: if the CDs/DVDs you are using don't contain some "
-"packages you need, you can always install those packages afterwards from "
-"your running new Debian system (after the installation has finished). If you "
-"need to know on which CD/DVD to find a specific package, visit <ulink url="
-"\"https://cdimage-search.debian.org/\">https://cdimage-search.debian.org/</"
-"ulink>."
+"Also, keep in mind: if the installation media you are using don't contain "
+"some packages you need, you can always install those packages afterwards "
+"from your running new Debian system (after the installation has finished). "
+"If you need to know on which installation image to find a specific package, "
+"visit <ulink url=\"https://cdimage-search.debian.org/\">https://cdimage-"
+"search.debian.org/</ulink>."
 msgstr ""
 
 #. Tag: para
 #: install-methods.xml:46
 #, no-c-format
 msgid ""
-"If your machine doesn't support CD booting<phrase arch=\"x86\"> (only "
-"relevant on very old PC systems)</phrase>, but you do have a CD set, you can "
-"use an alternative strategy such as <phrase arch=\"s390\">VM reader,</"
-"phrase> <phrase condition=\"bootable-disk\">hard disk,</phrase> <phrase "
-"condition=\"bootable-usb\">usb stick,</phrase> <phrase condition=\"supports-"
-"tftp\">net boot,</phrase> or manually loading the kernel from the CD to "
-"initially boot the system installer. The files you need for booting by "
-"another means are also on the CD; the &debian; network archive and CD folder "
-"organization are identical. So when archive file paths are given below for "
-"particular files you need for booting, look for those files in the same "
-"directories and subdirectories on your CD."
+"If your machine doesn't support booting from optical media<phrase arch="
+"\"x86\"> (only relevant on very old PC systems)</phrase>, but you do have a "
+"set of CD/DVD, you can use an alternative strategy such as <phrase arch="
+"\"s390\">VM reader,</phrase> <phrase condition=\"bootable-disk\">hard disk,</"
+"phrase> <phrase condition=\"bootable-usb\">usb stick,</phrase> <phrase "
+"condition=\"supports-tftp\">net boot,</phrase> or manually loading the "
+"kernel from the disc to initially boot the system installer. The files you "
+"need for booting by another means are also on the disc; the &debian; network "
+"archive and folder organization on the disc are identical. So when archive "
+"file paths are given below for particular files you need for booting, look "
+"for those files in the same directories and subdirectories on your "
+"installation media."
 msgstr ""
 
 #. Tag: para
@@ -90,17 +92,17 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Once the installer is booted, it will be able to obtain all the other files "
-"it needs from the CD."
+"it needs from the disc."
 msgstr ""
 
 #. Tag: para
 #: install-methods.xml:72
 #, no-c-format
 msgid ""
-"If you don't have a CD set, then you will need to download the installer "
-"system files and place them on the <phrase arch=\"s390\">VM minidisk</"
-"phrase> <phrase condition=\"bootable-disk\">hard disk or</phrase> <phrase "
-"condition=\"bootable-usb\">usb stick or</phrase> <phrase condition="
+"If you don't have an installation media set, then you will need to download "
+"the installer system files and place them on the <phrase arch=\"s390\">VM "
+"minidisk</phrase> <phrase condition=\"bootable-disk\">hard disk or</phrase> "
+"<phrase condition=\"bootable-usb\">usb stick or</phrase> <phrase condition="
 "\"supports-tftp\">a connected computer</phrase> so they can be used to boot "
 "the installer."
 msgstr ""
@@ -276,17 +278,17 @@ msgstr ""
 #. Tag: title
 #: install-methods.xml:263
 #, no-c-format
-msgid "Preparing a USB stick using a hybrid CD or DVD image"
+msgid "Preparing a USB stick using a hybrid CD/DVD image"
 msgstr ""
 
 #. Tag: para
 #: install-methods.xml:264
 #, no-c-format
 msgid ""
-"Debian CD and DVD images can now be written directly to a USB stick, which "
-"is a very easy way to make a bootable USB stick. Simply choose a CD or DVD "
-"image (such as the netinst, CD-1, DVD-1, or netboot) that will fit on your "
-"USB stick. See <xref linkend=\"official-cdrom\"/> to get a CD or DVD image."
+"Debian installation images can now be written directly to a USB stick, which "
+"is a very easy way to make a bootable USB stick. Simply choose an image "
+"(such as the netinst, CD, DVD-1, or netboot) that will fit on your USB "
+"stick. See <xref linkend=\"official-cdrom\"/> to get an installation image."
 msgstr ""
 
 #. Tag: para
@@ -303,10 +305,10 @@ msgstr ""
 #: install-methods.xml:279
 #, no-c-format
 msgid ""
-"The CD or DVD image you choose should be written directly to the USB stick, "
-"overwriting its current contents. For example, when using an existing GNU/"
-"Linux system, the CD or DVD image file can be written to a USB stick as "
-"follows, after having made sure that the stick is unmounted: "
+"The installation image you choose should be written directly to the USB "
+"stick, overwriting its current contents. For example, when using an existing "
+"GNU/Linux system, the image file can be written to a USB stick as follows, "
+"after having made sure that the stick is unmounted: "
 "<informalexample><screen>\n"
 "<prompt>#</prompt> <userinput>cp <replaceable>debian.iso</replaceable> /dev/"
 "<replaceable>sdX</replaceable></userinput>\n"
@@ -329,7 +331,7 @@ msgstr ""
 #: install-methods.xml:297
 #, no-c-format
 msgid ""
-"Simply writing the CD or DVD image to USB like this should work fine for "
+"Simply writing the installation image to USB like this should work fine for "
 "most users. The other options below are more complex, mainly for people with "
 "specialised needs."
 msgstr ""
@@ -384,9 +386,9 @@ msgstr ""
 #, no-c-format
 msgid ""
 "An alternative way to set up your USB stick is to manually copy the "
-"installer files, and also a CD image to it. Note that the USB stick should "
-"be at least 1 GB in size (smaller setups are possible if you follow <xref "
-"linkend=\"usb-copy-flexible\"/>)."
+"installer files, and also an installation image to it. Note that the USB "
+"stick should be at least 1 GB in size (smaller setups are possible if you "
+"follow <xref linkend=\"usb-copy-flexible\"/>)."
 msgstr ""
 
 #. Tag: para
@@ -448,8 +450,8 @@ msgid ""
 "<replaceable>sdX2</replaceable> /mnt</userinput>),</phrase> which will now "
 "have <phrase arch=\"x86\">a FAT filesystem</phrase> <phrase arch=\"powerpc"
 "\">an HFS filesystem</phrase> on it, and copy a &debian; ISO image (netinst "
-"or full CD) to it. Unmount the stick (<userinput>umount /mnt</userinput>) "
-"and you are done."
+"or full CD/DVD) to it. Unmount the stick (<userinput>umount /mnt</"
+"userinput>) and you are done."
 msgstr ""
 
 #. Tag: title
@@ -575,15 +577,15 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:505 install-methods.xml:615
+#: install-methods.xml:505
 #, no-c-format
 msgid ""
 "If you used an <filename>hd-media</filename> image, you should now copy the "
 "ISO file of a &debian; ISO image<footnote> <para> You can use either a "
-"netinst or a full CD image (see <xref linkend=\"official-cdrom\"/>). Be sure "
-"to select one that fits. Note that the <quote>netboot <filename>mini.iso</"
-"filename></quote> image is not usable for this purpose. </para> </footnote> "
-"onto the stick. When you are done, unmount the USB memory stick "
+"netinst or a full CD/DVD image (see <xref linkend=\"official-cdrom\"/>). Be "
+"sure to select one that fits. Note that the <quote>netboot <filename>mini."
+"iso</filename></quote> image is not usable for this purpose. </para> </"
+"footnote> onto the stick. When you are done, unmount the USB memory stick "
 "(<userinput>umount /mnt</userinput>)."
 msgstr ""
 
@@ -690,6 +692,19 @@ msgid ""
 "are booting."
 msgstr ""
 
+#. Tag: para
+#: install-methods.xml:615
+#, no-c-format
+msgid ""
+"If you used an <filename>hd-media</filename> image, you should now copy the "
+"ISO file of a &debian; ISO image<footnote> <para> You can use either a "
+"netinst or a full CD image (see <xref linkend=\"official-cdrom\"/>). Be sure "
+"to select one that fits. Note that the <quote>netboot <filename>mini.iso</"
+"filename></quote> image is not usable for this purpose. </para> </footnote> "
+"onto the stick. When you are done, unmount the USB memory stick "
+"(<userinput>umount /mnt</userinput>)."
+msgstr ""
+
 #. Tag: title
 #: install-methods.xml:643
 #, no-c-format
@@ -711,7 +726,7 @@ msgstr ""
 msgid ""
 "A full, <quote>pure network</quote> installation can be achieved using this "
 "technique. This avoids all hassles of removable media, like finding and "
-"burning CD images."
+"burning CD/DVD images."
 msgstr ""
 
 #. Tag: para
@@ -809,8 +824,8 @@ msgstr ""
 #: install-methods.xml:726
 #, no-c-format
 msgid ""
-"Copy the following directories from a &debian; CD image to <filename>c:\\</"
-"filename>."
+"Copy the following directories from a &debian; installation image to "
+"<filename>c:\\</filename>."
 msgstr ""
 
 #. Tag: para
diff --git a/po/nb/installation-howto.po b/po/nb/installation-howto.po
index ca778d038..24bf79a20 100644
--- a/po/nb/installation-howto.po
+++ b/po/nb/installation-howto.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: installation-howto_nb\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-09-22 23:04+0000\n"
 "PO-Revision-Date: 2019-08-31 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Norwegian Bokmål\n"
+"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
@@ -60,21 +60,22 @@ msgstr ""
 #: installation-howto.xml:37
 #, no-c-format
 msgid ""
-"<phrase condition=\"unofficial-build\"> For some quick links to CD images, "
-"check out the <ulink url=\"&url-d-i;\"> &d-i; home page</ulink>. </phrase> "
-"The debian-cd team provides builds of CD images using &d-i; on the <ulink "
-"url=\"&url-debian-cd;\">Debian CD page</ulink>. For more information on "
-"where to get CDs, see <xref linkend=\"official-cdrom\"/>."
+"<phrase condition=\"unofficial-build\"> For some quick links to installation "
+"images, check out the <ulink url=\"&url-d-i;\"> &d-i; home page</ulink>. </"
+"phrase> The debian-cd team provides builds of installation images using &d-"
+"i; on the <ulink url=\"&url-debian-cd;\">Debian CD/DVD page</ulink>. For "
+"more information on where to get installation images, see <xref linkend="
+"\"official-cdrom\"/>."
 msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:47
 #, no-c-format
 msgid ""
-"Some installation methods require other images than CD images. <phrase "
-"condition=\"unofficial-build\"> The <ulink url=\"&url-d-i;\">&d-i; home "
-"page</ulink> has links to other images. </phrase> <xref linkend=\"where-files"
-"\"/> explains how to find images on &debian; mirrors."
+"Some installation methods require other images than those for optical media. "
+"<phrase condition=\"unofficial-build\"> The <ulink url=\"&url-d-i;\">&d-i; "
+"home page</ulink> has links to other images. </phrase> <xref linkend=\"where-"
+"files\"/> explains how to find images on &debian; mirrors."
 msgstr ""
 
 #. Tag: para
@@ -88,7 +89,7 @@ msgstr ""
 #. Tag: title
 #: installation-howto.xml:65
 #, no-c-format
-msgid "CDROM"
+msgid "Optical disc"
 msgstr ""
 
 #. Tag: para
@@ -96,24 +97,24 @@ msgstr ""
 #, no-c-format
 msgid ""
 "The netinst CD image is a popular image which can be used to install "
-"&releasename; with the &d-i;. This image is intended to boot from CD and "
-"install additional packages over a network; hence the name <quote>netinst</"
-"quote>. The image has the software components needed to run the installer "
-"and the base packages to provide a minimal &releasename; system. If you'd "
-"rather, you can get a full size CD image which will not need the network to "
-"install. You only need the first CD of the set."
+"&releasename; with the &d-i;. This installation method is intended to boot "
+"from the image and install additional packages over a network; hence the "
+"name <quote>netinst</quote>. The image has the software components needed to "
+"run the installer and the base packages to provide a minimal &releasename; "
+"system. If you'd rather, you can get a full size CD/DVD image which will not "
+"need the network to install. You only need the first image of such set."
 msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:77
 #, no-c-format
 msgid ""
-"Download whichever type you prefer and burn it to a CD. <phrase arch=\"any-"
-"x86\">To boot the CD, you may need to change your BIOS configuration, as "
-"explained in <xref linkend=\"bios-setup\"/>.</phrase> <phrase arch=\"powerpc"
-"\"> To boot a PowerMac from CD, press the <keycap>c</keycap> key while "
-"booting. See <xref linkend=\"boot-cd\"/> for other ways to boot from CD. </"
-"phrase>"
+"Download whichever type you prefer and burn it to an optical disc. <phrase "
+"arch=\"any-x86\">To boot the disc, you may need to change your BIOS "
+"configuration, as explained in <xref linkend=\"bios-setup\"/>.</phrase> "
+"<phrase arch=\"powerpc\"> To boot a PowerMac from CD, press the <keycap>c</"
+"keycap> key while booting. See <xref linkend=\"boot-cd\"/> for other ways to "
+"boot from CD. </phrase>"
 msgstr ""
 
 #. Tag: title
@@ -136,10 +137,10 @@ msgstr ""
 #, no-c-format
 msgid ""
 "The easiest way to prepare your USB memory stick is to download any Debian "
-"CD or DVD image that will fit on it, and write the CD image directly to the "
-"memory stick. Of course this will destroy anything already on the memory "
-"stick. This works because Debian CD images are \"isohybrid\" images that can "
-"boot both from CD and from USB drives."
+"CD or DVD image that will fit on it, and write the image directly to the "
+"memory stick. Of course this will destroy anything already on the stick. "
+"This works because Debian CD/DVD images are <quote>isohybrid</quote> images "
+"that can boot both from optical and USB drives."
 msgstr ""
 
 #. Tag: para
@@ -224,8 +225,8 @@ msgid ""
 "It's possible to boot the installer using no removable media, but just an "
 "existing hard disk, which can have a different OS on it. Download "
 "<filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</"
-"filename>, and a &debian; CD image to the top-level directory of the hard "
-"disk. Make sure that the CD image has a filename ending in <literal>.iso</"
+"filename>, and a &debian; CD/DVD image to the top-level directory of the "
+"hard disk. Make sure that the image has a filename ending in <literal>.iso</"
 "literal>. Now it's just a matter of booting linux with the initrd. <phrase "
 "arch=\"x86\"> <xref linkend=\"boot-initrd\"/> explains one way to do it. </"
 "phrase>"
@@ -270,7 +271,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Now sit back while debian-installer detects some of your hardware, and loads "
-"the rest of itself from CD, USB, etc."
+"the rest of the installation image."
 msgstr ""
 
 #. Tag: para
diff --git a/po/nb/partitioning.po b/po/nb/partitioning.po
index 3fb80376f..03ab220ca 100644
--- a/po/nb/partitioning.po
+++ b/po/nb/partitioning.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: partitioning_nb\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-08-29 14:36+0000\n"
 "PO-Revision-Date: 2019-08-31 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Norwegian Bokmål\n"
+"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
diff --git a/po/nb/post-install.po b/po/nb/post-install.po
index 021c97032..05c783d4c 100644
--- a/po/nb/post-install.po
+++ b/po/nb/post-install.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: post-install_nb\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-08-11 15:17+0000\n"
 "PO-Revision-Date: 2019-08-31 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Norwegian Bokmål\n"
+"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
diff --git a/po/nb/preface.po b/po/nb/preface.po
index a06410f0d..80dd730fc 100644
--- a/po/nb/preface.po
+++ b/po/nb/preface.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preface_nb\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2016-12-29 08:03+0000\n"
 "PO-Revision-Date: 2019-08-31 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Norwegian Bokmål\n"
+"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
diff --git a/po/nb/preparing.po b/po/nb/preparing.po
index b9a136544..844bd8411 100644
--- a/po/nb/preparing.po
+++ b/po/nb/preparing.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preparing_nb\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-09-22 23:04+0000\n"
 "PO-Revision-Date: 2019-08-31 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Norwegian Bokmål\n"
+"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
@@ -1409,11 +1409,12 @@ msgid ""
 "can be tricked into booting from the stick by changing the device type in "
 "the BIOS setup from the default <quote>USB harddisk</quote> or <quote>USB "
 "stick</quote> to <quote>USB ZIP</quote> or <quote>USB CDROM</quote>. <phrase "
-"condition=\"isohybrid-supported\"> In particular if you use an isohybrid CD/"
-"DVD image on a USB stick (see <xref linkend=\"usb-copy-isohybrid\"/>), "
-"changing the device type to <quote>USB CDROM</quote> helps on some BIOSes "
-"which will not boot from a USB stick in USB harddisk mode.</phrase> You may "
-"need to configure your BIOS to enable <quote>USB legacy support</quote>."
+"condition=\"isohybrid-supported\"> In particular if you use an isohybrid "
+"installation image on a USB stick (see <xref linkend=\"usb-copy-isohybrid\"/"
+">), changing the device type to <quote>USB CDROM</quote> helps on some "
+"BIOSes which will not boot from a USB stick in USB harddisk mode.</phrase> "
+"You may need to configure your BIOS to enable <quote>USB legacy support</"
+"quote>."
 msgstr ""
 
 #. Tag: para
@@ -1974,7 +1975,7 @@ msgstr ""
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
 "&debian-gnu; mirror, but only the S/390 and architecture-independent files "
-"are required. You can also copy the contents of all installation CDs into "
+"are required. You can also copy the contents of all installation images into "
 "such a directory tree."
 msgstr ""
 
diff --git a/po/nb/preseed.po b/po/nb/preseed.po
index 3d0307db5..a060de449 100644
--- a/po/nb/preseed.po
+++ b/po/nb/preseed.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preseed_nb\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-09-22 23:04+0000\n"
 "PO-Revision-Date: 2019-08-31 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Norwegian Bokmål\n"
+"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
@@ -115,7 +115,7 @@ msgstr ""
 #. Tag: entry
 #: preseed.xml:76
 #, no-c-format
-msgid "CD/DVD"
+msgid "CD/DVD/USB"
 msgstr ""
 
 #. Tag: entry
@@ -175,8 +175,8 @@ msgid ""
 "is thus possible to override configuration set in the initrd by editing the "
 "kernel command line (either in the bootloader configuration or manually at "
 "boot time for bootloaders that allow it). For file preseeding this is after "
-"the CD or CD image has been loaded. For network preseeding it is only after "
-"the network has been configured."
+"the installation image has been loaded. For network preseeding it is only "
+"after the network has been configured."
 msgstr ""
 
 #. Tag: para
@@ -234,10 +234,10 @@ msgid ""
 "location from where you want to use it. Creating the preconfiguration file "
 "is covered later in this appendix. Putting it in the correct location is "
 "fairly straightforward for network preseeding or if you want to read the "
-"file off a usb-stick. If you want to include the file on a CD or DVD, you "
-"will have to remaster the ISO image. How to get the preconfiguration file "
-"included in the initrd is outside the scope of this document; please consult "
-"the developers' documentation for &d-i;."
+"file off a usb-stick. If you want to include the file in an installation ISO "
+"image, you will have to remaster the image. How to get the preconfiguration "
+"file included in the initrd is outside the scope of this document; please "
+"consult the developers' documentation for &d-i;."
 msgstr ""
 
 #. Tag: para
@@ -315,7 +315,7 @@ msgid ""
 "  preseed/url=tftp://host/path/to/preseed.cfg\n"
 "  preseed/url/checksum=5da499872becccfeda2c4872f9171c3d\n"
 "\n"
-"- if you're booting a remastered CD:\n"
+"- if you're booting a remastered installation image:\n"
 "  preseed/file=/cdrom/preseed.cfg\n"
 "  preseed/file/checksum=5da499872becccfeda2c4872f9171c3d\n"
 "\n"
@@ -1223,9 +1223,9 @@ msgstr ""
 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."
+"booting from optical disc 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
@@ -2007,7 +2007,7 @@ msgid ""
 "# Some versions of the installer can report back on what software you have\n"
 "# installed, and what software you use. The default is not to report back,\n"
 "# but sending reports helps the project determine what software is most\n"
-"# popular and include it on CDs.\n"
+"# popular and should be included on the first CD/DVD.\n"
 "#popularity-contest popularity-contest/participate boolean false"
 msgstr ""
 
diff --git a/po/nb/random-bits.po b/po/nb/random-bits.po
index bd097c823..f20414802 100644
--- a/po/nb/random-bits.po
+++ b/po/nb/random-bits.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: random-bits_nb\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2019-08-31 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Norwegian Bokmål\n"
+"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
@@ -317,8 +317,8 @@ msgstr ""
 msgid ""
 "By default the installer will install the GNOME desktop environment, but "
 "alternative desktop environments can be selected either by using one of the "
-"special CD images, or by specifying the desired desktop environment when the "
-"installer is booted (see <xref linkend=\"pkgsel\"/>)."
+"special installation images, or by specifying the desired desktop "
+"environment during installation (see <xref linkend=\"pkgsel\"/>)."
 msgstr ""
 
 #. Tag: para
@@ -768,9 +768,9 @@ msgstr ""
 #: random-bits.xml:444
 #, no-c-format
 msgid ""
-"If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
-"filename>, you could substitute a file URL instead of the http URL: "
-"<userinput>file:/cdrom/debian/</userinput>"
+"If you have a &releasename; &debian-gnu; installation image mounted at "
+"<filename>/cdrom</filename>, you could substitute a file URL instead of the "
+"http URL: <userinput>file:/cdrom/debian/</userinput>"
 msgstr ""
 
 #. Tag: para
@@ -1076,8 +1076,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
@@ -1475,7 +1475,7 @@ msgstr ""
 #. Tag: guimenuitem
 #: random-bits.xml:930
 #, no-c-format
-msgid "Load installer components from CD"
+msgid "Load installer components from installation media"
 msgstr ""
 
 #. Tag: para
diff --git a/po/nb/using-d-i.po b/po/nb/using-d-i.po
index defb65b3d..12e2da82e 100644
--- a/po/nb/using-d-i.po
+++ b/po/nb/using-d-i.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: using-d-i_nb\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-09-24 23:05+0000\n"
 "PO-Revision-Date: 2019-08-31 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Norwegian Bokmål\n"
+"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
@@ -328,7 +328,7 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:230
 #, no-c-format
-msgid "Looks for and mounts a &debian; installation CD."
+msgid "Looks for and mounts a &debian; installation media."
 msgstr ""
 
 #. Tag: term
@@ -382,8 +382,8 @@ msgstr ""
 #: using-d-i.xml:264
 #, no-c-format
 msgid ""
-"Checks integrity of a CD-ROM. This way, the user may assure him/herself that "
-"the installation CD-ROM was not corrupted."
+"Checks integrity of installation media. This way, the user may assure him/"
+"herself that the installation image was not corrupted."
 msgstr ""
 
 #. Tag: term
@@ -412,7 +412,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Anna's Not Nearly APT. Installs packages which have been retrieved from the "
-"chosen mirror or CD."
+"chosen mirror or installation media."
 msgstr ""
 
 #. Tag: term
@@ -2832,10 +2832,10 @@ msgid ""
 "packages is called <command>dpkg</command>. However, this program is more of "
 "a low-level tool. <command>apt</command> is a higher-level tool, which will "
 "invoke <command>dpkg</command> as appropriate. It knows how to retrieve "
-"packages from your CD, the network, or wherever. It is also able to "
-"automatically install other packages which are required to make the package "
-"you're trying to install work correctly. </para> </footnote>. Other front-"
-"ends for package management, like <command>aptitude</command> and "
+"packages from your installation media, the network, or wherever. It is also "
+"able to automatically install other packages which are required to make the "
+"package you're trying to install work correctly. </para> </footnote>. Other "
+"front-ends for package management, like <command>aptitude</command> and "
 "<command>synaptic</command>, are also in use. These front-ends are "
 "recommended for new users, since they integrate some additional features "
 "(package searching and status checks) in a nice user interface."
@@ -2877,37 +2877,37 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:2341
 #, no-c-format
-msgid "Installing from more than one CD or DVD"
+msgid "Installing from more than one CD or DVD image"
 msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2343
 #, no-c-format
 msgid ""
-"If you are installing from a CD or a DVD that is part of a larger set, the "
-"installer will ask if you want to scan additional CDs or DVDs. If you have "
-"additional CDs or DVDs available, you probably want to do this so the "
-"installer can use the packages included on them."
+"If you are installing from a CD or DVD image that is part of a larger set, "
+"the installer will ask if you want to scan additional installation media. If "
+"you have such additional media available, you probably want to do this so "
+"the installer can use the packages included on them."
 msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2350
 #, no-c-format
 msgid ""
-"If you do not have any additional CDs or DVDs, that is no problem: using "
-"them is not required. If you also do not use a network mirror (as explained "
-"in the next section), it can mean that not all packages belonging to the "
-"tasks you select in the next step of the installation can be installed."
+"If you do not have any additional media, that is no problem: using them is "
+"not required. If you also do not use a network mirror (as explained in the "
+"next section), it can mean that not all packages belonging to the tasks you "
+"select in the next step of the installation can be installed."
 msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2358
 #, no-c-format
 msgid ""
-"Packages are included on CDs (and DVDs) in the order of their popularity. "
-"This means that for most uses only the first CDs in a set are needed and "
+"Packages are included on CD and DVD images in the order of their popularity. "
+"This means that for most uses only the first image of a set is needed and "
 "that only very few people actually use any of the packages included on the "
-"last CDs in a set."
+"last images of a set."
 msgstr ""
 
 #. Tag: para
@@ -2925,12 +2925,11 @@ msgstr ""
 #: using-d-i.xml:2375
 #, 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 "
-"set should be scanned. The order in which they are scanned does not really "
-"matter, but scanning them in ascending order will reduce the chance of "
-"mistakes."
+"If you do scan multiple installation media, the installer will prompt you to "
+"exchange them when it needs packages from one that isn't currently in the "
+"drive. Note that only discs that belong to the same set should be scanned. "
+"The order in which they are scanned does not really matter, but scanning "
+"them in ascending order will reduce the chance of mistakes."
 msgstr ""
 
 #. Tag: title
@@ -2952,24 +2951,23 @@ msgstr ""
 #: using-d-i.xml:2396
 #, no-c-format
 msgid ""
-"If you are <emphasis>not</emphasis> installing from a full CD or DVD or "
-"using a full CD/DVD image, you really should use a network mirror as "
-"otherwise you will end up with only a very minimal system. However, if you "
-"have a limited Internet connection it is best <emphasis>not</emphasis> to "
-"select the <literal>desktop</literal> task in the next step of the "
-"installation."
+"If you are <emphasis>not</emphasis> installing from a full CD/DVD image, you "
+"really should use a network mirror as otherwise you will end up with only a "
+"very minimal system. However, if you have a limited Internet connection it "
+"is best <emphasis>not</emphasis> to select the <literal>desktop</literal> "
+"task in the next step of the installation."
 msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2405
 #, no-c-format
 msgid ""
-"If you are installing from a single full CD or using a full CD image, using "
-"a network mirror is not required, but is still strongly recommended because "
-"a single CD contains only a fairly limited number of packages. If you have a "
-"limited Internet connection it may still be best to <emphasis>not</emphasis> "
-"select a network mirror here, but to finish the installation using only "
-"what's available on the CD and selectively install additional packages after "
+"If you are installing from a single full CD image, using a network mirror is "
+"not required, but is still strongly recommended because a single CD image "
+"contains only a fairly limited number of packages. If you have a limited "
+"Internet connection it may still be best to <emphasis>not</emphasis> select "
+"a network mirror here, but to finish the installation using only what's "
+"available on the CD image and selectively install additional packages after "
 "the installation (i.e. after you have rebooted into the new system)."
 msgstr ""
 
@@ -2977,64 +2975,64 @@ msgstr ""
 #: using-d-i.xml:2416
 #, no-c-format
 msgid ""
-"If you are installing from a DVD or using a DVD image, any packages needed "
-"during the installation should be present on the first DVD. The same is true "
-"if you have scanned multiple CDs as explained in the previous section. Use "
-"of a network mirror is optional."
+"If you are installing from DVD, any packages needed during the installation "
+"should be present on the first DVD image. Use of a network mirror is "
+"optional."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2423
+#: using-d-i.xml:2422
 #, no-c-format
 msgid ""
-"One advantage of adding a network mirror is that updates that have occurred "
-"since the CD/DVD set was created and have been included in a point release, "
-"will become available for installation, thus extending the life of your CD/"
-"DVD set without compromising the security or stability of the installed "
-"system."
+"One advantage of adding a network mirror is that updates, that have occurred "
+"since the CD/DVD images were created and have been included in a point "
+"release, will become available for installation, thus extending the life of "
+"your CD/DVD set without compromising the security or stability of the "
+"installed system."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2430
+#: using-d-i.xml:2429
 #, no-c-format
 msgid ""
 "In summary: selecting a network mirror is generally a good idea, except if "
 "you do not have a good Internet connection. If the current version of a "
-"package is available from CD/DVD, the installer will always use that. The "
-"amount of data that will be downloaded if you do select a mirror thus "
-"depends on"
+"package is available from installation media, the installer will always use "
+"that. The amount of data that will be downloaded if you do select a mirror "
+"thus depends on"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2439
+#: using-d-i.xml:2438
 #, no-c-format
 msgid "the tasks you select in the next step of the installation,"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2444
+#: using-d-i.xml:2443
 #, no-c-format
 msgid "which packages are needed for those tasks,"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2449
+#: using-d-i.xml:2448
 #, no-c-format
 msgid ""
-"which of those packages are present on the CDs or DVDs you have scanned, and"
+"which of those packages are present on the installation media you have "
+"scanned, and"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2454
+#: using-d-i.xml:2453
 #, no-c-format
 msgid ""
-"whether any updated versions of packages included on the CDs or DVDs are "
-"available from a mirror (either a regular package mirror, or a mirror for "
-"security or stable-updates)."
+"whether any updated versions of packages included on the installation media "
+"are available from a mirror (either a regular package mirror, or a mirror "
+"for security or stable-updates)."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2463
+#: using-d-i.xml:2462
 #, no-c-format
 msgid ""
 "Note that the last point means that, even if you choose not to use a network "
@@ -3044,13 +3042,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2474
+#: using-d-i.xml:2473
 #, no-c-format
 msgid "Choosing a network mirror"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2475
+#: using-d-i.xml:2474
 #, no-c-format
 msgid ""
 "Unless you chose not to use a network mirror, you will be presented with a "
@@ -3059,7 +3057,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2482
+#: using-d-i.xml:2481
 #, no-c-format
 msgid ""
 "The offered default is deb.debian.org, which is not a mirror itself but will "
@@ -3069,7 +3067,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2489
+#: using-d-i.xml:2488
 #, no-c-format
 msgid ""
 "A mirror can also be specified by hand by choosing <quote>enter information "
@@ -3080,7 +3078,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2497
+#: using-d-i.xml:2496
 #, no-c-format
 msgid ""
 "If your computer is on an IPv6-only network (which is probably not the case "
@@ -3097,13 +3095,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2520
+#: using-d-i.xml:2519
 #, no-c-format
 msgid "Selecting and Installing Software"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2522
+#: using-d-i.xml:2521
 #, no-c-format
 msgid ""
 "During the installation process, you are given the opportunity to select "
@@ -3115,7 +3113,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2531
+#: using-d-i.xml:2530
 #, no-c-format
 msgid ""
 "These tasks loosely represent a number of different jobs or things you want "
@@ -3133,7 +3131,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2557
+#: using-d-i.xml:2556
 #, no-c-format
 msgid ""
 "Some tasks may be pre-selected based on the characteristics of the computer "
@@ -3142,7 +3140,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2564
+#: using-d-i.xml:2563
 #, no-c-format
 msgid ""
 "In the standard user interface of the installer, you can use the space bar "
@@ -3150,7 +3148,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2570
+#: using-d-i.xml:2569
 #, no-c-format
 msgid ""
 "The <quote>Desktop environment</quote> task will install a graphical desktop "
@@ -3158,7 +3156,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2575
+#: using-d-i.xml:2574
 #, no-c-format
 msgid ""
 "By default, &d-i; installs the <phrase arch=\"x86\">Gnome</phrase> <phrase "
@@ -3169,20 +3167,20 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2583
+#: using-d-i.xml:2582
 #, 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 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 "
+"mirror as they might not be available on the CD image due to its limited "
+"amount of space. 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:2593
+#: using-d-i.xml:2592
 #, no-c-format
 msgid ""
 "The various server tasks will install software roughly as follows. Web "
@@ -3191,7 +3189,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2600
+#: using-d-i.xml:2599
 #, no-c-format
 msgid ""
 "The <quote>Standard system</quote> task will install any package that has a "
@@ -3202,7 +3200,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2608
+#: using-d-i.xml:2607
 #, no-c-format
 msgid ""
 "If during language selection a default locale other than the <quote>C</"
@@ -3215,7 +3213,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2618
+#: using-d-i.xml:2617
 #, no-c-format
 msgid ""
 "Once you've selected your tasks, select &BTN-CONT;. At this point, "
@@ -3225,7 +3223,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2625
+#: using-d-i.xml:2624
 #, no-c-format
 msgid ""
 "You should be aware that especially the Desktop task is very large. "
@@ -3237,7 +3235,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2634
+#: using-d-i.xml:2633
 #, no-c-format
 msgid ""
 "Even when packages are included on the CD-ROM, the installer may still "
@@ -3249,13 +3247,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2649
+#: using-d-i.xml:2648
 #, no-c-format
 msgid "Making Your System Bootable"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2651
+#: using-d-i.xml:2650
 #, no-c-format
 msgid ""
 "If you are installing a diskless workstation, obviously, booting off the "
@@ -3265,13 +3263,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2666
+#: using-d-i.xml:2665
 #, no-c-format
 msgid "Detecting other operating systems"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2668
+#: using-d-i.xml:2667
 #, no-c-format
 msgid ""
 "Before a boot loader is installed, the installer will attempt to probe for "
@@ -3282,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2676
+#: using-d-i.xml:2675
 #, no-c-format
 msgid ""
 "Note that multiple operating systems booting on a single machine is still "
@@ -3293,13 +3291,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2694
+#: using-d-i.xml:2693
 #, no-c-format
 msgid "<command>palo</command>-installer"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2695
+#: using-d-i.xml:2694
 #, no-c-format
 msgid ""
 "The bootloader on PA-RISC is <quote>palo</quote>. <command>PALO</command> is "
@@ -3310,19 +3308,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2704
+#: using-d-i.xml:2703
 #, no-c-format
 msgid "hppa FIXME ( need more info )"
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2716 using-d-i.xml:2989
+#: using-d-i.xml:2715 using-d-i.xml:2988
 #, no-c-format
 msgid "Install the <command>Grub</command> Boot Loader on a Hard Disk"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2718 using-d-i.xml:2991
+#: using-d-i.xml:2717 using-d-i.xml:2990
 #, no-c-format
 msgid ""
 "The main &architecture; boot loader is called <quote>grub</quote>. Grub is a "
@@ -3331,7 +3329,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2724
+#: using-d-i.xml:2723
 #, no-c-format
 msgid ""
 "By default, grub will be installed into the Master Boot Record (MBR), where "
@@ -3340,7 +3338,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2730
+#: using-d-i.xml:2729
 #, no-c-format
 msgid ""
 "If you do not want to install grub, use the &BTN-GOBACK; button to get to "
@@ -3349,13 +3347,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2743
+#: using-d-i.xml:2742
 #, no-c-format
 msgid "Install the <command>LILO</command> Boot Loader on a Hard Disk"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2745
+#: using-d-i.xml:2744
 #, no-c-format
 msgid ""
 "The second &architecture; boot loader is called <quote>LILO</quote>. It is "
@@ -3366,7 +3364,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2755
+#: using-d-i.xml:2754
 #, no-c-format
 msgid ""
 "Currently the LILO installation will only create menu entries for other "
@@ -3376,7 +3374,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2763
+#: using-d-i.xml:2762
 #, no-c-format
 msgid ""
 "&d-i; offers you three choices on where to install the <command>LILO</"
@@ -3384,13 +3382,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:2770
+#: using-d-i.xml:2769
 #, no-c-format
 msgid "Master Boot Record (MBR)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2770
+#: using-d-i.xml:2769
 #, no-c-format
 msgid ""
 "This way the <command>LILO</command> will take complete control of the boot "
@@ -3398,13 +3396,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:2777
+#: using-d-i.xml:2776
 #, no-c-format
 msgid "new &debian; partition"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2777
+#: using-d-i.xml:2776
 #, no-c-format
 msgid ""
 "Choose this if you want to use another boot manager. <command>LILO</command> "
@@ -3413,13 +3411,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:2786
+#: using-d-i.xml:2785
 #, no-c-format
 msgid "Other choice"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2786
+#: using-d-i.xml:2785
 #, no-c-format
 msgid ""
 "Useful for advanced users who want to install <command>LILO</command> "
@@ -3428,7 +3426,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2796
+#: using-d-i.xml:2795
 #, no-c-format
 msgid ""
 "If you can no longer boot into Windows 9x (or DOS) after this step, you'll "
@@ -3439,13 +3437,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2812
+#: using-d-i.xml:2811
 #, no-c-format
 msgid "Install the <command>ELILO</command> Boot Loader on a Hard Disk"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2814
+#: using-d-i.xml:2813
 #, no-c-format
 msgid ""
 "The &architecture; boot loader is called <quote>elilo</quote>. It is modeled "
@@ -3462,7 +3460,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2830
+#: using-d-i.xml:2829
 #, no-c-format
 msgid ""
 "The <quote>elilo</quote> configuration and installation is done as the last "
@@ -3474,13 +3472,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2842
+#: using-d-i.xml:2841
 #, no-c-format
 msgid "Choose the correct partition!"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2844
+#: using-d-i.xml:2843
 #, no-c-format
 msgid ""
 "The criterion for selecting a partition is that it must be a FAT format "
@@ -3492,13 +3490,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2859
+#: using-d-i.xml:2858
 #, no-c-format
 msgid "EFI Partition Contents"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2861
+#: using-d-i.xml:2860
 #, no-c-format
 msgid ""
 "The EFI partition is a FAT filesystem format partition on one of the hard "
@@ -3516,13 +3514,13 @@ msgid ""
 msgstr ""
 
 #. Tag: filename
-#: using-d-i.xml:2883
+#: using-d-i.xml:2882
 #, no-c-format
 msgid "elilo.conf"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2884
+#: using-d-i.xml:2883
 #, no-c-format
 msgid ""
 "This is the configuration file read by the boot loader when it starts. It is "
@@ -3531,13 +3529,13 @@ msgid ""
 msgstr ""
 
 #. Tag: filename
-#: using-d-i.xml:2893
+#: using-d-i.xml:2892
 #, no-c-format
 msgid "elilo.efi"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2894
+#: using-d-i.xml:2893
 #, no-c-format
 msgid ""
 "This is the boot loader program that the <quote>EFI Boot Manager</quote> "
@@ -3547,13 +3545,13 @@ msgid ""
 msgstr ""
 
 #. Tag: filename
-#: using-d-i.xml:2904
+#: using-d-i.xml:2903
 #, no-c-format
 msgid "initrd.img"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2905
+#: using-d-i.xml:2904
 #, no-c-format
 msgid ""
 "This is the initial root filesystem used to boot the kernel. It is a copy of "
@@ -3563,13 +3561,13 @@ msgid ""
 msgstr ""
 
 #. Tag: filename
-#: using-d-i.xml:2917
+#: using-d-i.xml:2916
 #, no-c-format
 msgid "readme.txt"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2918
+#: using-d-i.xml:2917
 #, no-c-format
 msgid ""
 "This is a small text file warning you that the contents of the directory are "
@@ -3578,13 +3576,13 @@ msgid ""
 msgstr ""
 
 #. Tag: filename
-#: using-d-i.xml:2928
+#: using-d-i.xml:2927
 #, no-c-format
 msgid "vmlinuz"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2929
+#: using-d-i.xml:2928
 #, no-c-format
 msgid ""
 "This is the compressed kernel itself. It is a copy of the file referenced in "
@@ -3594,13 +3592,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2953
+#: using-d-i.xml:2952
 #, no-c-format
 msgid "Install <command>Yaboot</command> on a Hard Disk"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2954
+#: using-d-i.xml:2953
 #, no-c-format
 msgid ""
 "Newer (mid 1998 and on) PowerMacs use <command>yaboot</command> as their "
@@ -3613,13 +3611,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2972
+#: using-d-i.xml:2971
 #, no-c-format
 msgid "Install <command>Quik</command> on a Hard Disk"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2973
+#: using-d-i.xml:2972
 #, no-c-format
 msgid ""
 "The boot loader for OldWorld Power Macintosh machines is <command>quik</"
@@ -3629,7 +3627,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2997
+#: using-d-i.xml:2996
 #, no-c-format
 msgid ""
 "By default, Grub will be installed into the PReP partition, where it will "
@@ -3637,13 +3635,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3010
+#: using-d-i.xml:3009
 #, no-c-format
 msgid "<command>zipl</command>-installer"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3011
+#: using-d-i.xml:3010
 #, no-c-format
 msgid ""
 "The boot loader on &arch-title; is <quote>zipl</quote>. <command>ZIPL</"
@@ -3654,13 +3652,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3028
+#: using-d-i.xml:3027
 #, no-c-format
 msgid "Install the <command>SILO</command> Boot Loader on a Hard Disk"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3030
+#: using-d-i.xml:3029
 #, no-c-format
 msgid ""
 "The standard &architecture; boot loader is called <quote>silo</quote>. It is "
@@ -3678,13 +3676,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3055
+#: using-d-i.xml:3054
 #, no-c-format
 msgid "Making the system bootable with flash-kernel"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3056
+#: using-d-i.xml:3055
 #, no-c-format
 msgid ""
 "As there is no common firmware interface on all ARM platforms, the steps "
@@ -3697,7 +3695,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3067
+#: using-d-i.xml:3066
 #, no-c-format
 msgid ""
 "On devices which boot from internal NOR- or NAND-flash memory, flash-kernel "
@@ -3709,7 +3707,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3077
+#: using-d-i.xml:3076
 #, no-c-format
 msgid ""
 "For ARM systems that use U-Boot as their system firmware and boot the kernel "
@@ -3719,13 +3717,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3093
+#: using-d-i.xml:3092
 #, no-c-format
 msgid "Continue Without Boot Loader"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3095
+#: using-d-i.xml:3094
 #, no-c-format
 msgid ""
 "This option can be used to complete the installation even when no boot "
@@ -3734,7 +3732,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3102
+#: using-d-i.xml:3101
 #, no-c-format
 msgid ""
 "If you plan to manually configure your bootloader, you should check the name "
@@ -3748,13 +3746,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3119
+#: using-d-i.xml:3118
 #, no-c-format
 msgid "Finishing the Installation"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3120
+#: using-d-i.xml:3119
 #, no-c-format
 msgid ""
 "This is the last step in the &debian; installation process during which the "
@@ -3763,13 +3761,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3133
+#: using-d-i.xml:3132
 #, no-c-format
 msgid "Setting the System Clock"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3135
+#: using-d-i.xml:3134
 #, no-c-format
 msgid ""
 "The installer may ask you if the computer's clock is set to UTC. Normally "
@@ -3779,7 +3777,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3142
+#: using-d-i.xml:3141
 #, no-c-format
 msgid ""
 "In expert mode you will always be able to choose whether or not the clock is "
@@ -3791,7 +3789,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3153
+#: using-d-i.xml:3152
 #, no-c-format
 msgid ""
 "At this point &d-i; will also attempt to save the current time to the "
@@ -3800,13 +3798,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3168
+#: using-d-i.xml:3167
 #, no-c-format
 msgid "Reboot the System"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3170
+#: using-d-i.xml:3169
 #, no-c-format
 msgid ""
 "You will be prompted to remove the boot media (CD, USB stick, etc) that you "
@@ -3815,7 +3813,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3176
+#: using-d-i.xml:3175
 #, no-c-format
 msgid ""
 "After a final prompt the system will be halted because rebooting is not "
@@ -3825,13 +3823,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3189
+#: using-d-i.xml:3188
 #, no-c-format
 msgid "Troubleshooting"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3190
+#: using-d-i.xml:3189
 #, no-c-format
 msgid ""
 "The components listed in this section are usually not involved in the "
@@ -3840,13 +3838,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3203
+#: using-d-i.xml:3202
 #, no-c-format
 msgid "Saving the installation logs"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3205
+#: using-d-i.xml:3204
 #, no-c-format
 msgid ""
 "If the installation is successful, the logfiles created during the "
@@ -3855,7 +3853,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3212
+#: using-d-i.xml:3211
 #, no-c-format
 msgid ""
 "Choosing <guimenuitem>Save debug logs</guimenuitem> from the main menu "
@@ -3866,13 +3864,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3232
+#: using-d-i.xml:3231
 #, no-c-format
 msgid "Using the Shell and Viewing the Logs"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3234
+#: using-d-i.xml:3233
 #, no-c-format
 msgid ""
 "There are several methods you can use to get a shell while running an "
@@ -3888,13 +3886,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3252
+#: using-d-i.xml:3251
 #, no-c-format
 msgid "For the graphical installer see also <xref linkend=\"gtk-using\"/>."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3256
+#: using-d-i.xml:3255
 #, no-c-format
 msgid ""
 "If you cannot switch consoles, there is also an <guimenuitem>Execute a "
@@ -3905,7 +3903,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3264
+#: using-d-i.xml:3263
 #, no-c-format
 msgid ""
 "At this point you are booted from the RAM disk, and there is a limited set "
@@ -3917,7 +3915,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3273
+#: using-d-i.xml:3272
 #, no-c-format
 msgid ""
 "To edit and view files, use the text editor <command>nano</command>. Log "
@@ -3926,7 +3924,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3280
+#: using-d-i.xml:3279
 #, no-c-format
 msgid ""
 "Although you can do basically anything in a shell that the available "
@@ -3935,7 +3933,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3286
+#: using-d-i.xml:3285
 #, no-c-format
 msgid ""
 "Doing things manually from the shell may interfere with the installation "
@@ -3945,13 +3943,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3302
+#: using-d-i.xml:3301
 #, no-c-format
 msgid "Installation Over the Network"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3304
+#: using-d-i.xml:3303
 #, no-c-format
 msgid ""
 "One of the more interesting components is <firstterm>network-console</"
@@ -3963,21 +3961,21 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3314
+#: using-d-i.xml:3313
 #, no-c-format
 msgid ""
 "This component is not loaded into the main installation menu by default, so "
-"you have to explicitly ask for it. If you are installing from CD, you need "
-"to boot with medium priority or otherwise invoke the main installation menu "
-"and choose <guimenuitem>Load installer components from CD</guimenuitem> and "
-"from the list of additional components select <guimenuitem>network-console: "
-"Continue installation remotely using SSH</guimenuitem>. Successful load is "
-"indicated by a new menu entry called <guimenuitem>Continue installation "
-"remotely using SSH</guimenuitem>."
+"you have to explicitly ask for it. If you are installing from optical media, "
+"you need to boot with medium priority or otherwise invoke the main "
+"installation menu and choose <guimenuitem>Load installer components from "
+"installation media</guimenuitem> and from the list of additional components "
+"select <guimenuitem>network-console: Continue installation remotely using "
+"SSH</guimenuitem>. Successful load is indicated by a new menu entry called "
+"<guimenuitem>Continue installation remotely using SSH</guimenuitem>."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3327
+#: using-d-i.xml:3326
 #, no-c-format
 msgid ""
 "For installations on &arch-title;, this is the default method after setting "
@@ -3985,7 +3983,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3332
+#: using-d-i.xml:3331
 #, no-c-format
 msgid ""
 "<phrase arch=\"not-s390\">After selecting this new entry, you</phrase> "
@@ -3999,7 +3997,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3344
+#: using-d-i.xml:3343
 #, no-c-format
 msgid ""
 "Should you decide to continue with the installation locally, you can always "
@@ -4008,7 +4006,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3350
+#: using-d-i.xml:3349
 #, no-c-format
 msgid ""
 "Now let's switch to the other side of the wire. As a prerequisite, you need "
@@ -4027,7 +4025,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3367
+#: using-d-i.xml:3366
 #, no-c-format
 msgid ""
 "The <command>ssh</command> server in the installer uses a default "
@@ -4043,7 +4041,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3380
+#: using-d-i.xml:3379
 #, no-c-format
 msgid ""
 "You may be able to avoid the connection being dropped by adding the option "
@@ -4057,7 +4055,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3393
+#: using-d-i.xml:3392
 #, no-c-format
 msgid ""
 "If you install several computers in turn and they happen to have the same IP "
@@ -4072,7 +4070,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3409
+#: using-d-i.xml:3408
 #, no-c-format
 msgid ""
 "After the login you will be presented with an initial screen where you have "
@@ -4085,7 +4083,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3419
+#: using-d-i.xml:3418
 #, no-c-format
 msgid ""
 "After you have started the installation remotely over SSH, you should not go "
@@ -4096,13 +4094,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3438
+#: using-d-i.xml:3437
 #, no-c-format
 msgid "Loading Missing Firmware"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3439
+#: using-d-i.xml:3438
 #, no-c-format
 msgid ""
 "As described in <xref linkend=\"hardware-firmware\"/>, some devices require "
@@ -4112,7 +4110,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3447
+#: using-d-i.xml:3446
 #, no-c-format
 msgid ""
 "If a device driver requests firmware that is not available, &d-i; will "
@@ -4124,7 +4122,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3457
+#: using-d-i.xml:3456
 #, no-c-format
 msgid ""
 "Which devices are scanned and which file systems are supported depends on "
@@ -4136,7 +4134,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3467
+#: using-d-i.xml:3466
 #, no-c-format
 msgid ""
 "Note that it is possible to skip loading the firmware if you know the device "
@@ -4145,7 +4143,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3473
+#: using-d-i.xml:3472
 #, no-c-format
 msgid ""
 "&d-i; only prompts for firmware needed by kernel modules loaded during the "
@@ -4159,28 +4157,28 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3487
+#: using-d-i.xml:3486
 #, no-c-format
 msgid "Preparing a medium"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3488
+#: using-d-i.xml:3487
 #, no-c-format
 msgid ""
-"Official CD images do not include non-free firmware. The most common method "
-"to load such firmware is from some removable medium such as a USB stick. "
-"Alternatively, unofficial CD builds containing non-free firmware can be "
-"found at <ulink url=\"&url-firmware-cds;\"></ulink>. To prepare a USB stick "
-"(or other medium like a hard drive partition), the firmware files or "
-"packages must be placed in either the root directory or a directory named "
-"<filename>/firmware</filename> of the file system on the medium. The "
-"recommended file system to use is FAT as that is most certain to be "
-"supported during the early stages of the installation."
+"Official installation images do not include non-free firmware. The most "
+"common method to load such firmware is from some removable medium such as a "
+"USB stick. Alternatively, unofficial installation images containing non-free "
+"firmware can be found at <ulink url=\"&url-firmware-cds;\"></ulink>. To "
+"prepare a USB stick (or other medium like a hard drive partition), the "
+"firmware files or packages must be placed in either the root directory or a "
+"directory named <filename>/firmware</filename> of the file system on the "
+"medium. The recommended file system to use is FAT as that is most certain to "
+"be supported during the early stages of the installation."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3501
+#: using-d-i.xml:3500
 #, no-c-format
 msgid ""
 "Tarballs and zip files containing current packages for the most common "
@@ -4191,7 +4189,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3515
+#: using-d-i.xml:3514
 #, no-c-format
 msgid ""
 "If the firmware you need is not included in the tarball, you can also "
@@ -4202,7 +4200,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3529
+#: using-d-i.xml:3528
 #, no-c-format
 msgid ""
 "It is also possible to copy individual firmware files to the medium. Loose "
@@ -4211,13 +4209,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3538
+#: using-d-i.xml:3537
 #, no-c-format
 msgid "Firmware and the Installed System"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3539
+#: using-d-i.xml:3538
 #, no-c-format
 msgid ""
 "Any firmware loaded during the installation will be copied automatically to "
@@ -4229,7 +4227,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3548
+#: using-d-i.xml:3547
 #, no-c-format
 msgid ""
 "If the firmware was loaded from a firmware package, &d-i; will also install "
@@ -4240,7 +4238,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3556
+#: using-d-i.xml:3555
 #, no-c-format
 msgid ""
 "If loading the firmware was skipped during the installation, the relevant "
@@ -4249,7 +4247,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3563
+#: using-d-i.xml:3562
 #, no-c-format
 msgid ""
 "If the firmware was loaded from loose firmware files, the firmware copied to "
diff --git a/po/nb/welcome.po b/po/nb/welcome.po
index 9e8ee1edd..8139b9430 100644
--- a/po/nb/welcome.po
+++ b/po/nb/welcome.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: welcome_nb\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-09-22 23:04+0000\n"
 "PO-Revision-Date: 2019-12-18 08:21+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål\n"
@@ -502,10 +502,10 @@ msgstr "Hent &debian;"
 #, no-c-format
 msgid ""
 "For information on how to download &debian-gnu; from the Internet or from "
-"whom official &debian; CDs can be purchased, see the <ulink url=\"&url-"
-"debian-distrib;\">distribution web page</ulink>. The <ulink url=\"&url-"
-"debian-mirrors;\">list of &debian; mirrors</ulink> contains a full set of "
-"official &debian; mirrors, so you can easily find the nearest one."
+"whom official &debian; installation media can be purchased, see the <ulink "
+"url=\"&url-debian-distrib;\">distribution web page</ulink>. The <ulink url="
+"\"&url-debian-mirrors;\">list of &debian; mirrors</ulink> contains a full "
+"set of official &debian; mirrors, so you can easily find the nearest one."
 msgstr ""
 
 #. Tag: para
@@ -613,10 +613,10 @@ msgid ""
 "This involves choosing your language, configuring peripheral driver modules, "
 "configuring your network connection, so that remaining installation files "
 "can be obtained directly from a &debian; server (if you are not installing "
-"from a CD/DVD set), partitioning your hard drives and installation of a base "
-"system, then selection and installation of tasks. (Some background about "
-"setting up the partitions for your &debian; system is explained in <xref "
-"linkend=\"partitioning\"/>.)"
+"from a set of CD/DVD installation images), partitioning your hard drives and "
+"installation of a base system, then selection and installation of tasks. "
+"(Some background about setting up the partitions for your &debian; system is "
+"explained in <xref linkend=\"partitioning\"/>.)"
 msgstr ""
 
 #. Tag: para
@@ -697,12 +697,12 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Calling software <emphasis>free</emphasis> doesn't mean that the software "
-"isn't copyrighted, and it doesn't mean that CDs/DVDs containing that "
-"software must be distributed at no charge. Free software, in part, means "
-"that the licenses of individual programs do not require you to pay for the "
-"privilege of distributing or using those programs. Free software also means "
-"that not only may anyone extend, adapt, and modify the software, but that "
-"they may distribute the results of their work as well."
+"isn't copyrighted, and it doesn't mean that installation media containing "
+"that software must be distributed at no charge. Free software, in part, "
+"means that the licenses of individual programs do not require you to pay for "
+"the privilege of distributing or using those programs. Free software also "
+"means that not only may anyone extend, adapt, and modify the software, but "
+"that they may distribute the results of their work as well."
 msgstr ""
 
 #. Tag: para
diff --git a/po/nl/random-bits.po b/po/nl/random-bits.po
index 833745b86..72b4ad3c9 100644
--- a/po/nl/random-bits.po
+++ b/po/nl/random-bits.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2019-11-06 21:52+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -1421,7 +1421,18 @@ msgstr "Apt configureren"
 
 #. Tag: para
 #: random-bits.xml:652
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debootstrap will have created a very basic <filename>/etc/apt/sources."
+#| "list</filename> that will allow installing additional packages. However, "
+#| "you may want to add some additional sources, for example for source "
+#| "packages and security updates: <informalexample><screen>\n"
+#| "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
+#| "\n"
+#| "deb http://security.debian.org/ &releasename;/updates main\n"
+#| "deb-src http://security.debian.org/ &releasename;/updates main\n"
+#| "</screen></informalexample> Make sure to run <userinput>apt update</"
+#| "userinput> after you have made changes to the sources list."
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
 "filename> that will allow installing additional packages. However, you may "
@@ -1429,8 +1440,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
diff --git a/po/nn/random-bits.po b/po/nn/random-bits.po
index f30ef34d1..18d091923 100644
--- a/po/nn/random-bits.po
+++ b/po/nn/random-bits.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2016-12-26 18:56+0000\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian nynorsk <LL@li.org>\n"
@@ -1076,8 +1076,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
diff --git a/po/pot/random-bits.pot b/po/pot/random-bits.pot
index b487edf24..6e066470e 100644
--- a/po/pot/random-bits.pot
+++ b/po/pot/random-bits.pot
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+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"
@@ -1076,8 +1076,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
diff --git a/po/pt/random-bits.po b/po/pt/random-bits.po
index 437262894..939f7d614 100644
--- a/po/pt/random-bits.po
+++ b/po/pt/random-bits.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2019-09-30 22:36+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <kde-i18n-doc@kde.org>\n"
@@ -1392,7 +1392,18 @@ msgstr "Configurar o Apt"
 
 #. Tag: para
 #: random-bits.xml:652
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debootstrap will have created a very basic <filename>/etc/apt/sources."
+#| "list</filename> that will allow installing additional packages. However, "
+#| "you may want to add some additional sources, for example for source "
+#| "packages and security updates: <informalexample><screen>\n"
+#| "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
+#| "\n"
+#| "deb http://security.debian.org/ &releasename;/updates main\n"
+#| "deb-src http://security.debian.org/ &releasename;/updates main\n"
+#| "</screen></informalexample> Make sure to run <userinput>apt update</"
+#| "userinput> after you have made changes to the sources list."
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
 "filename> that will allow installing additional packages. However, you may "
@@ -1400,8 +1411,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
diff --git a/po/ro/random-bits.po b/po/ro/random-bits.po
index a564e6876..b326e73d1 100644
--- a/po/ro/random-bits.po
+++ b/po/ro/random-bits.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2016-12-26 18:56+0000\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <LL@li.org>\n"
@@ -1076,8 +1076,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
diff --git a/po/ru/random-bits.po b/po/ru/random-bits.po
index 06e361a91..cee6d2160 100644
--- a/po/ru/random-bits.po
+++ b/po/ru/random-bits.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2018-11-02 21:16+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -1441,7 +1441,18 @@ msgstr "Настройка Apt"
 
 #. Tag: para
 #: random-bits.xml:652
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debootstrap will have created a very basic <filename>/etc/apt/sources."
+#| "list</filename> that will allow installing additional packages. However, "
+#| "you may want to add some additional sources, for example for source "
+#| "packages and security updates: <informalexample><screen>\n"
+#| "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
+#| "\n"
+#| "deb http://security.debian.org/ &releasename;/updates main\n"
+#| "deb-src http://security.debian.org/ &releasename;/updates main\n"
+#| "</screen></informalexample> Make sure to run <userinput>apt update</"
+#| "userinput> after you have made changes to the sources list."
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
 "filename> that will allow installing additional packages. However, you may "
@@ -1449,8 +1460,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
diff --git a/po/sv/random-bits.po b/po/sv/random-bits.po
index 5534090b7..bb26897bb 100644
--- a/po/sv/random-bits.po
+++ b/po/sv/random-bits.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2019-11-19 16:04+0000\n"
 "Last-Translator: Mattias Münster <mattiasmun@gmail.com>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -1389,7 +1389,18 @@ msgstr "Konfigurera apt"
 
 #. Tag: para
 #: random-bits.xml:652
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debootstrap will have created a very basic <filename>/etc/apt/sources."
+#| "list</filename> that will allow installing additional packages. However, "
+#| "you may want to add some additional sources, for example for source "
+#| "packages and security updates: <informalexample><screen>\n"
+#| "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
+#| "\n"
+#| "deb http://security.debian.org/ &releasename;/updates main\n"
+#| "deb-src http://security.debian.org/ &releasename;/updates main\n"
+#| "</screen></informalexample> Make sure to run <userinput>apt update</"
+#| "userinput> after you have made changes to the sources list."
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
 "filename> that will allow installing additional packages. However, you may "
@@ -1397,8 +1408,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
diff --git a/po/tl/random-bits.po b/po/tl/random-bits.po
index 08fbca70f..0af0d1f9e 100644
--- a/po/tl/random-bits.po
+++ b/po/tl/random-bits.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2016-12-26 18:56+0000\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Tagalog <LL@li.org>\n"
@@ -1076,8 +1076,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
diff --git a/po/uk/administrivia.po b/po/uk/administrivia.po
index e849fda15..ab9923804 100644
--- a/po/uk/administrivia.po
+++ b/po/uk/administrivia.po
@@ -8,10 +8,10 @@ msgstr ""
 "PO-Revision-Date: 2019-09-03 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Ukranian\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
@@ -199,4 +199,3 @@ msgstr ""
 #, no-c-format
 msgid "All trademarks are property of their respective trademark owners."
 msgstr ""
-
diff --git a/po/uk/bookinfo.po b/po/uk/bookinfo.po
index 7bfb740cb..dfb0feb0b 100644
--- a/po/uk/bookinfo.po
+++ b/po/uk/bookinfo.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bookinfo_uk\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2017-02-14 17:41+0000\n"
 "PO-Revision-Date: 2019-09-03 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Ukranian\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
diff --git a/po/uk/boot-installer.po b/po/uk/boot-installer.po
index 25e84db01..7ec49d30c 100644
--- a/po/uk/boot-installer.po
+++ b/po/uk/boot-installer.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: boot-installer_uk\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-09-22 23:04+0000\n"
 "PO-Revision-Date: 2019-09-03 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Ukranian\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
@@ -160,10 +160,10 @@ msgstr ""
 #: boot-installer.xml:116
 #, no-c-format
 msgid ""
-"Prepare a standard arm64 CD image on a USB stick. Insert it in one of the "
-"USB ports on the back. Plug a serial cable into the upper 9-pin serial port "
-"on the back. If you need networking (netboot image) plug the ethernet cable "
-"into the socket on the front of the machine."
+"Prepare a standard arm64 CD/DVD image on a USB stick. Insert it in one of "
+"the USB ports on the back. Plug a serial cable into the upper 9-pin serial "
+"port on the back. If you need networking (netboot image) plug the ethernet "
+"cable into the socket on the front of the machine."
 msgstr ""
 
 #. Tag: para
@@ -226,8 +226,8 @@ msgid "Booting by TFTP"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:169 boot-installer.xml:779 boot-installer.xml:1416
-#: boot-installer.xml:1546 boot-installer.xml:1939
+#: boot-installer.xml:169 boot-installer.xml:778 boot-installer.xml:1415
+#: boot-installer.xml:1545 boot-installer.xml:1938
 #, no-c-format
 msgid ""
 "Booting from the network requires that you have a network connection and a "
@@ -236,8 +236,8 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:175 boot-installer.xml:785 boot-installer.xml:1422
-#: boot-installer.xml:1552 boot-installer.xml:1945
+#: boot-installer.xml:175 boot-installer.xml:784 boot-installer.xml:1421
+#: boot-installer.xml:1551 boot-installer.xml:1944
 #, no-c-format
 msgid ""
 "Older systems such as the 715 might require the use of an RBOOT server "
@@ -245,8 +245,8 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:180 boot-installer.xml:790 boot-installer.xml:1427
-#: boot-installer.xml:1557 boot-installer.xml:1950
+#: boot-installer.xml:180 boot-installer.xml:789 boot-installer.xml:1426
+#: boot-installer.xml:1556 boot-installer.xml:1949
 #, no-c-format
 msgid ""
 "The server-side setup to support network booting is described in <xref "
@@ -594,45 +594,46 @@ msgid "Booting from USB Memory Stick"
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:573 boot-installer.xml:1030 boot-installer.xml:1973
+#: boot-installer.xml:573
 #, no-c-format
-msgid "Booting from a CD-ROM"
+msgid "Booting from optical disc (CD/DVD)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:579 boot-installer.xml:1036 boot-installer.xml:1979
+#: boot-installer.xml:579 boot-installer.xml:1035 boot-installer.xml:1978
 #, no-c-format
 msgid ""
-"If you have a CD set, and if your machine supports booting directly off the "
-"CD, great! Simply <phrase arch=\"x86\"> configure your system for booting "
-"off a CD as described in <xref linkend=\"boot-dev-select-x86\"/>, </phrase> "
-"insert your CD, reboot, and proceed to the next chapter."
+"If you have a set of optical discs, and your machine supports booting "
+"directly off those, great! Simply <phrase arch=\"x86\"> configure your "
+"system for booting off an optical disc as described in <xref linkend=\"boot-"
+"dev-select-x86\"/>, </phrase> insert the disc, reboot, and proceed to the "
+"next chapter."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:589 boot-installer.xml:1046 boot-installer.xml:1989
+#: boot-installer.xml:589 boot-installer.xml:1045 boot-installer.xml:1988
 #, no-c-format
 msgid ""
-"Note that certain CD drives may require special drivers, and thus be "
+"Note that certain optical drives may require special drivers, and thus be "
 "inaccessible in the early installation stages. If it turns out the standard "
-"way of booting off a CD doesn't work for your hardware, revisit this chapter "
-"and read about alternate kernels and installation methods which may work for "
-"you."
+"way of booting off an optical disc doesn't work for your hardware, revisit "
+"this chapter and read about alternate kernels and installation methods which "
+"may work for you."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:597 boot-installer.xml:1054 boot-installer.xml:1997
+#: boot-installer.xml:597 boot-installer.xml:1053 boot-installer.xml:1996
 #, no-c-format
 msgid ""
-"Even if you cannot boot from CD-ROM, you can probably install the &debian; "
-"system components and any packages you want from CD-ROM. Simply boot using a "
-"different medium and when it's time to install the operating system, base "
-"system, and any additional packages, point the installation system at the CD-"
-"ROM drive."
+"Even if you cannot boot from optical disc, you can probably install the "
+"&debian; system components and any packages you want from such disc. Simply "
+"boot using a different medium and when it's time to install the operating "
+"system, base system, and any additional packages, point the installation "
+"system at the optical drive."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:605 boot-installer.xml:1062 boot-installer.xml:2005
+#: boot-installer.xml:605 boot-installer.xml:1061 boot-installer.xml:2004
 #, no-c-format
 msgid ""
 "If you have problems booting, see <xref linkend=\"boot-troubleshooting\"/>."
@@ -654,14 +655,13 @@ msgstr ""
 #: boot-installer.xml:621
 #, no-c-format
 msgid ""
-"obtain CD-ROM/DVD-ROM<phrase condition=\"bootable-usb\"> or USB memory "
-"stick</phrase> installation media as described in <xref linkend=\"official-"
-"cdrom\"/><phrase condition=\"bootable-usb\"> respective <xref linkend=\"boot-"
-"usb-files\"/></phrase> or"
+"obtain installation media as described in <xref linkend=\"official-cdrom\"/"
+"><phrase condition=\"bootable-usb\"> or <xref linkend=\"boot-usb-files\"/></"
+"phrase> or"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:629
+#: boot-installer.xml:628
 #, no-c-format
 msgid ""
 "download a standalone Windows executable, which is available as <ulink url="
@@ -670,10 +670,10 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:638
+#: boot-installer.xml:637
 #, no-c-format
 msgid ""
-"If you use an installation CD or DVD, a pre-installation program should be "
+"If you use optical installation media, a pre-installation program should be "
 "launched automatically when you insert the disc. In case Windows does not "
 "start it automatically, or if you are using a USB memory stick, you can run "
 "it manually by accessing the device and executing <command>setup.exe</"
@@ -681,7 +681,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:646
+#: boot-installer.xml:645
 #, no-c-format
 msgid ""
 "After the program has been started, a few preliminary questions will be "
@@ -690,13 +690,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:656
+#: boot-installer.xml:655
 #, no-c-format
 msgid "Booting from DOS using loadlin"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:657
+#: boot-installer.xml:656
 #, no-c-format
 msgid ""
 "Boot into DOS (not Windows). To do this, you can for instance boot from a "
@@ -704,7 +704,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:662
+#: boot-installer.xml:661
 #, no-c-format
 msgid ""
 "If you can access the installation CD, change the current drive to the CD-"
@@ -716,7 +716,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:672
+#: boot-installer.xml:671
 #, no-c-format
 msgid ""
 "Enter the subdirectory for the flavor you chose, e.g., "
@@ -730,14 +730,14 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:690
+#: boot-installer.xml:689
 #, no-c-format
 msgid ""
 "Booting from Linux using <command>LILO</command> or <command>GRUB</command>"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:693
+#: boot-installer.xml:692
 #, no-c-format
 msgid ""
 "To boot the installer from hard disk, you must first download and place the "
@@ -745,7 +745,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:698
+#: boot-installer.xml:697
 #, no-c-format
 msgid ""
 "If you intend to use the hard drive only for booting and then download "
@@ -757,19 +757,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:708
+#: boot-installer.xml:707
 #, no-c-format
 msgid ""
 "Alternatively, if you intend to keep an existing partition on the hard drive "
 "unchanged during the install, you can download the <filename>hd-media/initrd."
-"gz</filename> file and its kernel, as well as copy a CD (or DVD) iso to the "
-"drive (make sure the file is named ending in <literal>.iso</literal>). The "
-"installer can then boot from the drive and install from the CD/DVD image, "
-"without needing the network."
+"gz</filename> file and its kernel, as well as copy an installation image to "
+"the hard drive (make sure the file is named ending in <literal>.iso</"
+"literal>). The installer can then boot from the hard drive and install from "
+"the installation image, without needing the network."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:717
+#: boot-installer.xml:716
 #, no-c-format
 msgid ""
 "For <command>LILO</command>, you will need to configure two essential things "
@@ -781,7 +781,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: boot-installer.xml:738
+#: boot-installer.xml:737
 #, no-c-format
 msgid ""
 "image=/boot/newinstall/vmlinuz\n"
@@ -790,7 +790,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:738
+#: boot-installer.xml:737
 #, no-c-format
 msgid ""
 "For more details, refer to the <citerefentry><refentrytitle>initrd</"
@@ -801,7 +801,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:747
+#: boot-installer.xml:746
 #, no-c-format
 msgid ""
 "The procedure for <command>GRUB1</command> is quite similar. Locate your "
@@ -812,7 +812,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: boot-installer.xml:755
+#: boot-installer.xml:754
 #, no-c-format
 msgid ""
 "title  New Install\n"
@@ -822,7 +822,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:757
+#: boot-installer.xml:756
 #, no-c-format
 msgid ""
 "The procedure for <command>GRUB2</command> is very similar. The file is "
@@ -831,7 +831,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: boot-installer.xml:763
+#: boot-installer.xml:762
 #, no-c-format
 msgid ""
 "menuentry 'New Install' {\n"
@@ -844,7 +844,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:765
+#: boot-installer.xml:764
 #, no-c-format
 msgid ""
 "From here on, there should be no difference between <command>GRUB</command> "
@@ -852,26 +852,26 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:773 boot-installer.xml:1398 boot-installer.xml:1540
-#: boot-installer.xml:1933
+#: boot-installer.xml:772 boot-installer.xml:1397 boot-installer.xml:1539
+#: boot-installer.xml:1932
 #, no-c-format
 msgid "Booting with TFTP"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:798
+#: boot-installer.xml:797
 #, no-c-format
 msgid "There are various ways to do a TFTP boot on i386."
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:804
+#: boot-installer.xml:803
 #, no-c-format
 msgid "NIC or Motherboard that support PXE"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:805
+#: boot-installer.xml:804
 #, no-c-format
 msgid ""
 "It could be that your Network Interface Card or Motherboard provides PXE "
@@ -881,13 +881,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:816
+#: boot-installer.xml:815
 #, no-c-format
 msgid "NIC with Network BootROM"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:817
+#: boot-installer.xml:816
 #, no-c-format
 msgid ""
 "It could be that your Network Interface Card provides TFTP boot "
@@ -895,7 +895,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:822
+#: boot-installer.xml:821
 #, no-c-format
 msgid ""
 "Let us (<email>&email-debian-boot-list;</email>) know how did you manage it. "
@@ -903,13 +903,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:830
+#: boot-installer.xml:829
 #, no-c-format
 msgid "Etherboot"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:831
+#: boot-installer.xml:830
 #, no-c-format
 msgid ""
 "The <ulink url=\"http://www.etherboot.org\">etherboot project</ulink> "
@@ -917,13 +917,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:841
+#: boot-installer.xml:840
 #, no-c-format
 msgid "The Boot Screen"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:842
+#: boot-installer.xml:841
 #, no-c-format
 msgid ""
 "When the installer boots, you should be presented with a friendly graphical "
@@ -931,7 +931,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: boot-installer.xml:847
+#: boot-installer.xml:846
 #, no-c-format
 msgid ""
 "&debian-gnu; installer boot menu\n"
@@ -944,7 +944,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:851
+#: boot-installer.xml:850
 #, no-c-format
 msgid ""
 "This graphical screen will look very slightly different depending on how "
@@ -952,7 +952,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:859
+#: boot-installer.xml:858
 #, no-c-format
 msgid ""
 "Depending on the installation method you are using, the <quote>Graphical "
@@ -962,7 +962,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:866
+#: boot-installer.xml:865
 #, no-c-format
 msgid ""
 "For a normal installation, select either the <quote>Graphical install</"
@@ -973,7 +973,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:874
+#: boot-installer.xml:873
 #, no-c-format
 msgid ""
 "The <quote>Advanced options</quote> entry gives access to a second menu that "
@@ -982,7 +982,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:880
+#: boot-installer.xml:879
 #, no-c-format
 msgid ""
 "If you wish or need to add any boot parameters for either the installer or "
@@ -996,7 +996,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:893
+#: boot-installer.xml:892
 #, no-c-format
 msgid ""
 "Choosing the <quote>Help</quote> entry will result in the first help screen "
@@ -1016,7 +1016,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:911
+#: boot-installer.xml:910
 #, no-c-format
 msgid ""
 "The keyboard is assumed to have a default American English layout at this "
@@ -1028,7 +1028,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:921
+#: boot-installer.xml:920
 #, no-c-format
 msgid ""
 "If you are using a system that has the BIOS configured to use serial "
@@ -1041,7 +1041,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:931
+#: boot-installer.xml:930
 #, no-c-format
 msgid ""
 "To bypass the graphical boot screen you can either blindly press &escapekey; "
@@ -1054,13 +1054,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:947
+#: boot-installer.xml:946
 #, no-c-format
 msgid "The Graphical Installer"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:948
+#: boot-installer.xml:947
 #, no-c-format
 msgid ""
 "The graphical version of the installer is only available for a limited "
@@ -1071,7 +1071,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:956
+#: boot-installer.xml:955
 #, no-c-format
 msgid ""
 "Although the functionality is identical, the graphical installer still has a "
@@ -1083,10 +1083,10 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:965
+#: boot-installer.xml:964
 #, no-c-format
 msgid ""
-"The graphical installer is available with all CD images and with the hd-"
+"The graphical installer is available with all CD/DVD images and with the hd-"
 "media installation method. To boot the graphical installer simply select the "
 "relevant option from the boot menu. Expert and rescue mode for the graphical "
 "installer can be selected from the <quote>Advanced options</quote> menu. The "
@@ -1097,7 +1097,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:976
+#: boot-installer.xml:975
 #, no-c-format
 msgid ""
 "There is also a graphical installer image that can be netbooted. And there "
@@ -1109,7 +1109,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:989
+#: boot-installer.xml:988
 #, no-c-format
 msgid ""
 "For &arch-title;, currently only an experimental <quote>mini</quote> ISO "
@@ -1121,7 +1121,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1003
+#: boot-installer.xml:1002
 #, no-c-format
 msgid ""
 "Just as with the text-based installer it is possible to add boot parameters "
@@ -1129,7 +1129,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1009
+#: boot-installer.xml:1008
 #, no-c-format
 msgid ""
 "The graphical installer requires significantly more memory to run than the "
@@ -1139,7 +1139,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1016
+#: boot-installer.xml:1015
 #, no-c-format
 msgid ""
 "If the amount of memory in your system is below &minimum-memory;, the "
@@ -1149,13 +1149,19 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1070
+#: boot-installer.xml:1029 boot-installer.xml:1972
+#, no-c-format
+msgid "Booting from a CD-ROM"
+msgstr ""
+
+#. Tag: title
+#: boot-installer.xml:1069
 #, no-c-format
 msgid "CD Contents"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1072
+#: boot-installer.xml:1071
 #, no-c-format
 msgid ""
 "There are three basic variations of &debian; Install CDs. The "
@@ -1170,7 +1176,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1088
+#: boot-installer.xml:1087
 #, no-c-format
 msgid ""
 "The IA-64 architecture uses the next generation Extensible Firmware "
@@ -1186,7 +1192,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1104
+#: boot-installer.xml:1103
 #, no-c-format
 msgid ""
 "The &debian; Installer CD contains a small EFI partition where the "
@@ -1197,7 +1203,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1113
+#: boot-installer.xml:1112
 #, no-c-format
 msgid ""
 "Most of the details of how <command>ELILO</command> actually loads and "
@@ -1211,7 +1217,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1125
+#: boot-installer.xml:1124
 #, no-c-format
 msgid ""
 "The EFI Boot Manager is presented as the last step of the firmware "
@@ -1226,13 +1232,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1144
+#: boot-installer.xml:1143
 #, no-c-format
 msgid "IMPORTANT"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1145
+#: boot-installer.xml:1144
 #, no-c-format
 msgid ""
 "The EFI Boot Manager will select a default boot action, typically the first "
@@ -1245,13 +1251,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1157
+#: boot-installer.xml:1156
 #, no-c-format
 msgid "Option 1: Booting from the Boot Option Maintenance Menu"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1164
+#: boot-installer.xml:1163
 #, no-c-format
 msgid ""
 "Insert the CD in the DVD/CD drive and reboot the machine. The firmware will "
@@ -1260,7 +1266,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1170
+#: boot-installer.xml:1169
 #, no-c-format
 msgid ""
 "Select <command>Boot Maintenance Menu</command> from the menu with the arrow "
@@ -1268,7 +1274,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1176
+#: boot-installer.xml:1175
 #, no-c-format
 msgid ""
 "Select <command>Boot From a File</command> from the menu with the arrow keys "
@@ -1280,7 +1286,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1187
+#: boot-installer.xml:1186
 #, no-c-format
 msgid ""
 "You can choose either of the entries that refer to the CD/DVD drive. Select "
@@ -1292,7 +1298,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1198
+#: boot-installer.xml:1197
 #, no-c-format
 msgid ""
 "You will only need this step if you chose <command>Debian Inst [Acpi ...</"
@@ -1303,7 +1309,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1210
+#: boot-installer.xml:1209
 #, no-c-format
 msgid ""
 "These steps start the &debian; boot loader which will display a menu page "
@@ -1312,13 +1318,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1220
+#: boot-installer.xml:1219
 #, no-c-format
 msgid "Option 2: Booting from the EFI Shell"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1221
+#: boot-installer.xml:1220
 #, no-c-format
 msgid ""
 "If, for some reason, option 1 is not successful, reboot the machine and when "
@@ -1328,7 +1334,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1232
+#: boot-installer.xml:1231
 #, no-c-format
 msgid ""
 "Insert the CD in the DVD/CD drive and reboot the machine. The firmware will "
@@ -1337,7 +1343,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1238
+#: boot-installer.xml:1237
 #, no-c-format
 msgid ""
 "Select <command>EFI Shell</command> from the menu with the arrow keys and "
@@ -1351,7 +1357,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1252
+#: boot-installer.xml:1251
 #, no-c-format
 msgid ""
 "Examine the output from the shell looking for the CDROM drive. It is most "
@@ -1361,7 +1367,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1259
+#: boot-installer.xml:1258
 #, no-c-format
 msgid ""
 "Enter <command>fs<replaceable>n</replaceable>:</command> and press "
@@ -1371,7 +1377,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1266
+#: boot-installer.xml:1265
 #, no-c-format
 msgid ""
 "Enter <command>elilo</command> and press <command>ENTER</command>. This will "
@@ -1379,7 +1385,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1273
+#: boot-installer.xml:1272
 #, no-c-format
 msgid ""
 "As with option 1, these steps start the &debian; boot loader which will "
@@ -1390,13 +1396,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1287
+#: boot-installer.xml:1286
 #, no-c-format
 msgid "Installing using a Serial Console"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1289
+#: boot-installer.xml:1288
 #, no-c-format
 msgid ""
 "You may choose to perform an install using a monitor and keyboard or using a "
@@ -1409,7 +1415,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1300
+#: boot-installer.xml:1299
 #, no-c-format
 msgid ""
 "In most circumstances, you will want the installer to use the same baud rate "
@@ -1419,7 +1425,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1307
+#: boot-installer.xml:1306
 #, no-c-format
 msgid ""
 "If there is not an option available that is configured for the serial device "
@@ -1430,7 +1436,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1318
+#: boot-installer.xml:1317
 #, no-c-format
 msgid ""
 "Most IA-64 boxes ship with a default console setting of 9600 baud. This "
@@ -1442,7 +1448,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1327
+#: boot-installer.xml:1326
 #, no-c-format
 msgid ""
 "If you select the wrong console type, you will be able to select the kernel "
@@ -1452,13 +1458,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1336
+#: boot-installer.xml:1335
 #, no-c-format
 msgid "Selecting the Boot Kernel and Options"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1338
+#: boot-installer.xml:1337
 #, no-c-format
 msgid ""
 "The boot loader will display a form with a menu list and a text window with "
@@ -1471,7 +1477,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1350
+#: boot-installer.xml:1349
 #, no-c-format
 msgid ""
 "Consult the <classname>General</classname> help screen for the description "
@@ -1486,7 +1492,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1368
+#: boot-installer.xml:1367
 #, no-c-format
 msgid ""
 "Select the kernel version and installation mode most appropriate to your "
@@ -1494,7 +1500,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1373
+#: boot-installer.xml:1372
 #, no-c-format
 msgid ""
 "Enter any boot parameters by typing at the keyboard. The text will be "
@@ -1503,7 +1509,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1380
+#: boot-installer.xml:1379
 #, no-c-format
 msgid ""
 "Press <command>ENTER</command>. This will load and start the kernel. The "
@@ -1512,7 +1518,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1389 boot-installer.xml:1526
+#: boot-installer.xml:1388 boot-installer.xml:1525
 #, no-c-format
 msgid ""
 "Proceed to the next chapter to continue the installation where you will set "
@@ -1520,7 +1526,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1400
+#: boot-installer.xml:1399
 #, no-c-format
 msgid ""
 "Booting an IA-64 system from the network is similar to a CD boot. The only "
@@ -1533,7 +1539,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1435
+#: boot-installer.xml:1434
 #, no-c-format
 msgid ""
 "Network booting an IA-64 system requires two architecture-specific actions. "
@@ -1543,13 +1549,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1446
+#: boot-installer.xml:1445
 #, no-c-format
 msgid "Configuring the Server"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1447
+#: boot-installer.xml:1446
 #, no-c-format
 msgid ""
 "A suitable TFTP entry for network booting an IA-64 system looks something "
@@ -1564,7 +1570,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1457
+#: boot-installer.xml:1456
 #, no-c-format
 msgid ""
 "Extract the <filename>netboot.tar.gz</filename> file into the directory used "
@@ -1575,7 +1581,7 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: boot-installer.xml:1467
+#: boot-installer.xml:1466
 #, no-c-format
 msgid ""
 "# cd /var/lib/tftp\n"
@@ -1587,7 +1593,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1467
+#: boot-installer.xml:1466
 #, no-c-format
 msgid ""
 "The <filename>netboot.tar.gz</filename> contains an <filename>elilo.conf</"
@@ -1601,13 +1607,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1484
+#: boot-installer.xml:1483
 #, no-c-format
 msgid "Configuring the Client"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1485
+#: boot-installer.xml:1484
 #, no-c-format
 msgid ""
 "To configure the client to support TFTP booting, start by booting to EFI and "
@@ -1625,7 +1631,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1517
+#: boot-installer.xml:1516
 #, no-c-format
 msgid ""
 "The boot loader will display its prompt after it has downloaded and "
@@ -1636,13 +1642,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1571
+#: boot-installer.xml:1570
 #, no-c-format
 msgid "S/390 Limitations"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1572
+#: boot-installer.xml:1571
 #, no-c-format
 msgid ""
 "In order to run the installation system a working network setup and ssh "
@@ -1650,7 +1656,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1577
+#: boot-installer.xml:1576
 #, no-c-format
 msgid ""
 "The booting process starts with a network setup that prompts you for several "
@@ -1660,13 +1666,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1588
+#: boot-installer.xml:1587
 #, no-c-format
 msgid "S/390 Boot Parameters"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1589
+#: boot-installer.xml:1588
 #, no-c-format
 msgid ""
 "On S/390 you can append boot parameters in the parm file. This file can "
@@ -1679,7 +1685,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1606
+#: boot-installer.xml:1605
 #, no-c-format
 msgid ""
 "If you boot the installer in a logical partition (LPAR) or virtual machine "
@@ -1702,25 +1708,25 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1891
+#: boot-installer.xml:1890
 #, no-c-format
 msgid "Booting a ppc64el machine"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1892
+#: boot-installer.xml:1891
 #, no-c-format
 msgid "How to boot a ppc64el machine:"
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:1898
+#: boot-installer.xml:1897
 #, no-c-format
 msgid "Petitboot"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1899
+#: boot-installer.xml:1898
 #, no-c-format
 msgid ""
 "Petitboot is a platform independent bootloader based on the Linux kexec. "
@@ -1731,7 +1737,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1907
+#: boot-installer.xml:1906
 #, no-c-format
 msgid ""
 "Petitboot looks for bootloader configuration files on mountable devices in "
@@ -1740,7 +1746,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:1958
+#: boot-installer.xml:1957
 #, no-c-format
 msgid ""
 "On machines with OpenBoot, simply enter the boot monitor on the machine "
@@ -1753,7 +1759,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2012
+#: boot-installer.xml:2011
 #, no-c-format
 msgid ""
 "Most OpenBoot versions support the <userinput>boot cdrom</userinput> command "
@@ -1762,13 +1768,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2021
+#: boot-installer.xml:2020
 #, no-c-format
 msgid "IDPROM Messages"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2022
+#: boot-installer.xml:2021
 #, no-c-format
 msgid ""
 "If you cannot boot because you get messages about a problem with "
@@ -1779,13 +1785,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2041
+#: boot-installer.xml:2040
 #, no-c-format
 msgid "Accessibility"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2042
+#: boot-installer.xml:2041
 #, no-c-format
 msgid ""
 "Some users may need specific support because of e.g. some visual impairment. "
@@ -1803,13 +1809,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2062
+#: boot-installer.xml:2061
 #, no-c-format
 msgid "Installer front-end"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2063
+#: boot-installer.xml:2062
 #, no-c-format
 msgid ""
 "The &debian; installer supports several front-ends for asking questions, "
@@ -1821,13 +1827,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2075
+#: boot-installer.xml:2074
 #, no-c-format
 msgid "USB Braille Displays"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2076
+#: boot-installer.xml:2075
 #, no-c-format
 msgid ""
 "USB braille displays should be automatically detected. A textual version of "
@@ -1841,13 +1847,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2091
+#: boot-installer.xml:2090
 #, no-c-format
 msgid "Serial Braille Displays"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2092
+#: boot-installer.xml:2091
 #, no-c-format
 msgid ""
 "Serial braille displays cannot safely be automatically detected (since that "
@@ -1872,13 +1878,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2119 boot-installer.xml:3109
+#: boot-installer.xml:2118 boot-installer.xml:3107
 #, no-c-format
 msgid "Software Speech Synthesis"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2120
+#: boot-installer.xml:2119
 #, no-c-format
 msgid ""
 "Support for software speech synthesis is available on all installer images "
@@ -1890,7 +1896,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2129
+#: boot-installer.xml:2128
 #, no-c-format
 msgid ""
 "If several sound cards are detected, you will be prompted to press "
@@ -1898,7 +1904,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2134
+#: boot-installer.xml:2133
 #, no-c-format
 msgid ""
 "The first question (language) is spoken in english, and the remainder of "
@@ -1907,7 +1913,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2140
+#: boot-installer.xml:2139
 #, no-c-format
 msgid ""
 "The default speech rate is quite slow. To make it faster, press "
@@ -1925,13 +1931,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2168
+#: boot-installer.xml:2167
 #, no-c-format
 msgid "Hardware Speech Synthesis"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2169
+#: boot-installer.xml:2168
 #, no-c-format
 msgid ""
 "Support for hardware speech synthesis devices is available on all installer "
@@ -1941,7 +1947,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2176
+#: boot-installer.xml:2175
 #, no-c-format
 msgid ""
 "Hardware speech synthesis devices cannot be automatically detected. You thus "
@@ -1955,13 +1961,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2191
+#: boot-installer.xml:2190
 #, no-c-format
 msgid "Board Devices"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2192
+#: boot-installer.xml:2191
 #, no-c-format
 msgid ""
 "Some accessibility devices are actual boards that are plugged inside the "
@@ -1972,7 +1978,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2200
+#: boot-installer.xml:2199
 #, no-c-format
 msgid ""
 "If desired a textual version of the bootloader can be activated before "
@@ -1980,13 +1986,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2208
+#: boot-installer.xml:2207
 #, no-c-format
 msgid "High-Contrast Theme"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2209
+#: boot-installer.xml:2208
 #, no-c-format
 msgid ""
 "For users with low vision, the installer can use a high-contrast color theme "
@@ -1997,13 +2003,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2220
+#: boot-installer.xml:2219
 #, no-c-format
 msgid "Zoom"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2221
+#: boot-installer.xml:2220
 #, no-c-format
 msgid ""
 "For users with low vision, the graphical installer has a very basic zoom "
@@ -2013,13 +2019,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2231
+#: boot-installer.xml:2230
 #, no-c-format
 msgid "Expert install, rescue mode, automated install"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2232
+#: boot-installer.xml:2231
 #, no-c-format
 msgid ""
 "Expert, Rescue, and Automated installation choices are also available with "
@@ -2037,7 +2043,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2247
+#: boot-installer.xml:2246
 #, no-c-format
 msgid ""
 "The automated install choice allows to install &debian; completely "
@@ -2047,13 +2053,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2257
+#: boot-installer.xml:2256
 #, no-c-format
 msgid "Accessibility of the installed system"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2258
+#: boot-installer.xml:2257
 #, no-c-format
 msgid ""
 "Documentation on accessibility of the installed system is available on the "
@@ -2062,13 +2068,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2272
+#: boot-installer.xml:2271
 #, no-c-format
 msgid "Boot Parameters"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2273
+#: boot-installer.xml:2272
 #, no-c-format
 msgid ""
 "Boot parameters are Linux kernel parameters which are generally used to make "
@@ -2078,7 +2084,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2280
+#: boot-installer.xml:2279
 #, no-c-format
 msgid ""
 "If this is the first time you're booting the system, try the default boot "
@@ -2088,7 +2094,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2287
+#: boot-installer.xml:2286
 #, no-c-format
 msgid ""
 "Information on many boot parameters can be found in the <ulink url=\"http://"
@@ -2099,13 +2105,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2299
+#: boot-installer.xml:2298
 #, no-c-format
 msgid "Boot console"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2301
+#: boot-installer.xml:2300
 #, no-c-format
 msgid ""
 "If you are booting with a serial console, generally the kernel will "
@@ -2118,7 +2124,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2313
+#: boot-installer.xml:2312
 #, no-c-format
 msgid ""
 "You may need to specify parameters for the serial port, such as speed and "
@@ -2129,7 +2135,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2321
+#: boot-installer.xml:2320
 #, no-c-format
 msgid ""
 "In order to ensure the terminal type used by the installer matches your "
@@ -2147,7 +2153,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2337
+#: boot-installer.xml:2336
 #, no-c-format
 msgid ""
 "For &arch-title; the serial devices are <filename>ttya</filename> or "
@@ -2157,13 +2163,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2349
+#: boot-installer.xml:2348
 #, no-c-format
 msgid "&debian; Installer Parameters"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2350
+#: boot-installer.xml:2349
 #, no-c-format
 msgid ""
 "The installation system recognizes a few additional boot "
@@ -2175,7 +2181,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2365
+#: boot-installer.xml:2364
 #, no-c-format
 msgid ""
 "A number of parameters have a <quote>short form</quote> that helps avoid the "
@@ -2186,19 +2192,19 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2377
+#: boot-installer.xml:2376
 #, no-c-format
 msgid "debconf/priority (priority)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2378
+#: boot-installer.xml:2377
 #, no-c-format
 msgid "This parameter sets the lowest priority of messages to be displayed."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2382
+#: boot-installer.xml:2381
 #, no-c-format
 msgid ""
 "The default installation uses <userinput>priority=high</userinput>. This "
@@ -2208,7 +2214,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2389
+#: boot-installer.xml:2388
 #, no-c-format
 msgid ""
 "If you add <userinput>priority=medium</userinput> as boot parameter, you "
@@ -2221,13 +2227,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2403
+#: boot-installer.xml:2402
 #, no-c-format
 msgid "DEBIAN_FRONTEND"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2404
+#: boot-installer.xml:2403
 #, no-c-format
 msgid ""
 "This boot parameter controls the type of user interface used for the "
@@ -2248,13 +2254,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2435
+#: boot-installer.xml:2434
 #, no-c-format
 msgid "BOOT_DEBUG"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2436
+#: boot-installer.xml:2435
 #, no-c-format
 msgid ""
 "Setting this boot parameter to 2 will cause the installer's boot process to "
@@ -2264,49 +2270,49 @@ msgid ""
 msgstr ""
 
 #. Tag: userinput
-#: boot-installer.xml:2445
+#: boot-installer.xml:2444
 #, no-c-format
 msgid "BOOT_DEBUG=0"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2446
+#: boot-installer.xml:2445
 #, no-c-format
 msgid "This is the default."
 msgstr ""
 
 #. Tag: userinput
-#: boot-installer.xml:2450
+#: boot-installer.xml:2449
 #, no-c-format
 msgid "BOOT_DEBUG=1"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2451
+#: boot-installer.xml:2450
 #, no-c-format
 msgid "More verbose than usual."
 msgstr ""
 
 #. Tag: userinput
-#: boot-installer.xml:2455
+#: boot-installer.xml:2454
 #, no-c-format
 msgid "BOOT_DEBUG=2"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2456
+#: boot-installer.xml:2455
 #, no-c-format
 msgid "Lots of debugging information."
 msgstr ""
 
 #. Tag: userinput
-#: boot-installer.xml:2460
+#: boot-installer.xml:2459
 #, no-c-format
 msgid "BOOT_DEBUG=3"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2461
+#: boot-installer.xml:2460
 #, no-c-format
 msgid ""
 "Shells are run at various points in the boot process to allow detailed "
@@ -2314,19 +2320,19 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2475
+#: boot-installer.xml:2474
 #, no-c-format
 msgid "log_host"
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2476
+#: boot-installer.xml:2475
 #, no-c-format
 msgid "log_port"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2477
+#: boot-installer.xml:2476
 #, no-c-format
 msgid ""
 "Causes the installer to send log messages to a remote syslog on the "
@@ -2335,13 +2341,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2488
+#: boot-installer.xml:2487
 #, no-c-format
 msgid "lowmem"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2489
+#: boot-installer.xml:2488
 #, no-c-format
 msgid ""
 "Can be used to force the installer to a lowmem level higher than the one the "
@@ -2350,13 +2356,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2499
+#: boot-installer.xml:2498
 #, no-c-format
 msgid "noshell"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2500
+#: boot-installer.xml:2499
 #, no-c-format
 msgid ""
 "Prevents the installer from offering interactive shells on tty2 and tty3. "
@@ -2364,13 +2370,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2509
+#: boot-installer.xml:2508
 #, no-c-format
 msgid "debian-installer/framebuffer (fb)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2510
+#: boot-installer.xml:2509
 #, no-c-format
 msgid ""
 "Some architectures use the kernel framebuffer to offer installation in a "
@@ -2382,13 +2388,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2519
+#: boot-installer.xml:2518
 #, no-c-format
 msgid "Such problems have been reported on hppa."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2523
+#: boot-installer.xml:2522
 #, no-c-format
 msgid ""
 "Because of display problems on some systems, framebuffer support is "
@@ -2400,13 +2406,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2537
+#: boot-installer.xml:2536
 #, no-c-format
 msgid "debian-installer/theme (theme)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2538
+#: boot-installer.xml:2537
 #, no-c-format
 msgid ""
 "A theme determines how the user interface of the installer looks (colors, "
@@ -2417,13 +2423,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2550 boot-installer.xml:2783
+#: boot-installer.xml:2549 boot-installer.xml:2782
 #, no-c-format
 msgid "netcfg/disable_autoconfig"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2551
+#: boot-installer.xml:2550
 #, no-c-format
 msgid ""
 "By default, the &d-i; automatically probes for network configuration via "
@@ -2433,7 +2439,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2558
+#: boot-installer.xml:2557
 #, no-c-format
 msgid ""
 "If you have an IPv6 router or a DHCP server on your local network, but want "
@@ -2444,13 +2450,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2569
+#: boot-installer.xml:2568
 #, no-c-format
 msgid "hw-detect/start_pcmcia"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2570
+#: boot-installer.xml:2569
 #, no-c-format
 msgid ""
 "Set to <userinput>false</userinput> to prevent starting PCMCIA services, if "
@@ -2458,13 +2464,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2580
+#: boot-installer.xml:2579
 #, no-c-format
 msgid "disk-detect/dmraid/enable (dmraid)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2581
+#: boot-installer.xml:2580
 #, no-c-format
 msgid ""
 "Set to <userinput>true</userinput> to enable support for Serial ATA RAID "
@@ -2474,13 +2480,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2592
+#: boot-installer.xml:2591
 #, no-c-format
 msgid "preseed/url (url)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2593
+#: boot-installer.xml:2592
 #, no-c-format
 msgid ""
 "Specify the url to a preconfiguration file to download and use for "
@@ -2488,13 +2494,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2602
+#: boot-installer.xml:2601
 #, no-c-format
 msgid "preseed/file (file)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2603
+#: boot-installer.xml:2602
 #, no-c-format
 msgid ""
 "Specify the path to a preconfiguration file to load for automating the "
@@ -2502,13 +2508,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2612
+#: boot-installer.xml:2611
 #, no-c-format
 msgid "preseed/interactive"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2613
+#: boot-installer.xml:2612
 #, no-c-format
 msgid ""
 "Set to <userinput>true</userinput> to display questions even if they have "
@@ -2519,13 +2525,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2625
+#: boot-installer.xml:2624
 #, no-c-format
 msgid "auto-install/enable (auto)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2626
+#: boot-installer.xml:2625
 #, no-c-format
 msgid ""
 "Delay questions that are normally asked before preseeding is possible until "
@@ -2534,13 +2540,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2637
+#: boot-installer.xml:2636
 #, no-c-format
 msgid "finish-install/keep-consoles"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2638
+#: boot-installer.xml:2637
 #, no-c-format
 msgid ""
 "During installations from serial or management console, the regular virtual "
@@ -2549,25 +2555,25 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2649
+#: boot-installer.xml:2648
 #, no-c-format
 msgid "cdrom-detect/eject"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2650
+#: boot-installer.xml:2649
 #, no-c-format
 msgid ""
 "By default, before rebooting, &d-i; automatically ejects the optical media "
 "used during the installation. This can be unnecessary if the system does not "
-"automatically boot off the CD. In some cases it may even be undesirable, for "
-"example if the optical drive cannot reinsert the media itself and the user "
-"is not there to do it manually. Many slot loading, slim-line, and caddy "
+"automatically boot off such media. In some cases it may even be undesirable, "
+"for example if the optical drive cannot reinsert the media itself and the "
+"user is not there to do it manually. Many slot loading, slim-line, and caddy "
 "style drives cannot reload media automatically."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2659
+#: boot-installer.xml:2658
 #, no-c-format
 msgid ""
 "Set to <userinput>false</userinput> to disable automatic ejection, and be "
@@ -2576,13 +2582,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2670
+#: boot-installer.xml:2669
 #, no-c-format
 msgid "base-installer/install-recommends (recommends)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2671
+#: boot-installer.xml:2670
 #, no-c-format
 msgid ""
 "By setting this option to <userinput>false</userinput>, the package "
@@ -2592,7 +2598,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2678
+#: boot-installer.xml:2677
 #, no-c-format
 msgid ""
 "Note that this option allows to have a leaner system, but can also result in "
@@ -2603,13 +2609,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2690
+#: boot-installer.xml:2689
 #, no-c-format
 msgid "debian-installer/allow_unauthenticated"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2691
+#: boot-installer.xml:2690
 #, no-c-format
 msgid ""
 "By default the installer requires that repositories be authenticated using a "
@@ -2619,13 +2625,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2702
+#: boot-installer.xml:2701
 #, no-c-format
 msgid "ramdisk_size"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2703
+#: boot-installer.xml:2702
 #, no-c-format
 msgid ""
 "This parameter should already be set to a correct value where needed; set it "
@@ -2634,13 +2640,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2713
+#: boot-installer.xml:2712
 #, no-c-format
 msgid "rescue/enable"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2714
+#: boot-installer.xml:2713
 #, no-c-format
 msgid ""
 "Set to <userinput>true</userinput> to enter rescue mode rather than "
@@ -2648,13 +2654,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2727
+#: boot-installer.xml:2726
 #, no-c-format
 msgid "Using boot parameters to answer questions"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2728
+#: boot-installer.xml:2727
 #, no-c-format
 msgid ""
 "With some exceptions, a value can be set at the boot prompt for any question "
@@ -2664,25 +2670,25 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2740
+#: boot-installer.xml:2739
 #, no-c-format
 msgid "debian-installer/language (language)"
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2741
+#: boot-installer.xml:2740
 #, no-c-format
 msgid "debian-installer/country (country)"
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2742
+#: boot-installer.xml:2741
 #, no-c-format
 msgid "debian-installer/locale (locale)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2743
+#: boot-installer.xml:2742
 #, no-c-format
 msgid ""
 "There are two ways to specify the language, country and locale to use for "
@@ -2690,7 +2696,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2748
+#: boot-installer.xml:2747
 #, no-c-format
 msgid ""
 "The first and easiest is to pass only the parameter <literal>locale</"
@@ -2703,7 +2709,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2757
+#: boot-installer.xml:2756
 #, no-c-format
 msgid ""
 "The second, more flexible option is to specify <literal>language</literal> "
@@ -2714,13 +2720,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2769
+#: boot-installer.xml:2768
 #, no-c-format
 msgid "anna/choose_modules (modules)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2770
+#: boot-installer.xml:2769
 #, no-c-format
 msgid ""
 "Can be used to automatically load installer components that are not loaded "
@@ -2731,7 +2737,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2784
+#: boot-installer.xml:2783
 #, no-c-format
 msgid ""
 "Set to <userinput>true</userinput> if you want to disable IPv6 "
@@ -2739,13 +2745,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2793
+#: boot-installer.xml:2792
 #, no-c-format
 msgid "mirror/protocol (protocol)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2794
+#: boot-installer.xml:2793
 #, no-c-format
 msgid ""
 "By default the installer will use the http protocol to download files from "
@@ -2757,13 +2763,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: boot-installer.xml:2807
+#: boot-installer.xml:2806
 #, no-c-format
 msgid "tasksel:tasksel/first (tasks)"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2808
+#: boot-installer.xml:2807
 #, no-c-format
 msgid ""
 "Can be used to select tasks that are not available from the interactive task "
@@ -2772,13 +2778,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2822
+#: boot-installer.xml:2821
 #, no-c-format
 msgid "Passing parameters to kernel modules"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2823
+#: boot-installer.xml:2822
 #, no-c-format
 msgid ""
 "If drivers are compiled into the kernel, you can pass parameters to them as "
@@ -2793,7 +2799,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2836
+#: boot-installer.xml:2835
 #, no-c-format
 msgid ""
 "Note that it is now quite rare that parameters need to be passed to modules. "
@@ -2803,7 +2809,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2843
+#: boot-installer.xml:2842
 #, no-c-format
 msgid ""
 "The syntax to use to set parameters for modules is: "
@@ -2817,19 +2823,19 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: boot-installer.xml:2853
+#: boot-installer.xml:2852
 #, no-c-format
 msgid "3c509.xcvr=3 3c509.irq=10"
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2859
+#: boot-installer.xml:2858
 #, no-c-format
 msgid "Blacklisting kernel modules"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2860
+#: boot-installer.xml:2859
 #, no-c-format
 msgid ""
 "Sometimes it may be necessary to blacklist a module to prevent it from being "
@@ -2841,7 +2847,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2869
+#: boot-installer.xml:2868
 #, no-c-format
 msgid ""
 "You can blacklist a module using the following syntax: "
@@ -2852,7 +2858,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2877
+#: boot-installer.xml:2876
 #, no-c-format
 msgid ""
 "Note that a module may still be loaded by the installation system itself. "
@@ -2862,29 +2868,29 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2893
+#: boot-installer.xml:2892
 #, no-c-format
 msgid "Troubleshooting the Installation Process"
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2898
+#: boot-installer.xml:2897
 #, no-c-format
-msgid "CD-ROM Reliability"
+msgid "Reliability of optical media"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2899
+#: boot-installer.xml:2898
 #, no-c-format
 msgid ""
-"Sometimes, especially with older CD-ROM drives, the installer may fail to "
-"boot from a CD-ROM. The installer may also &mdash; even after booting "
-"successfully from CD-ROM &mdash; fail to recognize the CD-ROM or return "
+"Sometimes, especially with older drives, the installer may fail to boot from "
+"an optical disc. The installer may also &mdash; even after booting "
+"successfully from such disc &mdash; fail to recognize the disc or return "
 "errors while reading from it during the installation."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2906
+#: boot-installer.xml:2905
 #, no-c-format
 msgid ""
 "There are many different possible causes for these problems. We can only "
@@ -2893,54 +2899,53 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2912
+#: boot-installer.xml:2911
 #, no-c-format
 msgid "There are two very simple things that you should try first."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2917
+#: boot-installer.xml:2916
 #, no-c-format
 msgid ""
-"If the CD-ROM does not boot, check that it was inserted correctly and that "
-"it is not dirty."
+"If the disc does not boot, check that it was inserted correctly and that it "
+"is not dirty."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2923
+#: boot-installer.xml:2922
 #, no-c-format
 msgid ""
-"If the installer fails to recognize a CD-ROM, try just running the option "
-"<menuchoice> <guimenuitem>Detect and mount CD-ROM</guimenuitem> </"
-"menuchoice> a second time. Some DMA related issues with very old CD-ROM "
+"If the installer fails to recognize the disc, try just running the option "
+"<menuchoice> <guimenuitem>Detect and mount installation media</guimenuitem> "
+"</menuchoice> a second time. Some DMA related issues with very old CD-ROM "
 "drives are known to be resolved in this way."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2933
+#: boot-installer.xml:2932
 #, no-c-format
 msgid ""
 "If this does not work, then try the suggestions in the subsections below. "
-"Most, but not all, suggestions discussed there are valid for both CD-ROM and "
-"DVD, but we'll use the term CD-ROM for simplicity."
+"Most, but not all, suggestions discussed there are valid for CD-ROM and DVD."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2939
+#: boot-installer.xml:2937
 #, no-c-format
 msgid ""
-"If you cannot get the installation working from CD-ROM, try one of the other "
-"installation methods that are available."
+"If you cannot get the installation working from optical disc, try one of the "
+"other installation methods that are available."
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2947
+#: boot-installer.xml:2945
 #, no-c-format
 msgid "Common issues"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2950
+#: boot-installer.xml:2948
 #, no-c-format
 msgid ""
 "Some older CD-ROM drives do not support reading from discs that were burned "
@@ -2948,7 +2953,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2967
+#: boot-installer.xml:2965
 #, no-c-format
 msgid ""
 "Some very old CD-ROM drives do not work correctly if <quote>direct memory "
@@ -2956,27 +2961,28 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:2978
+#: boot-installer.xml:2976
 #, no-c-format
 msgid "How to investigate and maybe solve issues"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2979
+#: boot-installer.xml:2977
 #, no-c-format
-msgid "If the CD-ROM fails to boot, try the suggestions listed below."
+msgid "If the optical disc fails to boot, try the suggestions listed below."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2984
+#: boot-installer.xml:2982
 #, no-c-format
 msgid ""
-"Check that your BIOS actually supports booting from CD-ROM (only an issue "
-"for very old systems) and that CD booting is enabled in the BIOS."
+"Check that your BIOS actually supports booting from optical disc (only an "
+"issue for very old systems) and that booting from such media is enabled in "
+"the BIOS."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:2991
+#: boot-installer.xml:2989
 #, no-c-format
 msgid ""
 "If you downloaded an iso image, check that the md5sum of that image matches "
@@ -2986,13 +2992,13 @@ msgid ""
 "$ md5sum <replaceable>debian-testing-i386-netinst.iso</replaceable>\n"
 "a20391b12f7ff22ef705cee4059c6b92  <replaceable>debian-testing-i386-netinst."
 "iso</replaceable>\n"
-"</screen></informalexample> Next, check that the md5sum of the burned CD-ROM "
+"</screen></informalexample> Next, check that the md5sum of the burned disc "
 "matches as well. The following command should work. It uses the size of the "
-"image to read the correct number of bytes from the CD-ROM."
+"image to read the correct number of bytes from the disc."
 msgstr ""
 
 #. Tag: screen
-#: boot-installer.xml:3004
+#: boot-installer.xml:3002
 #, no-c-format
 msgid ""
 "$ dd if=/dev/cdrom | \\\n"
@@ -3006,13 +3012,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3009
+#: boot-installer.xml:3007
 #, no-c-format
 msgid ""
-"If, after the installer has been booted successfully, the CD-ROM is not "
+"If, after the installer has been booted successfully, the disc is not "
 "detected, sometimes simply trying again may solve the problem. If you have "
-"more than one CD-ROM drive, try changing the CD-ROM to the other drive. If "
-"that does not work or if the CD-ROM is recognized but there are errors when "
+"more than one optical drive, try changing the disc to the other drive. If "
+"that does not work or if the disc is recognized but there are errors when "
 "reading from it, try the suggestions listed below. Some basic knowledge of "
 "&arch-kernel; is required for this. To execute any of the commands, you "
 "should first switch to the second virtual console (VT2) and activate the "
@@ -3020,7 +3026,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3021
+#: boot-installer.xml:3019
 #, no-c-format
 msgid ""
 "Switch to VT4 or view the contents of <filename>/var/log/syslog</filename> "
@@ -3029,10 +3035,10 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3028
+#: boot-installer.xml:3026
 #, no-c-format
 msgid ""
-"Check in the output of <command>dmesg</command> if your CD-ROM drive was "
+"Check in the output of <command>dmesg</command> if your optical drive was "
 "recognized. You should see something like (the lines do not necessarily have "
 "to be consecutive): <informalexample><screen>\n"
 "ata1.00: ATAPI: MATSHITADVD-RAM UJ-822S, 1.61, max UDMA/33\n"
@@ -3042,33 +3048,34 @@ msgid ""
 "sr0: scsi3-mmc drive: 24x/24x writer dvd-ram cd/rw xa/form2 cdda tray\n"
 "cdrom: Uniform CD-ROM driver Revision: 3.20\n"
 "</screen></informalexample> If you don't see something like that, chances "
-"are the controller your CD-ROM is connected to was not recognized or may be "
+"are the controller your drive is connected to was not recognized or may be "
 "not supported at all. If you know what driver is needed for the controller, "
 "you can try loading it manually using <command>modprobe</command>."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3042
+#: boot-installer.xml:3040
 #, no-c-format
 msgid ""
-"Check that there is a device node for your CD-ROM drive under <filename>/dev/"
-"</filename>. In the example above, this would be <filename>/dev/sr0</"
+"Check that there is a device node for your optical drive under <filename>/"
+"dev/</filename>. In the example above, this would be <filename>/dev/sr0</"
 "filename>. There should also be a <filename>/dev/cdrom</filename>."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3050
+#: boot-installer.xml:3048
 #, no-c-format
 msgid ""
-"Use the <command>mount</command> command to check if the CD-ROM is already "
-"mounted; if not, try mounting it manually: <informalexample><screen>\n"
+"Use the <command>mount</command> command to check if the optical disc is "
+"already mounted; if not, try mounting it manually: "
+"<informalexample><screen>\n"
 "$ mount /dev/<replaceable>hdc</replaceable> /cdrom\n"
 "</screen></informalexample> Check if there are any error messages after that "
 "command."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3060
+#: boot-installer.xml:3058
 #, no-c-format
 msgid ""
 "Check if DMA is currently enabled: <informalexample><screen>\n"
@@ -3080,27 +3087,27 @@ msgid ""
 "it: <informalexample><screen>\n"
 "$ echo -n \"using_dma:0\" &gt;settings\n"
 "</screen></informalexample> Make sure that you are in the directory for the "
-"device that corresponds to your CD-ROM drive."
+"device that corresponds to your optical drive."
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3075
+#: boot-installer.xml:3073
 #, no-c-format
 msgid ""
 "If there are any problems during the installation, try checking the "
-"integrity of the CD-ROM using the option near the bottom of the installer's "
-"main menu. This option can also be used as a general test if the CD-ROM can "
-"be read reliably."
+"integrity of the installation media using the option near the bottom of the "
+"installer's main menu. This option can also be used as a general test if the "
+"disc can be read reliably."
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:3089
+#: boot-installer.xml:3087
 #, no-c-format
 msgid "Boot Configuration"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3091
+#: boot-installer.xml:3089
 #, no-c-format
 msgid ""
 "If you have problems and the kernel hangs during the boot process, doesn't "
@@ -3110,7 +3117,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3100
+#: boot-installer.xml:3098
 #, no-c-format
 msgid ""
 "In some cases, malfunctions can be caused by missing device firmware (see "
@@ -3119,7 +3126,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3111
+#: boot-installer.xml:3109
 #, no-c-format
 msgid ""
 "If software speech synthesis does not work, there is most probably an issue "
@@ -3131,37 +3138,37 @@ msgid ""
 msgstr ""
 
 #. Tag: userinput
-#: boot-installer.xml:3122
+#: boot-installer.xml:3120
 #, no-c-format
 msgid "dmesg"
 msgstr ""
 
 #. Tag: userinput
-#: boot-installer.xml:3124
+#: boot-installer.xml:3122
 #, no-c-format
 msgid "lspci"
 msgstr ""
 
 #. Tag: userinput
-#: boot-installer.xml:3126
+#: boot-installer.xml:3124
 #, no-c-format
 msgid "lsmod"
 msgstr ""
 
 #. Tag: userinput
-#: boot-installer.xml:3128
+#: boot-installer.xml:3126
 #, no-c-format
 msgid "amixer"
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:3136 boot-installer.xml:3241
+#: boot-installer.xml:3134 boot-installer.xml:3239
 #, no-c-format
 msgid "Common &arch-title; Installation Problems"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3137
+#: boot-installer.xml:3135
 #, no-c-format
 msgid ""
 "There are some common installation problems that can be solved or avoided by "
@@ -3169,7 +3176,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3182
+#: boot-installer.xml:3180
 #, no-c-format
 msgid ""
 "If your screen begins to show a weird picture while the kernel boots, eg. "
@@ -3182,13 +3189,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:3196
+#: boot-installer.xml:3194
 #, no-c-format
 msgid "System Freeze During the PCMCIA Configuration Phase"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3197
+#: boot-installer.xml:3195
 #, no-c-format
 msgid ""
 "Some very old laptop models produced by Dell are known to crash when PCMCIA "
@@ -3201,7 +3208,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3207
+#: boot-installer.xml:3205
 #, no-c-format
 msgid ""
 "Alternatively, you can boot the installer in expert mode. You will then be "
@@ -3215,19 +3222,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3242
+#: boot-installer.xml:3240
 #, no-c-format
 msgid "There are some common installation problems that are worth mentioning."
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:3248
+#: boot-installer.xml:3246
 #, no-c-format
 msgid "Misdirected video output"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3249
+#: boot-installer.xml:3247
 #, no-c-format
 msgid ""
 "It is fairly common for &arch-title; to have two video cards in one machine, "
@@ -3243,7 +3250,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3263
+#: boot-installer.xml:3261
 #, no-c-format
 msgid ""
 "Note that you may also have to manually add this parameter to the silo "
@@ -3253,13 +3260,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:3274
+#: boot-installer.xml:3272
 #, no-c-format
 msgid "Failure to Boot or Install from CD-ROM"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3275
+#: boot-installer.xml:3273
 #, no-c-format
 msgid ""
 "Some Sparc systems are notoriously difficult to boot from CD-ROM and even if "
@@ -3268,19 +3275,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3281
+#: boot-installer.xml:3279
 #, no-c-format
 msgid "We recommend to install such systems by netbooting the installer."
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:3290
+#: boot-installer.xml:3288
 #, no-c-format
 msgid "Interpreting the Kernel Startup Messages"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3292
+#: boot-installer.xml:3290
 #, no-c-format
 msgid ""
 "During the boot sequence, you may see many messages in the form "
@@ -3302,13 +3309,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:3317
+#: boot-installer.xml:3315
 #, no-c-format
 msgid "Reporting Installation Problems"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3318
+#: boot-installer.xml:3316
 #, no-c-format
 msgid ""
 "If you get through the initial boot phase but cannot complete the install, "
@@ -3321,7 +3328,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3329
+#: boot-installer.xml:3327
 #, no-c-format
 msgid ""
 "Other pertinent installation messages may be found in <filename>/var/log/</"
@@ -3330,13 +3337,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: boot-installer.xml:3340
+#: boot-installer.xml:3338
 #, no-c-format
 msgid "Submitting Installation Reports"
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3341
+#: boot-installer.xml:3339
 #, no-c-format
 msgid ""
 "If you still have problems, please submit an installation report. We also "
@@ -3346,7 +3353,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3348
+#: boot-installer.xml:3346
 #, no-c-format
 msgid ""
 "Note that your installation report will be published in the Debian Bug "
@@ -3355,7 +3362,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3354
+#: boot-installer.xml:3352
 #, no-c-format
 msgid ""
 "If you have a working &debian; system, the easiest way to send an "
@@ -3368,7 +3375,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: boot-installer.xml:3364
+#: boot-installer.xml:3362
 #, no-c-format
 msgid ""
 "Alternatively you can use this template when filling out installation "
@@ -3377,7 +3384,7 @@ msgid ""
 "<email>submit@bugs.debian.org</email>. <informalexample><screen>\n"
 "Package: installation-reports\n"
 "\n"
-"Boot method: &lt;How did you boot the installer? CD? USB stick? Network?"
+"Boot method: &lt;How did you boot the installer? CD/DVD? USB stick? Network?"
 "&gt;\n"
 "Image version: &lt;Full URL to image you downloaded is best&gt;\n"
 "Date: &lt;Date and time of the install&gt;\n"
@@ -3395,7 +3402,7 @@ msgid ""
 "Initial boot:           [ ]\n"
 "Detect network card:    [ ]\n"
 "Configure network:      [ ]\n"
-"Detect CD:              [ ]\n"
+"Detect media:           [ ]\n"
 "Load installer modules: [ ]\n"
 "Detect hard drives:     [ ]\n"
 "Partition hard drives:  [ ]\n"
diff --git a/po/uk/boot-new.po b/po/uk/boot-new.po
index 11e014ccb..ee069bbc5 100644
--- a/po/uk/boot-new.po
+++ b/po/uk/boot-new.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: boot-new_uk\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2015-05-25 11:27+0000\n"
 "PO-Revision-Date: 2019-09-03 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Ukranian\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
diff --git a/po/uk/gpl.po b/po/uk/gpl.po
index 4a3d8396b..5c947b65d 100644
--- a/po/uk/gpl.po
+++ b/po/uk/gpl.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gpl_uk\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-08-07 21:24+0000\n"
 "PO-Revision-Date: 2019-09-03 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Ukranian\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
diff --git a/po/uk/hardware.po b/po/uk/hardware.po
index 96e3a1005..42820f522 100644
--- a/po/uk/hardware.po
+++ b/po/uk/hardware.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hardware_uk\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-09-22 23:04+0000\n"
 "PO-Revision-Date: 2019-09-03 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Ukranian\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
@@ -2662,52 +2662,43 @@ msgstr ""
 #. Tag: para
 #: hardware.xml:2109
 #, no-c-format
-msgid ""
-"Whenever you see <quote>CD-ROM</quote> in this manual, it applies to all of "
-"CD-ROMs, DVD-ROMs and BD-ROMs, because all these technologies are really the "
-"same from the operating system's point of view."
+msgid "Installation from optical disc is supported for most architectures."
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2115
-#, no-c-format
-msgid "CD-ROM based installation is supported for most architectures."
-msgstr ""
-
-#. Tag: para
-#: hardware.xml:2119
+#: hardware.xml:2113
 #, no-c-format
 msgid ""
-"On PCs SATA, IDE/ATAPI, USB and SCSI CD-ROMs are supported, as are FireWire "
-"devices that are supported by the ohci1394 and sbp2 drivers."
+"On PCs SATA, IDE/ATAPI, USB and SCSI optical drives are supported, as are "
+"FireWire devices that are supported by the ohci1394 and sbp2 drivers."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:2136
+#: hardware.xml:2130
 #, no-c-format
 msgid "USB Memory Stick"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2138
+#: hardware.xml:2132
 #, no-c-format
 msgid ""
 "USB flash disks a.k.a. USB memory sticks have become a commonly used and "
 "cheap storage device. Most modern computer systems also allow booting the &d-"
 "i; from such a stick. Many modern computer systems, in particular netbooks "
-"and thin laptops, do not have a CD/DVD-ROM drive anymore at all and booting "
+"and thin laptops, do not have an optical drive anymore at all and booting "
 "from USB media is the standard way of installing a new operating system on "
 "them."
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:2150
+#: hardware.xml:2144
 #, no-c-format
 msgid "Network"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2152
+#: hardware.xml:2146
 #, no-c-format
 msgid ""
 "The network can be used during the installation to retrieve files needed for "
@@ -2720,7 +2711,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2162
+#: hardware.xml:2156
 #, no-c-format
 msgid ""
 "You can also <emphasis>boot</emphasis> the installation system over the "
@@ -2734,7 +2725,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2175
+#: hardware.xml:2169
 #, no-c-format
 msgid ""
 "Diskless installation, using network booting from a local area network and "
@@ -2742,13 +2733,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:2184
+#: hardware.xml:2178
 #, no-c-format
 msgid "Hard Disk"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2186
+#: hardware.xml:2180
 #, no-c-format
 msgid ""
 "Booting the installation system directly from a hard disk is another option "
@@ -2758,7 +2749,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2193
+#: hardware.xml:2187
 #, no-c-format
 msgid ""
 "Although the &arch-title; does not allow booting from SunOS (Solaris), you "
@@ -2766,13 +2757,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:2202
+#: hardware.xml:2196
 #, no-c-format
 msgid "Un*x or GNU system"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2204
+#: hardware.xml:2198
 #, no-c-format
 msgid ""
 "If you are running another Unix-like system, you could use it to install "
@@ -2785,13 +2776,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:2217
+#: hardware.xml:2211
 #, no-c-format
 msgid "Supported Storage Systems"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2219
+#: hardware.xml:2213
 #, no-c-format
 msgid ""
 "The &debian; installer contains a kernel which is built to maximize the "
@@ -2799,7 +2790,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2223
+#: hardware.xml:2217
 #, no-c-format
 msgid ""
 "Generally, the &debian; installation system includes support for IDE (also "
@@ -2809,7 +2800,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2240
+#: hardware.xml:2234
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2824,7 +2815,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2285
+#: hardware.xml:2279
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2832,7 +2823,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2290
+#: hardware.xml:2284
 #, no-c-format
 msgid ""
 "Any storage system supported by the Linux kernel is also supported by the "
@@ -2841,13 +2832,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: hardware.xml:2307
+#: hardware.xml:2301
 #, no-c-format
 msgid "Memory and Disk Space Requirements"
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2309
+#: hardware.xml:2303
 #, no-c-format
 msgid ""
 "You must have at least &minimum-memory; of memory and &minimum-fs-size; of "
@@ -2857,7 +2848,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: hardware.xml:2316
+#: hardware.xml:2310
 #, no-c-format
 msgid ""
 "Installation on systems with less memory<footnote condition=\"gtk\"> <para> "
diff --git a/po/uk/install-methods.po b/po/uk/install-methods.po
index 060b97d57..b35837820 100644
--- a/po/uk/install-methods.po
+++ b/po/uk/install-methods.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: install-methods_uk\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-09-22 23:04+0000\n"
 "PO-Revision-Date: 2019-09-03 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Ukranian\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
@@ -23,26 +23,27 @@ msgstr ""
 #. Tag: title
 #: install-methods.xml:12
 #, no-c-format
-msgid "Official &debian-gnu; CD/DVD-ROM Sets"
+msgid "Official &debian-gnu; installation images"
 msgstr ""
 
 #. Tag: para
 #: install-methods.xml:13
 #, no-c-format
 msgid ""
-"By far the easiest way to install &debian-gnu; is from an Official &debian; "
-"CD/DVD-ROM Set. You can buy a set from a vendor (see the <ulink url=\"&url-"
-"debian-cd-vendors;\">CD vendors page</ulink>). You may also download the CD/"
-"DVD-ROM images from a &debian; mirror and make your own set, if you have a "
-"fast network connection and a CD/DVD burner (see the <ulink url=\"&url-"
-"debian-cd;\">Debian CD page</ulink> and <ulink url=\"&url-debian-cd-faq;"
-"\">Debian CD FAQ</ulink> for detailed instructions). If you have a &debian; "
-"CD/DVD set and CDs/DVDs are bootable on your machine<phrase arch=\"x86\">, "
-"which is the case on all modern PCs</phrase>, you can skip right to <xref "
-"linkend=\"boot-installer\"/>. Much effort has been expended to ensure the "
-"most-used files are on the first CDs and DVDs, so that a basic desktop "
-"installation can be done with only the first DVD or - to a limited extent - "
-"even with only the first CD."
+"By far the easiest way to install &debian-gnu; is from a set of official "
+"&debian; installation images. You can buy a set of CDs/DVDs from a vendor "
+"(see the <ulink url=\"&url-debian-cd-vendors;\">CD vendors page</ulink>). "
+"You may also download the installation images from a &debian; mirror and "
+"make your own set, if you have a fast network connection and a CD/DVD burner "
+"(see the <ulink url=\"&url-debian-cd;\">Debian CD/DVD page</ulink> and "
+"<ulink url=\"&url-debian-cd-faq;\">Debian CD FAQ</ulink> for detailed "
+"instructions). If you have such optical installation media, and they are "
+"bootable on your machine<phrase arch=\"x86\">, which is the case on all "
+"modern PCs</phrase>, you can skip right to <xref linkend=\"boot-installer\"/"
+">. Much effort has been expended to ensure the most-used files are on the "
+"first CD and DVD image, so that a basic desktop installation can be done "
+"with only the first DVD or - to a limited extent - even with only the first "
+"CD image."
 msgstr ""
 
 #. Tag: para
@@ -60,29 +61,30 @@ msgstr ""
 #: install-methods.xml:38
 #, no-c-format
 msgid ""
-"Also, keep in mind: if the CDs/DVDs you are using don't contain some "
-"packages you need, you can always install those packages afterwards from "
-"your running new Debian system (after the installation has finished). If you "
-"need to know on which CD/DVD to find a specific package, visit <ulink url="
-"\"https://cdimage-search.debian.org/\">https://cdimage-search.debian.org/</"
-"ulink>."
+"Also, keep in mind: if the installation media you are using don't contain "
+"some packages you need, you can always install those packages afterwards "
+"from your running new Debian system (after the installation has finished). "
+"If you need to know on which installation image to find a specific package, "
+"visit <ulink url=\"https://cdimage-search.debian.org/\">https://cdimage-"
+"search.debian.org/</ulink>."
 msgstr ""
 
 #. Tag: para
 #: install-methods.xml:46
 #, no-c-format
 msgid ""
-"If your machine doesn't support CD booting<phrase arch=\"x86\"> (only "
-"relevant on very old PC systems)</phrase>, but you do have a CD set, you can "
-"use an alternative strategy such as <phrase arch=\"s390\">VM reader,</"
-"phrase> <phrase condition=\"bootable-disk\">hard disk,</phrase> <phrase "
-"condition=\"bootable-usb\">usb stick,</phrase> <phrase condition=\"supports-"
-"tftp\">net boot,</phrase> or manually loading the kernel from the CD to "
-"initially boot the system installer. The files you need for booting by "
-"another means are also on the CD; the &debian; network archive and CD folder "
-"organization are identical. So when archive file paths are given below for "
-"particular files you need for booting, look for those files in the same "
-"directories and subdirectories on your CD."
+"If your machine doesn't support booting from optical media<phrase arch="
+"\"x86\"> (only relevant on very old PC systems)</phrase>, but you do have a "
+"set of CD/DVD, you can use an alternative strategy such as <phrase arch="
+"\"s390\">VM reader,</phrase> <phrase condition=\"bootable-disk\">hard disk,</"
+"phrase> <phrase condition=\"bootable-usb\">usb stick,</phrase> <phrase "
+"condition=\"supports-tftp\">net boot,</phrase> or manually loading the "
+"kernel from the disc to initially boot the system installer. The files you "
+"need for booting by another means are also on the disc; the &debian; network "
+"archive and folder organization on the disc are identical. So when archive "
+"file paths are given below for particular files you need for booting, look "
+"for those files in the same directories and subdirectories on your "
+"installation media."
 msgstr ""
 
 #. Tag: para
@@ -90,17 +92,17 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Once the installer is booted, it will be able to obtain all the other files "
-"it needs from the CD."
+"it needs from the disc."
 msgstr ""
 
 #. Tag: para
 #: install-methods.xml:72
 #, no-c-format
 msgid ""
-"If you don't have a CD set, then you will need to download the installer "
-"system files and place them on the <phrase arch=\"s390\">VM minidisk</"
-"phrase> <phrase condition=\"bootable-disk\">hard disk or</phrase> <phrase "
-"condition=\"bootable-usb\">usb stick or</phrase> <phrase condition="
+"If you don't have an installation media set, then you will need to download "
+"the installer system files and place them on the <phrase arch=\"s390\">VM "
+"minidisk</phrase> <phrase condition=\"bootable-disk\">hard disk or</phrase> "
+"<phrase condition=\"bootable-usb\">usb stick or</phrase> <phrase condition="
 "\"supports-tftp\">a connected computer</phrase> so they can be used to boot "
 "the installer."
 msgstr ""
@@ -276,17 +278,17 @@ msgstr ""
 #. Tag: title
 #: install-methods.xml:263
 #, no-c-format
-msgid "Preparing a USB stick using a hybrid CD or DVD image"
+msgid "Preparing a USB stick using a hybrid CD/DVD image"
 msgstr ""
 
 #. Tag: para
 #: install-methods.xml:264
 #, no-c-format
 msgid ""
-"Debian CD and DVD images can now be written directly to a USB stick, which "
-"is a very easy way to make a bootable USB stick. Simply choose a CD or DVD "
-"image (such as the netinst, CD-1, DVD-1, or netboot) that will fit on your "
-"USB stick. See <xref linkend=\"official-cdrom\"/> to get a CD or DVD image."
+"Debian installation images can now be written directly to a USB stick, which "
+"is a very easy way to make a bootable USB stick. Simply choose an image "
+"(such as the netinst, CD, DVD-1, or netboot) that will fit on your USB "
+"stick. See <xref linkend=\"official-cdrom\"/> to get an installation image."
 msgstr ""
 
 #. Tag: para
@@ -303,10 +305,10 @@ msgstr ""
 #: install-methods.xml:279
 #, no-c-format
 msgid ""
-"The CD or DVD image you choose should be written directly to the USB stick, "
-"overwriting its current contents. For example, when using an existing GNU/"
-"Linux system, the CD or DVD image file can be written to a USB stick as "
-"follows, after having made sure that the stick is unmounted: "
+"The installation image you choose should be written directly to the USB "
+"stick, overwriting its current contents. For example, when using an existing "
+"GNU/Linux system, the image file can be written to a USB stick as follows, "
+"after having made sure that the stick is unmounted: "
 "<informalexample><screen>\n"
 "<prompt>#</prompt> <userinput>cp <replaceable>debian.iso</replaceable> /dev/"
 "<replaceable>sdX</replaceable></userinput>\n"
@@ -329,7 +331,7 @@ msgstr ""
 #: install-methods.xml:297
 #, no-c-format
 msgid ""
-"Simply writing the CD or DVD image to USB like this should work fine for "
+"Simply writing the installation image to USB like this should work fine for "
 "most users. The other options below are more complex, mainly for people with "
 "specialised needs."
 msgstr ""
@@ -384,9 +386,9 @@ msgstr ""
 #, no-c-format
 msgid ""
 "An alternative way to set up your USB stick is to manually copy the "
-"installer files, and also a CD image to it. Note that the USB stick should "
-"be at least 1 GB in size (smaller setups are possible if you follow <xref "
-"linkend=\"usb-copy-flexible\"/>)."
+"installer files, and also an installation image to it. Note that the USB "
+"stick should be at least 1 GB in size (smaller setups are possible if you "
+"follow <xref linkend=\"usb-copy-flexible\"/>)."
 msgstr ""
 
 #. Tag: para
@@ -448,8 +450,8 @@ msgid ""
 "<replaceable>sdX2</replaceable> /mnt</userinput>),</phrase> which will now "
 "have <phrase arch=\"x86\">a FAT filesystem</phrase> <phrase arch=\"powerpc"
 "\">an HFS filesystem</phrase> on it, and copy a &debian; ISO image (netinst "
-"or full CD) to it. Unmount the stick (<userinput>umount /mnt</userinput>) "
-"and you are done."
+"or full CD/DVD) to it. Unmount the stick (<userinput>umount /mnt</"
+"userinput>) and you are done."
 msgstr ""
 
 #. Tag: title
@@ -575,15 +577,15 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: install-methods.xml:505 install-methods.xml:615
+#: install-methods.xml:505
 #, no-c-format
 msgid ""
 "If you used an <filename>hd-media</filename> image, you should now copy the "
 "ISO file of a &debian; ISO image<footnote> <para> You can use either a "
-"netinst or a full CD image (see <xref linkend=\"official-cdrom\"/>). Be sure "
-"to select one that fits. Note that the <quote>netboot <filename>mini.iso</"
-"filename></quote> image is not usable for this purpose. </para> </footnote> "
-"onto the stick. When you are done, unmount the USB memory stick "
+"netinst or a full CD/DVD image (see <xref linkend=\"official-cdrom\"/>). Be "
+"sure to select one that fits. Note that the <quote>netboot <filename>mini."
+"iso</filename></quote> image is not usable for this purpose. </para> </"
+"footnote> onto the stick. When you are done, unmount the USB memory stick "
 "(<userinput>umount /mnt</userinput>)."
 msgstr ""
 
@@ -690,6 +692,19 @@ msgid ""
 "are booting."
 msgstr ""
 
+#. Tag: para
+#: install-methods.xml:615
+#, no-c-format
+msgid ""
+"If you used an <filename>hd-media</filename> image, you should now copy the "
+"ISO file of a &debian; ISO image<footnote> <para> You can use either a "
+"netinst or a full CD image (see <xref linkend=\"official-cdrom\"/>). Be sure "
+"to select one that fits. Note that the <quote>netboot <filename>mini.iso</"
+"filename></quote> image is not usable for this purpose. </para> </footnote> "
+"onto the stick. When you are done, unmount the USB memory stick "
+"(<userinput>umount /mnt</userinput>)."
+msgstr ""
+
 #. Tag: title
 #: install-methods.xml:643
 #, no-c-format
@@ -711,7 +726,7 @@ msgstr ""
 msgid ""
 "A full, <quote>pure network</quote> installation can be achieved using this "
 "technique. This avoids all hassles of removable media, like finding and "
-"burning CD images."
+"burning CD/DVD images."
 msgstr ""
 
 #. Tag: para
@@ -809,8 +824,8 @@ msgstr ""
 #: install-methods.xml:726
 #, no-c-format
 msgid ""
-"Copy the following directories from a &debian; CD image to <filename>c:\\</"
-"filename>."
+"Copy the following directories from a &debian; installation image to "
+"<filename>c:\\</filename>."
 msgstr ""
 
 #. Tag: para
diff --git a/po/uk/installation-howto.po b/po/uk/installation-howto.po
index bc0c67d55..852471ce4 100644
--- a/po/uk/installation-howto.po
+++ b/po/uk/installation-howto.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: installation-howto_uk\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-09-22 23:04+0000\n"
 "PO-Revision-Date: 2019-09-03 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Ukranian\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
@@ -60,21 +60,22 @@ msgstr ""
 #: installation-howto.xml:37
 #, no-c-format
 msgid ""
-"<phrase condition=\"unofficial-build\"> For some quick links to CD images, "
-"check out the <ulink url=\"&url-d-i;\"> &d-i; home page</ulink>. </phrase> "
-"The debian-cd team provides builds of CD images using &d-i; on the <ulink "
-"url=\"&url-debian-cd;\">Debian CD page</ulink>. For more information on "
-"where to get CDs, see <xref linkend=\"official-cdrom\"/>."
+"<phrase condition=\"unofficial-build\"> For some quick links to installation "
+"images, check out the <ulink url=\"&url-d-i;\"> &d-i; home page</ulink>. </"
+"phrase> The debian-cd team provides builds of installation images using &d-"
+"i; on the <ulink url=\"&url-debian-cd;\">Debian CD/DVD page</ulink>. For "
+"more information on where to get installation images, see <xref linkend="
+"\"official-cdrom\"/>."
 msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:47
 #, no-c-format
 msgid ""
-"Some installation methods require other images than CD images. <phrase "
-"condition=\"unofficial-build\"> The <ulink url=\"&url-d-i;\">&d-i; home "
-"page</ulink> has links to other images. </phrase> <xref linkend=\"where-files"
-"\"/> explains how to find images on &debian; mirrors."
+"Some installation methods require other images than those for optical media. "
+"<phrase condition=\"unofficial-build\"> The <ulink url=\"&url-d-i;\">&d-i; "
+"home page</ulink> has links to other images. </phrase> <xref linkend=\"where-"
+"files\"/> explains how to find images on &debian; mirrors."
 msgstr ""
 
 #. Tag: para
@@ -88,7 +89,7 @@ msgstr ""
 #. Tag: title
 #: installation-howto.xml:65
 #, no-c-format
-msgid "CDROM"
+msgid "Optical disc"
 msgstr ""
 
 #. Tag: para
@@ -96,24 +97,24 @@ msgstr ""
 #, no-c-format
 msgid ""
 "The netinst CD image is a popular image which can be used to install "
-"&releasename; with the &d-i;. This image is intended to boot from CD and "
-"install additional packages over a network; hence the name <quote>netinst</"
-"quote>. The image has the software components needed to run the installer "
-"and the base packages to provide a minimal &releasename; system. If you'd "
-"rather, you can get a full size CD image which will not need the network to "
-"install. You only need the first CD of the set."
+"&releasename; with the &d-i;. This installation method is intended to boot "
+"from the image and install additional packages over a network; hence the "
+"name <quote>netinst</quote>. The image has the software components needed to "
+"run the installer and the base packages to provide a minimal &releasename; "
+"system. If you'd rather, you can get a full size CD/DVD image which will not "
+"need the network to install. You only need the first image of such set."
 msgstr ""
 
 #. Tag: para
 #: installation-howto.xml:77
 #, no-c-format
 msgid ""
-"Download whichever type you prefer and burn it to a CD. <phrase arch=\"any-"
-"x86\">To boot the CD, you may need to change your BIOS configuration, as "
-"explained in <xref linkend=\"bios-setup\"/>.</phrase> <phrase arch=\"powerpc"
-"\"> To boot a PowerMac from CD, press the <keycap>c</keycap> key while "
-"booting. See <xref linkend=\"boot-cd\"/> for other ways to boot from CD. </"
-"phrase>"
+"Download whichever type you prefer and burn it to an optical disc. <phrase "
+"arch=\"any-x86\">To boot the disc, you may need to change your BIOS "
+"configuration, as explained in <xref linkend=\"bios-setup\"/>.</phrase> "
+"<phrase arch=\"powerpc\"> To boot a PowerMac from CD, press the <keycap>c</"
+"keycap> key while booting. See <xref linkend=\"boot-cd\"/> for other ways to "
+"boot from CD. </phrase>"
 msgstr ""
 
 #. Tag: title
@@ -136,10 +137,10 @@ msgstr ""
 #, no-c-format
 msgid ""
 "The easiest way to prepare your USB memory stick is to download any Debian "
-"CD or DVD image that will fit on it, and write the CD image directly to the "
-"memory stick. Of course this will destroy anything already on the memory "
-"stick. This works because Debian CD images are \"isohybrid\" images that can "
-"boot both from CD and from USB drives."
+"CD or DVD image that will fit on it, and write the image directly to the "
+"memory stick. Of course this will destroy anything already on the stick. "
+"This works because Debian CD/DVD images are <quote>isohybrid</quote> images "
+"that can boot both from optical and USB drives."
 msgstr ""
 
 #. Tag: para
@@ -224,8 +225,8 @@ msgid ""
 "It's possible to boot the installer using no removable media, but just an "
 "existing hard disk, which can have a different OS on it. Download "
 "<filename>hd-media/initrd.gz</filename>, <filename>hd-media/vmlinuz</"
-"filename>, and a &debian; CD image to the top-level directory of the hard "
-"disk. Make sure that the CD image has a filename ending in <literal>.iso</"
+"filename>, and a &debian; CD/DVD image to the top-level directory of the "
+"hard disk. Make sure that the image has a filename ending in <literal>.iso</"
 "literal>. Now it's just a matter of booting linux with the initrd. <phrase "
 "arch=\"x86\"> <xref linkend=\"boot-initrd\"/> explains one way to do it. </"
 "phrase>"
@@ -270,7 +271,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Now sit back while debian-installer detects some of your hardware, and loads "
-"the rest of itself from CD, USB, etc."
+"the rest of the installation image."
 msgstr ""
 
 #. Tag: para
diff --git a/po/uk/partitioning.po b/po/uk/partitioning.po
index 86f234204..2f72c898e 100644
--- a/po/uk/partitioning.po
+++ b/po/uk/partitioning.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: partioning_uk\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-08-29 14:36+0000\n"
 "PO-Revision-Date: 2019-09-03 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Ukranian\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
diff --git a/po/uk/post-install.po b/po/uk/post-install.po
index 345e2db96..c1551bb64 100644
--- a/po/uk/post-install.po
+++ b/po/uk/post-install.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: post-install_uk\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-08-11 15:17+0000\n"
 "PO-Revision-Date: 2019-09-03 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Ukranian\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
diff --git a/po/uk/preface.po b/po/uk/preface.po
index c39738380..32c1f7d2e 100644
--- a/po/uk/preface.po
+++ b/po/uk/preface.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preface_uk\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2016-12-29 08:03+0000\n"
 "PO-Revision-Date: 2019-09-03 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Ukranian\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
diff --git a/po/uk/preparing.po b/po/uk/preparing.po
index a3df7a129..964fec2dc 100644
--- a/po/uk/preparing.po
+++ b/po/uk/preparing.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preparing_uk\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-09-22 23:04+0000\n"
 "PO-Revision-Date: 2019-09-03 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Ukranian\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
@@ -1409,11 +1409,12 @@ msgid ""
 "can be tricked into booting from the stick by changing the device type in "
 "the BIOS setup from the default <quote>USB harddisk</quote> or <quote>USB "
 "stick</quote> to <quote>USB ZIP</quote> or <quote>USB CDROM</quote>. <phrase "
-"condition=\"isohybrid-supported\"> In particular if you use an isohybrid CD/"
-"DVD image on a USB stick (see <xref linkend=\"usb-copy-isohybrid\"/>), "
-"changing the device type to <quote>USB CDROM</quote> helps on some BIOSes "
-"which will not boot from a USB stick in USB harddisk mode.</phrase> You may "
-"need to configure your BIOS to enable <quote>USB legacy support</quote>."
+"condition=\"isohybrid-supported\"> In particular if you use an isohybrid "
+"installation image on a USB stick (see <xref linkend=\"usb-copy-isohybrid\"/"
+">), changing the device type to <quote>USB CDROM</quote> helps on some "
+"BIOSes which will not boot from a USB stick in USB harddisk mode.</phrase> "
+"You may need to configure your BIOS to enable <quote>USB legacy support</"
+"quote>."
 msgstr ""
 
 #. Tag: para
@@ -1974,7 +1975,7 @@ msgstr ""
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
 "&debian-gnu; mirror, but only the S/390 and architecture-independent files "
-"are required. You can also copy the contents of all installation CDs into "
+"are required. You can also copy the contents of all installation images into "
 "such a directory tree."
 msgstr ""
 
diff --git a/po/uk/preseed.po b/po/uk/preseed.po
index 72bf38633..0d44a13a4 100644
--- a/po/uk/preseed.po
+++ b/po/uk/preseed.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preseed_uk\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-09-22 23:04+0000\n"
 "PO-Revision-Date: 2019-09-03 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Ukranian\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
@@ -115,7 +115,7 @@ msgstr ""
 #. Tag: entry
 #: preseed.xml:76
 #, no-c-format
-msgid "CD/DVD"
+msgid "CD/DVD/USB"
 msgstr ""
 
 #. Tag: entry
@@ -175,8 +175,8 @@ msgid ""
 "is thus possible to override configuration set in the initrd by editing the "
 "kernel command line (either in the bootloader configuration or manually at "
 "boot time for bootloaders that allow it). For file preseeding this is after "
-"the CD or CD image has been loaded. For network preseeding it is only after "
-"the network has been configured."
+"the installation image has been loaded. For network preseeding it is only "
+"after the network has been configured."
 msgstr ""
 
 #. Tag: para
@@ -234,10 +234,10 @@ msgid ""
 "location from where you want to use it. Creating the preconfiguration file "
 "is covered later in this appendix. Putting it in the correct location is "
 "fairly straightforward for network preseeding or if you want to read the "
-"file off a usb-stick. If you want to include the file on a CD or DVD, you "
-"will have to remaster the ISO image. How to get the preconfiguration file "
-"included in the initrd is outside the scope of this document; please consult "
-"the developers' documentation for &d-i;."
+"file off a usb-stick. If you want to include the file in an installation ISO "
+"image, you will have to remaster the image. How to get the preconfiguration "
+"file included in the initrd is outside the scope of this document; please "
+"consult the developers' documentation for &d-i;."
 msgstr ""
 
 #. Tag: para
@@ -315,7 +315,7 @@ msgid ""
 "  preseed/url=tftp://host/path/to/preseed.cfg\n"
 "  preseed/url/checksum=5da499872becccfeda2c4872f9171c3d\n"
 "\n"
-"- if you're booting a remastered CD:\n"
+"- if you're booting a remastered installation image:\n"
 "  preseed/file=/cdrom/preseed.cfg\n"
 "  preseed/file/checksum=5da499872becccfeda2c4872f9171c3d\n"
 "\n"
@@ -1223,9 +1223,9 @@ msgstr ""
 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."
+"booting from optical disc 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
@@ -2007,7 +2007,7 @@ msgid ""
 "# Some versions of the installer can report back on what software you have\n"
 "# installed, and what software you use. The default is not to report back,\n"
 "# but sending reports helps the project determine what software is most\n"
-"# popular and include it on CDs.\n"
+"# popular and should be included on the first CD/DVD.\n"
 "#popularity-contest popularity-contest/participate boolean false"
 msgstr ""
 
diff --git a/po/uk/random-bits.po b/po/uk/random-bits.po
index a856f8c7e..2f6fd4181 100644
--- a/po/uk/random-bits.po
+++ b/po/uk/random-bits.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: random-bits_uk\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2019-09-03 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Ukranian\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
@@ -317,8 +317,8 @@ msgstr ""
 msgid ""
 "By default the installer will install the GNOME desktop environment, but "
 "alternative desktop environments can be selected either by using one of the "
-"special CD images, or by specifying the desired desktop environment when the "
-"installer is booted (see <xref linkend=\"pkgsel\"/>)."
+"special installation images, or by specifying the desired desktop "
+"environment during installation (see <xref linkend=\"pkgsel\"/>)."
 msgstr ""
 
 #. Tag: para
@@ -768,9 +768,9 @@ msgstr ""
 #: random-bits.xml:444
 #, no-c-format
 msgid ""
-"If you have a &releasename; &debian-gnu; CD mounted at <filename>/cdrom</"
-"filename>, you could substitute a file URL instead of the http URL: "
-"<userinput>file:/cdrom/debian/</userinput>"
+"If you have a &releasename; &debian-gnu; installation image mounted at "
+"<filename>/cdrom</filename>, you could substitute a file URL instead of the "
+"http URL: <userinput>file:/cdrom/debian/</userinput>"
 msgstr ""
 
 #. Tag: para
@@ -1076,8 +1076,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
@@ -1475,7 +1475,7 @@ msgstr ""
 #. Tag: guimenuitem
 #: random-bits.xml:930
 #, no-c-format
-msgid "Load installer components from CD"
+msgid "Load installer components from installation media"
 msgstr ""
 
 #. Tag: para
diff --git a/po/uk/using-d-i.po b/po/uk/using-d-i.po
index df582651a..c7153322f 100644
--- a/po/uk/using-d-i.po
+++ b/po/uk/using-d-i.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: using-d-i_uk\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-09-24 23:05+0000\n"
 "PO-Revision-Date: 2019-09-03 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Ukranian\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
@@ -328,7 +328,7 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:230
 #, no-c-format
-msgid "Looks for and mounts a &debian; installation CD."
+msgid "Looks for and mounts a &debian; installation media."
 msgstr ""
 
 #. Tag: term
@@ -382,8 +382,8 @@ msgstr ""
 #: using-d-i.xml:264
 #, no-c-format
 msgid ""
-"Checks integrity of a CD-ROM. This way, the user may assure him/herself that "
-"the installation CD-ROM was not corrupted."
+"Checks integrity of installation media. This way, the user may assure him/"
+"herself that the installation image was not corrupted."
 msgstr ""
 
 #. Tag: term
@@ -412,7 +412,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Anna's Not Nearly APT. Installs packages which have been retrieved from the "
-"chosen mirror or CD."
+"chosen mirror or installation media."
 msgstr ""
 
 #. Tag: term
@@ -2832,10 +2832,10 @@ msgid ""
 "packages is called <command>dpkg</command>. However, this program is more of "
 "a low-level tool. <command>apt</command> is a higher-level tool, which will "
 "invoke <command>dpkg</command> as appropriate. It knows how to retrieve "
-"packages from your CD, the network, or wherever. It is also able to "
-"automatically install other packages which are required to make the package "
-"you're trying to install work correctly. </para> </footnote>. Other front-"
-"ends for package management, like <command>aptitude</command> and "
+"packages from your installation media, the network, or wherever. It is also "
+"able to automatically install other packages which are required to make the "
+"package you're trying to install work correctly. </para> </footnote>. Other "
+"front-ends for package management, like <command>aptitude</command> and "
 "<command>synaptic</command>, are also in use. These front-ends are "
 "recommended for new users, since they integrate some additional features "
 "(package searching and status checks) in a nice user interface."
@@ -2877,37 +2877,37 @@ msgstr ""
 #. Tag: title
 #: using-d-i.xml:2341
 #, no-c-format
-msgid "Installing from more than one CD or DVD"
+msgid "Installing from more than one CD or DVD image"
 msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2343
 #, no-c-format
 msgid ""
-"If you are installing from a CD or a DVD that is part of a larger set, the "
-"installer will ask if you want to scan additional CDs or DVDs. If you have "
-"additional CDs or DVDs available, you probably want to do this so the "
-"installer can use the packages included on them."
+"If you are installing from a CD or DVD image that is part of a larger set, "
+"the installer will ask if you want to scan additional installation media. If "
+"you have such additional media available, you probably want to do this so "
+"the installer can use the packages included on them."
 msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2350
 #, no-c-format
 msgid ""
-"If you do not have any additional CDs or DVDs, that is no problem: using "
-"them is not required. If you also do not use a network mirror (as explained "
-"in the next section), it can mean that not all packages belonging to the "
-"tasks you select in the next step of the installation can be installed."
+"If you do not have any additional media, that is no problem: using them is "
+"not required. If you also do not use a network mirror (as explained in the "
+"next section), it can mean that not all packages belonging to the tasks you "
+"select in the next step of the installation can be installed."
 msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2358
 #, no-c-format
 msgid ""
-"Packages are included on CDs (and DVDs) in the order of their popularity. "
-"This means that for most uses only the first CDs in a set are needed and "
+"Packages are included on CD and DVD images in the order of their popularity. "
+"This means that for most uses only the first image of a set is needed and "
 "that only very few people actually use any of the packages included on the "
-"last CDs in a set."
+"last images of a set."
 msgstr ""
 
 #. Tag: para
@@ -2925,12 +2925,11 @@ msgstr ""
 #: using-d-i.xml:2375
 #, 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 "
-"set should be scanned. The order in which they are scanned does not really "
-"matter, but scanning them in ascending order will reduce the chance of "
-"mistakes."
+"If you do scan multiple installation media, the installer will prompt you to "
+"exchange them when it needs packages from one that isn't currently in the "
+"drive. Note that only discs that belong to the same set should be scanned. "
+"The order in which they are scanned does not really matter, but scanning "
+"them in ascending order will reduce the chance of mistakes."
 msgstr ""
 
 #. Tag: title
@@ -2952,24 +2951,23 @@ msgstr ""
 #: using-d-i.xml:2396
 #, no-c-format
 msgid ""
-"If you are <emphasis>not</emphasis> installing from a full CD or DVD or "
-"using a full CD/DVD image, you really should use a network mirror as "
-"otherwise you will end up with only a very minimal system. However, if you "
-"have a limited Internet connection it is best <emphasis>not</emphasis> to "
-"select the <literal>desktop</literal> task in the next step of the "
-"installation."
+"If you are <emphasis>not</emphasis> installing from a full CD/DVD image, you "
+"really should use a network mirror as otherwise you will end up with only a "
+"very minimal system. However, if you have a limited Internet connection it "
+"is best <emphasis>not</emphasis> to select the <literal>desktop</literal> "
+"task in the next step of the installation."
 msgstr ""
 
 #. Tag: para
 #: using-d-i.xml:2405
 #, no-c-format
 msgid ""
-"If you are installing from a single full CD or using a full CD image, using "
-"a network mirror is not required, but is still strongly recommended because "
-"a single CD contains only a fairly limited number of packages. If you have a "
-"limited Internet connection it may still be best to <emphasis>not</emphasis> "
-"select a network mirror here, but to finish the installation using only "
-"what's available on the CD and selectively install additional packages after "
+"If you are installing from a single full CD image, using a network mirror is "
+"not required, but is still strongly recommended because a single CD image "
+"contains only a fairly limited number of packages. If you have a limited "
+"Internet connection it may still be best to <emphasis>not</emphasis> select "
+"a network mirror here, but to finish the installation using only what's "
+"available on the CD image and selectively install additional packages after "
 "the installation (i.e. after you have rebooted into the new system)."
 msgstr ""
 
@@ -2977,64 +2975,64 @@ msgstr ""
 #: using-d-i.xml:2416
 #, no-c-format
 msgid ""
-"If you are installing from a DVD or using a DVD image, any packages needed "
-"during the installation should be present on the first DVD. The same is true "
-"if you have scanned multiple CDs as explained in the previous section. Use "
-"of a network mirror is optional."
+"If you are installing from DVD, any packages needed during the installation "
+"should be present on the first DVD image. Use of a network mirror is "
+"optional."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2423
+#: using-d-i.xml:2422
 #, no-c-format
 msgid ""
-"One advantage of adding a network mirror is that updates that have occurred "
-"since the CD/DVD set was created and have been included in a point release, "
-"will become available for installation, thus extending the life of your CD/"
-"DVD set without compromising the security or stability of the installed "
-"system."
+"One advantage of adding a network mirror is that updates, that have occurred "
+"since the CD/DVD images were created and have been included in a point "
+"release, will become available for installation, thus extending the life of "
+"your CD/DVD set without compromising the security or stability of the "
+"installed system."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2430
+#: using-d-i.xml:2429
 #, no-c-format
 msgid ""
 "In summary: selecting a network mirror is generally a good idea, except if "
 "you do not have a good Internet connection. If the current version of a "
-"package is available from CD/DVD, the installer will always use that. The "
-"amount of data that will be downloaded if you do select a mirror thus "
-"depends on"
+"package is available from installation media, the installer will always use "
+"that. The amount of data that will be downloaded if you do select a mirror "
+"thus depends on"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2439
+#: using-d-i.xml:2438
 #, no-c-format
 msgid "the tasks you select in the next step of the installation,"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2444
+#: using-d-i.xml:2443
 #, no-c-format
 msgid "which packages are needed for those tasks,"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2449
+#: using-d-i.xml:2448
 #, no-c-format
 msgid ""
-"which of those packages are present on the CDs or DVDs you have scanned, and"
+"which of those packages are present on the installation media you have "
+"scanned, and"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2454
+#: using-d-i.xml:2453
 #, no-c-format
 msgid ""
-"whether any updated versions of packages included on the CDs or DVDs are "
-"available from a mirror (either a regular package mirror, or a mirror for "
-"security or stable-updates)."
+"whether any updated versions of packages included on the installation media "
+"are available from a mirror (either a regular package mirror, or a mirror "
+"for security or stable-updates)."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2463
+#: using-d-i.xml:2462
 #, no-c-format
 msgid ""
 "Note that the last point means that, even if you choose not to use a network "
@@ -3044,13 +3042,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2474
+#: using-d-i.xml:2473
 #, no-c-format
 msgid "Choosing a network mirror"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2475
+#: using-d-i.xml:2474
 #, no-c-format
 msgid ""
 "Unless you chose not to use a network mirror, you will be presented with a "
@@ -3059,7 +3057,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2482
+#: using-d-i.xml:2481
 #, no-c-format
 msgid ""
 "The offered default is deb.debian.org, which is not a mirror itself but will "
@@ -3069,7 +3067,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2489
+#: using-d-i.xml:2488
 #, no-c-format
 msgid ""
 "A mirror can also be specified by hand by choosing <quote>enter information "
@@ -3080,7 +3078,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2497
+#: using-d-i.xml:2496
 #, no-c-format
 msgid ""
 "If your computer is on an IPv6-only network (which is probably not the case "
@@ -3097,13 +3095,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2520
+#: using-d-i.xml:2519
 #, no-c-format
 msgid "Selecting and Installing Software"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2522
+#: using-d-i.xml:2521
 #, no-c-format
 msgid ""
 "During the installation process, you are given the opportunity to select "
@@ -3115,7 +3113,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2531
+#: using-d-i.xml:2530
 #, no-c-format
 msgid ""
 "These tasks loosely represent a number of different jobs or things you want "
@@ -3133,7 +3131,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2557
+#: using-d-i.xml:2556
 #, no-c-format
 msgid ""
 "Some tasks may be pre-selected based on the characteristics of the computer "
@@ -3142,7 +3140,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2564
+#: using-d-i.xml:2563
 #, no-c-format
 msgid ""
 "In the standard user interface of the installer, you can use the space bar "
@@ -3150,7 +3148,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2570
+#: using-d-i.xml:2569
 #, no-c-format
 msgid ""
 "The <quote>Desktop environment</quote> task will install a graphical desktop "
@@ -3158,7 +3156,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2575
+#: using-d-i.xml:2574
 #, no-c-format
 msgid ""
 "By default, &d-i; installs the <phrase arch=\"x86\">Gnome</phrase> <phrase "
@@ -3169,20 +3167,20 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2583
+#: using-d-i.xml:2582
 #, 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 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 "
+"mirror as they might not be available on the CD image due to its limited "
+"amount of space. 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:2593
+#: using-d-i.xml:2592
 #, no-c-format
 msgid ""
 "The various server tasks will install software roughly as follows. Web "
@@ -3191,7 +3189,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2600
+#: using-d-i.xml:2599
 #, no-c-format
 msgid ""
 "The <quote>Standard system</quote> task will install any package that has a "
@@ -3202,7 +3200,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2608
+#: using-d-i.xml:2607
 #, no-c-format
 msgid ""
 "If during language selection a default locale other than the <quote>C</"
@@ -3215,7 +3213,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2618
+#: using-d-i.xml:2617
 #, no-c-format
 msgid ""
 "Once you've selected your tasks, select &BTN-CONT;. At this point, "
@@ -3225,7 +3223,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2625
+#: using-d-i.xml:2624
 #, no-c-format
 msgid ""
 "You should be aware that especially the Desktop task is very large. "
@@ -3237,7 +3235,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2634
+#: using-d-i.xml:2633
 #, no-c-format
 msgid ""
 "Even when packages are included on the CD-ROM, the installer may still "
@@ -3249,13 +3247,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2649
+#: using-d-i.xml:2648
 #, no-c-format
 msgid "Making Your System Bootable"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2651
+#: using-d-i.xml:2650
 #, no-c-format
 msgid ""
 "If you are installing a diskless workstation, obviously, booting off the "
@@ -3265,13 +3263,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2666
+#: using-d-i.xml:2665
 #, no-c-format
 msgid "Detecting other operating systems"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2668
+#: using-d-i.xml:2667
 #, no-c-format
 msgid ""
 "Before a boot loader is installed, the installer will attempt to probe for "
@@ -3282,7 +3280,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2676
+#: using-d-i.xml:2675
 #, no-c-format
 msgid ""
 "Note that multiple operating systems booting on a single machine is still "
@@ -3293,13 +3291,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2694
+#: using-d-i.xml:2693
 #, no-c-format
 msgid "<command>palo</command>-installer"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2695
+#: using-d-i.xml:2694
 #, no-c-format
 msgid ""
 "The bootloader on PA-RISC is <quote>palo</quote>. <command>PALO</command> is "
@@ -3310,19 +3308,19 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2704
+#: using-d-i.xml:2703
 #, no-c-format
 msgid "hppa FIXME ( need more info )"
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2716 using-d-i.xml:2989
+#: using-d-i.xml:2715 using-d-i.xml:2988
 #, no-c-format
 msgid "Install the <command>Grub</command> Boot Loader on a Hard Disk"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2718 using-d-i.xml:2991
+#: using-d-i.xml:2717 using-d-i.xml:2990
 #, no-c-format
 msgid ""
 "The main &architecture; boot loader is called <quote>grub</quote>. Grub is a "
@@ -3331,7 +3329,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2724
+#: using-d-i.xml:2723
 #, no-c-format
 msgid ""
 "By default, grub will be installed into the Master Boot Record (MBR), where "
@@ -3340,7 +3338,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2730
+#: using-d-i.xml:2729
 #, no-c-format
 msgid ""
 "If you do not want to install grub, use the &BTN-GOBACK; button to get to "
@@ -3349,13 +3347,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2743
+#: using-d-i.xml:2742
 #, no-c-format
 msgid "Install the <command>LILO</command> Boot Loader on a Hard Disk"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2745
+#: using-d-i.xml:2744
 #, no-c-format
 msgid ""
 "The second &architecture; boot loader is called <quote>LILO</quote>. It is "
@@ -3366,7 +3364,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2755
+#: using-d-i.xml:2754
 #, no-c-format
 msgid ""
 "Currently the LILO installation will only create menu entries for other "
@@ -3376,7 +3374,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2763
+#: using-d-i.xml:2762
 #, no-c-format
 msgid ""
 "&d-i; offers you three choices on where to install the <command>LILO</"
@@ -3384,13 +3382,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:2770
+#: using-d-i.xml:2769
 #, no-c-format
 msgid "Master Boot Record (MBR)"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2770
+#: using-d-i.xml:2769
 #, no-c-format
 msgid ""
 "This way the <command>LILO</command> will take complete control of the boot "
@@ -3398,13 +3396,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:2777
+#: using-d-i.xml:2776
 #, no-c-format
 msgid "new &debian; partition"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2777
+#: using-d-i.xml:2776
 #, no-c-format
 msgid ""
 "Choose this if you want to use another boot manager. <command>LILO</command> "
@@ -3413,13 +3411,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: using-d-i.xml:2786
+#: using-d-i.xml:2785
 #, no-c-format
 msgid "Other choice"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2786
+#: using-d-i.xml:2785
 #, no-c-format
 msgid ""
 "Useful for advanced users who want to install <command>LILO</command> "
@@ -3428,7 +3426,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2796
+#: using-d-i.xml:2795
 #, no-c-format
 msgid ""
 "If you can no longer boot into Windows 9x (or DOS) after this step, you'll "
@@ -3439,13 +3437,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2812
+#: using-d-i.xml:2811
 #, no-c-format
 msgid "Install the <command>ELILO</command> Boot Loader on a Hard Disk"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2814
+#: using-d-i.xml:2813
 #, no-c-format
 msgid ""
 "The &architecture; boot loader is called <quote>elilo</quote>. It is modeled "
@@ -3462,7 +3460,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2830
+#: using-d-i.xml:2829
 #, no-c-format
 msgid ""
 "The <quote>elilo</quote> configuration and installation is done as the last "
@@ -3474,13 +3472,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2842
+#: using-d-i.xml:2841
 #, no-c-format
 msgid "Choose the correct partition!"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2844
+#: using-d-i.xml:2843
 #, no-c-format
 msgid ""
 "The criterion for selecting a partition is that it must be a FAT format "
@@ -3492,13 +3490,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2859
+#: using-d-i.xml:2858
 #, no-c-format
 msgid "EFI Partition Contents"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2861
+#: using-d-i.xml:2860
 #, no-c-format
 msgid ""
 "The EFI partition is a FAT filesystem format partition on one of the hard "
@@ -3516,13 +3514,13 @@ msgid ""
 msgstr ""
 
 #. Tag: filename
-#: using-d-i.xml:2883
+#: using-d-i.xml:2882
 #, no-c-format
 msgid "elilo.conf"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2884
+#: using-d-i.xml:2883
 #, no-c-format
 msgid ""
 "This is the configuration file read by the boot loader when it starts. It is "
@@ -3531,13 +3529,13 @@ msgid ""
 msgstr ""
 
 #. Tag: filename
-#: using-d-i.xml:2893
+#: using-d-i.xml:2892
 #, no-c-format
 msgid "elilo.efi"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2894
+#: using-d-i.xml:2893
 #, no-c-format
 msgid ""
 "This is the boot loader program that the <quote>EFI Boot Manager</quote> "
@@ -3547,13 +3545,13 @@ msgid ""
 msgstr ""
 
 #. Tag: filename
-#: using-d-i.xml:2904
+#: using-d-i.xml:2903
 #, no-c-format
 msgid "initrd.img"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2905
+#: using-d-i.xml:2904
 #, no-c-format
 msgid ""
 "This is the initial root filesystem used to boot the kernel. It is a copy of "
@@ -3563,13 +3561,13 @@ msgid ""
 msgstr ""
 
 #. Tag: filename
-#: using-d-i.xml:2917
+#: using-d-i.xml:2916
 #, no-c-format
 msgid "readme.txt"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2918
+#: using-d-i.xml:2917
 #, no-c-format
 msgid ""
 "This is a small text file warning you that the contents of the directory are "
@@ -3578,13 +3576,13 @@ msgid ""
 msgstr ""
 
 #. Tag: filename
-#: using-d-i.xml:2928
+#: using-d-i.xml:2927
 #, no-c-format
 msgid "vmlinuz"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2929
+#: using-d-i.xml:2928
 #, no-c-format
 msgid ""
 "This is the compressed kernel itself. It is a copy of the file referenced in "
@@ -3594,13 +3592,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2953
+#: using-d-i.xml:2952
 #, no-c-format
 msgid "Install <command>Yaboot</command> on a Hard Disk"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2954
+#: using-d-i.xml:2953
 #, no-c-format
 msgid ""
 "Newer (mid 1998 and on) PowerMacs use <command>yaboot</command> as their "
@@ -3613,13 +3611,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:2972
+#: using-d-i.xml:2971
 #, no-c-format
 msgid "Install <command>Quik</command> on a Hard Disk"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2973
+#: using-d-i.xml:2972
 #, no-c-format
 msgid ""
 "The boot loader for OldWorld Power Macintosh machines is <command>quik</"
@@ -3629,7 +3627,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:2997
+#: using-d-i.xml:2996
 #, no-c-format
 msgid ""
 "By default, Grub will be installed into the PReP partition, where it will "
@@ -3637,13 +3635,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3010
+#: using-d-i.xml:3009
 #, no-c-format
 msgid "<command>zipl</command>-installer"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3011
+#: using-d-i.xml:3010
 #, no-c-format
 msgid ""
 "The boot loader on &arch-title; is <quote>zipl</quote>. <command>ZIPL</"
@@ -3654,13 +3652,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3028
+#: using-d-i.xml:3027
 #, no-c-format
 msgid "Install the <command>SILO</command> Boot Loader on a Hard Disk"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3030
+#: using-d-i.xml:3029
 #, no-c-format
 msgid ""
 "The standard &architecture; boot loader is called <quote>silo</quote>. It is "
@@ -3678,13 +3676,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3055
+#: using-d-i.xml:3054
 #, no-c-format
 msgid "Making the system bootable with flash-kernel"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3056
+#: using-d-i.xml:3055
 #, no-c-format
 msgid ""
 "As there is no common firmware interface on all ARM platforms, the steps "
@@ -3697,7 +3695,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3067
+#: using-d-i.xml:3066
 #, no-c-format
 msgid ""
 "On devices which boot from internal NOR- or NAND-flash memory, flash-kernel "
@@ -3709,7 +3707,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3077
+#: using-d-i.xml:3076
 #, no-c-format
 msgid ""
 "For ARM systems that use U-Boot as their system firmware and boot the kernel "
@@ -3719,13 +3717,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3093
+#: using-d-i.xml:3092
 #, no-c-format
 msgid "Continue Without Boot Loader"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3095
+#: using-d-i.xml:3094
 #, no-c-format
 msgid ""
 "This option can be used to complete the installation even when no boot "
@@ -3734,7 +3732,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3102
+#: using-d-i.xml:3101
 #, no-c-format
 msgid ""
 "If you plan to manually configure your bootloader, you should check the name "
@@ -3748,13 +3746,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3119
+#: using-d-i.xml:3118
 #, no-c-format
 msgid "Finishing the Installation"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3120
+#: using-d-i.xml:3119
 #, no-c-format
 msgid ""
 "This is the last step in the &debian; installation process during which the "
@@ -3763,13 +3761,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3133
+#: using-d-i.xml:3132
 #, no-c-format
 msgid "Setting the System Clock"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3135
+#: using-d-i.xml:3134
 #, no-c-format
 msgid ""
 "The installer may ask you if the computer's clock is set to UTC. Normally "
@@ -3779,7 +3777,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3142
+#: using-d-i.xml:3141
 #, no-c-format
 msgid ""
 "In expert mode you will always be able to choose whether or not the clock is "
@@ -3791,7 +3789,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3153
+#: using-d-i.xml:3152
 #, no-c-format
 msgid ""
 "At this point &d-i; will also attempt to save the current time to the "
@@ -3800,13 +3798,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3168
+#: using-d-i.xml:3167
 #, no-c-format
 msgid "Reboot the System"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3170
+#: using-d-i.xml:3169
 #, no-c-format
 msgid ""
 "You will be prompted to remove the boot media (CD, USB stick, etc) that you "
@@ -3815,7 +3813,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3176
+#: using-d-i.xml:3175
 #, no-c-format
 msgid ""
 "After a final prompt the system will be halted because rebooting is not "
@@ -3825,13 +3823,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3189
+#: using-d-i.xml:3188
 #, no-c-format
 msgid "Troubleshooting"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3190
+#: using-d-i.xml:3189
 #, no-c-format
 msgid ""
 "The components listed in this section are usually not involved in the "
@@ -3840,13 +3838,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3203
+#: using-d-i.xml:3202
 #, no-c-format
 msgid "Saving the installation logs"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3205
+#: using-d-i.xml:3204
 #, no-c-format
 msgid ""
 "If the installation is successful, the logfiles created during the "
@@ -3855,7 +3853,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3212
+#: using-d-i.xml:3211
 #, no-c-format
 msgid ""
 "Choosing <guimenuitem>Save debug logs</guimenuitem> from the main menu "
@@ -3866,13 +3864,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3232
+#: using-d-i.xml:3231
 #, no-c-format
 msgid "Using the Shell and Viewing the Logs"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3234
+#: using-d-i.xml:3233
 #, no-c-format
 msgid ""
 "There are several methods you can use to get a shell while running an "
@@ -3888,13 +3886,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3252
+#: using-d-i.xml:3251
 #, no-c-format
 msgid "For the graphical installer see also <xref linkend=\"gtk-using\"/>."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3256
+#: using-d-i.xml:3255
 #, no-c-format
 msgid ""
 "If you cannot switch consoles, there is also an <guimenuitem>Execute a "
@@ -3905,7 +3903,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3264
+#: using-d-i.xml:3263
 #, no-c-format
 msgid ""
 "At this point you are booted from the RAM disk, and there is a limited set "
@@ -3917,7 +3915,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3273
+#: using-d-i.xml:3272
 #, no-c-format
 msgid ""
 "To edit and view files, use the text editor <command>nano</command>. Log "
@@ -3926,7 +3924,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3280
+#: using-d-i.xml:3279
 #, no-c-format
 msgid ""
 "Although you can do basically anything in a shell that the available "
@@ -3935,7 +3933,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3286
+#: using-d-i.xml:3285
 #, no-c-format
 msgid ""
 "Doing things manually from the shell may interfere with the installation "
@@ -3945,13 +3943,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3302
+#: using-d-i.xml:3301
 #, no-c-format
 msgid "Installation Over the Network"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3304
+#: using-d-i.xml:3303
 #, no-c-format
 msgid ""
 "One of the more interesting components is <firstterm>network-console</"
@@ -3963,21 +3961,21 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3314
+#: using-d-i.xml:3313
 #, no-c-format
 msgid ""
 "This component is not loaded into the main installation menu by default, so "
-"you have to explicitly ask for it. If you are installing from CD, you need "
-"to boot with medium priority or otherwise invoke the main installation menu "
-"and choose <guimenuitem>Load installer components from CD</guimenuitem> and "
-"from the list of additional components select <guimenuitem>network-console: "
-"Continue installation remotely using SSH</guimenuitem>. Successful load is "
-"indicated by a new menu entry called <guimenuitem>Continue installation "
-"remotely using SSH</guimenuitem>."
+"you have to explicitly ask for it. If you are installing from optical media, "
+"you need to boot with medium priority or otherwise invoke the main "
+"installation menu and choose <guimenuitem>Load installer components from "
+"installation media</guimenuitem> and from the list of additional components "
+"select <guimenuitem>network-console: Continue installation remotely using "
+"SSH</guimenuitem>. Successful load is indicated by a new menu entry called "
+"<guimenuitem>Continue installation remotely using SSH</guimenuitem>."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3327
+#: using-d-i.xml:3326
 #, no-c-format
 msgid ""
 "For installations on &arch-title;, this is the default method after setting "
@@ -3985,7 +3983,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3332
+#: using-d-i.xml:3331
 #, no-c-format
 msgid ""
 "<phrase arch=\"not-s390\">After selecting this new entry, you</phrase> "
@@ -3999,7 +3997,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3344
+#: using-d-i.xml:3343
 #, no-c-format
 msgid ""
 "Should you decide to continue with the installation locally, you can always "
@@ -4008,7 +4006,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3350
+#: using-d-i.xml:3349
 #, no-c-format
 msgid ""
 "Now let's switch to the other side of the wire. As a prerequisite, you need "
@@ -4027,7 +4025,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3367
+#: using-d-i.xml:3366
 #, no-c-format
 msgid ""
 "The <command>ssh</command> server in the installer uses a default "
@@ -4043,7 +4041,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3380
+#: using-d-i.xml:3379
 #, no-c-format
 msgid ""
 "You may be able to avoid the connection being dropped by adding the option "
@@ -4057,7 +4055,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3393
+#: using-d-i.xml:3392
 #, no-c-format
 msgid ""
 "If you install several computers in turn and they happen to have the same IP "
@@ -4072,7 +4070,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3409
+#: using-d-i.xml:3408
 #, no-c-format
 msgid ""
 "After the login you will be presented with an initial screen where you have "
@@ -4085,7 +4083,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3419
+#: using-d-i.xml:3418
 #, no-c-format
 msgid ""
 "After you have started the installation remotely over SSH, you should not go "
@@ -4096,13 +4094,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3438
+#: using-d-i.xml:3437
 #, no-c-format
 msgid "Loading Missing Firmware"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3439
+#: using-d-i.xml:3438
 #, no-c-format
 msgid ""
 "As described in <xref linkend=\"hardware-firmware\"/>, some devices require "
@@ -4112,7 +4110,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3447
+#: using-d-i.xml:3446
 #, no-c-format
 msgid ""
 "If a device driver requests firmware that is not available, &d-i; will "
@@ -4124,7 +4122,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3457
+#: using-d-i.xml:3456
 #, no-c-format
 msgid ""
 "Which devices are scanned and which file systems are supported depends on "
@@ -4136,7 +4134,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3467
+#: using-d-i.xml:3466
 #, no-c-format
 msgid ""
 "Note that it is possible to skip loading the firmware if you know the device "
@@ -4145,7 +4143,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3473
+#: using-d-i.xml:3472
 #, no-c-format
 msgid ""
 "&d-i; only prompts for firmware needed by kernel modules loaded during the "
@@ -4159,28 +4157,28 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3487
+#: using-d-i.xml:3486
 #, no-c-format
 msgid "Preparing a medium"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3488
+#: using-d-i.xml:3487
 #, no-c-format
 msgid ""
-"Official CD images do not include non-free firmware. The most common method "
-"to load such firmware is from some removable medium such as a USB stick. "
-"Alternatively, unofficial CD builds containing non-free firmware can be "
-"found at <ulink url=\"&url-firmware-cds;\"></ulink>. To prepare a USB stick "
-"(or other medium like a hard drive partition), the firmware files or "
-"packages must be placed in either the root directory or a directory named "
-"<filename>/firmware</filename> of the file system on the medium. The "
-"recommended file system to use is FAT as that is most certain to be "
-"supported during the early stages of the installation."
+"Official installation images do not include non-free firmware. The most "
+"common method to load such firmware is from some removable medium such as a "
+"USB stick. Alternatively, unofficial installation images containing non-free "
+"firmware can be found at <ulink url=\"&url-firmware-cds;\"></ulink>. To "
+"prepare a USB stick (or other medium like a hard drive partition), the "
+"firmware files or packages must be placed in either the root directory or a "
+"directory named <filename>/firmware</filename> of the file system on the "
+"medium. The recommended file system to use is FAT as that is most certain to "
+"be supported during the early stages of the installation."
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3501
+#: using-d-i.xml:3500
 #, no-c-format
 msgid ""
 "Tarballs and zip files containing current packages for the most common "
@@ -4191,7 +4189,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3515
+#: using-d-i.xml:3514
 #, no-c-format
 msgid ""
 "If the firmware you need is not included in the tarball, you can also "
@@ -4202,7 +4200,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3529
+#: using-d-i.xml:3528
 #, no-c-format
 msgid ""
 "It is also possible to copy individual firmware files to the medium. Loose "
@@ -4211,13 +4209,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: using-d-i.xml:3538
+#: using-d-i.xml:3537
 #, no-c-format
 msgid "Firmware and the Installed System"
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3539
+#: using-d-i.xml:3538
 #, no-c-format
 msgid ""
 "Any firmware loaded during the installation will be copied automatically to "
@@ -4229,7 +4227,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3548
+#: using-d-i.xml:3547
 #, no-c-format
 msgid ""
 "If the firmware was loaded from a firmware package, &d-i; will also install "
@@ -4240,7 +4238,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3556
+#: using-d-i.xml:3555
 #, no-c-format
 msgid ""
 "If loading the firmware was skipped during the installation, the relevant "
@@ -4249,7 +4247,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: using-d-i.xml:3563
+#: using-d-i.xml:3562
 #, no-c-format
 msgid ""
 "If the firmware was loaded from loose firmware files, the firmware copied to "
diff --git a/po/uk/welcome.po b/po/uk/welcome.po
index b6911c552..d504425d5 100644
--- a/po/uk/welcome.po
+++ b/po/uk/welcome.po
@@ -4,14 +4,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: welcome_uk\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-08-06 18:46+0000\n"
+"POT-Creation-Date: 2019-09-22 23:04+0000\n"
 "PO-Revision-Date: 2019-09-03 08:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: Ukranian\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. Tag: title
@@ -498,10 +498,10 @@ msgstr ""
 #, no-c-format
 msgid ""
 "For information on how to download &debian-gnu; from the Internet or from "
-"whom official &debian; CDs can be purchased, see the <ulink url=\"&url-"
-"debian-distrib;\">distribution web page</ulink>. The <ulink url=\"&url-"
-"debian-mirrors;\">list of &debian; mirrors</ulink> contains a full set of "
-"official &debian; mirrors, so you can easily find the nearest one."
+"whom official &debian; installation media can be purchased, see the <ulink "
+"url=\"&url-debian-distrib;\">distribution web page</ulink>. The <ulink url="
+"\"&url-debian-mirrors;\">list of &debian; mirrors</ulink> contains a full "
+"set of official &debian; mirrors, so you can easily find the nearest one."
 msgstr ""
 
 #. Tag: para
@@ -609,10 +609,10 @@ msgid ""
 "This involves choosing your language, configuring peripheral driver modules, "
 "configuring your network connection, so that remaining installation files "
 "can be obtained directly from a &debian; server (if you are not installing "
-"from a CD/DVD set), partitioning your hard drives and installation of a base "
-"system, then selection and installation of tasks. (Some background about "
-"setting up the partitions for your &debian; system is explained in <xref "
-"linkend=\"partitioning\"/>.)"
+"from a set of CD/DVD installation images), partitioning your hard drives and "
+"installation of a base system, then selection and installation of tasks. "
+"(Some background about setting up the partitions for your &debian; system is "
+"explained in <xref linkend=\"partitioning\"/>.)"
 msgstr ""
 
 #. Tag: para
@@ -693,12 +693,12 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Calling software <emphasis>free</emphasis> doesn't mean that the software "
-"isn't copyrighted, and it doesn't mean that CDs/DVDs containing that "
-"software must be distributed at no charge. Free software, in part, means "
-"that the licenses of individual programs do not require you to pay for the "
-"privilege of distributing or using those programs. Free software also means "
-"that not only may anyone extend, adapt, and modify the software, but that "
-"they may distribute the results of their work as well."
+"isn't copyrighted, and it doesn't mean that installation media containing "
+"that software must be distributed at no charge. Free software, in part, "
+"means that the licenses of individual programs do not require you to pay for "
+"the privilege of distributing or using those programs. Free software also "
+"means that not only may anyone extend, adapt, and modify the software, but "
+"that they may distribute the results of their work as well."
 msgstr ""
 
 #. Tag: para
diff --git a/po/vi/random-bits.po b/po/vi/random-bits.po
index 442209c7e..95e009f1a 100644
--- a/po/vi/random-bits.po
+++ b/po/vi/random-bits.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: random-bits\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2012-08-05 13:21+0700\n"
 "Last-Translator: hailang <hailangvn@gmail.com>\n"
 "Language-Team: MOST Project <du-an-most@lists.hanoilug.org>\n"
@@ -1523,8 +1523,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 0afc2a351..aa80f339d 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2017-06-11 20:40+0800\n"
 "Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
 "Language-Team:  <debian-l10n-chinese@lists.debian.org>\n"
@@ -1416,7 +1416,18 @@ msgstr "配置 Apt"
 
 #. Tag: para
 #: random-bits.xml:652
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Debootstrap will have created a very basic <filename>/etc/apt/sources."
+#| "list</filename> that will allow installing additional packages. However, "
+#| "you may want to add some additional sources, for example for source "
+#| "packages and security updates: <informalexample><screen>\n"
+#| "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
+#| "\n"
+#| "deb http://security.debian.org/ &releasename;/updates main\n"
+#| "deb-src http://security.debian.org/ &releasename;/updates main\n"
+#| "</screen></informalexample> Make sure to run <userinput>apt update</"
+#| "userinput> after you have made changes to the sources list."
 msgid ""
 "Debootstrap will have created a very basic <filename>/etc/apt/sources.list</"
 "filename> that will allow installing additional packages. However, you may "
@@ -1424,8 +1435,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""
diff --git a/po/zh_TW/random-bits.po b/po/zh_TW/random-bits.po
index eb26488e2..7d04b91c7 100644
--- a/po/zh_TW/random-bits.po
+++ b/po/zh_TW/random-bits.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-09-22 23:04+0000\n"
+"POT-Creation-Date: 2019-12-20 20:36+0000\n"
 "PO-Revision-Date: 2005-07-18 14:20+0800\n"
 "Last-Translator: Jhang, Jia-Wei<dreamcryer@gmail.com>\n"
 "Language-Team: debian-chinese-big5 <debian-chinese-big5@lists.debian.org>\n"
@@ -1246,8 +1246,8 @@ msgid ""
 "security updates: <informalexample><screen>\n"
 "deb-src http://ftp.us.debian.org/debian &releasename; main\n"
 "\n"
-"deb http://security.debian.org/ &releasename;/updates main\n"
-"deb-src http://security.debian.org/ &releasename;/updates main\n"
+"deb http://security.debian.org/ &releasename;-security main\n"
+"deb-src http://security.debian.org/ &releasename;-security main\n"
 "</screen></informalexample> Make sure to run <userinput>apt update</"
 "userinput> after you have made changes to the sources list."
 msgstr ""