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

1 files changed, 45 insertions, 10 deletions

diff --git a/po/da/preseed.po b/po/da/preseed.po
index 73578fa44..a8ddd75d6 100644
--- a/po/da/preseed.po
+++ b/po/da/preseed.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_preseed\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2019-06-22 16:23+0000\n"
+"POT-Creation-Date: 2019-08-16 23:12+0000\n"
 "PO-Revision-Date: 2018-12-28 11:40+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -1153,15 +1153,16 @@ msgstr ""
 #, no-c-format
 msgid ""
 "Note that the above example limits this filename to DHCP clients that "
-"identify themselves as \"d-i\", so it will not affect regular DHCP clients, "
-"but only the installer. You can also put the text in a stanza for only one "
-"particular host to avoid preseeding all installs on your network."
+"identify themselves as <quote>d-i</quote>, so it will not affect regular "
+"DHCP clients, but only the installer. You can also put the text in a stanza "
+"for only one particular host to avoid preseeding all installs on your "
+"network."
 msgstr ""
 "Bemærk at det ovenstående eksempel begrænser dette filnavn til DHCP-"
-"klineter, som identificerer sig selv som »d-i«, så det vil ikke påvirke "
-"normale DHCP-klienter, men kun installationsprogrammet. Du kan også placere "
-"teksten i en stanza for en bestemt vært for at undgå forhåndskonfiguration "
-"af alle installationer på dit netværk."
+"klineter, som identificerer sig selv som <quote>d-i</quote>, så det vil ikke "
+"påvirke normale DHCP-klienter, men kun installationsprogrammet. Du kan også "
+"placere teksten i en stanza for en bestemt vært for at undgå "
+"forhåndskonfiguration af alle installationer på dit netværk."
 
 #. Tag: para
 #: preseed.xml:582
@@ -2465,7 +2466,37 @@ msgstr ""
 
 #. Tag: screen
 #: preseed.xml:1059
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# You can choose to install non-free and contrib software.\n"
+#| "#d-i apt-setup/non-free boolean true\n"
+#| "#d-i apt-setup/contrib boolean true\n"
+#| "# Uncomment this if you don't want to use a network mirror.\n"
+#| "#d-i apt-setup/use_mirror boolean false\n"
+#| "# Select which update services to use; define the mirrors to be used.\n"
+#| "# Values shown below are the normal defaults.\n"
+#| "#d-i apt-setup/services-select multiselect security, updates\n"
+#| "#d-i apt-setup/security_host string security.debian.org\n"
+#| "\n"
+#| "# Additional repositories, local[0-9] available\n"
+#| "#d-i apt-setup/local0/repository string \\\n"
+#| "#       http://local.server/debian stable main\n"
+#| "#d-i apt-setup/local0/comment string local server\n"
+#| "# Enable deb-src lines\n"
+#| "#d-i apt-setup/local0/source boolean true\n"
+#| "# URL to the public key of the local repository; you must provide a key "
+#| "or\n"
+#| "# apt will complain about the unauthenticated repository and so the\n"
+#| "# sources.list line will be left commented out\n"
+#| "#d-i apt-setup/local0/key string http://local.server/key\n"
+#| "\n"
+#| "# By default the installer requires that repositories be authenticated\n"
+#| "# using a known gpg key. This setting can be used to disable that\n"
+#| "# authentication. Warning: Insecure, not recommended.\n"
+#| "#d-i debian-installer/allow_unauthenticated boolean true\n"
+#| "\n"
+#| "# Uncomment this to add multiarch configuration for i386\n"
+#| "#d-i apt-setup/multiarch string i386"
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
 "#d-i apt-setup/non-free boolean true\n"
@@ -2485,8 +2516,12 @@ msgid ""
 "#d-i apt-setup/local0/source boolean true\n"
 "# URL to the public key of the local repository; you must provide a key or\n"
 "# apt will complain about the unauthenticated repository and so the\n"
-"# sources.list line will be left commented out\n"
+"# sources.list line will be left commented out.\n"
 "#d-i apt-setup/local0/key string http://local.server/key\n"
+"# If the provided key file ends in \".asc\" the key file needs to be an\n"
+"# ASCII-armoured PGP key, if it ends in \".gpg\" it needs to use the\n"
+"# \"GPG key public keyring\" format, the \"keybox database\" format is\n"
+"# currently not supported.\n"
 "\n"
 "# By default the installer requires that repositories be authenticated\n"
 "# using a known gpg key. This setting can be used to disable that\n"