summaryrefslogtreecommitdiffstats
path: root/po/cy.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/cy.po')
-rw-r--r--po/cy.po1189
1 files changed, 733 insertions, 456 deletions
diff --git a/po/cy.po b/po/cy.po
index 53757544..96025281 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 02:27+0100\n"
+"POT-Creation-Date: 2007-01-09 14:14+0100\n"
"PO-Revision-Date: 2006-12-11 22:24-0000\n"
"Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
"Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -17,7 +17,8 @@ msgstr ""
"X-Poedit-Language: Welsh\n"
"X-Poedit-Country: UK\n"
-#: ../gurpmi:30 ../gurpmi2:62
+#: ../gurpmi:30 ../gurpmi2:63
+#, c-format
msgid "RPM installation"
msgstr "Gosod RPM"
@@ -26,7 +27,8 @@ 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:150 ../gurpmi2:173
+#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#, c-format
msgid "_Ok"
msgstr "_Iawn"
@@ -81,20 +83,23 @@ msgstr ""
"\n"
"Efallai byddai'n well gennych ei gadw. Beth yw eich dewis?"
-#. - buttons
#: ../gurpmi:97
+#, c-format
msgid "_Install"
msgstr "_Gosod"
#: ../gurpmi:98
+#, c-format
msgid "_Save"
msgstr "_Cadw"
-#: ../gurpmi:99 ../gurpmi2:150
+#: ../gurpmi:99 ../gurpmi2:152
+#, c-format
msgid "_Cancel"
msgstr "_Dileu"
#: ../gurpmi:107
+#, c-format
msgid "Choose location to save file"
msgstr "Dewiswch leoliad i gadw'r ffeil"
@@ -104,18 +109,21 @@ msgid "Unknown option %s"
msgstr "Dewis anhysbys %s"
#: ../gurpmi.pm:89
+#, c-format
msgid "No packages specified"
msgstr "Heb enwi pecyn"
#: ../gurpmi2:43
+#, c-format
msgid "Please wait..."
msgstr "Arhoswch..."
#: ../gurpmi2:52
+#, c-format
msgid "Must be root"
msgstr "Rhaid bod yn root"
-#: ../gurpmi2:86
+#: ../gurpmi2:87
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -126,35 +134,42 @@ msgstr ""
"%s\n"
"Parhau beth bynnag?"
-#: ../gurpmi2:110 ../urpmi:618
-msgid "Ok"
-msgstr "Iawn"
-
-#: ../gurpmi2:110
+#: ../gurpmi2:111
+#, c-format
msgid "Warning"
msgstr "Rhybudd"
-#: ../gurpmi2:146
+#: ../gurpmi2:111 ../urpmi:624
+#, c-format
+msgid "Ok"
+msgstr "Iawn"
+
+#: ../gurpmi2:148
+#, c-format
msgid " (to upgrade)"
msgstr "(uwchraddio)"
-#: ../gurpmi2:147
+#: ../gurpmi2:149
+#, c-format
msgid " (to install)"
msgstr "(gosod)"
-#: ../gurpmi2:150
+#: ../gurpmi2:152
+#, c-format
msgid "Package choice"
msgstr "Dewis pecyn"
-#: ../gurpmi2:151 ../urpmi:448
+#: ../gurpmi2:153 ../urpmi:449
+#, c-format
msgid "One of the following packages is needed:"
msgstr "Mae angen un o'r pecynnau canlynol:"
-#: ../gurpmi2:174
+#: ../gurpmi2:176
+#, c-format
msgid "_Abort"
msgstr "_Atal"
-#: ../gurpmi2:194
+#: ../gurpmi2:196
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -165,7 +180,7 @@ msgstr ""
"%s\n"
"Parhau beth bynnag?"
-#: ../gurpmi2:208
+#: ../gurpmi2:210
#, c-format
msgid ""
"To satisfy dependencies, the following %d packages are going to be "
@@ -175,25 +190,27 @@ msgstr ""
"I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod:\n"
"%s\n"
-#: ../gurpmi2:215
+#: ../gurpmi2:217
+#, c-format
msgid "Package installation..."
msgstr "Gosod y pecyn..."
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:219 ../urpmi:608
+#, c-format
msgid "unable to get source packages, aborting"
msgstr "methu estyn pecynnau ffynhonnell, atal"
-#: ../gurpmi2:229 ../urpmi:611
+#: ../gurpmi2:231 ../urpmi:617
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
-#: ../gurpmi2:254
+#: ../gurpmi2:256
#, c-format
msgid "Downloading package `%s'..."
msgstr "Llwytho pecynnau i lawr ' %s'..."
-#: ../gurpmi2:269
+#: ../gurpmi2:271
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -206,8 +223,7 @@ msgstr ""
"\n"
"Hoffech chi barhau gyda'r gosod?"
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:276 ../gurpmi2:334 ../urpmi:677 ../urpmi:805
+#: ../gurpmi2:278 ../gurpmi2:336 ../urpmi:684 ../urpmi:814
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -218,35 +234,38 @@ msgstr ""
"%s\n"
"Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:283 ../urpme:139 ../urpmi:726
+#: ../gurpmi2:285 ../urpme:138 ../urpmi:735
#, c-format
msgid "removing %s"
msgstr "tynnu %s"
-#: ../gurpmi2:289
+#: ../gurpmi2:291
+#, c-format
msgid "Preparing..."
msgstr "Paratoi..."
-#: ../gurpmi2:293
+#: ../gurpmi2:295
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Gosod pecyn `%s' (%s/%s)..."
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:318 ../urpmi:689 ../urpmi:765 ../urpmi:782
+#: ../gurpmi2:320 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#, c-format
msgid "Installation failed"
msgstr "Methodd y gosod"
-#: ../gurpmi2:329
+#: ../gurpmi2:331
+#, c-format
msgid "_Done"
msgstr "_Gorffen"
-#: ../gurpmi2:337
+#: ../gurpmi2:339
+#, c-format
msgid "The package(s) are already installed"
msgstr "Popeth wedi eu gosod eisoes"
-#: ../gurpmi2:339
+#: ../gurpmi2:341
+#, c-format
msgid "Installation finished"
msgstr "Cwblhawyd y gosod"
@@ -260,18 +279,22 @@ msgstr ""
"lle mae [dewisiadau] o\n"
#: ../rpm-find-leaves:16
+#, c-format
msgid " -h|--help - print this help message.\n"
msgstr " -h|--help - argraffu neges cymorth.\n"
#: ../rpm-find-leaves:17
+#, c-format
msgid " --root <path> - use the given root instead of /\n"
msgstr " --root <path> - defnyddio'r root hwn yn lle /\n"
#: ../rpm-find-leaves:18
+#, c-format
msgid " -g [group] - restrict results to specified group.\n"
msgstr " -g [group] - cyfyngu canlyniadau i'r grŵp.\n"
#: ../rpm-find-leaves:19
+#, c-format
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - allbynnu enw llawn rpm (NVRA)\n"
@@ -280,97 +303,113 @@ msgstr " -f - allbynnu enw llawn rpm (NVRA)\n"
msgid " defaults to %s.\n"
msgstr " rhagosodedig yw %s.\n"
-#. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:265
+#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
#: ../rurpmi:18
+#, c-format
msgid "Running urpmi in restricted mode..."
msgstr "Rhedeg urpmi mewn modd cyfyngedig..."
-#: ../urpm.pm:73
+#: ../urpm.pm:93
+#, c-format
msgid "unable to open rpmdb"
msgstr "methu agor rpmdb"
-#: ../urpm.pm:92
+#: ../urpm.pm:112
#, 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:108
+#: ../urpm.pm:128
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "enw ffeil rpm annilys [%s]"
-#: ../urpm.pm:114
+#: ../urpm.pm:134
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "adfer ffeil rpm (%s)..."
-#: ../urpm.pm:116
+#: ../urpm.pm:136
+#, c-format
msgid "...retrieving done"
msgstr ".cwblhau adfer"
-#: ../urpm.pm:119
+#: ../urpm.pm:139
#, c-format
msgid "...retrieving failed: %s"
msgstr "... methodd ail-lwytho: %s"
-#: ../urpm.pm:124
+#: ../urpm.pm:144
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "methu cael mynediad ffeil rpm (%s)"
-#: ../urpm.pm:129
+#: ../urpm.pm:149
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "methu didoli ffeil spec %s [%s]"
-#: ../urpm.pm:139
+#: ../urpm.pm:159
+#, c-format
msgid "unable to register rpm file"
msgstr "methu cofrestr ffeil rpm"
-#: ../urpm.pm:141
+#: ../urpm.pm:161
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Saernïaeth anghydnaws ar gyfer rpm [%s]"
-#: ../urpm.pm:145
+#: ../urpm.pm:165
+#, c-format
msgid "error registering local packages"
msgstr "gwall cofrestru pecynnau lleol"
-#: ../urpm.pm:241
+#: ../urpm.pm:261
+#, 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:101 ../urpm/args.pm:110
+#: ../urpm/args.pm:109 ../urpm/args.pm:118
+#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
-#: ../urpm/args.pm:125 ../urpm/args.pm:236
+#: ../urpm/args.pm:133
+#, c-format
msgid "chroot directory doesn't exist"
msgstr "Nid yw cyfeiriadur chroot yn bodoli"
#: ../urpm/args.pm:242
+#, c-format
msgid "You need to be root to use --use-distrib"
msgstr "Rhaid i chi fod yn wraidd i ddefnyddio --use-distrib"
-#: ../urpm/args.pm:274
+#: ../urpm/args.pm:273
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
-#: ../urpm/args.pm:418
+#: ../urpm/args.pm:423
#, c-format
msgid "Can't use %s without %s"
msgstr "Methu defnyddio %s heb %s"
-#: ../urpm/args.pm:432
+#: ../urpm/args.pm:426
+#, fuzzy, c-format
+msgid "Can't use %s with %s"
+msgstr "Methu defnyddio %s heb %s"
+
+#: ../urpm/args.pm:440
+#, c-format
msgid "Too many arguments\n"
msgstr "Gormod o ymresymiadau\n"
-#: ../urpm/msg.pm:52 ../urpmi:486 ../urpmi:504 ../urpmi:591
+#: ../urpm/msg.pm:52 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#, c-format
msgid "Nn"
msgstr "Nn"
@@ -378,115 +417,17 @@ 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
-#. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:487 ../urpmi:505 ../urpmi:542
-#: ../urpmi:592 ../urpmi:668 ../urpmi:753 ../urpmi.addmedia:133
+#: ../urpm/msg.pm:53 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
+#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#, c-format
msgid "Yy"
msgstr "Yy"
-#: ../urpm/msg.pm:98
+#: ../urpm/msg.pm:104
+#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Dewis gwael, ceisiwch eto\n"
-#: ../urpm/parallel_ka_run.pm:32 ../urpm/parallel_ka_run.pm:127
-#: ../urpm/parallel_ka_run.pm:221
-msgid "mput failed, maybe a node is unreacheable"
-msgstr "methodd mput, efallai bod nod yn anghyraeddadwy"
-
-#: ../urpm/parallel_ka_run.pm:69
-#, c-format
-msgid "node %s has an old version of urpme, please upgrade"
-msgstr "mae gan nod %s hen fersiwn o urpmi, diweddarwch"
-
-#: ../urpm/parallel_ka_run.pm:93 ../urpm/parallel_ka_run.pm:206
-#: ../urpm/parallel_ka_run.pm:236
-msgid "rshp failed, maybe a node is unreacheable"
-msgstr "methodd rshp, efallai bod y nod yn anghyraeddadwy"
-
-#: ../urpm/parallel_ka_run.pm:103 ../urpm/parallel_ssh.pm:108
-#, c-format
-msgid "on node %s"
-msgstr "ar nod %s"
-
-#. - first propagate the synthesis file to all machine.
-#: ../urpm/parallel_ka_run.pm:125
-msgid "Propagating synthesis to nodes..."
-msgstr "Lledaenu synthesis i nodau"
-
-#. - now try an iteration of urpmq.
-#: ../urpm/parallel_ka_run.pm:176
-msgid "Resolving dependencies on nodes..."
-msgstr "Datrys dibyniaethau ar y nodau"
-
-#: ../urpm/parallel_ka_run.pm:219
-msgid "Distributing files to nodes..."
-msgstr "Dosbarthu ffeiliau i nodau"
-
-#: ../urpm/parallel_ka_run.pm:226
-msgid "Verifying if install is possible on nodes..."
-msgstr "Gwirio os yw gosod yn bosib ar nodau"
-
-#: ../urpm/parallel_ka_run.pm:240 ../urpm/parallel_ssh.pm:255
-#, c-format
-msgid "Installation failed on node %s"
-msgstr "Methodd y gosod ar nod %s"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:245 ../urpm/parallel_ssh.pm:260 ../urpmi:819
-msgid "Installation is possible"
-msgstr "Gosod yn bosibl"
-
-#. - continue installation.
-#: ../urpm/parallel_ka_run.pm:250
-msgid "Installing packages on nodes..."
-msgstr "Gosod pecynnau ar nodau..."
-
-#: ../urpm/parallel_ssh.pm:33 ../urpm/parallel_ssh.pm:132
-#: ../urpm/parallel_ssh.pm:236
-#, c-format
-msgid "scp failed on host %s (%d)"
-msgstr "methodd scp ar westai %s (%d)"
-
-#: ../urpm/parallel_ssh.pm:130
-#, c-format
-msgid "Propagating synthesis to %s..."
-msgstr "Lledaenu synthesis i %s..."
-
-#: ../urpm/parallel_ssh.pm:183
-#, c-format
-msgid "Resolving dependencies on %s..."
-msgstr "Datrys dibyniaethau ar %s..."
-
-#: ../urpm/parallel_ssh.pm:213
-#, c-format
-msgid "host %s does not have a good version of urpmi (%d)"
-msgstr "nid oes gan westai %s fersiwn dda o urpmi (%d)"
-
-#: ../urpm/parallel_ssh.pm:229
-#, c-format
-msgid "Distributing files to %s..."
-msgstr "Dosbarthu ffeiliau i %s..."
-
-#: ../urpm/parallel_ssh.pm:243
-#, c-format
-msgid "Verifying if install is possible on %s..."
-msgstr "Gwirio os yw gosod yn bosibl ar %s..."
-
-#: ../urpm/parallel_ssh.pm:267
-#, c-format
-msgid "Performing install on %s..."
-msgstr "Gosod pecyn ar %s..."
-
-#: ../urpm/parallel_ssh.pm:281
-#, c-format
-msgid "Installing %s on %s..."
-msgstr "Gosod %s ar %s..."
-
-#: ../urpm/parallel_ssh.pm:282
-#, c-format
-msgid "Preparing install on %s..."
-msgstr "Paratoi gosod ar %s..."
-
#: ../urpme:39
#, c-format
msgid ""
@@ -503,44 +444,59 @@ msgstr ""
"\n"
"defnydd:\n"
-#: ../urpme:44 ../urpmf:35 ../urpmi:88 ../urpmi.addmedia:45
-#: ../urpmi.recover:33 ../urpmi.removemedia:54 ../urpmi.update:32 ../urpmq:47
+#: ../urpme:44 ../urpmf:35 ../urpmi:84 ../urpmi.addmedia:45
+#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:47
+#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - argraffu neges cymorth.\n"
#: ../urpme:45
+#, c-format
msgid " --auto - automatically select a package in choices.\n"
msgstr " --auto - dewis pecyn yn awtomatig o fewn dewisiadau.\n"
#: ../urpme:46
+#, c-format
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - gwirio os oes modd tynnu'n iawn.\n"
-#: ../urpme:47 ../urpmi:110 ../urpmq:66
+#: ../urpme:47 ../urpmi:109 ../urpmq:66
+#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
msgstr ""
" --force - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
"bodoli.\n"
-#: ../urpme:48 ../urpmi:115 ../urpmq:68
+#: ../urpme:48 ../urpmi:114 ../urpmq:68
+#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
" --parallel - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
-#: ../urpme:49 ../urpmi:148
+#: ../urpme:49 ../urpmi:146
+#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Ailbecynnu'r ffeiliau cyn eu dileu\n"
#: ../urpme:50
+#, c-format
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - defnyddio root arall ar gyfer tynnu rpm.\n"
-#: ../urpme:51
+#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
+#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:70
+#, fuzzy, c-format
+msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
+msgstr " --root - defnyddio root arall ar gyfer gosod rpm.\n"
+
+#: ../urpme:52
+#, c-format
msgid " --noscripts - do not execute package scriptlet(s).\n"
msgstr " --noscripts - peidio gweithredu sgriptledi'r pecyn(au).\n"
-#: ../urpme:52
+#: ../urpme:53
+#, c-format
msgid ""
" --use-distrib - configure urpme on the fly from a distrib tree, useful\n"
" to (un)install a chroot with --root option.\n"
@@ -548,75 +504,80 @@ msgstr ""
" --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
" wrth (ddad)osod chroot gyda dewis --root.\n"
-#: ../urpme:54 ../urpmi:119 ../urpmq:71
+#: ../urpme:55 ../urpmi:119 ../urpmq:73
+#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - defnyddio ffeil synthesis.\n"
-#: ../urpme:55 ../urpmi:120 ../urpmq:72
+#: ../urpme:56 ../urpmi:120 ../urpmq:74
+#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - defnyddio ffeil hdlist.\n"
-#: ../urpme:56 ../urpmi:158 ../urpmi.addmedia:73 ../urpmi.removemedia:59
-#: ../urpmi.update:50 ../urpmq:97
-msgid " -v - verbose mode.\n"
+#: ../urpme:57 ../urpmi:156 ../urpmq:85
+#, fuzzy, c-format
+msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose - modd llafar.\n"
-#: ../urpme:57
+#: ../urpme:58
+#, c-format
msgid " -a - select all packages matching expression.\n"
msgstr " -a - select all packages matching expression.\n"
-#: ../urpme:74
+#: ../urpme:75
+#, c-format
msgid "Only superuser is allowed to remove packages"
msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu pecynnau"
#: ../urpme:106
-msgid "unknown package"
-msgstr "pecyn anhysbys"
-
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:106
+#, c-format
msgid "unknown packages"
msgstr "pecynnau anhysbys"
-#. - Warning : the following message is parsed in urpm::parallel_*
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "pecyn anhysbys"
+
#: ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:118 ../urpmi:522
+#: ../urpme:118 ../urpmi:526
#, c-format
msgid "removing package %s will break your system"
msgstr "bydd tynnu pecynnau %s yn torri'r system"
-#: ../urpme:121
+#: ../urpme:120
+#, c-format
msgid "Nothing to remove"
msgstr "Dim i'w dynnu"
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:126
+#: ../urpme:125
+#, c-format
msgid "Checking to remove the following packages"
msgstr "Ticio i ddileu'r pecynnau canlynol"
-#: ../urpme:133
+#: ../urpme:132
#, 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)"
-#: ../urpme:135 ../urpmi:543 ../urpmi:669 ../urpmi.addmedia:136
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:135
+#: ../urpme:134
#, c-format
msgid "Remove %d packages?"
msgstr "Tynnu pecynnau %d?"
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:157
+#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpme:156
+#, c-format
msgid "Removal failed"
msgstr "Methodd y tynnu"
@@ -637,214 +598,261 @@ msgstr ""
"defnydd: urpmf [dewisiadau] pattern-expression\n"
#: ../urpmf:36
+#, c-format
msgid " --version - print this tool's version number.\n"
msgstr " --version - argraffu rhif fersiwn yr offeryn.\n"
-#: ../urpmf:37 ../urpmi:137 ../urpmq:80
+#: ../urpmf:37 ../urpmi:137 ../urpmq:82
+#, 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:90 ../urpmq:51
+#: ../urpmf:38 ../urpmi:86 ../urpmq:51
+#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
" --excludemedia - peidio defnyddio'r cyfrwng hwn, rhannwyd gyda choma.\n"
#: ../urpmf:39
+#, c-format
msgid ""
" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
" --literal, -l - peidio cydweddu patrymau, defnyddio ymresymiad fel llinyn "
"llythrennedd.\n"
-#: ../urpmf:40 ../urpmi:89 ../urpmq:49
+#: ../urpmf:41 ../urpmi:85 ../urpmq:49
+#, 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:41 ../urpmi:93 ../urpmq:52
+#: ../urpmf:42 ../urpmi:89 ../urpmq:52
+#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
msgstr ""
" --sortmedia - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda "
"choma.\n"
-#: ../urpmf:42 ../urpmi:94 ../urpmq:53
+#: ../urpmf:43 ../urpmi:90 ../urpmq:53
+#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - defnyddio'r synthesis yn lle urpmi db.\n"
-#: ../urpmf:43
+#: ../urpmf:44
+#, c-format
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - peidio argraffu llinellau'r un fath.\n"
-#: ../urpmf:44 ../urpmi:91 ../urpmq:48
+#: ../urpmf:45 ../urpmi:87 ../urpmq:48
+#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - defnyddio cyfrwng diweddaru'n unig.\n"
-#: ../urpmf:45
+#: ../urpmf:46
+#, c-format
msgid " --verbose - verbose mode.\n"
msgstr " --verbose - modd llafar.\n"
-#: ../urpmf:46
+#: ../urpmf:47
+#, c-format
msgid " -i - ignore case distinctions in patterns.\n"
msgstr ""
" -i - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
-#: ../urpmf:47
+#: ../urpmf:48
+#, c-format
msgid " -I - honor case distinctions in patterns (default).\n"
msgstr ""
" -i - cadw gwahaniaeth maint llythrennau ym mhob patrwm "
"(rhagosodiad).\n"
-#: ../urpmf:48
+#: ../urpmf:49
+#, c-format
msgid " -F<str> - change field separator (defaults to ':').\n"
msgstr " -F<str> - newid ymwahanydd maes (arferol i ':').\n"
-#: ../urpmf:49
+#: ../urpmf:50
+#, c-format
msgid "Pattern expressions:\n"
msgstr "Mynegiadau patrymau:\n"
-#: ../urpmf:50
+#: ../urpmf:51
+#, c-format
msgid " text - any text is parsed as a regexp, unless -l is used.\n"
msgstr ""
" text - unrhyw destun wedi ei ddidoli fel regexp, onibai fod -l "
"yn cael ei ddefnyddio.\n"
-#: ../urpmf:51
+#: ../urpmf:52
+#, c-format
msgid " -e - include perl code directly as perl -e.\n"
msgstr " -e - cynnwys perl cod yn union fel perl -e.\n"
-#: ../urpmf:52
+#: ../urpmf:53
+#, c-format
msgid " -a - binary AND operator.\n"
msgstr " -a - gweithredwr deuaidd AND.\n"
-#: ../urpmf:53
+#: ../urpmf:54
+#, c-format
msgid " -o - binary OR operator.\n"
msgstr " -o - gweithredwr deuaidd OR.\n"
-#: ../urpmf:54
+#: ../urpmf:55
+#, c-format
msgid " ! - unary NOT.\n"
msgstr " ! - unaidd NOT.\n"
-#: ../urpmf:55
+#: ../urpmf:56
+#, c-format
msgid " ( ) - left and right parentheses.\n"
msgstr " ( ) - parenthesis de a chwith.\n"
-#: ../urpmf:56
+#: ../urpmf:57
+#, c-format
msgid "List of tags:\n"
msgstr "Rhestr tagiau:\n"
-#: ../urpmf:57
+#: ../urpmf:58
+#, c-format
msgid " --qf - specify a printf-like output format\n"
msgstr " --qf - pennu allbwn fformat printf-aidd\n"
-#: ../urpmf:58
+#: ../urpmf:59
#, c-format
msgid " example: '%%name:%%files'\n"
msgstr " esiampl: '%%enw:%%ffeil'\n"
-#: ../urpmf:59
+#: ../urpmf:60
+#, c-format
msgid " --arch - architecture\n"
msgstr " --arch - saernïaeth\n"
-#: ../urpmf:60
+#: ../urpmf:61
+#, c-format
msgid " --buildhost - build host\n"
msgstr " --buildhost - gwestai'r adeiladedd\n"
-#: ../urpmf:61
+#: ../urpmf:62
+#, c-format
msgid " --buildtime - build time\n"
msgstr " --buildtime - amser adeiladu\n"
-#: ../urpmf:62
+#: ../urpmf:63
+#, c-format
msgid " --conffiles - configuration files\n"
msgstr " --conffiles - ffeiliau ffurfweddiad\n"
-#: ../urpmf:63
+#: ../urpmf:64
+#, c-format
msgid " --conflicts - conflict tags\n"
msgstr " --conflicts - tagiau gwrthdaro\n"
-#: ../urpmf:64
+#: ../urpmf:65
+#, c-format
msgid " --description - package description\n"
msgstr " --description - disgrifiad pecyn\n"
-#: ../urpmf:65
+#: ../urpmf:66
+#, c-format
msgid " --distribution - distribution\n"
msgstr " --distribution - dosbarthiad\n"
-#: ../urpmf:66
+#: ../urpmf:67
+#, c-format
msgid " --epoch - epoch\n"
msgstr " --epoch - cyfnod\n"
-#: ../urpmf:67
+#: ../urpmf:68
+#, c-format
msgid " --filename - filename of the package\n"
msgstr " --filename - enw ffeil y pecyn\n"
-#: ../urpmf:68
+#: ../urpmf:69
+#, c-format
msgid " --files - list of files contained in the package\n"
msgstr " --files - rhestr ffeiliau o fewn y pecyn\n"
-#: ../urpmf:69
+#: ../urpmf:70
+#, c-format
msgid " --group - group\n"
msgstr " --group - grŵp\n"
-#: ../urpmf:70
+#: ../urpmf:71
+#, c-format
msgid " --name - package name\n"
msgstr " --name - enw'r pecyn\n"
-#: ../urpmf:71
+#: ../urpmf:72
+#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr " --obsoletes - tagiau'r hen\n"
-#: ../urpmf:72
+#: ../urpmf:73
+#, c-format
msgid " --packager - packager\n"
msgstr " --packager - pecynydd\n"
-#: ../urpmf:73
+#: ../urpmf:74
+#, c-format
msgid " --provides - provides tags\n"
msgstr " --provides - tag darparu\n"
-#: ../urpmf:74
+#: ../urpmf:75
+#, c-format
msgid " --requires - requires tags\n"
msgstr " --requires - tagiau angenrhaid\n"
-#: ../urpmf:75
+#: ../urpmf:76
+#, c-format
msgid " --size - installed size\n"
msgstr " --size - maint wedi gosod\n"
-#: ../urpmf:76
+#: ../urpmf:77
+#, c-format
msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - enw rpm ffynhonnell\n"
-#: ../urpmf:77
+#: ../urpmf:78
+#, c-format
msgid " --summary - summary\n"
msgstr " --summary - crynodeb\n"
-#: ../urpmf:78
+#: ../urpmf:79
+#, c-format
msgid " --url - url\n"
msgstr " --url - url\n"
-#: ../urpmf:79
+#: ../urpmf:80
+#, c-format
msgid " --vendor - vendor\n"
msgstr " --vendor - gwerthwr\n"
-#: ../urpmf:80
+#: ../urpmf:81
+#, c-format
msgid " -m - the media in which the package was found\n"
msgstr " -m - y cyfrwng lle cafwyd y pecyn\n"
-#: ../urpmf:81 ../urpmq:86
+#: ../urpmf:82 ../urpmq:89
+#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
-#: ../urpmf:136
+#: ../urpmf:137
+#, 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:185 ../urpmi:256 ../urpmq:132
+#: ../urpmf:186 ../urpmi:254 ../urpmq:134
#, c-format
msgid "using specific environment on %s\n"
msgstr "ddefnyddio amgylchedd penodol ar %s\n"
-#: ../urpmf:225
+#: ../urpmf:226
+#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
@@ -852,11 +860,12 @@ msgstr ""
"Sylw: gan nad oedd unrhyw gyfrwng chwiliwyd yn defnyddio hdlists, methodd "
"urpmf â chynnig canlyniad\n"
-#: ../urpmf:226
+#: ../urpmf:227
+#, 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:83
+#: ../urpmi:79
#, c-format
msgid ""
"urpmi version %s\n"
@@ -872,14 +881,16 @@ msgstr ""
"\n"
"defnydd:\n"
-#: ../urpmi:92
+#: ../urpmi:88
+#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau "
"gofynnwyd.\n"
-#: ../urpmi:95
+#: ../urpmi:91
+#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
"questions.\n"
@@ -887,23 +898,42 @@ msgstr ""
" --auto - modd anrhyngweithiol, derbyn atebion rhagosodedig i "
"gwestiynau.\n"
-#: ../urpmi:96 ../urpmq:54
+#: ../urpmi:92 ../urpmq:54
+#, 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:97
+#: ../urpmi:93
+#, fuzzy, c-format
+msgid " --auto-update - update media then upgrade the system.\n"
+msgstr " --auto-select - dewis pecynnau'n awtomatig i uwchraddio'r system.\n"
+
+#: ../urpmi:94
+#, fuzzy, c-format
+msgid " --no-md5sum - disable MD5SUM file checking.\n"
+msgstr " --no-md5sum - analluogi gwirio ffeil MD5SUM.\n"
+
+#: ../urpmi:95
+#, fuzzy, c-format
+msgid " --force-key - force update of gpg key.\n"
+msgstr " --force-key - gorfodi diweddaru allwedd gpg.\n"
+
+#: ../urpmi:96
+#, 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:98
+#: ../urpmi:97
+#, 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:99 ../urpmq:56
+#: ../urpmi:98 ../urpmq:56
+#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
" packages that lead to removals.\n"
@@ -911,7 +941,7 @@ msgstr ""
" --keep - cadw'r pecynnau presennol os yn bosibl, gwrthod\n"
" pecynnau sy'n arwain at dynnu.\n"
-#: ../urpmi:101
+#: ../urpmi:100
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -923,33 +953,39 @@ msgstr ""
" eu gosod neu eu uwchraddio\n"
" rhagosodiad yw %d.\n"
-#: ../urpmi:104
+#: ../urpmi:103
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - hyd drosglwyddiad byr, rhagosodiad yw %d.\n"
-#: ../urpmi:105
+#: ../urpmi:104
+#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - mynnu chwiliad bras.\n"
-#: ../urpmi:106
+#: ../urpmi:105
+#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - pecyn nesaf yn becyn ffynhonnell.\n"
-#: ../urpmi:107
+#: ../urpmi:106
+#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
-#: ../urpmi:108
+#: ../urpmi:107
+#, 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:109
+#: ../urpmi:108
+#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - peidio glanhau rpm o'r storfa.\n"
-#: ../urpmi:111
+#: ../urpmi:110
+#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
" dependencies checking.\n"
@@ -957,7 +993,8 @@ msgstr ""
" --allow-nodeps - caniatáu gofyn i ddefnyddiwr i osod pecynnau heb\n"
" wirio dibyniaethau.\n"
-#: ../urpmi:113
+#: ../urpmi:112
+#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
" dependencies checking and integrity.\n"
@@ -965,11 +1002,13 @@ msgstr ""
" --allow-force - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n"
" wirio dibyniaethau na'u cyfanrwydd.\n"
-#: ../urpmi:116
+#: ../urpmi:115 ../urpmq:69
+#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - defnyddio root arall ar gyfer gosod rpm.\n"
#: ../urpmi:117
+#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
" to install a chroot with --root option.\n"
@@ -977,39 +1016,48 @@ msgstr ""
" --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
" wrth osod chroot gyda dewis o --root.\n"
-#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:121 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:75
+#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - defnyddio wget i estyn ffeiliau pell.\n"
-#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:76
+#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - defnyddio curl i estyn ffeiliau pell.\n"
-#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:75
+#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:77
+#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prozilla - defnyddio prozilla i estyn ffeiliau pell.\n"
#: ../urpmi:124
+#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - dewis ychwanegol wrth ddefnyddio curl\n"
#: ../urpmi:125
+#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options- dewis ychwanegol wrth ddefnyddio rsync\n"
#: ../urpmi:126
+#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - dewis ychwanegol wrth ddefnyddio wget\n"
#: ../urpmi:127
+#, 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:49 ../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
+#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
" (--no-resume disables it, default is disabled).\n"
@@ -1017,7 +1065,8 @@ msgstr ""
" --verify-rpm - gwirio llofnod rpm cyn gosod\n"
" (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
-#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:131 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:78
+#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
" to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1025,7 +1074,8 @@ msgstr ""
" --proxy - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
" rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
-#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:133 ../urpmi.addmedia:52 ../urpmi.update:39 ../urpmq:80
+#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
" authentication (format is <user:password>).\n"
@@ -1034,6 +1084,7 @@ msgstr ""
" dilysiad dirprwy (fformat yw <user:password>).\n"
#: ../urpmi:135
+#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
" next arg.\n"
@@ -1042,6 +1093,7 @@ msgstr ""
" yr arg. nesaf\n"
#: ../urpmi:138
+#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disables it, default is enabled).\n"
@@ -1050,44 +1102,44 @@ msgstr ""
" (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig).\n"
#: ../urpmi:140
+#, 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
+#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - eithrio llwybr wedi ei wahanu a chollnod.\n"
#: ../urpmi:142
+#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - eithrio ffeiliau docs.\n"
#: ../urpmi:143
+#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr " --ignoresize - peidio gwirio maint ar ddisg cyn gosod.\n"
#: ../urpmi:144
+#, 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
+#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - peidio gweithredu sgripledi pecyn(au)\n"
-#: ../urpmi:146 ../urpmi.addmedia:67 ../urpmi.update:42
-msgid " --no-md5sum - disable MD5SUM file checking.\n"
-msgstr " --no-md5sum - analluogi gwirio ffeil MD5SUM.\n"
-
-#: ../urpmi:147 ../urpmi.update:43
-msgid " --force-key - force update of gpg key.\n"
-msgstr " --force-key - gorfodi diweddaru allwedd gpg.\n"
-
-#: ../urpmi:149
+#: ../urpmi:147
+#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pecynnau dylid osgoi eu gosod.\n"
-#: ../urpmi:150
+#: ../urpmi:148
+#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
@@ -1096,43 +1148,51 @@ msgstr ""
"ddewis\n"
" na'r rhagosodiad.\n"
-#: ../urpmi:152
+#: ../urpmi:150
+#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - peidio cloi db rpm.\n"
-#: ../urpmi:153
+#: ../urpmi:151
+#, 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:154 ../urpmq:83
+#: ../urpmi:152 ../urpmq:86
+#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - dewis pob cydweddiad ar y llinell gorchymyn.\n"
-#: ../urpmi:155
+#: ../urpmi:153
+#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - caniatáu i chwilio canfod pecyn.\n"
-#: ../urpmi:156
+#: ../urpmi:154
+#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - peidio chwilio yn provides i ganfod pecyn.\n"
-#: ../urpmi:157 ../urpmi.addmedia:72 ../urpmi.removemedia:58
-#: ../urpmi.update:49
-msgid " -q - quiet mode.\n"
+#: ../urpmi:155
+#, fuzzy, c-format
+msgid " --quiet, -q - quiet mode.\n"
msgstr " -q - modd distaw.\n"
-#: ../urpmi:159
+#: ../urpmi:157
+#, 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:188
+#: ../urpmi:186
+#, 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:195
+#: ../urpmi:193
+#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
"along with --bug.\n"
@@ -1141,11 +1201,12 @@ msgstr ""
"arferol\n"
"ynghyd a --bug.\n"
-#: ../urpmi:222
+#: ../urpmi:220
+#, 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:245
+#: ../urpmi:243
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -1154,21 +1215,22 @@ msgstr ""
"Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
"adroddiad gwall neu ei ddileu."
-#: ../urpmi:246
+#: ../urpmi:244
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
-#: ../urpmi:249
+#: ../urpmi:247
+#, c-format
msgid "Copying failed"
msgstr "Methodd y copïo"
-#: ../urpmi:255
+#: ../urpmi:253
#, c-format
msgid "Environment directory %s does not exist"
msgstr "Nid yw cyfeiriadur amgylchedd %s yn bodoli"
-#: ../urpmi:273
+#: ../urpmi:271
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -1177,52 +1239,59 @@ msgstr ""
"Gwall: %s i weld wedi ei osod fel darllen yn unig.\n"
"Defnydd --allow-force gorfodaeth i orfodi gweithred."
-#. - For translators : there are several media here
#: ../urpmi:364
+#, c-format
msgid "Updating media...\n"
msgstr "Diweddaru cyfrwng...\n"
-#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:439
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (uwchraddio)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:441
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (uwchraddio)"
-#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:442
+#: ../urpmi:443
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (gosod)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:444
+#: ../urpmi:445
#, c-format
msgid "%s (to install)"
msgstr "%s (gosod)"
-#: ../urpmi:451
+#: ../urpmi:452
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Beth yw eich dewis? (1-%d)"
-#: ../urpmi:481
-#, c-format
+#: ../urpmi:482
+#, fuzzy, 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 ""
+msgstr[0] ""
+"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"
+msgstr[1] ""
"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:489 ../urpmi:507
+#: ../urpmi:492 ../urpmi:511
+#, c-format
msgid ""
"\n"
"Continue installation anyway?"
@@ -1230,58 +1299,80 @@ msgstr ""
"\n"
"Parhau i osod beth bynnag?"
-#: ../urpmi:489 ../urpmi:507 ../urpmi:593 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
-#: ../urpmi:500
-#, c-format
+#: ../urpmi:503
+#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s"
-msgstr ""
+msgid_plural ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr[0] ""
+"Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
+"%s"
+msgstr[1] ""
"Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
"%s"
-#: ../urpmi:530
-#, c-format
+#: ../urpmi:534
+#, fuzzy, 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 ""
+msgstr[0] ""
+"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"
+msgstr[1] ""
"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:535
-#, c-format
+#: ../urpmi:541
+#, fuzzy, 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 ""
+msgstr[0] ""
+"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
+"%s"
+msgstr[1] ""
"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
"%s"
-#: ../urpmi:537
+#: ../urpmi:544
+#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(prawf yn unig, ni fydd yn cael ei ddadosod)"
-#: ../urpmi:572 ../urpmi:584
+#: ../urpmi:578 ../urpmi:589
+#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed"
-msgstr "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod"
+msgid_plural ""
+"To satisfy dependencies, the following package is going to be installed"
+msgstr[0] "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod"
+msgstr[1] "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod"
-#: ../urpmi:573 ../urpmi:585
-msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod"
-
-#: ../urpmi:574
+#: ../urpmi:580
#, c-format
msgid "(%d packages, %d MB)"
msgstr "(%d pecyn, %d MB)"
-#: ../urpmi:580
+#: ../urpmi:586
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1290,88 +1381,106 @@ msgstr ""
"Rhaid eich bod yn wraidd i osod y dibyniaethau canlynol:\n"
"%s\n"
-#: ../urpmi:587
+#: ../urpmi:592
+#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(prawf yn unig, ni fydd yn cael ei osod)"
-#: ../urpmi:589
-#, c-format
-msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr "Parhau gyda gosod %d pecyn? (%d MB)"
+#: ../urpmi:594
+#, fuzzy, 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)"
-#: ../urpmi:612
+#: ../urpmi:618
+#, c-format
msgid "Press Enter when ready..."
msgstr "Pwyso Enter pan yn barod..."
-#: ../urpmi:618
+#: ../urpmi:624
+#, c-format
msgid "Cancel"
msgstr "Dileu"
-#: ../urpmi:660
-msgid "The following packages have bad signatures"
-msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
+#: ../urpmi:666
+#, fuzzy, c-format
+msgid "The following package has bad signature"
+msgid_plural "The following packages have bad signatures"
+msgstr[0] "Mae gan y pecynnau canlynol lofnod gwallus"
+msgstr[1] "Mae gan y pecynnau canlynol lofnod gwallus"
-#: ../urpmi:661
+#: ../urpmi:668
+#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ydych chi am barhau gosod?"
-#: ../urpmi:708
+#: ../urpmi:715
#, c-format
msgid "distributing %s"
msgstr "dosbarthu %s"
-#. - there's a common prefix, simplify message
-#: ../urpmi:721
+#: ../urpmi:729
#, c-format
msgid "installing %s from %s"
msgstr "gosod %s o %s"
-#: ../urpmi:723
+#: ../urpmi:731
#, c-format
msgid "installing %s"
msgstr "gosod %s"
-#. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpmi:747
+#: ../urpmi:756
+#, c-format
msgid "Installation failed:"
msgstr "Methodd y gosod:"
-#: ../urpmi:754
+#: ../urpmi:763
+#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
-#: ../urpmi:771
+#: ../urpmi:780
+#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Mwy o orfodaeth gyda'r gosod? (--force)? (y/N)"
-#: ../urpmi:810
+#: ../urpmi:819
#, c-format
msgid "%d installation transactions failed"
msgstr "methodd trosglwyddiad gosod %d"
-#: ../urpmi:824
-msgid "Packages are up to date"
-msgstr "Mae'r pecynnau'n rhai diweddaraf"
-
-#: ../urpmi:827
+#: ../urpmi:828
#, c-format
-msgid "Packages %s are already installed"
-msgstr "Pecynnau %s wedi eu gosod eisoes"
+msgid "Installation is possible"
+msgstr "Gosod yn bosibl"
-#: ../urpmi:828
+#: ../urpmi:833
#, c-format
+msgid "Packages are up to date"
+msgstr "Mae'r pecynnau'n rhai diweddaraf"
+
+#: ../urpmi:840
+#, fuzzy, c-format
msgid "Package %s is already installed"
-msgstr "Pecyn %s wedi ei osod eisoes"
+msgid_plural "Packages %s are already installed"
+msgstr[0] "Pecyn %s wedi ei osod eisoes"
+msgstr[1] "Pecyn %s wedi ei osod eisoes"
-#: ../urpmi:847
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Package %s can not be installed"
+msgid_plural "Packages %s can not be installed"
+msgstr[0] "Pecynnau %s wedi eu gosod eisoes"
+msgstr[1] "Pecynnau %s wedi eu gosod eisoes"
+
+#: ../urpmi:863
+#, c-format
msgid "restarting urpmi"
msgstr "ailgychwyn urpmi"
-#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
-#. Translator: and 'removable:' must not be translated!
-#. Translator: neither the ``with''.
-#. Translator: only what is between <brackets> can be translated.
#: ../urpmi.addmedia:36
+#, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -1394,26 +1503,34 @@ msgstr ""
"a [options] o\n"
#: ../urpmi.addmedia:54
+#, c-format
msgid " --update - create an update medium.\n"
msgstr " --update - defnyddio cyfrwng diweddaru.\n"
#: ../urpmi.addmedia:55
-msgid " --probe-synthesis - try to find and use synthesis file.\n"
-msgstr " --probe-synthesis - ceisio canfod a defnyddio ffeil synthesis.\n"
+#, fuzzy, c-format
+msgid " --probe-synthesis - use synthesis file.\n"
+msgstr " --probe-synthesis - defnyddio ffeil synthesis.\n"
-#: ../urpmi.addmedia:56
-msgid " --probe-hdlist - try to find and use hdlist file.\n"
-msgstr " --probe-hdlist - ceisio canfod a defnyddio ffeil hdlist.\n"
+#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
+#, fuzzy, c-format
+msgid " --probe-hdlist - use hdlist file.\n"
+msgstr " --probe-hdlist - defnyddio ffeil hdlist.\n"
#: ../urpmi.addmedia:57
-msgid ""
-" --no-probe - do not try to find any synthesis or\n"
-" hdlist file.\n"
+#, c-format
+msgid " --probe-rpms - use rpm files (instead of synthesis/hdlist).\n"
+msgstr ""
+
+#: ../urpmi.addmedia:59
+#, fuzzy, c-format
+msgid " --no-probe - do not try to find any synthesis or hdlist file.\n"
msgstr ""
" --no-probe - peidio ceisio canfod unrhyw synthesis neu\n"
" ffeil hdlist.\n"
-#: ../urpmi.addmedia:59
+#: ../urpmi.addmedia:61
+#, c-format
msgid ""
" --distrib - automatically create all media from an installation\n"
" medium.\n"
@@ -1421,16 +1538,18 @@ msgstr ""
" --distrib - creu yn awtomatig yr holl gyfrwng o gyfrwng\n"
" gosod\n"
-#: ../urpmi.addmedia:61
+#: ../urpmi.addmedia:63
+#, c-format
msgid " --interactive - with --distrib, ask confirmation for each media\n"
msgstr ""
" --rhyngweithiol - gyda --distrib, gofyn cadarnhad gyda phob cyfrwng\n"
-#: ../urpmi.addmedia:62
+#: ../urpmi.addmedia:64
+#, c-format
msgid " --all-media - with --distrib, add every listed media\n"
msgstr " --all-media - gyda --distrib, rhestri'r holl gyfrwng ar gael.\n"
-#: ../urpmi.addmedia:63
+#: ../urpmi.addmedia:65
#, c-format
msgid ""
" --from - use specified url for list of mirrors, the default is\n"
@@ -1440,7 +1559,8 @@ msgstr ""
"rhagosodedig yw\n"
" %s\n"
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:67
+#, c-format
msgid ""
" --virtual - create virtual media wich are always up-to-date,\n"
" only file:// protocol is allowed.\n"
@@ -1448,47 +1568,68 @@ msgstr ""
" --virtual - creu cyfrwng rhithiol sydd wedi ei ddiweddaru,\n"
" dom ond protocol file:// sy'n cael ei ganiatáu.\n"
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69 ../urpmi.update:42
+#, c-format
+msgid " --no-md5sum - disable MD5SUM file checking.\n"
+msgstr " --no-md5sum - analluogi gwirio ffeil MD5SUM.\n"
+
+#: ../urpmi.addmedia:70
+#, c-format
msgid " --nopubkey - don't import pubkey of added media\n"
msgstr " --nopubkey - peidio mewnforio pubkey y cyfrwng ychwanegwyd\n"
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:71
+#, c-format
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:70 ../urpmi.removemedia:56 ../urpmi.update:47
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - glanhau penawdau yng nghyfeiriadur y storfa.\n"
-#: ../urpmi.addmedia:71 ../urpmi.update:48
-msgid " -f - force generation of hdlist files.\n"
-msgstr " -f - gorfodi cynhyrchu ffeiliau hdlist\n"
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#, c-format
+msgid " -q - quiet mode.\n"
+msgstr " -q - modd distaw.\n"
-#: ../urpmi.addmedia:85
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#, c-format
+msgid " -v - verbose mode.\n"
+msgstr " --verbose - modd llafar.\n"
+
+#: ../urpmi.addmedia:86
#, c-format
msgid "unable to update medium \"%s\"\n"
msgstr "methu diweddaru cyfrwng \"%s\"\n"
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:115
+#, c-format
+msgid "bad <url> (for local directory, the path must be absolute)\n"
+msgstr ""
+
+#: ../urpmi.addmedia:118
+#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Dim ond uwch ddefnyddiwr sy'n cael ychwanegu cyfrwng"
-#: ../urpmi.addmedia:120
-#, c-format
-msgid "Will create config file [%s]"
+#: ../urpmi.addmedia:121
+#, fuzzy, c-format
+msgid "creating config file [%s]"
msgstr "Yn creu ffeil config (%s)"
-#: ../urpmi.addmedia:121
+#: ../urpmi.addmedia:122
#, c-format
msgid "Can't create config file [%s]"
msgstr "Methu creu ffeil Config (%s)"
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:129
+#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "dim angen rhoi <llwybr perthynnol hdlist> gyda --distrib"
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:137
#, c-format
msgid ""
"\n"
@@ -1497,16 +1638,17 @@ msgstr ""
"\n"
"Hoffech chi ychwanegu cyfrwng '%s'"
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:166
+#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<llwybr perthynnol hdlist> ar goll\n"
-#: ../urpmi.addmedia:167
-msgid "`with' missing for network media\n"
-msgstr "`with' ar goll ar gyfer cyfrwng rhwydwaith\n"
+#: ../urpmi.addmedia:169
+#, fuzzy, c-format
+msgid "Can't use %s with remote medium"
+msgstr "Methu defnyddio %s heb %s"
-#. - check creation of media
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:190
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "methu creu cyfrwng \"%s\"\n"
@@ -1528,28 +1670,34 @@ msgstr ""
"defnydd:\n"
#: ../urpmi.recover:34
+#, c-format
msgid " --checkpoint - set repackaging start now\n"
msgstr " --checkpoint - gosod cychwyn ailbacio nawr\n"
#: ../urpmi.recover:35
+#, c-format
msgid " --noclean - don't clean repackage directory on checkpoint\n"
msgstr " --noclean - peidio glanhau rpm ar checkpoint\n"
-#: ../urpmi.recover:36
+#: ../urpmi.recover:37
+#, c-format
msgid ""
" --list - list transactions since provided date/duration argument\n"
msgstr ""
" --list - rhestri trafodion ers darparu ymresymiad dyddiad hyd\n"
-#: ../urpmi.recover:37
+#: ../urpmi.recover:38
+#, c-format
msgid " --list-all - list all transactions in rpmdb (long)\n"
msgstr " --list-all - rhestri'r holl drafodion yn rpmdb (hir)\n"
-#: ../urpmi.recover:38
+#: ../urpmi.recover:39
+#, c-format
msgid " --list-safe - list transactions since checkpoint\n"
msgstr " --list-safe - rhestri'r holl drafodion ers y pwynt gwirio\n"
-#: ../urpmi.recover:39
+#: ../urpmi.recover:40
+#, c-format
msgid ""
" --rollback - rollback until specified date,\n"
" or rollback the specified number of transactions\n"
@@ -1557,118 +1705,121 @@ msgstr ""
" --rollback - mynd yn ôl i'r dyddiad penodol,\n"
" neu nôl y nifer o drafodion penodwyd\n"
-#: ../urpmi.recover:41
+#: ../urpmi.recover:42
+#, c-format
msgid " --disable - turn off repackaging\n"
msgstr " --disable - diffodd ailbecynnu\n"
-#: ../urpmi.recover:56
+#: ../urpmi.recover:57
#, c-format
msgid "Invalid date or duration [%s]\n"
msgstr "Dyddiad neu hyd annilys [%s]\n"
-#: ../urpmi.recover:64
+#: ../urpmi.recover:65
+#, c-format
msgid "Repackage directory not defined\n"
msgstr "Heb ddiffinio cyfeiriadur ailbecynnu\n"
-#: ../urpmi.recover:67
+#: ../urpmi.recover:68
#, c-format
msgid "Can't write to repackage directory [%s]\n"
msgstr "Methu ysgrifennu i gyfeiriadur ailbacio [%s]\n"
-#: ../urpmi.recover:69
+#: ../urpmi.recover:70
#, c-format
msgid "Cleaning up repackage directory [%s]...\n"
msgstr "Glanhau cyfeiriadur ailbacio [%s]...\n"
-#: ../urpmi.recover:71
+#: ../urpmi.recover:72
#, c-format
msgid "%d files removed\n"
msgstr "Tynnwyd %d pecyn\n"
-#: ../urpmi.recover:81
+#: ../urpmi.recover:82
#, c-format
msgid "Spurious command-line arguments [%s]\n"
msgstr "Ymresymiadau llinell orchymyn annilys [%s]\n"
-#: ../urpmi.recover:83
+#: ../urpmi.recover:84
+#, c-format
msgid "You can't specify --checkpoint and --rollback at the same time\n"
msgstr "Methu pennu --checkpoint a --rollback ar yr un pryd\n"
-#: ../urpmi.recover:85
+#: ../urpmi.recover:86
+#, c-format
msgid "You can't specify --checkpoint and --list at the same time\n"
msgstr "Methu pennu --checkpoint a --list ar yr un pryd\n"
-#: ../urpmi.recover:87
+#: ../urpmi.recover:88
+#, c-format
msgid "You can't specify --rollback and --list at the same time\n"
msgstr "Methu pennu --rollback a --list ar yr un pryd\n"
-#: ../urpmi.recover:89
+#: ../urpmi.recover:90
+#, c-format
msgid "You can't specify --disable along with another option"
msgstr "Methu pennu --disable gyda dewis arall"
-#: ../urpmi.recover:114
+#: ../urpmi.recover:115
#, c-format
msgid "No transaction found since %s\n"
msgstr "Dim trafodion ers %s\n"
-#. - check we're running as root
-#: ../urpmi.recover:129
+#: ../urpmi.recover:130
+#, c-format
msgid "You must be superuser to do this"
msgstr "Rhaid bod yn uwch-ddefnyddiwr i wneud hyn"
-#. - write rpm config file
-#: ../urpmi.recover:142 ../urpmi.recover:208
+#: ../urpmi.recover:143 ../urpmi.recover:209
#, c-format
msgid "Writing rpm macros file [%s]...\n"
msgstr "Ysgrifennu ffeil macros rpm [%s]...\n"
-#: ../urpmi.recover:184
+#: ../urpmi.recover:185
+#, c-format
msgid "No rollback date found\n"
msgstr "Heb ganfod dyddiad rholio nôl\n"
-#: ../urpmi.recover:187
+#: ../urpmi.recover:188
#, c-format
msgid "Rollback until %s...\n"
msgstr "Rholio nôl hyd %s...\n"
-#: ../urpmi.recover:194
+#: ../urpmi.recover:195
+#, c-format
msgid "Disabling repackaging\n"
msgstr "Anablu ailbecynnu\n"
-#: ../urpmi.removemedia:52
+#: ../urpmi.removemedia:38
+#, fuzzy, c-format
msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
"usage: urpmi.removemedia [-a] <name> ...\n"
"lle mai <name> yw'r enw cyfrwng i'w dynnu.\n"
-#: ../urpmi.removemedia:55
+#: ../urpmi.removemedia:41
+#, c-format
msgid " -a - select all media.\n"
msgstr " -a - dewis pob cyfrwng.\n"
-#: ../urpmi.removemedia:57
+#: ../urpmi.removemedia:43
+#, c-format
msgid " -y - fuzzy match on media names.\n"
msgstr " -y - cydweddiad bras enwau cyfryngau\n"
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:65
#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"dewisiadau anhysbys '%s'\n"
-
-#: ../urpmi.removemedia:70
msgid "Only superuser is allowed to remove media"
msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu cyfrwng"
-#: ../urpmi.removemedia:81
+#: ../urpmi.removemedia:78
+#, 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:83
+#: ../urpmi.removemedia:84
#, c-format
msgid ""
"the entry to remove is missing\n"
@@ -1678,6 +1829,7 @@ msgstr ""
"(un o %s)\n"
#: ../urpmi.update:30
+#, c-format
msgid ""
"usage: urpmi.update [options] <name> ...\n"
"where <name> is a medium name to update.\n"
@@ -1686,32 +1838,48 @@ msgstr ""
"lle mai <name> yw'r enw cyfrwng i'w dynnu.\n"
#: ../urpmi.update:41
+#, c-format
msgid " --update - update only update media.\n"
msgstr " --update - defnyddio cyfrwng diweddaru'n unig.\n"
+#: ../urpmi.update:43
+#, c-format
+msgid " --force-key - force update of gpg key.\n"
+msgstr " --force-key - gorfodi diweddaru allwedd gpg.\n"
+
#: ../urpmi.update:44
+#, c-format
msgid " --ignore - don't update, mark the media as ignored.\n"
msgstr ""
" --norebuild - peidio diweddaru, marcio'r cyfrwng wedi ei anwybyddu.\n"
#: ../urpmi.update:45
+#, c-format
msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr ""
" --no-ignore - peidiwch diweddaru, marciwch y cyfrwng wedi ei alluogi.\n"
-#: ../urpmi.update:46
+#: ../urpmi.update:47
+#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - dewis pob cyfrwng ansymudadwy.\n"
-#: ../urpmi.update:69
+#: ../urpmi.update:49
+#, c-format
+msgid " -f - force generation of hdlist files.\n"
+msgstr " -f - gorfodi cynhyrchu ffeiliau hdlist\n"
+
+#: ../urpmi.update:70
+#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Dim ond uwch ddefnyddiwr sy'n cael diweddaru cyfrwng"
-#: ../urpmi.update:77
+#: ../urpmi.update:78
+#, 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:95
+#: ../urpmi.update:96
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -1720,21 +1888,21 @@ msgstr ""
"mae'r cofnod i ddiweddaru ar goll\n"
"(un o %s)\n"
-#: ../urpmi.update:99
+#: ../urpmi.update:100
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:100
-#, c-format
-msgid "enabling media %s"
-msgstr "galluogi cyfrwng %s"
-
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "ignoring media %s"
msgstr "anwybyddu cyfrwng %s"
+#: ../urpmi.update:101
+#, c-format
+msgid "enabling media %s"
+msgstr "galluogi cyfrwng %s"
+
#: ../urpmq:42
#, c-format
msgid ""
@@ -1752,6 +1920,7 @@ msgstr ""
"defnydd:\n"
#: ../urpmq:50
+#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
@@ -1760,31 +1929,38 @@ msgstr ""
"gofynnwyd (neu diweddarwyd).\n"
#: ../urpmq:55
+#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - mynnu chwiliad fuzzy (fel -y).\n"
#: ../urpmq:58
+#, c-format
msgid " --list - list available packages.\n"
msgstr " --list - rhestri'r holl gyfrwng ar gael.\n"
#: ../urpmq:59
+#, c-format
msgid " --list-media - list available media.\n"
msgstr " --list-media - rhestri'r holl gyfrwng ar gael.\n"
#: ../urpmq:60
+#, c-format
msgid " --list-url - list available media and their url.\n"
msgstr " --list-url - rhestri'r holl gyfrwng ar gael.\n"
#: ../urpmq:61
+#, 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:62
+#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
msgstr " --list-aliases - rhestr ar gael ar gyfer enwau paralel.\n"
#: ../urpmq:63
+#, c-format
msgid ""
" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
@@ -1792,22 +1968,26 @@ msgstr ""
"addmedia.\n"
#: ../urpmq:64
+#, 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:65
+#, 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:67
+#, 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:69
+#: ../urpmq:71
+#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree.\n"
" This permit to querying a distro.\n"
@@ -1815,67 +1995,81 @@ msgstr ""
" --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib.\n"
" Mae hyn yn caniatáu ymholi mewn dosbarthiad.\n"
-#: ../urpmq:81
+#: ../urpmq:83
+#, c-format
msgid " --changelog - print changelog.\n"
msgstr " --changelog - cofnod argraffu.\n"
-#: ../urpmq:82
+#: ../urpmq:84
+#, c-format
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - crynodeb argraffu.\n"
-#: ../urpmq:84
+#: ../urpmq:87
+#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - allbwn cyfan a phecyn i'w dynnu\n"
-#: ../urpmq:85
+#: ../urpmq:88
+#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - ymestyn ymholiad i ddibyniaethau pecynnau.\n"
-#: ../urpmq:87
+#: ../urpmq:90
+#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - argraffu grwpiau gydag enw hefyd.\n"
-#: ../urpmq:88
+#: ../urpmq:91
+#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy "
"i bobl.\n"
-#: ../urpmq:89
+#: ../urpmq:92
+#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - rhestri'r ffeiliau mewn pecyn.\n"
-#: ../urpmq:90
+#: ../urpmq:93
+#, 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"
-#: ../urpmq:91
+#: ../urpmq:94
+#, c-format
msgid " -p - search in provides to find package.\n"
msgstr " -p - caniatáu i chwilio canfod pecyn.\n"
-#: ../urpmq:92
+#: ../urpmq:95
+#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - argraffu fersiwn a rhyddhad gydag enw hefyd.\n"
-#: ../urpmq:93
+#: ../urpmq:96
+#, 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:94
+#: ../urpmq:97
+#, c-format
msgid ""
" -RR - extended reverse search (includes virtual packages).\n"
msgstr ""
" -RR - chwilio nôl estyndig (yn cynnwys rhith becynnau) \n"
-#: ../urpmq:95
+#: ../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:96
+#: ../urpmq:99
+#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
@@ -1883,35 +2077,118 @@ msgstr ""
" -u - tynnu pecyn os oes yna fersiwn mwy diweddar wedi ei "
"osod.\n"
-#: ../urpmq:98
+#: ../urpmq:100
+#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - gosod chwilio fuzzy (fel --fuzzy).\n"
-#: ../urpmq:99
+#: ../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:100
+#: ../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:176
+#: ../urpmq:177
+#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
-#: ../urpmq:332
+#: ../urpmq:333
#, c-format
msgid "skipping media %s: no hdlist"
msgstr "hepgor cyfrwng %s: dim hdliist"
-#: ../urpmq:405
+#: ../urpmq:406
+#, c-format
msgid "No filelist found\n"
msgstr "Heb ganfod filelist\n"
-#: ../urpmq:417
+#: ../urpmq:418
+#, c-format
msgid "No changelog found\n"
msgstr "Heb ganfod changelog\n"
+
+#~ msgid "mput failed, maybe a node is unreacheable"
+#~ msgstr "methodd mput, efallai bod nod yn anghyraeddadwy"
+
+#~ msgid "node %s has an old version of urpme, please upgrade"
+#~ msgstr "mae gan nod %s hen fersiwn o urpmi, diweddarwch"
+
+#~ msgid "rshp failed, maybe a node is unreacheable"
+#~ msgstr "methodd rshp, efallai bod y nod yn anghyraeddadwy"
+
+#~ msgid "on node %s"
+#~ msgstr "ar nod %s"
+
+#~ msgid "Propagating synthesis to nodes..."
+#~ msgstr "Lledaenu synthesis i nodau"
+
+#~ msgid "Resolving dependencies on nodes..."
+#~ msgstr "Datrys dibyniaethau ar y nodau"
+
+#~ msgid "Distributing files to nodes..."
+#~ msgstr "Dosbarthu ffeiliau i nodau"
+
+#~ msgid "Verifying if install is possible on nodes..."
+#~ msgstr "Gwirio os yw gosod yn bosib ar nodau"
+
+#~ msgid "Installation failed on node %s"
+#~ msgstr "Methodd y gosod ar nod %s"
+
+#~ msgid "Installing packages on nodes..."
+#~ msgstr "Gosod pecynnau ar nodau..."
+
+#~ msgid "scp failed on host %s (%d)"
+#~ msgstr "methodd scp ar westai %s (%d)"
+
+#~ msgid "Propagating synthesis to %s..."
+#~ msgstr "Lledaenu synthesis i %s..."
+
+#~ msgid "Resolving dependencies on %s..."
+#~ msgstr "Datrys dibyniaethau ar %s..."
+
+#~ msgid "host %s does not have a good version of urpmi (%d)"
+#~ msgstr "nid oes gan westai %s fersiwn dda o urpmi (%d)"
+
+#~ msgid "Distributing files to %s..."
+#~ msgstr "Dosbarthu ffeiliau i %s..."
+
+#~ msgid "Verifying if install is possible on %s..."
+#~ msgstr "Gwirio os yw gosod yn bosibl ar %s..."
+
+#~ msgid "Performing install on %s..."
+#~ msgstr "Gosod pecyn ar %s..."
+
+#~ msgid "Installing %s on %s..."
+#~ msgstr "Gosod %s ar %s..."
+
+#~ msgid "Preparing install on %s..."
+#~ msgstr "Paratoi gosod ar %s..."
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod"
+
+#~ msgid " --probe-synthesis - try to find and use synthesis file.\n"
+#~ msgstr " --probe-synthesis - ceisio canfod a defnyddio ffeil synthesis.\n"
+
+#~ msgid " --probe-hdlist - try to find and use hdlist file.\n"
+#~ msgstr " --probe-hdlist - ceisio canfod a defnyddio ffeil hdlist.\n"
+
+#~ msgid "`with' missing for network media\n"
+#~ msgstr "`with' ar goll ar gyfer cyfrwng rhwydwaith\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "unknown options '%s'\n"
+#~ msgstr ""
+#~ "\n"
+#~ "dewisiadau anhysbys '%s'\n"