aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/docs/stable/installer/nb.po40
-rw-r--r--docs/docs/stable/installer/nb/setupBootloader.xml6
2 files changed, 9 insertions, 37 deletions
diff --git a/docs/docs/stable/installer/nb.po b/docs/docs/stable/installer/nb.po
index 485e2804..08b00cff 100644
--- a/docs/docs/stable/installer/nb.po
+++ b/docs/docs/stable/installer/nb.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: Mageia\n"
"Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
"POT-Creation-Date: 2019-01-15 12:24+0200\n"
-"PO-Revision-Date: 2019-01-13 20:51+0000\n"
+"PO-Revision-Date: 2019-01-15 12:56+0000\n"
"Last-Translator: Karl Morten Ramberg <karl.m.ramberg@gmail.com>\n"
"Language-Team: Norwegian Bokmål (http://www.transifex.com/MageiaLinux/mageia/"
"language/nb/)\n"
@@ -4731,9 +4731,8 @@ msgstr "<emphasis role=\"bold\">Standard</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
#: en/setupBootloader.xml:193
-#, fuzzy
msgid "The operating system to be started up by default."
-msgstr " Operativsystemet startes opp som standard"
+msgstr " Operativsystemet som startes opp som standard"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
#: en/setupBootloader.xml:197
@@ -4742,13 +4741,12 @@ msgstr "<emphasis role=\"bold\">Legg til</emphasis>"
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
#: en/setupBootloader.xml:199
-#, fuzzy
msgid ""
"This option lets you pass information to the kernel or tell the kernel to "
"give you more information as it boots."
msgstr ""
-"Dette alternativet lar deg sende kjernedataene eller fortelle kjernen for å "
-"gi deg mer informasjon når den starter opp."
+"Dette alternativet lar deg sende informasjon eller fortelle kjernen til å gi "
+"deg mer informasjon når den starter opp."
#. type: Content of: <section><section><section><itemizedlist><listitem><para>
#: en/setupBootloader.xml:204
@@ -4815,13 +4813,12 @@ msgstr ""
#. type: Content of: <section><section><section><mediaobject>
#: en/setupBootloader.xml:245
-#, fuzzy
msgid ""
"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
"\"/> </imageobject>"
msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
+"\"/> </imageobject>"
#. type: Content of: <section><section><title>
#: en/setupBootloader.xml:253
@@ -5267,28 +5264,3 @@ msgid ""
msgstr ""
"Neste steg er kopiering av filene til disken. Dette tar noen minutter. Til "
"slutt får du en tom skjerm for en stund, noe som er normalt."
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
-#~ "\"center\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align="
-#~ "\"center\"/> </imageobject>"
-
-#~ msgid ""
-#~ "To do this you need to manually edit <filename>/boot/grub2/custom.cfg</"
-#~ "filename> or use the software <application>grub-customizer</application> "
-#~ "tool instead (available in the Mageia repositories)."
-#~ msgstr ""
-#~ "For å gjøre dette må du manuelt redigere <filename>/boot/grub2/custom."
-#~ "cfg</filename> eller bruke verktøyet <application> grub-customizer </"
-#~ "application> i stedet (tilgjengelig i Mageia-repositoriene)."
-
-#~ msgid ""
-#~ "For more information, see: <link ns4:href=\"https://wiki.mageia.org/en/"
-#~ "Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-#~ "link>"
-#~ msgstr ""
-#~ "For mer informasjon, see: <link ns4:href=\"https://wiki.mageia.org/en/"
-#~ "Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-#~ "link>"
diff --git a/docs/docs/stable/installer/nb/setupBootloader.xml b/docs/docs/stable/installer/nb/setupBootloader.xml
index 9e499b44..7682c1ac 100644
--- a/docs/docs/stable/installer/nb/setupBootloader.xml
+++ b/docs/docs/stable/installer/nb/setupBootloader.xml
@@ -184,14 +184,14 @@ fileref="live-setupBootloader3.png"/> </imageobject></mediaobject>
<listitem>
<para><emphasis role="bold">Standard</emphasis></para>
- <para>The operating system to be started up by default.</para>
+ <para> Operativsystemet som startes opp som standard</para>
</listitem>
<listitem>
<para><emphasis role="bold">Legg til</emphasis></para>
- <para>This option lets you pass information to the kernel or tell the kernel to
-give you more information as it boots.</para>
+ <para>Dette alternativet lar deg sende informasjon eller fortelle kjernen til å gi
+deg mer informasjon når den starter opp.</para>
</listitem>
<listitem>