sync with code

1 files changed, 67 insertions, 85 deletions

diff --git a/perl-install/install/share/po/nn.po b/perl-install/install/share/po/nn.po
index db2e1aff1..758cf9801 100644
--- a/perl-install/install/share/po/nn.po
+++ b/perl-install/install/share/po/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-02 16:49+0200\n"
+"POT-Creation-Date: 2008-09-11 18:46+0200\n"
 "PO-Revision-Date: 2008-08-22 18:10+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -17,6 +17,31 @@ msgstr ""
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
+#: ../../advertising/IM_flash.pl:1
+#, c-format
+msgid "Your desktop on a USB key"
+msgstr "Skrivebordet på ein minnepinne"
+
+#: ../../advertising/IM_free09.pl:1
+#, c-format
+msgid "The 100%% open source Mandriva Linux distribution"
+msgstr "Mandriva Linux-distribusjonen med 100 %% open kjeldekode"
+
+#: ../../advertising/IM_one09.pl:1
+#, c-format
+msgid "Explore Linux easily with Mandriva One"
+msgstr "Utforsk Linux med Mandriva One"
+
+#: ../../advertising/IM_pwp09.pl:1
+#, c-format
+msgid "A full Mandriva Linux desktop, with support"
+msgstr "Eit fullt Mandriva Linux-skrivebord – med brukarstøtte"
+
+#: ../../advertising/IM_range09.pl:1
+#, c-format
+msgid "Mandriva: distributions for everybody's needs"
+msgstr "Mandriva: Distribusjonar for alle behov"
+
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -951,17 +976,17 @@ msgstr "Kopier CD-ane"
 msgid "An error occurred"
 msgstr "Det oppstod ein feil"
 
-#: steps_interactive.pm:98
-#, c-format
-msgid "Here is the full list of available keyboards"
-msgstr "Her er heile lista over tastaturoppsett"
-
 #: steps_interactive.pm:102
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr "Vel tastaturoppsett"
 
-#: steps_interactive.pm:135
+#: steps_interactive.pm:105
+#, c-format
+msgid "Here is the full list of available keyboards"
+msgstr "Her er heile lista over tastaturoppsett"
+
+#: steps_interactive.pm:136
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installer/oppgrader"
@@ -978,22 +1003,12 @@ msgid ""
 "Install"
 msgstr "Installer"
 
-#: steps_interactive.pm:140
+#: steps_interactive.pm:144
 #, c-format
 msgid "Upgrade %s"
 msgstr "Oppgrader «%s»"
 
-#: steps_interactive.pm:144
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Oppgradering frå 32 bits til 64 bits er ikkje støtta"
-
-#: steps_interactive.pm:148
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Oppgradering frå 64 bits til 32 bits er ikkje støtta"
-
-#: steps_interactive.pm:167
+#: steps_interactive.pm:162
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Krypteringsnøkkel for «%s»"
@@ -1247,17 +1262,7 @@ msgstr ""
 "\n"
 "Ønskjer du å installera oppdateringane?"
 
-#: steps_interactive.pm:768
-#, c-format
-msgid "Contacting the mirror to get the list of available packages..."
-msgstr "Kontaktar spegel for oversikt over pakkar …"
-
-#: steps_interactive.pm:774
-#, c-format
-msgid "Unable to contact mirror %s"
-msgstr "Klarte ikkje kontakta spegelen «%s»"
-
-#: steps_interactive.pm:879
+#: steps_interactive.pm:849
 #, c-format
 msgid "%s on %s"
 msgstr "%s på %s"
@@ -1396,41 +1401,6 @@ msgstr "Gratulerer"
 msgid "Reboot"
 msgstr "Start på nytt"
 
-#: steps_interactive.pm:1151 steps_interactive.pm:1152
-#, c-format
-msgid "Generate auto install floppy"
-msgstr "Lag diskett for automatisk installasjon"
-
-#: steps_interactive.pm:1153
-#, c-format
-msgid ""
-"The auto install can be fully automated if wanted,\n"
-"in that case it will take over the hard drive!!\n"
-"(this is meant for installing on another box).\n"
-"\n"
-"You may prefer to replay the installation.\n"
-msgstr ""
-"Du kan heilautomatisera autoinstalleringa om du ønskjer. Denne vil då "
-"overskriva heile harddisken. (Dette er meint for installering på ei anna "
-"maskin.)\n"
-"\n"
-"Du kan òg velja å køyra gjennom installasjonen på nytt.\n"
-
-#: steps_interactive.pm:1158
-#, c-format
-msgid "Replay"
-msgstr "Spel av"
-
-#: steps_interactive.pm:1158
-#, c-format
-msgid "Automated"
-msgstr "Automatisert"
-
-#: steps_interactive.pm:1161
-#, c-format
-msgid "Save packages selection"
-msgstr "Lagra pakkeval"
-
 #. -PO: please keep the following messages very short: they must fit in the left list of the installer!!!
 #: steps_list.pm:16
 #, c-format
@@ -1570,30 +1540,42 @@ msgid ""
 "Exit"
 msgstr "Avslutt"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Skrivebordet på ein minnepinne"
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "Oppgradering frå 32 bits til 64 bits er ikkje støtta"
 
-#: ../../advertising/IM_free08S.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "Mandriva Linux-distribusjonen med 100 %% open kjeldekode"
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "Oppgradering frå 64 bits til 32 bits er ikkje støtta"
 
-#: ../../advertising/IM_one08S.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Utforsk Linux med Mandriva One"
+#~ msgid "Contacting the mirror to get the list of available packages..."
+#~ msgstr "Kontaktar spegel for oversikt over pakkar …"
 
-#: ../../advertising/IM_pwp08S.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Eit fullt Mandriva Linux-skrivebord – med brukarstøtte"
+#~ msgid "Unable to contact mirror %s"
+#~ msgstr "Klarte ikkje kontakta spegelen «%s»"
 
-#: ../../advertising/IM_range08S.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: Distribusjonar for alle behov"
+#~ msgid "Generate auto install floppy"
+#~ msgstr "Lag diskett for automatisk installasjon"
+
+#~ msgid ""
+#~ "The auto install can be fully automated if wanted,\n"
+#~ "in that case it will take over the hard drive!!\n"
+#~ "(this is meant for installing on another box).\n"
+#~ "\n"
+#~ "You may prefer to replay the installation.\n"
+#~ msgstr ""
+#~ "Du kan heilautomatisera autoinstalleringa om du ønskjer. Denne vil då "
+#~ "overskriva heile harddisken. (Dette er meint for installering på ei anna "
+#~ "maskin.)\n"
+#~ "\n"
+#~ "Du kan òg velja å køyra gjennom installasjonen på nytt.\n"
+
+#~ msgid "Replay"
+#~ msgstr "Spel av"
+
+#~ msgid "Automated"
+#~ msgstr "Automatisert"
+
+#~ msgid "Save packages selection"
+#~ msgstr "Lagra pakkeval"
 
 #~ msgid "Do you want to use aboot?"
 #~ msgstr "Vil du bruka aboot?"