Merge branch 'master' of git://git.mageia.org/software/i18n/tools

1 files changed, 16 insertions, 16 deletions

diff --git a/docs/installer/nb/media_selection.xml b/docs/installer/nb/media_selection.xml
index c4b5026f..bb46954d 100644
--- a/docs/installer/nb/media_selection.xml
+++ b/docs/installer/nb/media_selection.xml
@@ -16,31 +16,31 @@
 <imageobject> <imagedata align="center" fileref="dx2-media_selection.png"
 format="PNG" revision="1" xml:id="media_selection-im1"/> </imageobject></mediaobject>
 
-  <para>Here you have the list of available repositories. Not all repositories are
-available, according to which media you use for installing. The repositories
-selection determines which packages will be available for selection during
-the next steps.</para>
+  <para>Her har du listen over tilgjengelige pakkebrønner. Ikke alle pakkebrønner er
+tilgjengelige, i henhold til hvilke medier du bruker til å
+installere. Valget av pakkebrønner bestemmer hvilke pakker som er
+tilgjengelige for valg i de neste trinnene.</para>
 
   <itemizedlist>
     <listitem>
-      <para>The <emphasis>Core</emphasis> repository cannot be disabled as it contains
-the base of the distribution.</para>
+      <para> <emphasis>Kjerne</emphasis> pakkebrønnen kan ikke deaktiveres da den
+inneholder kjernedistribusjonen.</para>
     </listitem>
 
     <listitem>
-      <para>The <emphasis>Nonfree</emphasis> repository includes packages that are
-free-of-charge, i.e. Mageia may redistribute them, but they contain
-closed-source software (hence the name - Nonfree). For example this
-repository includes nVidia and ATI graphics card proprietary drivers,
-firmware for various WiFi cards, etc.</para>
+      <para><emphasis>Nonfree</emphasis> pakkebrønnen Inkluderer pakker som er gratis,
+det vil si at Mageia kan distribuere dem, men de inneholder lukket
+programvare (dermed navnet - Nonfree). For eksempel inneholder denne
+pakkebrønnen nVidia og ATI grafikkort proprietære drivere, fastvare for
+forskjellige WiFi-kort, etc.</para>
     </listitem>
 
     <listitem>
-      <para>The <emphasis>Tainted</emphasis> repository includes packages released under
-a free license. The main criteria for placing packages in this repository is
-that they may infringe patents and copyright laws in some countries,
-e.g. Multimedia codecs needed to play various audio/video files; packages
-needed to play commercial video DVD, etc.</para>
+      <para> <emphasis>Tainted</emphasis> pakkebrønnen inneholder pakker utgitt under en
+fri lisens. Hovedkriteriene for å plassere pakker i dette depotet er at de
+kan krenke patenter og opphavsrettigheter i enkelte land,
+f.eks. Multimediekodekoller trengte å spille av ulike lyd- / videofiler;
+pakker som trengs for å spille kommersiell video-DVD, etc.</para>
     </listitem>
   </itemizedlist>
 </section>
\ No newline at end of file