summaryrefslogtreecommitdiffstats
path: root/perl-install/install/share/po/cy.po
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/install/share/po/cy.po')
-rw-r--r--perl-install/install/share/po/cy.po325
1 files changed, 167 insertions, 158 deletions
diff --git a/perl-install/install/share/po/cy.po b/perl-install/install/share/po/cy.po
index 7fd35d420..28c1d15a2 100644
--- a/perl-install/install/share/po/cy.po
+++ b/perl-install/install/share/po/cy.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mandriva Linux\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-09 05:35+0200\n"
+"POT-Creation-Date: 2009-09-10 12:21+0200\n"
"PO-Revision-Date: 2009-08-24 19:19-0000\n"
"Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
"Language-Team: Cymraeg\n"
@@ -20,6 +20,31 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n == 2) ? 1 : 0;\n"
"X-Generator: KBabel 1.11.4\n"
+#: ../../advertising/IM_flash.pl:1
+#, c-format
+msgid "Your desktop on a USB key"
+msgstr "Eich bwrdd gwaith ar allwedd USB"
+
+#: ../../advertising/IM_free09.pl:1
+#, c-format
+msgid "The 100%% open source Mandriva Linux distribution"
+msgstr "Mandriva Linux - y dosbarthiad cod agored 100%%"
+
+#: ../../advertising/IM_one09.pl:1
+#, c-format
+msgid "Explore Linux easily with Mandriva One"
+msgstr "Arbrofi rhwydd gyda Mandriva One"
+
+#: ../../advertising/IM_pwp09.pl:1
+#, c-format
+msgid "A full Mandriva Linux desktop, with support"
+msgstr "Bwrdd gwaith Mandriva Linux llawn, gyda chefnogaeth"
+
+#: ../../advertising/IM_range09.pl:1
+#, c-format
+msgid "Mandriva: distributions for everybody's needs"
+msgstr "Mandriva: dosbarthiad ar gyfer angen pawb"
+
#: any.pm:109
#, c-format
msgid "Do you have further supplementary media?"
@@ -138,49 +163,18 @@ msgstr ""
msgid "Looking at packages already installed..."
msgstr "Edrych ar becynnau wedi eu gosod yn barod..."
-#: any.pm:368
+#: any.pm:369
#, c-format
msgid "Finding packages to upgrade..."
msgstr "Canfod pecynnau i'w uwchraddio..."
-#: any.pm:387
+#: any.pm:388
#, c-format
msgid "Removing packages prior to upgrade..."
msgstr "Tynnu pecynnau cyn diweddaru..."
-#: any.pm:408
-#, c-format
-msgid ""
-"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-"on your system. This installer cannot preserve KDE 3.5 in an upgrade. If you "
-"choose to proceed, \n"
-"KDE 4 will replace KDE 3, and you will lose your personal KDE configuration "
-"settings. \n"
-"To upgrade with KDE 3.5 and your personal settings preserved, \n"
-"please reboot your system and upgrade using the Mandriva update applet."
-msgstr ""
-"Rydych wedi penderfynu diweddaru eich system i %s. Mae KDE 3.5 wedi ei "
-"ganfod ar eich system.\n"
-"Nid yw'r gosodwr hwn yn gallu diogelu KDE 3.5 wrth ddiweddaru. Os fyddwch yn "
-"penderfynu parhau, \n"
-"bydd KDE 4 yn cymryd lle KDE 3, a byddwch yn colli eich gosodiadau "
-"ffurfweddi personol yn KDE. \n"
-"I ddiweddaru KDE 3.5 gan gadw eich gosodiadau personol, \n"
-"ail gychwynnwch eich system a diweddaru gan ddefnyddio rhaglennig diweddaru "
-"Mandriva."
-
-#: any.pm:413 steps_interactive.pm:1103
-#, c-format
-msgid "Reboot"
-msgstr "Ail gychwyn"
-
-#: any.pm:413
-#, c-format
-msgid "Proceed"
-msgstr "Parhau"
-
#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:602
+#: any.pm:594
#, c-format
msgid ""
"The following packages will be removed to allow upgrading your system: %s\n"
@@ -194,91 +188,86 @@ msgstr ""
"\n"
"Ydych chi am dynnu'r pecynnau hyn?\n"
-#: any.pm:821
+#: any.pm:813
#, c-format
msgid "Error reading file %s"
msgstr "Gwall wrth ddarllen ffeil %s"
-#: any.pm:1028
+#: any.pm:1020
#, c-format
msgid "The following disk(s) were renamed:"
msgstr "Mae'r disg(iau) canlynol wedi eu hail enwi:"
-#: any.pm:1030
+#: any.pm:1022
#, c-format
msgid "%s (previously named as %s)"
msgstr "%s (ei enw blaenorol oedd %s)"
-#: any.pm:1087
+#: any.pm:1079
#, c-format
msgid "HTTP"
msgstr "HTTP"
-#: any.pm:1087
+#: any.pm:1079
#, c-format
msgid "FTP"
msgstr "FTP"
-#: any.pm:1087
+#: any.pm:1079
#, c-format
msgid "NFS"
msgstr "NFS"
-#: any.pm:1106 steps_interactive.pm:932
+#: any.pm:1098 steps_interactive.pm:936
#, c-format
msgid "Network"
msgstr "Rhwydwaith"
-#: any.pm:1110
+#: any.pm:1102
#, c-format
msgid "Please choose a media"
msgstr "Dewiswch gyfrwng"
-#: any.pm:1126
+#: any.pm:1118
#, c-format
msgid "File already exists. Overwrite it?"
msgstr "Mae'r ffeil yn bodoli eisoes. Ysgrifennu drosti?"
-#: any.pm:1130
+#: any.pm:1122
#, c-format
msgid "Permission denied"
msgstr "Caniatâd wedi ei wrthod."
-#: any.pm:1178
+#: any.pm:1170
#, c-format
msgid "Bad NFS name"
msgstr "Enw NFS gwael"
-#: any.pm:1199
+#: any.pm:1191
#, c-format
msgid "Bad media %s"
msgstr "Cyfrwng %s gwael"
-#: any.pm:1242
+#: any.pm:1234
#, c-format
msgid "Can not make screenshots before partitioning"
msgstr "Meth creu lluniau o'r sgrin cyn rhannu"
-#: any.pm:1250
+#: any.pm:1242
#, c-format
msgid "Screenshots will be available after install in %s"
msgstr "Bydd lluniau o'r sgrin ar gael ar ôl gosod yn %s"
-#: gtk.pm:130
+#: gtk.pm:131
#, c-format
msgid "Installation"
msgstr "Gosod"
-#: gtk.pm:134 share/meta-task/compssUsers.pl:44
+#: gtk.pm:135 share/meta-task/compssUsers.pl:44
#, c-format
msgid "Configuration"
msgstr "Ffurfweddiad"
-#: http.pm:53
-#, c-format
-msgid "retrieval of [%s] failed"
-msgstr "methodd estyn [%s]"
-
#: install2.pm:168
#, c-format
msgid "You must also format %s"
@@ -308,17 +297,17 @@ msgstr "Cau'r rhwydwaith"
msgid "Please wait, retrieving file"
msgstr "Arhoswch, estyn ffeil"
-#: media.pm:718
+#: media.pm:716
#, c-format
msgid "unable to add medium"
msgstr "methu ychwanegu cyfrwng"
-#: media.pm:758
+#: media.pm:756
#, c-format
msgid "Copying some packages on disks for future use"
msgstr "Copïo rhai pecynnau ar ddisg ar gyfer defnydd yn y dyfodol"
-#: media.pm:811
+#: media.pm:809
#, c-format
msgid "Copying in progress"
msgstr "Wrthi'n copïo..."
@@ -362,12 +351,12 @@ msgstr ""
msgid "An error occurred:"
msgstr "Digwyddodd gwall:"
-#: pkgs.pm:780
+#: pkgs.pm:792
#, c-format
msgid "%d installation transactions failed"
msgstr "Methodd trafod gosod %d"
-#: pkgs.pm:781
+#: pkgs.pm:793
#, c-format
msgid "Installation of packages failed:"
msgstr "Methodd gosod pecynnau:"
@@ -802,17 +791,17 @@ msgstr "Dyma ragolwg o fwrdd gwaith '%s'."
msgid "Click on images in order to see a bigger preview"
msgstr "Cliciwch ar y delweddau i weld y rhagolwg yn fwy"
-#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
#, c-format
msgid "Package Group Selection"
msgstr "Dewis Grŵp y Pecyn"
-#: steps_gtk.pm:336 steps_interactive.pm:619
+#: steps_gtk.pm:336 steps_interactive.pm:623
#, c-format
msgid "Individual package selection"
msgstr "Dewis pecynnau unigol."
-#: steps_gtk.pm:360 steps_interactive.pm:543
+#: steps_gtk.pm:360 steps_interactive.pm:544
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Cyfanswm maint: %d / %d MB"
@@ -929,59 +918,59 @@ msgstr "Gosodiad lleiaf"
msgid "Software Management"
msgstr "Rheoli Meddalwedd"
-#: steps_gtk.pm:517 steps_interactive.pm:428
+#: steps_gtk.pm:517 steps_interactive.pm:429
#, c-format
msgid "Choose the packages you want to install"
msgstr "Dewiswch y pecynnau yr hoffech chi eu gosod"
-#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
#, c-format
msgid "Installing"
msgstr "Gosod"
-#: steps_gtk.pm:563
+#: steps_gtk.pm:564
#, c-format
msgid "No details"
msgstr "Dim manylion"
-#: steps_gtk.pm:578
+#: steps_gtk.pm:583
#, c-format
msgid "Time remaining:"
msgstr "Amser yn weddill:"
-#: steps_gtk.pm:579
+#: steps_gtk.pm:584
#, c-format
msgid "(estimating...)"
msgstr "(amcangyfrif...)"
-#: steps_gtk.pm:605
+#: steps_gtk.pm:614
#, c-format
msgid "%d package"
msgid_plural "%d packages"
msgstr[0] "%d pecyn"
msgstr[1] "%d pecyn"
-#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
+#: steps_gtk.pm:668 steps_interactive.pm:801 steps_list.pm:43
#, c-format
msgid "Summary"
msgstr "Crynodeb"
-#: steps_gtk.pm:670
+#: steps_gtk.pm:687
#, c-format
msgid "Configure"
msgstr "Ffurfweddu"
-#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
+#: steps_gtk.pm:704 steps_interactive.pm:797 steps_interactive.pm:948
#, c-format
msgid "not configured"
msgstr "heb ffurfweddu"
-#: steps_gtk.pm:721
+#: steps_gtk.pm:738
#, c-format
msgid "Media Selection"
msgstr "Dewis Cyfrwng"
-#: steps_gtk.pm:730 steps_interactive.pm:329
+#: steps_gtk.pm:747 steps_interactive.pm:330
#, c-format
msgid ""
"The following installation media have been found.\n"
@@ -990,7 +979,7 @@ msgstr ""
"Mae'r cyfrwng gosod canlynol wedi ei ganfod.\n"
"Os hoffech hepgor rhai ohonynt, dad-ddewiswch nhw nawr."
-#: steps_gtk.pm:746 steps_interactive.pm:335
+#: steps_gtk.pm:763 steps_interactive.pm:336
#, c-format
msgid ""
"You have the option to copy the contents of the CDs onto the hard drive "
@@ -1003,7 +992,7 @@ msgstr ""
"Bydd yna'n parhau o'r disg caled a bydd y pecynnau ar gael unwaith i'r "
"system gael ei osod yn gyflawn."
-#: steps_gtk.pm:748 steps_interactive.pm:337
+#: steps_gtk.pm:765 steps_interactive.pm:338
#, c-format
msgid "Copy whole CDs"
msgstr "Copïo'r CDau cyfan"
@@ -1023,17 +1012,17 @@ msgstr "Dewiswch gynllun eich bysellfwrdd"
msgid "Here is the full list of available keyboards:"
msgstr "Dyma restr lawn o'r bysellfyrddau sydd ar gael:"
-#: steps_interactive.pm:143
+#: steps_interactive.pm:144
#, c-format
msgid "Install/Upgrade"
msgstr "Gosod/Diweddaru"
-#: steps_interactive.pm:147
+#: steps_interactive.pm:148
#, c-format
msgid "Is this an install or an upgrade?"
msgstr "Gosod neu ddiweddaru?"
-#: steps_interactive.pm:149
+#: steps_interactive.pm:150
#, c-format
msgid ""
"_: This is a noun:\n"
@@ -1042,32 +1031,32 @@ msgstr ""
"_:Enw yw hwn:\n"
"Gosod"
-#: steps_interactive.pm:151
+#: steps_interactive.pm:152
#, c-format
msgid "Upgrade %s"
msgstr "Diweddaru %s"
-#: steps_interactive.pm:169
+#: steps_interactive.pm:170
#, c-format
msgid "Encryption key for %s"
msgstr "Allwedd amgryptio ar gyfer %s"
-#: steps_interactive.pm:202
+#: steps_interactive.pm:203
#, c-format
msgid "Cancel installation, reboot system"
msgstr "Atal y gosod, ailgychwyn y system"
-#: steps_interactive.pm:203
+#: steps_interactive.pm:204
#, c-format
msgid "New Installation"
msgstr "Gosodiad Newydd"
-#: steps_interactive.pm:204
+#: steps_interactive.pm:205
#, c-format
msgid "Upgrade previous installation (not recommended)"
msgstr "Diweddaru'r gosodiad blaenorol (argymell i beidio)"
-#: steps_interactive.pm:208
+#: steps_interactive.pm:209
#, c-format
msgid ""
"Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1086,17 +1075,17 @@ msgstr ""
"Rhybudd : dylech wneud copi wrth gefn o'ch data personol cvyn dewis \"New\n"
"Installation\"."
-#: steps_interactive.pm:250
+#: steps_interactive.pm:251
#, c-format
msgid "IDE"
msgstr "IDE"
-#: steps_interactive.pm:250
+#: steps_interactive.pm:251
#, c-format
msgid "Configuring IDE"
msgstr "Ffurfweddu IDE"
-#: steps_interactive.pm:287
+#: steps_interactive.pm:288
#, c-format
msgid ""
"No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1105,7 +1094,7 @@ msgstr ""
"Nid oes lle rhydd ar gyfer yr ymlwythwr 1MB! Bydd y gosod yn parhau, ond i "
"gychwyn y system bydd rhaid i chi greu rhaniad ymlwythwr yn DiskDrake"
-#: steps_interactive.pm:292
+#: steps_interactive.pm:293
#, c-format
msgid ""
"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1115,7 +1104,7 @@ msgstr ""
"Bydd angen i chi greu llwythwr mwdwl PPC PReP Boot! Bydd y gosod yn parhau, "
"ond i gychwyn y system bydd rhaid i chi greu rhaniad ymlwythwr yn DiskDrake"
-#: steps_interactive.pm:368
+#: steps_interactive.pm:369
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -1127,12 +1116,12 @@ msgstr ""
"Rhowch y CD-ROM \"%s\" yn eich gyrrwr a chlicio Iawn ar ôl gorffen\n"
"Os nad yw gennych, cliciwch Diddymu i beidio a gosod o'r CD-ROM."
-#: steps_interactive.pm:385
+#: steps_interactive.pm:386
#, c-format
msgid "Looking for available packages..."
msgstr "Casglu'r pecynnau sydd ar gael..."
-#: steps_interactive.pm:393
+#: steps_interactive.pm:394
#, c-format
msgid ""
"Your system does not have enough space left for installation or upgrade (%"
@@ -1141,7 +1130,7 @@ msgstr ""
"Nid oes gan eich system ddigon o le ar gyfer gosod neu ddiweddaru (%dMB > %"
"dMB)"
-#: steps_interactive.pm:440
+#: steps_interactive.pm:441
#, c-format
msgid ""
"Please choose load or save package selection.\n"
@@ -1150,52 +1139,52 @@ msgstr ""
"Dewiswch lwytho neu gadw pecyn dewiswyd.\n"
"Mae'r fformat yr un â ffeiliau cynhyrchwyd drwy auto_install."
-#: steps_interactive.pm:442
+#: steps_interactive.pm:443
#, c-format
msgid "Load"
msgstr "Llwyth"
-#: steps_interactive.pm:442
+#: steps_interactive.pm:443
#, c-format
msgid "Save"
msgstr "Cadw"
-#: steps_interactive.pm:450
+#: steps_interactive.pm:451
#, c-format
msgid "Bad file"
msgstr "Ffeil gwael"
-#: steps_interactive.pm:466
+#: steps_interactive.pm:467
#, c-format
msgid "KDE"
msgstr "KDE"
-#: steps_interactive.pm:467
+#: steps_interactive.pm:468
#, c-format
msgid "GNOME"
msgstr "GNOME"
-#: steps_interactive.pm:470
+#: steps_interactive.pm:471
#, c-format
msgid "Desktop Selection"
msgstr "Dewis Bwrdd Gwaith"
-#: steps_interactive.pm:471
+#: steps_interactive.pm:472
#, c-format
msgid "You can choose your workstation desktop profile."
msgstr "Dewiswch broffil bwrdd gwaith eich man gwaith."
-#: steps_interactive.pm:557
+#: steps_interactive.pm:558
#, c-format
msgid "Selected size is larger than available space"
msgstr "Mae'r maint a ddewiswyd yn fwy na'r lle ar gael"
-#: steps_interactive.pm:572
+#: steps_interactive.pm:574
#, c-format
msgid "Type of install"
msgstr "Math o osod"
-#: steps_interactive.pm:573
+#: steps_interactive.pm:575
#, c-format
msgid ""
"You have not selected any group of packages.\n"
@@ -1204,82 +1193,87 @@ msgstr ""
"Nid ydych wedi dewis grwpiau o becynnau.\n"
"Dewiswch y gosod lleiaf rydych ei eisiau"
-#: steps_interactive.pm:578
+#: steps_interactive.pm:580
#, c-format
msgid "With X"
msgstr "Gyda X"
-#: steps_interactive.pm:579
+#: steps_interactive.pm:581
+#, fuzzy, c-format
+msgid "Install suggested packages"
+msgstr "Gosod pecyn %s"
+
+#: steps_interactive.pm:582
#, c-format
msgid "With basic documentation (recommended!)"
msgstr "Gyda dogfennau elfennol (argymell!)"
-#: steps_interactive.pm:580
+#: steps_interactive.pm:583
#, c-format
msgid "Truly minimal install (especially no urpmi)"
msgstr "Gosod bach iawn (yn arbennig dim urpmi)"
-#: steps_interactive.pm:634
+#: steps_interactive.pm:638
#, c-format
msgid "Preparing installation"
msgstr "Paratoi'r gosod"
-#: steps_interactive.pm:642
+#: steps_interactive.pm:646
#, c-format
msgid "Installing package %s"
msgstr "Gosod pecyn %s"
-#: steps_interactive.pm:666
+#: steps_interactive.pm:670
#, c-format
msgid "There was an error ordering packages:"
msgstr "Roedd gwall wrth drefnu pecynnau:"
-#: steps_interactive.pm:666
+#: steps_interactive.pm:670
#, c-format
msgid "Go on anyway?"
msgstr "Mynd yn eich blaen beth bynnag?"
-#: steps_interactive.pm:670
+#: steps_interactive.pm:674
#, c-format
msgid "Retry"
msgstr "Ceisio eto"
-#: steps_interactive.pm:671
+#: steps_interactive.pm:675
#, c-format
msgid "Skip this package"
msgstr "Hepgor y pecyn"
-#: steps_interactive.pm:672
+#: steps_interactive.pm:676
#, c-format
msgid "Skip all packages from medium \"%s\""
msgstr "Hepgor pob pecyn o gyfrwng \"%s\""
-#: steps_interactive.pm:673
+#: steps_interactive.pm:677
#, c-format
msgid "Go back to media and packages selection"
msgstr "Mynd yn ôl at ddewis cyfrwng a phecyn"
-#: steps_interactive.pm:676
+#: steps_interactive.pm:680
#, c-format
msgid "There was an error installing package %s."
msgstr "Digwyddodd gwall wrth osod pecyn: %s."
-#: steps_interactive.pm:695
+#: steps_interactive.pm:699
#, c-format
msgid "Post-install configuration"
msgstr "Ffurfweddiad ôl osod"
-#: steps_interactive.pm:702
+#: steps_interactive.pm:706
#, c-format
msgid "Please ensure the Update Modules media is in drive %s"
msgstr "Gwnewch yn siŵr fod cyfrwng Diweddaru Modiwlau yng ngyrrwr %s"
-#: steps_interactive.pm:730 steps_list.pm:47
+#: steps_interactive.pm:734 steps_list.pm:47
#, c-format
msgid "Updates"
msgstr "Diweddaru"
-#: steps_interactive.pm:731
+#: steps_interactive.pm:735
#, c-format
msgid ""
"You now have the opportunity to download updated packages. These packages\n"
@@ -1300,28 +1294,28 @@ msgstr ""
"\n"
"Ydych chi am osod y diweddariadau?"
-#: steps_interactive.pm:839
+#: steps_interactive.pm:843
#, c-format
msgid "%s on %s"
msgstr "%s ar %s"
-#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
-#: steps_interactive.pm:909 steps_interactive.pm:924
+#: steps_interactive.pm:876 steps_interactive.pm:883 steps_interactive.pm:896
+#: steps_interactive.pm:913 steps_interactive.pm:928
#, c-format
msgid "Hardware"
msgstr "Caledwedd"
-#: steps_interactive.pm:893 steps_interactive.pm:910
+#: steps_interactive.pm:897 steps_interactive.pm:914
#, c-format
msgid "Sound card"
msgstr "Cerdyn sain"
-#: steps_interactive.pm:913
+#: steps_interactive.pm:917
#, c-format
msgid "Do you have an ISA sound card?"
msgstr "A oes gennych gerdyn sain ISA?"
-#: steps_interactive.pm:915
+#: steps_interactive.pm:919
#, c-format
msgid ""
"Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1330,67 +1324,67 @@ msgstr ""
"Rhedwch \"alsaconf\" neu \"sndconfig\" wedi'r gosodiad i ffurfweddu eich "
"cerdyn sain"
-#: steps_interactive.pm:917
+#: steps_interactive.pm:921
#, c-format
msgid "No sound card detected. Try \"harddrake\" after installation"
msgstr "Heb ganfod cerdyn sain. Ceisiwch \"harddrake\" wedi'r gosodiad"
-#: steps_interactive.pm:925
+#: steps_interactive.pm:929
#, c-format
msgid "Graphical interface"
msgstr "Rhyngwyneb graffigol"
-#: steps_interactive.pm:931 steps_interactive.pm:942
+#: steps_interactive.pm:935 steps_interactive.pm:946
#, c-format
msgid "Network & Internet"
msgstr "Rhwydwaith a'r Rhyngrwyd"
-#: steps_interactive.pm:943
+#: steps_interactive.pm:947
#, c-format
msgid "Proxies"
msgstr "Dirprwyon"
-#: steps_interactive.pm:944
+#: steps_interactive.pm:948
#, c-format
msgid "configured"
msgstr "ffurfweddwyd"
-#: steps_interactive.pm:954
+#: steps_interactive.pm:958
#, c-format
msgid "Security Level"
msgstr "Lefel Diogelwch"
-#: steps_interactive.pm:973
+#: steps_interactive.pm:977
#, c-format
msgid "Firewall"
msgstr "Mur Cadarn"
-#: steps_interactive.pm:977
+#: steps_interactive.pm:981
#, c-format
msgid "activated"
msgstr "gweithredwyd"
-#: steps_interactive.pm:977
+#: steps_interactive.pm:981
#, c-format
msgid "disabled"
msgstr "anablwyd"
-#: steps_interactive.pm:991
+#: steps_interactive.pm:995
#, c-format
msgid "You have not configured X. Are you sure you really want this?"
msgstr "Nid ydych wedi ffurfweddu X. Ydych chi'n siŵr eich bod am wneud hyn?"
-#: steps_interactive.pm:1019
+#: steps_interactive.pm:1023
#, c-format
msgid "Preparing bootloader..."
msgstr "Paratoi cychwynnwr..."
-#: steps_interactive.pm:1020
+#: steps_interactive.pm:1024
#, c-format
msgid "Be patient, this may take a while..."
msgstr "Amynedd, gall hyn gymryd amser..."
-#: steps_interactive.pm:1031
+#: steps_interactive.pm:1035
#, c-format
msgid ""
"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1403,7 +1397,7 @@ msgstr ""
"bydd rhaid defnyddio BootX i gychwyn eich peiriant. Ymresymiad y cnewyllyn "
"ar gyfer y gwraidd yw: root=%s"
-#: steps_interactive.pm:1045
+#: steps_interactive.pm:1049
#, c-format
msgid ""
"In this security level, access to the files in the Windows partition is "
@@ -1412,17 +1406,17 @@ msgstr ""
"Ar y lefel diogelwch yma, mae mynedfa i ffeiliau yn rhaniad Windows wedi eu "
"cyfyngu i'r Gweinyddwr."
-#: steps_interactive.pm:1077
+#: steps_interactive.pm:1081
#, c-format
msgid "Insert a blank floppy in drive %s"
msgstr "Rhowch ddisg meddal yng ngyrrwr %s"
-#: steps_interactive.pm:1079
+#: steps_interactive.pm:1083
#, c-format
msgid "Creating auto install floppy..."
msgstr "Creu disg meddal awto gosod..."
-#: steps_interactive.pm:1090
+#: steps_interactive.pm:1094
#, c-format
msgid ""
"Some steps are not completed.\n"
@@ -1433,11 +1427,16 @@ msgstr ""
"\n"
"Ydych chi wir eisiau gorffen?"
-#: steps_interactive.pm:1100
+#: steps_interactive.pm:1104
#, c-format
msgid "Congratulations"
msgstr "Llongyfarchiadau"
+#: steps_interactive.pm:1107
+#, c-format
+msgid "Reboot"
+msgstr "Ail gychwyn"
+
#. -PO: please keep the following messages very short: they must fit in the left list of the installer!!!
#: steps_list.pm:16
#, c-format
@@ -1577,20 +1576,30 @@ msgid ""
"Exit"
msgstr "Gorffen"
-#~ msgid "Your desktop on a USB key"
-#~ msgstr "Eich bwrdd gwaith ar allwedd USB"
-
-#~ msgid "The 100%% open source Mandriva Linux distribution"
-#~ msgstr "Mandriva Linux - y dosbarthiad cod agored 100%%"
-
-#~ msgid "Explore Linux easily with Mandriva One"
-#~ msgstr "Arbrofi rhwydd gyda Mandriva One"
-
-#~ msgid "A full Mandriva Linux desktop, with support"
-#~ msgstr "Bwrdd gwaith Mandriva Linux llawn, gyda chefnogaeth"
-
-#~ msgid "Mandriva: distributions for everybody's needs"
-#~ msgstr "Mandriva: dosbarthiad ar gyfer angen pawb"
+#~ msgid ""
+#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
+#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
+#~ "you choose to proceed, \n"
+#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
+#~ "configuration settings. \n"
+#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
+#~ "please reboot your system and upgrade using the Mandriva update applet."
+#~ msgstr ""
+#~ "Rydych wedi penderfynu diweddaru eich system i %s. Mae KDE 3.5 wedi ei "
+#~ "ganfod ar eich system.\n"
+#~ "Nid yw'r gosodwr hwn yn gallu diogelu KDE 3.5 wrth ddiweddaru. Os fyddwch "
+#~ "yn penderfynu parhau, \n"
+#~ "bydd KDE 4 yn cymryd lle KDE 3, a byddwch yn colli eich gosodiadau "
+#~ "ffurfweddi personol yn KDE. \n"
+#~ "I ddiweddaru KDE 3.5 gan gadw eich gosodiadau personol, \n"
+#~ "ail gychwynnwch eich system a diweddaru gan ddefnyddio rhaglennig "
+#~ "diweddaru Mandriva."
+
+#~ msgid "Proceed"
+#~ msgstr "Parhau"
+
+#~ msgid "retrieval of [%s] failed"
+#~ msgstr "methodd estyn [%s]"
#~ msgid "Downloading file %s..."
#~ msgstr "Llwytho ffeil %s..."