summaryrefslogtreecommitdiffstats
path: root/po/cy.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/cy.po')
-rw-r--r--po/cy.po487
1 files changed, 253 insertions, 234 deletions
diff --git a/po/cy.po b/po/cy.po
index 0046fdb7..05fd4926 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-09-07 14:44+0200\n"
+"POT-Creation-Date: 2007-09-13 22:24+0800\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:639
+#: ../gurpmi2:113 ../urpmi:624
#, c-format
msgid "Ok"
msgstr "Iawn"
@@ -183,13 +183,13 @@ msgstr ""
"%s\n"
"Parhau beth bynnag?"
-#: ../gurpmi2:217 ../urpmi:602
+#: ../gurpmi2:217 ../urpmi:590
#, 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:603
+#: ../gurpmi2:218 ../urpmi:591
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -207,12 +207,12 @@ msgstr[1] "(%d pecyn, %d MB)"
msgid "Package installation..."
msgstr "Gosod y pecyn..."
-#: ../gurpmi2:228 ../urpm/main_loop.pm:47
+#: ../gurpmi2:228 ../urpm/main_loop.pm:48
#, c-format
msgid "unable to get source packages, aborting"
msgstr "methu estyn pecynnau ffynhonnell, atal"
-#: ../gurpmi2:242 ../urpm/install.pm:84
+#: ../gurpmi2:242 ../urpm/install.pm:81
#, 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:633
+#: ../gurpmi2:262 ../urpmi:618
#, 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:245
+#: ../gurpmi2:298 ../urpm/main_loop.pm:253
#, 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:183 ../urpm/main_loop.pm:201
-#: ../urpm/main_loop.pm:219
+#: ../gurpmi2:304 ../urpm/main_loop.pm:191 ../urpm/main_loop.pm:209
+#: ../urpm/main_loop.pm:227
#, c-format
msgid "Installation failed:"
msgstr "Methodd y gosod:"
@@ -264,7 +264,7 @@ msgstr "Popeth wedi eu gosod eisoes"
msgid "Installation finished"
msgstr "Cwblhawyd y gosod"
-#: ../gurpmi2:312 ../urpme:135
+#: ../gurpmi2:312 ../urpme:134
#, c-format
msgid "removing %s"
msgstr "tynnu %s"
@@ -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:268
+#: ../rurpmi:11 ../urpmi:267
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
@@ -333,12 +333,12 @@ msgstr "enw ffeil rpm annilys [%s]"
msgid "retrieving rpm file [%s] ..."
msgstr "adfer ffeil rpm (%s)..."
-#: ../urpm.pm:152 ../urpm/get_pkgs.pm:188
+#: ../urpm.pm:152 ../urpm/get_pkgs.pm:135
#, c-format
msgid "...retrieving done"
msgstr ".cwblhau adfer"
-#: ../urpm.pm:155 ../urpm/download.pm:610 ../urpm/get_pkgs.pm:190
+#: ../urpm.pm:155 ../urpm/download.pm:612 ../urpm/get_pkgs.pm:137
#: ../urpm/media.pm:744 ../urpm/media.pm:1269 ../urpm/media.pm:1491
#, c-format
msgid "...retrieving failed: %s"
@@ -379,27 +379,27 @@ msgstr "Mae'r weithred yn waharddedig wrth redeg ym modd cyfyngedig"
msgid "bad proxy declaration on command line\n"
msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
-#: ../urpm/args.pm:269
+#: ../urpm/args.pm:267
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
-#: ../urpm/args.pm:413
+#: ../urpm/args.pm:411
#, c-format
msgid "chroot directory doesn't exist"
msgstr "Nid yw cyfeiriadur chroot yn bodoli"
-#: ../urpm/args.pm:430
+#: ../urpm/args.pm:428
#, c-format
msgid "Can't use %s without %s"
msgstr "Methu defnyddio %s heb %s"
-#: ../urpm/args.pm:433 ../urpm/args.pm:436
+#: ../urpm/args.pm:431 ../urpm/args.pm:434
#, c-format
msgid "Can't use %s with %s"
msgstr "Methu defnyddio %s gyda %s"
-#: ../urpm/args.pm:450
+#: ../urpm/args.pm:448
#, 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:248
+#: ../urpm/bug_report.pm:51 ../urpmi:247
#, c-format
msgid "Copying failed"
msgstr "Methodd y copïo"
@@ -489,163 +489,129 @@ msgstr "methodd curl: diddymwyd y llwytho i lawr\n"
msgid "rsync is missing\n"
msgstr "rsync ar goll\n"
-#: ../urpm/download.pm:518
+#: ../urpm/download.pm:520
#, c-format
msgid "ssh is missing\n"
msgstr "ssh ar goll\n"
-#: ../urpm/download.pm:537
+#: ../urpm/download.pm:539
#, c-format
msgid "prozilla is missing\n"
msgstr "prozilla ar goll\n"
-#: ../urpm/download.pm:553
+#: ../urpm/download.pm:555
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Methu gweithredu prozilla\n"
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:602
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
msgstr " %s%% o %s wedi ei gwblhau, Amser = %s, cyflymder = %s"
-#: ../urpm/download.pm:602
+#: ../urpm/download.pm:604
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% wedi ei gwblhau, cyflymder = %s"
-#: ../urpm/download.pm:659
+#: ../urpm/download.pm:661
#, c-format
msgid "retrieving %s"
msgstr "estyn %s"
-#: ../urpm/download.pm:663
+#: ../urpm/download.pm:665
#, c-format
msgid "retrieved %s"
msgstr "estynwyd: %s"
-#: ../urpm/download.pm:676
+#: ../urpm/download.pm:678
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocol anhysbys ar gyfer %s"
-#: ../urpm/download.pm:695
+#: ../urpm/download.pm:697
#, c-format
msgid "%s is not available, falling back on %s"
msgstr "Nid yw %s ar gael, mynd yn ôl at %s"
-#: ../urpm/download.pm:699
+#: ../urpm/download.pm:701
#, c-format
msgid "no webfetch found, supported webfetch are: %s\n"
msgstr "heb ganfod webfetch, yn cael eu cynnal gan webfetch: %s\n"
-#: ../urpm/download.pm:720
+#: ../urpm/download.pm:722
#, c-format
msgid "unable to handle protocol: %s"
msgstr "methu trin protocol: %s"
-#: ../urpm/get_pkgs.pm:41
+#: ../urpm/get_pkgs.pm:15
#, c-format
msgid "cleaning %s and %s"
msgstr "glanhau %s ac %s"
-#: ../urpm/get_pkgs.pm:56 ../urpm/get_pkgs.pm:79 ../urpm/get_pkgs.pm:110
-#, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "mae yna becynnau niferus gyda'r un enw ffeil rpm \"%s\""
-
-#: ../urpm/get_pkgs.pm:93
-#, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "methu didoli (%s) yn gywir ar werth \"%s\""
-
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
-#, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "methu cael mynediad ffeil rhestr \"%s\", anwybyddu'r cyfrwng"
-
-#: ../urpm/get_pkgs.pm:101
-#, c-format
-msgid "(retry as root?)"
-msgstr "(ceisio eto fel root)"
-
-#: ../urpm/get_pkgs.pm:126
-#, c-format
-msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-" mirror is probably not up-to-date, trying to use alternate method"
-msgstr ""
-"cyfrwng \"%s\" yn defnyddio rhestr ffeiliau annilys:\n"
-" nid yw'r drych yn un diweddar, ceisiwch ddull arall"
-
-#: ../urpm/get_pkgs.pm:130
-#, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "nid yw cyfrwng \"%s\" yn diffinio unrhyw leoliad ar gyfer ffeiliau rpm"
-
-#: ../urpm/get_pkgs.pm:142
+#: ../urpm/get_pkgs.pm:88
#, c-format
msgid "package %s is not found."
msgstr "heb ganfod pecyn %s"
-#: ../urpm/get_pkgs.pm:174
+#: ../urpm/get_pkgs.pm:121
#, c-format
msgid "malformed URL: [%s]"
msgstr "URL gwallus: [%s]"
-#: ../urpm/get_pkgs.pm:179
+#: ../urpm/get_pkgs.pm:126
#, c-format
msgid "sorry, you can't use --install-src to install remote .src.rpm files"
msgstr ""
-#: ../urpm/get_pkgs.pm:185
+#: ../urpm/get_pkgs.pm:132
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
-#: ../urpm/install.pm:91
+#: ../urpm/install.pm:88
#, c-format
msgid "[repackaging]"
msgstr "[ailbecynnu]"
-#: ../urpm/install.pm:157
+#: ../urpm/install.pm:154
#, 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:160
+#: ../urpm/install.pm:157
#, c-format
msgid "unable to create transaction"
msgstr "methu creu trosglwyddiad."
-#: ../urpm/install.pm:182
+#: ../urpm/install.pm:179
#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
msgstr "methu tynnu rpm o becyn delta-rpm %s"
-#: ../urpm/install.pm:193
+#: ../urpm/install.pm:190
#, c-format
msgid "unable to install package %s"
msgstr "methu gosod pecyn %s"
-#: ../urpm/install.pm:230
+#: ../urpm/install.pm:227
#, fuzzy, c-format
msgid "Removing package %s"
msgstr "tynnu pecyn %s."
-#: ../urpm/install.pm:231
+#: ../urpm/install.pm:228
#, c-format
msgid "removing package %s"
msgstr "tynnu pecyn %s."
-#: ../urpm/install.pm:246
+#: ../urpm/install.pm:243
#, c-format
msgid "removing installed rpms (%s) from %s"
msgstr "tynnu rpm wedi eu gosod (%s) o %s"
-#: ../urpm/install.pm:252
+#: ../urpm/install.pm:249
#, c-format
msgid "More information on package %s"
msgstr "Rhagor o wybodaeth ar becyn %s"
@@ -690,84 +656,84 @@ msgstr "Rhybudd"
msgid "%s database locked"
msgstr "Cronfa ddata %s wedi cloi"
-#: ../urpm/main_loop.pm:102
+#: ../urpm/main_loop.pm:110
#, c-format
msgid "The following package has bad signature"
msgstr "Mae gan y pecyn canlynol lofnod gwallus"
-#: ../urpm/main_loop.pm:103
+#: ../urpm/main_loop.pm:111
#, c-format
msgid "The following packages have bad signatures"
msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
-#: ../urpm/main_loop.pm:104
+#: ../urpm/main_loop.pm:112
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ydych chi am barhau gosod?"
-#: ../urpm/main_loop.pm:117 ../urpm/main_loop.pm:190 ../urpm/main_loop.pm:208
+#: ../urpm/main_loop.pm:125 ../urpm/main_loop.pm:198 ../urpm/main_loop.pm:216
#, c-format
msgid "Installation failed"
msgstr "Methodd y gosod"
-#: ../urpm/main_loop.pm:136
+#: ../urpm/main_loop.pm:144
#, c-format
msgid "distributing %s"
msgstr "dosbarthu %s"
-#: ../urpm/main_loop.pm:151
+#: ../urpm/main_loop.pm:159
#, c-format
msgid "installing %s from %s"
msgstr "gosod %s o %s"
-#: ../urpm/main_loop.pm:153
+#: ../urpm/main_loop.pm:161
#, c-format
msgid "installing %s"
msgstr "gosod %s"
-#: ../urpm/main_loop.pm:191
+#: ../urpm/main_loop.pm:199
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
-#: ../urpm/main_loop.pm:209
+#: ../urpm/main_loop.pm:217
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Mwy o orfodaeth gyda'r gosod? (--force)? (y/N)"
-#: ../urpm/main_loop.pm:251
+#: ../urpm/main_loop.pm:259
#, 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:262
+#: ../urpm/main_loop.pm:270
#, c-format
msgid "Installation is possible"
msgstr "Gosod yn bosibl"
-#: ../urpm/main_loop.pm:267
+#: ../urpm/main_loop.pm:275
#, c-format
msgid "Packages are up to date"
msgstr "Mae'r pecynnau'n rhai diweddaraf"
-#: ../urpm/main_loop.pm:275
+#: ../urpm/main_loop.pm:283
#, c-format
msgid "Package %s is already installed"
msgstr "Pecyn %s wedi ei osod eisoes"
-#: ../urpm/main_loop.pm:276
+#: ../urpm/main_loop.pm:284
#, c-format
msgid "Packages %s are already installed"
msgstr "Pecynnau %s wedi eu gosod eisoes"
-#: ../urpm/main_loop.pm:279
+#: ../urpm/main_loop.pm:287
#, c-format
msgid "Package %s can not be installed"
msgstr "Methu gosod pecyn %s"
-#: ../urpm/main_loop.pm:280
+#: ../urpm/main_loop.pm:288
#, c-format
msgid "Packages %s can not be installed"
msgstr "Methu gosod pecynnau %s"
@@ -831,6 +797,11 @@ msgstr "methu cael mynediad i ffeil hdlist\"%s\", anwybyddu'r cyfrwng"
msgid "unable to access list file of \"%s\""
msgstr "methu cael mynediad ffeil rhestr \"%s\""
+#: ../urpm/media.pm:220
+#, c-format
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "methu cael mynediad ffeil rhestr \"%s\", anwybyddu'r cyfrwng"
+
#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
@@ -1195,7 +1166,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:503 ../urpmi:523 ../urpmi:624
+#: ../urpm/msg.pm:62 ../urpmi:508 ../urpmi:524 ../urpmi:609
#, c-format
msgid "Nn"
msgstr "Nn"
@@ -1205,38 +1176,73 @@ 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:504 ../urpmi:524 ../urpmi:567
-#: ../urpmi:625 ../urpmi:655 ../urpmi:661 ../urpmi.addmedia:128
+#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:509 ../urpmi:525 ../urpmi:564
+#: ../urpmi:610 ../urpmi:640 ../urpmi:646 ../urpmi.addmedia:128
#, c-format
msgid "Yy"
msgstr "Yy"
-#: ../urpm/msg.pm:112
+#: ../urpm/msg.pm:120
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Dewis gwael, ceisiwch eto\n"
-#: ../urpm/msg.pm:132
+#: ../urpm/msg.pm:151
+#, fuzzy, c-format
+msgid "Package"
+msgstr "Dewis pecyn"
+
+#: ../urpm/msg.pm:151
+#, c-format
+msgid "Version"
+msgstr ""
+
+#: ../urpm/msg.pm:151
+#, c-format
+msgid "Release"
+msgstr ""
+
+#: ../urpm/msg.pm:151
+#, c-format
+msgid "Arch"
+msgstr ""
+
+#: ../urpm/msg.pm:160
+#, c-format
+msgid "(suggested)"
+msgstr ""
+
+#: ../urpm/msg.pm:175
+#, fuzzy, c-format
+msgid "medium \"%s\""
+msgstr "ychwanegu cyfrwng \"%s\""
+
+#: ../urpm/msg.pm:175
+#, c-format
+msgid "command line"
+msgstr ""
+
+#: ../urpm/msg.pm:189
#, c-format
msgid "B"
msgstr ""
-#: ../urpm/msg.pm:132
+#: ../urpm/msg.pm:189
#, c-format
msgid "KB"
msgstr ""
-#: ../urpm/msg.pm:132
+#: ../urpm/msg.pm:189
#, c-format
msgid "MB"
msgstr ""
-#: ../urpm/msg.pm:132
+#: ../urpm/msg.pm:189
#, c-format
msgid "GB"
msgstr ""
-#: ../urpm/msg.pm:132 ../urpm/msg.pm:141
+#: ../urpm/msg.pm:189 ../urpm/msg.pm:198
#, c-format
msgid "TB"
msgstr ""
@@ -1307,51 +1313,46 @@ msgstr ""
msgid "No package named %s"
msgstr "Dim pecyn o'r enw %s"
-#: ../urpm/select.pm:162 ../urpme:110
+#: ../urpm/select.pm:162 ../urpme:109
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
-#: ../urpm/select.pm:477 ../urpm/select.pm:520
+#: ../urpm/select.pm:480 ../urpm/select.pm:523
#, c-format
msgid "due to missing %s"
msgstr "oherwydd %s coll"
-#: ../urpm/select.pm:478
+#: ../urpm/select.pm:481
#, fuzzy, c-format
msgid "due to already installed %s"
msgstr "Pecyn %s wedi ei osod eisoes"
-#: ../urpm/select.pm:479 ../urpm/select.pm:518
+#: ../urpm/select.pm:482 ../urpm/select.pm:521
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s heb ei foddloni"
-#: ../urpm/select.pm:485
+#: ../urpm/select.pm:488
#, c-format
msgid "trying to promote %s"
msgstr "ceisio hybu %s"
-#: ../urpm/select.pm:486
+#: ../urpm/select.pm:489
#, c-format
msgid "in order to keep %s"
msgstr "fel modd i gadw %s"
-#: ../urpm/select.pm:514
+#: ../urpm/select.pm:517
#, c-format
msgid "in order to install %s"
msgstr "er mwyn gosod %s"
-#: ../urpm/select.pm:524
+#: ../urpm/select.pm:527
#, c-format
msgid "due to conflicts with %s"
msgstr "oherwydd gwrthdaro gyda %s"
-#: ../urpm/select.pm:526
-#, c-format
-msgid "unrequested"
-msgstr "diofyn"
-
#: ../urpm/signature.pm:29
#, c-format
msgid "Invalid signature (%s)"
@@ -1393,7 +1394,7 @@ msgstr ""
"\n"
"defnydd:\n"
-#: ../urpme:45 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpme:45 ../urpmf:35 ../urpmi:79 ../urpmi.addmedia:44
#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
@@ -1409,7 +1410,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:107 ../urpmq:64
+#: ../urpme:48 ../urpmi:106 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -1417,13 +1418,13 @@ msgstr ""
" --force - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
"bodoli.\n"
-#: ../urpme:49 ../urpmi:112 ../urpmq:66
+#: ../urpme:49 ../urpmi:111 ../urpmq:66
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
" --parallel - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
-#: ../urpme:50 ../urpmi:144
+#: ../urpme:50 ../urpmi:143
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Ailbecynnu'r ffeiliau cyn eu dileu\n"
@@ -1433,7 +1434,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:114 ../urpmi.addmedia:58
+#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
@@ -1455,17 +1456,17 @@ msgstr ""
" --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
" wrth (ddad)osod chroot gyda dewis --root.\n"
-#: ../urpme:56 ../urpmi:117 ../urpmq:71
+#: ../urpme:56 ../urpmi:116 ../urpmq:71
#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
msgstr " --probe-synthesis - defnyddio ffeil synthesis.\n"
-#: ../urpme:57 ../urpmi:118 ../urpmq:72
+#: ../urpme:57 ../urpmi:117 ../urpmq:72
#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - defnyddio ffeil hdlist.\n"
-#: ../urpme:58 ../urpmi:155 ../urpmq:83
+#: ../urpme:58 ../urpmi:154 ../urpmq:83
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - modd llafar.\n"
@@ -1480,32 +1481,32 @@ msgstr " -a - select all packages matching expression.\n"
msgid "Only superuser is allowed to remove packages"
msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu pecynnau"
-#: ../urpme:104
+#: ../urpme:103
#, c-format
msgid "unknown packages"
msgstr "pecynnau anhysbys"
-#: ../urpme:104
+#: ../urpme:103
#, c-format
msgid "unknown package"
msgstr "pecyn anhysbys"
-#: ../urpme:116 ../urpmi:541
+#: ../urpme:115 ../urpmi:538
#, c-format
msgid "removing package %s will break your system"
msgstr "bydd tynnu pecynnau %s yn torri'r system"
-#: ../urpme:118
+#: ../urpme:117
#, c-format
msgid "Nothing to remove"
msgstr "Dim i'w dynnu"
-#: ../urpme:123
+#: ../urpme:122
#, c-format
msgid "Checking to remove the following packages"
msgstr "Ticio i ddileu'r pecynnau canlynol"
-#: ../urpme:127
+#: ../urpme:126
#, c-format
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
@@ -1513,19 +1514,19 @@ 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:131
+#: ../urpme:130
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Tynnu pecynnau %d?"
msgstr[1] "Tynnu pecynnau %d?"
-#: ../urpme:131 ../urpmi:568 ../urpmi:656 ../urpmi.addmedia:131
+#: ../urpme:130 ../urpmi:565 ../urpmi:641 ../urpmi.addmedia:131
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpme:153
+#: ../urpme:152
#, c-format
msgid "Removal failed"
msgstr "Methodd y tynnu"
@@ -1551,14 +1552,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - argraffu rhif fersiwn yr offeryn.\n"
-#: ../urpmf:37 ../urpmi:135 ../urpmq:80
+#: ../urpmf:37 ../urpmi:134 ../urpmq:80
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
msgstr ""
" --env - defnyddio amgylchedd penodol (adroddiad gwall fel "
"rheol).\n"
-#: ../urpmf:38 ../urpmi:82 ../urpmq:49
+#: ../urpmf:38 ../urpmi:81 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1572,12 +1573,12 @@ msgstr ""
" --literal, -l - peidio cydweddu patrymau, defnyddio ymresymiad fel llinyn "
"llythrennedd.\n"
-#: ../urpmf:41 ../urpmi:81 ../urpmq:47
+#: ../urpmf:41 ../urpmi:80 ../urpmq:47
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - defnyddio'r cyfrwng, wedi ei ran gan gollnod.\n"
-#: ../urpmf:42 ../urpmi:85 ../urpmq:50
+#: ../urpmf:42 ../urpmi:84 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1590,7 +1591,7 @@ msgstr ""
msgid " --use-distrib - use the given path to access media\n"
msgstr " --synthesis - defnyddio'r synthesis yn lle urpmi db.\n"
-#: ../urpmf:44 ../urpmi:86 ../urpmq:51
+#: ../urpmf:44 ../urpmi:85 ../urpmq:51
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - defnyddio'r synthesis yn lle urpmi db.\n"
@@ -1600,7 +1601,7 @@ msgstr " --synthesis - defnyddio'r synthesis yn lle urpmi db.\n"
msgid " --uniq - do not print identical lines twice.\n"
msgstr " --uniq - peidio argraffu llinellau'r un fath.\n"
-#: ../urpmf:46 ../urpmi:83 ../urpmq:46
+#: ../urpmf:46 ../urpmi:82 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - defnyddio cyfrwng diweddaru'n unig.\n"
@@ -1810,7 +1811,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:255 ../urpmq:135
+#: ../urpmf:190 ../urpmi:254 ../urpmq:135
#, c-format
msgid "using specific environment on %s\n"
msgstr "ddefnyddio amgylchedd penodol ar %s\n"
@@ -1829,7 +1830,7 @@ msgstr ""
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:75
+#: ../urpmi:74
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1845,7 +1846,7 @@ msgstr ""
"\n"
"defnydd:\n"
-#: ../urpmi:84
+#: ../urpmi:83
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -1853,7 +1854,7 @@ msgstr ""
" --searchmedia - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau "
"gofynnwyd.\n"
-#: ../urpmi:87
+#: ../urpmi:86
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -1862,41 +1863,41 @@ msgstr ""
" --auto - modd anrhyngweithiol, derbyn atebion rhagosodedig i "
"gwestiynau.\n"
-#: ../urpmi:88 ../urpmq:52
+#: ../urpmi:87 ../urpmq:52
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - dewis pecynnau'n awtomatig i uwchraddio'r system.\n"
-#: ../urpmi:89
+#: ../urpmi:88
#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-update - diweddaru'r cyfrwng ac yna uwchraddio'r system.\n"
-#: ../urpmi:90
+#: ../urpmi:89
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - analluogi gwirio ffeil MD5SUM.\n"
-#: ../urpmi:91
+#: ../urpmi:90
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - gorfodi diweddaru allwedd gpg.\n"
-#: ../urpmi:92
+#: ../urpmi:91
#, 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:93
+#: ../urpmi:92
#, 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:94 ../urpmq:54
+#: ../urpmi:93 ../urpmq:54
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1905,7 +1906,7 @@ msgstr ""
" --keep - cadw'r pecynnau presennol os yn bosibl, gwrthod\n"
" pecynnau sy'n arwain at dynnu.\n"
-#: ../urpmi:96
+#: ../urpmi:95
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1917,49 +1918,49 @@ msgstr ""
" eu gosod neu eu uwchraddio\n"
" rhagosodiad yw %d.\n"
-#: ../urpmi:99
+#: ../urpmi:98
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - hyd drosglwyddiad byr, rhagosodiad yw %d.\n"
-#: ../urpmi:100
+#: ../urpmi:99
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - mynnu chwiliad bras.\n"
-#: ../urpmi:101
+#: ../urpmi:100
#, c-format
msgid " --src, -s - next package is a source package.\n"
msgstr " --src, -s - pecyn nesaf yn becyn ffynhonnell.\n"
-#: ../urpmi:102
+#: ../urpmi:101
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
-#: ../urpmi:103
+#: ../urpmi:102
#, 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:104
+#: ../urpmi:103
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - peidio glanhau rpm o'r storfa.\n"
-#: ../urpmi:105
+#: ../urpmi:104
#, fuzzy, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
msgstr " --update - defnyddio cyfrwng diweddaru'n unig.\n"
-#: ../urpmi:106
+#: ../urpmi:105
#, c-format
msgid ""
" --replacepkgs - force installing packages which are already installed.\n"
msgstr ""
-#: ../urpmi:108
+#: ../urpmi:107
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1968,7 +1969,7 @@ msgstr ""
" --allow-nodeps - caniatáu gofyn i ddefnyddiwr i osod pecynnau heb\n"
" wirio dibyniaethau.\n"
-#: ../urpmi:110
+#: ../urpmi:109
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1977,12 +1978,12 @@ msgstr ""
" --allow-force - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n"
" wirio dibyniaethau na'u cyfanrwydd.\n"
-#: ../urpmi:113 ../urpmq:67
+#: ../urpmi:112 ../urpmq:67
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - defnyddio root arall ar gyfer gosod rpm.\n"
-#: ../urpmi:115
+#: ../urpmi:114
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1991,47 +1992,47 @@ msgstr ""
" --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
" wrth osod chroot gyda dewis o --root.\n"
-#: ../urpmi:119 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - defnyddio wget i estyn ffeiliau pell.\n"
-#: ../urpmi:120 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - defnyddio curl i estyn ffeiliau pell.\n"
-#: ../urpmi:121 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
+#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr " --prozilla - defnyddio prozilla i estyn ffeiliau pell.\n"
-#: ../urpmi:122
+#: ../urpmi:121
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - dewis ychwanegol wrth ddefnyddio curl\n"
-#: ../urpmi:123
+#: ../urpmi:122
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options- dewis ychwanegol wrth ddefnyddio rsync\n"
-#: ../urpmi:124
+#: ../urpmi:123
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - dewis ychwanegol wrth ddefnyddio wget\n"
-#: ../urpmi:125
+#: ../urpmi:124
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --cprozilla-options - dewis ychwanegol wrth ddefnyddio prozilla\n"
-#: ../urpmi:126 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - cyfyngu cyflymder y llwytho i lawr.\n"
-#: ../urpmi:127
+#: ../urpmi:126
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -2040,7 +2041,7 @@ msgstr ""
" --verify-rpm - gwirio llofnod rpm cyn gosod\n"
" (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
-#: ../urpmi:129 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -2049,7 +2050,7 @@ msgstr ""
" --proxy - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
" rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
-#: ../urpmi:131 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -2058,7 +2059,7 @@ msgstr ""
" --proxy-user - enwi defnyddiwr a chyfrinair i'w ddefnyddio fel y\n"
" dilysiad dirprwy (fformat yw <user:password>).\n"
-#: ../urpmi:133
+#: ../urpmi:132
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -2067,7 +2068,7 @@ msgstr ""
" --bug - cynhyrchu adroddiad gwall i'r cyfeiriadur nodir gan\n"
" yr arg. nesaf\n"
-#: ../urpmi:136
+#: ../urpmi:135
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -2076,49 +2077,49 @@ msgstr ""
" --verify-rpm - gwirio llofnod rpm cyn gosod\n"
" (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig).\n"
-#: ../urpmi:138
+#: ../urpmi:137
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - gwirio os oes modd gosod yn iawn.\n"
-#: ../urpmi:139
+#: ../urpmi:138
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - eithrio llwybr wedi ei wahanu a chollnod.\n"
-#: ../urpmi:140
+#: ../urpmi:139
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - eithrio ffeiliau docs.\n"
-#: ../urpmi:141
+#: ../urpmi:140
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr " --ignoresize - peidio gwirio maint ar ddisg cyn gosod.\n"
-#: ../urpmi:142
+#: ../urpmi:141
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
msgstr " --ignorearch - caniatáu gosod rpm ar gyfer saernïaeth annhebyg.\n"
-#: ../urpmi:143
+#: ../urpmi:142
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - peidio gweithredu sgripledi pecyn(au)\n"
-#: ../urpmi:145
+#: ../urpmi:144
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pecynnau dylid osgoi eu gosod.\n"
-#: ../urpmi:146
+#: ../urpmi:145
#, fuzzy, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --skip - pecynnau dylid osgoi eu gosod.\n"
-#: ../urpmi:147
+#: ../urpmi:146
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2128,50 +2129,50 @@ msgstr ""
"ddewis\n"
" na'r rhagosodiad.\n"
-#: ../urpmi:149
+#: ../urpmi:148
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - peidio cloi db rpm.\n"
-#: ../urpmi:150
+#: ../urpmi:149
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - uwchraddio dim ond pecynnau gyda'r un bensaernïaeth.\n"
-#: ../urpmi:151 ../urpmq:89
+#: ../urpmi:150 ../urpmq:89
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - dewis pob cydweddiad ar y llinell gorchymyn.\n"
-#: ../urpmi:152
+#: ../urpmi:151
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - caniatáu i chwilio canfod pecyn.\n"
-#: ../urpmi:153
+#: ../urpmi:152
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - peidio chwilio yn provides i ganfod pecyn.\n"
-#: ../urpmi:154
+#: ../urpmi:153
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - modd distaw.\n"
-#: ../urpmi:156
+#: ../urpmi:155
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
" bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
"eu gosod.\n"
-#: ../urpmi:185
+#: ../urpmi:184
#, c-format
msgid "Error: can't use --auto-select along with package list.\n"
msgstr "Gwall: methu defnyddio --auto-select ynghyd â'r rhestr pecynnau.\n"
-#: ../urpmi:192
+#: ../urpmi:191
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2181,12 +2182,12 @@ msgstr ""
"arferol\n"
"ynghyd a --bug.\n"
-#: ../urpmi:219
+#: ../urpmi:218
#, c-format
msgid "You can't install binary rpm files when using --install-src"
msgstr "Methu gosod ffeiliau deuaidd rpm wrth ddefnyddio --install-src"
-#: ../urpmi:242
+#: ../urpmi:241
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2195,17 +2196,17 @@ msgstr ""
"Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
"adroddiad gwall neu ei ddileu."
-#: ../urpmi:243
+#: ../urpmi:242
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
-#: ../urpmi:254
+#: ../urpmi:253
#, c-format
msgid "Environment directory %s does not exist"
msgstr "Nid yw cyfeiriadur amgylchedd %s yn bodoli"
-#: ../urpmi:274
+#: ../urpmi:273
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2214,48 +2215,48 @@ msgstr ""
"Gwall: %s i weld wedi ei osod fel darllen yn unig.\n"
"Defnydd --allow-force gorfodaeth i orfodi gweithred."
-#: ../urpmi:362
+#: ../urpmi:361
#, c-format
msgid "Updating media...\n"
msgstr "Diweddaru cyfrwng...\n"
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:438
+#: ../urpmi:443
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (uwchraddio)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:440
+#: ../urpmi:445
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (uwchraddio)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:444
+#: ../urpmi:449
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (gosod)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:446
+#: ../urpmi:451
#, c-format
msgid "%s (to install)"
msgstr "%s (gosod)"
-#: ../urpmi:452
+#: ../urpmi:457
#, 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:455
+#: ../urpmi:460
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Beth yw eich dewis? (1-%d)"
-#: ../urpmi:496
+#: ../urpmi:501
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2266,7 +2267,7 @@ msgstr ""
"sy'n hyn na'r rhai sydd wedi eu gosod:\n"
"%s"
-#: ../urpmi:498
+#: ../urpmi:503
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2277,7 +2278,7 @@ msgstr ""
"sy'n hyn na'r rhai sydd wedi eu gosod:\n"
"%s"
-#: ../urpmi:506 ../urpmi:526
+#: ../urpmi:510 ../urpmi:526
#, c-format
msgid ""
"\n"
@@ -2286,12 +2287,12 @@ msgstr ""
"\n"
"Parhau i osod beth bynnag?"
-#: ../urpmi:506 ../urpmi:526 ../urpmi:626 ../urpmi.addmedia:131
+#: ../urpmi:511 ../urpmi:527 ../urpmi:611 ../urpmi.addmedia:131
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
-#: ../urpmi:518
+#: ../urpmi:519
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2300,7 +2301,7 @@ msgstr ""
"Nid oes modd gosod pecyn gofynnwyd amdani:\n"
"%s"
-#: ../urpmi:519
+#: ../urpmi:520
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2309,7 +2310,7 @@ msgstr ""
"Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
"%s"
-#: ../urpmi:550
+#: ../urpmi:547
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2320,7 +2321,7 @@ msgstr ""
"gael ei dynnu i eraill gael eu diweddaru.\n"
"%s\n"
-#: ../urpmi:552
+#: ../urpmi:549
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2331,7 +2332,7 @@ msgstr ""
"gael eu tynnu i eraill gael eu diweddaru.\n"
"%s\n"
-#: ../urpmi:559
+#: ../urpmi:556
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -2340,7 +2341,7 @@ msgstr ""
"Rhaid i'r pecyn canlynol gael ei dynnu i eraill gael eu diweddaru.\n"
"%s"
-#: ../urpmi:560
+#: ../urpmi:557
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -2349,17 +2350,12 @@ msgstr ""
"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
"%s"
-#: ../urpmi:562
+#: ../urpmi:559
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(prawf yn unig, ni fydd yn cael ei ddadosod)"
-#: ../urpmi:592
-#, c-format
-msgid "(suggested)"
-msgstr ""
-
-#: ../urpmi:599
+#: ../urpmi:585
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2368,39 +2364,39 @@ msgstr ""
"Rhaid eich bod yn wraidd i osod y dibyniaethau canlynol:\n"
"%s\n"
-#: ../urpmi:605
+#: ../urpmi:593
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(prawf yn unig, ni fydd yn cael ei osod)"
-#: ../urpmi:614
+#: ../urpmi:599
#, c-format
msgid "%s of additional disk space will be used."
msgstr ""
-#: ../urpmi:615
+#: ../urpmi:600
#, c-format
msgid "%s of disk space will be freed."
msgstr ""
-#: ../urpmi:616
+#: ../urpmi:601
#, 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:634
+#: ../urpmi:619
#, c-format
msgid "Press Enter when ready..."
msgstr "Pwyso Enter pan yn barod..."
-#: ../urpmi:639
+#: ../urpmi:624
#, c-format
msgid "Cancel"
msgstr "Dileu"
-#: ../urpmi:678
+#: ../urpmi:663
#, c-format
msgid "restarting urpmi"
msgstr "ailgychwyn urpmi"
@@ -2566,17 +2562,17 @@ msgstr ""
"\n"
"Hoffech chi ychwanegu cyfrwng '%s'"
-#: ../urpmi.addmedia:162
+#: ../urpmi.addmedia:161
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<llwybr perthynnol hdlist> ar goll\n"
-#: ../urpmi.addmedia:165
+#: ../urpmi.addmedia:164
#, c-format
msgid "Can't use %s with remote medium"
msgstr "Methu defnyddio %s gyda chyfrwng pell"
-#: ../urpmi.addmedia:188
+#: ../urpmi.addmedia:187
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "methu creu cyfrwng \"%s\"\n"
@@ -3074,6 +3070,29 @@ msgstr ""
msgid "No changelog found\n"
msgstr "Heb ganfod changelog\n"
+#~ msgid "there are multiple packages with the same rpm filename \"%s\""
+#~ msgstr "mae yna becynnau niferus gyda'r un enw ffeil rpm \"%s\""
+
+#~ msgid "unable to correctly parse [%s] on value \"%s\""
+#~ msgstr "methu didoli (%s) yn gywir ar werth \"%s\""
+
+#~ msgid "(retry as root?)"
+#~ msgstr "(ceisio eto fel root)"
+
+#~ msgid ""
+#~ "medium \"%s\" uses an invalid list file:\n"
+#~ " mirror is probably not up-to-date, trying to use alternate method"
+#~ msgstr ""
+#~ "cyfrwng \"%s\" yn defnyddio rhestr ffeiliau annilys:\n"
+#~ " nid yw'r drych yn un diweddar, ceisiwch ddull arall"
+
+#~ msgid "medium \"%s\" does not define any location for rpm files"
+#~ msgstr ""
+#~ "nid yw cyfrwng \"%s\" yn diffinio unrhyw leoliad ar gyfer ffeiliau rpm"
+
+#~ msgid "unrequested"
+#~ msgstr "diofyn"
+
#~ msgid " (%d MB)"
#~ msgstr " (%d MB)"