merge

1 files changed, 108 insertions, 92 deletions

diff --git a/po/cy.po b/po/cy.po
index 277d5d9d..d3603eec 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,14 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf 0.96\n"
-"POT-Creation-Date: 2004-01-12 10:26+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-16 14:38+0000\n"
 "PO-Revision-Date: 2003-12-31 17:54-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: ../contributors.pl_.c:11
 msgid "Per Oyvind Karlsen"
@@ -182,8 +182,9 @@ msgid "Backups"
 msgstr "Wrth gefn"
 
 #: ../control-center_.c:107
-msgid "Bootstrapping"
-msgstr ""
+#, fuzzy
+msgid "Boot loader"
+msgstr "Disg meddal cychwyn"
 
 #: ../control-center_.c:108
 #, fuzzy
@@ -242,7 +243,7 @@ msgstr "Gwasanaethwr Graffigol"
 msgid "Partitions"
 msgstr "Rhaniadau"
 
-#: ../control-center_.c:124 ../control-center_.c:161
+#: ../control-center_.c:124 ../control-center_.c:162
 msgid "Hardware"
 msgstr "Caledwedd"
 
@@ -346,169 +347,184 @@ msgstr "Pwyntiau gosod WebDAV"
 msgid "Boot"
 msgstr "Cychwyn"
 
-#: ../control-center_.c:174
+#: ../control-center_.c:175
 msgid "Mount Points"
 msgstr "Pwyntiau Gosod"
 
-#: ../control-center_.c:189
+#: ../control-center_.c:190
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: ../control-center_.c:190
+#: ../control-center_.c:191
 msgid "DVD"
 msgstr "DVD"
 
-#: ../control-center_.c:190
+#: ../control-center_.c:191
 msgid "DVD-ROM"
 msgstr "DVD-ROM"
 
-#: ../control-center_.c:191
+#: ../control-center_.c:192
 msgid "CD Burner"
 msgstr "Llosgwr CD"
 
-#: ../control-center_.c:191
+#: ../control-center_.c:192
 msgid "CD/DVD"
 msgstr "CD/DVD"
 
-#: ../control-center_.c:192
+#: ../control-center_.c:193
 msgid "Floppy"
 msgstr "Disg meddal"
 
-#: ../control-center_.c:192
+#: ../control-center_.c:193
 msgid "Floppy drive"
 msgstr "Disg meddal"
 
-#: ../control-center_.c:193
+#: ../control-center_.c:194
 msgid "ZIP drive"
 msgstr "Disg ZIP"
 
-#: ../control-center_.c:193
+#: ../control-center_.c:194
 msgid "Zip"
 msgstr "Zip"
 
-#: ../control-center_.c:202
+#: ../control-center_.c:203
 msgid "Network & Internet"
 msgstr "Rhwydwaith a'r Rhyngrwyd"
 
-#: ../control-center_.c:213
+#: ../control-center_.c:214
 msgid "Security"
 msgstr "Diogelwch"
 
-#: ../control-center_.c:220
+#: ../control-center_.c:221
 msgid "System"
 msgstr "System"
 
-#: ../control-center_.c:236
+#: ../control-center_.c:237
 msgid "Software Management"
 msgstr "Rheoli Meddalwedd"
 
-#: ../control-center_.c:245
+#: ../control-center_.c:246
 msgid "Server wizards"
 msgstr "Dewiniaid gwasanaethwr"
 
-#: ../control-center_.c:252
+#: ../control-center_.c:253
 msgid "Configure DHCP"
 msgstr "Ffurfweddu DHCP"
 
-#: ../control-center_.c:253
+#: ../control-center_.c:254
 msgid "Add a DNS client"
 msgstr "Ychwanegu cleient DNS"
 
-#: ../control-center_.c:254
+#: ../control-center_.c:255
 msgid "Configure DNS"
 msgstr "Ffurfweddu DNS"
 
-#: ../control-center_.c:255
+#: ../control-center_.c:256
 msgid "Configure FTP"
 msgstr "Ffurfweddu FTP"
 
-#: ../control-center_.c:256
+#: ../control-center_.c:257
 msgid "Configure news"
 msgstr "Ffurfweddu newyddion"
 
-#: ../control-center_.c:257
+#: ../control-center_.c:258
 msgid "Configure mail"
 msgstr "Ffurfweddu e-bost"
 
-#: ../control-center_.c:258
+#: ../control-center_.c:259
 msgid "Configure proxy"
 msgstr "Ffurfweddu dirprwy"
 
-#: ../control-center_.c:259
+#: ../control-center_.c:260
 msgid "Configure Samba"
 msgstr "Ffurfweddu Samba"
 
-#: ../control-center_.c:260
+#: ../control-center_.c:261
 msgid "Configure time"
 msgstr "Ffurfweddu amser"
 
-#: ../control-center_.c:261
+#: ../control-center_.c:262
 msgid "Configure web"
 msgstr "Ffurfweddu'r we"
 
-#: ../control-center_.c:266
+#: ../control-center_.c:263
+#, fuzzy
+msgid "Configure NIS and Autofs"
+msgstr "Ffurfweddu DNS"
+
+#: ../control-center_.c:264
+#, fuzzy
+msgid "Configure installation server"
+msgstr "Canolfan Ffurfweddu Dewislenni"
+
+#: ../control-center_.c:265
+#, fuzzy
+msgid "Configure PXE"
+msgstr "Ffurfweddu FTP"
+
+#: ../control-center_.c:271
 msgid "Online Administration"
 msgstr "Gweinyddiaeth Ar-lein"
 
-#: ../control-center_.c:273
+#: ../control-center_.c:278
 msgid "Local administration"
 msgstr "Gweinyddiaeth leol"
 
-#: ../control-center_.c:274
+#: ../control-center_.c:279
 msgid "Remote administration"
 msgstr "Gweinyddiaeth bell"
 
-#: ../control-center_.c:302
+#: ../control-center_.c:307
 msgid "/Display _Logs"
 msgstr "/Dangos _Cofnodion"
 
 #. -PO Translators, please keep all "/" charaters !!!
-#: ../control-center_.c:302 ../control-center_.c:303 ../control-center_.c:304
-#: ../control-center_.c:323
+#: ../control-center_.c:307 ../control-center_.c:308 ../control-center_.c:309
+#: ../control-center_.c:328
 msgid "/_Options"
 msgstr "/_Dewisiadau"
 
-#: ../control-center_.c:303
+#: ../control-center_.c:308
 msgid "/_Embedded Mode"
 msgstr "/Modd _Mewnosod"
 
-#: ../control-center_.c:304
+#: ../control-center_.c:309
 msgid "/Expert mode in _wizards"
 msgstr "/Modd arbenigwr mewn _dewin"
 
-#: ../control-center_.c:308
+#: ../control-center_.c:313
 msgid "/_Profiles"
 msgstr "/_Proffilau"
 
-#: ../control-center_.c:309
+#: ../control-center_.c:314
 msgid "/_Delete"
 msgstr "/_Dileu"
 
-#: ../control-center_.c:310
+#: ../control-center_.c:315
 msgid "/_New"
 msgstr "/_Newydd"
 
-#: ../control-center_.c:321 ../control-center_.c:322
+#: ../control-center_.c:326 ../control-center_.c:327
 msgid "/_File"
 msgstr "/_Ffeil"
 
-#: ../control-center_.c:322
+#: ../control-center_.c:327
 msgid "/_Quit"
 msgstr "/_Gadael"
 
-#: ../control-center_.c:322
+#: ../control-center_.c:327
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../control-center_.c:322
+#: ../control-center_.c:327
 msgid "Quit"
 msgstr "Gadael"
 
-#: ../control-center_.c:338 ../control-center_.c:341 ../control-center_.c:354
+#: ../control-center_.c:343 ../control-center_.c:346 ../control-center_.c:359
 msgid "/_Themes"
 msgstr "/_Themâu"
 
-#: ../control-center_.c:344
+#: ../control-center_.c:349
 msgid ""
 "This action will restart the control center.\n"
 "Any change not applied will be lost."
@@ -516,15 +532,15 @@ msgstr ""
 "Bydd y weithred hon yn ail gychwyn y ganolfan rheoli.\n"
 "Byd unrhyw newid heb ei osod yn cael ei golli."
 
-#: ../control-center_.c:354
+#: ../control-center_.c:359
 msgid "/_More themes"
 msgstr "/_Rhagor o themâu"
 
-#: ../control-center_.c:358
+#: ../control-center_.c:363
 msgid "New profile..."
 msgstr "Proffil newydd..."
 
-#: ../control-center_.c:361
+#: ../control-center_.c:366
 msgid ""
 "Name of the profile to create (the new profile is created as a copy of the "
 "current one):"
@@ -532,57 +548,57 @@ msgstr ""
 "Enw'r proffil i'w greu (bydd y proffil newydd yn cael ei greu fel copi o'r "
 "un cyfredol)"
 
-#: ../control-center_.c:365 ../control-center_.c:398 ../control-center_.c:524
+#: ../control-center_.c:370 ../control-center_.c:403 ../control-center_.c:529
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: ../control-center_.c:367 ../control-center_.c:399
+#: ../control-center_.c:372 ../control-center_.c:404
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../control-center_.c:373
+#: ../control-center_.c:378
 msgid "Error"
 msgstr "Gwall"
 
-#: ../control-center_.c:373
+#: ../control-center_.c:378
 #, c-format
 msgid "The \"%s\" profile already exists!"
 msgstr "Mae proffil \"%s\" yn bod eisoes!"
 
-#: ../control-center_.c:391
+#: ../control-center_.c:396
 msgid "Delete profile"
 msgstr "Dileu proffil"
 
-#: ../control-center_.c:393
+#: ../control-center_.c:398
 msgid "Profile to delete:"
 msgstr "Proffil i'w ddileu:"
 
-#: ../control-center_.c:402 ../control-center_.c:462 ../control-center_.c:913
+#: ../control-center_.c:407 ../control-center_.c:467 ../control-center_.c:918
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../control-center_.c:402
+#: ../control-center_.c:407
 msgid "You can not delete the current profile"
 msgstr "Nid oes modd dileu'r proffil presennol"
 
-#: ../control-center_.c:417 ../control-center_.c:418 ../control-center_.c:419
-#: ../control-center_.c:420
+#: ../control-center_.c:422 ../control-center_.c:423 ../control-center_.c:424
+#: ../control-center_.c:425
 msgid "/_Help"
 msgstr "/_Cymorth"
 
-#: ../control-center_.c:418
+#: ../control-center_.c:423
 msgid "Help"
 msgstr "Cymorth"
 
-#: ../control-center_.c:419
+#: ../control-center_.c:424
 msgid "/_Report Bug"
 msgstr "/_Adrodd ar Wallau"
 
-#: ../control-center_.c:420
+#: ../control-center_.c:425
 msgid "/_About..."
 msgstr "/_Ynghylch..."
 
-#: ../control-center_.c:463
+#: ../control-center_.c:468
 #, fuzzy, c-format
 msgid ""
 "We are about to switch from the \"%s\" profile to the \"%s\" profile.\n"
@@ -593,125 +609,125 @@ msgstr ""
 "\n"
 "Ydych chi'n siwr eich bod am newid?."
 
-#: ../control-center_.c:513
+#: ../control-center_.c:518
 msgid "Please wait..."
 msgstr "Arhoswch..."
 
-#: ../control-center_.c:529
+#: ../control-center_.c:534
 msgid "Previous"
 msgstr "Cynt"
 
-#: ../control-center_.c:544
+#: ../control-center_.c:549
 #, fuzzy, c-format
 msgid "Mandrake Control Center %s [on %s]"
 msgstr "Canolfan Rheoli Mandrake %s"
 
-#: ../control-center_.c:555
+#: ../control-center_.c:560
 msgid ""
 "_banner font:\n"
 "Sans 15"
 msgstr ""
 
-#: ../control-center_.c:557
+#: ../control-center_.c:562
 msgid "Welcome to the Mandrake Control Center"
 msgstr "Croeso i Ganolfan Rheoli Mandrake"
 
-#: ../control-center_.c:700
+#: ../control-center_.c:705
 msgid "The modifications done in the current module won't be saved."
 msgstr "Ni fydd y newidiadau wnaed yn y modiwl cyfredol yn cael ei gadw."
 
-#: ../control-center_.c:776
+#: ../control-center_.c:781
 #, c-format
 msgid "cannot fork: %s"
 msgstr "Methu fforchio: %s"
 
-#: ../control-center_.c:786
+#: ../control-center_.c:791
 #, c-format
 msgid "cannot fork and exec \"%s\" since it is not executable"
 msgstr "methu fforchio a gweithredu \"%s\" am nad yw'n weithredadwy"
 
-#: ../control-center_.c:904
+#: ../control-center_.c:909
 msgid "This program has exited abnormally"
 msgstr "Mae'r rhaglen wedi gorffen yn ddisymwth"
 
-#: ../control-center_.c:923
+#: ../control-center_.c:928
 msgid "Close"
 msgstr "Cau"
 
-#: ../control-center_.c:930
+#: ../control-center_.c:935
 msgid "More themes"
 msgstr "Rhagor o themâu"
 
-#: ../control-center_.c:932
+#: ../control-center_.c:937
 msgid "Getting new themes"
 msgstr "Estyn themâu newydd"
 
-#: ../control-center_.c:933
+#: ../control-center_.c:938
 msgid "Additional themes"
 msgstr "Themâu ychwanegol"
 
-#: ../control-center_.c:935
+#: ../control-center_.c:940
 msgid "Get additional themes on www.damz.net"
 msgstr "Estyn themâu ychwanegol o www.damz.net"
 
-#: ../control-center_.c:943
+#: ../control-center_.c:948
 msgid "About - Mandrake Control Center"
 msgstr "Ynghylch - Canolfan Rheoli Mandrake"
 
-#: ../control-center_.c:953
+#: ../control-center_.c:958
 msgid "Authors: "
 msgstr "Awdur: "
 
-#: ../control-center_.c:954
+#: ../control-center_.c:959
 msgid "(original C version)"
 msgstr "(fersiwn C gwreiddiol)"
 
 #. -PO "perl" here is the programming language
-#: ../control-center_.c:956 ../control-center_.c:959
+#: ../control-center_.c:961 ../control-center_.c:964
 msgid "(perl version)"
 msgstr "fersiwn perl"
 
-#: ../control-center_.c:961
+#: ../control-center_.c:966
 msgid "Artwork: "
 msgstr "Gwaith Celf:"
 
-#: ../control-center_.c:962
+#: ../control-center_.c:967
 msgid "(design)"
 msgstr "(cynllun)"
 
 #. -PO If your language allows it, use eacute for first "e" and egrave for 2nd one.
-#: ../control-center_.c:964
+#: ../control-center_.c:969
 msgid "Helene Durosini"
 msgstr "Hélène Durosini"
 
 #. -PO Add your Name here to find it in the About section in your language.
-#: ../control-center_.c:978
+#: ../control-center_.c:983
 msgid "~ * ~"
 msgstr "~ * ~"
 
 #. -PO Add your E-Mail address here if you want to show it in the about doialog.
-#: ../control-center_.c:980
+#: ../control-center_.c:985
 msgid "~ @ ~"
 msgstr "~ @ ~"
 
-#: ../control-center_.c:982
+#: ../control-center_.c:987
 msgid "Translator: "
 msgstr "Cyfieithydd"
 
-#: ../control-center_.c:988
+#: ../control-center_.c:993
 #, c-format
 msgid "Mandrake Control Center %s\n"
 msgstr "Canolfan Rheoli Mandrake %s\n"
 
-#: ../control-center_.c:989
+#: ../control-center_.c:994
 msgid "Copyright (C) 1999-2003 Mandrakesoft SA"
 msgstr "Hawlfraint (C) 2001-2002 Mandrakesoft SA"
 
-#: ../control-center_.c:993
+#: ../control-center_.c:998
 msgid "Authors"
 msgstr "Awdur"
 
-#: ../control-center_.c:994
+#: ../control-center_.c:999
 msgid "Mandrake Linux Contributors"
 msgstr "Cyfraniadau Mandrake Linux"