sync with code

1 files changed, 267 insertions, 316 deletions

diff --git a/po/cy.po b/po/cy.po
index f7c9a893..cbf7c416 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mandriva Linux\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-01 19:38+0200\n"
+"POT-Creation-Date: 2012-10-05 17:55+0200\n"
 "PO-Revision-Date: 2009-08-24 20:33-0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: Cymraeg\n"
@@ -113,7 +113,7 @@ msgid "Options:"
 msgstr "Dewisiadau:"
 
 #: ../gurpmi.pm:42 ../urpme:42 ../urpmf:30 ../urpmi:67 ../urpmi.addmedia:55
-#: ../urpmi.recover:29 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:41
+#: ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:41
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - argraffu neges cymorth.\n"
@@ -155,12 +155,12 @@ msgstr ""
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media          - defnyddio'r cyfrwng, wedi ei ran gan gollnod.\n"
 
-#: ../gurpmi.pm:49 ../urpmi:146
+#: ../gurpmi.pm:49 ../urpmi:145
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - caniatáu i chwilio canfod pecyn.\n"
 
-#: ../gurpmi.pm:50 ../urpmi:147
+#: ../gurpmi.pm:50 ../urpmi:146
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - peidio chwilio yn provides i ganfod pecyn.\n"
@@ -215,7 +215,7 @@ msgstr "Gosod pecynnau"
 msgid "Preparing packages installation..."
 msgstr "Paratoi pecynnau i'w gosod..."
 
-#: ../gurpmi2:113 ../urpmi:505
+#: ../gurpmi2:113 ../urpmi:504
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -281,13 +281,13 @@ msgstr ""
 "%s\n"
 "Parhau beth bynnag?"
 
-#: ../gurpmi2:277 ../urpmi:605
+#: ../gurpmi2:277 ../urpmi:604
 #, 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:278 ../urpmi:606
+#: ../gurpmi2:278 ../urpmi:605
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -315,7 +315,7 @@ msgstr "Paratoi..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../gurpmi2:344 ../urpmi:633
+#: ../gurpmi2:344 ../urpmi:632
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Rhowch gyfrwng \"%s\" yn y ddyfais"
@@ -325,8 +325,8 @@ msgstr "Rhowch gyfrwng \"%s\" yn y ddyfais"
 msgid "Downloading package `%s'..."
 msgstr "Llwytho pecynnau i lawr ' %s'..."
 
-#: ../gurpmi2:371 ../urpm.pm:338 ../urpm/download.pm:863
-#: ../urpm/get_pkgs.pm:286 ../urpm/media.pm:994 ../urpm/media.pm:1506
+#: ../gurpmi2:371 ../urpm.pm:389 ../urpm/download.pm:859
+#: ../urpm/get_pkgs.pm:278 ../urpm/media.pm:994 ../urpm/media.pm:1506
 #: ../urpm/media.pm:1657
 #, c-format
 msgid "...retrieving failed: %s"
@@ -366,12 +366,12 @@ msgstr "Popeth wedi eu gosod eisoes"
 msgid "Installation finished"
 msgstr "Cwblhawyd y gosod"
 
-#: ../gurpmi2:419 ../urpme:165
+#: ../gurpmi2:419 ../urpme:164
 #, c-format
 msgid "removing %s"
 msgstr "tynnu %s"
 
-#: ../gurpmi2:430 ../urpmi:691
+#: ../gurpmi2:430 ../urpmi:690
 #, c-format
 msgid "restarting urpmi"
 msgstr "ailgychwyn urpmi"
@@ -410,7 +410,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:265
+#: ../rurpmi:11 ../urpmi:264
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
@@ -425,139 +425,139 @@ msgstr "Rhedeg urpmi mewn modd cyfyngedig..."
 msgid "While some packages may have been installed, there were failures.\n"
 msgstr ""
 
-#: ../urpm.pm:110
+#: ../urpm.pm:142
 #, c-format
 msgid "fail to create directory %s"
 msgstr "methu creu cyfeiriadur %s"
 
-#: ../urpm.pm:111
+#: ../urpm.pm:143
 #, c-format
 msgid "invalid owner for directory %s"
 msgstr "perchennog annilys cyfeiriadur %s"
 
-#: ../urpm.pm:135
+#: ../urpm.pm:175
 #, c-format
 msgid "Can not download packages into %s"
 msgstr "Methu llwytho pecynnau i lawr i %s"
 
-#: ../urpm.pm:150
+#: ../urpm.pm:190
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "Nid yw cyfeiriadur amgylchedd %s yn bodoli"
 
-#: ../urpm.pm:151 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:191 ../urpmf:243 ../urpmq:163
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "ddefnyddio amgylchedd penodol ar %s\n"
 
-#: ../urpm.pm:313
+#: ../urpm.pm:359
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "methu agor rpmdb"
 
-#: ../urpm.pm:327
+#: ../urpm.pm:378
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "enw ffeil rpm annilys [%s]"
 
-#: ../urpm.pm:333
+#: ../urpm.pm:384
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "adfer ffeil rpm (%s)..."
 
-#: ../urpm.pm:335 ../urpm/get_pkgs.pm:284
+#: ../urpm.pm:386 ../urpm/get_pkgs.pm:276
 #, c-format
 msgid "...retrieving done"
 msgstr ".cwblhau adfer"
 
-#: ../urpm.pm:343
+#: ../urpm.pm:394
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "methu cael mynediad  ffeil rpm (%s)"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:399
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "methu didoli ffeil spec %s [%s]"
 
-#: ../urpm.pm:356
+#: ../urpm.pm:407
 #, c-format
 msgid "unable to register rpm file"
 msgstr "methu cofrestr ffeil rpm"
 
-#: ../urpm.pm:358
+#: ../urpm.pm:409
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Saernïaeth anghydnaws ar gyfer rpm [%s]"
 
-#: ../urpm.pm:362
+#: ../urpm.pm:413
 #, c-format
 msgid "error registering local packages"
 msgstr "gwall cofrestru pecynnau lleol"
 
-#: ../urpm.pm:450
+#: ../urpm.pm:525
 #, 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:151 ../urpm/args.pm:160
+#: ../urpm/args.pm:149 ../urpm/args.pm:158
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
 
-#: ../urpm/args.pm:306
+#: ../urpm/args.pm:303
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
 
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:371
 #, c-format
 msgid "unexpected expression %s"
 msgstr "mynegiadau annisgwyl %s"
 
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:372
 #, c-format
 msgid "missing expression before %s"
 msgstr "mynegiad coll cyn %s"
 
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:378
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "mynegiad annisgwyl %s (awgrym: defnyddio -a neu-0 ?)"
 
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:382
 #, c-format
 msgid "no expression to close"
 msgstr "dim mynegiad i'w gau"
 
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:391
 #, 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:478
+#: ../urpm/args.pm:465
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Nid yw cyfeiriadur chroot yn bodoli"
 
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:488
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Methu defnyddio %s heb %s"
 
-#: ../urpm/args.pm:504 ../urpm/args.pm:507 ../urpmq:155
+#: ../urpm/args.pm:491 ../urpm/args.pm:494 ../urpmq:155
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Methu defnyddio %s gyda %s"
 
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:502
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Gormod o ymresymiadau\n"
 
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:510
 #, c-format
 msgid ""
 "%s version %s\n"
@@ -573,12 +573,12 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpm/args.pm:529
+#: ../urpm/args.pm:516
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "Hawlfraint (C) %s %s"
 
-#: ../urpm/bug_report.pm:67 ../urpmi:255
+#: ../urpm/bug_report.pm:67 ../urpmi:254
 #, c-format
 msgid "Copying failed"
 msgstr "Methodd y copïo"
@@ -607,152 +607,147 @@ msgstr "nid yw cyfrwng \"%s\" ar gael"
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "methu darllen ffeil rpm (%s) o gyfrwng \"%s\""
 
-#: ../urpm/cfg.pm:82
+#: ../urpm/cfg.pm:80
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "gwall cystrawen yn ffeil config ar linell %s"
 
-#: ../urpm/cfg.pm:115
+#: ../urpm/cfg.pm:113
 #, c-format
 msgid "unable to read config file [%s]"
 msgstr "Methu creu ffeil config (%s)"
 
-#: ../urpm/cfg.pm:141
+#: ../urpm/cfg.pm:139
 #, c-format
 msgid "medium `%s' is defined twice, aborting"
 msgstr "mae cyfrwng '%s' wedi ei ddiffinio ddwy waith, cau"
 
-#: ../urpm/cfg.pm:254 ../urpm/media.pm:553
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:553
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)"
 
-#: ../urpm/download.pm:95
+#: ../urpm/download.pm:93
 #, 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:178
+#: ../urpm/download.pm:176
 #, 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:208
+#: ../urpm/download.pm:206
 #, 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:209
+#: ../urpm/download.pm:207
 #, c-format
 msgid "User name:"
 msgstr "Enw Defnyddiwr"
 
-#: ../urpm/download.pm:209
+#: ../urpm/download.pm:207
 #, c-format
 msgid "Password:"
 msgstr "Cyfrinair:"
 
-#: ../urpm/download.pm:295
+#: ../urpm/download.pm:293
 #, c-format
 msgid "Unknown webfetch `%s' !!!\n"
 msgstr "Webfetch anhysbys '%s' !!!\n"
 
-#: ../urpm/download.pm:303
+#: ../urpm/download.pm:301
 #, c-format
 msgid "%s failed: exited with signal %d"
 msgstr "Methodd '%s': gadael gydag arwydd %d"
 
-#: ../urpm/download.pm:304
+#: ../urpm/download.pm:302
 #, c-format
 msgid "%s failed: exited with %d"
 msgstr "Methodd '%s': gadael gyda %d"
 
-#: ../urpm/download.pm:338
+#: ../urpm/download.pm:336
 #, c-format
 msgid "copy failed"
 msgstr "methodd y copïo"
 
-#: ../urpm/download.pm:344
+#: ../urpm/download.pm:342
 #, c-format
 msgid "wget is missing\n"
 msgstr "mae wget ar goll\n"
 
-#: ../urpm/download.pm:411
+#: ../urpm/download.pm:409
 #, c-format
 msgid "curl is missing\n"
 msgstr "mae curl ar goll\n"
 
-#: ../urpm/download.pm:547
-#, c-format
-msgid "curl failed: upload canceled\n"
-msgstr "methodd curl: diddymwyd y llwytho\n"
-
-#: ../urpm/download.pm:548
+#: ../urpm/download.pm:544
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "methodd curl: diddymwyd y llwytho i lawr\n"
 
-#: ../urpm/download.pm:583
+#: ../urpm/download.pm:579
 #, c-format
 msgid "rsync is missing\n"
 msgstr "rsync ar goll\n"
 
-#: ../urpm/download.pm:651
+#: ../urpm/download.pm:647
 #, c-format
 msgid "ssh is missing\n"
 msgstr "ssh ar goll\n"
 
-#: ../urpm/download.pm:670
+#: ../urpm/download.pm:666
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "prozilla ar goll\n"
 
-#: ../urpm/download.pm:686
+#: ../urpm/download.pm:682
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "Methu gweithredu prozilla\n"
 
-#: ../urpm/download.pm:696
+#: ../urpm/download.pm:692
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "aria2 ar goll\n"
 
-#: ../urpm/download.pm:740
+#: ../urpm/download.pm:736
 #, c-format
 msgid "Failed to download %s"
 msgstr "Methu llwytho %s i lawr"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:831
 #, 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:836
+#: ../urpm/download.pm:832
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% wedi ei gwblhau, cyflymder = %s"
 
-#: ../urpm/download.pm:921
+#: ../urpm/download.pm:917
 #, c-format
 msgid "retrieving %s"
 msgstr "estyn %s"
 
-#: ../urpm/download.pm:932
+#: ../urpm/download.pm:928
 #, c-format
 msgid "retrieved %s"
 msgstr "estynwyd: %s"
 
-#: ../urpm/download.pm:994
+#: ../urpm/download.pm:990
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocol anhysbys ar gyfer %s"
 
-#: ../urpm/download.pm:1008
+#: ../urpm/download.pm:1004
 #, 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:1023
+#: ../urpm/download.pm:1019
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "methu trin protocol: %s"
@@ -767,7 +762,7 @@ msgstr "glanhau %s ac %s"
 msgid "package %s is not found."
 msgstr "heb ganfod pecyn %s"
 
-#: ../urpm/get_pkgs.pm:277
+#: ../urpm/get_pkgs.pm:269
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
@@ -777,79 +772,79 @@ msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
 msgid "[repackaging]"
 msgstr "[ailbecynnu]"
 
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:200
 #, 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:204
+#: ../urpm/install.pm:203
 #, c-format
 msgid "unable to create transaction"
 msgstr "methu creu trosglwyddiad."
 
-#: ../urpm/install.pm:229
+#: ../urpm/install.pm:228
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "methu tynnu rpm o becyn delta-rpm %s"
 
-#: ../urpm/install.pm:242
+#: ../urpm/install.pm:241
 #, c-format
 msgid "unable to install package %s"
 msgstr "methu gosod pecyn %s"
 
-#: ../urpm/install.pm:245
+#: ../urpm/install.pm:244
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "tynnu rpm gwallus (%s) o %s"
 
-#: ../urpm/install.pm:246 ../urpm/install.pm:311
+#: ../urpm/install.pm:245 ../urpm/install.pm:310
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "tynnu %s methodd: %s"
 
-#: ../urpm/install.pm:292
+#: ../urpm/install.pm:291
 #, c-format
 msgid "Removing package %s"
 msgstr "Tynnu pecyn %s."
 
-#: ../urpm/install.pm:293
+#: ../urpm/install.pm:292
 #, c-format
 msgid "removing package %s"
 msgstr "tynnu pecyn %s."
 
-#: ../urpm/install.pm:309
+#: ../urpm/install.pm:308
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "tynnu rpm wedi eu gosod (%s) o %s"
 
-#: ../urpm/install.pm:318
+#: ../urpm/install.pm:317
 #, c-format
 msgid "More information on package %s"
 msgstr "Rhagor o wybodaeth ar becyn %s"
 
-#: ../urpm/ldap.pm:44
+#: ../urpm/ldap.pm:42
 #, c-format
 msgid "Cannot create ldap cache directory"
 msgstr "Methu creu cyfeiriadur storfa Idap"
 
-#: ../urpm/ldap.pm:46
+#: ../urpm/ldap.pm:44
 #, c-format
 msgid "Cannot write cache file for ldap\n"
 msgstr "Methu ysgrifennu ffeil storfa ar gyfer Idap\n"
 
-#: ../urpm/ldap.pm:181
+#: ../urpm/ldap.pm:179
 #, c-format
 msgid "No server defined, missing uri or host"
 msgstr "Heb ddiffinio gweinydd, uri neu westeiwr coll"
 
-#: ../urpm/ldap.pm:182
+#: ../urpm/ldap.pm:180
 #, c-format
 msgid "No base defined"
 msgstr "Sail heb ei ddiffinio"
 
-#: ../urpm/ldap.pm:192 ../urpm/ldap.pm:195
+#: ../urpm/ldap.pm:190 ../urpm/ldap.pm:193
 #, c-format
 msgid "Cannot connect to ldap uri:"
 msgstr "Methu cysylltu  æg uri ldap:"
@@ -1267,7 +1262,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:76 ../urpmi:491 ../urpmi:509 ../urpmi:625
+#: ../urpm/msg.pm:74 ../urpmi:490 ../urpmi:508 ../urpmi:624
 #, c-format
 msgid "Nn"
 msgstr "Nn"
@@ -1277,77 +1272,77 @@ 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:77 ../urpme:38 ../urpmi.addmedia:133
+#: ../urpm/msg.pm:75 ../urpme:38 ../urpmi.addmedia:133
 #, c-format
 msgid "Yy"
 msgstr "Yy"
 
-#: ../urpm/msg.pm:107 ../urpme:159 ../urpmi.addmedia:136
+#: ../urpm/msg.pm:105 ../urpme:158 ../urpmi.addmedia:136
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) "
 
-#: ../urpm/msg.pm:139
+#: ../urpm/msg.pm:134
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "Dewis gwael, ceisiwch eto\n"
 
-#: ../urpm/msg.pm:170
+#: ../urpm/msg.pm:165
 #, c-format
 msgid "Package"
 msgstr "Pecyn"
 
-#: ../urpm/msg.pm:170
+#: ../urpm/msg.pm:165
 #, c-format
 msgid "Version"
 msgstr "Fersiwn"
 
-#: ../urpm/msg.pm:170
+#: ../urpm/msg.pm:165
 #, c-format
 msgid "Release"
 msgstr "Ryddhad"
 
-#: ../urpm/msg.pm:170
+#: ../urpm/msg.pm:165
 #, c-format
 msgid "Arch"
 msgstr "Arch"
 
-#: ../urpm/msg.pm:179
+#: ../urpm/msg.pm:174
 #, c-format
 msgid "(suggested)"
 msgstr "(awgrym)"
 
-#: ../urpm/msg.pm:194
+#: ../urpm/msg.pm:189
 #, c-format
 msgid "medium \"%s\""
 msgstr "cyfrwng \"%s\""
 
-#: ../urpm/msg.pm:194
+#: ../urpm/msg.pm:189
 #, c-format
 msgid "command line"
 msgstr "llinell orchymyn"
 
-#: ../urpm/msg.pm:208
+#: ../urpm/msg.pm:203
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:208
+#: ../urpm/msg.pm:203
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:208
+#: ../urpm/msg.pm:203
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:208
+#: ../urpm/msg.pm:203
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
+#: ../urpm/msg.pm:203 ../urpm/msg.pm:212
 #, c-format
 msgid "TB"
 msgstr "TB"
@@ -1429,27 +1424,27 @@ msgstr "ar nod %s"
 msgid "Installation failed on node %s"
 msgstr "Methodd y gosod ar nod %s"
 
-#: ../urpm/parallel_ka_run.pm:58
+#: ../urpm/parallel_ka_run.pm:57
 #, c-format
 msgid "rshp failed, maybe a node is unreacheable"
 msgstr "methodd rshp, efallai fod y nod yn anghyraeddadwy"
 
-#: ../urpm/parallel_ka_run.pm:80
+#: ../urpm/parallel_ka_run.pm:79
 #, c-format
 msgid "mput failed, maybe a node is unreacheable"
 msgstr "methodd mput, efallai fod y nod yn anghyraeddadwy"
 
-#: ../urpm/parallel_ssh.pm:27
+#: ../urpm/parallel_ssh.pm:25
 #, c-format
 msgid "scp failed on host %s (%d)"
 msgstr "methodd scp ar westai %s (%d)"
 
-#: ../urpm/parallel_ssh.pm:39
+#: ../urpm/parallel_ssh.pm:37
 #, c-format
 msgid "cp failed on host %s (%d)"
 msgstr "methodd cp ar westai %s (%d)"
 
-#: ../urpm/parallel_ssh.pm:86
+#: ../urpm/parallel_ssh.pm:84
 #, c-format
 msgid ""
 "%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
@@ -1490,7 +1485,7 @@ msgstr ""
 msgid "No package named %s"
 msgstr "Dim pecyn o'r enw %s"
 
-#: ../urpm/select.pm:219 ../urpme:113
+#: ../urpm/select.pm:219 ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
@@ -1598,37 +1593,37 @@ msgstr ""
 msgid "Medium without key (%s)"
 msgstr ""
 
-#: ../urpm/sys.pm:225
+#: ../urpm/sys.pm:213
 #, c-format
 msgid "system"
 msgstr "system"
 
-#: ../urpm/sys.pm:262
+#: ../urpm/sys.pm:250
 #, fuzzy, c-format
 msgid "You should restart your computer for %s"
 msgstr "Dylech ailddechrau %s ar gyfer %s"
 
-#: ../urpm/sys.pm:264
+#: ../urpm/sys.pm:252
 #, fuzzy, c-format
 msgid "You should restart your session for %s"
 msgstr "Dylech ailddechrau %s ar gyfer %s"
 
-#: ../urpm/sys.pm:266
+#: ../urpm/sys.pm:254
 #, c-format
 msgid "You should restart %s for %s"
 msgstr "Dylech ailddechrau %s ar gyfer %s"
 
-#: ../urpm/sys.pm:404
+#: ../urpm/sys.pm:392
 #, c-format
 msgid "Can't write file"
 msgstr "Methu ysgrifennu'r ffeil"
 
-#: ../urpm/sys.pm:404
+#: ../urpm/sys.pm:392
 #, c-format
 msgid "Can't open file"
 msgstr "Methu agor y ffeil"
 
-#: ../urpm/sys.pm:417
+#: ../urpm/sys.pm:405
 #, c-format
 msgid "Can't move file %s to %s"
 msgstr "Methu symud ffeil %s i %s"
@@ -1654,35 +1649,30 @@ msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 "  --parallel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
 
-#: ../urpme:48 ../urpmi:138
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - Ailbecynnu'r ffeiliau cyn eu dileu\n"
-
-#: ../urpme:49
+#: ../urpme:48
 #, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - defnyddio root arall ar gyfer tynnu rpm.\n"
 
-#: ../urpme:50 ../urpmf:35 ../urpmi:106 ../urpmi.addmedia:73
-#: ../urpmi.recover:32 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:68
+#: ../urpme:49 ../urpmf:35 ../urpmi:106 ../urpmi.addmedia:73
+#: ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:68
 #, 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:51 ../urpmi:96
+#: ../urpme:50 ../urpmi:96
 #, 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"
 
-#: ../urpme:52
+#: ../urpme:51
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - peidio gweithredu sgriptledi'r pecyn(au).\n"
 
-#: ../urpme:53
+#: ../urpme:52
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1691,49 +1681,49 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
 "                   wrth (ddad)osod chroot gyda dewis  --root.\n"
 
-#: ../urpme:55 ../urpmi:149 ../urpmq:87
+#: ../urpme:54 ../urpmi:148 ../urpmq:87
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - modd llafar.\n"
 
-#: ../urpme:56
+#: ../urpme:55
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - select all packages matching expression.\n"
 
-#: ../urpme:71
+#: ../urpme:70
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu pecynnau"
 
-#: ../urpme:104
+#: ../urpme:103
 #, c-format
 msgid "unknown packages"
 msgstr "pecynnau anhysbys"
 
-#: ../urpme:104
+#: ../urpme:103
 #, c-format
 msgid "unknown package"
 msgstr "pecyn anhysbys"
 
-#: ../urpme:119
+#: ../urpme:118
 #, 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:"
 
-#: ../urpme:124
+#: ../urpme:123
 #, c-format
 msgid "Nothing to remove"
 msgstr "Dim i'w dynnu"
 
-#: ../urpme:141
+#: ../urpme:140
 #, c-format
 msgid "No orphans to remove"
 msgstr "Dim amddifad i'w tynnu"
 
-#: ../urpme:147
+#: ../urpme:146
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1741,31 +1731,31 @@ 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:152
+#: ../urpme:151
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "pecyn amddifad"
 msgstr[1] "pecynnau amddifad"
 
-#: ../urpme:159
+#: ../urpme:158
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Tynnu pecynnau %d?"
 msgstr[1] "Tynnu pecynnau %d?"
 
-#: ../urpme:164
+#: ../urpme:163
 #, c-format
 msgid "testing removal of %s"
 msgstr "profi tynnu %s"
 
-#: ../urpme:181
+#: ../urpme:180
 #, c-format
 msgid "Removal failed"
 msgstr "Methodd y tynnu"
 
-#: ../urpme:183
+#: ../urpme:182
 #, c-format
 msgid "Removal is possible"
 msgstr "Mae tynnu yn bosibl"
@@ -2295,17 +2285,17 @@ msgstr "  --noscripts    - peidio gweithredu sgripledi pecyn(au)\n"
 msgid "  --replacefiles - ignore file conflicts\n"
 msgstr "  --replacefiles - anwybyddu gwrthdaro ffeiliau\n"
 
-#: ../urpmi:139
+#: ../urpmi:138
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip          - pecynnau dylid osgoi eu gosod.\n"
 
-#: ../urpmi:140
+#: ../urpmi:139
 #, c-format
 msgid "  --prefer       - packages which should be preferred\n"
 msgstr "  --prefer       - pecynnau angenrheidiol\n"
 
-#: ../urpmi:141
+#: ../urpmi:140
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -2315,45 +2305,45 @@ msgstr ""
 "ddewis\n"
 "                   na'r rhagosodiad.\n"
 
-#: ../urpmi:143
+#: ../urpmi:142
 #, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - peidio cloi db rpm.\n"
 
-#: ../urpmi:144
+#: ../urpmi:143
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 "  --strict-arch  - uwchraddio dim ond pecynnau gyda'r un bensaernïaeth.\n"
 
-#: ../urpmi:145 ../urpmq:95
+#: ../urpmi:144 ../urpmq:95
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - dewis pob cydweddiad ar y llinell gorchymyn.\n"
 
-#: ../urpmi:148
+#: ../urpmi:147
 #, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q    - modd distaw.\n"
 
-#: ../urpmi:150
+#: ../urpmi:149
 #, c-format
 msgid "  --debug        - very verbose mode.\n"
 msgstr "  -  --debug       - modd llafar iawn.\n"
 
-#: ../urpmi:151
+#: ../urpmi:150
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 " bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
 "eu gosod.\n"
 
-#: ../urpmi:179
+#: ../urpmi:178
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "Gwall: methu defnyddio --auto-select ynghyd â'r rhestr pecynnau.\n"
 
-#: ../urpmi:186
+#: ../urpmi:185
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2363,29 +2353,29 @@ msgstr ""
 "arferol\n"
 "ynghyd a --bug.\n"
 
-#: ../urpmi:216
+#: ../urpmi:215
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "Methu gosod ffeiliau deuaidd rpm wrth ddefnyddio --install-src"
 
-#: ../urpmi:217
+#: ../urpmi:216
 #, c-format
 msgid "You can't install spec files"
 msgstr "Nid oes modd gosod ffeiliau spec"
 
-#: ../urpmi:224
+#: ../urpmi:223
 #, c-format
 msgid "defaulting to --buildrequires"
 msgstr "rhagosod --buildrequires"
 
-#: ../urpmi:229
+#: ../urpmi:228
 #, c-format
 msgid ""
 "please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr ""
 "defnyddiwch --buildrequires neu --install-src, yn rhagosod i --buildrequires"
 
-#: ../urpmi:249
+#: ../urpmi:248
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -2394,12 +2384,12 @@ msgstr ""
 "Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
 "adroddiad gwall neu ei ddileu."
 
-#: ../urpmi:250
+#: ../urpmi:249
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
 
-#: ../urpmi:271
+#: ../urpmi:270
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2409,42 +2399,42 @@ msgstr ""
 "Defnydd --allow-force gorfodaeth i orfodi gweithred."
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:425
+#: ../urpmi:424
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (uwchraddio)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:427
+#: ../urpmi:426
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (uwchraddio)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:431
+#: ../urpmi:430
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (gosod)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:433
+#: ../urpmi:432
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (gosod)"
 
-#: ../urpmi:439
+#: ../urpmi:438
 #, 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:442
+#: ../urpmi:441
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Beth yw eich dewis? (1-%d)"
 
-#: ../urpmi:484
+#: ../urpmi:483
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2455,7 +2445,7 @@ msgstr ""
 "sy'n hyn na'r rhai sydd wedi eu gosod:\n"
 "%s"
 
-#: ../urpmi:486
+#: ../urpmi:485
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2466,7 +2456,7 @@ msgstr ""
 "sy'n hyn na'r rhai sydd wedi eu gosod:\n"
 "%s"
 
-#: ../urpmi:492 ../urpmi:510
+#: ../urpmi:491 ../urpmi:509
 #, c-format
 msgid ""
 "\n"
@@ -2475,12 +2465,12 @@ msgstr ""
 "\n"
 "Parhau i osod beth bynnag?"
 
-#: ../urpmi:493 ../urpmi:511 ../urpmi:626 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:510 ../urpmi:625 ../urpmi.addmedia:136
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
-#: ../urpmi:504
+#: ../urpmi:503
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2489,12 +2479,12 @@ msgstr ""
 "Nid oes modd gosod pecyn gofynnwyd amdani:\n"
 "%s"
 
-#: ../urpmi:525
+#: ../urpmi:524
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "bydd tynnu pecynnau %s yn torri'r system"
 
-#: ../urpmi:533
+#: ../urpmi:532
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2505,7 +2495,7 @@ msgstr ""
 "gael ei dynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
-#: ../urpmi:535
+#: ../urpmi:534
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2516,12 +2506,12 @@ msgstr ""
 "gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
-#: ../urpmi:543
+#: ../urpmi:542
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(prawf yn unig, ni fydd yn cael ei ddadosod)"
 
-#: ../urpmi:562
+#: ../urpmi:561
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2532,46 +2522,46 @@ msgstr ""
 "canlynol:\n"
 "%s\n"
 
-#: ../urpmi:572
+#: ../urpmi:571
 #, 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:596
+#: ../urpmi:595
 #, c-format
 msgid "WARNING: %s option is in use. Some strange problems may happen"
 msgstr ""
 
-#: ../urpmi:608
+#: ../urpmi:607
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(prawf yn unig, ni fydd yn cael ei osod)"
 
-#: ../urpmi:614
+#: ../urpmi:613
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Bydd %s o le ychwanegol ar ddisg yn cael ei ddefnyddio."
 
-#: ../urpmi:615
+#: ../urpmi:614
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Bydd %s o le ar ddisg ar gael."
 
-#: ../urpmi:616
+#: ../urpmi:615
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "bydd %s o becynnau yn cael eu hadfer."
 
-#: ../urpmi:617
+#: ../urpmi:616
 #, 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:639
+#: ../urpmi:638
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Pwyso Enter pan wedi ei arosod..."
@@ -2788,129 +2778,6 @@ msgstr "<llwybr perthynnol synthesis> ar goll\n"
 msgid "Can't use %s with remote medium"
 msgstr "Methu defnyddio %s gyda chyfrwng pell"
 
-#: ../urpmi.recover:30
-#, c-format
-msgid "  --checkpoint   - set repackaging start now\n"
-msgstr "  --checkpoint   - gosod cychwyn ailbacio nawr\n"
-
-#: ../urpmi.recover:31
-#, c-format
-msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
-msgstr "  --noclean      - peidio glanhau rpm ar checkpoint\n"
-
-#: ../urpmi.recover:33
-#, c-format
-msgid ""
-"  --list         - list transactions since provided date/duration argument\n"
-msgstr ""
-"  --list         - rhestri trafodion ers darparu ymresymiad dyddiad hyd\n"
-
-#: ../urpmi.recover:34
-#, c-format
-msgid "  --list-all     - list all transactions in rpmdb (long)\n"
-msgstr "  --list-all     - rhestri'r holl drafodion yn rpmdb (hir)\n"
-
-#: ../urpmi.recover:35
-#, c-format
-msgid "  --list-safe    - list transactions since checkpoint\n"
-msgstr "  --list-safe     - rhestri'r holl drafodion ers y pwynt gwirio\n"
-
-#: ../urpmi.recover:36
-#, c-format
-msgid ""
-"  --rollback     - rollback until specified date,\n"
-"                   or rollback the specified number of transactions\n"
-msgstr ""
-"  --rollback     - mynd yn ôl i'r dyddiad penodol,\n"
-"                   neu nôl y nifer o drafodion penodwyd\n"
-
-#: ../urpmi.recover:38
-#, c-format
-msgid "  --disable      - turn off repackaging\n"
-msgstr "  --disable      - diffodd ailbecynnu\n"
-
-#: ../urpmi.recover:53
-#, c-format
-msgid "Invalid date or duration [%s]\n"
-msgstr "Dyddiad neu hyd annilys [%s]\n"
-
-#: ../urpmi.recover:61
-#, c-format
-msgid "Repackage directory not defined\n"
-msgstr "Heb ddiffinio cyfeiriadur ailbecynnu\n"
-
-#: ../urpmi.recover:64
-#, c-format
-msgid "Can't write to repackage directory [%s]\n"
-msgstr "Methu ysgrifennu i gyfeiriadur ailbacio [%s]\n"
-
-#: ../urpmi.recover:66
-#, c-format
-msgid "Cleaning up repackage directory [%s]...\n"
-msgstr "Glanhau cyfeiriadur ailbacio [%s]...\n"
-
-#: ../urpmi.recover:68
-#, c-format
-msgid "%d file removed\n"
-msgid_plural "%d files removed\n"
-msgstr[0] "Tynnwyd %d pecyn\n"
-msgstr[1] "Tynnwyd %d pecyn\n"
-
-#: ../urpmi.recover:78
-#, c-format
-msgid "Spurious command-line arguments [%s]\n"
-msgstr "Ymresymiadau llinell orchymyn annilys [%s]\n"
-
-#: ../urpmi.recover:80
-#, c-format
-msgid "You can't specify --checkpoint and --rollback at the same time\n"
-msgstr "Methu pennu --checkpoint a --rollback ar yr un pryd\n"
-
-#: ../urpmi.recover:82
-#, c-format
-msgid "You can't specify --checkpoint and --list at the same time\n"
-msgstr "Methu pennu --checkpoint a --list ar yr un pryd\n"
-
-#: ../urpmi.recover:84
-#, c-format
-msgid "You can't specify --rollback and --list at the same time\n"
-msgstr "Methu pennu --rollback a --list ar yr un pryd\n"
-
-#: ../urpmi.recover:86
-#, c-format
-msgid "You can't specify --disable along with another option"
-msgstr "Methu pennu --disable gyda dewis arall"
-
-#: ../urpmi.recover:111
-#, c-format
-msgid "No transaction found since %s\n"
-msgstr "Dim trafodion ers %s\n"
-
-#: ../urpmi.recover:126
-#, c-format
-msgid "You must be superuser to do this"
-msgstr "Rhaid bod yn uwch-ddefnyddiwr i wneud hyn"
-
-#: ../urpmi.recover:139 ../urpmi.recover:205
-#, c-format
-msgid "Writing rpm macros file [%s]...\n"
-msgstr "Ysgrifennu ffeil macros rpm [%s]...\n"
-
-#: ../urpmi.recover:181
-#, c-format
-msgid "No rollback date found\n"
-msgstr "Heb ganfod dyddiad rholio nôl\n"
-
-#: ../urpmi.recover:184
-#, c-format
-msgid "Rollback until %s...\n"
-msgstr "Rholio nôl hyd %s...\n"
-
-#: ../urpmi.recover:191
-#, c-format
-msgid "Disabling repackaging\n"
-msgstr "Anablu ailbecynnu\n"
-
 #: ../urpmi.removemedia:38
 #, c-format
 msgid ""
@@ -3275,21 +3142,21 @@ msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
 msgid "use -l to list files"
 msgstr "defnyddiwch -l i restru'r ffeiliau"
 
-#: ../urpmq:416
+#: ../urpmq:415
 #, 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:417
+#: ../urpmq:416
 #, 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:420
+#: ../urpmq:419
 #, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for package %s"
@@ -3297,7 +3164,7 @@ msgstr ""
 "dim  xml info ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
 "pecyn %s"
 
-#: ../urpmq:421
+#: ../urpmq:420
 #, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for packages %s"
@@ -3305,7 +3172,7 @@ msgstr ""
 "dim  xml info ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
 "pecynnau %s"
 
-#: ../urpmq:488
+#: ../urpmq:487
 #, c-format
 msgid "No changelog found\n"
 msgstr "Heb ganfod changelog\n"
@@ -3318,6 +3185,90 @@ msgstr "Gosodwr Meddalwedd"
 msgid "Graphical front end to install RPM files"
 msgstr "Blaen graffigol ar gyfer gosod ffeiliau RPM"
 
+#~ msgid "curl failed: upload canceled\n"
+#~ msgstr "methodd curl: diddymwyd y llwytho\n"
+
+#~ msgid "  --repackage    - Re-package the files before erasing\n"
+#~ msgstr "  --repackage    - Ailbecynnu'r ffeiliau cyn eu dileu\n"
+
+#~ msgid "  --checkpoint   - set repackaging start now\n"
+#~ msgstr "  --checkpoint   - gosod cychwyn ailbacio nawr\n"
+
+#~ msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
+#~ msgstr "  --noclean      - peidio glanhau rpm ar checkpoint\n"
+
+#~ msgid ""
+#~ "  --list         - list transactions since provided date/duration "
+#~ "argument\n"
+#~ msgstr ""
+#~ "  --list         - rhestri trafodion ers darparu ymresymiad dyddiad hyd\n"
+
+#~ msgid "  --list-all     - list all transactions in rpmdb (long)\n"
+#~ msgstr "  --list-all     - rhestri'r holl drafodion yn rpmdb (hir)\n"
+
+#~ msgid "  --list-safe    - list transactions since checkpoint\n"
+#~ msgstr "  --list-safe     - rhestri'r holl drafodion ers y pwynt gwirio\n"
+
+#~ msgid ""
+#~ "  --rollback     - rollback until specified date,\n"
+#~ "                   or rollback the specified number of transactions\n"
+#~ msgstr ""
+#~ "  --rollback     - mynd yn ôl i'r dyddiad penodol,\n"
+#~ "                   neu nôl y nifer o drafodion penodwyd\n"
+
+#~ msgid "  --disable      - turn off repackaging\n"
+#~ msgstr "  --disable      - diffodd ailbecynnu\n"
+
+#~ msgid "Invalid date or duration [%s]\n"
+#~ msgstr "Dyddiad neu hyd annilys [%s]\n"
+
+#~ msgid "Repackage directory not defined\n"
+#~ msgstr "Heb ddiffinio cyfeiriadur ailbecynnu\n"
+
+#~ msgid "Can't write to repackage directory [%s]\n"
+#~ msgstr "Methu ysgrifennu i gyfeiriadur ailbacio [%s]\n"
+
+#~ msgid "Cleaning up repackage directory [%s]...\n"
+#~ msgstr "Glanhau cyfeiriadur ailbacio [%s]...\n"
+
+#~ msgid "%d file removed\n"
+#~ msgid_plural "%d files removed\n"
+#~ msgstr[0] "Tynnwyd %d pecyn\n"
+#~ msgstr[1] "Tynnwyd %d pecyn\n"
+
+#~ msgid "Spurious command-line arguments [%s]\n"
+#~ msgstr "Ymresymiadau llinell orchymyn annilys [%s]\n"
+
+#~ msgid "You can't specify --checkpoint and --rollback at the same time\n"
+#~ msgstr "Methu pennu --checkpoint a --rollback ar yr un pryd\n"
+
+#~ msgid "You can't specify --checkpoint and --list at the same time\n"
+#~ msgstr "Methu pennu --checkpoint a --list ar yr un pryd\n"
+
+#~ msgid "You can't specify --rollback and --list at the same time\n"
+#~ msgstr "Methu pennu --rollback a --list ar yr un pryd\n"
+
+#~ msgid "You can't specify --disable along with another option"
+#~ msgstr "Methu pennu --disable gyda dewis arall"
+
+#~ msgid "No transaction found since %s\n"
+#~ msgstr "Dim trafodion ers %s\n"
+
+#~ msgid "You must be superuser to do this"
+#~ msgstr "Rhaid bod yn uwch-ddefnyddiwr i wneud hyn"
+
+#~ msgid "Writing rpm macros file [%s]...\n"
+#~ msgstr "Ysgrifennu ffeil macros rpm [%s]...\n"
+
+#~ msgid "No rollback date found\n"
+#~ msgstr "Heb ganfod dyddiad rholio nôl\n"
+
+#~ msgid "Rollback until %s...\n"
+#~ msgstr "Rholio nôl hyd %s...\n"
+
+#~ msgid "Disabling repackaging\n"
+#~ msgstr "Anablu ailbecynnu\n"
+
 #~ msgid ""
 #~ "urpme version %s\n"
 #~ "%s\n"