updated Welsh file

1 files changed, 271 insertions, 196 deletions

diff --git a/po/cy.po b/po/cy.po
index e0ae933c..8ff304ab 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mandriva Linux\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
-"PO-Revision-Date: 2007-01-28 12:29+0000\n"
+"POT-Creation-Date: 2007-02-23 19:44+0100\n"
+"PO-Revision-Date: 2007-03-02 20:33-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg\n"
 "MIME-Version: 1.0\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:63
+#: ../gurpmi:30 ../gurpmi2:64
 #, 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:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
 #, c-format
 msgid "_Ok"
 msgstr "_Iawn"
@@ -96,7 +96,7 @@ msgstr "_Gosod"
 msgid "_Save"
 msgstr "_Cadw"
 
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
 #, c-format
 msgid "_Cancel"
 msgstr "_Dileu"
@@ -116,17 +116,17 @@ msgstr "Dewis anhysbys %s"
 msgid "No packages specified"
 msgstr "Heb enwi pecyn"
 
-#: ../gurpmi2:43
+#: ../gurpmi2:44
 #, c-format
 msgid "Please wait..."
 msgstr "Arhoswch..."
 
-#: ../gurpmi2:52
+#: ../gurpmi2:53
 #, c-format
 msgid "Must be root"
 msgstr "Rhaid bod yn root"
 
-#: ../gurpmi2:87
+#: ../gurpmi2:88
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -137,42 +137,42 @@ msgstr ""
 "%s\n"
 "Parhau beth bynnag?"
 
-#: ../gurpmi2:111
+#: ../gurpmi2:112
 #, c-format
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:629
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../gurpmi2:148
+#: ../gurpmi2:149
 #, c-format
 msgid " (to upgrade)"
 msgstr "(uwchraddio)"
 
-#: ../gurpmi2:149
+#: ../gurpmi2:150
 #, c-format
 msgid " (to install)"
 msgstr "(gosod)"
 
-#: ../gurpmi2:152
+#: ../gurpmi2:153
 #, c-format
 msgid "Package choice"
 msgstr "Dewis pecyn"
 
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../gurpmi2:176
+#: ../gurpmi2:177
 #, c-format
 msgid "_Abort"
 msgstr "_Atal"
 
-#: ../gurpmi2:196
+#: ../gurpmi2:197
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -183,41 +183,46 @@ msgstr ""
 "%s\n"
 "Parhau beth bynnag?"
 
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
+msgstr "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod"
+
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, c-format
+msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod"
-msgstr[1] "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod"
+msgstr "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod"
 
-#: ../gurpmi2:217 ../urpmi:580
+#: ../gurpmi2:219 ../urpmi:583
 #, c-format
-msgid "(%d packages, %d MB)"
-msgstr "(%d pecyn, %d MB)"
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "(%d pecyn, %d MB)"
+msgstr[1] "(%d pecyn, %d MB)"
 
-#: ../gurpmi2:223
+#: ../gurpmi2:225
 #, c-format
 msgid "Package installation..."
 msgstr "Gosod y pecyn..."
 
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "methu estyn pecynnau ffynhonnell, atal"
 
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
 
-#: ../gurpmi2:256
+#: ../gurpmi2:264
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Llwytho pecynnau i lawr ' %s'..."
 
-#: ../gurpmi2:271
+#: ../gurpmi2:279
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -230,7 +235,7 @@ msgstr ""
 "\n"
 "Hoffech chi barhau gyda'r gosod?"
 
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -241,37 +246,37 @@ msgstr ""
 "%s\n"
 "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:741
 #, c-format
 msgid "removing %s"
 msgstr "tynnu %s"
 
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
 #, c-format
 msgid "Preparing..."
 msgstr "Paratoi..."
 
-#: ../gurpmi2:294
+#: ../gurpmi2:302
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../gurpmi2:326
+#: ../gurpmi2:334
 #, c-format
 msgid "_Done"
 msgstr "_Gorffen"
 
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
 #, c-format
 msgid "Installation failed"
 msgstr "Methodd y gosod"
 
-#: ../gurpmi2:336
+#: ../gurpmi2:344
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Popeth wedi eu gosod eisoes"
 
-#: ../gurpmi2:338
+#: ../gurpmi2:346
 #, c-format
 msgid "Installation finished"
 msgstr "Cwblhawyd y gosod"
@@ -320,63 +325,63 @@ msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
 msgid "Running urpmi in restricted mode..."
 msgstr "Rhedeg urpmi mewn modd cyfyngedig..."
 
-#: ../urpm.pm:93
+#: ../urpm.pm:92
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "methu agor rpmdb"
 
-#: ../urpm.pm:112
+#: ../urpm.pm:111
 #, 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:128
+#: ../urpm.pm:127
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "enw ffeil rpm annilys [%s]"
 
-#: ../urpm.pm:134
+#: ../urpm.pm:133
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "adfer ffeil rpm (%s)..."
 
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
 #, c-format
 msgid "...retrieving done"
 msgstr ".cwblhau adfer"
 
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
 #: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... methodd ail-lwytho: %s"
 
-#: ../urpm.pm:144
+#: ../urpm.pm:143
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "methu cael mynediad  ffeil rpm (%s)"
 
-#: ../urpm.pm:149
+#: ../urpm.pm:148
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "methu didoli ffeil spec %s [%s]"
 
-#: ../urpm.pm:159
+#: ../urpm.pm:158
 #, c-format
 msgid "unable to register rpm file"
 msgstr "methu cofrestr ffeil rpm"
 
-#: ../urpm.pm:161
+#: ../urpm.pm:160
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Saernïaeth anghydnaws ar gyfer rpm [%s]"
 
-#: ../urpm.pm:165
+#: ../urpm.pm:164
 #, c-format
 msgid "error registering local packages"
 msgstr "gwall cofrestru pecynnau lleol"
 
-#: ../urpm.pm:261
+#: ../urpm.pm:260
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Mae'r weithred yn waharddedig wrth redeg ym modd cyfyngedig"
@@ -396,22 +401,22 @@ msgstr "Nid yw cyfeiriadur chroot yn bodoli"
 msgid "You need to be root to use --use-distrib"
 msgstr "Rhaid i chi fod yn wraidd i ddefnyddio --use-distrib"
 
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
 
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Methu defnyddio %s heb %s"
 
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Methu defnyddio %s gyda %s"
 
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Gormod o ymresymiadau\n"
@@ -684,8 +689,8 @@ msgstr "Sail heb ei ddiffinio"
 
 #: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
 #, c-format
-msgid "Cannot connect to ldap uri :"
-msgstr "Methu cysylltu  æg uri ldap"
+msgid "Cannot connect to ldap uri:"
+msgstr "Methu cysylltu  æg uri ldap:"
 
 #: ../urpm/lock.pm:50
 #, c-format
@@ -1110,7 +1115,7 @@ msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
 msgid "reading headers from medium \"%s\""
 msgstr "darllen pennawd o'r cyfrwng \"%s\""
 
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
 #, c-format
 msgid "Nn"
 msgstr "Nn"
@@ -1119,13 +1124,13 @@ msgstr "Nn"
 #  you can put here the letters for 'yes' for your language, so people
 #  can hit those keys in their keyboard to reply.
 #  please keep the 'Yy' for compatibility reasons
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
 #, c-format
 msgid "Yy"
 msgstr "Yy"
 
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:101
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Dewis gwael, ceisiwch eto\n"
@@ -1162,8 +1167,8 @@ msgstr "dadosod %s"
 
 #: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "heb ddewis cyfrwng \"%s\""
+msgid "medium \"%s\" is not available"
+msgstr "nid yw cyfrwng \"%s\" ar gael"
 
 #: ../urpm/removable.pm:143
 #, c-format
@@ -1368,24 +1373,32 @@ msgstr "Dim i'w dynnu"
 msgid "Checking to remove the following packages"
 msgstr "Ticio i ddileu'r pecynnau canlynol"
 
-#: ../urpme:132
+#: ../urpme:133
 #, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
-"I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu (%d MB)"
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+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:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr " (%d MB)"
 
-#: ../urpme:134
+#: ../urpme:137
 #, c-format
-msgid "Remove %d packages?"
-msgstr "Tynnu pecynnau %d?"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Tynnu pecynnau %d?"
+msgstr[1] "Tynnu pecynnau %d?"
 
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) "
 
-#: ../urpme:156
+#: ../urpme:159
 #, c-format
 msgid "Removal failed"
 msgstr "Methodd y tynnu"
@@ -1645,7 +1658,7 @@ msgstr "  --vendor       - gwerthwr\n"
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - y cyfrwng lle cafwyd y pecyn\n"
 
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:93
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
@@ -1655,7 +1668,7 @@ msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Fformat anghywir: gallwch ddefnyddio un tag aml-werth yn unig"
 
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:136
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "ddefnyddio amgylchedd penodol ar %s\n"
@@ -1968,7 +1981,7 @@ 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:87
+#: ../urpmi:152 ../urpmq:90
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - dewis pob cydweddiad ar y llinell gorchymyn.\n"
@@ -2043,58 +2056,61 @@ msgstr ""
 "Gwall: %s i weld wedi ei osod fel darllen yn unig.\n"
 "Defnydd --allow-force gorfodaeth i orfodi gweithred."
 
-#: ../urpmi:364
+#: ../urpmi:362
 #, c-format
 msgid "Updating media...\n"
 msgstr "Diweddaru cyfrwng...\n"
 
-#: ../urpmi:439
+#: ../urpmi:437
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (uwchraddio)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (uwchraddio)"
 
-#: ../urpmi:443
+#: ../urpmi:441
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (gosod)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (gosod)"
 
-#: ../urpmi:452
+#: ../urpmi:450
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Beth yw eich dewis? (1-%d)"
 
-#: ../urpmi:482
+#: ../urpmi:481
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
 "that are older than the installed ones:\n"
 "%s"
-msgid_plural ""
-"The following packages can't be installed because they depend on packages\n"
-"that are older than the installed ones:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
 "Nid oes modd gosod y pecyn canlynol am ei fod yn dibynnu ar becynnau\n"
 "sy'n hyn na'r rhai sydd wedi eu gosod:\n"
 "%s"
-msgstr[1] ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
+"The following packages can't be installed because they depend on packages\n"
+"that are older than the installed ones:\n"
+"%s"
+msgstr ""
 "Nid oes modd gosod y pecynnau canlynol am eu bod yn dibynnu ar becynnau\n"
 "sy'n hyn na'r rhai sydd wedi eu gosod:\n"
 "%s"
 
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
 #, c-format
 msgid ""
 "\n"
@@ -2103,7 +2119,7 @@ msgstr ""
 "\n"
 "Parhau i osod beth bynnag?"
 
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -2113,56 +2129,65 @@ msgstr " (Y/n) "
 msgid ""
 "A requested package cannot be installed:\n"
 "%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
 "Nid oes modd gosod pecyn gofynnwyd amdani:\n"
 "%s"
-msgstr[1] ""
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr ""
 "Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
 "%s"
 
-#: ../urpmi:534
+#: ../urpmi:535
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
 "has to be removed for others to be upgraded:\n"
 "%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
+msgstr ""
 "Nid oes modd i'r gosod parhau gan fo'n rhaid i'r pecyn canlynol\n"
 "gael ei dynnu i eraill gael eu diweddaru.\n"
 "%s\n"
-msgstr[1] ""
+
+#: ../urpmi:537
+#, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
 "Nid oes modd i'r gosod parhau gan fo'n rhaid i'r pecynnau canlynol\n"
 "gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
-#: ../urpmi:541
+#: ../urpmi:544
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
 "%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
 "Rhaid i'r pecyn canlynol gael ei dynnu i eraill gael eu diweddaru.\n"
 "%s"
-msgstr[1] ""
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
 "Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s"
 
-#: ../urpmi:544
+#: ../urpmi:547
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(prawf yn unig, ni fydd yn cael ei ddadosod)"
 
-#: ../urpmi:586
+#: ../urpmi:589
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -2171,100 +2196,111 @@ msgstr ""
 "Rhaid eich bod yn wraidd i osod y dibyniaethau canlynol:\n"
 "%s\n"
 
-#: ../urpmi:592
+#: ../urpmi:595
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(prawf yn unig, ni fydd yn cael ei osod)"
 
-#: ../urpmi:594
+#: ../urpmi:597
 #, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-msgstr[0] "Parhau gyda gosod %d pecyn? (%d MB)"
-msgstr[1] "Parhau gyda gosod %d pecyn? (%d MB)"
+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:618
+#: ../urpmi:623
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Pwyso Enter pan yn barod..."
 
-#: ../urpmi:624
+#: ../urpmi:629
 #, c-format
 msgid "Cancel"
 msgstr "Dileu"
 
-#: ../urpmi:666
+#: ../urpmi:672
 #, c-format
 msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Mae gan y pecyn canlynol lofnod gwallus"
-msgstr[1] "Mae gan y pecynnau canlynol lofnod gwallus"
+msgstr "Mae gan y pecyn canlynol lofnod gwallus"
+
+#: ../urpmi:673
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
 
-#: ../urpmi:668
+#: ../urpmi:674
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ydych chi am barhau gosod?"
 
-#: ../urpmi:715
+#: ../urpmi:721
 #, c-format
 msgid "distributing %s"
 msgstr "dosbarthu %s"
 
-#: ../urpmi:729
+#: ../urpmi:735
 #, c-format
 msgid "installing %s from %s"
 msgstr "gosod %s o %s"
 
-#: ../urpmi:731
+#: ../urpmi:737
 #, c-format
 msgid "installing %s"
 msgstr "gosod %s"
 
-#: ../urpmi:756
+#: ../urpmi:762
 #, c-format
 msgid "Installation failed:"
 msgstr "Methodd y gosod:"
 
-#: ../urpmi:763
+#: ../urpmi:769
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
 
-#: ../urpmi:780
+#: ../urpmi:786
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Mwy o orfodaeth gyda'r gosod?  (--force)? (y/N)"
 
-#: ../urpmi:819
+#: ../urpmi:825
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "methodd trosglwyddiad gosod %d"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "methodd trosglwyddiad gosod %d"
+msgstr[1] "methodd trosglwyddiad gosod %d"
 
-#: ../urpmi:828
+#: ../urpmi:835
 #, c-format
 msgid "Installation is possible"
 msgstr "Gosod yn bosibl"
 
-#: ../urpmi:833
+#: ../urpmi:840
 #, c-format
 msgid "Packages are up to date"
 msgstr "Mae'r pecynnau'n rhai diweddaraf"
 
-#: ../urpmi:840
+#: ../urpmi:848
 #, c-format
 msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "Pecyn %s wedi ei osod eisoes"
-msgstr[1] "Pecynnau %s wedi eu gosod eisoes"
+msgstr "Pecyn %s wedi ei osod eisoes"
+
+#: ../urpmi:849
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Pecynnau %s wedi eu gosod eisoes"
 
-#: ../urpmi:843
+#: ../urpmi:852
 #, c-format
 msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "Methu gosod pecyn %s"
-msgstr[1] "Methu gosod pecynnau %s"
+msgstr "Methu gosod pecyn %s"
+
+#: ../urpmi:853
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "Methu gosod pecynnau %s"
 
-#: ../urpmi:863
+#: ../urpmi:872
 #, c-format
 msgid "restarting urpmi"
 msgstr "ailgychwyn urpmi"
@@ -2373,17 +2409,17 @@ msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - ychwanegu cyfrwng yn config, ond nid yn ei ddiweddaru.\n"
 
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - glanhau penawdau yng nghyfeiriadur y storfa.\n"
 
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modd distaw.\n"
 
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
@@ -2522,8 +2558,10 @@ msgstr "Glanhau cyfeiriadur ailbacio [%s]...\n"
 
 #: ../urpmi.recover:72
 #, c-format
-msgid "%d files removed\n"
-msgstr "Tynnwyd %d pecyn\n"
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "Tynnwyd %d pecyn\n"
+msgstr[1] "Tynnwyd %d pecyn\n"
 
 #: ../urpmi.recover:82
 #, c-format
@@ -2586,7 +2624,7 @@ msgid ""
 "usage: urpmi.removemedia (-a | <name> ...)\n"
 "where <name> is a medium name to remove.\n"
 msgstr ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
 "lle mai <name> yw'r enw cyfrwng i'w dynnu.\n"
 
 #: ../urpmi.removemedia:41
@@ -2651,25 +2689,33 @@ msgstr ""
 
 #: ../urpmi.update:47
 #, c-format
+msgid ""
+"  --probe-rpms   - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+"  --probe-rpms     - peidio defnyddio synthesis/hdlist, defnyddiwch ffeiliau "
+"rpm\n"
+
+#: ../urpmi.update:48
+#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - dewis pob cyfrwng ansymudadwy.\n"
 
-#: ../urpmi.update:49
+#: ../urpmi.update:50
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - gorfodi cynhyrchu ffeiliau hdlist\n"
+msgid "  -f             - force updating synthesis/hdlist\n"
+msgstr "  -f             - gorfodi cynhyrchu ffeiliau synthesis/hdlist\n"
 
-#: ../urpmi.update:70
+#: ../urpmi.update:71
 #, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael diweddaru cyfrwng"
 
-#: ../urpmi.update:78
+#: ../urpmi.update:79
 #, 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:96
+#: ../urpmi.update:97
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2678,17 +2724,17 @@ msgstr ""
 "mae'r cofnod i ddiweddaru ar goll\n"
 "(un o %s)\n"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:101
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:101
+#: ../urpmi.update:102
 #, c-format
 msgid "ignoring media %s"
 msgstr "anwybyddu cyfrwng %s"
 
-#: ../urpmi.update:101
+#: ../urpmi.update:102
 #, c-format
 msgid "enabling media %s"
 msgstr "galluogi cyfrwng %s"
@@ -2795,70 +2841,69 @@ msgstr "  --changelog    - cofnod argraffu.\n"
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - crynodeb argraffu.\n"
 
+#: ../urpmq:87
+#, 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
 #, c-format
+msgid ""
+"  --whatrequires-recursive\n"
+"                   - extended reverse search (includes virtual packages).\n"
+msgstr ""
+"  --whatrequires-recursive\n"
+"                  - chwilio nôl  estyndig (yn cynnwys rhith becynnau) \n"
+
+#: ../urpmq:91
+#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - allbwn cyfan a phecyn i'w dynnu\n"
 
-#: ../urpmq:89
+#: ../urpmq:92
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - ymestyn ymholiad i ddibyniaethau pecynnau.\n"
 
-#: ../urpmq:91
+#: ../urpmq:94
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g            - argraffu grwpiau gydag enw hefyd.\n"
 
-#: ../urpmq:92
+#: ../urpmq:95
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy "
 "i bobl.\n"
 
-#: ../urpmq:93
+#: ../urpmq:96
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - rhestri'r ffeiliau mewn pecyn.\n"
 
-#: ../urpmq:94
+#: ../urpmq:97
 #, c-format
-msgid ""
-"  -P             - do not search in provides to find package (default).\n"
-msgstr ""
-"  -P             - peidio chwilio yn provides i ganfod pecyn "
-"(rhagosodedig).\n"
+msgid "  -m             - equivalent to -du\n"
+msgstr "  -m             - yn cyfateb i -du.\n"
 
-#: ../urpmq:95
+#: ../urpmq:98
 #, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - caniatáu i chwilio canfod pecyn.\n"
 
-#: ../urpmq:96
+#: ../urpmq:99
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - argraffu fersiwn a rhyddhad gydag enw hefyd.\n"
 
-#: ../urpmq:97
-#, 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:98
-#, c-format
-msgid ""
-"  -RR            - extended reverse search (includes virtual packages).\n"
-msgstr ""
-"  -RR             - chwilio nôl  estyndig (yn cynnwys rhith becynnau) \n"
-
-#: ../urpmq:99
+#: ../urpmq:100
 #, 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:100
+#: ../urpmq:101
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2867,57 +2912,87 @@ msgstr ""
 "  -u             - tynnu pecyn os oes yna fersiwn mwy diweddar wedi ei "
 "osod.\n"
 
-#: ../urpmq:101
+#: ../urpmq:102
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - gosod chwilio fuzzy (fel --fuzzy).\n"
 
-#: ../urpmq:102
+#: ../urpmq:103
 #, 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:103
+#: ../urpmq:104
 #, 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:178
+#: ../urpmq:179
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
 
-#: ../urpmq:350
+#: ../urpmq:360
 #, c-format
 msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
+msgstr ""
 "dim hdlist ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer pecyn "
 "%s"
-msgstr[1] ""
+
+#: ../urpmq:361
+#, 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:353
+#: ../urpmq:364
 #, c-format
 msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
+msgstr ""
+"dim hdlist ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
+"pecyn %s"
+
+#: ../urpmq:365
+#, c-format
+msgid ""
 "no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
+msgstr ""
 "dim hdlist ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
 "pecynnau %s"
-msgstr[1] ""
 
-#: ../urpmq:405
+#: ../urpmq:416
 #, c-format
 msgid "No filelist found\n"
 msgstr "Heb ganfod filelist\n"
 
-#: ../urpmq:417
+#: ../urpmq:428
 #, c-format
 msgid "No changelog found\n"
 msgstr "Heb ganfod changelog\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+#~ msgstr ""
+#~ "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu (%d MB)"
+
+#~ msgid "Proceed with the installation of the %d package? (%d MB)"
+#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+#~ msgstr[0] "Parhau gyda gosod %d pecyn? (%d MB)"
+#~ msgstr[1] "Parhau gyda gosod %d pecyn? (%d MB)"
+
+#~ msgid "(%d packages, %d MB)"
+#~ msgstr "(%d pecyn, %d MB)"
+
+#~ msgid ""
+#~ "  -P             - do not search in provides to find package (default).\n"
+#~ msgstr ""
+#~ "  -P             - peidio chwilio yn provides i ganfod pecyn "
+#~ "(rhagosodedig).\n"
+
+#~ msgid "  -R             - reverse search to what requires package.\n"
+#~ msgstr "  -R             - chwilio nôl  i'r hyn sydd angen ar becyn.\n"