Updated POT file

1 files changed, 470 insertions, 403 deletions

diff --git a/po/cy.po b/po/cy.po
index dfd1ea14..fa89aace 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mandriva Linux\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 08:14+0200\n"
+"POT-Creation-Date: 2007-08-22 09:55+0200\n"
 "PO-Revision-Date: 2007-03-02 20:33-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n == 2) ? 1 : 0;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../gurpmi:30 ../gurpmi2:64
+#: ../gurpmi:30 ../gurpmi2:65
 #, c-format
 msgid "RPM installation"
 msgstr "Gosod RPM"
@@ -30,7 +30,7 @@ msgstr "Gosod RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Gwall: methu canfod ffeil %s, diddymu'r weithred"
 
-#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
+#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
 #, c-format
 msgid "_Ok"
 msgstr "_Iawn"
@@ -96,7 +96,7 @@ msgstr "_Gosod"
 msgid "_Save"
 msgstr "_Cadw"
 
-#: ../gurpmi:99 ../gurpmi2:153
+#: ../gurpmi:99 ../gurpmi2:154
 #, c-format
 msgid "_Cancel"
 msgstr "_Dileu"
@@ -116,17 +116,17 @@ msgstr "Dewis anhysbys %s"
 msgid "No packages specified"
 msgstr "Heb enwi pecyn"
 
-#: ../gurpmi2:44
+#: ../gurpmi2:45
 #, c-format
 msgid "Please wait..."
 msgstr "Arhoswch..."
 
-#: ../gurpmi2:53
+#: ../gurpmi2:54
 #, c-format
 msgid "Must be root"
 msgstr "Rhaid bod yn root"
 
-#: ../gurpmi2:88
+#: ../gurpmi2:89
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -137,42 +137,42 @@ msgstr ""
 "%s\n"
 "Parhau beth bynnag?"
 
-#: ../gurpmi2:112
+#: ../gurpmi2:113
 #, c-format
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../gurpmi2:112 ../urpmi:628
+#: ../gurpmi2:113 ../urpmi:637
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../gurpmi2:149
+#: ../gurpmi2:150
 #, c-format
 msgid " (to upgrade)"
 msgstr "(uwchraddio)"
 
-#: ../gurpmi2:150
+#: ../gurpmi2:151
 #, c-format
 msgid " (to install)"
 msgstr "(gosod)"
 
-#: ../gurpmi2:153
+#: ../gurpmi2:154
 #, c-format
 msgid "Package choice"
 msgstr "Dewis pecyn"
 
-#: ../gurpmi2:154
+#: ../gurpmi2:155
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../gurpmi2:177
+#: ../gurpmi2:178
 #, c-format
 msgid "_Abort"
 msgstr "_Atal"
 
-#: ../gurpmi2:197
+#: ../gurpmi2:198
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -183,59 +183,61 @@ msgstr ""
 "%s\n"
 "Parhau beth bynnag?"
 
-#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod"
 
-#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod"
 
-#: ../gurpmi2:219 ../urpmi:583
+#: ../gurpmi2:220 ../urpmi:603
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pecyn, %d MB)"
 msgstr[1] "(%d pecyn, %d MB)"
 
-#: ../gurpmi2:225
+#: ../gurpmi2:226
 #, c-format
 msgid "Package installation..."
 msgstr "Gosod y pecyn..."
 
-#: ../gurpmi2:227 ../urpmi:613
+#: ../gurpmi2:228 ../urpm/main_loop.pm:47
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "methu estyn pecynnau ffynhonnell, atal"
 
-#: ../gurpmi2:239 ../urpmi:622
+#: ../gurpmi2:242 ../urpm/install.pm:70
+#, c-format
+msgid "Preparing..."
+msgstr "Paratoi..."
+
+#: ../gurpmi2:246
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Gosod pecyn `%s' (%s/%s)..."
+
+#: ../gurpmi2:262 ../urpmi:631
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
 
-#: ../gurpmi2:264
+#: ../gurpmi2:273
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Llwytho pecynnau i lawr ' %s'..."
 
-#: ../gurpmi2:279
+#: ../gurpmi2:291
 #, c-format
-msgid ""
-"The following packages have bad signatures:\n"
-"%s\n"
-"\n"
-"Do you want to continue installation ?"
-msgstr ""
-"Mae gan y pecynnau canlynol lofnod gwallus:\n"
-"%s\n"
-"\n"
-"Hoffech chi barhau gyda'r gosod?"
+msgid "_Done"
+msgstr "_Gorffen"
 
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#: ../gurpmi2:298 ../urpm/main_loop.pm:241
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -246,41 +248,27 @@ msgstr ""
 "%s\n"
 "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
-#: ../gurpmi2:292 ../urpme:142
-#, c-format
-msgid "removing %s"
-msgstr "tynnu %s"
-
-#: ../gurpmi2:298 ../urpm/install.pm:70
-#, c-format
-msgid "Preparing..."
-msgstr "Paratoi..."
-
-#: ../gurpmi2:302
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Gosod pecyn `%s' (%s/%s)..."
-
-#: ../gurpmi2:334
-#, c-format
-msgid "_Done"
-msgstr "_Gorffen"
-
-#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
+#: ../urpm/main_loop.pm:215
 #, c-format
 msgid "Installation failed:"
 msgstr "Methodd y gosod:"
 
-#: ../gurpmi2:344
+#: ../gurpmi2:309
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Popeth wedi eu gosod eisoes"
 
-#: ../gurpmi2:346
+#: ../gurpmi2:311
 #, c-format
 msgid "Installation finished"
 msgstr "Cwblhawyd y gosod"
 
+#: ../gurpmi2:312 ../urpme:139
+#, c-format
+msgid "removing %s"
+msgstr "tynnu %s"
+
 #: ../rpm-find-leaves:14
 #, c-format
 msgid ""
@@ -315,7 +303,7 @@ msgstr "  -f            - allbynnu enw llawn rpm (NVRA)\n"
 msgid "                    defaults to %s.\n"
 msgstr "                   rhagosodedig yw %s.\n"
 
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:267
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
@@ -325,98 +313,98 @@ msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
 msgid "Running urpmi in restricted mode..."
 msgstr "Rhedeg urpmi mewn modd cyfyngedig..."
 
-#: ../urpm.pm:91
+#: ../urpm.pm:104
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "methu agor rpmdb"
 
-#: ../urpm.pm:110
+#: ../urpm.pm:123
 #, c-format
 msgid "found %d rpm headers in cache, removing %d obsolete headers"
 msgstr "wedi canfod %d pennawd rpm yn yr ystorfa, tynnu %d hen bennawd"
 
-#: ../urpm.pm:126
+#: ../urpm.pm:139
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "enw ffeil rpm annilys [%s]"
 
-#: ../urpm.pm:132
+#: ../urpm.pm:145
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "adfer ffeil rpm (%s)..."
 
-#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:147 ../urpm/get_pkgs.pm:188
 #, c-format
 msgid "...retrieving done"
 msgstr ".cwblhau adfer"
 
-#: ../urpm.pm:137 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:747 ../urpm/media.pm:1265 ../urpm/media.pm:1487
+#: ../urpm.pm:150 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm/media.pm:747 ../urpm/media.pm:1272 ../urpm/media.pm:1494
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... methodd ail-lwytho: %s"
 
-#: ../urpm.pm:142
+#: ../urpm.pm:155
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "methu cael mynediad  ffeil rpm (%s)"
 
-#: ../urpm.pm:147
+#: ../urpm.pm:160
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "methu didoli ffeil spec %s [%s]"
 
-#: ../urpm.pm:157
+#: ../urpm.pm:170
 #, c-format
 msgid "unable to register rpm file"
 msgstr "methu cofrestr ffeil rpm"
 
-#: ../urpm.pm:159
+#: ../urpm.pm:172
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Saernïaeth anghydnaws ar gyfer rpm [%s]"
 
-#: ../urpm.pm:163
+#: ../urpm.pm:176
 #, c-format
 msgid "error registering local packages"
 msgstr "gwall cofrestru pecynnau lleol"
 
-#: ../urpm.pm:259
+#: ../urpm.pm:274
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Mae'r weithred yn waharddedig wrth redeg ym modd cyfyngedig"
 
-#: ../urpm/args.pm:111 ../urpm/args.pm:120
+#: ../urpm/args.pm:116 ../urpm/args.pm:125
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
 
-#: ../urpm/args.pm:135
-#, c-format
-msgid "chroot directory doesn't exist"
-msgstr "Nid yw cyfeiriadur chroot yn bodoli"
-
-#: ../urpm/args.pm:270
+#: ../urpm/args.pm:263
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
 
-#: ../urpm/args.pm:421
+#: ../urpm/args.pm:407
+#, c-format
+msgid "chroot directory doesn't exist"
+msgstr "Nid yw cyfeiriadur chroot yn bodoli"
+
+#: ../urpm/args.pm:424
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Methu defnyddio %s heb %s"
 
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:427 ../urpm/args.pm:430
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Methu defnyddio %s gyda %s"
 
-#: ../urpm/args.pm:438
+#: ../urpm/args.pm:444
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Gormod o ymresymiadau\n"
 
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1147
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1154
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "adeiladu ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
@@ -605,7 +593,12 @@ msgstr "heb ganfod pecyn %s"
 msgid "malformed URL: [%s]"
 msgstr "URL gwallus: [%s]"
 
-#: ../urpm/get_pkgs.pm:180
+#: ../urpm/get_pkgs.pm:179
+#, c-format
+msgid "sorry you can't --install-src remote .src.rpm files"
+msgstr ""
+
+#: ../urpm/get_pkgs.pm:185
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
@@ -615,44 +608,49 @@ msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
 msgid "[repackaging]"
 msgstr "[ailbecynnu]"
 
-#: ../urpm/install.pm:112
+#: ../urpm/install.pm:143
 #, 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/install.pm:115
+#: ../urpm/install.pm:146
 #, c-format
 msgid "unable to create transaction"
 msgstr "methu creu trosglwyddiad."
 
-#: ../urpm/install.pm:133
+#: ../urpm/install.pm:164
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "methu tynnu rpm o becyn delta-rpm %s"
 
-#: ../urpm/install.pm:139
+#: ../urpm/install.pm:170
 #, 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/install.pm:142
+#: ../urpm/install.pm:173
 #, c-format
 msgid "unable to install package %s"
 msgstr "methu gosod pecyn %s"
 
-#: ../urpm/install.pm:180
+#: ../urpm/install.pm:210
+#, fuzzy, c-format
+msgid "Removing package %s"
+msgstr "tynnu pecyn %s."
+
+#: ../urpm/install.pm:211
 #, c-format
 msgid "removing package %s"
 msgstr "tynnu pecyn %s."
 
-#: ../urpm/install.pm:195
+#: ../urpm/install.pm:226
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "tynnu rpm wedi eu gosod (%s) o %s"
 
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:232
 #, c-format
 msgid "More information on package %s"
 msgstr "Rhagor o wybodaeth ar becyn %s"
@@ -682,11 +680,103 @@ msgstr "Sail heb ei ddiffinio"
 msgid "Cannot connect to ldap uri:"
 msgstr "Methu cysylltu  æg uri ldap:"
 
-#: ../urpm/lock.pm:50
+#: ../urpm/lock.pm:62
+#, fuzzy, c-format
+msgid "%s database locked. waiting..."
+msgstr "Cronfa ddata %s wedi cloi"
+
+#: ../urpm/lock.pm:63
+#, fuzzy, c-format
+msgid "aborting"
+msgstr "Rhybudd"
+
+#: ../urpm/lock.pm:65
 #, c-format
 msgid "%s database locked"
 msgstr "Cronfa ddata %s wedi cloi"
 
+#: ../urpm/main_loop.pm:99
+#, c-format
+msgid "The following package has bad signature"
+msgstr "Mae gan y pecyn canlynol lofnod gwallus"
+
+#: ../urpm/main_loop.pm:100
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
+
+#: ../urpm/main_loop.pm:101
+#, c-format
+msgid "Do you want to continue installation ?"
+msgstr "Ydych chi am barhau gosod?"
+
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#, c-format
+msgid "Installation failed"
+msgstr "Methodd y gosod"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "distributing %s"
+msgstr "dosbarthu %s"
+
+#: ../urpm/main_loop.pm:148
+#, c-format
+msgid "installing %s from %s"
+msgstr "gosod %s o %s"
+
+#: ../urpm/main_loop.pm:150
+#, c-format
+msgid "installing %s"
+msgstr "gosod %s"
+
+#: ../urpm/main_loop.pm:187
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
+
+#: ../urpm/main_loop.pm:205
+#, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Mwy o orfodaeth gyda'r gosod?  (--force)? (y/N)"
+
+#: ../urpm/main_loop.pm:247
+#, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "methodd trosglwyddiad gosod %d"
+msgstr[1] "methodd trosglwyddiad gosod %d"
+
+#: ../urpm/main_loop.pm:258
+#, c-format
+msgid "Installation is possible"
+msgstr "Gosod yn bosibl"
+
+#: ../urpm/main_loop.pm:263
+#, c-format
+msgid "Packages are up to date"
+msgstr "Mae'r pecynnau'n rhai diweddaraf"
+
+#: ../urpm/main_loop.pm:271
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Pecyn %s wedi ei osod eisoes"
+
+#: ../urpm/main_loop.pm:272
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Pecynnau %s wedi eu gosod eisoes"
+
+#: ../urpm/main_loop.pm:275
+#, c-format
+msgid "Package %s can not be installed"
+msgstr "Methu gosod pecyn %s"
+
+#: ../urpm/main_loop.pm:276
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "Methu gosod pecynnau %s"
+
 #: ../urpm/md5sum.pm:23
 #, c-format
 msgid "examining %s file"
@@ -736,7 +826,7 @@ msgstr "nid ddylai \"synthesis\" gael ei osod (canolig \"%s\")"
 msgid "\"synthesis\" should be set (medium \"%s\")"
 msgstr "\"synthesis\" i'w osod (canolig \"%s\")"
 
-#: ../urpm/media.pm:210 ../urpm/media.pm:1425 ../urpm/media.pm:1513
+#: ../urpm/media.pm:210 ../urpm/media.pm:1432 ../urpm/media.pm:1520
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "methu cael mynediad i  ffeil hdlist\"%s\", anwybyddu'r cyfrwng"
@@ -830,7 +920,7 @@ msgstr ""
 msgid "Search start: %s end: %s"
 msgstr "Cychwyn chwilio: %s diwedd: %s"
 
-#: ../urpm/media.pm:606 ../urpm/media.pm:1810
+#: ../urpm/media.pm:606 ../urpm/media.pm:1818
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n"
@@ -896,67 +986,72 @@ msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "methu cael mynediad at gyfrwng y dosbarthiad (heb ganfod ffeil media.cfg)"
 
-#: ../urpm/media.pm:832
+#: ../urpm/media.pm:766
+#, c-format
+msgid "skipping non compatible media `%s' (for %s)"
+msgstr ""
+
+#: ../urpm/media.pm:839
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\""
 
-#: ../urpm/media.pm:835
+#: ../urpm/media.pm:842
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "dewis aml-gyfrwng: %s"
 
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:862
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "dewis cyfrwng \"%s\":"
 
-#: ../urpm/media.pm:946
+#: ../urpm/media.pm:953
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "ail-ffurfweddu urpmi ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:984
+#: ../urpm/media.pm:991
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...methodd ail-ffurfweddu"
 
-#: ../urpm/media.pm:990
+#: ../urpm/media.pm:997
 #, c-format
 msgid "reconfiguration done"
 msgstr "cwblhau ail-ffurfweddu"
 
-#: ../urpm/media.pm:1038
+#: ../urpm/media.pm:1045
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Gwall wrth gynhyrchu ffeil enwau: heb ganfod dibyniaeth %d"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1049
 #, c-format
 msgid "Error generating names file: Can't write to file (%s)"
 msgstr "Gwall wrth gynhyrchu ffeil enwau: Methu ysgrifennu ffeil (%s)"
 
-#: ../urpm/media.pm:1077
+#: ../urpm/media.pm:1084
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
 
-#: ../urpm/media.pm:1097
+#: ../urpm/media.pm:1104
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "archwilio ffeil hdlist [%s]"
 
-#: ../urpm/media.pm:1107
+#: ../urpm/media.pm:1114
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "archwilio ffeil synthesis [%s]"
 
-#: ../urpm/media.pm:1124
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "adeiladu hdlist [%s]"
 
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1150
 #, c-format
 msgid ""
 "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -965,77 +1060,77 @@ msgstr ""
 "Methu adeiladu ffeil synthesis ar gyfer cyfrwng \"%s\". Efallai bod eich "
 "ffeil hdlist yn llygredig."
 
-#: ../urpm/media.pm:1162
+#: ../urpm/media.pm:1169
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1173 ../urpm/media.pm:1238
+#: ../urpm/media.pm:1180 ../urpm/media.pm:1245
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "copïo [%s] ar gyfer cyfrwng \"%s\"..."
 
-#: ../urpm/media.pm:1175 ../urpm/media.pm:1213 ../urpm/media.pm:1500
+#: ../urpm/media.pm:1182 ../urpm/media.pm:1220 ../urpm/media.pm:1507
 #, c-format
 msgid "...copying failed"
 msgstr "...methodd y copïo"
 
-#: ../urpm/media.pm:1209
+#: ../urpm/media.pm:1216
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copïo ffeil disgrifiad o \"%s\""
 
-#: ../urpm/media.pm:1211 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1249
 #, c-format
 msgid "...copying done"
 msgstr "...cwblhau'r copïo"
 
-#: ../urpm/media.pm:1244
+#: ../urpm/media.pm:1251
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)"
 
-#: ../urpm/media.pm:1277
+#: ../urpm/media.pm:1284
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum o ffynhonnell hdlist gopïwyd (neu synthesis)"
 
-#: ../urpm/media.pm:1279
+#: ../urpm/media.pm:1286
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "methodd copïo (%s) (md5sum gwallus)"
 
-#: ../urpm/media.pm:1291
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum o ffynhonnell hdlist adferwyd (neu synthesis)"
 
-#: ../urpm/media.pm:1293
+#: ../urpm/media.pm:1300
 #, c-format
 msgid "...retrieving failed: md5sum mismatch"
 msgstr "... methodd ail-lwytho: anghysondeb md5sum"
 
-#: ../urpm/media.pm:1308
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "heb ganfod ffeiliau rpm o [%s]"
 
-#: ../urpm/media.pm:1315
+#: ../urpm/media.pm:1322
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "darllen ffeiliau rpm o [%s]"
 
-#: ../urpm/media.pm:1330
+#: ../urpm/media.pm:1337
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "methu darllen ffeiliau rpm o (%s): %s"
 
-#: ../urpm/media.pm:1340
+#: ../urpm/media.pm:1347
 #, c-format
 msgid "no rpms read"
 msgstr "heb ddarllen rpmau"
 
-#: ../urpm/media.pm:1370
+#: ../urpm/media.pm:1377
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -1045,67 +1140,67 @@ msgstr ""
 "maethu cael mynediad i gyfrwng \"%s\",\n"
 "gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur wrth greu'r cyfrwng."
 
-#: ../urpm/media.pm:1383
+#: ../urpm/media.pm:1390
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "ffeil hdlist annilys %s ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1463
+#: ../urpm/media.pm:1470
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "adfer ffynhonnell hdlist (neu synthesis) \"%s\"..."
 
-#: ../urpm/media.pm:1479
+#: ../urpm/media.pm:1486
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "canfod hdlist (neu synthesis) holwyd fel %s"
 
-#: ../urpm/media.pm:1486 ../urpm/media.pm:1620
+#: ../urpm/media.pm:1493 ../urpm/media.pm:1627
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "dim ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1538
+#: ../urpm/media.pm:1545
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "archwilio ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1550
+#: ../urpm/media.pm:1557
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1560
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "methu mewnforio ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1571
+#: ../urpm/media.pm:1578
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "ysgrifennu rhestr ffeil  ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1629 ../urpm/media.pm:1659
+#: ../urpm/media.pm:1636 ../urpm/media.pm:1666
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
 
-#: ../urpm/media.pm:1646
+#: ../urpm/media.pm:1653
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "methu didoli ffeil hdlist \"%s\""
 
-#: ../urpm/media.pm:1652
+#: ../urpm/media.pm:1659
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1717
+#: ../urpm/media.pm:1724
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "darllen pennawd o'r cyfrwng \"%s\""
 
-#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
 #, c-format
 msgid "Nn"
 msgstr "Nn"
@@ -1115,8 +1210,8 @@ msgstr "Nn"
 #  can hit those keys in their keyboard to reply.
 #  please keep the 'Yy' for compatibility reasons
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:130
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
+#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
 #, c-format
 msgid "Yy"
 msgstr "Yy"
@@ -1176,47 +1271,52 @@ msgstr "cyfrwng annealladwy \"%s\" wedi ei nodi'n symudadwy ond nid yw"
 msgid "unable to access medium \"%s\""
 msgstr "methu cael mynediad at gyfrwng. \"%s\""
 
-#: ../urpm/select.pm:124
+#: ../urpm/select.pm:125
 #, c-format
 msgid "No package named %s"
 msgstr "Dim pecyn o'r enw %s"
 
-#: ../urpm/select.pm:126 ../urpme:113
+#: ../urpm/select.pm:127 ../urpme:110
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
 
-#: ../urpm/select.pm:405 ../urpm/select.pm:447
+#: ../urpm/select.pm:441 ../urpm/select.pm:484
 #, c-format
 msgid "due to missing %s"
 msgstr "oherwydd %s coll"
 
-#: ../urpm/select.pm:406 ../urpm/select.pm:445
+#: ../urpm/select.pm:442
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Pecyn %s wedi ei osod eisoes"
+
+#: ../urpm/select.pm:443 ../urpm/select.pm:482
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s heb ei foddloni"
 
-#: ../urpm/select.pm:412
+#: ../urpm/select.pm:449
 #, c-format
 msgid "trying to promote %s"
 msgstr "ceisio hybu %s"
 
-#: ../urpm/select.pm:413
+#: ../urpm/select.pm:450
 #, c-format
 msgid "in order to keep %s"
 msgstr "fel modd i gadw %s"
 
-#: ../urpm/select.pm:441
+#: ../urpm/select.pm:478
 #, c-format
 msgid "in order to install %s"
 msgstr "er mwyn gosod %s"
 
-#: ../urpm/select.pm:451
+#: ../urpm/select.pm:488
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "oherwydd gwrthdaro gyda %s"
 
-#: ../urpm/select.pm:453
+#: ../urpm/select.pm:490
 #, c-format
 msgid "unrequested"
 msgstr "diofyn"
@@ -1236,6 +1336,16 @@ msgstr "Enw Allwedd Annilys (%s)"
 msgid "Missing signature (%s)"
 msgstr "Llofnod coll (%s)"
 
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Methu creu ffeil Config (%s)"
+
+#: ../urpm/sys.pm:216
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Methodd y copïo"
+
 #: ../urpme:40
 #, c-format
 msgid ""
@@ -1252,8 +1362,8 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpme:45 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:48
+#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - argraffu neges cymorth.\n"
@@ -1268,7 +1378,7 @@ msgstr "  --auto         - dewis pecyn yn awtomatig o fewn dewisiadau.\n"
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test          - gwirio os oes modd tynnu'n iawn.\n"
 
-#: ../urpme:48 ../urpmi:109 ../urpmq:67
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
@@ -1276,13 +1386,13 @@ msgstr ""
 "  --force        - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
 "bodoli.\n"
 
-#: ../urpme:49 ../urpmi:114 ../urpmq:69
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 "  --parallel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
 
-#: ../urpme:50 ../urpmi:146
+#: ../urpme:50 ../urpmi:143
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - Ailbecynnu'r ffeiliau cyn eu dileu\n"
@@ -1292,8 +1402,8 @@ msgstr "  --repackage    - Ailbecynnu'r ffeiliau cyn eu dileu\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - defnyddio root arall ar gyfer tynnu rpm.\n"
 
-#: ../urpme:52 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
 #, c-format
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr ""
@@ -1314,17 +1424,17 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
 "                   wrth (ddad)osod chroot gyda dewis  --root.\n"
 
-#: ../urpme:56 ../urpmi:119 ../urpmq:74
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
 #, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - defnyddio ffeil synthesis.\n"
 
-#: ../urpme:57 ../urpmi:120 ../urpmq:75
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
 #, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - defnyddio ffeil hdlist.\n"
 
-#: ../urpme:58 ../urpmi:156 ../urpmq:86
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - modd llafar.\n"
@@ -1334,37 +1444,37 @@ msgstr "  --verbose, -v  - modd llafar.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - select all packages matching expression.\n"
 
-#: ../urpme:76
+#: ../urpme:73
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu pecynnau"
 
-#: ../urpme:107
+#: ../urpme:104
 #, c-format
 msgid "unknown packages"
 msgstr "pecynnau anhysbys"
 
-#: ../urpme:107
+#: ../urpme:104
 #, c-format
 msgid "unknown package"
 msgstr "pecyn anhysbys"
 
-#: ../urpme:119 ../urpmi:526
+#: ../urpme:116 ../urpmi:543
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "bydd tynnu pecynnau %s yn torri'r system"
 
-#: ../urpme:121
+#: ../urpme:118
 #, c-format
 msgid "Nothing to remove"
 msgstr "Dim i'w dynnu"
 
-#: ../urpme:126
+#: ../urpme:123
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "Ticio i ddileu'r pecynnau canlynol"
 
-#: ../urpme:134
+#: ../urpme:131
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1372,24 +1482,24 @@ msgid_plural ""
 msgstr[0] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
 msgstr[1] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
 
-#: ../urpme:136 ../urpmi:600
+#: ../urpme:133 ../urpmi:620
 #, c-format
 msgid " (%d MB)"
 msgstr " (%d MB)"
 
-#: ../urpme:138
+#: ../urpme:135
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Tynnu pecynnau %d?"
 msgstr[1] "Tynnu pecynnau %d?"
 
-#: ../urpme:138 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:133
+#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) "
 
-#: ../urpme:160
+#: ../urpme:157
 #, c-format
 msgid "Removal failed"
 msgstr "Methodd y tynnu"
@@ -1415,14 +1525,14 @@ msgstr ""
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - argraffu rhif fersiwn yr offeryn.\n"
 
-#: ../urpmf:37 ../urpmi:137 ../urpmq:83
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - defnyddio amgylchedd penodol (adroddiad gwall fel "
 "rheol).\n"
 
-#: ../urpmf:38 ../urpmi:86 ../urpmq:52
+#: ../urpmf:38 ../urpmi:82 ../urpmq:49
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
@@ -1436,12 +1546,12 @@ msgstr ""
 "  --literal, -l  - peidio cydweddu patrymau, defnyddio ymresymiad fel llinyn "
 "llythrennedd.\n"
 
-#: ../urpmf:41 ../urpmi:85 ../urpmq:50
+#: ../urpmf:41 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media          - defnyddio'r cyfrwng, wedi ei ran gan gollnod.\n"
 
-#: ../urpmf:42 ../urpmi:89 ../urpmq:53
+#: ../urpmf:42 ../urpmi:85 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1454,7 +1564,7 @@ msgstr ""
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 
-#: ../urpmf:44 ../urpmi:90 ../urpmq:54
+#: ../urpmf:44 ../urpmi:86 ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
@@ -1464,7 +1574,7 @@ msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - peidio argraffu llinellau'r un fath.\n"
 
-#: ../urpmf:46 ../urpmi:87 ../urpmq:49
+#: ../urpmf:46 ../urpmi:83 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
@@ -1600,76 +1710,86 @@ msgid "  --group        - group\n"
 msgstr "  --group        - grŵp\n"
 
 #: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name          - enw'r pecyn\n"
+
+#: ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name          - enw'r pecyn\n"
 
-#: ../urpmf:73
+#: ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - tagiau'r hen\n"
 
-#: ../urpmf:74
+#: ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager      - pecynydd\n"
 
-#: ../urpmf:75
+#: ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides      - tag darparu\n"
 
-#: ../urpmf:76
+#: ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - tagiau angenrhaid\n"
 
-#: ../urpmf:77
+#: ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - maint wedi gosod\n"
 
-#: ../urpmf:78
+#: ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - enw rpm ffynhonnell\n"
 
-#: ../urpmf:79
+#: ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes     - tagiau'r hen\n"
+
+#: ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - crynodeb\n"
 
-#: ../urpmf:80
+#: ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:81
+#: ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - gwerthwr\n"
 
-#: ../urpmf:82
+#: ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - y cyfrwng lle cafwyd y pecyn\n"
 
-#: ../urpmf:83 ../urpmq:95
+#: ../urpmf:85 ../urpmq:92
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
 
-#: ../urpmf:140
+#: ../urpmf:142
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Fformat anghywir: gallwch ddefnyddio un tag aml-werth yn unig"
 
-#: ../urpmf:189 ../urpmi:254 ../urpmq:138
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "ddefnyddio amgylchedd penodol ar %s\n"
 
-#: ../urpmf:227
+#: ../urpmf:229
 #, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1678,12 +1798,12 @@ msgstr ""
 "Sylw: gan nad oedd unrhyw gyfrwng chwiliwyd yn defnyddio hdlists, methodd "
 "urpmf â chynnig canlyniad\n"
 
-#: ../urpmf:228
+#: ../urpmf:230
 #, 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:79
+#: ../urpmi:75
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1699,7 +1819,7 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpmi:88
+#: ../urpmi:84
 #, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
@@ -1707,7 +1827,7 @@ msgstr ""
 "  --searchmedia  - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau "
 "gofynnwyd.\n"
 
-#: ../urpmi:91
+#: ../urpmi:87
 #, c-format
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
@@ -1716,41 +1836,41 @@ msgstr ""
 "  --auto         - modd anrhyngweithiol, derbyn atebion rhagosodedig i "
 "gwestiynau.\n"
 
-#: ../urpmi:92 ../urpmq:55
+#: ../urpmi:88 ../urpmq:52
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - dewis pecynnau'n awtomatig i uwchraddio'r system.\n"
 
-#: ../urpmi:93
+#: ../urpmi:89
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
 msgstr "  --auto-update  - diweddaru'r cyfrwng ac yna uwchraddio'r system.\n"
 
-#: ../urpmi:94
+#: ../urpmi:90
 #, c-format
 msgid "    --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - analluogi gwirio ffeil  MD5SUM.\n"
 
-#: ../urpmi:95
+#: ../urpmi:91
 #, c-format
 msgid "    --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - gorfodi diweddaru allwedd gpg.\n"
 
-#: ../urpmi:96
+#: ../urpmi:92
 #, c-format
 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:97
+#: ../urpmi:93
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr ""
 "  --no-install   - peidio gosod y pecynnau (dim ond eu llwytho i lawr)\n"
 
-#: ../urpmi:98 ../urpmq:57
+#: ../urpmi:94 ../urpmq:54
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1759,7 +1879,7 @@ msgstr ""
 "  --keep         - cadw'r pecynnau presennol os yn bosibl, gwrthod\n"
 "                   pecynnau sy'n arwain at dynnu.\n"
 
-#: ../urpmi:100
+#: ../urpmi:96
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1771,38 +1891,44 @@ msgstr ""
 "                   eu gosod neu eu uwchraddio\n"
 "                   rhagosodiad yw %d.\n"
 
-#: ../urpmi:103
+#: ../urpmi:99
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - hyd drosglwyddiad byr, rhagosodiad yw %d.\n"
 
-#: ../urpmi:104
+#: ../urpmi:100
 #, c-format
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
 msgstr "  --fuzzy        - mynnu chwiliad bras.\n"
 
-#: ../urpmi:105
+#: ../urpmi:101
 #, c-format
 msgid "  --src, -s      - next package is a source package.\n"
 msgstr "  --src, -s      - pecyn nesaf yn becyn ffynhonnell.\n"
 
-#: ../urpmi:106
+#: ../urpmi:102
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr ""
 "  --install-src  - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
 
-#: ../urpmi:107
+#: ../urpmi:103
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - tynnu rpm o'r storfa cyn unrhyw beth arall.\n"
 
-#: ../urpmi:108
+#: ../urpmi:104
 #, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - peidio glanhau rpm o'r storfa.\n"
 
-#: ../urpmi:110
+#: ../urpmi:105
+#, c-format
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
+msgstr ""
+
+#: ../urpmi:107
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
@@ -1811,7 +1937,7 @@ msgstr ""
 "  --allow-nodeps - caniatáu gofyn i ddefnyddiwr i osod pecynnau heb\n"
 "                   wirio dibyniaethau.\n"
 
-#: ../urpmi:112
+#: ../urpmi:109
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1820,12 +1946,12 @@ msgstr ""
 "  --allow-force  - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n"
 "                   wirio dibyniaethau na'u cyfanrwydd.\n"
 
-#: ../urpmi:115 ../urpmq:70
+#: ../urpmi:112 ../urpmq:67
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - defnyddio root arall ar gyfer gosod rpm.\n"
 
-#: ../urpmi:117
+#: ../urpmi:114
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1834,47 +1960,47 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
 "                   wrth osod chroot gyda dewis o  --root.\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:76
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - defnyddio wget i estyn ffeiliau pell.\n"
 
-#: ../urpmi:122 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:77
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - defnyddio curl i estyn ffeiliau pell.\n"
 
-#: ../urpmi:123 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:78
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --prozilla         - defnyddio prozilla i estyn ffeiliau pell.\n"
 
-#: ../urpmi:124
+#: ../urpmi:121
 #, c-format
 msgid "  --curl-options - additional options to pass to curl\n"
 msgstr "  --curl-options - dewis ychwanegol wrth ddefnyddio curl\n"
 
-#: ../urpmi:125
+#: ../urpmi:122
 #, c-format
 msgid "  --rsync-options- additional options to pass to rsync\n"
 msgstr "  --rsync-options- dewis ychwanegol wrth ddefnyddio rsync\n"
 
-#: ../urpmi:126
+#: ../urpmi:123
 #, c-format
 msgid "  --wget-options - additional options to pass to wget\n"
 msgstr "  --wget-options - dewis ychwanegol wrth ddefnyddio wget\n"
 
-#: ../urpmi:127
+#: ../urpmi:124
 #, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --cprozilla-options - dewis ychwanegol wrth ddefnyddio prozilla\n"
 
-#: ../urpmi:128 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - cyfyngu cyflymder y llwytho i lawr.\n"
 
-#: ../urpmi:129
+#: ../urpmi:126
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1883,7 +2009,7 @@ msgstr ""
 "  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
 "                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
 
-#: ../urpmi:131 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:79
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1892,7 +2018,7 @@ msgstr ""
 "  --proxy        - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
 "                   rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
 
-#: ../urpmi:133 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:81
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1901,7 +2027,7 @@ msgstr ""
 "  --proxy-user   - enwi defnyddiwr a chyfrinair i'w ddefnyddio fel y\n"
 "                   dilysiad dirprwy (fformat yw <user:password>).\n"
 
-#: ../urpmi:135
+#: ../urpmi:132
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1910,7 +2036,7 @@ msgstr ""
 "  --bug          - cynhyrchu adroddiad gwall i'r cyfeiriadur nodir gan\n"
 "                   yr arg. nesaf\n"
 
-#: ../urpmi:138
+#: ../urpmi:135
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1919,44 +2045,49 @@ msgstr ""
 "  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
 "                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig).\n"
 
-#: ../urpmi:140
+#: ../urpmi:137
 #, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
 msgstr "  --test          - gwirio os oes modd gosod yn iawn.\n"
 
-#: ../urpmi:141
+#: ../urpmi:138
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - eithrio llwybr wedi ei wahanu a chollnod.\n"
 
-#: ../urpmi:142
+#: ../urpmi:139
 #, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - eithrio ffeiliau docs.\n"
 
-#: ../urpmi:143
+#: ../urpmi:140
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - peidio gwirio maint ar ddisg cyn gosod.\n"
 
-#: ../urpmi:144
+#: ../urpmi:141
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr "  --ignorearch   - caniatáu gosod rpm ar gyfer saernïaeth annhebyg.\n"
 
-#: ../urpmi:145
+#: ../urpmi:142
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - peidio gweithredu sgripledi pecyn(au)\n"
 
-#: ../urpmi:147
+#: ../urpmi:144
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip          - pecynnau dylid osgoi eu gosod.\n"
 
-#: ../urpmi:148
+#: ../urpmi:145
+#, fuzzy, c-format
+msgid "  --prefer       - packages which should be preferred\n"
+msgstr "  --skip          - pecynnau dylid osgoi eu gosod.\n"
+
+#: ../urpmi:146
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -1966,50 +2097,50 @@ msgstr ""
 "ddewis\n"
 "                   na'r rhagosodiad.\n"
 
-#: ../urpmi:150
+#: ../urpmi:148
 #, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - peidio cloi db rpm.\n"
 
-#: ../urpmi:151
+#: ../urpmi:149
 #, 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:152 ../urpmq:92
+#: ../urpmi:150 ../urpmq:89
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - dewis pob cydweddiad ar y llinell gorchymyn.\n"
 
-#: ../urpmi:153
+#: ../urpmi:151
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - caniatáu i chwilio canfod pecyn.\n"
 
-#: ../urpmi:154
+#: ../urpmi:152
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - peidio chwilio yn provides i ganfod pecyn.\n"
 
-#: ../urpmi:155
+#: ../urpmi:153
 #, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q    - modd distaw.\n"
 
-#: ../urpmi:157
+#: ../urpmi:155
 #, 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:186
+#: ../urpmi:184
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "Gwall: methu defnyddio --auto-select ynghyd â'r rhestr pecynnau.\n"
 
-#: ../urpmi:193
+#: ../urpmi:191
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2019,12 +2150,12 @@ msgstr ""
 "arferol\n"
 "ynghyd a --bug.\n"
 
-#: ../urpmi:220
+#: ../urpmi:218
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "Methu gosod ffeiliau deuaidd rpm wrth ddefnyddio --install-src"
 
-#: ../urpmi:243
+#: ../urpmi:241
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -2033,7 +2164,7 @@ msgstr ""
 "Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
 "adroddiad gwall neu ei ddileu."
 
-#: ../urpmi:244
+#: ../urpmi:242
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
@@ -2043,7 +2174,7 @@ msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
 msgid "Environment directory %s does not exist"
 msgstr "Nid yw cyfeiriadur amgylchedd %s yn bodoli"
 
-#: ../urpmi:271
+#: ../urpmi:273
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2052,46 +2183,48 @@ msgstr ""
 "Gwall: %s i weld wedi ei osod fel darllen yn unig.\n"
 "Defnydd --allow-force gorfodaeth i orfodi gweithred."
 
-#: ../urpmi:362
+#: ../urpmi:361
 #, c-format
 msgid "Updating media...\n"
 msgstr "Diweddaru cyfrwng...\n"
 
-#: ../urpmi:437
+#. -PO: here format is "<package_name>: <summary> (to upgrade)"
+#: ../urpmi:440
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (uwchraddio)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:439
+#: ../urpmi:442
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (uwchraddio)"
 
-#: ../urpmi:441
+#. -PO: here format is "<package_name>: <summary> (to install)"
+#: ../urpmi:446
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (gosod)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:448
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (gosod)"
 
-#: ../urpmi:447
+#: ../urpmi:454
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
 
-#: ../urpmi:450
+#: ../urpmi:457
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Beth yw eich dewis? (1-%d)"
 
-#: ../urpmi:481
+#: ../urpmi:498
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2102,7 +2235,7 @@ msgstr ""
 "sy'n hyn na'r rhai sydd wedi eu gosod:\n"
 "%s"
 
-#: ../urpmi:483
+#: ../urpmi:500
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2113,7 +2246,7 @@ msgstr ""
 "sy'n hyn na'r rhai sydd wedi eu gosod:\n"
 "%s"
 
-#: ../urpmi:491 ../urpmi:511
+#: ../urpmi:508 ../urpmi:528
 #, c-format
 msgid ""
 "\n"
@@ -2122,12 +2255,12 @@ msgstr ""
 "\n"
 "Parhau i osod beth bynnag?"
 
-#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:133
+#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
-#: ../urpmi:503
+#: ../urpmi:520
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2136,7 +2269,7 @@ msgstr ""
 "Nid oes modd gosod pecyn gofynnwyd amdani:\n"
 "%s"
 
-#: ../urpmi:504
+#: ../urpmi:521
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2145,7 +2278,7 @@ msgstr ""
 "Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
 "%s"
 
-#: ../urpmi:535
+#: ../urpmi:552
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2156,7 +2289,7 @@ msgstr ""
 "gael ei dynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
-#: ../urpmi:537
+#: ../urpmi:554
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2167,7 +2300,7 @@ msgstr ""
 "gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
-#: ../urpmi:544
+#: ../urpmi:561
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -2176,7 +2309,7 @@ msgstr ""
 "Rhaid i'r pecyn canlynol gael ei dynnu i eraill gael eu diweddaru.\n"
 "%s"
 
-#: ../urpmi:545
+#: ../urpmi:562
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -2185,12 +2318,17 @@ msgstr ""
 "Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s"
 
-#: ../urpmi:547
+#: ../urpmi:564
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(prawf yn unig, ni fydd yn cael ei ddadosod)"
 
-#: ../urpmi:589
+#: ../urpmi:594
+#, c-format
+msgid "%s (suggested)"
+msgstr ""
+
+#: ../urpmi:609
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -2199,111 +2337,29 @@ msgstr ""
 "Rhaid eich bod yn wraidd i osod y dibyniaethau canlynol:\n"
 "%s\n"
 
-#: ../urpmi:595
+#: ../urpmi:615
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(prawf yn unig, ni fydd yn cael ei osod)"
 
-#: ../urpmi:597
+#: ../urpmi:617
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "Parhau gyda gosod %d pecyn?"
 msgstr[1] "Parhau gyda gosod %d pecyn?"
 
-#: ../urpmi:623
+#: ../urpmi:632
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Pwyso Enter pan yn barod..."
 
-#: ../urpmi:628
+#: ../urpmi:637
 #, c-format
 msgid "Cancel"
 msgstr "Dileu"
 
-#: ../urpmi:671
-#, c-format
-msgid "The following package has bad signature"
-msgstr "Mae gan y pecyn canlynol lofnod gwallus"
-
-#: ../urpmi:672
-#, c-format
-msgid "The following packages have bad signatures"
-msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
-
-#: ../urpmi:673
-#, c-format
-msgid "Do you want to continue installation ?"
-msgstr "Ydych chi am barhau gosod?"
-
-#: ../urpmi:692
-#, c-format
-msgid "Installation failed"
-msgstr "Methodd y gosod"
-
-#: ../urpmi:711
-#, c-format
-msgid "distributing %s"
-msgstr "dosbarthu %s"
-
-#: ../urpmi:726
-#, c-format
-msgid "installing %s from %s"
-msgstr "gosod %s o %s"
-
-#: ../urpmi:728
-#, c-format
-msgid "installing %s"
-msgstr "gosod %s"
-
-#: ../urpmi:759
-#, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
-
-#: ../urpmi:776
-#, c-format
-msgid "Try harder to install (--force)? (y/N) "
-msgstr "Mwy o orfodaeth gyda'r gosod?  (--force)? (y/N)"
-
-#: ../urpmi:815
-#, c-format
-msgid "%d installation transaction failed"
-msgid_plural "%d installation transactions failed"
-msgstr[0] "methodd trosglwyddiad gosod %d"
-msgstr[1] "methodd trosglwyddiad gosod %d"
-
-#: ../urpmi:825
-#, c-format
-msgid "Installation is possible"
-msgstr "Gosod yn bosibl"
-
-#: ../urpmi:830
-#, c-format
-msgid "Packages are up to date"
-msgstr "Mae'r pecynnau'n rhai diweddaraf"
-
-#: ../urpmi:838
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Pecyn %s wedi ei osod eisoes"
-
-#: ../urpmi:839
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Pecynnau %s wedi eu gosod eisoes"
-
-#: ../urpmi:842
-#, c-format
-msgid "Package %s can not be installed"
-msgstr "Methu gosod pecyn %s"
-
-#: ../urpmi:843
-#, c-format
-msgid "Packages %s can not be installed"
-msgstr "Methu gosod pecynnau %s"
-
-#: ../urpmi:862
+#: ../urpmi:676
 #, c-format
 msgid "restarting urpmi"
 msgstr "ailgychwyn urpmi"
@@ -2434,33 +2490,33 @@ msgstr "  --verbose      - modd llafar.\n"
 msgid "unable to update medium \"%s\"\n"
 msgstr "methu diweddaru cyfrwng \"%s\"\n"
 
-#: ../urpmi.addmedia:111
+#: ../urpmi.addmedia:109
 #, fuzzy, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 "<url> gwallus (rhaid i'r llwybr fod yn absoliwt ar gyfer cyfeiriadur lleol)\n"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:112
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael ychwanegu cyfrwng"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "creating config file [%s]"
 msgstr "yn creu ffeil config (%s)"
 
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:116
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Methu creu ffeil Config (%s)"
 
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:123
 #, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "dim angen rhoi <llwybr perthynnol hdlist> gyda --distrib"
 
-#: ../urpmi.addmedia:133
+#: ../urpmi.addmedia:131
 #, c-format
 msgid ""
 "\n"
@@ -2469,17 +2525,17 @@ msgstr ""
 "\n"
 "Hoffech chi ychwanegu cyfrwng '%s'"
 
-#: ../urpmi.addmedia:164
+#: ../urpmi.addmedia:162
 #, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<llwybr perthynnol hdlist> ar goll\n"
 
-#: ../urpmi.addmedia:167
+#: ../urpmi.addmedia:165
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Methu defnyddio %s gyda chyfrwng pell"
 
-#: ../urpmi.addmedia:190
+#: ../urpmi.addmedia:188
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "methu creu cyfrwng \"%s\"\n"
@@ -2642,17 +2698,17 @@ msgstr "  -a             - dewis pob cyfrwng.\n"
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - cydweddiad bras enwau cyfryngau\n"
 
-#: ../urpmi.removemedia:65
+#: ../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:78
+#: ../urpmi.removemedia:76
 #, 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"
 
-#: ../urpmi.removemedia:84
+#: ../urpmi.removemedia:82
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -2710,17 +2766,17 @@ msgstr "  -a             - dewis pob cyfrwng ansymudadwy.\n"
 msgid "  -f             - force updating synthesis/hdlist\n"
 msgstr "  -f             - gorfodi cynhyrchu ffeiliau synthesis/hdlist\n"
 
-#: ../urpmi.update:71
+#: ../urpmi.update:69
 #, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael diweddaru cyfrwng"
 
-#: ../urpmi.update:79
+#: ../urpmi.update:77
 #, 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"
 
-#: ../urpmi.update:97
+#: ../urpmi.update:95
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2729,22 +2785,22 @@ msgstr ""
 "mae'r cofnod i ddiweddaru ar goll\n"
 "(un o %s)\n"
 
-#: ../urpmi.update:101
+#: ../urpmi.update:99
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:102
+#: ../urpmi.update:100
 #, c-format
 msgid "ignoring media %s"
 msgstr "anwybyddu cyfrwng %s"
 
-#: ../urpmi.update:102
+#: ../urpmi.update:100
 #, c-format
 msgid "enabling media %s"
 msgstr "galluogi cyfrwng %s"
 
-#: ../urpmq:43
+#: ../urpmq:40
 #, c-format
 msgid ""
 "urpmq version %s\n"
@@ -2760,7 +2816,7 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpmq:51
+#: ../urpmq:48
 #, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
@@ -2769,38 +2825,38 @@ msgstr ""
 "  --searchmedia  - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau "
 "gofynnwyd (neu diweddarwyd).\n"
 
-#: ../urpmq:56
+#: ../urpmq:53
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - mynnu chwiliad fuzzy (fel -y).\n"
 
-#: ../urpmq:59
+#: ../urpmq:56
 #, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list        - rhestri'r holl gyfrwng ar gael.\n"
 
-#: ../urpmq:60
+#: ../urpmq:57
 #, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - rhestri'r holl gyfrwng ar gael.\n"
 
-#: ../urpmq:61
+#: ../urpmq:58
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - rhestri'r holl gyfrwng ar gael.\n"
 
-#: ../urpmq:62
+#: ../urpmq:59
 #, 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:63
+#: ../urpmq:60
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - rhestr ar gael ar gyfer enwau paralel.\n"
 
-#: ../urpmq:64
+#: ../urpmq:61
 #, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
@@ -2808,26 +2864,26 @@ msgstr ""
 "  --dump-config  - dympio'r ffurfweddiad mewn ffurf ymresymiad urpmi."
 "addmedia.\n"
 
-#: ../urpmq:65
+#: ../urpmq:62
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr ""
 "  --src          - pecyn nesaf yn becyn ffynhonnell (yr un peth â -s).\n"
 
-#: ../urpmq:66
+#: ../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:68
+#: ../urpmq:65
 #, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr ""
 "  --ignorearch   - caniatáu ymholi rpmau ar gyfer saernïaeth annhebyg.\n"
 
-#: ../urpmq:72
+#: ../urpmq:69
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
@@ -2836,22 +2892,22 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib.\n"
 "                   Mae hyn yn caniatáu ymholi mewn dosbarthiad.\n"
 
-#: ../urpmq:84
+#: ../urpmq:81
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - cofnod argraffu.\n"
 
-#: ../urpmq:85
+#: ../urpmq:82
 #, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - crynodeb argraffu.\n"
 
-#: ../urpmq:87
+#: ../urpmq:84
 #, c-format
 msgid "  --whatrequires - reverse search to what requires package.\n"
 msgstr "  --whatrequires - chwilio nôl  i'r hyn sydd angen ar becyn.\n"
 
-#: ../urpmq:88
+#: ../urpmq:85
 #, c-format
 msgid ""
 "  --whatrequires-recursive\n"
@@ -2860,57 +2916,57 @@ msgstr ""
 "  --whatrequires-recursive\n"
 "                  - chwilio nôl  estyndig (yn cynnwys rhith becynnau) \n"
 
-#: ../urpmq:90
+#: ../urpmq:87
 #, fuzzy, c-format
 msgid ""
 "  --whatprovides, -p\n"
 "                   - search in provides to find package.\n"
 msgstr "  -p             - caniatáu i chwilio canfod pecyn.\n"
 
-#: ../urpmq:93
+#: ../urpmq:90
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - allbwn cyfan a phecyn i'w dynnu\n"
 
-#: ../urpmq:94
+#: ../urpmq:91
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - ymestyn ymholiad i ddibyniaethau pecynnau.\n"
 
-#: ../urpmq:96
+#: ../urpmq:93
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g            - argraffu grwpiau gydag enw hefyd.\n"
 
-#: ../urpmq:97
+#: ../urpmq:94
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy "
 "i bobl.\n"
 
-#: ../urpmq:98
+#: ../urpmq:95
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - rhestri'r ffeiliau mewn pecyn.\n"
 
-#: ../urpmq:99
+#: ../urpmq:96
 #, c-format
 msgid "  -m             - equivalent to -du\n"
 msgstr "  -m             - yn cyfateb i -du.\n"
 
-#: ../urpmq:100
+#: ../urpmq:97
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - argraffu fersiwn a rhyddhad gydag enw hefyd.\n"
 
-#: ../urpmq:101
+#: ../urpmq:98
 #, 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"
 
-#: ../urpmq:102
+#: ../urpmq:99
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2919,52 +2975,52 @@ msgstr ""
 "  -u             - tynnu pecyn os oes yna fersiwn mwy diweddar wedi ei "
 "osod.\n"
 
-#: ../urpmq:103
+#: ../urpmq:100
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - gosod chwilio fuzzy (fel --fuzzy).\n"
 
-#: ../urpmq:104
+#: ../urpmq:101
 #, 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:105
+#: ../urpmq:102
 #, 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:181
+#: ../urpmq:180
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
 
-#: ../urpmq:362
+#: ../urpmq:359
 #, c-format
 msgid "no hdlist for medium \"%s\", only partial result for package %s"
 msgstr ""
 "dim hdlist ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer pecyn "
 "%s"
 
-#: ../urpmq:363
+#: ../urpmq:360
 #, c-format
 msgid "no hdlist for medium \"%s\", only partial result for packages %s"
 msgstr ""
 "dim hdlist ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer "
 "pecynnau %s"
 
-#: ../urpmq:366
+#: ../urpmq:363
 #, c-format
 msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 "dim hdlist ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
 "pecyn %s"
 
-#: ../urpmq:367
+#: ../urpmq:364
 #, c-format
 msgid ""
 "no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2972,11 +3028,22 @@ msgstr ""
 "dim hdlist ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
 "pecynnau %s"
 
-#: ../urpmq:428
+#: ../urpmq:425
 #, c-format
 msgid "No changelog found\n"
 msgstr "Heb ganfod changelog\n"
 
+#~ msgid ""
+#~ "The following packages have bad signatures:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you want to continue installation ?"
+#~ msgstr ""
+#~ "Mae gan y pecynnau canlynol lofnod gwallus:\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Hoffech chi barhau gyda'r gosod?"
+
 #~ msgid "You need to be root to use --use-distrib"
 #~ msgstr "Rhaid i chi fod yn wraidd i ddefnyddio --use-distrib"