Synthesized commit during git-svn import combining previous Mandriva history with Mageia.

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r456 | dmorgan | 2011-02-07 08:15:44 +0000 (Mon, 07 Feb 2011) | 1 line

Import cleaned mageia-gfxboot-theme
------------------------------------------------------------------------
r457 | dmorgan | 2011-02-07 08:31:20 +0000 (Mon, 07 Feb 2011) | 1 line

Fix tree
------------------------------------------------------------------------

1 files changed, 22 insertions, 11 deletions

diff --git a/po/nb.po b/po/nb.po
index 4ce519e..ec5c88e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -14,6 +14,7 @@ msgstr ""
 "PO-Revision-Date: 2009-12-01 22:39+0100\n"
 "Last-Translator: Olav Dahlum <odahlum@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <cooker-i18n@mandrivalinux.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -41,8 +42,8 @@ msgid "Continue"
 msgstr "Fortsett"
 
 #. txt_linux
-msgid "Boot Mandriva Linux 2010 Spring"
-msgstr "Start Mandriva Linux 2010 Spring"
+msgid "Boot Mageia 1"
+msgstr ""
 
 #. txt_windows
 msgid "Boot Microsoft Windows"
@@ -58,8 +59,9 @@ msgid "Linux with kernel %s"
 msgstr "Linux med kjerne %s"
 
 #. txt_install
-msgid "Install Mandriva Linux 2010 Spring"
-msgstr "Installer Mandriva Linux 2010 Spring"
+#, fuzzy
+msgid "Install Mageia 1"
+msgstr "Kontroller installasjonsmedier"
 
 #. txt_manual_install
 msgid "Manual Installation"
@@ -74,7 +76,8 @@ msgid "Installation--Safe Settings"
 msgstr "Installering – trygge innstillinger"
 
 #. txt_safe_linux
-msgid "Boot Mandriva Linux 2010 Spring (safe mode)"
+#, fuzzy
+msgid "Boot Mageia 1 (safe mode)"
 msgstr "Start Mandriva Linux 2010 Spring (sikkermodus)"
 
 #. txt_boot_harddisk
@@ -449,10 +452,11 @@ msgstr "Feil arkitektur"
 
 #. warning when running a 64bit CD on a 32bit machine
 #. txt_64bit_popup
-msgid "This is a 32-bit computer. You cannot use or install 64-bit software on it."
+msgid ""
+"This is a 32-bit computer. You cannot use or install 64-bit software on it."
 msgstr ""
-"Dette er en 32-bits datamaskin. Du kan ikke installere eller bruke 64-bits programvare på "
-"den."
+"Dette er en 32-bits datamaskin. Du kan ikke installere eller bruke 64-bits "
+"programvare på den."
 
 #. title of warning box when running a 32bit CD on a 64bit machine
 #. txt_warning
@@ -462,7 +466,8 @@ msgstr "Advarsel"
 #. warning when running a 32bit CD on a 64bit machine
 #. txt_32bit_popup
 msgid "You are about to install 32-bit software on a 64-bit computer."
-msgstr "Du er i ferd med å installere 32-bits programvare på en 64-bits datamaskin."
+msgstr ""
+"Du er i ferd med å installere 32-bits programvare på en 64-bits datamaskin."
 
 #. insert CDROM with drivers
 #. txt_insert_driver_cd
@@ -474,9 +479,10 @@ msgstr ""
 "Sett inn CD-ROM med driveroppdatering for\n"
 "\"%s\"."
 
-#. insert Mandriva CD back
+#. insert Mageia CD back
 #. txt_insert_mdv_cd
-msgid "Put the Mandriva Linux CD-ROM back into the drive."
+#, fuzzy
+msgid "Put the Mageia CD-ROM back into the drive."
 msgstr "Sett inn igjen CD-en for Mandriva Linux."
 
 #. bootloader entry to restore draksnapshot backups
@@ -484,3 +490,8 @@ msgstr "Sett inn igjen CD-en for Mandriva Linux."
 msgid "Restore draksnapshot backup"
 msgstr "Gjenopprett reservekopi fra draksnapshot"
 
+#~ msgid "Boot Mandriva Linux 2010 Spring"
+#~ msgstr "Start Mandriva Linux 2010 Spring"
+
+#~ msgid "Install Mandriva Linux 2010 Spring"
+#~ msgstr "Installer Mandriva Linux 2010 Spring"