20080311

1 files changed, 744 insertions, 873 deletions

diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po
index 26dac4e95..111167951 100644
--- a/perl-install/share/po/cy.po
+++ b/perl-install/share/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mandriva DrakX.cy\n"
 "POT-Creation-Date: 2008-03-11 20:27+0100\n"
-"PO-Revision-Date: 2007-09-25 23:23+0100\n"
+"PO-Revision-Date: 2008-03-11 22:19+0100\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg <post@meddal.com>\n"
 "MIME-Version: 1.0\n"
@@ -16,10 +16,16 @@ msgstr ""
 "X-Poedit-Country: UNITED KINGDOM\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: any.pm:245 diskdrake/interactive.pm:552 diskdrake/interactive.pm:739
-#: diskdrake/interactive.pm:783 diskdrake/interactive.pm:841
-#: diskdrake/interactive.pm:1132 do_pkgs.pm:216 do_pkgs.pm:258
-#: harddrake/sound.pm:202 interactive.pm:580
+#: any.pm:245
+#: diskdrake/interactive.pm:552
+#: diskdrake/interactive.pm:739
+#: diskdrake/interactive.pm:783
+#: diskdrake/interactive.pm:841
+#: diskdrake/interactive.pm:1132
+#: do_pkgs.pm:216
+#: do_pkgs.pm:258
+#: harddrake/sound.pm:202
+#: interactive.pm:580
 #, c-format
 msgid "Please wait"
 msgstr "Arhoswch..."
@@ -33,8 +39,7 @@ msgstr "Wrthi'n gosod cychwynnwr"
 #, c-format
 msgid ""
 "LILO wants to assign a new Volume ID to drive %s.  However, changing\n"
-"the Volume ID of a Windows NT, 2000, or XP boot disk is a fatal Windows "
-"error.\n"
+"the Volume ID of a Windows NT, 2000, or XP boot disk is a fatal Windows error.\n"
 "This caution does not apply to Windows 95 or 98, or to NT data disks.\n"
 "\n"
 "Assign a new Volume ID?"
@@ -71,14 +76,12 @@ msgstr ""
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
-"This implies you already have a bootloader on the hard drive you boot (eg: "
-"System Commander).\n"
+"This implies you already have a bootloader on the hard drive you boot (eg: System Commander).\n"
 "\n"
 "On which drive are you booting?"
 msgstr ""
 "Rydych wedi penderfynu gosod y cychwynnwr ar raniad.\n"
-"Mae hyn yn awgrymu bod gennych gychwynnwr ar ddisg caled eisoes: (ee System "
-"Commander).\n"
+"Mae hyn yn awgrymu bod gennych gychwynnwr ar ddisg caled eisoes: (ee System Commander).\n"
 "\n"
 "Gyda pha ddisg ydych chi'n cychwyn?"
 
@@ -117,7 +120,9 @@ msgstr "Lle rydych chi eisiau gosod y cychwynnwr?"
 msgid "Boot Style Configuration"
 msgstr "Ffurfweddu'r Math o Gychwyn"
 
-#: any.pm:382 any.pm:414 any.pm:415
+#: any.pm:382
+#: any.pm:414
+#: any.pm:415
 #, c-format
 msgid "Bootloader main options"
 msgstr "Prif ddewisiadau'r cychwynnwr"
@@ -127,12 +132,14 @@ msgstr "Prif ddewisiadau'r cychwynnwr"
 msgid "Bootloader"
 msgstr "Cychwynnwr"
 
-#: any.pm:388 any.pm:419
+#: any.pm:388
+#: any.pm:419
 #, c-format
 msgid "Bootloader to use"
 msgstr "Dewis cychwynnwr"
 
-#: any.pm:390 any.pm:421
+#: any.pm:390
+#: any.pm:421
 #, c-format
 msgid "Boot device"
 msgstr "Dyfais cychwyn"
@@ -162,18 +169,24 @@ msgstr "Galluogi APIC"
 msgid "Enable Local APIC"
 msgstr "Galluogi APIC Lleol"
 
-#: any.pm:398 any.pm:785 any.pm:794 authentication.pm:197
+#: any.pm:398
+#: any.pm:785
+#: any.pm:794
+#: authentication.pm:197
 #: diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Password"
 msgstr "Cyfrinair"
 
-#: any.pm:400 authentication.pm:208
+#: any.pm:400
+#: authentication.pm:208
 #, c-format
 msgid "The passwords do not match"
 msgstr "Nid yw'r cyfrineiriau'n cyd-fynd"
 
-#: any.pm:400 authentication.pm:208 diskdrake/interactive.pm:1299
+#: any.pm:400
+#: authentication.pm:208
+#: diskdrake/interactive.pm:1299
 #, c-format
 msgid "Please try again"
 msgstr "Ceisiwch eto"
@@ -183,7 +196,10 @@ msgstr "Ceisiwch eto"
 msgid "You can not use a password with %s"
 msgstr "Nid oes modd defnyddio cyfrinair gyda %s"
 
-#: any.pm:404 any.pm:787 any.pm:796 authentication.pm:198
+#: any.pm:404
+#: any.pm:787
+#: any.pm:796
+#: authentication.pm:198
 #, c-format
 msgid "Password (again)"
 msgstr "Cyfrinair (eto)"
@@ -200,10 +216,8 @@ msgstr "cyfyngu"
 
 #: any.pm:406
 #, c-format
-msgid ""
-"Option ``Restrict command line options'' is of no use without a password"
-msgstr ""
-"Dewis ``Nid yw 'cyfyngu dewisiadau llinell orchymyn'' o werth heb gyfrinair"
+msgid "Option ``Restrict command line options'' is of no use without a password"
+msgstr "Dewis ``Nid yw 'cyfyngu dewisiadau llinell orchymyn'' o werth heb gyfrinair"
 
 #: any.pm:408
 #, c-format
@@ -255,12 +269,14 @@ msgstr "System Weithredu Rhagosodedig?"
 msgid "Image"
 msgstr "Delwedd"
 
-#: any.pm:494 any.pm:507
+#: any.pm:494
+#: any.pm:507
 #, c-format
 msgid "Root"
 msgstr "Gwraidd"
 
-#: any.pm:495 any.pm:520
+#: any.pm:495
+#: any.pm:520
 #, c-format
 msgid "Append"
 msgstr "Atodi"
@@ -285,12 +301,17 @@ msgstr "Initrd"
 msgid "Network profile"
 msgstr "Proffil rhwydwaith"
 
-#: any.pm:512 any.pm:517 any.pm:519 diskdrake/interactive.pm:374
+#: any.pm:512
+#: any.pm:517
+#: any.pm:519
+#: diskdrake/interactive.pm:374
 #, c-format
 msgid "Label"
 msgstr "Label"
 
-#: any.pm:514 any.pm:522 harddrake/v4l.pm:438
+#: any.pm:514
+#: any.pm:522
+#: harddrake/v4l.pm:438
 #, c-format
 msgid "Default"
 msgstr "Rhagosodedig"
@@ -396,10 +417,8 @@ msgstr "Rhowch enw defnyddiwr"
 
 #: any.pm:763
 #, c-format
-msgid ""
-"The user name must contain only lower cased letters, numbers, `-' and `_'"
-msgstr ""
-"Rhaid i'r enw defnyddiwr gynnwys dim ond llythrennau bach, rhifau, '-' a '_'"
+msgid "The user name must contain only lower cased letters, numbers, `-' and `_'"
+msgstr "Rhaid i'r enw defnyddiwr gynnwys dim ond llythrennau bach, rhifau, '-' a '_'"
 
 #: any.pm:764
 #, c-format
@@ -411,12 +430,14 @@ msgstr "Mae'r enw defnyddiwr yn rhy hir"
 msgid "This user name has already been added"
 msgstr "Mae'r enw defnyddiwr wedi ei ychwanegu yn barod"
 
-#: any.pm:771 any.pm:798
+#: any.pm:771
+#: any.pm:798
 #, c-format
 msgid "User ID"
 msgstr "Enw Defnyddiwr"
 
-#: any.pm:771 any.pm:799
+#: any.pm:771
+#: any.pm:799
 #, c-format
 msgid "Group ID"
 msgstr "Enw Grŵp"
@@ -436,7 +457,8 @@ msgstr "Dylai %s fod dros 500. Parhau beth bynnag?"
 msgid "User management"
 msgstr "Rheoli defnyddiwr"
 
-#: any.pm:784 authentication.pm:183
+#: any.pm:784
+#: authentication.pm:183
 #, c-format
 msgid "Set administrator (root) password"
 msgstr "Gosod cyfrinair gweinyddwr (root)"
@@ -461,7 +483,8 @@ msgstr "Enw mewngofnodi"
 msgid "Shell"
 msgstr "Cragen"
 
-#: any.pm:835 security/l10n.pm:14
+#: any.pm:835
+#: security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "Awto mewngofnodi"
@@ -486,12 +509,15 @@ msgstr "Dewis y defnyddiwr rhagosodedig:"
 msgid "Choose the window manager to run:"
 msgstr "Dewiswch y rheolwr ffenestr i redeg:"
 
-#: any.pm:862 any.pm:912
+#: any.pm:862
+#: any.pm:912
 #, c-format
 msgid "Release Notes"
 msgstr "Nodiadau Ryddhau"
 
-#: any.pm:869 any.pm:1201 interactive/gtk.pm:766
+#: any.pm:869
+#: any.pm:1201
+#: interactive/gtk.pm:766
 #, c-format
 msgid "Close"
 msgstr "Cau"
@@ -501,7 +527,8 @@ msgstr "Cau"
 msgid "License agreement"
 msgstr "Cytundeb trwyddedu"
 
-#: any.pm:908 diskdrake/dav.pm:26
+#: any.pm:908
+#: diskdrake/dav.pm:26
 #, c-format
 msgid "Quit"
 msgstr "Gadael"
@@ -516,12 +543,14 @@ msgstr "Derbyn"
 msgid "Refuse"
 msgstr "Gwrthod"
 
-#: any.pm:930 any.pm:996
+#: any.pm:930
+#: any.pm:996
 #, c-format
 msgid "Please choose a language to use."
 msgstr "Dewiswch iaith i'w defnyddio."
 
-#: any.pm:931 any.pm:997
+#: any.pm:931
+#: any.pm:997
 #, c-format
 msgid "Language choice"
 msgstr "Dewis iaith"
@@ -542,7 +571,8 @@ msgstr ""
 msgid "Multi languages"
 msgstr "Amlieithog"
 
-#: any.pm:975 any.pm:1005
+#: any.pm:975
+#: any.pm:1005
 #, c-format
 msgid "Old compatibility (non UTF-8) encoding"
 msgstr "Hen Amgodiad (nid utf-8)"
@@ -572,7 +602,8 @@ msgstr "Dyma restr lawn o'r gwledydd sydd ar gael"
 msgid "Other Countries"
 msgstr "Gwledydd eraill"
 
-#: any.pm:1057 interactive.pm:481
+#: any.pm:1057
+#: interactive.pm:481
 #, c-format
 msgid "Advanced"
 msgstr "Uwch"
@@ -606,41 +637,29 @@ msgstr "Arddull"
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
-"Allowing this will permit users to simply click on \"Share\" in konqueror "
-"and nautilus.\n"
+"Allowing this will permit users to simply click on \"Share\" in konqueror and nautilus.\n"
 "\n"
 "\"Custom\" permit a per-user granularity.\n"
 msgstr ""
 "Hoffech chi ganiatáu i rai defnyddwyr rannu eu cyfeiriaduron?\n"
-"Bydd caniatáu hyn yn gadael i ddefnyddwyr glicio ar \"Rhannu\" yn konqueror "
-"a nautilus.\n"
+"Bydd caniatáu hyn yn gadael i ddefnyddwyr glicio ar \"Rhannu\" yn konqueror a nautilus.\n"
 "\n"
 "\"Addasu\" caniatáu cyfran i'r defnyddwyr.\n"
 
 #: any.pm:1162
 #, c-format
-msgid ""
-"NFS: the traditional Unix file sharing system, with less support on Mac and "
-"Windows."
-msgstr ""
-"NFS: system rhannu ffeiliau traddodiadol Unix, sydd â llai o gefnogaeth ar "
-"Mac a Windows."
+msgid "NFS: the traditional Unix file sharing system, with less support on Mac and Windows."
+msgstr "NFS: system rhannu ffeiliau traddodiadol Unix, sydd â llai o gefnogaeth ar Mac a Windows."
 
 #: any.pm:1165
 #, c-format
-msgid ""
-"SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
-"systems."
-msgstr ""
-"SMB: system rhannu ffeiliau sy'n cael ei ddefnyddio yn Windows, Mac OSX a "
-"nifer o systemau Linux diweddar."
+msgid "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux systems."
+msgstr "SMB: system rhannu ffeiliau sy'n cael ei ddefnyddio yn Windows, Mac OSX a nifer o systemau Linux diweddar."
 
 #: any.pm:1173
 #, c-format
-msgid ""
-"You can export using NFS or SMB. Please select which you would like to use."
-msgstr ""
-"Gallwch allforio gan ddefnyddio NFS neu SMB. Pa un hoffech chi ei ddefnyddio?"
+msgid "You can export using NFS or SMB. Please select which you would like to use."
+msgstr "Gallwch allforio gan ddefnyddio NFS neu SMB. Pa un hoffech chi ei ddefnyddio?"
 
 #: any.pm:1201
 #, c-format
@@ -676,7 +695,8 @@ msgstr "Cylchfa amser"
 msgid "Which is your timezone?"
 msgstr "Pa un yw eich parth amser?"
 
-#: any.pm:1346 any.pm:1348
+#: any.pm:1346
+#: any.pm:1348
 #, c-format
 msgid "Date, Clock & Time Zone Settings"
 msgstr "Gosodiadau Dyddiad Cloc a Chylchedd Amser"
@@ -726,7 +746,8 @@ msgstr "NIS"
 msgid "Smart Card"
 msgstr "Cerdyn Clyfar"
 
-#: authentication.pm:28 authentication.pm:164
+#: authentication.pm:28
+#: authentication.pm:164
 #, c-format
 msgid "Windows Domain"
 msgstr "Parth Windows"
@@ -749,9 +770,7 @@ msgstr "Ffeil leol:"
 #: authentication.pm:67
 #, c-format
 msgid "Use information stored in local files for all authentication"
-msgstr ""
-"Defnyddiwch wybodaeth sydd wedi ei gadw ar ffeiliau lleol ar gyfer pob "
-"dilysiad"
+msgstr "Defnyddiwch wybodaeth sydd wedi ei gadw ar ffeiliau lleol ar gyfer pob dilysiad"
 
 #: authentication.pm:68
 #, c-format
@@ -760,12 +779,8 @@ msgstr "LDAP:"
 
 #: authentication.pm:68
 #, c-format
-msgid ""
-"Tells your computer to use LDAP for some or all authentication. LDAP "
-"consolidates certain types of information within your organization."
-msgstr ""
-"Dweud wrth eich cyfrifiadur i ddefnyddio LDAP ar gyfer rhai neu'r holl "
-"ddilysiad. Mae LDAP yn crynhoi mathau arbennig o wybodaeth o fewn eich corff."
+msgid "Tells your computer to use LDAP for some or all authentication. LDAP consolidates certain types of information within your organization."
+msgstr "Dweud wrth eich cyfrifiadur i ddefnyddio LDAP ar gyfer rhai neu'r holl ddilysiad. Mae LDAP yn crynhoi mathau arbennig o wybodaeth o fewn eich corff."
 
 #: authentication.pm:69
 #, c-format
@@ -774,12 +789,8 @@ msgstr "NIS:"
 
 #: authentication.pm:69
 #, c-format
-msgid ""
-"Allows you to run a group of computers in the same Network Information "
-"Service domain with a common password and group file."
-msgstr ""
-"Caniatáu i chi redeg grŵp o gyfrifiaduron yn yr un parth Gwasanaeth "
-"Gwybodaeth Rhwydwaith gyda chyfrinair cyffredin a ffeil grŵp."
+msgid "Allows you to run a group of computers in the same Network Information Service domain with a common password and group file."
+msgstr "Caniatáu i chi redeg grŵp o gyfrifiaduron yn yr un parth Gwasanaeth Gwybodaeth Rhwydwaith gyda chyfrinair cyffredin a ffeil grŵp."
 
 #: authentication.pm:70
 #, c-format
@@ -788,12 +799,8 @@ msgstr "Parth Windows:"
 
 #: authentication.pm:70
 #, c-format
-msgid ""
-"Winbind allows the system to retrieve information and authenticate users in "
-"a Windows domain."
-msgstr ""
-"Mae Winbind yn caniatáu i'r system estyn gwybodaeth a dilysu defnyddwyr mewn "
-"parth Windows."
+msgid "Winbind allows the system to retrieve information and authenticate users in a Windows domain."
+msgstr "Mae Winbind yn caniatáu i'r system estyn gwybodaeth a dilysu defnyddwyr mewn parth Windows."
 
 #: authentication.pm:71
 #, c-format
@@ -812,12 +819,8 @@ msgstr "Cyfeiriadur Byw gyda Winbind:"
 
 #: authentication.pm:72
 #, c-format
-msgid ""
-"Winbind allows the system to authenticate users in a Windows Active "
-"Directory Server."
-msgstr ""
-"Mae Winbind yn caniatáu i'r system ddilysu defnyddwyr mewn Gweinydd "
-"Cyfeiriadur Byw Windows"
+msgid "Winbind allows the system to authenticate users in a Windows Active Directory Server."
+msgstr "Mae Winbind yn caniatáu i'r system ddilysu defnyddwyr mewn Gweinydd Cyfeiriadur Byw Windows"
 
 #: authentication.pm:97
 #, c-format
@@ -834,7 +837,8 @@ msgstr "Sail dn LDAP"
 msgid "LDAP Server"
 msgstr "Gweinydd LDAP"
 
-#: authentication.pm:112 fsedit.pm:23
+#: authentication.pm:112
+#: fsedit.pm:23
 #, c-format
 msgid "simple"
 msgstr "syml"
@@ -854,17 +858,20 @@ msgstr "SSL"
 msgid "security layout (SASL/Kerberos)"
 msgstr "trefn diogelwch (SASL/Kerberos)"
 
-#: authentication.pm:122 authentication.pm:160
+#: authentication.pm:122
+#: authentication.pm:160
 #, c-format
 msgid "Authentication Active Directory"
 msgstr "Cyfeiriadur Byw Dilysu"
 
-#: authentication.pm:123 diskdrake/smbnfs_gtk.pm:182
+#: authentication.pm:123
+#: diskdrake/smbnfs_gtk.pm:182
 #, c-format
 msgid "Domain"
 msgstr "Parth"
 
-#: authentication.pm:125 diskdrake/dav.pm:63
+#: authentication.pm:125
+#: diskdrake/dav.pm:63
 #, c-format
 msgid "Server"
 msgstr "Gweinydd"
@@ -907,29 +914,15 @@ msgstr "Gweinydd NIS"
 #: authentication.pm:148
 #, c-format
 msgid ""
-"For this to work for a W2K PDC, you will probably need to have the admin "
-"run: C:\\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /"
-"add and reboot the server.\n"
-"You will also need the username/password of a Domain Admin to join the "
-"machine to the Windows(TM) domain.\n"
-"If networking is not yet enabled, Drakx will attempt to join the domain "
-"after the network setup step.\n"
-"Should this setup fail for some reason and domain authentication is not "
-"working, run 'smbpasswd -j DOMAIN -U USER%%PASSWORD' using your Windows(tm) "
-"Domain, and Admin Username/Password, after system boot.\n"
-"The command 'wbinfo -t' will test whether your authentication secrets are "
-"good."
+"For this to work for a W2K PDC, you will probably need to have the admin run: C:\\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /add and reboot the server.\n"
+"You will also need the username/password of a Domain Admin to join the machine to the Windows(TM) domain.\n"
+"If networking is not yet enabled, Drakx will attempt to join the domain after the network setup step.\n"
+"Should this setup fail for some reason and domain authentication is not working, run 'smbpasswd -j DOMAIN -U USER%%PASSWORD' using your Windows(tm) Domain, and Admin Username/Password, after system boot.\n"
+"The command 'wbinfo -t' will test whether your authentication secrets are good."
 msgstr ""
-"I hyn weithio gyda 2WK PDC, bydd angen i chi gael y gweinyddwr i redeg C:"
-"\\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /add ac "
-"ailgychwyn y gweinydd. Bydd angen hefyd yr enw defnyddiwr/cyfrinair "
-"Gweinyddiaeth Parth i uno'r peiriant â pharth Windows (NM).\n"
-"Os nad yw'r rhwydwaith wedi ei alluogi eto, bydd DrakX yn ceisio ymuno â'r "
-"parth ar ôl y cam o gychwyn y rhwydwaith.\n"
-"Os bydd y cam hwn yn methu am ryw reswm ac nid yw dilysiad yn gweithio, "
-"rhedwch 'smbpasswd -j DOMAIN -U USER%%PASSWORD' gan ddefnyddio eich Parth "
-"Windows(NM), a'ch Enw Defnyddiwr Gweinyddol/Cyfrinair ar ôl cychwyn eich "
-"system.\n"
+"I hyn weithio gyda 2WK PDC, bydd angen i chi gael y gweinyddwr i redeg C:\\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /add ac ailgychwyn y gweinydd. Bydd angen hefyd yr enw defnyddiwr/cyfrinair Gweinyddiaeth Parth i uno'r peiriant â pharth Windows (NM).\n"
+"Os nad yw'r rhwydwaith wedi ei alluogi eto, bydd DrakX yn ceisio ymuno â'r parth ar ôl y cam o gychwyn y rhwydwaith.\n"
+"Os bydd y cam hwn yn methu am ryw reswm ac nid yw dilysiad yn gweithio, rhedwch 'smbpasswd -j DOMAIN -U USER%%PASSWORD' gan ddefnyddio eich Parth Windows(NM), a'ch Enw Defnyddiwr Gweinyddol/Cyfrinair ar ôl cychwyn eich system.\n"
 "Bydd y gorchymyn 'wbinfo -t' yn gwirio a yw eich cyfrinachau dilysu'n addas."
 
 #: authentication.pm:160
@@ -952,7 +945,8 @@ msgstr "Enw Defnyddiwr Gweinyddiaeth Parth"
 msgid "Domain Admin Password"
 msgstr "Cyfrinair Gweinyddol y Parth"
 
-#: authentication.pm:182 authentication.pm:199
+#: authentication.pm:182
+#: authentication.pm:199
 #, c-format
 msgid "Authentication"
 msgstr "Dilysu"
@@ -1031,21 +1025,13 @@ msgstr "Nid oes modd gosod y cychwynnwr ar raniad %s\n"
 
 #: bootloader.pm:1813
 #, c-format
-msgid ""
-"Your bootloader configuration must be updated because partition has been "
-"renumbered"
-msgstr ""
-"Rhaid i ffurfweddiad eich cychwynnwr gael ei ddiweddaru am i'r rhaniadau "
-"gael eu hail rifo."
+msgid "Your bootloader configuration must be updated because partition has been renumbered"
+msgstr "Rhaid i ffurfweddiad eich cychwynnwr gael ei ddiweddaru am i'r rhaniadau gael eu hail rifo."
 
 #: bootloader.pm:1826
 #, c-format
-msgid ""
-"The bootloader can not be installed correctly. You have to boot rescue and "
-"choose \"%s\""
-msgstr ""
-"Methu gosod eich cychwynnwr yn iawn, Rhaid defnyddio achub cychwyn a dewis "
-"\"%s\""
+msgid "The bootloader can not be installed correctly. You have to boot rescue and choose \"%s\""
+msgstr "Methu gosod eich cychwynnwr yn iawn, Rhaid defnyddio achub cychwyn a dewis \"%s\""
 
 #: bootloader.pm:1827
 #, c-format
@@ -1072,7 +1058,8 @@ msgstr "MB"
 msgid "GB"
 msgstr "GB"
 
-#: common.pm:142 common.pm:151
+#: common.pm:142
+#: common.pm:151
 #, c-format
 msgid "TB"
 msgstr "TB"
@@ -1115,47 +1102,78 @@ msgstr ""
 msgid "New"
 msgstr "Newydd"
 
-#: diskdrake/dav.pm:61 diskdrake/interactive.pm:380 diskdrake/smbnfs_gtk.pm:75
+#: diskdrake/dav.pm:61
+#: diskdrake/interactive.pm:380
+#: diskdrake/smbnfs_gtk.pm:75
 #, c-format
 msgid "Unmount"
 msgstr "Dadarosod"
 
-#: diskdrake/dav.pm:62 diskdrake/interactive.pm:377 diskdrake/smbnfs_gtk.pm:76
+#: diskdrake/dav.pm:62
+#: diskdrake/interactive.pm:377
+#: diskdrake/smbnfs_gtk.pm:76
 #, c-format
 msgid "Mount"
 msgstr "Arosod"
 
-#: diskdrake/dav.pm:64 diskdrake/interactive.pm:371
-#: diskdrake/interactive.pm:611 diskdrake/interactive.pm:629
-#: diskdrake/interactive.pm:633 diskdrake/removable.pm:23
+#: diskdrake/dav.pm:64
+#: diskdrake/interactive.pm:371
+#: diskdrake/interactive.pm:611
+#: diskdrake/interactive.pm:629
+#: diskdrake/interactive.pm:633
+#: diskdrake/removable.pm:23
 #: diskdrake/smbnfs_gtk.pm:79
 #, c-format
 msgid "Mount point"
 msgstr "Pwynt arosod"
 
-#: diskdrake/dav.pm:65 diskdrake/interactive.pm:373
-#: diskdrake/interactive.pm:987 diskdrake/removable.pm:24
+#: diskdrake/dav.pm:65
+#: diskdrake/interactive.pm:373
+#: diskdrake/interactive.pm:987
+#: diskdrake/removable.pm:24
 #: diskdrake/smbnfs_gtk.pm:80
 #, c-format
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:164 diskdrake/removable.pm:26
-#: diskdrake/smbnfs_gtk.pm:82 interactive/http.pm:151
+#: diskdrake/dav.pm:66
+#: diskdrake/hd_gtk.pm:164
+#: diskdrake/removable.pm:26
+#: diskdrake/smbnfs_gtk.pm:82
+#: interactive/http.pm:151
 #, c-format
 msgid "Done"
 msgstr "Gorffen"
 
-#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:113 diskdrake/interactive.pm:231
-#: diskdrake/interactive.pm:244 diskdrake/interactive.pm:478
-#: diskdrake/interactive.pm:483 diskdrake/interactive.pm:601
-#: diskdrake/interactive.pm:859 diskdrake/interactive.pm:1033
-#: diskdrake/interactive.pm:1046 diskdrake/interactive.pm:1049
-#: diskdrake/interactive.pm:1299 diskdrake/smbnfs_gtk.pm:42 do_pkgs.pm:19
-#: do_pkgs.pm:24 do_pkgs.pm:40 do_pkgs.pm:56 do_pkgs.pm:61 fsedit.pm:223
-#: interactive/http.pm:117 interactive/http.pm:118 modules/interactive.pm:19
-#: scanner.pm:94 scanner.pm:105 scanner.pm:112 scanner.pm:119 wizards.pm:95
-#: wizards.pm:99 wizards.pm:121
+#: diskdrake/dav.pm:75
+#: diskdrake/hd_gtk.pm:113
+#: diskdrake/interactive.pm:231
+#: diskdrake/interactive.pm:244
+#: diskdrake/interactive.pm:478
+#: diskdrake/interactive.pm:483
+#: diskdrake/interactive.pm:601
+#: diskdrake/interactive.pm:859
+#: diskdrake/interactive.pm:1033
+#: diskdrake/interactive.pm:1046
+#: diskdrake/interactive.pm:1049
+#: diskdrake/interactive.pm:1299
+#: diskdrake/smbnfs_gtk.pm:42
+#: do_pkgs.pm:19
+#: do_pkgs.pm:24
+#: do_pkgs.pm:40
+#: do_pkgs.pm:56
+#: do_pkgs.pm:61
+#: fsedit.pm:223
+#: interactive/http.pm:117
+#: interactive/http.pm:118
+#: modules/interactive.pm:19
+#: scanner.pm:94
+#: scanner.pm:105
+#: scanner.pm:112
+#: scanner.pm:119
+#: wizards.pm:95
+#: wizards.pm:99
+#: wizards.pm:121
 #, c-format
 msgid "Error"
 msgstr "Gwall"
@@ -1175,28 +1193,38 @@ msgstr "Rhaid i'r URL gychwyn gyda http:// neu https://"
 msgid "Server: "
 msgstr "Gweinydd:"
 
-#: diskdrake/dav.pm:110 diskdrake/interactive.pm:451
-#: diskdrake/interactive.pm:1179 diskdrake/interactive.pm:1259
+#: diskdrake/dav.pm:110
+#: diskdrake/interactive.pm:451
+#: diskdrake/interactive.pm:1179
+#: diskdrake/interactive.pm:1259
 #, c-format
 msgid "Mount point: "
 msgstr "Pwynt arosod:"
 
-#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1266
+#: diskdrake/dav.pm:111
+#: diskdrake/interactive.pm:1266
 #, c-format
 msgid "Options: %s"
 msgstr "Dewisiadau: %s"
 
-#: diskdrake/hd_gtk.pm:53 diskdrake/interactive.pm:282
-#: diskdrake/smbnfs_gtk.pm:22 fs/mount_point.pm:106
-#: fs/partitioning_wizard.pm:51 fs/partitioning_wizard.pm:205
-#: fs/partitioning_wizard.pm:211 fs/partitioning_wizard.pm:251
-#: fs/partitioning_wizard.pm:270 fs/partitioning_wizard.pm:275
+#: diskdrake/hd_gtk.pm:53
+#: diskdrake/interactive.pm:282
+#: diskdrake/smbnfs_gtk.pm:22
+#: fs/mount_point.pm:106
+#: fs/partitioning_wizard.pm:51
+#: fs/partitioning_wizard.pm:205
+#: fs/partitioning_wizard.pm:211
+#: fs/partitioning_wizard.pm:251
+#: fs/partitioning_wizard.pm:270
+#: fs/partitioning_wizard.pm:275
 #, c-format
 msgid "Partitioning"
 msgstr "Creu rhaniadau"
 
-#: diskdrake/hd_gtk.pm:93 diskdrake/interactive.pm:1008
-#: diskdrake/interactive.pm:1018 diskdrake/interactive.pm:1071
+#: diskdrake/hd_gtk.pm:93
+#: diskdrake/interactive.pm:1008
+#: diskdrake/interactive.pm:1018
+#: diskdrake/interactive.pm:1071
 #, c-format
 msgid "Read carefully!"
 msgstr "Darllenwch yn ofalus!"
@@ -1206,7 +1234,8 @@ msgstr "Darllenwch yn ofalus!"
 msgid "Please make a backup of your data first"
 msgstr "Gwnewch gopi wrth gefn o'ch data yn gyntaf"
 
-#: diskdrake/hd_gtk.pm:94 diskdrake/interactive.pm:224
+#: diskdrake/hd_gtk.pm:94
+#: diskdrake/interactive.pm:224
 #, c-format
 msgid "Exit"
 msgstr "Gadael"
@@ -1219,16 +1248,19 @@ msgstr "Parhau"
 #: diskdrake/hd_gtk.pm:97
 #, c-format
 msgid ""
-"If you plan to use aboot, be careful to leave a free space (2048 sectors is "
-"enough)\n"
+"If you plan to use aboot, be careful to leave a free space (2048 sectors is enough)\n"
 "at the beginning of the disk"
 msgstr ""
-"Os ydych yn bwriadu defnyddio aboot, gofalwch adael lle gwag (2048 sector yn "
-"ddigon)\n"
+"Os ydych yn bwriadu defnyddio aboot, gofalwch adael lle gwag (2048 sector yn ddigon)\n"
 "ar ddechrau'r ddisg."
 
-#: diskdrake/hd_gtk.pm:160 interactive.pm:644 interactive/gtk.pm:744
-#: interactive/gtk.pm:759 interactive/gtk.pm:779 ugtk2.pm:936 ugtk2.pm:937
+#: diskdrake/hd_gtk.pm:160
+#: interactive.pm:644
+#: interactive/gtk.pm:744
+#: interactive/gtk.pm:759
+#: interactive/gtk.pm:779
+#: ugtk2.pm:936
+#: ugtk2.pm:937
 #, c-format
 msgid "Help"
 msgstr "Cymorth"
@@ -1254,7 +1286,8 @@ msgstr ""
 msgid "Please click on a partition"
 msgstr "Cliciwch ar raniad"
 
-#: diskdrake/hd_gtk.pm:215 diskdrake/smbnfs_gtk.pm:63
+#: diskdrake/hd_gtk.pm:215
+#: diskdrake/smbnfs_gtk.pm:63
 #, c-format
 msgid "Details"
 msgstr "Manylion"
@@ -1299,12 +1332,14 @@ msgstr "HFS"
 msgid "Windows"
 msgstr "Windows"
 
-#: diskdrake/hd_gtk.pm:353 services.pm:158
+#: diskdrake/hd_gtk.pm:353
+#: services.pm:158
 #, c-format
 msgid "Other"
 msgstr "Arall"
 
-#: diskdrake/hd_gtk.pm:353 diskdrake/interactive.pm:1194
+#: diskdrake/hd_gtk.pm:353
+#: diskdrake/interactive.pm:1194
 #, c-format
 msgid "Empty"
 msgstr "Gwag"
@@ -1314,13 +1349,22 @@ msgstr "Gwag"
 msgid "Filesystem types:"
 msgstr "Mathau o system ffeiliau:"
 
-#: diskdrake/hd_gtk.pm:381 diskdrake/interactive.pm:287
-#: diskdrake/interactive.pm:359 diskdrake/interactive.pm:508
-#: diskdrake/interactive.pm:692 diskdrake/interactive.pm:750
-#: diskdrake/interactive.pm:839 diskdrake/interactive.pm:881
-#: diskdrake/interactive.pm:882 diskdrake/interactive.pm:1117
-#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1298 do_pkgs.pm:16
-#: do_pkgs.pm:35 do_pkgs.pm:53 harddrake/sound.pm:286
+#: diskdrake/hd_gtk.pm:381
+#: diskdrake/interactive.pm:287
+#: diskdrake/interactive.pm:359
+#: diskdrake/interactive.pm:508
+#: diskdrake/interactive.pm:692
+#: diskdrake/interactive.pm:750
+#: diskdrake/interactive.pm:839
+#: diskdrake/interactive.pm:881
+#: diskdrake/interactive.pm:882
+#: diskdrake/interactive.pm:1117
+#: diskdrake/interactive.pm:1155
+#: diskdrake/interactive.pm:1298
+#: do_pkgs.pm:16
+#: do_pkgs.pm:35
+#: do_pkgs.pm:53
+#: harddrake/sound.pm:286
 #, c-format
 msgid "Warning"
 msgstr "Rhybudd"
@@ -1336,13 +1380,16 @@ msgid "Use ``Unmount'' first"
 msgstr "Defnyddiwch \"Dadarosod\" yn gyntaf"
 
 #: diskdrake/hd_gtk.pm:390
-#, fuzzy, c-format
+#, c-format
 msgid "Use ``%s'' instead (in expert mode)"
-msgstr "Defnyddiwch \"%s\" yn lle hynny"
+msgstr "Defnyddiwch \"%s\" yn lle hynny (modd arbenigwr)"
 
-#: diskdrake/hd_gtk.pm:390 diskdrake/interactive.pm:372
-#: diskdrake/interactive.pm:546 diskdrake/interactive.pm:1024
-#: diskdrake/removable.pm:25 diskdrake/removable.pm:48
+#: diskdrake/hd_gtk.pm:390
+#: diskdrake/interactive.pm:372
+#: diskdrake/interactive.pm:546
+#: diskdrake/interactive.pm:1024
+#: diskdrake/removable.pm:25
+#: diskdrake/removable.pm:48
 #, c-format
 msgid "Type"
 msgstr "Math"
@@ -1367,7 +1414,8 @@ msgstr "Arbenigwr > Cyffredinol"
 msgid "Toggle to expert mode"
 msgstr "Cyffredinol > Arbenigwr"
 
-#: diskdrake/interactive.pm:265 diskdrake/interactive.pm:275
+#: diskdrake/interactive.pm:265
+#: diskdrake/interactive.pm:275
 #: diskdrake/interactive.pm:1102
 #, c-format
 msgid "Confirmation"
@@ -1393,11 +1441,11 @@ msgstr "Gorffen heb ysgrifennu'r tabl rhaniadau?"
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "Ydych eisiau cadw newidiadau /etc/fstab"
 
-#: diskdrake/interactive.pm:282 fs/partitioning_wizard.pm:251
+#: diskdrake/interactive.pm:282
+#: fs/partitioning_wizard.pm:251
 #, c-format
 msgid "You need to reboot for the partition table modifications to take place"
-msgstr ""
-"Bydd angen i chi ail gychwyn cyn i'r newidiadau yn eich tabl rhaniad ddigwydd"
+msgstr "Bydd angen i chi ail gychwyn cyn i'r newidiadau yn eich tabl rhaniad ddigwydd"
 
 #: diskdrake/interactive.pm:287
 #, c-format
@@ -1407,8 +1455,7 @@ msgid ""
 "Quit anyway?"
 msgstr ""
 "Dylech fformatio rhaniad %s.\n"
-"Fel arall ni fydd mynediad i bwynt arosod %s yn cael ei ysgrifennu yn "
-"fstab.\n"
+"Fel arall ni fydd mynediad i bwynt arosod %s yn cael ei ysgrifennu yn fstab.\n"
 "Gadael beth bynnag?"
 
 #: diskdrake/interactive.pm:300
@@ -1421,7 +1468,8 @@ msgstr "Clirio i gyd"
 msgid "Auto allocate"
 msgstr "Awto ddynodi"
 
-#: diskdrake/interactive.pm:302 diskdrake/interactive.pm:350
+#: diskdrake/interactive.pm:302
+#: diskdrake/interactive.pm:350
 #: interactive/curses.pm:512
 #, c-format
 msgid "More"
@@ -1444,9 +1492,7 @@ msgstr "Does dim modd ychwanegu rhaniadau ychwanegol"
 
 #: diskdrake/interactive.pm:341
 #, c-format
-msgid ""
-"To have more partitions, please delete one to be able to create an extended "
-"partition"
+msgid "To have more partitions, please delete one to be able to create an extended partition"
 msgstr "I gael mwy o raniadau, dilëwch un i greu rhaniad estynedig"
 
 #: diskdrake/interactive.pm:352
@@ -1459,7 +1505,8 @@ msgstr "Ail-lwytho'r tabl rhaniad"
 msgid "Detailed information"
 msgstr "Gwybodaeth fanwl"
 
-#: diskdrake/interactive.pm:375 diskdrake/interactive.pm:705
+#: diskdrake/interactive.pm:375
+#: diskdrake/interactive.pm:705
 #, c-format
 msgid "Resize"
 msgstr "Newid maint"
@@ -1469,12 +1516,14 @@ msgstr "Newid maint"
 msgid "Format"
 msgstr "Fformatio"
 
-#: diskdrake/interactive.pm:378 diskdrake/interactive.pm:791
+#: diskdrake/interactive.pm:378
+#: diskdrake/interactive.pm:791
 #, c-format
 msgid "Add to RAID"
 msgstr "Ychwanegu i RAID"
 
-#: diskdrake/interactive.pm:379 diskdrake/interactive.pm:809
+#: diskdrake/interactive.pm:379
+#: diskdrake/interactive.pm:809
 #, c-format
 msgid "Add to LVM"
 msgstr "Ychwanegu i LVM"
@@ -1509,7 +1558,8 @@ msgstr "Defnyddiwch ar gyfer cylchol"
 msgid "Create"
 msgstr "Creu"
 
-#: diskdrake/interactive.pm:440 diskdrake/interactive.pm:442
+#: diskdrake/interactive.pm:440
+#: diskdrake/interactive.pm:442
 #, c-format
 msgid "Create a new partition"
 msgstr "Creu rhaniad newydd"
@@ -1519,12 +1569,14 @@ msgstr "Creu rhaniad newydd"
 msgid "Start sector: "
 msgstr "Sector dechreuol: "
 
-#: diskdrake/interactive.pm:447 diskdrake/interactive.pm:874
+#: diskdrake/interactive.pm:447
+#: diskdrake/interactive.pm:874
 #, c-format
 msgid "Size in MB: "
 msgstr "Maint mewn MB: "
 
-#: diskdrake/interactive.pm:449 diskdrake/interactive.pm:875
+#: diskdrake/interactive.pm:449
+#: diskdrake/interactive.pm:875
 #, c-format
 msgid "Filesystem type: "
 msgstr "Math o system ffeilio"
@@ -1557,27 +1609,27 @@ msgstr "Tynnu'r ffeil gylchol?"
 
 #: diskdrake/interactive.pm:530
 #, c-format
-msgid ""
-"After changing type of partition %s, all data on this partition will be lost"
-msgstr ""
-"Wedi newid math raniad %s, bydd yr holl ddata ar y rhaniad yn cael ei golli"
+msgid "After changing type of partition %s, all data on this partition will be lost"
+msgstr "Wedi newid math raniad %s, bydd yr holl ddata ar y rhaniad yn cael ei golli"
 
 #: diskdrake/interactive.pm:543
 #, c-format
 msgid "Change partition type"
 msgstr "Newid math y rhaniad"
 
-#: diskdrake/interactive.pm:545 diskdrake/removable.pm:47
+#: diskdrake/interactive.pm:545
+#: diskdrake/removable.pm:47
 #, c-format
 msgid "Which filesystem do you want?"
 msgstr "Pa fath o system ffeil  ydych chi eisiau?"
 
 #: diskdrake/interactive.pm:552
-#, fuzzy, c-format
+#, c-format
 msgid "Switching from %s to %s"
-msgstr "Newid o ext2 i ext3"
+msgstr "Newid o %s i %s"
 
-#: diskdrake/interactive.pm:578 diskdrake/interactive.pm:581
+#: diskdrake/interactive.pm:578
+#: diskdrake/interactive.pm:581
 #, c-format
 msgid "Which volume label?"
 msgstr "Pa label cyfrol?"
@@ -1603,8 +1655,7 @@ msgid ""
 "Can not unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
-"Methu dadsetio'r pwynt arosod gan fod y rhaniad yn cael ei ddefnyddio ar "
-"gyfer cylch-ôl\n"
+"Methu dadsetio'r pwynt arosod gan fod y rhaniad yn cael ei ddefnyddio ar gyfer cylch-ôl\n"
 "Tynnu'r cylchol yn gyntaf"
 
 #: diskdrake/interactive.pm:632
@@ -1612,8 +1663,10 @@ msgstr ""
 msgid "Where do you want to mount %s?"
 msgstr "Lle'r ydych am arosod %s?"
 
-#: diskdrake/interactive.pm:656 diskdrake/interactive.pm:739
-#: fs/partitioning_wizard.pm:145 fs/partitioning_wizard.pm:177
+#: diskdrake/interactive.pm:656
+#: diskdrake/interactive.pm:739
+#: fs/partitioning_wizard.pm:145
+#: fs/partitioning_wizard.pm:177
 #, c-format
 msgid "Resizing"
 msgstr "Newid maint"
@@ -1636,9 +1689,7 @@ msgstr "Dylai'r holl ddata ar y rhaniad gael ei gadw wrth gefn"
 #: diskdrake/interactive.pm:699
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
-msgstr ""
-"Ar ôl newid maint rhaniad %s, bydd yr holl ddata ar y rhaniad yma yn cael ei "
-"golli"
+msgstr "Ar ôl newid maint rhaniad %s, bydd yr holl ddata ar y rhaniad yma yn cael ei golli"
 
 #: diskdrake/interactive.pm:706
 #, c-format
@@ -1660,22 +1711,23 @@ msgstr "Lleiafswm maint: %s MB"
 msgid "Maximum size: %s MB"
 msgstr "Uchawfswm maint : %s MB"
 
-#: diskdrake/interactive.pm:750 fs/partitioning_wizard.pm:185
+#: diskdrake/interactive.pm:750
+#: fs/partitioning_wizard.pm:185
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
 "filesystem checks will be run on your next boot into Microsoft Windows®"
 msgstr ""
 "I sicrhau cywirdeb data'r rhaniad ar ôl ail-feintioli’r rhaniad(au), bydd \n"
-"gwiriadau'r system ffeiliau'n cael eu gwneud wrth i chi ail gychwyn Windows "
-"(TM)"
+"gwiriadau'r system ffeiliau'n cael eu gwneud wrth i chi ail gychwyn Windows (TM)"
 
 #: diskdrake/interactive.pm:791
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Dewis RAID presennol i ychwanegu ato"
 
-#: diskdrake/interactive.pm:793 diskdrake/interactive.pm:811
+#: diskdrake/interactive.pm:793
+#: diskdrake/interactive.pm:811
 #, c-format
 msgid "new"
 msgstr "newydd"
@@ -1697,8 +1749,7 @@ msgid ""
 "Do you want to move used physical extents on this volume to other volumes?"
 msgstr ""
 "Mae cyfrol %s dan mewn defnydd.\n"
-"Ydych chi am symud ystentiau ffisegol a ddefnyddiwyd o'r gyfrol i gyfrol "
-"arall?"
+"Ydych chi am symud ystentiau ffisegol a ddefnyddiwyd o'r gyfrol i gyfrol arall?"
 
 #: diskdrake/interactive.pm:841
 #, c-format
@@ -1728,15 +1779,15 @@ msgstr "Rhowch enw ffeil"
 #: diskdrake/interactive.pm:881
 #, c-format
 msgid "File is already used by another loopback, choose another one"
-msgstr ""
-"Mae'r ffeil yn cael ei ddefnyddio eisoes gam cylchol arall, dewiswch un arall"
+msgstr "Mae'r ffeil yn cael ei ddefnyddio eisoes gam cylchol arall, dewiswch un arall"
 
 #: diskdrake/interactive.pm:882
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "Mae'r ffeil yn bodoli eisoes. Defnyddiwch hwn?"
 
-#: diskdrake/interactive.pm:914 diskdrake/interactive.pm:917
+#: diskdrake/interactive.pm:914
+#: diskdrake/interactive.pm:917
 #, c-format
 msgid "Mount options"
 msgstr "Dewisiadau arosod"
@@ -1784,10 +1835,10 @@ msgstr "Mae tabl rhaniad disg %s yn mynd i gael ei ysgrifennu i'r ddisg!"
 #: diskdrake/interactive.pm:1097
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
-msgstr ""
-"Wedi fformatio rhaniad %s, bydd yr holl ddata ar y rhaniad yn cael ei golli"
+msgstr "Wedi fformatio rhaniad %s, bydd yr holl ddata ar y rhaniad yn cael ei golli"
 
-#: diskdrake/interactive.pm:1102 fs/partitioning.pm:49
+#: diskdrake/interactive.pm:1102
+#: fs/partitioning.pm:49
 #, c-format
 msgid "Check bad blocks?"
 msgstr "Gwirio blociau gwallus?"
@@ -1808,15 +1859,12 @@ msgid ""
 "Directory %s already contains data\n"
 "(%s)\n"
 "\n"
-"You can either choose to move the files into the partition that will be "
-"mounted there or leave them where they are (which results in hiding them by "
-"the contents of the mounted partition)"
+"You can either choose to move the files into the partition that will be mounted there or leave them where they are (which results in hiding them by the contents of the mounted partition)"
 msgstr ""
 "Mae cyfeiriadur %s eisoes yn cynnwys data\n"
 "(%s)\n"
 "\n"
-"Gallwch un ai ddewis i symud y ffeiliau i'r rhaniad fydd wedi ei arosod yno "
-"neu eu gadael lle y maent (sy'n golygu eu cuddio gan gynnwys y rhaniad hwnnw)"
+"Gallwch un ai ddewis i symud y ffeiliau i'r rhaniad fydd wedi ei arosod yno neu eu gadael lle y maent (sy'n golygu eu cuddio gan gynnwys y rhaniad hwnnw)"
 
 #: diskdrake/interactive.pm:1132
 #, c-format
@@ -1843,7 +1891,8 @@ msgstr "Mae rhaniad %s yn cael ei alw'n %s"
 msgid "Partitions have been renumbered: "
 msgstr "Mae'r rhaniadau wedi eu hail-rifo"
 
-#: diskdrake/interactive.pm:1180 diskdrake/interactive.pm:1243
+#: diskdrake/interactive.pm:1180
+#: diskdrake/interactive.pm:1243
 #, c-format
 msgid "Device: "
 msgstr "Dyfais: "
@@ -1863,13 +1912,15 @@ msgstr "UUID: "
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "Llythyren disg DOS: %s (dim ond dyfalu)\n"
 
-#: diskdrake/interactive.pm:1187 diskdrake/interactive.pm:1196
+#: diskdrake/interactive.pm:1187
+#: diskdrake/interactive.pm:1196
 #: diskdrake/interactive.pm:1262
 #, c-format
 msgid "Type: "
 msgstr "Math: "
 
-#: diskdrake/interactive.pm:1191 diskdrake/interactive.pm:1247
+#: diskdrake/interactive.pm:1191
+#: diskdrake/interactive.pm:1247
 #, c-format
 msgid "Name: "
 msgstr "Enw : "
@@ -2004,9 +2055,9 @@ msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geometreg: %s silindr, %s pen, %s sector\n"
 
 #: diskdrake/interactive.pm:1248
-#, fuzzy, c-format
+#, c-format
 msgid "Medium type: "
-msgstr "Math o system ffeilio"
+msgstr "Math o gyfrwng:"
 
 #: diskdrake/interactive.pm:1249
 #, c-format
@@ -2036,8 +2087,7 @@ msgstr "Dewiswch eich allwedd amgryptio system ffeiliau"
 #: diskdrake/interactive.pm:1298
 #, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
-msgstr ""
-"Mae'r allwedd amgryptio'n rhy syml (mae'n rhaid bod o leiaf %d nod o hyd)"
+msgstr "Mae'r allwedd amgryptio'n rhy syml (mae'n rhaid bod o leiaf %d nod o hyd)"
 
 #: diskdrake/interactive.pm:1299
 #, c-format
@@ -2064,10 +2114,18 @@ msgstr "Algorithm amgryptio"
 msgid "Change type"
 msgstr "Newid y math"
 
-#: diskdrake/smbnfs_gtk.pm:81 interactive.pm:126 interactive.pm:543
-#: interactive/curses.pm:260 interactive/http.pm:104 interactive/http.pm:160
-#: interactive/stdio.pm:39 interactive/stdio.pm:148 ugtk2.pm:408 ugtk2.pm:510
-#: ugtk2.pm:519 ugtk2.pm:801
+#: diskdrake/smbnfs_gtk.pm:81
+#: interactive.pm:126
+#: interactive.pm:543
+#: interactive/curses.pm:260
+#: interactive/http.pm:104
+#: interactive/http.pm:160
+#: interactive/stdio.pm:39
+#: interactive/stdio.pm:148
+#: ugtk2.pm:408
+#: ugtk2.pm:510
+#: ugtk2.pm:519
+#: ugtk2.pm:801
 #, c-format
 msgid "Cancel"
 msgstr "Diddymu"
@@ -2075,10 +2133,10 @@ msgstr "Diddymu"
 #: diskdrake/smbnfs_gtk.pm:164
 #, c-format
 msgid "Can not login using username %s (bad password?)"
-msgstr ""
-"Methu mewngofnodi gan ddefnyddio enw defnyddiwr %s (cyfrinair anghywir?)"
+msgstr "Methu mewngofnodi gan ddefnyddio enw defnyddiwr %s (cyfrinair anghywir?)"
 
-#: diskdrake/smbnfs_gtk.pm:168 diskdrake/smbnfs_gtk.pm:177
+#: diskdrake/smbnfs_gtk.pm:168
+#: diskdrake/smbnfs_gtk.pm:177
 #, c-format
 msgid "Domain Authentication Required"
 msgstr "Angen Dilysu Parth"
@@ -2095,11 +2153,8 @@ msgstr "Un arall"
 
 #: diskdrake/smbnfs_gtk.pm:178
 #, c-format
-msgid ""
-"Please enter your username, password and domain name to access this host."
-msgstr ""
-"Rhowch eich enw defnyddiwr, cyfrinair ac enw parth i gael mynediad i'r "
-"gwesteiwr."
+msgid "Please enter your username, password and domain name to access this host."
+msgstr "Rhowch eich enw defnyddiwr, cyfrinair ac enw parth i gael mynediad i'r gwesteiwr."
 
 #: diskdrake/smbnfs_gtk.pm:180
 #, c-format
@@ -2116,17 +2171,21 @@ msgstr "Chwiliwch am weinyddion"
 msgid "Search new servers"
 msgstr "Chwiliwch weinyddion newydd"
 
-#: do_pkgs.pm:16 do_pkgs.pm:53
+#: do_pkgs.pm:16
+#: do_pkgs.pm:53
 #, c-format
 msgid "The package %s needs to be installed. Do you want to install it?"
 msgstr "Rhaid i becyn %s gael ei osod. Ydych chi am ei osod?"
 
-#: do_pkgs.pm:19 do_pkgs.pm:40 do_pkgs.pm:56
+#: do_pkgs.pm:19
+#: do_pkgs.pm:40
+#: do_pkgs.pm:56
 #, c-format
 msgid "Could not install the %s package!"
 msgstr "Methu gosod pecyn %s!"
 
-#: do_pkgs.pm:24 do_pkgs.pm:61
+#: do_pkgs.pm:24
+#: do_pkgs.pm:61
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "Mae pecyn gorfodol %s ar goll"
@@ -2148,19 +2207,17 @@ msgstr "Tynnu pecyn..."
 
 #: fs/any.pm:17
 #, c-format
-msgid ""
-"An error occurred - no valid devices were found on which to create new "
-"filesystems. Please check your hardware for the cause of this problem"
-msgstr ""
-"Digwyddodd gwall - heb ganfod unrhyw ddyfeisiau dilys er mwyn creu system "
-"ffeil arnynt. Gwiriwch eich caledwedd am reswm dros y gwall."
+msgid "An error occurred - no valid devices were found on which to create new filesystems. Please check your hardware for the cause of this problem"
+msgstr "Digwyddodd gwall - heb ganfod unrhyw ddyfeisiau dilys er mwyn creu system ffeil arnynt. Gwiriwch eich caledwedd am reswm dros y gwall."
 
-#: fs/any.pm:74 fs/partitioning_wizard.pm:59
+#: fs/any.pm:74
+#: fs/partitioning_wizard.pm:59
 #, c-format
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Rhaid cael rhaniad FAT wedi ei arosod yn /boot/efi"
 
-#: fs/format.pm:62 fs/format.pm:69
+#: fs/format.pm:62
+#: fs/format.pm:69
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Yn fformatio rhaniad %s"
@@ -2175,7 +2232,8 @@ msgstr "Creu a fformatio ffeil %s"
 msgid "I do not know how to format %s in type %s"
 msgstr "Nid wyf yn gwybod sut i fformatio %s ym math %s"
 
-#: fs/format.pm:124 fs/format.pm:126
+#: fs/format.pm:124
+#: fs/format.pm:126
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "methodd  fformatio %s o %s"
@@ -2195,12 +2253,14 @@ msgstr "Yn arosod rhaniad %s"
 msgid "mounting partition %s in directory %s failed"
 msgstr "methodd arosod rhaniad %s yng nghyfeiriadur %s"
 
-#: fs/mount.pm:85 fs/mount.pm:102
+#: fs/mount.pm:85
+#: fs/mount.pm:102
 #, c-format
 msgid "Checking %s"
 msgstr "Gwirio %s"
 
-#: fs/mount.pm:119 partition_table.pm:395
+#: fs/mount.pm:119
+#: partition_table.pm:395
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "gwall dadarosod %s: %s"
@@ -2232,8 +2292,7 @@ msgid ""
 "(e.g, for faster access on the news spool to speed up news servers)."
 msgstr ""
 "Peidiwch ddiweddaru amser mynediad inode ar y system ffeiliau\n"
-"(e.e. ar gyfer mynediad cynt ar y cylch newyddion i gyflymu gweinyddion "
-"newyddion)."
+"(e.e. ar gyfer mynediad cynt ar y cylch newyddion i gyflymu gweinyddion newyddion)."
 
 #: fs/mount_options.pm:124
 #, c-format
@@ -2241,10 +2300,8 @@ msgid ""
 "Update inode access times on this filesystem in a more efficient way\n"
 "(e.g, for faster access on the news spool to speed up news servers)."
 msgstr ""
-"Diweddaru amser mynediad inode ar y system ffeiliau mewn ffordd mwy "
-"effeithiol\n"
-"(e.e. ar gyfer mynediad cynt ar y cylch newyddion i gyflymu gweinyddion "
-"newyddion)."
+"Diweddaru amser mynediad inode ar y system ffeiliau mewn ffordd mwy effeithiol\n"
+"(e.e. ar gyfer mynediad cynt ar y cylch newyddion i gyflymu gweinyddion newyddion)."
 
 #: fs/mount_options.pm:127
 #, c-format
@@ -2258,8 +2315,7 @@ msgstr ""
 #: fs/mount_options.pm:130
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
-msgstr ""
-"Peidio dehongli nod neu rwystro dyfeisiadau arbennig ar y system ffeil."
+msgstr "Peidio dehongli nod neu rwystro dyfeisiadau arbennig ar y system ffeil."
 
 #: fs/mount_options.pm:132
 #, c-format
@@ -2270,8 +2326,7 @@ msgid ""
 msgstr ""
 "Peidio caniatáu gweithrediad unrhyw dueddiad ar system ffeil wedi ei\n"
 "arosod. Gall y dewis fod yn ddefnyddiol ar gyfer gweinydd sydd ganddo\n"
-"systemau ffeiliau yn cynnwys tueddiad fel pensaernïaeth wahanol i'w un ei "
-"hun."
+"systemau ffeiliau yn cynnwys tueddiad fel pensaernïaeth wahanol i'w un ei hun."
 
 #: fs/mount_options.pm:136
 #, c-format
@@ -2351,12 +2406,8 @@ msgstr "Dewiswch y rhaniadau rydych am eu fformatio"
 
 #: fs/partitioning.pm:76
 #, c-format
-msgid ""
-"Failed to check filesystem %s. Do you want to repair the errors? (beware, "
-"you can lose data)"
-msgstr ""
-"Methu gwirio system ffeil %s. Hoffech chi gywiro'r gwallau? (gofal, mae modd "
-"colli data)"
+msgid "Failed to check filesystem %s. Do you want to repair the errors? (beware, you can lose data)"
+msgstr "Methu gwirio system ffeil %s. Hoffech chi gywiro'r gwallau? (gofal, mae modd colli data)"
 
 #: fs/partitioning.pm:79
 #, c-format
@@ -2433,8 +2484,7 @@ msgstr "Maint rhaniad cyfnewid mewn MB: "
 #: fs/partitioning_wizard.pm:119
 #, c-format
 msgid "There is no FAT partition to use as loopback (or not enough space left)"
-msgstr ""
-"Nid oes rhaniad FAT i'w ddefnyddio ar gyfer cylch ôl (dim digon o le ar ôl)"
+msgstr "Nid oes rhaniad FAT i'w ddefnyddio ar gyfer cylch ôl (dim digon o le ar ôl)"
 
 #: fs/partitioning_wizard.pm:126
 #, c-format
@@ -2462,14 +2512,8 @@ msgstr "Mesur maint rhaniad Microsoft Windows®"
 
 #: fs/partitioning_wizard.pm:152
 #, c-format
-msgid ""
-"Your Microsoft Windows® partition is too fragmented. Please reboot your "
-"computer under Microsoft Windows®, run the ``defrag'' utility, then restart "
-"the Mandriva Linux installation."
-msgstr ""
-"Mae eich rhaniad Microsoft Windows® yn rhy ddarniog. Ailgychwynnwch eich "
-"cyfrifiadur yn Microsoft Windows®, a rhedeg y rhaglen `defrag'', yna "
-"ailgychwyn gosod Mandriva Linux."
+msgid "Your Microsoft Windows® partition is too fragmented. Please reboot your computer under Microsoft Windows®, run the ``defrag'' utility, then restart the Mandriva Linux installation."
+msgstr "Mae eich rhaniad Microsoft Windows® yn rhy ddarniog. Ailgychwynnwch eich cyfrifiadur yn Microsoft Windows®, a rhedeg y rhaglen `defrag'', yna ailgychwyn gosod Mandriva Linux."
 
 #: fs/partitioning_wizard.pm:155
 #, c-format
@@ -2480,12 +2524,7 @@ msgid ""
 "Your Microsoft Windows® partition will be now resized.\n"
 "\n"
 "\n"
-"Be careful: this operation is dangerous. If you have not already done so, "
-"you first need to exit the installation, run \"chkdsk c:\" from a Command "
-"Prompt under Microsoft Windows® (beware, running graphical program \"scandisk"
-"\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), "
-"optionally run defrag, then restart the installation. You should also backup "
-"your data.\n"
+"Be careful: this operation is dangerous. If you have not already done so, you first need to exit the installation, run \"chkdsk c:\" from a Command Prompt under Microsoft Windows® (beware, running graphical program \"scandisk\" is not enough, be sure to use \"chkdsk\" in a Command Prompt!), optionally run defrag, then restart the installation. You should also backup your data.\n"
 "\n"
 "\n"
 "When sure, press %s."
@@ -2496,18 +2535,15 @@ msgstr ""
 "Bydd maint eich rhaniad Microsoft Windows® yn cael ei newid.\n"
 "\n"
 "\n"
-"Byddwch ofalus: mae'r weithred hon yn beryglus. Os nad ydych wedi gwneud "
-"hynny eisoes, rhaid gadael y gosod, rhedeg \"chkdsk c:\" o'r Llinell "
-"Orchymyn yn Microsoft Windows® (rhybudd: nid yw rhedeg y rhaglen \"scandisk"
-"\" yn ddigon, gwnewch yn siŵr eich bod yn defnyddio \"chkdsk\" mewn Llinell "
-"Orchymyn!), neu rhedwch defrag, yna ailgychwyn gosod. Dylech hefyd wneud "
-"copi wrth gefn o'ch data.\n"
+"Byddwch ofalus: mae'r weithred hon yn beryglus. Os nad ydych wedi gwneud hynny eisoes, rhaid gadael y gosod, rhedeg \"chkdsk c:\" o'r Llinell Orchymyn yn Microsoft Windows® (rhybudd: nid yw rhedeg y rhaglen \"scandisk\" yn ddigon, gwnewch yn siŵr eich bod yn defnyddio \"chkdsk\" mewn Llinell Orchymyn!), neu rhedwch defrag, yna ailgychwyn gosod. Dylech hefyd wneud copi wrth gefn o'ch data.\n"
 "\n"
 "\n"
 "When sure, press %s."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: fs/partitioning_wizard.pm:164 interactive.pm:542 interactive/curses.pm:263
+#: fs/partitioning_wizard.pm:164
+#: interactive.pm:542
+#: interactive/curses.pm:263
 #: ugtk2.pm:512
 #, c-format
 msgid "Next"
@@ -2521,8 +2557,7 @@ msgstr "Creu rhaniadau"
 #: fs/partitioning_wizard.pm:167
 #, c-format
 msgid "Which size do you want to keep for Microsoft Windows® on partition %s?"
-msgstr ""
-"Pa faint o le ydych am ei gadw ar gyfer Microsoft Windows® ar rhaniad %s?"
+msgstr "Pa faint o le ydych am ei gadw ar gyfer Microsoft Windows® ar rhaniad %s?"
 
 #: fs/partitioning_wizard.pm:168
 #, c-format
@@ -2559,7 +2594,8 @@ msgstr "Dileu a defnyddio'r ddisg gyfan"
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr "Mae gennych fwy nag un disg caled, ar ba un hoffech osod linux?"
 
-#: fs/partitioning_wizard.pm:210 fsedit.pm:566
+#: fs/partitioning_wizard.pm:210
+#: fsedit.pm:566
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "Bydd POB rhaniad presennol a'u data'n cael eu colli ar yrrwr %si"
@@ -2626,8 +2662,7 @@ msgstr "Mae meddalwedd BIOS RAID wedi ei ganfod ar ddisgiau %s. Gweithredu?"
 #: fsedit.pm:224
 #, c-format
 msgid ""
-"I can not read the partition table of device %s, it's too corrupted for me :"
-"(\n"
+"I can not read the partition table of device %s, it's too corrupted for me :(\n"
 "I can try to go on, erasing over bad partitions (ALL DATA will be lost!).\n"
 "The other solution is to not allow DrakX to modify the partition table.\n"
 "(the error is %s)\n"
@@ -2669,38 +2704,31 @@ msgstr ""
 
 #: fsedit.pm:405
 #, c-format
-msgid ""
-"You can not use the LVM Logical Volume for mount point %s since it spans "
-"physical volumes"
-msgstr ""
-"Does dim modd defnyddio Cyfrol Resymegol LVM ar gyfer pwynt arosod %s am ei "
-"fod ar draws cyfrolau ffisegol."
+msgid "You can not use the LVM Logical Volume for mount point %s since it spans physical volumes"
+msgstr "Does dim modd defnyddio Cyfrol Resymegol LVM ar gyfer pwynt arosod %s am ei fod ar draws cyfrolau ffisegol."
 
 #: fsedit.pm:407
 #, c-format
 msgid ""
 "You've selected the LVM Logical Volume as root (/).\n"
-"The bootloader is not able to handle this when the volume spans physical "
-"volumes.\n"
+"The bootloader is not able to handle this when the volume spans physical volumes.\n"
 "You should create a /boot partition first"
 msgstr ""
 "Rydych wedi dewis Cyfrol Resymegol LVM fel gwraidd (/)\n"
 "Nid oes cychwynnwr yn gallu trin hwn pan yw ar draws cyfrolau ffisegol.\n"
 "Cofiwch ychwanegu rhaniad /boot yn gyntaf"
 
-#: fsedit.pm:411 fsedit.pm:413
+#: fsedit.pm:411
+#: fsedit.pm:413
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "Dylai'r cyfeiriadur aros o fewn y system ffeilio gwraidd"
 
-#: fsedit.pm:415 fsedit.pm:417
+#: fsedit.pm:415
+#: fsedit.pm:417
 #, c-format
-msgid ""
-"You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
-"point\n"
-msgstr ""
-"Mae angen gwir system ffeilio (ext2, reiserfs,  xfs, neu jfs)) ar gyfer y "
-"pwynt arosod\n"
+msgid "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount point\n"
+msgstr "Mae angen gwir system ffeilio (ext2, reiserfs,  xfs, neu jfs)) ar gyfer y pwynt arosod\n"
 
 #: fsedit.pm:419
 #, c-format
@@ -2966,27 +2994,27 @@ msgstr "Arhoswch...Gosod y ffurfweddiad"
 #: harddrake/sound.pm:305
 #, c-format
 msgid "Enable PulseAudio"
-msgstr ""
+msgstr "Galluogi PulseAudio"
 
 #: harddrake/sound.pm:309
 #, c-format
 msgid "Automatic routing from ALSA to PulseAudio"
-msgstr ""
+msgstr "Llwybro awtomatig o ALSA i PulseAudio"
 
 #: harddrake/sound.pm:344
 #, c-format
 msgid "Enable 5.1 sound with Pulse Audio"
-msgstr ""
+msgstr "Galluogi sain 5.1 gyda Pulse Audio"
 
 #: harddrake/sound.pm:348
 #, c-format
 msgid "Enable user switching for audio applications"
-msgstr ""
+msgstr "Galluogi newid defnyddiwr gyda rhaglenni sain"
 
 #: harddrake/sound.pm:318
 #, c-format
 msgid "Reset sound mixer to default values"
-msgstr ""
+msgstr "Ail-osod sain cymysgydd i'r gwerthoedd rhagosodedig"
 
 #: harddrake/sound.pm:323
 #, c-format
@@ -3000,12 +3028,8 @@ msgstr "Dim gyrwyr eraill"
 
 #: harddrake/sound.pm:240
 #, c-format
-msgid ""
-"There's no known OSS/ALSA alternative driver for your sound card (%s) which "
-"currently uses \"%s\""
-msgstr ""
-"Nid oes gyrrwr OSS/ALSA  arall hysbys ar gyfer eich cerdyn sain (%s) sy'n "
-"defnyddio \"%s\" ar hyn o bryd"
+msgid "There's no known OSS/ALSA alternative driver for your sound card (%s) which currently uses \"%s\""
+msgstr "Nid oes gyrrwr OSS/ALSA  arall hysbys ar gyfer eich cerdyn sain (%s) sy'n defnyddio \"%s\" ar hyn o bryd"
 
 #: harddrake/sound.pm:246
 #, c-format
@@ -3014,14 +3038,10 @@ msgstr "Ffurfweddiad sain"
 
 #: harddrake/sound.pm:248
 #, c-format
-msgid ""
-"Here you can select an alternative driver (either OSS or ALSA) for your "
-"sound card (%s)."
-msgstr ""
-"Yma gallwch ddewis gyrrwr arall (un ai OSS neu ALSA) ar gyfer eich cerdyn "
-"sain (%s)"
+msgid "Here you can select an alternative driver (either OSS or ALSA) for your sound card (%s)."
+msgstr "Yma gallwch ddewis gyrrwr arall (un ai OSS neu ALSA) ar gyfer eich cerdyn sain (%s)"
 
-#. -PO: here the first %s is either "OSS" or "ALSA", 
+#. -PO: here the first %s is either "OSS" or "ALSA",
 #. -PO: the second %s is the name of the current driver
 #. -PO: and the third %s is the name of the default driver
 #: harddrake/sound.pm:253
@@ -3029,50 +3049,41 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"Your card currently use the %s\"%s\" driver (default driver for your card is "
-"\"%s\")"
+"Your card currently use the %s\"%s\" driver (default driver for your card is \"%s\")"
 msgstr ""
 "\n"
 "\n"
-"Mae eich cerdyn yn defnyddio'r gyrrwr %s\"%s\" ar hyn o bryd ( y gyrrwr "
-"arferol ar ei gyfer yw \"%s\")"
+"Mae eich cerdyn yn defnyddio'r gyrrwr %s\"%s\" ar hyn o bryd ( y gyrrwr arferol ar ei gyfer yw \"%s\")"
 
 #: harddrake/sound.pm:255
 #, c-format
 msgid ""
-"OSS (Open Sound System) was the first sound API. It's an OS independent "
-"sound API (it's available on most UNIX(tm) systems) but it's a very basic "
-"and limited API.\n"
+"OSS (Open Sound System) was the first sound API. It's an OS independent sound API (it's available on most UNIX(tm) systems) but it's a very basic and limited API.\n"
 "What's more, OSS drivers all reinvent the wheel.\n"
 "\n"
-"ALSA (Advanced Linux Sound Architecture) is a modularized architecture "
-"which\n"
+"ALSA (Advanced Linux Sound Architecture) is a modularized architecture which\n"
 "supports quite a large range of ISA, USB and PCI cards.\n"
 "\n"
 "It also provides a much higher API than OSS.\n"
 "\n"
 "To use alsa, one can either use:\n"
 "- the old compatibility OSS api\n"
-"- the new ALSA api that provides many enhanced features but requires using "
-"the ALSA library.\n"
+"- the new ALSA api that provides many enhanced features but requires using the ALSA library.\n"
 msgstr ""
-"OSS (Open Sound System) oedd yr API sain gyntaf. Mae'n API sail annibynnol o "
-"systemau gweithredu ( mae ar gael ar gyfer y rhan fwyaf o systemau unices) "
-"on mae'n API elfennol iawn a chyfyng.\n"
+"OSS (Open Sound System) oedd yr API sain gyntaf. Mae'n API sail annibynnol o systemau gweithredu ( mae ar gael ar gyfer y rhan fwyaf o systemau unices) on mae'n API elfennol iawn a chyfyng.\n"
 "Mae gyrwyr OSS hefyd yn ail ddyfeisio'r hyn sy'n bod eisoes.\n"
 "\n"
-"Mae ALSA (Advanced Linux Sound Architecture) yn bensaernïaeth fodiwlaidd "
-"sy'n \n"
+"Mae ALSA (Advanced Linux Sound Architecture) yn bensaernïaeth fodiwlaidd sy'n \n"
 "cynnal ystod eang o gardiau ISA, USB a PCI.\n"
 "\n"
 "Mae hefyd yn darparu API llawer uwch na OSS.\n"
 "\n"
 "I ddefnyddio alsa, mae modd defnyddio un ai:\n"
 "- hen api OSS cydweddus\n"
-"- api ALSA newydd sy'n darparu llawer o nodweddion gell ond sydd angen "
-"defnyddio llyfrgell ALSA.\n"
+"- api ALSA newydd sy'n darparu llawer o nodweddion gell ond sydd angen defnyddio llyfrgell ALSA.\n"
 
-#: harddrake/sound.pm:269 harddrake/sound.pm:354
+#: harddrake/sound.pm:269
+#: harddrake/sound.pm:354
 #, c-format
 msgid "Driver:"
 msgstr "Gyrrwr:"
@@ -3099,12 +3110,8 @@ msgstr "Dim gyrrwr cod agored"
 
 #: harddrake/sound.pm:295
 #, 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\" ."
+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:298
 #, c-format
@@ -3180,8 +3187,7 @@ msgstr "Dewis gyrrwr ar hap"
 #: harddrake/sound.pm:349
 #, c-format
 msgid ""
-"If you really think that you know which driver is the right one for your "
-"card\n"
+"If you really think that you know which driver is the right one for your card\n"
 "you can pick one in the above list.\n"
 "\n"
 "The current driver for your \"%s\" sound card is \"%s\" "
@@ -3196,7 +3202,9 @@ msgstr ""
 msgid "Auto-detect"
 msgstr "Awtoganfod"
 
-#: harddrake/v4l.pm:97 harddrake/v4l.pm:285 harddrake/v4l.pm:337
+#: harddrake/v4l.pm:97
+#: harddrake/v4l.pm:285
+#: harddrake/v4l.pm:337
 #, c-format
 msgid "Unknown|Generic"
 msgstr "Anhysbys|Generig"
@@ -3214,15 +3222,11 @@ msgstr "Anhysbys|CPH06X (bt878) [nifer o werthwyr]"
 #: harddrake/v4l.pm:475
 #, c-format
 msgid ""
-"For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-"
-"detect the rights parameters.\n"
-"If your card is misdetected, you can force the right tuner and card types "
-"here. Just select your tv card parameters if needed."
+"For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-detect the rights parameters.\n"
+"If your card is misdetected, you can force the right tuner and card types here. Just select your tv card parameters if needed."
 msgstr ""
-"Ar gyfer y rhelyw o gardiau Teledu diweddar, mae modiwl bttv cnewyllyn GNU/"
-"Linux yn awto ganfod y paramedrau cywir.\n"
-"Os yw'ch cerdyn yn cael ei ganfod ar gam, mae modd gorfodi'r mathau cywir o "
-"gerdyn a rheolydd. Dewiswch baramedrau eich cerdyn teledu os oes raid"
+"Ar gyfer y rhelyw o gardiau Teledu diweddar, mae modiwl bttv cnewyllyn GNU/Linux yn awto ganfod y paramedrau cywir.\n"
+"Os yw'ch cerdyn yn cael ei ganfod ar gam, mae modd gorfodi'r mathau cywir o gerdyn a rheolydd. Dewiswch baramedrau eich cerdyn teledu os oes raid"
 
 #: harddrake/v4l.pm:478
 #, c-format
@@ -3234,20 +3238,34 @@ msgstr "Model cerdyn:"
 msgid "Tuner type:"
 msgstr "Math o diwniwr:"
 
-#: interactive.pm:125 interactive.pm:542 interactive/curses.pm:263
-#: interactive/http.pm:103 interactive/http.pm:156 interactive/stdio.pm:39
-#: interactive/stdio.pm:148 interactive/stdio.pm:149 ugtk2.pm:414 ugtk2.pm:512
-#: ugtk2.pm:801 ugtk2.pm:824
+#: interactive.pm:125
+#: interactive.pm:542
+#: interactive/curses.pm:263
+#: interactive/http.pm:103
+#: interactive/http.pm:156
+#: interactive/stdio.pm:39
+#: interactive/stdio.pm:148
+#: interactive/stdio.pm:149
+#: ugtk2.pm:414
+#: ugtk2.pm:512
+#: ugtk2.pm:801
+#: ugtk2.pm:824
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: interactive.pm:224 modules/interactive.pm:71 ugtk2.pm:800 wizards.pm:156
+#: interactive.pm:224
+#: modules/interactive.pm:71
+#: ugtk2.pm:800
+#: wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "Iawn"
 
-#: interactive.pm:224 modules/interactive.pm:71 ugtk2.pm:800 wizards.pm:156
+#: interactive.pm:224
+#: modules/interactive.pm:71
+#: ugtk2.pm:800
+#: wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "Na"
@@ -3257,27 +3275,34 @@ msgstr "Na"
 msgid "Choose a file"
 msgstr "Dewis ffeil"
 
-#: interactive.pm:383 interactive/gtk.pm:420
+#: interactive.pm:383
+#: interactive/gtk.pm:420
 #, c-format
 msgid "Add"
 msgstr "Ychwanegu"
 
-#: interactive.pm:383 interactive/gtk.pm:420
+#: interactive.pm:383
+#: interactive/gtk.pm:420
 #, c-format
 msgid "Modify"
 msgstr "Newid"
 
-#: interactive.pm:383 interactive/gtk.pm:420
+#: interactive.pm:383
+#: interactive/gtk.pm:420
 #, c-format
 msgid "Remove"
 msgstr "Tynnu"
 
-#: interactive.pm:542 interactive/curses.pm:263 ugtk2.pm:512
+#: interactive.pm:542
+#: interactive/curses.pm:263
+#: ugtk2.pm:512
 #, c-format
 msgid "Finish"
 msgstr "Gorffen"
 
-#: interactive.pm:543 interactive/curses.pm:260 ugtk2.pm:510
+#: interactive.pm:543
+#: interactive/curses.pm:260
+#: ugtk2.pm:510
 #, c-format
 msgid "Previous"
 msgstr "Blaenorol"
@@ -3287,12 +3312,14 @@ msgstr "Blaenorol"
 msgid "Beware, Caps Lock is enabled"
 msgstr "Gwyliwch, Mae Caps Lock ymlaen"
 
-#: interactive/stdio.pm:29 interactive/stdio.pm:154
+#: interactive/stdio.pm:29
+#: interactive/stdio.pm:154
 #, c-format
 msgid "Bad choice, try again\n"
 msgstr "Dewis gwael, ceisiwch eto\n"
 
-#: interactive/stdio.pm:30 interactive/stdio.pm:155
+#: interactive/stdio.pm:30
+#: interactive/stdio.pm:155
 #, c-format
 msgid "Your choice? (default %s) "
 msgstr "Eich dewis? (rhagosodedig %s)"
@@ -3374,7 +3401,8 @@ msgstr "default:LTR"
 msgid "Andorra"
 msgstr "Andorra"
 
-#: lang.pm:211 timezone.pm:215
+#: lang.pm:211
+#: timezone.pm:215
 #, c-format
 msgid "United Arab Emirates"
 msgstr "United Arab Emirates"
@@ -3419,7 +3447,8 @@ msgstr "Angola"
 msgid "Antarctica"
 msgstr "Antarctica"
 
-#: lang.pm:220 timezone.pm:260
+#: lang.pm:220
+#: timezone.pm:260
 #, c-format
 msgid "Argentina"
 msgstr "Yr Ariannin"
@@ -3429,12 +3458,16 @@ msgstr "Yr Ariannin"
 msgid "American Samoa"
 msgstr "American Samoa"
 
-#: lang.pm:222 mirror.pm:11 timezone.pm:218
+#: lang.pm:222
+#: mirror.pm:11
+#: timezone.pm:218
 #, c-format
 msgid "Austria"
 msgstr "Awstria"
 
-#: lang.pm:223 mirror.pm:10 timezone.pm:256
+#: lang.pm:223
+#: mirror.pm:10
+#: timezone.pm:256
 #, c-format
 msgid "Australia"
 msgstr "Awstralia"
@@ -3459,12 +3492,15 @@ msgstr "Bosnia ac Herzegovina"
 msgid "Barbados"
 msgstr "Barbados"
 
-#: lang.pm:228 timezone.pm:200
+#: lang.pm:228
+#: timezone.pm:200
 #, c-format
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: lang.pm:229 mirror.pm:12 timezone.pm:220
+#: lang.pm:229
+#: mirror.pm:12
+#: timezone.pm:220
 #, c-format
 msgid "Belgium"
 msgstr "Gwlad Belg"
@@ -3474,7 +3510,8 @@ msgstr "Gwlad Belg"
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: lang.pm:231 timezone.pm:221
+#: lang.pm:231
+#: timezone.pm:221
 #, c-format
 msgid "Bulgaria"
 msgstr "Bwlgaria"
@@ -3509,7 +3546,9 @@ msgstr "Brunei Darussalam"
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: lang.pm:238 mirror.pm:13 timezone.pm:261
+#: lang.pm:238
+#: mirror.pm:13
+#: timezone.pm:261
 #, c-format
 msgid "Brazil"
 msgstr "Brasil"
@@ -3534,7 +3573,8 @@ msgstr "Ynys Bouvet"
 msgid "Botswana"
 msgstr "Botswana"
 
-#: lang.pm:243 timezone.pm:219
+#: lang.pm:243
+#: timezone.pm:219
 #, c-format
 msgid "Belarus"
 msgstr "Belarus"
@@ -3544,7 +3584,9 @@ msgstr "Belarus"
 msgid "Belize"
 msgstr "Belize"
 
-#: lang.pm:245 mirror.pm:14 timezone.pm:250
+#: lang.pm:245
+#: mirror.pm:14
+#: timezone.pm:250
 #, c-format
 msgid "Canada"
 msgstr "Canada"
@@ -3569,7 +3611,9 @@ msgstr "Gweriniaeth Canol Affrica"
 msgid "Congo (Brazzaville)"
 msgstr "Congo (Brazzaville)"
 
-#: lang.pm:250 mirror.pm:38 timezone.pm:244
+#: lang.pm:250
+#: mirror.pm:38
+#: timezone.pm:244
 #, c-format
 msgid "Switzerland"
 msgstr "Y Swistir"
@@ -3584,7 +3628,8 @@ msgstr "Cote d'Ivoire"
 msgid "Cook Islands"
 msgstr "Ynysoedd Cook"
 
-#: lang.pm:253 timezone.pm:262
+#: lang.pm:253
+#: timezone.pm:262
 #, c-format
 msgid "Chile"
 msgstr "Chile"
@@ -3594,7 +3639,8 @@ msgstr "Chile"
 msgid "Cameroon"
 msgstr "Cameroon"
 
-#: lang.pm:255 timezone.pm:201
+#: lang.pm:255
+#: timezone.pm:201
 #, c-format
 msgid "China"
 msgstr "Tsieina"
@@ -3604,7 +3650,8 @@ msgstr "Tsieina"
 msgid "Colombia"
 msgstr "Colombia"
 
-#: lang.pm:257 mirror.pm:15
+#: lang.pm:257
+#: mirror.pm:15
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
@@ -3634,12 +3681,16 @@ msgstr "Ynys Christmas"
 msgid "Cyprus"
 msgstr "Cyprus"
 
-#: lang.pm:263 mirror.pm:16 timezone.pm:222
+#: lang.pm:263
+#: mirror.pm:16
+#: timezone.pm:222
 #, c-format
 msgid "Czech Republic"
 msgstr "Gweriniaeth Tsiec"
 
-#: lang.pm:264 mirror.pm:21 timezone.pm:227
+#: lang.pm:264
+#: mirror.pm:21
+#: timezone.pm:227
 #, c-format
 msgid "Germany"
 msgstr "Yr Almaen"
@@ -3649,7 +3700,9 @@ msgstr "Yr Almaen"
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: lang.pm:266 mirror.pm:17 timezone.pm:223
+#: lang.pm:266
+#: mirror.pm:17
+#: timezone.pm:223
 #, c-format
 msgid "Denmark"
 msgstr "Denmarc"
@@ -3674,7 +3727,9 @@ msgstr "Algeria"
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: lang.pm:271 mirror.pm:18 timezone.pm:224
+#: lang.pm:271
+#: mirror.pm:18
+#: timezone.pm:224
 #, c-format
 msgid "Estonia"
 msgstr "Estonia"
@@ -3694,7 +3749,9 @@ msgstr "Western Sahara"
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: lang.pm:275 mirror.pm:36 timezone.pm:242
+#: lang.pm:275
+#: mirror.pm:36
+#: timezone.pm:242
 #, c-format
 msgid "Spain"
 msgstr "Sbaen"
@@ -3704,7 +3761,9 @@ msgstr "Sbaen"
 msgid "Ethiopia"
 msgstr "Ethiopia"
 
-#: lang.pm:277 mirror.pm:19 timezone.pm:225
+#: lang.pm:277
+#: mirror.pm:19
+#: timezone.pm:225
 #, c-format
 msgid "Finland"
 msgstr "Y Ffindir"
@@ -3729,7 +3788,9 @@ msgstr "Micronesia"
 msgid "Faroe Islands"
 msgstr "Ynysoedd Faroe"
 
-#: lang.pm:282 mirror.pm:20 timezone.pm:226
+#: lang.pm:282
+#: mirror.pm:20
+#: timezone.pm:226
 #, c-format
 msgid "France"
 msgstr "Ffrainc"
@@ -3739,7 +3800,8 @@ msgstr "Ffrainc"
 msgid "Gabon"
 msgstr "Gabon"
 
-#: lang.pm:284 timezone.pm:246
+#: lang.pm:284
+#: timezone.pm:246
 #, c-format
 msgid "United Kingdom"
 msgstr "Y Deyrnas Unedig"
@@ -3794,7 +3856,9 @@ msgstr "Guadeloupe"
 msgid "Equatorial Guinea"
 msgstr "Equatorial Guinea"
 
-#: lang.pm:295 mirror.pm:22 timezone.pm:228
+#: lang.pm:295
+#: mirror.pm:22
+#: timezone.pm:228
 #, c-format
 msgid "Greece"
 msgstr "Groeg"
@@ -3804,7 +3868,8 @@ msgstr "Groeg"
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "De Georgia ac Ynysoedd De Sandwich"
 
-#: lang.pm:297 timezone.pm:251
+#: lang.pm:297
+#: timezone.pm:251
 #, c-format
 msgid "Guatemala"
 msgstr "Guatemala"
@@ -3849,27 +3914,35 @@ msgstr "Croatia"
 msgid "Haiti"
 msgstr "Haiti"
 
-#: lang.pm:306 mirror.pm:23 timezone.pm:229
+#: lang.pm:306
+#: mirror.pm:23
+#: timezone.pm:229
 #, c-format
 msgid "Hungary"
 msgstr "Hwngari"
 
-#: lang.pm:307 timezone.pm:204
+#: lang.pm:307
+#: timezone.pm:204
 #, c-format
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: lang.pm:308 mirror.pm:24 timezone.pm:230
+#: lang.pm:308
+#: mirror.pm:24
+#: timezone.pm:230
 #, c-format
 msgid "Ireland"
 msgstr "Iwerddon"
 
-#: lang.pm:309 mirror.pm:25 timezone.pm:206
+#: lang.pm:309
+#: mirror.pm:25
+#: timezone.pm:206
 #, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: lang.pm:310 timezone.pm:203
+#: lang.pm:310
+#: timezone.pm:203
 #, c-format
 msgid "India"
 msgstr "India"
@@ -3884,7 +3957,8 @@ msgstr "British Indian Ocean Territory"
 msgid "Iraq"
 msgstr "Irac"
 
-#: lang.pm:313 timezone.pm:205
+#: lang.pm:313
+#: timezone.pm:205
 #, c-format
 msgid "Iran"
 msgstr "Iran"
@@ -3894,7 +3968,9 @@ msgstr "Iran"
 msgid "Iceland"
 msgstr "Ynys yr Iâ"
 
-#: lang.pm:315 mirror.pm:26 timezone.pm:231
+#: lang.pm:315
+#: mirror.pm:26
+#: timezone.pm:231
 #, c-format
 msgid "Italy"
 msgstr "Yr Eidal"
@@ -3909,7 +3985,9 @@ msgstr "Jamaica"
 msgid "Jordan"
 msgstr "Yr Iorddonen"
 
-#: lang.pm:318 mirror.pm:27 timezone.pm:207
+#: lang.pm:318
+#: mirror.pm:27
+#: timezone.pm:207
 #, c-format
 msgid "Japan"
 msgstr "Siapan"
@@ -3949,7 +4027,8 @@ msgstr "Saint Kitts a Nevis"
 msgid "Korea (North)"
 msgstr "Corea (Gogledd)"
 
-#: lang.pm:326 timezone.pm:208
+#: lang.pm:326
+#: timezone.pm:208
 #, c-format
 msgid "Korea"
 msgstr "Corea"
@@ -4004,12 +4083,14 @@ msgstr "Liberia"
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: lang.pm:337 timezone.pm:232
+#: lang.pm:337
+#: timezone.pm:232
 #, c-format
 msgid "Lithuania"
 msgstr "Lithuania"
 
-#: lang.pm:338 timezone.pm:233
+#: lang.pm:338
+#: timezone.pm:233
 #, c-format
 msgid "Luxembourg"
 msgstr "Luxembourg"
@@ -4109,12 +4190,14 @@ msgstr "Maldives"
 msgid "Malawi"
 msgstr "Malawi"
 
-#: lang.pm:358 timezone.pm:252
+#: lang.pm:358
+#: timezone.pm:252
 #, c-format
 msgid "Mexico"
 msgstr "Mecsico"
 
-#: lang.pm:359 timezone.pm:209
+#: lang.pm:359
+#: timezone.pm:209
 #, c-format
 msgid "Malaysia"
 msgstr "Malaysia"
@@ -4154,12 +4237,16 @@ msgstr "Nigeria"
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: lang.pm:367 mirror.pm:28 timezone.pm:234
+#: lang.pm:367
+#: mirror.pm:28
+#: timezone.pm:234
 #, c-format
 msgid "Netherlands"
 msgstr "Yr Iseldiroedd"
 
-#: lang.pm:368 mirror.pm:30 timezone.pm:235
+#: lang.pm:368
+#: mirror.pm:30
+#: timezone.pm:235
 #, c-format
 msgid "Norway"
 msgstr "Norwy"
@@ -4179,7 +4266,9 @@ msgstr "Nauru"
 msgid "Niue"
 msgstr "Niue"
 
-#: lang.pm:372 mirror.pm:29 timezone.pm:257
+#: lang.pm:372
+#: mirror.pm:29
+#: timezone.pm:257
 #, c-format
 msgid "New Zealand"
 msgstr "Seland Newydd"
@@ -4209,7 +4298,8 @@ msgstr "Polynesia Ffrengig"
 msgid "Papua New Guinea"
 msgstr "Papua New Guinea"
 
-#: lang.pm:378 timezone.pm:210
+#: lang.pm:378
+#: timezone.pm:210
 #, c-format
 msgid "Philippines"
 msgstr "Philippines"
@@ -4219,7 +4309,9 @@ msgstr "Philippines"
 msgid "Pakistan"
 msgstr "Pacistan"
 
-#: lang.pm:380 mirror.pm:31 timezone.pm:236
+#: lang.pm:380
+#: mirror.pm:31
+#: timezone.pm:236
 #, c-format
 msgid "Poland"
 msgstr "Gwlad Pwyl"
@@ -4244,7 +4336,9 @@ msgstr "Puerto Rico"
 msgid "Palestine"
 msgstr "Palestina"
 
-#: lang.pm:385 mirror.pm:32 timezone.pm:237
+#: lang.pm:385
+#: mirror.pm:32
+#: timezone.pm:237
 #, c-format
 msgid "Portugal"
 msgstr "Portiwgal"
@@ -4269,12 +4363,14 @@ msgstr "Qatar"
 msgid "Reunion"
 msgstr "Reunion"
 
-#: lang.pm:390 timezone.pm:238
+#: lang.pm:390
+#: timezone.pm:238
 #, c-format
 msgid "Romania"
 msgstr "Rwmania"
 
-#: lang.pm:391 mirror.pm:33
+#: lang.pm:391
+#: mirror.pm:33
 #, c-format
 msgid "Russia"
 msgstr "Rwsia"
@@ -4304,12 +4400,15 @@ msgstr "Seychelles"
 msgid "Sudan"
 msgstr "Swdan"
 
-#: lang.pm:397 mirror.pm:37 timezone.pm:243
+#: lang.pm:397
+#: mirror.pm:37
+#: timezone.pm:243
 #, c-format
 msgid "Sweden"
 msgstr "Sweden"
 
-#: lang.pm:398 timezone.pm:211
+#: lang.pm:398
+#: timezone.pm:211
 #, c-format
 msgid "Singapore"
 msgstr "Singapore"
@@ -4319,7 +4418,8 @@ msgstr "Singapore"
 msgid "Saint Helena"
 msgstr "Saint Helena"
 
-#: lang.pm:400 timezone.pm:241
+#: lang.pm:400
+#: timezone.pm:241
 #, c-format
 msgid "Slovenia"
 msgstr "Slovenia"
@@ -4329,7 +4429,9 @@ msgstr "Slovenia"
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Ynysoedd Svalbard a Jan Mayen"
 
-#: lang.pm:402 mirror.pm:34 timezone.pm:240
+#: lang.pm:402
+#: mirror.pm:34
+#: timezone.pm:240
 #, c-format
 msgid "Slovakia"
 msgstr "Slofacia"
@@ -4399,7 +4501,9 @@ msgstr "French Southern Territories"
 msgid "Togo"
 msgstr "Togo"
 
-#: lang.pm:416 mirror.pm:40 timezone.pm:213
+#: lang.pm:416
+#: mirror.pm:40
+#: timezone.pm:213
 #, c-format
 msgid "Thailand"
 msgstr "Gwlad Thail"
@@ -4434,7 +4538,8 @@ msgstr "Tunisia"
 msgid "Tonga"
 msgstr "Tonga"
 
-#: lang.pm:423 timezone.pm:214
+#: lang.pm:423
+#: timezone.pm:214
 #, c-format
 msgid "Turkey"
 msgstr "Twrci"
@@ -4449,17 +4554,21 @@ msgstr "Trinidad a Tobago"
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: lang.pm:426 mirror.pm:39 timezone.pm:212
+#: lang.pm:426
+#: mirror.pm:39
+#: timezone.pm:212
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: lang.pm:427 timezone.pm:197
+#: lang.pm:427
+#: timezone.pm:197
 #, c-format
 msgid "Tanzania"
 msgstr "Tanzania"
 
-#: lang.pm:428 timezone.pm:245
+#: lang.pm:428
+#: timezone.pm:245
 #, c-format
 msgid "Ukraine"
 msgstr "Wcráin"
@@ -4474,7 +4583,9 @@ msgstr "Uganda"
 msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
-#: lang.pm:431 mirror.pm:41 timezone.pm:253
+#: lang.pm:431
+#: mirror.pm:41
+#: timezone.pm:253
 #, c-format
 msgid "United States"
 msgstr "Yr Unol Daleithiau"
@@ -4544,7 +4655,9 @@ msgstr "Yemen"
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: lang.pm:445 mirror.pm:35 timezone.pm:196
+#: lang.pm:445
+#: mirror.pm:35
+#: timezone.pm:196
 #, c-format
 msgid "South Africa"
 msgstr "De Affrica"
@@ -4590,250 +4703,166 @@ msgstr "Nid yw'r cychwynnydd yn gallu trin /boot ar gyfrolau ffisegol niferus"
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Mandriva "
-"Linux distribution \n"
-"shall be called the \"Software Products\" hereafter. The Software Products "
-"include, but are not \n"
-"restricted to, the set of programs, methods, rules and documentation related "
-"to the operating \n"
+"The operating system and the different components available in the Mandriva Linux distribution \n"
+"shall be called the \"Software Products\" hereafter. The Software Products include, but are not \n"
+"restricted to, the set of programs, methods, rules and documentation related to the operating \n"
 "system and the different components of the Mandriva Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
 "\n"
-"Please read this document carefully. This document is a license agreement "
-"between you and  \n"
+"Please read this document carefully. This document is a license agreement between you and  \n"
 "Mandriva S.A. which applies to the Software Products.\n"
-"By installing, duplicating or using the Software Products in any manner, you "
-"explicitly \n"
-"accept and fully agree to conform to the terms and conditions of this "
-"License. \n"
-"If you disagree with any portion of the License, you are not allowed to "
-"install, duplicate or use \n"
+"By installing, duplicating or using the Software Products in any manner, you explicitly \n"
+"accept and fully agree to conform to the terms and conditions of this License. \n"
+"If you disagree with any portion of the License, you are not allowed to install, duplicate or use \n"
 "the Software Products. \n"
-"Any attempt to install, duplicate or use the Software Products in a manner "
-"which does not comply \n"
-"with the terms and conditions of this License is void and will terminate "
-"your rights under this \n"
-"License. Upon termination of the License,  you must immediately destroy all "
-"copies of the \n"
+"Any attempt to install, duplicate or use the Software Products in a manner which does not comply \n"
+"with the terms and conditions of this License is void and will terminate your rights under this \n"
+"License. Upon termination of the License,  you must immediately destroy all copies of the \n"
 "Software Products.\n"
 "\n"
 "\n"
 "2. Limited Warranty\n"
 "\n"
-"The Software Products and attached documentation are provided \"as is\", "
-"with no warranty, to the \n"
+"The Software Products and attached documentation are provided \"as is\", with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
-"be liable for any special,\n"
-"incidental, direct or indirect damages whatsoever (including without "
-"limitation damages for loss of \n"
-"business, interruption of business, financial loss, legal fees and penalties "
-"resulting from a court \n"
-"judgment, or any other consequential loss) arising out of  the use or "
-"inability to use the Software \n"
-"Products, even if Mandriva S.A. has been advised of the possibility or "
-"occurrence of such \n"
+"Mandriva S.A. will, in no circumstances and to the extent permitted by law, be liable for any special,\n"
+"incidental, direct or indirect damages whatsoever (including without limitation damages for loss of \n"
+"business, interruption of business, financial loss, legal fees and penalties resulting from a court \n"
+"judgment, or any other consequential loss) arising out of  the use or inability to use the Software \n"
+"Products, even if Mandriva S.A. has been advised of the possibility or occurrence of such \n"
 "damages.\n"
 "\n"
-"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
-"COUNTRIES\n"
-"\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
-"no circumstances, be \n"
-"liable for any special, incidental, direct or indirect damages whatsoever "
-"(including without \n"
-"limitation damages for loss of business, interruption of business, financial "
-"loss, legal fees \n"
-"and penalties resulting from a court judgment, or any other consequential "
-"loss) arising out \n"
-"of the possession and use of software components or arising out of  "
-"downloading software components \n"
-"from one of Mandriva Linux sites  which are prohibited or restricted in some "
-"countries by local laws.\n"
-"This limited liability applies to, but is not restricted to, the strong "
-"cryptography components \n"
+"LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME COUNTRIES\n"
+"\n"
+"To the extent permitted by law, Mandriva S.A. or its distributors will, in no circumstances, be \n"
+"liable for any special, incidental, direct or indirect damages whatsoever (including without \n"
+"limitation damages for loss of business, interruption of business, financial loss, legal fees \n"
+"and penalties resulting from a court judgment, or any other consequential loss) arising out \n"
+"of the possession and use of software components or arising out of  downloading software components \n"
+"from one of Mandriva Linux sites  which are prohibited or restricted in some countries by local laws.\n"
+"This limited liability applies to, but is not restricted to, the strong cryptography components \n"
 "included in the Software Products.\n"
 "\n"
 "\n"
 "3. The GPL License and Related Licenses\n"
 "\n"
-"The Software Products consist of components created by different persons or "
-"entities.  Most \n"
-"of these components are governed under the terms and conditions of the GNU "
-"General Public \n"
-"Licence, hereafter called \"GPL\", or of similar licenses. Most of these "
-"licenses allow you to use, \n"
-"duplicate, adapt or redistribute the components which they cover. Please "
-"read carefully the terms \n"
-"and conditions of the license agreement for each component before using any "
-"component. Any question \n"
-"on a component license should be addressed to the component author and not "
-"to Mandriva.\n"
-"The programs developed by Mandriva S.A. are governed by the GPL License. "
-"Documentation written \n"
-"by Mandriva S.A. is governed by a specific license. Please refer to the "
-"documentation for \n"
+"The Software Products consist of components created by different persons or entities.  Most \n"
+"of these components are governed under the terms and conditions of the GNU General Public \n"
+"Licence, hereafter called \"GPL\", or of similar licenses. Most of these licenses allow you to use, \n"
+"duplicate, adapt or redistribute the components which they cover. Please read carefully the terms \n"
+"and conditions of the license agreement for each component before using any component. Any question \n"
+"on a component license should be addressed to the component author and not to Mandriva.\n"
+"The programs developed by Mandriva S.A. are governed by the GPL License. Documentation written \n"
+"by Mandriva S.A. is governed by a specific license. Please refer to the documentation for \n"
 "further details.\n"
 "\n"
 "\n"
 "4. Intellectual Property Rights\n"
 "\n"
-"All rights to the components of the Software Products belong to their "
-"respective authors and are \n"
-"protected by intellectual property and copyright laws applicable to software "
-"programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
-"as a whole or in \n"
+"All rights to the components of the Software Products belong to their respective authors and are \n"
+"protected by intellectual property and copyright laws applicable to software programs.\n"
+"Mandriva S.A. reserves its rights to modify or adapt the Software Products, as a whole or in \n"
 "parts, by all means and for all purposes.\n"
-"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
-"Mandriva S.A.  \n"
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of Mandriva S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
 "\n"
-"If any portion of this agreement is held void, illegal or inapplicable by a "
-"court judgment, this \n"
-"portion is excluded from this contract. You remain bound by the other "
-"applicable sections of the \n"
+"If any portion of this agreement is held void, illegal or inapplicable by a court judgment, this \n"
+"portion is excluded from this contract. You remain bound by the other applicable sections of the \n"
 "agreement.\n"
-"The terms and conditions of this License are governed by the Laws of "
-"France.\n"
-"All disputes on the terms of this license will preferably be settled out of "
-"court. As a last \n"
-"resort, the dispute will be referred to the appropriate Courts of Law of "
-"Paris - France.\n"
+"The terms and conditions of this License are governed by the Laws of France.\n"
+"All disputes on the terms of this license will preferably be settled out of court. As a last \n"
+"resort, the dispute will be referred to the appropriate Courts of Law of Paris - France.\n"
 "For any question on this document, please contact Mandriva S.A.  \n"
 msgstr ""
 "Cyflwyniad\n"
 "\n"
-"Bydd y system weithredu a'r cydrannau gwahanol sydd o fewn dosbarthiad "
-"Mandriva Linux yn\n"
-"cael eu galw yn \"Gynnyrch Meddalwedd\" o hyn ymlaen. Mae'r Cynnyrch "
-"Meddalwedd yn\n"
-"cynnwys, ond heb eu cyfyngu, i'r  casgliad o raglenni , dulliau, rheolau a "
-"dogfennau mewn\n"
-"perthynas â'r system weithredu a chydrannau gwahanol ddosbarthiad Mandriva "
-"Linux.\n"
+"Bydd y system weithredu a'r cydrannau gwahanol sydd o fewn dosbarthiad Mandriva Linux yn\n"
+"cael eu galw yn \"Gynnyrch Meddalwedd\" o hyn ymlaen. Mae'r Cynnyrch Meddalwedd yn\n"
+"cynnwys, ond heb eu cyfyngu, i'r  casgliad o raglenni , dulliau, rheolau a dogfennau mewn\n"
+"perthynas â'r system weithredu a chydrannau gwahanol ddosbarthiad Mandriva Linux.\n"
 "\n"
 "\n"
 "1. Cytundeb Trwyddedu\n"
 "\n"
-"Darllenwch y ddogfen hon yn ofalus. Mae'r ddogfen hon yn gytundeb trwyddedu "
-"rhyngoch\n"
+"Darllenwch y ddogfen hon yn ofalus. Mae'r ddogfen hon yn gytundeb trwyddedu rhyngoch\n"
 "chi â Mandriva S.A,. sy'n berthnasol i'r Cynnyrch Meddalwedd.\n"
 "\n"
-"Wrth osod, dyblygu neu ddefnyddio'r Cynnyrch Meddalwedd mewn unrhyw fodd, "
-"rydych yn\n"
-"amlwg yn derbyn ac yn llawn cytuno i gadw at delerau ac amodau'r Drwydded "
-"hon.\n"
-"Os ydych yn anghytuno ag unrhyw ran o'r cytundeb, ni chewch ganiatâd i osod, "
-"dyblygu\n"
+"Wrth osod, dyblygu neu ddefnyddio'r Cynnyrch Meddalwedd mewn unrhyw fodd, rydych yn\n"
+"amlwg yn derbyn ac yn llawn cytuno i gadw at delerau ac amodau'r Drwydded hon.\n"
+"Os ydych yn anghytuno ag unrhyw ran o'r cytundeb, ni chewch ganiatâd i osod, dyblygu\n"
 "neu ddefnyddio'r Cynnyrch Meddalwedd.\n"
-"Bydd unrhyw ymgais i osod, dyblygu neu ddefnyddio'r Cynnyrch Meddalwedd mewn "
-"modd\n"
+"Bydd unrhyw ymgais i osod, dyblygu neu ddefnyddio'r Cynnyrch Meddalwedd mewn modd\n"
 "\n"
-"nad yw'n cyd-fynd â thelerau ac amodau'r Drwydded yn ddi-rym a bydd yn "
-"terfynu eich\n"
-"hawliau o dan y Drwydded hon. Ar ddiwedd y Drwydded, rhaid i chi "
-"ddinistrio'n syth pob\n"
+"nad yw'n cyd-fynd â thelerau ac amodau'r Drwydded yn ddi-rym a bydd yn terfynu eich\n"
+"hawliau o dan y Drwydded hon. Ar ddiwedd y Drwydded, rhaid i chi ddinistrio'n syth pob\n"
 "copi o'r Cynnyrch Meddalwedd.\n"
 "\n"
 "\n"
 "2. Gwarant Gyfyngedig\n"
 "\n"
-"Mae'r Cynnyrch Meddalwedd a'r ddogfennaeth gysylltiedig yn cael eu darparu "
-"\"fel ag y maent\",\n"
+"Mae'r Cynnyrch Meddalwedd a'r ddogfennaeth gysylltiedig yn cael eu darparu \"fel ag y maent\",\n"
 "heb ddim gwarant,\n"
 "hyd y mae'r gyfraith yn caniatáu.\n"
-"Ni fydd Mandriva S.A. yn gyfrifol, o dan unrhyw amgylchiad, a chyhyd ag y "
-"bydd y gyfraith yn\n"
+"Ni fydd Mandriva S.A. yn gyfrifol, o dan unrhyw amgylchiad, a chyhyd ag y bydd y gyfraith yn\n"
 "caniatáu,  am unrhyw iawn o gwbl,\n"
-"arbennig, damweiniol, uniongyrchol neu anuniongyrchol (gan gynnwys heb "
-"gyfyngu ar iawndal\n"
-"am golli busnes, tarfu ar fusnes, colled ariannol, costau cyfreithiol, a "
-"chosb o ganlyniad i achos llys,\n"
-"neu unrhyw golled o ganlyniad) yn codi o'r defnydd neu'r anallu i "
-"ddefnyddio'r Cynnyrch Meddalwedd,\n"
+"arbennig, damweiniol, uniongyrchol neu anuniongyrchol (gan gynnwys heb gyfyngu ar iawndal\n"
+"am golli busnes, tarfu ar fusnes, colled ariannol, costau cyfreithiol, a chosb o ganlyniad i achos llys,\n"
+"neu unrhyw golled o ganlyniad) yn codi o'r defnydd neu'r anallu i ddefnyddio'r Cynnyrch Meddalwedd,\n"
 "hyd yn oed os yw Mandriva wedi eu cynghori o'r posibilrwydd o'r fath iawn.\n"
 "\n"
-"CYFRIFOLDEB CYFYNGEDIG YN GYSYLLTIEDIG GYDA'R MEDDIANT NEU'R DEFNYDD O "
-"FEDDALWEDD\n"
+"CYFRIFOLDEB CYFYNGEDIG YN GYSYLLTIEDIG GYDA'R MEDDIANT NEU'R DEFNYDD O FEDDALWEDD\n"
 " GWAHARDDEDIG MEWN RHAI GWLEDYDD\n"
 "\n"
-"Ni fydd Mandriva S.A. yn gyfrifol, o dan unrhyw amgylchiad, a chyhyd y bydd "
-"y gyfraith yn caniatáu,\n"
-"i fod yn atebol am unrhyw iawn o gwbl, arbennig, damweiniol, uniongyrchol "
-"neu anuniongyrchol (gan gynnwys\n"
-"heb gyfyngu ar iawndal am golli busnes, tarfu ar fusnes, colled ariannol, "
-"costau cyfreithiol, a chosb o ganlyniad\n"
-"i achos llys, neu unrhyw golled o ganlyniad) yn codi o lwytho i lawr "
-"cydrannau meddalwedd o un o safleoedd\n"
-" Mandriva Linux, sydd wedi eu gwahardd neu eu hatal mewn rhai gwledydd gan "
-"gyfreithiau lleol. Mae'r\n"
-"cyfrifoldeb cyfyngedig hwn yn perthyn i , ond heb ei gyfyngu i'r, cydrannau "
-"cryptograffiaeth cryf sy'n cael\n"
+"Ni fydd Mandriva S.A. yn gyfrifol, o dan unrhyw amgylchiad, a chyhyd y bydd y gyfraith yn caniatáu,\n"
+"i fod yn atebol am unrhyw iawn o gwbl, arbennig, damweiniol, uniongyrchol neu anuniongyrchol (gan gynnwys\n"
+"heb gyfyngu ar iawndal am golli busnes, tarfu ar fusnes, colled ariannol, costau cyfreithiol, a chosb o ganlyniad\n"
+"i achos llys, neu unrhyw golled o ganlyniad) yn codi o lwytho i lawr cydrannau meddalwedd o un o safleoedd\n"
+" Mandriva Linux, sydd wedi eu gwahardd neu eu hatal mewn rhai gwledydd gan gyfreithiau lleol. Mae'r\n"
+"cyfrifoldeb cyfyngedig hwn yn perthyn i , ond heb ei gyfyngu i'r, cydrannau cryptograffiaeth cryf sy'n cael\n"
 "eu cynnwys o fewn y Cynnyrch Meddalwedd.\n"
 "\n"
 "\n"
 "3. Trwydded GPL a Thrwyddedau Cysylltiedig\n"
 "\n"
-"Mae'r Cynnyrch Meddalwedd yn cynnwys cydrannau sydd wedi eu creu gan "
-"bersonau a endidau gwahanol.\n"
-"Mae'r rhan fwyaf o'r cydrannau hyn yn cael eu llywodraethu gan dermau ac "
-"amodau Trwydded Gyhoeddus\n"
-"Cyffredinol (General Public Licence (GPL)), GNU, fydd yn cael ei gyfeirio "
-"ato  o hyn ymlaen fel \"GPL\", neu\n"
-"drwyddedau cyffelyb. Mae'r rhan fwyaf o'r trwyddedau'n caniatáu i chi "
-"ddefnyddio, dyblygu, addasu neu\n"
-" ailddosbarthu'r cydrannau maent yn eu cynnwys. Darllenwch delerau ac amodau "
-"trwydded pob cydran cyn\n"
-"eu defnyddio. Dylai pob cwestiwn am drwydded cydran gael ei ofyn i awdur y "
-"gydran ac nid i Mandriva.\n"
-"Mae'r rhaglenni a ddatblygwyd gan Mandriva yn cael eu llywodraethu o dan "
-"Drwydded GLP. Mae'r dogfennau\n"
-" ysgrifennwyd gan Mandriva S.A. yn cael eu llywodraethu gan drwydded "
-"benodol. Darllenwch y dogfennau\n"
+"Mae'r Cynnyrch Meddalwedd yn cynnwys cydrannau sydd wedi eu creu gan bersonau a endidau gwahanol.\n"
+"Mae'r rhan fwyaf o'r cydrannau hyn yn cael eu llywodraethu gan dermau ac amodau Trwydded Gyhoeddus\n"
+"Cyffredinol (General Public Licence (GPL)), GNU, fydd yn cael ei gyfeirio ato  o hyn ymlaen fel \"GPL\", neu\n"
+"drwyddedau cyffelyb. Mae'r rhan fwyaf o'r trwyddedau'n caniatáu i chi ddefnyddio, dyblygu, addasu neu\n"
+" ailddosbarthu'r cydrannau maent yn eu cynnwys. Darllenwch delerau ac amodau trwydded pob cydran cyn\n"
+"eu defnyddio. Dylai pob cwestiwn am drwydded cydran gael ei ofyn i awdur y gydran ac nid i Mandriva.\n"
+"Mae'r rhaglenni a ddatblygwyd gan Mandriva yn cael eu llywodraethu o dan Drwydded GLP. Mae'r dogfennau\n"
+" ysgrifennwyd gan Mandriva S.A. yn cael eu llywodraethu gan drwydded benodol. Darllenwch y dogfennau\n"
 "am fwy o fanylion.\n"
 "\n"
 "\n"
 "4. Hawliau Eiddo Deallusol\n"
 "\n"
-"Mae pob hawl cydrannau'r Cynnyrch Meddalwedd yn perthyn i'w hawduron "
-"perthnasol ac wedi eu hamddiffyn\n"
-"gan gyfreithiau eiddo deallusol a hawlfraint sy'n berthnasol i raglenni "
-"meddalwedd. Mae Mandriva yn cadw\n"
-"ei hawl i newid neu addasu ei Gynnyrch Meddalwedd, yn rhannol neu yn gyfan, "
-"drwy unrhyw ddull ac ar gyfer\n"
+"Mae pob hawl cydrannau'r Cynnyrch Meddalwedd yn perthyn i'w hawduron perthnasol ac wedi eu hamddiffyn\n"
+"gan gyfreithiau eiddo deallusol a hawlfraint sy'n berthnasol i raglenni meddalwedd. Mae Mandriva yn cadw\n"
+"ei hawl i newid neu addasu ei Gynnyrch Meddalwedd, yn rhannol neu yn gyfan, drwy unrhyw ddull ac ar gyfer\n"
 "unrhyw bwrpas.\n"
-"Mae \"Mandriva\", \"Mandriva Linux\"  a'r logos cysylltiedig yn nodau "
-"masnachol sy'n perthyn i Mandriva S.A.\n"
+"Mae \"Mandriva\", \"Mandriva Linux\"  a'r logos cysylltiedig yn nodau masnachol sy'n perthyn i Mandriva S.A.\n"
 "\n"
 "\n"
 "5. Cyfreithiau Llywodraethol\n"
 "\n"
-"Os bydd unrhyw ran o'r cytundeb hwn yn cael ei ddal yn ddi-rym, "
-"anghyfreithlon neu amherthnasol gan\n"
-"benderfyniad llys, bydd y rhan yma'n cael ei dynnu o'r cytundeb hwn. Byddwch "
-"yn parhau i fod yn rhwymedig\n"
+"Os bydd unrhyw ran o'r cytundeb hwn yn cael ei ddal yn ddi-rym, anghyfreithlon neu amherthnasol gan\n"
+"benderfyniad llys, bydd y rhan yma'n cael ei dynnu o'r cytundeb hwn. Byddwch yn parhau i fod yn rhwymedig\n"
 "i adrannau cymwys o'r cytundeb.\n"
-"Mae telerau ac amodau'r Drwydded hon yn cael eu llywodraethu gan Gyfreithiau "
-"Ffrainc. Mae'n ddymunol y\n"
-"bydd pob anghytundeb ar amodau'r drwydded yn cael eu datrys y tu allan i'r "
-"llys. Fel cam olaf, bydd yr anghytundeb yn cael ei drosglwyddo i'r Llysoedd "
-"Barn, Paris - Ffrainc. Am unrhyw gwestiwn ynghylch y ddogfen hon cysylltwch "
-"â Mandriva S.A.  \n"
+"Mae telerau ac amodau'r Drwydded hon yn cael eu llywodraethu gan Gyfreithiau Ffrainc. Mae'n ddymunol y\n"
+"bydd pob anghytundeb ar amodau'r drwydded yn cael eu datrys y tu allan i'r llys. Fel cam olaf, bydd yr anghytundeb yn cael ei drosglwyddo i'r Llysoedd Barn, Paris - Ffrainc. Am unrhyw gwestiwn ynghylch y ddogfen hon cysylltwch â Mandriva S.A.  \n"
 
 #: messages.pm:90
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
-"Software included may be covered by patents in your country. For example, "
-"the\n"
+"Software included may be covered by patents in your country. For example, the\n"
 "MP3 decoders included may require a licence for further usage (see\n"
-"http://www.mp3licensing.com for more details). If you are unsure if a "
-"patent\n"
+"http://www.mp3licensing.com for more details). If you are unsure if a patent\n"
 "may be applicable to you, check your local laws."
 msgstr ""
 "Rhybudd: Mae'n bosibl nad yw Meddalwedd Rhad yn rhydd o batent, ac mae\n"
@@ -4887,23 +4916,18 @@ msgstr ""
 " amodau ei drwydded benodol ei hun. Darllenwch yn ofalus a chadwch at y\n"
 " trwyddedau penodol cyn defnyddio neu ddosbarthu'r cydrannau hynny.\n"
 "\n"
-"Mae'r trwyddedau hynny'n atal yn gyffredinol, drosglwyddiad, dyblygu (ar "
-"wahan i\n"
+"Mae'r trwyddedau hynny'n atal yn gyffredinol, drosglwyddiad, dyblygu (ar wahan i\n"
 " bwrpas cadw wrth gefn), dosbarthu, cildroi peirianyddol, dadcydosod,\n"
 " dad-grynhoi neu newid y cydrannau. Bydd unrhyw dorri ar yr amodau hyn yn\n"
-"terfynu eich hawl  o dan y drwydded benodol. Oni bai ei fod yn rhoi'r hawl i "
-"chi,\n"
-"nid oes modd i chi osod y rhaglenni ar fwy nag un system na'i addasu ar "
-"gyfer\n"
+"terfynu eich hawl  o dan y drwydded benodol. Oni bai ei fod yn rhoi'r hawl i chi,\n"
+"nid oes modd i chi osod y rhaglenni ar fwy nag un system na'i addasu ar gyfer\n"
 " defnydd ar rwydwaith. Os oes amheuaeth, cysylltwch yn uniongyrchol â\n"
 "dosbarthwr neu olygydd y cydrannau hynny.\n"
 "Mae trosglwyddo i drydydd parti neu gopïo'r cydrannau hynny gan gynnwys y\n"
 " ddogfennaeth, wedi ei wahardd fel rheol\n"
 "\n"
-"Mae pob hawl i gydrannau'r cyfrwng CD nesaf yn perthyn i' hawduron "
-"perthnasol\n"
-" ac maent wedi eu hamddiffyn drwy gyfreithiau eiddo deallusol a hawlfraint "
-"sy'n\n"
+"Mae pob hawl i gydrannau'r cyfrwng CD nesaf yn perthyn i' hawduron perthnasol\n"
+" ac maent wedi eu hamddiffyn drwy gyfreithiau eiddo deallusol a hawlfraint sy'n\n"
 " berthynol i raglenni meddalwedd.\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
@@ -4914,8 +4938,7 @@ msgid ""
 "Remove the boot media and press Enter to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of Mandriva "
-"Linux,\n"
+"For information on fixes which are available for this release of Mandriva Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -4929,8 +4952,7 @@ msgstr ""
 "Tynnwch y cyfrwng cychwyn a chlicio Ailgychwyn.\n"
 "\n"
 "\n"
-"Am wybodaeth am gywiriadau sydd ar gael ar gyfer y rhyddhad hwn o Mandriva "
-"Linux,\n"
+"Am wybodaeth am gywiriadau sydd ar gael ar gyfer y rhyddhad hwn o Mandriva Linux,\n"
 "cysylltwch â'r atodiad, sydd i'w gael yn:\n"
 "\n"
 "\n"
@@ -5009,8 +5031,7 @@ msgid ""
 "Note that any address should be entered with the prefix 0x like '0x123'"
 msgstr ""
 "Gallwch ddarparu ddewisiadau i fodiwl %s.\n"
-"Sylwer: wrth greu unrhyw gyfeiriad bydd angen defnyddio rhagddodiad 0x, e.e. "
-"'0x123'"
+"Sylwer: wrth greu unrhyw gyfeiriad bydd angen defnyddio rhagddodiad 0x, e.e. '0x123'"
 
 #: modules/interactive.pm:116
 #, c-format
@@ -5038,20 +5059,15 @@ msgstr "Pa yrrwr %s ddylwn drio?"
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without them. Would you like to "
-"specify\n"
+"properly, although it normally works fine without them. Would you like to specify\n"
 "extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
+"information it needs? Occasionally, probing will hang a computer, but it should\n"
 "not cause any damage."
 msgstr ""
 "Mewn rhai achosion, mae gyrrwr %s angen gwybodaeth ychwanegol i weithio'n\n"
-"gywir, er fel rheol mae'n gweithio'n iawn hebddo. Hoffech chi enwi'r "
-"dewisiadau\n"
-"ychwanegol ar ei gyfer neu adael i'r gyrrwr archwilio'r peiriant am y "
-"wybodaeth mae\n"
-"ei angen? Weithiau bydd yr archwilio'n atal y peiriant, ond ni ddylai achosi "
-"unrhyw\n"
+"gywir, er fel rheol mae'n gweithio'n iawn hebddo. Hoffech chi enwi'r dewisiadau\n"
+"ychwanegol ar ei gyfer neu adael i'r gyrrwr archwilio'r peiriant am y wybodaeth mae\n"
+"ei angen? Weithiau bydd yr archwilio'n atal y peiriant, ond ni ddylai achosi unrhyw\n"
 "ddifrod."
 
 #: modules/interactive.pm:144
@@ -5087,20 +5103,17 @@ msgstr "Nid yw'r rhaniad estynedig yn cael ei gynnal ar y platfform hwn"
 #, c-format
 msgid ""
 "You have a hole in your partition table but I can not use it.\n"
-"The only solution is to move your primary partitions to have the hole next "
-"to the extended partitions."
+"The only solution is to move your primary partitions to have the hole next to the extended partitions."
 msgstr ""
 "Mae gennych dwll yn nhabl eich rhaniad ond nid wyf yn gallu ei ddefnyddio\n"
-"Yr unig ateb yw i symud eich rhaniadau cynradd fel bo'r twll nesaf at y "
-"rhaniadau estynedig "
+"Yr unig ateb yw i symud eich rhaniadau cynradd fel bo'r twll nesaf at y rhaniadau estynedig "
 
 #: partition_table/raw.pm:279
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
 "A test to check the integrity of data has failed. \n"
-"It means writing anything on the disk will end up with random, corrupted "
-"data."
+"It means writing anything on the disk will end up with random, corrupted data."
 msgstr ""
 "Mae rhywbeth gwael yn digwydd ar eich disg.\n"
 "Mae prawf i fesur ei gyfanrwydd wedi methu. \n"
@@ -5204,8 +5217,7 @@ msgstr "Caniatáu mewngofnodi gwraidd uniongyrchol."
 
 #: security/help.pm:33
 #, c-format
-msgid ""
-"Allow the list of users on the system on display managers (kdm and gdm)."
+msgid "Allow the list of users on the system on display managers (kdm and gdm)."
 msgstr "Caniatáu rhestr defnyddwyr ar y system ar reolwyr dangos (kdm a gdm)."
 
 #: security/help.pm:35
@@ -5254,28 +5266,24 @@ msgstr ""
 msgid ""
 "Authorize:\n"
 "\n"
-"- all services controlled by tcp_wrappers (see hosts.deny(5) man page) if "
-"set to \"ALL\",\n"
+"- all services controlled by tcp_wrappers (see hosts.deny(5) man page) if set to \"ALL\",\n"
 "\n"
 "- only local ones if set to \"Local\"\n"
 "\n"
 "- none if set to \"None\".\n"
 "\n"
-"To authorize the services you need, use /etc/hosts.allow (see hosts.allow"
-"(5))."
+"To authorize the services you need, use /etc/hosts.allow (see hosts.allow(5))."
 msgstr ""
 "Ymresymiadau: (arg)\n"
 "\n"
-"- pob gwasanaeth sy'n cael ei reoli gan tcp_wrappers (gw. hosts.deny(5) man "
-"page) os wedi ei osod i \"POPETH\",\n"
+"- pob gwasanaeth sy'n cael ei reoli gan tcp_wrappers (gw. hosts.deny(5) man page) os wedi ei osod i \"POPETH\",\n"
 "\n"
 "\n"
 " Dim ond rhai lleol os wedi eu gosod i \"LLEOL\"\n"
 "\n"
 "- dim os wedi eu gosodi i \"None\".\n"
 "\n"
-" I ganiatáu'r gwasanaethau sydd eu hangen, defnyddiwch /etc/hosts.allow (gw. "
-"hosts.allow(5))."
+" I ganiatáu'r gwasanaethau sydd eu hangen, defnyddiwch /etc/hosts.allow (gw. hosts.allow(5))."
 
 #: security/help.pm:63
 #, c-format
@@ -5351,12 +5359,8 @@ msgstr "Galluogi gwiriad diogelwch msec bob awr."
 
 #: security/help.pm:90
 #, c-format
-msgid ""
-"Enable su only from members of the wheel group. If set to no, allows su from "
-"any user."
-msgstr ""
-"Galluogi su gan aelodau'r grŵp olwyn yn unig. Os wedi ei osod i na, caniatáu "
-"su o unrhyw ddefnyddiwr."
+msgid "Enable su only from members of the wheel group. If set to no, allows su from any user."
+msgstr "Galluogi su gan aelodau'r grŵp olwyn yn unig. Os wedi ei osod i na, caniatáu su o unrhyw ddefnyddiwr."
 
 #: security/help.pm:92
 #, c-format
@@ -5386,8 +5390,7 @@ msgstr "Ychwanegu'r enw fel eithriad i drin cyfrinair yn erbyn msec."
 #: security/help.pm:102
 #, c-format
 msgid "Set password aging to \"max\" days and delay to change to \"inactive\"."
-msgstr ""
-"Gosod cyfrinair yn erbyn \"max\" dyddiau ac oedi i newid i \"inactive\"."
+msgstr "Gosod cyfrinair yn erbyn \"max\" dyddiau ac oedi i newid i \"inactive\"."
 
 #: security/help.pm:104
 #, c-format
@@ -5396,12 +5399,8 @@ msgstr "Gosod hyd hanes cyfrinair i rwystro ail ddefnyddio'r cyfrinair."
 
 #: security/help.pm:106
 #, c-format
-msgid ""
-"Set the password minimum length and minimum number of digit and minimum "
-"number of capitalized letters."
-msgstr ""
-"Gosod lleiafswm hyd gyfrinair a lleiafswm digidau a lleiafswm llythrennau "
-"mawr."
+msgid "Set the password minimum length and minimum number of digit and minimum number of capitalized letters."
+msgstr "Gosod lleiafswm hyd gyfrinair a lleiafswm digidau a lleiafswm llythrennau mawr."
 
 #: security/help.pm:108
 #, c-format
@@ -5435,14 +5434,12 @@ msgstr ""
 #: security/help.pm:117
 #, c-format
 msgid "if set to yes, check permissions of files in the users' home."
-msgstr ""
-"os wedi ei osod i iawn, gwirio caniatâd ffeiliau yng nghartref y defnyddiwr."
+msgstr "os wedi ei osod i iawn, gwirio caniatâd ffeiliau yng nghartref y defnyddiwr."
 
 #: security/help.pm:118
 #, c-format
 msgid "if set to yes, check if the network devices are in promiscuous mode."
-msgstr ""
-"os wedi ei osod i iawn, gwirio os yw'r dyfeisiau rhwydwaith mewn modd cymysg"
+msgstr "os wedi ei osod i iawn, gwirio os yw'r dyfeisiau rhwydwaith mewn modd cymysg"
 
 #: security/help.pm:119
 #, c-format
@@ -5467,8 +5464,7 @@ msgstr "os wedi ei osod i iawn, gwirio checksum y ffeiliau suid/sgid."
 #: security/help.pm:123
 #, c-format
 msgid "if set to yes, check additions/removals of suid root files."
-msgstr ""
-"os wedi ei osod i iawn, , gwirio ychwanegu/tynnu ffeiliau gwraidd suid."
+msgstr "os wedi ei osod i iawn, , gwirio ychwanegu/tynnu ffeiliau gwraidd suid."
 
 #: security/help.pm:124
 #, c-format
@@ -5478,8 +5474,7 @@ msgstr "os wedi ei osod i iawn, adrodd ar ffeiliau heb berchennog."
 #: security/help.pm:125
 #, c-format
 msgid "if set to yes, check files/directories writable by everybody."
-msgstr ""
-"os wedi ei osod i iawn, gwirio ffeiliau/cyfeiriaduron ysgrifennadwy gan bawb."
+msgstr "os wedi ei osod i iawn, gwirio ffeiliau/cyfeiriaduron ysgrifennadwy gan bawb."
 
 #: security/help.pm:126
 #, c-format
@@ -5488,11 +5483,8 @@ msgstr "os wedi ei osod i iawn,  gwirio gyda chkrootkit."
 
 #: security/help.pm:127
 #, c-format
-msgid ""
-"if set, send the mail report to this email address else send it to root."
-msgstr ""
-"os wedi ei osod, anfon yr adroddiad e-bost i'r cyfeiriad e-bost neu ei anfon "
-"i'r gwraidd."
+msgid "if set, send the mail report to this email address else send it to root."
+msgstr "os wedi ei osod, anfon yr adroddiad e-bost i'r cyfeiriad e-bost neu ei anfon i'r gwraidd."
 
 #: security/help.pm:128
 #, c-format
@@ -5772,9 +5764,7 @@ msgstr "Peidiwch anfon adroddiadau e-bost gwag"
 #: security/l10n.pm:58
 #, c-format
 msgid "If set, send the mail report to this email address else send it to root"
-msgstr ""
-"Os wedi ei osod, anfon yr adroddiad e-bost i'r cyfeiriad e-bost neu ei anfon "
-"i'r gwraidd."
+msgstr "Os wedi ei osod, anfon yr adroddiad e-bost i'r cyfeiriad e-bost neu ei anfon i'r gwraidd."
 
 #: security/l10n.pm:59
 #, c-format
@@ -5839,55 +5829,34 @@ msgstr ""
 
 #: security/level.pm:44
 #, c-format
-msgid ""
-"Passwords are now enabled, but use as a networked computer is still not "
-"recommended."
-msgstr ""
-"Mae'r cyfrinair wedi ei alluogi, ond ni argymhellir ei ddefnyddio fel "
-"cyfrifiadur rhwydwaith."
+msgid "Passwords are now enabled, but use as a networked computer is still not recommended."
+msgstr "Mae'r cyfrinair wedi ei alluogi, ond ni argymhellir ei ddefnyddio fel cyfrifiadur rhwydwaith."
 
 #: security/level.pm:45
 #, c-format
-msgid ""
-"This is the standard security recommended for a computer that will be used "
-"to connect to the Internet as a client."
-msgstr ""
-"Dyma'r safon sy'n cael ei argymell ar gyfer diogelwch cyfrifiadur fydd yn "
-"cael ei gysylltu â'r Rhyngrwyd fel cleient."
+msgid "This is the standard security recommended for a computer that will be used to connect to the Internet as a client."
+msgstr "Dyma'r safon sy'n cael ei argymell ar gyfer diogelwch cyfrifiadur fydd yn cael ei gysylltu â'r Rhyngrwyd fel cleient."
 
 #: security/level.pm:46
 #, c-format
-msgid ""
-"There are already some restrictions, and more automatic checks are run every "
-"night."
-msgstr ""
-"Mae rhai cyfyngiadau, ac mae rhagor o wiriadau awtomatig yn cael eu rhedeg "
-"bob nos"
+msgid "There are already some restrictions, and more automatic checks are run every night."
+msgstr "Mae rhai cyfyngiadau, ac mae rhagor o wiriadau awtomatig yn cael eu rhedeg bob nos"
 
 #: security/level.pm:47
 #, c-format
 msgid ""
-"With this security level, the use of this system as a server becomes "
-"possible.\n"
-"The security is now high enough to use the system as a server which can "
-"accept\n"
-"connections from many clients. Note: if your machine is only a client on the "
-"Internet, you should choose a lower level."
+"With this security level, the use of this system as a server becomes possible.\n"
+"The security is now high enough to use the system as a server which can accept\n"
+"connections from many clients. Note: if your machine is only a client on the Internet, you should choose a lower level."
 msgstr ""
 "Gyda'r lefel diogelwch hwn, mae defnydd y system fel gweinydd yn bosibl.\n"
-"Mae diogelwch yn ddigon uchel i ddefnyddio'r system fel gweinydd sy'n "
-"derbyn\n"
-"cysylltiad gan amryw o gleientiaid. Sylwer: os mae i gleient yn unig yw eich "
-"peiriant ar y Rhyngrwyd, yna mae'n well i chi ddewis lefel is."
+"Mae diogelwch yn ddigon uchel i ddefnyddio'r system fel gweinydd sy'n derbyn\n"
+"cysylltiad gan amryw o gleientiaid. Sylwer: os mae i gleient yn unig yw eich peiriant ar y Rhyngrwyd, yna mae'n well i chi ddewis lefel is."
 
 #: security/level.pm:50
 #, c-format
-msgid ""
-"This is similar to the previous level, but the system is entirely closed and "
-"security features are at their maximum."
-msgstr ""
-"Wedi ei seilio ar y lefel flaenorol, ond mae'r system yn hollol gaeedig ac "
-"mae nodweddion diogelwch ar eu uchaf."
+msgid "This is similar to the previous level, but the system is entirely closed and security features are at their maximum."
+msgstr "Wedi ei seilio ar y lefel flaenorol, ond mae'r system yn hollol gaeedig ac mae nodweddion diogelwch ar eu uchaf."
 
 #: security/level.pm:55
 #, c-format
@@ -5916,10 +5885,8 @@ msgstr "Defnyddiwch libsafe ar gyfer gweinyddion"
 
 #: security/level.pm:64
 #, c-format
-msgid ""
-"A library which defends against buffer overflow and format string attacks."
-msgstr ""
-"Llyfrgell sy'n diogelu rhag gorlif byffer ac ymosodiadau llinellau fformatio."
+msgid "A library which defends against buffer overflow and format string attacks."
+msgstr "Llyfrgell sy'n diogelu rhag gorlif byffer ac ymosodiadau llinellau fformatio."
 
 #: security/level.pm:65
 #, c-format
@@ -5959,8 +5926,7 @@ msgstr ""
 #, c-format
 msgid ""
 "cron is a standard UNIX program that runs user-specified programs\n"
-"at periodic scheduled times. vixie cron adds a number of features to the "
-"basic\n"
+"at periodic scheduled times. vixie cron adds a number of features to the basic\n"
 "UNIX cron, including better security and more powerful configuration options."
 msgstr ""
 "Mae cron yn rhaglen safonol yn UNIX sy'n rhedeg rhaglenni sydd wedi eu \n"
@@ -5970,8 +5936,7 @@ msgstr ""
 
 #: services.pm:28
 #, c-format
-msgid ""
-"Common UNIX Printing System (CUPS) is an advanced printer spooling system"
+msgid "Common UNIX Printing System (CUPS) is an advanced printer spooling system"
 msgstr "System sbwlio argraffu uwch yw'r Common UNIX Printing System (CUPS)"
 
 #: services.pm:29
@@ -5982,26 +5947,22 @@ msgstr "Cychwyn y rheolwr dangosydd graffigol"
 #: services.pm:30
 #, c-format
 msgid ""
-"FAM is a file monitoring daemon. It is used to get reports when files "
-"change.\n"
+"FAM is a file monitoring daemon. It is used to get reports when files change.\n"
 "It is used by GNOME and KDE"
 msgstr ""
-"Mae FAM yn ddaemon monitro ffeiliau. Mae'n cael ei ddefnyddio i adrodd pan "
-"fo ffeiliau'n newid.\n"
+"Mae FAM yn ddaemon monitro ffeiliau. Mae'n cael ei ddefnyddio i adrodd pan fo ffeiliau'n newid.\n"
 "Mae'n cael ei ddefnyddio gan GNOME a KDE"
 
 #: services.pm:32
 #, c-format
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
-"Midnight Commander. It also allows mouse-based console cut-and-paste "
-"operations,\n"
+"Midnight Commander. It also allows mouse-based console cut-and-paste operations,\n"
 "and includes support for pop-up menus on the console."
 msgstr ""
 "Mae GPM yn ychwanegu cefnogaeth ar gyfer llygoden i raglenni testun Linux \n"
 "megis, Midnight Commander. Mae hefyd yn caniatáu gweithrediadau torri a \n"
-"gludo consol llygoden, gan gynnwys cefnogaeth ar gyfer bryslenni yn y "
-"consol. "
+"gludo consol llygoden, gan gynnwys cefnogaeth ar gyfer bryslenni yn y consol. "
 
 #: services.pm:35
 #, c-format
@@ -6019,20 +5980,15 @@ msgstr ""
 
 #: services.pm:38
 #, c-format
-msgid ""
-"Apache is a World Wide Web server. It is used to serve HTML files and CGI."
-msgstr ""
-"Mae Apache yn weinydd y We Fyd Eang. Mae'n cael ei ddefnyddio i wasanaethu "
-"ffeiliau HTML a CGI."
+msgid "Apache is a World Wide Web server. It is used to serve HTML files and CGI."
+msgstr "Mae Apache yn weinydd y We Fyd Eang. Mae'n cael ei ddefnyddio i wasanaethu ffeiliau HTML a CGI."
 
 #: services.pm:39
 #, c-format
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
-"variety of other internet services as needed. It is responsible for "
-"starting\n"
-"many services, including telnet, ftp, rsh, and rlogin. Disabling inetd "
-"disables\n"
+"variety of other internet services as needed. It is responsible for starting\n"
+"many services, including telnet, ftp, rsh, and rlogin. Disabling inetd disables\n"
 "all of the services it is responsible for."
 msgstr ""
 "Mae daemon uwchwasanaethwr rhyngrwyd (inetd) yn cychwyn nifer\n"
@@ -6104,20 +6060,13 @@ msgstr ""
 
 #: services.pm:57
 #, c-format
-msgid ""
-"DBUS is a daemon which broadcasts notifications of system events and other "
-"messages"
-msgstr ""
-"DBUS -daemon sy'n hysbysu'r sytem am ddigwyddiadau system a negeseuon eraill"
+msgid "DBUS is a daemon which broadcasts notifications of system events and other messages"
+msgstr "DBUS -daemon sy'n hysbysu'r sytem am ddigwyddiadau system a negeseuon eraill"
 
 #: services.pm:58
 #, c-format
-msgid ""
-"named (BIND) is a Domain Name Server (DNS) that is used to resolve host "
-"names to IP addresses."
-msgstr ""
-"mae'r enwyd (BIND) yn Wasanaethwr Enw Parth (DNS) sy'n cael ei ddefnyddio i "
-"gydrannu enwau gwestai i'r cyfeiriadau IP."
+msgid "named (BIND) is a Domain Name Server (DNS) that is used to resolve host names to IP addresses."
+msgstr "mae'r enwyd (BIND) yn Wasanaethwr Enw Parth (DNS) sy'n cael ei ddefnyddio i gydrannu enwau gwestai i'r cyfeiriadau IP."
 
 #: services.pm:59
 #, c-format
@@ -6144,10 +6093,8 @@ msgid ""
 "This service provides NFS server functionality, which is configured via the\n"
 "/etc/exports file."
 msgstr ""
-"Mae NFS yn brotocol poblogaidd ar gyfer rhannu ffeiliau ar draws "
-"rhwydweithiau TCP/IP.\n"
-"Mae'r gwasanaeth yn darparu  ffwythiannaeth gweinydd NFS, sy;n cael ei "
-"ffurfweddu\n"
+"Mae NFS yn brotocol poblogaidd ar gyfer rhannu ffeiliau ar draws rhwydweithiau TCP/IP.\n"
+"Mae'r gwasanaeth yn darparu  ffwythiannaeth gweinydd NFS, sy;n cael ei ffurfweddu\n"
 "drwy'r ffeil  /etc/exports."
 
 #: services.pm:66
@@ -6183,8 +6130,7 @@ msgstr "Cynnal OKI 4w ac argraffyddion Windows cyffelyb."
 #, c-format
 msgid ""
 "PCMCIA support is usually to support things like ethernet and\n"
-"modems in laptops.  It will not get started unless configured so it is safe "
-"to have\n"
+"modems in laptops.  It will not get started unless configured so it is safe to have\n"
 "it installed on machines that do not need it."
 msgstr ""
 "Mae cynhaliaeth PCMICA fel rheol ar gyfer cynnal pethau fel \n"
@@ -6196,25 +6142,18 @@ msgstr ""
 #, c-format
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
-"protocols such as NFS and NIS. The portmap server must be running on "
-"machines\n"
+"protocols such as NFS and NIS. The portmap server must be running on machines\n"
 "which act as servers for protocols which make use of the RPC mechanism."
 msgstr ""
 "Mae'r mapiwr porth (portmapper) yn rheoli cysylltiadau RPC, \n"
-"sy'n cael eu defnyddio gan brotocolau fel NFS a NIS. Rhaid i weinydd "
-"porthmap\n"
-"redeg ar beiriannau sy'n gweithredu fel gweinyddion ar gyfer protocolau "
-"sy'n\n"
+"sy'n cael eu defnyddio gan brotocolau fel NFS a NIS. Rhaid i weinydd porthmap\n"
+"redeg ar beiriannau sy'n gweithredu fel gweinyddion ar gyfer protocolau sy'n\n"
 "gwneud defnydd o fecanwaith RPC."
 
 #: services.pm:78
 #, c-format
-msgid ""
-"Postfix is a Mail Transport Agent, which is the program that moves mail from "
-"one machine to another."
-msgstr ""
-"Mae Postfix yn Asiant Cludo E-bost (MTA), sef rhaglen sy'n symud e-bost o un "
-"peiriant i'r llall."
+msgid "Postfix is a Mail Transport Agent, which is the program that moves mail from one machine to another."
+msgstr "Mae Postfix yn Asiant Cludo E-bost (MTA), sef rhaglen sy'n symud e-bost o un peiriant i'r llall."
 
 #: services.pm:79
 #, c-format
@@ -6276,20 +6215,13 @@ msgstr ""
 
 #: services.pm:92
 #, c-format
-msgid ""
-"SANE (Scanner Access Now Easy) enables to access scanners, video cameras, ..."
-msgstr ""
-"SANE (Scanner Access Now Easy) - galluogi mynediad i sganwyr, camerau "
-"fideo..."
+msgid "SANE (Scanner Access Now Easy) enables to access scanners, video cameras, ..."
+msgstr "SANE (Scanner Access Now Easy) - galluogi mynediad i sganwyr, camerau fideo..."
 
 #: services.pm:93
 #, c-format
-msgid ""
-"The SMB/CIFS protocol enables to share access to files & printers and also "
-"integrates with a Windows Server domain"
-msgstr ""
-"Protocol SMB/CIFS - caniatau rhannu mynediad i ffeiliau ac argraffwyr ac "
-"yhefyd yn intigreiddio gyda parth Windows Server"
+msgid "The SMB/CIFS protocol enables to share access to files & printers and also integrates with a Windows Server domain"
+msgstr "Protocol SMB/CIFS - caniatau rhannu mynediad i ffeiliau ac argraffwyr ac yhefyd yn intigreiddio gyda parth Windows Server"
 
 #: services.pm:94
 #, c-format
@@ -6298,12 +6230,8 @@ msgstr "Cychwyn y system sain ar eich peiriant"
 
 #: services.pm:95
 #, c-format
-msgid ""
-"Secure Shell is a network protocol that allows data to be exchanged over a "
-"secure channel between two computers"
-msgstr ""
-"Secure Shell - protocol rhwydwaith sy'n caniatâu u ddata gael ei gyfnewid "
-"dros sianel ddiogel rhwng dau gyfrifiadur"
+msgid "Secure Shell is a network protocol that allows data to be exchanged over a secure channel between two computers"
+msgstr "Secure Shell - protocol rhwydwaith sy'n caniatâu u ddata gael ei gyfnewid dros sianel ddiogel rhwng dau gyfrifiadur"
 
 #: services.pm:96
 #, c-format
@@ -6360,7 +6288,8 @@ msgstr "Gweinyddu Pell"
 msgid "Database Server"
 msgstr "Gweinydd Cronfa Ddata"
 
-#: services.pm:153 services.pm:189
+#: services.pm:153
+#: services.pm:189
 #, c-format
 msgid "Services"
 msgstr "Gwasanaethau"
@@ -6368,9 +6297,7 @@ msgstr "Gwasanaethau"
 #: services.pm:153
 #, c-format
 msgid "Choose which services should be automatically started at boot time"
-msgstr ""
-"Dewiswch ba wasanaethau ddylai gael eu cychwyn yn awtomatig wrth gychwyn y "
-"cyfrifiadur"
+msgstr "Dewiswch ba wasanaethau ddylai gael eu cychwyn yn awtomatig wrth gychwyn y cyfrifiadur"
 
 #: services.pm:171
 #, c-format
@@ -6399,7 +6326,8 @@ msgid ""
 "about this service, sorry."
 msgstr "Dim gwybodaeth ychwanegol am y gwasanaeth hwn."
 
-#: services.pm:221 ugtk2.pm:911
+#: services.pm:221
+#: ugtk2.pm:911
 #, c-format
 msgid "Info"
 msgstr "Gwybodaeth"
@@ -6439,8 +6367,7 @@ msgid ""
 "\n"
 "You should have received a copy of the GNU General Public License\n"
 "along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
-"USA.\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
 msgstr ""
 "Mae'r rhaglen hon yn feddalwedd rhydd; gallwch ei ailddosbarthu\n"
 "a/neu ei newid o dan amodau Trwydded Gyhoeddus Gyffredinol GNU\n"
@@ -6455,8 +6382,7 @@ msgstr ""
 "\n"
 " Dylech fod wedi derbyn copi o Drwydded Gyhoeddus Gyffredinol GNU\n"
 " gyda'r rhaglen; os nad, ysgrifennwch at:\n"
-" Free Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-"
-"1301, USA.\n"
+" Free Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
 
 #: standalone.pm:44
 #, c-format
@@ -6467,8 +6393,7 @@ msgid ""
 "--default             : save default directories.\n"
 "--debug               : show all debug messages.\n"
 "--show-conf           : list of files or directories to backup.\n"
-"--config-info         : explain configuration file options (for non-X "
-"users).\n"
+"--config-info         : explain configuration file options (for non-X users).\n"
 "--daemon              : use daemon configuration. \n"
 "--help                : show this message.\n"
 "--version             : show version number.\n"
@@ -6479,8 +6404,7 @@ msgstr ""
 "--default             : save default directories.\n"
 "--debug               : show all debug messages.\n"
 "--show-conf           : list of files or directories to backup.\n"
-"--config-info         : explain configuration file options (for non-X "
-"users).\n"
+"--config-info         : explain configuration file options (for non-X users).\n"
 "--daemon              : use daemon configuration. \n"
 "--help                : show this message.\n"
 "--version             : show version number.\n"
@@ -6575,26 +6499,19 @@ msgid ""
 "--start          : start MTS\n"
 "--stop           : stop MTS\n"
 "--adduser        : add an existing system user to MTS (requires username)\n"
-"--deluser        : delete an existing system user from MTS (requires "
-"username)\n"
-"--addclient      : add a client machine to MTS (requires MAC address, IP, "
-"nbi image name)\n"
-"--delclient      : delete a client machine from MTS (requires MAC address, "
-"IP, nbi image name)"
+"--deluser        : delete an existing system user from MTS (requires username)\n"
+"--addclient      : add a client machine to MTS (requires MAC address, IP, nbi image name)\n"
+"--delclient      : delete a client machine from MTS (requires MAC address, IP, nbi image name)"
 msgstr ""
 "Ffurfweddwr Gweinydd Terfynell Mandriva Linux\n"
 "--enable         : galluogi MTS\n"
 "--disable        : analluogi MTS\n"
 "--start          : cychwyn MTS\n"
 "--stop           : atal MTS\n"
-"--adduser        : ychwanegu defnyddiwr system bresennol i MTS (angen enw "
-"defnyddiwr)\n"
-"--deluser        : dileu defnyddiwr system bresennol o MTS (angen enw "
-"defnyddiwr)\n"
-"--addclient      : ychwanegu peiriant cleient i MTS (angen cyfeiriad MAC, "
-"IP, enw delwedd nbi)\n"
-"--delclient      : dileu  peiriant cleient i MTS (angen cyfeiriad MAC, IP, "
-"enw delwedd nbi)"
+"--adduser        : ychwanegu defnyddiwr system bresennol i MTS (angen enw defnyddiwr)\n"
+"--deluser        : dileu defnyddiwr system bresennol o MTS (angen enw defnyddiwr)\n"
+"--addclient      : ychwanegu peiriant cleient i MTS (angen cyfeiriad MAC, IP, enw delwedd nbi)\n"
+"--delclient      : dileu  peiriant cleient i MTS (angen cyfeiriad MAC, IP, enw delwedd nbi)"
 
 #: standalone.pm:100
 #, c-format
@@ -6633,29 +6550,21 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTION]...\n"
-"  --no-confirmation      do not ask first confirmation question in Mandriva "
-"Update mode\n"
+"  --no-confirmation      do not ask first confirmation question in Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
-"  --changelog-first      display changelog before filelist in the "
-"description window\n"
+"  --changelog-first      display changelog before filelist in the description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[DEWIS]...\n"
-"  --no-confirmation      do not ask first confirmation question in Mandriva "
-"Update mode\n"
+"  --no-confirmation      do not ask first confirmation question in Mandriva Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
-"  --changelog-first      display changelog before filelist in the "
-"description window\n"
+"  --changelog-first      display changelog before filelist in the description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 
 #: standalone.pm:117
 #, c-format
-msgid ""
-"[--manual] [--device=dev] [--update-sane=sane_source_dir] [--update-"
-"usbtable] [--dynamic=dev]"
-msgstr ""
-"[--manual] [--device=dev] [--update-sane=sane_source_dir] [--update-"
-"usbtable] [--dynamic=dev]"
+msgid "[--manual] [--device=dev] [--update-sane=sane_source_dir] [--update-usbtable] [--dynamic=dev]"
+msgstr "[--manual] [--device=dev] [--update-sane=sane_source_dir] [--update-usbtable] [--dynamic=dev]"
 
 #: standalone.pm:118
 #, c-format
@@ -6672,14 +6581,13 @@ msgstr ""
 #, c-format
 msgid ""
 "\n"
-"Usage: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
-"testing] [-v|--version] "
+"Usage: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--testing] [-v|--version] "
 msgstr ""
 "\n"
-"Defnydd: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
-"testing] [-v|--version] "
+"Defnydd: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--testing] [-v|--version] "
 
-#: timezone.pm:150 timezone.pm:151
+#: timezone.pm:150
+#: timezone.pm:151
 #, c-format
 msgid "All servers"
 msgstr "Pob gweinydd"
@@ -6795,56 +6703,40 @@ msgstr "Methodd y gosod"
 
 #~ msgid "Undo"
 #~ msgstr "Dadwneud"
-
 #~ msgid "Save partition table"
 #~ msgstr "Cadw'r tabl rhaniad"
-
 #~ msgid "Restore partition table"
 #~ msgstr "Adfer y tabl rhaniad"
-
 #~ msgid "Select file"
 #~ msgstr "Dewiswch ffeil"
-
 #~ msgid ""
 #~ "The backup partition table has not the same size\n"
 #~ "Still continue?"
 #~ msgstr ""
 #~ "Nid yw'r tabl rhaniad wrth gefn yr un maint\n"
 #~ "Parhau?"
-
 #~ msgid "Info: "
 #~ msgstr "Gwybodaeth:"
-
 #~ msgid "Unknown driver"
 #~ msgstr "Gyrrwr anhysbys"
-
 #~ msgid "Error reading file %s"
 #~ msgstr "Gwall wrth ddarllen ffeil %s"
-
 #~ msgid "Restoring from file %s failed: %s"
 #~ msgstr "Methodd adfer o ffeil %s: %s"
-
 #~ msgid "Bad backup file"
 #~ msgstr "Ffeil wrth gefn gwallus"
-
 #~ msgid "Error writing to file %s"
 #~ msgstr "Gwall wrth ysgrifennu i ffeil %s"
-
 #~ msgid "Error: The \"%s\" driver for your sound card is unlisted"
 #~ msgstr "Gwall. Nid yw gyrrwr \"%s\" wedi ei restru"
-
 #~ msgid "Ext2"
 #~ msgstr "Ext2"
-
 #~ msgid "Journalised FS"
 #~ msgstr "FS jwrnaleiddiwyd"
-
 #~ msgid "Starts the X Font Server (this is mandatory for Xorg to run)."
 #~ msgstr "Yn cychwyn Gweinydd Ffont  X (mae hyn yn orfodol i Xorg i redeg).."
-
 #~ msgid "Add user"
 #~ msgstr "Ychwanegu defnyddiwr"
-
 #~ msgid "Accept user"
 #~ msgstr "Derbyn defnyddiwr"
 
@@ -6856,70 +6748,49 @@ msgstr "Methodd y gosod"
 #~ "Peidiwch ddiweddaru amser mynediad inode ar y system ffeiliau\n"
 #~ "(e.e. ar gyfer mynediad cynt ar y cylch newyddion i gyflymu gweinyddion "
 #~ "newyddion)."
-
 #~ msgid "No supermount"
 #~ msgstr "Dim uwchosod"
-
 #~ msgid "Supermount"
 #~ msgstr "Uwchosod"
-
 #~ msgid "Supermount except for CDROM drives"
 #~ msgstr "Uwchosod heblaw am yrrwyr CDROM"
-
 #~ msgid "Rescue partition table"
 #~ msgstr "Achub y tabl rhaniadau"
-
 #~ msgid "Removable media automounting"
 #~ msgstr "Cyfrwng symudadwy'n awto-osod"
-
 #~ msgid "Trying to rescue partition table"
 #~ msgstr "Yn ceisio achub y tabl rhaniadau"
-
 #~ msgid ""
 #~ "Use local for all authentication and information user tell in local file"
 #~ msgstr "Defnyddio lleol ar gyfer pob dilysiad a gwybodaeth mewn ffeil leol"
-
 #~ msgid "Accept/Refuse bogus IPv4 error messages."
 #~ msgstr "Caniatáu/Gwrthod negeseuon gwall IPv4 ffug."
-
 #~ msgid "Accept/Refuse broadcasted icmp echo."
 #~ msgstr "Caniatáu/Gwrthod darlledu atsain icmp."
-
 #~ msgid "Accept/Refuse icmp echo."
 #~ msgstr "Caniatáu/Gwrthod atsain icmp."
-
 #~ msgid "Allow/Forbid remote root login."
 #~ msgstr "Caniatáu/Gwrthod mewngofnodi gwraidd pell."
-
 #~ msgid "Enable/Disable IP spoofing protection."
 #~ msgstr "Galluogi/Analluogi amddiffyn sbwlio IP."
-
 #~ msgid "Enable/Disable libsafe if libsafe is found on the system."
 #~ msgstr "Galluogi/Analluogi libsafe os yw ar y system."
-
 #~ msgid "Enable/Disable the logging of IPv4 strange packets."
 #~ msgstr "Galluogi/Analluogi mewngofnodi pecynnau anarferol IPv4."
-
 #~ msgid "Enable/Disable msec hourly security check."
 #~ msgstr "Galluogi/Analluogi gwiriad diogelwch msec bob awr."
-
 #~ msgid "Icon"
 #~ msgstr "Eicon"
-
 #~ msgid "Number of capture buffers:"
 #~ msgstr "Nifer o fyfferau cipio:"
-
 #~ msgid "number of capture buffers for mmap'ed capture"
 #~ msgstr "nifer o fyfferau cipio ar gyfer cipio mmap"
-
 #~ msgid "PLL setting:"
 #~ msgstr "Gosodiad PLL:"
-
 #~ msgid "Radio support:"
 #~ msgstr "Cynnal radio:"
-
 #~ msgid "enable radio support"
 #~ msgstr "galluogi cynnal radio"
-
 #~ msgid " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 #~ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
+