sync with code & sync translations with urpmi

1 files changed, 59 insertions, 49 deletions

diff --git a/po/cy.po b/po/cy.po
index 1d6af5f6..5799b53e 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-03-07 15:00+0100\n"
+"POT-Creation-Date: 2007-03-07 15:42+0100\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"
@@ -230,7 +230,7 @@ msgstr "Math o gyfrwng:"
 #: ../Rpmdrake/edit_urpm_sources.pm:521 ../Rpmdrake/edit_urpm_sources.pm:608
 #: ../Rpmdrake/edit_urpm_sources.pm:649 ../Rpmdrake/edit_urpm_sources.pm:707
 #: ../Rpmdrake/edit_urpm_sources.pm:857 ../Rpmdrake/gui.pm:502
-#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:525 ../Rpmdrake/pkg.pm:571
+#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:523 ../Rpmdrake/pkg.pm:568
 #: ../rpmdrake.pm:296 ../rpmdrake.pm:609 ../rpmdrake.pm:694 ../rpmdrake.pm:767
 #, c-format
 msgid "Cancel"
@@ -242,7 +242,7 @@ msgstr "Diddymu"
 #: ../Rpmdrake/edit_urpm_sources.pm:700 ../Rpmdrake/edit_urpm_sources.pm:773
 #: ../Rpmdrake/edit_urpm_sources.pm:903 ../Rpmdrake/edit_urpm_sources.pm:1063
 #: ../Rpmdrake/gui.pm:502 ../Rpmdrake/gui.pm:518 ../Rpmdrake/gui.pm:523
-#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:525 ../Rpmdrake/pkg.pm:754
+#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:523 ../Rpmdrake/pkg.pm:760
 #: ../Rpmdrake/rpmnew.pm:172 ../rpmdrake.pm:126 ../rpmdrake.pm:236
 #: ../rpmdrake.pm:298 ../rpmdrake.pm:609
 #, c-format
@@ -844,7 +844,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:615 ../Rpmdrake/pkg.pm:495
+#: ../Rpmdrake/gui.pm:615 ../Rpmdrake/pkg.pm:494
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Rhaid tynnu rhai pecynnau"
@@ -1705,23 +1705,23 @@ msgstr "Ydych chi'n siŵr eich bod eisiau tynnu ffynhonnell \"%s\"?"
 msgid "Fatal error"
 msgstr "Gwall terfynol"
 
-#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:510 ../Rpmdrake/pkg.pm:784
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:509 ../Rpmdrake/pkg.pm:790
 #: ../rpmdrake.pm:323
 #, c-format
 msgid "Please wait"
 msgstr "Arhoswch"
 
-#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:510
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:509
 #, c-format
 msgid "Package installation..."
 msgstr "Gosod pecynnau..."
 
-#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:510 ../Rpmdrake/pkg.pm:784
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:509 ../Rpmdrake/pkg.pm:790
 #, c-format
 msgid "Initializing..."
 msgstr "Ymgychwyn..."
 
-#: ../Rpmdrake/pkg.pm:215 ../Rpmdrake/pkg.pm:495
+#: ../Rpmdrake/pkg.pm:215 ../Rpmdrake/pkg.pm:494
 #, c-format
 msgid "Confirmation"
 msgstr "Gwiriad"
@@ -1801,17 +1801,17 @@ msgstr "Arhoswch, rhestri pecynnau sail..."
 msgid "Please wait, finding installed packages..."
 msgstr "Arhoswch, canfod pecynnau sydd wedi eu gosod..."
 
-#: ../Rpmdrake/pkg.pm:443 ../Rpmdrake/pkg.pm:731
+#: ../Rpmdrake/pkg.pm:443 ../Rpmdrake/pkg.pm:737
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
 
-#: ../Rpmdrake/pkg.pm:447 ../Rpmdrake/pkg.pm:710
+#: ../Rpmdrake/pkg.pm:447 ../Rpmdrake/pkg.pm:716
 #, c-format
 msgid "Problem during installation"
 msgstr "Anhawster wrth osod"
 
-#: ../Rpmdrake/pkg.pm:448 ../Rpmdrake/pkg.pm:712 ../Rpmdrake/pkg.pm:770
+#: ../Rpmdrake/pkg.pm:448 ../Rpmdrake/pkg.pm:718 ../Rpmdrake/pkg.pm:776
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1822,17 +1822,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:473
+#: ../Rpmdrake/pkg.pm:472
 #, c-format
 msgid "Unable to get source packages."
 msgstr "Methu estyn pecynnau ffynhonnell."
 
-#: ../Rpmdrake/pkg.pm:474
+#: ../Rpmdrake/pkg.pm:473
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Methu estyn pecynnau ffynhonnell, %s"
 
-#: ../Rpmdrake/pkg.pm:475 ../Rpmdrake/pkg.pm:700
+#: ../Rpmdrake/pkg.pm:474 ../Rpmdrake/pkg.pm:706
 #, c-format
 msgid ""
 "\n"
@@ -1845,7 +1845,7 @@ msgstr ""
 "Gwall(au) wedi eu hadrodd:\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:492
+#: ../Rpmdrake/pkg.pm:491
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
@@ -1854,69 +1854,79 @@ msgid_plural ""
 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:497
+#: ../Rpmdrake/pkg.pm:496
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Tynnu %d pecyn?"
 msgstr[1] "Tynnu %d pecyn?"
 
-#: ../Rpmdrake/pkg.pm:499
+#: ../Rpmdrake/pkg.pm:498
 #, 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:500
+#: ../Rpmdrake/pkg.pm:499
 #, 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:500
+#: ../Rpmdrake/pkg.pm:499
 #, c-format
 msgid "Is it ok to continue?"
 msgstr "Ydi hi'n iawn parhau?"
 
-#: ../Rpmdrake/pkg.pm:523
+#: ../Rpmdrake/pkg.pm:521
 #, c-format
 msgid "Change medium"
 msgstr "Newid cyfrwng"
 
-#: ../Rpmdrake/pkg.pm:524
+#: ../Rpmdrake/pkg.pm:522
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" i mewn i ddyfais [%s]"
 
-#: ../Rpmdrake/pkg.pm:545
+#: ../Rpmdrake/pkg.pm:543
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Paratoi pecynnau i'w gosod..."
 
-#: ../Rpmdrake/pkg.pm:545
+#: ../Rpmdrake/pkg.pm:543
 #, c-format
 msgid "Preparing..."
 msgstr "Paratoi..."
 
-#: ../Rpmdrake/pkg.pm:548
+#: ../Rpmdrake/pkg.pm:546
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../Rpmdrake/pkg.pm:569
+#: ../Rpmdrake/pkg.pm:567 ../Rpmdrake/pkg.pm:572
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Llwytho pecyn `%s' (%s/%s) i lawr..."
+msgid "Downloading package `%s'..."
+msgstr "Llwytho pecynnau i lawr ' %s'..."
 
-#: ../Rpmdrake/pkg.pm:589
+#: ../Rpmdrake/pkg.pm:574
+#, 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:575
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% wedi ei gwblhau, cyflymder = %s"
+
+#: ../Rpmdrake/pkg.pm:595
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "Gwirio llofnodion pecynnau ..."
 
-#: ../Rpmdrake/pkg.pm:602 ../rpmdrake.pm:750 ../rpmdrake.pm:859
+#: ../Rpmdrake/pkg.pm:608 ../rpmdrake.pm:750 ../rpmdrake.pm:859
 #, c-format
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../Rpmdrake/pkg.pm:603
+#: ../Rpmdrake/pkg.pm:609
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1931,48 +1941,48 @@ msgstr ""
 "\n"
 "Ydi hi'n iawn parhau gyda'r gosod?"
 
-#: ../Rpmdrake/pkg.pm:616
+#: ../Rpmdrake/pkg.pm:622
 #, c-format
 msgid "installing %s from %s"
 msgstr "gosod %s o %s"
 
-#: ../Rpmdrake/pkg.pm:618
+#: ../Rpmdrake/pkg.pm:624
 #, c-format
 msgid "installing %s"
 msgstr "gosod %s"
 
-#: ../Rpmdrake/pkg.pm:622
+#: ../Rpmdrake/pkg.pm:628
 #, c-format
 msgid "removing %s"
 msgstr "tynnu %s"
 
-#: ../Rpmdrake/pkg.pm:648 ../Rpmdrake/pkg.pm:666 ../Rpmdrake/pkg.pm:759
+#: ../Rpmdrake/pkg.pm:654 ../Rpmdrake/pkg.pm:672 ../Rpmdrake/pkg.pm:765
 #: ../rpmdrake.pm:737 ../rpmdrake.pm:818 ../rpmdrake.pm:842
 #, c-format
 msgid "Error"
 msgstr "Gwall"
 
-#: ../Rpmdrake/pkg.pm:649 ../Rpmdrake/pkg.pm:667
+#: ../Rpmdrake/pkg.pm:655 ../Rpmdrake/pkg.pm:673
 #, c-format
 msgid "Installation failed:"
 msgstr "Methodd y gosod:"
 
-#: ../Rpmdrake/pkg.pm:650
+#: ../Rpmdrake/pkg.pm:656
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
 
-#: ../Rpmdrake/pkg.pm:668
+#: ../Rpmdrake/pkg.pm:674
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Mwy o orfodaeth gyda'r gosod?  (--force)? (y/N)"
 
-#: ../Rpmdrake/pkg.pm:680 ../Rpmdrake/pkg.pm:697 ../Rpmdrake/pkg.pm:769
+#: ../Rpmdrake/pkg.pm:686 ../Rpmdrake/pkg.pm:703 ../Rpmdrake/pkg.pm:775
 #, c-format
 msgid "Installation failed"
 msgstr "Methodd y gosodiad"
 
-#: ../Rpmdrake/pkg.pm:698
+#: ../Rpmdrake/pkg.pm:704
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1985,12 +1995,12 @@ msgstr ""
 "\n"
 "Efallai'r hoffech ddiweddaru eich cronfa ddata o gyfryngau."
 
-#: ../Rpmdrake/pkg.pm:711
+#: ../Rpmdrake/pkg.pm:717
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "Methodd y gosodiad"
 
-#: ../Rpmdrake/pkg.pm:726
+#: ../Rpmdrake/pkg.pm:732
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -2003,42 +2013,42 @@ msgstr ""
 "Cafodd rhai ffeiliau ffurfweddu eu creu fel  `.rpmnew' neu `.rpmsave',\n"
 "mae modd eu harchwilio i weithredu arnynt:"
 
-#: ../Rpmdrake/pkg.pm:734
+#: ../Rpmdrake/pkg.pm:740
 #, c-format
 msgid "Upgrade information"
 msgstr "Gwybodaeth uwchraddio"
 
-#: ../Rpmdrake/pkg.pm:736
+#: ../Rpmdrake/pkg.pm:742
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "Mae gan y pecynnau wybodaeth uwchraddio"
 
-#: ../Rpmdrake/pkg.pm:744
+#: ../Rpmdrake/pkg.pm:750
 #, c-format
 msgid "Upgrade information about this package"
 msgstr "Gwybodaeth uwchraddio am y pecyn hwn"
 
-#: ../Rpmdrake/pkg.pm:747
+#: ../Rpmdrake/pkg.pm:753
 #, c-format
 msgid "Upgrade information about package %s"
 msgstr "Gwybodaeth uwchraddio am becyn %s"
 
-#: ../Rpmdrake/pkg.pm:760
+#: ../Rpmdrake/pkg.pm:766
 #, 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:784 ../Rpmdrake/pkg.pm:789
+#: ../Rpmdrake/pkg.pm:790 ../Rpmdrake/pkg.pm:795
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "Arhoswch, tynnu'r pecynnau..."
 
-#: ../Rpmdrake/pkg.pm:800
+#: ../Rpmdrake/pkg.pm:806
 #, c-format
 msgid "Problem during removal"
 msgstr "Problem wrth dynnu"
 
-#: ../Rpmdrake/pkg.pm:801
+#: ../Rpmdrake/pkg.pm:807
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"