From 7b97e6dc767e2115123b89e45116bde116afa7ef Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 13 Sep 2014 21:15:37 +0200 Subject: sync with code --- po/cy.po | 161 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 85 insertions(+), 76 deletions(-) (limited to 'po/cy.po') diff --git a/po/cy.po b/po/cy.po index e0027e88..60319807 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: 2014-05-11 21:49+0200\n" +"POT-Creation-Date: 2014-09-13 21:15+0200\n" "PO-Revision-Date: 2009-08-24 20:33-0000\n" "Last-Translator: Rhoslyn Prys \n" "Language-Team: Cymraeg\n" @@ -61,7 +61,7 @@ msgstr "Gosod pecyn `%s' (%s/%s)..." msgid "Downloading package `%s'..." msgstr "Llwytho pecynnau i lawr ' %s'..." -#: ../gurpm/RPMProgressDialog.pm:349 +#: ../gurpm/RPMProgressDialog.pm:349 ../gurpmi:126 #, c-format msgid "Cancel" msgstr "Dileu" @@ -73,22 +73,22 @@ msgstr "Dileu" msgid "...retrieving failed: %s" msgstr "... methodd ail-lwytho: %s" -#: ../gurpmi:45 +#: ../gurpmi:49 #, c-format msgid "RPM installation" msgstr "Gosod RPM" -#: ../gurpmi:59 +#: ../gurpmi:63 #, c-format msgid "Error: unable to find file %s, will cancel operation" msgstr "Gwall: methu canfod ffeil %s, diddymu'r weithred" -#: ../gurpmi:60 ../gurpmi2:169 ../gurpmi2:199 +#: ../gurpmi:64 ../gurpmi2:173 ../gurpmi2:203 #, c-format msgid "_Ok" msgstr "_Iawn" -#: ../gurpmi:80 +#: ../gurpmi:84 #, c-format msgid "" "You have selected a source package:\n" @@ -109,7 +109,7 @@ msgstr "" "\n" "Beth hoffech chi ei wneud?" -#: ../gurpmi:88 ../gurpmi:99 +#: ../gurpmi:92 ../gurpmi:103 #, c-format msgid "" "You are about to install the following software packages on your computer:\n" @@ -124,7 +124,7 @@ msgstr "" "\n" "Parhau?" -#: ../gurpmi:94 +#: ../gurpmi:98 #, c-format msgid "" "You are about to install the following software package on your computer:\n" @@ -139,26 +139,31 @@ msgstr "" "\n" "Efallai byddai'n well gennych ei gadw. Beth yw eich dewis?" -#: ../gurpmi:112 +#: ../gurpmi:116 #, c-format msgid "_Install" msgstr "_Gosod" -#: ../gurpmi:113 +#: ../gurpmi:117 #, c-format msgid "_Save" msgstr "_Cadw" -#: ../gurpmi:114 ../gurpmi2:169 +#: ../gurpmi:118 ../gurpmi2:173 #, c-format msgid "_Cancel" msgstr "_Dileu" -#: ../gurpmi:122 +#: ../gurpmi:126 #, c-format msgid "Choose location to save file" msgstr "Dewiswch leoliad i gadw'r ffeil" +#: ../gurpmi:126 ../gurpmi2:119 +#, c-format +msgid "Ok" +msgstr "Iawn" + #: ../gurpmi.pm:56 #, c-format msgid "Options:" @@ -242,17 +247,17 @@ msgstr "" msgid "No packages specified" msgstr "Heb enwi pecyn" -#: ../gurpmi2:42 +#: ../gurpmi2:46 #, c-format msgid "Must be root" msgstr "Rhaid bod yn root" -#: ../gurpmi2:72 +#: ../gurpmi2:76 #, c-format msgid "Preparing packages installation..." msgstr "Paratoi pecynnau i'w gosod..." -#: ../gurpmi2:87 ../urpmi:506 +#: ../gurpmi2:91 ../urpmi:506 #, c-format msgid "" "Some requested packages cannot be installed:\n" @@ -261,7 +266,7 @@ msgstr "" "Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n" "%s" -#: ../gurpmi2:95 +#: ../gurpmi2:99 #, c-format msgid "" "Some requested packages cannot be installed:\n" @@ -272,42 +277,37 @@ msgstr "" "%s\n" "Parhau beth bynnag?" -#: ../gurpmi2:115 +#: ../gurpmi2:119 #, c-format msgid "Warning" msgstr "Rhybudd" -#: ../gurpmi2:115 -#, c-format -msgid "Ok" -msgstr "Iawn" - -#: ../gurpmi2:165 +#: ../gurpmi2:169 #, c-format msgid " (to upgrade)" msgstr "(uwchraddio)" -#: ../gurpmi2:166 +#: ../gurpmi2:170 #, c-format msgid " (to install)" msgstr "(gosod)" -#: ../gurpmi2:169 +#: ../gurpmi2:173 #, c-format msgid "Package choice" msgstr "Dewis pecyn" -#: ../gurpmi2:170 +#: ../gurpmi2:174 #, c-format msgid "One of the following packages is needed:" msgstr "Mae angen un o'r pecynnau canlynol:" -#: ../gurpmi2:200 +#: ../gurpmi2:204 #, c-format msgid "_Abort" msgstr "_Atal" -#: ../gurpmi2:235 +#: ../gurpmi2:239 #, c-format msgid "" "The following packages have to be removed for others to be upgraded:\n" @@ -318,61 +318,61 @@ msgstr "" "%s\n" "Parhau beth bynnag?" -#: ../gurpmi2:246 ../urpmi:615 +#: ../gurpmi2:250 ../urpmi:615 #, c-format msgid "%s of additional disk space will be used." msgstr "Bydd %s o le ychwanegol ar ddisg yn cael ei ddefnyddio." -#: ../gurpmi2:247 ../urpmi:616 +#: ../gurpmi2:251 ../urpmi:616 #, c-format msgid "%s of disk space will be freed." msgstr "Bydd %s o le ar ddisg ar gael." -#: ../gurpmi2:248 ../urpmi:617 +#: ../gurpmi2:252 ../urpmi:617 #, c-format msgid "%s of packages will be retrieved." msgstr "bydd %s o becynnau yn cael eu hadfer." -#: ../gurpmi2:249 ../urpmi:618 +#: ../gurpmi2:253 ../urpmi:618 #, 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?" -#: ../gurpmi2:255 ../urpmi:606 +#: ../gurpmi2:259 ../urpmi:606 #, 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:256 ../urpmi:607 +#: ../gurpmi2:260 ../urpmi:607 #, c-format msgid "" "To satisfy dependencies, the following packages are going to be installed:" msgstr "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod" -#: ../gurpmi2:266 ../urpm/main_loop.pm:467 +#: ../gurpmi2:270 ../urpm/main_loop.pm:467 #, c-format msgid "unable to get source packages, aborting" msgstr "methu estyn pecynnau ffynhonnell, atal" -#: ../gurpmi2:283 ../urpmi:634 +#: ../gurpmi2:287 ../urpmi:634 #, c-format msgid "Please insert the medium named \"%s\"" msgstr "Rhowch gyfrwng \"%s\" yn y ddyfais" -#: ../gurpmi2:303 +#: ../gurpmi2:307 #, c-format msgid "An error occurred:" msgstr "" -#: ../gurpmi2:315 +#: ../gurpmi2:319 #, c-format msgid "_Done" msgstr "_Gorffen" -#: ../gurpmi2:332 ../urpm/main_loop.pm:82 +#: ../gurpmi2:336 ../urpm/main_loop.pm:82 #, c-format msgid "" "Installation failed, some files are missing:\n" @@ -381,27 +381,27 @@ msgstr "" "Methodd y gosod, mae rhai ffiliau ar goll:\n" "%s" -#: ../gurpmi2:335 +#: ../gurpmi2:339 #, c-format msgid "You may want to update your urpmi database." msgstr "Efallai eich bod angen diweddaru cronfa ddata urpmi." -#: ../gurpmi2:339 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580 +#: ../gurpmi2:343 ../urpm/main_loop.pm:288 ../urpm/main_loop.pm:580 #, c-format msgid "Installation failed:" msgstr "Methodd y gosod:" -#: ../gurpmi2:344 +#: ../gurpmi2:348 #, c-format msgid "The package(s) are already installed" msgstr "Popeth wedi eu gosod eisoes" -#: ../gurpmi2:346 +#: ../gurpmi2:350 #, c-format msgid "Installation finished" msgstr "Cwblhawyd y gosod" -#: ../gurpmi2:359 ../urpmi:692 +#: ../gurpmi2:363 ../urpmi:692 #, c-format msgid "restarting urpmi" msgstr "ailgychwyn urpmi" @@ -475,7 +475,7 @@ msgstr "Methu llwytho pecynnau i lawr i %s" msgid "Environment directory %s does not exist" msgstr "Nid yw cyfeiriadur amgylchedd %s yn bodoli" -#: ../urpm.pm:255 ../urpmf:243 ../urpmq:163 +#: ../urpm.pm:255 ../urpmf:244 ../urpmq:163 #, c-format msgid "using specific environment on %s\n" msgstr "ddefnyddio amgylchedd penodol ar %s\n" @@ -530,64 +530,64 @@ msgstr "gwall cofrestru pecynnau lleol" msgid "This operation is forbidden while running in restricted mode" msgstr "Mae'r weithred yn waharddedig wrth redeg ym modd cyfyngedig" -#: ../urpm/args.pm:150 ../urpm/args.pm:159 +#: ../urpm/args.pm:157 ../urpm/args.pm:166 #, c-format msgid "bad proxy declaration on command line\n" msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n" -#: ../urpm/args.pm:310 +#: ../urpm/args.pm:321 #, c-format msgid "urpmq: cannot read rpm file \"%s\"\n" msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n" -#: ../urpm/args.pm:378 +#: ../urpm/args.pm:389 #, c-format msgid "unexpected expression %s" msgstr "mynegiadau annisgwyl %s" -#: ../urpm/args.pm:379 +#: ../urpm/args.pm:390 #, c-format msgid "missing expression before %s" msgstr "mynegiad coll cyn %s" -#: ../urpm/args.pm:385 +#: ../urpm/args.pm:396 #, c-format msgid "unexpected expression %s (suggestion: use -a or -o ?)" msgstr "mynegiad annisgwyl %s (awgrym: defnyddio -a neu-0 ?)" -#: ../urpm/args.pm:389 +#: ../urpm/args.pm:400 #, c-format msgid "no expression to close" msgstr "dim mynegiad i'w gau" -#: ../urpm/args.pm:398 +#: ../urpm/args.pm:409 #, 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:472 +#: ../urpm/args.pm:483 #, c-format msgid "chroot directory doesn't exist" msgstr "Nid yw cyfeiriadur chroot yn bodoli" -#: ../urpm/args.pm:495 +#: ../urpm/args.pm:506 #, c-format msgid "Can't use %s without %s" msgstr "Methu defnyddio %s heb %s" -#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:155 +#: ../urpm/args.pm:509 ../urpm/args.pm:512 ../urpmq:155 #, c-format msgid "Can't use %s with %s" msgstr "Methu defnyddio %s gyda %s" -#: ../urpm/args.pm:509 +#: ../urpm/args.pm:520 #, c-format msgid "Too many arguments\n" msgstr "Gormod o ymresymiadau\n" -#: ../urpm/args.pm:517 +#: ../urpm/args.pm:528 #, c-format msgid "" "%s version %s\n" @@ -603,7 +603,7 @@ msgstr "" "\n" "defnydd:\n" -#: ../urpm/args.pm:523 +#: ../urpm/args.pm:534 #, c-format msgid "Copyright (C) %s by %s" msgstr "Hawlfraint (C) %s %s" @@ -652,7 +652,7 @@ 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:245 ../urpm/media.pm:556 +#: ../urpm/cfg.pm:249 ../urpm/media.pm:556 #, c-format msgid "unable to write config file [%s]" msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)" @@ -1344,8 +1344,8 @@ msgstr "Arch" #: ../urpm/msg.pm:170 #, c-format -msgid "(suggested)" -msgstr "(awgrym)" +msgid "(recommended)" +msgstr "" #: ../urpm/msg.pm:185 #, c-format @@ -2021,9 +2021,9 @@ msgid " --sourcerpm - source rpm name\n" msgstr " --sourcerpm - enw rpm ffynhonnell\n" #: ../urpmf:75 -#, c-format -msgid " --suggests - suggests tags\n" -msgstr " --suggests - cynnig tagiau\n" +#, fuzzy, c-format +msgid " --recommends - recommends tags\n" +msgstr " --requires - tagiau angenrhaid\n" #: ../urpmf:76 #, c-format @@ -2050,27 +2050,27 @@ msgstr " -m - y cyfrwng lle cafwyd y pecyn\n" msgid " -f - print version, release and arch with name.\n" msgstr " -f - argraffu fersiwn a rhyddhad ac arch gydag enw.\n" -#: ../urpmf:148 +#: ../urpmf:149 #, c-format msgid "unterminated expression (%s)" msgstr "Mynegiadauheb ei derfynnu (%s)" -#: ../urpmf:193 +#: ../urpmf:194 #, c-format msgid "Incorrect format: you may use only one multi-valued tag" msgstr "Fformat anghywir: gallwch ddefnyddio un tag aml-werth yn unig" -#: ../urpmf:286 +#: ../urpmf:287 #, c-format msgid "no hdlist available for medium \"%s\"" msgstr "dim ffeil hdlist ar gyfer cyfrwng \"%s\"" -#: ../urpmf:293 +#: ../urpmf:294 #, c-format msgid "no synthesis available for medium \"%s\"" msgstr "adeiladu ffeil synthesis file ar gyfer cyfrwng \"%s\"" -#: ../urpmf:302 +#: ../urpmf:303 #, c-format msgid "no xml-info available for medium \"%s\"" msgstr "dim xml-info ar gyfer cyfrwng \"%s\"" @@ -2096,8 +2096,8 @@ msgid " --auto-orphans - remove orphans without asking\n" msgstr " --auto-orphans - tynnu'r amddifad heb ofyn\n" #: ../urpmi:80 ../urpmq:52 -#, c-format -msgid " --no-suggests - do not auto select \"suggested\" packages.\n" +#, fuzzy, c-format +msgid " --no-recommends - do not auto select \"recommended\" packages.\n" msgstr " --no-suggests - peidio awto ddewis pecynnau \"suggested\" .\n" #: ../urpmi:81 @@ -2197,8 +2197,8 @@ msgstr "" " wirio dibyniaethau na'u cyfanrwydd.\n" #: ../urpmi:105 -#, c-format -msgid " --allow-suggests - auto select \"suggested\" packages.\n" +#, fuzzy, c-format +msgid " --allow-recommends - auto select \"recommended\" packages.\n" msgstr " --allow-suggests - awto ddewis pecynnau \"awgrymwyd\".\n" #: ../urpmi:109 @@ -3034,9 +3034,9 @@ msgid " --requires - print requires.\n" msgstr " --requires - angenrhaid argraffu.\n" #: ../urpmq:84 -#, c-format -msgid " --suggests - print suggests.\n" -msgstr " --suggests - argraffu'r awgrym.\n" +#, fuzzy, c-format +msgid " --recommends - print recommends.\n" +msgstr " --requires - angenrhaid argraffu.\n" #: ../urpmq:85 #, c-format @@ -3213,6 +3213,15 @@ msgstr "" msgid "Authentication is required to run Mageia Package Installer" msgstr "" +#~ msgid "(suggested)" +#~ msgstr "(awgrym)" + +#~ msgid " --suggests - suggests tags\n" +#~ msgstr " --suggests - cynnig tagiau\n" + +#~ msgid " --suggests - print suggests.\n" +#~ msgstr " --suggests - argraffu'r awgrym.\n" + #~ msgid "(%d package, %d MB)" #~ msgid_plural "(%d packages, %d MB)" #~ msgstr[0] "(%d pecyn, %d MB)" -- cgit v1.2.1