From 34f7c616f0a456d7acd1594b4763b9c941b3db3a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sun, 28 Sep 2008 23:44:51 +0000 Subject: update (Rhoslyn Prys) --- po/cy.po | 1153 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 576 insertions(+), 577 deletions(-) diff --git a/po/cy.po b/po/cy.po index 4cfb0c39..5ad66e0d 100644 --- a/po/cy.po +++ b/po/cy.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Mandriva Linux\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-04 18:36+0200\n" -"PO-Revision-Date: 2008-08-18 19:57-0000\n" +"POT-Creation-Date: 2008-09-23 18:55+0200\n" +"PO-Revision-Date: 2008-09-26 21:43-0000\n" "Last-Translator: Rhoslyn Prys \n" "Language-Team: Cymraeg\n" "MIME-Version: 1.0\n" @@ -127,9 +127,8 @@ msgstr "" msgid "Options:" msgstr "Dewisiadau:" -#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72 -#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40 -#: ../urpmi.update:32 ../urpmq:45 +#: ../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" @@ -166,7 +165,7 @@ msgstr "" " --verify-rpm - gwirio llofnod rpm cyn gosod\n" " (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig).\n" -#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../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" @@ -232,7 +231,7 @@ msgstr "" msgid "Warning" msgstr "Rhybudd" -#: ../gurpmi2:134 ../urpmi:640 +#: ../gurpmi2:134 ../urpmi:624 #, c-format msgid "Ok" msgstr "Iawn" @@ -273,13 +272,13 @@ msgstr "" "%s\n" "Parhau beth bynnag?" -#: ../gurpmi2:241 ../urpmi:607 +#: ../gurpmi2:241 ../urpmi:591 #, 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:242 ../urpmi:608 +#: ../gurpmi2:242 ../urpmi:592 #, c-format msgid "" "To satisfy dependencies, the following packages are going to be installed:" @@ -302,7 +301,7 @@ msgstr "Gosod y pecyn..." msgid "unable to get source packages, aborting" msgstr "methu estyn pecynnau ffynhonnell, atal" -#: ../gurpmi2:266 ../urpm/install.pm:88 +#: ../gurpmi2:266 ../urpm/install.pm:81 #, c-format msgid "Preparing..." msgstr "Paratoi..." @@ -312,7 +311,7 @@ msgstr "Paratoi..." msgid "Installing package `%s' (%s/%s)..." msgstr "Gosod pecyn `%s' (%s/%s)..." -#: ../gurpmi2:287 ../urpmi:635 +#: ../gurpmi2:287 ../urpmi:619 #, c-format msgid "Please insert the medium named \"%s\"" msgstr "Rhowch gyfrwng \"%s\" yn y ddyfais" @@ -327,7 +326,7 @@ msgstr "Llwytho pecynnau i lawr ' %s'..." msgid "_Done" msgstr "_Gorffen" -#: ../gurpmi2:332 ../urpm/main_loop.pm:111 +#: ../gurpmi2:332 ../urpm/main_loop.pm:114 #, c-format msgid "" "Installation failed, some files are missing:\n" @@ -338,8 +337,8 @@ msgstr "" "%s\n" "Hoffech chi ddiweddaru eich cronfa ddata urpmi?" -#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241 -#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282 +#: ../gurpmi2:338 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244 +#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289 #, c-format msgid "Installation failed:" msgstr "Methodd y gosod:" @@ -359,7 +358,7 @@ msgstr "Cwblhawyd y gosod" msgid "removing %s" msgstr "tynnu %s" -#: ../gurpmi2:354 ../urpmi:702 +#: ../gurpmi2:354 ../urpmi:686 #, c-format msgid "restarting urpmi" msgstr "ailgychwyn urpmi" @@ -398,7 +397,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:281 +#: ../rurpmi:11 ../urpmi:268 #, c-format msgid "Only superuser is allowed to install packages" msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau" @@ -408,136 +407,145 @@ msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau" msgid "Running urpmi in restricted mode..." msgstr "Rhedeg urpmi mewn modd cyfyngedig..." -#: ../urpm.pm:111 +#: ../urpm.pm:112 #, c-format msgid "fail to create directory %s" msgstr "methu creu cyfeiriadur %s" -#: ../urpm.pm:112 +#: ../urpm.pm:113 #, c-format msgid "invalid owner for directory %s" msgstr "perchennog annilys cyfeiriadur %s" -#: ../urpm.pm:124 +#: ../urpm.pm:125 #, c-format msgid "Can not download packages into %s" msgstr "Methu llwytho pecynnau i lawr i %s" -#: ../urpm.pm:274 +#: ../urpm.pm:140 +#, c-format +msgid "Environment directory %s does not exist" +msgstr "Nid yw cyfeiriadur amgylchedd %s yn bodoli" + +#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165 +#, c-format +msgid "using specific environment on %s\n" +msgstr "ddefnyddio amgylchedd penodol ar %s\n" + +#: ../urpm.pm:305 #, c-format msgid "unable to open rpmdb" msgstr "methu agor rpmdb" -#: ../urpm.pm:288 +#: ../urpm.pm:319 #, c-format msgid "invalid rpm file name [%s]" msgstr "enw ffeil rpm annilys [%s]" -#: ../urpm.pm:294 +#: ../urpm.pm:325 #, c-format msgid "retrieving rpm file [%s] ..." msgstr "adfer ffeil rpm (%s)..." -#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217 +#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217 #, c-format msgid "...retrieving done" msgstr ".cwblhau adfer" -#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219 -#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432 -#: ../urpm/media.pm:1486 +#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219 +#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442 #, c-format msgid "...retrieving failed: %s" msgstr "... methodd ail-lwytho: %s" -#: ../urpm.pm:304 +#: ../urpm.pm:335 #, c-format msgid "unable to access rpm file [%s]" msgstr "methu cael mynediad ffeil rpm (%s)" -#: ../urpm.pm:309 +#: ../urpm.pm:340 #, c-format msgid "unable to parse spec file %s [%s]" msgstr "methu didoli ffeil spec %s [%s]" -#: ../urpm.pm:317 +#: ../urpm.pm:348 #, c-format msgid "unable to register rpm file" msgstr "methu cofrestr ffeil rpm" -#: ../urpm.pm:319 +#: ../urpm.pm:350 #, c-format msgid "Incompatible architecture for rpm [%s]" msgstr "Saernïaeth anghydnaws ar gyfer rpm [%s]" -#: ../urpm.pm:323 +#: ../urpm.pm:354 #, c-format msgid "error registering local packages" msgstr "gwall cofrestru pecynnau lleol" -#: ../urpm.pm:410 +#: ../urpm.pm:441 #, 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:145 ../urpm/args.pm:154 +#: ../urpm/args.pm:152 ../urpm/args.pm:161 #, c-format msgid "bad proxy declaration on command line\n" msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n" -#: ../urpm/args.pm:298 +#: ../urpm/args.pm:305 #, c-format msgid "urpmq: cannot read rpm file \"%s\"\n" msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n" -#: ../urpm/args.pm:375 +#: ../urpm/args.pm:382 #, c-format msgid "unexpected expression %s" msgstr "mynegiadau annisgwyl %s" -#: ../urpm/args.pm:376 +#: ../urpm/args.pm:383 #, c-format msgid "missing expression before %s" msgstr "mynegiad coll cyn %s" -#: ../urpm/args.pm:382 +#: ../urpm/args.pm:389 #, c-format msgid "unexpected expression %s (suggestion: use -a or -o ?)" msgstr "mynegiad annisgwyl %s (awgrym: defnyddio -a neu-0 ?)" -#: ../urpm/args.pm:386 +#: ../urpm/args.pm:393 #, c-format msgid "no expression to close" msgstr "dim mynegiad i'w gau" -#: ../urpm/args.pm:395 +#: ../urpm/args.pm:402 #, 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:463 +#: ../urpm/args.pm:470 #, c-format msgid "chroot directory doesn't exist" msgstr "Nid yw cyfeiriadur chroot yn bodoli" -#: ../urpm/args.pm:482 +#: ../urpm/args.pm:493 #, c-format msgid "Can't use %s without %s" msgstr "Methu defnyddio %s heb %s" -#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157 +#: ../urpm/args.pm:496 ../urpm/args.pm:499 ../urpmq:157 #, c-format msgid "Can't use %s with %s" msgstr "Methu defnyddio %s gyda %s" -#: ../urpm/args.pm:496 +#: ../urpm/args.pm:507 #, c-format msgid "Too many arguments\n" msgstr "Gormod o ymresymiadau\n" -#: ../urpm/bug_report.pm:51 ../urpmi:258 +#: ../urpm/bug_report.pm:54 ../urpmi:258 #, c-format msgid "Copying failed" msgstr "Methodd y copïo" @@ -586,122 +594,122 @@ 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:113 +#: ../urpm/download.pm:82 +#, 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:157 #, 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:138 +#: ../urpm/download.pm:182 #, 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:139 +#: ../urpm/download.pm:183 #, c-format msgid "User name:" msgstr "Enw Defnyddiwr" -#: ../urpm/download.pm:139 +#: ../urpm/download.pm:183 #, c-format msgid "Password:" msgstr "Cyfrinair:" -#: ../urpm/download.pm:214 +#: ../urpm/download.pm:258 #, c-format msgid "Unknown webfetch `%s' !!!\n" msgstr "Webfetch anhysbys '%s' !!!\n" -#: ../urpm/download.pm:222 +#: ../urpm/download.pm:266 #, c-format msgid "%s failed: exited with signal %d" msgstr "Methodd '%s': gadael gydag arwydd %d" -#: ../urpm/download.pm:223 +#: ../urpm/download.pm:267 #, c-format msgid "%s failed: exited with %d" msgstr "Methodd '%s': gadael gyda %d" -#: ../urpm/download.pm:252 +#: ../urpm/download.pm:296 #, c-format msgid "copy failed" msgstr "methodd y copïo" -#: ../urpm/download.pm:258 +#: ../urpm/download.pm:302 #, c-format msgid "wget is missing\n" msgstr "mae wget ar goll\n" -#: ../urpm/download.pm:325 +#: ../urpm/download.pm:369 #, c-format msgid "curl is missing\n" msgstr "mae curl ar goll\n" -#: ../urpm/download.pm:450 +#: ../urpm/download.pm:494 #, c-format msgid "curl failed: download canceled\n" msgstr "methodd curl: diddymwyd y llwytho i lawr\n" -#: ../urpm/download.pm:489 +#: ../urpm/download.pm:533 #, c-format msgid "rsync is missing\n" msgstr "rsync ar goll\n" -#: ../urpm/download.pm:557 +#: ../urpm/download.pm:601 #, c-format msgid "ssh is missing\n" msgstr "ssh ar goll\n" -#: ../urpm/download.pm:576 +#: ../urpm/download.pm:620 #, c-format msgid "prozilla is missing\n" msgstr "prozilla ar goll\n" -#: ../urpm/download.pm:592 +#: ../urpm/download.pm:636 #, c-format msgid "Couldn't execute prozilla\n" msgstr "Methu gweithredu prozilla\n" -#: ../urpm/download.pm:600 +#: ../urpm/download.pm:646 #, c-format msgid "aria2 is missing\n" msgstr "aria2 ar goll\n" -#: ../urpm/download.pm:715 +#: ../urpm/download.pm:761 #, 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:717 +#: ../urpm/download.pm:763 #, c-format msgid " %s%% completed, speed = %s" msgstr " %s%% wedi ei gwblhau, cyflymder = %s" -#: ../urpm/download.pm:782 +#: ../urpm/download.pm:828 #, c-format msgid "retrieving %s" msgstr "estyn %s" -#: ../urpm/download.pm:786 +#: ../urpm/download.pm:835 #, c-format msgid "retrieved %s" msgstr "estynwyd: %s" -#: ../urpm/download.pm:834 +#: ../urpm/download.pm:899 #, c-format msgid "unknown protocol defined for %s" msgstr "protocol anhysbys ar gyfer %s" -#: ../urpm/download.pm:862 -#, 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:866 +#: ../urpm/download.pm:909 #, 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:886 +#: ../urpm/download.pm:930 #, c-format msgid "unable to handle protocol: %s" msgstr "methu trin protocol: %s" @@ -721,59 +729,59 @@ msgstr "heb ganfod pecyn %s" msgid "retrieving rpm files from medium \"%s\"..." msgstr "adfer ffeiliau rpm o gyfrwng [%s]" -#: ../urpm/install.pm:95 +#: ../urpm/install.pm:88 #, c-format msgid "[repackaging]" msgstr "[ailbecynnu]" -#: ../urpm/install.pm:175 +#: ../urpm/install.pm:168 #, 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:178 +#: ../urpm/install.pm:171 #, c-format msgid "unable to create transaction" msgstr "methu creu trosglwyddiad." -#: ../urpm/install.pm:201 +#: ../urpm/install.pm:194 #, c-format msgid "unable to extract rpm from delta-rpm package %s" msgstr "methu tynnu rpm o becyn delta-rpm %s" -#: ../urpm/install.pm:214 +#: ../urpm/install.pm:207 #, c-format msgid "unable to install package %s" msgstr "methu gosod pecyn %s" -#: ../urpm/install.pm:217 +#: ../urpm/install.pm:210 #, c-format msgid "removing bad rpm (%s) from %s" msgstr "tynnu rpm gwallus (%s) o %s" -#: ../urpm/install.pm:218 ../urpm/install.pm:275 +#: ../urpm/install.pm:211 ../urpm/install.pm:268 #, c-format msgid "removing %s failed: %s" msgstr "tynnu %s methodd: %s" -#: ../urpm/install.pm:256 +#: ../urpm/install.pm:249 #, c-format msgid "Removing package %s" msgstr "Tynnu pecyn %s." -#: ../urpm/install.pm:257 +#: ../urpm/install.pm:250 #, c-format msgid "removing package %s" msgstr "tynnu pecyn %s." -#: ../urpm/install.pm:273 +#: ../urpm/install.pm:266 #, c-format msgid "removing installed rpms (%s) from %s" msgstr "tynnu rpm wedi eu gosod (%s) o %s" -#: ../urpm/install.pm:281 +#: ../urpm/install.pm:274 #, c-format msgid "More information on package %s" msgstr "Rhagor o wybodaeth ar becyn %s" @@ -818,18 +826,18 @@ 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:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154 -#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248 +#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157 +#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251 #, c-format msgid "Installation failed" msgstr "Methodd y gosod" -#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122 +#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125 #, c-format msgid "Try to go on anyway? (y/N) " msgstr "Ceisio mynd ymlaen beth bynnag? (i/N)" -#: ../urpm/main_loop.pm:121 +#: ../urpm/main_loop.pm:124 #, c-format msgid "" "Installation failed, bad rpms:\n" @@ -838,73 +846,63 @@ msgstr "" "Methodd y gosod, rpm gwallus:\n" "%s" -#: ../urpm/main_loop.pm:139 +#: ../urpm/main_loop.pm:142 #, c-format msgid "The following package has bad signature" msgstr "Mae gan y pecyn canlynol lofnod gwallus" -#: ../urpm/main_loop.pm:140 +#: ../urpm/main_loop.pm:143 #, c-format msgid "The following packages have bad signatures" msgstr "Mae gan y pecynnau canlynol lofnod gwallus" -#: ../urpm/main_loop.pm:141 +#: ../urpm/main_loop.pm:144 #, c-format msgid "Do you want to continue installation ?" msgstr "Ydych chi am barhau gosod?" -#: ../urpm/main_loop.pm:158 +#: ../urpm/main_loop.pm:161 #, c-format msgid "removing installed rpms (%s)" msgstr "tynnu rpm wedi eu gosod (%s)" -#: ../urpm/main_loop.pm:178 +#: ../urpm/main_loop.pm:181 #, c-format msgid "distributing %s" msgstr "dosbarthu %s" -#: ../urpm/main_loop.pm:193 +#: ../urpm/main_loop.pm:196 #, c-format msgid "installing %s from %s" msgstr "gosod %s o %s" -#: ../urpm/main_loop.pm:195 +#: ../urpm/main_loop.pm:198 #, c-format msgid "installing %s" msgstr "gosod %s" -#: ../urpm/main_loop.pm:231 +#: ../urpm/main_loop.pm:234 #, c-format msgid "Try installation without checking dependencies? (y/N) " msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)" -#: ../urpm/main_loop.pm:249 +#: ../urpm/main_loop.pm:252 #, c-format msgid "Try harder to install (--force)? (y/N) " msgstr "Mwy o orfodaeth gyda'r gosod? (--force)? (y/N)" -#: ../urpm/main_loop.pm:295 +#: ../urpm/main_loop.pm:302 #, c-format msgid "Packages are up to date" msgstr "Mae'r pecynnau'n rhai diweddaraf" -#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298 +#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298 #, c-format msgid "Installation is possible" msgstr "Gosod yn bosibl" #: ../urpm/md5sum.pm:26 #, c-format -msgid "examining %s file" -msgstr "archwilio %s ffeil" - -#: ../urpm/md5sum.pm:27 -#, c-format -msgid "invalid MD5SUM file" -msgstr "ffeil MD SUM annilys" - -#: ../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" @@ -977,223 +975,223 @@ msgstr "gosod yn lle uwchraddio pecyn %s" msgid "medium \"%s\" already exists" msgstr "cyfrwng \"%s\" yn bodoli eisoes" -#: ../urpm/media.pm:767 +#: ../urpm/media.pm:763 #, c-format msgid "(ignored by default)" msgstr "(anwybyddwyd drwy ragosodiad)" -#: ../urpm/media.pm:773 +#: ../urpm/media.pm:769 #, c-format msgid "adding medium \"%s\" before remote medium \"%s\"" msgstr "ychwanegu cyfrwng \"%s\", cyn cyfrwng pell \"%s\"" -#: ../urpm/media.pm:779 +#: ../urpm/media.pm:775 #, c-format msgid "adding medium \"%s\"" msgstr "ychwanegu cyfrwng \"%s\"" -#: ../urpm/media.pm:808 +#: ../urpm/media.pm:804 #, c-format msgid "directory %s does not exist" msgstr "nid yw cyfeiriadur %s yn bodoli" -#: ../urpm/media.pm:816 +#: ../urpm/media.pm:812 #, 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:834 +#: ../urpm/media.pm:828 #, c-format msgid "unable to parse media.cfg" msgstr "methu didoli media.cfg" -#: ../urpm/media.pm:837 +#: ../urpm/media.pm:831 #, 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:855 +#: ../urpm/media.pm:849 #, c-format msgid "skipping non compatible media `%s' (for %s)" msgstr "hepgor cyfrwng anghymarus '%s' (ar gyfer %s)" -#: ../urpm/media.pm:907 +#: ../urpm/media.pm:900 #, c-format msgid "retrieving media.cfg file..." msgstr "estyn ffeil media.cfg..." -#: ../urpm/media.pm:948 +#: ../urpm/media.pm:941 #, c-format msgid "trying to select nonexistent medium \"%s\"" msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\"" -#: ../urpm/media.pm:951 +#: ../urpm/media.pm:944 #, c-format msgid "selecting multiple media: %s" msgstr "dewis aml-gyfrwng: %s" -#: ../urpm/media.pm:971 +#: ../urpm/media.pm:964 #, c-format msgid "removing medium \"%s\"" msgstr "dewis cyfrwng \"%s\":" -#: ../urpm/media.pm:1055 +#: ../urpm/media.pm:1047 #, c-format msgid "reconfiguring urpmi for media \"%s\"" msgstr "ail-ffurfweddu urpmi ar gyfer cyfrwng \"%s\"" -#: ../urpm/media.pm:1089 +#: ../urpm/media.pm:1081 #, c-format msgid "...reconfiguration failed" msgstr "...methodd ail-ffurfweddu" -#: ../urpm/media.pm:1095 +#: ../urpm/media.pm:1087 #, c-format msgid "reconfiguration done" msgstr "cwblhau ail-ffurfweddu" -#: ../urpm/media.pm:1111 +#: ../urpm/media.pm:1103 #, c-format msgid "Error generating names file: dependency %d not found" msgstr "Gwall wrth gynhyrchu ffeil enwau: heb ganfod dibyniaeth %d" -#: ../urpm/media.pm:1132 +#: ../urpm/media.pm:1124 #, c-format msgid "medium \"%s\" is up-to-date" msgstr "cyfrwng \"%s\" wedi ei ddiweddaru" -#: ../urpm/media.pm:1143 +#: ../urpm/media.pm:1135 #, c-format msgid "examining synthesis file [%s]" msgstr "archwilio ffeil synthesis [%s]" -#: ../urpm/media.pm:1163 +#: ../urpm/media.pm:1155 #, c-format msgid "problem reading synthesis file of medium \"%s\"" msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\"" -#: ../urpm/media.pm:1176 ../urpm/media.pm:1259 +#: ../urpm/media.pm:1168 ../urpm/media.pm:1263 #, c-format msgid "copying [%s] for medium \"%s\"..." msgstr "copïo [%s] ar gyfer cyfrwng \"%s\"..." -#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502 +#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493 #, c-format msgid "...copying failed" msgstr "...methodd y copïo" -#: ../urpm/media.pm:1229 +#: ../urpm/media.pm:1236 #, c-format msgid "copying description file of \"%s\"..." msgstr "copïo ffeil disgrifiad o \"%s\"" -#: ../urpm/media.pm:1231 ../urpm/media.pm:1263 +#: ../urpm/media.pm:1238 ../urpm/media.pm:1267 #, c-format msgid "...copying done" msgstr "...cwblhau'r copïo" -#: ../urpm/media.pm:1265 +#: ../urpm/media.pm:1269 #, 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:1310 +#: ../urpm/media.pm:1317 #, c-format msgid "computing md5sum of retrieved source synthesis" msgstr "cyfrifo md5sum o ffynhonnell synthesis adferwyd (neu synthesis)" -#: ../urpm/media.pm:1312 ../urpm/media.pm:1752 +#: ../urpm/media.pm:1319 ../urpm/media.pm:1738 #, c-format msgid "retrieval of [%s] failed (md5sum mismatch)" msgstr "methodd estyn (%s) (md5sum gwallus)" -#: ../urpm/media.pm:1327 +#: ../urpm/media.pm:1334 #, c-format msgid "genhdlist2 failed on %s" msgstr "methodd genhdlist2 ar %s" -#: ../urpm/media.pm:1337 +#: ../urpm/media.pm:1344 #, c-format msgid "comparing %s and %s" msgstr "cymharu %s ac %s" -#: ../urpm/media.pm:1362 +#: ../urpm/media.pm:1374 #, c-format msgid "invalid hdlist file %s for medium \"%s\"" msgstr "ffeil hdlist annilys %s ar gyfer cyfrwng \"%s\"" -#: ../urpm/media.pm:1388 +#: ../urpm/media.pm:1400 #, c-format msgid "copying MD5SUM file of \"%s\"..." msgstr "copïo ffeil MD5SUM o \"%s\"" -#: ../urpm/media.pm:1430 +#: ../urpm/media.pm:1440 #, c-format msgid "invalid MD5SUM file (downloaded from %s)" msgstr "ffeil MD5SUM annilys (llwytho i lawr o %s)" -#: ../urpm/media.pm:1461 +#: ../urpm/media.pm:1443 +#, fuzzy, c-format +msgid "no metadata found for medium \"%s\"" +msgstr "dim ffeil synthesis file ar gyfer cyfrwng \"%s\"" + +#: ../urpm/media.pm:1475 #, c-format msgid "retrieving source synthesis of \"%s\"..." msgstr "adfer ffynhonnell synthesis \"%s\"..." -#: ../urpm/media.pm:1478 -#, c-format -msgid "found probed synthesis as %s" -msgstr "canfod synthesis holwyd fel %s" - -#: ../urpm/media.pm:1485 ../urpm/media.pm:1593 -#, c-format -msgid "no synthesis file found for medium \"%s\"" -msgstr "dim ffeil synthesis file ar gyfer cyfrwng \"%s\"" - -#: ../urpm/media.pm:1536 +#: ../urpm/media.pm:1527 #, c-format msgid "examining pubkey file of \"%s\"..." msgstr "archwilio ffeil pubkey \"%s\"" -#: ../urpm/media.pm:1548 +#: ../urpm/media.pm:1539 #, c-format msgid "...imported key %s from pubkey file of \"%s\"" msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\"" -#: ../urpm/media.pm:1552 +#: ../urpm/media.pm:1543 #, c-format msgid "unable to import pubkey file of \"%s\"" msgstr "methu mewnforio ffeil pubkey \"%s\"" -#: ../urpm/media.pm:1626 +#: ../urpm/media.pm:1579 +#, c-format +msgid "no synthesis file found for medium \"%s\"" +msgstr "dim ffeil synthesis file ar gyfer cyfrwng \"%s\"" + +#: ../urpm/media.pm:1612 #, c-format msgid "updated medium \"%s\"" msgstr "cyfrwng \"%s\" wedi ei ddiweddaru" -#: ../urpm/media.pm:1746 +#: ../urpm/media.pm:1732 #, c-format msgid "retrieval of [%s] failed" msgstr "methodd estyn [%s]" -#: ../urpm/mirrors.pm:19 +#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40 #, c-format msgid "trying again with mirror %s" msgstr "ceisio eto gyda drych %s" -#: ../urpm/mirrors.pm:71 +#: ../urpm/mirrors.pm:92 #, c-format msgid "Could not find a mirror from mirrorlist %s" msgstr "Methu canfod drych o restr drychau %s" -#: ../urpm/mirrors.pm:194 +#: ../urpm/mirrors.pm:215 #, c-format msgid "found geolocalisation %s %.2f %.2f from timezone %s" msgstr "wedi canfod geolleoleiddio %s %.2f %.2f o gylchfa amser %s" -#: ../urpm/mirrors.pm:239 +#: ../urpm/mirrors.pm:260 #, c-format msgid "getting mirror list from %s" msgstr "estyn rhestr drychai o %s" -#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627 +#: ../urpm/msg.pm:63 ../urpmi:501 ../urpmi:516 ../urpmi:611 #, c-format msgid "Nn" msgstr "Nn" @@ -1203,7 +1201,7 @@ 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:38 ../urpmi:568 ../urpmi:663 ../urpmi:669 +#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:552 ../urpmi:647 ../urpmi:653 #: ../urpmi.addmedia:141 #, c-format msgid "Yy" @@ -1274,7 +1272,7 @@ msgstr "GB" msgid "TB" msgstr "TB" -#: ../urpm/orphans.pm:307 +#: ../urpm/orphans.pm:310 #, c-format msgid "" "The following package is now orphan, use \"urpme --auto-orphans\" to remove " @@ -1363,582 +1361,594 @@ msgstr "gosod %s" msgid "unmounting %s" msgstr "dadosod %s" -#: ../urpm/search.pm:29 ../urpmf:29 +#: ../urpm/select.pm:30 +#, c-format +msgid "urpmi was restarted, and the list of priority packages did not change" +msgstr "ail gychwynnwyd urpmi, ac nid yw'r rhestr prif pecynnau wedi newid" + +#: ../urpm/select.pm:32 #, c-format msgid "" -"urpmf version %s\n" -"Copyright (C) 2002-2006 Mandriva.\n" -"This is free software and may be redistributed under the terms of the GNU " -"GPL.\n" -"\n" -"usage: urpmf [options] pattern-expression\n" +"urpmi was restarted, and the list of priority packages did change: %s vs %s" msgstr "" -"urpmf fersiwn %s\n" -"Hawlfraint © 2002 - 2006 Mandriva.\n" -"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL GNU..\n" -"\n" -"defnydd: urpmf [dewisiadau] pattern-expression\n" +"ail gychwynnwyd urpmi, ac mae'r rhestr prif pecynnau wedi newid: %s vs %s" -#: ../urpm/search.pm:36 ../urpmf:36 +#: ../urpm/select.pm:170 #, c-format -msgid " --version - print this tool's version number.\n" -msgstr " --version - argraffu rhif fersiwn yr offeryn.\n" +msgid "No package named %s" +msgstr "Dim pecyn o'r enw %s" -#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80 +#: ../urpm/select.pm:172 ../urpme:115 #, c-format -msgid " --env - use specific environment (typically a bug report).\n" -msgstr "" -" --env - defnyddio amgylchedd penodol (adroddiad gwall fel " -"rheol).\n" +msgid "The following packages contain %s: %s" +msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:" -#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49 +#: ../urpm/select.pm:174 #, c-format -msgid " --excludemedia - do not use the given media, separated by comma.\n" -msgstr "" -" --excludemedia - peidio defnyddio'r cyfrwng hwn, rhannwyd gyda choma.\n" +msgid "You should use \"-a\" to use all of them" +msgstr "Dylech ddefnyddio \"-a\" i'w defnyddio i gyd" -#: ../urpm/search.pm:39 ../urpmf:39 +#: ../urpm/select.pm:295 #, c-format -msgid "" -" --literal, -l - don't match patterns, use argument as a literal string.\n" -msgstr "" -" --literal, -l - peidio cydweddu patrymau, defnyddio ymresymiad fel llinyn " -"llythrennedd.\n" +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/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111 -#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45 -#: ../urpmi.update:48 ../urpmq:70 +#: ../urpm/select.pm:538 #, 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" +msgid "Package %s is already installed" +msgstr "Pecyn %s wedi ei osod eisoes" -#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50 +#: ../urpm/select.pm:539 #, c-format -msgid "" -" --sortmedia - sort media according to substrings separated by comma.\n" -msgstr "" -" --sortmedia - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda " -"choma.\n" +msgid "Packages %s are already installed" +msgstr "Pecynnau %s wedi eu gosod eisoes" -#: ../urpm/search.pm:43 ../urpmf:43 +#: ../urpm/select.pm:557 ../urpm/select.pm:641 #, c-format -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" +msgid "due to missing %s" +msgstr "oherwydd %s coll" -#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51 +#: ../urpm/select.pm:558 #, c-format -msgid " --synthesis - use the given synthesis instead of urpmi db.\n" -msgstr " --synthesis - defnyddio'r synthesis yn lle urpmi db.\n" +msgid "due to already installed %s" +msgstr "oherwydd %s wedi ei osod eisoes" -#: ../urpm/search.pm:45 ../urpmf:45 +#: ../urpm/select.pm:559 ../urpm/select.pm:639 #, c-format -msgid " --uniq - do not print identical lines twice.\n" -msgstr " --uniq - peidio argraffu llinellau'r un fath.\n" +msgid "due to unsatisfied %s" +msgstr "%s heb ei foddloni" -#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46 +#: ../urpm/select.pm:565 #, c-format -msgid " --update - use only update media.\n" -msgstr " --update - defnyddio cyfrwng diweddaru'n unig.\n" +msgid "trying to promote %s" +msgstr "ceisio hybu %s" -#: ../urpm/search.pm:47 ../urpmf:47 +#: ../urpm/select.pm:566 #, c-format -msgid " --verbose - verbose mode.\n" -msgstr " --verbose - modd llafar.\n" +msgid "in order to keep %s" +msgstr "fel modd i gadw %s" -#: ../urpm/search.pm:48 ../urpmf:48 +#: ../urpm/select.pm:607 #, c-format -msgid " -i - ignore case distinctions in patterns.\n" +msgid "" +"The following package has to be removed for others to be upgraded:\n" +"%s" msgstr "" -" -i - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n" +"Rhaid i'r pecyn canlynol gael ei dynnu i eraill gael eu diweddaru.\n" +"%s" -#: ../urpm/search.pm:49 ../urpmf:49 +#: ../urpm/select.pm:608 #, c-format -msgid " -I - honor case distinctions in patterns (default).\n" +msgid "" +"The following packages have to be removed for others to be upgraded:\n" +"%s" msgstr "" -" -i - cadw gwahaniaeth maint llythrennau ym mhob patrwm " -"(rhagosodiad).\n" - -#: ../urpm/search.pm:50 ../urpmf:50 -#, c-format -msgid " -F - change field separator (defaults to ':').\n" -msgstr " -F - newid ymwahanydd maes (arferol i ':').\n" +"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n" +"%s" -#: ../urpm/search.pm:51 ../urpmf:51 +#: ../urpm/select.pm:635 #, c-format -msgid "Pattern expressions:\n" -msgstr "Mynegiadau patrymau:\n" +msgid "in order to install %s" +msgstr "er mwyn gosod %s" -#: ../urpm/search.pm:52 ../urpmf:52 +#: ../urpm/select.pm:645 #, c-format -msgid " text - any text is parsed as a regexp, unless -l is used.\n" -msgstr "" -" text - unrhyw destun wedi ei ddidoli fel regexp, onibai fod -l " -"yn cael ei ddefnyddio.\n" +msgid "due to conflicts with %s" +msgstr "oherwydd gwrthdaro gyda %s" -#: ../urpm/search.pm:53 ../urpmf:53 +#: ../urpm/signature.pm:29 #, c-format -msgid " -e - include perl code directly as perl -e.\n" -msgstr " -e - cynnwys perl cod yn union fel perl -e.\n" +msgid "Invalid signature (%s)" +msgstr "Llofnod annilys (%s)" -#: ../urpm/search.pm:54 ../urpmf:54 +#: ../urpm/signature.pm:60 #, c-format -msgid " -a - binary AND operator.\n" -msgstr " -a - gweithredwr deuaidd AND.\n" +msgid "Invalid Key ID (%s)" +msgstr "Enw Allwedd Annilys (%s)" -#: ../urpm/search.pm:55 ../urpmf:55 +#: ../urpm/signature.pm:62 #, c-format -msgid " -o - binary OR operator.\n" -msgstr " -o - gweithredwr deuaidd OR.\n" +msgid "Missing signature (%s)" +msgstr "Llofnod coll (%s)" -#: ../urpm/search.pm:56 ../urpmf:56 +#: ../urpm/sys.pm:178 #, c-format -msgid " ! - unary NOT.\n" -msgstr " ! - unaidd NOT.\n" +msgid "system" +msgstr "system" -#: ../urpm/search.pm:57 ../urpmf:57 +#: ../urpm/sys.pm:213 #, c-format -msgid " ( ) - left and right parentheses.\n" -msgstr " ( ) - parenthesis de a chwith.\n" +msgid "You should restart %s for %s" +msgstr "Dylech ailddechrau %s ar gyfer %s" -#: ../urpm/search.pm:58 ../urpmf:58 +#: ../urpm/sys.pm:316 #, c-format -msgid "List of tags:\n" -msgstr "Rhestr tagiau:\n" +msgid "Can't write file" +msgstr "Methu ysgrifennu'r ffeil" -#: ../urpm/search.pm:59 ../urpmf:59 +#: ../urpm/sys.pm:316 #, c-format -msgid " --qf - specify a printf-like output format\n" -msgstr " --qf - pennu allbwn fformat printf-aidd\n" +msgid "Can't open file" +msgstr "Methu agor y ffeil" -#: ../urpm/search.pm:60 ../urpmf:60 +#: ../urpm/sys.pm:329 #, c-format -msgid " example: '%%name:%%files'\n" -msgstr " esiampl: '%%enw:%%ffeil'\n" +msgid "Can't move file %s to %s" +msgstr "Methu symud ffeil %s i %s" -#: ../urpm/search.pm:61 ../urpmf:61 +#: ../urpme:41 #, c-format -msgid " --arch - architecture\n" -msgstr " --arch - saernïaeth\n" +msgid "" +"urpme version %s\n" +"Copyright (C) 1999-2008 Mandriva.\n" +"This is free software and may be redistributed under the terms of the GNU " +"GPL.\n" +"\n" +"usage:\n" +msgstr "" +"urpmf fersiwn %s\n" +"Hawlfraint (C) 1999 - 2006 Mandriva.\n" +"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL GNU.\n" +"\n" +"defnydd:\n" -#: ../urpm/search.pm:62 ../urpmf:62 +#: ../urpme:47 #, c-format -msgid " --buildhost - build host\n" -msgstr " --buildhost - gwestai'r adeiladedd\n" +msgid " --auto - automatically select a package in choices.\n" +msgstr " --auto - dewis pecyn yn awtomatig o fewn dewisiadau.\n" -#: ../urpm/search.pm:63 ../urpmf:63 +#: ../urpme:48 #, c-format -msgid " --buildtime - build time\n" -msgstr " --buildtime - amser adeiladu\n" +msgid " --auto-orphans - remove orphans\n" +msgstr " --auto-orphans - tynnu amddifad\n" -#: ../urpm/search.pm:64 ../urpmf:64 +#: ../urpme:49 #, c-format -msgid " --conffiles - configuration files\n" -msgstr " --conffiles - ffeiliau ffurfweddiad\n" +msgid " --test - verify if the removal can be achieved correctly.\n" +msgstr " --test - gwirio os oes modd tynnu'n iawn.\n" -#: ../urpm/search.pm:65 ../urpmf:65 +#: ../urpme:51 ../urpmi:109 ../urpmq:68 #, c-format -msgid " --conflicts - conflict tags\n" -msgstr " --conflicts - tagiau gwrthdaro\n" +msgid " --parallel - distributed urpmi across machines of alias.\n" +msgstr "" +" --parallel - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n" -#: ../urpm/search.pm:66 ../urpmf:66 +#: ../urpme:52 ../urpmi:141 #, c-format -msgid " --description - package description\n" -msgstr " --description - disgrifiad pecyn\n" +msgid " --repackage - Re-package the files before erasing\n" +msgstr " --repackage - Ailbecynnu'r ffeiliau cyn eu dileu\n" -#: ../urpm/search.pm:67 ../urpmf:67 +#: ../urpme:53 #, c-format -msgid " --distribution - distribution\n" -msgstr " --distribution - dosbarthiad\n" +msgid " --root - use another root for rpm removal.\n" +msgstr " --root - defnyddio root arall ar gyfer tynnu rpm.\n" -#: ../urpm/search.pm:68 ../urpmf:68 +#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72 +#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70 #, c-format -msgid " --epoch - epoch\n" -msgstr " --epoch - cyfnod\n" +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" -#: ../urpm/search.pm:69 ../urpmf:69 +#: ../urpme:55 ../urpmi:101 #, c-format -msgid " --filename - filename of the package\n" -msgstr " --filename - enw ffeil y pecyn\n" +msgid " --justdb - update only the rpm db, not the filesystem.\n" +msgstr " --justdb - diweddaru'n unig db yr rpm, nid y system ffeilio.\n" -#: ../urpm/search.pm:70 ../urpmf:70 +#: ../urpme:56 #, c-format -msgid " --files - list of files contained in the package\n" -msgstr " --files - rhestr ffeiliau o fewn y pecyn\n" +msgid " --noscripts - do not execute package scriptlet(s).\n" +msgstr " --noscripts - peidio gweithredu sgriptledi'r pecyn(au).\n" -#: ../urpm/search.pm:71 ../urpmf:71 +#: ../urpme:57 #, c-format -msgid " --group - group\n" -msgstr " --group - grŵp\n" +msgid "" +" --use-distrib - configure urpme on the fly from a distrib tree, useful\n" +" to (un)install a chroot with --root option.\n" +msgstr "" +" --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n" +" wrth (ddad)osod chroot gyda dewis --root.\n" -#: ../urpm/search.pm:72 ../urpmf:72 +#: ../urpme:59 ../urpmi:152 ../urpmq:89 #, c-format -msgid " --license - license\n" -msgstr " --license - trwydded\n" +msgid " --verbose, -v - verbose mode.\n" +msgstr " --verbose, -v - modd llafar.\n" -#: ../urpm/search.pm:73 ../urpmf:73 +#: ../urpme:60 #, c-format -msgid " --name - package name\n" -msgstr " --name - enw'r pecyn\n" +msgid " -a - select all packages matching expression.\n" +msgstr " -a - select all packages matching expression.\n" -#: ../urpm/search.pm:74 ../urpmf:74 +#: ../urpme:73 #, c-format -msgid " --obsoletes - obsoletes tags\n" -msgstr " --obsoletes - tagiau'r hen\n" +msgid "Only superuser is allowed to remove packages" +msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu pecynnau" -#: ../urpm/search.pm:75 ../urpmf:75 +#: ../urpme:106 #, c-format -msgid " --packager - packager\n" -msgstr " --packager - pecynydd\n" +msgid "unknown packages" +msgstr "pecynnau anhysbys" -#: ../urpm/search.pm:76 ../urpmf:76 +#: ../urpme:106 #, c-format -msgid " --provides - provides tags\n" -msgstr " --provides - tag darparu\n" +msgid "unknown package" +msgstr "pecyn anhysbys" -#: ../urpm/search.pm:77 ../urpmf:77 +#: ../urpme:121 #, c-format -msgid " --requires - requires tags\n" -msgstr " --requires - tagiau angenrhaid\n" +msgid "Removing the following package will break your system:" +msgid_plural "Removing the following packages will break your system:" +msgstr[0] "Bydd tynnu pecyn canlynol yn torri eich system:" +msgstr[1] "Bydd tynnu pecynnau canlynol yn torri eich system:" -#: ../urpm/search.pm:78 ../urpmf:78 +#: ../urpme:126 #, c-format -msgid " --size - installed size\n" -msgstr " --size - maint wedi gosod\n" +msgid "Nothing to remove" +msgstr "Dim i'w dynnu" -#: ../urpm/search.pm:79 ../urpmf:79 +#: ../urpme:143 #, c-format -msgid " --sourcerpm - source rpm name\n" -msgstr " --sourcerpm - enw rpm ffynhonnell\n" +msgid "No orphans to remove" +msgstr "Dim amddifad i'w tynnu" -#: ../urpm/search.pm:80 ../urpmf:80 +#: ../urpme:149 #, c-format -msgid " --suggests - suggests tags\n" -msgstr " --suggests - cynnig tagiau\n" +msgid "To satisfy dependencies, the following package will be removed" +msgid_plural "" +"To satisfy dependencies, the following %d 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" -#: ../urpm/search.pm:81 ../urpmf:81 +#: ../urpme:154 #, c-format -msgid " --summary - summary\n" -msgstr " --summary - crynodeb\n" +msgid "(orphan package)" +msgid_plural "(orphan packages)" +msgstr[0] "pecyn amddifad" +msgstr[1] "pecynnau amddifad" -#: ../urpm/search.pm:82 ../urpmf:82 +#: ../urpme:161 #, c-format -msgid " --url - url\n" -msgstr " --url - url\n" +msgid "Remove %d package?" +msgid_plural "Remove %d packages?" +msgstr[0] "Tynnu pecynnau %d?" +msgstr[1] "Tynnu pecynnau %d?" -#: ../urpm/search.pm:83 ../urpmf:83 +#: ../urpme:161 ../urpmi:553 ../urpmi:648 ../urpmi.addmedia:144 #, c-format -msgid " --vendor - vendor\n" -msgstr " --vendor - gwerthwr\n" +msgid " (y/N) " +msgstr " (y/N) " -#: ../urpm/search.pm:84 ../urpmf:84 +#: ../urpme:166 #, c-format -msgid " -m - the media in which the package was found\n" -msgstr " -m - y cyfrwng lle cafwyd y pecyn\n" +msgid "testing removal of %s" +msgstr "profi tynnu %s" -#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99 +#: ../urpme:181 #, c-format -msgid " -f - print version, release and arch with name.\n" -msgstr " -f - argraffu fersiwn a rhyddhad ac arch gydag enw.\n" +msgid "Removal failed" +msgstr "Methodd y tynnu" -#: ../urpm/search.pm:197 ../urpmf:198 +#: ../urpme:183 #, c-format -msgid "Incorrect format: you may use only one multi-valued tag" -msgstr "Fformat anghywir: gallwch ddefnyddio un tag aml-werth yn unig" +msgid "Removal is possible" +msgstr "Mae tynnu yn bosibl" -#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165 +#: ../urpmf:29 #, c-format -msgid "using specific environment on %s\n" -msgstr "ddefnyddio amgylchedd penodol ar %s\n" +msgid "" +"urpmf version %s\n" +"Copyright (C) 2002-2006 Mandriva.\n" +"This is free software and may be redistributed under the terms of the GNU " +"GPL.\n" +"\n" +"usage: urpmf [options] pattern-expression\n" +msgstr "" +"urpmf fersiwn %s\n" +"Hawlfraint © 2002 - 2006 Mandriva.\n" +"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL GNU..\n" +"\n" +"defnydd: urpmf [dewisiadau] pattern-expression\n" -#: ../urpm/search.pm:290 ../urpmf:291 +#: ../urpmf:36 #, c-format -msgid "no hdlist available for medium \"%s\"" -msgstr "dim ffeil hdlist ar gyfer cyfrwng \"%s\"" +msgid " --version - print this tool's version number.\n" +msgstr " --version - argraffu rhif fersiwn yr offeryn.\n" -#: ../urpm/search.pm:297 ../urpmf:298 +#: ../urpmf:37 ../urpmi:132 ../urpmq:80 #, c-format -msgid "no synthesis available for medium \"%s\"" -msgstr "adeiladu ffeil synthesis file ar gyfer cyfrwng \"%s\"" +msgid " --env - use specific environment (typically a bug report).\n" +msgstr "" +" --env - defnyddio amgylchedd penodol (adroddiad gwall fel " +"rheol).\n" -#: ../urpm/search.pm:304 ../urpmf:307 +#: ../urpmf:38 ../urpmi:74 ../urpmq:49 #, c-format -msgid "no xml-info available for medium \"%s\"" -msgstr "dim xml-info ar gyfer cyfrwng \"%s\"" +msgid " --excludemedia - do not use the given media, separated by comma.\n" +msgstr "" +" --excludemedia - peidio defnyddio'r cyfrwng hwn, rhannwyd gyda choma.\n" -#: ../urpm/select.pm:28 +#: ../urpmf:39 #, c-format -msgid "urpmi was restarted, and the list of priority packages did not change" -msgstr "ail gychwynnwyd urpmi, ac nid yw'r rhestr prif pecynnau wedi newid" +msgid "" +" --literal, -l - don't match patterns, use argument as a literal string.\n" +msgstr "" +" --literal, -l - peidio cydweddu patrymau, defnyddio ymresymiad fel llinyn " +"llythrennedd.\n" -#: ../urpm/select.pm:30 +#: ../urpmf:42 ../urpmi:77 ../urpmq:50 #, c-format msgid "" -"urpmi was restarted, and the list of priority packages did change: %s vs %s" +" --sortmedia - sort media according to substrings separated by comma.\n" msgstr "" -"ail gychwynnwyd urpmi, ac mae'r rhestr prif pecynnau wedi newid: %s vs %s" +" --sortmedia - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda " +"choma.\n" -#: ../urpm/select.pm:168 +#: ../urpmf:43 #, c-format -msgid "No package named %s" -msgstr "Dim pecyn o'r enw %s" +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" -#: ../urpm/select.pm:170 ../urpme:115 +#: ../urpmf:44 ../urpmi:78 ../urpmq:51 #, c-format -msgid "The following packages contain %s: %s" -msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:" +msgid " --synthesis - use the given synthesis instead of urpmi db.\n" +msgstr " --synthesis - defnyddio'r synthesis yn lle urpmi db.\n" -#: ../urpm/select.pm:172 +#: ../urpmf:45 #, c-format -msgid "You should use \"-a\" to use all of them" -msgstr "" +msgid " --uniq - do not print identical lines twice.\n" +msgstr " --uniq - peidio argraffu llinellau'r un fath.\n" -#: ../urpm/select.pm:300 +#: ../urpmf:46 ../urpmi:75 ../urpmq:46 #, 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" +msgid " --update - use only update media.\n" +msgstr " --update - defnyddio cyfrwng diweddaru'n unig.\n" -#: ../urpm/select.pm:543 +#: ../urpmf:47 #, c-format -msgid "Package %s is already installed" -msgstr "Pecyn %s wedi ei osod eisoes" +msgid " --verbose - verbose mode.\n" +msgstr " --verbose - modd llafar.\n" + +#: ../urpmf:48 +#, c-format +msgid " -i - ignore case distinctions in patterns.\n" +msgstr "" +" -i - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n" -#: ../urpm/select.pm:544 +#: ../urpmf:49 #, c-format -msgid "Packages %s are already installed" -msgstr "Pecynnau %s wedi eu gosod eisoes" +msgid " -I - honor case distinctions in patterns (default).\n" +msgstr "" +" -i - cadw gwahaniaeth maint llythrennau ym mhob patrwm " +"(rhagosodiad).\n" -#: ../urpm/select.pm:562 ../urpm/select.pm:613 +#: ../urpmf:50 #, c-format -msgid "due to missing %s" -msgstr "oherwydd %s coll" +msgid " -F - change field separator (defaults to ':').\n" +msgstr " -F - newid ymwahanydd maes (arferol i ':').\n" -#: ../urpm/select.pm:563 +#: ../urpmf:51 #, c-format -msgid "due to already installed %s" -msgstr "oherwydd %s wedi ei osod eisoes" +msgid "Pattern expressions:\n" +msgstr "Mynegiadau patrymau:\n" -#: ../urpm/select.pm:564 ../urpm/select.pm:611 +#: ../urpmf:52 #, c-format -msgid "due to unsatisfied %s" -msgstr "%s heb ei foddloni" +msgid " text - any text is parsed as a regexp, unless -l is used.\n" +msgstr "" +" text - unrhyw destun wedi ei ddidoli fel regexp, onibai fod -l " +"yn cael ei ddefnyddio.\n" -#: ../urpm/select.pm:570 +#: ../urpmf:53 #, c-format -msgid "trying to promote %s" -msgstr "ceisio hybu %s" +msgid " -e - include perl code directly as perl -e.\n" +msgstr " -e - cynnwys perl cod yn union fel perl -e.\n" -#: ../urpm/select.pm:571 +#: ../urpmf:54 #, c-format -msgid "in order to keep %s" -msgstr "fel modd i gadw %s" +msgid " -a - binary AND operator.\n" +msgstr " -a - gweithredwr deuaidd AND.\n" -#: ../urpm/select.pm:607 +#: ../urpmf:55 #, c-format -msgid "in order to install %s" -msgstr "er mwyn gosod %s" +msgid " -o - binary OR operator.\n" +msgstr " -o - gweithredwr deuaidd OR.\n" -#: ../urpm/select.pm:617 +#: ../urpmf:56 #, c-format -msgid "due to conflicts with %s" -msgstr "oherwydd gwrthdaro gyda %s" +msgid " ! - unary NOT.\n" +msgstr " ! - unaidd NOT.\n" -#: ../urpm/signature.pm:29 +#: ../urpmf:57 #, c-format -msgid "Invalid signature (%s)" -msgstr "Llofnod annilys (%s)" +msgid " ( ) - left and right parentheses.\n" +msgstr " ( ) - parenthesis de a chwith.\n" -#: ../urpm/signature.pm:60 +#: ../urpmf:58 #, c-format -msgid "Invalid Key ID (%s)" -msgstr "Enw Allwedd Annilys (%s)" +msgid "List of tags:\n" +msgstr "Rhestr tagiau:\n" -#: ../urpm/signature.pm:62 +#: ../urpmf:59 #, c-format -msgid "Missing signature (%s)" -msgstr "Llofnod coll (%s)" +msgid " --qf - specify a printf-like output format\n" +msgstr " --qf - pennu allbwn fformat printf-aidd\n" -#: ../urpm/sys.pm:156 +#: ../urpmf:60 #, c-format -msgid "system" -msgstr "system" +msgid " example: '%%name:%%files'\n" +msgstr " esiampl: '%%enw:%%ffeil'\n" -#: ../urpm/sys.pm:191 +#: ../urpmf:61 #, c-format -msgid "You should restart %s for %s" -msgstr "Dylech ailddechrau %s ar gyfer %s" +msgid " --arch - architecture\n" +msgstr " --arch - saernïaeth\n" -#: ../urpm/sys.pm:276 +#: ../urpmf:62 #, c-format -msgid "Can't write file" -msgstr "Methu ysgrifennu'r ffeil" +msgid " --buildhost - build host\n" +msgstr " --buildhost - gwestai'r adeiladedd\n" -#: ../urpm/sys.pm:276 +#: ../urpmf:63 #, c-format -msgid "Can't open file" -msgstr "Methu agor y ffeil" +msgid " --buildtime - build time\n" +msgstr " --buildtime - amser adeiladu\n" -#: ../urpm/sys.pm:289 +#: ../urpmf:64 #, c-format -msgid "Can't move file %s to %s" -msgstr "Methu symud ffeil %s i %s" +msgid " --conffiles - configuration files\n" +msgstr " --conffiles - ffeiliau ffurfweddiad\n" -#: ../urpme:41 +#: ../urpmf:65 #, c-format -msgid "" -"urpme version %s\n" -"Copyright (C) 1999-2008 Mandriva.\n" -"This is free software and may be redistributed under the terms of the GNU " -"GPL.\n" -"\n" -"usage:\n" -msgstr "" -"urpmf fersiwn %s\n" -"Hawlfraint (C) 1999 - 2006 Mandriva.\n" -"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL GNU.\n" -"\n" -"defnydd:\n" +msgid " --conflicts - conflict tags\n" +msgstr " --conflicts - tagiau gwrthdaro\n" -#: ../urpme:47 +#: ../urpmf:66 #, c-format -msgid " --auto - automatically select a package in choices.\n" -msgstr " --auto - dewis pecyn yn awtomatig o fewn dewisiadau.\n" +msgid " --description - package description\n" +msgstr " --description - disgrifiad pecyn\n" -#: ../urpme:48 +#: ../urpmf:67 #, c-format -msgid " --auto-orphans - remove orphans\n" -msgstr " --auto-orphans - tynnu amddifad\n" +msgid " --distribution - distribution\n" +msgstr " --distribution - dosbarthiad\n" -#: ../urpme:49 +#: ../urpmf:68 #, c-format -msgid " --test - verify if the removal can be achieved correctly.\n" -msgstr " --test - gwirio os oes modd tynnu'n iawn.\n" +msgid " --epoch - epoch\n" +msgstr " --epoch - cyfnod\n" -#: ../urpme:51 ../urpmi:109 ../urpmq:68 +#: ../urpmf:69 #, c-format -msgid " --parallel - distributed urpmi across machines of alias.\n" -msgstr "" -" --parallel - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n" +msgid " --filename - filename of the package\n" +msgstr " --filename - enw ffeil y pecyn\n" -#: ../urpme:52 ../urpmi:141 +#: ../urpmf:70 #, c-format -msgid " --repackage - Re-package the files before erasing\n" -msgstr " --repackage - Ailbecynnu'r ffeiliau cyn eu dileu\n" +msgid " --files - list of files contained in the package\n" +msgstr " --files - rhestr ffeiliau o fewn y pecyn\n" -#: ../urpme:53 +#: ../urpmf:71 #, c-format -msgid " --root - use another root for rpm removal.\n" -msgstr " --root - defnyddio root arall ar gyfer tynnu rpm.\n" +msgid " --group - group\n" +msgstr " --group - grŵp\n" -#: ../urpme:55 ../urpmi:101 +#: ../urpmf:72 #, 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" +msgid " --license - license\n" +msgstr " --license - trwydded\n" -#: ../urpme:56 +#: ../urpmf:73 #, c-format -msgid " --noscripts - do not execute package scriptlet(s).\n" -msgstr " --noscripts - peidio gweithredu sgriptledi'r pecyn(au).\n" +msgid " --name - package name\n" +msgstr " --name - enw'r pecyn\n" -#: ../urpme:57 +#: ../urpmf:74 #, c-format -msgid "" -" --use-distrib - configure urpme on the fly from a distrib tree, useful\n" -" to (un)install a chroot with --root option.\n" -msgstr "" -" --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n" -" wrth (ddad)osod chroot gyda dewis --root.\n" +msgid " --obsoletes - obsoletes tags\n" +msgstr " --obsoletes - tagiau'r hen\n" -#: ../urpme:59 ../urpmi:152 ../urpmq:89 +#: ../urpmf:75 #, c-format -msgid " --verbose, -v - verbose mode.\n" -msgstr " --verbose, -v - modd llafar.\n" +msgid " --packager - packager\n" +msgstr " --packager - pecynydd\n" -#: ../urpme:60 +#: ../urpmf:76 #, c-format -msgid " -a - select all packages matching expression.\n" -msgstr " -a - select all packages matching expression.\n" +msgid " --provides - provides tags\n" +msgstr " --provides - tag darparu\n" -#: ../urpme:73 +#: ../urpmf:77 #, c-format -msgid "Only superuser is allowed to remove packages" -msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu pecynnau" +msgid " --requires - requires tags\n" +msgstr " --requires - tagiau angenrhaid\n" -#: ../urpme:106 +#: ../urpmf:78 #, c-format -msgid "unknown packages" -msgstr "pecynnau anhysbys" +msgid " --size - installed size\n" +msgstr " --size - maint wedi gosod\n" -#: ../urpme:106 +#: ../urpmf:79 #, c-format -msgid "unknown package" -msgstr "pecyn anhysbys" +msgid " --sourcerpm - source rpm name\n" +msgstr " --sourcerpm - enw rpm ffynhonnell\n" -#: ../urpme:121 +#: ../urpmf:80 #, 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 pecyn canlynol yn torri eich system:" -msgstr[1] "Bydd tynnu pecynnau canlynol yn torri eich system:" +msgid " --suggests - suggests tags\n" +msgstr " --suggests - cynnig tagiau\n" -#: ../urpme:126 +#: ../urpmf:81 #, c-format -msgid "Nothing to remove" -msgstr "Dim i'w dynnu" +msgid " --summary - summary\n" +msgstr " --summary - crynodeb\n" -#: ../urpme:143 +#: ../urpmf:82 #, c-format -msgid "No orphans to remove" -msgstr "Dim amddifad i'w tynnu" +msgid " --url - url\n" +msgstr " --url - url\n" -#: ../urpme:149 +#: ../urpmf:83 #, c-format -msgid "To satisfy dependencies, the following package will be removed" -msgid_plural "" -"To satisfy dependencies, the following %d 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" +msgid " --vendor - vendor\n" +msgstr " --vendor - gwerthwr\n" -#: ../urpme:154 +#: ../urpmf:84 #, c-format -msgid "(orphan package)" -msgid_plural "(orphan packages)" -msgstr[0] "pecyn amddifad" -msgstr[1] "pecynnau amddifad" +msgid " -m - the media in which the package was found\n" +msgstr " -m - y cyfrwng lle cafwyd y pecyn\n" -#: ../urpme:161 +#: ../urpmf:85 ../urpmq:99 #, c-format -msgid "Remove %d package?" -msgid_plural "Remove %d packages?" -msgstr[0] "Tynnu pecynnau %d?" -msgstr[1] "Tynnu pecynnau %d?" +msgid " -f - print version, release and arch with name.\n" +msgstr " -f - argraffu fersiwn a rhyddhad ac arch gydag enw.\n" -#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144 +#: ../urpmf:153 #, c-format -msgid " (y/N) " -msgstr " (y/N) " +msgid "unterminated expression (%s)" +msgstr "Mynegiadauheb ei derfynnu (%s)" -#: ../urpme:166 +#: ../urpmf:198 #, c-format -msgid "testing removal of %s" -msgstr "profi tynnu %s" +msgid "Incorrect format: you may use only one multi-valued tag" +msgstr "Fformat anghywir: gallwch ddefnyddio un tag aml-werth yn unig" -#: ../urpme:181 +#: ../urpmf:291 #, c-format -msgid "Removal failed" -msgstr "Methodd y tynnu" +msgid "no hdlist available for medium \"%s\"" +msgstr "dim ffeil hdlist ar gyfer cyfrwng \"%s\"" -#: ../urpme:183 +#: ../urpmf:298 #, c-format -msgid "Removal is possible" -msgstr "Mae tynnu yn bosibl" +msgid "no synthesis available for medium \"%s\"" +msgstr "adeiladu ffeil synthesis file ar gyfer cyfrwng \"%s\"" -#: ../urpmf:153 +#: ../urpmf:307 #, c-format -msgid "unterminated expression (%s)" -msgstr "Mynegiadauheb ei derfynnu (%s)" +msgid "no xml-info available for medium \"%s\"" +msgstr "dim xml-info ar gyfer cyfrwng \"%s\"" #: ../urpmi:81 #, c-format @@ -2277,12 +2287,7 @@ msgstr "" msgid "Unable to create directory [%s] for bug report" msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall" -#: ../urpmi:264 -#, c-format -msgid "Environment directory %s does not exist" -msgstr "Nid yw cyfeiriadur amgylchedd %s yn bodoli" - -#: ../urpmi:287 +#: ../urpmi:274 #, c-format msgid "" "Error: %s appears to be mounted read-only.\n" @@ -2291,48 +2296,48 @@ msgstr "" "Gwall: %s i weld wedi ei osod fel darllen yn unig.\n" "Defnydd --allow-force gorfodaeth i orfodi gweithred." -#: ../urpmi:361 +#: ../urpmi:348 #, c-format msgid "Updating media...\n" msgstr "Diweddaru cyfrwng...\n" #. -PO: here format is ": (to upgrade)" -#: ../urpmi:448 +#: ../urpmi:435 #, c-format msgid "%s: %s (to upgrade)" msgstr "%s: %s (uwchraddio)" #. -PO: here format is " (to upgrade)" -#: ../urpmi:450 +#: ../urpmi:437 #, c-format msgid "%s (to upgrade)" msgstr "%s (uwchraddio)" #. -PO: here format is ": (to install)" -#: ../urpmi:454 +#: ../urpmi:441 #, c-format msgid "%s: %s (to install)" msgstr "%s: %s (gosod)" #. -PO: here format is " (to install)" -#: ../urpmi:456 +#: ../urpmi:443 #, c-format msgid "%s (to install)" msgstr "%s (gosod)" -#: ../urpmi:462 +#: ../urpmi:449 #, 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:465 +#: ../urpmi:452 #, c-format msgid "What is your choice? (1-%d) " msgstr "Beth yw eich dewis? (1-%d)" -#: ../urpmi:507 +#: ../urpmi:494 #, c-format msgid "" "The following package cannot be installed because it depends on packages\n" @@ -2343,7 +2348,7 @@ msgstr "" "sy'n hyn na'r rhai sydd wedi eu gosod:\n" "%s" -#: ../urpmi:509 +#: ../urpmi:496 #, c-format msgid "" "The following packages can't be installed because they depend on packages\n" @@ -2354,7 +2359,7 @@ msgstr "" "sy'n hyn na'r rhai sydd wedi eu gosod:\n" "%s" -#: ../urpmi:515 ../urpmi:530 +#: ../urpmi:502 ../urpmi:517 #, c-format msgid "" "\n" @@ -2363,12 +2368,12 @@ msgstr "" "\n" "Parhau i osod beth bynnag?" -#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144 +#: ../urpmi:503 ../urpmi:518 ../urpmi:612 ../urpmi.addmedia:144 #, c-format msgid " (Y/n) " msgstr " (Y/n) " -#: ../urpmi:524 +#: ../urpmi:511 #, c-format msgid "" "A requested package cannot be installed:\n" @@ -2377,7 +2382,7 @@ msgstr "" "Nid oes modd gosod pecyn gofynnwyd amdani:\n" "%s" -#: ../urpmi:525 +#: ../urpmi:512 #, c-format msgid "" "Some requested packages cannot be installed:\n" @@ -2386,12 +2391,12 @@ msgstr "" "Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n" "%s" -#: ../urpmi:542 +#: ../urpmi:529 #, c-format msgid "removing package %s will break your system" msgstr "bydd tynnu pecynnau %s yn torri'r system" -#: ../urpmi:551 +#: ../urpmi:537 #, c-format msgid "" "The installation cannot continue because the following package\n" @@ -2402,7 +2407,7 @@ msgstr "" "gael ei dynnu i eraill gael eu diweddaru.\n" "%s\n" -#: ../urpmi:553 +#: ../urpmi:539 #, c-format msgid "" "The installation cannot continue because the following packages\n" @@ -2413,30 +2418,12 @@ msgstr "" "gael eu tynnu i eraill gael eu diweddaru.\n" "%s\n" -#: ../urpmi:560 -#, c-format -msgid "" -"The following package has to be removed for others to be upgraded:\n" -"%s" -msgstr "" -"Rhaid i'r pecyn canlynol gael ei dynnu i eraill gael eu diweddaru.\n" -"%s" - -#: ../urpmi:561 -#, c-format -msgid "" -"The following packages have to be removed for others to be upgraded:\n" -"%s" -msgstr "" -"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n" -"%s" - -#: ../urpmi:563 +#: ../urpmi:547 #, c-format msgid "(test only, removal will not be actually done)" msgstr "(prawf yn unig, ni fydd yn cael ei ddadosod)" -#: ../urpmi:583 +#: ../urpmi:567 #, c-format msgid "" "You must first call urpmi with --buildrequires to install the following " @@ -2447,46 +2434,46 @@ msgstr "" "canlynol:\n" "%s\n" -#: ../urpmi:594 +#: ../urpmi:578 #, 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:610 +#: ../urpmi:594 #, c-format msgid "(test only, installation will not be actually done)" msgstr "(prawf yn unig, ni fydd yn cael ei osod)" -#: ../urpmi:616 +#: ../urpmi:600 #, c-format msgid "%s of additional disk space will be used." msgstr "Bydd %s o le ychwanegol ar ddisg yn cael ei ddefnyddio." -#: ../urpmi:617 +#: ../urpmi:601 #, c-format msgid "%s of disk space will be freed." msgstr "Bydd %s o le ar ddisg ar gael." -#: ../urpmi:618 +#: ../urpmi:602 #, c-format msgid "%s of packages will be retrieved." msgstr "bydd %s o becynnau yn cael eu hadfer." -#: ../urpmi:619 +#: ../urpmi:603 #, 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:640 +#: ../urpmi:624 #, c-format msgid "Cancel" msgstr "Dileu" -#: ../urpmi:648 +#: ../urpmi:632 #, c-format msgid "Press Enter when mounted..." msgstr "Pwyso Enter pan wedi ei arosod..." @@ -2560,6 +2547,9 @@ msgid "" " --update - create an update medium, \n" " or discard non-update media (when used with --distrib)\n" msgstr "" +" --update - creu cyfrwng diweddaru, \n" +" neu ddileu'r cyfrwng heb ei dddiweddaru (wrth gael ei " +"ddefnyddio gyda --distrib)\n" #: ../urpmi.addmedia:67 #, c-format @@ -3258,6 +3248,15 @@ msgstr "" msgid "No changelog found\n" msgstr "Heb ganfod changelog\n" +#~ msgid "examining %s file" +#~ msgstr "archwilio %s ffeil" + +#~ msgid "invalid MD5SUM file" +#~ msgstr "ffeil MD SUM annilys" + +#~ msgid "found probed synthesis as %s" +#~ msgstr "canfod synthesis holwyd fel %s" + #~ msgid " --update - create an update medium.\n" #~ msgstr " --update - defnyddio cyfrwng diweddaru.\n" -- cgit v1.2.1