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, 18 insertions, 7 deletions

diff --git a/po/nn.po b/po/nn.po
index c8c7eda..9e6d080 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -8,6 +8,7 @@ msgstr ""
 "PO-Revision-Date: 2010-01-31 11:29+0100\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
+"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,8 +40,8 @@ msgid "Continue"
 msgstr "Hald fram"
 
 #. txt_linux
-msgid "Boot Mandriva Linux 2010 Spring"
-msgstr "Start Mandriva Linux 2010 – vårutgåve"
+msgid "Boot Mageia 1"
+msgstr ""
 
 #. txt_windows
 msgid "Boot Microsoft Windows"
@@ -55,9 +56,11 @@ msgstr "Maskinvareoppdaging"
 msgid "Linux with kernel %s"
 msgstr "Linux med kjernen %s"
 
+# dialog title for ftp installation
 #. txt_install
-msgid "Install Mandriva Linux 2010 Spring"
-msgstr "Installer Mandriva Linux 2010 – vårutgåve"
+#, fuzzy
+msgid "Install Mageia 1"
+msgstr "Kontroller installasjonsmedium"
 
 #. txt_manual_install
 msgid "Manual Installation"
@@ -72,7 +75,8 @@ msgid "Installation--Safe Settings"
 msgstr "Installering – trygge innstillingar"
 
 #. txt_safe_linux
-msgid "Boot Mandriva Linux 2010 Spring (safe mode)"
+#, fuzzy
+msgid "Boot Mageia 1 (safe mode)"
 msgstr "Start Mandriva Linux 2010 – vårutgåve (sikkermodus)"
 
 #. txt_boot_harddisk
@@ -500,9 +504,10 @@ msgstr ""
 "Set inn drivaroppdaterings-CD-en 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 "Set inn att CD-en for Mandriva Linux."
 
 #. bootloader entry to restore draksnapshot backups
@@ -510,6 +515,12 @@ msgstr "Set inn att CD-en for Mandriva Linux."
 msgid "Restore draksnapshot backup"
 msgstr "Gjenopprett reservekopi frå draksnapshot"
 
+#~ msgid "Boot Mandriva Linux 2010 Spring"
+#~ msgstr "Start Mandriva Linux 2010 – vårutgåve"
+
+#~ msgid "Install Mandriva Linux 2010 Spring"
+#~ msgstr "Installer Mandriva Linux 2010 – vårutgåve"
+
 #~ msgid "Linux--Safe Settings"
 #~ msgstr "Linux – trygt oppsett"