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

1 files changed, 45 insertions, 48 deletions

diff --git a/perl-install/share/po/is.po b/perl-install/share/po/is.po
index 4dfcdd989..62b803264 100644
--- a/perl-install/share/po/is.po
+++ b/perl-install/share/po/is.po
@@ -11,7 +11,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: 2009-03-27 10:46+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -211,11 +211,6 @@ msgstr "Þú getur ekki notað lykilorð með %s"
 msgid "Password (again)"
 msgstr "Lykilorð (aftur)"
 
-#: any.pm:449
-#, c-format
-msgid "Clean /tmp at each boot"
-msgstr "Hreinsa /tmp við hverja ræsingu"
-
 #: any.pm:459
 #, c-format
 msgid "Init Message"
@@ -3188,7 +3183,17 @@ msgstr "örgjörvi # "
 msgid "Please Wait... Applying the configuration"
 msgstr "Augnablik... Framkvæmi stillingar"
 
-#: harddrake/sound.pm:331
+#: harddrake/sound.pm:133
+#, c-format
+msgid "No known driver"
+msgstr "Enginn þekktur rekill"
+
+#: harddrake/sound.pm:134
+#, c-format
+msgid "There's no known driver for your sound card (%s)"
+msgstr "Það er enginn þekktur rekill fyrir hljóðkortið þitt (%s)"
+
+#: harddrake/sound.pm:166
 #, c-format
 msgid "Enable PulseAudio"
 msgstr "Virkja PulseAudio"
@@ -3290,46 +3295,7 @@ msgstr ""
 msgid "Driver:"
 msgstr "Rekill:"
 
-#: 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 ""
-"Gamli \"%s\" rekillinn er á svörtum lista.\n"
-"\n"
-"Hann hefur valdið kerfisvillum þegar honum er afhlaðið.\n"
-"\n"
-"Nýi \"%s\" rekillinn verður aðeins notaður við næstu ræsingu."
-
-#: harddrake/sound.pm:407
-#, c-format
-msgid "No open source driver"
-msgstr "Enginn \"frjáls hugbúnaðar\" rekill"
-
-#: 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 ""
-"Það er enginn \"frjáls\" rekill fyrir hljóðkortið þitt (%s) en það er til "
-"rekill framleiðanda á \"%s\"."
-
-#: harddrake/sound.pm:411
-#, c-format
-msgid "No known driver"
-msgstr "Enginn þekktur rekill"
-
-#: harddrake/sound.pm:412
-#, c-format
-msgid "There's no known driver for your sound card (%s)"
-msgstr "Það er enginn þekktur rekill fyrir hljóðkortið þitt (%s)"
-
-#: harddrake/sound.pm:427
+#: harddrake/sound.pm:243
 #, c-format
 msgid "Sound troubleshooting"
 msgstr "Vandamálaleit hljóðkorta"
@@ -6156,11 +6122,16 @@ msgid "Avahi is a ZeroConf daemon which implements an mDNS stack"
 msgstr ""
 
 #: services.pm:26
+#, fuzzy, c-format
+msgid "An NTP client/server"
+msgstr "NTP þjónn"
+
+#: services.pm:27
 #, c-format
 msgid "Set CPU frequency settings"
 msgstr ""
 
-#: services.pm:27
+#: services.pm:28
 #, c-format
 msgid ""
 "cron is a standard UNIX program that runs user-specified programs\n"
@@ -7039,6 +7010,32 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Innsetning mistókst"
 
+#~ msgid "Clean /tmp at each boot"
+#~ msgstr "Hreinsa /tmp við hverja ræsingu"
+
+#~ 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 ""
+#~ "Gamli \"%s\" rekillinn er á svörtum lista.\n"
+#~ "\n"
+#~ "Hann hefur valdið kerfisvillum þegar honum er afhlaðið.\n"
+#~ "\n"
+#~ "Nýi \"%s\" rekillinn verður aðeins notaður við næstu ræsingu."
+
+#~ msgid "No open source driver"
+#~ msgstr "Enginn \"frjáls hugbúnaðar\" rekill"
+
+#~ msgid ""
+#~ "There's no free driver for your sound card (%s), but there's a "
+#~ "proprietary driver at \"%s\"."
+#~ msgstr ""
+#~ "Það er enginn \"frjáls\" rekill fyrir hljóðkortið þitt (%s) en það er til "
+#~ "rekill framleiðanda á \"%s\"."
+
 #~ msgid "command %s missing"
 #~ msgstr "skipun %s vantar"