Merge branch 'master' of git://git.mageia.org/software/drakx

1 files changed, 44 insertions, 47 deletions

diff --git a/perl-install/share/po/nn.po b/perl-install/share/po/nn.po
index 586d94f36..20bcd2eba 100644
--- a/perl-install/share/po/nn.po
+++ b/perl-install/share/po/nn.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libDrakX\n"
-"POT-Creation-Date: 2013-09-30 21:17+0200\n"
+"POT-Creation-Date: 2013-11-30 19:21+0100\n"
 "PO-Revision-Date: 2010-06-07 22:03+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -203,11 +203,6 @@ msgstr "Du kan ikkje bruka eit passord som inneheld «%s»."
 msgid "Password (again)"
 msgstr "Passord (på nytt)"
 
-#: any.pm:449
-#, c-format
-msgid "Clean /tmp at each boot"
-msgstr "Tøm «/tmp» ved kvar oppstart"
-
 #: any.pm:459
 #, c-format
 msgid "Init Message"
@@ -3173,7 +3168,17 @@ msgstr "Prosessornummer "
 msgid "Please Wait... Applying the configuration"
 msgstr "Vent litt … Gjer klar oppsett"
 
-#: harddrake/sound.pm:331
+#: harddrake/sound.pm:133
+#, c-format
+msgid "No known driver"
+msgstr "Ingen kjend drivar"
+
+#: harddrake/sound.pm:134
+#, c-format
+msgid "There's no known driver for your sound card (%s)"
+msgstr "Det finst ingen kjend drivar for lydkortet ditt («%s»)"
+
+#: harddrake/sound.pm:166
 #, c-format
 msgid "Enable PulseAudio"
 msgstr "Bruk PulseAudio"
@@ -3271,45 +3276,7 @@ msgstr ""
 msgid "Driver:"
 msgstr "Drivar:"
 
-#: harddrake/sound.pm:399
-#, c-format
-msgid ""
-"The old \"%s\" driver is blacklisted.\n"
-"\n"
-"It has been reported to oops the kernel on unloading.\n"
-"\n"
-"The new \"%s\" driver will only be used on next bootstrap."
-msgstr ""
-"Den gamle «%s»-drivaren er svartelista, då han visstnok kan «oopsa» kjernen "
-"ved utlasting.\n"
-"\n"
-"Den nye «%s»-drivaren vert berre brukt ved neste oppstart."
-
-#: harddrake/sound.pm:407
-#, c-format
-msgid "No open source driver"
-msgstr "Ingen open kjeldekode-drivar"
-
-#: harddrake/sound.pm:408
-#, c-format
-msgid ""
-"There's no free driver for your sound card (%s), but there's a proprietary "
-"driver at \"%s\"."
-msgstr ""
-"Det finst ingen fri drivar for lydkortet ditt («%s»), men det finst ein "
-"godseigd drivar på «%s»."
-
-#: harddrake/sound.pm:411
-#, c-format
-msgid "No known driver"
-msgstr "Ingen kjend drivar"
-
-#: harddrake/sound.pm:412
-#, c-format
-msgid "There's no known driver for your sound card (%s)"
-msgstr "Det finst ingen kjend drivar for lydkortet ditt («%s»)"
-
-#: harddrake/sound.pm:427
+#: harddrake/sound.pm:243
 #, c-format
 msgid "Sound troubleshooting"
 msgstr "Feilsøking av lyd"
@@ -6153,11 +6120,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack"
 msgstr "Avahi er ei Zeroconf-teneste med ein mDNS-stakk"
 
 #: services.pm:26
+#, fuzzy, c-format
+msgid "An NTP client/server"
+msgstr "NTP-tenar"
+
+#: services.pm:27
 #, c-format
 msgid "Set CPU frequency settings"
 msgstr "Vel prosessorfrekvensar"
 
-#: services.pm:27
+#: services.pm:28
 #, c-format
 msgid ""
 "cron is a standard UNIX program that runs user-specified programs\n"
@@ -7052,6 +7024,31 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Feil ved installering."
 
+#~ msgid "Clean /tmp at each boot"
+#~ msgstr "Tøm «/tmp» ved kvar oppstart"
+
+#~ msgid ""
+#~ "The old \"%s\" driver is blacklisted.\n"
+#~ "\n"
+#~ "It has been reported to oops the kernel on unloading.\n"
+#~ "\n"
+#~ "The new \"%s\" driver will only be used on next bootstrap."
+#~ msgstr ""
+#~ "Den gamle «%s»-drivaren er svartelista, då han visstnok kan «oopsa» "
+#~ "kjernen ved utlasting.\n"
+#~ "\n"
+#~ "Den nye «%s»-drivaren vert berre brukt ved neste oppstart."
+
+#~ msgid "No open source driver"
+#~ msgstr "Ingen open kjeldekode-drivar"
+
+#~ msgid ""
+#~ "There's no free driver for your sound card (%s), but there's a "
+#~ "proprietary driver at \"%s\"."
+#~ msgstr ""
+#~ "Det finst ingen fri drivar for lydkortet ditt («%s»), men det finst ein "
+#~ "godseigd drivar på «%s»."
+
 #~ msgid "command %s missing"
 #~ msgstr "Kommandoen %s manglar"