sync with code

1 files changed, 422 insertions, 406 deletions

diff --git a/po/cy.po b/po/cy.po
index bc1057c9..12792a77 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mandriva Linux\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-23 18:55+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
 "PO-Revision-Date: 2008-09-29 19:31-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg\n"
@@ -30,7 +30,7 @@ msgstr "Gosod RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Gwall: methu canfod ffeil %s, diddymu'r weithred"
 
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
 #, c-format
 msgid "_Ok"
 msgstr "_Iawn"
@@ -96,7 +96,7 @@ msgstr "_Gosod"
 msgid "_Save"
 msgstr "_Cadw"
 
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
 #, c-format
 msgid "_Cancel"
 msgstr "_Dileu"
@@ -170,12 +170,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:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - caniatáu i chwilio canfod pecyn.\n"
 
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - peidio chwilio yn provides i ganfod pecyn.\n"
@@ -215,7 +215,22 @@ msgstr "Arhoswch..."
 msgid "Must be root"
 msgstr "Rhaid bod yn root"
 
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "dosbarthu %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Gosod y pecyn..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Gosod y pecyn..."
+
+#: ../gurpmi2:111
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -231,37 +246,37 @@ msgstr ""
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../gurpmi2:134 ../urpmi:624
+#: ../gurpmi2:134 ../urpmi:625
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:170
 #, c-format
 msgid " (to upgrade)"
 msgstr "(uwchraddio)"
 
-#: ../gurpmi2:172
+#: ../gurpmi2:171
 #, c-format
 msgid " (to install)"
 msgstr "(gosod)"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:174
 #, c-format
 msgid "Package choice"
 msgstr "Dewis pecyn"
 
-#: ../gurpmi2:176
+#: ../gurpmi2:175
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../gurpmi2:200
+#: ../gurpmi2:199
 #, c-format
 msgid "_Abort"
 msgstr "_Atal"
 
-#: ../gurpmi2:222
+#: ../gurpmi2:221
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -272,61 +287,56 @@ msgstr ""
 "%s\n"
 "Parhau beth bynnag?"
 
-#: ../gurpmi2:241 ../urpmi:591
+#: ../gurpmi2:240 ../urpmi:592
 #, 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:592
+#: ../gurpmi2:241 ../urpmi:593
 #, 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:244
+#: ../gurpmi2:243
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pecyn, %d MB)"
 msgstr[1] "(%d pecyn, %d MB)"
 
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Gosod y pecyn..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "methu estyn pecynnau ffynhonnell, atal"
 
-#: ../gurpmi2:266 ../urpm/install.pm:81
+#: ../gurpmi2:265 ../urpm/install.pm:81
 #, c-format
 msgid "Preparing..."
 msgstr "Paratoi..."
 
-#: ../gurpmi2:270
+#: ../gurpmi2:269
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../gurpmi2:287 ../urpmi:619
+#: ../gurpmi2:286 ../urpmi:620
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Rhowch gyfrwng \"%s\" yn y ddyfais"
 
-#: ../gurpmi2:298
+#: ../gurpmi2:297
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Llwytho pecynnau i lawr ' %s'..."
 
-#: ../gurpmi2:324
+#: ../gurpmi2:323
 #, c-format
 msgid "_Done"
 msgstr "_Gorffen"
 
-#: ../gurpmi2:332 ../urpm/main_loop.pm:114
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -337,28 +347,28 @@ msgstr ""
 "%s\n"
 "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
-#: ../gurpmi2:338 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../gurpmi2:337 ../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:"
 
-#: ../gurpmi2:343
+#: ../gurpmi2:342
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Popeth wedi eu gosod eisoes"
 
-#: ../gurpmi2:345
+#: ../gurpmi2:344
 #, c-format
 msgid "Installation finished"
 msgstr "Cwblhawyd y gosod"
 
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "tynnu %s"
 
-#: ../gurpmi2:354 ../urpmi:686
+#: ../gurpmi2:353 ../urpmi:687
 #, c-format
 msgid "restarting urpmi"
 msgstr "ailgychwyn urpmi"
@@ -397,7 +407,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:268
+#: ../rurpmi:11 ../urpmi:269
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
@@ -493,59 +503,59 @@ msgstr "Mae'r weithred yn waharddedig wrth redeg ym modd cyfyngedig"
 msgid "bad proxy declaration on command line\n"
 msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
 
-#: ../urpm/args.pm:305
+#: ../urpm/args.pm:306
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
 
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:383
 #, c-format
 msgid "unexpected expression %s"
 msgstr "mynegiadau annisgwyl %s"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:384
 #, c-format
 msgid "missing expression before %s"
 msgstr "mynegiad coll cyn %s"
 
-#: ../urpm/args.pm:389
+#: ../urpm/args.pm:390
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "mynegiad annisgwyl %s (awgrym: defnyddio -a neu-0 ?)"
 
-#: ../urpm/args.pm:393
+#: ../urpm/args.pm:394
 #, c-format
 msgid "no expression to close"
 msgstr "dim mynegiad i'w gau"
 
-#: ../urpm/args.pm:402
+#: ../urpm/args.pm:403
 #, 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:470
+#: ../urpm/args.pm:471
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Nid yw cyfeiriadur chroot yn bodoli"
 
-#: ../urpm/args.pm:493
+#: ../urpm/args.pm:494
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Methu defnyddio %s heb %s"
 
-#: ../urpm/args.pm:496 ../urpm/args.pm:499 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Methu defnyddio %s gyda %s"
 
-#: ../urpm/args.pm:507
+#: ../urpm/args.pm:508
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Gormod o ymresymiadau\n"
 
-#: ../urpm/bug_report.pm:54 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
 #, c-format
 msgid "Copying failed"
 msgstr "Methodd y copïo"
@@ -734,54 +744,54 @@ msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
 msgid "[repackaging]"
 msgstr "[ailbecynnu]"
 
-#: ../urpm/install.pm:168
+#: ../urpm/install.pm:169
 #, 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:171
+#: ../urpm/install.pm:172
 #, c-format
 msgid "unable to create transaction"
 msgstr "methu creu trosglwyddiad."
 
-#: ../urpm/install.pm:194
+#: ../urpm/install.pm:195
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "methu tynnu rpm o becyn delta-rpm %s"
 
-#: ../urpm/install.pm:207
+#: ../urpm/install.pm:208
 #, c-format
 msgid "unable to install package %s"
 msgstr "methu gosod pecyn %s"
 
-#: ../urpm/install.pm:210
+#: ../urpm/install.pm:211
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "tynnu rpm gwallus (%s) o %s"
 
-#: ../urpm/install.pm:211 ../urpm/install.pm:268
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "tynnu %s methodd: %s"
 
-#: ../urpm/install.pm:249
+#: ../urpm/install.pm:250
 #, c-format
 msgid "Removing package %s"
 msgstr "Tynnu pecyn %s."
 
-#: ../urpm/install.pm:250
+#: ../urpm/install.pm:251
 #, c-format
 msgid "removing package %s"
 msgstr "tynnu pecyn %s."
 
-#: ../urpm/install.pm:266
+#: ../urpm/install.pm:267
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "tynnu rpm wedi eu gosod (%s) o %s"
 
-#: ../urpm/install.pm:274
+#: ../urpm/install.pm:275
 #, c-format
 msgid "More information on package %s"
 msgstr "Rhagor o wybodaeth ar becyn %s"
@@ -1191,7 +1201,7 @@ msgstr "wedi canfod geolleoleiddio %s %.2f %.2f  o gylchfa amser %s"
 msgid "getting mirror list from %s"
 msgstr "estyn rhestr drychai o %s"
 
-#: ../urpm/msg.pm:63 ../urpmi:501 ../urpmi:516 ../urpmi:611
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
 #, c-format
 msgid "Nn"
 msgstr "Nn"
@@ -1201,7 +1211,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:552 ../urpmi:647 ../urpmi:653
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
@@ -1361,6 +1371,306 @@ msgstr "gosod %s"
 msgid "unmounting %s"
 msgstr "dadosod %s"
 
+#: ../urpm/search.pm:29 ../urpmf:29
+#, 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"
+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:36 ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - argraffu rhif fersiwn yr offeryn.\n"
+
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - defnyddio amgylchedd penodol (adroddiad gwall fel "
+"rheol).\n"
+
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, 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"
+
+#: ../urpm/search.pm:39 ../urpmf:39
+#, 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"
+
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root         - defnyddio root arall ar gyfer gosod urpmi db ac "
+"rpm.\n"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, 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"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, 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"
+
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - peidio argraffu llinellau'r un fath.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - modd llafar.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -i             - cadw gwahaniaeth maint llythrennau ym mhob patrwm "
+"(rhagosodiad).\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - newid ymwahanydd maes (arferol i ':').\n"
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Mynegiadau patrymau:\n"
+
+#: ../urpm/search.pm:52 ../urpmf:52
+#, 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"
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - cynnwys perl cod yn union fel perl -e.\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - gweithredwr deuaidd AND.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - gweithredwr deuaidd OR.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - unaidd NOT.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )              - parenthesis de a chwith.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Rhestr tagiau:\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - pennu allbwn fformat printf-aidd\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   esiampl: '%%enw:%%ffeil'\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - saernïaeth\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - gwestai'r adeiladedd\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - amser adeiladu\n"
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - ffeiliau ffurfweddiad\n"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - tagiau gwrthdaro\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - disgrifiad pecyn\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - dosbarthiad\n"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - cyfnod\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - enw ffeil y pecyn\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - rhestr ffeiliau o fewn y pecyn\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - grŵp\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license          - trwydded\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name          - enw'r pecyn\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes     - tagiau'r hen\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager      - pecynydd\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides      - tag darparu\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - tagiau angenrhaid\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - maint wedi gosod\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - enw rpm ffynhonnell\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - cynnig tagiau\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - crynodeb\n"
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - url\n"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - gwerthwr\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - y cyfrwng lle cafwyd y pecyn\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Fformat anghywir: gallwch ddefnyddio un tag aml-werth yn unig"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "dim ffeil hdlist ar gyfer cyfrwng \"%s\""
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "adeiladu ffeil synthesis file ar gyfer cyfrwng \"%s\""
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "dim xml-info ar gyfer cyfrwng \"%s\""
+
 #: ../urpm/select.pm:30
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1456,17 +1766,17 @@ msgstr "er mwyn gosod %s"
 msgid "due to conflicts with %s"
 msgstr "oherwydd gwrthdaro gyda %s"
 
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Llofnod annilys (%s)"
 
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Enw Allwedd Annilys (%s)"
 
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Llofnod coll (%s)"
@@ -1533,7 +1843,7 @@ msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 "  --parallel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
 
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - Ailbecynnu'r ffeiliau cyn eu dileu\n"
@@ -1543,14 +1853,6 @@ msgstr "  --repackage    - Ailbecynnu'r ffeiliau cyn eu dileu\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - defnyddio root arall ar gyfer tynnu rpm.\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root         - defnyddio root arall ar gyfer gosod urpmi db ac "
-"rpm.\n"
-
 #: ../urpme:55 ../urpmi:101
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
@@ -1570,7 +1872,7 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
 "                   wrth (ddad)osod chroot gyda dewis  --root.\n"
 
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - modd llafar.\n"
@@ -1634,7 +1936,7 @@ msgid_plural "Remove %d packages?"
 msgstr[0] "Tynnu pecynnau %d?"
 msgstr[1] "Tynnu pecynnau %d?"
 
-#: ../urpme:161 ../urpmi:553 ../urpmi:648 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) "
@@ -1654,302 +1956,11 @@ msgstr "Methodd y tynnu"
 msgid "Removal is possible"
 msgstr "Mae tynnu yn bosibl"
 
-#: ../urpmf:29
-#, 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"
-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"
-
-#: ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - argraffu rhif fersiwn yr offeryn.\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - defnyddio amgylchedd penodol (adroddiad gwall fel "
-"rheol).\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, 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"
-
-#: ../urpmf:39
-#, 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"
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, 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"
-
-#: ../urpmf:43
-#, 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"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
-
-#: ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - peidio argraffu llinellau'r un fath.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
-
-#: ../urpmf:47
-#, c-format
-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"
-
-#: ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -i             - cadw gwahaniaeth maint llythrennau ym mhob patrwm "
-"(rhagosodiad).\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - newid ymwahanydd maes (arferol i ':').\n"
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Mynegiadau patrymau:\n"
-
-#: ../urpmf:52
-#, 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"
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - cynnwys perl cod yn union fel perl -e.\n"
-
-#: ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - gweithredwr deuaidd AND.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - gweithredwr deuaidd OR.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - unaidd NOT.\n"
-
-#: ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )              - parenthesis de a chwith.\n"
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Rhestr tagiau:\n"
-
-#: ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - pennu allbwn fformat printf-aidd\n"
-
-#: ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   esiampl: '%%enw:%%ffeil'\n"
-
-#: ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - saernïaeth\n"
-
-#: ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - gwestai'r adeiladedd\n"
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - amser adeiladu\n"
-
-#: ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - ffeiliau ffurfweddiad\n"
-
-#: ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - tagiau gwrthdaro\n"
-
-#: ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - disgrifiad pecyn\n"
-
-#: ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - dosbarthiad\n"
-
-#: ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - cyfnod\n"
-
-#: ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - enw ffeil y pecyn\n"
-
-#: ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - rhestr ffeiliau o fewn y pecyn\n"
-
-#: ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - grŵp\n"
-
-#: ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license          - trwydded\n"
-
-#: ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name          - enw'r pecyn\n"
-
-#: ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes     - tagiau'r hen\n"
-
-#: ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager      - pecynydd\n"
-
-#: ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides      - tag darparu\n"
-
-#: ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - tagiau angenrhaid\n"
-
-#: ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - maint wedi gosod\n"
-
-#: ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - enw rpm ffynhonnell\n"
-
-#: ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - cynnig tagiau\n"
-
-#: ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - crynodeb\n"
-
-#: ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - url\n"
-
-#: ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - gwerthwr\n"
-
-#: ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - y cyfrwng lle cafwyd y pecyn\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
-
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "Mynegiadauheb ei derfynnu (%s)"
 
-#: ../urpmf:198
-#, 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:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "dim ffeil hdlist ar gyfer cyfrwng \"%s\""
-
-#: ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "adeiladu ffeil synthesis file ar gyfer cyfrwng \"%s\""
-
-#: ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "dim xml-info ar gyfer cyfrwng \"%s\""
-
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2183,17 +2194,22 @@ msgstr "  --ignorearch   - caniatáu gosod rpm ar gyfer saernïaeth annhebyg.\n"
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - peidio gweithredu sgripledi pecyn(au)\n"
 
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid "  --replacefiles - ignore file conflicts\n"
+msgstr "  --conflicts    - gwrthdaro argraffu\n"
+
+#: ../urpmi:143
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip          - pecynnau dylid osgoi eu gosod.\n"
 
-#: ../urpmi:143
+#: ../urpmi:144
 #, c-format
 msgid "  --prefer       - packages which should be preferred\n"
 msgstr "  --prefer       - pecynnau angenrheidiol\n"
 
-#: ../urpmi:144
+#: ../urpmi:145
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -2203,45 +2219,45 @@ msgstr ""
 "ddewis\n"
 "                   na'r rhagosodiad.\n"
 
-#: ../urpmi:146
+#: ../urpmi:147
 #, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - peidio cloi db rpm.\n"
 
-#: ../urpmi:147
+#: ../urpmi:148
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 "  --strict-arch  - uwchraddio dim ond pecynnau gyda'r un bensaernïaeth.\n"
 
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - dewis pob cydweddiad ar y llinell gorchymyn.\n"
 
-#: ../urpmi:151
+#: ../urpmi:152
 #, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q    - modd distaw.\n"
 
-#: ../urpmi:153
+#: ../urpmi:154
 #, c-format
 msgid "  --debug        - very verbose mode.\n"
 msgstr "  -  --debug       - modd llafar iawn.\n"
 
-#: ../urpmi:154
+#: ../urpmi:155
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 " bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
 "eu gosod.\n"
 
-#: ../urpmi:182
+#: ../urpmi:183
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "Gwall: methu defnyddio --auto-select ynghyd â'r rhestr pecynnau.\n"
 
-#: ../urpmi:189
+#: ../urpmi:190
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2251,29 +2267,29 @@ msgstr ""
 "arferol\n"
 "ynghyd a --bug.\n"
 
-#: ../urpmi:219
+#: ../urpmi:220
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "Methu gosod ffeiliau deuaidd rpm wrth ddefnyddio --install-src"
 
-#: ../urpmi:220
+#: ../urpmi:221
 #, c-format
 msgid "You can't install spec files"
 msgstr "Nid oes modd gosod ffeiliau spec"
 
-#: ../urpmi:227
+#: ../urpmi:228
 #, c-format
 msgid "defaulting to --buildrequires"
 msgstr "rhagosod --buildrequires"
 
-#: ../urpmi:232
+#: ../urpmi:233
 #, c-format
 msgid ""
 "please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr ""
 "defnyddiwch --buildrequires neu --install-src, yn rhagosod i --buildrequires"
 
-#: ../urpmi:252
+#: ../urpmi:253
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -2282,12 +2298,12 @@ msgstr ""
 "Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
 "adroddiad gwall neu ei ddileu."
 
-#: ../urpmi:253
+#: ../urpmi:254
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
 
-#: ../urpmi:274
+#: ../urpmi:275
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2296,48 +2312,48 @@ msgstr ""
 "Gwall: %s i weld wedi ei osod fel darllen yn unig.\n"
 "Defnydd --allow-force gorfodaeth i orfodi gweithred."
 
-#: ../urpmi:348
+#: ../urpmi:349
 #, c-format
 msgid "Updating media...\n"
 msgstr "Diweddaru cyfrwng...\n"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:435
+#: ../urpmi:436
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (uwchraddio)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:437
+#: ../urpmi:438
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (uwchraddio)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:441
+#: ../urpmi:442
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (gosod)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:443
+#: ../urpmi:444
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (gosod)"
 
-#: ../urpmi:449
+#: ../urpmi:450
 #, 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:452
+#: ../urpmi:453
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Beth yw eich dewis? (1-%d)"
 
-#: ../urpmi:494
+#: ../urpmi:495
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2348,7 +2364,7 @@ msgstr ""
 "sy'n hyn na'r rhai sydd wedi eu gosod:\n"
 "%s"
 
-#: ../urpmi:496
+#: ../urpmi:497
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2359,7 +2375,7 @@ msgstr ""
 "sy'n hyn na'r rhai sydd wedi eu gosod:\n"
 "%s"
 
-#: ../urpmi:502 ../urpmi:517
+#: ../urpmi:503 ../urpmi:518
 #, c-format
 msgid ""
 "\n"
@@ -2368,12 +2384,12 @@ msgstr ""
 "\n"
 "Parhau i osod beth bynnag?"
 
-#: ../urpmi:503 ../urpmi:518 ../urpmi:612 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
-#: ../urpmi:511
+#: ../urpmi:512
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2382,7 +2398,7 @@ msgstr ""
 "Nid oes modd gosod pecyn gofynnwyd amdani:\n"
 "%s"
 
-#: ../urpmi:512
+#: ../urpmi:513
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2391,12 +2407,12 @@ msgstr ""
 "Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
 "%s"
 
-#: ../urpmi:529
+#: ../urpmi:530
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "bydd tynnu pecynnau %s yn torri'r system"
 
-#: ../urpmi:537
+#: ../urpmi:538
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2407,7 +2423,7 @@ msgstr ""
 "gael ei dynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
-#: ../urpmi:539
+#: ../urpmi:540
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2418,12 +2434,12 @@ msgstr ""
 "gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
-#: ../urpmi:547
+#: ../urpmi:548
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(prawf yn unig, ni fydd yn cael ei ddadosod)"
 
-#: ../urpmi:567
+#: ../urpmi:568
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2434,46 +2450,46 @@ msgstr ""
 "canlynol:\n"
 "%s\n"
 
-#: ../urpmi:578
+#: ../urpmi:579
 #, 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:594
+#: ../urpmi:595
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(prawf yn unig, ni fydd yn cael ei osod)"
 
-#: ../urpmi:600
+#: ../urpmi:601
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Bydd %s o le ychwanegol ar ddisg yn cael ei ddefnyddio."
 
-#: ../urpmi:601
+#: ../urpmi:602
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Bydd %s o le ar ddisg ar gael."
 
-#: ../urpmi:602
+#: ../urpmi:603
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "bydd %s o becynnau yn cael eu hadfer."
 
-#: ../urpmi:603
+#: ../urpmi:604
 #, 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:624
+#: ../urpmi:625
 #, c-format
 msgid "Cancel"
 msgstr "Dileu"
 
-#: ../urpmi:632
+#: ../urpmi:633
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Pwyso Enter pan wedi ei arosod..."