aboutsummaryrefslogtreecommitdiffstats
path: root/docs/docs/stable/bootiso/nb.po
diff options
context:
space:
mode:
Diffstat (limited to 'docs/docs/stable/bootiso/nb.po')
-rw-r--r--docs/docs/stable/bootiso/nb.po79
1 files changed, 42 insertions, 37 deletions
diff --git a/docs/docs/stable/bootiso/nb.po b/docs/docs/stable/bootiso/nb.po
index 46ffb3e3..47c0537a 100644
--- a/docs/docs/stable/bootiso/nb.po
+++ b/docs/docs/stable/bootiso/nb.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mageia Boot ISO Help 6.0\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-18 19:11+0200\n"
+"POT-Creation-Date: 2020-12-20 15:06+0200\n"
"PO-Revision-Date: 2017-04-04 18:35+0000\n"
"Last-Translator: Karl Morten Ramberg <karl.m.ramberg@gmail.com>, 2020\n"
"Language-Team: Norwegian Bokmål (https://www.transifex.com/MageiaLinux/"
@@ -98,29 +98,30 @@ msgid "Installing Mageia using a Tiny Boot Image"
msgstr "Installer Mageia fra et Lite Boot Bilde"
#. type: Content of: <section><title>
-#: en/netInstall-intro.xml:11
+#: en/netInstall-intro.xml:12
msgid "Introduction"
msgstr "Introduksjon"
#. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:14
+#: en/netInstall-intro.xml:15
msgid "NetInstall Media"
msgstr "Mageia NettverksInstallering"
#. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:17
+#: en/netInstall-intro.xml:18
msgid "Description"
msgstr "Beskrivelse"
#. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:19
+#: en/netInstall-intro.xml:20
msgid "These minimal ISO's contain:"
msgstr "Disse minimale ISOene inneholder:"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:23
+#: en/netInstall-intro.xml:24
+#, fuzzy
msgid ""
-"less than 100 MB and are convenient if bandwidth is too low to download a "
+"less than 120 MB and are convenient if bandwidth is too low to download a "
"full DVD, or if you have a PC without a DVD drive or unable to boot from a "
"USB stick."
msgstr ""
@@ -129,10 +130,11 @@ msgstr ""
"uten DVD-stasjon eller som ikke kan starte fra en USB-pinne."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:29
+#: en/netInstall-intro.xml:30
+#, fuzzy
msgid ""
-"no more than that which is needed to a) start the <literal>DrakX</literal> "
-"installer and b) find <literal>DrakX-installer-stage2</literal> and other "
+"no more than that which is needed to (a) start the <literal>DrakX</literal> "
+"installer and (b) find <literal>DrakX-installer-stage2</literal> and other "
"packages that are needed to continue and complete the install."
msgstr ""
"ikke mer enn det som trengs for å a) starte <literal>DrakX</literal> "
@@ -141,7 +143,7 @@ msgstr ""
"installasjonen."
#. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:36
+#: en/netInstall-intro.xml:37
msgid ""
"The required source packages may be on a PC hard disk, a local drive, a "
"local network or on the Internet."
@@ -149,23 +151,18 @@ msgstr ""
"De nødvendige kildepakkene kan ligge på en PC-harddisk, en lokal stasjon, et "
"lokalt nettverk eller på Internett."
-#. type: Content of: <section><section><section><note><para>
-#: en/netInstall-intro.xml:40
-msgid "Installation via encrypted wifi or bluetooth is not supported."
-msgstr "Installasjon via kryptert wifi eller bluetooth støttes ikke."
-
#. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:46
+#: en/netInstall-intro.xml:42
msgid "Availability"
msgstr "Tilgjengelighet"
#. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:48
+#: en/netInstall-intro.xml:44
msgid "There a two versions of the NetInstall media:"
msgstr "Det er to versjoner av NettInstallasjons media:"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:52
+#: en/netInstall-intro.xml:48
msgid ""
"<emphasis role=\"bold\">netinstall.iso</emphasis> For those who prefer not "
"to use non-free software, this ISO contains only free software."
@@ -175,7 +172,7 @@ msgstr ""
"programvare."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:58
+#: en/netInstall-intro.xml:54
msgid ""
"<emphasis role=\"bold\">netinstall-nonfree.iso</emphasis> This ISO "
"additionally includes proprietary device drivers, which may be required for "
@@ -186,7 +183,7 @@ msgstr ""
"for nettverksenheten, diskkontrolleren etc."
#. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:64
+#: en/netInstall-intro.xml:60
msgid ""
"Both versions are available in the form of separate 32-bit and 64-bit ISO's. "
"See here: <link xlink:href=\"https://www.mageia.org/downloads/\">https://www."
@@ -197,12 +194,12 @@ msgstr ""
"\">https://www.mageia.org/downloads/</link>"
#. type: Content of: <section><section><section><title>
-#: en/netInstall-intro.xml:70
+#: en/netInstall-intro.xml:66
msgid "Preparation"
msgstr "Forberedelse"
#. type: Content of: <section><section><section><para>
-#: en/netInstall-intro.xml:72
+#: en/netInstall-intro.xml:68
msgid ""
"After downloading the image, burn it to a CD/DVD or, if you prefer to put it "
"on a USB stick, follow the instructions here: <link xlink:href=\"https://"
@@ -217,22 +214,25 @@ msgstr ""
"org/en/Installation_Media#Dump_Mageia_ISOs_on_an_USB_stick </link>."
#. type: Content of: <section><section><title>
-#: en/netInstall-intro.xml:79
+#: en/netInstall-intro.xml:75
msgid "Installation Stages"
msgstr "Installasjonstrinn"
#. type: Content of: <section><section><para>
-#: en/netInstall-intro.xml:81
+#: en/netInstall-intro.xml:77
msgid "The installation is carried out in two stages:"
msgstr "Installasjonen skjer i to trinn:"
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:85
+#: en/netInstall-intro.xml:81
+#, fuzzy
msgid ""
"<emphasis role=\"bold\">Stage 1</emphasis> This is the pre-Installation "
"stage. You will need to provide the method and details for accessing the "
"medium containing the files to be used for the installation. If the method "
-"involves a server, then the network connection will be activated."
+"involves a server, then the network connection will be activated. This "
+"network can be a WiFi connection with WEP or WPA2 encryption (though please "
+"be mindful of the Warning below regarding keyboard input)."
msgstr ""
"<emphasis role=\"bold\">Fase 1 </emphasis>Dette er pre-installasjonsfasen. "
"Du må angi metodene og detaljene for aksess til mediet som inneholder filene "
@@ -240,7 +240,7 @@ msgstr ""
"nettverksforbindelsen aktivert."
#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/netInstall-intro.xml:93
+#: en/netInstall-intro.xml:91
msgid ""
"<emphasis role=\"bold\">Stage 2</emphasis> This is the actual Installation "
"stage, which will automatically commence once a connection to the installer "
@@ -251,7 +251,7 @@ msgstr ""
"installasjonsfilene er opprettet."
#. type: Content of: <section><section><note><para>
-#: en/netInstall-intro.xml:100
+#: en/netInstall-intro.xml:98
msgid ""
"During Stage 1, nothing will be written to your Hard Disk, so it is safe to "
"quit at any point during Stage 1 if you wish. You can do so by pressing "
@@ -264,7 +264,7 @@ msgstr ""
"keycap><keycap>Del</keycap></keycombo>."
#. type: Content of: <section><section><tip><para>
-#: en/netInstall-intro.xml:112
+#: en/netInstall-intro.xml:110
msgid ""
"You can use <keycombo> <keycap>Alt</keycap> <keycap>F3</keycap> </keycombo> "
"to read the logs and <keycombo> <keycap>Alt</keycap> <keycap>F1</keycap> </"
@@ -275,14 +275,16 @@ msgstr ""
"keycap></keycombo>for å gå tilbake til installasjonsskjermbildet."
#. type: Content of: <section><section><warning><para>
-#: en/netInstall-intro.xml:124
+#: en/netInstall-intro.xml:122
+#, fuzzy
msgid ""
-"Unlike when installing from DVD or LiveCD, during the first part of the "
-"installation (<emphasis role=\"bold\">Stage 1</emphasis>), you will be asked "
-"to type things. During this stage, your keyboard will operate as per an "
-"<link xlink:href=\"https://en.wikipedia.org/wiki/"
-"Keyboard_layout#United_States\">American keyboard</link> layout. This can be "
-"very confusing when you need to type names and paths."
+"Unlike when installing from DVD or LiveCD, you will be asked to type things "
+"during the first part of a Network installation (<emphasis role=\"bold"
+"\">Stage 1</emphasis>). Throughout this stage, however, your keyboard will "
+"operate as per an <link xlink:href=\"https://en.wikipedia.org/wiki/"
+"Keyboard_layout#United_States\">American keyboard</link> layout. Please bear "
+"this in mind to avoid confusion when entering things like names and paths "
+"etc."
msgstr ""
"I motsetning til installasjon fra DVD eller Live CD vil du under første del "
"av installasjonen, (<emphasis role=\"bold\">Trinn 1</emphasis>) , bli spurt "
@@ -836,3 +838,6 @@ msgstr ""
"Ingen vil se alle installasjonsskjermbildene du ser i denne manualen. Hvilke "
"skjermbilder du kommer til å se er avhengig av din maskinvare og de valg du "
"gjør under installasjonen."
+
+#~ msgid "Installation via encrypted wifi or bluetooth is not supported."
+#~ msgstr "Installasjon via kryptert wifi eller bluetooth støttes ikke."