summaryrefslogtreecommitdiffstats
path: root/po/cy.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/cy.po')
-rw-r--r--po/cy.po546
1 files changed, 262 insertions, 284 deletions
diff --git a/po/cy.po b/po/cy.po
index aee55b51..40bd5cf4 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: 2012-01-28 12:59+0100\n"
+"POT-Creation-Date: 2012-02-13 11:06+0100\n"
"PO-Revision-Date: 2009-08-24 20:33-0000\n"
"Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
"Language-Team: Cymraeg\n"
@@ -107,7 +107,7 @@ msgstr "_Dileu"
msgid "Choose location to save file"
msgstr "Dewiswch leoliad i gadw'r ffeil"
-#: ../gurpmi.pm:39 ../urpmi:75
+#: ../gurpmi.pm:39 ../urpmi:66
#, c-format
msgid ""
"urpmi version %s\n"
@@ -128,13 +128,13 @@ msgstr ""
msgid "Options:"
msgstr "Dewisiadau:"
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:80 ../urpmi.addmedia:55
+#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:71 ../urpmi.addmedia:55
#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - argraffu neges cymorth.\n"
-#: ../gurpmi.pm:47 ../urpmi:87
+#: ../gurpmi.pm:47 ../urpmi:78
#, c-format
msgid ""
" --auto - non-interactive mode, assume default answers to "
@@ -143,13 +143,13 @@ msgstr ""
" --auto - modd anrhyngweithiol, derbyn atebion rhagosodedig i "
"gwestiynau.\n"
-#: ../gurpmi.pm:48 ../urpmi:88 ../urpmq:52
+#: ../gurpmi.pm:48 ../urpmi:79 ../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"
-#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:111 ../urpmq:68
+#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:102 ../urpmq:68
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -157,7 +157,7 @@ msgstr ""
" --force - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
"bodoli.\n"
-#: ../gurpmi.pm:50 ../urpmi:142
+#: ../gurpmi.pm:50 ../urpmi:133
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -166,34 +166,34 @@ msgstr ""
" --verify-rpm - gwirio llofnod rpm cyn gosod\n"
" (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig).\n"
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:81 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:72 ../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"
-#: ../gurpmi.pm:53 ../urpmi:159
+#: ../gurpmi.pm:53 ../urpmi:150
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - caniatáu i chwilio canfod pecyn.\n"
-#: ../gurpmi.pm:54 ../urpmi:160
+#: ../gurpmi.pm:54 ../urpmi:151
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - peidio chwilio yn provides i ganfod pecyn.\n"
-#: ../gurpmi.pm:55 ../urpmi:118 ../urpmq:71
+#: ../gurpmi.pm:55 ../urpmi:109 ../urpmq:71
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - defnyddio root arall ar gyfer gosod rpm.\n"
-#: ../gurpmi.pm:56 ../urpmi:144
+#: ../gurpmi.pm:56 ../urpmi:135
#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr " --test - gwirio os oes modd gosod yn iawn.\n"
-#: ../gurpmi.pm:57 ../urpmi:84
+#: ../gurpmi.pm:57 ../urpmi:75
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
@@ -247,7 +247,7 @@ msgstr ""
msgid "Warning"
msgstr "Rhybudd"
-#: ../gurpmi2:146 ../urpmi:650
+#: ../gurpmi2:146 ../urpmi:626
#, c-format
msgid "Ok"
msgstr "Iawn"
@@ -288,13 +288,13 @@ msgstr ""
"%s\n"
"Parhau beth bynnag?"
-#: ../gurpmi2:267 ../urpmi:615
+#: ../gurpmi2:267 ../urpmi:593
#, 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:268 ../urpmi:616
+#: ../gurpmi2:268 ../urpmi:594
#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
@@ -322,7 +322,7 @@ msgstr "Paratoi..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Gosod pecyn `%s' (%s/%s)..."
-#: ../gurpmi2:334 ../urpmi:645
+#: ../gurpmi2:334 ../urpmi:621
#, c-format
msgid "Please insert the medium named \"%s\""
msgstr "Rhowch gyfrwng \"%s\" yn y ddyfais"
@@ -332,7 +332,7 @@ msgstr "Rhowch gyfrwng \"%s\" yn y ddyfais"
msgid "Downloading package `%s'..."
msgstr "Llwytho pecynnau i lawr ' %s'..."
-#: ../gurpmi2:360 ../urpm.pm:331 ../urpm/download.pm:830
+#: ../gurpmi2:360 ../urpm.pm:334 ../urpm/download.pm:831
#: ../urpm/get_pkgs.pm:262 ../urpm/media.pm:981 ../urpm/media.pm:1493
#: ../urpm/media.pm:1644
#, c-format
@@ -375,7 +375,7 @@ msgstr "Cwblhawyd y gosod"
msgid "removing %s"
msgstr "tynnu %s"
-#: ../gurpmi2:415 ../urpmi:714
+#: ../gurpmi2:415 ../urpmi:686
#, c-format
msgid "restarting urpmi"
msgstr "ailgychwyn urpmi"
@@ -414,7 +414,7 @@ msgstr " rhagosodedig yw %s.\n"
msgid " -f - output rpm full name (NVRA)\n"
msgstr " -f - allbynnu enw llawn rpm (NVRA)\n"
-#: ../rurpmi:11 ../urpmi:284
+#: ../rurpmi:11 ../urpmi:269
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
@@ -424,77 +424,77 @@ msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
msgid "Running urpmi in restricted mode..."
msgstr "Rhedeg urpmi mewn modd cyfyngedig..."
-#: ../urpm.pm:103
+#: ../urpm.pm:106
#, c-format
msgid "fail to create directory %s"
msgstr "methu creu cyfeiriadur %s"
-#: ../urpm.pm:104
+#: ../urpm.pm:107
#, c-format
msgid "invalid owner for directory %s"
msgstr "perchennog annilys cyfeiriadur %s"
-#: ../urpm.pm:128
+#: ../urpm.pm:131
#, c-format
msgid "Can not download packages into %s"
msgstr "Methu llwytho pecynnau i lawr i %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:146
#, c-format
msgid "Environment directory %s does not exist"
msgstr "Nid yw cyfeiriadur amgylchedd %s yn bodoli"
-#: ../urpm.pm:144 ../urpmf:248 ../urpmq:167
+#: ../urpm.pm:147 ../urpmf:248 ../urpmq:167
#, c-format
msgid "using specific environment on %s\n"
msgstr "ddefnyddio amgylchedd penodol ar %s\n"
-#: ../urpm.pm:306
+#: ../urpm.pm:309
#, c-format
msgid "unable to open rpmdb"
msgstr "methu agor rpmdb"
-#: ../urpm.pm:320
+#: ../urpm.pm:323
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "enw ffeil rpm annilys [%s]"
-#: ../urpm.pm:326
+#: ../urpm.pm:329
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "adfer ffeil rpm (%s)..."
-#: ../urpm.pm:328 ../urpm/get_pkgs.pm:260
+#: ../urpm.pm:331 ../urpm/get_pkgs.pm:260
#, c-format
msgid "...retrieving done"
msgstr ".cwblhau adfer"
-#: ../urpm.pm:336
+#: ../urpm.pm:339
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "methu cael mynediad ffeil rpm (%s)"
-#: ../urpm.pm:341
+#: ../urpm.pm:344
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "methu didoli ffeil spec %s [%s]"
-#: ../urpm.pm:349
+#: ../urpm.pm:352
#, c-format
msgid "unable to register rpm file"
msgstr "methu cofrestr ffeil rpm"
-#: ../urpm.pm:351
+#: ../urpm.pm:354
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Saernïaeth anghydnaws ar gyfer rpm [%s]"
-#: ../urpm.pm:355
+#: ../urpm.pm:358
#, c-format
msgid "error registering local packages"
msgstr "gwall cofrestru pecynnau lleol"
-#: ../urpm.pm:443
+#: ../urpm.pm:446
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Mae'r weithred yn waharddedig wrth redeg ym modd cyfyngedig"
@@ -509,54 +509,54 @@ msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
-#: ../urpm/args.pm:388
+#: ../urpm/args.pm:381
#, c-format
msgid "unexpected expression %s"
msgstr "mynegiadau annisgwyl %s"
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:382
#, c-format
msgid "missing expression before %s"
msgstr "mynegiad coll cyn %s"
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:388
#, c-format
msgid "unexpected expression %s (suggestion: use -a or -o ?)"
msgstr "mynegiad annisgwyl %s (awgrym: defnyddio -a neu-0 ?)"
-#: ../urpm/args.pm:399
+#: ../urpm/args.pm:392
#, c-format
msgid "no expression to close"
msgstr "dim mynegiad i'w gau"
-#: ../urpm/args.pm:408
+#: ../urpm/args.pm:401
#, c-format
msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
msgstr ""
"drwy ragosodiad mae urmpf yn disgwyl regexp, dylech ddefnyddio dewis \"--"
"literal\""
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:475
#, c-format
msgid "chroot directory doesn't exist"
msgstr "Nid yw cyfeiriadur chroot yn bodoli"
-#: ../urpm/args.pm:505
+#: ../urpm/args.pm:498
#, c-format
msgid "Can't use %s without %s"
msgstr "Methu defnyddio %s heb %s"
-#: ../urpm/args.pm:508 ../urpm/args.pm:511 ../urpmq:159
+#: ../urpm/args.pm:501 ../urpm/args.pm:504 ../urpmq:159
#, c-format
msgid "Can't use %s with %s"
msgstr "Methu defnyddio %s gyda %s"
-#: ../urpm/args.pm:519
+#: ../urpm/args.pm:512
#, c-format
msgid "Too many arguments\n"
msgstr "Gormod o ymresymiadau\n"
-#: ../urpm/bug_report.pm:55 ../urpmi:274
+#: ../urpm/bug_report.pm:55 ../urpmi:259
#, c-format
msgid "Copying failed"
msgstr "Methodd y copïo"
@@ -575,12 +575,12 @@ msgstr ""
msgid "Udisks daemon (udisks-daemon) is not running or not ready"
msgstr "Nid yw'r Udisks daemon (udisks-daemon) yn rhedeg neu nid yw'n barod"
-#: ../urpm/cdrom.pm:162 ../urpm/cdrom.pm:167
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
#, c-format
msgid "medium \"%s\" is not available"
msgstr "nid yw cyfrwng \"%s\" ar gael"
-#: ../urpm/cdrom.pm:206
+#: ../urpm/cdrom.pm:205
#, c-format
msgid "unable to read rpm file [%s] from medium \"%s\""
msgstr "methu darllen ffeil rpm (%s) o gyfrwng \"%s\""
@@ -605,239 +605,136 @@ msgstr "mae cyfrwng '%s' wedi ei ddiffinio ddwy waith, cau"
msgid "unable to write config file [%s]"
msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)"
-#: ../urpm/download.pm:82
+#: ../urpm/download.pm:83
#, 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:165
+#: ../urpm/download.pm:166
#, c-format
msgid "can not read proxy settings (not enough rights to read %s)"
msgstr "methu darllen y gosodiadau dirprwy (dim digon o hawl i ddarllen %s)"
-#: ../urpm/download.pm:190
+#: ../urpm/download.pm:191
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr "Rhowch eich hawliau ar gyfer cael mynediad i ddirprwy\n"
-#: ../urpm/download.pm:191
+#: ../urpm/download.pm:192
#, c-format
msgid "User name:"
msgstr "Enw Defnyddiwr"
-#: ../urpm/download.pm:191
+#: ../urpm/download.pm:192
#, c-format
msgid "Password:"
msgstr "Cyfrinair:"
-#: ../urpm/download.pm:267
+#: ../urpm/download.pm:268
#, c-format
msgid "Unknown webfetch `%s' !!!\n"
msgstr "Webfetch anhysbys '%s' !!!\n"
-#: ../urpm/download.pm:275
+#: ../urpm/download.pm:276
#, c-format
msgid "%s failed: exited with signal %d"
msgstr "Methodd '%s': gadael gydag arwydd %d"
-#: ../urpm/download.pm:276
+#: ../urpm/download.pm:277
#, c-format
msgid "%s failed: exited with %d"
msgstr "Methodd '%s': gadael gyda %d"
-#: ../urpm/download.pm:310
+#: ../urpm/download.pm:311
#, c-format
msgid "copy failed"
msgstr "methodd y copïo"
-#: ../urpm/download.pm:316
+#: ../urpm/download.pm:317
#, c-format
msgid "wget is missing\n"
msgstr "mae wget ar goll\n"
-#: ../urpm/download.pm:383
+#: ../urpm/download.pm:384
#, c-format
msgid "curl is missing\n"
msgstr "mae curl ar goll\n"
-#: ../urpm/download.pm:519
+#: ../urpm/download.pm:520
#, c-format
msgid "curl failed: upload canceled\n"
msgstr "methodd curl: diddymwyd y llwytho\n"
-#: ../urpm/download.pm:520
+#: ../urpm/download.pm:521
#, c-format
msgid "curl failed: download canceled\n"
msgstr "methodd curl: diddymwyd y llwytho i lawr\n"
-#: ../urpm/download.pm:555
+#: ../urpm/download.pm:556
#, c-format
msgid "rsync is missing\n"
msgstr "rsync ar goll\n"
-#: ../urpm/download.pm:623
+#: ../urpm/download.pm:624
#, c-format
msgid "ssh is missing\n"
msgstr "ssh ar goll\n"
-#: ../urpm/download.pm:642
+#: ../urpm/download.pm:643
#, c-format
msgid "prozilla is missing\n"
msgstr "prozilla ar goll\n"
-#: ../urpm/download.pm:658
+#: ../urpm/download.pm:659
#, c-format
msgid "Couldn't execute prozilla\n"
msgstr "Methu gweithredu prozilla\n"
-#: ../urpm/download.pm:668
+#: ../urpm/download.pm:669
#, c-format
msgid "aria2 is missing\n"
msgstr "aria2 ar goll\n"
-#: ../urpm/download.pm:712
+#: ../urpm/download.pm:713
#, c-format
msgid "Failed to download %s"
msgstr "Methu llwytho %s i lawr"
-#: ../urpm/download.pm:807
+#: ../urpm/download.pm:808
#, 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:808
+#: ../urpm/download.pm:809
#, c-format
msgid " %s%% completed, speed = %s"
msgstr " %s%% wedi ei gwblhau, cyflymder = %s"
-#: ../urpm/download.pm:882
+#: ../urpm/download.pm:883
#, c-format
msgid "retrieving %s"
msgstr "estyn %s"
-#: ../urpm/download.pm:889
+#: ../urpm/download.pm:890
#, c-format
msgid "retrieved %s"
msgstr "estynwyd: %s"
-#: ../urpm/download.pm:953
+#: ../urpm/download.pm:954
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocol anhysbys ar gyfer %s"
-#: ../urpm/download.pm:967
+#: ../urpm/download.pm:968
#, 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:982
+#: ../urpm/download.pm:983
#, c-format
msgid "unable to handle protocol: %s"
msgstr "methu trin protocol: %s"
-#: ../urpm/dudf.pm:195
-#, fuzzy, c-format
-msgid ""
-"# Here are logs of your DUDF uploads.\n"
-"# Line format is : <date time of generation> <uid>\n"
-"# You can use uids to see the content of your uploads at this url :\n"
-"# %s"
-msgstr ""
-"# Dyma gofnod eich llwythi DUDF.\n"
-"# Fformat llinell yw : <dyddiad amser cynhyrchu> <uid>\n"
-"# Mae modd defnyddio You can use uids to see the content of your uploads at "
-"this url :\n"
-"# http://dudf.forge.mandriva.com/"
-
-#: ../urpm/dudf.pm:239
-#, c-format
-msgid "curl is missing, cannot upload DUDF file.\n"
-msgstr "mae curl ar goll, methu llwytho ffeil DUDF.\n"
-
-#: ../urpm/dudf.pm:242
-#, c-format
-msgid "Compressing DUDF data... "
-msgstr "Cywasgu data DUDF..."
-
-#: ../urpm/dudf.pm:244 ../urpm/dudf.pm:245
-#, c-format
-msgid "NOT OK\n"
-msgstr "NID YN IAWN\n"
-
-#: ../urpm/dudf.pm:253 ../urpm/dudf.pm:487
-#, c-format
-msgid "OK\n"
-msgstr "IAWN\n"
-
-#: ../urpm/dudf.pm:255
-#, c-format
-msgid "Uploading DUDF data:\n"
-msgstr "Llwytho data DUDF:\n"
-
-#: ../urpm/dudf.pm:276
-#, c-format
-msgid ""
-"\n"
-"You can see your DUDF report at the following URL :\n"
-"\t"
-msgstr ""
-"\n"
-"Mae eich adroddiad DUDF i’w weld yn yr URL canlynol :\n"
-"\t"
-
-#: ../urpm/dudf.pm:279
-#, fuzzy, c-format
-msgid ""
-"You can access a log of your uploads in\n"
-"\t"
-msgstr ""
-"Mae modd cael cofnod o'ch llwythi yn\n"
-"\t"
-
-#: ../urpm/dudf.pm:360 ../urpm/msg.pm:76 ../urpmi:512 ../urpmi:528
-#: ../urpmi:635
-#, c-format
-msgid "Nn"
-msgstr "Nn"
-
-#: ../urpm/dudf.pm:361
-#, c-format
-msgid ""
-"A problem has been encountered. You can help Mandriva to improve package\n"
-"installation by uploading a DUDF report file.\n"
-"This is a part of the Mancoosi european research project.\n"
-"More at http://www.mancoosi.org\n"
-msgstr ""
-"Cafwyd anhawster. Mae modd cynorthwyo Mandriva i wella gosodiad\n"
-"pecynnau drwy lwytho ffeil adrodd DUDF.\n"
-"Mae hyn yn rhan o Mancoosi European Research Project.\n"
-"Rhagor yn http://www.mancoosi.org\n"
-
-#: ../urpm/dudf.pm:362
-#, fuzzy, c-format
-msgid "Do you want to upload a DUDF report to Mandriva?"
-msgstr "Hoffech chi lwytho adroddiad DUDF i Mandriva ?"
-
-#: ../urpm/dudf.pm:363 ../urpmi:515 ../urpmi:531 ../urpmi:636
-#: ../urpmi.addmedia:136
-#, c-format
-msgid " (Y/n) "
-msgstr " (Y/n) "
-
-#: ../urpm/dudf.pm:364
-#, c-format
-msgid ""
-"\n"
-"Generating DUDF... "
-msgstr ""
-"\n"
-"Cynhyrchu DUDF... "
-
-#: ../urpm/dudf.pm:491
-#, fuzzy, c-format
-msgid "Cannot write DUDF file.\n"
-msgstr "Methu ysgrifennu'r ffeil DUDF"
-
#: ../urpm/get_pkgs.pm:16
#, c-format
msgid "cleaning %s and %s"
@@ -1352,6 +1249,11 @@ msgstr "wedi canfod geolleoleiddio %s %.2f %.2f o gylchfa amser %s"
msgid "getting mirror list from %s"
msgstr "estyn rhestr drychai o %s"
+#: ../urpm/msg.pm:76 ../urpmi:495 ../urpmi:510 ../urpmi:613
+#, c-format
+msgid "Nn"
+msgstr "Nn"
+
# This is a list of chars acceptable as a 'yes' answer to a Yes/No question;
# you can put here the letters for 'yes' for your language, so people
# can hit those keys in their keyboard to reply.
@@ -1565,57 +1467,57 @@ msgid ""
msgstr ""
"ail gychwynnwyd urpmi, ac mae'r rhestr prif pecynnau wedi newid: %s vs %s"
-#: ../urpm/select.pm:176
+#: ../urpm/select.pm:186
#, c-format
msgid "No package named %s"
msgstr "Dim pecyn o'r enw %s"
-#: ../urpm/select.pm:178 ../urpme:117
+#: ../urpm/select.pm:188 ../urpme:117
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
-#: ../urpm/select.pm:180
+#: ../urpm/select.pm:190
#, c-format
msgid "You should use \"-a\" to use all of them"
msgstr "Dylech ddefnyddio \"-a\" i'w defnyddio i gyd"
-#: ../urpm/select.pm:298
+#: ../urpm/select.pm:308
#, c-format
msgid "found package(s) %s in urpmi db, but none are installed"
msgstr "wedi canfod pecyn(nau) %s yn urpmi db, ond heb eu gosod"
-#: ../urpm/select.pm:545
+#: ../urpm/select.pm:555
#, c-format
msgid "Package %s is already installed"
msgstr "Pecyn %s wedi ei osod eisoes"
-#: ../urpm/select.pm:546
+#: ../urpm/select.pm:556
#, c-format
msgid "Packages %s are already installed"
msgstr "Pecynnau %s wedi eu gosod eisoes"
-#: ../urpm/select.pm:563 ../urpm/select.pm:650
+#: ../urpm/select.pm:573 ../urpm/select.pm:660
#, c-format
msgid "due to conflicts with %s"
msgstr "oherwydd gwrthdaro gyda %s"
-#: ../urpm/select.pm:564 ../urpm/select.pm:644
+#: ../urpm/select.pm:574 ../urpm/select.pm:654
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s heb ei foddloni"
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:580
#, c-format
msgid "trying to promote %s"
msgstr "ceisio hybu %s"
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:581
#, c-format
msgid "in order to keep %s"
msgstr "fel modd i gadw %s"
-#: ../urpm/select.pm:612
+#: ../urpm/select.pm:622
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
@@ -1624,7 +1526,7 @@ msgstr ""
"Rhaid i'r pecyn canlynol gael ei dynnu i eraill gael eu diweddaru.\n"
"%s"
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:623
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1633,12 +1535,12 @@ msgstr ""
"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
"%s"
-#: ../urpm/select.pm:640
+#: ../urpm/select.pm:650
#, c-format
msgid "in order to install %s"
msgstr "er mwyn gosod %s"
-#: ../urpm/select.pm:646
+#: ../urpm/select.pm:656
#, c-format
msgid "due to missing %s"
msgstr "oherwydd %s coll"
@@ -1724,13 +1626,13 @@ msgstr " --auto-orphans - tynnu amddifad\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - gwirio os oes modd tynnu'n iawn.\n"
-#: ../urpme:51 ../urpmi:117 ../urpmq:70
+#: ../urpme:51 ../urpmi:108 ../urpmq:70
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
" --parallel - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
-#: ../urpme:52 ../urpmi:151
+#: ../urpme:52 ../urpmi:142
#, c-format
msgid " --repackage - Re-package the files before erasing\n"
msgstr " --repackage - Ailbecynnu'r ffeiliau cyn eu dileu\n"
@@ -1740,7 +1642,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:54 ../urpmf:40 ../urpmi:119 ../urpmi.addmedia:73
+#: ../urpme:54 ../urpmf:40 ../urpmi:110 ../urpmi.addmedia:73
#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:72
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
@@ -1748,7 +1650,7 @@ msgstr ""
" --urpmi-root - defnyddio root arall ar gyfer gosod urpmi db ac "
"rpm.\n"
-#: ../urpme:55 ../urpmi:109
+#: ../urpme:55 ../urpmi:100
#, c-format
msgid " --justdb - update only the rpm db, not the filesystem.\n"
msgstr " --justdb - diweddaru'n unig db yr rpm, nid y system ffeilio.\n"
@@ -1767,7 +1669,7 @@ msgstr ""
" --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
" wrth (ddad)osod chroot gyda dewis --root.\n"
-#: ../urpme:59 ../urpmi:162 ../urpmq:91
+#: ../urpme:59 ../urpmi:153 ../urpmq:91
#, c-format
msgid " --verbose, -v - verbose mode.\n"
msgstr " --verbose, -v - modd llafar.\n"
@@ -1867,14 +1769,14 @@ msgstr ""
msgid " --version - print this tool's version number.\n"
msgstr " --version - argraffu rhif fersiwn yr offeryn.\n"
-#: ../urpmf:37 ../urpmi:141 ../urpmq:82
+#: ../urpmf:37 ../urpmi:132 ../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:82 ../urpmq:49
+#: ../urpmf:38 ../urpmi:73 ../urpmq:49
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
@@ -1888,7 +1790,7 @@ msgstr ""
" --literal, -l - peidio cydweddu patrymau, defnyddio ymresymiad fel llinyn "
"llythrennedd.\n"
-#: ../urpmf:42 ../urpmi:85 ../urpmq:50
+#: ../urpmf:42 ../urpmi:76 ../urpmq:50
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1902,7 +1804,7 @@ msgid " --use-distrib - use the given path to access media\n"
msgstr ""
" --use-distrib - defnyddio'r llwybr yma i gael mynediad ar y cyfrwng.\n"
-#: ../urpmf:44 ../urpmi:86 ../urpmq:51
+#: ../urpmf:44 ../urpmi:77 ../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"
@@ -1912,7 +1814,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:74 ../urpmq:46
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - defnyddio cyfrwng diweddaru'n unig.\n"
@@ -2142,45 +2044,45 @@ msgstr "adeiladu ffeil synthesis file ar gyfer cyfrwng \"%s\""
msgid "no xml-info available for medium \"%s\""
msgstr "dim xml-info ar gyfer cyfrwng \"%s\""
-#: ../urpmi:89
+#: ../urpmi:80
#, 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:81
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - analluogi gwirio ffeil MD5SUM.\n"
-#: ../urpmi:91
+#: ../urpmi:82
#, c-format
msgid " --force-key - force update of gpg key.\n"
msgstr " --force-key - gorfodi diweddaru allwedd gpg.\n"
-#: ../urpmi:92
+#: ../urpmi:83
#, c-format
msgid " --auto-orphans - remove orphans without asking\n"
msgstr " --auto-orphans - tynnu'r amddifad heb ofyn\n"
-#: ../urpmi:93 ../urpmq:56
+#: ../urpmi:84 ../urpmq:56
#, c-format
msgid " --no-suggests - do not auto select \"suggested\" packages.\n"
msgstr " --no-suggests - peidio awto ddewis pecynnau \"suggested\" .\n"
-#: ../urpmi:94
+#: ../urpmi:85
#, 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:95
+#: ../urpmi:86
#, 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:96 ../urpmq:58
+#: ../urpmi:87 ../urpmq:58
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -2189,7 +2091,7 @@ msgstr ""
" --keep - cadw'r pecynnau presennol os yn bosibl, gwrthod\n"
" pecynnau sy'n arwain at dynnu.\n"
-#: ../urpmi:98
+#: ../urpmi:89
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -2201,44 +2103,44 @@ msgstr ""
" eu gosod neu eu uwchraddio\n"
" rhagosodiad yw %d.\n"
-#: ../urpmi:102
+#: ../urpmi:93
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - hyd drosglwyddiad byr, rhagosodiad yw %d.\n"
-#: ../urpmi:104
+#: ../urpmi:95
#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
msgstr " --fuzzy - mynnu chwiliad bras.\n"
-#: ../urpmi:105
+#: ../urpmi:96
#, c-format
msgid " --buildrequires - install the buildrequires of the packages\n"
msgstr " --buildrequires - gosod buildrequires y pecynnau\n"
-#: ../urpmi:106
+#: ../urpmi:97
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
-#: ../urpmi:107
+#: ../urpmi:98
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - tynnu rpm o'r storfa cyn unrhyw beth arall.\n"
-#: ../urpmi:108
+#: ../urpmi:99
#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - peidio glanhau rpm o'r storfa.\n"
-#: ../urpmi:110
+#: ../urpmi:101
#, c-format
msgid ""
" --replacepkgs - force installing packages which are already installed.\n"
msgstr " --replacepkgs - gorfodi gosod pecynnau sydd wedi eu gosod eisoes.\n"
-#: ../urpmi:112
+#: ../urpmi:103
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -2247,7 +2149,7 @@ msgstr ""
" --allow-nodeps - caniatáu gofyn i ddefnyddiwr i osod pecynnau heb\n"
" wirio dibyniaethau.\n"
-#: ../urpmi:114
+#: ../urpmi:105
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -2256,12 +2158,12 @@ msgstr ""
" --allow-force - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n"
" wirio dibyniaethau na'u cyfanrwydd.\n"
-#: ../urpmi:116
+#: ../urpmi:107
#, c-format
msgid " --allow-suggests - auto select \"suggested\" packages.\n"
msgstr " --allow-suggests - awto ddewis pecynnau \"awgrymwyd\".\n"
-#: ../urpmi:120
+#: ../urpmi:111
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -2270,19 +2172,19 @@ msgstr ""
" --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
" wrth osod chroot gyda dewis o --root.\n"
-#: ../urpmi:122 ../urpmi.addmedia:60 ../urpmi.update:37
+#: ../urpmi:113 ../urpmi.addmedia:60 ../urpmi.update:37
#, c-format
msgid " --metalink - generate and use a local metalink.\n"
msgstr " --metalink - cynhyrchu a defnyddio metalink lleol.\n"
-#: ../urpmi:123
+#: ../urpmi:114
#, c-format
msgid ""
" --download-all - download all needed packages before trying to install "
"them\n"
msgstr ""
-#: ../urpmi:124
+#: ../urpmi:115
#, c-format
msgid ""
" --downloader - program to use to retrieve distant files. \n"
@@ -2291,37 +2193,37 @@ msgstr ""
" --downloader - rhaglen i'w defnyddio ar gyfer estyn ffeiliau pell. \n"
" rhaglenni hysbys: %s\n"
-#: ../urpmi:127
+#: ../urpmi:118
#, c-format
msgid " --curl-options - additional options to pass to curl\n"
msgstr " --curl-options - dewis ychwanegol wrth ddefnyddio curl\n"
-#: ../urpmi:128
+#: ../urpmi:119
#, c-format
msgid " --rsync-options- additional options to pass to rsync\n"
msgstr " --rsync-options- dewis ychwanegol wrth ddefnyddio rsync\n"
-#: ../urpmi:129
+#: ../urpmi:120
#, c-format
msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - dewis ychwanegol wrth ddefnyddio wget\n"
-#: ../urpmi:130
+#: ../urpmi:121
#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
msgstr " --cprozilla-options - dewis ychwanegol wrth ddefnyddio prozilla\n"
-#: ../urpmi:131
+#: ../urpmi:122
#, c-format
msgid " --aria2-options - additional options to pass to aria2\n"
msgstr " --aria2-options -dewis ychwanegol i'w estyn i aria2\n"
-#: ../urpmi:132 ../urpmi.addmedia:61 ../urpmi.update:38
+#: ../urpmi:123 ../urpmi.addmedia:61 ../urpmi.update:38
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - cyfyngu cyflymder y llwytho i lawr.\n"
-#: ../urpmi:133
+#: ../urpmi:124
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -2330,7 +2232,7 @@ msgstr ""
" --verify-rpm - gwirio llofnod rpm cyn gosod\n"
" (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
-#: ../urpmi:135 ../urpmi.addmedia:62 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:126 ../urpmi.addmedia:62 ../urpmi.update:39 ../urpmq:78
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -2339,7 +2241,7 @@ msgstr ""
" --proxy - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
" rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
-#: ../urpmi:137 ../urpmi.addmedia:64 ../urpmi.update:41 ../urpmq:80
+#: ../urpmi:128 ../urpmi.addmedia:64 ../urpmi.update:41 ../urpmq:80
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -2348,7 +2250,7 @@ msgstr ""
" --proxy-user - enwi defnyddiwr a chyfrinair i'w ddefnyddio fel y\n"
" dilysiad dirprwy (fformat yw <user:password>).\n"
-#: ../urpmi:139
+#: ../urpmi:130
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -2357,47 +2259,47 @@ msgstr ""
" --bug - cynhyrchu adroddiad gwall i'r cyfeiriadur nodir gan\n"
" yr arg. nesaf\n"
-#: ../urpmi:145
+#: ../urpmi:136
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - eithrio llwybr wedi ei wahanu a chollnod.\n"
-#: ../urpmi:146
+#: ../urpmi:137
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - eithrio ffeiliau docs.\n"
-#: ../urpmi:147
+#: ../urpmi:138
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr " --ignoresize - peidio gwirio maint ar ddisg cyn gosod.\n"
-#: ../urpmi:148
+#: ../urpmi:139
#, 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:149
+#: ../urpmi:140
#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
msgstr " --noscripts - peidio gweithredu sgripledi pecyn(au)\n"
-#: ../urpmi:150
+#: ../urpmi:141
#, c-format
msgid " --replacefiles - ignore file conflicts\n"
msgstr " --replacefiles - anwybyddu gwrthdaro ffeiliau\n"
-#: ../urpmi:152
+#: ../urpmi:143
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pecynnau dylid osgoi eu gosod.\n"
-#: ../urpmi:153
+#: ../urpmi:144
#, c-format
msgid " --prefer - packages which should be preferred\n"
msgstr " --prefer - pecynnau angenrheidiol\n"
-#: ../urpmi:154
+#: ../urpmi:145
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -2407,45 +2309,45 @@ msgstr ""
"ddewis\n"
" na'r rhagosodiad.\n"
-#: ../urpmi:156
+#: ../urpmi:147
#, c-format
msgid " --nolock - don't lock rpm db.\n"
msgstr " --nolock - peidio cloi db rpm.\n"
-#: ../urpmi:157
+#: ../urpmi:148
#, 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:158 ../urpmq:99
+#: ../urpmi:149 ../urpmq:99
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - dewis pob cydweddiad ar y llinell gorchymyn.\n"
-#: ../urpmi:161
+#: ../urpmi:152
#, c-format
msgid " --quiet, -q - quiet mode.\n"
msgstr " --quiet, -q - modd distaw.\n"
-#: ../urpmi:163
+#: ../urpmi:154
#, c-format
msgid " --debug - very verbose mode.\n"
msgstr " - --debug - modd llafar iawn.\n"
-#: ../urpmi:164
+#: ../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:198
+#: ../urpmi:183
#, 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:205
+#: ../urpmi:190
#, c-format
msgid ""
"Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2455,29 +2357,29 @@ msgstr ""
"arferol\n"
"ynghyd a --bug.\n"
-#: ../urpmi:235
+#: ../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:236
+#: ../urpmi:221
#, c-format
msgid "You can't install spec files"
msgstr "Nid oes modd gosod ffeiliau spec"
-#: ../urpmi:243
+#: ../urpmi:228
#, c-format
msgid "defaulting to --buildrequires"
msgstr "rhagosod --buildrequires"
-#: ../urpmi:248
+#: ../urpmi:233
#, c-format
msgid ""
"please use --buildrequires or --install-src, defaulting to --buildrequires"
msgstr ""
"defnyddiwch --buildrequires neu --install-src, yn rhagosod i --buildrequires"
-#: ../urpmi:268
+#: ../urpmi:253
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -2486,12 +2388,12 @@ msgstr ""
"Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
"adroddiad gwall neu ei ddileu."
-#: ../urpmi:269
+#: ../urpmi:254
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
-#: ../urpmi:290
+#: ../urpmi:275
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -2501,42 +2403,42 @@ msgstr ""
"Defnydd --allow-force gorfodaeth i orfodi gweithred."
#. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:446
+#: ../urpmi:429
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (uwchraddio)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:431
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (uwchraddio)"
#. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:452
+#: ../urpmi:435
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (gosod)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:454
+#: ../urpmi:437
#, c-format
msgid "%s (to install)"
msgstr "%s (gosod)"
-#: ../urpmi:460
+#: ../urpmi:443
#, c-format
msgid ""
"In order to satisfy the '%s' dependency, one of the following packages is "
"needed:"
msgstr "I fodloni '%s' dibyniaeth, bydd angen un o'r pecynnau canlynol:"
-#: ../urpmi:463
+#: ../urpmi:446
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Beth yw eich dewis? (1-%d)"
-#: ../urpmi:505
+#: ../urpmi:488
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
@@ -2547,7 +2449,7 @@ msgstr ""
"sy'n hyn na'r rhai sydd wedi eu gosod:\n"
"%s"
-#: ../urpmi:507
+#: ../urpmi:490
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -2558,7 +2460,7 @@ msgstr ""
"sy'n hyn na'r rhai sydd wedi eu gosod:\n"
"%s"
-#: ../urpmi:514 ../urpmi:530
+#: ../urpmi:496 ../urpmi:511
#, c-format
msgid ""
"\n"
@@ -2567,7 +2469,12 @@ msgstr ""
"\n"
"Parhau i osod beth bynnag?"
-#: ../urpmi:523
+#: ../urpmi:497 ../urpmi:512 ../urpmi:614 ../urpmi.addmedia:136
+#, c-format
+msgid " (Y/n) "
+msgstr " (Y/n) "
+
+#: ../urpmi:505
#, c-format
msgid ""
"A requested package cannot be installed:\n"
@@ -2576,7 +2483,7 @@ msgstr ""
"Nid oes modd gosod pecyn gofynnwyd amdani:\n"
"%s"
-#: ../urpmi:524
+#: ../urpmi:506
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -2585,12 +2492,12 @@ msgstr ""
"Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
"%s"
-#: ../urpmi:542
+#: ../urpmi:523
#, c-format
msgid "removing package %s will break your system"
msgstr "bydd tynnu pecynnau %s yn torri'r system"
-#: ../urpmi:550
+#: ../urpmi:531
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
@@ -2601,7 +2508,7 @@ msgstr ""
"gael ei dynnu i eraill gael eu diweddaru.\n"
"%s\n"
-#: ../urpmi:552
+#: ../urpmi:533
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -2612,12 +2519,12 @@ msgstr ""
"gael eu tynnu i eraill gael eu diweddaru.\n"
"%s\n"
-#: ../urpmi:561
+#: ../urpmi:541
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(prawf yn unig, ni fydd yn cael ei ddadosod)"
-#: ../urpmi:580
+#: ../urpmi:560
#, c-format
msgid ""
"You must first call urpmi with --buildrequires to install the following "
@@ -2628,46 +2535,46 @@ msgstr ""
"canlynol:\n"
"%s\n"
-#: ../urpmi:590
+#: ../urpmi:570
#, c-format
msgid "The following orphan package will be removed."
msgid_plural "The following orphan packages will be removed."
msgstr[0] "Bydd y pecyn amddifad canlynol yn cael ei dynnu"
msgstr[1] "Bydd y pecynnau amddifad canlynol yn cael eu tynnu"
-#: ../urpmi:618
+#: ../urpmi:596
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(prawf yn unig, ni fydd yn cael ei osod)"
-#: ../urpmi:624
+#: ../urpmi:602
#, c-format
msgid "%s of additional disk space will be used."
msgstr "Bydd %s o le ychwanegol ar ddisg yn cael ei ddefnyddio."
-#: ../urpmi:625
+#: ../urpmi:603
#, c-format
msgid "%s of disk space will be freed."
msgstr "Bydd %s o le ar ddisg ar gael."
-#: ../urpmi:626
+#: ../urpmi:604
#, c-format
msgid "%s of packages will be retrieved."
msgstr "bydd %s o becynnau yn cael eu hadfer."
-#: ../urpmi:627
+#: ../urpmi:605
#, 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:650
+#: ../urpmi:626
#, c-format
msgid "Cancel"
msgstr "Dileu"
-#: ../urpmi:658
+#: ../urpmi:634
#, c-format
msgid "Press Enter when mounted..."
msgstr "Pwyso Enter pan wedi ei arosod..."
@@ -3439,12 +3346,83 @@ msgid "No changelog found\n"
msgstr "Heb ganfod changelog\n"
#: ../gurpmi.desktop.in.h:1
+msgid "Graphical front end to install RPM files"
+msgstr "Blaen graffigol ar gyfer gosod ffeiliau RPM"
+
+#: ../gurpmi.desktop.in.h:2
msgid "Software Installer"
msgstr "Gosodwr Meddalwedd"
-#: ../gurpmi.desktop.in.h:2
-msgid "Graphical front end to install RPM files"
-msgstr "Blaen graffigol ar gyfer gosod ffeiliau RPM"
+#, fuzzy
+#~ msgid ""
+#~ "# Here are logs of your DUDF uploads.\n"
+#~ "# Line format is : <date time of generation> <uid>\n"
+#~ "# You can use uids to see the content of your uploads at this url :\n"
+#~ "# %s"
+#~ msgstr ""
+#~ "# Dyma gofnod eich llwythi DUDF.\n"
+#~ "# Fformat llinell yw : <dyddiad amser cynhyrchu> <uid>\n"
+#~ "# Mae modd defnyddio You can use uids to see the content of your uploads "
+#~ "at this url :\n"
+#~ "# http://dudf.forge.mandriva.com/"
+
+#~ msgid "curl is missing, cannot upload DUDF file.\n"
+#~ msgstr "mae curl ar goll, methu llwytho ffeil DUDF.\n"
+
+#~ msgid "Compressing DUDF data... "
+#~ msgstr "Cywasgu data DUDF..."
+
+#~ msgid "NOT OK\n"
+#~ msgstr "NID YN IAWN\n"
+
+#~ msgid "OK\n"
+#~ msgstr "IAWN\n"
+
+#~ msgid "Uploading DUDF data:\n"
+#~ msgstr "Llwytho data DUDF:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "You can see your DUDF report at the following URL :\n"
+#~ "\t"
+#~ msgstr ""
+#~ "\n"
+#~ "Mae eich adroddiad DUDF i’w weld yn yr URL canlynol :\n"
+#~ "\t"
+
+#, fuzzy
+#~ msgid ""
+#~ "You can access a log of your uploads in\n"
+#~ "\t"
+#~ msgstr ""
+#~ "Mae modd cael cofnod o'ch llwythi yn\n"
+#~ "\t"
+
+#~ msgid ""
+#~ "A problem has been encountered. You can help Mandriva to improve package\n"
+#~ "installation by uploading a DUDF report file.\n"
+#~ "This is a part of the Mancoosi european research project.\n"
+#~ "More at http://www.mancoosi.org\n"
+#~ msgstr ""
+#~ "Cafwyd anhawster. Mae modd cynorthwyo Mandriva i wella gosodiad\n"
+#~ "pecynnau drwy lwytho ffeil adrodd DUDF.\n"
+#~ "Mae hyn yn rhan o Mancoosi European Research Project.\n"
+#~ "Rhagor yn http://www.mancoosi.org\n"
+
+#, fuzzy
+#~ msgid "Do you want to upload a DUDF report to Mandriva?"
+#~ msgstr "Hoffech chi lwytho adroddiad DUDF i Mandriva ?"
+
+#~ msgid ""
+#~ "\n"
+#~ "Generating DUDF... "
+#~ msgstr ""
+#~ "\n"
+#~ "Cynhyrchu DUDF... "
+
+#, fuzzy
+#~ msgid "Cannot write DUDF file.\n"
+#~ msgstr "Methu ysgrifennu'r ffeil DUDF"
#~ msgid ""
#~ " --sources - give all source packages before downloading (root "