updated all po with for removing fuzzy on "Is this OK?" as previously "Is it

OK?"

1 files changed, 512 insertions, 198 deletions

diff --git a/po/cy.po b/po/cy.po
index f9116849..f31761f2 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2002-08-30 17:05+0200\n"
+"POT-Creation-Date: 2002-09-05 11:10+0200\n"
 "PO-Revision-Date: 2002-03-07 21:04-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@ntlworld.com>\n"
 "Language-Team: Cymraeg/Welsh <cy@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-14\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_irpm_.c:23 ../urpmi_.c:511
+#: ../_irpm_.c:23 ../urpmi_.c:511 placeholder.h:99
 #, c-format
 msgid "installing %s\n"
 msgstr "gosod %s\n"
@@ -28,34 +28,33 @@ msgstr ""
 "Roeddech wedi gofyn i gael gosod pecyn %s\n"
 
 #: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:425
-#, fuzzy
-msgid "Is it OK?"
+msgid "Is this OK?"
 msgstr "Mae'r model yn gywir"
 
 #: ../_irpm_.c:35 ../urpmi_.c:362 ../urpmi_.c:379 ../urpmi_.c:428
-#: ../urpmi_.c:456 ../urpmi_.c:484
+#: ../urpmi_.c:456 ../urpmi_.c:484 placeholder.h:127
 msgid "Ok"
 msgstr "Iawn"
 
 #: ../_irpm_.c:36 ../urpmi_.c:363 ../urpmi_.c:380 ../urpmi_.c:429
-#: ../urpmi_.c:457 ../urpmi_.c:485
+#: ../urpmi_.c:457 ../urpmi_.c:485 placeholder.h:93
 msgid "Cancel"
 msgstr "Dileu"
 
 #. Translator: Add here the keys which might be pressed in the "No"-case.
 #: ../_irpm_.c:42 ../urpme_.c:35 ../urpmi_.c:367 ../urpmi_.c:384
-#: ../urpmi_.c:433 ../urpmi_.c:489 ../urpmi_.c:540 placeholder.h:17
+#: ../urpmi_.c:433 ../urpmi_.c:489 ../urpmi_.c:540 placeholder.h:128
 msgid "Nn"
 msgstr "Nn"
 
 #. Translator: Add here the keys which might be pressed in the "Yes"-case.
 #: ../_irpm_.c:43 ../urpme_.c:37 ../urpmi_.c:368 ../urpmi_.c:385
-#: ../urpmi_.c:434 ../urpmi_.c:490 ../urpmi_.c:541 placeholder.h:11
+#: ../urpmi_.c:434 ../urpmi_.c:490 ../urpmi_.c:541 placeholder.h:96
 msgid "Yy"
 msgstr "Yy"
 
 #: ../_irpm_.c:44 ../urpme_.c:184 ../urpmi_.c:369 ../urpmi_.c:386
-#: ../urpmi_.c:435
+#: ../urpmi_.c:435 placeholder.h:95
 msgid " (Y/n) "
 msgstr " (Y/n) "
 
@@ -118,7 +117,7 @@ msgstr "Mae pecyn gorfodol %s ar goll"
 msgid "rsync failed: exited with %d or signal %d\n"
 msgstr ""
 
-#: ../urpm.pm_.c:337 ../urpm.pm_.c:349
+#: ../urpm.pm_.c:337 ../urpm.pm_.c:349 placeholder.h:65
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr ""
@@ -133,7 +132,7 @@ msgstr ""
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:376
+#: ../urpm.pm_.c:376 placeholder.h:46
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
@@ -145,47 +144,47 @@ msgstr ""
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "enw"
 
-#: ../urpm.pm_.c:389
+#: ../urpm.pm_.c:389 placeholder.h:24
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr ""
 
-#: ../urpm.pm_.c:393
+#: ../urpm.pm_.c:393 placeholder.h:89
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:402
+#: ../urpm.pm_.c:402 placeholder.h:55
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:404
+#: ../urpm.pm_.c:404 placeholder.h:78
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:418
+#: ../urpm.pm_.c:418 placeholder.h:72
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr ""
 
-#: ../urpm.pm_.c:424
+#: ../urpm.pm_.c:424 placeholder.h:41
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:429
+#: ../urpm.pm_.c:429 placeholder.h:13
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "methu canfod ffeil rhestr ar gyfer \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpm.pm_.c:448
+#: ../urpm.pm_.c:448 placeholder.h:59
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr ""
 
-#: ../urpm.pm_.c:456
+#: ../urpm.pm_.c:456 placeholder.h:58
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr ""
@@ -210,12 +209,12 @@ msgstr "dyfais"
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:512
+#: ../urpm.pm_.c:512 placeholder.h:10
 #, fuzzy, c-format
 msgid "unable to write config file [%s]"
 msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
 
-#: ../urpm.pm_.c:524
+#: ../urpm.pm_.c:524 placeholder.h:33
 #, fuzzy, c-format
 msgid "write config file [%s]"
 msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
@@ -249,7 +248,7 @@ msgstr "Methu rhedeg porwr"
 msgid "--synthesis cannot be used with --media, --update or --parallel"
 msgstr ""
 
-#: ../urpm.pm_.c:598 ../urpm.pm_.c:1140 ../urpm.pm_.c:1155 ../urpm.pm_.c:1285
+#: ../urpm.pm_.c:598 ../urpm.pm_.c:1138 ../urpm.pm_.c:1153 ../urpm.pm_.c:1283
 #, fuzzy, c-format
 msgid "examining hdlist file [%s]"
 msgstr "adeiladu math 1inst"
@@ -259,19 +258,19 @@ msgstr "adeiladu math 1inst"
 msgid "problem reading hdlist file of medium \"%s\""
 msgstr "Y ffeil yn methu darllen ffeil\n"
 
-#: ../urpm.pm_.c:613 ../urpm.pm_.c:866 ../urpm.pm_.c:948 ../urpm.pm_.c:1083
-#: ../urpm.pm_.c:1145 ../urpm.pm_.c:1150 ../urpm.pm_.c:1212 ../urpm.pm_.c:1280
+#: ../urpm.pm_.c:613 ../urpm.pm_.c:866 ../urpm.pm_.c:946 ../urpm.pm_.c:1081
+#: ../urpm.pm_.c:1143 ../urpm.pm_.c:1148 ../urpm.pm_.c:1210 ../urpm.pm_.c:1278
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:617 ../urpm.pm_.c:870 ../urpm.pm_.c:951 ../urpm.pm_.c:1087
-#: ../urpm.pm_.c:1215
+#: ../urpm.pm_.c:617 ../urpm.pm_.c:870 ../urpm.pm_.c:949 ../urpm.pm_.c:1085
+#: ../urpm.pm_.c:1213
 #, fuzzy, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "Y ffeil yn methu darllen ffeil\n"
 
-#: ../urpm.pm_.c:655
+#: ../urpm.pm_.c:655 placeholder.h:32
 #, fuzzy, c-format
 msgid "medium \"%s\" already exists"
 msgstr "Mae'r ffeil yn bodoli eisoes. Defnyddiwch hwn?"
@@ -290,12 +289,12 @@ msgstr ""
 msgid "copying hdlists file..."
 msgstr "Rhestr ddewis argraffu"
 
-#: ../urpm.pm_.c:707 ../urpm.pm_.c:925 ../urpm.pm_.c:933 ../urpm.pm_.c:966
+#: ../urpm.pm_.c:707 ../urpm.pm_.c:923 ../urpm.pm_.c:931 ../urpm.pm_.c:964
 #, fuzzy
 msgid "...copying done"
 msgstr "Wedi gosod True Type"
 
-#: ../urpm.pm_.c:707 ../urpm.pm_.c:925 ../urpm.pm_.c:933 ../urpm.pm_.c:966
+#: ../urpm.pm_.c:707 ../urpm.pm_.c:923 ../urpm.pm_.c:931 ../urpm.pm_.c:964
 #, fuzzy
 msgid "...copying failed"
 msgstr "methodd y gosodiad"
@@ -311,12 +310,12 @@ msgstr ""
 msgid "retrieving hdlists file..."
 msgstr "Ffeiliau Defnyddiwr Cadw wrth Gefn..."
 
-#: ../urpm.pm_.c:717 ../urpm.pm_.c:1021 ../urpm.pm_.c:1073 ../urpm.pm_.c:1931
+#: ../urpm.pm_.c:717 ../urpm.pm_.c:1019 ../urpm.pm_.c:1071 ../urpm.pm_.c:1929
 #, fuzzy
 msgid "...retrieving done"
 msgstr "Wedi gosod True Type"
 
-#: ../urpm.pm_.c:719 ../urpm.pm_.c:1068 ../urpm.pm_.c:1933
+#: ../urpm.pm_.c:719 ../urpm.pm_.c:1066 ../urpm.pm_.c:1931
 #, fuzzy, c-format
 msgid "...retrieving failed: %s"
 msgstr "methodd y gosodiad"
@@ -351,228 +350,228 @@ msgstr "Tynnu LPRng..."
 msgid "urpmi database locked"
 msgstr "archwilio cronfa ddata urpmi gyfan"
 
-#: ../urpm.pm_.c:890 ../urpm.pm_.c:892 ../urpm.pm_.c:1875
+#: ../urpm.pm_.c:891 ../urpm.pm_.c:1873 placeholder.h:83
 #, fuzzy, c-format
 msgid "unable to access medium \"%s\""
 msgstr "mynediad i offer rpm"
 
-#: ../urpm.pm_.c:923
+#: ../urpm.pm_.c:921
 #, fuzzy, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "Rhestr ddewis argraffu"
 
-#: ../urpm.pm_.c:931
+#: ../urpm.pm_.c:929
 #, fuzzy, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "llwybr perthynol i synthesis neu hdlist:"
 
-#: ../urpm.pm_.c:936
+#: ../urpm.pm_.c:934 placeholder.h:60
 #, fuzzy, c-format
 msgid "copy of [%s] failed"
 msgstr "methodd y gosodiad"
 
-#: ../urpm.pm_.c:964
+#: ../urpm.pm_.c:962
 #, fuzzy, c-format
 msgid "copying source list of \"%s\"..."
 msgstr "Rhestr ddewis argraffu"
 
-#: ../urpm.pm_.c:981
+#: ../urpm.pm_.c:979
 #, fuzzy, c-format
 msgid "reading rpm files from [%s]"
 msgstr "Heb ganfod ffeil  RPM"
 
-#: ../urpm.pm_.c:1000
+#: ../urpm.pm_.c:998
 #, fuzzy, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "Methu canfod ffeil menudrake .glade"
 
-#: ../urpm.pm_.c:1005
+#: ../urpm.pm_.c:1003 placeholder.h:85
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr ""
 
-#: ../urpm.pm_.c:1018
+#: ../urpm.pm_.c:1016
 #, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm.pm_.c:1030
+#: ../urpm.pm_.c:1028
 #, fuzzy, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "llwybr perthynol i synthesis neu hdlist:"
 
-#: ../urpm.pm_.c:1112
+#: ../urpm.pm_.c:1110
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr ""
 
-#: ../urpm.pm_.c:1119
+#: ../urpm.pm_.c:1117 placeholder.h:23
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1131 ../urpm.pm_.c:1175
+#: ../urpm.pm_.c:1129 ../urpm.pm_.c:1173
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1162
+#: ../urpm.pm_.c:1160 placeholder.h:15
 #, fuzzy, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "Methu canfod ffeil menudrake .glade"
 
-#: ../urpm.pm_.c:1189
+#: ../urpm.pm_.c:1187 placeholder.h:12
 #, c-format
 msgid "nothing to write in list file for \"%s\""
 msgstr "dim byd i'w ysgrifennu yn ffeil rhestr ar gyfer \"%s\""
 
-#: ../urpm.pm_.c:1196
+#: ../urpm.pm_.c:1194 placeholder.h:34
 #, fuzzy, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
 
-#: ../urpm.pm_.c:1203
+#: ../urpm.pm_.c:1201 placeholder.h:16
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "dim wedi ei ysgrifennu yn y ffeil rhestr ar gyfer \"%s\""
 
-#: ../urpm.pm_.c:1245
+#: ../urpm.pm_.c:1243
 msgid "performing second pass to compute dependencies\n"
 msgstr ""
 
-#: ../urpm.pm_.c:1258
+#: ../urpm.pm_.c:1256
 #, fuzzy, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "Tynnu LPRng..."
 
-#: ../urpm.pm_.c:1263
+#: ../urpm.pm_.c:1261 placeholder.h:66
 #, fuzzy, c-format
 msgid "building hdlist [%s]"
 msgstr "adeiladu math 1inst"
 
-#: ../urpm.pm_.c:1275 ../urpm.pm_.c:1294
+#: ../urpm.pm_.c:1273 ../urpm.pm_.c:1292 placeholder.h:42
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1312
+#: ../urpm.pm_.c:1310 placeholder.h:26
 #, c-format
 msgid "found %d headers in cache"
 msgstr ""
 
-#: ../urpm.pm_.c:1316
+#: ../urpm.pm_.c:1314 placeholder.h:22
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr ""
 
-#: ../urpm.pm_.c:1472
+#: ../urpm.pm_.c:1470 placeholder.h:45
 #, c-format
 msgid "mounting %s"
 msgstr ""
 
-#: ../urpm.pm_.c:1483
+#: ../urpm.pm_.c:1481 placeholder.h:21
 #, fuzzy, c-format
 msgid "unmounting %s"
 msgstr "gwall dadosod %s: %s"
 
-#: ../urpm.pm_.c:1496
+#: ../urpm.pm_.c:1494
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr ""
 
-#: ../urpm.pm_.c:1497
+#: ../urpm.pm_.c:1495
 msgid "no entries relocated in depslist"
 msgstr ""
 
-#: ../urpm.pm_.c:1510
+#: ../urpm.pm_.c:1508 placeholder.h:71
 #, fuzzy, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "Heb ganfod ffeil  RPM"
 
-#: ../urpm.pm_.c:1511 ../urpm.pm_.c:2035
+#: ../urpm.pm_.c:1509 ../urpm.pm_.c:2033 placeholder.h:81
 #, fuzzy, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "Methu canfod ffeil menudrake .glade"
 
-#: ../urpm.pm_.c:1515
+#: ../urpm.pm_.c:1513
 #, fuzzy
 msgid "unable to register rpm file"
 msgstr "Methu canfod ffeil menudrake .glade"
 
-#: ../urpm.pm_.c:1518
+#: ../urpm.pm_.c:1516
 #, fuzzy
 msgid "error registering local packages"
 msgstr "Gwall fformat ffeiliau neu becynnau"
 
-#: ../urpm.pm_.c:1606
+#: ../urpm.pm_.c:1604 placeholder.h:38
 #, fuzzy, c-format
 msgid "no package named %s"
 msgstr "Dewis pecynnau unigol."
 
-#: ../urpm.pm_.c:1609
+#: ../urpm.pm_.c:1607 placeholder.h:86
 #, fuzzy, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Diweddaru'r pecynnau'n unig"
 
-#: ../urpm.pm_.c:1740 ../urpm.pm_.c:1770
+#: ../urpm.pm_.c:1738 ../urpm.pm_.c:1768
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1779
+#: ../urpm.pm_.c:1777
 #, fuzzy, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "Methu rhedeg porwr"
 
-#: ../urpm.pm_.c:1791
+#: ../urpm.pm_.c:1789
 #, fuzzy, c-format
 msgid "package %s is not found."
 msgstr "Nid yw pecyn %s wedi ei lofnodi"
 
-#: ../urpm.pm_.c:1839 ../urpm.pm_.c:1842 ../urpm.pm_.c:1860
+#: ../urpm.pm_.c:1837 ../urpm.pm_.c:1840 ../urpm.pm_.c:1858 placeholder.h:70
 #, fuzzy, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "Nid yw pecyn %s wedi ei lofnodi"
 
-#: ../urpm.pm_.c:1848
+#: ../urpm.pm_.c:1846 placeholder.h:67
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr ""
 
-#: ../urpm.pm_.c:1864
+#: ../urpm.pm_.c:1862 placeholder.h:68
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr ""
 
-#: ../urpm.pm_.c:1921
+#: ../urpm.pm_.c:1919 placeholder.h:52
 #, fuzzy, c-format
 msgid "malformed input: [%s]"
 msgstr "Mewnbwn/Allbwn"
 
-#: ../urpm.pm_.c:1926
+#: ../urpm.pm_.c:1924
 #, fuzzy
 msgid "retrieving rpm files..."
 msgstr "Ffeiliau Defnyddiwr Cadw wrth Gefn..."
 
-#: ../urpm.pm_.c:1975
+#: ../urpm.pm_.c:1973
 msgid "Preparing..."
 msgstr ""
 
-#: ../urpm.pm_.c:2003
+#: ../urpm.pm_.c:2001
 #, fuzzy, c-format
 msgid "unable to remove package %s"
 msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
 
-#: ../urpm.pm_.c:2009 ../urpm.pm_.c:2015
+#: ../urpm.pm_.c:2007 ../urpm.pm_.c:2013
 #, fuzzy, c-format
 msgid "unable to install package %s"
 msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
 
-#: ../urpm.pm_.c:2022
+#: ../urpm.pm_.c:2020
 #, c-format
 msgid "%s is needed by %s"
 msgstr ""
 
-#: ../urpm.pm_.c:2023
+#: ../urpm.pm_.c:2021
 #, c-format
 msgid "%s conflicts with %s"
 msgstr ""
@@ -715,19 +714,19 @@ msgstr ""
 "\n"
 " llwybr"
 
-#: ../urpmi.addmedia_.c:100 ../urpmi.addmedia_.c:117
+#: ../urpmi.addmedia_.c:100 ../urpmi.addmedia_.c:117 placeholder.h:134
 #, fuzzy, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "Methu rhedeg porwr"
 
-#: ../urpmi.addmedia_.c:106
+#: ../urpmi.addmedia_.c:106 placeholder.h:148
 #, fuzzy, c-format
 msgid ""
 "%s\n"
 "<relative path of hdlist> missing\n"
 msgstr "llwybr perthynol i synthesis neu hdlist:"
 
-#: ../urpmi.addmedia_.c:108
+#: ../urpmi.addmedia_.c:108 placeholder.h:129
 #, fuzzy, c-format
 msgid ""
 "%s\n"
@@ -736,7 +735,7 @@ msgstr ""
 "\n"
 " ftp"
 
-#: ../urpmi.addmedia_.c:116
+#: ../urpmi.addmedia_.c:116 placeholder.h:133
 #, fuzzy, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "Methu creu'r enw ssh"
@@ -762,11 +761,11 @@ msgid ""
 "unknown options '%s'\n"
 msgstr "Dewisiadau modiwl:"
 
-#: ../urpmi.removemedia_.c:47
+#: ../urpmi.removemedia_.c:47 placeholder.h:166
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.removemedia_.c:49
+#: ../urpmi.removemedia_.c:49 placeholder.h:167
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -792,11 +791,11 @@ msgid ""
 "  -d             - force complete computation of depslist.ordered file.\n"
 msgstr "grym"
 
-#: ../urpmi.update_.c:78
+#: ../urpmi.update_.c:78 placeholder.h:161
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.update_.c:80
+#: ../urpmi.update_.c:80 placeholder.h:162
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -975,7 +974,7 @@ msgid "Only superuser is allowed to install packages"
 msgstr ""
 
 #: ../urpmi_.c:236 ../urpmi_.c:517 ../urpmi_.c:527 ../urpmi_.c:535
-#: ../urpmi_.c:549 ../urpmi_.c:557
+#: ../urpmi_.c:549 ../urpmi_.c:557 placeholder.h:91
 #, fuzzy
 msgid "Installation failed"
 msgstr "methodd y gosodiad"
@@ -985,17 +984,17 @@ msgstr "methodd y gosodiad"
 msgid "One of the following packages is needed to install %s:"
 msgstr "Un:"
 
-#: ../urpmi_.c:330
+#: ../urpmi_.c:330 placeholder.h:102
 #, fuzzy
 msgid "One of the following packages is needed:"
 msgstr "Un:"
 
-#: ../urpmi_.c:338
+#: ../urpmi_.c:338 placeholder.h:100
 #, fuzzy, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Pa fath o gysylltiad IDSN?"
 
-#: ../urpmi_.c:341
+#: ../urpmi_.c:341 placeholder.h:94
 #, fuzzy
 msgid "Sorry, bad choice, try again\n"
 msgstr "Ymddiheuriad"
@@ -1016,7 +1015,7 @@ msgid ""
 "do you agree ?"
 msgstr ""
 
-#: ../urpmi_.c:415 ../urpmi_.c:424
+#: ../urpmi_.c:415 ../urpmi_.c:424 placeholder.h:98
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed (%"
@@ -1030,11 +1029,11 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../urpmi_.c:442 ../urpmq_.c:218
+#: ../urpmi_.c:442 ../urpmq_.c:218 placeholder.h:179
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../urpmi_.c:453
+#: ../urpmi_.c:453 placeholder.h:124
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "dyfais"
@@ -1064,11 +1063,11 @@ msgstr ""
 msgid "distributing %s\n"
 msgstr "gosod %s\n"
 
-#: ../urpmi_.c:542
+#: ../urpmi_.c:542 placeholder.h:101
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr ""
 
-#: ../urpmi_.c:551
+#: ../urpmi_.c:551 placeholder.h:125
 #, fuzzy
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "grym "
@@ -1078,7 +1077,7 @@ msgstr "grym "
 msgid "Installation is possible"
 msgstr "methodd y gosodiad"
 
-#: ../urpmi_.c:566
+#: ../urpmi_.c:566 placeholder.h:97
 #, fuzzy
 msgid "everything already installed"
 msgstr "Pecynnau wedi eu gosod eisoes"
@@ -1163,128 +1162,471 @@ msgstr ""
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr ""
 
-#: ../urpmq_.c:130
+#: ../urpmq_.c:130 placeholder.h:180
 #, fuzzy, c-format
 msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
 msgstr "anhysbus"
 
-#: ../urpmq_.c:133
+#: ../urpmq_.c:133 placeholder.h:178
 #, fuzzy, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "methu agor y ffeil i ddarllen: %s"
 
+#: placeholder.h:6
+#, fuzzy
+msgid "usage: rpmf [<file>]"
+msgstr "defnydd: urpmf [dewisiadau] <ffeil>"
+
+#: placeholder.h:7
+msgid "urpmi is not installed"
+msgstr ""
+
+#: placeholder.h:8
+#, fuzzy
+msgid "mismatch version for registering rpm file"
+msgstr "Methu canfod ffeil menudrake .glade"
+
+#: placeholder.h:9
+msgid "maybe the package has only been updated for another incompatible arch?"
+msgstr ""
+
+#: placeholder.h:11
+#, fuzzy, c-format
+msgid "unable to use name \"%s\" for unamed medium because it is already used"
+msgstr "enw"
+
+#: placeholder.h:14
+#, c-format
+msgid "removing %s to upgrade ..."
+msgstr ""
+
+#: placeholder.h:17
+#, fuzzy, c-format
+msgid "read provides file [%s]"
+msgstr "Y ffeil yn methu darllen ffeil\n"
+
 #: placeholder.h:18
 #, fuzzy, c-format
-msgid "urpmf version %s"
-msgstr "Fersiwn y Cnewyllyn:"
+msgid "trying to remove inexistant medium \"%s\""
+msgstr "Tynnu LPRng..."
 
 #: placeholder.h:19
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Hawlfraint (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#, fuzzy, c-format
+msgid "unable to copy source of [%s] from [%s]"
+msgstr "Methu canfod ffeil menudrake .glade"
 
 #: placeholder.h:20
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
+#, fuzzy, c-format
+msgid "unable to write compss file [%s]"
+msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
+
+#: placeholder.h:25
+#, fuzzy, c-format
+msgid "unable to build synthesis file for medium \"%s\""
+msgstr "Y ffeil yn methu darllen ffeil\n"
+
+#: placeholder.h:27
+#, c-format
+msgid " to %s since it will not be updated otherwise"
 msgstr ""
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU."
 
-#: placeholder.h:21 placeholder.h:38
-msgid "usage: urpmf [options] <file>"
-msgstr "defnydd: urpmf [dewisiadau] <ffeil>"
+#: placeholder.h:28
+#, fuzzy, c-format
+msgid "unable to read provides file [%s]"
+msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
 
-#: placeholder.h:22
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
+#: placeholder.h:29
+#, c-format
+msgid "avoid selecting %s as its locales language is not already selected"
 msgstr ""
-"  --quiet         - peidiwch argraffu enw tag (rhagosodedig os nad oes tag "
-"yn cael ei roi ar "
 
-#: placeholder.h:23
-msgid "                    line, incompatible with interactive mode)."
+#: placeholder.h:30
+msgid "computing dependancy"
 msgstr ""
-"                    linell orchymyn , imae'n anghytûn a'r modd "
-"rhyngweithiol)."
 
-#: placeholder.h:24
-#, fuzzy
-msgid "  --all           - print all tags."
-msgstr "Argraffu tudalennau prawf"
+#: placeholder.h:31
+#, fuzzy, c-format
+msgid ", mismatch version %s"
+msgstr "Fersiwn y Cnewyllyn:"
 
-#: placeholder.h:25
-msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
+#: placeholder.h:35
+#, fuzzy, c-format
+msgid "retrieving [%s]"
+msgstr "methodd y gosodiad"
+
+#: placeholder.h:36
+#, c-format
+msgid ", mismatch release %s"
 msgstr ""
-"  --name          - argraffu enw'r tag: enw ffeil rpm (dyfaliad os nad oed "
-"tag yn cael ei gynnig"
 
-#: placeholder.h:26
-msgid "                    command line but without package name)."
-msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
+#: placeholder.h:37
+#, fuzzy, c-format
+msgid "wget of [%s] failed"
+msgstr "methodd y gosodiad"
+
+#: placeholder.h:39
+#, fuzzy, c-format
+msgid "unable to parse correctly %s"
+msgstr "Methu rhedeg porwr"
 
-#: placeholder.h:27
+#: placeholder.h:40
+#, fuzzy, c-format
+msgid "unable to read compss file [%s]"
+msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
+
+#: placeholder.h:43
+#, c-format
+msgid "internal error for selecting unknown package for id=%s"
+msgstr ""
+
+#: placeholder.h:44
+#, fuzzy, c-format
+msgid "write provides file [%s]"
+msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
+
+#: placeholder.h:47
+#, c-format
+msgid "medium \"%s\" try to use an already used list, medium ignored"
+msgstr ""
+
+#: placeholder.h:48
+#, fuzzy, c-format
+msgid "reading hdlist file [%s]"
+msgstr "adeiladu math 1inst"
+
+#: placeholder.h:49
+#, fuzzy, c-format
+msgid "write compss file [%s]"
+msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
+
+#: placeholder.h:50
+#, fuzzy, c-format
+msgid "read depslist file [%s]"
+msgstr "Y ffeil yn methu darllen ffeil\n"
+
+#: placeholder.h:51
+#, fuzzy, c-format
+msgid "trying to select inexistant medium \"%s\""
+msgstr "Methu creu'r enw ssh"
+
+#: placeholder.h:53
+#, c-format
+msgid "medium \"%s\" try to use an already used hdlist, medium ignored"
+msgstr ""
+
+#: placeholder.h:54
+#, fuzzy, c-format
+msgid "unable to write provides file [%s]"
+msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
+
+#: placeholder.h:56
+msgid "keeping only provides files"
+msgstr ""
+
+#: placeholder.h:57
+msgid "unable to find all synthesis file, using parsehdlist server"
+msgstr ""
+
+#: placeholder.h:61
+#, fuzzy, c-format
+msgid "unable to read depslist file [%s]"
+msgstr "Methu canfod ffeil menudrake .glade"
+
+#: placeholder.h:62
 #, fuzzy
-msgid "  --group         - print tag group: group."
-msgstr "Argraffu tudalennau prawf"
+msgid "removable medium not selected"
+msgstr "Nid yw pecyn %s wedi ei lofnodi"
 
-#: placeholder.h:28
+#: placeholder.h:63
+#, fuzzy, c-format
+msgid "read compss file [%s]"
+msgstr "Y ffeil yn methu darllen ffeil\n"
+
+#: placeholder.h:64
+#, c-format
+msgid ", incompatible arch %s"
+msgstr ""
+
+#: placeholder.h:69
+#, fuzzy, c-format
+msgid "unable to build hdlist: %s"
+msgstr "Methu rhedeg porwr"
+
+#: placeholder.h:73
+#, fuzzy, c-format
+msgid "write depslist file [%s]"
+msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
+
+#: placeholder.h:74
+#, fuzzy, c-format
+msgid "unknown data associated with %s"
+msgstr "anhysbus"
+
+#: placeholder.h:75
+#, c-format
+msgid "source of [%s] not found as [%s]"
+msgstr ""
+
+#: placeholder.h:76
+#, c-format
+msgid " to %s since it will not upgrade correctly!"
+msgstr ""
+
+#: placeholder.h:77
+#, fuzzy, c-format
+msgid "package %s is not found%s."
+msgstr "Nid yw pecyn %s wedi ei lofnodi"
+
+#: placeholder.h:79
+#, c-format
+msgid "avoid selecting %s as not enough files will be updated"
+msgstr ""
+
+#: placeholder.h:80
+#, c-format
+msgid "wget of [%s] failed (maybe wget is missing?)"
+msgstr ""
+
+#: placeholder.h:82
+#, fuzzy, c-format
+msgid "unable to write depslist file [%s]"
+msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
+
+#: placeholder.h:84
 #, fuzzy
-msgid "  --size          - print tag size: size."
-msgstr "Argraffu tudalennau prawf"
+msgid "mismatch release for registering rpm file"
+msgstr "Methu canfod ffeil menudrake .glade"
 
-#: placeholder.h:29
+#: placeholder.h:87
+#, fuzzy, c-format
+msgid "selecting %s using obsoletes"
+msgstr "Rhyngwyneb %s (gan ddefnyddio modiwl %s)"
+
+#: placeholder.h:88
+#, fuzzy, c-format
+msgid "selecting %s by selection on files"
+msgstr "Rhyngwyneb %s (gan ddefnyddio modiwl %s)"
+
+#: placeholder.h:90
+msgid "rpmtools package is too old, please upgrade it"
+msgstr ""
+
+#: placeholder.h:92
 #, fuzzy
-msgid "  --serial        - print tag serial: serial."
-msgstr "Argraffu tudalennau prawf"
+msgid "Press enter when it's done..."
+msgstr "gorffen."
 
-#: placeholder.h:30
+#: placeholder.h:103
 #, fuzzy
-msgid "  --summary       - print tag summary: summary."
-msgstr "Argraffu tudalennau prawf"
+msgid "Only superuser is allowed to install local packages"
+msgstr "methu ysgrifenn'r ddewislen i'r ffeil"
 
-#: placeholder.h:31
+#: placeholder.h:104
+#, c-format
+msgid ""
+"urpmi version %s\n"
+"Copyright (C) 1999, 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  --help           - print this help message.\n"
+"  --auto           - automatically select a good package in choices.\n"
+"  --auto-select    - automatically select packages for upgrading the "
+"system.\n"
+"  --force          - force invocation even if some package do not exist.\n"
+"  --X              - use X interface.\n"
+"  --best-output    - choose best interface according to the environment:\n"
+"                     X or text mode.\n"
+"  -a               - select all matches on command line.\n"
+"  -m               - choose minimum closure of requires (default).\n"
+"  -M               - choose maximun closure of requires.\n"
+"  -c               - choose complete method for resolving requires closure.\n"
+"  -q               - quiet mode.\n"
+"  -v               - verbose mode.\n"
+"  names or rpm files (only for root) given on command line are installed.\n"
+msgstr ""
+
+#: placeholder.h:126
+msgid "Is it ok?"
+msgstr "Mae'r model yn gywir"
+
+#: placeholder.h:135
 #, fuzzy
-msgid "  --description   - print tag description: description."
-msgstr "Argraffu tudalennau prawf"
+msgid ""
+"usage: urpmi.addmedia <name> <url>\n"
+"where <url> is one of\n"
+"       file://<path>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable_<device>://<path>\n"
+msgstr ""
+"<name><url> llwybr\n"
+"<url>\n"
+"<path>\n"
+" ftp<login><password><host><path>\n"
+" ftp<host><path>\n"
+" http<host><path>\n"
+"<path>\n"
 
-#: placeholder.h:32
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
+#: placeholder.h:144
+#, c-format
+msgid ""
+"%s\n"
+"device `%s' do not exist\n"
 msgstr ""
-"  --provides      - tag argraffu'n darparu: pob darpariaeth (llinellau "
-"lluosog)."
 
-#: placeholder.h:33
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
+#: placeholder.h:152
+#, c-format
+msgid ""
+"usage: urpmi.update [-a] <name> ...\n"
+"where <name> is a medium name to update.\n"
+"   -a    select all non-removable media.\n"
+"   -c    clean headers cache directory.\n"
+"   -f    force generation of hdlist or base files.\n"
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"  --requires      - tag argraffu'n darparu: all requires (multiple lines)."
 
-#: placeholder.h:34
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr "  --files         - print tag files: all files (multiple lines)."
+#: placeholder.h:171
+#, fuzzy, c-format
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+"   -a    select all media.\n"
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"<name>\n"
+"<name> enw"
 
-#: placeholder.h:35
+#: placeholder.h:181
 msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+"some package have to be removed for being upgraded, this is not supported "
+"yet\n"
 msgstr ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
 
-#: placeholder.h:36
+#: placeholder.h:182
+#, c-format
 msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+"urpmq version %s\n"
+"Copyright (C) 2000, 2001 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"usage:\n"
+"  -h             - print this help message.\n"
+"  -v             - verbose mode.\n"
+"  -d             - extend query to package dependancies.\n"
+"  -u             - remove package if a better version is already installed.\n"
+"  -m             - extend query to package dependancies, remove already\n"
+"                   installed package that provide what is necessary, add\n"
+"                   packages that may be block the upgrade.\n"
+"  -M             - extend query to package dependancies and remove already\n"
+"                   installed package only if they are newer or the same.\n"
+"  -c             - choose complete method for resolving requires closure.\n"
+"  -g             - print groups too with name.\n"
+"  -r             - print version and release too with name.\n"
+"  --auto-select  - automatically select packages for upgrading the system.\n"
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+"  --sources      - give all source packages before downloading (root only).\n"
+"  --force        - force invocation even if some package do not exist.\n"
+"  names or rpm files given on command line are queried.\n"
 msgstr ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
 
-#: placeholder.h:37
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
-msgstr "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#, fuzzy
+#~ msgid "urpmf version %s"
+#~ msgstr "Fersiwn y Cnewyllyn:"
 
-#: placeholder.h:39
-msgid "try urpmf --help for more options"
-msgstr "try urpmf --help for more options"
+#~ msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+#~ msgstr "Hawlfraint (C) 1999, 2000, 2001, 2002 MandrakeSoft."
 
-#: placeholder.h:40
-msgid "no full media list was found"
-msgstr "ni chanfyddwyd restr cyfrwng llawn"
+#~ msgid ""
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL."
+#~ msgstr ""
+#~ "Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU."
+
+#~ msgid ""
+#~ "  --quiet         - do not print tag name (default if no tag given on "
+#~ "command"
+#~ msgstr ""
+#~ "  --quiet         - peidiwch argraffu enw tag (rhagosodedig os nad oes "
+#~ "tag yn cael ei roi ar "
+
+#~ msgid "                    line, incompatible with interactive mode)."
+#~ msgstr ""
+#~ "                    linell orchymyn , imae'n anghytûn a'r modd "
+#~ "rhyngweithiol)."
+
+#, fuzzy
+#~ msgid "  --all           - print all tags."
+#~ msgstr "Argraffu tudalennau prawf"
+
+#~ msgid ""
+#~ "  --name          - print tag name: rpm filename (assumed if no tag given "
+#~ "on"
+#~ msgstr ""
+#~ "  --name          - argraffu enw'r tag: enw ffeil rpm (dyfaliad os nad "
+#~ "oed tag yn cael ei gynnig"
+
+#~ msgid "                    command line but without package name)."
+#~ msgstr "                    llinell orchymyn ond heb enw'r pecyn)."
+
+#, fuzzy
+#~ msgid "  --group         - print tag group: group."
+#~ msgstr "Argraffu tudalennau prawf"
+
+#, fuzzy
+#~ msgid "  --size          - print tag size: size."
+#~ msgstr "Argraffu tudalennau prawf"
+
+#, fuzzy
+#~ msgid "  --serial        - print tag serial: serial."
+#~ msgstr "Argraffu tudalennau prawf"
+
+#, fuzzy
+#~ msgid "  --summary       - print tag summary: summary."
+#~ msgstr "Argraffu tudalennau prawf"
+
+#, fuzzy
+#~ msgid "  --description   - print tag description: description."
+#~ msgstr "Argraffu tudalennau prawf"
+
+#~ msgid ""
+#~ "  --provides      - print tag provides: all provides (multiple lines)."
+#~ msgstr ""
+#~ "  --provides      - tag argraffu'n darparu: pob darpariaeth (llinellau "
+#~ "lluosog)."
+
+#~ msgid ""
+#~ "  --requires      - print tag requires: all requires (multiple lines)."
+#~ msgstr ""
+#~ "  --requires      - tag argraffu'n darparu: all requires (multiple lines)."
+
+#~ msgid "  --files         - print tag files: all files (multiple lines)."
+#~ msgstr "  --files         - print tag files: all files (multiple lines)."
+
+#~ msgid ""
+#~ "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+#~ msgstr ""
+#~ "  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+
+#~ msgid ""
+#~ "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+#~ msgstr ""
+#~ "  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+
+#~ msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+#~ msgstr ""
+#~ "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+
+#~ msgid "try urpmf --help for more options"
+#~ msgstr "try urpmf --help for more options"
+
+#~ msgid "no full media list was found"
+#~ msgstr "ni chanfyddwyd restr cyfrwng llawn"
 
 #, fuzzy
 #~ msgid "unknown package(s) "
@@ -1305,10 +1647,6 @@ msgstr "ni chanfyddwyd restr cyfrwng llawn"
 #~ "system.\n"
 
 #, fuzzy
-#~ msgid "Press Enter when it's done..."
-#~ msgstr "gorffen."
-
-#, fuzzy
 #~ msgid "  -g             - print groups too with name.\n"
 #~ msgstr "enw"
 
@@ -1317,18 +1655,6 @@ msgstr "ni chanfyddwyd restr cyfrwng llawn"
 #~ msgstr "enw"
 
 #, fuzzy
-#~ msgid "unable to parse correctly [%s]"
-#~ msgstr "Methu rhedeg porwr"
-
-#, fuzzy
-#~ msgid "read synthesis file [%s]"
-#~ msgstr "Y ffeil yn methu darllen ffeil\n"
-
-#, fuzzy
-#~ msgid "unknown data associated with %s"
-#~ msgstr "anhysbus"
-
-#, fuzzy
 #~ msgid "<non printable chars>"
 #~ msgstr "Heb eu gosod yn unig"
 
@@ -1337,22 +1663,10 @@ msgstr "ni chanfyddwyd restr cyfrwng llawn"
 #~ msgstr "Gwasanaethwr"
 
 #, fuzzy
-#~ msgid "unable to build hdlist: %s"
-#~ msgstr "Methu rhedeg porwr"
-
-#, fuzzy
 #~ msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
 #~ msgstr "Hawlfraint (H) 1999, 2000, 2001, 2002 MandrakeSoft."
 
 #, fuzzy
-#~ msgid "selecting %s using obsoletes"
-#~ msgstr "Rhyngwyneb %s (gan ddefnyddio modiwl %s)"
-
-#, fuzzy
-#~ msgid "urpmi version %s"
-#~ msgstr "Fersiwn y Cnewyllyn:"
-
-#, fuzzy
 #~ msgid "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]"
 #~ msgstr "<name><url> llwybr"