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

1 files changed, 45 insertions, 48 deletions

diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po
index 6bb42e9a6..ea5ab9cbf 100644
--- a/perl-install/share/po/cy.po
+++ b/perl-install/share/po/cy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia DrakX.cy\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-10-01 20:12-0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: Cymraeg <post@meddal.com>\n"
@@ -205,11 +205,6 @@ msgstr "Nid oes modd defnyddio cyfrinair gyda %s"
 msgid "Password (again)"
 msgstr "Cyfrinair (eto)"
 
-#: any.pm:449
-#, c-format
-msgid "Clean /tmp at each boot"
-msgstr "Glanhau /tmp bob tro fyddwch yn cychwyn"
-
 #: any.pm:459
 #, c-format
 msgid "Init Message"
@@ -3191,7 +3186,17 @@ msgstr "cpu # "
 msgid "Please Wait... Applying the configuration"
 msgstr "Arhoswch...Gosod y ffurfweddiad"
 
-#: harddrake/sound.pm:331
+#: harddrake/sound.pm:133
+#, c-format
+msgid "No known driver"
+msgstr "Dim gyrrwr hysbys"
+
+#: harddrake/sound.pm:134
+#, c-format
+msgid "There's no known driver for your sound card (%s)"
+msgstr "Nid oes gyrrwr hysbys ar gyfer eich cerdyn sain (%s)"
+
+#: harddrake/sound.pm:166
 #, c-format
 msgid "Enable PulseAudio"
 msgstr "Galluogi PulseAudio"
@@ -3295,46 +3300,7 @@ msgstr ""
 msgid "Driver:"
 msgstr "Gyrrwr:"
 
-#: 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 ""
-"Mae'r hen yrrwr \"%s\" wedi ei wahardd.\n"
-"\n"
-"Mae'n effeithio'n andwyol ar y cnewyllyn\n"
-"\n"
-"Bydd y gyrrwr \"%s|\"'n cael ei ddefnyddio ar y cychwyn"
-
-#: harddrake/sound.pm:407
-#, c-format
-msgid "No open source driver"
-msgstr "Dim gyrrwr cod agored"
-
-#: 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 ""
-"Nid oes gyrrwr rhydd ar gyfer eich cerdyn sain (%s) ond mae gyrrwr "
-"perchnogol yn \"%s\" ."
-
-#: harddrake/sound.pm:411
-#, c-format
-msgid "No known driver"
-msgstr "Dim gyrrwr hysbys"
-
-#: harddrake/sound.pm:412
-#, c-format
-msgid "There's no known driver for your sound card (%s)"
-msgstr "Nid oes gyrrwr hysbys ar gyfer eich cerdyn sain (%s)"
-
-#: harddrake/sound.pm:427
+#: harddrake/sound.pm:243
 #, c-format
 msgid "Sound troubleshooting"
 msgstr "Datrys problemau sain"
@@ -6178,11 +6144,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 "Gweinydd 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"
@@ -7084,6 +7055,32 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Methodd y gosod"
 
+#~ msgid "Clean /tmp at each boot"
+#~ msgstr "Glanhau /tmp bob tro fyddwch yn cychwyn"
+
+#~ 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 ""
+#~ "Mae'r hen yrrwr \"%s\" wedi ei wahardd.\n"
+#~ "\n"
+#~ "Mae'n effeithio'n andwyol ar y cnewyllyn\n"
+#~ "\n"
+#~ "Bydd y gyrrwr \"%s|\"'n cael ei ddefnyddio ar y cychwyn"
+
+#~ msgid "No open source driver"
+#~ msgstr "Dim gyrrwr cod agored"
+
+#~ msgid ""
+#~ "There's no free driver for your sound card (%s), but there's a "
+#~ "proprietary driver at \"%s\"."
+#~ msgstr ""
+#~ "Nid oes gyrrwr rhydd ar gyfer eich cerdyn sain (%s) ond mae gyrrwr "
+#~ "perchnogol yn \"%s\" ."
+
 #~ msgid "command %s missing"
 #~ msgstr "gorchymyn %s ar goll"