From 45a8cfefdd336d8b3a0daf25b9e76a92c8c3960b Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 23 Jul 2008 18:10:01 +0000 Subject: really sync with code (pixel sucks :-()) --- po/cy.po | 949 ++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 540 insertions(+), 409 deletions(-) (limited to 'po/cy.po') diff --git a/po/cy.po b/po/cy.po index 9b40471a..a00dd607 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: 2008-04-22 20:19+0200\n" +"POT-Creation-Date: 2008-07-10 21:25+0200\n" "PO-Revision-Date: 2008-03-17 19:40+0100\n" "Last-Translator: Rhoslyn Prys \n" "Language-Team: Cymraeg\n" @@ -20,22 +20,22 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n == 2) ? 1 : 0;\n" "X-Generator: KBabel 1.11.4\n" -#: ../gurpmi:30 ../gurpmi2:72 +#: ../gurpmi:32 ../gurpmi2:72 #, c-format msgid "RPM installation" msgstr "Gosod RPM" -#: ../gurpmi:44 +#: ../gurpmi:46 #, c-format msgid "Error: unable to find file %s, will cancel operation" msgstr "Gwall: methu canfod ffeil %s, diddymu'r weithred" -#: ../gurpmi:45 ../gurpmi2:166 ../gurpmi2:190 +#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190 #, c-format msgid "_Ok" msgstr "_Iawn" -#: ../gurpmi:65 +#: ../gurpmi:67 #, c-format msgid "" "You have selected a source package:\n" @@ -56,7 +56,7 @@ msgstr "" "\n" "Beth hoffech chi ei wneud?" -#: ../gurpmi:73 ../gurpmi:84 +#: ../gurpmi:75 ../gurpmi:86 #, c-format msgid "" "You are about to install the following software packages on your computer:\n" @@ -71,7 +71,7 @@ msgstr "" "\n" "Parhau?" -#: ../gurpmi:79 +#: ../gurpmi:81 #, c-format msgid "" "You are about to install the following software package on your computer:\n" @@ -86,27 +86,27 @@ msgstr "" "\n" "Efallai byddai'n well gennych ei gadw. Beth yw eich dewis?" -#: ../gurpmi:97 +#: ../gurpmi:99 #, c-format msgid "_Install" msgstr "_Gosod" -#: ../gurpmi:98 +#: ../gurpmi:100 #, c-format msgid "_Save" msgstr "_Cadw" -#: ../gurpmi:99 ../gurpmi2:166 +#: ../gurpmi:101 ../gurpmi2:166 #, c-format msgid "_Cancel" msgstr "_Dileu" -#: ../gurpmi:107 +#: ../gurpmi:109 #, c-format msgid "Choose location to save file" msgstr "Dewiswch leoliad i gadw'r ffeil" -#: ../gurpmi.pm:39 ../urpmi:69 +#: ../gurpmi.pm:39 ../urpmi:67 #, c-format msgid "" "urpmi version %s\n" @@ -127,13 +127,13 @@ msgstr "" msgid "Options:" msgstr "Dewisiadau:" -#: ../gurpmi.pm:46 ../urpme:45 ../urpmf:35 ../urpmi:74 ../urpmi.addmedia:54 +#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54 #: ../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:81 +#: ../gurpmi.pm:47 ../urpmi:79 #, c-format msgid "" " --auto - non-interactive mode, assume default answers to " @@ -142,13 +142,13 @@ msgstr "" " --auto - modd anrhyngweithiol, derbyn atebion rhagosodedig i " "gwestiynau.\n" -#: ../gurpmi.pm:48 ../urpmi:82 ../urpmq:52 +#: ../gurpmi.pm:48 ../urpmi:80 ../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:48 ../urpmi:104 ../urpmq:65 +#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66 #, c-format msgid "" " --force - force invocation even if some packages do not exist.\n" @@ -165,7 +165,7 @@ msgstr "" " --verify-rpm - gwirio llofnod rpm cyn gosod\n" " (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig).\n" -#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:75 ../urpmq:47 +#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../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" @@ -180,7 +180,7 @@ msgstr " -p - caniatáu i chwilio canfod pecyn.\n" 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:111 ../urpmq:68 +#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69 #, c-format msgid " --root - use another root for rpm installation.\n" msgstr " --root - defnyddio root arall ar gyfer gosod rpm.\n" @@ -192,7 +192,7 @@ msgid "" "correctly.\n" msgstr " --test - gwirio os oes modd gosod yn iawn.\n" -#: ../gurpmi.pm:57 ../urpmi:78 +#: ../gurpmi.pm:57 ../urpmi:76 #, c-format msgid "" " --searchmedia - use only the given media to search requested packages.\n" @@ -231,7 +231,7 @@ msgstr "" msgid "Warning" msgstr "Rhybudd" -#: ../gurpmi2:126 ../urpmi:638 +#: ../gurpmi2:126 ../urpmi:640 #, c-format msgid "Ok" msgstr "Iawn" @@ -272,13 +272,13 @@ msgstr "" "%s\n" "Parhau beth bynnag?" -#: ../gurpmi2:232 ../urpmi:604 +#: ../gurpmi2:232 ../urpmi:607 #, 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:233 ../urpmi:605 +#: ../gurpmi2:233 ../urpmi:608 #, c-format msgid "" "To satisfy dependencies, the following packages are going to be installed:" @@ -296,12 +296,12 @@ msgstr[1] "(%d pecyn, %d MB)" msgid "Package installation..." msgstr "Gosod y pecyn..." -#: ../gurpmi2:243 ../urpm/main_loop.pm:48 +#: ../gurpmi2:243 ../urpm/main_loop.pm:49 #, c-format msgid "unable to get source packages, aborting" msgstr "methu estyn pecynnau ffynhonnell, atal" -#: ../gurpmi2:257 ../urpm/install.pm:81 +#: ../gurpmi2:257 ../urpm/install.pm:88 #, c-format msgid "Preparing..." msgstr "Paratoi..." @@ -311,7 +311,7 @@ msgstr "Paratoi..." msgid "Installing package `%s' (%s/%s)..." msgstr "Gosod pecyn `%s' (%s/%s)..." -#: ../gurpmi2:278 ../urpmi:633 +#: ../gurpmi2:278 ../urpmi:635 #, c-format msgid "Please insert the medium named \"%s\"" msgstr "Rhowch gyfrwng \"%s\" yn y ddyfais" @@ -326,7 +326,7 @@ msgstr "Llwytho pecynnau i lawr ' %s'..." msgid "_Done" msgstr "_Gorffen" -#: ../gurpmi2:316 ../urpm/main_loop.pm:261 +#: ../gurpmi2:316 ../urpm/main_loop.pm:111 #, c-format msgid "" "Installation failed, some files are missing:\n" @@ -337,8 +337,8 @@ msgstr "" "%s\n" "Hoffech chi ddiweddaru eich cronfa ddata urpmi?" -#: ../gurpmi2:322 ../urpm/main_loop.pm:199 ../urpm/main_loop.pm:217 -#: ../urpm/main_loop.pm:235 +#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241 +#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282 #, c-format msgid "Installation failed:" msgstr "Methodd y gosod:" @@ -353,17 +353,17 @@ msgstr "Popeth wedi eu gosod eisoes" msgid "Installation finished" msgstr "Cwblhawyd y gosod" -#: ../gurpmi2:330 ../urpme:132 +#: ../gurpmi2:330 ../urpme:165 #, c-format msgid "removing %s" msgstr "tynnu %s" -#: ../gurpmi2:338 ../urpmi:692 +#: ../gurpmi2:338 ../urpmi:702 #, c-format msgid "restarting urpmi" msgstr "ailgychwyn urpmi" -#: ../rpm-find-leaves:14 +#: ../rpm-find-leaves:15 #, c-format msgid "" "usage: %s [options]\n" @@ -372,27 +372,27 @@ msgstr "" "usage: %s [dewisiadau]\n" "lle mae [dewisiadau] o\n" -#: ../rpm-find-leaves:16 +#: ../rpm-find-leaves:17 #, c-format msgid " -h|--help - print this help message.\n" msgstr " -h|--help - argraffu neges cymorth.\n" -#: ../rpm-find-leaves:17 +#: ../rpm-find-leaves:18 #, c-format msgid " --root - use the given root instead of /\n" msgstr " --root - defnyddio'r root hwn yn lle /\n" -#: ../rpm-find-leaves:18 +#: ../rpm-find-leaves:19 #, c-format msgid " -g [group] - restrict results to specified group.\n" msgstr " -g [group] - cyfyngu canlyniadau i'r grŵp.\n" -#: ../rpm-find-leaves:19 +#: ../rpm-find-leaves:20 #, c-format msgid " defaults to %s.\n" msgstr " rhagosodedig yw %s.\n" -#: ../rpm-find-leaves:20 +#: ../rpm-find-leaves:21 #, c-format msgid " -f - output rpm full name (NVRA)\n" msgstr " -f - allbynnu enw llawn rpm (NVRA)\n" @@ -407,125 +407,126 @@ msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau" msgid "Running urpmi in restricted mode..." msgstr "Rhedeg urpmi mewn modd cyfyngedig..." -#: ../urpm.pm:110 +#: ../urpm.pm:111 #, c-format msgid "fail to create directory %s" msgstr "methu creu cyfeiriadur %s" -#: ../urpm.pm:111 +#: ../urpm.pm:112 #, c-format msgid "invalid owner for directory %s" msgstr "perchennog annilys cyfeiriadur %s" -#: ../urpm.pm:233 +#: ../urpm.pm:258 #, c-format msgid "unable to open rpmdb" msgstr "methu agor rpmdb" -#: ../urpm.pm:247 +#: ../urpm.pm:272 #, c-format msgid "invalid rpm file name [%s]" msgstr "enw ffeil rpm annilys [%s]" -#: ../urpm.pm:253 +#: ../urpm.pm:278 #, c-format msgid "retrieving rpm file [%s] ..." msgstr "adfer ffeil rpm (%s)..." -#: ../urpm.pm:255 ../urpm/get_pkgs.pm:171 +#: ../urpm.pm:280 ../urpm/get_pkgs.pm:226 #, c-format msgid "...retrieving done" msgstr ".cwblhau adfer" -#: ../urpm.pm:258 ../urpm/download.pm:714 ../urpm/get_pkgs.pm:173 -#: ../urpm/media.pm:793 ../urpm/media.pm:1237 ../urpm/media.pm:1405 +#: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228 +#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419 +#: ../urpm/media.pm:1473 #, c-format msgid "...retrieving failed: %s" msgstr "... methodd ail-lwytho: %s" -#: ../urpm.pm:263 +#: ../urpm.pm:288 #, c-format msgid "unable to access rpm file [%s]" msgstr "methu cael mynediad ffeil rpm (%s)" -#: ../urpm.pm:268 +#: ../urpm.pm:293 #, c-format msgid "unable to parse spec file %s [%s]" msgstr "methu didoli ffeil spec %s [%s]" -#: ../urpm.pm:276 +#: ../urpm.pm:301 #, c-format msgid "unable to register rpm file" msgstr "methu cofrestr ffeil rpm" -#: ../urpm.pm:278 +#: ../urpm.pm:303 #, c-format msgid "Incompatible architecture for rpm [%s]" msgstr "Saernïaeth anghydnaws ar gyfer rpm [%s]" -#: ../urpm.pm:282 +#: ../urpm.pm:307 #, c-format msgid "error registering local packages" msgstr "gwall cofrestru pecynnau lleol" -#: ../urpm.pm:367 +#: ../urpm.pm:394 #, 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:142 ../urpm/args.pm:151 +#: ../urpm/args.pm:145 ../urpm/args.pm:154 #, c-format msgid "bad proxy declaration on command line\n" msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n" -#: ../urpm/args.pm:300 +#: ../urpm/args.pm:299 #, c-format msgid "urpmq: cannot read rpm file \"%s\"\n" msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n" -#: ../urpm/args.pm:377 +#: ../urpm/args.pm:376 #, fuzzy, c-format msgid "unexpected expression %s" msgstr "Mynegiadau patrymau:\n" -#: ../urpm/args.pm:378 +#: ../urpm/args.pm:377 #, fuzzy, c-format msgid "missing expression before %s" msgstr "Llofnod coll (%s)" -#: ../urpm/args.pm:384 +#: ../urpm/args.pm:383 #, c-format msgid "unexpected expression %s (suggestion: use -a or -o ?)" msgstr "" -#: ../urpm/args.pm:388 +#: ../urpm/args.pm:387 #, fuzzy, c-format msgid "no expression to close" msgstr "Mynegiadau patrymau:\n" -#: ../urpm/args.pm:397 +#: ../urpm/args.pm:396 #, 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:469 +#: ../urpm/args.pm:464 #, c-format msgid "chroot directory doesn't exist" msgstr "Nid yw cyfeiriadur chroot yn bodoli" -#: ../urpm/args.pm:488 +#: ../urpm/args.pm:483 #, c-format msgid "Can't use %s without %s" msgstr "Methu defnyddio %s heb %s" -#: ../urpm/args.pm:491 ../urpm/args.pm:494 +#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157 #, c-format msgid "Can't use %s with %s" msgstr "Methu defnyddio %s gyda %s" -#: ../urpm/args.pm:502 +#: ../urpm/args.pm:497 #, c-format msgid "Too many arguments\n" msgstr "Gormod o ymresymiadau\n" @@ -554,7 +555,7 @@ msgstr "" msgid "medium \"%s\" is not available" msgstr "nid yw cyfrwng \"%s\" ar gael" -#: ../urpm/cdrom.pm:207 +#: ../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\"" @@ -574,127 +575,127 @@ msgstr "Methu creu ffeil config (%s)" msgid "medium `%s' is defined twice, aborting" msgstr "mae cyfrwng '%s' wedi ei ddiffinio ddwy waith, cau" -#: ../urpm/cfg.pm:250 ../urpm/media.pm:456 ../urpm/media.pm:462 +#: ../urpm/cfg.pm:251 ../urpm/media.pm:486 ../urpm/media.pm:492 #, c-format msgid "unable to write config file [%s]" msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)" -#: ../urpm/download.pm:100 +#: ../urpm/download.pm:109 #, c-format msgid "can not read proxy settings (not enough rights to read %s)" msgstr "" -#: ../urpm/download.pm:125 +#: ../urpm/download.pm:134 #, 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:126 +#: ../urpm/download.pm:135 #, c-format msgid "User name:" msgstr "Enw Defnyddiwr" -#: ../urpm/download.pm:126 +#: ../urpm/download.pm:135 #, c-format msgid "Password:" msgstr "Cyfrinair:" -#: ../urpm/download.pm:210 +#: ../urpm/download.pm:219 #, c-format msgid "Unknown webfetch `%s' !!!\n" msgstr "Webfetch anhysbys '%s' !!!\n" -#: ../urpm/download.pm:219 +#: ../urpm/download.pm:228 #, c-format msgid "%s failed: exited with signal %d" msgstr "Methodd '%s': gadael gydag arwydd %d" -#: ../urpm/download.pm:220 +#: ../urpm/download.pm:229 #, c-format msgid "%s failed: exited with %d" msgstr "Methodd '%s': gadael gyda %d" -#: ../urpm/download.pm:249 +#: ../urpm/download.pm:258 #, c-format msgid "copy failed" msgstr "methodd y copïo" -#: ../urpm/download.pm:255 +#: ../urpm/download.pm:264 #, c-format msgid "wget is missing\n" msgstr "mae wget ar goll\n" -#: ../urpm/download.pm:322 +#: ../urpm/download.pm:331 #, c-format msgid "curl is missing\n" msgstr "mae curl ar goll\n" -#: ../urpm/download.pm:447 +#: ../urpm/download.pm:456 #, c-format msgid "curl failed: download canceled\n" msgstr "methodd curl: diddymwyd y llwytho i lawr\n" -#: ../urpm/download.pm:486 +#: ../urpm/download.pm:495 #, c-format msgid "rsync is missing\n" msgstr "rsync ar goll\n" -#: ../urpm/download.pm:552 +#: ../urpm/download.pm:563 #, c-format msgid "ssh is missing\n" msgstr "ssh ar goll\n" -#: ../urpm/download.pm:571 +#: ../urpm/download.pm:582 #, c-format msgid "prozilla is missing\n" msgstr "prozilla ar goll\n" -#: ../urpm/download.pm:587 +#: ../urpm/download.pm:598 #, c-format msgid "Couldn't execute prozilla\n" msgstr "Methu gweithredu prozilla\n" -#: ../urpm/download.pm:595 +#: ../urpm/download.pm:606 #, c-format msgid "aria2 is missing\n" msgstr "aria2 ar goll\n" -#: ../urpm/download.pm:698 +#: ../urpm/download.pm:718 #, 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:700 +#: ../urpm/download.pm:720 #, c-format msgid " %s%% completed, speed = %s" msgstr " %s%% wedi ei gwblhau, cyflymder = %s" -#: ../urpm/download.pm:763 +#: ../urpm/download.pm:783 #, c-format msgid "retrieving %s" msgstr "estyn %s" -#: ../urpm/download.pm:767 +#: ../urpm/download.pm:787 #, c-format msgid "retrieved %s" msgstr "estynwyd: %s" -#: ../urpm/download.pm:795 +#: ../urpm/download.pm:815 #, c-format msgid "unknown protocol defined for %s" msgstr "protocol anhysbys ar gyfer %s" -#: ../urpm/download.pm:815 +#: ../urpm/download.pm:836 #, 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:819 +#: ../urpm/download.pm:840 #, 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:840 +#: ../urpm/download.pm:866 #, c-format msgid "unable to handle protocol: %s" msgstr "methu trin protocol: %s" @@ -704,81 +705,74 @@ msgstr "methu trin protocol: %s" msgid "cleaning %s and %s" msgstr "glanhau %s ac %s" -#: ../urpm/get_pkgs.pm:101 +#: ../urpm/get_pkgs.pm:127 #, c-format msgid "package %s is not found." msgstr "heb ganfod pecyn %s" -#: ../urpm/get_pkgs.pm:149 -#, c-format -msgid "malformed URL: [%s]" -msgstr "URL gwallus: [%s]" - -#: ../urpm/get_pkgs.pm:160 -#, c-format -msgid "sorry, you can't use --install-src to install remote .src.rpm files" -msgstr "" -"nid oes modd ei ddefnyddio --install-src i osod y ffeiliau pell .src.rpm " -"files" +#: ../urpm/get_pkgs.pm:218 +#, fuzzy, c-format +msgid "Can not download packages into %s" +msgstr "Methu ysgrifennu i gyfeiriadur ailbacio [%s]\n" -#: ../urpm/get_pkgs.pm:167 +#: ../urpm/get_pkgs.pm:222 #, c-format msgid "retrieving rpm files from medium \"%s\"..." msgstr "adfer ffeiliau rpm o gyfrwng [%s]" -#: ../urpm/install.pm:88 +#: ../urpm/install.pm:95 #, c-format msgid "[repackaging]" msgstr "[ailbecynnu]" -#: ../urpm/install.pm:154 +#: ../urpm/install.pm:175 #, 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:157 +#: ../urpm/install.pm:178 #, c-format msgid "unable to create transaction" msgstr "methu creu trosglwyddiad." -#: ../urpm/install.pm:180 +#: ../urpm/install.pm:201 #, 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:214 #, c-format msgid "unable to install package %s" msgstr "methu gosod pecyn %s" -#: ../urpm/install.pm:196 +#: ../urpm/install.pm:217 #, c-format msgid "removing bad rpm (%s) from %s" msgstr "tynnu rpm gwallus (%s) o %s" -#: ../urpm/install.pm:197 ../urpm/install.pm:254 +#: ../urpm/install.pm:218 ../urpm/install.pm:275 #, c-format msgid "removing %s failed: %s" msgstr "tynnu %s methodd: %s" -#: ../urpm/install.pm:235 +#: ../urpm/install.pm:256 #, c-format msgid "Removing package %s" msgstr "Tynnu pecyn %s." -#: ../urpm/install.pm:236 +#: ../urpm/install.pm:257 #, c-format msgid "removing package %s" msgstr "tynnu pecyn %s." -#: ../urpm/install.pm:252 +#: ../urpm/install.pm:273 #, c-format msgid "removing installed rpms (%s) from %s" msgstr "tynnu rpm wedi eu gosod (%s) o %s" -#: ../urpm/install.pm:260 +#: ../urpm/install.pm:281 #, c-format msgid "More information on package %s" msgstr "Rhagor o wybodaeth ar becyn %s" @@ -823,158 +817,137 @@ msgstr "atal" msgid "%s database is locked (another program is already using it)" msgstr "Mae cronfa ddata %s wedi ei chloi (mae rhaglen arall yn ei defnyddio)" -#: ../urpm/main_loop.pm:113 +#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154 +#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248 +#, c-format +msgid "Installation failed" +msgstr "Methodd y gosod" + +#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122 +#, c-format +msgid "Try to go on anyway? (y/N) " +msgstr "" + +#: ../urpm/main_loop.pm:121 +#, c-format +msgid "" +"Installation failed, bad rpms:\n" +"%s" +msgstr "" +"Methodd y gosod, rpm gwallus:\n" +"%s" + +#: ../urpm/main_loop.pm:139 #, c-format msgid "The following package has bad signature" msgstr "Mae gan y pecyn canlynol lofnod gwallus" -#: ../urpm/main_loop.pm:114 +#: ../urpm/main_loop.pm:140 #, c-format msgid "The following packages have bad signatures" msgstr "Mae gan y pecynnau canlynol lofnod gwallus" -#: ../urpm/main_loop.pm:115 +#: ../urpm/main_loop.pm:141 #, c-format msgid "Do you want to continue installation ?" msgstr "Ydych chi am barhau gosod?" -#: ../urpm/main_loop.pm:128 ../urpm/main_loop.pm:206 ../urpm/main_loop.pm:224 -#, c-format -msgid "Installation failed" -msgstr "Methodd y gosod" - -#: ../urpm/main_loop.pm:132 +#: ../urpm/main_loop.pm:158 #, c-format msgid "removing installed rpms (%s)" msgstr "tynnu rpm wedi eu gosod (%s)" -#: ../urpm/main_loop.pm:152 +#: ../urpm/main_loop.pm:178 #, c-format msgid "distributing %s" msgstr "dosbarthu %s" -#: ../urpm/main_loop.pm:167 +#: ../urpm/main_loop.pm:193 #, c-format msgid "installing %s from %s" msgstr "gosod %s o %s" -#: ../urpm/main_loop.pm:169 +#: ../urpm/main_loop.pm:195 #, c-format msgid "installing %s" msgstr "gosod %s" -#: ../urpm/main_loop.pm:207 +#: ../urpm/main_loop.pm:231 #, c-format msgid "Try installation without checking dependencies? (y/N) " msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)" -#: ../urpm/main_loop.pm:225 +#: ../urpm/main_loop.pm:249 #, c-format msgid "Try harder to install (--force)? (y/N) " msgstr "Mwy o orfodaeth gyda'r gosod? (--force)? (y/N)" -#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:267 -#, c-format -msgid "Error" -msgstr "Gwall" - -#: ../urpm/main_loop.pm:267 -#, c-format -msgid "" -"Installation failed, bad rpms:\n" -"%s" -msgstr "" -"Methodd y gosod, rpm gwallus:\n" -"%s" - -#: ../urpm/main_loop.pm:273 -#, 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:286 +#: ../urpm/main_loop.pm:295 #, c-format msgid "Packages are up to date" msgstr "Mae'r pecynnau'n rhai diweddaraf" -#: ../urpm/main_loop.pm:294 -#, c-format -msgid "Package %s is already installed" -msgstr "Pecyn %s wedi ei osod eisoes" - -#: ../urpm/main_loop.pm:295 -#, c-format -msgid "Packages %s are already installed" -msgstr "Pecynnau %s wedi eu gosod eisoes" - -#: ../urpm/main_loop.pm:298 -#, c-format -msgid "Package %s can not be installed" -msgstr "Methu gosod pecyn %s" - -#: ../urpm/main_loop.pm:299 -#, c-format -msgid "Packages %s can not be installed" -msgstr "Methu gosod pecynnau %s" - -#: ../urpm/main_loop.pm:307 +#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298 #, c-format msgid "Installation is possible" msgstr "Gosod yn bosibl" -#: ../urpm/md5sum.pm:20 +#: ../urpm/md5sum.pm:26 #, c-format msgid "examining %s file" msgstr "archwilio %s ffeil" -#: ../urpm/md5sum.pm:22 +#: ../urpm/md5sum.pm:27 +#, c-format +msgid "invalid MD5SUM file" +msgstr "" + +#: ../urpm/md5sum.pm:28 #, c-format msgid "warning: md5sum for %s unavailable in MD5SUM file" msgstr "rhybudd: nid yw md5sum ar gyfer %s ar gael yn ffeil MD5SUM" -#: ../urpm/media.pm:194 +#: ../urpm/media.pm:204 #, c-format msgid "virtual medium \"%s\" should have a clear url, medium ignored" msgstr "dylai cyfrwng rhithiol \"%s\" gael url clir, anwybyddu'r cyfrwng" -#: ../urpm/media.pm:196 +#: ../urpm/media.pm:206 #, 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:203 +#: ../urpm/media.pm:213 #, c-format msgid "unable to access synthesis file of \"%s\", medium ignored" msgstr "methu cael mynediad i ffeil \"%s\", anwybyddu'r cyfrwng" -#: ../urpm/media.pm:230 +#: ../urpm/media.pm:240 #, c-format msgid "trying to override existing medium \"%s\", skipping" msgstr "ceisio osgoi'r cyfrwng presennol \"%s\", hepgor" -#: ../urpm/media.pm:415 +#: ../urpm/media.pm:445 #, c-format msgid "failed to migrate removable device, ignoring media" msgstr "methu symud y ddyfais symudol, anwybyddu'r cyfrwng" -#: ../urpm/media.pm:458 ../urpm/media.pm:464 +#: ../urpm/media.pm:488 ../urpm/media.pm:494 #, c-format msgid "wrote config file [%s]" msgstr "ysgrifennu ffeil ffurfweddu (%s)" -#: ../urpm/media.pm:507 +#: ../urpm/media.pm:537 #, c-format msgid "Can't use parallel mode with use-distrib mode" msgstr "Methu defnyddio'r modd paralel gyda'r modd use-distrib" -#: ../urpm/media.pm:515 +#: ../urpm/media.pm:545 #, c-format msgid "using associated media for parallel mode: %s" msgstr "defnyddio cyfrwng cysylltiedig ar gyfer modd paralel: %s" -#: ../urpm/media.pm:531 +#: ../urpm/media.pm:561 #, c-format msgid "" "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --" @@ -983,213 +956,218 @@ msgstr "" "--nid oes modd defnyddio synthesis gyda --media, --excludemedia, --" "sortmedia, --diweddaru, --use-distrib or --parallel" -#: ../urpm/media.pm:624 +#: ../urpm/media.pm:654 #, c-format msgid "Search start: %s end: %s" msgstr "Cychwyn chwilio: %s diwedd: %s" -#: ../urpm/media.pm:641 +#: ../urpm/media.pm:671 #, c-format msgid "skipping package %s" msgstr "hepgor pecyn %s" -#: ../urpm/media.pm:657 +#: ../urpm/media.pm:687 #, c-format msgid "would install instead of upgrade package %s" msgstr "gosod yn lle uwchraddio pecyn %s" -#: ../urpm/media.pm:682 +#: ../urpm/media.pm:712 #, c-format msgid "medium \"%s\" already exists" msgstr "cyfrwng \"%s\" yn bodoli eisoes" -#: ../urpm/media.pm:724 +#: ../urpm/media.pm:755 #, c-format msgid "(ignored by default)" msgstr "(anwybyddwyd drwy ragosodiad)" -#: ../urpm/media.pm:730 +#: ../urpm/media.pm:761 #, c-format msgid "adding medium \"%s\" before remote medium \"%s\"" msgstr "ychwanegu cyfrwng \"%s\", cyn cyfrwng pell \"%s\"" -#: ../urpm/media.pm:736 +#: ../urpm/media.pm:767 #, c-format msgid "adding medium \"%s\"" msgstr "ychwanegu cyfrwng \"%s\"" -#: ../urpm/media.pm:765 +#: ../urpm/media.pm:796 #, c-format msgid "directory %s does not exist" msgstr "nid yw cyfeiriadur %s yn bodoli" -#: ../urpm/media.pm:773 +#: ../urpm/media.pm:804 #, c-format msgid "this location doesn't seem to contain any distribution" msgstr "nid yw'r lleoliad i weld yn cynnwys unrhyw ddosbarthiad" -#: ../urpm/media.pm:791 +#: ../urpm/media.pm:822 #, c-format msgid "unable to parse media.cfg" msgstr "methu didoli media.cfg" -#: ../urpm/media.pm:794 +#: ../urpm/media.pm:825 #, c-format msgid "unable to access the distribution medium (no media.cfg file found)" msgstr "" "methu cael mynediad at gyfrwng y dosbarthiad (heb ganfod ffeil media.cfg)" -#: ../urpm/media.pm:812 +#: ../urpm/media.pm:843 #, c-format msgid "skipping non compatible media `%s' (for %s)" msgstr "hepgor cyfrwng anghymarus '%s' (ar gyfer %s)" -#: ../urpm/media.pm:861 +#: ../urpm/media.pm:895 #, c-format msgid "retrieving media.cfg file..." msgstr "estyn ffeil media.cfg..." -#: ../urpm/media.pm:902 +#: ../urpm/media.pm:936 #, c-format msgid "trying to select nonexistent medium \"%s\"" msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\"" -#: ../urpm/media.pm:905 +#: ../urpm/media.pm:939 #, c-format msgid "selecting multiple media: %s" msgstr "dewis aml-gyfrwng: %s" -#: ../urpm/media.pm:925 +#: ../urpm/media.pm:959 #, c-format msgid "removing medium \"%s\"" msgstr "dewis cyfrwng \"%s\":" -#: ../urpm/media.pm:1001 +#: ../urpm/media.pm:1042 #, c-format msgid "reconfiguring urpmi for media \"%s\"" msgstr "ail-ffurfweddu urpmi ar gyfer cyfrwng \"%s\"" -#: ../urpm/media.pm:1039 +#: ../urpm/media.pm:1076 #, c-format msgid "...reconfiguration failed" msgstr "...methodd ail-ffurfweddu" -#: ../urpm/media.pm:1045 +#: ../urpm/media.pm:1082 #, c-format msgid "reconfiguration done" msgstr "cwblhau ail-ffurfweddu" -#: ../urpm/media.pm:1061 +#: ../urpm/media.pm:1098 #, c-format msgid "Error generating names file: dependency %d not found" msgstr "Gwall wrth gynhyrchu ffeil enwau: heb ganfod dibyniaeth %d" -#: ../urpm/media.pm:1082 +#: ../urpm/media.pm:1119 #, c-format msgid "medium \"%s\" is up-to-date" msgstr "cyfrwng \"%s\" wedi ei ddiweddaru" -#: ../urpm/media.pm:1093 +#: ../urpm/media.pm:1130 #, c-format msgid "examining synthesis file [%s]" msgstr "archwilio ffeil synthesis [%s]" -#: ../urpm/media.pm:1113 +#: ../urpm/media.pm:1150 #, c-format msgid "problem reading synthesis file of medium \"%s\"" msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\"" -#: ../urpm/media.pm:1126 ../urpm/media.pm:1209 +#: ../urpm/media.pm:1163 ../urpm/media.pm:1246 #, c-format msgid "copying [%s] for medium \"%s\"..." msgstr "copïo [%s] ar gyfer cyfrwng \"%s\"..." -#: ../urpm/media.pm:1128 ../urpm/media.pm:1183 ../urpm/media.pm:1421 +#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489 #, c-format msgid "...copying failed" msgstr "...methodd y copïo" -#: ../urpm/media.pm:1179 +#: ../urpm/media.pm:1216 #, c-format msgid "copying description file of \"%s\"..." msgstr "copïo ffeil disgrifiad o \"%s\"" -#: ../urpm/media.pm:1181 ../urpm/media.pm:1213 +#: ../urpm/media.pm:1218 ../urpm/media.pm:1250 #, c-format msgid "...copying done" msgstr "...cwblhau'r copïo" -#: ../urpm/media.pm:1215 +#: ../urpm/media.pm:1252 #, c-format msgid "copy of [%s] failed (file is suspiciously small)" msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)" -#: ../urpm/media.pm:1248 +#: ../urpm/media.pm:1297 #, c-format msgid "computing md5sum of retrieved source synthesis" msgstr "cyfrifo md5sum o ffynhonnell synthesis adferwyd (neu synthesis)" -#: ../urpm/media.pm:1250 ../urpm/media.pm:1671 +#: ../urpm/media.pm:1299 ../urpm/media.pm:1739 #, c-format msgid "retrieval of [%s] failed (md5sum mismatch)" msgstr "methodd estyn (%s) (md5sum gwallus)" -#: ../urpm/media.pm:1265 +#: ../urpm/media.pm:1314 #, c-format msgid "genhdlist2 failed on %s" msgstr "methodd genhdlist2 ar %s" -#: ../urpm/media.pm:1275 +#: ../urpm/media.pm:1324 #, c-format msgid "comparing %s and %s" msgstr "cymharu %s ac %s" -#: ../urpm/media.pm:1300 +#: ../urpm/media.pm:1349 #, c-format msgid "invalid hdlist file %s for medium \"%s\"" msgstr "ffeil hdlist annilys %s ar gyfer cyfrwng \"%s\"" -#: ../urpm/media.pm:1326 +#: ../urpm/media.pm:1375 #, c-format msgid "copying MD5SUM file of \"%s\"..." msgstr "copïo ffeil MD5SUM o \"%s\"" -#: ../urpm/media.pm:1380 +#: ../urpm/media.pm:1417 +#, fuzzy, c-format +msgid "invalid MD5SUM file (downloaded from %s)" +msgstr "enw ffeil rpm annilys [%s]" + +#: ../urpm/media.pm:1448 #, c-format msgid "retrieving source synthesis of \"%s\"..." msgstr "adfer ffynhonnell synthesis \"%s\"..." -#: ../urpm/media.pm:1397 +#: ../urpm/media.pm:1465 #, c-format msgid "found probed synthesis as %s" msgstr "canfod synthesis holwyd fel %s" -#: ../urpm/media.pm:1404 ../urpm/media.pm:1512 +#: ../urpm/media.pm:1472 ../urpm/media.pm:1580 #, c-format msgid "no synthesis file found for medium \"%s\"" msgstr "dim ffeil synthesis file ar gyfer cyfrwng \"%s\"" -#: ../urpm/media.pm:1455 +#: ../urpm/media.pm:1523 #, c-format msgid "examining pubkey file of \"%s\"..." msgstr "archwilio ffeil pubkey \"%s\"" -#: ../urpm/media.pm:1467 +#: ../urpm/media.pm:1535 #, c-format msgid "...imported key %s from pubkey file of \"%s\"" msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\"" -#: ../urpm/media.pm:1471 +#: ../urpm/media.pm:1539 #, c-format msgid "unable to import pubkey file of \"%s\"" msgstr "methu mewnforio ffeil pubkey \"%s\"" -#: ../urpm/media.pm:1545 +#: ../urpm/media.pm:1613 #, c-format msgid "updated medium \"%s\"" msgstr "cyfrwng \"%s\" wedi ei ddiweddaru" -#: ../urpm/media.pm:1665 +#: ../urpm/media.pm:1733 #, c-format msgid "retrieval of [%s] failed" msgstr "methodd estyn [%s]" @@ -1199,7 +1177,7 @@ msgstr "methodd estyn [%s]" msgid "trying again with mirror %s" msgstr "ceisio eto gyda drych %s" -#: ../urpm/mirrors.pm:55 +#: ../urpm/mirrors.pm:52 #, c-format msgid "Could not find a mirror from mirrorlist %s" msgstr "Methu canfod drych o restr drychau %s" @@ -1214,7 +1192,7 @@ 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:63 ../urpmi:518 ../urpmi:534 ../urpmi:624 +#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627 #, c-format msgid "Nn" msgstr "Nn" @@ -1224,8 +1202,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:64 ../urpme:37 ../urpmi:519 ../urpmi:535 ../urpmi:574 -#: ../urpmi:625 ../urpmi:661 ../urpmi:667 ../urpmi.addmedia:138 +#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669 +#: ../urpmi.addmedia:140 #, c-format msgid "Yy" msgstr "Yy" @@ -1295,6 +1273,17 @@ msgstr "GB" msgid "TB" msgstr "TB" +#: ../urpm/orphans.pm:305 +#, c-format +msgid "" +"The following package is now orphan, use \"urpme --auto-orphans\" to remove " +"it." +msgid_plural "" +"The following packages are now orphans, use \"urpme --auto-orphans\" to " +"remove them." +msgstr[0] "" +msgstr[1] "" + #: ../urpm/parallel.pm:14 #, c-format msgid "unable to parse \"%s\" in file [%s]" @@ -1315,17 +1304,54 @@ msgstr "canfod trinydd paralel ar gyfer nodau: %s" msgid "unable to use parallel option \"%s\"" msgstr "methu defnyddio dewis paralel \"%s\"" -#: ../urpm/removable.pm:26 +#: ../urpm/parallel.pm:93 +#, c-format +msgid "on node %s" +msgstr "" + +#: ../urpm/parallel.pm:293 +#, fuzzy, c-format +msgid "Installation failed on node %s" +msgstr "Methodd y gosod" + +#: ../urpm/parallel_ka_run.pm:58 +#, c-format +msgid "rshp failed, maybe a node is unreacheable" +msgstr "" + +#: ../urpm/parallel_ka_run.pm:80 +#, c-format +msgid "mput failed, maybe a node is unreacheable" +msgstr "" + +#: ../urpm/parallel_ssh.pm:27 +#, c-format +msgid "scp failed on host %s (%d)" +msgstr "" + +#: ../urpm/parallel_ssh.pm:39 +#, c-format +msgid "cp failed on host %s (%d)" +msgstr "" + +#: ../urpm/parallel_ssh.pm:86 +#, c-format +msgid "" +"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit " +"code: %d)" +msgstr "" + +#: ../urpm/removable.pm:32 #, c-format msgid "unable to access medium \"%s\"." msgstr "methu cael mynediad at gyfrwng. \"%s\"" -#: ../urpm/removable.pm:66 ../urpm/removable.pm:84 +#: ../urpm/removable.pm:72 ../urpm/removable.pm:90 #, c-format msgid "mounting %s" msgstr "gosod %s" -#: ../urpm/removable.pm:97 +#: ../urpm/removable.pm:103 #, c-format msgid "unmounting %s" msgstr "dadosod %s" @@ -1347,42 +1373,57 @@ msgstr "" msgid "No package named %s" msgstr "Dim pecyn o'r enw %s" -#: ../urpm/select.pm:193 ../urpme:107 +#: ../urpm/select.pm:193 ../urpme:114 #, c-format msgid "The following packages contain %s: %s" msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:" -#: ../urpm/select.pm:516 ../urpm/select.pm:559 +#: ../urpm/select.pm:296 +#, fuzzy, c-format +msgid "found package(s) %s in urpmi db, but none are installed" +msgstr "Methu gosod pecynnau %s" + +#: ../urpm/select.pm:539 +#, c-format +msgid "Package %s is already installed" +msgstr "Pecyn %s wedi ei osod eisoes" + +#: ../urpm/select.pm:540 +#, c-format +msgid "Packages %s are already installed" +msgstr "Pecynnau %s wedi eu gosod eisoes" + +#: ../urpm/select.pm:558 ../urpm/select.pm:609 #, c-format msgid "due to missing %s" msgstr "oherwydd %s coll" -#: ../urpm/select.pm:517 +#: ../urpm/select.pm:559 #, c-format msgid "due to already installed %s" msgstr "oherwydd %s wedi ei osod eisoes" -#: ../urpm/select.pm:518 ../urpm/select.pm:557 +#: ../urpm/select.pm:560 ../urpm/select.pm:607 #, c-format msgid "due to unsatisfied %s" msgstr "%s heb ei foddloni" -#: ../urpm/select.pm:524 +#: ../urpm/select.pm:566 #, c-format msgid "trying to promote %s" msgstr "ceisio hybu %s" -#: ../urpm/select.pm:525 +#: ../urpm/select.pm:567 #, c-format msgid "in order to keep %s" msgstr "fel modd i gadw %s" -#: ../urpm/select.pm:553 +#: ../urpm/select.pm:603 #, c-format msgid "in order to install %s" msgstr "er mwyn gosod %s" -#: ../urpm/select.pm:563 +#: ../urpm/select.pm:613 #, c-format msgid "due to conflicts with %s" msgstr "oherwydd gwrthdaro gyda %s" @@ -1412,22 +1453,22 @@ msgstr "" msgid "You should restart %s for %s" msgstr "" -#: ../urpm/sys.pm:271 +#: ../urpm/sys.pm:276 #, c-format msgid "Can't write file" msgstr "Methu ysgrifennu'r ffeil" -#: ../urpm/sys.pm:271 +#: ../urpm/sys.pm:276 #, c-format msgid "Can't open file" msgstr "Methu agor y ffeil" -#: ../urpm/sys.pm:284 +#: ../urpm/sys.pm:289 #, c-format msgid "Can't move file %s to %s" msgstr "Methu symud ffeil %s i %s" -#: ../urpme:40 +#: ../urpme:41 #, c-format msgid "" "urpme version %s\n" @@ -1443,46 +1484,51 @@ msgstr "" "\n" "defnydd:\n" -#: ../urpme:46 +#: ../urpme:47 #, c-format msgid " --auto - automatically select a package in choices.\n" msgstr " --auto - dewis pecyn yn awtomatig o fewn dewisiadau.\n" -#: ../urpme:47 +#: ../urpme:48 +#, c-format +msgid " --auto-orphans - remove orphans\n" +msgstr "" + +#: ../urpme:49 #, c-format msgid " --test - verify if the removal can be achieved correctly.\n" msgstr " --test - gwirio os oes modd tynnu'n iawn.\n" -#: ../urpme:49 ../urpmi:110 ../urpmq:67 +#: ../urpme:51 ../urpmi:109 ../urpmq:68 #, c-format msgid " --parallel - distributed urpmi across machines of alias.\n" msgstr "" " --parallel - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n" -#: ../urpme:50 ../urpmi:141 +#: ../urpme:52 ../urpmi:141 #, c-format msgid " --repackage - Re-package the files before erasing\n" msgstr " --repackage - Ailbecynnu'r ffeiliau cyn eu dileu\n" -#: ../urpme:51 +#: ../urpme:53 #, c-format msgid " --root - use another root for rpm removal.\n" msgstr " --root - defnyddio root arall ar gyfer tynnu rpm.\n" -#: ../urpme:52 ../urpmf:40 ../urpmi:112 ../urpmi.addmedia:69 -#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:46 ../urpmq:69 +#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71 +#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70 #, c-format msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n" msgstr "" " --urpmi-root - defnyddio root arall ar gyfer gosod urpmi db ac " "rpm.\n" -#: ../urpme:53 +#: ../urpme:55 #, c-format msgid " --noscripts - do not execute package scriptlet(s).\n" msgstr " --noscripts - peidio gweithredu sgriptledi'r pecyn(au).\n" -#: ../urpme:54 +#: ../urpme:56 #, c-format msgid "" " --use-distrib - configure urpme on the fly from a distrib tree, useful\n" @@ -1491,47 +1537,49 @@ msgstr "" " --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n" " wrth (ddad)osod chroot gyda dewis --root.\n" -#: ../urpme:56 ../urpmi:152 ../urpmq:86 +#: ../urpme:58 ../urpmi:152 ../urpmq:89 #, c-format msgid " --verbose, -v - verbose mode.\n" msgstr " --verbose, -v - modd llafar.\n" -#: ../urpme:57 +#: ../urpme:59 #, c-format msgid " -a - select all packages matching expression.\n" msgstr " -a - select all packages matching expression.\n" -#: ../urpme:70 +#: ../urpme:72 #, c-format msgid "Only superuser is allowed to remove packages" msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu pecynnau" -#: ../urpme:100 +#: ../urpme:105 #, c-format msgid "unknown packages" msgstr "pecynnau anhysbys" -#: ../urpme:100 +#: ../urpme:105 #, c-format msgid "unknown package" msgstr "pecyn anhysbys" -#: ../urpme:113 ../urpmi:548 -#, c-format -msgid "removing package %s will break your system" -msgstr "bydd tynnu pecynnau %s yn torri'r system" +#: ../urpme:119 +#, fuzzy, c-format +msgid "Removing the following package will break your system:" +msgid_plural "Removing the following packages will break your system:" +msgstr[0] "bydd tynnu pecynnau %s yn torri'r system" +msgstr[1] "bydd tynnu pecynnau %s yn torri'r system" -#: ../urpme:115 +#: ../urpme:124 #, c-format msgid "Nothing to remove" msgstr "Dim i'w dynnu" -#: ../urpme:120 -#, c-format -msgid "Checking to remove the following packages" -msgstr "Ticio i ddileu'r pecynnau canlynol" +#: ../urpme:141 +#, fuzzy, c-format +msgid "No orphans to remove" +msgstr "Dim i'w dynnu" -#: ../urpme:124 +#: ../urpme:147 #, c-format msgid "To satisfy dependencies, the following package will be removed" msgid_plural "" @@ -1539,23 +1587,40 @@ 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:128 +#: ../urpme:152 +#, fuzzy, c-format +msgid "(orphan package)" +msgid_plural "(orphan packages)" +msgstr[0] "pecyn anhysbys" +msgstr[1] "pecyn anhysbys" + +#: ../urpme:159 #, c-format msgid "Remove %d package?" msgid_plural "Remove %d packages?" msgstr[0] "Tynnu pecynnau %d?" msgstr[1] "Tynnu pecynnau %d?" -#: ../urpme:128 ../urpmi:575 ../urpmi:662 ../urpmi.addmedia:141 +#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143 #, c-format msgid " (y/N) " msgstr " (y/N) " -#: ../urpme:150 +#: ../urpme:164 +#, fuzzy, c-format +msgid "testing removal of %s" +msgstr "cymryd dyfais symudol fel \"%s\"" + +#: ../urpme:178 #, c-format msgid "Removal failed" msgstr "Methodd y tynnu" +#: ../urpme:180 +#, fuzzy, c-format +msgid "Removal is possible" +msgstr "Methodd y tynnu" + #: ../urpmf:29 #, c-format msgid "" @@ -1577,14 +1642,14 @@ msgstr "" msgid " --version - print this tool's version number.\n" msgstr " --version - argraffu rhif fersiwn yr offeryn.\n" -#: ../urpmf:37 ../urpmi:132 ../urpmq:79 +#: ../urpmf:37 ../urpmi:132 ../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:76 ../urpmq:49 +#: ../urpmf:38 ../urpmi:74 ../urpmq:49 #, c-format msgid " --excludemedia - do not use the given media, separated by comma.\n" msgstr "" @@ -1598,7 +1663,7 @@ msgstr "" " --literal, -l - peidio cydweddu patrymau, defnyddio ymresymiad fel llinyn " "llythrennedd.\n" -#: ../urpmf:42 ../urpmi:79 ../urpmq:50 +#: ../urpmf:42 ../urpmi:77 ../urpmq:50 #, c-format msgid "" " --sortmedia - sort media according to substrings separated by comma.\n" @@ -1612,7 +1677,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:80 ../urpmq:51 +#: ../urpmf:44 ../urpmi:78 ../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" @@ -1622,7 +1687,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:77 ../urpmq:46 +#: ../urpmf:46 ../urpmi:75 ../urpmq:46 #, c-format msgid " --update - use only update media.\n" msgstr " --update - defnyddio cyfrwng diweddaru'n unig.\n" @@ -1822,7 +1887,7 @@ msgstr " --vendor - gwerthwr\n" msgid " -m - the media in which the package was found\n" msgstr " -m - y cyfrwng lle cafwyd y pecyn\n" -#: ../urpmf:85 ../urpmq:96 +#: ../urpmf:85 ../urpmq:99 #, c-format msgid " -f - print version, release and arch with name.\n" msgstr " -f - argraffu fersiwn a rhyddhad ac arch gydag enw.\n" @@ -1837,7 +1902,7 @@ msgstr "Mynegiadau patrymau:\n" msgid "Incorrect format: you may use only one multi-valued tag" msgstr "Fformat anghywir: gallwch ddefnyddio un tag aml-werth yn unig" -#: ../urpmf:248 ../urpmi:265 ../urpmq:141 +#: ../urpmf:248 ../urpmi:265 ../urpmq:165 #, c-format msgid "using specific environment on %s\n" msgstr "ddefnyddio amgylchedd penodol ar %s\n" @@ -1857,40 +1922,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:83 +#: ../urpmi:81 #, 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:84 +#: ../urpmi:82 #, c-format msgid " --no-md5sum - disable MD5SUM file checking.\n" msgstr " --no-md5sum - analluogi gwirio ffeil MD5SUM.\n" -#: ../urpmi:85 +#: ../urpmi:83 #, c-format msgid " --force-key - force update of gpg key.\n" msgstr " --force-key - gorfodi diweddaru allwedd gpg.\n" -#: ../urpmi:86 ../urpmq:53 +#: ../urpmi:84 +#, c-format +msgid " --auto-orphans - remove orphans without asking\n" +msgstr "" + +#: ../urpmi:85 ../urpmq:54 #, c-format msgid " --no-suggests - do not auto select \"suggested\" packages.\n" msgstr " --no-suggests - peidio awto ddewis pecynnau \"suggested\" .\n" -#: ../urpmi:87 +#: ../urpmi:86 #, 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:88 +#: ../urpmi:87 #, 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:89 ../urpmq:55 +#: ../urpmi:88 ../urpmq:56 #, c-format msgid "" " --keep - keep existing packages if possible, reject requested\n" @@ -1899,7 +1969,7 @@ msgstr "" " --keep - cadw'r pecynnau presennol os yn bosibl, gwrthod\n" " pecynnau sy'n arwain at dynnu.\n" -#: ../urpmi:91 +#: ../urpmi:90 #, c-format msgid "" " --split-level - split in small transaction if more than given packages\n" @@ -1911,49 +1981,49 @@ msgstr "" " eu gosod neu eu uwchraddio\n" " rhagosodiad yw %d.\n" -#: ../urpmi:95 +#: ../urpmi:94 #, c-format msgid " --split-length - small transaction length, default is %d.\n" msgstr " --split-length - hyd drosglwyddiad byr, rhagosodiad yw %d.\n" -#: ../urpmi:97 +#: ../urpmi:96 #, c-format msgid " --fuzzy, -y - impose fuzzy search.\n" msgstr " --fuzzy - mynnu chwiliad bras.\n" -#: ../urpmi:98 +#: ../urpmi:97 #, c-format msgid " --buildrequires - install the buildrequires of the packages\n" msgstr " --buildrequires - gosod buildrequires y pecynnau\n" -#: ../urpmi:99 +#: ../urpmi:98 #, c-format msgid " --install-src - install only source package (no binaries).\n" msgstr "" " --install-src - gosod pecynnau ffynhonnell yn unig (dim binaries).\n" -#: ../urpmi:100 +#: ../urpmi:99 #, 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:101 +#: ../urpmi:100 #, c-format msgid " --noclean - don't clean rpms from cache.\n" msgstr " --noclean - peidio glanhau rpm o'r storfa.\n" -#: ../urpmi:102 +#: ../urpmi:101 #, 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" -#: ../urpmi:103 +#: ../urpmi:102 #, c-format msgid "" " --replacepkgs - force installing packages which are already installed.\n" msgstr " --replacepkgs - gorfodi gosod pecynnau sydd wedi eu gosod eisoes.\n" -#: ../urpmi:105 +#: ../urpmi:104 #, c-format msgid "" " --allow-nodeps - allow asking user to install packages without\n" @@ -1962,7 +2032,7 @@ msgstr "" " --allow-nodeps - caniatáu gofyn i ddefnyddiwr i osod pecynnau heb\n" " wirio dibyniaethau.\n" -#: ../urpmi:107 +#: ../urpmi:106 #, c-format msgid "" " --allow-force - allow asking user to install packages without\n" @@ -1971,12 +2041,12 @@ msgstr "" " --allow-force - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n" " wirio dibyniaethau na'u cyfanrwydd.\n" -#: ../urpmi:109 +#: ../urpmi:108 #, fuzzy, c-format msgid " --allow-suggests - auto select \"suggested\" packages.\n" msgstr " --no-suggests - peidio awto ddewis pecynnau \"suggested\" .\n" -#: ../urpmi:113 +#: ../urpmi:112 #, c-format msgid "" " --use-distrib - configure urpmi on the fly from a distrib tree, useful\n" @@ -1985,6 +2055,11 @@ msgstr "" " --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n" " wrth osod chroot gyda dewis o --root.\n" +#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:37 +#, c-format +msgid " --metalink - generate and use a local metalink.\n" +msgstr "" + #: ../urpmi:115 #, c-format msgid "" @@ -2019,7 +2094,7 @@ msgstr " --cprozilla-options - dewis ychwanegol wrth ddefnyddio prozilla\n" msgid " --aria2-options - additional options to pass to aria2\n" msgstr " --aria2-options -dewis ychwanegol i'w estyn i aria2\n" -#: ../urpmi:123 ../urpmi.addmedia:58 ../urpmi.update:36 +#: ../urpmi:123 ../urpmi.addmedia:60 ../urpmi.update:38 #, c-format msgid " --limit-rate - limit the download speed.\n" msgstr " --limit-rate - cyfyngu cyflymder y llwytho i lawr.\n" @@ -2033,7 +2108,7 @@ msgstr "" " --verify-rpm - gwirio llofnod rpm cyn gosod\n" " (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n" -#: ../urpmi:126 ../urpmi.addmedia:59 ../urpmi.update:37 ../urpmq:75 +#: ../urpmi:126 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:76 #, c-format msgid "" " --proxy - use specified HTTP proxy, the port number is assumed\n" @@ -2042,7 +2117,7 @@ msgstr "" " --proxy - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n" " rhagosodiad yw 1080 (fformat yw ).\n" -#: ../urpmi:128 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:77 +#: ../urpmi:128 ../urpmi.addmedia:63 ../urpmi.update:41 ../urpmq:78 #, c-format msgid "" " --proxy-user - specify user and password to use for proxy\n" @@ -2116,7 +2191,7 @@ msgid " --strict-arch - upgrade only packages with the same architecture.\n" msgstr "" " --strict-arch - uwchraddio dim ond pecynnau gyda'r un bensaernïaeth.\n" -#: ../urpmi:148 ../urpmq:94 +#: ../urpmi:148 ../urpmq:97 #, c-format msgid " -a - select all matches on command line.\n" msgstr " -a - dewis pob cydweddiad ar y llinell gorchymyn.\n" @@ -2203,48 +2278,48 @@ msgstr "" "Gwall: %s i weld wedi ei osod fel darllen yn unig.\n" "Defnydd --allow-force gorfodaeth i orfodi gweithred." -#: ../urpmi:374 +#: ../urpmi:361 #, c-format msgid "Updating media...\n" msgstr "Diweddaru cyfrwng...\n" #. -PO: here format is ": (to upgrade)" -#: ../urpmi:453 +#: ../urpmi:448 #, c-format msgid "%s: %s (to upgrade)" msgstr "%s: %s (uwchraddio)" #. -PO: here format is " (to upgrade)" -#: ../urpmi:455 +#: ../urpmi:450 #, c-format msgid "%s (to upgrade)" msgstr "%s (uwchraddio)" #. -PO: here format is ": (to install)" -#: ../urpmi:459 +#: ../urpmi:454 #, c-format msgid "%s: %s (to install)" msgstr "%s: %s (gosod)" #. -PO: here format is " (to install)" -#: ../urpmi:461 +#: ../urpmi:456 #, c-format msgid "%s (to install)" msgstr "%s (gosod)" -#: ../urpmi:467 +#: ../urpmi:462 #, 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:470 +#: ../urpmi:465 #, c-format msgid "What is your choice? (1-%d) " msgstr "Beth yw eich dewis? (1-%d)" -#: ../urpmi:511 +#: ../urpmi:507 #, c-format msgid "" "The following package cannot be installed because it depends on packages\n" @@ -2255,7 +2330,7 @@ msgstr "" "sy'n hyn na'r rhai sydd wedi eu gosod:\n" "%s" -#: ../urpmi:513 +#: ../urpmi:509 #, c-format msgid "" "The following packages can't be installed because they depend on packages\n" @@ -2266,7 +2341,7 @@ msgstr "" "sy'n hyn na'r rhai sydd wedi eu gosod:\n" "%s" -#: ../urpmi:520 ../urpmi:536 +#: ../urpmi:515 ../urpmi:530 #, c-format msgid "" "\n" @@ -2275,12 +2350,12 @@ msgstr "" "\n" "Parhau i osod beth bynnag?" -#: ../urpmi:521 ../urpmi:537 ../urpmi:626 ../urpmi.addmedia:141 +#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143 #, c-format msgid " (Y/n) " msgstr " (Y/n) " -#: ../urpmi:529 +#: ../urpmi:524 #, c-format msgid "" "A requested package cannot be installed:\n" @@ -2289,7 +2364,7 @@ msgstr "" "Nid oes modd gosod pecyn gofynnwyd amdani:\n" "%s" -#: ../urpmi:530 +#: ../urpmi:525 #, c-format msgid "" "Some requested packages cannot be installed:\n" @@ -2298,7 +2373,12 @@ msgstr "" "Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n" "%s" -#: ../urpmi:557 +#: ../urpmi:542 +#, c-format +msgid "removing package %s will break your system" +msgstr "bydd tynnu pecynnau %s yn torri'r system" + +#: ../urpmi:551 #, c-format msgid "" "The installation cannot continue because the following package\n" @@ -2309,7 +2389,7 @@ msgstr "" "gael ei dynnu i eraill gael eu diweddaru.\n" "%s\n" -#: ../urpmi:559 +#: ../urpmi:553 #, c-format msgid "" "The installation cannot continue because the following packages\n" @@ -2320,7 +2400,7 @@ msgstr "" "gael eu tynnu i eraill gael eu diweddaru.\n" "%s\n" -#: ../urpmi:566 +#: ../urpmi:560 #, c-format msgid "" "The following package has to be removed for others to be upgraded:\n" @@ -2329,7 +2409,7 @@ msgstr "" "Rhaid i'r pecyn canlynol gael ei dynnu i eraill gael eu diweddaru.\n" "%s" -#: ../urpmi:567 +#: ../urpmi:561 #, c-format msgid "" "The following packages have to be removed for others to be upgraded:\n" @@ -2338,12 +2418,12 @@ msgstr "" "Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n" "%s" -#: ../urpmi:569 +#: ../urpmi:563 #, c-format msgid "(test only, removal will not be actually done)" msgstr "(prawf yn unig, ni fydd yn cael ei ddadosod)" -#: ../urpmi:590 +#: ../urpmi:583 #, c-format msgid "" "You must first call urpmi with --buildrequires to install the following " @@ -2354,39 +2434,46 @@ msgstr "" "canlynol:\n" "%s\n" -#: ../urpmi:607 +#: ../urpmi:594 +#, fuzzy, c-format +msgid "The following orphan package will be removed." +msgid_plural "The following orphan packages will be removed." +msgstr[0] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu" +msgstr[1] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu" + +#: ../urpmi:610 #, c-format msgid "(test only, installation will not be actually done)" msgstr "(prawf yn unig, ni fydd yn cael ei osod)" -#: ../urpmi:613 +#: ../urpmi:616 #, c-format msgid "%s of additional disk space will be used." msgstr "Bydd %s o le ychwanegol ar ddisg yn cael ei ddefnyddio." -#: ../urpmi:614 +#: ../urpmi:617 #, c-format msgid "%s of disk space will be freed." msgstr "Bydd %s o le ar ddisg ar gael." -#: ../urpmi:615 +#: ../urpmi:618 #, c-format msgid "%s of packages will be retrieved." msgstr "bydd %s o becynnau yn cael eu hadfer." -#: ../urpmi:616 +#: ../urpmi:619 #, 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:638 +#: ../urpmi:640 #, c-format msgid "Cancel" msgstr "Dileu" -#: ../urpmi:646 +#: ../urpmi:648 #, c-format msgid "Press Enter when mounted..." msgstr "Pwyso Enter pan wedi ei arosod..." @@ -2434,27 +2521,32 @@ msgstr "" "\n" "a [options] o\n" -#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:72 +#: ../urpmi.addmedia:55 ../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.addmedia:56 ../urpmi.update:34 ../urpmq:73 +#: ../urpmi.addmedia:56 ../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.addmedia:57 ../urpmi.update:35 ../urpmq:74 +#: ../urpmi.addmedia:57 ../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.addmedia:63 +#: ../urpmi.addmedia:58 ../urpmi.update:36 +#, fuzzy, c-format +msgid " --aria2 - use aria2 to retrieve distant files.\n" +msgstr " --curl - defnyddio curl i estyn ffeiliau pell.\n" + +#: ../urpmi.addmedia:65 #, c-format msgid " --update - create an update medium.\n" msgstr " --update - defnyddio cyfrwng diweddaru.\n" -#: ../urpmi.addmedia:64 +#: ../urpmi.addmedia:66 #, c-format msgid "" " --xml-info - use the specific policy for downloading xml info files\n" @@ -2466,22 +2558,22 @@ msgstr "" " un o: byth, ar alw, diweddaru'n unig, bob tro. cf urpmi." "cfg(5)\n" -#: ../urpmi.addmedia:66 +#: ../urpmi.addmedia:68 #, c-format msgid " --probe-synthesis - use synthesis file.\n" msgstr " --probe-synthesis - defnyddio ffeil synthesis.\n" -#: ../urpmi.addmedia:67 +#: ../urpmi.addmedia:69 #, c-format msgid " --probe-rpms - use rpm files (instead of synthesis).\n" msgstr " --probe-rpms -defnyddio ffeiliau rpm (yn lle synthesis).\n" -#: ../urpmi.addmedia:68 +#: ../urpmi.addmedia:70 #, c-format msgid " --no-probe - do not try to find any synthesis file.\n" msgstr " --no-probe - peidio ceisio canfod unrhyw ffeil synthesis.\n" -#: ../urpmi.addmedia:70 +#: ../urpmi.addmedia:72 #, c-format msgid "" " --distrib - automatically create all media from an installation\n" @@ -2490,18 +2582,18 @@ msgstr "" " --distrib - creu yn awtomatig yr holl gyfrwng o gyfrwng\n" " gosod\n" -#: ../urpmi.addmedia:72 +#: ../urpmi.addmedia:74 #, c-format msgid " --interactive - with --distrib, ask confirmation for each media\n" msgstr "" " --rhyngweithiol - gyda --distrib, gofyn cadarnhad gyda phob cyfrwng\n" -#: ../urpmi.addmedia:73 +#: ../urpmi.addmedia:75 #, c-format msgid " --all-media - with --distrib, add every listed media\n" msgstr " --all-media - gyda --distrib, rhestri'r holl gyfrwng ar gael.\n" -#: ../urpmi.addmedia:74 +#: ../urpmi.addmedia:76 #, c-format msgid "" " --from - use specified url for list of mirrors, the default is\n" @@ -2511,74 +2603,74 @@ msgstr "" "rhagosodedig yw\n" " %s\n" -#: ../urpmi.addmedia:76 +#: ../urpmi.addmedia:78 #, c-format msgid " --virtual - create virtual media wich are always up-to-date.\n" msgstr " --virtual - creu cyfrwng rhithiol sydd wedi ei ddiweddaru,\n" -#: ../urpmi.addmedia:77 ../urpmi.update:42 +#: ../urpmi.addmedia:79 ../urpmi.update:44 #, c-format msgid " --no-md5sum - disable MD5SUM file checking.\n" msgstr " --no-md5sum - analluogi gwirio ffeil MD5SUM.\n" -#: ../urpmi.addmedia:78 +#: ../urpmi.addmedia:80 #, c-format msgid " --nopubkey - don't import pubkey of added media\n" msgstr " --nopubkey - peidio mewnforio pubkey y cyfrwng ychwanegwyd\n" -#: ../urpmi.addmedia:79 +#: ../urpmi.addmedia:81 #, c-format msgid " --raw - add the media in config, but don't update it.\n" msgstr "" " --raw - ychwanegu cyfrwng yn config, ond nid yn ei ddiweddaru.\n" -#: ../urpmi.addmedia:80 ../urpmi.removemedia:43 ../urpmi.update:51 +#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53 #, c-format msgid " -q - quiet mode.\n" msgstr " -q - modd distaw.\n" -#: ../urpmi.addmedia:81 ../urpmi.removemedia:44 ../urpmi.update:52 +#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54 #, c-format msgid " -v - verbose mode.\n" msgstr " --verbose - modd llafar.\n" -#: ../urpmi.addmedia:101 +#: ../urpmi.addmedia:103 #, c-format msgid "known xml-info policies are %s" msgstr "polisiau hysbys known xml-info yw %s" -#: ../urpmi.addmedia:112 +#: ../urpmi.addmedia:114 #, c-format msgid "no argument needed for --distrib --mirrorlist " msgstr "dim angen ymresymiad ar gyfer --distrib --mirrorlist " -#: ../urpmi.addmedia:117 +#: ../urpmi.addmedia:119 #, c-format msgid "bad (for local directory, the path must be absolute)" msgstr "" "gwallus (ar gyfer cyfeiriadur lleol, rhaid i'r llwybr fod yn absoliwt)" -#: ../urpmi.addmedia:121 +#: ../urpmi.addmedia:123 #, c-format msgid "Only superuser is allowed to add media" msgstr "Dim ond uwch ddefnyddiwr sy'n cael ychwanegu cyfrwng" -#: ../urpmi.addmedia:124 +#: ../urpmi.addmedia:126 #, c-format msgid "creating config file [%s]" msgstr "yn creu ffeil config (%s)" -#: ../urpmi.addmedia:125 +#: ../urpmi.addmedia:127 #, c-format msgid "Can't create config file [%s]" msgstr "Methu creu ffeil Config (%s)" -#: ../urpmi.addmedia:133 +#: ../urpmi.addmedia:135 #, c-format msgid "no need to give with --distrib" msgstr "dim angen rhoi gyda --distrib" -#: ../urpmi.addmedia:141 +#: ../urpmi.addmedia:143 #, fuzzy, c-format msgid "" "\n" @@ -2587,17 +2679,17 @@ msgstr "" "\n" "Hoffech chi ychwanegu cyfrwng '%s'" -#: ../urpmi.addmedia:167 +#: ../urpmi.addmedia:169 #, c-format msgid " missing\n" msgstr " ar goll\n" -#: ../urpmi.addmedia:170 +#: ../urpmi.addmedia:172 #, c-format msgid "Can't use %s with remote medium" msgstr "Methu defnyddio %s gyda chyfrwng pell" -#: ../urpmi.addmedia:182 +#: ../urpmi.addmedia:184 #, c-format msgid "unable to add medium" msgstr "methu ychwanegu cyfrwng" @@ -2788,60 +2880,60 @@ msgstr "" "usage: urpmi.update [dewisiadau] ...\n" "lle mai yw'r enw cyfrwng i'w dynnu.\n" -#: ../urpmi.update:41 +#: ../urpmi.update:43 #, c-format msgid " --update - update only update media.\n" msgstr " --update - defnyddio cyfrwng diweddaru'n unig.\n" -#: ../urpmi.update:43 +#: ../urpmi.update:45 #, c-format msgid " --force-key - force update of gpg key.\n" msgstr " --force-key - gorfodi diweddaru allwedd gpg.\n" -#: ../urpmi.update:44 +#: ../urpmi.update:46 #, c-format msgid " --ignore - don't update, mark the media as ignored.\n" msgstr "" " --norebuild - peidio diweddaru, marcio'r cyfrwng wedi ei anwybyddu.\n" -#: ../urpmi.update:45 +#: ../urpmi.update:47 #, c-format msgid " --no-ignore - don't update, mark the media as enabled.\n" msgstr "" " --no-ignore - peidiwch diweddaru, marciwch y cyfrwng wedi ei alluogi.\n" -#: ../urpmi.update:47 +#: ../urpmi.update:49 #, c-format msgid " --probe-rpms - do not use synthesis, use rpm files directly\n" msgstr "" " --probe-rpms - peidio defnyddio synthesis, defnyddiwch ffeiliau rpm\n" -#: ../urpmi.update:48 +#: ../urpmi.update:50 #, c-format msgid " -a - select all non-removable media.\n" msgstr " -a - dewis pob cyfrwng ansymudadwy.\n" -#: ../urpmi.update:49 +#: ../urpmi.update:51 #, c-format msgid " -f - force updating synthesis\n" msgstr " -f - gorfodi diweddaru ffeiliau synthesis\n" -#: ../urpmi.update:50 +#: ../urpmi.update:52 #, c-format msgid " -ff - really force updating synthesis\n" msgstr " -f - gorfodi diweddaru ffeiliau synthesis/\n" -#: ../urpmi.update:67 +#: ../urpmi.update:69 #, c-format msgid "Only superuser is allowed to update media" msgstr "Dim ond uwch ddefnyddiwr sy'n cael diweddaru cyfrwng" -#: ../urpmi.update:75 +#: ../urpmi.update:77 #, c-format msgid "nothing to update (use urpmi.addmedia to add a media)\n" msgstr "dim i'w ddiweddaru (defnyddio urpmi.addmedia i ychwanegu cyfrwng)\n" -#: ../urpmi.update:93 +#: ../urpmi.update:95 #, c-format msgid "" "the entry to update is missing\n" @@ -2850,17 +2942,17 @@ msgstr "" "mae'r cofnod i ddiweddaru ar goll\n" "(un o %s)\n" -#: ../urpmi.update:97 +#: ../urpmi.update:99 #, c-format msgid "\"%s\"" msgstr "\"%s\"" -#: ../urpmi.update:98 +#: ../urpmi.update:100 #, c-format msgid "ignoring media %s" msgstr "anwybyddu cyfrwng %s" -#: ../urpmi.update:98 +#: ../urpmi.update:100 #, c-format msgid "enabling media %s" msgstr "galluogi cyfrwng %s" @@ -2890,38 +2982,43 @@ msgstr "" " --searchmedia - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau " "gofynnwyd (neu diweddarwyd).\n" -#: ../urpmq:54 +#: ../urpmq:53 +#, c-format +msgid " --auto-orphans - list orphans\n" +msgstr "" + +#: ../urpmq:55 #, c-format msgid " --fuzzy - impose fuzzy search (same as -y).\n" msgstr " --fuzzy - mynnu chwiliad fuzzy (fel -y).\n" -#: ../urpmq:57 +#: ../urpmq:58 #, c-format msgid " --list - list available packages.\n" msgstr " --list - rhestri'r holl gyfrwng ar gael.\n" -#: ../urpmq:58 +#: ../urpmq:59 #, c-format msgid " --list-media - list available media.\n" msgstr " --list-media - rhestri'r holl gyfrwng ar gael.\n" -#: ../urpmq:59 +#: ../urpmq:60 #, c-format msgid " --list-url - list available media and their url.\n" msgstr " --list-url - rhestri'r holl gyfrwng ar gael.\n" -#: ../urpmq:60 +#: ../urpmq:61 #, c-format msgid " --list-nodes - list available nodes when using --parallel.\n" msgstr "" " --list-nodes - rhestri'r nodau sydd ar gael wrth ddefnyddio --parallel.\n" -#: ../urpmq:61 +#: ../urpmq:62 #, c-format msgid " --list-aliases - list available parallel aliases.\n" msgstr " --list-aliases - rhestr ar gael ar gyfer enwau paralel.\n" -#: ../urpmq:62 +#: ../urpmq:63 #, c-format msgid "" " --dump-config - dump the config in form of urpmi.addmedia argument.\n" @@ -2929,26 +3026,26 @@ msgstr "" " --dump-config - dympio'r ffurfweddiad mewn ffurf ymresymiad urpmi." "addmedia.\n" -#: ../urpmq:63 +#: ../urpmq:64 #, c-format msgid " --src - next package is a source package (same as -s).\n" msgstr "" " --src - pecyn nesaf yn becyn ffynhonnell (yr un peth â -s).\n" -#: ../urpmq:64 +#: ../urpmq:65 #, c-format msgid "" " --sources - give all source packages before downloading (root only).\n" msgstr "" " --sources - give all source packages before downloading (root only).\n" -#: ../urpmq:66 +#: ../urpmq:67 #, c-format msgid " --ignorearch - allow to query rpms for unmatched architectures.\n" msgstr "" " --ignorearch - caniatáu ymholi rpmau ar gyfer saernïaeth annhebyg.\n" -#: ../urpmq:70 +#: ../urpmq:71 #, c-format msgid "" " --use-distrib - configure urpmi on the fly from a distrib tree.\n" @@ -2957,37 +3054,47 @@ msgstr "" " --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib.\n" " Mae hyn yn caniatáu ymholi mewn dosbarthiad.\n" -#: ../urpmq:80 +#: ../urpmq:81 #, c-format msgid " --changelog - print changelog.\n" msgstr " --changelog - cofnod argraffu.\n" -#: ../urpmq:81 +#: ../urpmq:82 #, c-format msgid " --conflicts - print conflicts.\n" msgstr " --conflicts - gwrthdaro argraffu\n" -#: ../urpmq:82 +#: ../urpmq:83 +#, fuzzy, c-format +msgid " --obsoletes - print obsoletes.\n" +msgstr " --obsoletes - tagiau'r hen\n" + +#: ../urpmq:84 #, c-format msgid " --provides - print provides.\n" msgstr " --provides - argraffu darparu\n" -#: ../urpmq:83 +#: ../urpmq:85 #, c-format msgid " --requires - print requires.\n" msgstr " --requires - angenrhaid argraffu.\n" -#: ../urpmq:84 +#: ../urpmq:86 +#, fuzzy, c-format +msgid " --suggests - print suggests.\n" +msgstr " --suggests - cynnig tagiau\n" + +#: ../urpmq:87 #, c-format msgid " --sourcerpm - print sourcerpm.\n" msgstr " --sourcerpm - argraffu rpm ffynhonnell\n" -#: ../urpmq:85 +#: ../urpmq:88 #, c-format msgid " --summary, -S - print summary.\n" msgstr " --summary, -S - crynodeb argraffu.\n" -#: ../urpmq:87 +#: ../urpmq:90 #, c-format msgid "" " --requires-recursive, -d\n" @@ -2997,12 +3104,12 @@ msgstr "" " - ymestyn ymholiad i ddibyniaethau pecynnau.\n" ".\n" -#: ../urpmq:89 +#: ../urpmq:92 #, c-format msgid " --whatrequires - reverse search to what requires package.\n" msgstr " --whatrequires - chwilio nôl i'r hyn sydd angen ar becyn.\n" -#: ../urpmq:90 +#: ../urpmq:93 #, c-format msgid "" " --whatrequires-recursive\n" @@ -3011,7 +3118,7 @@ msgstr "" " --whatrequires-recursive\n" " - chwilio nôl estyndig (yn cynnwys rhith becynnau) \n" -#: ../urpmq:92 +#: ../urpmq:95 #, c-format msgid "" " --whatprovides, -p\n" @@ -3020,45 +3127,45 @@ msgstr "" " --whatprovides, -p\n" " - chwilio yn provides i ganfod pecyn.\n" -#: ../urpmq:95 +#: ../urpmq:98 #, c-format msgid " -c - complete output with package to be removed.\n" msgstr " -c - allbwn cyfan a phecyn i'w dynnu\n" -#: ../urpmq:97 +#: ../urpmq:100 #, c-format msgid " -g - print groups with name also.\n" msgstr " -g - argraffu grwpiau gydag enw hefyd.\n" -#: ../urpmq:98 +#: ../urpmq:101 #, c-format msgid " -i - print useful information in human readable form.\n" msgstr "" " -i - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy " "i bobl.\n" -#: ../urpmq:99 +#: ../urpmq:102 #, c-format msgid " -l - list files in package.\n" msgstr " -l - rhestri'r ffeiliau mewn pecyn.\n" -#: ../urpmq:100 +#: ../urpmq:103 #, c-format msgid " -m - equivalent to -du\n" msgstr " -m - yn cyfateb i -du.\n" -#: ../urpmq:101 +#: ../urpmq:104 #, c-format msgid " -r - print version and release with name also.\n" msgstr " -r - argraffu fersiwn a rhyddhad gydag enw hefyd.\n" -#: ../urpmq:102 +#: ../urpmq:105 #, c-format msgid " -s - next package is a source package (same as --src).\n" msgstr "" " --s - pecyn nesaf yn becyn ffynhonnell (yr un peth â --src).\n" -#: ../urpmq:103 +#: ../urpmq:106 #, c-format msgid "" " -u - remove package if a more recent version is already " @@ -3067,50 +3174,55 @@ msgstr "" " -u - tynnu pecyn os oes yna fersiwn mwy diweddar wedi ei " "osod.\n" -#: ../urpmq:104 +#: ../urpmq:107 #, c-format msgid " -y - impose fuzzy search (same as --fuzzy).\n" msgstr " -y - gosod chwilio fuzzy (fel --fuzzy).\n" -#: ../urpmq:105 +#: ../urpmq:108 #, c-format msgid " -Y - like -y, but forces to match case-insensitively.\n" msgstr "" " -Y - fel -y, ond yn gorfodi cydweddu diffyg cydweddiad maint " "llythrennau.\n" -#: ../urpmq:106 +#: ../urpmq:109 #, c-format msgid " names or rpm files given on command line are queried.\n" msgstr "" " bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael " "eu holi.\n" -#: ../urpmq:185 +#: ../urpmq:156 +#, c-format +msgid "usage: \"urpmq --auto-orphans\" with no argument" +msgstr "" + +#: ../urpmq:209 #, c-format msgid "--list-nodes can only be used with --parallel" msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes" -#: ../urpmq:209 +#: ../urpmq:233 #, c-format msgid "use -l to list files" msgstr "defnyddiwch -l i restru'r ffeiliau" -#: ../urpmq:382 +#: ../urpmq:404 #, c-format msgid "no xml info for medium \"%s\", only partial result for package %s" msgstr "" "dim xml info ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer " "pecyn %s" -#: ../urpmq:383 +#: ../urpmq:405 #, c-format msgid "no xml info for medium \"%s\", only partial result for packages %s" msgstr "" "dimxml info ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer " "pecynnau %s" -#: ../urpmq:386 +#: ../urpmq:408 #, c-format msgid "" "no xml info for medium \"%s\", unable to return any result for package %s" @@ -3118,7 +3230,7 @@ msgstr "" "dim xml info ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer " "pecyn %s" -#: ../urpmq:387 +#: ../urpmq:409 #, c-format msgid "" "no xml info for medium \"%s\", unable to return any result for packages %s" @@ -3126,11 +3238,33 @@ msgstr "" "dim xml info ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer " "pecynnau %s" -#: ../urpmq:451 +#: ../urpmq:473 #, c-format msgid "No changelog found\n" msgstr "Heb ganfod changelog\n" +#~ msgid "malformed URL: [%s]" +#~ msgstr "URL gwallus: [%s]" + +#~ msgid "sorry, you can't use --install-src to install remote .src.rpm files" +#~ msgstr "" +#~ "nid oes modd ei ddefnyddio --install-src i osod y ffeiliau pell .src.rpm " +#~ "files" + +#~ msgid "Error" +#~ msgstr "Gwall" + +#~ msgid "%d installation transaction failed" +#~ msgid_plural "%d installation transactions failed" +#~ msgstr[0] "methodd trosglwyddiad gosod %d" +#~ msgstr[1] "methodd trosglwyddiad gosod %d" + +#~ msgid "Package %s can not be installed" +#~ msgstr "Methu gosod pecyn %s" + +#~ msgid "Checking to remove the following packages" +#~ msgstr "Ticio i ddileu'r pecynnau canlynol" + #~ msgid "%s database locked" #~ msgstr "Cronfa ddata %s wedi cloi" @@ -3148,9 +3282,6 @@ msgstr "Heb ganfod changelog\n" #~ msgid "too many mount points for removable medium \"%s\"" #~ msgstr "gormod o bwyntiau gosod ar gyfer cyfrwng symudol \"%s\"" -#~ msgid "taking removable device as \"%s\"" -#~ msgstr "cymryd dyfais symudol fel \"%s\"" - #~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly" #~ msgstr "" #~ "Delwedd ISO yw cyfrwng \"%s\" , a fydd yn cael ei osod wrth ei ddefnyddio." -- cgit v1.2.1