summaryrefslogtreecommitdiffstats
path: root/po/cy.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/cy.po')
-rw-r--r--po/cy.po294
1 files changed, 154 insertions, 140 deletions
diff --git a/po/cy.po b/po/cy.po
index fa89aace..ecc697f6 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mandriva Linux\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-22 09:55+0200\n"
+"POT-Creation-Date: 2007-08-29 01:12+0200\n"
"PO-Revision-Date: 2007-03-02 20:33-0000\n"
"Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
"Language-Team: Cymraeg\n"
@@ -142,7 +142,7 @@ msgstr ""
msgid "Warning"
msgstr "Rhybudd"
-#: ../gurpmi2:113 ../urpmi:637
+#: ../gurpmi2:113 ../urpmi:635
#, c-format
msgid "Ok"
msgstr "Iawn"
@@ -183,19 +183,19 @@ msgstr ""
"%s\n"
"Parhau beth bynnag?"
-#: ../gurpmi2:217 ../urpmi:601 ../urpmi:612
+#: ../gurpmi2:217 ../urpmi:599 ../urpmi:610
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
msgstr "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod"
-#: ../gurpmi2:218 ../urpmi:602 ../urpmi:613
+#: ../gurpmi2:218 ../urpmi:600 ../urpmi:611
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
msgstr "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod"
-#: ../gurpmi2:220 ../urpmi:603
+#: ../gurpmi2:220 ../urpmi:601
#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
@@ -212,7 +212,7 @@ msgstr "Gosod y pecyn..."
msgid "unable to get source packages, aborting"
msgstr "methu estyn pecynnau ffynhonnell, atal"
-#: ../gurpmi2:242 ../urpm/install.pm:70
+#: ../gurpmi2:242 ../urpm/install.pm:84
#, c-format
msgid "Preparing..."
msgstr "Paratoi..."
@@ -222,7 +222,7 @@ msgstr "Paratoi..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Gosod pecyn `%s' (%s/%s)..."
-#: ../gurpmi2:262 ../urpmi:631
+#: ../gurpmi2:262 ../urpmi:629
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
@@ -237,7 +237,7 @@ msgstr "Llwytho pecynnau i lawr ' %s'..."
msgid "_Done"
msgstr "_Gorffen"
-#: ../gurpmi2:298 ../urpm/main_loop.pm:241
+#: ../gurpmi2:298 ../urpm/main_loop.pm:242
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -248,8 +248,8 @@ msgstr ""
"%s\n"
"Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
-#: ../gurpmi2:304 ../urpm/main_loop.pm:179 ../urpm/main_loop.pm:197
-#: ../urpm/main_loop.pm:215
+#: ../gurpmi2:304 ../urpm/main_loop.pm:180 ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:216
#, c-format
msgid "Installation failed:"
msgstr "Methodd y gosod:"
@@ -303,7 +303,7 @@ msgstr " -f - allbynnu enw llawn rpm (NVRA)\n"
msgid " defaults to %s.\n"
msgstr " rhagosodedig yw %s.\n"
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11 ../urpmi:268
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
@@ -354,52 +354,52 @@ msgstr "methu cael mynediad ffeil rpm (%s)"
msgid "unable to parse spec file %s [%s]"
msgstr "methu didoli ffeil spec %s [%s]"
-#: ../urpm.pm:170
+#: ../urpm.pm:168
#, c-format
msgid "unable to register rpm file"
msgstr "methu cofrestr ffeil rpm"
-#: ../urpm.pm:172
+#: ../urpm.pm:170
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Saernïaeth anghydnaws ar gyfer rpm [%s]"
-#: ../urpm.pm:176
+#: ../urpm.pm:174
#, c-format
msgid "error registering local packages"
msgstr "gwall cofrestru pecynnau lleol"
-#: ../urpm.pm:274
+#: ../urpm.pm:272
#, 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:116 ../urpm/args.pm:125
+#: ../urpm/args.pm:121 ../urpm/args.pm:130
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
-#: ../urpm/args.pm:263
+#: ../urpm/args.pm:268
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
-#: ../urpm/args.pm:407
+#: ../urpm/args.pm:412
#, c-format
msgid "chroot directory doesn't exist"
msgstr "Nid yw cyfeiriadur chroot yn bodoli"
-#: ../urpm/args.pm:424
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s without %s"
msgstr "Methu defnyddio %s heb %s"
-#: ../urpm/args.pm:427 ../urpm/args.pm:430
+#: ../urpm/args.pm:432 ../urpm/args.pm:435
#, c-format
msgid "Can't use %s with %s"
msgstr "Methu defnyddio %s gyda %s"
-#: ../urpm/args.pm:444
+#: ../urpm/args.pm:449
#, c-format
msgid "Too many arguments\n"
msgstr "Gormod o ymresymiadau\n"
@@ -409,7 +409,7 @@ msgstr "Gormod o ymresymiadau\n"
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "adeiladu ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
-#: ../urpm/bug_report.pm:51 ../urpmi:247
+#: ../urpm/bug_report.pm:51 ../urpmi:248
#, c-format
msgid "Copying failed"
msgstr "Methodd y copïo"
@@ -595,7 +595,7 @@ msgstr "URL gwallus: [%s]"
#: ../urpm/get_pkgs.pm:179
#, c-format
-msgid "sorry you can't --install-src remote .src.rpm files"
+msgid "sorry, you can't use --install-src to install remote .src.rpm files"
msgstr ""
#: ../urpm/get_pkgs.pm:185
@@ -603,54 +603,49 @@ msgstr ""
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
-#: ../urpm/install.pm:77
+#: ../urpm/install.pm:91
#, c-format
msgid "[repackaging]"
msgstr "[ailbecynnu]"
-#: ../urpm/install.pm:143
+#: ../urpm/install.pm:157
#, c-format
msgid ""
"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"crëwyd trosglwyddiad ar gyfer gosod ar %s (tynnu=%d, gosod=%d, uwchraddio=%d)"
-#: ../urpm/install.pm:146
+#: ../urpm/install.pm:160
#, c-format
msgid "unable to create transaction"
msgstr "methu creu trosglwyddiad."
-#: ../urpm/install.pm:164
+#: ../urpm/install.pm:182
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "methu tynnu rpm o becyn delta-rpm %s"
-#: ../urpm/install.pm:170
-#, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "ychwanegu pecyn %s (id=%d, eid=%d, update=%d, file=%s)"
-
-#: ../urpm/install.pm:173
+#: ../urpm/install.pm:193
#, c-format
msgid "unable to install package %s"
msgstr "methu gosod pecyn %s"
-#: ../urpm/install.pm:210
+#: ../urpm/install.pm:230
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "tynnu pecyn %s."
-#: ../urpm/install.pm:211
+#: ../urpm/install.pm:231
#, c-format
msgid "removing package %s"
msgstr "tynnu pecyn %s."
-#: ../urpm/install.pm:226
+#: ../urpm/install.pm:246
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "tynnu rpm wedi eu gosod (%s) o %s"
-#: ../urpm/install.pm:232
+#: ../urpm/install.pm:252
#, c-format
msgid "More information on package %s"
msgstr "Rhagor o wybodaeth ar becyn %s"
@@ -710,7 +705,7 @@ msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
msgid "Do you want to continue installation ?"
msgstr "Ydych chi am barhau gosod?"
-#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:186 ../urpm/main_loop.pm:204
+#: ../urpm/main_loop.pm:114 ../urpm/main_loop.pm:187 ../urpm/main_loop.pm:205
#, c-format
msgid "Installation failed"
msgstr "Methodd y gosod"
@@ -730,49 +725,49 @@ msgstr "gosod %s o %s"
msgid "installing %s"
msgstr "gosod %s"
-#: ../urpm/main_loop.pm:187
+#: ../urpm/main_loop.pm:188
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
-#: ../urpm/main_loop.pm:205
+#: ../urpm/main_loop.pm:206
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Mwy o orfodaeth gyda'r gosod? (--force)? (y/N)"
-#: ../urpm/main_loop.pm:247
+#: ../urpm/main_loop.pm:248
#, c-format
msgid "%d installation transaction failed"
msgid_plural "%d installation transactions failed"
msgstr[0] "methodd trosglwyddiad gosod %d"
msgstr[1] "methodd trosglwyddiad gosod %d"
-#: ../urpm/main_loop.pm:258
+#: ../urpm/main_loop.pm:259
#, c-format
msgid "Installation is possible"
msgstr "Gosod yn bosibl"
-#: ../urpm/main_loop.pm:263
+#: ../urpm/main_loop.pm:264
#, c-format
msgid "Packages are up to date"
msgstr "Mae'r pecynnau'n rhai diweddaraf"
-#: ../urpm/main_loop.pm:271
+#: ../urpm/main_loop.pm:272
#, c-format
msgid "Package %s is already installed"
msgstr "Pecyn %s wedi ei osod eisoes"
-#: ../urpm/main_loop.pm:272
+#: ../urpm/main_loop.pm:273
#, c-format
msgid "Packages %s are already installed"
msgstr "Pecynnau %s wedi eu gosod eisoes"
-#: ../urpm/main_loop.pm:275
+#: ../urpm/main_loop.pm:276
#, c-format
msgid "Package %s can not be installed"
msgstr "Methu gosod pecyn %s"
-#: ../urpm/main_loop.pm:276
+#: ../urpm/main_loop.pm:277
#, c-format
msgid "Packages %s can not be installed"
msgstr "Methu gosod pecynnau %s"
@@ -1200,7 +1195,7 @@ msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
msgid "reading headers from medium \"%s\""
msgstr "darllen pennawd o'r cyfrwng \"%s\""
-#: ../urpm/msg.pm:62 ../urpmi:505 ../urpmi:525 ../urpmi:622
+#: ../urpm/msg.pm:62 ../urpmi:503 ../urpmi:523 ../urpmi:620
#, c-format
msgid "Nn"
msgstr "Nn"
@@ -1210,8 +1205,8 @@ msgstr "Nn"
# can hit those keys in their keyboard to reply.
# please keep the 'Yy' for compatibility reasons
#. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:506 ../urpmi:526 ../urpmi:569
-#: ../urpmi:623 ../urpmi:653 ../urpmi:659 ../urpmi.addmedia:128
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:504 ../urpmi:524 ../urpmi:567
+#: ../urpmi:621 ../urpmi:651 ../urpmi:657 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "Yy"
@@ -1271,67 +1266,78 @@ msgstr "cyfrwng annealladwy \"%s\" wedi ei nodi'n symudadwy ond nid yw"
msgid "unable to access medium \"%s\""
msgstr "methu cael mynediad at gyfrwng. \"%s\""
-#: ../urpm/select.pm:125
+#: ../urpm/select.pm:21
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:23
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:144
#, c-format
msgid "No package named %s"
msgstr "Dim pecyn o'r enw %s"
-#: ../urpm/select.pm:127 ../urpme:110
+#: ../urpm/select.pm:146 ../urpme:110
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
-#: ../urpm/select.pm:441 ../urpm/select.pm:484
+#: ../urpm/select.pm:460 ../urpm/select.pm:503
#, c-format
msgid "due to missing %s"
msgstr "oherwydd %s coll"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:461
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "Pecyn %s wedi ei osod eisoes"
-#: ../urpm/select.pm:443 ../urpm/select.pm:482
+#: ../urpm/select.pm:462 ../urpm/select.pm:501
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s heb ei foddloni"
-#: ../urpm/select.pm:449
+#: ../urpm/select.pm:468
#, c-format
msgid "trying to promote %s"
msgstr "ceisio hybu %s"
-#: ../urpm/select.pm:450
+#: ../urpm/select.pm:469
#, c-format
msgid "in order to keep %s"
msgstr "fel modd i gadw %s"
-#: ../urpm/select.pm:478
+#: ../urpm/select.pm:497
#, c-format
msgid "in order to install %s"
msgstr "er mwyn gosod %s"
-#: ../urpm/select.pm:488
+#: ../urpm/select.pm:507
#, c-format
msgid "due to conflicts with %s"
msgstr "oherwydd gwrthdaro gyda %s"
-#: ../urpm/select.pm:490
+#: ../urpm/select.pm:509
#, c-format
msgid "unrequested"
msgstr "diofyn"
-#: ../urpm/signature.pm:27
+#: ../urpm/signature.pm:29
#, c-format
msgid "Invalid signature (%s)"
msgstr "Llofnod annilys (%s)"
-#: ../urpm/signature.pm:58
+#: ../urpm/signature.pm:60
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Enw Allwedd Annilys (%s)"
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:62
#, c-format
msgid "Missing signature (%s)"
msgstr "Llofnod coll (%s)"
@@ -1378,7 +1384,7 @@ msgstr " --auto - dewis pecyn yn awtomatig o fewn dewisiadau.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - gwirio os oes modd tynnu'n iawn.\n"
-#: ../urpme:48 ../urpmi:106 ../urpmq:64
+#: ../urpme:48 ../urpmi:107 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -1386,13 +1392,13 @@ msgstr ""
" --force - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
"bodoli.\n"
-#: ../urpme:49 ../urpmi:111 ../urpmq:66
+#: ../urpme:49 ../urpmi:112 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
" --parallel - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
-#: ../urpme:50 ../urpmi:143
+#: ../urpme:50 ../urpmi:144
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Ailbecynnu'r ffeiliau cyn eu dileu\n"
@@ -1402,7 +1408,7 @@ msgstr " --repackage - Ailbecynnu'r ffeiliau cyn eu dileu\n"
msgid " --root - use another root for rpm removal.\n"
msgstr " --root - defnyddio root arall ar gyfer tynnu rpm.\n"
-#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
+#: ../urpme:52 ../urpmf:40 ../urpmi:114 ../urpmi.addmedia:58
#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
@@ -1424,17 +1430,17 @@ msgstr ""
" --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
" wrth (ddad)osod chroot gyda dewis --root.\n"
-#: ../urpme:56 ../urpmi:116 ../urpmq:71
+#: ../urpme:56 ../urpmi:117 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - defnyddio ffeil synthesis.\n"
-#: ../urpme:57 ../urpmi:117 ../urpmq:72
+#: ../urpme:57 ../urpmi:118 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - defnyddio ffeil hdlist.\n"
-#: ../urpme:58 ../urpmi:154 ../urpmq:83
+#: ../urpme:58 ../urpmi:155 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - modd llafar.\n"
@@ -1459,7 +1465,7 @@ msgstr "pecynnau anhysbys"
msgid "unknown package"
msgstr "pecyn anhysbys"
-#: ../urpme:116 ../urpmi:543
+#: ../urpme:116 ../urpmi:541
#, c-format
msgid "removing package %s will break your system"
msgstr "bydd tynnu pecynnau %s yn torri'r system"
@@ -1482,7 +1488,7 @@ msgid_plural ""
msgstr[0] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
msgstr[1] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
-#: ../urpme:133 ../urpmi:620
+#: ../urpme:133 ../urpmi:618
#, c-format
msgid " (%d MB)"
msgstr " (%d MB)"
@@ -1494,7 +1500,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Tynnu pecynnau %d?"
msgstr[1] "Tynnu pecynnau %d?"
-#: ../urpme:135 ../urpmi:570 ../urpmi:654 ../urpmi.addmedia:131
+#: ../urpme:135 ../urpmi:568 ../urpmi:652 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
@@ -1525,7 +1531,7 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - argraffu rhif fersiwn yr offeryn.\n"
-#: ../urpmf:37 ../urpmi:134 ../urpmq:80
+#: ../urpmf:37 ../urpmi:135 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
@@ -1784,7 +1790,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:190 ../urpmi:254 ../urpmq:135
+#: ../urpmf:190 ../urpmi:255 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "ddefnyddio amgylchedd penodol ar %s\n"
@@ -1923,12 +1929,17 @@ msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - peidio glanhau rpm o'r storfa.\n"
#: ../urpmi:105
+#, fuzzy, c-format
+msgid " --justdb - update only the rpm db, not the filesystem.\n"
+msgstr " --update - defnyddio cyfrwng diweddaru'n unig.\n"
+
+#: ../urpmi:106
#, c-format
msgid ""
" --replacepkgs - force installing packages which are already installed.\n"
msgstr ""
-#: ../urpmi:107
+#: ../urpmi:108
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1937,7 +1948,7 @@ msgstr ""
" --allow-nodeps - caniatáu gofyn i ddefnyddiwr i osod pecynnau heb\n"
" wirio dibyniaethau.\n"
-#: ../urpmi:109
+#: ../urpmi:110
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1946,12 +1957,12 @@ msgstr ""
" --allow-force - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n"
" wirio dibyniaethau na'u cyfanrwydd.\n"
-#: ../urpmi:112 ../urpmq:67
+#: ../urpmi:113 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - defnyddio root arall ar gyfer gosod rpm.\n"
-#: ../urpmi:114
+#: ../urpmi:115
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1960,47 +1971,47 @@ msgstr ""
" --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
" wrth osod chroot gyda dewis o --root.\n"
-#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:119 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - defnyddio wget i estyn ffeiliau pell.\n"
-#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:120 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - defnyddio curl i estyn ffeiliau pell.\n"
-#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
+#: ../urpmi:121 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prozilla - defnyddio prozilla i estyn ffeiliau pell.\n"
-#: ../urpmi:121
+#: ../urpmi:122
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - dewis ychwanegol wrth ddefnyddio curl\n"
-#: ../urpmi:122
+#: ../urpmi:123
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options- dewis ychwanegol wrth ddefnyddio rsync\n"
-#: ../urpmi:123
+#: ../urpmi:124
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - dewis ychwanegol wrth ddefnyddio wget\n"
-#: ../urpmi:124
+#: ../urpmi:125
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --cprozilla-options - dewis ychwanegol wrth ddefnyddio prozilla\n"
-#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:126 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - cyfyngu cyflymder y llwytho i lawr.\n"
-#: ../urpmi:126
+#: ../urpmi:127
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -2009,7 +2020,7 @@ msgstr ""
" --verify-rpm - gwirio llofnod rpm cyn gosod\n"
" (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
-#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:129 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -2018,7 +2029,7 @@ msgstr ""
" --proxy - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
" rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
-#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:131 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -2027,7 +2038,7 @@ msgstr ""
" --proxy-user - enwi defnyddiwr a chyfrinair i'w ddefnyddio fel y\n"
" dilysiad dirprwy (fformat yw <user:password>).\n"
-#: ../urpmi:132
+#: ../urpmi:133
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -2036,7 +2047,7 @@ msgstr ""
" --bug - cynhyrchu adroddiad gwall i'r cyfeiriadur nodir gan\n"
" yr arg. nesaf\n"
-#: ../urpmi:135
+#: ../urpmi:136
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -2045,49 +2056,49 @@ msgstr ""
" --verify-rpm - gwirio llofnod rpm cyn gosod\n"
" (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig).\n"
-#: ../urpmi:137
+#: ../urpmi:138
#, 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:138
+#: ../urpmi:139
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - eithrio llwybr wedi ei wahanu a chollnod.\n"
-#: ../urpmi:139
+#: ../urpmi:140
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - eithrio ffeiliau docs.\n"
-#: ../urpmi:140
+#: ../urpmi:141
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr " --ignoresize - peidio gwirio maint ar ddisg cyn gosod.\n"
-#: ../urpmi:141
+#: ../urpmi:142
#, 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:142
+#: ../urpmi:143
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - peidio gweithredu sgripledi pecyn(au)\n"
-#: ../urpmi:144
+#: ../urpmi:145
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pecynnau dylid osgoi eu gosod.\n"
-#: ../urpmi:145
+#: ../urpmi:146
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --skip - pecynnau dylid osgoi eu gosod.\n"
-#: ../urpmi:146
+#: ../urpmi:147
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2097,50 +2108,50 @@ msgstr ""
"ddewis\n"
" na'r rhagosodiad.\n"
-#: ../urpmi:148
+#: ../urpmi:149
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - peidio cloi db rpm.\n"
-#: ../urpmi:149
+#: ../urpmi:150
#, 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:150 ../urpmq:89
+#: ../urpmi:151 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - dewis pob cydweddiad ar y llinell gorchymyn.\n"
-#: ../urpmi:151
+#: ../urpmi:152
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - caniatáu i chwilio canfod pecyn.\n"
-#: ../urpmi:152
+#: ../urpmi:153
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - peidio chwilio yn provides i ganfod pecyn.\n"
-#: ../urpmi:153
+#: ../urpmi:154
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - modd distaw.\n"
-#: ../urpmi:155
+#: ../urpmi:156
#, 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:184
+#: ../urpmi:185
#, 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:191
+#: ../urpmi:192
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2150,12 +2161,12 @@ msgstr ""
"arferol\n"
"ynghyd a --bug.\n"
-#: ../urpmi:218
+#: ../urpmi:219
#, 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:241
+#: ../urpmi:242
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2164,17 +2175,17 @@ msgstr ""
"Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
"adroddiad gwall neu ei ddileu."
-#: ../urpmi:242
+#: ../urpmi:243
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
-#: ../urpmi:253
+#: ../urpmi:254
#, c-format
msgid "Environment directory %s does not exist"
msgstr "Nid yw cyfeiriadur amgylchedd %s yn bodoli"
-#: ../urpmi:273
+#: ../urpmi:274
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2183,48 +2194,48 @@ msgstr ""
"Gwall: %s i weld wedi ei osod fel darllen yn unig.\n"
"Defnydd --allow-force gorfodaeth i orfodi gweithred."
-#: ../urpmi:361
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr "Diweddaru cyfrwng...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:438
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (uwchraddio)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:442
+#: ../urpmi:440
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (uwchraddio)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:446
+#: ../urpmi:444
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (gosod)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:448
+#: ../urpmi:446
#, c-format
msgid "%s (to install)"
msgstr "%s (gosod)"
-#: ../urpmi:454
+#: ../urpmi:452
#, fuzzy, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
-#: ../urpmi:457
+#: ../urpmi:455
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Beth yw eich dewis? (1-%d)"
-#: ../urpmi:498
+#: ../urpmi:496
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2235,7 +2246,7 @@ msgstr ""
"sy'n hyn na'r rhai sydd wedi eu gosod:\n"
"%s"
-#: ../urpmi:500
+#: ../urpmi:498
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2246,7 +2257,7 @@ msgstr ""
"sy'n hyn na'r rhai sydd wedi eu gosod:\n"
"%s"
-#: ../urpmi:508 ../urpmi:528
+#: ../urpmi:506 ../urpmi:526
#, c-format
msgid ""
"\n"
@@ -2255,12 +2266,12 @@ msgstr ""
"\n"
"Parhau i osod beth bynnag?"
-#: ../urpmi:508 ../urpmi:528 ../urpmi:624 ../urpmi.addmedia:131
+#: ../urpmi:506 ../urpmi:526 ../urpmi:622 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
-#: ../urpmi:520
+#: ../urpmi:518
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2269,7 +2280,7 @@ msgstr ""
"Nid oes modd gosod pecyn gofynnwyd amdani:\n"
"%s"
-#: ../urpmi:521
+#: ../urpmi:519
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2278,7 +2289,7 @@ msgstr ""
"Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
"%s"
-#: ../urpmi:552
+#: ../urpmi:550
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2289,7 +2300,7 @@ msgstr ""
"gael ei dynnu i eraill gael eu diweddaru.\n"
"%s\n"
-#: ../urpmi:554
+#: ../urpmi:552
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2300,7 +2311,7 @@ msgstr ""
"gael eu tynnu i eraill gael eu diweddaru.\n"
"%s\n"
-#: ../urpmi:561
+#: ../urpmi:559
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2309,7 +2320,7 @@ msgstr ""
"Rhaid i'r pecyn canlynol gael ei dynnu i eraill gael eu diweddaru.\n"
"%s"
-#: ../urpmi:562
+#: ../urpmi:560
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2318,17 +2329,17 @@ msgstr ""
"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
"%s"
-#: ../urpmi:564
+#: ../urpmi:562
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(prawf yn unig, ni fydd yn cael ei ddadosod)"
-#: ../urpmi:594
+#: ../urpmi:592
#, c-format
msgid "%s (suggested)"
msgstr ""
-#: ../urpmi:609
+#: ../urpmi:607
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2337,29 +2348,29 @@ msgstr ""
"Rhaid eich bod yn wraidd i osod y dibyniaethau canlynol:\n"
"%s\n"
-#: ../urpmi:615
+#: ../urpmi:613
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(prawf yn unig, ni fydd yn cael ei osod)"
-#: ../urpmi:617
+#: ../urpmi:615
#, c-format
msgid "Proceed with the installation of one package?"
msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Parhau gyda gosod %d pecyn?"
msgstr[1] "Parhau gyda gosod %d pecyn?"
-#: ../urpmi:632
+#: ../urpmi:630
#, c-format
msgid "Press Enter when ready..."
msgstr "Pwyso Enter pan yn barod..."
-#: ../urpmi:637
+#: ../urpmi:635
#, c-format
msgid "Cancel"
msgstr "Dileu"
-#: ../urpmi:676
+#: ../urpmi:674
#, c-format
msgid "restarting urpmi"
msgstr "ailgychwyn urpmi"
@@ -3033,6 +3044,9 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Heb ganfod changelog\n"
+#~ msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+#~ msgstr "ychwanegu pecyn %s (id=%d, eid=%d, update=%d, file=%s)"
+
#~ msgid ""
#~ "The following packages have bad signatures:\n"
#~ "%s\n"