merge two more strings

1 files changed, 162 insertions, 150 deletions

diff --git a/po/cy.po b/po/cy.po
index 581b45c4..cd188e6b 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.4\n"
-"POT-Creation-Date: 2002-09-05 18:22+0200\n"
+"POT-Creation-Date: 2002-09-11 15:17+0200\n"
 "PO-Revision-Date: 2002-09-04 17:13-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@ntlworld.com>\n"
 "Language-Team: Cymraeg/Welsh <cy@li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Llwybr neu bwynt gosod:"
 msgid "Removable device"
 msgstr "Dyfais symudol"
 
-#: ../edit-urpm-sources.pl_.c:58 ../rpmdrake_.c:484
+#: ../edit-urpm-sources.pl_.c:58 ../rpmdrake_.c:487
 msgid "Security updates"
 msgstr "Diweddariadau diogelwch"
 
@@ -104,15 +104,15 @@ msgstr "Math o ffynonellau:"
 
 #: ../edit-urpm-sources.pl_.c:123 ../edit-urpm-sources.pl_.c:182
 #: ../edit-urpm-sources.pl_.c:214 ../rpmdrake.pm_.c:85 ../rpmdrake.pm_.c:105
-#: ../rpmdrake.pm_.c:277 ../rpmdrake_.c:338 ../rpmdrake_.c:862
-#: ../rpmdrake_.c:888
+#: ../rpmdrake.pm_.c:277 ../rpmdrake_.c:340 ../rpmdrake_.c:868
+#: ../rpmdrake_.c:899
 msgid "Ok"
 msgstr "Iawn"
 
 #: ../edit-urpm-sources.pl_.c:126 ../edit-urpm-sources.pl_.c:174
 #: ../edit-urpm-sources.pl_.c:182 ../edit-urpm-sources.pl_.c:215
-#: ../rpmdrake.pm_.c:277 ../rpmdrake.pm_.c:301 ../rpmdrake_.c:338
-#: ../rpmdrake_.c:888
+#: ../rpmdrake.pm_.c:277 ../rpmdrake.pm_.c:301 ../rpmdrake_.c:340
+#: ../rpmdrake_.c:899
 msgid "Cancel"
 msgstr "Dileu"
 
@@ -182,7 +182,7 @@ msgstr "Galluogwyd?"
 msgid "Source"
 msgstr "Ffynhonell"
 
-#: ../edit-urpm-sources.pl_.c:261 ../rpmdrake_.c:658
+#: ../edit-urpm-sources.pl_.c:261 ../rpmdrake_.c:663
 msgid "Remove"
 msgstr "Tynnu"
 
@@ -206,11 +206,11 @@ msgstr "Dirprwy..."
 msgid "Save and quit"
 msgstr "Cadw a gadael"
 
-#: ../edit-urpm-sources.pl_.c:272 ../rpmdrake_.c:661
+#: ../edit-urpm-sources.pl_.c:272 ../rpmdrake_.c:666
 msgid "Quit"
 msgstr "Gadael"
 
-#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:988
+#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:1014
 #, c-format
 msgid ""
 "%s\n"
@@ -413,7 +413,7 @@ msgstr ""
 msgid "Please choose the desired mirror."
 msgstr "Dewiswch ddrych"
 
-#: ../rpmdrake.pm_.c:293 ../rpmdrake_.c:563
+#: ../rpmdrake.pm_.c:293 ../rpmdrake_.c:566
 msgid "Update source(s)"
 msgstr "Diweddaru ffynonellau"
 
@@ -429,75 +429,75 @@ msgstr "Diweddaru"
 msgid "Please wait, updating media..."
 msgstr "Arhoswch, diweddaru cyfrwng..."
 
-#: ../rpmdrake_.c:94
+#: ../rpmdrake_.c:96
 msgid "Other"
 msgstr "Arall"
 
-#: ../rpmdrake_.c:131 ../rpmdrake_.c:443 ../rpmdrake_.c:444
+#: ../rpmdrake_.c:133 ../rpmdrake_.c:441 ../rpmdrake_.c:442
 msgid "(Not available)"
 msgstr "(Dim ar gael)"
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:198
+#: ../rpmdrake_.c:143 ../rpmdrake_.c:200
 msgid "Search results"
 msgstr "Canlyniadau'r chwilio"
 
-#: ../rpmdrake_.c:141
+#: ../rpmdrake_.c:143
 msgid "Search results (none)"
 msgstr "Canlyniadau'r chwilio (dim)"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:162
+#: ../rpmdrake_.c:153 ../rpmdrake_.c:164
 msgid "Please wait, searching..."
 msgstr "Arhoswch, chwilio..."
 
-#: ../rpmdrake_.c:165
+#: ../rpmdrake_.c:167
 msgid "Stop"
 msgstr "Atal"
 
-#: ../rpmdrake_.c:199 ../rpmdrake_.c:305
+#: ../rpmdrake_.c:201 ../rpmdrake_.c:307
 msgid "Addable"
 msgstr "Ychwanegadwy"
 
-#: ../rpmdrake_.c:199 ../rpmdrake_.c:305
+#: ../rpmdrake_.c:201 ../rpmdrake_.c:307
 msgid "Upgradable"
 msgstr "Diweddariadwy"
 
-#: ../rpmdrake_.c:201
+#: ../rpmdrake_.c:203
 msgid "Not selected"
 msgstr "Heb ddewis"
 
-#: ../rpmdrake_.c:201
+#: ../rpmdrake_.c:203
 msgid "Selected"
 msgstr "Dewiswyd"
 
-#: ../rpmdrake_.c:214 ../rpmdrake_.c:284
+#: ../rpmdrake_.c:216 ../rpmdrake_.c:286
 msgid "(none)"
 msgstr "(dim)"
 
-#: ../rpmdrake_.c:242
+#: ../rpmdrake_.c:244
 msgid "More information on package..."
 msgstr "Rhagor o wybodaethar becyn..."
 
-#: ../rpmdrake_.c:244
+#: ../rpmdrake_.c:246
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../rpmdrake_.c:244
+#: ../rpmdrake_.c:246
 msgid "Please choose"
 msgstr "Dewiswch"
 
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:262
 msgid "unknown package "
 msgstr "pecyn anhysbys"
 
-#: ../rpmdrake_.c:270
+#: ../rpmdrake_.c:272
 msgid "Please wait, listing packages..."
 msgstr "Arhoswch, rhestri pecynnau..."
 
-#: ../rpmdrake_.c:286
+#: ../rpmdrake_.c:288
 msgid "No update"
 msgstr "Dim diweddariad"
 
-#: ../rpmdrake_.c:287
+#: ../rpmdrake_.c:289
 msgid ""
 "The list of updates is void. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -507,11 +507,11 @@ msgstr ""
 "diweddariad ar gyfer y pecynnau ar eich cyfrifiadur, neu eich bod\n"
 "wedi eu gosod."
 
-#: ../rpmdrake_.c:344
+#: ../rpmdrake_.c:346
 msgid "Some additional packages need to be removed"
 msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
 
-#: ../rpmdrake_.c:345
+#: ../rpmdrake_.c:347
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -521,11 +521,11 @@ msgstr ""
 "hefyd: \n"
 "\n"
 
-#: ../rpmdrake_.c:351
+#: ../rpmdrake_.c:353
 msgid "Some packages can't be removed"
 msgstr "Nid oes modd tynnu rhai pecynnau"
 
-#: ../rpmdrake_.c:352 ../rpmdrake_.c:410
+#: ../rpmdrake_.c:354 ../rpmdrake_.c:412
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -534,11 +534,11 @@ msgstr ""
 "Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
 "eu dad-ddewis nawr:\n"
 
-#: ../rpmdrake_.c:380
+#: ../rpmdrake_.c:382
 msgid "Additional packages needed"
 msgstr "Pecynnau ychwanegol angenrheidiol"
 
-#: ../rpmdrake_.c:381
+#: ../rpmdrake_.c:383
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -548,11 +548,11 @@ msgstr ""
 "hefyd:\n"
 "\n"
 
-#: ../rpmdrake_.c:394
+#: ../rpmdrake_.c:396
 msgid "Some packages can't be installed"
 msgstr "Nid oes modd gosod rhai pecynnau"
 
-#: ../rpmdrake_.c:395
+#: ../rpmdrake_.c:397
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -560,146 +560,146 @@ msgstr ""
 "Yn anffodus, nid oes modd dewis y pecyn(nau) canlynol:\n"
 "\n"
 
-#: ../rpmdrake_.c:409 ../rpmdrake_.c:619
+#: ../rpmdrake_.c:411 ../rpmdrake_.c:624
 msgid "Some packages need to be removed"
 msgstr "Rhaid tynnu rhai pecynnau"
 
-#: ../rpmdrake_.c:431
+#: ../rpmdrake_.c:433
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
 
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:435
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Maint dewisiwyd: %d MB"
 
 #: ../rpmdrake_.c:441
-msgid "Source: "
-msgstr "Ffynhonell: "
-
-#: ../rpmdrake_.c:442
-msgid "Currently installed version: "
-msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
-
-#: ../rpmdrake_.c:443
 msgid "Files:\n"
 msgstr "Ffeiliau:\n"
 
-#: ../rpmdrake_.c:444
+#: ../rpmdrake_.c:442
 msgid "Changelog:\n"
 msgstr "Cofnod Newid:\n"
 
-#: ../rpmdrake_.c:447
+#: ../rpmdrake_.c:445
+msgid "Source: "
+msgstr "Ffynhonell: "
+
+#: ../rpmdrake_.c:446
+msgid "Currently installed version: "
+msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
+
+#: ../rpmdrake_.c:450
 msgid "Reason for update: "
 msgstr "Rheswm am y diweddariad:"
 
-#: ../rpmdrake_.c:449
+#: ../rpmdrake_.c:452
 msgid "Name: "
 msgstr "Enw: "
 
-#: ../rpmdrake_.c:450
+#: ../rpmdrake_.c:453
 msgid "Version: "
 msgstr "Fersiwn: "
 
-#: ../rpmdrake_.c:451
+#: ../rpmdrake_.c:454
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake_.c:451
+#: ../rpmdrake_.c:454
 msgid "Size: "
 msgstr "Maint: "
 
-#: ../rpmdrake_.c:452
+#: ../rpmdrake_.c:455
 msgid "Importance: "
 msgstr "Pwysigrwydd: "
 
-#: ../rpmdrake_.c:453
+#: ../rpmdrake_.c:456
 msgid "Summary: "
 msgstr "Crynodeb: "
 
-#: ../rpmdrake_.c:454
+#: ../rpmdrake_.c:457
 msgid "Description: "
 msgstr "Disgrifiadau: "
 
-#: ../rpmdrake_.c:463
+#: ../rpmdrake_.c:466
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:487
 msgid "Bugfixes updates"
 msgstr "Diweddariad cywiro gwallau"
 
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:487
 msgid "Normal updates"
 msgstr "Diweddariadau arferol"
 
-#: ../rpmdrake_.c:503
+#: ../rpmdrake_.c:506
 msgid "Mandrake choices"
 msgstr "Dewisiadau Mandrake"
 
-#: ../rpmdrake_.c:504
+#: ../rpmdrake_.c:507
 msgid "All packages, alphabetical"
 msgstr "Pob pecyn, trefn yr wyddor"
 
-#: ../rpmdrake_.c:505
+#: ../rpmdrake_.c:508
 msgid "All packages,"
 msgstr "Pob pecyn,"
 
-#: ../rpmdrake_.c:528
+#: ../rpmdrake_.c:531
 msgid "by group"
 msgstr "yn ôl grwp"
 
-#: ../rpmdrake_.c:528
+#: ../rpmdrake_.c:531
 msgid "by size"
 msgstr "yn ôl maint"
 
-#: ../rpmdrake_.c:529
+#: ../rpmdrake_.c:532
 msgid "by selection state"
 msgstr "yn ôl cyflwr dewis"
 
-#: ../rpmdrake_.c:530
+#: ../rpmdrake_.c:533
 msgid "by source repository"
 msgstr "yn ôl ffynhonnell eu tarddiad"
 
-#: ../rpmdrake_.c:530
+#: ../rpmdrake_.c:533
 msgid "by update availability"
 msgstr "yn ôl diweddariad"
 
-#: ../rpmdrake_.c:551
+#: ../rpmdrake_.c:554
 msgid "in descriptions"
 msgstr "disgrifiadau"
 
-#: ../rpmdrake_.c:551
+#: ../rpmdrake_.c:554
 msgid "in files"
 msgstr "mewn ffeiliau"
 
-#: ../rpmdrake_.c:551
+#: ../rpmdrake_.c:554
 msgid "in names"
 msgstr "enwau"
 
-#: ../rpmdrake_.c:562
+#: ../rpmdrake_.c:565
 msgid "Reload the packages list"
 msgstr ""
 
-#: ../rpmdrake_.c:562
+#: ../rpmdrake_.c:565
 msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake_.c:587
+#: ../rpmdrake_.c:592
 msgid "Maximum information"
 msgstr "Gwybodath lawn"
 
-#: ../rpmdrake_.c:587
+#: ../rpmdrake_.c:592
 msgid "Normal information"
 msgstr "Gwybodaeth arferol"
 
-#: ../rpmdrake_.c:609
+#: ../rpmdrake_.c:614
 msgid "Too many packages are selected"
 msgstr "Mae gormod o becynnau wedi eu dewis"
 
-#: ../rpmdrake_.c:610
+#: ../rpmdrake_.c:615
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -715,7 +715,7 @@ msgstr ""
 "\n"
 "Ydych chi wir eisiau gosod yr holl becynnau hyn?"
 
-#: ../rpmdrake_.c:620
+#: ../rpmdrake_.c:625
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -730,35 +730,35 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau?"
 
-#: ../rpmdrake_.c:642
+#: ../rpmdrake_.c:647
 msgid "Find:"
 msgstr "Canfod:"
 
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:652
 msgid "Search"
 msgstr "Chwilio"
 
-#: ../rpmdrake_.c:659
+#: ../rpmdrake_.c:664
 msgid "Install"
 msgstr "Gosod"
 
-#: ../rpmdrake_.c:685
+#: ../rpmdrake_.c:691
 msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 
-#: ../rpmdrake_.c:686 data/mandrakeupdate.desktop.in.h:1
+#: ../rpmdrake_.c:692 data/mandrakeupdate.desktop.in.h:1
 msgid "Mandrake Update"
 msgstr "Diweddaru Mandrake"
 
-#: ../rpmdrake_.c:686
+#: ../rpmdrake_.c:692
 msgid "Software Packages Removal"
 msgstr "Tynnu Pecynnau Meddalwedd"
 
-#: ../rpmdrake_.c:687
+#: ../rpmdrake_.c:693
 msgid "Software Packages Installation"
 msgstr "Gosodiad Pecynnau Meddalwedd"
 
-#: ../rpmdrake_.c:720
+#: ../rpmdrake_.c:726
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -770,24 +770,24 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn i mi barhau?"
 
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:730
 msgid "Please wait, contacting mirror to update packages information."
 msgstr "Arhoswch, yn cysylltu â'r drych i ddiweddaru gwybodaeth am y pecynnau."
 
-#: ../rpmdrake_.c:726
+#: ../rpmdrake_.c:732
 msgid "Error updating medium"
 msgstr "Gwall wrth ddiweddaru'r cyfrwng"
 
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:733
 msgid "There was an unrecoverable error while updating packages information."
 msgstr ""
 "Digwyddodd gwall anadferadwy wrth ddiweddaru'r wybodaeth am y pecynnau."
 
-#: ../rpmdrake_.c:733
+#: ../rpmdrake_.c:739
 msgid "How to choose manually your mirror"
 msgstr "Sut i ddewis drych gyda llaw."
 
-#: ../rpmdrake_.c:734
+#: ../rpmdrake_.c:740
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Sources Manager, and then add a `Security\n"
@@ -801,15 +801,15 @@ msgstr ""
 "\n"
 "Yna ailgychwynnwch MandrakeUpdate."
 
-#: ../rpmdrake_.c:740
+#: ../rpmdrake_.c:746
 msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr "Arhoswch, yn cysylltu â'r drych i gychwyn pecynnau diweddaru."
 
-#: ../rpmdrake_.c:744
+#: ../rpmdrake_.c:750
 msgid "Error adding update medium"
 msgstr "Gwall wrth ychwanegu cyfrwng diweddaru"
 
-#: ../rpmdrake_.c:745
+#: ../rpmdrake_.c:751
 #, c-format
 msgid ""
 "There was an error while adding the update medium via urpmi.\n"
@@ -831,96 +831,63 @@ msgstr ""
 "\n"
 "Hoffech chi drio drych arall?"
 
-#: ../rpmdrake_.c:774
+#: ../rpmdrake_.c:780
 msgid "Please wait, finding available packages..."
 msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
 
-#: ../rpmdrake_.c:798
-msgid "All requested packages were installed successfully."
-msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
-
-#: ../rpmdrake_.c:798
-msgid "Everything installed successfully"
-msgstr "Gosodwyd popeth yn llwyddiannus"
-
-#: ../rpmdrake_.c:801
+#: ../rpmdrake_.c:809
 msgid "Installation finished"
 msgstr "Gorffennodd y gosodiad"
 
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:812
 #, c-format
 msgid "Inspecting %s"
 msgstr "Archwilio %s"
 
-#: ../rpmdrake_.c:820
+#: ../rpmdrake_.c:828
 #, c-format
 msgid "Remove .%s"
 msgstr "Tynnu .%s"
 
-#: ../rpmdrake_.c:822
+#: ../rpmdrake_.c:830
 #, c-format
 msgid "Use .%s as main file"
 msgstr "Defnyddio .%s fel y brif ffeil"
 
-#: ../rpmdrake_.c:824
+#: ../rpmdrake_.c:832
 msgid "Do nothing"
 msgstr "Gwneud dim"
 
-#: ../rpmdrake_.c:827
+#: ../rpmdrake_.c:835
 msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:852
 msgid "Inspect..."
 msgstr "Archwilio..."
 
-#: ../rpmdrake_.c:857
-#, c-format
-msgid ""
-"The installation is finished; %s.\n"
-"\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
-msgstr ""
-"Mae'r gosod wedi gorffen;%s.\n"
-"\n"
-"Cafodd rhai ffeiliau ffurfweddu eu creu fel  `.rpmnew' neu `.rpmsave',\n"
-"mae modd eu harchwilio i weithredu arnynt:"
-
-#: ../rpmdrake_.c:858
-msgid ""
-"some packages failed to install\n"
-"correctly"
-msgstr ""
-"methodd rhai pecynnau a chael eu gosod\n"
-"yn gywir"
-
-#: ../rpmdrake_.c:859
-msgid "everything was installed correctly"
-msgstr "gosodwyd popeth yn llwyddiannus"
-
-#: ../rpmdrake_.c:878
+#: ../rpmdrake_.c:889
 msgid "Unable to get source packages."
 msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../rpmdrake_.c:879
+#: ../rpmdrake_.c:890
 msgid "Unable to get source packages, sorry."
 msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../rpmdrake_.c:886
+#: ../rpmdrake_.c:897
 msgid "Change medium"
 msgstr "Newid cyfrwng"
 
-#: ../rpmdrake_.c:887
+#: ../rpmdrake_.c:898
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
 
-#: ../rpmdrake_.c:895
+#: ../rpmdrake_.c:906
 msgid "Installation failed"
 msgstr "Methodd y gosodiad"
 
-#: ../rpmdrake_.c:896
+#: ../rpmdrake_.c:907
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your sources database."
@@ -928,35 +895,80 @@ msgstr ""
 "Methodd y gosodiad, mae rhai ffeiliau ar goll.\n"
 "Efallai'r hoffech ddiweddaru eich cronfa ddata o ffynonellau."
 
-#: ../rpmdrake_.c:899
+#: ../rpmdrake_.c:910
 msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr "Arhoswch, tynnu pecynnau i eraill gael eu diweddaru"
 
-#: ../rpmdrake_.c:910
+#: ../rpmdrake_.c:921
 msgid "Program missing"
 msgstr "Rhaglen ar goll"
 
-#: ../rpmdrake_.c:911
+#: ../rpmdrake_.c:922
 msgid "A required program is missing (grpmi). Check your installation."
 msgstr "Mae rhaglen angenrheidiol ar goll (grpmi). Gwiriwch eich gosodiad."
 
-#: ../rpmdrake_.c:928
+#: ../rpmdrake_.c:932
+#, c-format
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"Mae'r gosod wedi gorffen;%s.\n"
+"\n"
+"Cafodd rhai ffeiliau ffurfweddu eu creu fel  `.rpmnew' neu `.rpmsave',\n"
+"mae modd eu harchwilio i weithredu arnynt:"
+
+#: ../rpmdrake_.c:932
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"methodd rhai pecynnau a chael eu gosod\n"
+"yn gywir"
+
+#: ../rpmdrake_.c:933
+msgid "everything was installed correctly"
+msgstr "gosodwyd popeth yn llwyddiannus"
+
+#: ../rpmdrake_.c:935
+msgid "Everything installed successfully"
+msgstr "Gosodwyd popeth yn llwyddiannus"
+
+#: ../rpmdrake_.c:936
+msgid "All requested packages were installed successfully."
+msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
+
+#: ../rpmdrake_.c:938
 msgid "Everything already installed."
 msgstr "Popeth wedi ei osod eisoes"
 
-#: ../rpmdrake_.c:929
+#: ../rpmdrake_.c:939
 msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr "Mae popeth wedi ei osod (ydy hyn i fod i ddigwydd o gwbl?)"
 
-#: ../rpmdrake_.c:939
+#: ../rpmdrake_.c:942
+msgid "Problem during installation"
+msgstr ""
+
+#: ../rpmdrake_.c:943
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../rpmdrake_.c:953
 msgid "Please wait, reading packages database..."
 msgstr "Arhoswch, darlen cronfa ddata'r pecynnau..."
 
-#: ../rpmdrake_.c:977
+#: ../rpmdrake_.c:991
 msgid "Please wait, removing packages..."
 msgstr "Arhoswch tynnu'r pecynnau..."
 
-#: ../rpmdrake_.c:992
+#: ../rpmdrake_.c:1018
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -968,7 +980,7 @@ msgstr ""
 "Bydd yr offeryn hwn yn eich cynorthwyo o ddewis pa feddalwedd rydych\n"
 "am ei dynnu oddi ar eich cyfrifiadur."
 
-#: ../rpmdrake_.c:997
+#: ../rpmdrake_.c:1023
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
@@ -979,7 +991,7 @@ msgstr ""
 "Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
 "ar eich cyfrifiadur."
 
-#: ../rpmdrake_.c:1002
+#: ../rpmdrake_.c:1028
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"