diff options
Diffstat (limited to 'docs/installer/nb/SelectAndUseISOs2.xml')
| -rw-r--r-- | docs/installer/nb/SelectAndUseISOs2.xml | 25 |
1 files changed, 10 insertions, 15 deletions
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> |