merge

1 files changed, 38 insertions, 59 deletions

diff --git a/po/cy.po b/po/cy.po
index 974e0e98..be982e24 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf 0.96\n"
-"POT-Creation-Date: 2004-01-21 18:52+0100\n"
+"POT-Creation-Date: 2004-01-22 12:55+0100\n"
 "PO-Revision-Date: 2004-01-18 20:24-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <cy@li.org>\n"
@@ -215,7 +215,7 @@ msgstr "Awtomewngofnodi"
 msgid "Backups"
 msgstr "Wrth gefn"
 
-#: ../control-center:107
+#: ../control-center:107 ../drakxconf:32
 #, c-format
 msgid "Boot loader"
 msgstr "Rheolwr Cychwyn"
@@ -230,7 +230,7 @@ msgstr "Thema cychwyn"
 msgid "Boot floppy"
 msgstr "Disg meddal cychwyn"
 
-#: ../control-center:110
+#: ../control-center:110 ../drakxconf:34
 #, c-format
 msgid "Internet connection sharing"
 msgstr "Rhannu cyswllt rhyngrwyd"
@@ -285,7 +285,7 @@ msgstr "Ffontiau"
 msgid "Graphical server"
 msgstr "Gwasanaethwr Graffigol"
 
-#: ../control-center:122
+#: ../control-center:122 ../drakxconf:35
 #, c-format
 msgid "Partitions"
 msgstr "Rhaniadau"
@@ -300,7 +300,7 @@ msgstr "Caledwedd"
 msgid "Install"
 msgstr "Gosod"
 
-#: ../control-center:125
+#: ../control-center:125 ../drakxconf:26
 #, c-format
 msgid "Keyboard"
 msgstr "Bysellfwrdd"
@@ -325,7 +325,7 @@ msgstr "Dewislenni"
 msgid "Monitor"
 msgstr "Monitro"
 
-#: ../control-center:130
+#: ../control-center:130 ../drakxconf:27
 #, c-format
 msgid "Mouse"
 msgstr "Llygoden"
@@ -390,7 +390,7 @@ msgstr "Lefelau a gwiriadau"
 msgid "Permissions"
 msgstr "Caniatâd"
 
-#: ../control-center:143
+#: ../control-center:143 ../drakxconf:30
 #, c-format
 msgid "Services"
 msgstr "Gwasanaethau"
@@ -405,7 +405,7 @@ msgstr "Rheolwr Cyfrwng"
 msgid "TV card"
 msgstr "Cerdyn Teledu"
 
-#: ../control-center:146
+#: ../control-center:146 ../drakxconf:29
 #, c-format
 msgid "Users and groups"
 msgstr "Defnyddwyr a grwpiau"
@@ -664,7 +664,7 @@ msgstr ""
 "Enw'r proffil i'w greu (bydd y proffil newydd yn cael ei greu fel copi o'r "
 "un cyfredol)"
 
-#: ../control-center:369 ../control-center:402 ../control-center:528
+#: ../control-center:369 ../control-center:402 ../control-center:527
 #, c-format
 msgid "Cancel"
 msgstr "Diddymu"
@@ -741,7 +741,7 @@ msgstr ""
 msgid "Please wait..."
 msgstr "Arhoswch..."
 
-#: ../control-center:533 ../gecko.pm:56
+#: ../control-center:532
 #, c-format
 msgid "Previous"
 msgstr "Cynt"
@@ -868,66 +868,31 @@ msgstr "Canolfan Rheoli Mandrake %s\n"
 msgid "Copyright (C) 1999-2004 Mandrakesoft SA"
 msgstr "Hawlfraint (C) 1999-2004 Mandrakesoft SA"
 
-#: ../control-center:996
+#: ../control-center:998
 #, c-format
 msgid "Authors"
 msgstr "Awdur"
 
-#: ../control-center:997
+#: ../control-center:999
 #, c-format
 msgid "Mandrake Linux Contributors"
 msgstr "Cyfraniadau Mandrake Linux"
 
 #: ../drakxconf:25
 #, fuzzy, c-format
-msgid "Display Configuration"
-msgstr "Ffurfweddiad Argraffu"
-
-#: ../drakxconf:26
-#, fuzzy, c-format
-msgid "KeyBoard Configuration"
-msgstr "Canolfan Ffurfweddu Dewislenni"
-
-#: ../drakxconf:27
-#, fuzzy, c-format
-msgid "Mouse Configuration"
-msgstr "Canolfan Ffurfweddu Dewislenni"
+msgid "Display"
+msgstr "/Dangos _Cofnodion"
 
 #: ../drakxconf:28
 #, fuzzy, c-format
 msgid "Internet & Network"
 msgstr "Mynediad i'r rhyngrwyd"
 
-#: ../drakxconf:29
-#, c-format
-msgid "Add new users"
-msgstr ""
-
-#: ../drakxconf:30
-#, fuzzy, c-format
-msgid "Service Configuration"
-msgstr "Ffurfweddiad Argraffu"
-
-#: ../drakxconf:32
-#, fuzzy, c-format
-msgid "Boot Configuration"
-msgstr "Ffurfweddiad Argraffu"
-
 #: ../drakxconf:33
 #, fuzzy, c-format
 msgid "Auto Install"
 msgstr "Disg meddal awto gosod"
 
-#: ../drakxconf:34
-#, fuzzy, c-format
-msgid "Connection Sharing"
-msgstr "Rhannu cyswllt rhyngrwyd"
-
-#: ../drakxconf:35
-#, c-format
-msgid "Disk Partionning"
-msgstr ""
-
 #: ../drakxconf:38
 #, fuzzy, c-format
 msgid "Control Center"
@@ -941,16 +906,6 @@ msgstr ""
 "\n"
 "Dewiswch ba ddewislen rydych am ei ffurfweddu."
 
-#: ../gecko.pm:52
-#, c-format
-msgid "Next"
-msgstr ""
-
-#: ../gecko.pm:60
-#, c-format
-msgid "Skip Wizard"
-msgstr ""
-
 #: ../menus_launcher.pl:19 ../menus_launcher.pl:41
 #, c-format
 msgid "Menu Configuration Center"
@@ -996,3 +951,27 @@ msgstr "Cliciwch yma i ffurfweddu'r system argraffu"
 #, c-format
 msgid "Done"
 msgstr "Gorffen"
+
+#, fuzzy
+#~ msgid "Display Configuration"
+#~ msgstr "Ffurfweddiad Argraffu"
+
+#, fuzzy
+#~ msgid "KeyBoard Configuration"
+#~ msgstr "Canolfan Ffurfweddu Dewislenni"
+
+#, fuzzy
+#~ msgid "Mouse Configuration"
+#~ msgstr "Canolfan Ffurfweddu Dewislenni"
+
+#, fuzzy
+#~ msgid "Service Configuration"
+#~ msgstr "Ffurfweddiad Argraffu"
+
+#, fuzzy
+#~ msgid "Boot Configuration"
+#~ msgstr "Ffurfweddiad Argraffu"
+
+#, fuzzy
+#~ msgid "Connection Sharing"
+#~ msgstr "Rhannu cyswllt rhyngrwyd"