Update catalog

1 files changed, 88 insertions, 80 deletions

diff --git a/docs/docs/stable/installer/nb.po b/docs/docs/stable/installer/nb.po
index c9f42619..485e2804 100644
--- a/docs/docs/stable/installer/nb.po
+++ b/docs/docs/stable/installer/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2019-01-13 16:48+0200\n"
+"POT-Creation-Date: 2019-01-15 12:24+0200\n"
 "PO-Revision-Date: 2019-01-13 20:51+0000\n"
 "Last-Translator: Karl Morten Ramberg <karl.m.ramberg@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/MageiaLinux/mageia/"
@@ -283,7 +283,7 @@ msgstr ""
 "skiller på store og små bokstaver. </emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:88 en/setupBootloader.xml:87
+#: en/addUser.xml:88 en/setupBootloader.xml:124
 msgid "<emphasis role=\"bold\">Password</emphasis>"
 msgstr "<emphasis role=\"bold\">Passord</emphasis>"
 
@@ -4440,8 +4440,8 @@ msgstr ""
 "guimenuitem></menuchoice> for å konfigurere knappene som ikke virker på en "
 "mus med 6 eller flere knapper."
 
-#. type: Content of: <section><section><section><title>
-#: en/setupBootloaderAddEntry.xml:7 en/setupBootloader.xml:206
+#. type: Content of: <section><info><title>
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Legg til eller endre et oppstartsmenypunkt"
 
@@ -4466,22 +4466,22 @@ msgstr ""
 "efi_and_Mageia\"> https://wiki.mageia.org/en/Grub2-efi_and_Mageia </link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:10
+#: en/setupBootloader.xml:27
 msgid "Bootloader"
 msgstr "Oppstartslaster"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:31
 msgid "Grub2"
 msgstr "Grub2"
 
 #. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:34
 msgid "Grub2 on Legacy MBR/GPT systems"
 msgstr "Grub2 på eldre MBR/GPT systemer"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:17
+#: en/setupBootloader.xml:37
 msgid ""
 "GRUB2 (with or without graphical menu) will be used exclusively as the "
 "bootloader for a Legacy/MBR or Legacy/GPT system."
@@ -4490,7 +4490,7 @@ msgstr ""
 "oppstartslaster for et Legacy/MBR eller Legacy/GPT-system."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:21
+#: en/setupBootloader.xml:42
 msgid ""
 "By default, a new bootloader will be written into either the MBR (Master "
 "Boot Record) of your first hard drive or in the BIOS boot partition."
@@ -4499,17 +4499,17 @@ msgstr ""
 "Record) på den første harddisken eller i BIOS-oppstartspartisjonen."
 
 #. type: Content of: <section><section><itemizedlist><title>
-#: en/setupBootloader.xml:27
+#: en/setupBootloader.xml:49
 msgid "Grub2-efi on UEFI systems"
 msgstr "Grub2-efi på UEFI systemer"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:52
 msgid "GRUB2-efi will be used exclusively as the bootloader for a UEFI system."
 msgstr "GRUB2-efi vil bare bli brukt som oppstartslaster for et UEFI-system."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:33
+#: en/setupBootloader.xml:57
 msgid ""
 "By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI "
 "System Partition)."
@@ -4518,7 +4518,7 @@ msgstr ""
 "Partition)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:35
+#: en/setupBootloader.xml:60
 msgid ""
 "If there are already UEFI-based operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer will detect the existing ESP "
@@ -4534,17 +4534,17 @@ msgstr ""
 "operativsystemer du har."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:46
+#: en/setupBootloader.xml:72
 msgid "Bootloader Setup"
 msgstr "Oppsett av Oppstartslaster"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:76
 msgid "Bootloader main options"
 msgstr "Hovedvalg for oppstartslaster"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:51
+#: en/setupBootloader.xml:79
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4557,12 +4557,12 @@ msgstr ""
 "im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:62
+#: en/setupBootloader.xml:91
 msgid "<emphasis role=\"bold\">Bootloader to use</emphasis>"
 msgstr "<emphasis role=\"bold\">Velg Oppstarter</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:63
+#: en/setupBootloader.xml:93
 msgid ""
 "This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI "
 "systems will not see this option here."
@@ -4571,17 +4571,17 @@ msgstr ""
 "av UEFI-systemer vil ikke se dette alternativet."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:67
+#: en/setupBootloader.xml:98
 msgid "<emphasis role=\"bold\">Boot device</emphasis>"
 msgstr "<emphasis role=\"bold\">Oppstartsenhet</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:68
+#: en/setupBootloader.xml:100
 msgid "Don't change this unless you really know what you are doing"
 msgstr "Gjør ikke endringer i dette med mindre du virkelig vet hva du gjør"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:72
+#: en/setupBootloader.xml:105
 msgid ""
 "<emphasis role=\"bold\">Delay before booting the default image</emphasis>"
 msgstr ""
@@ -4589,7 +4589,7 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:74
+#: en/setupBootloader.xml:108
 msgid ""
 "This text box lets you set a delay, in seconds, before the default operating "
 "system is started up."
@@ -4598,12 +4598,12 @@ msgstr ""
 "operativsystemet er startet opp."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:78
+#: en/setupBootloader.xml:113
 msgid "<emphasis role=\"bold\">Security</emphasis>"
 msgstr "<emphasis role=\"bold\">Sikkerhet</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:115
 msgid ""
 "This allows you to set a password for the bootloader. This means a username "
 "and password will be required when booting in order to select a booting "
@@ -4617,17 +4617,17 @@ msgstr ""
 "literal>og passordet er det som er valgt her etter."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:88
+#: en/setupBootloader.xml:126
 msgid "Choose a password for the bootloader (optional)"
 msgstr "Velg et passord for oppstartslasteren (alternativt)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:130
 msgid "<emphasis role=\"bold\">Password (again)</emphasis>"
 msgstr "<emphasis role=\"bold\">Passord (igjen)</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:92
+#: en/setupBootloader.xml:132
 msgid ""
 "Retype the password and DrakX will check that it matches with the one set "
 "above"
@@ -4636,17 +4636,17 @@ msgstr ""
 "som er angitt ovenfor."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:96 en/setupBootloader.xml:154
+#: en/setupBootloader.xml:137 en/setupBootloader.xml:212
 msgid "<emphasis>Advanced</emphasis>"
 msgstr "<emphasis>Avansert</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:99
+#: en/setupBootloader.xml:141
 msgid "<emphasis>Enable ACPI</emphasis>"
 msgstr "<emphasis>Aktiver ACPI</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:143
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for power "
 "management. It can save energy by stopping unused devices. Deselecting it "
@@ -4662,12 +4662,12 @@ msgstr ""
 "tilfeldige omstart eller systemlåsing)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:108
+#: en/setupBootloader.xml:152
 msgid "<emphasis>Enable SMP</emphasis>"
 msgstr "<emphasis>Aktiver SMP</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:109
+#: en/setupBootloader.xml:154
 msgid ""
 "This option enables/disables symmetric multiprocessing for multi-core "
 "processors"
@@ -4676,12 +4676,12 @@ msgstr ""
 "fler-kjerne prosessorer."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:159
 msgid "<emphasis>Enable APIC</emphasis>"
 msgstr "<emphasis>Aktiver APIC</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:114
+#: en/setupBootloader.xml:161
 msgid ""
 "Enabling this gives the operating system access to the Advanced Programmable "
 "Interrupt Controller. APIC devices permit more complex priority models, and "
@@ -4693,12 +4693,12 @@ msgstr ""
 "administrasjon."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:168
 msgid "<emphasis>Enable Local APIC</emphasis>"
 msgstr "<emphasis>Aktiver Lokal APIC</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:170
 msgid ""
 "Here you can set Local APIC, which manages all external interrupts for a "
 "specific processor in an SMP system"
@@ -4707,12 +4707,12 @@ msgstr ""
 "bestemt prosessor i et SMP-system."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:127
+#: en/setupBootloader.xml:177
 msgid "Bootloader Configuration"
 msgstr "Oppsett av oppstartslaster"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:180
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4725,36 +4725,38 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:139
+#: en/setupBootloader.xml:191
 msgid "<emphasis role=\"bold\">Default</emphasis>"
 msgstr "<emphasis role=\"bold\">Standard</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:140
-msgid "The operating system to started up by default"
+#: en/setupBootloader.xml:193
+#, fuzzy
+msgid "The operating system to be started up by default."
 msgstr " Operativsystemet startes opp som standard"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:143
+#: en/setupBootloader.xml:197
 msgid "<emphasis role=\"bold\">Append</emphasis>"
 msgstr "<emphasis role=\"bold\">Legg til</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:144
+#: 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"
+"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."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:148
+#: en/setupBootloader.xml:204
 msgid "<emphasis role=\"bold\">Probe foreign OS</emphasis>"
 msgstr "<emphasis role=\"bold\">Sjekk for fremmed OS</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:206
 msgid ""
 "If you already have other operating systems installed, Mageia attempts to "
 "add them to your new Mageia boot menu. If you don't want this behaviour, "
@@ -4765,7 +4767,7 @@ msgstr ""
 "du markeringen for Test for Fremmed OS"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:215
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader4.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4778,12 +4780,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:166
+#: en/setupBootloader.xml:226
 msgid "<emphasis>Video mode</emphasis>"
 msgstr "<emphasis>Video modus</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:167
+#: en/setupBootloader.xml:228
 msgid ""
 "This sets the screen size and colour depth to be used by the boot menu. If "
 "you click the down-triangle you will be offered other size and colour depth "
@@ -4794,12 +4796,12 @@ msgstr ""
 "fargedybdealternativer."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:172
+#: en/setupBootloader.xml:234
 msgid "<emphasis>Do not touch ESP or MBR</emphasis>"
 msgstr "<emphasis>Ikke rør ESP eller MBR</emphasis>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:173
+#: en/setupBootloader.xml:236
 msgid ""
 "Select this option if you don't want a bootable Mageia, but would rather "
 "chain-load it from another OS. You will get a warning that the bootloader is "
@@ -4812,26 +4814,27 @@ msgstr ""
 "på at du forstår implikasjonene, og ønsker å fortsette."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:181
+#: en/setupBootloader.xml:245
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-setupBootloader5.png"
 "\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\" align=\"center"
-"\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:188
+#: en/setupBootloader.xml:253
 msgid "Other Options"
 msgstr "Andre valg"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:190
+#: en/setupBootloader.xml:256
 msgid "Using an existing bootloader"
 msgstr "Bruker en eksisterende oppstartslaster"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:191
+#: en/setupBootloader.xml:258
 msgid ""
 "The exact procedure for adding Mageia to an existing bootloader is beyond "
 "the scope of this documentation. However in most cases it will involve "
@@ -4846,12 +4849,12 @@ msgstr ""
 "automatisk. Se dokumentasjonen for det aktuelle operativsystemet."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:199
+#: en/setupBootloader.xml:267
 msgid "Installing Without a Bootloader"
 msgstr "Innstaller uten en oppstartslaster"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:200
+#: en/setupBootloader.xml:269
 msgid ""
 "While you can opt to install Mageia without a bootloader (see section 2.1 "
 "Advanced), this is not recommended unless you absolutely know what you are "
@@ -4862,26 +4865,6 @@ msgstr ""
 "Avansert), anbefales dette ikke med mindre du absolutt vet hva du gjør, som "
 "uten noen form for oppstartslader, kan operativsystemet ikke starte."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:207
-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)."
-
-#. type: Content of: <section><section><section><note><para>
-#: en/setupBootloader.xml:212
-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>"
-
 #. type: Content of: <section><info><title>
 #: en/setupSCSI.xml:10
 msgid "Setup SCSI"
@@ -5284,3 +5267,28 @@ 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>"