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

1 files changed, 45 insertions, 48 deletions

diff --git a/perl-install/share/po/sk.po b/perl-install/share/po/sk.po
index 087676e82..e327b5536 100644
--- a/perl-install/share/po/sk.po
+++ b/perl-install/share/po/sk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2013-09-30 21:17+0200\n"
+"POT-Creation-Date: 2013-11-30 19:21+0100\n"
 "PO-Revision-Date: 2005-09-21 14:03+0100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@mandriva.org>\n"
 "Language-Team:  <i18n@mandrake.sk>\n"
@@ -205,11 +205,6 @@ msgstr "Nemôžete použiť kryptovaný súborový systém pre bod pripojenia %s
 msgid "Password (again)"
 msgstr "Heslo (znova)"
 
-#: any.pm:449
-#, c-format
-msgid "Clean /tmp at each boot"
-msgstr "Vyčistiť /tmp pri každom štarte"
-
 #: any.pm:459
 #, c-format
 msgid "Init Message"
@@ -3167,7 +3162,17 @@ msgstr "cpu #"
 msgid "Please Wait... Applying the configuration"
 msgstr "Prosím čakajte... Aplikuje sa konfigurácia"
 
-#: harddrake/sound.pm:331
+#: harddrake/sound.pm:133
+#, c-format
+msgid "No known driver"
+msgstr "Žiaden známy ovládač"
+
+#: harddrake/sound.pm:134
+#, c-format
+msgid "There's no known driver for your sound card (%s)"
+msgstr "Nie je žiaden známy ovládač pre vašu zvukovú kartu (%s)"
+
+#: harddrake/sound.pm:166
 #, c-format
 msgid "Enable PulseAudio"
 msgstr ""
@@ -3270,46 +3275,7 @@ msgstr ""
 msgid "Driver:"
 msgstr "Ovládač:"
 
-#: 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 ""
-"Starý ovládač \"%s\" nie je odporúčaný.\n"
-"\n"
-"Boli oznámené havárie jadra pri jeho odstraňovaní.\n"
-"\n"
-"Nový ovládač \"%s\" bude použitý iba po nasledovnom štarte systému."
-
-#: harddrake/sound.pm:407
-#, c-format
-msgid "No open source driver"
-msgstr "Žiaden známy open source ovládač"
-
-#: 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 ""
-"Nie je žiaden voľne dostupný ovládač pre vašu zvukovú kartu (%s), ale je k "
-"dispozícii proprietárny ovládač \"%s\"."
-
-#: harddrake/sound.pm:411
-#, c-format
-msgid "No known driver"
-msgstr "Žiaden známy ovládač"
-
-#: harddrake/sound.pm:412
-#, c-format
-msgid "There's no known driver for your sound card (%s)"
-msgstr "Nie je žiaden známy ovládač pre vašu zvukovú kartu (%s)"
-
-#: harddrake/sound.pm:427
+#: harddrake/sound.pm:243
 #, c-format
 msgid "Sound troubleshooting"
 msgstr "Hľadanie chyby v súvislosti so zvukom"
@@ -6170,11 +6136,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 server"
+
+#: 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"
@@ -7055,6 +7026,32 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Inštalácia zlyhala"
 
+#~ msgid "Clean /tmp at each boot"
+#~ msgstr "Vyčistiť /tmp pri každom štarte"
+
+#~ 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 ""
+#~ "Starý ovládač \"%s\" nie je odporúčaný.\n"
+#~ "\n"
+#~ "Boli oznámené havárie jadra pri jeho odstraňovaní.\n"
+#~ "\n"
+#~ "Nový ovládač \"%s\" bude použitý iba po nasledovnom štarte systému."
+
+#~ msgid "No open source driver"
+#~ msgstr "Žiaden známy open source ovládač"
+
+#~ msgid ""
+#~ "There's no free driver for your sound card (%s), but there's a "
+#~ "proprietary driver at \"%s\"."
+#~ msgstr ""
+#~ "Nie je žiaden voľne dostupný ovládač pre vašu zvukovú kartu (%s), ale je "
+#~ "k dispozícii proprietárny ovládač \"%s\"."
+
 #~ msgid ""
 #~ "The classic bug sound tester is to run the following commands:\n"
 #~ "\n"