20080322

1 files changed, 148 insertions, 209 deletions

diff --git a/perl-install/install/share/po/cy.po b/perl-install/install/share/po/cy.po
index 6ce0fffd6..1109ecd8a 100644
--- a/perl-install/install/share/po/cy.po
+++ b/perl-install/install/share/po/cy.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Mandriva Linux\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-03-21 20:52+0100\n"
-"PO-Revision-Date: 2008-02-22 14:26-0000\n"
+"PO-Revision-Date: 2008-03-22 19:39+0100\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg\n"
 "MIME-Version: 1.0\n"
@@ -23,27 +23,27 @@ msgstr ""
 #: ../../advertising/IM_flash.pl:1
 #, c-format
 msgid "Your desktop on a USB key"
-msgstr ""
+msgstr "Eich bwrdd gwaith ar allwedd USB"
 
 #: ../../advertising/IM_free08S.pl:1
 #, c-format
 msgid "The 100%% open source Mandriva Linux distribution"
-msgstr ""
+msgstr "Mandriva Linux - y dosbarthiad cod agored 100%"
 
 #: ../../advertising/IM_one08S.pl:1
 #, c-format
 msgid "Explore Linux easily with Mandriva One"
-msgstr ""
+msgstr "Arbrofi rhwydd gyda Mandriva One"
 
 #: ../../advertising/IM_pwp08S.pl:1
 #, c-format
 msgid "A full Mandriva Linux desktop, with support"
-msgstr ""
+msgstr "Bwrdd gwaith Mandriva Linux llawn, gyda chefnogaeth"
 
 #: ../../advertising/IM_range08S.pl:1
 #, c-format
 msgid "Mandriva: distributions for everybody's needs"
-msgstr ""
+msgstr "Mandriva: dosbarthiad ar gyfer angen pawb"
 
 #: any.pm:109
 #, c-format
@@ -59,8 +59,7 @@ msgid ""
 "\n"
 "Do you have a supplementary installation medium to configure?"
 msgstr ""
-"Mae'r cyfrwng yma wedi ei ganfod a byddant yn cael eu defnyddio gyda'r "
-"gosodiad nesaf: %s \n"
+"Mae'r cyfrwng yma wedi ei ganfod a byddant yn cael eu defnyddio gyda'r gosodiad nesaf: %s \n"
 "\n"
 "\n"
 "A oes gennych gyfrwng gosod ychwanegol i'w ffurfweddu?"
@@ -97,17 +96,13 @@ msgstr "Rhaid i'r URL gychwyn gyda ftp:// neu http://"
 
 #: any.pm:228
 #, c-format
-msgid ""
-"Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgid "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr "Cysylltu â safle gwe Mandriva Linux i estyn y rhestr o ddrychau..."
 
 #: any.pm:233
 #, c-format
-msgid ""
-"Failed contacting Mandriva Linux web site to get the list of available "
-"mirrors"
-msgstr ""
-"Methwyd cysylltu â safle gwe Mandriva Linux i estyn y rhestr o ddrychau"
+msgid "Failed contacting Mandriva Linux web site to get the list of available mirrors"
+msgstr "Methwyd cysylltu â safle gwe Mandriva Linux i estyn y rhestr o ddrychau"
 
 #: any.pm:243
 #, c-format
@@ -151,12 +146,8 @@ msgstr "Atodol"
 
 #: any.pm:341
 #, c-format
-msgid ""
-"Can't find a package list file on this mirror. Make sure the location is "
-"correct."
-msgstr ""
-"Methu canfod ffeil hdlist ar y drych. Gwnewch yn siwr fod y lleoliad yn "
-"gywir."
+msgid "Can't find a package list file on this mirror. Make sure the location is correct."
+msgstr "Methu canfod ffeil hdlist ar y drych. Gwnewch yn siwr fod y lleoliad yn gywir."
 
 #: any.pm:375
 #, c-format
@@ -205,8 +196,7 @@ msgid ""
 "\n"
 "Do you really want to remove these packages?\n"
 msgstr ""
-"Bydd y pecynnau canlynol yn cael eu tynnu i ganiatáu diweddaru eich system: %"
-"s\n"
+"Bydd y pecynnau canlynol yn cael eu tynnu i ganiatáu diweddaru eich system: %s\n"
 "\n"
 "\n"
 "Ydych chi am dynnu'r pecynnau hyn?\n"
@@ -219,7 +209,7 @@ msgstr "Gwall wrth ddarllen ffeil %s"
 #: any.pm:1065
 #, c-format
 msgid "The following disk(s) were renamed:"
-msgstr "Mae'r disg(iau) canlynol wedi eu hailenwi:"
+msgstr "Mae'r disg(iau) canlynol wedi eu hail enwi:"
 
 #: any.pm:1067
 #, c-format
@@ -241,7 +231,8 @@ msgstr "FTP"
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1143 steps_interactive.pm:923
+#: any.pm:1143
+#: steps_interactive.pm:923
 #, c-format
 msgid "Network"
 msgstr "Rhwydwaith"
@@ -259,7 +250,7 @@ msgstr "Mae'r ffeil yn bodoli eisoes. Ysgrifennu drosti?"
 #: any.pm:1167
 #, c-format
 msgid "Permission denied"
-msgstr "Caniatad wedi ei wrthod."
+msgstr "Caniatâd wedi ei wrthod."
 
 #: any.pm:1215
 #, c-format
@@ -269,7 +260,7 @@ msgstr "Enw NFS gwael"
 #: any.pm:1236
 #, c-format
 msgid "Bad media %s"
-msgstr "Cyfrwng gwael %s"
+msgstr "Cyfrwng %s gwael"
 
 #: any.pm:1279
 #, c-format
@@ -286,7 +277,8 @@ msgstr "Bydd lluniau o'r sgrin ar gael ar ôl gosod yn %s"
 msgid "Installation"
 msgstr "Gosod"
 
-#: gtk.pm:122 share/meta-task/compssUsers.pl:42
+#: gtk.pm:122
+#: share/meta-task/compssUsers.pl:42
 #, c-format
 msgid "Configuration"
 msgstr "Ffurfweddiad"
@@ -315,7 +307,8 @@ msgstr "Cychwyn y rhwydwaith"
 msgid "Bringing down the network"
 msgstr "Cau'r rhwydwaith"
 
-#: media.pm:703 media.pm:714
+#: media.pm:703
+#: media.pm:714
 #, c-format
 msgid "Downloading file %s..."
 msgstr "Llwytho ffeil %s..."
@@ -376,21 +369,13 @@ msgstr "Gweithfan Swyddfa"
 
 #: share/meta-task/compssUsers.pl:15
 #, c-format
-msgid ""
-"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
-"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
-msgstr ""
-"Rhaglenni swyddfa: prosesydd geiriau (OpenOffice.org Writer, Kword), "
-"taenlenni (OpenOffice.org Calc, Kspread), ddarllenydd pdf, ag ati"
+msgid "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets (OpenOffice.org Calc, Kspread), PDF viewers, etc"
+msgstr "Rhaglenni swyddfa: prosesydd geiriau (OpenOffice.org Writer, Kword), taenlenni (OpenOffice.org Calc, Kspread), ddarllenydd pdf, ag ati"
 
 #: share/meta-task/compssUsers.pl:16
 #, c-format
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Rhaglenni swyddfa: prosesydd geiriau (Kword, abiword), taenlenni (kspread, "
-"gnumeric), ddarllenydd pdf, ag ati"
+msgid "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, gnumeric), pdf viewers, etc"
+msgstr "Rhaglenni swyddfa: prosesydd geiriau (Kword, abiword), taenlenni (kspread, gnumeric), ddarllenydd pdf, ag ati"
 
 #: share/meta-task/compssUsers.pl:21
 #, c-format
@@ -415,16 +400,12 @@ msgstr "Chwarae sain a fideo/rhaglenni golygu"
 #: share/meta-task/compssUsers.pl:31
 #, c-format
 msgid "Internet station"
-msgstr "Man Rhyngrwyd"
+msgstr "Man rhyngrwyd"
 
 #: share/meta-task/compssUsers.pl:32
 #, c-format
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
-msgstr ""
-"Casgliad o offer i ddarllen ac anfon e-bost a newyddion (mutt, tin..) ac i "
-"bori'r We"
+msgid "Set of tools to read and send mail and news (mutt, tin..) and to browse the Web"
+msgstr "Casgliad o offer i ddarllen ac anfon e-bost a newyddion (mutt, tin..) ac i bori'r We"
 
 #: share/meta-task/compssUsers.pl:37
 #, c-format
@@ -451,33 +432,39 @@ msgstr "Offer y Consol"
 msgid "Editors, shells, file tools, terminals"
 msgstr "Golygyddion, cregyn, offer ffeilio, terfynellau"
 
-#: share/meta-task/compssUsers.pl:52 share/meta-task/compssUsers.pl:153
+#: share/meta-task/compssUsers.pl:52
+#: share/meta-task/compssUsers.pl:153
 #: share/meta-task/compssUsers.pl:155
 #, c-format
 msgid "Development"
 msgstr "Datblygiad"
 
-#: share/meta-task/compssUsers.pl:53 share/meta-task/compssUsers.pl:156
+#: share/meta-task/compssUsers.pl:53
+#: share/meta-task/compssUsers.pl:156
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "Llyfrgelloedd datblygiadol C a C++, rhaglenni a ffeiliau cynnwys"
 
-#: share/meta-task/compssUsers.pl:56 share/meta-task/compssUsers.pl:160
+#: share/meta-task/compssUsers.pl:56
+#: share/meta-task/compssUsers.pl:160
 #, c-format
 msgid "Documentation"
 msgstr "Dogfennau"
 
-#: share/meta-task/compssUsers.pl:57 share/meta-task/compssUsers.pl:161
+#: share/meta-task/compssUsers.pl:57
+#: share/meta-task/compssUsers.pl:161
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Llyfrau a Howto's ar Linux a Meddalwedd Rhydd"
 
-#: share/meta-task/compssUsers.pl:61 share/meta-task/compssUsers.pl:164
+#: share/meta-task/compssUsers.pl:61
+#: share/meta-task/compssUsers.pl:164
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:62 share/meta-task/compssUsers.pl:165
+#: share/meta-task/compssUsers.pl:62
+#: share/meta-task/compssUsers.pl:165
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Cefnogaeth i raglenni trydydd parti"
@@ -502,12 +489,14 @@ msgstr "Grwpwar"
 msgid "Kolab Server"
 msgstr "Gweinydd Kolab"
 
-#: share/meta-task/compssUsers.pl:79 share/meta-task/compssUsers.pl:120
+#: share/meta-task/compssUsers.pl:79
+#: share/meta-task/compssUsers.pl:120
 #, c-format
 msgid "Firewall/Router"
 msgstr "Mur Gwarchod/Llwybrydd"
 
-#: share/meta-task/compssUsers.pl:80 share/meta-task/compssUsers.pl:121
+#: share/meta-task/compssUsers.pl:80
+#: share/meta-task/compssUsers.pl:121
 #, c-format
 msgid "Internet gateway"
 msgstr "Porth i'r rhyngrwyd"
@@ -557,7 +546,8 @@ msgstr "Gweinydd Ffeil a Rhannu Argraffydd"
 msgid "NFS Server, Samba server"
 msgstr "Gweinydd NSF, gweinydd Samba"
 
-#: share/meta-task/compssUsers.pl:103 share/meta-task/compssUsers.pl:116
+#: share/meta-task/compssUsers.pl:103
+#: share/meta-task/compssUsers.pl:116
 #, c-format
 msgid "Database"
 msgstr "Cronfa Ddata"
@@ -565,7 +555,7 @@ msgstr "Cronfa Ddata"
 #: share/meta-task/compssUsers.pl:104
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
-msgstr "Gweinydd cronfa data PostgreSQL neu MySQL"
+msgstr "Gweinydd CronfaDdata PostgreSQL a MySQL"
 
 #: share/meta-task/compssUsers.pl:108
 #, c-format
@@ -614,12 +604,8 @@ msgstr "Man Gwaith KDE"
 
 #: share/meta-task/compssUsers.pl:134
 #, c-format
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"KDE - Amgylchedd Bwrdd gwaith K, yr amgylchedd graffig sylfaenol gyda "
-"chasgliad o offer"
+msgid "The K Desktop Environment, the basic graphical environment with a collection of accompanying tools"
+msgstr "KDE - Amgylchedd Bwrdd gwaith K, yr amgylchedd graffig sylfaenol gyda chasgliad o offer"
 
 #: share/meta-task/compssUsers.pl:138
 #, c-format
@@ -628,12 +614,8 @@ msgstr "Man Gwaith Gnome"
 
 #: share/meta-task/compssUsers.pl:139
 #, c-format
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Amgylchedd graffig gyda chasgliad o raglenni ac offer bwrdd gwaith hawdd eu "
-"defnyddio."
+msgid "A graphical environment with user-friendly set of applications and desktop tools"
+msgstr "Amgylchedd graffig gyda chasgliad o raglenni ac offer bwrdd gwaith hawdd eu defnyddio."
 
 #: share/meta-task/compssUsers.pl:142
 #, c-format
@@ -655,7 +637,8 @@ msgstr "Window Maker, Enlightenment, Fvwm, ag ati"
 msgid "Utilities"
 msgstr "Gwasanaethau"
 
-#: share/meta-task/compssUsers.pl:172 share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:172
+#: share/meta-task/compssUsers.pl:173
 #, c-format
 msgid "SSH Server"
 msgstr "Gweinydd SSH"
@@ -704,15 +687,14 @@ msgstr ""
 msgid ""
 "Some important packages did not get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm"
-"\"\n"
+"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm\"\n"
 msgstr ""
 "Methodd rhai pecynnau pwysig a chael eu gosod yn gywir.\n"
 "Un ai mae eich disg CD-ROM neu eich CD-ROM yn wallus.\n"
-"Gwiriwch y CD-ROM ar gyfrifiadur wedi ei osod gan ddefnyddio \"rpm -qpl "
-"media/main/*.rpm\"\n"
+"Gwiriwch y CD-ROM ar gyfrifiadur wedi ei osod gan ddefnyddio \"rpm -qpl media/main/*.rpm\"\n"
 
-#: steps_auto_install.pm:71 steps_stdio.pm:27
+#: steps_auto_install.pm:71
+#: steps_stdio.pm:27
 #, c-format
 msgid "Entering step `%s'\n"
 msgstr "Cychwyn cam '%s\"\n"
@@ -720,7 +702,7 @@ msgstr "Cychwyn cam '%s\"\n"
 #: steps_curses.pm:22
 #, c-format
 msgid "Mandriva Linux Installation %s"
-msgstr "Gosod %s Mandriva Linux"
+msgstr "Gosod Mandriva Linux %s"
 
 #: steps_curses.pm:32
 #, c-format
@@ -736,30 +718,32 @@ msgstr "Mae gweinydd Xorg yn araf ei gychwyn. Arhoswch..."
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandriva Linux. If that occurs, you can try a text install instead. For "
-"this,\n"
+"Mandriva Linux. If that occurs, you can try a text install instead. For this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Mae eich system yn brin o adnoddau. Efallai bod gennych broblem wrth osod\n"
 "Mandriva Linux. Os yw hynny'n digwydd, defnyddiwch y gosod testun  yn lle\n"
-"hynny. I wneud hynny pwyswch 'F1' wrth gychwyn ar CD-ROM, ac yna teipio "
-"'text'."
+"hynny. I wneud hynny pwyswch 'F1' wrth gychwyn ar CD-ROM, ac yna teipio 'text'."
 
-#: steps_gtk.pm:259 steps_interactive.pm:435 steps_interactive.pm:564
+#: steps_gtk.pm:259
+#: steps_interactive.pm:435
+#: steps_interactive.pm:564
 #: steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Dewis Grŵp y Pecyn"
 
-#: steps_gtk.pm:280 steps_interactive.pm:581
+#: steps_gtk.pm:280
+#: steps_interactive.pm:581
 #, c-format
 msgid "Individual package selection"
 msgstr "Dewis pecynnau unigol."
 
-#: steps_gtk.pm:302 steps_interactive.pm:507
+#: steps_gtk.pm:302
+#: steps_interactive.pm:507
 #, c-format
 msgid "Total size: %d / %d MB"
-msgstr "Cyfanswm maint: %d/%d MB"
+msgstr "Cyfanswm maint: %d / %d MB"
 
 #: steps_gtk.pm:347
 #, c-format
@@ -813,9 +797,7 @@ msgstr "er mwyn cadw %s"
 
 #: steps_gtk.pm:397
 #, c-format
-msgid ""
-"You can not select this package as there is not enough space left to install "
-"it"
+msgid "You can not select this package as there is not enough space left to install it"
 msgstr "Nid oes modd i chi ddewis y pecyn hwn - does dim lle ar ôl i'w osod"
 
 #: steps_gtk.pm:400
@@ -841,7 +823,7 @@ msgstr "Does dim mod dad-ddewis y pecyn, mae wedi ei osod yn barod"
 #: steps_gtk.pm:430
 #, c-format
 msgid "You can not unselect this package. It must be upgraded"
-msgstr "Does dim mod dad-ddewis y pecyn hwn. Rhaid ei uwchraddio"
+msgstr "Does dim mod dad-ddewis y pecyn hwn. Rhaid ei ddiweddaru"
 
 #: steps_gtk.pm:434
 #, c-format
@@ -861,7 +843,7 @@ msgstr "Llwytho/Cadw'r dewis"
 #: steps_gtk.pm:440
 #, c-format
 msgid "Updating package selection"
-msgstr "Uwchraddio'r dewis o becynnau"
+msgstr "Diweddaru'r dewis o becynnau"
 
 #: steps_gtk.pm:445
 #, c-format
@@ -873,12 +855,15 @@ msgstr "Gosodiad lleiaf"
 msgid "Software Management"
 msgstr "Rheoli Meddalwedd"
 
-#: steps_gtk.pm:459 steps_interactive.pm:393
+#: steps_gtk.pm:459
+#: steps_interactive.pm:393
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Dewiswch y pecynnau yr hoffech chi eu gosod"
 
-#: steps_gtk.pm:476 steps_interactive.pm:595 steps_list.pm:32
+#: steps_gtk.pm:476
+#: steps_interactive.pm:595
+#: steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Gosod"
@@ -905,7 +890,9 @@ msgid_plural "%d packages"
 msgstr[0] "%d pecyn"
 msgstr[1] "%d pecyn"
 
-#: steps_gtk.pm:591 steps_interactive.pm:783 steps_list.pm:43
+#: steps_gtk.pm:591
+#: steps_interactive.pm:783
+#: steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Crynodeb"
@@ -915,12 +902,15 @@ msgstr "Crynodeb"
 msgid "Configure"
 msgstr "Ffurfweddu"
 
-#: steps_gtk.pm:625 steps_interactive.pm:779 steps_interactive.pm:935
+#: steps_gtk.pm:625
+#: steps_interactive.pm:779
+#: steps_interactive.pm:935
 #, c-format
 msgid "not configured"
 msgstr "heb ffurfweddu"
 
-#: steps_gtk.pm:661 steps_interactive.pm:278
+#: steps_gtk.pm:661
+#: steps_interactive.pm:278
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -929,20 +919,18 @@ msgstr ""
 "Mae'r cyfrwng gosod canlynol wedi ei ganfod.\n"
 "Os hoffech hepgor rhai ohonynt, dad-ddewiswch nhw nawr."
 
-#: steps_gtk.pm:670 steps_interactive.pm:284
+#: steps_gtk.pm:670
+#: steps_interactive.pm:284
 #, c-format
 msgid ""
-"You have the option to copy the contents of the CDs onto the hard drive "
-"before installation.\n"
-"It will then continue from the hard drive and the packages will remain "
-"available once the system is fully installed."
+"You have the option to copy the contents of the CDs onto the hard drive before installation.\n"
+"It will then continue from the hard drive and the packages will remain available once the system is fully installed."
 msgstr ""
-"Mae gennych y dewis i gopïo cynnwys y CD ar i'r disg caled cyn gosod "
-"Mandriva Linux.\n"
-"Bydd yna'n parhau o'r disg caled a bydd y pecynnau ar gael unwaith i'r "
-"system gael ei osod yn gyflawn."
+"Mae gennych y dewis i gopïo cynnwys y CD ar i'r disg caled cyn gosod Mandriva Linux.\n"
+"Bydd yna'n parhau o'r disg caled a bydd y pecynnau ar gael unwaith i'r system gael ei osod yn gyflawn."
 
-#: steps_gtk.pm:672 steps_interactive.pm:286
+#: steps_gtk.pm:672
+#: steps_interactive.pm:286
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Copïo'r CDau cyfan"
@@ -970,7 +958,7 @@ msgstr "Gosod/Diweddaru"
 #: steps_interactive.pm:130
 #, c-format
 msgid "Is this an install or an upgrade?"
-msgstr "Gosod neu uwchraddio?"
+msgstr "Gosod neu ddiweddaru?"
 
 #: steps_interactive.pm:134
 #, c-format
@@ -984,7 +972,7 @@ msgstr ""
 #: steps_interactive.pm:136
 #, c-format
 msgid "Upgrade %s"
-msgstr "Uwchraddio %s"
+msgstr "Diweddaru %s"
 
 #: steps_interactive.pm:140
 #, c-format
@@ -1013,29 +1001,19 @@ msgstr "Ffurfweddu IDE"
 
 #: steps_interactive.pm:231
 #, c-format
-msgid ""
-"No free space for 1MB bootstrap! Install will continue, but to boot your "
-"system, you'll need to create the bootstrap partition in DiskDrake"
-msgstr ""
-"Nid oes lle rhydd ar gyfer yr ymlwythwr 1MB! Bydd y gosod yn parhau, ond i "
-"gychwyn y system bydd rhaid i chi greu rhaniad ymlwythwr yn DiskDrake"
+msgid "No free space for 1MB bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake"
+msgstr "Nid oes lle rhydd ar gyfer yr ymlwythwr 1MB! Bydd y gosod yn parhau, ond i gychwyn y system bydd rhaid i chi greu rhaniad ymlwythwr yn DiskDrake"
 
 #: steps_interactive.pm:236
 #, c-format
-msgid ""
-"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
-"to boot your system, you'll need to create the bootstrap partition in "
-"DiskDrake"
-msgstr ""
-"Bydd angen i chi greu llwythwr mwdwl PPC PReP Boot! Bydd y gosod yn parhau, "
-"ond i gychwyn y system bydd rhaid i chi greu rhaniad ymlwythwr yn DiskDrake"
+msgid "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but to boot your system, you'll need to create the bootstrap partition in DiskDrake"
+msgstr "Bydd angen i chi greu llwythwr mwdwl PPC PReP Boot! Bydd y gosod yn parhau, ond i gychwyn y system bydd rhaid i chi greu rhaniad ymlwythwr yn DiskDrake"
 
 #: steps_interactive.pm:328
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
-"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
-"done.\n"
+"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done.\n"
 "If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 "Newidiwch eich CD-ROM\n"
@@ -1049,12 +1027,8 @@ msgstr "Casglu'r pecynnau sydd ar gael..."
 
 #: steps_interactive.pm:358
 #, c-format
-msgid ""
-"Your system does not have enough space left for installation or upgrade (%"
-"dMB > %dMB)"
-msgstr ""
-"Nid oes gan eich system ddigon o le ar gyfer gosod neu uwchraddio (%dMB > %"
-"dMB)"
+msgid "Your system does not have enough space left for installation or upgrade (%dMB > %dMB)"
+msgstr "Nid oes gan eich system ddigon o le ar gyfer gosod neu ddiweddaru  (%dMB > %dMB)"
 
 #: steps_interactive.pm:405
 #, c-format
@@ -1073,7 +1047,7 @@ msgstr "Llwyth"
 #: steps_interactive.pm:407
 #, c-format
 msgid "Save"
-msgstr "Gorffen"
+msgstr "Cadw"
 
 #: steps_interactive.pm:415
 #, c-format
@@ -1098,8 +1072,7 @@ msgstr "Gosodiad addasu"
 #: steps_interactive.pm:436
 #, c-format
 msgid "You can choose your workstation desktop profile: KDE, GNOME or Custom"
-msgstr ""
-"Gallwch ddewis proffil bwrdd gwaith eich man gwaith: KDR, GNOME neu Addasu"
+msgstr "Gallwch ddewis proffil bwrdd gwaith eich man gwaith: KDR, GNOME neu Addasu"
 
 #: steps_interactive.pm:521
 #, c-format
@@ -1117,7 +1090,7 @@ msgid ""
 "You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
-"Nid ydych wedi dewis unrhyw grwpiau o becynnau.\n"
+"Nid ydych wedi dewis grwpiau o becynnau.\n"
 "Dewiswch y gosod lleiaf rydych ei eisiau"
 
 #: steps_interactive.pm:540
@@ -1153,12 +1126,12 @@ msgstr "Roedd gwall wrth drefnu pecynnau:"
 #: steps_interactive.pm:628
 #, c-format
 msgid "Go on anyway?"
-msgstr "Mynd yn ein blaen beth bynnag?"
+msgstr "Mynd yn eich blaen beth bynnag?"
 
 #: steps_interactive.pm:632
 #, c-format
 msgid "Retry"
-msgstr "Ceisio Eto"
+msgstr "Ceisio eto"
 
 #: steps_interactive.pm:633
 #, c-format
@@ -1190,10 +1163,11 @@ msgstr "Ffurfweddiad ôl osod"
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Gwnewch yn siŵr fod cyfrwng Diweddaru Modiwlau yng ngyrrwr %s"
 
-#: steps_interactive.pm:691 steps_list.pm:47
+#: steps_interactive.pm:691
+#: steps_list.pm:47
 #, c-format
 msgid "Updates"
-msgstr "YUwchraddio"
+msgstr "Diweddaru"
 
 #: steps_interactive.pm:692
 #, c-format
@@ -1208,8 +1182,7 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 "Mae'n bosibl i chi llwytho i lawr y pecynnau diweddaraf sydd wedi eu\n"
-"ryddhau ers i'r dosbarthiad fod ar gael. Efallai bod gwallau a materion "
-"diogelwch wedi eu cywiro\n"
+"ryddhau ers i'r dosbarthiad fod ar gael. Efallai bod gwallau a materion diogelwch wedi eu cywiro\n"
 "\n"
 "I lwytho'r pecynnau i lawr, bydd angen cyswllt gweithredol\n"
 "â'r Rhyngrwyd.\n"
@@ -1232,13 +1205,17 @@ msgstr "Methu canfod drych: %s."
 msgid "%s on %s"
 msgstr "%s ar %s"
 
-#: steps_interactive.pm:860 steps_interactive.pm:867 steps_interactive.pm:881
-#: steps_interactive.pm:899 steps_interactive.pm:914
+#: steps_interactive.pm:860
+#: steps_interactive.pm:867
+#: steps_interactive.pm:881
+#: steps_interactive.pm:899
+#: steps_interactive.pm:914
 #, c-format
 msgid "Hardware"
 msgstr "Caledwedd"
 
-#: steps_interactive.pm:882 steps_interactive.pm:900
+#: steps_interactive.pm:882
+#: steps_interactive.pm:900
 #, c-format
 msgid "Sound card"
 msgstr "Cerdyn sain"
@@ -1250,12 +1227,8 @@ msgstr "A oes gennych gerdyn sain ISA?"
 
 #: steps_interactive.pm:905
 #, c-format
-msgid ""
-"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
-"card"
-msgstr ""
-"Rhedwch \"alsaconf\" neu \"sndconfig\" wedi'r gosodiad i ffurfweddu eich "
-"cerdyn sain"
+msgid "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound card"
+msgstr "Rhedwch \"alsaconf\" neu \"sndconfig\" wedi'r gosodiad i ffurfweddu eich cerdyn sain"
 
 #: steps_interactive.pm:907
 #, c-format
@@ -1267,7 +1240,8 @@ msgstr "Heb ganfod cerdyn sain. Ceisiwch \"harddrake\" wedi'r gosodiad"
 msgid "Graphical interface"
 msgstr "Rhyngwyneb graffigol"
 
-#: steps_interactive.pm:922 steps_interactive.pm:933
+#: steps_interactive.pm:922
+#: steps_interactive.pm:933
 #, c-format
 msgid "Network & Internet"
 msgstr "Rhwydwaith a'r Rhyngrwyd"
@@ -1314,16 +1288,8 @@ msgstr "Paratoi cychwynnwr..."
 
 #: steps_interactive.pm:1019
 #, c-format
-msgid ""
-"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
-"will not work for you. The install will continue, but you'll need to use "
-"BootX or some other means to boot your machine. The kernel argument for the "
-"root fs is: root=%s"
-msgstr ""
-"Mae'n ymddangos fod gennych beiriant OldWorld neu Anhysbys ac ni fydd "
-"cychwynnydd yaboot yn gweithio ar eich cyfer Bydd y gosodiad yn parhau ond "
-"bydd rhaid defnyddio BootX i gychwyn eich peiriant. Ymresymiad y cnewyllyn "
-"ar gyfer y gwraidd yw: root=%s"
+msgid "You appear to have an OldWorld or Unknown machine, the yaboot bootloader will not work for you. The install will continue, but you'll need to use BootX or some other means to boot your machine. The kernel argument for the root fs is: root=%s"
+msgstr "Mae'n ymddangos fod gennych beiriant OldWorld neu Anhysbys ac ni fydd cychwynnwr yaboot yn gweithio ar eich cyfer Bydd y gosodiad yn parhau ond bydd rhaid defnyddio BootX i gychwyn eich peiriant. Ymresymiad y cnewyllyn ar gyfer y gwraidd yw: root=%s"
 
 #: steps_interactive.pm:1025
 #, c-format
@@ -1341,12 +1307,8 @@ msgstr ""
 
 #: steps_interactive.pm:1040
 #, c-format
-msgid ""
-"In this security level, access to the files in the Windows partition is "
-"restricted to the administrator."
-msgstr ""
-"Ar y lefel diogelwch yma, mae mynedfa i ffeiliau yn rhaniad Windows wedi eu "
-"cyfyngu i'r Gweinyddwr."
+msgid "In this security level, access to the files in the Windows partition is restricted to the administrator."
+msgstr "Ar y lefel diogelwch yma, mae mynedfa i ffeiliau yn rhaniad Windows wedi eu cyfyngu i'r Gweinyddwr."
 
 #: steps_interactive.pm:1072
 #, c-format
@@ -1377,9 +1339,10 @@ msgstr "Llongyfarchiadau"
 #: steps_interactive.pm:1099
 #, c-format
 msgid "Reboot"
-msgstr "Ailgychwyn"
+msgstr "Ail gychwyn"
 
-#: steps_interactive.pm:1103 steps_interactive.pm:1104
+#: steps_interactive.pm:1103
+#: steps_interactive.pm:1104
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "Creu disg meddal awto gosod"
@@ -1413,7 +1376,7 @@ msgstr "Awtomeiddwyd"
 #: steps_interactive.pm:1113
 #, c-format
 msgid "Save packages selection"
-msgstr "Cadw'r dewis becynnau"
+msgstr "Cadw'r dewis o becynnau"
 
 #. -PO: please keep the following messages very short: they must fit in the left list of the installer!!!
 #: steps_list.pm:16
@@ -1423,7 +1386,8 @@ msgid ""
 "Language"
 msgstr "Iaith"
 
-#: steps_list.pm:16 steps_list.pm:23
+#: steps_list.pm:16
+#: steps_list.pm:23
 #, c-format
 msgid "Localization"
 msgstr "Lleoleiddio"
@@ -1442,14 +1406,16 @@ msgid ""
 "Mouse"
 msgstr "Llygoden"
 
-#: steps_list.pm:19 steps_list.pm:20
+#: steps_list.pm:19
+#: steps_list.pm:20
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Hard drive detection"
 msgstr "Canfod disg caled"
 
-#: steps_list.pm:21 steps_list.pm:22
+#: steps_list.pm:21
+#: steps_list.pm:22
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
@@ -1477,7 +1443,8 @@ msgid ""
 "Partitioning"
 msgstr "Creu rhaniadau"
 
-#: steps_list.pm:27 steps_list.pm:28
+#: steps_list.pm:27
+#: steps_list.pm:28
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
@@ -1505,21 +1472,24 @@ msgid ""
 "Users"
 msgstr "Defnyddwyr"
 
-#: steps_list.pm:36 steps_list.pm:37
+#: steps_list.pm:36
+#: steps_list.pm:37
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Networking"
 msgstr "Rhwydweithio"
 
-#: steps_list.pm:38 steps_list.pm:39
+#: steps_list.pm:38
+#: steps_list.pm:39
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
 "Bootloader"
 msgstr "Cychwynnwr"
 
-#: steps_list.pm:40 steps_list.pm:41
+#: steps_list.pm:40
+#: steps_list.pm:41
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
@@ -1533,7 +1503,8 @@ msgid ""
 "Summary"
 msgstr "Crynodeb"
 
-#: steps_list.pm:44 steps_list.pm:45
+#: steps_list.pm:44
+#: steps_list.pm:45
 #, c-format
 msgid ""
 "_: Keep these entry short\n"
@@ -1545,7 +1516,7 @@ msgstr "Gwasanaethau"
 msgid ""
 "_: Keep these entry short\n"
 "Updates"
-msgstr "Uwchraddio"
+msgstr "Diweddaru"
 
 #: steps_list.pm:48
 #, c-format
@@ -1556,107 +1527,74 @@ msgstr "Gorffen"
 
 #~ msgid "All"
 #~ msgstr "Popeth"
-
 #~ msgid "TV card"
 #~ msgstr "Cerdyn Teledu"
-
 #~ msgid "Boot"
 #~ msgstr "Cychwyn"
-
 #~ msgid ""
 #~ "_: Keep these entry short\n"
 #~ "Authentication"
 #~ msgstr "Dilysu"
-
 #~ msgid "Arkeia"
 #~ msgstr "Arkeia"
-
 #~ msgid "Flatout"
 #~ msgstr "Flatout"
-
 #~ msgid "Gwenview"
 #~ msgstr "Gwenview"
-
 #~ msgid "3D"
 #~ msgstr "3D"
-
 #~ msgid "CMS"
 #~ msgstr "CMS"
-
 #~ msgid "CRM"
 #~ msgstr "CRM"
-
 #~ msgid "2007 product line"
 #~ msgstr "Cynnyrch 2007"
-
 #~ msgid "Invictus Firewall"
 #~ msgstr "Mur Cadarn Invictus"
-
 #~ msgid "Discovery Live Mode"
 #~ msgstr "Modd Byw Discovery"
-
 #~ msgid "How to register"
 #~ msgstr "Sut i gofrestru"
-
 #~ msgid "Rpmdrake 2"
 #~ msgstr "Rpmdrake 2"
-
 #~ msgid "Mandriva Online Services"
 #~ msgstr "Mandriva Online Services"
-
 #~ msgid "New Theme"
 #~ msgstr "Thema Newydd"
-
 #~ msgid "Web 2.0"
 #~ msgstr "Web 2.0"
-
 #~ msgid "Kaspersky"
 #~ msgstr "Kaspersky"
-
 #~ msgid "LinDVD"
 #~ msgstr "LinDVD"
-
 #~ msgid "Skype"
 #~ msgstr "Skype"
-
 #~ msgid "Transgaming/Cedega"
 #~ msgstr "Transgaming/Cedega"
-
 #~ msgid "DrakVPN"
 #~ msgstr "DrakVPN"
-
 #~ msgid "(%d package, %d MB)"
 #~ msgid_plural "(%d packages, %d MB)"
 #~ msgstr[0] "(%d pecyn, %d MB)"
 #~ msgstr[1] "(%d pecyn, %d MB)"
-
 #~ msgid "%d packages"
 #~ msgstr "%d pecyn"
-
 #~ msgid "Language"
 #~ msgstr "Iaith"
-
 #~ msgid "License"
 #~ msgstr "Trwydded"
-
 #~ msgid "Installation class"
 #~ msgstr "Dosbarth gosod"
-
 #~ msgid "Formatting"
 #~ msgstr "Fformatio"
-
 #~ msgid "Choosing packages"
 #~ msgstr "Dewis pecynnau"
-
 #~ msgid "Users"
 #~ msgstr "Defnyddwyr"
-
 #~ msgid "Networking"
 #~ msgstr "Rhwydweithio"
-
 #~ msgid "Configure X"
 #~ msgstr "Ffurfweddu X"
-
 #~ msgid ""
 #~ "Can not access kernel modules corresponding to your kernel (file %s is "
 #~ "missing), this generally means your boot floppy in not in sync with the "
@@ -1666,3 +1604,4 @@ msgstr "Gorffen"
 #~ "chi (mae ffeil %s ar goll), mae hyn yn golygu, fel arfer, nad yw eich "
 #~ "disg cychwyn yn cydweddu gyda'r cyfrwng Gosod (crëwch ddisg cychwyn "
 #~ "meddal newydd)"
+