Merge branch 'master' of salsa.debian.org:installer-team/installation-guide

2 files changed, 71 insertions, 9 deletions

diff --git a/po/da/random-bits.po b/po/da/random-bits.po
index fc35b523f..5c7de0175 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: 2017-04-17 21:48+0000\n"
+"POT-Creation-Date: 2018-10-21 10:09+0000\n"
 "PO-Revision-Date: 2016-12-30 10:15+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -1305,7 +1305,68 @@ msgstr "Konfigurer netværk"
 
 #. Tag: para
 #: random-bits.xml:627
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "To configure networking, edit <filename>/etc/network/interfaces</"
+#| "filename>, <filename>/etc/resolv.conf</filename>, <filename>/etc/"
+#| "hostname</filename> and <filename>/etc/hosts</filename>. "
+#| "<informalexample><screen>\n"
+#| "# editor /etc/network/interfaces\n"
+#| "</screen></informalexample> Here are some simple examples from <filename>/"
+#| "usr/share/doc/ifupdown/examples</filename>: <informalexample><screen>\n"
+#| "######################################################################\n"
+#| "# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)\n"
+#| "# See the interfaces(5) manpage for information on what options are\n"
+#| "# available.\n"
+#| "######################################################################\n"
+#| "\n"
+#| "# We always want the loopback interface.\n"
+#| "#\n"
+#| "auto lo\n"
+#| "iface lo inet loopback\n"
+#| "\n"
+#| "# To use dhcp:\n"
+#| "#\n"
+#| "# auto eth0\n"
+#| "# iface eth0 inet dhcp\n"
+#| "\n"
+#| "# An example static IP setup: (broadcast and gateway are optional)\n"
+#| "#\n"
+#| "# auto eth0\n"
+#| "# iface eth0 inet static\n"
+#| "#     address 192.168.0.42\n"
+#| "#     network 192.168.0.0\n"
+#| "#     netmask 255.255.255.0\n"
+#| "#     broadcast 192.168.0.255\n"
+#| "#     gateway 192.168.0.1\n"
+#| "</screen></informalexample> Enter your nameserver(s) and search "
+#| "directives in <filename>/etc/resolv.conf</filename>: "
+#| "<informalexample><screen>\n"
+#| "# editor /etc/resolv.conf\n"
+#| "</screen></informalexample> A simple example <filename>/etc/resolv.conf</"
+#| "filename>: <informalexample><screen>\n"
+#| "search hqdom.local\n"
+#| "nameserver 10.1.1.36\n"
+#| "nameserver 192.168.9.100\n"
+#| "</screen></informalexample> Enter your system's host name (2 to 63 "
+#| "characters): <informalexample><screen>\n"
+#| "# echo DebianHostName &gt; /etc/hostname\n"
+#| "</screen></informalexample> And a basic <filename>/etc/hosts</filename> "
+#| "with IPv6 support: <informalexample><screen>\n"
+#| "127.0.0.1 localhost\n"
+#| "127.0.1.1 DebianHostName\n"
+#| "\n"
+#| "# The following lines are desirable for IPv6 capable hosts\n"
+#| "::1     ip6-localhost ip6-loopback\n"
+#| "fe00::0 ip6-localnet\n"
+#| "ff00::0 ip6-mcastprefix\n"
+#| "ff02::1 ip6-allnodes\n"
+#| "ff02::2 ip6-allrouters\n"
+#| "ff02::3 ip6-allhosts\n"
+#| "</screen></informalexample> If you have multiple network cards, you "
+#| "should arrange the names of driver modules in the <filename>/etc/modules</"
+#| "filename> file into the desired order. Then during boot, each card will "
+#| "be associated with the interface name (eth0, eth1, etc.) that you expect."
 msgid ""
 "To configure networking, edit <filename>/etc/network/interfaces</filename>, "
 "<filename>/etc/resolv.conf</filename>, <filename>/etc/hostname</filename> "
@@ -1319,17 +1380,18 @@ msgid ""
 "# available.\n"
 "######################################################################\n"
 "\n"
-"# We always want the loopback interface.\n"
+"# The loopback interface isn't really required any longer, but can be used\n"
+"# if needed.\n"
 "#\n"
-"auto lo\n"
-"iface lo inet loopback\n"
+"# auto lo\n"
+"# iface lo inet loopback\n"
 "\n"
 "# To use dhcp:\n"
 "#\n"
 "# auto eth0\n"
 "# iface eth0 inet dhcp\n"
 "\n"
-"# An example static IP setup: (broadcast and gateway are optional)\n"
+"# An example static IP setup: (network, broadcast and gateway are optional)\n"
 "#\n"
 "# auto eth0\n"
 "# iface eth0 inet static\n"
@@ -1343,7 +1405,7 @@ msgid ""
 "# editor /etc/resolv.conf\n"
 "</screen></informalexample> A simple example <filename>/etc/resolv.conf</"
 "filename>: <informalexample><screen>\n"
-"search hqdom.local\n"
+"search example.com\n"
 "nameserver 10.1.1.36\n"
 "nameserver 192.168.9.100\n"
 "</screen></informalexample> Enter your system's host name (2 to 63 "
diff --git a/po/da/welcome.po b/po/da/welcome.po
index 19625e56e..cfae66c97 100644
--- a/po/da/welcome.po
+++ b/po/da/welcome.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: installation-guide welcome\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-01 23:05+0000\n"
+"POT-Creation-Date: 2018-10-23 07:43+0000\n"
 "PO-Revision-Date: 2014-10-06 09:40+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -629,7 +629,7 @@ msgid ""
 "available are an expert mode that allows to control every aspect of the "
 "installation and an advanced feature to perform automated installations. The "
 "installed system can be used as is or further customized. The installation "
-"can be performed from a multitude of sources: USB, CD/DVD/Blue Ray or the "
+"can be performed from a multitude of sources: USB, CD/DVD/Blu-Ray or the "
 "network. The installer supports localized installations in more than 80 "
 "languages."
 msgstr ""