aboutsummaryrefslogtreecommitdiffstats
path: root/norwegian/distrib
diff options
context:
space:
mode:
authorHans Fredrik Nordhaug <hans@nordhaug.priv.no>2021-01-28 21:05:01 +0100
committerHans Fredrik Nordhaug <hans@nordhaug.priv.no>2021-01-28 21:05:01 +0100
commit6b08ba1ac7d53d0d067c9545031be00cd283847a (patch)
tree98695b392bfe4dc89dbf718a074972220ba22d16 /norwegian/distrib
parent9d169c4bffc3e3a99cce10a0001c4d60571f6287 (diff)
(nb) Synced distrib/index.wml and netinst.wml with English.
Adding information about non-free firmware.
Diffstat (limited to 'norwegian/distrib')
-rw-r--r--norwegian/distrib/index.wml8
-rw-r--r--norwegian/distrib/index_sub_non_free_firmware.data27
-rw-r--r--norwegian/distrib/netinst.wml6
3 files changed, 33 insertions, 8 deletions
diff --git a/norwegian/distrib/index.wml b/norwegian/distrib/index.wml
index b07256d65a1..8db5e71f7be 100644
--- a/norwegian/distrib/index.wml
+++ b/norwegian/distrib/index.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="Få tak i Debian"
#include "$(ENGLISHDIR)/releases/images.data"
-#use wml::debian::translation-check translation="fc74a202c0f1463d4bc08c88f3da3c2b4f1066f1" maintainer="Hans F. Nordhaug"
+#use wml::debian::translation-check translation="f917b9adf4a1c15cca8405e010043d380e4b1b83" maintainer="Hans F. Nordhaug"
# Oversatt til norsk av Tor Slettnes <tor@slett.net>
# Oppdatert av Hans F. Nordhaug <hansfn@gmail.com>, 2008-2021.
@@ -121,8 +121,4 @@ inneholder detaljert instruksjon for installasjonen. Se også
</div>
-# Local variables:
-# mode: sgml
-# sgml-indent-data:t
-# sgml-doctype:"../.doctype"
-# End:
+#include "index_sub_non_free_firmware.data"
diff --git a/norwegian/distrib/index_sub_non_free_firmware.data b/norwegian/distrib/index_sub_non_free_firmware.data
new file mode 100644
index 00000000000..773305c906b
--- /dev/null
+++ b/norwegian/distrib/index_sub_non_free_firmware.data
@@ -0,0 +1,27 @@
+# Translators: the following paragraph exists (in this or a similar form) several times in webwml,
+# so please try to keep translations consistent. See:
+# ./CD/http-ftp/index.wml
+# ./CD/live/index.wml
+# ./CD/netinst/index.wml
+# ./CD/torrent-cd/index.wml
+# ./distrib/index.wml
+# ./distrib/netinst.wml
+# ./releases/<release-codename>/debian-installer/index.wml
+# ./devel/debian-installer/index.wml
+#
+<div id="firmware_nonfree" class="important">
+<p>
+Hvis noe av maskinvaren i systemet ditt <strong>krever ufri fastvare for å
+laste inn</strong> med enhetsdriveren, så kan du bruke en av
+<a href="https://cdimage.debian.org/cdimage/unofficial/non-free/firmware/stable/current/">tar-ballene
+med vanlig fastvare-pakker</a> eller laste ned et <strong>uoffisielt</strong>
+bilde som inkluderer disse <strong>ufrie</strong> fastvarene. Instruksjoner om
+hvordan du skal bruke disse tar-ballene og generell informasjon om innlasting
+av fastvare under en installasjon finner du i
+<a href="../releases/stable/amd64/ch06s04">installasjonsguiden</a>.
+</p>
+<p>
+<a href="https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/current/">Uoffisielle
+installasjonsbilder for <q>stable</q> med fastvare inkludert</a>
+</p>
+</div>
diff --git a/norwegian/distrib/netinst.wml b/norwegian/distrib/netinst.wml
index 427ecdd2db0..8d58569173c 100644
--- a/norwegian/distrib/netinst.wml
+++ b/norwegian/distrib/netinst.wml
@@ -1,10 +1,10 @@
#use wml::debian::template title="Installering av Debian over Internettet" BARETITLE=true
-#use wml::debian::translation-check translation="457bcb4118a5a79a3dc0e676d42418e45a8d65f3" maintainer="Hans F. Nordhaug"
+#use wml::debian::translation-check translation="f917b9adf4a1c15cca8405e010043d380e4b1b83" maintainer="Hans F. Nordhaug"
#use wml::debian::toc
#include "$(ENGLISHDIR)/releases/info"
#include "$(ENGLISHDIR)/releases/images.data"
# Oversatt til norsk av Hans F. Nordhaug <hansfn@gmail.com>
-# Oppdatert av Hans F. Nordhaug <hansfn@gmail.com>, 2011-2016.
+# Oppdatert av Hans F. Nordhaug <hansfn@gmail.com>, 2011-2021.
<p>
Denne metoden å installere Debian på, krever en fungerende
@@ -100,3 +100,5 @@
</div>
</div>
+
+#include "index_sub_non_free_firmware.data"

© 2014-2024 Faster IT GmbH | imprint | privacy policy