Updated POT file.

1 files changed, 373 insertions, 443 deletions

diff --git a/po/cy.po b/po/cy.po
index 6d3b737e..aa96fa24 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-27 16:02+0200\n"
+"POT-Creation-Date: 2005-11-16 22:47+0800\n"
 "PO-Revision-Date: 2005-06-28 21:39-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -40,51 +40,20 @@ msgstr "Yy"
 msgid "Nn"
 msgstr "Nn"
 
-#: ../_irpm:23
-#, c-format
-msgid "installing %s\n"
-msgstr "gosod %s\n"
+#: ../gurpmi:29 ../gurpmi2:55
+msgid "RPM installation"
+msgstr "Gosodiad RPM"
 
-#: ../_irpm:33
+#: ../gurpmi:42
 #, c-format
-msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
-"Gosodiad pecynnau awtomatig...\n"
-"Roeddech wedi gofyn i gael gosod pecyn %s\n"
-
-#: ../_irpm:33 ../urpme:31 ../urpmi:498
-#, c-format
-msgid "Is this OK?"
-msgstr "Mae'r model yn gywir"
 
-#: ../_irpm:35 ../urpmi:529
-#, c-format
-msgid "Ok"
-msgstr "Iawn"
-
-#: ../_irpm:36 ../urpmi:529
-#, c-format
-msgid "Cancel"
-msgstr "Dileu"
-
-#: ../_irpm:44 ../urpmi:404 ../urpmi:422 ../urpmi:502
-#, c-format
-msgid " (Y/n) "
-msgstr " (Y/n) "
-
-#: ../_irpm:63
-#, c-format
-msgid "%s: command not found\n"
-msgstr "%s: heb ganfod gorchymyn\n"
-
-#: ../gurpmi:31 ../gurpmi2:55
-#, c-format
-msgid "RPM installation"
-msgstr "Gosodiad RPM"
+#: ../gurpmi:43 ../gurpmi2:122 ../gurpmi2:145
+msgid "_Ok"
+msgstr "_Iawn"
 
-#: ../gurpmi:48
+#: ../gurpmi:57
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -106,67 +75,71 @@ msgstr ""
 "\n"
 "Beth hoffech chi ei wneud?"
 
-#: ../gurpmi:56
+#: ../gurpmi:65 ../gurpmi:76
 #, c-format
 msgid ""
-"You are about to install the following software package on your computer:\n"
+"You are about to install the following software packages on your computer:\n"
 "\n"
 "%s\n"
 "\n"
-"You may prefer to just save it. What is your choice?"
+"Proceed?"
 msgstr ""
-"Rydych ar fin gosod y pecyn meddalwedd canlynol ar eich cyfrifiadur:\n"
+"Rydych ar fin gosod y pecynnau meddalwedd canlynol ar eich cyfrifiadur:\n"
 "\n"
 "%s\n"
 "\n"
-"Efallai byddai'n well gennych ei gadw. Beth yw eich dewis?"
+"Parhau?"
 
-#: ../gurpmi:61
+#: ../gurpmi:71
 #, c-format
 msgid ""
-"You are about to install the following software packages on your computer:\n"
+"You are about to install the following software package on your computer:\n"
 "\n"
 "%s\n"
 "\n"
-"Proceed?"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
-"Rydych ar fin gosod y pecynnau meddalwedd canlynol ar eich cyfrifiadur:\n"
+"Rydych ar fin gosod y pecyn meddalwedd canlynol ar eich cyfrifiadur:\n"
 "\n"
 "%s\n"
 "\n"
-"Parhau?"
+"Efallai byddai'n well gennych ei gadw. Beth yw eich dewis?"
 
-#: ../gurpmi:71
-#, c-format
+#. - buttons
+#: ../gurpmi:86
 msgid "_Install"
 msgstr "_Gosod"
 
-#: ../gurpmi:72
-#, c-format
+#: ../gurpmi:87
 msgid "_Save"
 msgstr "_Cadw"
 
-#: ../gurpmi:73 ../gurpmi2:119
-#, c-format
+#: ../gurpmi:88 ../gurpmi2:122
 msgid "_Cancel"
 msgstr "_Dileu"
 
-#: ../gurpmi:83
-#, c-format
+#: ../gurpmi:98
 msgid "Choose location to save file"
 msgstr "Dewiswch leoliad i gadw'r ffeil"
 
-#: ../gurpmi2:36
+#: ../gurpmi.pm:62
 #, c-format
+msgid "Unknown option %s"
+msgstr "Dewis anhysbys %s"
+
+#: ../gurpmi.pm:70
+msgid "No packages specified"
+msgstr "Heb enwi pecyn"
+
+#: ../gurpmi2:36
 msgid "Please wait..."
 msgstr "Arhoswch..."
 
 #: ../gurpmi2:45
-#, c-format
 msgid "Must be root"
 msgstr "Rhaid bod yn root"
 
-#: ../gurpmi2:75
+#: ../gurpmi2:78
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -177,37 +150,27 @@ msgstr ""
 "%s\n"
 "Parhau?"
 
-#: ../gurpmi2:115
-#, c-format
+#: ../gurpmi2:118
 msgid " (to upgrade)"
 msgstr "(uwchraddio)"
 
-#: ../gurpmi2:116
-#, c-format
+#: ../gurpmi2:119
 msgid " (to install)"
 msgstr "(gosod)"
 
-#: ../gurpmi2:119
-#, c-format
+#: ../gurpmi2:122
 msgid "Package choice"
 msgstr "Dewis pecyn"
 
-#: ../gurpmi2:119 ../gurpmi2:142
-#, c-format
-msgid "_Ok"
-msgstr "_Iawn"
-
-#: ../gurpmi2:120 ../urpmi:364
-#, c-format
+#: ../gurpmi2:123 ../urpmi:366
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../gurpmi2:143
-#, c-format
+#: ../gurpmi2:146
 msgid "_Abort"
 msgstr "_Atal"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:166
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -218,7 +181,7 @@ msgstr ""
 "%s\n"
 "Parhau?"
 
-#: ../gurpmi2:177
+#: ../gurpmi2:180
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -228,27 +191,25 @@ msgstr ""
 "I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod:\n"
 "%s\n"
 
-#: ../gurpmi2:184
-#, c-format
+#: ../gurpmi2:187
 msgid "Package installation..."
 msgstr "Gosod y pecyn..."
 
-#: ../gurpmi2:186 ../urpmi:511 ../urpmq:307
-#, c-format
+#: ../gurpmi2:189 ../urpmi:513 ../urpmq:308
 msgid "unable to get source packages, aborting"
 msgstr "methu estyn pecynnau ffynhonnell, atal"
 
-#: ../gurpmi2:200 ../urpmi:522
+#: ../gurpmi2:203 ../urpmi:524
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
 
-#: ../gurpmi2:229
+#: ../gurpmi2:232
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Llwytho pecynnau i lawr ' %s'..."
 
-#: ../gurpmi2:244
+#: ../gurpmi2:247
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -261,7 +222,7 @@ msgstr ""
 "\n"
 "Hoffech chi barhau gyda'r gosod?"
 
-#: ../gurpmi2:251 ../gurpmi2:300 ../urpmi:593 ../urpmi:710
+#: ../gurpmi2:254 ../gurpmi2:303 ../urpmi:595 ../urpmi:713
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -272,38 +233,33 @@ msgstr ""
 "%s\n"
 "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
-#: ../gurpmi2:258 ../urpme:118 ../urpmi:636
+#: ../gurpmi2:261 ../urpme:118 ../urpmi:638
 #, c-format
 msgid "removing %s"
 msgstr "tynnu %s"
 
-#: ../gurpmi2:266 ../urpm.pm:2901
-#, c-format
+#: ../gurpmi2:269 ../urpm.pm:2903
 msgid "Preparing..."
 msgstr "Paratoi..."
 
-#: ../gurpmi2:268
+#: ../gurpmi2:271
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:603 ../urpmi:655 ../urpmi:673 ../urpmi:689
-#, c-format
+#: ../gurpmi2:289 ../urpmi:605 ../urpmi:658 ../urpmi:676 ../urpmi:692
 msgid "Installation failed"
 msgstr "Methodd y gosod"
 
-#: ../gurpmi2:295
-#, c-format
+#: ../gurpmi2:298
 msgid "_Done"
 msgstr "_Gorffen"
 
-#: ../gurpmi2:303 ../urpmi:726
-#, c-format
+#: ../gurpmi2:306 ../urpmi:729
 msgid "The package(s) are already installed"
 msgstr "Popeth wedi eu gosod eisoes"
 
-#: ../gurpmi2:305
-#, c-format
+#: ../gurpmi2:308
 msgid "Installation finished"
 msgstr "Cwblhawyd y gosod"
 
@@ -317,17 +273,14 @@ msgstr ""
 "lle mae [dewisiadau] o\n"
 
 #: ../rpm-find-leaves:16
-#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help     - argraffu neges cymorth.\n"
 
 #: ../rpm-find-leaves:17
-#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "  --root <path>   - defnyddio'r root hwn yn lle /\n"
 
 #: ../rpm-find-leaves:18
-#, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [group]     - cyfyngu canlyniadau i'r grŵp.\n"
 
@@ -336,56 +289,57 @@ msgstr "   -g [group]     - cyfyngu canlyniadau i'r grŵp.\n"
 msgid "                    defaults is %s.\n"
 msgstr "                   rhagosodedig yw %s.\n"
 
-#: ../rurpmi:8 ../urpmi:227
-#, c-format
+#. - need to be root if binary rpms are to be installed
+#: ../rurpmi:8 ../urpmi:229
 msgid "Only superuser is allowed to install packages"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
 
 #: ../rurpmi:15
-#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr ""
 
-#: ../urpm.pm:71
+#: ../urpm.pm:70
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocol anhysbys ar gyfer %s"
 
-#: ../urpm.pm:104
+#: ../urpm.pm:103
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "heb ganfod webfetch, yn cael eu cynnal gan webfetch: %s\n"
 
-#: ../urpm.pm:120
+#: ../urpm.pm:119
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "methu trin protocol: %s"
 
-#: ../urpm.pm:211
+#: ../urpm.pm:210
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr ""
 "cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:212
+#: ../urpm.pm:211
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 "cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:225 ../urpm.pm:1314 ../urpm.pm:1324
+#: ../urpm.pm:224 ../urpm.pm:1314 ../urpm.pm:1324
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "methu cael mynediad i  ffeil hdlist\"%s\", anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:228 ../urpm.pm:2508
+#. list file exists but isn't readable
+#. report error only if no result found, list files are only readable by root
+#: ../urpm.pm:227 ../urpm.pm:2509
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "methu cael mynediad ffeil rhestr \"%s\", anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:258
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+#: ../urpm.pm:255
+#, fuzzy, c-format
+msgid "trying to override existing medium \"%s\", skipping"
 msgstr "ceisio osgoi'r cyfrwng presennol \"%s\", osgoi"
 
 #: ../urpm.pm:266
@@ -422,6 +376,7 @@ msgstr "rhestr ffeil annealladwy \"%s\", cyfrwng wedi ei anwybyddu"
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "methu archwilio rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
 
+#. - return value is suitable for an hash.
 #: ../urpm.pm:361
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
@@ -459,7 +414,6 @@ msgid "wrote config file [%s]"
 msgstr "ysgrifennu ffeil ffurfweddu (%s)"
 
 #: ../urpm.pm:440
-#, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Methu defnyddio'r modd paralel gyda'r modd use-distrib"
 
@@ -494,7 +448,6 @@ msgid "there doesn't seem to be devices in the chroot in \"%s\""
 msgstr "does dim dyfeisiau i'w gweld yn chroot yn \"%s\""
 
 #: ../urpm.pm:495
-#, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
@@ -502,6 +455,15 @@ msgstr ""
 "-nid oes modd defnyddio synthesis gyda --media, --excludemedia, --sortmedia, "
 "--update neu --parallel"
 
+#. - XXX we could link the new hdlist to the old one.
+#. - (However links need to be managed. see bug #12391.)
+#. - as previously done, just read synthesis file here, this is enough.
+#. - as previously done, just read synthesis file here, this is enough, but only
+#. - if synthesis exists, else it needs to be recomputed.
+#. - XXX we could link the new hdlist to the old one.
+#. - (However links need to be managed. see bug #12391.)
+#. - as previously done, just read synthesis file here, this is enough.
+#. - read default synthesis (we have to make sure nothing get out of depslist).
 #: ../urpm.pm:556 ../urpm.pm:582 ../urpm.pm:1068 ../urpm.pm:1079
 #: ../urpm.pm:1151 ../urpm.pm:1168 ../urpm.pm:1238 ../urpm.pm:1297
 #: ../urpm.pm:1512 ../urpm.pm:1635 ../urpm.pm:1752 ../urpm.pm:1758
@@ -528,6 +490,7 @@ msgstr "nid yw'r rhith gyfrwng \"%s\" yn lleol, anwybyddu'r cyfrwng"
 msgid "Search start: %s end: %s"
 msgstr "Cychwyn chwilio: %s diwedd: %s"
 
+#. - this is almost a fatal error, ignore it by default?
 #: ../urpm.pm:605 ../urpm.pm:1089 ../urpm.pm:1176 ../urpm.pm:1247
 #: ../urpm.pm:1643
 #, c-format
@@ -535,7 +498,6 @@ msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\""
 
 #: ../urpm.pm:612 ../urpm.pm:1899
-#, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n"
 
@@ -549,9 +511,10 @@ msgstr "hepgor pecyn  %s"
 msgid "would install instead of upgrade package %s"
 msgstr "gosod yn lle uwchraddio pecyn %s"
 
-#: ../urpm.pm:652 ../urpm.pm:2315 ../urpm.pm:2376 ../urpm.pm:2565
-#: ../urpm.pm:2966 ../urpm.pm:3088
-#, c-format
+#. - beware this can be a child process or the main process now...
+#. - open in read/write mode unless testing installation.
+#: ../urpm.pm:652 ../urpm.pm:2315 ../urpm.pm:2376 ../urpm.pm:2566
+#: ../urpm.pm:2968 ../urpm.pm:3092
 msgid "unable to open rpmdb"
 msgstr "methu agor rpmdb"
 
@@ -561,7 +524,6 @@ msgid "medium \"%s\" already exists"
 msgstr "cyfrwng \"%s\" yn bodoli eisoes"
 
 #: ../urpm.pm:699
-#, c-format
 msgid "virtual medium needs to be local"
 msgstr "rhaid i'r rhith gyfrwng fod yn lleol"
 
@@ -571,43 +533,36 @@ msgid "added medium %s"
 msgstr "ychwanegwyd cyfrwng %s"
 
 #: ../urpm.pm:769
-#, c-format
 msgid "unable to access first installation medium"
 msgstr "methu cael mynediad i gyfrwng gosod cyntaf"
 
 #: ../urpm.pm:773
-#, c-format
 msgid "copying hdlists file..."
 msgstr "copïo ffeil hdlists..."
 
 #: ../urpm.pm:775 ../urpm.pm:1192 ../urpm.pm:1267
-#, c-format
 msgid "...copying done"
 msgstr "...cwblhau'r copïo"
 
 #: ../urpm.pm:776 ../urpm.pm:1193 ../urpm.pm:1342 ../urpm.pm:1401
 #: ../urpm.pm:1581 ../urpm.pm:1588
-#, c-format
 msgid "...copying failed"
 msgstr "...methodd y copïo"
 
 #: ../urpm.pm:779 ../urpm.pm:804 ../urpm.pm:843
-#, c-format
 msgid "unable to access first installation medium (no hdlists file found)"
 msgstr ""
 "methu cael mynediad i'r cyfrwng gosod cyntaf (heb ganfod ffeil hdlists)"
 
 #: ../urpm.pm:786
-#, c-format
 msgid "retrieving hdlists file..."
 msgstr "adfer ffeil hdlists..."
 
-#: ../urpm.pm:798 ../urpm.pm:1625 ../urpm.pm:2115 ../urpm.pm:2834
-#, c-format
+#: ../urpm.pm:798 ../urpm.pm:1625 ../urpm.pm:2115 ../urpm.pm:2835
 msgid "...retrieving done"
 msgstr ".cwblhau adfer"
 
-#: ../urpm.pm:800 ../urpm.pm:1609 ../urpm.pm:2119 ../urpm.pm:2836
+#: ../urpm.pm:800 ../urpm.pm:1609 ../urpm.pm:2119 ../urpm.pm:2837
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... methodd ail-lwytho: %s"
@@ -622,6 +577,7 @@ msgstr "disgrifiad hdlist annilys \"%s\" yn rhestr ffeilio hdlists"
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\""
 
+#. - several elements in found and/or foundi lists.
 #: ../urpm.pm:882
 #, c-format
 msgid "selecting multiple media: %s"
@@ -638,12 +594,10 @@ msgid "reconfiguring urpmi for media \"%s\""
 msgstr "ail-ffurfweddu urpmi ar gyfer cyfrwng \"%s\""
 
 #: ../urpm.pm:978
-#, c-format
 msgid "...reconfiguration failed"
 msgstr "...methodd ail-ffurfweddu"
 
 #: ../urpm.pm:985
-#, c-format
 msgid "reconfiguration done"
 msgstr "cwblhau ail-ffurfweddu"
 
@@ -672,7 +626,6 @@ msgid "copying description file of \"%s\"..."
 msgstr "copïo ffeil disgrifiad o \"%s\""
 
 #: ../urpm.pm:1214 ../urpm.pm:1488
-#, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum ffynhonnell hdlist presennol (neu synthesis)"
 
@@ -687,7 +640,6 @@ msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)"
 
 #: ../urpm.pm:1282
-#, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum o ffynhonnell hdlist gopïwyd (neu synthesis)"
 
@@ -707,7 +659,6 @@ msgid "reading rpm files from [%s]"
 msgstr "darllen ffeiliau rpm o [%s]"
 
 #: ../urpm.pm:1374
-#, c-format
 msgid "no rpms read"
 msgstr "heb ddarllen rpmau"
 
@@ -721,6 +672,8 @@ msgstr "methu darllen ffeiliau rpm o (%s): %s"
 msgid "no rpm files found from [%s]"
 msgstr "heb ganfod ffeiliau rpm o [%s]"
 
+#. - try to probe for possible with_hdlist parameter, unless
+#. - it is already defined (and valid).
 #: ../urpm.pm:1538
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
@@ -732,17 +685,14 @@ msgid "found probed hdlist (or synthesis) as %s"
 msgstr "canfod hdlist (neu synthesis) holwyd fel %s"
 
 #: ../urpm.pm:1616
-#, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum o ffynhonnell hdlist adferwyd (neu synthesis)"
 
 #: ../urpm.pm:1618
-#, c-format
 msgid "...retrieving failed: md5sum mismatch"
 msgstr "... methodd ail-lwytho: anghysondeb md5sum"
 
 #: ../urpm.pm:1716
-#, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "methodd adfer ffynhonnell hdlist (neu synthesis)"
 
@@ -801,6 +751,7 @@ msgstr "darllen pennawd o'r cyfrwng \"%s\""
 msgid "building hdlist [%s]"
 msgstr "adeiladu hdlist [%s]"
 
+#. - XXX this happens when building a synthesis for a local media from RPMs... why ?
 #: ../urpm.pm:1933 ../urpm.pm:1968
 #, c-format
 msgid ""
@@ -810,7 +761,7 @@ msgstr ""
 "Methu adeiladu ffeil synthesis ar gyfer cyfrwng \"%s\". Efallai bod eich "
 "ffeil hdlist yn llygredig."
 
-#: ../urpm.pm:1936 ../urpm.pm:1971 ../urpmi:321
+#: ../urpm.pm:1936 ../urpm.pm:1971 ../urpmi:323
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "adeiladu ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
@@ -851,17 +802,14 @@ msgid "unable to access rpm file [%s]"
 msgstr "methu cael mynediad  ffeil rpm (%s)"
 
 #: ../urpm.pm:2129
-#, c-format
 msgid "unable to register rpm file"
 msgstr "methu cofrestr ffeil rpm"
 
 #: ../urpm.pm:2132
-#, c-format
 msgid "error registering local packages"
 msgstr "gwall cofrestru pecynnau lleol"
 
 #: ../urpm.pm:2156
-#, c-format
 msgid "Search"
 msgstr "Chwilio"
 
@@ -875,17 +823,17 @@ msgstr "heb enwi pecyn %s"
 msgid "The following packages contain %s: %s"
 msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
 
-#: ../urpm.pm:2439 ../urpm.pm:2485 ../urpm.pm:2516
+#: ../urpm.pm:2439 ../urpm.pm:2486 ../urpm.pm:2517
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "mae yna becynnau niferus gyda'r un enw ffeil rpm \"%s\""
 
-#: ../urpm.pm:2499
+#: ../urpm.pm:2500
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "methu didoli (%s) yn gywir ar werth \"%s\""
 
-#: ../urpm.pm:2532
+#: ../urpm.pm:2533
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -894,89 +842,89 @@ msgstr ""
 "cyfrwng \"%s\" yn defnyddio rhestr ffeiliau annilys:\n"
 "  nid yw'r drych yn un diweddar, ceisiwch ddull arall"
 
-#: ../urpm.pm:2536
+#: ../urpm.pm:2537
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "nid yw cyfrwng \"%s\" yn diffinio unrhyw leoliad ar gyfer ffeiliau rpm"
 
-#: ../urpm.pm:2548
+#: ../urpm.pm:2549
 #, c-format
 msgid "package %s is not found."
 msgstr "heb ganfod pecyn %s"
 
-#: ../urpm.pm:2606 ../urpm.pm:2620 ../urpm.pm:2640 ../urpm.pm:2654
-#, c-format
+#: ../urpm.pm:2607 ../urpm.pm:2621 ../urpm.pm:2641 ../urpm.pm:2655
 msgid "urpmi database locked"
 msgstr "cronfa ddata urpmi wedi cloi"
 
-#: ../urpm.pm:2706 ../urpm.pm:2711 ../urpm.pm:2737
+#: ../urpm.pm:2707 ../urpm.pm:2712 ../urpm.pm:2738
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "heb ddewis cyfrwng \"%s\""
 
-#: ../urpm.pm:2733
+#. - fallback to use other method for retrieving the file later.
+#: ../urpm.pm:2734
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "methu darllen ffeil rpm (%s) o gyfrwng \"%s\""
 
-#: ../urpm.pm:2741
+#. - we have a removable device that is not removable, well...
+#: ../urpm.pm:2742
 #, c-format
 msgid "inconsistent medium \"%s\" marked removable but not really"
 msgstr "cyfrwng annealladwy \"%s\" wedi ei nodi'n symudadwy ond nid yw"
 
-#: ../urpm.pm:2753
+#: ../urpm.pm:2754
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "methu cael mynediad at gyfrwng. \"%s\""
 
-#: ../urpm.pm:2812
+#: ../urpm.pm:2813
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "allbwn gwallus: [%s]"
 
-#: ../urpm.pm:2819
+#: ../urpm.pm:2820
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
 
-#: ../urpm.pm:2939
+#: ../urpm.pm:2941
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "defnyddio proses %d ar gyfer gweithredu trosglwyddiad"
 
-#: ../urpm.pm:2970
+#: ../urpm.pm:2972
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "crëwyd trosglwyddiad ar gyfer gosod ar %s (tynnu=%d, gosod=%d, uwchraddio=%d)"
 
-#: ../urpm.pm:2973
-#, c-format
+#: ../urpm.pm:2975
 msgid "unable to create transaction"
 msgstr "methu creu trosglwyddiad."
 
-#: ../urpm.pm:2981
+#: ../urpm.pm:2983
 #, c-format
 msgid "removing package %s"
 msgstr "tynnu pecyn %s."
 
-#: ../urpm.pm:2983
+#: ../urpm.pm:2985
 #, c-format
 msgid "unable to remove package %s"
 msgstr "methu tynnu pecyn %s"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2997
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "methu tynnu rpm o becyn delta-rpm %s"
 
-#: ../urpm.pm:3001
+#: ../urpm.pm:3003
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "ychwanegu pecyn %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:3004
+#: ../urpm.pm:3006
 #, c-format
 msgid "unable to install package %s"
 msgstr "methu gosod pecyn %s"
@@ -986,91 +934,184 @@ msgstr "methu gosod pecyn %s"
 msgid "More information on package %s"
 msgstr "Rhagor o wybodaeth ar becyn %s"
 
-#: ../urpm.pm:3228 ../urpm.pm:3261
+#: ../urpm.pm:3234 ../urpm.pm:3267
 #, c-format
 msgid "due to missing %s"
 msgstr "oherwydd %s coll"
 
-#: ../urpm.pm:3229 ../urpm.pm:3259
+#: ../urpm.pm:3235 ../urpm.pm:3265
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s heb ei foddloni"
 
-#: ../urpm.pm:3230
+#: ../urpm.pm:3236
 #, c-format
 msgid "trying to promote %s"
 msgstr "ceisio hybu %s"
 
-#: ../urpm.pm:3231
+#: ../urpm.pm:3237
 #, c-format
 msgid "in order to keep %s"
 msgstr "fel modd i gadw %s"
 
-#: ../urpm.pm:3254
+#: ../urpm.pm:3260
 #, c-format
 msgid "in order to install %s"
 msgstr "er mwyn gosod %s"
 
-#: ../urpm.pm:3265
+#: ../urpm.pm:3271
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "oherwydd gwrthdaro gyda %s"
 
-#: ../urpm.pm:3266
-#, c-format
+#: ../urpm.pm:3272
 msgid "unrequested"
 msgstr "diofyn"
 
-#: ../urpm.pm:3282
+#: ../urpm.pm:3288
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Llofnod annilys (%s)"
 
-#: ../urpm.pm:3314
+#: ../urpm.pm:3320
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Enw Allwedd Annilys (%s)"
 
-#: ../urpm.pm:3316
+#: ../urpm.pm:3322
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Llofnod coll (%s)"
 
-#: ../urpm.pm:3365
-#, c-format
+#: ../urpm.pm:3382
 msgid "examining MD5SUM file"
 msgstr "archwilio ffeil MD5SUM"
 
-#: ../urpm.pm:3376
+#: ../urpm.pm:3393
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "rhybudd: nid yw md5sum ar gyfer %s ar gael yn ffeil MD5SUM"
 
-#: ../urpm.pm:3398
-#, c-format
+#: ../urpm.pm:3415
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
 
 #: ../urpm/args.pm:99 ../urpm/args.pm:108
-#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
 
-#: ../urpm/args.pm:217
-#, fuzzy, c-format
+#: ../urpm/args.pm:218
+#, fuzzy
 msgid "You need to be root to use --use-distrib"
 msgstr "Rhaid i chi fod yn wraidd i ddefnyddio'r gorchymyn hwn!\n"
 
-#: ../urpm/args.pm:249
+#: ../urpm/args.pm:250
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
 
 #: ../urpm/msg.pm:82
-#, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Dewis gwael, ceisiwch eto\n"
 
+#: ../urpm/parallel_ka_run.pm:9 ../urpm/parallel_ka_run.pm:103
+#: ../urpm/parallel_ka_run.pm:197
+msgid "mput failed, maybe a node is unreacheable"
+msgstr ""
+
+#: ../urpm/parallel_ka_run.pm:70 ../urpm/parallel_ka_run.pm:182
+#: ../urpm/parallel_ka_run.pm:211
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr ""
+
+#: ../urpm/parallel_ka_run.pm:79 ../urpm/parallel_ssh.pm:96
+#, c-format
+msgid "on node %s"
+msgstr ""
+
+#. - first propagate the synthesis file to all machine.
+#: ../urpm/parallel_ka_run.pm:101
+msgid "Propagating synthesis to nodes..."
+msgstr ""
+
+#. - now try an iteration of urpmq.
+#: ../urpm/parallel_ka_run.pm:152
+msgid "Resolving dependencies on nodes..."
+msgstr ""
+
+#: ../urpm/parallel_ka_run.pm:195
+msgid "Distributing files to nodes..."
+msgstr ""
+
+#: ../urpm/parallel_ka_run.pm:201
+msgid "Verifying if install is possible on nodes..."
+msgstr ""
+
+#: ../urpm/parallel_ka_run.pm:215 ../urpm/parallel_ssh.pm:243
+#, fuzzy, c-format
+msgid "Installation failed on node %s"
+msgstr "Methodd y gosod"
+
+#: ../urpm/parallel_ka_run.pm:220 ../urpm/parallel_ssh.pm:248 ../urpmi:726
+msgid "Installation is possible"
+msgstr "Gosod yn bosibl"
+
+#. - continue installation.
+#: ../urpm/parallel_ka_run.pm:225
+#, fuzzy
+msgid "Installing packages on nodes..."
+msgstr "Gosod pecyn `%s' (%s/%s)..."
+
+#: ../urpm/parallel_ssh.pm:22 ../urpm/parallel_ssh.pm:120
+#: ../urpm/parallel_ssh.pm:224
+#, c-format
+msgid "scp failed on host %s (%d)"
+msgstr ""
+
+#: ../urpm/parallel_ssh.pm:118
+#, fuzzy, c-format
+msgid "Propagating synthesis to %s..."
+msgstr "archwilio ffeil synthesis [%s]"
+
+#: ../urpm/parallel_ssh.pm:171
+#, c-format
+msgid "Resolving dependencies on %s..."
+msgstr ""
+
+#: ../urpm/parallel_ssh.pm:201
+#, c-format
+msgid "host %s does not have a good version of urpmi (%d)"
+msgstr ""
+
+#: ../urpm/parallel_ssh.pm:217
+#, fuzzy, c-format
+msgid "Distributing files to %s..."
+msgstr "dosbarthu %s"
+
+#: ../urpm/parallel_ssh.pm:231
+#, c-format
+msgid "Verifying if install is possible on %s..."
+msgstr ""
+
+#: ../urpm/parallel_ssh.pm:255
+#, fuzzy, c-format
+msgid "Performing install on %s..."
+msgstr "Gosod y pecyn..."
+
+#: ../urpm/parallel_ssh.pm:268
+#, fuzzy, c-format
+msgid "Installing %s on %s..."
+msgstr "gosod %s o %s"
+
+#: ../urpm/parallel_ssh.pm:269
+#, fuzzy, c-format
+msgid "Preparing install on %s..."
+msgstr "Gosod y pecyn..."
+
+#: ../urpme:31 ../urpmi:500
+msgid "Is this OK?"
+msgstr "Mae'r model yn gywir"
+
 #: ../urpme:38
 #, c-format
 msgid ""
@@ -1087,43 +1128,36 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpme:43 ../urpmf:33 ../urpmi:79 ../urpmi.addmedia:43
+#: ../urpme:43 ../urpmf:33 ../urpmi:78 ../urpmi.addmedia:43
 #: ../urpmi.removemedia:48 ../urpmi.update:30 ../urpmq:43
-#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - argraffu neges cymorth.\n"
 
-#: ../urpme:44 ../urpmi:86
-#, c-format
+#: ../urpme:44 ../urpmi:85
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - dewis pecyn ynn awtomatig o fewn dewisiadau.\n"
 
 #: ../urpme:45
-#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test          - gwirio os oes modd tynnu'n iawn.\n"
 
-#: ../urpme:46 ../urpmi:101 ../urpmq:64
-#, c-format
+#: ../urpme:46 ../urpmi:100 ../urpmq:64
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
 "bodoli.\n"
 
-#: ../urpme:47 ../urpmi:106 ../urpmq:65
-#, c-format
+#: ../urpme:47 ../urpmi:105 ../urpmq:65
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 "  --parallel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
 
 #: ../urpme:48
-#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - defnyddio root arall ar gyfer tynnu rpm.\n"
 
 #: ../urpme:49
-#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
@@ -1133,42 +1167,35 @@ msgstr ""
 
 #: ../urpme:51 ../urpmi:139 ../urpmi.addmedia:74 ../urpmi.removemedia:53
 #: ../urpmi.update:48 ../urpmq:91
-#, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
 
 #: ../urpme:52
-#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - select all packages matching expression.\n"
 
 #: ../urpme:68
-#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu pecynnau"
 
 #: ../urpme:89
-#, c-format
-msgid "unknown packages"
-msgstr "pecynnau anhysbys"
-
-#: ../urpme:89
-#, c-format
 msgid "unknown package"
 msgstr "pecyn anhysbys"
 
-#: ../urpme:99 ../urpmi:437
+#: ../urpme:89
+msgid "unknown packages"
+msgstr "pecynnau anhysbys"
+
+#: ../urpme:99 ../urpmi:439
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "bydd tynnu pecynnau %s yn torri'r system"
 
 #: ../urpme:102
-#, c-format
 msgid "Nothing to remove"
 msgstr "Dim i'w dynnu"
 
 #: ../urpme:106
-#, c-format
 msgid "Checking to remove the following packages"
 msgstr "Ticio i ddileu'r pecynnau canlynol"
 
@@ -1179,13 +1206,11 @@ msgid ""
 msgstr ""
 "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu (%d MB)"
 
-#: ../urpme:115 ../urpmi:456 ../urpmi:586
-#, c-format
+#: ../urpme:115 ../urpmi:458 ../urpmi:588
 msgid " (y/N) "
 msgstr " (y/N) "
 
 #: ../urpme:122
-#, c-format
 msgid "Removing failed"
 msgstr "Methodd y tynnu"
 
@@ -1206,117 +1231,100 @@ msgstr ""
 "defnydd:\n"
 
 #: ../urpmf:34
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - argraffu neges cymorth.\n"
 
-#: ../urpmf:35 ../urpmi:121 ../urpmq:74
-#, c-format
+#: ../urpmf:35 ../urpmi:120 ../urpmq:74
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - defnyddio amgylchedd penodol (adroddiad gwall fel "
 "rheol).\n"
 
-#: ../urpmf:36 ../urpmi:83 ../urpmq:47
-#, c-format
+#: ../urpmf:36 ../urpmi:82 ../urpmq:47
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 "  --excludemedia - peidio defnyddio'r cyfrwng hwn, rhannwyd gyda choma.\n"
 
 #: ../urpmf:37
-#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:38 ../urpmi:81 ../urpmq:45
-#, c-format
+#: ../urpmf:38 ../urpmi:80 ../urpmq:45
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media          - defnyddio'r cyfrwng, wedi ei ran gan gollnod.\n"
 
-#: ../urpmf:39 ../urpmi:84 ../urpmq:48
-#, c-format
+#: ../urpmf:39 ../urpmi:83 ../urpmq:48
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "   --sortmedia    - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda "
 "choma.\n"
 
-#: ../urpmf:40 ../urpmi:85 ../urpmq:49
-#, c-format
+#: ../urpmf:40 ../urpmi:84 ../urpmq:49
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 
 #: ../urpmf:41
-#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - peidio argraffu llinellau'r un fath.\n"
 
-#: ../urpmf:42 ../urpmi:80 ../urpmq:44
-#, c-format
+#: ../urpmf:42 ../urpmi:79 ../urpmq:44
 msgid "  --update       - use only update media.\n"
 msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
 #: ../urpmf:43
-#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
 
 #: ../urpmf:44
-#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
 
 #: ../urpmf:45
-#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
 #: ../urpmf:46
-#, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
 #: ../urpmf:47
-#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
 #: ../urpmf:48
-#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - cynnwys perl cod yn union fel perl -e.\n"
 
 #: ../urpmf:49
-#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - gweithredwr deuaidd AND.\n"
 
 #: ../urpmf:50
-#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - gweithredwr deuaidd OR.\n"
 
 #: ../urpmf:51
-#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unaidd NOT.\n"
 
 #: ../urpmf:52
-#, fuzzy, c-format
+#, fuzzy
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  )              - parenthesis de i gau mynegiad grŵp.\n"
 
 #: ../urpmf:53
-#, fuzzy, c-format
+#, fuzzy
 msgid "List of tags:\n"
 msgstr ""
 "Rhestr o ddata i'w adfer:\n"
 "\n"
 
 #: ../urpmf:54
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - defnyddio rhyngwyneb  X.\n"
 
@@ -1326,134 +1334,129 @@ msgid "                   example: '%%name:%%files'\n"
 msgstr "                   rhagosodedig yw %s.\n"
 
 #: ../urpmf:56
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - argraffu tag url: url.\n"
 
 #: ../urpmf:57
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - argraffu buildhost tag: build host.\n"
 
 #: ../urpmf:58
-#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
 #: ../urpmf:59
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --conffiles    - configuration files\n"
 msgstr "Modiwl ffurfweddu Konsole"
 
 #: ../urpmf:60
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - tag argraffu'n gwrthdaro: pob gwrthdaro\n"
 
 #: ../urpmf:61
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --description  - package description\n"
 msgstr "  --summary      - argraffu disgrifiad tag: disgrifiad.\n"
 
 #: ../urpmf:62
-#, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
 #: ../urpmf:63
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - argraffu cyfnod tag: cyfnod.\n"
 
 #: ../urpmf:64
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name          - argraffu enwau pecyn yn unig \n"
 
 #: ../urpmf:65
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - rhestri'r ffeiliau mewn pecyn.\n"
 
 #: ../urpmf:66
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --group        - group\n"
 msgstr "  --group        - argraffu grŵp tag: grŵp.\n"
 
 #: ../urpmf:67
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --name         - package name\n"
 msgstr "  --name          - argraffu enwau pecyn yn unig \n"
 
 #: ../urpmf:68
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 "  --obsoletes     - argraffu hen dagiau: yr holl hen rai (llinellau "
 "niferus).\n"
 
 #: ../urpmf:69
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --packager     - packager\n"
 msgstr "  --packager      - argraffu pencynydd tag: pencynydd.\n"
 
 #: ../urpmf:70
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides      - tag argraffu'n darparu: pob darpariaeth. \n"
 
 #: ../urpmf:71
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - argraffu tagiau angenrheidiol: pob anghenraid\n"
 
 #: ../urpmf:72
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --size         - installed size\n"
 msgstr "  --size         - argraffu maint tag: maint.\n"
 
 #: ../urpmf:73
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - argraffu ourcerpm tag: ffynhonnell rpm.\n"
 
 #: ../urpmf:74
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --summary      - summary\n"
 msgstr "  --summary, -S  - crynodeb argraffu.\n"
 
 #: ../urpmf:75
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --url          - url\n"
 msgstr "  --url          - argraffu tag url: url.\n"
 
 #: ../urpmf:76
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - modd llafar.\n"
 
 #: ../urpmf:77
-#, fuzzy, c-format
+#, fuzzy
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - rhestri'r ffeiliau mewn pecyn.\n"
 
 #: ../urpmf:78 ../urpmq:80
-#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
 
 #: ../urpmf:130
-#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:172 ../urpmi:216 ../urpmq:115
+#: ../urpmf:172 ../urpmi:218 ../urpmq:116
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "ddefnyddio amgylchedd penodol ar %s\n"
 
 #: ../urpmf:218
-#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -1462,11 +1465,10 @@ msgstr ""
 "urpmf â chynnig canlyniad\n"
 
 #: ../urpmf:219
-#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "Efallai yr hoffech ddefnyddio --name i chwilio am enwau pecynnau.\n"
 
-#: ../urpmi:74
+#: ../urpmi:73
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1482,8 +1484,7 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpmi:82 ../urpmq:46
-#, c-format
+#: ../urpmi:81 ../urpmq:46
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
@@ -1491,26 +1492,23 @@ msgstr ""
 "  --searchmedia  - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau "
 "gofynnwyd (neu diweddarwyd).\n"
 
-#: ../urpmi:87 ../urpmq:50
-#, c-format
+#: ../urpmi:86 ../urpmq:50
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - dewis pecynnau'n awtomatig i uwchraddio'r system.\n"
 
-#: ../urpmi:88
-#, c-format
+#: ../urpmi:87
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - peidio gofyn i ddadosod pecyn, atal gosod.\n"
 
-#: ../urpmi:89
-#, fuzzy, c-format
+#: ../urpmi:88
+#, fuzzy
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --install-src  - peidio gosod pecynnau (llawyth i lawr yn unig).\n"
 
-#: ../urpmi:90 ../urpmq:52
-#, c-format
+#: ../urpmi:89 ../urpmq:52
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -1518,7 +1516,7 @@ msgstr ""
 "  --keep         - cadw'r pecynnau presennol os yn bosibl, gwrthod\n"
 "                   pecynnau sy'n arwain at dynnu.\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1530,40 +1528,34 @@ msgstr ""
 "                   eu gosod neu eu uwchraddio\n"
 "                   rhagosodiad yw %d.\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - hyd drosglwyddiad byr, rhagosodiad yw %d.\n"
 
-#: ../urpmi:96 ../urpmq:51
-#, c-format
+#: ../urpmi:95 ../urpmq:51
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - mynnu chwiliad fuzzy (fel -y).\n"
 
-#: ../urpmi:97 ../urpmq:60
-#, c-format
+#: ../urpmi:96 ../urpmq:60
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - pecyn nesaf yn becyn ffynhonnell (yr un peth â -s).\n"
 
-#: ../urpmi:98
-#, c-format
+#: ../urpmi:97
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
 
-#: ../urpmi:99
-#, c-format
+#: ../urpmi:98
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - tynnu rpm o'r storfa cyn unrhyw beth arall.\n"
 
-#: ../urpmi:100
-#, c-format
+#: ../urpmi:99
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - peidio glanhau rpm o'r storfa.\n"
 
-#: ../urpmi:102
-#, c-format
+#: ../urpmi:101
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
@@ -1571,8 +1563,7 @@ msgstr ""
 "  --allow-nodeps - caniatáu gofyn i ddefnyddiwr i osod pecynnau heb\n"
 "                   wirio dibyniaethau.\n"
 
-#: ../urpmi:104
-#, c-format
+#: ../urpmi:103
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -1580,13 +1571,11 @@ msgstr ""
 "  --allow-force  - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n"
 "                   wirio dibyniaethau na'u cyfanrwydd.\n"
 
-#: ../urpmi:107
-#, c-format
+#: ../urpmi:106
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - defnyddio root arall ar gyfer gosod rpm.\n"
 
-#: ../urpmi:108
-#, c-format
+#: ../urpmi:107
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -1594,23 +1583,19 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
 "                   wrth osod chroot gyda dewis o  --root.\n"
 
-#: ../urpmi:110 ../urpmi.addmedia:44 ../urpmi.update:31 ../urpmq:68
-#, c-format
+#: ../urpmi:109 ../urpmi.addmedia:44 ../urpmi.update:31 ../urpmq:68
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - defnyddio wget i estyn ffeiliau pell.\n"
 
-#: ../urpmi:111 ../urpmi.addmedia:45 ../urpmi.update:32 ../urpmq:69
-#, c-format
+#: ../urpmi:110 ../urpmi.addmedia:45 ../urpmi.update:32 ../urpmq:69
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - defnyddio curl i estyn ffeiliau pell.\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:46 ../urpmi.update:33
-#, c-format
+#: ../urpmi:111 ../urpmi.addmedia:46 ../urpmi.update:33
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - cyfyngu cyflymder y llwytho i lawr.\n"
 
-#: ../urpmi:113
-#, c-format
+#: ../urpmi:112
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1618,8 +1603,7 @@ msgstr ""
 "  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
 "                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
 
-#: ../urpmi:115 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:70
-#, c-format
+#: ../urpmi:114 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:70
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1627,8 +1611,7 @@ msgstr ""
 "  --proxy        - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
 "                   rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
 
-#: ../urpmi:117 ../urpmi.addmedia:49 ../urpmi.update:36 ../urpmq:72
-#, c-format
+#: ../urpmi:116 ../urpmi.addmedia:49 ../urpmi.update:36 ../urpmq:72
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1636,8 +1619,7 @@ msgstr ""
 "  --proxy-user   - enwi defnyddiwr a chyfrinair i'w ddefnyddio fel y\n"
 "                   dilysiad dirprwy (fformat yw <user:password>).\n"
 
-#: ../urpmi:119
-#, c-format
+#: ../urpmi:118
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
@@ -1645,8 +1627,7 @@ msgstr ""
 "  --bug          - cynhyrchu adroddiad gwall i'r cyfeiriadur nodir gan\n"
 "                   yr arg. nesaf\n"
 
-#: ../urpmi:122
-#, c-format
+#: ../urpmi:121
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
@@ -1654,34 +1635,34 @@ msgstr ""
 "  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
 "                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
 
-#: ../urpmi:124
-#, c-format
+#: ../urpmi:123
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test          - gwirio os oes modd gosod yn iawn.\n"
 
-#: ../urpmi:125
-#, c-format
+#: ../urpmi:124
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - eithrio llwybr wedi ei wahanu a chollnod.\n"
 
-#: ../urpmi:126
-#, c-format
+#: ../urpmi:125
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - eithrio ffeiliau docs.\n"
 
-#: ../urpmi:127
-#, fuzzy, c-format
+#: ../urpmi:126
+#, fuzzy
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --no-uninstall - peidio gofyn i ddadosod pecyn, atal gosod.\n"
 
+#: ../urpmi:127
+#, fuzzy
+msgid "  --noscripts    - do not execute package scriptlet(s)\n"
+msgstr "  --summary      - argraffu disgrifiad tag: disgrifiad.\n"
+
 #: ../urpmi:128
-#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip          - pecynnau dylid osgoi eu gosod.\n"
 
 #: ../urpmi:129
-#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1691,64 +1672,54 @@ msgstr ""
 "                   na'r rhagosodiad.\n"
 
 #: ../urpmi:131 ../urpmi.addmedia:68 ../urpmi.update:41
-#, c-format
 msgid "  --norebuild    - don't try to rebuild hdlist if not readable.\n"
 msgstr ""
 "  --norebuild    - peidiwch ceisio adeiladu buildhost os nad yw'n "
 "ddarllenadwy.\n"
 
 #: ../urpmi:132
-#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 "  --strict-arch  - uwchraddio dim ond pecynnau gyda'r un bensaernïaeth.\n"
 
 #: ../urpmi:133 ../urpmq:77
-#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - dewis pob cydweddiad ar y llinell gorchymyn.\n"
 
 #: ../urpmi:134
-#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - caniatáu i chwilio canfod pecyn.\n"
 
 #: ../urpmi:135
-#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - peidio chwilio yn provides i ganfod pecyn.\n"
 
 #: ../urpmi:136 ../urpmq:92
-#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - gosod chwilio fuzzy (fel --fuzzy).\n"
 
 #: ../urpmi:137 ../urpmq:89
-#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
 "  --s          - pecyn nesaf yn becyn ffynhonnell (yr un peth â --src).\n"
 
 #: ../urpmi:138 ../urpmi.addmedia:73 ../urpmi.removemedia:52
 #: ../urpmi.update:47
-#, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modd distaw.\n"
 
 #: ../urpmi:140
-#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 " bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
 "eu gosod.\n"
 
-#: ../urpmi:187
-#, c-format
+#: ../urpmi:189
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 "Beth mae modd gwneud gyda ffeiliau deuaidd wrth ddefnyddio --install-src"
 
-#: ../urpmi:206
+#: ../urpmi:208
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1757,17 +1728,16 @@ msgstr ""
 "Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
 "adroddiad gwall neu ei ddileu."
 
-#: ../urpmi:207
+#: ../urpmi:209
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
 
-#: ../urpmi:210 ../urpmi:331
-#, c-format
+#: ../urpmi:212 ../urpmi:333
 msgid "Copying failed"
 msgstr "Methodd y copïo"
 
-#: ../urpmi:236
+#: ../urpmi:238
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1776,12 +1746,12 @@ msgstr ""
 "Gwall: %s i weld wedi ei osod fel darllen yn unig.\n"
 "Defnydd --allow-force gorfodaeth i orfodi gweithred."
 
-#: ../urpmi:366
+#: ../urpmi:368
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Beth yw eich dewis? (1-%d)"
 
-#: ../urpmi:396
+#: ../urpmi:398
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -1792,14 +1762,18 @@ msgstr ""
 "sy'n hyn na'r rhai sydd wedi eu gosod:\n"
 "%s"
 
-#: ../urpmi:404 ../urpmi:422
-#, fuzzy, c-format
+#: ../urpmi:406 ../urpmi:424
+#, fuzzy
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Parhau beth bynnag?"
 
-#: ../urpmi:415
+#: ../urpmi:406 ../urpmi:424 ../urpmi:504
+msgid " (Y/n) "
+msgstr " (Y/n) "
+
+#: ../urpmi:417
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -1808,7 +1782,7 @@ msgstr ""
 "Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
 "%s"
 
-#: ../urpmi:445
+#: ../urpmi:447
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1819,7 +1793,7 @@ msgstr ""
 "gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
-#: ../urpmi:450
+#: ../urpmi:452
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1828,7 +1802,7 @@ msgstr ""
 "Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s"
 
-#: ../urpmi:485 ../urpmi:496
+#: ../urpmi:487 ../urpmi:498
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be installed "
@@ -1836,7 +1810,7 @@ msgid ""
 msgstr ""
 "I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod (%d MB)"
 
-#: ../urpmi:486 ../urpmi:497
+#: ../urpmi:488 ../urpmi:499
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed (%d "
@@ -1844,7 +1818,7 @@ msgid ""
 msgstr ""
 "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod (%d MB)"
 
-#: ../urpmi:492
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1853,68 +1827,69 @@ msgstr ""
 "Rhaid eich bod yn wraidd i osod y dibyniaethau canlynol:\n"
 "%s\n"
 
-#: ../urpmi:523
-#, c-format
+#: ../urpmi:525
 msgid "Press Enter when ready..."
 msgstr "Pwyso Enter pan yn barod..."
 
-#: ../urpmi:577
-#, c-format
+#: ../urpmi:531
+msgid "Cancel"
+msgstr "Dileu"
+
+#: ../urpmi:531
+msgid "Ok"
+msgstr "Iawn"
+
+#: ../urpmi:579
 msgid "The following packages have bad signatures"
 msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
 
-#: ../urpmi:578
-#, c-format
+#: ../urpmi:580
 msgid "Do you want to continue installation ?"
 msgstr "Ydych chi am barhau gosod?"
 
-#: ../urpmi:620
+#: ../urpmi:622
 #, c-format
 msgid "distributing %s"
 msgstr "dosbarthu %s"
 
-#: ../urpmi:631
+#. - there's a common prefix, simplify message
+#: ../urpmi:633
 #, c-format
 msgid "installing %s from %s"
 msgstr "gosod %s o %s"
 
-#: ../urpmi:633
+#: ../urpmi:635
 #, c-format
 msgid "installing %s"
 msgstr "gosod %s"
 
-#: ../urpmi:662
-#, c-format
+#: ../urpmi:665
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
 
-#: ../urpmi:678
-#, c-format
+#: ../urpmi:681
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Gwneud y gosod gyda mwy o orfodaeth (--force)? (i/N)"
 
-#: ../urpmi:715
+#: ../urpmi:718
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "methodd trosglwyddiad gosod %d"
 
-#: ../urpmi:723
-#, c-format
-msgid "Installation is possible"
-msgstr "Gosod yn bosibl"
-
-#: ../urpmi:730
+#: ../urpmi:733
 #, fuzzy, c-format
 msgid "The following package names were assumed: %s"
 msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
 
-#: ../urpmi:747
-#, c-format
+#: ../urpmi:750
 msgid "restarting urpmi"
 msgstr "ailgychwyn urpmi"
 
+#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
+#. Translator: and 'removable:' must not be translated!
+#. Translator: neither the ``with''.
+#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:34
-#, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
@@ -1939,22 +1914,18 @@ msgstr ""
 "and [options] are from\n"
 
 #: ../urpmi.addmedia:51
-#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update        - defnyddio cyfrwng diweddaru.\n"
 
 #: ../urpmi.addmedia:52
-#, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - ceisio canfod a defnyddio ffeil synthesis.\n"
 
 #: ../urpmi.addmedia:53
-#, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - ceisio canfod a defnyddio ffeil hdlist.\n"
 
 #: ../urpmi.addmedia:54
-#, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
@@ -1963,7 +1934,6 @@ msgstr ""
 "                   ffeil hdlist.\n"
 
 #: ../urpmi.addmedia:56
-#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1982,7 +1952,6 @@ msgstr ""
 "                   %s\n"
 
 #: ../urpmi.addmedia:60
-#, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
 "                   from the version of the distribution told by the\n"
@@ -1995,7 +1964,6 @@ msgstr ""
 "                   ryddhawyd gan Mandriva Linux.\n"
 
 #: ../urpmi.addmedia:63
-#, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandriva-release package installed.\n"
@@ -2004,7 +1972,6 @@ msgstr ""
 "                   osod pecynnau Mandriva Linux.\n"
 
 #: ../urpmi.addmedia:65
-#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -2013,28 +1980,23 @@ msgstr ""
 "                   dom ond protocol file:// sy'n cael ei ganiatáu.\n"
 
 #: ../urpmi.addmedia:67 ../urpmi.update:39
-#, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - analluogi gwirio ffeil  MD5SUM.\n"
 
 #: ../urpmi.addmedia:69
-#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - peidio mewnforio pubkey y cyfrwng ychwanegwyd\n"
 
 #: ../urpmi.addmedia:70
-#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - ychwnaegu cyfrwng yn config, ond nid yn ei ddiweddaru.\n"
 
 #: ../urpmi.addmedia:71 ../urpmi.removemedia:50 ../urpmi.update:45
-#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - glanhau penawdau yng nghyfeiriadur y storfa.\n"
 
 #: ../urpmi.addmedia:72 ../urpmi.update:46
-#, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - gorfodi cynhyrchu ffeiliau hdlist\n"
 
@@ -2044,7 +2006,6 @@ msgid "unable to update medium \"%s\"\n"
 msgstr "methu diweddaru cyfrwng \"%s\"\n"
 
 #: ../urpmi.addmedia:117
-#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael ychwanegu cyfrwng"
 
@@ -2059,17 +2020,14 @@ msgid "Can't create config file [%s]"
 msgstr "Methu creu ffeil Config (%s)"
 
 #: ../urpmi.addmedia:128
-#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "dim angen rhoi <llwybr perthynnol hdlist> gyda --distrib"
 
 #: ../urpmi.addmedia:138
-#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<llwybr perthynnol hdlist> ar goll\n"
 
 #: ../urpmi.addmedia:140
-#, c-format
 msgid "`with' missing for network media\n"
 msgstr "`with' ar goll ar gyfer cyfrwng rhwydwaith\n"
 
@@ -2079,7 +2037,6 @@ msgid "unable to create medium \"%s\"\n"
 msgstr "methu creu cyfrwng \"%s\"\n"
 
 #: ../urpmi.removemedia:46
-#, c-format
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
@@ -2088,12 +2045,10 @@ msgstr ""
 "lle mai <name> yw'r enw cyfrwng i'w dynnu.\n"
 
 #: ../urpmi.removemedia:49
-#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - dewis pob cyfrwng.\n"
 
 #: ../urpmi.removemedia:51
-#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - cydweddiad bras enwau cyfryngau\n"
 
@@ -2107,12 +2062,10 @@ msgstr ""
 "dewisiadau anhysbys '%s'\n"
 
 #: ../urpmi.removemedia:63
-#, c-format
 msgid "Only superuser is allowed to remove media"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu cyfrwng"
 
 #: ../urpmi.removemedia:73
-#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "dim i'w dynnu (defnyddio urpmi.addmedia i ychwanegu cyfrwng)\n"
 
@@ -2126,7 +2079,6 @@ msgstr ""
 "(un o %s)\n"
 
 #: ../urpmi.update:28
-#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -2135,39 +2087,32 @@ msgstr ""
 "lle mai <name> yw'r enw cyfrwng i'w dynnu.\n"
 
 #: ../urpmi.update:38
-#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
 #: ../urpmi.update:40
-#, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - gorfodi diweddaru allwedd gpg.\n"
 
 #: ../urpmi.update:42
-#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr ""
 "  --norebuild    - peidio diweddaru, marcio'r cyfrwng wedi ei anwybyddu.\n"
 
 #: ../urpmi.update:43
-#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr ""
 "  --no-ignore    - peidiwch diweddaru, marciwch y cyfrwng wedi ei alluogi.\n"
 
 #: ../urpmi.update:44
-#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - dewis pob cyfrwng ansymudadwy.\n"
 
 #: ../urpmi.update:67
-#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael diweddaru cyfrwng"
 
 #: ../urpmi.update:75
-#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "dim i'w ddiweddaru (defnyddio urpmi.addmedia i ychwanegu cyfrwng)\n"
 
@@ -2187,13 +2132,13 @@ msgstr "\"%s\""
 
 #: ../urpmi.update:98
 #, c-format
-msgid "ignoring media %s"
-msgstr "anwybyddu cyfrwng %s"
+msgid "enabling media %s"
+msgstr "galluogi cyfrwng %s"
 
 #: ../urpmi.update:98
 #, c-format
-msgid "enabling media %s"
-msgstr "galluogi cyfrwng %s"
+msgid "ignoring media %s"
+msgstr "anwybyddu cyfrwng %s"
 
 #: ../urpmq:38
 #, c-format
@@ -2212,33 +2157,27 @@ msgstr ""
 "defnydd:\n"
 
 #: ../urpmq:54
-#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list        - rhestri'r holl gyfrwng ar gael.\n"
 
 #: ../urpmq:55
-#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - rhestri'r holl gyfrwng ar gael.\n"
 
 #: ../urpmq:56
-#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - rhestru'r holl gyfrwng ar gael.\n"
 
 #: ../urpmq:57
-#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr ""
 "  --list-nodes   - rhestri'r nodau sydd ar gael wrth ddefnyddio --parallel.\n"
 
 #: ../urpmq:58
-#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - rhestr ar gael ar gyfer enwau paralel.\n"
 
 #: ../urpmq:59
-#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
@@ -2246,7 +2185,6 @@ msgstr ""
 "addmedia.\n"
 
 #: ../urpmq:61
-#, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
@@ -2255,14 +2193,12 @@ msgstr ""
 "                   stdout (gwraidd yn unig).\n"
 
 #: ../urpmq:63
-#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - give all source packages before downloading (root only).\n"
 
 #: ../urpmq:66
-#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -2271,44 +2207,36 @@ msgstr ""
 "                   Mae hyn yn caniatáu ymholi mewn dosbarthiad.\n"
 
 #: ../urpmq:75
-#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - cofnod argraffu.\n"
 
 #: ../urpmq:76
-#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - crynodeb argraffu.\n"
 
 #: ../urpmq:78
-#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - allbwn cyfan a phecyn i'w dynnu\n"
 
 #: ../urpmq:79
-#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - ymestyn ymholiad i ddibyniaethau pecynnau.\n"
 
 #: ../urpmq:81
-#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g            - argraffu grwpiau gydag enw hefyd.\n"
 
 #: ../urpmq:82
-#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy "
 "i bobl.\n"
 
 #: ../urpmq:83
-#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - rhestri'r ffeiliau mewn pecyn.\n"
 
 #: ../urpmq:84
-#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr ""
@@ -2316,29 +2244,24 @@ msgstr ""
 "(rhagosodedig).\n"
 
 #: ../urpmq:85
-#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - caniatáu i chwilio canfod pecyn.\n"
 
 #: ../urpmq:86
-#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - argraffu fersiwn a rhyddhad gydag enw hefyd.\n"
 
 #: ../urpmq:87
-#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - chwilio nôl  i'r hyn sydd angen ar becyn.\n"
 
 #: ../urpmq:88
-#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  -RR             - chwilio nôl  estyndig (yn cynnwys rhith becynnau) \n"
 
 #: ../urpmq:90
-#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
@@ -2347,39 +2270,52 @@ msgstr ""
 "osod.\n"
 
 #: ../urpmq:93
-#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 "  -Y             - fel -y, ond yn gorfodi cydweddu diffyg cydweddiad maint "
 "llythrennau.\n"
 
 #: ../urpmq:94
-#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 " bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
 "eu holi.\n"
 
-#: ../urpmq:156
-#, c-format
+#: ../urpmq:157
 msgid "--list-nodes can only be used with --parallel"
 msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
 
-#: ../urpmq:343
+#. TODO rewrite rpm2header in perl
+#: ../urpmq:313
+msgid "rpm2header utility not found, impossible to use the --header option"
+msgstr ""
+
+#: ../urpmq:362
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "hepgor cyfrwng %s: dim hdliist"
 
-#: ../urpmq:414
-#, c-format
+#: ../urpmq:437
 msgid "No filelist found\n"
 msgstr "Heb ganfod filelist\n"
 
-#: ../urpmq:424
-#, c-format
+#: ../urpmq:449
 msgid "No changelog found\n"
 msgstr "Heb ganfod changelog\n"
 
+#~ msgid "installing %s\n"
+#~ msgstr "gosod %s\n"
+
+#~ msgid ""
+#~ "Automatic installation of packages...\n"
+#~ "You requested installation of package %s\n"
+#~ msgstr ""
+#~ "Gosodiad pecynnau awtomatig...\n"
+#~ "Roeddech wedi gofyn i gael gosod pecyn %s\n"
+
+#~ msgid "%s: command not found\n"
+#~ msgstr "%s: heb ganfod gorchymyn\n"
+
 #~ msgid ""
 #~ "Some package requested cannot be installed:\n"
 #~ "%s\n"
@@ -2545,9 +2481,3 @@ msgstr "Heb ganfod changelog\n"
 
 #~ msgid "retrieving mirrors at %s ..."
 #~ msgstr "adfer drychau yn %s..."
-
-#~ msgid "Unknown option %s"
-#~ msgstr "Dewis anhysbys %s"
-
-#~ msgid "No packages specified"
-#~ msgstr "Heb enwi pecyn"