From b468ed93931c779d85ffec3393385ead397a0df1 Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Sun, 6 Dec 2020 16:50:18 +0200
Subject: Update Norwegian Bokmal translation

---
 docs/docs/stable/installer/nb.po                 | 16 +-----
 docs/docs/stable/installer/nb/DrakLive-cover.xml | 51 ++---------------
 docs/docs/stable/installer/nb/DrakLive.xml       |  6 +-
 docs/docs/stable/installer/nb/DrakX-cover.xml    | 73 ++----------------------
 4 files changed, 18 insertions(+), 128 deletions(-)

diff --git a/docs/docs/stable/installer/nb.po b/docs/docs/stable/installer/nb.po
index 59347ad3..a813bc1f 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: 2020-12-06 11:03+0200\n"
-"PO-Revision-Date: 2020-09-06 21:22+0000\n"
+"PO-Revision-Date: 2020-12-06 12:25+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"
@@ -1850,13 +1850,12 @@ msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 #. type: Content of: <book><info><revhistory><revision><date>
 #: en/DrakLive-cover.xml:11 en/DrakX-cover.xml:9
 msgid "05 December 2020"
-msgstr ""
+msgstr "05 Desember 2020"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
 #: en/DrakLive-cover.xml:12 en/DrakX-cover.xml:10
-#, fuzzy
 msgid "Mageia 8"
-msgstr "Mageia 5"
+msgstr "Mageia 8"
 
 #. type: Content of: <book><info><cover><para>
 #: en/DrakLive-cover.xml:16 en/DrakX-cover.xml:14
@@ -5467,12 +5466,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 "March 2016"
-#~ msgstr "Mars 2016"
-
-#~ msgid "February 2014"
-#~ msgstr "Februar 2014"
-
-#~ msgid "Mageia 4"
-#~ msgstr "Mageia 4"
diff --git a/docs/docs/stable/installer/nb/DrakLive-cover.xml b/docs/docs/stable/installer/nb/DrakLive-cover.xml
index f89055f8..e065a0e7 100644
--- a/docs/docs/stable/installer/nb/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/nb/DrakLive-cover.xml
@@ -1,80 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<book version="5.0" xml:lang="nb" xml:id="DrakLive-installer"
-      xmlns="http://docbook.org/ns/docbook"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xmlns:ns6="http://www.w3.org/1999/xlink"
-      xmlns:ns5="http://www.w3.org/1998/Math/MathML"
-      xmlns:ns4="http://www.w3.org/1999/xhtml"
-      xmlns:ns3="http://www.w3.org/2000/svg"
-      xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><book xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="DrakLive-installer" version="5.0" xml:lang="nb">
   
-
   
-
   <info>
     <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
 <!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
 <title>Installerer fra LIVE medium</title>
-
     <publisher> <publishername>Mageia.org</publishername> </publisher>
-
     <revhistory>
       <revision>
-        <date>Mars 2016</date>
-
-        <revremark>Mageia 5</revremark>
+        <date>05 Desember 2020</date>
+        <revremark>Mageia 8</revremark>
       </revision>
     </revhistory>
-
     <cover>
       <para role="tagline">Mageias Offisielle dokumentasjon</para>
-
       <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>.</para>
-
       <para>Denne manualen ble produsert med hjelp av <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> utviklet av <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
-
       <para>Den ble skrevet av frivllige på deres fritid. Vennligst kontakt <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
 Team</link>, hvis du vil hjelpe til med å forbedre denne manualen.</para>
     </cover>
   </info>
-
   <article>
     <title>Installerer fra LIVE medium</title>
-
-    <para><note>
-        <para>Ingen vil se alle installasjonsskjermbildene du ser i denne manualen. Hvilke
+    <para><note><para>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.</para>
-      </note></para>
-
+gjør under installasjonen.</para></note></para>
     <xi:include href="SelectAndUseISOs2.xml"/>
-
     <xi:include href="bootLive.xml"/>
-
     <xi:include href="selectLanguage.xml"/>
-
     <xi:include href="acceptLicense.xml"/>
-
     <xi:include href="configureTimezoneUTC.xml"/>
-
     <xi:include href="bestTime.xml"/>
-
     <xi:include href="selectKeyboardLive.xml"/>
-
     <xi:include href="testing.xml"/>
-
     <xi:include href="diskPartitioning.xml"/>
-
     
-
     <!-- <xi:include href="doPartitionDisks.xml"/>
 
 
@@ -86,19 +53,13 @@ gjør under installasjonen.</para>
 
     <xi:include href="formatPartitions.xml"/> -->
 <xi:include href="unused.xml"/>
-
     <xi:include href="setupBootloader.xml"/>
-
     
-
     <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
 <xi:include href="reboot.xml"/>
-
     <xi:include href="addUser.xml"/>
-
     <xi:include href="login.xml"/>
-
     <xi:include href="uninstall-Mageia.xml"/>
   </article>
-</book>
+</book>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/nb/DrakLive.xml b/docs/docs/stable/installer/nb/DrakLive.xml
index bee5de0c..a6ca6252 100644
--- a/docs/docs/stable/installer/nb/DrakLive.xml
+++ b/docs/docs/stable/installer/nb/DrakLive.xml
@@ -70,10 +70,10 @@ hvis du vil bidra til å forbedre denne håndboken.</para>
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/> -->
+<xi:include href="unused.xml"/>
 
-  <xi:include href="unused.xml"/> -->
-<xi:include href="setupBootloader.xml"/>
+  <xi:include href="setupBootloader.xml"/>
 
   
 
diff --git a/docs/docs/stable/installer/nb/DrakX-cover.xml b/docs/docs/stable/installer/nb/DrakX-cover.xml
index a65e7bf4..6ea23cb5 100644
--- a/docs/docs/stable/installer/nb/DrakX-cover.xml
+++ b/docs/docs/stable/installer/nb/DrakX-cover.xml
@@ -1,61 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Converted by db4-upgrade version 1.0 -->
-<book version="5.0" xml:lang="nb" xml:id="Quick-Startup"
-      xmlns="http://docbook.org/ns/docbook"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xmlns:ns62="http://docbook.org/ns/transclusion"
-      xmlns:ns6="http://www.w3.org/1999/xlink"
-      xmlns:ns5="http://www.w3.org/1998/Math/MathML"
-      xmlns:ns4="http://www.w3.org/1999/xhtml"
-      xmlns:ns3="http://www.w3.org/2000/svg"
-      xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><book xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns62="http://docbook.org/ns/transclusion" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:lang="nb" xml:id="Quick-Startup">
   <info>
     <title>Installasjon med DrakX</title>
-
     <publisher> <publishername>Mageia.org</publishername> </publisher>
-
     <revhistory>
       <revision>
-        <date>Februar 2014</date>
-
-        <revremark>Mageia 4</revremark>
+        <date>05 Desember 2020</date>
+        <revremark>Mageia 8</revremark>
       </revision>
     </revhistory>
-
     <cover>
       <para role="tagline">Mageias Offisielle dokumentasjon</para>
-
       <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>.</para>
-
       <para>Denne manualen ble produsert med hjelp av <link
 ns6:href="http://www.calenco.com">Calenco CMS</link> utviklet av <link
 ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
-
       <para>Den ble skrevet av frivllige på deres fritid. Vennligst kontakt <link
 ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
 Team</link>, hvis du vil hjelpe til med å forbedre denne manualen.</para>
     </cover>
   </info>
-
   <article>
     
-
     
-
     
-
     
-
     
-
     
-
     <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
 <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
@@ -63,37 +37,22 @@ Team</link>, hvis du vil hjelpe til med å forbedre denne manualen.</para>
 <!--2013-12-08 add soundConfig.xml -->
 <!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
 <title>Installasjon med DrakX</title>
-
-    <para><note>
-        <para>Ingen vil se alle installasjonsskjermbildene du ser i denne manualen. Hvilke
+    <para><note><para>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.</para>
-      </note></para>
-
+gjør under installasjonen.</para></note></para>
     
-
     <!-- <xi:include href="drakx-intro.xml"/>
  -->
 <xi:include href="SelectAndUseISOs2.xml"/>
-
     <xi:include href="installer.xml"/>
-
     <xi:include href="selectLanguage.xml"/>
-
     <xi:include href="acceptLicense.xml"/>
-
     <xi:include href="setupSCSI.xml"/>
-
     <xi:include href="selectInstallClass.xml"/>
-
     <xi:include href="selectKeyboard.xml"/>
-
     
-
     
-
     
-
     <!-- <xi:include href="resizeFATChoose.xml"/>
  -->
 <!-- <xi:include href="doPartitionDisks.xml"/>
@@ -121,19 +80,13 @@ gjør under installasjonen.</para>
 
   <xi:include href="choosePackagesTree.xml"/> -->
 <xi:include href="diskPartitioning.xml"/>
-
     <xi:include href="software.xml"/>
-
     
-
     <!-- <xi:include href="setRootPassword.xml">
 </xi:include> -->
 <xi:include href="addUser.xml"/>
-
     <xi:include href="graphicalConfiguration.xml"/>
-
     
-
     <!-- <xi:include href="configureX_card_list.xml"/>
 
 
@@ -141,11 +94,8 @@ gjør under installasjonen.</para>
 
   <xi:include href="configureX_monitor.xml"/> -->
 <xi:include href="setupBootloader.xml"/>
-
     
-
     
-
     <!-- <xi:include href="setupBootloaderAddEntry.xml"/>
  -->
 <!-- <xi:include href="setupYabootGeneral.xml">
@@ -155,33 +105,22 @@ gjør under installasjonen.</para>
   
   <xi:include href="summary.xml"></xi:include> -->
 <xi:include href="misc-params.xml"/>
-
     <xi:include href="locale.xml"/>
-
     
-
     <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
 
   <xi:include href="selectCountry.xml"/> -->
 <xi:include href="configureServices.xml"/>
-
     <xi:include href="selectMouse.xml"/>
-
     <xi:include href="soundConfig.xml"/>
-
     <xi:include href="securityLevel.xml"/>
-
     <xi:include href="firewall.xml"/>
-
     
-
     <!-- <xi:include href="configureNetwork.xml">
 </xi:include> -->
 <xi:include href="installUpdates.xml"/>
-
     <xi:include href="exitInstall.xml"/>
-
     <xi:include href="uninstall-Mageia.xml"/>
   </article>
-</book>
+</book>
\ No newline at end of file
-- 
cgit v1.2.1