better phrasing

1 files changed, 80 insertions, 77 deletions

diff --git a/po/cy.po b/po/cy.po
index f2912268..44e86059 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-02 22:39+0200\n"
+"POT-Creation-Date: 2007-08-03 16:14+0200\n"
 "PO-Revision-Date: 2007-03-02 20:31-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -241,7 +241,7 @@ msgstr "Math o gyfrwng:"
 #: ../Rpmdrake/edit_urpm_sources.pm:540 ../Rpmdrake/edit_urpm_sources.pm:627
 #: ../Rpmdrake/edit_urpm_sources.pm:668 ../Rpmdrake/edit_urpm_sources.pm:726
 #: ../Rpmdrake/edit_urpm_sources.pm:876 ../Rpmdrake/gui.pm:459
-#: ../Rpmdrake/init.pm:139 ../Rpmdrake/pkg.pm:564 ../Rpmdrake/pkg.pm:612
+#: ../Rpmdrake/init.pm:132 ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:611
 #: ../rpmdrake.pm:301 ../rpmdrake.pm:616 ../rpmdrake.pm:701 ../rpmdrake.pm:774
 #, c-format
 msgid "Cancel"
@@ -253,7 +253,7 @@ msgstr "Diddymu"
 #: ../Rpmdrake/edit_urpm_sources.pm:719 ../Rpmdrake/edit_urpm_sources.pm:792
 #: ../Rpmdrake/edit_urpm_sources.pm:922 ../Rpmdrake/edit_urpm_sources.pm:1082
 #: ../Rpmdrake/gui.pm:459 ../Rpmdrake/gui.pm:475 ../Rpmdrake/gui.pm:480
-#: ../Rpmdrake/init.pm:139 ../Rpmdrake/pkg.pm:564 ../Rpmdrake/pkg.pm:815
+#: ../Rpmdrake/init.pm:132 ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:807
 #: ../Rpmdrake/rpmnew.pm:172 ../rpmdrake.pm:125 ../rpmdrake.pm:239
 #: ../rpmdrake.pm:304 ../rpmdrake.pm:616
 #, c-format
@@ -599,7 +599,7 @@ msgstr "Paralel..."
 msgid "Global options..."
 msgstr "Dewisiadau eang..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1097 ../Rpmdrake/init.pm:145
+#: ../Rpmdrake/edit_urpm_sources.pm:1097 ../Rpmdrake/init.pm:138
 #: ../gurpmi.addmedia:99
 #, c-format
 msgid ""
@@ -860,7 +860,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:582 ../Rpmdrake/pkg.pm:527
+#: ../Rpmdrake/gui.pm:582 ../Rpmdrake/pkg.pm:526
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Rhaid tynnu rhai pecynnau"
@@ -1533,12 +1533,12 @@ msgstr "Gweinydd Cyfrifiadur Rhwydwaith"
 msgid "Web/FTP"
 msgstr "Gwe/FTP"
 
-#: ../Rpmdrake/init.pm:46
+#: ../Rpmdrake/init.pm:39
 #, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Defnyddi: %s [DEWIS]..."
 
-#: ../Rpmdrake/init.pm:47
+#: ../Rpmdrake/init.pm:40
 #, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
@@ -1547,41 +1547,41 @@ msgstr ""
 "  --changelog-first      dangos cofnod newid cyn filelist yn y ffenestr "
 "disgrifio"
 
-#: ../Rpmdrake/init.pm:48
+#: ../Rpmdrake/init.pm:41
 #, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=medium1,..     terfyn i'r cyfrwng hwn"
 
-#: ../Rpmdrake/init.pm:49
+#: ../Rpmdrake/init.pm:42
 #, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr "  --merge-all-rpmnew     cynnig uno pob ffeil  .rpmnew/.rpmsave"
 
-#: ../Rpmdrake/init.pm:50
+#: ../Rpmdrake/init.pm:43
 #, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 "  --mode=MODE            gosod modd (gosod (rhagosodedig), tynnu, diweddaru)"
 
-#: ../Rpmdrake/init.pm:51
+#: ../Rpmdrake/init.pm:44
 #, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      peidio gofyn cwestiwn cadarnhau ym modd diweddaru"
 
-#: ../Rpmdrake/init.pm:52
+#: ../Rpmdrake/init.pm:45
 #, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update    peidio diweddaru cyfrwng wrth gychwyn"
 
-#: ../Rpmdrake/init.pm:53
+#: ../Rpmdrake/init.pm:46
 #, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        peidio gwirio llofnod pecynnau"
 
-#: ../Rpmdrake/init.pm:54
+#: ../Rpmdrake/init.pm:47
 #, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
@@ -1590,37 +1590,37 @@ msgstr ""
 "  --parallel=alias,host  ym modd paralel, defnyddio grŵp \"alias\" , "
 "defnyddio peiriant  \"host\" i ddangos deps angenrheidiol"
 
-#: ../Rpmdrake/init.pm:55
+#: ../Rpmdrake/init.pm:48
 #, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=pkg1,..    dangos y pecynnau yma'n unig"
 
-#: ../Rpmdrake/init.pm:56
+#: ../Rpmdrake/init.pm:49
 #, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=pkg1,..      rhag ddewis y pecynnau yma"
 
-#: ../Rpmdrake/init.pm:57
+#: ../Rpmdrake/init.pm:50
 #, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 gorfodi ei redeg fel root"
 
-#: ../Rpmdrake/init.pm:58
+#: ../Rpmdrake/init.pm:51
 #, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=pkg           chwilio am \"pkg\""
 
-#: ../Rpmdrake/init.pm:59
+#: ../Rpmdrake/init.pm:52
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - argraffu rhif fersiwn yr offeryn.\n"
 
-#: ../Rpmdrake/init.pm:136
+#: ../Rpmdrake/init.pm:129
 #, c-format
 msgid "Running in user mode"
 msgstr "Rhedeg ym modd defnyddiwr"
 
-#: ../Rpmdrake/init.pm:137
+#: ../Rpmdrake/init.pm:130
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -1631,12 +1631,12 @@ msgstr ""
 "Ni fydd modd i chi greu newidiadau i'r system.\n"
 "ond bydd modd i chi bori'r gronfa ddata presennol."
 
-#: ../Rpmdrake/init.pm:144 ../Rpmdrake/init.pm:169
+#: ../Rpmdrake/init.pm:137 ../Rpmdrake/init.pm:162
 #, c-format
 msgid "Welcome"
 msgstr "Croeso"
 
-#: ../Rpmdrake/init.pm:149
+#: ../Rpmdrake/init.pm:142
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1649,7 +1649,7 @@ msgstr ""
 "Bydd yr offeryn hwn yn eich cynorthwyo i ddewis pa feddalwedd rydych\n"
 "am ei dynnu oddi ar eich cyfrifiadur."
 
-#: ../Rpmdrake/init.pm:154
+#: ../Rpmdrake/init.pm:147
 #, c-format
 msgid ""
 "Welcome to %s!\n"
@@ -1661,12 +1661,12 @@ msgstr ""
 "Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
 "ar eich cyfrifiadur."
 
-#: ../Rpmdrake/init.pm:159
+#: ../Rpmdrake/init.pm:152
 #, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Croeso i'r offeryn gosod meddalwedd!"
 
-#: ../Rpmdrake/init.pm:160
+#: ../Rpmdrake/init.pm:153
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -1681,17 +1681,17 @@ msgstr ""
 "meddalwedd ar CDROM neu DVD.  Bydd yr offeryn hwn yn eich cynorthwyo\n"
 "i ddewis pa feddalwedd i osod ar eich cyfrifiadur."
 
-#: ../Rpmdrake/init.pm:171
+#: ../Rpmdrake/init.pm:164
 #, c-format
 msgid "The software installation tool can set up media sources."
 msgstr ""
 
-#: ../Rpmdrake/init.pm:172
+#: ../Rpmdrake/init.pm:165
 #, fuzzy, c-format
 msgid "Do you want to add media sources now?"
 msgstr "Ydych chi'n siŵr eich bod eisiau tynnu ffynhonnell \"%s\"?"
 
-#: ../Rpmdrake/pkg.pm:187 ../Rpmdrake/pkg.pm:527
+#: ../Rpmdrake/pkg.pm:187 ../Rpmdrake/pkg.pm:526
 #, c-format
 msgid "Confirmation"
 msgstr "Gwiriad"
@@ -1751,18 +1751,18 @@ msgstr ""
 "\n"
 "Yna ailgychwynnwch %s."
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:542 ../Rpmdrake/pkg.pm:836
+#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541 ../Rpmdrake/pkg.pm:828
 #: ../rpmdrake.pm:329
 #, c-format
 msgid "Please wait"
 msgstr "Arhoswch"
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:542
+#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541
 #, c-format
 msgid "Package installation..."
 msgstr "Gosod pecynnau..."
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:542 ../Rpmdrake/pkg.pm:836
+#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541 ../Rpmdrake/pkg.pm:828
 #, c-format
 msgid "Initializing..."
 msgstr "Ymgychwyn..."
@@ -1792,17 +1792,17 @@ msgstr "Arhoswch, canfod pecynnau sydd wedi eu gosod..."
 msgid "Could not create temporary directory '%s'"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:455 ../Rpmdrake/pkg.pm:792
+#: ../Rpmdrake/pkg.pm:455 ../Rpmdrake/pkg.pm:782
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
 
-#: ../Rpmdrake/pkg.pm:459 ../Rpmdrake/pkg.pm:772
+#: ../Rpmdrake/pkg.pm:459 ../Rpmdrake/pkg.pm:762
 #, c-format
 msgid "Problem during installation"
 msgstr "Anhawster wrth osod"
 
-#: ../Rpmdrake/pkg.pm:460 ../Rpmdrake/pkg.pm:480 ../Rpmdrake/pkg.pm:774
+#: ../Rpmdrake/pkg.pm:460 ../Rpmdrake/pkg.pm:479 ../Rpmdrake/pkg.pm:764
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1813,22 +1813,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:479 ../Rpmdrake/pkg.pm:761
+#: ../Rpmdrake/pkg.pm:478 ../Rpmdrake/pkg.pm:751
 #, c-format
 msgid "Installation failed"
 msgstr "Methodd y gosodiad"
 
-#: ../Rpmdrake/pkg.pm:508
+#: ../Rpmdrake/pkg.pm:507
 #, c-format
 msgid "Unable to get source packages."
 msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../Rpmdrake/pkg.pm:509
+#: ../Rpmdrake/pkg.pm:508
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Methu estyn pecynnau ffynhonnell, %s"
 
-#: ../Rpmdrake/pkg.pm:510 ../Rpmdrake/pkg.pm:764
+#: ../Rpmdrake/pkg.pm:509 ../Rpmdrake/pkg.pm:754
 #, c-format
 msgid ""
 "\n"
@@ -1841,91 +1841,91 @@ msgstr ""
 "Gwall(au) wedi eu hadrodd:\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:524
+#: ../Rpmdrake/pkg.pm:523
 #, fuzzy, c-format
 msgid "The following package is going to be installed:"
 msgid_plural "The following %d packages are going to be installed:"
 msgstr[0] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael ei osod:"
 msgstr[1] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu gosod:"
 
-#: ../Rpmdrake/pkg.pm:529
+#: ../Rpmdrake/pkg.pm:528
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Tynnu %d pecyn?"
 msgstr[1] "Tynnu %d pecyn?"
 
-#: ../Rpmdrake/pkg.pm:531
+#: ../Rpmdrake/pkg.pm:530
 #, c-format
 msgid "The following package has to be removed for others to be upgraded:"
 msgstr "Cafodd y pecyn canlynol ei dynnu i eraill gael eu diweddaru:"
 
-#: ../Rpmdrake/pkg.pm:532
+#: ../Rpmdrake/pkg.pm:531
 #, c-format
 msgid "The following packages have to be removed for others to be upgraded:"
 msgstr "Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru:"
 
-#: ../Rpmdrake/pkg.pm:532
+#: ../Rpmdrake/pkg.pm:531
 #, c-format
 msgid "Is it ok to continue?"
 msgstr "Ydi hi'n iawn parhau?"
 
-#: ../Rpmdrake/pkg.pm:562
+#: ../Rpmdrake/pkg.pm:561
 #, c-format
 msgid "Change medium"
 msgstr "Newid cyfrwng"
 
-#: ../Rpmdrake/pkg.pm:563
+#: ../Rpmdrake/pkg.pm:562
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" i mewn i ddyfais [%s]"
 
-#: ../Rpmdrake/pkg.pm:586
+#: ../Rpmdrake/pkg.pm:585
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Paratoi pecynnau i'w gosod..."
 
-#: ../Rpmdrake/pkg.pm:586
-#, c-format
-msgid "Preparing..."
-msgstr "Paratoi..."
+#: ../Rpmdrake/pkg.pm:585
+#, fuzzy, c-format
+msgid "Preparing package installation transaction..."
+msgstr "Paratoi pecynnau i'w gosod..."
 
-#: ../Rpmdrake/pkg.pm:589
+#: ../Rpmdrake/pkg.pm:588
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../Rpmdrake/pkg.pm:590
+#: ../Rpmdrake/pkg.pm:589
 #, c-format
 msgid "Total: %s/%s"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:611 ../Rpmdrake/pkg.pm:616
+#: ../Rpmdrake/pkg.pm:610 ../Rpmdrake/pkg.pm:615
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Llwytho pecynnau i lawr ' %s'..."
 
-#: ../Rpmdrake/pkg.pm:618
+#: ../Rpmdrake/pkg.pm:617
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% o %s wedi ei gwblhau, Amser = %s, cyflymder = %s"
 
-#: ../Rpmdrake/pkg.pm:619
+#: ../Rpmdrake/pkg.pm:618
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% wedi ei gwblhau, cyflymder = %s"
 
-#: ../Rpmdrake/pkg.pm:640
+#: ../Rpmdrake/pkg.pm:639
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "Gwirio llofnodion pecynnau ..."
 
-#: ../Rpmdrake/pkg.pm:653 ../rpmdrake.pm:757 ../rpmdrake.pm:866
+#: ../Rpmdrake/pkg.pm:652 ../rpmdrake.pm:757 ../rpmdrake.pm:866
 #, c-format
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../Rpmdrake/pkg.pm:654
+#: ../Rpmdrake/pkg.pm:653
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1940,43 +1940,43 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau gyda'r gosod?"
 
-#: ../Rpmdrake/pkg.pm:667
+#: ../Rpmdrake/pkg.pm:666
 #, c-format
 msgid "installing %s from %s"
 msgstr "gosod %s o %s"
 
-#: ../Rpmdrake/pkg.pm:669
+#: ../Rpmdrake/pkg.pm:668
 #, c-format
 msgid "installing %s"
 msgstr "gosod %s"
 
-#: ../Rpmdrake/pkg.pm:673
+#: ../Rpmdrake/pkg.pm:672
 #, c-format
 msgid "removing %s"
 msgstr "tynnu %s"
 
-#: ../Rpmdrake/pkg.pm:708 ../Rpmdrake/pkg.pm:726 ../Rpmdrake/pkg.pm:819
+#: ../Rpmdrake/pkg.pm:698 ../Rpmdrake/pkg.pm:716 ../Rpmdrake/pkg.pm:811
 #: ../rpmdrake.pm:744 ../rpmdrake.pm:825 ../rpmdrake.pm:849
 #, c-format
 msgid "Error"
 msgstr "Gwall"
 
-#: ../Rpmdrake/pkg.pm:709 ../Rpmdrake/pkg.pm:727 ../Rpmdrake/pkg.pm:740
+#: ../Rpmdrake/pkg.pm:699 ../Rpmdrake/pkg.pm:717 ../Rpmdrake/pkg.pm:730
 #, c-format
 msgid "Installation failed:"
 msgstr "Methodd y gosod:"
 
-#: ../Rpmdrake/pkg.pm:710
+#: ../Rpmdrake/pkg.pm:700
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
 
-#: ../Rpmdrake/pkg.pm:728
+#: ../Rpmdrake/pkg.pm:718
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Mwy o orfodaeth gyda'r gosod?  (--force)? (y/N)"
 
-#: ../Rpmdrake/pkg.pm:762
+#: ../Rpmdrake/pkg.pm:752
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1989,12 +1989,12 @@ msgstr ""
 "\n"
 "Efallai'r hoffech ddiweddaru eich cronfa ddata o gyfryngau."
 
-#: ../Rpmdrake/pkg.pm:773
+#: ../Rpmdrake/pkg.pm:763
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Methodd y gosodiad"
 
-#: ../Rpmdrake/pkg.pm:787
+#: ../Rpmdrake/pkg.pm:777
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -2007,42 +2007,42 @@ msgstr ""
 "Cafodd rhai ffeiliau ffurfweddu eu creu fel  `.rpmnew' neu `.rpmsave',\n"
 "mae modd eu harchwilio i weithredu arnynt:"
 
-#: ../Rpmdrake/pkg.pm:795
+#: ../Rpmdrake/pkg.pm:787
 #, c-format
 msgid "Upgrade information"
 msgstr "Gwybodaeth uwchraddio"
 
-#: ../Rpmdrake/pkg.pm:797
+#: ../Rpmdrake/pkg.pm:789
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "Mae gan y pecynnau wybodaeth uwchraddio"
 
-#: ../Rpmdrake/pkg.pm:805
+#: ../Rpmdrake/pkg.pm:797
 #, c-format
 msgid "Upgrade information about this package"
 msgstr "Gwybodaeth uwchraddio am y pecyn hwn"
 
-#: ../Rpmdrake/pkg.pm:808
+#: ../Rpmdrake/pkg.pm:800
 #, c-format
 msgid "Upgrade information about package %s"
 msgstr "Gwybodaeth uwchraddio am becyn %s"
 
-#: ../Rpmdrake/pkg.pm:820
+#: ../Rpmdrake/pkg.pm:812
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Gwall anadferadwy: dim pecyn wedi ei ganfod ar gyfer y gosod."
 
-#: ../Rpmdrake/pkg.pm:836 ../Rpmdrake/pkg.pm:853
+#: ../Rpmdrake/pkg.pm:828 ../Rpmdrake/pkg.pm:845
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "Arhoswch, tynnu'r pecynnau..."
 
-#: ../Rpmdrake/pkg.pm:864
+#: ../Rpmdrake/pkg.pm:856
 #, c-format
 msgid "Problem during removal"
 msgstr "Problem wrth dynnu"
 
-#: ../Rpmdrake/pkg.pm:865
+#: ../Rpmdrake/pkg.pm:857
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -3134,6 +3134,9 @@ msgstr "Tynnu Meddalwedd"
 msgid "Software Media Manager"
 msgstr "Rheolwr Cyfrwng Meddalwedd"
 
+#~ msgid "Preparing..."
+#~ msgstr "Paratoi..."
+
 #~ msgid "Message Passing"
 #~ msgstr "Pasio Negeseuon"