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

1 files changed, 45 insertions, 48 deletions

diff --git a/perl-install/share/po/gl.po b/perl-install/share/po/gl.po
index a13f04961..27393862e 100644
--- a/perl-install/share/po/gl.po
+++ b/perl-install/share/po/gl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libDrakX-gl\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-09-25 18:43+0200\n"
 "Last-Translator: Alejo Pacín Jul <alejopj@gmail.com>\n"
 "Language-Team: Galician <cooker-i18n@mandrivalinux.org>\n"
@@ -211,11 +211,6 @@ msgstr "Non pode usar un contrasinal con %s"
 msgid "Password (again)"
 msgstr "Contrasinal (de novo)"
 
-#: any.pm:449
-#, c-format
-msgid "Clean /tmp at each boot"
-msgstr "Baleirar /tmp en cada arrinque"
-
 #: any.pm:459
 #, c-format
 msgid "Init Message"
@@ -3208,7 +3203,17 @@ msgstr "cpu # "
 msgid "Please Wait... Applying the configuration"
 msgstr "Por Favor, Agarde... Aplicando a configuración"
 
-#: harddrake/sound.pm:331
+#: harddrake/sound.pm:133
+#, c-format
+msgid "No known driver"
+msgstr "Controlador descoñecido"
+
+#: harddrake/sound.pm:134
+#, c-format
+msgid "There's no known driver for your sound card (%s)"
+msgstr "Non hai ningún driver coñecido para a súa tarxeta de son (%s)"
+
+#: harddrake/sound.pm:166
 #, c-format
 msgid "Enable PulseAudio"
 msgstr "Habilitar PulseAudio"
@@ -3311,46 +3316,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 ""
-"O antigo driver \"%s\" está na lista negra.\n"
-"\n"
-"Comunicouse que bloquea o kernel ó descargarse.\n"
-"\n"
-"Só se usará o novo driver \"%s\" no seguinte inicio."
-
-#: harddrake/sound.pm:407
-#, c-format
-msgid "No open source driver"
-msgstr "Non hai un controlador de código aberto"
-
-#: 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 ""
-"Non hai un driver libre para a súa tarxeta de son (%s), pero hai un driver "
-"propietario en \"%s\"."
-
-#: harddrake/sound.pm:411
-#, c-format
-msgid "No known driver"
-msgstr "Controlador descoñecido"
-
-#: harddrake/sound.pm:412
-#, c-format
-msgid "There's no known driver for your sound card (%s)"
-msgstr "Non hai ningún driver coñecido para a súa tarxeta de son (%s)"
-
-#: harddrake/sound.pm:427
+#: harddrake/sound.pm:243
 #, c-format
 msgid "Sound troubleshooting"
 msgstr "Solución de problemas co son"
@@ -6222,11 +6188,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 ""
 
-#: services.pm:27
+#: services.pm:28
 #, c-format
 msgid ""
 "cron is a standard UNIX program that runs user-specified programs\n"
@@ -7118,6 +7089,32 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Fallou a instalación"
 
+#~ msgid "Clean /tmp at each boot"
+#~ msgstr "Baleirar /tmp en cada arrinque"
+
+#~ 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 ""
+#~ "O antigo driver \"%s\" está na lista negra.\n"
+#~ "\n"
+#~ "Comunicouse que bloquea o kernel ó descargarse.\n"
+#~ "\n"
+#~ "Só se usará o novo driver \"%s\" no seguinte inicio."
+
+#~ msgid "No open source driver"
+#~ msgstr "Non hai un controlador de código aberto"
+
+#~ msgid ""
+#~ "There's no free driver for your sound card (%s), but there's a "
+#~ "proprietary driver at \"%s\"."
+#~ msgstr ""
+#~ "Non hai un driver libre para a súa tarxeta de son (%s), pero hai un "
+#~ "driver propietario en \"%s\"."
+
 #~ msgid "command %s missing"
 #~ msgstr "Non se atopa o comando %s"