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

1 files changed, 45 insertions, 48 deletions

diff --git a/perl-install/share/po/ca.po b/perl-install/share/po/ca.po
index 906378c54..a66bf888a 100644
--- a/perl-install/share/po/ca.po
+++ b/perl-install/share/po/ca.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx_share\n"
-"POT-Creation-Date: 2013-09-30 21:17+0200\n"
+"POT-Creation-Date: 2013-11-30 19:21+0100\n"
 "PO-Revision-Date: 2013-06-29 11:37+0200\n"
 "Last-Translator: Francesc Pinyol\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -202,11 +202,6 @@ msgstr "No podeu fer servir una contrasenya amb %s"
 msgid "Password (again)"
 msgstr "Contrasenya (un altre cop)"
 
-#: any.pm:449
-#, c-format
-msgid "Clean /tmp at each boot"
-msgstr "Buida /tmp en cada arrencada"
-
 #: any.pm:459
 #, c-format
 msgid "Init Message"
@@ -3194,7 +3189,17 @@ msgstr "CPU #"
 msgid "Please Wait... Applying the configuration"
 msgstr "Espereu si us plau... s'està aplicant la configuració"
 
-#: harddrake/sound.pm:331
+#: harddrake/sound.pm:133
+#, c-format
+msgid "No known driver"
+msgstr "No hi ha cap controlador conegut"
+
+#: harddrake/sound.pm:134
+#, c-format
+msgid "There's no known driver for your sound card (%s)"
+msgstr "No hi ha cap controlador conegut per a la vostra targeta de so (%s)"
+
+#: harddrake/sound.pm:166
 #, c-format
 msgid "Enable PulseAudio"
 msgstr "Habilita PulseAudio"
@@ -3298,46 +3303,7 @@ msgstr ""
 msgid "Driver:"
 msgstr "Controlador:"
 
-#: 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 ""
-"L'antic controlador «%s» ha estat desaprovat.\n"
-"\n"
-"S'ha vist que causa problemes al nucli en descarregar-se.\n"
-"\n"
-"El nou controlador «%s» només s'usarà en la següent arrencada."
-
-#: harddrake/sound.pm:407
-#, c-format
-msgid "No open source driver"
-msgstr "No hi ha cap programa de control de codi obert"
-
-#: 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 ""
-"No hi ha cap programa de control gratuït per a la vostra targeta de so (%s), "
-"però n'hi ha un de propietat a «%s»."
-
-#: harddrake/sound.pm:411
-#, c-format
-msgid "No known driver"
-msgstr "No hi ha cap controlador conegut"
-
-#: harddrake/sound.pm:412
-#, c-format
-msgid "There's no known driver for your sound card (%s)"
-msgstr "No hi ha cap controlador conegut per a la vostra targeta de so (%s)"
-
-#: harddrake/sound.pm:427
+#: harddrake/sound.pm:243
 #, c-format
 msgid "Sound troubleshooting"
 msgstr "Resolució de problemes amb el so"
@@ -6078,11 +6044,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 "Servidor NTP"
+
+#: services.pm:27
 #, c-format
 msgid "Set CPU frequency settings"
 msgstr "Estableix els paràmetres de freqüència de la CPU"
 
-#: services.pm:27
+#: services.pm:28
 #, c-format
 msgid ""
 "cron is a standard UNIX program that runs user-specified programs\n"
@@ -6958,6 +6929,32 @@ msgstr ""
 msgid "Installation failed"
 msgstr "La instal·lació ha fallat"
 
+#~ msgid "Clean /tmp at each boot"
+#~ msgstr "Buida /tmp en cada arrencada"
+
+#~ 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 ""
+#~ "L'antic controlador «%s» ha estat desaprovat.\n"
+#~ "\n"
+#~ "S'ha vist que causa problemes al nucli en descarregar-se.\n"
+#~ "\n"
+#~ "El nou controlador «%s» només s'usarà en la següent arrencada."
+
+#~ msgid "No open source driver"
+#~ msgstr "No hi ha cap programa de control de codi obert"
+
+#~ msgid ""
+#~ "There's no free driver for your sound card (%s), but there's a "
+#~ "proprietary driver at \"%s\"."
+#~ msgstr ""
+#~ "No hi ha cap programa de control gratuït per a la vostra targeta de so "
+#~ "(%s), però n'hi ha un de propietat a «%s»."
+
 #~ msgid "command %s missing"
 #~ msgstr "l'ordre %s no existeix"