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

1 files changed, 47 insertions, 49 deletions

diff --git a/perl-install/share/po/bs.po b/perl-install/share/po/bs.po
index ac8833ffe..3f526cc49 100644
--- a/perl-install/share/po/bs.po
+++ b/perl-install/share/po/bs.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bs\n"
-"POT-Creation-Date: 2013-09-30 21:17+0200\n"
+"POT-Creation-Date: 2013-11-30 19:21+0100\n"
 "PO-Revision-Date: 2006-09-13 19:15+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -210,11 +210,6 @@ msgstr "Ne možete koristiti šifrovani datotečni sistem za tačku montiranja %
 msgid "Password (again)"
 msgstr "Šifra (ponovo)"
 
-#: any.pm:449
-#, c-format
-msgid "Clean /tmp at each boot"
-msgstr "Očisti /tmp prilikom svakog starta"
-
 #: any.pm:459
 #, c-format
 msgid "Init Message"
@@ -3204,7 +3199,17 @@ msgstr "cpu # "
 msgid "Please Wait... Applying the configuration"
 msgstr "Molim sačekajte... Primjenjujem konfiguraciju"
 
-#: harddrake/sound.pm:331
+#: harddrake/sound.pm:133
+#, c-format
+msgid "No known driver"
+msgstr "Nema nijedan poznat drajver"
+
+#: harddrake/sound.pm:134
+#, c-format
+msgid "There's no known driver for your sound card (%s)"
+msgstr "Nema poznatih drajvera za vašu zvučnu karticu (%s)"
+
+#: harddrake/sound.pm:166
 #, c-format
 msgid "Enable PulseAudio"
 msgstr ""
@@ -3307,47 +3312,7 @@ msgstr ""
 msgid "Driver:"
 msgstr "Drajver:"
 
-#: 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 ""
-"Stari \"%s\" drajver je na crnoj listi.\n"
-"\n"
-"Prijavljeno je da ovaj drajver prilikom deinstalacije izaziva oops kernela.\n"
-"\n"
-"Stoga će novi drajver \"%s\" biti korišten tek nakon idućeg pokretanja "
-"sistema."
-
-#: harddrake/sound.pm:407
-#, c-format
-msgid "No open source driver"
-msgstr "Nema open source drajver"
-
-#: 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 ""
-"Nema slobodnih drajvera za vašu zvučnu karticu (%s), ali postoji vlasnički "
-"drajver na \"%s\"."
-
-#: harddrake/sound.pm:411
-#, c-format
-msgid "No known driver"
-msgstr "Nema nijedan poznat drajver"
-
-#: harddrake/sound.pm:412
-#, c-format
-msgid "There's no known driver for your sound card (%s)"
-msgstr "Nema poznatih drajvera za vašu zvučnu karticu (%s)"
-
-#: harddrake/sound.pm:427
+#: harddrake/sound.pm:243
 #, c-format
 msgid "Sound troubleshooting"
 msgstr "Rješavanje problema sa zvukom"
@@ -6191,11 +6156,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"
@@ -7082,6 +7052,34 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Instalacija nije uspjela"
 
+#~ msgid "Clean /tmp at each boot"
+#~ msgstr "Očisti /tmp prilikom svakog starta"
+
+#~ 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 ""
+#~ "Stari \"%s\" drajver je na crnoj listi.\n"
+#~ "\n"
+#~ "Prijavljeno je da ovaj drajver prilikom deinstalacije izaziva oops "
+#~ "kernela.\n"
+#~ "\n"
+#~ "Stoga će novi drajver \"%s\" biti korišten tek nakon idućeg pokretanja "
+#~ "sistema."
+
+#~ msgid "No open source driver"
+#~ msgstr "Nema open source drajver"
+
+#~ msgid ""
+#~ "There's no free driver for your sound card (%s), but there's a "
+#~ "proprietary driver at \"%s\"."
+#~ msgstr ""
+#~ "Nema slobodnih drajvera za vašu zvučnu karticu (%s), ali postoji "
+#~ "vlasnički drajver na \"%s\"."
+
 #~ msgid "command %s missing"
 #~ msgstr "naredba %s nedostaje"