Get the logo for PDFs back

4 files changed, 22 insertions, 25 deletions

diff --git a/docs/installer/nb/DrakLive-cover.xml b/docs/installer/nb/DrakLive-cover.xml
index 6487efaf..556cc1cd 100644
--- a/docs/installer/nb/DrakLive-cover.xml
+++ b/docs/installer/nb/DrakLive-cover.xml
@@ -12,7 +12,7 @@
     <cover>
         <para role="tagline">Mageias Offisielle dokumentasjon</para>
       <mediaobject>
-<imageobject> <imagedata fileref="mageia-2013.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
             <para>Teksten og skjermbildene i denne manualen er tigjengelige under CC BY-SA 3.0
 lisensen <link
 ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
diff --git a/docs/installer/nb/DrakX-cover.xml b/docs/installer/nb/DrakX-cover.xml
index a6ba2ac8..53b12abd 100644
--- a/docs/installer/nb/DrakX-cover.xml
+++ b/docs/installer/nb/DrakX-cover.xml
@@ -13,7 +13,7 @@
     <cover>
         <para role="tagline">Mageias Offisielle dokumentasjon</para>
       <mediaobject>
-<imageobject> <imagedata fileref="mageia-2013.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="../mageia-2013.png"/> </imageobject></mediaobject>
 	    <para>Teksten og skjermbildene i denne manualen er tigjengelige under CC BY-SA 3.0
 lisensen <link
 ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.
diff --git a/docs/installer/nb/SelectAndUseISOs2.xml b/docs/installer/nb/SelectAndUseISOs2.xml
index d6fa778a..7541e63b 100644
--- a/docs/installer/nb/SelectAndUseISOs2.xml
+++ b/docs/installer/nb/SelectAndUseISOs2.xml
@@ -48,11 +48,6 @@ ns4:href="http://www.mageia.org/en/downloads/">her</link>.</para>
             <para>De kan enten gjøre en ren installasjon eller oppgrader fra en tidligere
 versjon.</para>
           </listitem>
-        </itemizedlist>
-      </section>
-      <section>
-        <title>DVD</title>
-        <itemizedlist>
           <listitem>
             <para>Forskjellige media for 32 eller 64 biters arkitektur.</para>
           </listitem>
@@ -79,7 +74,7 @@ Hardware Detection Tool.</para>
 optionally install Mageia on to your HDD.</para>
           </listitem>
           <listitem>
-            <para>Each ISO contains only one desktop environment (KDE, GNOME or Xfce).</para>
+            <para>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce).</para>
           </listitem>
           <listitem>
             <para>Forskjellige media for 32 eller 64 biters arkitektur.</para>
@@ -104,7 +99,7 @@ releases.</emphasis></para>
             <para>Alle språk er tilgjengelige</para>
           </listitem>
           <listitem>
-            <para>Forskjellige media for 32 eller 64 biters arkitektur.</para>
+            <para>64 bit architecture only.</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -118,7 +113,7 @@ releases.</emphasis></para>
             <para>Alle språk er tilgjengelige</para>
           </listitem>
           <listitem>
-            <para>Forskjellige media for 32 eller 64 biters arkitektur.</para>
+            <para>64 bit architecture only</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -132,7 +127,7 @@ releases.</emphasis></para>
             <para>Alle språk er tilgjengelige</para>
           </listitem>
           <listitem>
-            <para>Forskjellige media for 32 eller 64 biters arkitektur.</para>
+            <para>32 or 64 bit architectures.</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -166,8 +161,8 @@ PC that can't boot from a USB stick.</para>
         <title>netinstall.iso</title>
         <itemizedlist>
           <listitem>
-            <para>Inneholder bare fri programvare for de som nekter å bruke ikke-fri
-programvare.</para>
+            <para>Contains only free software, for those people who prefer not to use non-free
+software.</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -188,19 +183,19 @@ som trenger det.</para>
       <title>Laster ned</title>
       <para>Once you have chosen your ISO file, you can download it using either http or
 BitTorrent. In both cases, a window gives you some information, such as the
-mirror in use and the possibility to change if the bandwidth is to low. If
+mirror in use and an opportunity to change if the bandwidth is to low. If
 http is chosen, you may also see something like</para>
       <mediaobject>
 <imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
       <para>md5sum and sha1sum are tools to check the ISO integrity. Use only one of
 them. Keep one of them <link linkend="integrity">for further
-usage</link>. Then this window appears:</para>
+usage</link>. Then a window similar to this one appears:</para>
       <mediaobject>
 <imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
       <para>Klikk radioknappen Lagre Fil.</para>
     </section>
     <section>
-      <title xml:id="integrity">Kontrollerer integriteten til det nedlastede medium</title>
+      <title xml:id="integrity">Checking the integrity of the downloaded media</title>
       <para>Both checksums are hexadecimal numbers calculated by an algorithm from the
 file to be downloaded. When you ask these algorithms to recalculate this
 number from your downloaded file, either you have the same number and your
@@ -311,7 +306,7 @@ application or file manager that could access or read it)</para>
             <para>Skriv inn kommandoen: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX
 bs=1M</userinput></para>
             <para>Hvor X=enhetsnavnet feks: /dev/sdc</para>
-            <para>Eksempel: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso
+            <para>Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
 of=/dev/sdb bs=1M</userinput></para>
           </listitem>
           <listitem>
diff --git a/docs/installer/nb/setupBootloader.xml b/docs/installer/nb/setupBootloader.xml
index a742f929..3352113d 100644
--- a/docs/installer/nb/setupBootloader.xml
+++ b/docs/installer/nb/setupBootloader.xml
@@ -28,7 +28,7 @@ system</para>
     </itemizedlist>
 
     <tip>
-      <para>Mageias grafiske menyer er fine:</para>
+      <para>The Mageia graphical menus are nice :)</para>
     </tip>
 
     <section>
@@ -89,10 +89,10 @@ click on <guibutton>Next</guibutton> and then uncheck the box
 <guilabel>Probe Foreign OS</guilabel></para>
 
     <mediaobject>
-<imageobject condition="classical"> <imagedata
-fileref="dx2-setupBootloader3.png" align="center"/> </imageobject>
-<imageobject condition="live"> <imagedata
-fileref="live-setupBootloader3.png" align="center"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
+condition="live"> <imagedata fileref="live-setupBootloader3.png"
+align="center"/> </imageobject></mediaobject>
   </section>
 
   <section>
@@ -123,7 +123,8 @@ fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject
 klikke på <guibutton>OK</guibutton>.</para>
 
     <mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader5.png"/> </imageobject></mediaobject>
+<imageobject> <imagedata fileref="live-setupBootloader5.png"/>
+</imageobject></mediaobject>
   </section>
 
   <section>
@@ -141,8 +142,9 @@ started up.</para>
 
           <listitem>
             <para><guilabel>Security</guilabel>: This allows you to set a password for the
-bootloader. This means other people can not enter single user mode or change
-settings at the boot time.</para>
+bootloader. This means a username and password will be asked at the boot
+time to select a booting entry or change settings. The username is "root"
+and the password is the one chosen here after.</para>
           </listitem>
 
           <listitem>