usync with code

68 files changed, 33133 insertions, 32034 deletions

diff --git a/po/af.po b/po/af.po
index f9613254..897219c6 100644
--- a/po/af.po
+++ b/po/af.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: Fri May 19 2000 13:02:12+0200\n"
 "Last-Translator: Schalk W. Cronjé <schalkc@ntaba.co.za>\n"
 "Language-Team: Afrikaans <mandrake@af.org.za>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Generator: KTranslator v 0.6.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Stelsel-installasie"
@@ -29,7 +29,7 @@ msgstr "Stelsel-installasie"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -77,7 +77,7 @@ msgstr "_Installeer"
 msgid "_Save"
 msgstr "_Stoor"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "Kanselleer"
@@ -109,8 +109,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
@@ -141,7 +142,7 @@ msgid ""
 "                   (--no-verify-rpm disables it, default is enabled).\n"
 msgstr ""
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -189,7 +190,7 @@ msgstr "Asseblief wag..."
 msgid "Must be root"
 msgstr "Muispoort"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -197,42 +198,42 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Sommige pakkette kan nie geïnstalleer word nie"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Waarskuwing"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "Opgradeer"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Verlaat installasie"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Slegs een van die volgende pakkette word benodig:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "Staak"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -243,7 +244,7 @@ msgstr ""
 "%s\n"
 "Kan ons voort gaan?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
@@ -252,7 +253,7 @@ msgstr ""
 "geïnstalleer word:\n"
 "\n"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -261,49 +262,49 @@ msgstr ""
 "geïnstalleer word:\n"
 "\n"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pakket, %d MB)"
 msgstr[1] "(%d pakkette, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Installasievoorbereiding..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, fuzzy, c-format
 msgid "unable to get source packages, aborting"
 msgstr "Kan nie die bronpakette bekom nie."
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, fuzzy, c-format
 msgid "Preparing..."
 msgstr "Herlaaistelsel word voorberei..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installeer tans pakket %s (%s/%s)...."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Plaas asseblief die media bekend as \"%s\" in aandrywer [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "Laai tans pakket '%s' (%s/%s) af ..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Klaar"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -314,28 +315,28 @@ msgstr ""
 "%s\n"
 "Probeer u media se databasis opdateer."
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Installasie het misluk"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Alles is alreeds installeer"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Geïnstalleer"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "verwyder %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, fuzzy, c-format
 msgid "restarting urpmi"
 msgstr "Begin slurpd: "
@@ -415,8 +416,8 @@ msgid "...retrieving done"
 msgstr ""
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, fuzzy, c-format
 msgid "...retrieving failed: %s"
 msgstr "FAT-grootteverandering het gefaal: %s"
@@ -456,52 +457,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, fuzzy, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "kan nie kieslyslêer:%s lees nie"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Ontbrekende velde"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -924,217 +925,217 @@ msgid ""
 "update, --use-distrib or --parallel"
 msgstr ""
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, fuzzy, c-format
 msgid "Search start: %s end: %s"
 msgstr "Opsoek na geïnstalleerde lettertipes"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, fuzzy, c-format
 msgid "skipping package %s"
 msgstr "Installeer pakket %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "Probleme met Installasue van pakket %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, fuzzy, c-format
 msgid "medium \"%s\" already exists"
 msgstr "Rekening bestaan reeds\n"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "%s from media %s"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "Redigeer media \"%s\":"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "Kan nie lêer %s oopmaak nie\n"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "Probleme met skep van media."
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "Maak /etc/hosts ...\n"
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "Kopieer die lêer vir media '%s'..."
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, fuzzy, c-format
 msgid "selecting multiple media: %s"
 msgstr "%s word installeer\n"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, fuzzy, c-format
 msgid "removing medium \"%s\""
 msgstr "Redigeer media \"%s\":"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, fuzzy, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "Konfigureer drukker \"%s\" ..."
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, fuzzy, c-format
 msgid "...reconfiguration failed"
 msgstr "Konfigurasie-lêer"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, fuzzy, c-format
 msgid "reconfiguration done"
 msgstr "Bedienerkonfigurasie"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr ""
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, fuzzy, c-format
 msgid "examining synthesis file [%s]"
 msgstr "Kan nie lêer: %s skep nie"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, fuzzy, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "%s from media %s"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "Kopieer die lêer vir media '%s'..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, fuzzy, c-format
 msgid "...copying failed"
 msgstr "Aanteken gevaal"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, fuzzy, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "in beskrywings"
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, fuzzy, c-format
 msgid "...copying done"
 msgstr "Aanteken gevaal"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, fuzzy, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "Installasie het misluk"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr ""
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "Installasie het misluk"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "Kan nie lêer: %s skep nie"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "%s word installeer\n"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "Kopieer die lêer vir media '%s'..."
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "in beskrywings"
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "in lêername"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "Ondersoek die afgeleë medialêer '%s'..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr ""
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "Kopieer die lêer vir media '%s'..."
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "Ondersoek medialêer '%s'....."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "Kan nie lêer %s oopmaak nie\n"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "Voeg media by"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1166,7 +1167,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "JjYy"
@@ -1236,7 +1237,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1319,6 +1320,301 @@ msgstr "Verwyder %s"
 msgid "unmounting %s"
 msgstr "fout met onthegting van %s: %s"
 
+#: ../urpm/search.pm:29 ../urpmf:29
+#, fuzzy, 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 uitgawe %s\n"
+"Kopiereg (C) 2002-2006 Mandriva.\n"
+"Hierdie is vry sagteware en mag versprei word onder die terme van die GNU "
+"GPL.\n"
+"\n"
+"gebruik:\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+
+#: ../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 ""
+
+#: ../urpm/search.pm:39 ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../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 ""
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, fuzzy, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, fuzzy, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose       - woordryke modus.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpm/search.pm:52 ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, fuzzy, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, fuzzy, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, fuzzy, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Lys van data om te herstel:\n"
+"\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr ""
+"\n"
+"                      DrakBackup Verslag \n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr ""
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Konsole opstelling module"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr ""
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr ""
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr ""
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr ""
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr ""
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr ""
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr ""
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr ""
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, fuzzy, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -v             - woordryke modus.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr ""
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "Kopieer die lêer vir media '%s'..."
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "Kopieer die lêer vir media '%s'..."
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "Kopieer die lêer vir media '%s'..."
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1330,62 +1626,67 @@ msgid ""
 "urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, fuzzy, c-format
 msgid "No package named %s"
 msgstr "Teruglus lêernaam: %s"
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, fuzzy, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Die volgende pakkette geïnstalleer word:\n"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Alles is alreeds installeer"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "Alles is alreeds installeer"
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "Alles is alreeds installeer"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
 msgid "due to missing %s"
 msgstr "deur %s wat soek is"
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "Alles is alreeds installeer"
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "deur problematiese %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "probeer promosie van %s"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "om %s te kan behou"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr "om %s te kan behou"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, fuzzy, c-format
 msgid "due to conflicts with %s"
 msgstr "deur %s wat soek is"
@@ -1477,50 +1778,49 @@ msgstr "  --help         - druk hierdie help boodskap.\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../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 ""
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --help         - druk hierdie help boodskap.\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr ""
 
-#: ../urpme:56
+#: ../urpme:57
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, fuzzy, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpme:59
+#: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:72
+#: ../urpme:73
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpme:105
+#: ../urpme:106
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "Inligting rakende pakkette"
 
-#: ../urpme:105
+#: ../urpme:106
 #, fuzzy, c-format
 msgid "unknown package"
 msgstr "Onbekend"
 
-#: ../urpme:119
+#: ../urpme:121
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1531,17 +1831,17 @@ msgstr[1] ""
 "Jammer maat, nou wil jy jou Linux rekenaar vernietig:\n"
 "\n"
 
-#: ../urpme:124
+#: ../urpme:126
 #, fuzzy, c-format
 msgid "Nothing to remove"
 msgstr "Geen etiket om te verwyder nie!"
 
-#: ../urpme:141
+#: ../urpme:143
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Geen etiket om te verwyder nie!"
 
-#: ../urpme:147
+#: ../urpme:149
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1555,333 +1855,45 @@ msgstr[1] ""
 "geïnstalleer word:\n"
 "\n"
 
-#: ../urpme:152
+#: ../urpme:154
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "Onbekend"
 msgstr[1] "Onbekend"
 
-#: ../urpme:159
+#: ../urpme:161
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Verwyder pakkette..."
 msgstr[1] "Verwyder pakkette..."
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, fuzzy, c-format
 msgid " (y/N) "
 msgstr " (J/n) "
 
-#: ../urpme:164
+#: ../urpme:166
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "Verwyderbare media"
 
-#: ../urpme:178
+#: ../urpme:181
 #, fuzzy, c-format
 msgid "Removal failed"
 msgstr "Aanteken gevaal"
 
-#: ../urpme:180
+#: ../urpme:183
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Aanteken gevaal"
 
-#: ../urpmf:29
-#, fuzzy, 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 uitgawe %s\n"
-"Kopiereg (C) 2002-2006 Mandriva.\n"
-"Hierdie is vry sagteware en mag versprei word onder die terme van die GNU "
-"GPL.\n"
-"\n"
-"gebruik:\n"
-
-#: ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-
-#: ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-
-#: ../urpmf:45
-#, fuzzy, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, fuzzy, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose       - woordryke modus.\n"
-
-#: ../urpmf:48
-#, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr ""
-
-#: ../urpmf:54
-#, fuzzy, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpmf:55
-#, fuzzy, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpmf:56
-#, fuzzy, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Lys van data om te herstel:\n"
-"\n"
-
-#: ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr ""
-"\n"
-"                      DrakBackup Verslag \n"
-
-#: ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr ""
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "Konsole opstelling module"
-
-#: ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr ""
-
-#: ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr ""
-
-#: ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr ""
-
-#: ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr ""
-
-#: ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr ""
-
-#: ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr ""
-
-#: ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr ""
-
-#: ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr ""
-
-#: ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
-#: ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -v             - woordryke modus.\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, fuzzy, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -v             - woordryke modus.\n"
-
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
-
-#: ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "Kopieer die lêer vir media '%s'..."
-
-#: ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "Kopieer die lêer vir media '%s'..."
-
-#: ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "Kopieer die lêer vir media '%s'..."
-
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1964,11 +1976,6 @@ msgstr ""
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr ""
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2267,7 +2274,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Wil u in elk geval voortgaan?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
@@ -2452,11 +2459,13 @@ msgid "  --aria2        - use aria2 to retrieve distant files.\n"
 msgstr ""
 
 #: ../urpmi.addmedia:65
-#, fuzzy, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --help         - druk hierdie help boodskap.\n"
+#, c-format
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2464,128 +2473,128 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --help         - druk hierdie help boodskap.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, fuzzy, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - woordryke modus.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, fuzzy, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "Kan nie lêer: %s skep nie"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, fuzzy, c-format
 msgid "Can't create config file [%s]"
 msgstr "Kan nie lêer: %s skep nie"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "Jy moet stam wees om hierdie opdrag te gebruik !\n"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "Relatiewe pad na die synthesis/hdlist:"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "Probleme met skep van media."
@@ -2813,29 +2822,29 @@ msgstr "  -v             - woordryke modus.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr ""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Redigeer media \"%s\":"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "%s word installeer\n"
@@ -3094,6 +3103,10 @@ msgid "No changelog found\n"
 msgstr "Geen beeld gevind nie"
 
 #, fuzzy
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --help         - druk hierdie help boodskap.\n"
+
+#, fuzzy
 #~ msgid "%d installation transaction failed"
 #~ msgid_plural "%d installation transactions failed"
 #~ msgstr[0] "installasie instruksies"
diff --git a/po/ar.po b/po/ar.po
index 6eb12ffd..11c37203 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2005-09-05 17:40+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : "
 "3\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "تثبيت RPM"
@@ -32,7 +32,7 @@ msgstr "تثبيت RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_موافق"
@@ -98,7 +98,7 @@ msgstr "_تثبيت"
 msgid "_Save"
 msgstr "_حفظ"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "ال_غاء"
@@ -129,8 +129,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - تطبع رسالة المساعدة هذه.\n"
@@ -164,7 +165,7 @@ msgstr ""
 "                   (--no-verify-rpm يعطّل هذا الخيار، وهو ممكّن بشكل "
 "افتراضي.)\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - استخدم فقط الوسيط المحدّد، مفصولة بفواصل.\n"
@@ -214,7 +215,7 @@ msgstr "انتظر من فضلك..."
 msgid "Must be root"
 msgstr "يجب أن تكون جذراً"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -225,42 +226,42 @@ msgstr ""
 "%s\n"
 "استمرار على أي حال؟"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "تحذير"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "موافق"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (للترقية)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (للتثبيت)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "خيارات الحزم"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "أحد الحزم التالية يُحتاج اليه:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "إ_جهاض"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -271,19 +272,19 @@ msgstr ""
 "%s\n"
 "هل من الممكن المتابعة؟"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "لإرضاء المُعتمدات، سيتمّ تثبيت الحزمة التّالية (%d ميغابايت)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "لإرضاء المُعتمدات، سيتمّ تثبيت الحزمة التّالية (%d ميغابايت)"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -292,42 +293,42 @@ msgstr[1] "(%d حزم، %d م.ب.)"
 msgstr[2] "(%d حزم، %d م.ب.)"
 msgstr[3] "(%d حزم، %d م.ب.)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "تثبيت الحزم..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "لم يمكن الحصول على الحزمة المصدرية، جاري الإنهاء"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "جاري التحضير..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "جاري تثبيت الحزمة `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "يرجى ادخال الوسيط \"%s\" في الجهاز [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "جاري تنزيل الحزمة `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "ا_نتهى"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -338,28 +339,28 @@ msgstr ""
 "%s\n"
 "ربما تريد تحديث فاعدة بيانات urpmi الخاصة بك"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "فشل التثبيت"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "كل شئ مثبت مسبقا"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "انتهى التثبيت"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "جاري إزالة %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "إعادة تشغيل urpmi"
@@ -439,8 +440,8 @@ msgid "...retrieving done"
 msgstr "...تم الاسترجاع"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...فشل الإسترجاع: %s"
@@ -480,52 +481,52 @@ msgstr "هذه العملية محظورة أثناء العمل في الوضع
 msgid "bad proxy declaration on command line\n"
 msgstr "تعريف بروكسي خاطئ في سطر الأوامر\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: لم يمكن ايجاد ملف rpm \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "توقيع مفقود (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -950,217 +951,217 @@ msgstr ""
 "--synthesis لا يمكن استخدامه مع --media، --excludemedia، --sortmedia، --"
 "update، --use-distrib أو --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "البحث بدءً من: %s وإلى: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "جاري تخطي الحزمة %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "سيتم التثبيت بدلاً من ترقية الحزمة %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "الوسيط \"%s\" موجود مسبقا"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "جاري قراءة الترويسة من الوسيط \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "جاري ازالة الوسيط \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "تعذر فتح rpmdb"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "لم أستطع التّوصّل إلى وسيط التّثبيت الأوّل (ملفّ hdlists غير موجود)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "جاري استرجاع ملف hdlists..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "جاري محاولة اختيار الوسيط غير موجود \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "جاري اختيار الوسيط المتعدد: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "جاري ازالة الوسيط \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "تجري إعادة تهيئة urpmi للوسيط \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...فشلت إعادة التّهيئة"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "تمّت إعادة التّهيئة"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "الوسيط \"%s\" غير مختار"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "جاري اختبار ملف التخليق [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "مشكلة في قراءة ملف التخليق للوسيط \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "جاري كتابة ملف القوائم للوسيط \"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...فشل النسخ"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "جاري نسخ وصف الملف لـ\"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...تم النسخ"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "فشل نسخ [%s] (الملفّ صغير بشكل مثيل للشّكّ)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "جاري حساب md5sum لـhdlist المصدر المستحضر (أو التخليق)"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "فشل نسخ [%s] (md5sum غير متطابقة)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "جاري اختبار ملف hdlist [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "جاري تثبيت %s من %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "لم يمكن ايجاد ملف hdlist للوسيط \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "جاري نسخ وصف الملف لـ\"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "اسم ملف rpm غير موجود [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "جاري استرجاع hdlist (أو ملف تخليق) \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "تم ايجاد hdlist (أو ملف تخليق) كـ %s..."
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "لم يمكن ايجاد ملف hdlist للوسيط \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "جاري اختبار ملف pubkey لـ\"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...تم استيراد المفتاح %s من ملف pubkey \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "لم يمكن استيراد ملف pubkey الخاص بـ\"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "تمت اضافة الوسيط %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1192,7 +1193,7 @@ msgstr "لاNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "نyY"
@@ -1262,7 +1263,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1347,6 +1348,298 @@ msgstr "جاري تجهيز %s"
 msgid "unmounting %s"
 msgstr "جاري ازالة تجهيز %s"
 
+#: ../urpm/search.pm:29 ../urpmf:29
+#, fuzzy, 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 إصدارة %s\n"
+"حقوق النّسخ 2002-2006 ماندريبا.\n"
+"هذا برنامج حرّ و يمكن إعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
+"\n"
+"الاستعمال:\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - إعرض معلومات الإصدار ثم اخرج\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          - استخدم بيئة محدّدة (عادة تقرير خطا).\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 - لا تستخدم الوسيط المحدّد، مفصولة بفواصل.\n"
+
+#: ../urpm/search.pm:39 ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - استخدم جذر آخر لتثبيت حزم 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    - افرز الوسيط بناءً على النصّ الفرعي مفصول بفواصل.\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --synthesis    - استخدم التخليق التالي بدلاً من قاعدة بيانات urpmi.\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    - استخدم التخليق التالي بدلاً من قاعدة بيانات urpmi.\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - لا تطبع الأسماء المتشابهة.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - استخدم وسيط التحديث فقط.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - وضع التفصيل.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - تجاهل حالة الأحرف على كلّ الهيئات.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - تجاهل حالة الأحرف على كلّ الهيئات.\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpm/search.pm:52 ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - اشمل نصّ perl بشكل مباشر كـ perl -e.\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - معامل AND الثّنائي،.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - معامل OR الثّنائي،.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - NOT أحاديّة.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  (              - قوس لجهة اليمين لفتح تعبير مجموعة.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"قائمة البيانات التي سيتم استرجاعها:\n"
+"\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - استخدم واجهة X.\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    الافتراضات هي %s.\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - اطبع الصّفة عنوان url: عنوان url.\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - اطبع الصّفة جهاز التجميع : جهاز التجميع.\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "اعدادات سطر الأوامر"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - اطبع الصّفة يعارض : كل التعارضات.\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - اطبع وصف الصّفة : الوصف.\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - اطبع الصّفة epoch: epoch.\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --name         - إطبع أسماء الحزم فقط.\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - اسرد الملفّات في الحزمة.\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group         - اطبع علامة المجموعة : المجموعة\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name         - إطبع أسماء الحزم فقط.\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - إطبع أسماء الحزم فقط.\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - اطبع الصّفة الملغيّات : كل الملغيّات.\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - اطبع الصّفة المُغلّف : المغلّف.\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - اطبع الصّفة يُوفّر : كل ما يُوفّره.\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - اطبع الصّفة يتطلّب : كل ما يتطلّب.\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size          - اطبع حجم الصّفة : الصّفة.\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - اطبع الصّفة sourcerpm: الحزمة المصدريّة.\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes    - اطبع الصّفة الملغيّات : كل الملغيّات.\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary, -S  - عرض التلخيص.\n"
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - اطبع الصّفة عنوان url: عنوان url.\n"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - وضع التفصيل.\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - اسرد الملفّات في الحزمة.\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - اطبع النّسخة، الإصدار وarch مع الاسم.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "جاري استخدام بيئة محددة على %s\n"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "لم يمكن ايجاد ملف hdlist للوسيط \"%s\""
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "تم بناء ملف تخليق hdlist للوسيط \"%s\""
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "جاري كتابة ملف القوائم للوسيط \"%s\""
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1358,62 +1651,67 @@ msgid ""
 "urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, c-format
 msgid "No package named %s"
 msgstr "لا توجد حزمة بالإسم %s"
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "الحزم التالية تحتوي على %s: %s"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "كل شئ مثبت مسبقا"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "كل شئ مثبت مسبقا"
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "كل شئ مثبت مسبقا"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
 msgid "due to missing %s"
 msgstr "بسبب فقدان %s"
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "كل شئ مثبت مسبقا"
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "بسبب عدم ارضاء %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "جاري محاولة ترقية %s"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "كي يتم الحفاظ على %s"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, c-format
 msgid "in order to install %s"
 msgstr "كي يتم تثبيث %s"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "بسبب التعارض مع %s"
@@ -1504,18 +1802,17 @@ msgstr "  --packager     - اطبع الصّفة المُغلّف : المغلّ
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - استخدام جذر آخر لإزالة rpm.\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - استخدم جذر آخر لتثبيت حزم rpm.\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - حدّث فقط وسائط التّحديث.\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --description  - اطبع وصف الصّفة : الوصف.\n"
 
-#: ../urpme:56
+#: ../urpme:57
 #, fuzzy, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1524,32 +1821,32 @@ msgstr ""
 "  --use-distrib  - هيّئ urpmi بشكل سريع من شجرة توزيع، مفيد\n"
 "                   لتثبيت/إزالة chroot باستخدام خيار --root.\n"
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - وضع التفصيل.\n"
 
-#: ../urpme:59
+#: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - اختر كل الحزم المتفقة مع المعامل.\n"
 
-#: ../urpme:72
+#: ../urpme:73
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "يسمح للمستخدم الجذر فقط بحذف الحزم"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown packages"
 msgstr "حزم غير معروفة"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown package"
 msgstr "حزمة غير معروفة"
 
-#: ../urpme:119
+#: ../urpme:121
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1558,17 +1855,17 @@ msgstr[1] "إزالة الحزمة %s ستتسبب في تعطيل نظامك"
 msgstr[2] "إزالة الحزمة %s ستتسبب في تعطيل نظامك"
 msgstr[3] "إزالة الحزمة %s ستتسبب في تعطيل نظامك"
 
-#: ../urpme:124
+#: ../urpme:126
 #, c-format
 msgid "Nothing to remove"
 msgstr "لا شئ للإزالة"
 
-#: ../urpme:141
+#: ../urpme:143
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "لا شئ للإزالة"
 
-#: ../urpme:147
+#: ../urpme:149
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1578,7 +1875,7 @@ msgstr[1] "لإرضاء المُعتمدات، ستتم ازالة %d حزمة"
 msgstr[2] "لإرضاء المُعتمدات، ستتم ازالة %d حزمة"
 msgstr[3] "لإرضاء المُعتمدات، ستتم ازالة %d حزمة"
 
-#: ../urpme:152
+#: ../urpme:154
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1587,7 +1884,7 @@ msgstr[1] "حزمة غير معروفة"
 msgstr[2] "حزمة غير معروفة"
 msgstr[3] "حزمة غير معروفة"
 
-#: ../urpme:159
+#: ../urpme:161
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1596,316 +1893,31 @@ msgstr[1] "جاري حذف الحزمة %s"
 msgstr[2] "جاري حذف الحزمة %s"
 msgstr[3] "جاري حذف الحزمة %s"
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (ن/ل)"
 
-#: ../urpme:164
+#: ../urpme:166
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "جاري أخذ الأجهزة القابلة للإزالة كـ\"%s\""
 
-#: ../urpme:178
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "فشلت عملية الإزالة"
 
-#: ../urpme:180
+#: ../urpme:183
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "فشلت عملية الإزالة"
 
-#: ../urpmf:29
-#, fuzzy, 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 إصدارة %s\n"
-"حقوق النّسخ 2002-2006 ماندريبا.\n"
-"هذا برنامج حرّ و يمكن إعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
-"\n"
-"الاستعمال:\n"
-
-#: ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - إعرض معلومات الإصدار ثم اخرج\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - استخدم بيئة محدّدة (عادة تقرير خطا).\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - لا تستخدم الوسيط المحدّد، مفصولة بفواصل.\n"
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - افرز الوسيط بناءً على النصّ الفرعي مفصول بفواصل.\n"
-
-#: ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --synthesis    - استخدم التخليق التالي بدلاً من قاعدة بيانات urpmi.\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - استخدم التخليق التالي بدلاً من قاعدة بيانات urpmi.\n"
-
-#: ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - لا تطبع الأسماء المتشابهة.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - استخدم وسيط التحديث فقط.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - وضع التفصيل.\n"
-
-#: ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - تجاهل حالة الأحرف على كلّ الهيئات.\n"
-
-#: ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - تجاهل حالة الأحرف على كلّ الهيئات.\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - اشمل نصّ perl بشكل مباشر كـ perl -e.\n"
-
-#: ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - معامل AND الثّنائي،.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - معامل OR الثّنائي،.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - NOT أحاديّة.\n"
-
-#: ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  (              - قوس لجهة اليمين لفتح تعبير مجموعة.\n"
-
-#: ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"قائمة البيانات التي سيتم استرجاعها:\n"
-"\n"
-
-#: ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - استخدم واجهة X.\n"
-
-#: ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                    الافتراضات هي %s.\n"
-
-#: ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - اطبع الصّفة عنوان url: عنوان url.\n"
-
-#: ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - اطبع الصّفة جهاز التجميع : جهاز التجميع.\n"
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "اعدادات سطر الأوامر"
-
-#: ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - اطبع الصّفة يعارض : كل التعارضات.\n"
-
-#: ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - اطبع وصف الصّفة : الوصف.\n"
-
-#: ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - اطبع الصّفة epoch: epoch.\n"
-
-#: ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --name         - إطبع أسماء الحزم فقط.\n"
-
-#: ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - اسرد الملفّات في الحزمة.\n"
-
-#: ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group         - اطبع علامة المجموعة : المجموعة\n"
-
-#: ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name         - إطبع أسماء الحزم فقط.\n"
-
-#: ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - إطبع أسماء الحزم فقط.\n"
-
-#: ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - اطبع الصّفة الملغيّات : كل الملغيّات.\n"
-
-#: ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - اطبع الصّفة المُغلّف : المغلّف.\n"
-
-#: ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - اطبع الصّفة يُوفّر : كل ما يُوفّره.\n"
-
-#: ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - اطبع الصّفة يتطلّب : كل ما يتطلّب.\n"
-
-#: ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size          - اطبع حجم الصّفة : الصّفة.\n"
-
-#: ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - اطبع الصّفة sourcerpm: الحزمة المصدريّة.\n"
-
-#: ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes    - اطبع الصّفة الملغيّات : كل الملغيّات.\n"
-
-#: ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary, -S  - عرض التلخيص.\n"
-
-#: ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - اطبع الصّفة عنوان url: عنوان url.\n"
-
-#: ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - وضع التفصيل.\n"
-
-#: ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - اسرد الملفّات في الحزمة.\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - اطبع النّسخة، الإصدار وarch مع الاسم.\n"
-
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "جاري استخدام بيئة محددة على %s\n"
-
-#: ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "لم يمكن ايجاد ملف hdlist للوسيط \"%s\""
-
-#: ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "تم بناء ملف تخليق hdlist للوسيط \"%s\""
-
-#: ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "جاري كتابة ملف القوائم للوسيط \"%s\""
-
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1992,11 +2004,6 @@ msgstr "  --clean        - أزل حزمة rpm من الذاكرة المخبّ�
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - عدم إخلاء حزم rpms من المخزن.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - حدّث فقط وسائط التّحديث.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2318,7 +2325,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "استمرار على أي حال؟"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (ن/ل)"
@@ -2505,10 +2512,12 @@ msgstr "  --curl         - استخدم curl لجلب الملفّات البع�
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - اعمل وسيط تحديث.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2516,24 +2525,24 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - حاول أو تجد وتستخدم ملفّ التخليق.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  --no-probe     - لا تحاول أن تعثر على أي ملفّ تخليق\n"
 "                   أو ملف hdlist.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2542,17 +2551,17 @@ msgstr ""
 "  --distrib      - أنشئ كلّ الوسطاء تلقائيّاً من\n"
 "                   وسيط التّثبيت\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - اسرد الوسائط المتوفّرة.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2561,91 +2570,91 @@ msgstr ""
 "  --from         - استخدم عنوان url المحدّد للائحة المرايا، والافتراضيّة هي\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "   --virtual      - أنشئ وسائط خيالية محدّثة بصفة دائمة،\n"
 "                   يسمح ببروتوكول file:// فقط.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - عطّل التحقّق من MD5SUM للملفّات.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - عدم استيراد pubkey للوسط المضاف\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - إضافة الوسط في التهيئة، ولكن دون تحديثه.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - وضع هادئ.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - وضع تفصيلي.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "يسمح للمستخدم الجذر فقط بإضافة الوسائط"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "سوف ينشئ ملف التهيئة [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "لا يمكن إنشاء ملف التهيئة [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "لا داعي لإعطاء <المسار النّسبي لـhdlist> مع --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<المسار المُرتبط لـhdlist> مفقود\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "لم يمكن الوصول الى الوسيط \"%s\""
@@ -2882,12 +2891,12 @@ msgstr "  -f             - أجبر توليد ملفات hdlist.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "يسمح للمستخدم الجذر فقط بتحديث الوسائط"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "لا شئ للتحديث (استخدم urpmi.addmedia لإضافة وسيط)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2896,17 +2905,17 @@ msgstr ""
 "المدخل المطلوب تحديثه غير موجود\n"
 "(واحد من %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "تجاهل الوسط %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "تمكين الوسط %s"
@@ -3179,6 +3188,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "لم يُعثر على سجلّ تغييرات\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - اعمل وسيط تحديث.\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "ادخال مشوه: [%s]"
diff --git a/po/az.po b/po/az.po
index 518a9a5a..92be0d82 100644
--- a/po/az.po
+++ b/po/az.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-az\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2004-09-12 20:33+0300\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Sistem qurulumu"
@@ -32,7 +32,7 @@ msgstr "Sistem qurulumu"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Oldu"
@@ -100,7 +100,7 @@ msgstr "_Qur"
 msgid "_Save"
 msgstr "_Qeyd Et"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Ləğv Et"
@@ -132,8 +132,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - bu kömək ismarışını çap edər.\n"
@@ -167,7 +168,7 @@ msgstr ""
 "                   (--no-verify-rpm bunu qeyri-fəallaşdırır, əsasən "
 "fəaldır).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -219,7 +220,7 @@ msgstr "Xahiş edirik gözləyin..."
 msgid "Must be root"
 msgstr "Siçan Qapısı"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -229,42 +230,42 @@ msgstr ""
 "Bəzi istənən paketlər qurula bilmir:\n"
 "%s"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Xəbərdarlıq"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Oldu"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "Yeniləmə"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Qurulumun sonu"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Aşağıdakı paketlərin bir dənəsinə ehtiyac var:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Ləğv Et"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -274,62 +275,62 @@ msgstr ""
 "Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
 "%s"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "Asılıqları ortadan qaldırmaq üçün, aşağıdakılar da qurulmalıdır (%d Mb)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Asılıqları ortadan qaldırmaq üçün, aşağıdakılar da qurulmalıdır (%d Mb)"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d paket, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Paket qurulumu..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "qaynaq paketi alına bilmir, çıxılır"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Hazırlanır..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' paketi qurulur (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Lütfən \"%s\" medyasını [%s] avadanlığına yerləşdirin"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "`%s' paketi endirilir..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "Qurtardı"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -340,28 +341,28 @@ msgstr ""
 "%s\n"
 "Sizə, urpmi databeyzinizi yeniləməyi məsləhət görürük."
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Qurulum iflas etdi"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "hər şey onsuzda quruludur"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Qurulum bitdi"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "%s silinir"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi yenidən başladılır"
@@ -439,8 +440,8 @@ msgid "...retrieving done"
 msgstr "...alınma bitdi"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...alış bacarılmadı: %s"
@@ -480,52 +481,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr "əmr sətirində hökmsüz vəkil tə'yini\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: \"%s\" rpm faylı oxuna bilmir\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Əksik imza (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -950,218 +951,218 @@ msgstr ""
 "--synthesis bunlarla bərabər istifadə edilə bilməz: --media, --excludemedia, "
 "--sortmedia, --update ya da --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, fuzzy, c-format
 msgid "Search start: %s end: %s"
 msgstr "Qurulu yazı növlərini axtar"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "%s paketi keçilir"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "%s yeniləmə paketi yerinə qurula bilər"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "\"%s\" medyası onsuz da vardır"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "\"%s\" medyasından üst mə'lumatlar oxunur"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "\"%s\" medyumu çıxardılır"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "rpmb açıla bilmir"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "birinci qurulum mediyasına yetişə bilmədim (hdlists faylı tapıla bilmədi)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "hdlists faylı alınır..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "mövcud olmayan \"%s\" medyumu seçilməyə çalışılır"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "birdən çox medya seçilir: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "\"%s\" medyumu çıxardılır"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, fuzzy, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "\"%s\" mediyumundan rpm faylları alınır..."
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...yenidən quraşdırma bacarılmadı"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "yenidən quraşdırma tamamlandı"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "\"%s\" medyası seçili deyil"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "[%s] synthesis faylı sınanır "
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "\"%s\" medyasının synthesis faylı oxuna bilmədi"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "\"%s\" medyası üçün siyahı faylı yazılır"
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...köçütrmə bacarılmadı"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "\"%s\" faylının izahat faylı köçürdülür..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...köçürtmə bitdi"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "[%s] faylının köçürülməsi bacarılmadı (fayl şüphəli dərəcədə kiçikdir)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "alınan mənbə hdlist (ya da synthesis) faylının md5sum'ları hesablanır"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] köçürülmə əməliyyatı bacarılmadı (md5sum uyğunsuzluğu)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "[%s] hdlist faylı yoxlanır"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "%s qurulur"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "\"%s\" medyası hdlist faylı tapılmadı"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "\"%s\" faylının izahat faylı köçürdülür..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "hökmsüz rpm fayı adı [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "\"%s\"in mənbə hdlist (ya da synthesis) faylı alınır..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "%s adında sınanmış hdlist (ya da synthesis) tapıldı"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "\"%s\" medyası hdlist faylı tapılmadı"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" faylının pubkey'si yoxlanır..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...\"%s\"nın pubkey faylından %s açarı idxal edildi"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\"  faylının pubkey'si idxal edilə bilmədi"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "%s medyası əlavə edildi"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1193,7 +1194,7 @@ msgstr "XxJjNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyBb"
@@ -1263,7 +1264,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1345,264 +1346,7 @@ msgstr "%s bağlanır"
 msgid "unmounting %s"
 msgstr "%s ayrılır"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, fuzzy, c-format
-msgid "No package named %s"
-msgstr "%s adlı paket yoxdur"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Aşağıdakı paketlər %s daxıl edir: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "hər şey onsuzda quruludur"
-
-#: ../urpm/select.pm:539
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "hər şey onsuzda quruludur"
-
-#: ../urpm/select.pm:540
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "hər şey onsuzda quruludur"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "%s əksik olduğuna görə"
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "hər şey onsuzda quruludur"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "razı qalmayan %s olduğuna görə"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "%s irəliləndirməyə çalışılır"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "%s'ı saxlamaq üçün"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "%s paket(lər)ini qurmaq üçün"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "%s ilə yaranan toqquşma səbəbiylə"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Hökmsüz imza (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Hökmsüz Qiymət ID (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Əksik imza (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "[%s] quraşdırma faylı yazıla bilmir"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "Köçütrmə bacarılmadı"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "Köçütrmə bacarılmadı"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme buraxılış %s\n"
-"Müəllif Hüququ (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"istifadə qaydası:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - seçililər arasında paketi avtomatik seç.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, fuzzy, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - qurulumun düzgün edilə biləcəyini yoxla.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - alias sistemləri arasında paylaşılmış urpmi.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, fuzzy, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --packager     - taq paketləyicisini göstərr: paketləyici.\n"
-
-#: ../urpme:53
-#, fuzzy, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - rpm qurulumu üçün başqa root işlət.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - rpm qurulumu üçün başqa root işlət.\n"
-
-#: ../urpme:55
-#, fuzzy, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --description   - taq izahatını göstər: izahat.\n"
-
-#: ../urpme:56
-#, fuzzy, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr "  --use-distrib  - urpmi-ni birbaşa distrib ağacından quraşdır.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, fuzzy, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose      - təfsilatlı mod.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - qaydaya uyğun gələn bütün paketləri seç.\n"
-
-#: ../urpme:72
-#, fuzzy, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Medianı silmə icazəsi ancaq ali istifadəçiyə verilib"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "namə'lum paketlər"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "na'məlum paket "
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "%s paketini silmək sisteminizi pozacaq"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Silinəcək heç bir şey yoxdur"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Silinəcək heç bir şey yoxdur"
-
-#: ../urpme:147
-#, fuzzy, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] ""
-"Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər silinəcəkdir (%d MB)"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "na'məlum paket "
-
-#: ../urpme:159
-#, fuzzy, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "%s peketi silinir"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (b/X) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "çıxardıla bilən avadanlıq \"%s\" olaraq alınır"
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Çıxartma bacarılmadı"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Çıxartma bacarılmadı"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1619,284 +1363,552 @@ msgstr ""
 "\n"
 "istifadə qaydası:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - Buraxılıs mə'lumatını gösta,rər və çıxar\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - xüsusi mühit işlət (əsasən bir xəta raportu).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - vergüllə ayrılmış verilən mediya(lar)nı işlətmə.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - rpm qurulumu üçün başqa root işlət.\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    - vergüllə ayrılmış alt qatarlara görə mediyanı sırala.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --synthesis    - urpmi db yerinə verilən synthesis'i işlət.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - urpmi db yerinə verilən synthesis'i işlət.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - identik sətirləri göstərmə.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - təkcə güncəl medyanı işlət.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - təfsilatlı mod.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - hər patterndə bötük/kiçik hərf qaydalarını rədd et.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -i             - hər patterndə bötük/kiçik hərf qaydalarını rədd et.\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - perl kodunu birbaşa perl -e kimi daxil et.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - binary AND operatoru.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - OR operatoru.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - NOT operatoru.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  )              - sağ mötərizə qrup ifadəsini bağlamaq üçün.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "Geri yüklənəcək mə'lumatların siyahısı:\n"
 "\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - X ara üzünü işlət.\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    ön qurğulusu %s-dir.\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - taq url'sini göstər: url.\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - taq inşa qovşağını göstər: inşa qovşağı.\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "Konsol quraşdırma modulu"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts     - taq toqquşmalarını göstər: bütün toqquşmalar.\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - taq izahatını göstər: izahat.\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - taq epoch'unu göstər: epoch.\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name         - sadəcə paket adlarını göstər.\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - paketdəki faylları göstər.\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group         - taq qrupunu göstər: qrup.\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --name         - sadəcə paket adlarını göstər.\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - sadəcə paket adlarını göstər.\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - taq mütləqlərini göstər: bütün mütləqlər.\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - taq paketləyicisini göstərr: paketləyici.\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides      - taq gətirənini göstər: bütün gətirənlər.\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires      - taq lazımlılarını göstər: bütün lazımlılar.\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size          - taq böyüklüyünü göstər: böyüklük.\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - taq sourcerpm'ini göstər: source rpm.\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --obsoletes     - taq mütləqlərini göstər: bütün mütləqlər.\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary       - taq icmalını göstər: icmal.\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - taq url'sini göstər: url.\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - təfsilatlı mod.\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - paketdəki faylları göstər.\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - adla birlikdə buraxılış, yayını və arch'ı da çap et.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "%s üstündə xüsusi mühit istifadə edilir\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "\"%s\" medyası hdlist faylı tapılmadı"
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "\"%s\" medyası hdlist sintezi inşa edilid"
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "\"%s\" medyası üçün siyahı faylı yazılır"
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, fuzzy, c-format
+msgid "No package named %s"
+msgstr "%s adlı paket yoxdur"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Aşağıdakı paketlər %s daxıl edir: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "hər şey onsuzda quruludur"
+
+#: ../urpm/select.pm:543
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "hər şey onsuzda quruludur"
+
+#: ../urpm/select.pm:544
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "hər şey onsuzda quruludur"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "%s əksik olduğuna görə"
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "hər şey onsuzda quruludur"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "razı qalmayan %s olduğuna görə"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "%s irəliləndirməyə çalışılır"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "%s'ı saxlamaq üçün"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "%s paket(lər)ini qurmaq üçün"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "%s ilə yaranan toqquşma səbəbiylə"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Hökmsüz imza (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Hökmsüz Qiymət ID (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Əksik imza (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "[%s] quraşdırma faylı yazıla bilmir"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Köçütrmə bacarılmadı"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "Köçütrmə bacarılmadı"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme buraxılış %s\n"
+"Müəllif Hüququ (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"istifadə qaydası:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - seçililər arasında paketi avtomatik seç.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, fuzzy, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - qurulumun düzgün edilə biləcəyini yoxla.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - alias sistemləri arasında paylaşılmış urpmi.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, fuzzy, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --packager     - taq paketləyicisini göstərr: paketləyici.\n"
+
+#: ../urpme:53
+#, fuzzy, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - rpm qurulumu üçün başqa root işlət.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - ancaq yeniləmə medyanı yenilə.\n"
+
+#: ../urpme:56
+#, fuzzy, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --description   - taq izahatını göstər: izahat.\n"
+
+#: ../urpme:57
+#, fuzzy, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr "  --use-distrib  - urpmi-ni birbaşa distrib ağacından quraşdır.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - təfsilatlı mod.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - qaydaya uyğun gələn bütün paketləri seç.\n"
+
+#: ../urpme:73
+#, fuzzy, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Medianı silmə icazəsi ancaq ali istifadəçiyə verilib"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "namə'lum paketlər"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "na'məlum paket "
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "%s paketini silmək sisteminizi pozacaq"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Silinəcək heç bir şey yoxdur"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Silinəcək heç bir şey yoxdur"
+
+#: ../urpme:149
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər silinəcəkdir (%d MB)"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "na'məlum paket "
+
+#: ../urpme:161
+#, fuzzy, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "%s peketi silinir"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (b/X) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "çıxardıla bilən avadanlıq \"%s\" olaraq alınır"
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Çıxartma bacarılmadı"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Çıxartma bacarılmadı"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1985,11 +1997,6 @@ msgstr "  --clean        - hərşeydən əvvəl ara yaddaşdan rpm'i sil.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - rpm'ləri ara yaddaşda işlətmə.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - ancaq yeniləmə medyanı yenilə.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2304,7 +2311,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Davam edilsin?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (B/x) "
@@ -2486,10 +2493,12 @@ msgstr "  --curl         - uzaqdakı faylları almaq üçün curl işlət.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - yeniləmə mediyumu yarat.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2497,24 +2506,24 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - synthesis faylını tapıb işlətməyə çalış.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  --no-probe     - hər hansı bir synthesis ya da hdlist\n"
 "                   faylı tapmaya cəhd göstərmə.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2523,17 +2532,17 @@ msgstr ""
 "  --distrib      - bütün medyaları avtomatik olaraq qurulum medyumundan\n"
 "                    yarat.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - mövcud medyanı göstər.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2542,91 +2551,91 @@ msgstr ""
 "  --from         - əkslərin siyahısı üçün verilən url'ni işlət, əsası\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - həmişə yeni qalan virtual mediya yarat,\n"
 "                   ancaq file:// protokoluna icazə var.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - MD5SUM fayl yoxlamasını qeyri fəallaşdır.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - səssiz mod.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - təfsilatlı mod.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Media əlavə etmə icazəsi ancaq ali istifadəçiyə verilib"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "[%s] quraşdırma faylı yazılır"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, fuzzy, c-format
 msgid "Can't create config file [%s]"
 msgstr "[%s] quraşdırma faylı yazılır"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "<hdlist'in nisbi yolu>nu --distrib ilə verməyə ehtiyac yoxdur"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<hdlistin nisbi yolu> mövcud deyildir\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "\"%s\" medyasına çatıla bilmir"
@@ -2862,13 +2871,13 @@ msgstr "  -f             - hdlist fayllarının yaradılmasını məcbur et.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Medianı yeniləmə icazəsi ancaq ali istifadəçiyə verilib"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "yenilənəcək bir şey yoxdur (medya əlavə etmək üçün urpmi.addmedia işlədin)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2877,17 +2886,17 @@ msgstr ""
 "güncəllənəcək giriş mövcud deyildir\n"
 "(%s dan (dən) biri)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "\"%s\" mediyumu dəyişdirilir:"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "\"%s\" medyumu çıxardılır"
@@ -3153,6 +3162,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Rəsm tapıla bilmədi"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - yeniləmə mediyumu yarat.\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "xətalı giriş: [%s]"
diff --git a/po/bg.po b/po/bg.po
index e63e68dd..2ccf3287 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2003-08-18 15:59+0300\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM Инсталация"
@@ -31,7 +31,7 @@ msgstr "RPM Инсталация"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Добре"
@@ -97,7 +97,7 @@ msgstr "_Инсталиране"
 msgid "_Save"
 msgstr "_Запазване"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr " Отказ"
@@ -129,8 +129,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - показва това помощно съобщение.\n"
@@ -162,7 +163,7 @@ msgid ""
 "                   (--no-verify-rpm disables it, default is enabled).\n"
 msgstr ""
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, fuzzy, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --update       - обновява само източници на обновяване.\n"
@@ -213,7 +214,7 @@ msgstr "Моля, изчакайте..."
 msgid "Must be root"
 msgstr "Трябва да бъдете root/админ"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -224,42 +225,42 @@ msgstr ""
 "%s\n"
 "Продължение?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Добре"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr "(за обновяване)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr "(към инсталация)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Необходим е един от следните пакети:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Прекъсване"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -271,14 +272,14 @@ msgstr ""
 "%s\n"
 "Продължение"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "За да се запазят зависимостите,тези пакети ще бъдат деинсталирани (%d МБ)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -287,49 +288,49 @@ msgstr ""
 "бъдат инсталирани:\n"
 "%s\n"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "%d пакета"
 msgstr[1] "%d пакета"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Инсталиране на пакети..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "не мога да получа сорс пакетите, прекратявам"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Подготовка..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Инсталиране на пакет `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Моля, поставете източник с име \"%s\" в устройство [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Сваляне на пакет `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Готово"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -340,28 +341,28 @@ msgstr ""
 "%s\n"
 "Вие вероятно трябва да обновите вашата urpmi база данни."
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Инсталацията провалена"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Пакета(тите) вече са инсталирани"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Инсталацията приключи"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "изтриване на %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, fuzzy, c-format
 msgid "restarting urpmi"
 msgstr "Стартира slurpd: "
@@ -442,8 +443,8 @@ msgid "...retrieving done"
 msgstr "...получаването завършено"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...грешка при получаване: %s"
@@ -483,52 +484,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr "грешна прокси декларация на командния ред\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: не може да се прочете rpm файл \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Липсващ подпис (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -958,223 +959,223 @@ msgstr ""
 "--synthesis не може да бъде използван с --media, --excludemedia, --"
 "sortmedia, --update или --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Търсенето започнато: %s край: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "пропускане на пакет %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "ще инсталирам, вместо да обновя пакет %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "източникът \"%s\" вече съществува"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "четене на headers от източник \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "премахване на източник \"%s\":"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "не мога да отворя rpmdb"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "невъзможен достъпа до източника за първоначална инсталация (не е намерен "
 "файла hdlists)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "получаване на hdlists файла..."
 
 # Another meaning of the word is in the sense "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "опит за избор на несъществуващ източник \"%s\""
 
 # Another meaning of the word is in the sense "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "избор на множество източници: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "премахване на източник \"%s\":"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "пренастройка на urpmi за източник \"%s\"..."
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, fuzzy, c-format
 msgid "...reconfiguration failed"
 msgstr "...пренастройката неуспешна"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "пренастройката завършена"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "източникът \"%s\" не е избран"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, fuzzy, c-format
 msgid "examining synthesis file [%s]"
 msgstr "проверявам синтезис файл [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "проблем при четенето на синтез файл за източник  \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "записване на лист файл за източник \"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...неуспешно копиране"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "копиране на описателен файл за \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...копирането завършено"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "грешка при копиране на [%s] (файла е подозрително малък)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "изчисляване на md5 сумата на копирания hdlist (или synthesis)"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "грешко копие на [%s] (грешна md5sum)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "проверка на hdlists файла [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "инсталиране %s\n"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "не е намерен hdlist файл за източник  \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "копиране на описателен файл за \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "грешно rpm име на файла [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "четене на source hdlist (или synthesis) от \"%s\""
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "намерен тестван hdlist (или synthesis) като %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "не е намерен hdlist файл за източник  \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "проверявам публичен ключ от \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...импортиран ключ %s от файл с публични ключове за \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "невъзможен импорт на файл с публични ключове от \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "добавен източник %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1206,7 +1207,7 @@ msgstr "НнNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "ДдDdYy"
@@ -1276,7 +1277,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1359,278 +1360,7 @@ msgstr "монтиране на %s"
 msgid "unmounting %s"
 msgstr "демонтиране на %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "няма пакет наречен %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Следните пакети съдържат %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Пакета(тите) вече са инсталирани"
-
-#: ../urpm/select.pm:539
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Пакета(тите) вече са инсталирани"
-
-#: ../urpm/select.pm:540
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Пакета(тите) вече са инсталирани"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, fuzzy, c-format
-msgid "due to missing %s"
-msgstr "поради липсващ %s"
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "Пакета(тите) вече са инсталирани"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "поради неопределен %s"
-
-#: ../urpm/select.pm:566
-#, fuzzy, c-format
-msgid "trying to promote %s"
-msgstr "опит за избор на %s"
-
-#: ../urpm/select.pm:567
-#, fuzzy, c-format
-msgid "in order to keep %s"
-msgstr "за да се запази %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "за да се инсталира %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "поради конфликт с %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Невалиден подпис (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Невалиден идентификатор на ключ (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Липсващ подпис (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
-# in this case must be "проводник"
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "невъзможно е да се запише файл [%s]"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "Неуспешно влизане"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "Неуспешно влизане"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme версия %s\n"
-"Mandriva 1999-2008, всички права запазени.\n"
-"Това е свободен софтуер и може да бъде разпространяван според условиятана "
-"GNU GPL.\n"
-"\n"
-"начин на ползване:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - автоматично избира пакет при опции за избор\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr ""
-"  --test         - проверка дали изтриването може да се извърши коректно.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-
-#: ../urpme:52 ../urpmi:141
-#, fuzzy, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --summary       - отпечатва резюме за тага: summary.\n"
-
-#: ../urpme:53
-#, fuzzy, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --size          - отпечатва размера на тага: size."
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --size          - отпечатва размера на тага: size."
-
-#: ../urpme:55
-#, fuzzy, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --description   - отпечатва описание на тага: description."
-
-#: ../urpme:56
-#, fuzzy, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - автоматична конфигурация на urpmi от дървото, полезна\n"
-"                   за (де)инсталация на chroot при --root опция.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - показва всички съобщения\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - избиране на всички съвпадащи пакети.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Само superuser-а има право да премахва пакети"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "неизвестни пакети"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "неизвестен пакет"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] ""
-"Премахването на тези пакети би разбило системата ви, съжалявам:\n"
-"\n"
-msgstr[1] ""
-"Премахването на тези пакети би разбило системата ви, съжалявам:\n"
-"\n"
-
-#: ../urpme:124
-#, fuzzy, c-format
-msgid "Nothing to remove"
-msgstr "Няма маркер за изтриване!"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Няма маркер за изтриване!"
-
-#: ../urpme:147
-#, fuzzy, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] ""
-"За да се запазят зависимостите,тези пакети ще бъдат деинсталирани (%d МБ)"
-msgstr[1] ""
-"За да се запазят зависимостите,тези пакети ще бъдат деинсталирани (%d МБ)"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "неизвестен пакет"
-msgstr[1] "неизвестен пакет"
-
-#: ../urpme:159
-#, fuzzy, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "изтриване на пакет %s"
-msgstr[1] "изтриване на пакет %s"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (Д/н) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "Преместваемо устройство е \"%s\""
-
-#: ../urpme:178
-#, fuzzy, c-format
-msgid "Removal failed"
-msgstr "Неуспешно влизане"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Неуспешно влизане"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1647,32 +1377,39 @@ msgstr ""
 "\n"
 "начин на ползване:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - показва версията и излиза\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 
 # Another meaning of the word is in the sense "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
 #, fuzzy, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --update       - създаване на ъпдейт посредник.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --size          - отпечатва размера на тага: size."
+
 # Another meaning of the word is in the sense "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, fuzzy, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1680,260 +1417,535 @@ msgstr "  --update       - създаване на ъпдейт посредни
 
 # Another meaning of the word is in the sense "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --update       - създаване на ъпдейт посредник.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, fuzzy, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --url          - отпечатва url тага: url.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, fuzzy, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - обновява само източници на обновяване.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - показва всички съобщения\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, fuzzy, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -e              - включва perl код направо като perl -e .\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -e              - включва perl код направо като perl -e .\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e              - включва perl код направо като perl -e .\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, fuzzy, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr ""
 "  -u             - премахни пакета ако вече е инсталирана по добра версия.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, fuzzy, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr " -v             - показва всички съобщения\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, fuzzy, c-format
 msgid "  !              - unary NOT.\n"
 msgstr " -v             - показва всички съобщения\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  -a             - избиране на всички съвпадения на командния ред.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "Списък на данни за възстановяване:\n"
 "\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  -g             - отпечатай също групите с имена.\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                      по подразбиране е %s.\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - отпечатва url тага: url.\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --url          - отпечатва url тага: url.\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "Настройки на конзолата"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 "  --conflicts     - отпечатва конфликтите на тага: всички конфликти "
 "(множество редове)."
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - отпечатва описание на тага: description."
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --help         - показва това помощно съобщение.\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --all           - отпечатва всички тагове.\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - извежда файловете в пакет.\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --url          - отпечатва url тага: url.\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --all           - отпечатва всички тагове.\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --all           - отпечатва всички тагове.\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 "  --conflicts     - отпечатва конфликтите на тага: всички конфликти "
 "(множество редове)."
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --summary       - отпечатва резюме за тага: summary.\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --url          - отпечатва url тага: url.\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --url          - отпечатва url тага: url.\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --url          - отпечатва url тага: url.\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --summary       - отпечатва резюме за тага: summary.\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr ""
 "  --conflicts     - отпечатва конфликтите на тага: всички конфликти "
 "(множество редове)."
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary       - отпечатва резюме за тага: summary.\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - отпечатва url тага: url.\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr " -v             - показва всички съобщения\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - извежда файловете в пакет.\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, fuzzy, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -r             - отпечатай версия и също така реализация с име.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "не е намерен hdlist файл за източник  \"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "създаден е hdlist синтезис файл за източник \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "записване на лист файл за източник \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "няма пакет наречен %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Следните пакети съдържат %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Пакета(тите) вече са инсталирани"
+
+#: ../urpm/select.pm:543
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Пакета(тите) вече са инсталирани"
+
+#: ../urpm/select.pm:544
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Пакета(тите) вече са инсталирани"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, fuzzy, c-format
+msgid "due to missing %s"
+msgstr "поради липсващ %s"
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Пакета(тите) вече са инсталирани"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "поради неопределен %s"
+
+#: ../urpm/select.pm:570
+#, fuzzy, c-format
+msgid "trying to promote %s"
+msgstr "опит за избор на %s"
+
+#: ../urpm/select.pm:571
+#, fuzzy, c-format
+msgid "in order to keep %s"
+msgstr "за да се запази %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "за да се инсталира %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "поради конфликт с %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Невалиден подпис (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Невалиден идентификатор на ключ (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Липсващ подпис (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
+# in this case must be "проводник"
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "невъзможно е да се запише файл [%s]"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Неуспешно влизане"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "Неуспешно влизане"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme версия %s\n"
+"Mandriva 1999-2008, всички права запазени.\n"
+"Това е свободен софтуер и може да бъде разпространяван според условиятана "
+"GNU GPL.\n"
+"\n"
+"начин на ползване:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - автоматично избира пакет при опции за избор\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+"  --test         - проверка дали изтриването може да се извърши коректно.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+
+#: ../urpme:52 ../urpmi:141
+#, fuzzy, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --summary       - отпечатва резюме за тага: summary.\n"
+
+#: ../urpme:53
+#, fuzzy, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --size          - отпечатва размера на тага: size."
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - обновява само източниците за обновяване.\n"
+
+#: ../urpme:56
+#, fuzzy, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --description   - отпечатва описание на тага: description."
+
+#: ../urpme:57
+#, fuzzy, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - автоматична конфигурация на urpmi от дървото, полезна\n"
+"                   за (де)инсталация на chroot при --root опция.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - показва всички съобщения\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - избиране на всички съвпадащи пакети.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Само superuser-а има право да премахва пакети"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "неизвестни пакети"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "неизвестен пакет"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] ""
+"Премахването на тези пакети би разбило системата ви, съжалявам:\n"
+"\n"
+msgstr[1] ""
+"Премахването на тези пакети би разбило системата ви, съжалявам:\n"
+"\n"
+
+#: ../urpme:126
+#, fuzzy, c-format
+msgid "Nothing to remove"
+msgstr "Няма маркер за изтриване!"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Няма маркер за изтриване!"
+
+#: ../urpme:149
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"За да се запазят зависимостите,тези пакети ще бъдат деинсталирани (%d МБ)"
+msgstr[1] ""
+"За да се запазят зависимостите,тези пакети ще бъдат деинсталирани (%d МБ)"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "неизвестен пакет"
+msgstr[1] "неизвестен пакет"
+
+#: ../urpme:161
+#, fuzzy, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "изтриване на пакет %s"
+msgstr[1] "изтриване на пакет %s"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (Д/н) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "Преместваемо устройство е \"%s\""
+
+#: ../urpme:181
+#, fuzzy, c-format
+msgid "Removal failed"
+msgstr "Неуспешно влизане"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Неуспешно влизане"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2019,11 +2031,6 @@ msgstr ""
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr ""
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - обновява само източниците за обновяване.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2322,7 +2329,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Продължение въпреки всичко ?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Д/н) "
@@ -2501,11 +2508,13 @@ msgid "  --aria2        - use aria2 to retrieve distant files.\n"
 msgstr "  --url          - отпечатва url тага: url.\n"
 
 #: ../urpmi.addmedia:65
-#, fuzzy, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - обновява само източници на обновяване.\n"
+#, c-format
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2513,24 +2522,24 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr ""
 "  -h             - опитай да намериш и ползваш синтез or hdlist файл.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  -h             - опитай да намериш и ползваш синтез or hdlist файл.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2540,108 +2549,108 @@ msgstr ""
 "инсталационен\n"
 "                   източник.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - показва наличните източници.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - създава псевдо източник, който винаги е актуален,\n"
 "                   само file:// протокола е разрешен.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - изключва MD5SUM проверка на файловете.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, fuzzy, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr " -v             - показва всички съобщения\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr " -v             - показва всички съобщения\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Само superuser-а има правото да инсталира източници"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "ще се създаде конфигурационен файл [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "невъзможно да се създаде конфигурационен файл [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "не се въвежда <относителен път до hdlist> при --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "Липсва относителен път до hdlist\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "невъзможен достъп до източник \"%s\""
@@ -2876,12 +2885,12 @@ msgstr " -v             - активира създаване на hdlist фай
 msgid "Only superuser is allowed to update media"
 msgstr "Само superuser-а има правото да обновява източниците"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "нищо за ъпгрейд (ползвай urpmi.addmedia за добавяне на източник)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2890,19 +2899,19 @@ msgstr ""
 "липсва опцията за обновяване\n"
 "(една от %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "игнориране на източник %s"
 
 # Another meaning of the word is in the sense "The iron is good medium for the eletricity"
 # in this case must be "проводник"
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "активиране на източник %s"
@@ -3176,6 +3185,10 @@ msgid "No changelog found\n"
 msgstr "Не е намерен changelog\n"
 
 #, fuzzy
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - обновява само източници на обновяване.\n"
+
+#, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "грешно въвеждане: [%s]"
 
diff --git a/po/bn.po b/po/bn.po
index f5cb9fda..bf9fc630 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2005-02-13 13:39+0600\n"
 "Last-Translator: Jamil Ahmed <jamil@bengalinux.org>\n"
 "Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -34,7 +34,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "আরপিএম ইনস্টলেশন"
@@ -44,7 +44,7 @@ msgstr "আরপিএম ইনস্টলেশন"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "ঠিক আছে (_ঠ)"
@@ -110,7 +110,7 @@ msgstr "_ইনস্টল"
 msgid "_Save"
 msgstr "_সংরক্ষণ"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "বাতিল (_ত)"
@@ -141,8 +141,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - এই সাহায্যকারী বার্তাটি ছাপাও।\n"
@@ -176,7 +177,7 @@ msgstr ""
 "  --verify-rpm   - ইনস্টলের আগে rpm স্বাক্ষর যাচাই করো\n"
 "                   (--no-verify-rpm অকার্যকর করবে, স্বাভাবিকভাবে কার্যকর).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - শুধুমাত্র প্রদত্ত মাধ্যম ব্যবহার করো, কমা দিয়ে ভাগ করা।\n"
@@ -226,7 +227,7 @@ msgstr "অনুগ্রহ করে অপেক্ষা করুন..."
 msgid "Must be root"
 msgstr "অবশ্যই root হতে হবে"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -237,42 +238,42 @@ msgstr ""
 "%s\n"
 "এগিয়ে যাবো?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "নোটিশ"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "ঠিক আছে"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (আপগ্রেডের জন্য)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (ইনস্টলের জন্য)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "নিম্নলিখিত প্যাকেজসমুহের মধ্যে একটির প্রয়োজন আছে:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_বাতিল"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -283,14 +284,14 @@ msgstr ""
 "%s\n"
 "এগিয়ে যাবো?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "নিম্নলিখিত প্যাকেজগুলি ইনস্টল হতে যাচ্ছে, ডিপেন্ডেন্সিদের সন্তুষ্ট করতে (%d এমবি)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -298,49 +299,49 @@ msgstr ""
 "ডিপেন্ডেন্সি সন্তুষ্ট করতে নিম্নলিখিত %d প্যাকেজগুলো ইনস্টল হতে যাচ্ছে:\n"
 "%s\n"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "%d প্যাকেজ সমূহ"
 msgstr[1] "%d প্যাকেজ সমূহ"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "প্যাকেজ ইনস্টলেশন..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "সোর্স প্যাকেজ গুলি পাওয়া যায়নি, থামানো হচ্ছে"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "প্রস্তুত করা হচ্ছে..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' প্যাকেজ ইনস্টল করা হচ্ছে (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "অনুগ্রহ করে \"%s\" নামের মাধ্যম [%s] নামের ডিভাইসে প্রবেশ করান"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "`%s' প্যাকেজ ডাউনলোড করা হচ্ছে..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_সম্পন্ন"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -351,28 +352,28 @@ msgstr ""
 "%s\n"
 "আপনি হয়তো আপনার urpmi ডাটাবেস আপডেট করতে চাইবেন"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "ইনস্টলেশন ব্যর্থ"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "ইনস্টলেশন প্রক্রিয়া সম্পূর্ণ হয়েছে"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "%s সরানো হচ্ছে"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi আবার শুরু করা হচ্ছে"
@@ -452,8 +453,8 @@ msgid "...retrieving done"
 msgstr "...আনা হয়ে গেছে"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...আনতে ব্যর্থ হয়েছি: %s"
@@ -493,52 +494,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr "কমান্ড লাইনের ওপর বাজে প্রক্সি ঘোষণা\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: \"%s\" rpm ফাইল পড়া যাচ্ছেনা\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "(%s) স্বাক্ষর পাওয়া যাচ্ছে না"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -965,218 +966,218 @@ msgstr ""
 "--media, --excludemedia, --sortmedia, --update অথবা --parallel এর সাথে --"
 "synthesis ব্যবহার করা যাবেনা"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "খোঁজো শুরু: %s শেষ: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "প্যাকেজ %s উপেক্ষা করা হচ্ছে"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "%s প্যাকেজ আপগ্রেড করার বদলে ইনস্টল করবে"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "মাধ্যম \"%s\" আগে থেকেই আছে"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "\"%s\" মাধ্যম থেকে হেডার পড়া হচ্ছে"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "\"%s\" মাধ্যম সরানো হচ্ছে"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "rpmdb খুলতে অক্ষম"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "প্রথম ইনস্টলেশন মাধ্যম ব্যবহার করা যাচ্ছে নাহ্ (কোন hdlists ফাইল পাওয়া যায়নি)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "hdlists ফাইল আনা হচ্ছে..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "অনুপস্হিত মাধ্যম \"%s\" নির্বাচন করার চেষ্টা করছি"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "একাধিক মিডিয়া নির্বাচন করা হচ্ছে: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "\"%s\" মাধ্যম সরানো হচ্ছে"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "\"%s\" মাধ্যমকে urpmi এর জন্য পুনরায় কনফিগার করা হচ্ছে"
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...পুনরায় কনফিগারেশন করতে ব্যর্থ"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "পুনরায় কনফিগারেশন সমপন্ন"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "মাধ্যম \"%s\" নির্বাচিত হয়নি"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "synthesis ফাইল [%s] পরীক্ষা করা হচ্ছে"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "\"%s\" মাধ্যমের synthesis ফাইল পড়তে সমস্যা হয়েছে"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "\"%s\"-এর তালিকা ফাইল লিখছি..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...কপি করতে ব্যর্থ"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "\"%s\"-এর বিবরণ ফাইল কপি করা হচ্ছে..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...কপি করা সম্পন্ন"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "[%s]-এর কপি ব্যর্থ হয়েছে (ফাইলটি অস্বাভাবিক ছোট)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "উদ্ধারকৃত সোর্স hdlist (অথবা synthesis)-এর md5sum হিসেব করা হচ্ছে"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s]-এর কপি ব্যর্থ হয়েছে (md5sum মেলেনি)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "hdlist ফাইল [%s] পরীক্ষা করা হচ্ছে"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "%s ইনস্টল করা হচ্ছে %s থেকে"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "\"%s\" মাধ্যমের জন্য কোন hdlist ফাইল পাওয়া যায়নি"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "\"%s\"-এর বিবরণ ফাইল কপি করা হচ্ছে..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "অবৈধ rpm ফাইল নাম [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "\"%s\"-এর hdlist (বা synthesis) সোর্স আনা হচ্ছে..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "আরম্ভ করা hdlist (বা synthesis) %s রূপে পাওয়া গিয়েছে"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "\"%s\" মাধ্যমের জন্য কোন hdlist ফাইল পাওয়া যায়নি"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\"-এর pubkey পরীক্ষা করছি..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...\"%s\"-এর pubkey থেকে %s কী ইমপোর্ট করা হয়েছে"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\"-এর pubkey ইমপোর্ট করা যায়নি"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "মাধ্যম %s যোগ করা হয়েছে"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1208,7 +1209,7 @@ msgstr "Nnন"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yyহ"
@@ -1278,7 +1279,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1361,6 +1362,299 @@ msgstr "%s মাউন্ট করা হচ্ছে"
 msgid "unmounting %s"
 msgstr "%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 সংস্করণ %s\n"
+"কপিরাইট (C) ২০০২-২০০৬ ম্যান্ড্রিব।\n"
+"এটি মুক্ত সফ্টওয়্যার এবং GNU GPL এর নিয়মানুযায়ী হয়তো এটা পুনঃবিতরণ করা যাবে।\n"
+"\n"
+"ব্যবহার: urpmf [options] pattern-expression\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - এই সাহায্যকারী বার্তাটি ছাপাও।\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          - সুনির্দিষ্ট পরিবেশ ব্যবহার করো (বিশেষত একটি ত্রুটি রিপোর্ট।)\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 - প্রদত্ত মাধ্যম ব্যবহার করবেনা, কমা দিয়ে ভাগ করা।\n"
+
+#: ../urpm/search.pm:39 ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - 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    - কমা দ্বারা বিচ্ছিন্ন মতে মাধ্যম ক্রমান্বয়ে সাজাও।\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --synthesis    - urpmi db'র পরিবর্তে প্রদত্ত synthesis ব্যবহার করো।\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    - urpmi db'র পরিবর্তে প্রদত্ত synthesis ব্যবহার করো।\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - identical লাইনসমূহহ ছাপাবে না।\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - শুধু আপডেট মিডিয়া ব্যবহার করো।\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - verbose মোড।\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - সকল প্যাটার্ণ এ case distinctions অগ্রাহ্য করো ।\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - সকল প্যাটার্ণ এ case distinctions অগ্রাহ্য করো ।\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpm/search.pm:52 ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - perl কোড perl -e এর মতো সরাসরি অন্তর্ভুক্ত করো।\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - বানারি AND অপারেটর.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - বাইনারি OR অপারেটর.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - ইউনারি NOT.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  )              - group expression শেষ করার জন্য।\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"যে সকল তথ্য ব্যাক-আপ থেকে পুনরুদ্ধার করতে হবে তাদের তালিকা:\n"
+"\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - ইন্টারফেস ব্যবহার করো।\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    %s ডিফল্ট।\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - url: url ট্যাগ ছাপাও।\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - build host: buildhost ট্যাগ ছাপাও।\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "কনসোল কনফিগারেশন মডিউল"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - all conflicts: conflicts ট্যাগ ছাপাও।\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --epoch        - description: description ট্যাগ ছাপাও।\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - epoch: epoch ট্যাগ ছাপাও।\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --name         - শুধুমাত্র প্যাকেজ নাম সমুহ ছাপাও।\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - প্যাকেজে ফাইলের তালিকা\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - group: group ট্যাগ ছাপাও।\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name         - শুধুমাত্র প্যাকেজ নাম সমুহ ছাপাও।\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - শুধুমাত্র প্যাকেজ নাম সমুহ ছাপাও।\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - packager: packager ট্যাগ ছাপাও।\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - all provides: provides ট্যাগ ছাপাও।\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - all requires: requires ট্যাগ ছাপাও।\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - size: size ট্যাগ ছাপাও।\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - source rpm: sourcerpm ট্যাগ ছাপাও।\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes    - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --epoch        - summary: summary ট্যাগ ছাপাও।\n"
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - url: url ট্যাগ ছাপাও।\n"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - verbose মোড।\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - প্যাকেজে ফাইলের তালিকা\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - ভার্সন, প্রকাশ এবং আর্ক এর সঙ্গে নাম ছাপাও।\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "%s-এর ওপর সুনির্দিষ্ট পরিবেশ ব্যবহার করো\n"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "\"%s\" মাধ্যমের জন্য কোন hdlist ফাইল পাওয়া যায়নি"
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "\"%s\" মাধ্যমের জন্য hdlist synthesis ফাইল তৈরি করা হচ্ছে"
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "\"%s\"-এর তালিকা ফাইল লিখছি..."
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1372,62 +1666,67 @@ msgid ""
 "urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, c-format
 msgid "No package named %s"
 msgstr "%s নামের কোন প্যাকেজ নেই"
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "এই প্যাকেজগুলিতে রয়েছে %s: %s"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
 msgid "due to missing %s"
 msgstr "%s অনুপস্থিতির কারনে"
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "সবকিছু আগে থেকেই ইনস্টল করা আছে"
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s অসন্তুষ্টির কারনে"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s প্রোমট করার চেষ্টা করছি"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s রাখার জন্য"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, c-format
 msgid "in order to install %s"
 msgstr "%s ইনস্টলের জন্য"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "%s-এর সাথে সংঘাতের কারনে"
@@ -1518,18 +1817,17 @@ msgstr "  --packager     - packager: packager ট্যাগ ছাপাও।
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - rpm সরানোর জন্য আরেকটি root ব্যবহার করো।\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - rpm ইনস্টলেশনের জন্য অন্য রুট ব্যবহার করো।\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - শুধুমাত্র আপডেট মাধ্যম আপডেট করো।\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --epoch        - description: description ট্যাগ ছাপাও।\n"
 
-#: ../urpme:56
+#: ../urpme:57
 #, fuzzy, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1538,49 +1836,49 @@ msgstr ""
 "  --use-distrib  - distrib ট্রি থেকে চলন্ত অবস্থায় urpmi কনফিগার করো, --root\n"
 "                    অপশনের সাথে croot (আন)ইনস্টলে কার্যকর।\n"
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v     - verbose মোড।\n"
 
-#: ../urpme:59
+#: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - expression মিলিয়ে সমস্ত প্যাকেজ নির্বাচন করো।\n"
 
-#: ../urpme:72
+#: ../urpme:73
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "শুধুমাত্র superuser-এর প্যাকেজ সরাবার অনুমতি আছে"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown packages"
 msgstr "অজানা প্যাকেজসমুহ"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown package"
 msgstr "অজানা প্যাকেজ"
 
-#: ../urpme:119
+#: ../urpme:121
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "%s প্যাকেজ সরালে আপনার সিস্টেমের সমস্যা হবে"
 msgstr[1] "%s প্যাকেজ সরালে আপনার সিস্টেমের সমস্যা হবে"
 
-#: ../urpme:124
+#: ../urpme:126
 #, c-format
 msgid "Nothing to remove"
 msgstr "সরানোর মতো কিছুই নেই"
 
-#: ../urpme:141
+#: ../urpme:143
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "সরানোর মতো কিছুই নেই"
 
-#: ../urpme:147
+#: ../urpme:149
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1588,331 +1886,45 @@ msgid_plural ""
 msgstr[0] "ডিপেন্ডেন্সি সন্তুষ্ট করতে, নিম্নলিখিত %d প্যাকেজগুলো সরানো হবে (%d এমবি)"
 msgstr[1] "ডিপেন্ডেন্সি সন্তুষ্ট করতে, নিম্নলিখিত %d প্যাকেজগুলো সরানো হবে (%d এমবি)"
 
-#: ../urpme:152
+#: ../urpme:154
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "অজানা প্যাকেজ"
 msgstr[1] "অজানা প্যাকেজ"
 
-#: ../urpme:159
+#: ../urpme:161
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "%s প্যকেজ সরানো হচ্ছে"
 msgstr[1] "%s প্যকেজ সরানো হচ্ছে"
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr "(y/N) "
 
-#: ../urpme:164
+#: ../urpme:166
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "স্থানান্তরযোগ্য ডিভাইসকে \"%s\" হিসেবে নেয়া হলো"
 
-#: ../urpme:178
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "সরাতে ব্যর্থ"
 
-#: ../urpme:180
+#: ../urpme:183
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "সরাতে ব্যর্থ"
 
-#: ../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 সংস্করণ %s\n"
-"কপিরাইট (C) ২০০২-২০০৬ ম্যান্ড্রিব।\n"
-"এটি মুক্ত সফ্টওয়্যার এবং GNU GPL এর নিয়মানুযায়ী হয়তো এটা পুনঃবিতরণ করা যাবে।\n"
-"\n"
-"ব্যবহার: urpmf [options] pattern-expression\n"
-
-#: ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - এই সাহায্যকারী বার্তাটি ছাপাও।\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - সুনির্দিষ্ট পরিবেশ ব্যবহার করো (বিশেষত একটি ত্রুটি রিপোর্ট।)\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - প্রদত্ত মাধ্যম ব্যবহার করবেনা, কমা দিয়ে ভাগ করা।\n"
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - কমা দ্বারা বিচ্ছিন্ন মতে মাধ্যম ক্রমান্বয়ে সাজাও।\n"
-
-#: ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --synthesis    - urpmi db'র পরিবর্তে প্রদত্ত synthesis ব্যবহার করো।\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - urpmi db'র পরিবর্তে প্রদত্ত synthesis ব্যবহার করো।\n"
-
-#: ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - identical লাইনসমূহহ ছাপাবে না।\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - শুধু আপডেট মিডিয়া ব্যবহার করো।\n"
-
-#: ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - verbose মোড।\n"
-
-#: ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - সকল প্যাটার্ণ এ case distinctions অগ্রাহ্য করো ।\n"
-
-#: ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - সকল প্যাটার্ণ এ case distinctions অগ্রাহ্য করো ।\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - perl কোড perl -e এর মতো সরাসরি অন্তর্ভুক্ত করো।\n"
-
-#: ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - বানারি AND অপারেটর.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - বাইনারি OR অপারেটর.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - ইউনারি NOT.\n"
-
-#: ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  )              - group expression শেষ করার জন্য।\n"
-
-#: ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"যে সকল তথ্য ব্যাক-আপ থেকে পুনরুদ্ধার করতে হবে তাদের তালিকা:\n"
-"\n"
-
-#: ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - ইন্টারফেস ব্যবহার করো।\n"
-
-#: ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                    %s ডিফল্ট।\n"
-
-#: ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - url: url ট্যাগ ছাপাও।\n"
-
-#: ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - build host: buildhost ট্যাগ ছাপাও।\n"
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "কনসোল কনফিগারেশন মডিউল"
-
-#: ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - all conflicts: conflicts ট্যাগ ছাপাও।\n"
-
-#: ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --epoch        - description: description ট্যাগ ছাপাও।\n"
-
-#: ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - epoch: epoch ট্যাগ ছাপাও।\n"
-
-#: ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --name         - শুধুমাত্র প্যাকেজ নাম সমুহ ছাপাও।\n"
-
-#: ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - প্যাকেজে ফাইলের তালিকা\n"
-
-#: ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - group: group ট্যাগ ছাপাও।\n"
-
-#: ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name         - শুধুমাত্র প্যাকেজ নাম সমুহ ছাপাও।\n"
-
-#: ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - শুধুমাত্র প্যাকেজ নাম সমুহ ছাপাও।\n"
-
-#: ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
-
-#: ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - packager: packager ট্যাগ ছাপাও।\n"
-
-#: ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - all provides: provides ট্যাগ ছাপাও।\n"
-
-#: ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - all requires: requires ট্যাগ ছাপাও।\n"
-
-#: ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - size: size ট্যাগ ছাপাও।\n"
-
-#: ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - source rpm: sourcerpm ট্যাগ ছাপাও।\n"
-
-#: ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes    - all obsoletes: obsoletes ট্যাগ ছাপাও।\n"
-
-#: ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --epoch        - summary: summary ট্যাগ ছাপাও।\n"
-
-#: ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - url: url ট্যাগ ছাপাও।\n"
-
-#: ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - verbose মোড।\n"
-
-#: ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - প্যাকেজে ফাইলের তালিকা\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - ভার্সন, প্রকাশ এবং আর্ক এর সঙ্গে নাম ছাপাও।\n"
-
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "%s-এর ওপর সুনির্দিষ্ট পরিবেশ ব্যবহার করো\n"
-
-#: ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "\"%s\" মাধ্যমের জন্য কোন hdlist ফাইল পাওয়া যায়নি"
-
-#: ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "\"%s\" মাধ্যমের জন্য hdlist synthesis ফাইল তৈরি করা হচ্ছে"
-
-#: ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "\"%s\"-এর তালিকা ফাইল লিখছি..."
-
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2005,11 +2017,6 @@ msgstr "  --clean        - কিছু করার পুর্বে ক্�
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - ক্যাশ এ ব্যবহৃত নয় এমন আর-পি-এম রাখো।\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - শুধুমাত্র আপডেট মাধ্যম আপডেট করো।\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2333,7 +2340,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "অগ্রসর হবে?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr "(Y/n)"
@@ -2516,10 +2523,12 @@ msgstr "  --curl         - দুরবর্তী ফাইল আনার �
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - একটি আপডেট মাধ্যম তৈরী করো।\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2527,24 +2536,24 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - একটি synthesis ফাইল খুঁজে ব্যবহারের চেষ্টা করো।\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  --no-probe     - কোন synthesis বা hdlist ফাইল খোঁজের\n"
 "                     চেষ্টা করবে না।\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2553,17 +2562,17 @@ msgstr ""
 "  --distrib      - একটি ইনস্টলেশনের মাধ্যম থেকে সমস্থ মাধ্যম তৈরী করো\n"
 "                  সয়ংক্রিয়ভাবে।\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - উপস্থিত মাধ্যমের তালিকাবদ্ধ করো।\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2572,91 +2581,91 @@ msgstr ""
 "  --from         - মিরর লিস্টের জন্য উল্লেখিত URL ব্যাবহার করো, স্বাভাবিক হলো\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - ভার্চুয়াল মাধ্যম তৈরী করো যারা সবসময় আপ-টু-ডেট থাকে,\n"
 "                   শুধুমাত্র file:// প্রটোকল অনুমতি পাবে।\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - MD5SUM ফাইল পরীক্ষা নিষ্ক্রিয় করো।\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - নির্বিকার ভাবে।\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - verbose মোড।\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "মাধ্যম যোগ করার অনুমতি শুধুমাত্র superuser এর আছে"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "কনফিগ ফাইল [%s] তৈরী করবে"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "কনফিগ ফাইল [%s] তৈরী করা যাচ্ছ না"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "--distrib এর সাথে <relative path of hdlist> দেয়ার প্রয়োজন নেই"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<relative path of hdlist> পাওয়া যাচ্ছে না\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "\"%s\" মাধ্যম ব্যবহার করা যায়নি"
@@ -2891,12 +2900,12 @@ msgstr "  -f             - hdlist ফাইলসমূহ তৈরী কর�
 msgid "Only superuser is allowed to update media"
 msgstr "শুধুমাত্র superuser-ই মাধ্যম আপডেট করতে পারবে"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "আপডেট করার কিছুই নাই (মাধ্যম যোগ করতে urpmi.addmedia ব্যবহার করো)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2905,17 +2914,17 @@ msgstr ""
 "আপডেটের এন্ট্রি পাওয়া যাচ্ছে না\n"
 "(%s-এর একটা)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "\"%s\" মাধ্যমটি অগ্রাহ্য করা হচ্ছে"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "\"%s\" মাধ্যমটি সক্রিয় করা হচ্ছে"
@@ -3188,6 +3197,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "changelog পাওয়া যায়নি\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - একটি আপডেট মাধ্যম তৈরী করো।\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "ত্রুটিপূর্ণ ইনপুট: [%s]"
diff --git a/po/br.po b/po/br.po
index 644673fd..7dd0434a 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-03-17 17:50+0100\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
 "Language-Team: Breton <LL@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1;plural=0\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Staliadur ar RPM"
@@ -25,7 +25,7 @@ msgstr "Staliadur ar RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Fazi : n'hell ket bet kavet ar restr %s, nullaet vo"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ya"
@@ -83,7 +83,7 @@ msgstr "_Staliañ"
 msgid "_Save"
 msgstr "_Enrollañ"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Nullañ"
@@ -115,8 +115,9 @@ msgstr ""
 msgid "Options:"
 msgstr "Dibarzhoù :"
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr ""
@@ -147,7 +148,7 @@ msgid ""
 "                   (--no-verify-rpm disables it, default is enabled).\n"
 msgstr ""
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -195,7 +196,7 @@ msgstr "Gortozit mar plij ..."
 msgid "Must be root"
 msgstr "Red eo da bezañ root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -206,42 +207,42 @@ msgstr ""
 "%s\n"
 "Kenderc'hel ar staliadur evelato ?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Diwallit"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ya"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (da vremanaat)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (da staliañ)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Choazh ar pakad"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Unan eus ar pakadoù a-heul a zo war-nes bezañ staliet :"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Dilaoskel"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -253,61 +254,61 @@ msgstr ""
 "%s\n"
 "Kenderc'hel evelato ?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Ar pakad a-heul a zo war-nes bezañ staliet evit dalc'hen an ezhommoù :"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Ar pakadoù a-heul a zo war-nes bezañ staliet evit dalc'hen an ezhommoù :"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pakad, %d Mo)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "O staliañ ar pakad ..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "n'hellan ket tigas ar pakadoù tarzh, emaon o terriñ"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "O prientiñ ..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "O staliañ ar pakad `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Enlakait ar medium a vez graet « %s » anezhañ"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "O tigas ar pakad « %s » ..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Graet"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -315,28 +316,28 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Sac'het eo an staliadur :"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Staliet eo ar pakad(où) c'hoazh"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Echu eo ar staliadur"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "lemel %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "oc'h adloc'hañ urpmi"
@@ -414,8 +415,8 @@ msgid "...retrieving done"
 msgstr "... echu eo ar resev"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... sac'het eo ar resev : %s"
@@ -455,52 +456,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq : n'hellan ket lenn ar restr rpm « %s »\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Mankout a ra ar sinadur (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "n'eo ket endeo renkell ar chroot"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -925,217 +926,217 @@ msgid ""
 "update, --use-distrib or --parallel"
 msgstr ""
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Deroù ar glask : %s  fin : %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "o tremen e-biou ar pakad %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "bez vefe staliet ar pakad %s e-lec'h bezañ bremañet"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "endeo eo ar medium « %s »"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "oc'h ouzhpennañ ar vedium « %s » a-raok ar vedium « %s »"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "oc'h ouzhpennañ ar vedium « %s »"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "n'eo ket endeo ar renkell %s"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "n'hell ket bet lennet ar restr media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "o tigas ar restr media.cfg ..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "o skrivañ restr ar roll evit ar medium « %s »"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "o tibab meur a media : %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "o lemel ar medium « %s »"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "oc'h adkefluniañ urpmi evit ar media « %s »"
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "... sac'het eo an adkefluniadur"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "graet eo an adkefluniadur"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Fazi en ur sevel anvioù restr : n'hell ket bet kavet an ezhomm %d"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "bremañ eo ar medium « %s » dija"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "o sell ouzh ar restr synthesis [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "fazi en ur lenn restr synthesis ar vedium « %s »"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "oc'h eilañ [%s] evit ar medium « %s » ..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "... sac'het eo ar staliadur "
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "oc'h eilañ restr deskrivadur eus « %s » ..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "... graet eo an eil"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "sac'het eo eil [%s] (re vihan eo ar restr)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "o jediñ md5sum ar synthesis degaset"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "sac'het eo degas [%s] (ne glot ket ar md5sum)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "sac'het eo bet genhdlist2 gant %s"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "o naetaat %s ha %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "siek eo restr hdlist %s evit ar vedium « %s »"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "oc'h eilañ restr MD5SUM a « %s » ..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "n'eo ket mat an ar restr rpm [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "o resev synthesis tizh evit « %s » ..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "kavet eo bet synthesis evel « %s »"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "n'eus restr synthesis kavet ebet evit ar medium « %s »"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "o sell ouzh restr pubkey « %s » ..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "... bez e oa enporzhet an alc'hwezh %s eus restr pubkey « %s »"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "n'hell ket bet enporzhet restr pubkey « %s »"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "bremañet eo bet ar medium « %s »"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "sac'het eo bet degas [%s]"
@@ -1167,7 +1168,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyOo"
@@ -1237,7 +1238,7 @@ msgstr "Go"
 msgid "TB"
 msgstr "To"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1319,266 +1320,7 @@ msgstr "o marc'hañ %s"
 msgid "unmounting %s"
 msgstr "o divarc'hañ %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "N'eus pakad ebet ket a vez graet %s anezhañ"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "%s zo er pakadoù a-heul : %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "N'hell ket bet staliet ar pakadoù %s"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Staliet eo ar pakad %s c'hoazh"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Staliet eo ar pakadoù %s c'hoazh"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "peogwir %s zo manket"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "peogwir eo staliet ar pakad %s c'hoazh"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "peogwir %s zo manket"
-
-#: ../urpm/select.pm:566
-#, fuzzy, c-format
-msgid "trying to promote %s"
-msgstr "N'eus pakad da zilemel ebet"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "evit mirout %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "evit staliañ %s"
-
-#: ../urpm/select.pm:613
-#, fuzzy, c-format
-msgid "due to conflicts with %s"
-msgstr "peogwir %s zo manket"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "N'eo ket mat ar sinadur (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "N'eo ket mat ID an alc'hwezh (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Mankout a ra ar sinadur (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't write file"
-msgstr "N'hell ket bet skrivet ar restr"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "N'hell ket bet digoret ar restr"
-
-#: ../urpm/sys.pm:289
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "N'hell ket bet fiñvet ar restr eus %s da %s"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme stumm %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Ur meziant frank eo an hini-mañ ha moien zo da zal'ch anezhañ hervez GNU "
-"GPL.\n"
-"\n"
-"arveriadur :\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr ""
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-
-#: ../urpme:52 ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --adpakadiñ    - Adpakadiñ ar restroù a-raok lemel anezho\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - implij ur gwrizienn all evit lemel pakadoù.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../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   - implij ur gwrizienn all evit stlennvon urpmi hag evit "
-"staliañ pakadoù.\n"
-
-#: ../urpme:55
-#, fuzzy, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --description  - deskrivadur ar pakad\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr ""
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Ar gourarveriad hepken a c'hell lemel pakadoù"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "dianav eo ar pakadoù"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "pakad anavez"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "sac'het e vo ho reizhiad ma eo lemelet ar pakad %s"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "N'eus pakad da zilemel ebet"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "N'eus pakad da zilemel ebet"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] ""
-"Ar %d pakad a-heul a zo war-nes bezañ distaliet evit dalc'hen an ezhommoù :"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "pakad anavez"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Lemel %d pakad ?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N)"
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "Trobarzhell lem-laka"
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Fazi en ur lemel"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Fazi en ur lemel"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1595,278 +1337,548 @@ msgstr ""
 "\n"
 "arveriadur : urpmf [dibarzhoù] sil\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr ""
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 ""
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../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   - implij ur gwrizienn all evit stlennvon urpmi hag evit "
+"staliañ pakadoù.\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 ""
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr ""
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr ""
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr ""
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr ""
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr ""
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - ostiz ar sevel\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - amzer ar sevel\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    -restroù kefluniadur\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - deskrivadur ar pakad\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr ""
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - anv restr ar pakad\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - roll ar restroù hag a zo er pakad\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - strollad\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --name         - anv ar pakad\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - anv ar pakad\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr ""
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr ""
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr ""
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - ment pa 'vez staliet\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - anv ar rpm tizh\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - liketennoù damantet\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - diverrañ\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr ""
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr ""
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "n'eus restr hdlist ebet evit ar medium « %s »"
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "n'eus restr synthesis ebet evit ar medium « %s »"
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "n'eus titour XML ebet evit ar medium « %s »"
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "N'eus pakad ebet ket a vez graet %s anezhañ"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "%s zo er pakadoù a-heul : %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "N'hell ket bet staliet ar pakadoù %s"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Staliet eo ar pakad %s c'hoazh"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Staliet eo ar pakadoù %s c'hoazh"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "peogwir %s zo manket"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "peogwir eo staliet ar pakad %s c'hoazh"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "peogwir %s zo manket"
+
+#: ../urpm/select.pm:570
+#, fuzzy, c-format
+msgid "trying to promote %s"
+msgstr "N'eus pakad da zilemel ebet"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "evit mirout %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "evit staliañ %s"
+
+#: ../urpm/select.pm:617
+#, fuzzy, c-format
+msgid "due to conflicts with %s"
+msgstr "peogwir %s zo manket"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "N'eo ket mat ar sinadur (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "N'eo ket mat ID an alc'hwezh (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Mankout a ra ar sinadur (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't write file"
+msgstr "N'hell ket bet skrivet ar restr"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "N'hell ket bet digoret ar restr"
+
+#: ../urpm/sys.pm:289
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "N'hell ket bet fiñvet ar restr eus %s da %s"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme stumm %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Ur meziant frank eo an hini-mañ ha moien zo da zal'ch anezhañ hervez GNU "
+"GPL.\n"
+"\n"
+"arveriadur :\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --adpakadiñ    - Adpakadiñ ar restroù a-raok lemel anezho\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - implij ur gwrizienn all evit lemel pakadoù.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr ""
+
+#: ../urpme:56
+#, fuzzy, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --description  - deskrivadur ar pakad\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr ""
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Ar gourarveriad hepken a c'hell lemel pakadoù"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "dianav eo ar pakadoù"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "pakad anavez"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "sac'het e vo ho reizhiad ma eo lemelet ar pakad %s"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "N'eus pakad da zilemel ebet"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "N'eus pakad da zilemel ebet"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Ar %d pakad a-heul a zo war-nes bezañ distaliet evit dalc'hen an ezhommoù :"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "pakad anavez"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Lemel %d pakad ?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N)"
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "Trobarzhell lem-laka"
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Fazi en ur lemel"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Fazi en ur lemel"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1949,11 +1961,6 @@ msgstr ""
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr ""
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr ""
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2253,7 +2260,7 @@ msgstr ""
 "\n"
 "Kenderc'hel evelato ?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n)"
@@ -2418,10 +2425,12 @@ msgstr "  --root         - implij ur gwrizienn all evit lemel pakadoù.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2429,128 +2438,128 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Ar gourarveriad hepken a c'hell ouzhpennañ ur vedia"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "o krouiñ ar restr kefluniadur [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Ne 'meus ket ar restr kefluniadur [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr ""
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr ""
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "n'eus ket tu da ouzhpennañ ar vedium"
@@ -2780,13 +2789,13 @@ msgstr ""
 msgid "Only superuser is allowed to update media"
 msgstr "Ar gourarveriad hepken a c'hell bremañaat ar media"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "bez eus netra da vremañaat (implij urpmi.addmedia evit ouzhpennañ ur vedia)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2795,17 +2804,17 @@ msgstr ""
 "mankout a ra ar vouetadur da vremañaat\n"
 "(unan eus %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "« %s »"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "o tremen e-biou ar vedia %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "o bevaat ar media %s"
diff --git a/po/bs.po b/po/bs.po
index de69513a..15f0d65b 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2006-09-13 21:02+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM instalacija"
@@ -32,7 +32,7 @@ msgstr "RPM instalacija"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Greška: ne mogu naći datoteku %s, prekidam operaciju"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_U redu"
@@ -98,7 +98,7 @@ msgstr "_Instaliraj"
 msgid "_Save"
 msgstr "_Snimi"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Odustani"
@@ -129,8 +129,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - ispiši ovu poruku.\n"
@@ -167,7 +168,7 @@ msgstr ""
 "  --verify-rpm   - provjeri potpis rpm-a prije instalacije\n"
 "                   (--no-verify-rpm isključuje, normalno je uključeno).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - koristi samo navedene medije, razdvojene zarezom.\n"
@@ -217,7 +218,7 @@ msgstr "Molim sačekajte..."
 msgid "Must be root"
 msgstr "Morate biti root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -228,42 +229,42 @@ msgstr ""
 "%s\n"
 "Da nastavim?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (za ažuriranje)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (za instalaciju)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Izbor paketa"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Jedan od sljedećih paketa je potreban:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Prekini"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -274,19 +275,19 @@ msgstr ""
 "%s\n"
 "Da nastavim?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Da bih zadovoljio ovisnosti, instaliraću sljedeći paket"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Da bih zadovoljio ovisnosti, instaliraću sljedeće pakete"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -294,42 +295,42 @@ msgstr[0] "(%d paketa, %d MB)"
 msgstr[1] "(%d paketa, %d MB)"
 msgstr[2] "(%d paketa, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Instalacija paketa..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ne mogu dobiti izvorne pakete, prekidam"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Pripremam..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instaliram paket `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Molim ubacite medij sa imenom \"%s\" u uređaj [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Downloadujem paket `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Gotovo"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -340,28 +341,28 @@ msgstr ""
 "%s\n"
 "Možda ćete trebati osvježiti vašu urpmi bazu podataka"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Instalacija nije uspjela:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "sve je već instalirano"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Instalacija završena"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "uklanjam %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "restartujem urpmi"
@@ -441,8 +442,8 @@ msgid "...retrieving done"
 msgstr "...download završen"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...dobavljanje nije uspjelo: %s"
@@ -482,52 +483,52 @@ msgstr "Ova operacija je zabranjena dok ste u ograničenom režimu"
 msgid "bad proxy declaration on command line\n"
 msgstr "pogrešna deklaracija proxy-ja na komandnoj liniji\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: ne mogu pročitati rpm datoteku \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "Izrazi za uzorke:\n"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Nedostaje potpis (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "Izrazi za uzorke:\n"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, fuzzy, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Direktorij okruženja %s ne postoji"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Previše argumenata\n"
@@ -954,219 +955,219 @@ msgstr ""
 "--synthesis se ne može koristiti zajedno sa --media, --excludemedia, --"
 "sortmedia, --update, --use-distrib or --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Početak pretrage: %s kraj: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "preskačem paket %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "instaliraću umjesto unaprjeđenja paketa %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "medij \"%s\" već postoji"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "dobavljam zaglavlja sa medija \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "uklanjam medij \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, fuzzy, c-format
 msgid "directory %s does not exist"
 msgstr "Direktorij okruženja %s ne postoji"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, fuzzy, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "izgleda da ovaj URL ne sadrži distrib"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "ne mogu obraditi media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "ne mogu pristupiti prvom instalacionom mediju (nije pronađena hdlist "
 "datoteka)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "skidam media.cfg datoteku..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "ne mogu izabrati nepostojeći medij \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "biram više medija: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "uklanjam medij \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "rekonfigurišem uprmi za medij \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...rekonfiguracija nije uspjela"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "rekonfiguracija završena"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Greška pri pravljenju names datoteke: zavisnost %d nedostaje"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "medij \"%s\" nije izabran"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "ispitujem synthesis datoteku [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problem pri čitanju synthesis datoteke za medij \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "ispisujem list datoteku za medij \"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiranje nije uspjelo"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopiram opisnu datoteku za \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...kopiranje završeno"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopiranje [%s] nije uspjelo (datoteka je sumnjivo mala)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "izračunavam md5sum za dobavljeni hdlist (ili synthesis)"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "kopiranje [%s] nije uspjelo (md5sum se ne poklapa)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "ispitujem hdlist datoteku [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "Instaliram %s na %s..."
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "kopiram opisnu datoteku za \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "neispravno ime rpm datoteke [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "dobavljam hdlist (ili synthesis) za \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "pronašao traženi hdlist (ili synthesis) kao %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "istražujem pubkey datoteku za \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...uveo sam ključ %s iz pubkey datoteke \"%s\"-a"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ne mogu uvesti pubkey datoteku za \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "dodao medij %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1198,7 +1199,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "DdYy"
@@ -1268,7 +1269,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1352,6 +1353,303 @@ msgstr "montiram %s"
 msgid "unmounting %s"
 msgstr "demontiram %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 verzija %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"Ovo je slobodan software i može biti distribuiran pod uslovima GNU GPL-a.\n"
+"\n"
+"upotreba: urpmf [opcije] izraz\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - ispisuje broj verzije ovog alata.\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          - koristi navedenu okolinu (tipično izvještaj o bugu).\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 - ne koristi navedene medije, razdvojene zarezom.\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  - bez prepoznavanja uzorka, koristi argument kao doslovan "
+"tekst.\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
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - koristi drugi dir. za rpm instalaciju.\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    - sortiraj medije prema podstringovima razdvojenim "
+"zarezom.\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --synthesis    - koristi zadani synthesis umjesto urpmi baze.\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    - koristi zadani synthesis umjesto urpmi baze.\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - ne ispisuj identične linije.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - koristi samo medije za unaprjeđenje.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - rječiti mod.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - ne razlikuj velika i mala slova u uzorcima.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -I             - razlikuj velika i mala slova u uzorcima.\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - promjena razdjelnika polja (standardno je ':').\n"
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Izrazi za uzorke:\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           - svaki tekst se tretira kao regexp, osim ako se koristi -"
+"I.\n"
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - uključi perl kod direktno kao perl -e.\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - binarni I operator.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - binarni OR operator.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - unarno NE.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - lijeva i desna zagrada.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Spisak tagova:\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - određuje format izlaza nalik na printf\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   primjer: '%%ime:%%datoteke'\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - arhitektura\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - računar na kojem je kompajliran\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - vrijeme kompajliranja\n"
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - konfiguracione datoteke\n"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - tagovi za konflikte\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - opis paketa\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - distribucija\n"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - epoha\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - ime datoteke paketa\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - lista datoteka u paketu\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - grupa\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name         - ime paketa\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - ime paketa\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - tag 'prevaziđeno'\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - autor paketa\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - tag 'pruža'\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - tag 'zahtijeva'\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - veličina nakon instalacije\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - naziv izvornog rpm-a\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes    - tag 'prevaziđeno'\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - sažetak.\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       - izdavač\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - medij na kojem je paket pronađen\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - štampa verziju, izdanje i arhitekturu sa imenom.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Neispravan format: možete koristiti samo jedan viševrijednosni tag"
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "koristim navedenu okolinu na %s\n"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "nije pronađena hdlist datoteka za medij \"%s\""
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "izgrađena hdlist synthesis datoteka za medij \"%s\""
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "ispisujem list datoteku za medij \"%s\""
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1363,62 +1661,67 @@ msgid ""
 "urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, c-format
 msgid "No package named %s"
 msgstr "Nema paketa pod imenom %s"
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Sljedeći paketi sadrže %s: %s"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
 msgid "due to missing %s"
 msgstr "zbog nedostajućeg %s"
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "zbog nezadovoljenih %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "pokušavam promovirati %s"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "kako bi zadržao %s"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, c-format
 msgid "in order to install %s"
 msgstr "da bih instalirao %s"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "zbog konflikta sa %s"
@@ -1510,18 +1813,17 @@ msgstr "  --repackage    - Prepakuj datoteke prije brisanja\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - koristi drugi korijen za uklanjanje RPM-a.\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - koristi drugi dir. za rpm instalaciju.\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - osvježi samo medije za update.\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - ne izvršavaj skripte u paketu.\n"
 
-#: ../urpme:56
+#: ../urpme:57
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1530,32 +1832,32 @@ msgstr ""
 "  --use-distrib  - podesi urpme u letu iz distrib stabla, korisno za\n"
 "                   chroot de-instalacije uz korištenje --root opcije.\n"
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - rječiti mod.\n"
 
-#: ../urpme:59
+#: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - izaberi sve pakete koji odgovaraju izrazu.\n"
 
-#: ../urpme:72
+#: ../urpme:73
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Samo administrator (superkorisnik) može uklanjati pakete"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown packages"
 msgstr "nepoznati paket"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown package"
 msgstr "nepoznat paket"
 
-#: ../urpme:119
+#: ../urpme:121
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1563,17 +1865,17 @@ msgstr[0] "uklanjanje paketa %s će pokvariti vaš sistem"
 msgstr[1] "uklanjanje paketa %s će pokvariti vaš sistem"
 msgstr[2] "uklanjanje paketa %s će pokvariti vaš sistem"
 
-#: ../urpme:124
+#: ../urpme:126
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nema ništa za uklanjanje"
 
-#: ../urpme:141
+#: ../urpme:143
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Nema ništa za uklanjanje"
 
-#: ../urpme:147
+#: ../urpme:149
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1582,7 +1884,7 @@ msgstr[0] "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
 msgstr[1] "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
 msgstr[2] "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
 
-#: ../urpme:152
+#: ../urpme:154
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1590,7 +1892,7 @@ msgstr[0] "nepoznat paket"
 msgstr[1] "nepoznat paket"
 msgstr[2] "nepoznat paket"
 
-#: ../urpme:159
+#: ../urpme:161
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1598,321 +1900,31 @@ msgstr[0] "Da uklonim %d paketa?"
 msgstr[1] "Da uklonim %d paketa?"
 msgstr[2] "Da uklonim %d paketa?"
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (d/N) "
 
-#: ../urpme:164
+#: ../urpme:166
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "uzimam izmjenjivi uređaj kao \"%s\""
 
-#: ../urpme:178
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "Uklanjanje nije uspjelo"
 
-#: ../urpme:180
+#: ../urpme:183
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Uklanjanje nije uspjelo"
 
-#: ../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 verzija %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"Ovo je slobodan software i može biti distribuiran pod uslovima GNU GPL-a.\n"
-"\n"
-"upotreba: urpmf [opcije] izraz\n"
-
-#: ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - ispisuje broj verzije ovog alata.\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - koristi navedenu okolinu (tipično izvještaj o bugu).\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - ne koristi navedene medije, razdvojene zarezom.\n"
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - bez prepoznavanja uzorka, koristi argument kao doslovan "
-"tekst.\n"
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - sortiraj medije prema podstringovima razdvojenim "
-"zarezom.\n"
-
-#: ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --synthesis    - koristi zadani synthesis umjesto urpmi baze.\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - koristi zadani synthesis umjesto urpmi baze.\n"
-
-#: ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - ne ispisuj identične linije.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - koristi samo medije za unaprjeđenje.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - rječiti mod.\n"
-
-#: ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - ne razlikuj velika i mala slova u uzorcima.\n"
-
-#: ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -I             - razlikuj velika i mala slova u uzorcima.\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - promjena razdjelnika polja (standardno je ':').\n"
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Izrazi za uzorke:\n"
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           - svaki tekst se tretira kao regexp, osim ako se koristi -"
-"I.\n"
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - uključi perl kod direktno kao perl -e.\n"
-
-#: ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - binarni I operator.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - binarni OR operator.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - unarno NE.\n"
-
-#: ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - lijeva i desna zagrada.\n"
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Spisak tagova:\n"
-
-#: ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - određuje format izlaza nalik na printf\n"
-
-#: ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   primjer: '%%ime:%%datoteke'\n"
-
-#: ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - arhitektura\n"
-
-#: ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - računar na kojem je kompajliran\n"
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - vrijeme kompajliranja\n"
-
-#: ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - konfiguracione datoteke\n"
-
-#: ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - tagovi za konflikte\n"
-
-#: ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - opis paketa\n"
-
-#: ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - distribucija\n"
-
-#: ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - epoha\n"
-
-#: ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - ime datoteke paketa\n"
-
-#: ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - lista datoteka u paketu\n"
-
-#: ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - grupa\n"
-
-#: ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name         - ime paketa\n"
-
-#: ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - ime paketa\n"
-
-#: ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - tag 'prevaziđeno'\n"
-
-#: ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - autor paketa\n"
-
-#: ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - tag 'pruža'\n"
-
-#: ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - tag 'zahtijeva'\n"
-
-#: ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - veličina nakon instalacije\n"
-
-#: ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - naziv izvornog rpm-a\n"
-
-#: ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes    - tag 'prevaziđeno'\n"
-
-#: ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - sažetak.\n"
-
-#: ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - URL\n"
-
-#: ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - izdavač\n"
-
-#: ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - medij na kojem je paket pronađen\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - štampa verziju, izdanje i arhitekturu sa imenom.\n"
-
 #: ../urpmf:153
 #, fuzzy, c-format
 msgid "unterminated expression (%s)"
 msgstr "Izrazi za uzorke:\n"
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Neispravan format: možete koristiti samo jedan viševrijednosni tag"
-
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "koristim navedenu okolinu na %s\n"
-
-#: ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-
-#: ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "izgrađena hdlist synthesis datoteka za medij \"%s\""
-
-#: ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "ispisujem list datoteku za medij \"%s\""
-
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2003,11 +2015,6 @@ msgstr "  --clean        - ukloni rpm iz spremnika prije svega ostalog.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - čuvaj neiskorištene rpm-ove u spremniku.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - osvježi samo medije za update.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2334,7 +2341,7 @@ msgstr ""
 "\n"
 "Svejedno nastavljate instalaciju?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (D/n) "
@@ -2519,10 +2526,12 @@ msgstr "  --curl         - koristi curl za download datoteka.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - napravi medij za unaprjeđenje.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2530,24 +2539,24 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - pokušaj naći i koristiti synthesis datoteku.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  --no-probe     - ne pokušavaj pronaći synthesis ili\n"
 "                   hdlist datoteku.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2556,17 +2565,17 @@ msgstr ""
 "  --distrib      - automatski napravi sve medije iz instalacionog\n"
 "                   medija.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr "  --interactive  - sa --distrib, pitaj prije svakog medija\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - sa --distrib, dodaj sve navedene medije\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2575,74 +2584,74 @@ msgstr ""
 "  --from         - koristi navedeni url za listu mirrora, podrazumijeva se\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - napravi virtuelne medije koji su uvijek osvježeni,\n"
 "                   dozvoljen je samo protokol file:// .\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - isključi provjeru MD5SUM datoteke.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - nemoj uvoziti pubkey dodanog medija\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - dodaj medij u konfiguraciju, ali bez ažuriranja.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - tihi mod.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - rječiti mod.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Samo administrator (superkorisnik) može dodavati medije"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "Napraviću konf. datoteku [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Ne mogu napraviti konf. datoteku [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "nema potrebe da navodite <relativnu putanju do hdlist> sa --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2651,17 +2660,17 @@ msgstr ""
 "\n"
 "Želite li dodati medij '%s'"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<relativni put do datoteke hdlist> nedostaje\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "ne mogu pristupiti mediju \"%s\""
@@ -2901,12 +2910,12 @@ msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Samo administrator (superkorisnik) može ažurirati medije"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ništa za update (koristite urpmi.addmedia da dodate medij)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2915,17 +2924,17 @@ msgstr ""
 "stavka za update nedostaje\n"
 "(jedan od %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignorišem medij %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "uključujem medij %s"
@@ -3204,6 +3213,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Nije pronađen changelog\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - napravi medij za unaprjeđenje.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "neispravan URL: [%s]"
 
diff --git a/po/ca.po b/po/ca.po
index ee023878..d0e85e50 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2005-09-19 23:29+0200\n"
 "Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Instal·lació de RPM"
@@ -30,7 +30,7 @@ msgstr "Instal·lació de RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_D'acord"
@@ -98,7 +98,7 @@ msgstr "_Instal·lació"
 msgid "_Save"
 msgstr "_Desa"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Cancel·la"
@@ -130,8 +130,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - mostra aquest missatge d'ajuda.\n"
@@ -169,7 +170,7 @@ msgstr ""
 "                   (--no-verify-rpm la deshabilita, per defecte està "
 "habilitat)\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -223,7 +224,7 @@ msgstr "Si us plau, espereu..."
 msgid "Must be root"
 msgstr "S'ha de ser root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -234,42 +235,42 @@ msgstr ""
 "%s\n"
 "Voleu continuar igualment?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Advertència"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "D'acord"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (a actualitzar)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (a instal·lar)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Cal un dels paquets següents:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Avorta"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -280,61 +281,61 @@ msgstr ""
 "%s\n"
 "Voleu continuar igualment?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Per complir les dependències, s'instal·lara el següent paquet:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Per complir les dependències, s'instal·laran els paquets següents:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d paquet, %d MB)"
 msgstr[1] "(%d paquets, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Instal·lació de paquets..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "no es poden recuperar els paquets font. S'està interrompent"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "S'està preparant..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "S'està instal·lant el paquet `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Si us plau, inseriu la font anomenada \"%s\" al dispositiu [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "S'està descarregant el paquet `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Fet"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -346,28 +347,28 @@ msgstr ""
 "%s\n"
 "Potser voleu actualitzar la base de dades urpmi"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "La instal·lació ha fallat:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Ja està tot instal·lat"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Instal·lació finalitzada"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "s'està eliminant %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "s'esta reiniciant urpmi"
@@ -447,8 +448,8 @@ msgid "...retrieving done"
 msgstr "...recuperació feta"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...ha fallat la recuperació: %s"
@@ -488,52 +489,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr "declaració errònia del proxy a la línia de comandes\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: no s'ha pogut llegir el fitxer rpm \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Falta la signatura (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -964,219 +965,219 @@ msgstr ""
 "--synthesis no es pot usar amb --media, --excludemedia, --sortmedia, --"
 "update, --use-distrib ni --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr ""
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "s'està saltant el paquet %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "instal·laria en comptes d'actualitzar el paquet %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "la font \"%s\" ja existeix"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "s'estan llegint les capçaleres de la font \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "s'està esborrant la font \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "no s'ha pogut obrir rpmdb"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "no s'ha pogut accedir la primera font d'instal·lació (no s'ha trobat fitxer "
 "hdlists)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "s'està recuperant el fitxer hdlists..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "s'ha intentant seleccionar una font inexistent \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "s'està seleccionant múltiples fonts: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "s'està esborrant la font \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "s'està reconfigurant l'urpmi per la font \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "..la reconfiguració ha fallat"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "reconfiguració acabada"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "la font \"%s\" no ha estat seleccionada"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "s'està examinant el fitxer de síntesi [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "s'ha trobat un problema llegint el fitxer de síntesi de la font \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "s'està escrivint el fitxer list per la font \"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "..la còpia ha fallat"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "s'està copiant el fitxer de descripció de \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...còpia feta"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "la còpia de [%s] ha fallat (el fitxer és sospitosament petit)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "s'està computant el md5sum de la font hdlist (o síntesi) recuperada"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "la còpia de [%s] ha fallat (el md5sum no concorda)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "s'està examinant el fitxer hdlist [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "s'està instal·lant %s des de %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "no s'ha trobat el fitxer hdlist per a la font \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "s'està copiant el fitxer de descripció de \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "el nom del fitxer rpm és incorrecte [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "s'està recuperant el hdlist font (o la síntesi) de \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "s'ha trobat l'hdlist (o síntesi) buscat a %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "no s'ha trobat el fitxer hdlist per a la font \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "s'està examinant el fitxer de clau pública de \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...s'ha importat la clau %s del fitxer de clau pública de \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "no s'ha pogut importat el fitxer de clau pública de \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "s'ha afegit la font %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1208,7 +1209,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "SsYy"
@@ -1278,7 +1279,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1361,271 +1362,7 @@ msgstr "s'està muntant %s"
 msgid "unmounting %s"
 msgstr "s'està desmuntant %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "No hi cap paquet anomenat %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Els paquets següents contenen %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Ja està tot instal·lat"
-
-#: ../urpm/select.pm:539
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Ja està tot instal·lat"
-
-#: ../urpm/select.pm:540
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Ja està tot instal·lat"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "degut a que falten %s"
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "Ja està tot instal·lat"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "degut a %s no satisfetes"
-
-#: ../urpm/select.pm:566
-#, fuzzy, c-format
-msgid "trying to promote %s"
-msgstr "Res a eliminar"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "per tal de mantenir %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "per tal d'instal·lar %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "degut a conflictes amb %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Signatura no vàlida (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "ID de clau no vàlid (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Falta la signatura (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "no s'ha pogut escriure el fitxer [%s]"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "La còpia ha fallat"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "La còpia ha fallat"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme versió %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Aquest programa és lliure i es pot redistribuir sota els termes de la GPL de "
-"GNU.\n"
-"\n"
-"sintaxi:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto         - en escollir, selecciona un paquets automàticament.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - verifica si l'eliminació pot ser duta a terme.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi distribuït pels ordinadors de l'àlias.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, fuzzy, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --packager     - mostra l'etiqueta packager: empaquetador.\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - usa una altre arrel per l'eliminació de rpm.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - usa una altre arrel per la instal·lació de rpm.\n"
-
-#: ../urpme:55
-#, fuzzy, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --description   - mostra l'etiqueta description: descripció.\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - mode detallat.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - selecciona tots els paquets que coincideixen amb "
-"l'expressió.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "El superusuari és l'únic autoritzat per a eliminar paquets"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "paquets desconeguts"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "paquet desconegut"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "eliminar el paquet %s trencarà el vostre sistema"
-msgstr[1] "eliminar el paquet %s trencarà el vostre sistema"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Res a eliminar"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Res a eliminar"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "Per a complir les dependències, s'eliminara el següent paquet"
-msgstr[1] ""
-"Per a complir les dependències, s'eliminaran els següents %d paquets"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "paquet desconegut"
-msgstr[1] "paquet desconegut"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Elimina %d paquet?"
-msgstr[1] "Elimina %d paquets?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (s/N) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "agafant dispositiu extraïble com a \"%s\""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "L'eliminació ha fallat"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "L'eliminació ha fallat"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1642,30 +1379,37 @@ msgstr ""
 "\n"
 "sintaxi: urpmf [opcions] patró-expressió\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - mostra la informació de la versió.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - utilitza un entorn concret (normalment un\n"
 "                   informe d'errors).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - no usis les fonts donades, separades per comes.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - usa una altre arrel per la instal·lació de 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"
@@ -1673,264 +1417,532 @@ msgstr ""
 "  --sortmedia        - ordena les fonts segons les cadenes donades, s'han de "
 "separar amb comes.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 "  --synthesis    - utilitza la síntesi donada en comptes de la bd de urpmi.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - utilitza la síntesi donada en comptes de la bd de urpmi.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - no imprimeix línies idèntiques.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - utilitza només les fonts d'actualització.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  -verbose             - mode detallat.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - ignora les distincions de majúscules en els patrons.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -i             - ignora les distincions de majúscules en els patrons.\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - operador binari AND.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - operador binari OR.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - NOT unari.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 "  ( )            - parentesis esquerre i dret per expressions de grup.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Llista de etiquetes:\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - utilitza l'interfície X.\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   exemple: '%%name:%%files'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - mostra l'etiqueta url: url.\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - màquina de construcció.\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "Mòdul de configuració de la consola"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 "  --conflicts     - mostra l'etiqueta conflicts: tots els conflictes.\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - mostra la descripció.\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - mostra l'etiqueta epoch: època.\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name           - imprimeix només els noms dels paquets.\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - llista els fitxers del paquet.\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group         - mostra el grup del paquet.\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --name           - imprimeix només els noms dels paquets.\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name           - imprimeix només els noms dels paquets.\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 "  --obsoletes     - mostra l'etiqueta obsoletes: tots els paquets que deixa "
 "obsolets.\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - empaquetador.\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr ""
 "  --provides      - mostra l'etiqueta provides: tots allò que proporciona.\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr ""
 "  --requires      - mostra l'etiqueta requires: tots allò que necessita.\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size          - mostra l'etiqueta size: mida.\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - mostra l'etiqueta sourcerpm: rpm de codi font.\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr ""
 "  --obsoletes     - mostra l'etiqueta obsoletes: tots els paquets que deixa "
 "obsolets.\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - imprimeix el resum.\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - mostra l'etiqueta url: url.\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  -verbose             - mode detallat.\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - llista els fitxers del paquet.\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - mostra la versió, llançament i arquitectura amb el nom.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "no s'ha trobat el fitxer hdlist per a la font \"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "s'ha construït el fitxer de síntesi hdlist per a la font \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "s'està escrivint el fitxer list per la font \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "No hi cap paquet anomenat %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Els paquets següents contenen %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Ja està tot instal·lat"
+
+#: ../urpm/select.pm:543
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Ja està tot instal·lat"
+
+#: ../urpm/select.pm:544
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Ja està tot instal·lat"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "degut a que falten %s"
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Ja està tot instal·lat"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "degut a %s no satisfetes"
+
+#: ../urpm/select.pm:570
+#, fuzzy, c-format
+msgid "trying to promote %s"
+msgstr "Res a eliminar"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "per tal de mantenir %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "per tal d'instal·lar %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "degut a conflictes amb %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Signatura no vàlida (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "ID de clau no vàlid (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Falta la signatura (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "no s'ha pogut escriure el fitxer [%s]"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "La còpia ha fallat"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "La còpia ha fallat"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme versió %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Aquest programa és lliure i es pot redistribuir sota els termes de la GPL de "
+"GNU.\n"
+"\n"
+"sintaxi:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - en escollir, selecciona un paquets automàticament.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - verifica si l'eliminació pot ser duta a terme.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi distribuït pels ordinadors de l'àlias.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, fuzzy, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --packager     - mostra l'etiqueta packager: empaquetador.\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - usa una altre arrel per l'eliminació de rpm.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - utilitza només les fonts d'actualització.\n"
+
+#: ../urpme:56
+#, fuzzy, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --description   - mostra l'etiqueta description: descripció.\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - mode detallat.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - selecciona tots els paquets que coincideixen amb "
+"l'expressió.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "El superusuari és l'únic autoritzat per a eliminar paquets"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "paquets desconeguts"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "paquet desconegut"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "eliminar el paquet %s trencarà el vostre sistema"
+msgstr[1] "eliminar el paquet %s trencarà el vostre sistema"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Res a eliminar"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Res a eliminar"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Per a complir les dependències, s'eliminara el següent paquet"
+msgstr[1] ""
+"Per a complir les dependències, s'eliminaran els següents %d paquets"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "paquet desconegut"
+msgstr[1] "paquet desconegut"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Elimina %d paquet?"
+msgstr[1] "Elimina %d paquets?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "agafant dispositiu extraïble com a \"%s\""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "L'eliminació ha fallat"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "L'eliminació ha fallat"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2027,11 +2039,6 @@ msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr ""
 "  --noclean      - conserva els rpm que no s'utilitzen a la memòria cau.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - utilitza només les fonts d'actualització.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2352,7 +2359,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Voleu continuar igualment?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (S/n) "
@@ -2536,10 +2543,12 @@ msgstr "  --curl         - usa curl per a recuperar fitxers llunyans.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - crea una font d'actualització.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2547,22 +2556,22 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - usa el fitxer de síntesi.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - no intenta buscar cap fitxer síntesi o hdlist.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2571,17 +2580,17 @@ msgstr ""
 "  --distrib      - automàticament crea tots les fonts des d'una font\n"
 "                   d'instal·lació.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - llista les fonts disponibles.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2590,89 +2599,89 @@ msgstr ""
 "  --from         - usa la url especificada per a la llista de rèpliques, \n"
 "                   la url per defecte és %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - deshabilita la comprovació MD5SUM.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - mode silenciós.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - mode detallat.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "El superusuari és l'únic autoritzat per a afegir fonts"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "Crearà el fitxer de configuració [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "No s'ha pogut crear el fitxer de configuració [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "no fa falta proporcionar el <camí relatiu de l'hdlist> amb --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "falta el <camí relatiu de l'hdlist>\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "no s'ha pogut accedir a al font \"%s\""
@@ -2912,13 +2921,13 @@ msgstr ""
 msgid "Only superuser is allowed to update media"
 msgstr "El superusuari és l'únic autoritzat per a actualitzar fonts"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "no hi ha res per actualitzar (utilitzeu urpmi.addmedia per afegir una font)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2927,17 +2936,17 @@ msgstr ""
 "falta l'entrada per actualitzar\n"
 "(una de %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "s'està ignorant la font %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "s'està habilitant la font %s"
@@ -3216,6 +3225,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "No s'ha trobat la llista de canvis\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - crea una font d'actualització.\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "entrada mal formada: [%s]"
diff --git a/po/cs.po b/po/cs.po
index fe7f324a..aa4f7d6b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-08-16 01:16+0200\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -21,9 +21,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Instalace RPM"
@@ -33,7 +34,7 @@ msgstr "Instalace RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Chyba: nelze nalézt soubor %s, operace bude zrušena"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -100,7 +101,7 @@ msgstr "_Instalovat"
 msgid "_Save"
 msgstr "_Uložit"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Přerušit"
@@ -132,8 +133,9 @@ msgstr ""
 msgid "Options:"
 msgstr "Volby:"
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help           - vypíše tuto nápovědu.\n"
@@ -149,13 +151,17 @@ msgstr ""
 
 #: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - automaticky vybere balíčky pro aktualizaci systému.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - automaticky vybere balíčky pro aktualizaci systému.\n"
 
 #: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - spustí program i v případě, že některé balíčky chybí.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - spustí program i v případě, že některé balíčky chybí.\n"
 
 #: ../gurpmi.pm:50 ../urpmi:133
 #, c-format
@@ -166,7 +172,7 @@ msgstr ""
 "  --verify-rpm   - zkontroluje před instalací podpis balíčku RPM\n"
 "                   (volba --no-verify-rpm toto vypne, jinak povoleno).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media         - použít pouze uvedené zdroje, oddělené čárkou.\n"
@@ -184,18 +190,21 @@ msgstr "  -P             - nehledá balíček v položkách provides.\n"
 #: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - použít pro instalaci balíčků jiný kořenový adresář.\n"
+msgstr ""
+"  --root         - použít pro instalaci balíčků jiný kořenový adresář.\n"
 
 #: ../gurpmi.pm:56 ../urpmi:135
 #, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
-msgstr "  --test         - pouze zkontrolovat, zda lze provést instalacisprávně.\n"
+msgstr ""
+"  --test         - pouze zkontrolovat, zda lze provést instalacisprávně.\n"
 
 #: ../gurpmi.pm:57 ../urpmi:76
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - použít pouze zadané zdroje pro vyhledávání požadovaných "
 "balíčků.\n"
@@ -215,7 +224,7 @@ msgstr "Čekejte prosím..."
 msgid "Must be root"
 msgstr "Nutný root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -226,42 +235,42 @@ msgstr ""
 "%s\n"
 "Pokračovat i přesto v instalaci?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Varování"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (k aktualizaci)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (k instalaci)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Výběr balíčků"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Je zapotřebí jeden z následujících balíčků:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Přerušit"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -272,17 +281,19 @@ msgstr ""
 "%s\n"
 "Pokračovat i přesto v instalaci?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
 msgstr "Aby byly splněny závislosti, bude nainstalován následující balíček"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Aby byly splněny závislosti, budou nainstalovány následující balíčky"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -290,42 +301,42 @@ msgstr[0] "(%d balíček, %d MB)"
 msgstr[1] "(%d balíčky, %d MB)"
 msgstr[2] "(%d balíčků, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Instalace balíčku..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "nelze získat zdrojový balíček, končím"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Připravuji..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instaluji balíček `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Prosím vložte médium nazvané \"%s\""
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Stahuje se balíček `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Hotovo"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -336,28 +347,28 @@ msgstr ""
 "%s\n"
 "Možná potřebujete aktualizovat vaši databázi urpmi"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Instalace selhala:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "vše je již nainstalováno"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Instalace dokončena"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "odstraňuje se %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "restartuji urpmi"
@@ -437,8 +448,8 @@ msgid "...retrieving done"
 msgstr "...načítání ukončeno"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...načítání selhalo: %s"
@@ -478,52 +489,52 @@ msgstr "Tato operace je zakázána při běhu v omezeném režimu"
 msgid "bad proxy declaration on command line\n"
 msgstr "špatně zadaná proxy na příkazové řádce\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: nemohu přečíst rpm soubor \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr "neočekávaný výraz %s"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, c-format
 msgid "missing expression before %s"
 msgstr "chybí výraz před %s"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "neočekávaný výraz %s (návrh: použijte -a nebo -o ?)"
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr "chybí výraz pro zavření"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "urpmf očekává implicitně regulární výraz, použijte volbu \"--literal\""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "adresář chroot neexistuje"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Nelze použít %s bez %s"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Nelze použít %s zároveň s %s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Příliš mnoho parametrů\n"
@@ -724,7 +735,8 @@ msgstr "[přebaluje se]"
 
 #: ../urpm/install.pm:175
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "vytvořena transakce pro instalaci na %s (odstranění=%d, instalace=%d, "
 "aktualizace=%d)"
@@ -902,7 +914,8 @@ msgstr "neplatný soubor MD5SUM"
 #: ../urpm/md5sum.pm:28
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
-msgstr "varování: kontrolní součet md5sum pro %s není k dispozici v souboru MD5SUM"
+msgstr ""
+"varování: kontrolní součet md5sum pro %s není k dispozici v souboru MD5SUM"
 
 #: ../urpm/media.pm:204
 #, c-format
@@ -953,217 +966,217 @@ msgstr ""
 "volbu --synthesis nelze použít s volbami --media, --excludemedia, --"
 "sortmedia, --update, --use-distrib nebo --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Hledání začátek: %s konec: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "přeskakuji balíček %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "místo aktualizace bych instaloval balíček %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "zdroj \"%s\" již existuje"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(implicitně ignorováno)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "přidávám zdroj \"%s\" před vzdálený zdroj \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "přidávám zdroj \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "adresář %s neexistuje"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "toto umístění zdá se neobsahuje žádnou distribuci"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "nelze zpracovat media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "nelze přistupovat k distribučnímu zdroji (chybí soubor media.cfg)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "vynechávám nekompatibilní zdroje `%s' (pro %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "načítám soubor media.cfg..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "pokouším se vybrat neexistující zdroj \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "vybírám více zdrojů: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "odebírám zdroj \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "přenastavuji urpmi pro zdroj \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...přenastavení selhalo"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "přenastaveno"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Chyba při generování souboru s názvy: závislost %d nebyla nalezena"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "zdroj \"%s\" je aktuální"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "zpracovávám soubor syntézy [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problém při čtení souboru se syntézou zdroje \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "kopíruji [%s] pro zdroj \"%s\"..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...kopírování selhalo"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopíruji soubor s popisy pro \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...kopírování ukončeno"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopírování [%s] selhalo (soubor je podezřele malý)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "počítám součet md5 získaného zdrojového souboru se syntézou"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "načtení [%s] selhalo (chyba v kontrolním součtu md5sum)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2 selhal na %s"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "porovnávám %s a %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "neplatný soubor hdlist %s pro zdroj \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "kopíruji soubor MD5SUM z \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "neplatný soubor MD5SUM (stažený z %s)"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "načítám zdrojový soubor se syntézou pro \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "nalezen ověřený soubor se syntézou jako %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "nebyl nalezen soubor se syntézou pro zdroj \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "zkoumá se soubor s veřejnými klíči \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importuji klíč %s ze souboru veřejných klíčů \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "nelze importovat soubor s veřejnými klíči \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "aktualizován zdroj \"%s\""
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "načtení [%s] selhalo"
@@ -1195,7 +1208,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "AaYy"
@@ -1265,7 +1278,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1274,14 +1287,14 @@ msgid_plural ""
 "The following packages are now orphans, use \"urpme --auto-orphans\" to "
 "remove them."
 msgstr[0] ""
-"Následující balíček je nyní sirotek, k jeho odstranění použijte "
-"\"urpme --auto-orphans\"."
+"Následující balíček je nyní sirotek, k jeho odstranění použijte \"urpme --"
+"auto-orphans\"."
 msgstr[1] ""
-"Následující balíčky jsou nyní sirotci, k jejich odstranění použijte "
-"\"urpme --auto-orphans\"."
+"Následující balíčky jsou nyní sirotci, k jejich odstranění použijte \"urpme "
+"--auto-orphans\"."
 msgstr[2] ""
-"Následující balíčky jsou nyní sirotci, k jejich odstranění použijte "
-"\"urpme --auto-orphans\"."
+"Následující balíčky jsou nyní sirotci, k jejich odstranění použijte \"urpme "
+"--auto-orphans\"."
 
 #: ../urpm/parallel.pm:14
 #, c-format
@@ -1357,6 +1370,309 @@ msgstr "připojuji %s"
 msgid "unmounting %s"
 msgstr "odpojuji %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 verze %s\n"
+"Copyright ©2002-2006 Mandriva.\n"
+"Toto je svobodný software a je volně šiřitelný dle podmínek licence GNU "
+"GPL.\n"
+"\n"
+"použití: urpmf [volby] vzor-výraz\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - vypíše číslo verze tohoto nástroje.\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          - použij specifické prostředí (většinou hlášení o chybě).\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 - nepoužít zadané zdroje, oddělené čárkami.\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  - neporovnávat vzory, použije se parametr jako prostý "
+"řetězec.\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   - použít jiný kořenový adresář pro instalaci balíčků rpm a "
+"databázi urpmi.\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    - třídit zdroje podle podřetězců oddělených čárkami.\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - použít zadanou cestu pro přístup ke zdroji\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    - použít daný soubor se syntézou místo databáze urpmi.\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - nevytiskne stejné řádky.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - použít pouze aktualizaci zdroje.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - užvaněný režim.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i         - ignorují se velká a malá písmena ve všech vzorech.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -I             - ve vzorech se bere ohled na malá a velká písmena "
+"(výchozí).\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - změní oddělovač pole (běžně na ':').\n"
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "vzorek výrazů:\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           - každ text je brán jako regulerní výraz, pokud není zadáno "
+"-l.\n"
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - vloží kód Perl přímo jako perl -e.\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - binární operátor AND.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - binární operátor OR.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - unární operátor NOT.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - levá a pravá závorka.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Seznam značek (tagů):\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - udává výstupní formát podle příkazu printf\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   příklad: '%%název:%%soubory'\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - architektura\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - sestavovací počítač\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - doba sestavení ze zdrojových kódů\n"
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - soubory s nastavením\n"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts     - tag s konflikty\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - popis balíčku\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - distribuce\n"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - epocha\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - název souboru balíčku\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - seznam souborů obsažených v balíčku\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - skupina\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - licence\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - název balíčku\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - co se nahrazuje (dělá zastaralým)\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - kdo vytvořil balíček\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - co se poskytuje\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - co se požaduje\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - instalovaná velikost\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - název zdrojového balíčku rpm\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - doporučené (navrhované) balíčky\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - shrnutí\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       - dodavatel\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - zdroj, ve kterém byl balíček nalezen\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - společně se jménem vypíše verzi, vydání a architekturu.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Nesprávný formát: můžete použít pouze jeden vícehodnotový tag"
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "používá se specifické prostředí na %s\n"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "není k dispozici žádný soubor hdlist pro zdroj \"%s\""
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "není k dispozici žádný soubor se syntézou pro zdroj \"%s\""
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "není k dispozici žádné xml-info pro zdroj \"%s\""
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1364,65 +1680,72 @@ msgstr "urpmi bylo znovu spuštěno a seznam prioritních balíčků se nezměni
 
 #: ../urpm/select.pm:30
 #, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi bylo znovu spuštěno a seznam prioritních balíčků se změnil: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi bylo znovu spuštěno a seznam prioritních balíčků se změnil: %s vs %s"
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, c-format
 msgid "No package named %s"
 msgstr "Žádný balíček s názvem %s"
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Následující balíčky obsahují: %s: %s"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "nalezeny balíčky %s v db urpmi, ale žádný není instalovaný"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Balíček %s je již nainstalován"
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Balíčky %s jsou již nainstalovány"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
 msgid "due to missing %s"
 msgstr "z důvodu chybějícího %s"
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, c-format
 msgid "due to already installed %s"
 msgstr "díky již nainstalovanému %s"
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "z důvodu nesplněného %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "pokouším se postoupit %s"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "aby bylo možné zachovat %s"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, c-format
 msgid "in order to install %s"
 msgstr "pro instalaci %s"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "z důvodu konfliktů s %s"
@@ -1497,12 +1820,14 @@ msgstr "  --auto-orphans - odstraní sirotky\n"
 #: ../urpme:49
 #, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - zkontrolovat, zda lze dokončit odstranění správně.\n"
+msgstr ""
+"  --test         - zkontrolovat, zda lze dokončit odstranění správně.\n"
 
 #: ../urpme:51 ../urpmi:109 ../urpmq:68
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - distribuovaný program urpmi na počítačích s přezdívkou.\n"
+msgstr ""
+"  --parallel     - distribuovaný program urpmi na počítačích s přezdívkou.\n"
 
 #: ../urpme:52 ../urpmi:141
 #, c-format
@@ -1512,22 +1837,21 @@ msgstr "  --repackage    - Před smazáním znovu zabalí soubory\n"
 #: ../urpme:53
 #, c-format
 msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - použít pro odebrání balíčků jiný kořenový adresář.\n"
+msgstr ""
+"  --root         - použít pro odebrání balíčků jiný kořenový adresář.\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpme:55 ../urpmi:101
 #, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
 msgstr ""
-"  --urpmi-root   - použít jiný kořenový adresář pro instalaci balíčků rpm a "
-"databázi urpmi.\n"
+"  --justdb       - aktualizovat pouze databázi RPM, ne souborový systém.\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - nespustí skriptlet(y) balíčku.\n"
 
-#: ../urpme:56
+#: ../urpme:57
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1536,32 +1860,32 @@ msgstr ""
 "  --use-distrib  - nastavit urpme za provozu ze stromu distribuce, užitečné\n"
 "                   při (od)instalaci chroot s volbou --root.\n"
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - užvaněný režim.\n"
 
-#: ../urpme:59
+#: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - vybere všechny balíčky vyhovující výrazu.\n"
 
-#: ../urpme:72
+#: ../urpme:73
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Odstranit balíčky může pouze uživatel root"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown packages"
 msgstr "neznámé balíčky"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown package"
 msgstr "neznámý balíček"
 
-#: ../urpme:119
+#: ../urpme:121
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1569,25 +1893,26 @@ msgstr[0] "Odebrání následujícího balíčku naruší funkčnost vašeho sys
 msgstr[1] "Odebrání následujících balíčků naruší funkčnost vašeho systému:"
 msgstr[2] "Odebrání následujících balíčků naruší funkčnost vašeho systému:"
 
-#: ../urpme:124
+#: ../urpme:126
 #, c-format
 msgid "Nothing to remove"
 msgstr "Není co odebrat"
 
-#: ../urpme:141
+#: ../urpme:143
 #, c-format
 msgid "No orphans to remove"
 msgstr "Nejsou sirotci k odebrání"
 
-#: ../urpme:147
+#: ../urpme:149
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
 msgstr[0] "Aby byly splněny závislosti, bude odebrán %d balíček"
 msgstr[1] "Aby byly splněny závislosti, budou odebrány %d balíčky"
 msgstr[2] "Aby byly splněny závislosti, bude odebráno %d balíčků"
 
-#: ../urpme:152
+#: ../urpme:154
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1595,7 +1920,7 @@ msgstr[0] "(sirotčí balíček)"
 msgstr[1] "(sirotčí balíčky)"
 msgstr[2] "(sirotčí balíčky)"
 
-#: ../urpme:159
+#: ../urpme:161
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1603,323 +1928,36 @@ msgstr[0] "Odstranit %d balíček?"
 msgstr[1] "Odstranit %d balíčky?"
 msgstr[2] "Odstranit %d balíčků?"
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (a/N) "
 
-#: ../urpme:164
+#: ../urpme:166
 #, c-format
 msgid "testing removal of %s"
 msgstr "testuji odstranění %s"
 
-#: ../urpme:178
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "Odebírání selhalo"
 
-#: ../urpme:180
+#: ../urpme:183
 #, c-format
 msgid "Removal is possible"
 msgstr "Odstranění je možné"
 
-#: ../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 verze %s\n"
-"Copyright ©2002-2006 Mandriva.\n"
-"Toto je svobodný software a je volně šiřitelný dle podmínek licence GNU "
-"GPL.\n"
-"\n"
-"použití: urpmf [volby] vzor-výraz\n"
-
-#: ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - vypíše číslo verze tohoto nástroje.\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - použij specifické prostředí (většinou hlášení o chybě).\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - nepoužít zadané zdroje, oddělené čárkami.\n"
-
-#: ../urpmf:39
-#, c-format
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - neporovnávat vzory, použije se parametr jako prostý "
-"řetězec.\n"
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - třídit zdroje podle podřetězců oddělených čárkami.\n"
-
-#: ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - použít zadanou cestu pro přístup ke zdroji\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - použít daný soubor se syntézou místo databáze urpmi.\n"
-
-#: ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - nevytiskne stejné řádky.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - použít pouze aktualizaci zdroje.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - užvaněný režim.\n"
-
-#: ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i         - ignorují se velká a malá písmena ve všech vzorech.\n"
-
-#: ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -I             - ve vzorech se bere ohled na malá a velká písmena "
-"(výchozí).\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - změní oddělovač pole (běžně na ':').\n"
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "vzorek výrazů:\n"
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           - každ text je brán jako regulerní výraz, pokud není zadáno "
-"-l.\n"
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - vloží kód Perl přímo jako perl -e.\n"
-
-#: ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - binární operátor AND.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - binární operátor OR.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - unární operátor NOT.\n"
-
-#: ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - levá a pravá závorka.\n"
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Seznam značek (tagů):\n"
-
-#: ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - udává výstupní formát podle příkazu printf\n"
-
-#: ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   příklad: '%%název:%%soubory'\n"
-
-#: ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - architektura\n"
-
-#: ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - sestavovací počítač\n"
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - doba sestavení ze zdrojových kódů\n"
-
-#: ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - soubory s nastavením\n"
-
-#: ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts     - tag s konflikty\n"
-
-#: ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - popis balíčku\n"
-
-#: ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - distribuce\n"
-
-#: ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - epocha\n"
-
-#: ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - název souboru balíčku\n"
-
-#: ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - seznam souborů obsažených v balíčku\n"
-
-#: ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - skupina\n"
-
-#: ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - licence\n"
-
-#: ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - název balíčku\n"
-
-#: ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - co se nahrazuje (dělá zastaralým)\n"
-
-#: ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - kdo vytvořil balíček\n"
-
-#: ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - co se poskytuje\n"
-
-#: ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - co se požaduje\n"
-
-#: ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - instalovaná velikost\n"
-
-#: ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - název zdrojového balíčku rpm\n"
-
-#: ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - doporučené (navrhované) balíčky\n"
-
-#: ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - shrnutí\n"
-
-#: ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - URL\n"
-
-#: ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - dodavatel\n"
-
-#: ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - zdroj, ve kterém byl balíček nalezen\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - společně se jménem vypíše verzi, vydání a architekturu.\n"
-
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "neukončený výraz (%s)"
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Nesprávný formát: můžete použít pouze jeden vícehodnotový tag"
-
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "používá se specifické prostředí na %s\n"
-
-#: ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "není k dispozici žádný soubor hdlist pro zdroj \"%s\""
-
-#: ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "není k dispozici žádný soubor se syntézou pro zdroj \"%s\""
-
-#: ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "není k dispozici žádné xml-info pro zdroj \"%s\""
-
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
-msgstr "  --auto-update  - provede aktualizaci zdrojů a poté aktualizaci systému.\n"
+msgstr ""
+"  --auto-update  - provede aktualizaci zdrojů a poté aktualizaci systému.\n"
 
 #: ../urpmi:82
 #, c-format
@@ -2002,22 +2040,20 @@ msgstr ""
 #: ../urpmi:99
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - nejprve odstraní balíčky RPM z vyrovnávací paměti.\n"
+msgstr ""
+"  --clean        - nejprve odstraní balíčky RPM z vyrovnávací paměti.\n"
 
 #: ../urpmi:100
 #, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - neodstraňovat rpm balíčky z vyrovnávací paměti.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       - aktualizovat pouze databázi RPM, ne souborový systém.\n"
-
 #: ../urpmi:102
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
-msgstr "  --replacepkgs  - vynutit instalaci balíčků, které jsou již nainstalovány.\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
+msgstr ""
+"  --replacepkgs  - vynutit instalaci balíčků, které jsou již nainstalovány.\n"
 
 #: ../urpmi:104
 #, c-format
@@ -2183,7 +2219,8 @@ msgstr "  --nolock       - nezamkne se databáze balíčků RPM.\n"
 #: ../urpmi:147
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
-msgstr "  --strict-arch  - aktualizovat pouze balíčky se shodnou architekturou.\n"
+msgstr ""
+"  --strict-arch  - aktualizovat pouze balíčky se shodnou architekturou.\n"
 
 #: ../urpmi:148 ../urpmq:97
 #, c-format
@@ -2203,7 +2240,8 @@ msgstr "  --debug        - velmi užvaněný režim.\n"
 #: ../urpmi:154
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  názvy nebo soubory RPM zadané na příkazové řádce budou instalovány.\n"
+msgstr ""
+"  názvy nebo soubory RPM zadané na příkazové řádce budou instalovány.\n"
 
 #: ../urpmi:182
 #, c-format
@@ -2236,7 +2274,8 @@ msgstr "použije se --buildrequires"
 
 #: ../urpmi:232
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr ""
 "použijte prosím --buildrequires nebo --install-src, použije se --"
 "buildrequires"
@@ -2303,7 +2342,8 @@ msgstr "%s (k instalaci)"
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
-msgstr "Aby byly splněna závislost '%s', je třeba jeden z následujících balíčků:"
+msgstr ""
+"Aby byly splněna závislost '%s', je třeba jeden z následujících balíčků:"
 
 #: ../urpmi:465
 #, c-format
@@ -2341,7 +2381,7 @@ msgstr ""
 "\n"
 "Přesto pokračovat v instalaci?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (A/n) "
@@ -2537,10 +2577,12 @@ msgstr "  --aria2        - použije pro získání vzdálených souborů aria2.\
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - vytvoří zdroj pro aktualizaci.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2552,22 +2594,22 @@ msgstr ""
 "                   jedna z: never, on-demand, update-only, always. viz urpmi."
 "cfg(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - použije soubor se syntézou.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - použije soubory rpm (místo souborů syntézy).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - nepokoušet se hledat žádný soubor se syntézou.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2576,17 +2618,18 @@ msgstr ""
 "  --distrib      - automaticky vytvoří všechny zdroje z instalačního\n"
 "                   média.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
-msgstr "  --interactive  - spolu s --distrib se zeptá na potvrzení u každého zdroje\n"
+msgstr ""
+"  --interactive  - spolu s --distrib se zeptá na potvrzení u každého zdroje\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - spolu s --distrib přidá všechny zdroje ze seznamu\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2595,72 +2638,73 @@ msgstr ""
 "  --from         - pro seznam zrcadel se použije zadané URL, výchozí je\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
-msgstr "  --virtual      - vytvoří virtuální zdroje, které jsou vždy aktuální.\n"
+msgstr ""
+"  --virtual      - vytvoří virtuální zdroje, které jsou vždy aktuální.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - vypnout kontrolu souborů MD5SUM.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - neimportovat veřejné klíče z přidaných zdrojů\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - přidat zdroje do nastavení, ale neaktualizovat.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q           - režim bez výpisů.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - režim s výpisy.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "známé xml-info politiky jsou %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "pro --distrib --mirrorlist <url> není potřeba žádný parametr"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "chybné <url> (pro lokální adresář musí být cesta absolutní)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Přidat zdroj může pouze uživatel root"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "vytvářím soubor s nastavením [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Nelze vytvořit soubor s nastavením [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "s volbou --distrib není třeba zadávat <relativní cestu k syntéze>"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
@@ -2669,17 +2713,17 @@ msgstr ""
 "\n"
 "Chcete přidat zdroj '%s'?"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<relativní cesta k syntéze> chybí\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Nelze použít %s se vzdáleným zdrojem"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "nelze přidat zdroj"
@@ -2713,7 +2757,8 @@ msgstr "  --noclean      - nečistit na kontrolním bodu sestavovací adresář\
 
 #: ../urpmi.recover:37
 #, c-format
-msgid "  --list         - list transactions since provided date/duration argument\n"
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
 msgstr "  --list         - vypíše transakce od daného data/doby\n"
 
 #: ../urpmi.recover:38
@@ -2915,12 +2960,12 @@ msgstr "  -ff            - opravdu vynutí aktualizaci souborů syntézy\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Aktualizovat zdroj může pouze uživatel root"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nic k aktualizaci (použijte urpmi.addmedia pro přidání zdroje)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2929,17 +2974,17 @@ msgstr ""
 "záznam pro update chybí\n"
 "(jeden z %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignoruji zdroj %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "zapínám zdroj %s"
@@ -3009,8 +3054,10 @@ msgstr "  --list-aliases - seznam dostupných paralelních přezdívek.\n"
 
 #: ../urpmq:63
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr "  --dump-config  - vypíše nastavení ve formě parametru pro urpmi.addmedia.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - vypíše nastavení ve formě parametru pro urpmi.addmedia.\n"
 
 #: ../urpmq:64
 #, c-format
@@ -3019,7 +3066,8 @@ msgstr "  --src          - další balíček je zdrojový (stejné jako -s).\n"
 
 #: ../urpmq:65
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources     - všechny zdrojové balíčky před stažením (pouze uživatel "
 "root).\n"
@@ -3027,7 +3075,8 @@ msgstr ""
 #: ../urpmq:67
 #, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
-msgstr "  --ignorearch   - povolí dotazy na balíčky RPM pro jiné architektury.\n"
+msgstr ""
+"  --ignorearch   - povolí dotazy na balíčky RPM pro jiné architektury.\n"
 
 #: ../urpmq:71
 #, c-format
@@ -3124,7 +3173,8 @@ msgstr "  -g         - vypíše tag skupin společně se jménem.\n"
 #: ../urpmq:101
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - tisk užitečných informací v člověkem čitelné podobě.\n"
+msgstr ""
+"  -i             - tisk užitečných informací v člověkem čitelné podobě.\n"
 
 #: ../urpmq:102
 #, c-format
@@ -3151,7 +3201,8 @@ msgstr "  -s              - další balíček je zdrojový (stejné jako --src).
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
-msgstr "  -u             - odebere balíček pokud je již instalována novější verze.\n"
+msgstr ""
+"  -u             - odebere balíček pokud je již instalována novější verze.\n"
 
 #: ../urpmq:107
 #, c-format
@@ -3166,7 +3217,8 @@ msgstr "  -Y             - jako -y, ale ignoruje velká a malá písmena.\n"
 #: ../urpmq:109
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  jméno nebo rpm soubory zadané na příkazové řádce, které jsou dotazovány.\n"
+msgstr ""
+"  jméno nebo rpm soubory zadané na příkazové řádce, které jsou dotazovány.\n"
 
 #: ../urpmq:156
 #, c-format
@@ -3186,7 +3238,8 @@ msgstr "použijte -l pro seznam souborů"
 #: ../urpmq:404
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "pro zdroj \"%s\" neexistuje xml info, pouze částečný výsledek pro balíček %s"
+msgstr ""
+"pro zdroj \"%s\" neexistuje xml info, pouze částečný výsledek pro balíček %s"
 
 #: ../urpmq:405
 #, c-format
@@ -3197,14 +3250,16 @@ msgstr ""
 
 #: ../urpmq:408
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 "pro zdroj \"%s\" neexistuje soubor xml info, nelze vrátit žádný výsledek pro "
 "balíček %s"
 
 #: ../urpmq:409
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 "pro zdroj \"%s\" neexistuje soubor xml info, nelze vrátit žádný výsledek pro "
 "balíčky %s"
@@ -3214,3 +3269,5 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Nebyl nalezen záznam změn\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - vytvoří zdroj pro aktualizaci.\n"
diff --git a/po/cy.po b/po/cy.po
index 36944100..26c00528 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-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-08-18 19:57-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n == 2) ? 1 : 0;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Gosod RPM"
@@ -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:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Iawn"
@@ -96,7 +96,7 @@ msgstr "_Gosod"
 msgid "_Save"
 msgstr "_Cadw"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Dileu"
@@ -127,8 +127,9 @@ msgstr ""
 msgid "Options:"
 msgstr "Dewisiadau:"
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - argraffu neges cymorth.\n"
@@ -165,7 +166,7 @@ msgstr ""
 "  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
 "                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media          - defnyddio'r cyfrwng, wedi ei ran gan gollnod.\n"
@@ -215,7 +216,7 @@ msgstr "Arhoswch..."
 msgid "Must be root"
 msgstr "Rhaid bod yn root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -226,42 +227,42 @@ msgstr ""
 "%s\n"
 "Parhau beth bynnag?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr "(uwchraddio)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr "(gosod)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Dewis pecyn"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Atal"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -272,61 +273,61 @@ msgstr ""
 "%s\n"
 "Parhau beth bynnag?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, 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:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, 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:235
+#: ../gurpmi2:240
 #, 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:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Gosod y pecyn..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "methu estyn pecynnau ffynhonnell, atal"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Paratoi..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Rhowch gyfrwng \"%s\" yn y ddyfais"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Llwytho pecynnau i lawr ' %s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Gorffen"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -337,28 +338,28 @@ msgstr ""
 "%s\n"
 "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Methodd y gosod:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Popeth wedi eu gosod eisoes"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Cwblhawyd y gosod"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "tynnu %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "ailgychwyn urpmi"
@@ -438,8 +439,8 @@ msgid "...retrieving done"
 msgstr ".cwblhau adfer"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... methodd ail-lwytho: %s"
@@ -479,54 +480,54 @@ 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:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr "mynegiadau annisgwyl %s"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, c-format
 msgid "missing expression before %s"
 msgstr "mynegiad coll cyn %s"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "mynegiad annisgwyl %s (awgrym: defnyddio -a neu-0 ?)"
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr "dim mynegiad i'w gau"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, 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:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Nid yw cyfeiriadur chroot yn bodoli"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Methu defnyddio %s heb %s"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Methu defnyddio %s gyda %s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Gormod o ymresymiadau\n"
@@ -956,218 +957,218 @@ msgstr ""
 "--nid oes modd defnyddio synthesis gyda --media, --excludemedia, --"
 "sortmedia, --diweddaru, --use-distrib or --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Cychwyn chwilio: %s diwedd: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "hepgor pecyn %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "gosod yn lle uwchraddio pecyn %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "cyfrwng \"%s\" yn bodoli eisoes"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(anwybyddwyd drwy ragosodiad)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "ychwanegu cyfrwng \"%s\", cyn cyfrwng pell \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "ychwanegu cyfrwng \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "nid yw cyfeiriadur %s yn bodoli"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "nid yw'r lleoliad i weld yn cynnwys unrhyw ddosbarthiad"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "methu didoli media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "methu cael mynediad at gyfrwng y dosbarthiad (heb ganfod ffeil media.cfg)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "hepgor cyfrwng anghymarus '%s' (ar gyfer %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "estyn ffeil media.cfg..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "dewis aml-gyfrwng: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "dewis cyfrwng \"%s\":"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "ail-ffurfweddu urpmi ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...methodd ail-ffurfweddu"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "cwblhau ail-ffurfweddu"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Gwall wrth gynhyrchu ffeil enwau: heb ganfod dibyniaeth %d"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "archwilio ffeil synthesis [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "copïo [%s] ar gyfer cyfrwng \"%s\"..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...methodd y copïo"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copïo ffeil disgrifiad o \"%s\""
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...cwblhau'r copïo"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "cyfrifo md5sum o ffynhonnell synthesis adferwyd (neu synthesis)"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "methodd estyn (%s) (md5sum gwallus)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "methodd genhdlist2 ar %s"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "cymharu %s ac %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "ffeil hdlist annilys %s ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "copïo ffeil MD5SUM o \"%s\""
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "ffeil MD5SUM annilys (llwytho i lawr o %s)"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "adfer ffynhonnell synthesis \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "canfod synthesis holwyd fel %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "dim ffeil synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "archwilio ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "methu mewnforio ffeil pubkey \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "methodd estyn [%s]"
@@ -1203,7 +1204,7 @@ msgstr "Nn"
 #  please keep the 'Yy' for compatibility reasons
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yy"
@@ -1273,7 +1274,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1362,272 +1363,7 @@ msgstr "gosod %s"
 msgid "unmounting %s"
 msgstr "dadosod %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "ail gychwynnwyd urpmi, ac nid yw'r rhestr prif pecynnau wedi newid"
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-"ail gychwynnwyd urpmi, ac mae'r rhestr prif pecynnau wedi newid: %s vs %s"
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Dim pecyn o'r enw %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
-
-#: ../urpm/select.pm:296
-#, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "wedi canfod pecyn(nau) %s yn urpmi db, ond heb eu gosod"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Pecyn %s wedi ei osod eisoes"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Pecynnau %s wedi eu gosod eisoes"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "oherwydd %s coll"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "oherwydd %s wedi ei osod eisoes"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "%s heb ei foddloni"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "ceisio hybu %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "fel modd i gadw %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "er mwyn gosod %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "oherwydd gwrthdaro gyda %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Llofnod annilys (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Enw Allwedd Annilys (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Llofnod coll (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr "system"
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr "Dylech ailddechrau %s ar gyfer %s"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't write file"
-msgstr "Methu ysgrifennu'r ffeil"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "Methu agor y ffeil"
-
-#: ../urpm/sys.pm:289
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "Methu symud ffeil %s i %s"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmf fersiwn %s\n"
-"Hawlfraint (C) 1999 - 2006 Mandriva.\n"
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL GNU.\n"
-"\n"
-"defnydd:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - dewis pecyn yn awtomatig o fewn dewisiadau.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr "  --auto-orphans - tynnu amddifad\n"
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test          - gwirio os oes modd tynnu'n iawn.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-"  --parallel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - Ailbecynnu'r ffeiliau cyn eu dileu\n"
-
-#: ../urpme:53
-#, c-format
-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:71
-#: ../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
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - peidio gweithredu sgriptledi'r pecyn(au).\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
-"                   wrth (ddad)osod chroot gyda dewis  --root.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - modd llafar.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - select all packages matching expression.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu pecynnau"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "pecynnau anhysbys"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "pecyn anhysbys"
-
-#: ../urpme:119
-#, 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
-#, c-format
-msgid "Nothing to remove"
-msgstr "Dim i'w dynnu"
-
-#: ../urpme:141
-#, c-format
-msgid "No orphans to remove"
-msgstr "Dim amddifad i'w tynnu"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
-msgstr[1] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
-
-#: ../urpme:152
-#, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "pecyn amddifad"
-msgstr[1] "pecynnau amddifad"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Tynnu pecynnau %d?"
-msgstr[1] "Tynnu pecynnau %d?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:164
-#, c-format
-msgid "testing removal of %s"
-msgstr "profi tynnu %s"
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Methodd y tynnu"
-
-#: ../urpme:180
-#, c-format
-msgid "Removal is possible"
-msgstr "Mae tynnu yn bosibl"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1643,25 +1379,25 @@ msgstr ""
 "\n"
 "defnydd: urpmf [dewisiadau] pattern-expression\n"
 
-#: ../urpmf:36
+#: ../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"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../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"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
@@ -1669,7 +1405,16 @@ msgstr ""
 "  --literal, -l  - peidio cydweddu patrymau, defnyddio ymresymiad fel llinyn "
 "llythrennedd.\n"
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../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"
@@ -1677,257 +1422,524 @@ msgstr ""
 "   --sortmedia    - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda "
 "choma.\n"
 
-#: ../urpmf:43
+#: ../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"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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"
 
-#: ../urpmf:45
+#: ../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"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../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"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
 
-#: ../urpmf:48
+#: ../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"
 
-#: ../urpmf:49
+#: ../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"
 
-#: ../urpmf:50
+#: ../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"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Mynegiadau patrymau:\n"
 
-#: ../urpmf:52
+#: ../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"
 
-#: ../urpmf:53
+#: ../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"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - gweithredwr deuaidd AND.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - gweithredwr deuaidd OR.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unaidd NOT.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )              - parenthesis de a chwith.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Rhestr tagiau:\n"
 
-#: ../urpmf:59
+#: ../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"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   esiampl: '%%enw:%%ffeil'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - saernïaeth\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - gwestai'r adeiladedd\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - amser adeiladu\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - ffeiliau ffurfweddiad\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - tagiau gwrthdaro\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - disgrifiad pecyn\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - dosbarthiad\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - cyfnod\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - enw ffeil y pecyn\n"
 
-#: ../urpmf:70
+#: ../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"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - grŵp\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license          - trwydded\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name          - enw'r pecyn\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - tagiau'r hen\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager      - pecynydd\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides      - tag darparu\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - tagiau angenrhaid\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - maint wedi gosod\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - enw rpm ffynhonnell\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - cynnig tagiau\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - crynodeb\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - gwerthwr\n"
 
-#: ../urpmf:84
+#: ../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"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../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"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr "Mynegiadauheb ei derfynnu (%s)"
-
-#: ../urpmf:198
+#: ../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"
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "ddefnyddio amgylchedd penodol ar %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "dim ffeil hdlist ar gyfer cyfrwng \"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "adeiladu ffeil synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpmf:307
+#: ../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:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr "ail gychwynnwyd urpmi, ac nid yw'r rhestr prif pecynnau wedi newid"
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"ail gychwynnwyd urpmi, ac mae'r rhestr prif pecynnau wedi newid: %s vs %s"
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Dim pecyn o'r enw %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "wedi canfod pecyn(nau) %s yn urpmi db, ond heb eu gosod"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Pecyn %s wedi ei osod eisoes"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Pecynnau %s wedi eu gosod eisoes"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "oherwydd %s coll"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "oherwydd %s wedi ei osod eisoes"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "%s heb ei foddloni"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "ceisio hybu %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "fel modd i gadw %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "er mwyn gosod %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "oherwydd gwrthdaro gyda %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Llofnod annilys (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Enw Allwedd Annilys (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Llofnod coll (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr "system"
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr "Dylech ailddechrau %s ar gyfer %s"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't write file"
+msgstr "Methu ysgrifennu'r ffeil"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "Methu agor y ffeil"
+
+#: ../urpm/sys.pm:289
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "Methu symud ffeil %s i %s"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf fersiwn %s\n"
+"Hawlfraint (C) 1999 - 2006 Mandriva.\n"
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL GNU.\n"
+"\n"
+"defnydd:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - dewis pecyn yn awtomatig o fewn dewisiadau.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr "  --auto-orphans - tynnu amddifad\n"
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test          - gwirio os oes modd tynnu'n iawn.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+"  --parallel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - Ailbecynnu'r ffeiliau cyn eu dileu\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - defnyddio root arall ar gyfer tynnu rpm.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, 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:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - peidio gweithredu sgriptledi'r pecyn(au).\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
+"                   wrth (ddad)osod chroot gyda dewis  --root.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - modd llafar.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - select all packages matching expression.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu pecynnau"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "pecynnau anhysbys"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "pecyn anhysbys"
+
+#: ../urpme:121
+#, 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:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Dim i'w dynnu"
+
+#: ../urpme:143
+#, c-format
+msgid "No orphans to remove"
+msgstr "Dim amddifad i'w tynnu"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
+msgstr[1] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
+
+#: ../urpme:154
+#, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "pecyn amddifad"
+msgstr[1] "pecynnau amddifad"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Tynnu pecynnau %d?"
+msgstr[1] "Tynnu pecynnau %d?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpme:166
+#, c-format
+msgid "testing removal of %s"
+msgstr "profi tynnu %s"
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Methodd y tynnu"
+
+#: ../urpme:183
+#, c-format
+msgid "Removal is possible"
+msgstr "Mae tynnu yn bosibl"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr "Mynegiadauheb ei derfynnu (%s)"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2018,11 +2030,6 @@ msgstr "  --clean        - tynnu rpm o'r storfa cyn unrhyw beth arall.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - peidio glanhau rpm o'r storfa.\n"
 
-#: ../urpmi:101
-#, 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"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2356,7 +2363,7 @@ msgstr ""
 "\n"
 "Parhau i osod beth bynnag?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -2549,10 +2556,12 @@ msgstr "  --aria2        - - defnyddio aria2 i estyn ffeiliau pell.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update        - defnyddio cyfrwng diweddaru.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2564,22 +2573,22 @@ msgstr ""
 "                   un o: byth, ar alw, diweddaru'n unig, bob tro. cf urpmi."
 "cfg(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - defnyddio ffeil synthesis.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   -defnyddio ffeiliau rpm (yn lle synthesis).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - peidio ceisio canfod unrhyw ffeil synthesis.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2588,18 +2597,18 @@ msgstr ""
 "  --distrib      - creu yn awtomatig yr holl gyfrwng o gyfrwng\n"
 "                   gosod\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --rhyngweithiol  - gyda --distrib, gofyn cadarnhad gyda phob cyfrwng\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media   - gyda --distrib, rhestri'r holl gyfrwng ar gael.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2609,74 +2618,74 @@ msgstr ""
 "rhagosodedig yw\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr "  --virtual      - creu cyfrwng rhithiol sydd wedi ei ddiweddaru,\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - analluogi gwirio ffeil  MD5SUM.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - peidio mewnforio pubkey y cyfrwng ychwanegwyd\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - ychwanegu cyfrwng yn config, ond nid yn ei ddiweddaru.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modd distaw.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "polisiau hysbys known xml-info yw %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "dim angen ymresymiad ar gyfer --distrib --mirrorlist <url>"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 "gwallus <url> (ar gyfer cyfeiriadur lleol, rhaid i'r llwybr fod yn absoliwt)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael ychwanegu cyfrwng"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "yn creu ffeil config (%s)"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Methu creu ffeil Config (%s)"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "dim angen rhoi <llwybr perthynnol synthesis> gyda --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
@@ -2685,17 +2694,17 @@ msgstr ""
 "\n"
 "Hoffech chi ychwanegu cyfrwng '%s'?"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<llwybr perthynnol synthesis> ar goll\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Methu defnyddio %s gyda chyfrwng pell"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "methu ychwanegu cyfrwng"
@@ -2934,12 +2943,12 @@ msgstr "  -f             - gorfodi diweddaru ffeiliau synthesis/\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael diweddaru cyfrwng"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "dim i'w ddiweddaru (defnyddio urpmi.addmedia i ychwanegu cyfrwng)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2948,17 +2957,17 @@ msgstr ""
 "mae'r cofnod i ddiweddaru ar goll\n"
 "(un o %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "anwybyddu cyfrwng %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "galluogi cyfrwng %s"
@@ -3249,6 +3258,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Heb ganfod changelog\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update        - defnyddio cyfrwng diweddaru.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "URL gwallus: [%s]"
 
diff --git a/po/da.po b/po/da.po
index 6195f673..b8d08034 100644
--- a/po/da.po
+++ b/po/da.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-03-20 14:21+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: dansk <dansk@dansk-gruppen.dk>\n"
@@ -29,7 +29,7 @@ msgstr ""
 "X-Generator: KBabel 1.10.2\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM-installering"
@@ -39,7 +39,7 @@ msgstr "RPM-installering"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Fejl: kunne ikke finde fil %s, vil afbryde handling"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_O.k."
@@ -106,7 +106,7 @@ msgstr "_Installér"
 msgid "_Save"
 msgstr "_Gem"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Annullér"
@@ -137,8 +137,9 @@ msgstr ""
 msgid "Options:"
 msgstr "Valgmuligheder:"
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - udskriv denne hjælpebesked.\n"
@@ -176,7 +177,7 @@ msgstr ""
 "                   (--no-verify-rpm deaktiverer det, standard er "
 "aktiveret).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - brug kun de opgivne medier, adskilt med komma.\n"
@@ -226,7 +227,7 @@ msgstr "Vent venligst..."
 msgid "Must be root"
 msgstr "Skal være root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -237,42 +238,42 @@ msgstr ""
 "%s\n"
 "Skal installationen fortsættes alligevel?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "O.k."
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (skal opgraderes)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (skal installeres)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Pakkevalg"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Der er brug for en af de følgende pakker:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Afbryd"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -283,63 +284,63 @@ msgstr ""
 "%s\n"
 "Skal installationen fortsættes alligevel?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "For at tilfredsstille afhængigheder vil den følgende pakke blive installeret "
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "For at tilfredsstille afhængigheder vil de følgende pakker blive installeret"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pakke, %d MB)"
 msgstr[1] "(%d pakker, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Pakkeinstallation..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "kan ikke hente kilde-pakker, afslutter med fejl"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Forbereder..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installerer pakke `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Vær venlig at indsætte mediet med navnet %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Henter pakke %s..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Færdig"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -350,28 +351,28 @@ msgstr ""
 "%s\n"
 "Du ønsker måske at opdatere din urpmi-database"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Installationen fejlede:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "alting er allerede installeret"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Installationen færdig"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "fjerner %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "genstarter urpmi"
@@ -451,8 +452,8 @@ msgid "...retrieving done"
 msgstr "...hentning færdig"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...hentning mislykkedes: %s"
@@ -492,52 +493,52 @@ msgstr "Denne handling er forbudt ved kørsel i begrænset tilstand"
 msgid "bad proxy declaration on command line\n"
 msgstr "Forkert proxy-erklæring på kommandolinje\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: kan ikke læse rpm-fil \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "Søgestrengsudtryk:\n"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Manglende signatur (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "Søgestrengsudtryk:\n"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "normalt venter urpmf en regexp. du bør bruge parameteren \"--literal\""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot-katalog eksisterer ikke"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Kan ikke bruge %s uden %s."
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Kan ikke bruge '%s' med '%s'."
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "For mange argumenter\n"
@@ -968,217 +969,217 @@ msgstr ""
 "--synthesis kan ikke bruges med --media, --excludemedia, --sortmedia, --"
 "update, --use-distrib eller --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Søgnings-start: %s slut: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "overspringer pakke %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "ville installere i stedet for at opgradere pakke %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "medie \"%s\" eksisterer allerede"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(oversprunget som standard)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "Tilføjer medie '%s' før det eksterne medie '%s'."
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "tilføjer medie \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "katalog %s eksisterer ikke"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "denne adresse ser ikke ud til at indeholde nogen distribution"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "kunne ikke læse media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "kunne ikke få fat på distributionsmedie (ingen media.cfg fil fundet)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "overspringer ikke-kompatibelt medie '%s' (for %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "modtager media.cfg-fil..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "prøver at vælge ikke-eksisterende medie \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "vælger flere medier: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "fjerner medium \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "omkonfigurerer urpmi for medie \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...omkonfigurering mislykkedes"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "omkonfigurering færdig"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Fejl ved generering af navne-fil: afhængighed %d ikke fundet"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "medie \"%s\" er tidssvarende"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "undersøger syntese-fil [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problem ved læsning af syntese-fil for medie \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "kopierer [%s] for medium '%s' ..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiering mislykkedes"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopierer beskrivelsesfil for \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...kopiering færdig"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopiering af [%s] mislykkedes (filen er mistænkeligt lille)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "beregner md5sum på hentet kilde-syntese"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "hentning af [%s] mislykkedes (md5sum-uoverensstemmelse)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2 mislykkedes på %s"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "sammenligner %s og %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "ugyldig hdlist-fil %s for medie \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "kopierer MD5SUM-fil for \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "ugyldigt rpm-filnavn [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "henter kilde-syntese for \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "fandt undersøgte syntese for \"%s\"..."
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "ingen syntese-fil fundet for medie \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "undersøger pubkey-fil for '%s'"
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importeret nøgle %s fra pubkey-fil for \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "kunne ikke importere pubkey-fil for \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "opdaterede medie %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "hentning af [%s] mislykkedes"
@@ -1210,7 +1211,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyJj"
@@ -1280,7 +1281,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1363,275 +1364,7 @@ msgstr "monterer %s"
 msgid "unmounting %s"
 msgstr "afmonterer %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-"Installationsprogrammet urpmi blev startet igen, og listen over prioriterede "
-"pakker blev ikke ændret."
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-"Installationsprogrammet urpmi blev startet igen, og listen over prioriterede "
-"pakker blev ændret: %s mod %s"
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Ingen pakke kaldet %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Følgende pakker indeholder %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Pakkerne %s kan ikke installeres"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Pakke %s er allerede installeret"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Pakkerne %s er allerede installerede"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "grundet manglende %s"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "pga. allerede installeret %s"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "grundet uopfyldt %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "prøver at fremme %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "for at kunne beholde %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "for at kunne installere %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "grundet modstrid med %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Ugyldig signatur (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Ugyldig nøgle-id (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Manglende signatur (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't write file"
-msgstr "Kan ikke skrive fil"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "Kan ikke åbne fil"
-
-#: ../urpm/sys.pm:289
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "Kan ikke flytte fil %s til %s."
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme version %s\n"
-"Ophavsret © 1999-2008 Mandriva.\n"
-"Dette er frit programmel og kan redistribueres under vilkårene for GNU GPL.\n"
-"\n"
-"brug:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - vælg automatisk en pakke ved valg.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - afprøv om fjernelsen kan udføres korrekt.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - distribueret urpmi over maskiner med alias.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - Ompak filer før sletning\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - brug en anden root for rpm-fjernelse.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../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   - Brug anden rod for urpmi-database og rpm-installering.\n"
-
-#: ../urpme:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - udfør ikke pakke-småskripter.\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - konfigurér urpme løbende fra et distrib træ, "
-"nyttigt               til at (af)installere en chroot med root-tilvalget.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - udførlig tilstand.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - vælg alle pakker matchende udtryk.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Kun superbrugeren har lov til at fjerne pakker"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "ukendte pakker"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "ukendt pakke"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "fjernelse af pakke %s vil skade dit system"
-msgstr[1] "fjernelse af pakke %s vil skade dit system"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Ingenting at fjerne"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Ingenting at fjerne"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] ""
-"For at tilfredsstille afhængigheder vil den følgende pakke blive fjernet"
-msgstr[1] ""
-"For at tilfredsstille afhængigheder vil de følgende %d pakker blive fjernet"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "ukendt pakke"
-msgstr[1] "ukendt pakke"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Skal %d pakke fjernes?"
-msgstr[1] "Skal %d pakker fjernes?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (j/N) "
-
-#: ../urpme:164
-#, c-format
-msgid "testing removal of %s"
-msgstr ""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Fjernelse mislykkedes"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Fjernelse mislykkedes"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1647,22 +1380,22 @@ msgstr ""
 "\n"
 "brug: urpmf [tilvalg] mønster-udtryk\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - udskriv dette værktøjs versionsnummer.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - brug specifikt miljø (typisk ved en fejlrapport).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - brug ikke de opgivne medier, adskilt med komma.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
@@ -1670,266 +1403,545 @@ msgstr ""
 "  --literal, -l  - kontrollér ikke søgestrenge, brug argumenter som "
 "bogstavelige strenge.\n"
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../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   - Brug anden rod for urpmi-database og rpm-installering.\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    - sortér medier ifølge delstrenge, adskilt med komma.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - Brug denne sti for adgang til media.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - brug synthesis angivet i stedet for urpmi-db.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq          - udskriv ikke identiske linjer.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - brug kun opdateringsmedie.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  -v             - udførlig tilstand.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - ignorér forskel på store og små bogstaver i alle "
 "mønstre.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -I             - skeln mellem store og små bogstaver i søgestrenge "
 "(standard).\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - ændr feltseparator (standard er ':').\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Søgestrengsudtryk:\n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  text           - al tekst er forstået som regulære udtryk, med mindre -l "
 "er brugt.\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - inkludér perl-kode direkte som perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - binær OG-operator.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - binær ELLER-operator.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - negation.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - venstre- og højreparenteser.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr ""
 "Liste over mærker:\n"
 "\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - angiv et printf-lignende uddata-format\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   eksempel: '%%navn:%%filer'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - arkitektur\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost     - byggevært\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - byggetidspunkt\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - konfigurationsfiler\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts     - konfliktmærker\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - pakkebeskrivelse.\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - distribution\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - epoke\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - filnavn på pakken\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - liste over filer i pakken\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group         - gruppe\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - licens\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - pakkenavn\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - mærk forældet\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager      - pakkeprogram.\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - tilbudsetiketter\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - afhængighedsetiketter\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - installeret størrelse\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - navn på kilde-rpm\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - Forslagsetiketter.\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - sammendrag\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url           - url\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - leverandør\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - mediet i hvilken pakken blev fundet\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - udskriv version, udgave og arkitektur med navn.\n"
 
-#: ../urpmf:153
-#, fuzzy, c-format
-msgid "unterminated expression (%s)"
-msgstr "Søgestrengsudtryk:\n"
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Ugyldigt format: du kan kun bruge flerværdi-etiketter"
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "bruger særligt miljø på %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "ingen hdlist-fil tilgængelig for medie \"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "ingen syntese-fil tilgængelig for medie \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "ingen xml-info-fil tilgængelig for medie \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+"Installationsprogrammet urpmi blev startet igen, og listen over prioriterede "
+"pakker blev ikke ændret."
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"Installationsprogrammet urpmi blev startet igen, og listen over prioriterede "
+"pakker blev ændret: %s mod %s"
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Ingen pakke kaldet %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Følgende pakker indeholder %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Pakkerne %s kan ikke installeres"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Pakke %s er allerede installeret"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Pakkerne %s er allerede installerede"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "grundet manglende %s"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "pga. allerede installeret %s"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "grundet uopfyldt %s"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "prøver at fremme %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "for at kunne beholde %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "for at kunne installere %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "grundet modstrid med %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Ugyldig signatur (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Ugyldig nøgle-id (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Manglende signatur (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't write file"
+msgstr "Kan ikke skrive fil"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "Kan ikke åbne fil"
+
+#: ../urpm/sys.pm:289
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "Kan ikke flytte fil %s til %s."
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme version %s\n"
+"Ophavsret © 1999-2008 Mandriva.\n"
+"Dette er frit programmel og kan redistribueres under vilkårene for GNU GPL.\n"
+"\n"
+"brug:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - vælg automatisk en pakke ved valg.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - afprøv om fjernelsen kan udføres korrekt.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - distribueret urpmi over maskiner med alias.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - Ompak filer før sletning\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - brug en anden root for rpm-fjernelse.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --justdb       - opdatér kun rpm-databasen, og ikke filsystemet.\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - udfør ikke pakke-småskripter.\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - konfigurér urpme løbende fra et distrib træ, "
+"nyttigt               til at (af)installere en chroot med root-tilvalget.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - udførlig tilstand.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - vælg alle pakker matchende udtryk.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Kun superbrugeren har lov til at fjerne pakker"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "ukendte pakker"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "ukendt pakke"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "fjernelse af pakke %s vil skade dit system"
+msgstr[1] "fjernelse af pakke %s vil skade dit system"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Ingenting at fjerne"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Ingenting at fjerne"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"For at tilfredsstille afhængigheder vil den følgende pakke blive fjernet"
+msgstr[1] ""
+"For at tilfredsstille afhængigheder vil de følgende %d pakker blive fjernet"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "ukendt pakke"
+msgstr[1] "ukendt pakke"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Skal %d pakke fjernes?"
+msgstr[1] "Skal %d pakker fjernes?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (j/N) "
+
+#: ../urpme:166
+#, c-format
+msgid "testing removal of %s"
+msgstr ""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Fjernelse mislykkedes"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Fjernelse mislykkedes"
+
+#: ../urpmf:153
+#, fuzzy, c-format
+msgid "unterminated expression (%s)"
+msgstr "Søgestrengsudtryk:\n"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2019,11 +2031,6 @@ msgstr "  --clean        - fjern rpm fra cache før noget andet.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - fjern ikke rpm'er fra cache.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       - opdatér kun rpm-databasen, og ikke filsystemet.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2360,7 +2367,7 @@ msgstr ""
 "\n"
 "Fortsæt installationen alligevel?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
@@ -2556,10 +2563,12 @@ msgstr "  --curl         - brug 'curl' til at hente retrieve eksterne filer.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - opret et opdateringsmedium.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2571,22 +2580,22 @@ msgstr ""
 "                   én af: never, on-demand, update-only, always. cf urpmi.cfg"
 "(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - brug syntese-fil.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - brug rpm-filer (i stedet for syntese).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - forsøg ikke at finde nogen syntese-fil.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2594,18 +2603,18 @@ msgid ""
 msgstr ""
 "  --distrib      - opret automatisk alle media fra et installationsmedium.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - med --distrib, spøger om bekræftelse for hvert medie\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - med --distrib, tilføj hvert listede medie\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2614,72 +2623,72 @@ msgstr ""
 "  --from         - brug angivet adresse for liste over spejl, standard er\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr "  --virtual       - opret virtuelt medie som altid er opdateret.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - deaktivér kontrol med MD5SUM fil.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - importér ikke pubkey fra tilføjet medie\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - tilføj mediet i config, men opdatér det ikke.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - stille udgave.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - udførlig tilstand.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "kendte xml-info politikker er %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "intet argument krævet for --distrib --mirrorlist <url>"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "Ugyldig <adresse> (for lokalt katalog, stien skal være absolut)."
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Kun superbrugeren har lov til at tilføje medier"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "opretter config-fil [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Kan ikke oprette config-fil [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "ingen grund til at angive <relativ sti for syntese> med --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2688,17 +2697,17 @@ msgstr ""
 "\n"
 "Ønsker du at tilføje medie '%s'"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<relativ sti for syntese> mangler\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Kan ikke bruge '%s' med eksternt medie."
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "kunne ikke tilføje medie"
@@ -2935,12 +2944,12 @@ msgstr "  -f             - gennemtving opdatering af syntese\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Kun superbrugeren har lov til at opdatere medier"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ingenting at opdatere (brug urpmi.addmedia til at tilføje et medie)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2949,17 +2958,17 @@ msgstr ""
 "mangler det element der skal opdateres\n"
 "(én af %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignorerer medie %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "aktiverer medie %s"
@@ -3233,6 +3242,9 @@ msgstr "Ingen xml-info for medie '%s', kan ikke vise resultat for pakkerne %s"
 msgid "No changelog found\n"
 msgstr "Ingen ændringslog fundet\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - opret et opdateringsmedium.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "misdannet URL: [%s]"
 
diff --git a/po/de.po b/po/de.po
index 07f32d79..351805e7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-08-26 14:15+0100\n"
 "Last-Translator: Oliver Burger <oliver@mandrivauser.de>\n"
 "Language-Team: deutsch\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM Installation"
@@ -29,7 +29,7 @@ msgstr "RPM Installation"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Fehler: kann die Datei %s nicht finden, Vorgang wird abgebrochen"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_OK"
@@ -96,7 +96,7 @@ msgstr "_Installieren"
 msgid "_Save"
 msgstr "_Speichern"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Abbrechen"
@@ -128,8 +128,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - Diese Hilfe-Botschaft anzeigen.\n"
@@ -169,7 +170,7 @@ msgstr ""
 "                   (--no-verify-rpm deaktiviert das Verhalten,\n"
 "                   Voreingestellt: Kontrolle der Signaturen).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - Benutze nur durch Kommata getrennte Medienliste.\n"
@@ -223,7 +224,7 @@ msgstr "Bitte warten..."
 msgid "Must be root"
 msgstr "Sie müssen root sein"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -234,42 +235,42 @@ msgstr ""
 "%s\n"
 "Wollen Sie trotzdem fortfahren?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (zu aktualisieren)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (zu installieren)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Paketwahl"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Eines der folgenden Pakete wird benötigt:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Abbruch"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -281,62 +282,62 @@ msgstr ""
 "%s\n"
 "Wollen Sie trotzdem fortfahren?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Um die Abhängigkeiten zu erfüllen, wird folgendes Paket installiert:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Um die Abhängigkeiten zu erfüllen, werden die folgenden Pakete installiert"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d Paket, %d MB)"
 msgstr[1] "(%d Pakete, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Paketinstallation ..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "Ich kann die Quellpakete nicht finden, Abbruch"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Vorbereiten ..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installieren des Pakets `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Bitte legen Sie das Medium mit dem Namen \"%s\" ein"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Holen des Pakets `%s' ..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Fertig"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -347,28 +348,28 @@ msgstr ""
 "%s\n"
 "Sie sollten Ihre urpmi-Datenbank aktualisieren"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Installation fehlgeschlagen:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Alles bereits installiert"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Installation beendet"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "Entferne %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "starte urpmi neu"
@@ -448,8 +449,8 @@ msgid "...retrieving done"
 msgstr "...Holen fertig"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...Holen fehlgeschlagen: %s"
@@ -489,52 +490,52 @@ msgstr "Diese Funktion ist während des eingeschränkten Modus verboten"
 msgid "bad proxy declaration on command line\n"
 msgstr "Ungültige Proxyangabe als Kommandozeilenparameter\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: Ich kann das RPM \"%s\" nicht lesen.\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "Musterausdrücke:\n"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Fehlende Signatur (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "Musterausdrücke:\n"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot Verzeichnis existiert nicht"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Es ist nicht möglich %s ohne %s zu verwenden"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Es ist nicht möglich %s mit %s zu verwenden"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "zu viele Argumente\n"
@@ -967,219 +968,219 @@ msgstr ""
 "--synthesis kann nicht verwendet werden mit --media, --excludemedia, --"
 "sortmedia, --update, --use-distrib oder --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Suche starten %s Ende:%s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "Paket %s ausgelassen"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "Anstatt des Upgrade Paketes lieber folgendes %s installieren"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "Das Medium \"%s\" existiert bereits"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(standartmäßig ignorieren)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "Hinzufügen des Mediums \"%s\" vor dem Remotemodium \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "hinzufügen des Mediums \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, fuzzy, c-format
 msgid "directory %s does not exist"
 msgstr "Das angegebene Verzeichnis %s existiert nicht"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "Diese Ort enthält keine Distribution"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "Nicht möglich media.cfg zu parsen"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "Es ist nicht möglich das Distributionsmedium zu verwenden (keine media.cfg "
 "Datei gefunden)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "Frage media.cfg Datei ..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "Versuch, das nicht existierende Medium \"%s\" auszuwählen"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "Auswahl des Mehrfachmediums: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "Entfernen des Mediums \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "Rekonfiguriere URPMI für Medium  \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...Rekonfiguration scheiterte"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "Rekonfiguration durchgeführt"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Fehler beim Erstellen der Namens-Datei: Abhängigkeit %d nicht gefunden"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "Medium \"%s\" ist auf dem aktuellen Stand"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "Lesen der Synthese-Datei [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "Probleme beim Lesen der Synthese-Datei des Mediums \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "Kopiere [%s] zu Medium \"%s\" ..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...das Kopieren scheiterte"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "Kopiere Beschreibungs-Datei von \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "... das Kopieren ist beendet"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopieren von [%s] fehlgeschlagen (Datei ist verdächtig klein)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "errechne md5sum der erhaltenen Quell-HD-Liste (oder Synthese-Datei)"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "Kopieren von [%s] fehlgeschlagen (md5sum fehlerhaft)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "Das Erstellen der HD-Liste mit genhdlist2 in [%s] schlug fehl."
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "säubere %s und %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "Fehlerhafte hdlist Datei %s für das Medium \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "Kopiere Beschreibungs-Datei von \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "Ungültiger RPM Name [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "Hole HD-Liste (oder Synthese-Datei) von \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "HD-Liste (oder Synthese-Datei) als %s gefunden"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "Keine HD-Liste für das Medium \"%s\" gefunden"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "Holen der Pubkey-Datei für \"%s\" ..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importierter Schlüssel %s von Pubkey-Datei von \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "kann die Pubkey-Datei für \"%s\" nicht importieren"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "Aktualisiere Medium \"%s\""
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1211,7 +1212,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "JjYy"
@@ -1281,7 +1282,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1364,276 +1365,7 @@ msgstr "Einhängen von %s"
 msgid "unmounting %s"
 msgstr "Aushängen von %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Kein Paket mit dem Namen %s gefunden"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Die folgenden Pakete enthalten %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Pakete %s können nicht installiert werden"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Paket %s ist installiert"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Pakete %s sind installiert"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "wegen fehlendem %s"
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "Paket %s ist installiert"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "wegen nicht erfüllter Abhängigkeit von %s "
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "versuche %s voranzubringen"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "um %s zu behalten"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "um %s zu installieren"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "wegen Konflikten mit %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Falsche Signatur (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Ungültige Schlüssel ID (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Fehlende Signatur (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "Kann Konfigurationsdatei [%s] nicht erzeugen"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "Kopieren fehlgeschlagen"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "Es ist nicht möglich %s mit %s zu verwenden"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
-"vertrieben werden.\n"
-"\n"
-"Verwendung:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - Automatische Auswahl bei mehren Möglichkeiten.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr ""
-"  --test         - verifiziere, ob die Entfernung korrekt verlaufen wird.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-" --parallel     - verteilter urpmi Aufruf auf allen teilnehmenden\n"
-"                  Maschinen.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - neupacken vor dem Löschen\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr ""
-"  --root         - benutze anderes Wurzelverzeichnis zur RPM Entfernung.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../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   - benutze anderes Wurzelverzeichnis für urpmi db & RPM "
-"Installation.\n"
-
-#: ../urpme:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - Paket-Skripte nicht ausführen.\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - Konfiguriere urpme von einem distrib Baum, nützlich\n"
-"                  um einen chroot mit --root Option zu (de)installieren.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - ausführlicher Modus.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - wähle alle Pakete, die dem Ausdruck gleichen.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Nur der Systemadministrator darf Pakete entfernen"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "unbekannte Pakete "
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "unbekanntes Paket"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "Das Entfernen des Pakets %s macht Ihr System unbrauchbar"
-msgstr[1] "Das Entfernen des Pakets %s macht Ihr System unbrauchbar"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Nichts zu entfernen"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Nichts zu entfernen"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "Um die Abhängigkeiten zu erfüllen, wird das folgende Paket entfernt"
-msgstr[1] ""
-"Um die Abhängigkeiten zu erfüllen, werden die folgenden %d Pakete entfernt"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "unbekanntes Paket"
-msgstr[1] "unbekanntes Paket"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Entfernen das Paket %d?"
-msgstr[1] "Entfernen der Pakete %d?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (j/N) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "Verwende Wechselmedium als \"%s\""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Entfernen schlug fehl"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Entfernen schlug fehl"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1650,25 +1382,25 @@ msgstr ""
 "\n"
 "Verwendung: urpmf [Optionen] Muster-Ausdruck\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - Ausgabe der Versionsnummer dieses Tools.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - Verwende ein besondere Umgebung (Etwa zur\n"
 "                   Erstellung von Fehlerberichten).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - Benutze keine durch Kommata getrennte Medienliste.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
@@ -1676,7 +1408,16 @@ msgstr ""
 "  --literal, -l  - passe die Schablone nicht an, sondern benutze es als "
 "string\n"
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../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   - benutze anderes Wurzelverzeichnis für urpmi db & RPM "
+"Installation.\n"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1684,262 +1425,533 @@ msgstr ""
 "  --sortmedia    - sortiere Medien gemäß der Substrings getrennt durch "
 "Kommata.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 "  --synthesis    - Verwende die angegebene Synthese-Datei anstelle\n"
 "                   der urpmi-DB.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - Verwende die angegebene Synthese-Datei anstelle\n"
 "                   der urpmi-DB.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - keine identischen Zeilen ausgeben.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - Verwende nur Aktualisierungs-Medien.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - ausführlicher Modus.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - ignoriere Fallunterscheidungen in jedem Muster.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -i             - ignoriere Fallunterscheidungen in jedem Muster "
 "(standart).\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - ändert den Feldtrenner (Voreinstellung ':').\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Musterausdrücke:\n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  text           - jeder Text wird als regulärer Ausdruck geparst, bis -l "
 "benutzt wird.\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - beziehe Perl Code direkt als perl -e ein.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - binärer UND operator.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o              - binärer ODER Operator.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unäres NICHT.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - linke und rechte Klammern.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Liste der Markierungen:\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - angeben eines printf-ähnlichen Ausgabeformats\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   Beispiel: '%%name:%%files'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - Architektur\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    -  Build host.\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - build Zeit\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - Konfigurationsdateien\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts     - Steht in Konflikt mit.\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - Paketbeschreibung\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - Distribution\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - Epoche\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - Dateiname des Pakets\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr ""
 "  --files        - Liste der Dateien, die in dem Paket enthalten sind\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - Gruppe\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --name         - Paketname\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - Paketname\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - Veraltet.\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     -  Packer.\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides      - Stellt zur Verfügung\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires      - Benötigt\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size          - Größe\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - Quell RPM Name.\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --obsoletes     - Veraltet.\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - Zusammenfassung\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - URL\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - Hersteller\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - das Mediium, in welchem das Paket gefunden wurde\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - Ausgabe von Version, Release und Architektur mit dem "
 "Namen.\n"
 
-#: ../urpmf:153
-#, fuzzy, c-format
-msgid "unterminated expression (%s)"
-msgstr "Musterausdrücke:\n"
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Fehlerhaftes Format: Sie können nur ein mehrfach Zweig anhängen"
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "nutze spezielle Umgebung für %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "Keine HD-Liste für das Medium \"%s\" gefunden"
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "Erstellen der HD-Listen-Synthese-Datei für das Medium \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "schreibe Dateiliste für das Medium \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Kein Paket mit dem Namen %s gefunden"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Die folgenden Pakete enthalten %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Pakete %s können nicht installiert werden"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Paket %s ist installiert"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Pakete %s sind installiert"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "wegen fehlendem %s"
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Paket %s ist installiert"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "wegen nicht erfüllter Abhängigkeit von %s "
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "versuche %s voranzubringen"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "um %s zu behalten"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "um %s zu installieren"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "wegen Konflikten mit %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Falsche Signatur (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Ungültige Schlüssel ID (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Fehlende Signatur (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Kann Konfigurationsdatei [%s] nicht erzeugen"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Kopieren fehlgeschlagen"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "Es ist nicht möglich %s mit %s zu verwenden"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Dies ist freie Software und kann unter den Bedingungen der GNU GPL weiter \n"
+"vertrieben werden.\n"
+"\n"
+"Verwendung:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - Automatische Auswahl bei mehren Möglichkeiten.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+"  --test         - verifiziere, ob die Entfernung korrekt verlaufen wird.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+" --parallel     - verteilter urpmi Aufruf auf allen teilnehmenden\n"
+"                  Maschinen.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - neupacken vor dem Löschen\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr ""
+"  --root         - benutze anderes Wurzelverzeichnis zur RPM Entfernung.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - Verwende nur Aktualisierungs-Medien.\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - Paket-Skripte nicht ausführen.\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - Konfiguriere urpme von einem distrib Baum, nützlich\n"
+"                  um einen chroot mit --root Option zu (de)installieren.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - ausführlicher Modus.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - wähle alle Pakete, die dem Ausdruck gleichen.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Nur der Systemadministrator darf Pakete entfernen"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "unbekannte Pakete "
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "unbekanntes Paket"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "Das Entfernen des Pakets %s macht Ihr System unbrauchbar"
+msgstr[1] "Das Entfernen des Pakets %s macht Ihr System unbrauchbar"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Nichts zu entfernen"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Nichts zu entfernen"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Um die Abhängigkeiten zu erfüllen, wird das folgende Paket entfernt"
+msgstr[1] ""
+"Um die Abhängigkeiten zu erfüllen, werden die folgenden %d Pakete entfernt"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "unbekanntes Paket"
+msgstr[1] "unbekanntes Paket"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Entfernen das Paket %d?"
+msgstr[1] "Entfernen der Pakete %d?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (j/N) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "Verwende Wechselmedium als \"%s\""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Entfernen schlug fehl"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Entfernen schlug fehl"
+
+#: ../urpmf:153
+#, fuzzy, c-format
+msgid "unterminated expression (%s)"
+msgstr "Musterausdrücke:\n"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2032,11 +2044,6 @@ msgstr "  --clean        - leert zu Begeinn den RPM-Cache.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - belasse unverwendete RPMs im Cache.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - Verwende nur Aktualisierungs-Medien.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2385,7 +2392,7 @@ msgstr ""
 "\n"
 "Wollen Sie trotzdem fortfahren?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
@@ -2574,10 +2581,12 @@ msgstr "  --curl         - Benutze curl um entfernte Dateien zu laden.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - Erstellen eines Aktualisierungsmediums.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2585,25 +2594,25 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - Versuche Synthese-Datei zu nutzen.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, fuzzy, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 "  --probe-rpms   - verwende rpm Dateien (anstelle von synthesis/hdlist).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  --no-probe     - versuche keine Synthese-Datei oder\n"
 "                          HD-Liste zu finden.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2612,19 +2621,19 @@ msgstr ""
 "  --distrib      - automatisch alle Medien von einem Installations-Medium\n"
 "                   erzeugen.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - mit --distrib, fragt bei jedem Medium nach einer "
 "Bestätigung\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - mit --distrib. add jedes aufgeführte Medium.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2634,80 +2643,80 @@ msgstr ""
 "Vorgabe ist\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - erstelle virtuelle Medien, welche immer aktuell sind,\n"
 "                   nur das file:// Protokoll ist erlaubt.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - deaktiviere MD5SUM Dateiüberprüfung.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 "  --nopubkey     - den Pubkey vom hinzugefügten Medium nicht importieren\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - Medien zur Konfiguration hinzufügen ohne sie zu "
 "aktualisieren.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - stiller Modus.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - ausführlicher Modus.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, fuzzy, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 "Fehler in der <url> (für das Lokale Verzeichnis, der Pfad muss absolut "
 "sein)\n"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Nur der Systemadministrator darf Medien hinzufügen"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "Erstelle die Konfigurationsdatei [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Kann Konfigurationsdatei [%s] nicht erzeugen"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr ""
 "nicht erforderlich, <relativer Pfad zur HD-Liste> anzugeben mit --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2716,17 +2725,17 @@ msgstr ""
 "\n"
 "Medium wirklich hinzufügen '%s'"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<relativer Pfad zur HD-Liste> fehlt.\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Es ist nicht möglich %s mit einem Remote Medium zu verwenden"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "Das Medium \"%s\" kann nicht hinzugefügt werden."
@@ -2978,14 +2987,14 @@ msgstr "  -f             - Erzwinge das Updaten von synthesis/hdlist\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Nur der Systemadministrator darf Medien aktualisieren"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "Es gibt nichts zu aktualisieren (verwenden Sie \"urpmi.addmedia\", \n"
 "um neue Medien hinzuzufügen)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2994,17 +3003,17 @@ msgstr ""
 "Was soll aktualisiert werden?\n"
 "(eins aus %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignoriere Medium %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "Aktiviere das Medium %s"
@@ -3293,6 +3302,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Kein Changelog gefunden\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - Erstellen eines Aktualisierungsmediums.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "fehlerhafte URL: [%s]"
 
diff --git a/po/el.po b/po/el.po
index ead4b19b..6cb31c91 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-07-27 09:55+0200\n"
 "Last-Translator: nikos papadopoulos <231036448@freemail.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -30,8 +30,7 @@ msgstr ""
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,-1,519,-1\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../gurpmi:32
-#: ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Εγκατάσταση των RPM"
@@ -41,9 +40,7 @@ msgstr "Εγκατάσταση των RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Σφάλμα: αδυναμία εύρεσης του αρχείου %s, η διαδικασία θα ακυρωθεί"
 
-#: ../gurpmi:47
-#: ../gurpmi2:166
-#: ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Εντάξει"
@@ -55,7 +52,8 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"You probably didn't want to install it on your computer (installing it would allow you to make modifications to its sourcecode then compile it).\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
 "\n"
 "What would you like to do?"
 msgstr ""
@@ -63,12 +61,13 @@ msgstr ""
 "\n"
 "%s\n"
 "\n"
-"Πιθανόν δεν θέλατε να το εγκαταστήσετε στον υπολογιστή σας (η εγκατάστασή του θα σας επιτρέψει να κάνετε τροποποιήσεις στον πηγαίου του κώδικα και μετά να το μεταγλωττίσετε).\n"
+"Πιθανόν δεν θέλατε να το εγκαταστήσετε στον υπολογιστή σας (η εγκατάστασή "
+"του θα σας επιτρέψει να κάνετε τροποποιήσεις στον πηγαίου του κώδικα και "
+"μετά να το μεταγλωττίσετε).\n"
 "\n"
 "Τι θέλετε να κάνετε;"
 
-#: ../gurpmi:75
-#: ../gurpmi:86
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -77,7 +76,8 @@ msgid ""
 "\n"
 "Proceed?"
 msgstr ""
-"Πρόκειται να εγκαταστήσετε τα ακόλουθα πακέτα λογισμικού στον υπολογιστή σας:\n"
+"Πρόκειται να εγκαταστήσετε τα ακόλουθα πακέτα λογισμικού στον υπολογιστή "
+"σας:\n"
 "\n"
 "%s\n"
 " \n"
@@ -92,7 +92,8 @@ msgid ""
 "\n"
 "You may prefer to just save it. What is your choice?"
 msgstr ""
-"Πρόκειται να να εγκαταστήσετε το ακόλουθο πακέτο λογισμικού στον υπολογιστή σας:\n"
+"Πρόκειται να να εγκαταστήσετε το ακόλουθο πακέτο λογισμικού στον υπολογιστή "
+"σας:\n"
 "\n"
 "%s\n"
 "\n"
@@ -108,8 +109,7 @@ msgstr "_Εγκατάσταση"
 msgid "_Save"
 msgstr "_Αποθήκευση"
 
-#: ../gurpmi:101
-#: ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Ακύρωση"
@@ -119,19 +119,20 @@ msgstr "_Ακύρωση"
 msgid "Choose location to save file"
 msgstr "Επιλέξτε μια τοποθεσία για την αποθήκευση του αρχείου"
 
-#: ../gurpmi.pm:39
-#: ../urpmi:67
+#: ../gurpmi.pm:39 ../urpmi:67
 #, c-format
 msgid ""
 "urpmi version %s\n"
 "Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "urpm έκδοση  %s\n"
 "Copyright (C) 1999-2008 Mandriva.\n"
-"Αυτό είναι ελεύθερο λογισμικό και μπορεί να αναδιανεμηθεί υπό τους όρους της GNU GPL.\n"
+"Αυτό είναι ελεύθερο λογισμικό και μπορεί να αναδιανεμηθεί υπό τους όρους της "
+"GNU GPL.\n"
 "\n"
 "χρήση:\n"
 
@@ -140,88 +141,91 @@ msgstr ""
 msgid "Options:"
 msgstr "Επιλογές:"
 
-#: ../gurpmi.pm:46
-#: ../urpme:46
-#: ../urpmf:35
-#: ../urpmi:72
-#: ../urpmi.addmedia:54
-#: ../urpmi.recover:33
-#: ../urpmi.removemedia:40
-#: ../urpmi.update:32
-#: ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - τύπωσε αυτό το μήνυμα βοήθειας.\n"
 
-#: ../gurpmi.pm:47
-#: ../urpmi:79
+#: ../gurpmi.pm:47 ../urpmi:79
 #, c-format
-msgid "  --auto         - non-interactive mode, assume default answers to questions.\n"
-msgstr "  --auto         - μη αλληλεπιδραστική λειτουργία, χρήση των προεπιλεγμένων παραμέτρων.\n"
+msgid ""
+"  --auto         - non-interactive mode, assume default answers to "
+"questions.\n"
+msgstr ""
+"  --auto         - μη αλληλεπιδραστική λειτουργία, χρήση των προεπιλεγμένων "
+"παραμέτρων.\n"
 
-#: ../gurpmi.pm:48
-#: ../urpmi:80
-#: ../urpmq:52
+#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - αυτόματη επιλογή των πακέτων για την αναβάθμιση του συστήματος.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - αυτόματη επιλογή των πακέτων για την αναβάθμιση του "
+"συστήματος.\n"
 
-#: ../gurpmi.pm:49
-#: ../urpme:50
-#: ../urpmi:103
-#: ../urpmq:66
+#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - εξαναγκασμός επίκλησης ακόμα και εάν μερικά πακέτα δεν υπάρχουν.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - εξαναγκασμός επίκλησης ακόμα και εάν μερικά πακέτα δεν "
+"υπάρχουν.\n"
 
-#: ../gurpmi.pm:50
-#: ../urpmi:133
+#: ../gurpmi.pm:50 ../urpmi:133
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
 msgstr ""
 "  --verify-rpm   - έλεγχος της υπογραφής του rpm πριν την εγκατάσταση\n"
-"                   (--no-verify-rpm για απενεργοποίηση, ενεργοποιημένο από προεπιλογή).\n"
+"                   (--no-verify-rpm για απενεργοποίηση, ενεργοποιημένο από "
+"προεπιλογή).\n"
 
-#: ../gurpmi.pm:52
-#: ../urpmf:41
-#: ../urpmi:73
-#: ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - χρήση μόνο των μέσων που δόθηκαν, διαχωρισμένα με το κόμμα.\n"
+msgstr ""
+"  --media        - χρήση μόνο των μέσων που δόθηκαν, διαχωρισμένα με το "
+"κόμμα.\n"
 
-#: ../gurpmi.pm:53
-#: ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:149
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - να επιτρέπεται η αναζήτηση εντός των πακέτων, για να βρεθεί το κατάλληλο πακέτο.\n"
+msgstr ""
+"  -p             - να επιτρέπεται η αναζήτηση εντός των πακέτων, για να "
+"βρεθεί το κατάλληλο πακέτο.\n"
 
-#: ../gurpmi.pm:54
-#: ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:150
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - να μην επιτρέπεται η αναζήτηση εντός των πακέτων, για να βρεθεί το κατάλληλο πακέτο.\n"
+msgstr ""
+"  -P             - να μην επιτρέπεται η αναζήτηση εντός των πακέτων, για να "
+"βρεθεί το κατάλληλο πακέτο.\n"
 
-#: ../gurpmi.pm:55
-#: ../urpmi:110
-#: ../urpmq:69
+#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - χρησιμοποίησε μία άλλη διαδρομή root για την εγκατάσταση του rpm.\n"
+msgstr ""
+"  --root         - χρησιμοποίησε μία άλλη διαδρομή root για την εγκατάσταση "
+"του rpm.\n"
 
-#: ../gurpmi.pm:56
-#: ../urpmi:135
+#: ../gurpmi.pm:56 ../urpmi:135
 #, c-format
-msgid "  --test         - only verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - έλεγξε μόνο αν η εγκατάσταση μπορεί να γίνει σωστά.\n"
+msgid ""
+"  --test         - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+"  --test         - έλεγξε μόνο αν η εγκατάσταση μπορεί να γίνει σωστά.\n"
 
-#: ../gurpmi.pm:57
-#: ../urpmi:76
+#: ../gurpmi.pm:57 ../urpmi:76
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
-msgstr "  --searchmedia  - χρήση μόνο των δοσμένων μέσων για την αναζήτηση των ζητούμενων πακέτων.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
+msgstr ""
+"  --searchmedia  - χρήση μόνο των δοσμένων μέσων για την αναζήτηση των "
+"ζητούμενων πακέτων.\n"
 
 #: ../gurpmi.pm:100
 #, c-format
@@ -238,7 +242,7 @@ msgstr "Παρακαλώ περιμένετε..."
 msgid "Must be root"
 msgstr "Πρέπει να είστε διαχειριστής"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -249,43 +253,42 @@ msgstr ""
 "%s\n"
 "Συνέχιση της εγκατάστασης ;"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Προσοχή"
 
-#: ../gurpmi2:126
-#: ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Εντάξει"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (προς αναβάθμιση)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (προς εγκατάσταση)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Επιλογή πακέτων"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Ένα εκ των παρακάτω πακέτων απαιτείται:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Ματαίωση"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -296,65 +299,63 @@ msgstr ""
 "%s\n"
 "Συνέχεια εγκατάστασης;"
 
-#: ../gurpmi2:232
-#: ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
-msgstr "Για να ικανοποιηθούν οι εξαρτήσεις, θα εγκατασταθεί το παρακάτω πακέτο:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
+msgstr ""
+"Για να ικανοποιηθούν οι εξαρτήσεις, θα εγκατασταθεί το παρακάτω πακέτο:"
 
-#: ../gurpmi2:233
-#: ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "Για να ικανοποιηθούν οι εξαρτήσεις, θα εγκατασταθούν τα ακόλουθα πακέτα:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"Για να ικανοποιηθούν οι εξαρτήσεις, θα εγκατασταθούν τα ακόλουθα πακέτα:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d πακέτο, %d MB)"
 msgstr[1] "(%d πακέτα, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Εγκατάσταση του πακέτου..."
 
-#: ../gurpmi2:243
-#: ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "αδυναμία λήψης των πακέτων πηγαίου κώδικα, ματαίωση"
 
-#: ../gurpmi2:257
-#: ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Προετοιμασία..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Εγκατάσταση του πακέτου `%s' (%s/%s)..."
 
-#: ../gurpmi2:278
-#: ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Παρακαλώ εισήγαγε το μέσο με το όνομα «%s»"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Λήψη του πακέτου `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Ολοκληρώθηκε"
 
-#: ../gurpmi2:316
-#: ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -365,33 +366,28 @@ msgstr ""
 "%s\n"
 "Ίσως θέλετε να αναβαθμίσετε τη βάση δεδομένων urpmi"
 
-#: ../gurpmi2:322
-#: ../urpm/main_loop.pm:223
-#: ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259
-#: ../urpm/main_loop.pm:282
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Η εγκατάσταση απέτυχε:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Το(α) πακέτο(α) είναι ήδη εγκατεστημένα"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Η εγκατάσταση τελείωσε"
 
-#: ../gurpmi2:330
-#: ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "αφαίρεση του %s"
 
-#: ../gurpmi2:338
-#: ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "Επανεκκίνηση urpmi"
@@ -413,7 +409,8 @@ msgstr "   -h|--help      - τύπωσε αυτό το μήνυμα βοήθει
 #: ../rpm-find-leaves:18
 #, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
-msgstr "   --root <path>  - χρήση της root διαδρομής που δόθηκε αντί για την /\n"
+msgstr ""
+"   --root <path>  - χρήση της root διαδρομής που δόθηκε αντί για την /\n"
 
 #: ../rpm-find-leaves:19
 #, c-format
@@ -430,8 +427,7 @@ msgstr "                    προκαθορισμένο είναι το %s.\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "   -f             - εμφανίζει το πλήρες όνομα του πακέτου (NVRA)\n"
 
-#: ../rurpmi:11
-#: ../urpmi:281
+#: ../rurpmi:11 ../urpmi:281
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Μόνο ο διαχειριστής επιτρέπεται να εγκαταστήσει πακέτα"
@@ -466,19 +462,14 @@ msgstr "μη έγκυρο όνομα αρχείου rpm [%s]"
 msgid "retrieving rpm file [%s] ..."
 msgstr "ανάκτηση αρχείου rpm [%s] ..."
 
-#: ../urpm.pm:280
-#: ../urpm/get_pkgs.pm:226
+#: ../urpm.pm:280 ../urpm/get_pkgs.pm:226
 #, c-format
 msgid "...retrieving done"
 msgstr "...η ανάκτηση ολοκληρώθηκε"
 
-#: ../urpm.pm:283
-#: ../urpm/download.pm:734
-#: ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824
-#: ../urpm/media.pm:1274
-#: ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... η ανάκτηση απέτυχε: %s"
@@ -511,84 +502,87 @@ msgstr "σφάλμα κατά την δήλωση των τοπικών πακέ
 #: ../urpm.pm:394
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
-msgstr "Αυτή η λειτουργία απαγορεύεται να εκτελεστεί, όταν ισχύει κατάσταση περιορισμένης λειτουργίας"
+msgstr ""
+"Αυτή η λειτουργία απαγορεύεται να εκτελεστεί, όταν ισχύει κατάσταση "
+"περιορισμένης λειτουργίας"
 
-#: ../urpm/args.pm:145
-#: ../urpm/args.pm:154
+#: ../urpm/args.pm:145 ../urpm/args.pm:154
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "μη ορθή διακήρυξη proxy στην γραμμή εντολών\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: αδυναμία ανάγνωσης αρχείου rpm \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr "απρόσμενη έκφραση %s"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, c-format
 msgid "missing expression before %s"
 msgstr "απουσία έκφρασης πριν το %s"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "απρόσμενη έκφραση %s (πρόταση: να χρησιμοποιήσεις -a ή -o ; )"
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr "δεν υπάρχει έκφραση για να τερματιστεί"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
-msgstr "από προεπιλογή η urpmf αναμένει μια regexp. Θα πρέπει να χρησιμοποιήσετε την επιλογή \"--literal\""
+msgstr ""
+"από προεπιλογή η urpmf αναμένει μια regexp. Θα πρέπει να χρησιμοποιήσετε την "
+"επιλογή \"--literal\""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "ο κατάλογος chroot δεν υπάρχει"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Αδύνατη η χρήση του %s χωρίς το %s"
 
-#: ../urpm/args.pm:486
-#: ../urpm/args.pm:489
-#: ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Αδύνατη η χρήση του %s με το %s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Πάρα πολλά ορίσματα\n"
 
-#: ../urpm/bug_report.pm:48
-#: ../urpmi:258
+#: ../urpm/bug_report.pm:48 ../urpmi:258
 #, c-format
 msgid "Copying failed"
 msgstr "Η αντιγραφή απέτυχε"
 
 #: ../urpm/cdrom.pm:66
 #, c-format
-msgid "You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done automatically)"
-msgstr "Πρέπει να προσαρτήσεις το CD-ROM από μόνος σου (ή να εγκαταστήσεις το perl-Hal-Cdroms ώστε αυτό να γίνεται αυτόματα)"
+msgid ""
+"You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+"Πρέπει να προσαρτήσεις το CD-ROM από μόνος σου (ή να εγκαταστήσεις το perl-"
+"Hal-Cdroms ώστε αυτό να γίνεται αυτόματα)"
 
 #: ../urpm/cdrom.pm:68
 #, c-format
 msgid "HAL daemon (hald) is not running or not ready"
 msgstr "Ο δαίμονας HAL (hald) δεν εκτελείται ή δεν είναι έτοιμος"
 
-#: ../urpm/cdrom.pm:161
-#: ../urpm/cdrom.pm:166
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
 #, c-format
 msgid "medium \"%s\" is not available"
 msgstr "το μέσο \"%s\" δεν είναι διαθέσιμο"
@@ -613,9 +607,7 @@ msgstr "αδυναμία ανάγνωσης του αρχείου ρυθμίσε
 msgid "medium `%s' is defined twice, aborting"
 msgstr "το μέσο `%s' προσδιορίστηκε δύο φορές, γίνεται εγκατάλειψη"
 
-#: ../urpm/cfg.pm:251
-#: ../urpm/media.pm:486
-#: ../urpm/media.pm:492
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:486 ../urpm/media.pm:492
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "αδυναμία εγγραφής του αρχείου ρυθμίσεων [%s]"
@@ -623,7 +615,9 @@ msgstr "αδυναμία εγγραφής του αρχείου ρυθμίσεω
 #: ../urpm/download.pm:109
 #, c-format
 msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "αδυναμία ανάγνωσης των ρυθμίσεων του proxy (διαμεσολαβητής) (τα δικαιώματα δεν είναι επαρκή για την ανάγνωση του %s)"
+msgstr ""
+"αδυναμία ανάγνωσης των ρυθμίσεων του proxy (διαμεσολαβητής) (τα δικαιώματα "
+"δεν είναι επαρκή για την ανάγνωση του %s)"
 
 #: ../urpm/download.pm:134
 #, c-format
@@ -767,8 +761,11 @@ msgstr "[επαναπακετάρισμα]"
 
 #: ../urpm/install.pm:175
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "δημιουργήθηκε transaction για εγκατάσταση στο %s (αφαίρεση=%d, εγκατάσταση=%d, αναβάθμιση=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"δημιουργήθηκε transaction για εγκατάσταση στο %s (αφαίρεση=%d, εγκατάσταση=%"
+"d, αναβάθμιση=%d)"
 
 #: ../urpm/install.pm:178
 #, c-format
@@ -790,8 +787,7 @@ msgstr "αδυναμία εγκατάστασης του πακέτου %s"
 msgid "removing bad rpm (%s) from %s"
 msgstr "αφαίρεση του κακοδιατυπομένου rpm (%s) από το %s"
 
-#: ../urpm/install.pm:218
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:218 ../urpm/install.pm:275
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "η αφαίρεση του %s απέτυχε: %s"
@@ -836,8 +832,7 @@ msgstr "Δεν προσδιορίστηκε εξυπηρετητής, λείπε
 msgid "No base defined"
 msgstr "Δεν ορίστηκε βάση"
 
-#: ../urpm/ldap.pm:172
-#: ../urpm/ldap.pm:175
+#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
 #, c-format
 msgid "Cannot connect to ldap uri:"
 msgstr "Αδυναμία σύνδεσης στο ldap uri:"
@@ -855,19 +850,16 @@ msgstr "εγκατάλειψη"
 #: ../urpm/lock.pm:65
 #, c-format
 msgid "%s database is locked (another program is already using it)"
-msgstr "η βάση δεδομένων %s είναι κλειδωμένη (ένα άλλο πρόγραμμα τη χρησιμοποιεί ήδη)"
+msgstr ""
+"η βάση δεδομένων %s είναι κλειδωμένη (ένα άλλο πρόγραμμα τη χρησιμοποιεί ήδη)"
 
-#: ../urpm/main_loop.pm:110
-#: ../urpm/main_loop.pm:120
-#: ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230
-#: ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
+#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Η εγκατάσταση απέτυχε"
 
-#: ../urpm/main_loop.pm:112
-#: ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
 #, c-format
 msgid "Try to go on anyway? (y/N) "
 msgstr "Να προσπαθήσω να συνεχίσω, έτσι κι αλλιώς; (y/N) "
@@ -931,8 +923,7 @@ msgstr "Προσπάθεια για εξαναγκαστική εγκατάστ�
 msgid "Packages are up to date"
 msgstr "Τα πακέτα είναι ενημερωμένα"
 
-#: ../urpm/main_loop.pm:306
-#: ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Η εγκατάσταση είναι δυνατή"
@@ -955,7 +946,9 @@ msgstr "προειδοποίηση: μη διαθέσιμο md5sum για %s σ�
 #: ../urpm/media.pm:204
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "το εικονικό μέσο \"%s\" πρέπει να έχει ένα καθαρό σύνδεσμο url, το μέσο αγνοείται"
+msgstr ""
+"το εικονικό μέσο \"%s\" πρέπει να έχει ένα καθαρό σύνδεσμο url, το μέσο "
+"αγνοείται"
 
 #: ../urpm/media.pm:206
 #, c-format
@@ -977,8 +970,7 @@ msgstr "προσπάθεια παράκαμψης του υπάρχοντος μ
 msgid "failed to migrate removable device, ignoring media"
 msgstr "σφάλμα στην εισαγωγή της αφαιρούμενης συσκευής, το μέσο θα αγνοηθεί"
 
-#: ../urpm/media.pm:488
-#: ../urpm/media.pm:494
+#: ../urpm/media.pm:488 ../urpm/media.pm:494
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "εγγραφή αρχείου ρυθμίσεων [%s]"
@@ -986,7 +978,8 @@ msgstr "εγγραφή αρχείου ρυθμίσεων [%s]"
 #: ../urpm/media.pm:537
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
-msgstr "Δεν μπορεί να χρησιμοποιηθεί παράλληλη κατάσταση με use-distrib κατάσταση"
+msgstr ""
+"Δεν μπορεί να χρησιμοποιηθεί παράλληλη κατάσταση με use-distrib κατάσταση"
 
 #: ../urpm/media.pm:545
 #, c-format
@@ -995,226 +988,224 @@ msgstr "χρήση του συσχετισμένου μέσου για παρά�
 
 #: ../urpm/media.pm:561
 #, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
-msgstr "--synthesis δεν μπορεί να χρησιμοποιηθεί μαζί με --media, --excludemedia, --sortmedia, --update, --use-distrib ή --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"--synthesis δεν μπορεί να χρησιμοποιηθεί μαζί με --media, --excludemedia, --"
+"sortmedia, --update, --use-distrib ή --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Έναρξη αναζήτησης: %s τέλος: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "παράλειψη του πακέτου %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "θα εγκαταστήσει αντί για να αναβαθμίσει το πακέτο %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "το μέσο \"%s\" υπάρχει ήδη"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(αγνοήθηκε κατά προεπιλογή)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "προσθήκη του μέσου \"%s\" πριν από το απομακρυσμένο μέσο \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "προσθήκη του μέσου \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "ο κατάλογος %s δεν υπάρχει"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "αυτή η τοποθεσία δεν φαίνεται να περιέχει καμία διανομή"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "αδυναμία ανάλυσης του media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "αδυναμία πρόσβασης στο μέσο διανομής (δεν βρέθηκε αρχείο media.cfg)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "παράληψη του μη συμβατού μέσου `%s' (για %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "ανάκτηση του αρχείου media.cfg..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "προσπάθεια επιλογής του ανύπαρκτου μέσου \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "επιλογή πολλαπλών μέσων: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "αφαίρεση του μέσου \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "επαναρύθμιση του urpmi για το μέσο \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...η επαναρρύθμιση απέτυχε"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "η επαναρρύθμιση πέτυχε"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Σφάλμα στη δημιουργία του αρχείου ονομάτων: η εξάρτηση %d δεν βρέθηκε"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "το μέσο \"%s\" είναι ενημερωμένο"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "εξέταση του αρχείου σύνθεσης [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "πρόβλημα ανάγνωσης του αρχείου σύνθεσης από το μέσο \"%s\""
 
-#: ../urpm/media.pm:1163
-#: ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "αντιγραφή [%s] για το μέσο \"%s\"..."
 
-#: ../urpm/media.pm:1165
-#: ../urpm/media.pm:1220
-#: ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...η αντιγραφή απέτυχε"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "αντιγραφή του αρχείου περιγραφής του \"%s\"..."
 
-#: ../urpm/media.pm:1218
-#: ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...η αντιγραφή ολοκληρώθηκε"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "η αντιγραφή του [%s] απέτυχε (το αρχείο είναι ύποπτα μικρό)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "υπολογισμός του md5sum του ανακτημένου πηγαίου synthesis"
 
-#: ../urpm/media.pm:1299
-#: ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "η ανάκτηση του [%s] απέτυχε (τα md5sum δεν ταιριάζουν)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "αποτυχία του genhdlist2 στο %s"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "σύγκριση του %s και του %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "άκυρο αρχείο hdlist %s για το μέσο \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "αντιγραφή του αρχείου MD5SUM από το \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "μη έγκυρο αρχείο MD5SUM (έγινε λήψη από το %s)"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "ανάκτηση της πηγαίας synthesis από το \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "το αρχείο synthesis εντοπίστηκε σαν %s"
 
-#: ../urpm/media.pm:1472
-#: ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "δεν βρέθηκε αρχείο synthesis για το μέσο \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "Εξέταση του αρχείου δημοσίου κλειδιού από το \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...εισαγωγή του κλειδιού %s από το αρχείο δημοσίου κλειδιού του \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "αδυναμία εισαγωγής του αρχείου δημοσίου κλειδιού του \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "ενημερώθηκε το μέσο \"%s\""
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "αποτυχία ανάκτησης του [%s]"
@@ -1227,7 +1218,9 @@ msgstr "γίνεται προσπάθεια ξανά με την εναλλακ�
 #: ../urpm/mirrors.pm:52
 #, c-format
 msgid "Could not find a mirror from mirrorlist %s"
-msgstr "Αδυναμία εύρεσης μιας εναλλακτικής διεύθυνσης από τη λίστα των εναλλακτικών διευθύνσεων %s"
+msgstr ""
+"Αδυναμία εύρεσης μιας εναλλακτικής διεύθυνσης από τη λίστα των εναλλακτικών "
+"διευθύνσεων %s"
 
 #: ../urpm/mirrors.pm:181
 #, c-format
@@ -1239,21 +1232,14 @@ msgstr "βρέθηκε η γεωτοποθεσία %s %.2f %.2f από την ζ
 msgid "getting mirror list from %s"
 msgstr "λήψη της λίστας των εναλλακτικών διευθύνσεων από το %s"
 
-#: ../urpm/msg.pm:63
-#: ../urpmi:514
-#: ../urpmi:529
-#: ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
 #, c-format
 msgid "Nn"
 msgstr "ΟοNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64
-#: ../urpme:38
-#: ../urpmi:568
-#: ../urpmi:663
-#: ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "ΝνYy"
@@ -1318,18 +1304,25 @@ msgstr "MB"
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190
-#: ../urpm/msg.pm:199
+#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
-msgid "The following package is now orphan, use \"urpme --auto-orphans\" to remove it."
-msgid_plural "The following packages are now orphans, use \"urpme --auto-orphans\" to remove them."
-msgstr[0] "Το παρακάτω πακέτο είναι, πλέον, ορφανό. Για να το αφαιρέσεις, χρησιμοποίησε την εντολή \"urpme --auto-orphans\" ."
-msgstr[1] "Τα παρακάτω πακέτα είναι, πλέον, ορφανά. Για να τα αφαιρέσεις, χρησιμοποίησε την εντολή \"urpme --auto-orphans\" ."
+msgid ""
+"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
+"it."
+msgid_plural ""
+"The following packages are now orphans, use \"urpme --auto-orphans\" to "
+"remove them."
+msgstr[0] ""
+"Το παρακάτω πακέτο είναι, πλέον, ορφανό. Για να το αφαιρέσεις, χρησιμοποίησε "
+"την εντολή \"urpme --auto-orphans\" ."
+msgstr[1] ""
+"Τα παρακάτω πακέτα είναι, πλέον, ορφανά. Για να τα αφαιρέσεις, χρησιμοποίησε "
+"την εντολή \"urpme --auto-orphans\" ."
 
 #: ../urpm/parallel.pm:14
 #, c-format
@@ -1383,16 +1376,19 @@ msgstr "απέτυχε το cp, στον οικοδεσπότη (host) %s (%d)"
 
 #: ../urpm/parallel_ssh.pm:86
 #, c-format
-msgid "%s failed on host %s (maybe it does not have a good version of urpmi?) (exit code: %d)"
-msgstr "απέτυχε το %s, στον οικοδεσπότη (host) %s (μήπως δεν διαθέτει μια καλή έκδοση του urpmi;) (το αποτέλεσμα εξαγωγής του κώδικα: %d)"
+msgid ""
+"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
+"code: %d)"
+msgstr ""
+"απέτυχε το %s, στον οικοδεσπότη (host) %s (μήπως δεν διαθέτει μια καλή "
+"έκδοση του urpmi;) (το αποτέλεσμα εξαγωγής του κώδικα: %d)"
 
 #: ../urpm/removable.pm:32
 #, c-format
 msgid "unable to access medium \"%s\"."
 msgstr "αδυναμία πρόσβασης στο μέσο \"%s\"."
 
-#: ../urpm/removable.pm:72
-#: ../urpm/removable.pm:90
+#: ../urpm/removable.pm:72 ../urpm/removable.pm:90
 #, c-format
 msgid "mounting %s"
 msgstr "προσάρτηση του %s"
@@ -1402,75 +1398,404 @@ msgstr "προσάρτηση του %s"
 msgid "unmounting %s"
 msgstr "αποπροσάρτηση του %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 έκδοση %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"Αυτό είναι ελεύθερο λογισμικό και μπορεί να αναδιανεμηθεί υπό τους όρους της "
+"GNU GPL.\n"
+"\n"
+"χρήση: urpmf [επιλογές] ακολουθία-έκφραση ( urpmf [options] pattern-"
+"expression )\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --έκδοση         - τύπωσε τον αριθμό έκδοσης αυτού του εργαλείου\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          - χρήση συγκεκριμένου περιβάλλοντος (τυπικά μία αναφορά\n"
+"                   σφάλματος).\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 - μην χρήση των μέσων που δόθηκαν, διαχωρισμένα με το "
+"κόμμα.\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  - δεν αντικαθιστά τους μπαλαντέρ, εφαρμογή του ορίσματος ως "
+"έχει.\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   - χρήση μίας άλλης διαδρομής root για την βάση δεδομένων "
+"urpmi κ' την εγκατάσταση του 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    - ταξινόμηση μέσων σύμφωνα με τα τμήματα λεκτικών "
+"διαχωρισμένα\n"
+"                   με το κόμμα.\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+"  --use-distrib  - χρησιμοποιεί την καθορισμένη διαδρομή για πρόσβαση στο "
+"μέσο\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    - χρήση του synthesis που δίδεται αντί του urpmi db.\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - μην τυπώσεις πανομοιότυπες γραμμές.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - χρήση μόνο των μέσων αναβάθμισης.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose             - αναλυτική λειτουργία.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i            - αγνόησε τη διάκριση πεζών-κεφαλαίων στις ακολουθίες.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -I             - να γίνει διάκριση πεζών-κεφαλαίων στις ακολουθίες "
+"(προεπιλογή).\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+"  -F<str>        - αντικαθιστά τον διαχωριστή με <str> (από προεπιλογή "
+"':').\n"
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Ακολουθίες εκφράσεων:\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           - οποιοδήποτε κείμενο επεξεργάζεται σαν απλή έκφραση "
+"(regexp), εκτός αν έχει επιλεγεί το -l .\n"
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - συμπεριέλαβε κώδικα perl απευθείας σαν perl -e.\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - δυαδικός AND τελεστής.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -ο             - δυαδικός OR τελεστής.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - ΟΧΙ μοναδιαίο.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )             - αριστερή και δεξιά παρένθεση.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Κατάλογος ετικετών:\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - καθορίζει την μορφή εμφάνισης του τύπου printf\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    παράδειγμα: '%%name:%%files'\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch        - αρχιτεκτονική\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - αναζήτηση στο πεδίο « BuildHost »\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - αναζήτηση στο πεδίο «BuildTime»\n"
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - αρχεία ρυθμίσεων\n"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - ετικέτες συγκρούσεων\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - αναζήτηση στην περιγραφή των πακέτων\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - διανομή\n"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - .\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename      - όνομα αρχείου του πακέτου\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files          - λίστα αρχείων που περιέχονται στο πακέτο.\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group         - ομάδα\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - άδεια\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - όνομα πακέτου\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - αναζήτηση στο πεδίο «obsoletes»\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - δημιουργός πακέτου\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr ""
+"  --provides     - τύπωσε την ετικέτα με τις παροχές: όλες οι παροχές.\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr ""
+"  --requires     - τύπωσε την ετικέτα με τις εξαρτήσεις: όλες οι "
+"εξαρτήσεις.\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size          - μέγεθος εγκατεστημένου\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - όνομα πηγαίου rpm\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - αναζήτηση στο πεδίο «suggests»\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary       -  περίληψη.\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       - κατασκευαστής\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - το μέσο στο οποίο βρέθηκε το πακέτο\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - τύπωσε την έκδοση, κυκλοφορίας και αρχιτεκτονικής με "
+"όνομα.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+"Άγνωστος τύπος: μπορείτε να χρησιμοποιήσετε μόνο μια επιλογή πολλαπλών τιμών "
+"(multi-valued tag)"
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "χρήση συγκεκριμένου περιβάλλοντος στο %s\n"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "δεν βρέθηκε αρχείο hdlist για το μέσο \"%s\""
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "δεν υπάρχει διαθέσιμη σύνθεση για το μέσο \"%s\""
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "δεν υπάρχουν διαθέσιμες πληροφορίες xml για το μέσο \"%s\""
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "το urpmi επανανακινήθηκε, και η λίστα με τα πακέτα προτεραιότητας δεν έχει αλλάξει"
+msgstr ""
+"το urpmi επανανακινήθηκε, και η λίστα με τα πακέτα προτεραιότητας δεν έχει "
+"αλλάξει"
 
 #: ../urpm/select.pm:30
 #, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "το urpmi επανανακινήθηκε, και η λίστα με τα πακέτα προτεραιότητας έχει αλλάξει: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"το urpmi επανανακινήθηκε, και η λίστα με τα πακέτα προτεραιότητας έχει "
+"αλλάξει: %s vs %s"
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, c-format
 msgid "No package named %s"
 msgstr "Κανένα πακέτο με το όνομα %s"
 
-#: ../urpm/select.pm:193
-#: ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Τα παρακάτω πακέτα περιέχουν %s: %s"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "τα πακέτα %s βρέθηκαν στην βάση δεδομένων του urpmi, αλλά κανένα τους δεν είναι εγκατεστημένο"
+msgstr ""
+"τα πακέτα %s βρέθηκαν στην βάση δεδομένων του urpmi, αλλά κανένα τους δεν "
+"είναι εγκατεστημένο"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Το πακέτο %s είναι ήδη εγκατεστημένο"
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Τα πακέτα %s είναι ήδη εγκατεστημένα"
 
-#: ../urpm/select.pm:558
-#: ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
 msgid "due to missing %s"
 msgstr "λόγω έλλειψης του %s"
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, c-format
 msgid "due to already installed %s"
 msgstr "επειδή το %s είναι ήδη εγκατεστημένο"
 
-#: ../urpm/select.pm:560
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "λόγω μη ικανοποίησης του %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "προσπάθεια ενίσχυσης του %s"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "για να κρατηθεί το %s"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, c-format
 msgid "in order to install %s"
 msgstr "για να εγκατασταθεί το %s"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "λόγω συγκρούσεων με το %s"
@@ -1520,13 +1845,15 @@ msgstr "Αδυναμία μετακίνησης του αρχείου %s στο
 msgid ""
 "urpme version %s\n"
 "Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "urpme έκδοση %s\n"
 "Copyright (C) 1999-2008 Mandriva.\n"
-"Αυτό είναι ελεύθερο λογισμικό και μπορεί να αναδιανεμηθεί υπό τους όρους της GNU GPL.\n"
+"Αυτό είναι ελεύθερο λογισμικό και μπορεί να αναδιανεμηθεί υπό τους όρους της "
+"GNU GPL.\n"
 "\n"
 "χρήση:\n"
 
@@ -1543,17 +1870,16 @@ msgstr "  --auto-orphans - απομάκρυνση των ορφανών\n"
 #: ../urpme:49
 #, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - επαλήθευση ότι η αφαίρεση μπορεί να επιτευχθεί σωστά.\n"
+msgstr ""
+"  --test         - επαλήθευση ότι η αφαίρεση μπορεί να επιτευχθεί σωστά.\n"
 
-#: ../urpme:51
-#: ../urpmi:109
-#: ../urpmq:68
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - διανεμημένα urpmi κατά μήκος των μηχανών με ψευδώνυμα.\n"
+msgstr ""
+"  --parallel     - διανεμημένα urpmi κατά μήκος των μηχανών με ψευδώνυμα.\n"
 
-#: ../urpme:52
-#: ../urpmi:141
+#: ../urpme:52 ../urpmi:141
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - Ξανά-πακετάρισμα των αρχείων πριν την διαγραφή\n"
@@ -1561,424 +1887,121 @@ msgstr "  --repackage    - Ξανά-πακετάρισμα των αρχείων
 #: ../urpme:53
 #, c-format
 msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - χρήση διαφορετικής διαδρομής root για την αφαίρεση rpm.\n"
+msgstr ""
+"  --root         - χρήση διαφορετικής διαδρομής root για την αφαίρεση rpm.\n"
 
-#: ../urpme:54
-#: ../urpmf:40
-#: ../urpmi:111
-#: ../urpmi.addmedia:71
-#: ../urpmi.recover:36
-#: ../urpmi.removemedia:45
-#: ../urpmi.update:48
-#: ../urpmq:70
+#: ../urpme:55 ../urpmi:101
 #, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --urpmi-root   - χρήση μίας άλλης διαδρομής root για την βάση δεδομένων urpmi κ' την εγκατάσταση του rpm.\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr ""
+"  --justdb       - ενημέρωση της βάσης rpm αλλά όχι το σύστημα αρχείων.\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - να μην εκτελεστούν τα scripts απεγκατάστασης.\n"
 
-#: ../urpme:56
+#: ../urpme:57
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 "  --use-distrib  - ρύθμιση urpme απευθείας από ένα δέντρο διανομής, χρήσιμο\n"
-"                   για την (απ)εγκατάσταση ενός chroot με την --root επιλογή.\n"
+"                   για την (απ)εγκατάσταση ενός chroot με την --root "
+"επιλογή.\n"
 
-#: ../urpme:58
-#: ../urpmi:152
-#: ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - αναλυτική λειτουργία.\n"
 
-#: ../urpme:59
+#: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - επιλογή όλων των πακέτων που ταιριάζουν με την έκφραση.\n"
+msgstr ""
+"  -a             - επιλογή όλων των πακέτων που ταιριάζουν με την έκφραση.\n"
 
-#: ../urpme:72
+#: ../urpme:73
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Μόνο ο διαχειριστής επιτρέπεται να αφαιρέσει πακέτα"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown packages"
 msgstr "άγνωστα πακέτα"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown package"
 msgstr "άγνωστο πακέτο"
 
-#: ../urpme:119
+#: ../urpme:121
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "Η αφαίρεση του παρακάτω πακέτου θα καταστρέψει το σύστημά σου:"
 msgstr[1] "Η αφαίρεση των παρακάτω πακέτων θα καταστρέψει το σύστημά σου:"
 
-#: ../urpme:124
+#: ../urpme:126
 #, c-format
 msgid "Nothing to remove"
 msgstr "Τίποτα προς αφαίρεση"
 
-#: ../urpme:141
+#: ../urpme:143
 #, c-format
 msgid "No orphans to remove"
 msgstr "Δεν υπάρχουν ορφανά προς αφαίρεση"
 
-#: ../urpme:147
+#: ../urpme:149
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
 msgstr[0] "Για να ικανοποιηθούν οι εξαρτήσεις, θα αφαιρεθεί το παρακάτω πακέτο"
-msgstr[1] "Για να ικανοποιηθούν οι εξαρτήσεις, θα αφαιρεθούν τα παρακάτω %d πακέτα"
+msgstr[1] ""
+"Για να ικανοποιηθούν οι εξαρτήσεις, θα αφαιρεθούν τα παρακάτω %d πακέτα"
 
-#: ../urpme:152
+#: ../urpme:154
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "(ορφανό πακέτο)"
 msgstr[1] "(ορφανά πακέτα)"
 
-#: ../urpme:159
+#: ../urpme:161
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Αφαίρεση %d πακέτου;"
 msgstr[1] "Αφαίρεση %d πακέτων;"
 
-#: ../urpme:159
-#: ../urpmi:569
-#: ../urpmi:664
-#: ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) "
 
-#: ../urpme:164
+#: ../urpme:166
 #, c-format
 msgid "testing removal of %s"
 msgstr "δοκιμαστική αφαίρεση του %s"
 
-#: ../urpme:178
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "Η αφαίρεση απέτυχε"
 
-#: ../urpme:180
+#: ../urpme:183
 #, c-format
 msgid "Removal is possible"
 msgstr "Η αφαίρεση είναι δυνατή"
 
-#: ../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 έκδοση %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"Αυτό είναι ελεύθερο λογισμικό και μπορεί να αναδιανεμηθεί υπό τους όρους της GNU GPL.\n"
-"\n"
-"χρήση: urpmf [επιλογές] ακολουθία-έκφραση ( urpmf [options] pattern-expression )\n"
-
-#: ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --έκδοση         - τύπωσε τον αριθμό έκδοσης αυτού του εργαλείου\n"
-
-#: ../urpmf:37
-#: ../urpmi:132
-#: ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - χρήση συγκεκριμένου περιβάλλοντος (τυπικά μία αναφορά\n"
-"                   σφάλματος).\n"
-
-#: ../urpmf:38
-#: ../urpmi:74
-#: ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - μην χρήση των μέσων που δόθηκαν, διαχωρισμένα με το κόμμα.\n"
-
-#: ../urpmf:39
-#, c-format
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr "  --literal, -l  - δεν αντικαθιστά τους μπαλαντέρ, εφαρμογή του ορίσματος ως έχει.\n"
-
-#: ../urpmf:42
-#: ../urpmi:77
-#: ../urpmq:50
-#, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - ταξινόμηση μέσων σύμφωνα με τα τμήματα λεκτικών διαχωρισμένα\n"
-"                   με το κόμμα.\n"
-
-#: ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - χρησιμοποιεί την καθορισμένη διαδρομή για πρόσβαση στο μέσο\n"
-
-#: ../urpmf:44
-#: ../urpmi:78
-#: ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - χρήση του synthesis που δίδεται αντί του urpmi db.\n"
-
-#: ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - μην τυπώσεις πανομοιότυπες γραμμές.\n"
-
-#: ../urpmf:46
-#: ../urpmi:75
-#: ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - χρήση μόνο των μέσων αναβάθμισης.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose             - αναλυτική λειτουργία.\n"
-
-#: ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i            - αγνόησε τη διάκριση πεζών-κεφαλαίων στις ακολουθίες.\n"
-
-#: ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -I             - να γίνει διάκριση πεζών-κεφαλαίων στις ακολουθίες (προεπιλογή).\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - αντικαθιστά τον διαχωριστή με <str> (από προεπιλογή ':').\n"
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Ακολουθίες εκφράσεων:\n"
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr "  text           - οποιοδήποτε κείμενο επεξεργάζεται σαν απλή έκφραση (regexp), εκτός αν έχει επιλεγεί το -l .\n"
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - συμπεριέλαβε κώδικα perl απευθείας σαν perl -e.\n"
-
-#: ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - δυαδικός AND τελεστής.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -ο             - δυαδικός OR τελεστής.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - ΟΧΙ μοναδιαίο.\n"
-
-#: ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )             - αριστερή και δεξιά παρένθεση.\n"
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Κατάλογος ετικετών:\n"
-
-#: ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - καθορίζει την μορφή εμφάνισης του τύπου printf\n"
-
-#: ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                    παράδειγμα: '%%name:%%files'\n"
-
-#: ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch        - αρχιτεκτονική\n"
-
-#: ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - αναζήτηση στο πεδίο « BuildHost »\n"
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - αναζήτηση στο πεδίο «BuildTime»\n"
-
-#: ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - αρχεία ρυθμίσεων\n"
-
-#: ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - ετικέτες συγκρούσεων\n"
-
-#: ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - αναζήτηση στην περιγραφή των πακέτων\n"
-
-#: ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - διανομή\n"
-
-#: ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - .\n"
-
-#: ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename      - όνομα αρχείου του πακέτου\n"
-
-#: ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files          - λίστα αρχείων που περιέχονται στο πακέτο.\n"
-
-#: ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group         - ομάδα\n"
-
-#: ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - άδεια\n"
-
-#: ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - όνομα πακέτου\n"
-
-#: ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - αναζήτηση στο πεδίο «obsoletes»\n"
-
-#: ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - δημιουργός πακέτου\n"
-
-#: ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - τύπωσε την ετικέτα με τις παροχές: όλες οι παροχές.\n"
-
-#: ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - τύπωσε την ετικέτα με τις εξαρτήσεις: όλες οι εξαρτήσεις.\n"
-
-#: ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size          - μέγεθος εγκατεστημένου\n"
-
-#: ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - όνομα πηγαίου rpm\n"
-
-#: ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - αναζήτηση στο πεδίο «suggests»\n"
-
-#: ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary       -  περίληψη.\n"
-
-#: ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - url\n"
-
-#: ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - κατασκευαστής\n"
-
-#: ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - το μέσο στο οποίο βρέθηκε το πακέτο\n"
-
-#: ../urpmf:85
-#: ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - τύπωσε την έκδοση, κυκλοφορίας και αρχιτεκτονικής με όνομα.\n"
-
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "μη τερματισμένη έκφραση (%s)"
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Άγνωστος τύπος: μπορείτε να χρησιμοποιήσετε μόνο μια επιλογή πολλαπλών τιμών (multi-valued tag)"
-
-#: ../urpmf:248
-#: ../urpmi:265
-#: ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "χρήση συγκεκριμένου περιβάλλοντος στο %s\n"
-
-#: ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "δεν βρέθηκε αρχείο hdlist για το μέσο \"%s\""
-
-#: ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "δεν υπάρχει διαθέσιμη σύνθεση για το μέσο \"%s\""
-
-#: ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "δεν υπάρχουν διαθέσιμες πληροφορίες xml για το μέσο \"%s\""
-
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1999,24 +2022,27 @@ msgstr "    --force-key    - εξαναγκασμός ενημέρωσης το�
 msgid "  --auto-orphans - remove orphans without asking\n"
 msgstr "  --auto-orphans - απομάκρυνση των ορφανών, χωρίς επιβαιβέωση\n"
 
-#: ../urpmi:85
-#: ../urpmq:54
+#: ../urpmi:85 ../urpmq:54
 #, c-format
 msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
-msgstr "  --no-suggests  - να μην επιλεγούν αυτόματα τα \"προτεινόμενα\" πακέτα.\n"
+msgstr ""
+"  --no-suggests  - να μην επιλεγούν αυτόματα τα \"προτεινόμενα\" πακέτα.\n"
 
 #: ../urpmi:86
 #, c-format
-msgid "  --no-uninstall - never ask to uninstall a package, abort the installation.\n"
-msgstr "  --no-uninstall - μην ρωτήσεις για να απεγκαταστήσεις ένα πακέτο, διέκοψε την εγκατάσταση.\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - μην ρωτήσεις για να απεγκαταστήσεις ένα πακέτο, διέκοψε "
+"την εγκατάσταση.\n"
 
 #: ../urpmi:87
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - μη εγκατάσταση πακέτων (μόνο λήψη)\n"
 
-#: ../urpmi:88
-#: ../urpmq:56
+#: ../urpmi:88 ../urpmq:56
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -2032,14 +2058,16 @@ msgid ""
 "                   are going to be installed or upgraded,\n"
 "                   default is %d.\n"
 msgstr ""
-"  --split-level  - διαχωρισμός σε μικρότερες συναλλαγές, αν περισσότερα από τα καθορισμένα\n"
+"  --split-level  - διαχωρισμός σε μικρότερες συναλλαγές, αν περισσότερα από "
+"τα καθορισμένα\n"
 "                   πακέτα πρόκειται να ενημερωθούν ή να αναβαθμιστούν.\n"
 "                   Η προεπιλογή είναι %d.\n"
 
 #: ../urpmi:94
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - μικρότερο μήκος συναλλαγής, η προεπιλογή είναι %d.\n"
+msgstr ""
+"  --split-length - μικρότερο μήκος συναλλαγής, η προεπιλογή είναι %d.\n"
 
 #: ../urpmi:96
 #, c-format
@@ -2054,27 +2082,28 @@ msgstr "  --buildrequires - εγκατάσταση των buildrequires των �
 #: ../urpmi:98
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - εγκατάσταση μόνο του πηγαίου πακέτου (όχι εκτελέσιμα).\n"
+msgstr ""
+"  --install-src  - εγκατάσταση μόνο του πηγαίου πακέτου (όχι εκτελέσιμα).\n"
 
 #: ../urpmi:99
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - αφαίρεσε τα rpm από την προσωρινή μνήμη πριν από κάθε άλλο.\n"
+msgstr ""
+"  --clean        - αφαίρεσε τα rpm από την προσωρινή μνήμη πριν από κάθε "
+"άλλο.\n"
 
 #: ../urpmi:100
 #, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - κρατά τα rpm στην προσωρινή μνήμη.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       - ενημέρωση της βάσης rpm αλλά όχι το σύστημα αρχείων.\n"
-
 #: ../urpmi:102
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
-msgstr "  --replacepkgs  - εξαναγκασμός εγκατάστασης πακέτων που είναι ήδη εγκατεστημένα.\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
+msgstr ""
+"  --replacepkgs  - εξαναγκασμός εγκατάστασης πακέτων που είναι ήδη "
+"εγκατεστημένα.\n"
 
 #: ../urpmi:104
 #, c-format
@@ -2082,7 +2111,8 @@ msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr ""
-"  --allow-nodeps - επέτρεψε στον χρήστη να ρωτάει για να εγκατεστημένα πακέτα χωρίς\n"
+"  --allow-nodeps - επέτρεψε στον χρήστη να ρωτάει για να εγκατεστημένα "
+"πακέτα χωρίς\n"
 "                   να ελέγχει τις εξαρτήσεις.\n"
 
 #: ../urpmi:106
@@ -2105,12 +2135,11 @@ msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
-"  --use-distrib  - ρύθμισε το urpmi απευθείας από ένα δένδρο διανομής, χρήσιμο\n"
+"  --use-distrib  - ρύθμισε το urpmi απευθείας από ένα δένδρο διανομής, "
+"χρήσιμο\n"
 "                   για να εγκαταστήσετε ένα  chroot με την επιλογή --root .\n"
 
-#: ../urpmi:114
-#: ../urpmi.addmedia:59
-#: ../urpmi.update:37
+#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:37
 #, c-format
 msgid "  --metalink     - generate and use a local metalink.\n"
 msgstr "  --metalink     - δημιουργία και χρήση ενός τοπικού μετασυνδέσμου.\n"
@@ -2142,16 +2171,15 @@ msgstr "  --wget-options - πρόσθετες επιλογές για να πε�
 #: ../urpmi:121
 #, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
-msgstr "  --prozilla-options - πρόσθετες επιλογές για να περάσετε στο prozilla\n"
+msgstr ""
+"  --prozilla-options - πρόσθετες επιλογές για να περάσετε στο prozilla\n"
 
 #: ../urpmi:122
 #, c-format
 msgid "  --aria2-options - additional options to pass to aria2\n"
 msgstr "  --aria2-options - πρόσθετες επιλογές για να περάσετε στο aria2\n"
 
-#: ../urpmi:123
-#: ../urpmi.addmedia:60
-#: ../urpmi.update:38
+#: ../urpmi:123 ../urpmi.addmedia:60 ../urpmi.update:38
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - περιόρισε την ταχύτητα λήψης.\n"
@@ -2163,31 +2191,29 @@ msgid ""
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 "  --resume       - ανάκτηση της λήψης ελλιπών αρχείων\n"
-"                   (--no-resume το απενεργοποιεί, από προεπιλογή είναι απενεργοποιημένο).\n"
+"                   (--no-resume το απενεργοποιεί, από προεπιλογή είναι "
+"απενεργοποιημένο).\n"
 
-#: ../urpmi:126
-#: ../urpmi.addmedia:61
-#: ../urpmi.update:39
-#: ../urpmq:76
+#: ../urpmi:126 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 "  --proxy        - χρήση καθορισμένου HTTP proxy, ο αριθμός της θύρας\n"
-"                   θεωρείται ότι είναι από προεπιλογή ο 1080  (η μορφή είναι <proxyhost[:port]>).\n"
+"                   θεωρείται ότι είναι από προεπιλογή ο 1080  (η μορφή είναι "
+"<proxyhost[:port]>).\n"
 
-#: ../urpmi:128
-#: ../urpmi.addmedia:63
-#: ../urpmi.update:41
-#: ../urpmq:78
+#: ../urpmi:128 ../urpmi.addmedia:63 ../urpmi.update:41 ../urpmq:78
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
 msgstr ""
-"  --proxy-user   - καθορίζει τον χρήστη και τον κωδικό πρόσβασης που θα χρησιμοποιηθεί για\n"
-"                   τον έλεγχο ταυτότητας στον proxy (η μορφή είναι <user:password>).\n"
+"  --proxy-user   - καθορίζει τον χρήστη και τον κωδικό πρόσβασης που θα "
+"χρησιμοποιηθεί για\n"
+"                   τον έλεγχο ταυτότητας στον proxy (η μορφή είναι <user:"
+"password>).\n"
 
 #: ../urpmi:130
 #, c-format
@@ -2211,12 +2237,16 @@ msgstr "  --excludedocs  - εξαιρούμενα αρχεία τεκμηρίω�
 #: ../urpmi:138
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
-msgstr "  --ignoresize   - να μην γίνει έλεγχος της χωρητικότητας του δίσκου πριν την εγκατάσταση.\n"
+msgstr ""
+"  --ignoresize   - να μην γίνει έλεγχος της χωρητικότητας του δίσκου πριν "
+"την εγκατάσταση.\n"
 
 #: ../urpmi:139
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
-msgstr "  --ignorearch   - επιτρέπει την εγκατάσταση πακέτων για άλλες αρχιτεκτονικές.\n"
+msgstr ""
+"  --ignorearch   - επιτρέπει την εγκατάσταση πακέτων για άλλες "
+"αρχιτεκτονικές.\n"
 
 #: ../urpmi:140
 #, c-format
@@ -2239,7 +2269,8 @@ msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
-"  --more-choices - όταν βρίσκονται πολλά πακέτα, να προτείνονται περισσότερες επιλογές \n"
+"  --more-choices - όταν βρίσκονται πολλά πακέτα, να προτείνονται "
+"περισσότερες επιλογές \n"
 "                   από αυτές της προεπιλογής.\n"
 
 #: ../urpmi:146
@@ -2250,13 +2281,15 @@ msgstr "  --nolock       - μα μην κλειδωθεί η βάση rpm.\n"
 #: ../urpmi:147
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
-msgstr "  --strict-arch  - αναβάθμισε μόνο τα πακέτα με την ίδια αρχιτεκτονική.\n"
+msgstr ""
+"  --strict-arch  - αναβάθμισε μόνο τα πακέτα με την ίδια αρχιτεκτονική.\n"
 
-#: ../urpmi:148
-#: ../urpmq:97
+#: ../urpmi:148 ../urpmq:97
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - επιλογή όλων των μέσων που ταιριάζουν στην γραμμή εντολών.\n"
+msgstr ""
+"  -a             - επιλογή όλων των μέσων που ταιριάζουν στην γραμμή "
+"εντολών.\n"
 
 #: ../urpmi:151
 #, c-format
@@ -2271,12 +2304,15 @@ msgstr "  --debug        - περισσότερο αναλυτική λειτο�
 #: ../urpmi:154
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  τα ονόματα ή τα αρχεία rpm που δόθηκαν στην γραμμή εντολών θα εγκατασταθούν.\n"
+msgstr ""
+"  τα ονόματα ή τα αρχεία rpm που δόθηκαν στην γραμμή εντολών θα "
+"εγκατασταθούν.\n"
 
 #: ../urpmi:182
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
-msgstr "Σφάλμα: αδύνατη η χρήση του --auto-select παράλληλα με τη λίστα πακέτων.\n"
+msgstr ""
+"Σφάλμα: αδύνατη η χρήση του --auto-select παράλληλα με τη λίστα πακέτων.\n"
 
 #: ../urpmi:189
 #, c-format
@@ -2284,13 +2320,16 @@ msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
-"Σφάλμα: Για την δημιουργία αναφοράς bug, καθορίστε τους ορισμούς της γραμμής εντολών\n"
+"Σφάλμα: Για την δημιουργία αναφοράς bug, καθορίστε τους ορισμούς της γραμμής "
+"εντολών\n"
 "με το --bug.\n"
 
 #: ../urpmi:219
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
-msgstr "Δεν μπορείτε να εγκαταστήσετε δυαδικά αρχεία rpm  όταν χρησιμοποιείτε --install-src"
+msgstr ""
+"Δεν μπορείτε να εγκαταστήσετε δυαδικά αρχεία rpm  όταν χρησιμοποιείτε --"
+"install-src"
 
 #: ../urpmi:220
 #, c-format
@@ -2304,13 +2343,20 @@ msgstr "αντιστοίχηση στο --buildrequires"
 
 #: ../urpmi:232
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "παρακαλώ χρησιμοποιήστε --buildrequires ή --install-src, από προεπιλογή --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"παρακαλώ χρησιμοποιήστε --buildrequires ή --install-src, από προεπιλογή --"
+"buildrequires"
 
 #: ../urpmi:252
 #, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
-msgstr "Ο κατάλογος [%s] υπάρχει ήδη, παρακαλώ χρησιμοποιήστε ένα διαφορετικό κατάλογο για να αναφορά σφάλματος ή διαγράψτε το"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Ο κατάλογος [%s] υπάρχει ήδη, παρακαλώ χρησιμοποιήστε ένα διαφορετικό "
+"κατάλογο για να αναφορά σφάλματος ή διαγράψτε το"
 
 #: ../urpmi:253
 #, c-format
@@ -2362,8 +2408,12 @@ msgstr "%s (προς εγκατάσταση)"
 
 #: ../urpmi:462
 #, c-format
-msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
-msgstr "Για να ικανοποιηθούν οι εξαρτήσεις του '%s', απαιτείται ένα από τα παρακάτω πακέτα:"
+msgid ""
+"In order to satisfy the '%s' dependency, one of the following packages is "
+"needed:"
+msgstr ""
+"Για να ικανοποιηθούν οι εξαρτήσεις του '%s', απαιτείται ένα από τα παρακάτω "
+"πακέτα:"
 
 #: ../urpmi:465
 #, c-format
@@ -2388,12 +2438,12 @@ msgid ""
 "that are older than the installed ones:\n"
 "%s"
 msgstr ""
-"Τα ακόλουθα πακέτα δεν μπορούν να εγκατασταθούν, γιατί εξαρτώνται από πακέτα\n"
+"Τα ακόλουθα πακέτα δεν μπορούν να εγκατασταθούν, γιατί εξαρτώνται από "
+"πακέτα\n"
 "που είναι παλαιότερα από αυτά που είναι εγκατεστημένα:\n"
 "%s"
 
-#: ../urpmi:515
-#: ../urpmi:530
+#: ../urpmi:515 ../urpmi:530
 #, c-format
 msgid ""
 "\n"
@@ -2402,10 +2452,7 @@ msgstr ""
 "\n"
 "Να συνεχίσω την εγκατάσταση;"
 
-#: ../urpmi:516
-#: ../urpmi:531
-#: ../urpmi:628
-#: ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -2451,7 +2498,8 @@ msgid ""
 "have to be removed for others to be upgraded:\n"
 "%s\n"
 msgstr ""
-"Η εγκατάσταση δεν μπορεί να συνεχιστεί διότι τα παρακάτω πακέτα πρέπει να αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
+"Η εγκατάσταση δεν μπορεί να συνεχιστεί διότι τα παρακάτω πακέτα πρέπει να "
+"αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
 "%s\n"
 
 #: ../urpmi:560
@@ -2480,10 +2528,12 @@ msgstr "(μονάχα έλεγχος, η αφαίρεση δεν θα γίνει
 #: ../urpmi:583
 #, c-format
 msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
 "%s\n"
 msgstr ""
-"Πρέπει πρώτα να χρησιμοποιήσετε την urpmi --buildrequires για να εγκαταστήσετε τις παρακάτω εξαρτήσεις:\n"
+"Πρέπει πρώτα να χρησιμοποιήσετε την urpmi --buildrequires για να "
+"εγκαταστήσετε τις παρακάτω εξαρτήσεις:\n"
 "%s\n"
 
 #: ../urpmi:594
@@ -2563,7 +2613,8 @@ msgstr ""
 "       cdrom://<διαδρομή>\n"
 "\n"
 "χρήση: urpmi.addmedia [options] --distrib --mirrorlist <url>\n"
-"χρήση: urpmi.addmedia [options] --mirrorlist <url> <όνομα> <σχετική διαδρομή>\n"
+"χρήση: urpmi.addmedia [options] --mirrorlist <url> <όνομα> <σχετική "
+"διαδρομή>\n"
 "\n"
 "παραδείγματα:\n"
 "\n"
@@ -2573,63 +2624,66 @@ msgstr ""
 "\n"
 "και οι [επιλογές] είναι από\n"
 
-#: ../urpmi.addmedia:55
-#: ../urpmi.update:33
-#: ../urpmq:73
+#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:73
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - χρήση του wget για την ανάκτηση απομακρυσμένων αρχείων.\n"
+msgstr ""
+"  --wget         - χρήση του wget για την ανάκτηση απομακρυσμένων αρχείων.\n"
 
-#: ../urpmi.addmedia:56
-#: ../urpmi.update:34
-#: ../urpmq:74
+#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:74
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - χρήση του curl για την ανάκτηση απομακρυσμένων αρχείων.\n"
+msgstr ""
+"  --curl         - χρήση του curl για την ανάκτηση απομακρυσμένων αρχείων.\n"
 
-#: ../urpmi.addmedia:57
-#: ../urpmi.update:35
-#: ../urpmq:75
+#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:75
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
-msgstr "  --prozilla     - χρήση του prozilla για την ανάκτηση απομακρυσμένων αρχείων.\n"
+msgstr ""
+"  --prozilla     - χρήση του prozilla για την ανάκτηση απομακρυσμένων "
+"αρχείων.\n"
 
-#: ../urpmi.addmedia:58
-#: ../urpmi.update:36
+#: ../urpmi.addmedia:58 ../urpmi.update:36
 #, c-format
 msgid "  --aria2        - use aria2 to retrieve distant files.\n"
-msgstr "  --aria2         - χρήση του aria2, για την ανάκτηση απομακρυσμένων αρχείων.\n"
+msgstr ""
+"  --aria2         - χρήση του aria2, για την ανάκτηση απομακρυσμένων "
+"αρχείων.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - δημιουργία μέσου αναβάθμισης.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
-"                   one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+"                   one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
 msgstr ""
 "  --xml-info     - λήψη των αρχείων xml info με την καθορισμένη πολιτική\n"
-"                   απο τις εξής: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+"                   απο τις εξής: never, on-demand, update-only, always. cf "
+"urpmi.cfg(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - χρήση ενός αρχείου synthesis.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - χρήση των αρχείων rpm (αντί των synthesis).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - να μην γίνει αναζήτηση για αρχεία synthesis.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2638,96 +2692,102 @@ msgstr ""
 "  --distrib      - αυτόματη δημιουργία όλων των μέσων (media) από ένα μέσο\n"
 "                   εγκατάστασης.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
-msgstr "  --interactive  - με --distrib, ρωτά επιβεβαίωση για κάθε μέσο (media)\n"
+msgstr ""
+"  --interactive  - με --distrib, ρωτά επιβεβαίωση για κάθε μέσο (media)\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - εμφανίζει τα διαθέσιμα μέσα.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
-"  --from         - χρήση του καθορισμένου url για την λίστα των mirrors, η προεπιλογή είναι\n"
+"  --from         - χρήση του καθορισμένου url για την λίστα των mirrors, η "
+"προεπιλογή είναι\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
-msgstr "  --virtual      - δημιουργία εικονικών μέσων (media) τα οποία είναι πάντα ενημερωμένα.\n"
+msgstr ""
+"  --virtual      - δημιουργία εικονικών μέσων (media) τα οποία είναι πάντα "
+"ενημερωμένα.\n"
 
-#: ../urpmi.addmedia:79
-#: ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - απενεργοποίηση του MD5SUM ελέγχου του αρχείου .\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
-msgstr "  --nopubkey     - να μην γίνει εισαγωγή δημόσιου κλειδιού των νέων μέσων (media)\n"
+msgstr ""
+"  --nopubkey     - να μην γίνει εισαγωγή δημόσιου κλειδιού των νέων μέσων "
+"(media)\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
-msgstr "  --raw          - προσθήκη του μέσου (media) στην διαμόρφωση, αλλά χωρίς ενημέρωση.\n"
+msgstr ""
+"  --raw          - προσθήκη του μέσου (media) στην διαμόρφωση, αλλά χωρίς "
+"ενημέρωση.\n"
 
-#: ../urpmi.addmedia:82
-#: ../urpmi.removemedia:43
-#: ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - σιωπηλή λειτουργία.\n"
 
-#: ../urpmi.addmedia:83
-#: ../urpmi.removemedia:44
-#: ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - αναλυτική περιγραφή.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "οι γνωστές πολιτικές xml-πληροφοριών είναι οι %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "δεν απαιτείται όρισμα για --distrib --mirrorlist <url>"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
-msgstr "εσφαλμένο <url> (στην περίπτωση τοπικού καταλόγου, η διαδρομή θα πρέπει να είναι απόλυτη)"
+msgstr ""
+"εσφαλμένο <url> (στην περίπτωση τοπικού καταλόγου, η διαδρομή θα πρέπει να "
+"είναι απόλυτη)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Μόνο ο διαχειριστής επιτρέπεται να προσθέσει μέσα"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "δημιουργία αρχείου ρυθμίσεων (config) [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Δεν μπορεί να δημιουργηθεί το αρχείο ρυθμίσης [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
-msgstr "δε χρειάζεται να δώσεις <σχετική διαδρομή του synthesis>  με το --distrib"
+msgstr ""
+"δε χρειάζεται να δώσεις <σχετική διαδρομή του synthesis>  με το --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
@@ -2736,17 +2796,17 @@ msgstr ""
 "\n"
 "Θες να προσθέσεις το μέσο '%s' ;"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "η <σχετική διαδρομή του synthesis> λείπει\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Αδυναμία χρήσης του %s με το απομακρυσμένο μέσο"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "Αδυναμία προσθήκης μέσου"
@@ -2756,13 +2816,15 @@ msgstr "Αδυναμία προσθήκης μέσου"
 msgid ""
 "urpmi.recover version %s\n"
 "Copyright (C) 2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "Έκδοση urpmi.recover %s\n"
 "Copyright (C) 2006 Mandriva.\n"
-"Αυτό είναι ελεύθερο λογισμικό και μπορεί να διανεμηθεί υπό τους όρους της GNU GPL.\n"
+"Αυτό είναι ελεύθερο λογισμικό και μπορεί να διανεμηθεί υπό τους όρους της "
+"GNU GPL.\n"
 "\n"
 "χρήση:\n"
 
@@ -2775,18 +2837,24 @@ msgstr "  --checkpoint   - ορίστε τώρα το σημείο αναφορ�
 #, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
 msgstr ""
-"  --noclean      - να μην γίνει καθαρισμός του φακέλου αναδημιουργίας πακέτων\n"
+"  --noclean      - να μην γίνει καθαρισμός του φακέλου αναδημιουργίας "
+"πακέτων\n"
 "κατά την αρχικοποίηση του σημείου αναφοράς\n"
 
 #: ../urpmi.recover:37
 #, c-format
-msgid "  --list         - list transactions since provided date/duration argument\n"
-msgstr "  --list         - λίστα συναλλαγών που έγιναν από μια καθορισμένη ημερομηνία/διάρκεια και μετά\n"
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
+msgstr ""
+"  --list         - λίστα συναλλαγών που έγιναν από μια καθορισμένη "
+"ημερομηνία/διάρκεια και μετά\n"
 
 #: ../urpmi.recover:38
 #, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
-msgstr "  --list-all     - εμφανίζει την λίστα με όλες τις συναλλαγές της βάσης RPM.\n"
+msgstr ""
+"  --list-all     - εμφανίζει την λίστα με όλες τις συναλλαγές της βάσης "
+"RPM.\n"
 
 #: ../urpmi.recover:39
 #, c-format
@@ -2801,7 +2869,8 @@ msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
-"  --rollback     - επαναφορά στην κατάσταση που αντιστοιχεί στην καθορισμένη ημερομηνία,\n"
+"  --rollback     - επαναφορά στην κατάσταση που αντιστοιχεί στην καθορισμένη "
+"ημερομηνία,\n"
 "                   ή υποχώρηση σύμφωνα με τον καθορισμένο αριθμό συναλλαγών\n"
 
 #: ../urpmi.recover:42
@@ -2844,12 +2913,14 @@ msgstr "Λανθασμένα ορίσματα της γραμμής εντολώ
 #: ../urpmi.recover:84
 #, c-format
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
-msgstr "Δεν μπορείς να προσδιορίσεις συγχρόνως το --checkpoint και το --rollback \n"
+msgstr ""
+"Δεν μπορείς να προσδιορίσεις συγχρόνως το --checkpoint και το --rollback \n"
 
 #: ../urpmi.recover:86
 #, c-format
 msgid "You can't specify --checkpoint and --list at the same time\n"
-msgstr "Δεν μπορείς να προσδιορίσεις συγχρόνως το --checkpoint και το --list \n"
+msgstr ""
+"Δεν μπορείς να προσδιορίσεις συγχρόνως το --checkpoint και το --list \n"
 
 #: ../urpmi.recover:88
 #, c-format
@@ -2871,8 +2942,7 @@ msgstr "Δεν βρέθηκε συναλλαγή από %s\n"
 msgid "You must be superuser to do this"
 msgstr "Πρέπει να είστε υπερχρήστης για να  το πράξετε αυτό"
 
-#: ../urpmi.recover:143
-#: ../urpmi.recover:209
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "Εγγραφή αρχείου rpm μακροεντολών [%s]...\n"
@@ -2919,7 +2989,9 @@ msgstr "Μόνο ο διαχειριστής επιτρέπεται να αφα�
 #: ../urpmi.removemedia:72
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "τίποτα για διαγραφή (χρησιμοποιήστε το urpmi.addmedia για να προσθέσετε ένα μέσο)\n"
+msgstr ""
+"τίποτα για διαγραφή (χρησιμοποιήστε το urpmi.addmedia για να προσθέσετε ένα "
+"μέσο)\n"
 
 #: ../urpmi.removemedia:78
 #, c-format
@@ -2952,12 +3024,15 @@ msgstr "  --force-key    - εξαναγκασμός ενημέρωσης του
 #: ../urpmi.update:46
 #, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
-msgstr "  --ignore       - να μην ενημερωθεί, να σημειωθεί το μέσο ως αγνοημένο.\n"
+msgstr ""
+"  --ignore       - να μην ενημερωθεί, να σημειωθεί το μέσο ως αγνοημένο.\n"
 
 #: ../urpmi.update:47
 #, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
-msgstr "  --no-ignore    - να μην γίνει ενημέρωση, το μέσο θα σημειωθεί ως ενεργοποιημένο.\n"
+msgstr ""
+"  --no-ignore    - να μην γίνει ενημέρωση, το μέσο θα σημειωθεί ως "
+"ενεργοποιημένο.\n"
 
 #: ../urpmi.update:49
 #, c-format
@@ -2977,19 +3052,23 @@ msgstr "  -f             - εξαναγκάζει την ενημέρωση τω
 #: ../urpmi.update:52
 #, c-format
 msgid "  -ff            - really force updating synthesis\n"
-msgstr "  -ff            - εξαναγκάζει πραγματικά την ενημέρωση των αρχείων synthesis\n"
+msgstr ""
+"  -ff            - εξαναγκάζει πραγματικά την ενημέρωση των αρχείων "
+"synthesis\n"
 
 #: ../urpmi.update:69
 #, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Μόνο ο διαχειριστής επιτρέπεται να αναβαθμίζει τα μέσα"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "τίποτα για αναβάθμιση (χρησιμοποιήστε urpmi.addmedia για να προσθέσετε ένα μέσο)\n"
+msgstr ""
+"τίποτα για αναβάθμιση (χρησιμοποιήστε urpmi.addmedia για να προσθέσετε ένα "
+"μέσο)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2998,17 +3077,17 @@ msgstr ""
 "η επιλογή για αναβάθμιση λείπει\n"
 "(ένα εκ των %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "παράβλεψη του μέσου %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "ενεργοποίηση του μέσου %s"
@@ -3018,19 +3097,23 @@ msgstr "ενεργοποίηση του μέσου %s"
 msgid ""
 "urpmq version %s\n"
 "Copyright (C) 2000-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "Έκδοση urpmq %s\n"
 "Copyright (C) 2000-2006 Mandriva.\n"
-"Αυτό είναι ελεύθερο λογισμικό και μπορεί να διανεμηθεί υπό τους όρους της GNU GPL.\n"
+"Αυτό είναι ελεύθερο λογισμικό και μπορεί να διανεμηθεί υπό τους όρους της "
+"GNU GPL.\n"
 "\n"
 "χρήση:\n"
 
 #: ../urpmq:48
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested (or updated) packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested (or updated) "
+"packages.\n"
 msgstr ""
 "  --searchmedia  - χρήση μόνο των μέσων που δόθηκαν, στην αναζήτηση των\n"
 "                   ζητούμενων (ή των αναβαθμιζόμενων) πακέτων.\n"
@@ -3058,7 +3141,8 @@ msgstr "  --list-media   - εμφανίζει τα διαθέσιμα μέσα �
 #: ../urpmq:60
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
-msgstr "  --list-url     - εμφανίζει τα διαθέσιμα μέσα ενημέρωσης και τα URL τους.\n"
+msgstr ""
+"  --list-url     - εμφανίζει τα διαθέσιμα μέσα ενημέρωσης και τα URL τους.\n"
 
 #: ../urpmq:61
 #, c-format
@@ -3074,7 +3158,8 @@ msgstr "  --list-aliases - λίστα των διαθέσιμων παράλλη
 
 #: ../urpmq:63
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - εμφανίζει την διαμόρφωση με τη μορφή ενός ορίσματος\n"
 "                   urpmi.addmedia.\n"
@@ -3088,8 +3173,10 @@ msgstr ""
 
 #: ../urpmq:65
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources      - δίνει όλα τα πηγαία πακέτα πριν τη λήψη (μόνο root).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - δίνει όλα τα πηγαία πακέτα πριν τη λήψη (μόνο root).\n"
 
 #: ../urpmq:67
 #, c-format
@@ -3217,13 +3304,18 @@ msgstr "  -r             - αναλυτική εμφάνιση της έκδοσ
 #: ../urpmq:105
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - το επόμενο πακέτο είναι πηγαίο πακέτο (ίδιο με το --src).\n"
+msgstr ""
+"  -s             - το επόμενο πακέτο είναι πηγαίο πακέτο (ίδιο με το --"
+"src).\n"
 
 #: ../urpmq:106
 #, c-format
-msgid "  -u             - remove package if a more recent version is already installed.\n"
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr ""
-"  -u             - αφαίρεση του πακέτου εάν μια πιο πρόσφατη έκδοση είναι ήδη\n"
+"  -u             - αφαίρεση του πακέτου εάν μια πιο πρόσφατη έκδοση είναι "
+"ήδη\n"
 "                   εγκατεστημένη.\n"
 
 #: ../urpmq:107
@@ -3235,14 +3327,16 @@ msgstr "  -y             - επιβάλει την ασαφής αναζήτησ
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
-"  -Y             - όπως το -y, αλλά δεν λαμβάνει υπόψη τον τύπο των χαρακτήρων\n"
+"  -Y             - όπως το -y, αλλά δεν λαμβάνει υπόψη τον τύπο των "
+"χαρακτήρων\n"
 "                   (κεφαλαία/πεζά).\n"
 
 # ???
 #: ../urpmq:109
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  τα ονόματα ή τα αρχεία rpm που δόθηκαν στη γραμμή εντολών συγκεντρώθηκαν.\n"
+msgstr ""
+"  τα ονόματα ή τα αρχεία rpm που δόθηκαν στη γραμμή εντολών συγκεντρώθηκαν.\n"
 
 #: ../urpmq:156
 #, c-format
@@ -3262,58 +3356,82 @@ msgstr "χρησιμοποίησε το -l για να δεις μια λίστ�
 #: ../urpmq:404
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", μονάχα περιορισμένα αποτελέσματα για το πακέτο %s"
+msgstr ""
+"δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", μονάχα περιορισμένα "
+"αποτελέσματα για το πακέτο %s"
 
 #: ../urpmq:405
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for packages %s"
-msgstr "δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", μονάχα περιορισμένα αποτελέσματα για τα πακέτα %s"
+msgstr ""
+"δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", μονάχα περιορισμένα "
+"αποτελέσματα για τα πακέτα %s"
 
 #: ../urpmq:408
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", αδύνατη η λήψη αποτελεσμάτων για το πακέτο %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", αδύνατη η λήψη "
+"αποτελεσμάτων για το πακέτο %s"
 
 #: ../urpmq:409
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", αδύνατη η επιστροφή αποτελεσμάτων για τα πακέτα %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"δεν βρέθηκαν πληροφορίες xml, για το μέσο \"%s\", αδύνατη η επιστροφή "
+"αποτελεσμάτων για τα πακέτα %s"
 
 #: ../urpmq:473
 #, c-format
 msgid "No changelog found\n"
 msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - δημιουργία μέσου αναβάθμισης.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "κακοδιατυπωμένο URL: [%s]"
+
 #~ msgid "sorry, you can't use --install-src to install remote .src.rpm files"
 #~ msgstr ""
 #~ "δεν μπορείτε να χρησιμοποιήσετε --install-src για να εγκαταστήσετε "
 #~ "απομακρυσμένα .src.rpm αρχεία"
+
 #~ msgid "Error"
 #~ msgstr "Σφάλμα"
+
 #~ msgid "%d installation transaction failed"
 #~ msgid_plural "%d installation transactions failed"
 #~ msgstr[0] "αποτυχία %d διεργασίας εγκατάστασης"
 #~ msgstr[1] "αποτυχία %d διεργασιών εγκατάστασης"
+
 #~ msgid "Package %s can not be installed"
 #~ msgstr "Το πακέτο %s δεν μπορεί να εγκατασταθεί"
+
 #~ msgid "Packages %s can not be installed"
 #~ msgstr "Τα πακέτα %s δεν μπορούν να εγκατασταθούν"
+
 #~ msgid "Checking to remove the following packages"
 #~ msgstr "Έλεγχος για την αφαίρεση των παρακάτω πακέτων"
 
 #, fuzzy
 #~ msgid "%s database locked"
 #~ msgstr "Η βάση δεδομένων urpmi είναι κλειδωμένη"
+
 #~ msgid "Unknown option %s"
 #~ msgstr "Άγνωστη επιλογή %s"
+
 #~ msgid "too many mount points for removable medium \"%s\""
 #~ msgstr "πολλαπλά σημεία σύνδεσης για το αφαιρούμενο μέσο \"%s\""
+
 #~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
 #~ msgstr "Το μέσο \"%s\" είναι ένα αρχείο ISO, θα προσαρτηθεί on-the-fly"
+
 #~ msgid "using different removable device [%s] for \"%s\""
 #~ msgstr "χρήση διαφορετικής αφαιρούμενης συσκευής  [%s] για το \"%s\""
+
 #~ msgid "unable to retrieve pathname for removable medium \"%s\""
 #~ msgstr ""
 #~ "αδυναμία ανάκτησης της διαδρομής (pathname) για το αφαιρούμενο μέσο \"%s\""
@@ -3321,6 +3439,7 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 #, fuzzy
 #~ msgid "unable to mount the distribution medium"
 #~ msgstr "αδυναμία πρόσβασης στο πρώτο μέσο εγκατάστασης"
+
 #~ msgid ""
 #~ "unable to access medium \"%s\",\n"
 #~ "this could happen if you mounted manually the directory when creating the "
@@ -3329,6 +3448,7 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 #~ "αδυναμία πρόσβασης μέσου \"%s\",\n"
 #~ "αυτό μπορεί να συμβαίνει εάν έχετε προσαρτήσει μόνοι σας τον κατάλογο "
 #~ "όταν δημιουργήθηκε το μέσο."
+
 #~ msgid "inconsistent medium \"%s\" marked removable but not really"
 #~ msgstr ""
 #~ "το αντιφατικό μέσο \"%s\" έχει αναφερθεί ως αφαιρούμενο αλλά δεν είναι "
@@ -3337,14 +3457,17 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 #, fuzzy
 #~ msgid "  -c             - clean headers cache directory.\n"
 #~ msgstr "  -v             - αναλυτική λειτουργία.\n"
+
 #~ msgid "virtual medium needs to be local"
 #~ msgstr "το εικονικό μέσο χρειάζεται να είναι τοπικό"
 
 #, fuzzy
 #~ msgid "unable to parse synthesis file of \"%s\""
 #~ msgstr "αδυναμία ανάλυσης του hdlist αρχείου από το \"%s\""
+
 #~ msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
 #~ msgstr "υπολογισμός md5sum από υπάρχουσα πηγή hdlist (ή synthesis) [%s]"
+
 #~ msgid ""
 #~ "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 #~ "ignored"
@@ -3355,6 +3478,7 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 #, fuzzy
 #~ msgid "invalid hdlist name"
 #~ msgstr "μη έγκυρο όνομα αρχείου rpm [%s]"
+
 #~ msgid "unable to find list file for \"%s\", medium ignored"
 #~ msgstr "αδυναμία εύρεσης αρχείου λίστας για το \"%s\", το μέσο αγνοείται"
 
@@ -3369,10 +3493,12 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 #, fuzzy
 #~ msgid "unable to access list file of \"%s\""
 #~ msgstr "αδυναμία ανάλυσης του hdlist αρχείου από το \"%s\""
+
 #~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 #~ msgstr ""
 #~ "το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένη "
 #~ "hdlist, το μέσο αγνοείται"
+
 #~ msgid "medium \"%s\" trying to use an already used list, medium ignored"
 #~ msgstr ""
 #~ "το μέσο \"%s\" προσπαθεί να χρησιμοποιήσει την ήδη χρησιμοποιημένη λίστα, "
@@ -3384,29 +3510,39 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 #~ msgstr ""
 #~ "Σημείωση: αφού δεν έγινε αναζήτηση σε κανένα μέσο που χρησιμοποιεί "
 #~ "hdlists, το urpmf δεν μπόρεσε να επιστρέψει κανένα αποτέλεσμα\n"
+
 #~ msgid "performing second pass to compute dependencies\n"
 #~ msgstr "γίνεται δεύτερος έλεγχος για να υπολογιστούν οι εξαρτήσεις\n"
+
 #~ msgid "building hdlist [%s]"
 #~ msgstr "δημιουργία hdlist [%s]"
+
 #~ msgid ""
 #~ "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
 #~ "corrupted."
 #~ msgstr ""
 #~ "αδυναμία δημιουργίας αρχείου σύνθεσης για το μέσο \"%s\". Το αρχείο "
 #~ "hdlist μπορεί να είναι λανθασμένο."
+
 #~ msgid "problem reading hdlist or synthesis file of medium \"%s\""
 #~ msgstr ""
 #~ "πρόβλημα ανάγνωσης του hdlist ή του αρχείου σύνθεσης από το μέσο \"%s\""
+
 #~ msgid "computing md5sum of copied source hdlist (or synthesis)"
 #~ msgstr "υπολογισμός md5sum από αντιγραμμένης πηγής hdlist (ή synthesis)"
+
 #~ msgid "...retrieving failed: md5sum mismatch"
 #~ msgstr "... η ανάκτηση απέτυχε: Ασυμφωνία md5sum"
+
 #~ msgid "no rpm files found from [%s]"
 #~ msgstr "δεν βρέθηκαν αρχεία rpm από το [%s]"
+
 #~ msgid "unable to read rpm files from [%s]: %s"
 #~ msgstr "αδυναμία ανάγνωσης αρχείων rpm από το [%s]: %s"
+
 #~ msgid "no rpms read"
 #~ msgstr "καμία ανάγνωση rpm πακέτων"
+
 #~ msgid "reading headers from medium \"%s\""
 #~ msgstr "ανάγνωση επικεφαλίδων από το μέσο \"%s\""
 
@@ -3421,15 +3557,18 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 #~ msgstr ""
 #~ "  -h             - Προσπάθησε να βρεις και να χρησιμοποιήσεις το αρχείο\n"
 #~ "                    synthesis hdlist.\n"
+
 #~ msgid ""
 #~ "Note: since no media searched uses hdlists, urpmf was unable to return "
 #~ "any result\n"
 #~ msgstr ""
 #~ "Σημείωση: αφού δεν έγινε αναζήτηση σε κανένα μέσο που χρησιμοποιεί "
 #~ "hdlists, το urpmf δεν μπόρεσε να επιστρέψει κανένα αποτέλεσμα\n"
+
 #~ msgid "You may want to use --name to search for package names.\n"
 #~ msgstr ""
 #~ "Μπορείτε να χρησιμοποιήσετε --name για την αναζήτηση ονομάτων πακέτων.\n"
+
 #~ msgid "  --src, -s      - next package is a source package.\n"
 #~ msgstr ""
 #~ "  --src, -s       - το επόμενο πακέτο είναι ένα πακέτο πηγαίου κώδικα \n"
@@ -3439,14 +3578,19 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 #~ msgstr ""
 #~ "  -h             - Προσπάθησε να βρεις και να χρησιμοποιήσεις το αρχείο\n"
 #~ "                    synthesis hdlist.\n"
+
 #~ msgid "unable to update medium \"%s\"\n"
 #~ msgstr "αδυναμία αναβάθμισης του μέσου \"%s\"\n"
+
 #~ msgid "unable to create medium \"%s\"\n"
 #~ msgstr "αδυναμία δημιουργίας του μέσου \"%s\"\n"
+
 #~ msgid "there are multiple packages with the same rpm filename \"%s\""
 #~ msgstr "υπάρχουν πολλαπλά πακέτα με το ίδιο όνομα αρχείου rpm \"%s\""
+
 #~ msgid "unable to correctly parse [%s] on value \"%s\""
 #~ msgstr "αδυναμία σωστής ανάλυσης του [%s] στην τιμή \"%s\""
+
 #~ msgid ""
 #~ "medium \"%s\" uses an invalid list file:\n"
 #~ "  mirror is probably not up-to-date, trying to use alternate method"
@@ -3454,14 +3598,19 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 #~ "το μέσο \"%s\" χρησιμοποιεί ένα μη έγκυρο αρχείο λίστας:\n"
 #~ "  η τοποθεσία mirror μάλλον δεν είναι πλήρως ενημερωμένη, προσπάθεια "
 #~ "χρησιμοποίησης εναλλακτικής μεθόδου"
+
 #~ msgid "medium \"%s\" does not define any location for rpm files"
 #~ msgstr "το μέσο \"%s\" δεν καθορίζει κάποια τοποθεσία για τα αρχεία rpm"
+
 #~ msgid "unrequested"
 #~ msgstr "δεν ζητήθηκαν"
+
 #~ msgid " (%d MB)"
 #~ msgstr " (%d MB)"
+
 #~ msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 #~ msgstr "προσθήκη πακέτου %s (id=%d, eid=%d, αναβάθμιση=%d, αρχείο=%s)"
+
 #~ msgid ""
 #~ "The following packages have bad signatures:\n"
 #~ "%s\n"
@@ -3477,15 +3626,19 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 #, fuzzy
 #~ msgid "You need to be root to use --use-distrib"
 #~ msgstr "Πρέπει να είστε root για να κάνετε χρήση της εντολής ! \n"
+
 #~ msgid "unable to remove package %s"
 #~ msgstr "αδυναμία αφαίρεσης του πακέτου %s"
+
 #~ msgid "No filelist found\n"
 #~ msgstr "Δεν βρέθηκε αρχείο λίστας (filelist)\n"
+
 #~ msgid ""
 #~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 #~ msgstr ""
 #~ "Για να ικανοποιηθούν οι εξαρτήσεις, τα παρακάτω πακέτα %d θα αφαιρεθούν (%"
 #~ "d MB)"
+
 #~ msgid ""
 #~ "To satisfy dependencies, the following %d packages are going to be "
 #~ "installed:\n"
@@ -3494,62 +3647,83 @@ msgstr "Δεν βρέθηκε αρχείο αλλαγών (changelog)\n"
 #~ "Για να ικανοποιηθούν οι εξαρτήσεις, τα ακόλουθα πακέτα %d πρέπει να "
 #~ "εγκατασταθούν:\n"
 #~ "%s\n"
+
 #~ msgid "Installing packages on nodes..."
 #~ msgstr "Εγκατάσταση πακέτων στους κόμβους..."
+
 #~ msgid "Distributing files to %s..."
 #~ msgstr "Κατανομή αρχείων στο %s..."
+
 #~ msgid "Performing install on %s..."
 #~ msgstr "Εκτέλεση εγκατάστασης σε %s..."
+
 #~ msgid "Preparing install on %s..."
 #~ msgstr "Προετοιμάζω εγκατάσταση σε %s...."
+
 #~ msgid ""
 #~ "\n"
 #~ "unknown options '%s'\n"
 #~ msgstr ""
 #~ "\n"
 #~ "άγνωστες επιλογές '%s'\n"
+
 #~ msgid "unable to find hdlist file for \"%s\", medium ignored"
 #~ msgstr ""
 #~ "αδυναμία εύρεσης του αρχείου hdlist για το \"%s\", το μέσο αγνοείται"
+
 #~ msgid "inconsistent list file for \"%s\", medium ignored"
 #~ msgstr "μη συναφές αρχείο λίστας για το \"%s\", το μέσο αγνοείται"
+
 #~ msgid "unable to inspect list file for \"%s\", medium ignored"
 #~ msgstr ""
 #~ "αδυναμία επιθεώρησης αρχείου λίστας για το \"%s\", το μέσο αγνοείται"
+
 #~ msgid "virtual medium \"%s\" is not local, medium ignored"
 #~ msgstr "το εικονικό μέσο \"%s\" δεν είναι τοπικό, το μέσο αγνοείται"
+
 #~ msgid ""
 #~ "virtual medium \"%s\" should have valid source hdlist or synthesis, "
 #~ "medium ignored"
 #~ msgstr ""
 #~ "το εικονικό μέσο \"%s\" πρέπει να έχει έγκυρη πηγή hdlist ή σύνθεσης, το "
 #~ "μέσο αγνοείται"
+
 #~ msgid "copying source hdlist (or synthesis) of \"%s\"..."
 #~ msgstr "αντιγραφή πηγής hdlist (ή synthesis) από \"%s\"..."
+
 #~ msgid "retrieval of source hdlist (or synthesis) failed"
 #~ msgstr "απέτυχε η ανάκτηση του πηγαίου hdlist (ή synthesis) "
+
 #~ msgid "file [%s] already used in the same medium \"%s\""
 #~ msgstr "το αρχείο [%s] χρησιμοποιείται από το ίδιο μέσο \"%s\""
+
 #~ msgid "nothing written in list file for \"%s\""
 #~ msgstr "τίποτα δεν γράφτηκε στο αρχείο λίστας για το \"%s\""
+
 #~ msgid "found %d headers in cache"
 #~ msgstr "βρέθηκαν %d επικεφαλίδες στην προσωρινή μνήμη"
+
 #~ msgid "removing %d obsolete headers in cache"
 #~ msgstr ""
 #~ "αφαίρεση των μη χρησιμοποιημένων %d επικεφαλίδων από την προσωρινή μνήμη"
+
 #~ msgid "using process %d for executing transaction"
 #~ msgstr "χρήση διαδικασίας %d για την εκτέλεση transaction"
+
 #~ msgid "  --norebuild    - don't try to rebuild hdlist if not readable.\n"
 #~ msgstr ""
 #~ "  --norebuild    - μην προσπαθείς να ξαναδημιουργήσεις την hdlist εάν δεν "
 #~ "είναι εγγράψιμη.\n"
+
 #~ msgid "copying hdlists file..."
 #~ msgstr "αντιγραφή αρχείου hdlist..."
+
 #~ msgid "invalid hdlist description \"%s\" in hdlists file"
 #~ msgstr "μη έγκυρη περιγραφή hdlist \"%s\" μέσα στο αρχείο hdlists"
+
 #~ msgid "   -g [group]     - restrict results to given group.\n"
 #~ msgstr ""
 #~ "   -g [group]     - περιορισμένα αποτελέσματα στην ομάδα που δόθηκε.\n"
+
 #~ msgid "                    defaults is %s.\n"
 #~ msgstr "                    προκαθορισμένο είναι το %s.\n"
-
diff --git a/po/eo.po b/po/eo.po
index 43e64a12..4370e393 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2005-01-13 10:05+0100\n"
 "Last-Translator: Grégoire COLBERT <gcolbert2004@noos.fr>\n"
 "Language-Team: Esperanto <mandrak-eo@yahoogroups.com>\n"
@@ -23,7 +23,7 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM instalado"
@@ -33,7 +33,7 @@ msgstr "RPM instalado"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Jes"
@@ -99,7 +99,7 @@ msgstr "_Instalu"
 msgid "_Save"
 msgstr "_Konservu"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Nuligu"
@@ -131,8 +131,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - presu tiun ĉi help-mesaĝon.\n"
@@ -166,7 +167,7 @@ msgstr ""
 "  --verify-rpm   - kontrolu rpm-signaturon antaŭ instalado\n"
 "                   (--no-verify-rpm elŝaltu ĝin, defaŭlta estas enŝaltita).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -220,7 +221,7 @@ msgstr "Bonvole atendu..."
 msgid "Must be root"
 msgstr "Devas esti sistemestro"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -231,42 +232,42 @@ msgstr ""
 "%s\n"
 "Ĉu vi deziras tamen daŭrigi?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Averto"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Jes"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (ĝisdatigi)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (instali)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Unu el la sekvantaj pakaĵoj estas bezonata:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "Ĉ_esigu"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -277,14 +278,14 @@ msgstr ""
 "%s\n"
 "Ĉu vi deziras tamen daŭrigi?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "Por plenumi dependaĵojn, la sekvanta pakaĵo estos ankaŭ instalita (%d MB)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -293,49 +294,49 @@ msgstr ""
 "esti instalataj:\n"
 "%s\n"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pakaĵo, %d MB)"
 msgstr[1] "(%d pakaĵoj, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Instalado de pakaĵo..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "Ne povas preni fontajn pakaĵojn, mi ĉesiĝas."
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Mi preparas..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Mi instalas pakaĵon '%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Bonvole enŝovu la medion nomata \"%s\" en aparaton [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Mi elŝutas pakaĵon '%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Finata"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -346,28 +347,28 @@ msgstr ""
 "%s\n"
 "Eble vi ĝisdatigu vian urpmi-datenbazon"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Instalado malsukcesis:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "La pakaĵo(j) estas jam instalita(j)"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Instalo finita"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "foriganta %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "restartas urpmi"
@@ -447,8 +448,8 @@ msgid "...retrieving done"
 msgstr "... ekstraktado farita"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...ekstraktado malsukcesis: %s"
@@ -488,52 +489,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr "malĝusta deklaro de prokuro en la komanda linio\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: ne povas legi rpm-an dosieron \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Mankas signaturo (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -959,218 +960,218 @@ msgstr ""
 "--sintezo ne uzeblas kun --media, --excludemedia, --sortmedia, --update aŭ --"
 "parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Serĉo startas al: %s finas al: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "transsaltu pakaĵon %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "instalus anstataŭ ĝisdatigi pakaĵon %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "medio \"%s\" jam ekzistas"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "mi legas la ĉapojn de la datenportilo \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "foriganta datenportilon \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "ne povis malfermi rpmdb"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "neeblas aliri la unuan instal-datenportilon (ne trovis hdlists-dosieron)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "mi ekstraktas la dosieron hdlists..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "provas elekti neekzistantan datenportilon \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "mi elektas plurtipan datenportilon: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "foriganta datenportilon \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "rekonfiguras urpmi-on por datenportilo \"%s\"..."
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...rekonfigurado malsukcesis"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "rekonfigurado finita"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "medio \"%s\" ne estas elektata"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "mi kontrolas la sintezo-dosieron [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problemo por legi sintezan dosieron por datenportilo \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "skribante list-dosieron por datenportilo \"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiado malsukcesis"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "mi kopias priskrib-dosieron de \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...kopiado farita"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopiado de [%s] malsukcesis (dosiero estas strange malgranda)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "kalkulata md5sum de ekstraktita fonto hdlist (aŭ sintezo)"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "kopiado de [%s] malsukcesis (md5sum-konfuzo)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "kontrolanta hdlist-dosieron [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "instalas %s el %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "mi kopias priskrib-dosieron de \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "nevalida rpm-a dosiernomo [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "ekstraktanta la font-hd-liston (aŭ sintezon) de \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "provita hd-listo (aŭ sintezo) trovita kiel %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "kontrolante la publikan ĉifroŝlosilon de \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importis ĉifroŝlosilon %s de \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ne povis importi la publikan ĉifroŝlosilon de \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "aldonita datenportilo %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1202,7 +1203,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyJj"
@@ -1272,7 +1273,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1355,270 +1356,7 @@ msgstr "muntas %s"
 msgid "unmounting %s"
 msgstr "malmuntas %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Neniu pakaĵo nomata %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "La sekvantaj pakaĵoj enhavas %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "La pakaĵoj estas jam instalitaj"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "La pakaĵo %s estas jam instalita"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "La pakaĵoj %s estas jam instalitaj"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "pro mankanta %s"
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "La pakaĵo %s estas jam instalita"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "pro neplenumita %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "mi provas disponigi %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "por konservi %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "por instali %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "pro konflikto kun %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Nevalida signaturo (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Nevalida Ŝlosil-ID (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Mankas signaturo (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "ne povas skribi dosieron [%s]"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "Kopiado malsukcesis"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "Kopiado malsukcesis"
-
-#: ../urpme:41
-#, fuzzy, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdkupdate versio %s\n"
-"Kopirajto © 1999-2005 Mandriva.\n"
-"Tio ĉi estas libera programaro kaj povas esti pludisdonata sub la termoj de "
-"GNU GPL.\n"
-"\n"
-"uzado:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - automate elektu pakaĵon en elektoj.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, fuzzy, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr ""
-"  --test         - kontrolu ĉu la instalado povas esti ĝuste arĥivota.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - distribuita urpmi tra maŝinoj de kromnomo.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, fuzzy, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --packager     - printu etiked-pakilon: packager.\n"
-
-#: ../urpme:53
-#, fuzzy, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr ""
-"  --root         - uzu alian vojprefikson por instali la RPM-aj dosieroj.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --root         - uzu alian vojprefikson por instali la RPM-aj dosieroj.\n"
-
-#: ../urpme:55
-#, fuzzy, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --description  - printu etikedan priskribon: description.\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, fuzzy, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose      - babilema modo.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - elektu ĉiujn pakaĵojn kongruajn kun la esprimo.\n"
-
-#: ../urpme:72
-#, fuzzy, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Nur superuzulo rajtas forpreni pakaĵojn"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "nekonataj pakaĵoj"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "nekonata pakaĵo"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "forigi pakaĵon %s detruos vian sistemon"
-msgstr[1] "forigi pakaĵon %s detruos vian sistemon"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Nenio forigenda"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Nenio forigenda"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "Por plenumi dependaĵojn, la sekvanta pakaĵo estas forigota"
-msgstr[1] "Por plenumi dependaĵojn, la %d sekvantaj pakaĵoj estas forigotaj"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "nekonata pakaĵo"
-msgstr[1] "nekonata pakaĵo"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Malinstalu %d pakaĵon?"
-msgstr[1] "Malinstalu %d pakaĵojn?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (J/n) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "prenante moveblan aparaton kiel \"%s\""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Forigado malsukcesis"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Forigado malsukcesis"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1635,29 +1373,37 @@ msgstr ""
 "\n"
 "uzado:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - presu tiun ĉi help-mesaĝon.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - uzu specifan medion (tipe estas cim-raporto).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - ne uzu la donitan datenportilon, disigitan per komo.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --root         - uzu alian vojprefikson por instali la RPM-aj dosieroj.\n"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1665,252 +1411,518 @@ msgstr ""
 "  --sortmedia    - vicigu la datenportilojn laŭ subĉenoj disigitaj per "
 "komo.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --synthesis    - uzu la donitan sintezon anstataŭ la urpmi-db.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - uzu la donitan sintezon anstataŭ la urpmi-db.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - ne printu identajn liniojn.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - uzu nur ĝisdatigajn datenportilojn.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - babilema modo.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - ignoru ĉiufoje usklecon.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -i             - ignoru ĉiufoje usklecon.\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - anigu perl-kodon rekte kiel perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - binara KAJ-operatoro.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - binara AŬ-operatoro.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unuloka NE.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  )              - dekstra parentezo por fermi grup-esprimon.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr ""
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - uzu X-interfacon.\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    defaŭlte al %s.\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - presu url-on de etikedo: url.\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - printu etikedon buildhost: build host.\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "Agordo de Konzolo"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts     - printu etikedajn konfliktojn: ĉiuj konfliktoj.\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - printu etikedan priskribon: description.\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - printu etikedon epoĥo: epoch.\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name           - printu nur la nomojn de la pakaĵoj.\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - listigu dosierojn en la pakaĵo.\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group         - printu etikedo-grupon: group.\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --name           - printu nur la nomojn de la pakaĵoj.\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name           - printu nur la nomojn de la pakaĵoj.\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - printu etikedajn arkaikojn: ĉiuj arkaikoj.\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - printu etiked-pakilon: packager.\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides      - presu etikedan provizon: ĉiuj provizoj.\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires      - printu etikedan postulojn: ĉiujn postulojn.\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - printu grandecon de etikedo: size.\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - printu etikedon sourcerpm: source rpm.\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --obsoletes     - printu etikedajn arkaikojn: ĉiuj arkaikoj.\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --group         - printu etikedan resumon: summary.\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - presu url-on de etikedo: url.\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - babilema modo.\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - listigu dosierojn en la pakaĵo.\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - printu version, eldonon kaj arkitekturon kun nomo.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "uzante specifan medion sur %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "konstruis hdlist-an sintezan dosieron por medio \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "skribante list-dosieron por datenportilo \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Neniu pakaĵo nomata %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "La sekvantaj pakaĵoj enhavas %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "La pakaĵoj estas jam instalitaj"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "La pakaĵo %s estas jam instalita"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "La pakaĵoj %s estas jam instalitaj"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "pro mankanta %s"
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "La pakaĵo %s estas jam instalita"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "pro neplenumita %s"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "mi provas disponigi %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "por konservi %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "por instali %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "pro konflikto kun %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Nevalida signaturo (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Nevalida Ŝlosil-ID (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Mankas signaturo (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "ne povas skribi dosieron [%s]"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Kopiado malsukcesis"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "Kopiado malsukcesis"
+
+#: ../urpme:41
+#, fuzzy, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"mdkupdate versio %s\n"
+"Kopirajto © 1999-2005 Mandriva.\n"
+"Tio ĉi estas libera programaro kaj povas esti pludisdonata sub la termoj de "
+"GNU GPL.\n"
+"\n"
+"uzado:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - automate elektu pakaĵon en elektoj.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, fuzzy, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+"  --test         - kontrolu ĉu la instalado povas esti ĝuste arĥivota.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - distribuita urpmi tra maŝinoj de kromnomo.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, fuzzy, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --packager     - printu etiked-pakilon: packager.\n"
+
+#: ../urpme:53
+#, fuzzy, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr ""
+"  --root         - uzu alian vojprefikson por instali la RPM-aj dosieroj.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - ĝisdatigu nur ĝisdatigajn datenportilojn.\n"
+
+#: ../urpme:56
+#, fuzzy, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --description  - printu etikedan priskribon: description.\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - babilema modo.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - elektu ĉiujn pakaĵojn kongruajn kun la esprimo.\n"
+
+#: ../urpme:73
+#, fuzzy, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Nur superuzulo rajtas forpreni pakaĵojn"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "nekonataj pakaĵoj"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "nekonata pakaĵo"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "forigi pakaĵon %s detruos vian sistemon"
+msgstr[1] "forigi pakaĵon %s detruos vian sistemon"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Nenio forigenda"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Nenio forigenda"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Por plenumi dependaĵojn, la sekvanta pakaĵo estas forigota"
+msgstr[1] "Por plenumi dependaĵojn, la %d sekvantaj pakaĵoj estas forigotaj"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "nekonata pakaĵo"
+msgstr[1] "nekonata pakaĵo"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Malinstalu %d pakaĵon?"
+msgstr[1] "Malinstalu %d pakaĵojn?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (J/n) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "prenante moveblan aparaton kiel \"%s\""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Forigado malsukcesis"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Forigado malsukcesis"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2002,11 +2014,6 @@ msgstr ""
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - konservu rpm ne uzatan en kaŝejo.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - ĝisdatigu nur ĝisdatigajn datenportilojn.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2332,7 +2339,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Ĉu mi devus daŭri malgraŭe?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
@@ -2514,10 +2521,12 @@ msgstr "  --curl         - uzu curl por ekstrakti forajn dosierojn.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - kreu ĝisdatigan datenportilon.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2525,22 +2534,22 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - uzu sintezan dosieron.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - ne provu trovi ian sintezon aŭ hdlist-dosieron.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2549,17 +2558,17 @@ msgstr ""
 "  --distrib      - kreas aŭtomate ĉiujn datenportilojn de instala\n"
 "                   datenportilo.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - listigu haveblajn datenportilojn.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2569,91 +2578,91 @@ msgstr ""
 "defaŭlta estas\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - kreu virtualan datenportikojn ĉiam ĝisdatajn,\n"
 "                   nur file:// protokolo estas permesita.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - malebligas la kontrolon de dosieroj per MD5SUM.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - silenta modo.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - babilema modo.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Nur superuzulo rajtas aldoni datenportilon"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "mi kreos konfiguran dosieron [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Ne povas krei konfiguran dosieron [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "ne bezonas doni <relative path of hdlist> per --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<relativa dosieronomo de hd-listo> mankas\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "ne povis atingi medion \"%s\""
@@ -2888,12 +2897,12 @@ msgstr "  -f             - trudu ĝisdatigon de sintezo/hdlist-dosieroj.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Nur superuzulo rajtas ĝisdatigi pakaĵojn"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nenio por ĝisdatigi (uzu urpmi.addmedia por aldoni medion)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2902,17 +2911,17 @@ msgstr ""
 "la enskribaĵo por ĝisgatigi mankas\n"
 "(unu el %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "preterlasante datenportilon \"%s\":"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "ebligante datenportilon \"%s\""
@@ -3188,6 +3197,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Neniu \"changelog\" trovita\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - kreu ĝisdatigan datenportilon.\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "malbone formata enigo: [%s]"
diff --git a/po/es.po b/po/es.po
index fb61e333..249684ad 100644
--- a/po/es.po
+++ b/po/es.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-08-25 17:30-0300\n"
 "Last-Translator: José Manuel Pérez <jmprodu@hotmail.com>\n"
 "Language-Team: Español <es@li.org>\n"
@@ -28,7 +28,7 @@ msgstr ""
 "X-Generator: KBabel 1.10\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Instalación de RPMs"
@@ -38,7 +38,7 @@ msgstr "Instalación de RPMs"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Error: no se puede encontrar el archivo %s, se cancelará la operación"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -106,7 +106,7 @@ msgstr "_Instalar"
 msgid "_Save"
 msgstr "_Guardar"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -138,8 +138,9 @@ msgstr ""
 msgid "Options:"
 msgstr "Opciones:"
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - imprime este mensaje de ayuda.\n"
@@ -177,7 +178,7 @@ msgstr ""
 "  --verify-rpm   - verificar la firma del rpm antes de la instalación.\n"
 "                   (--no-verify-rpm lo deshabilita, habilitado predet.).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media         - usar sólo soportes dados, separados por comas.\n"
@@ -229,7 +230,7 @@ msgstr "Por favor, espere..."
 msgid "Must be root"
 msgstr "Debe ser root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -240,42 +241,42 @@ msgstr ""
 "%s\n"
 "¿Continuar a pesar de todo?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Aceptar"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (para actualizar)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (para instalar)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Elección de paquetes"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Uno de los paquetes siguientes es necesario:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Abortar"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -286,62 +287,62 @@ msgstr ""
 "%s\n"
 "¿Continuar a pesar de todo?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Para satisfacer las dependencias, se instalará el paquete siguiente"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Para satisfacer las dependencias, se instalarán los paquetes siguientes:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d paquete, %d MB)"
 msgstr[1] "(%d paquetes, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Instalación de paquete..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "no se pueden obtener los paquetes fuente, abortando"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Preparando..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalando paquete `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Por favor, inserte el soporte denominado «%s»"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Descargando paquete `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Hecho"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -352,28 +353,28 @@ msgstr ""
 "%s\n"
 "Puede querer actualizar su base de datos de urpmi"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Falló la instalación:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "ya está todo instalado"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Finalizó la instalación"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "quitando %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "reiniciando urpmi"
@@ -453,8 +454,8 @@ msgid "...retrieving done"
 msgstr "...recuperación hecha"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...falló la recuperación: %s"
@@ -494,54 +495,54 @@ msgstr "Esta operación está prohibida en modo restringido"
 msgid "bad proxy declaration on command line\n"
 msgstr "declaración incorrecta del proxy en la línea de comandos\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: no se puede leer el archivo rpm «%s»\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr "expresión %s no esperada"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, c-format
 msgid "missing expression before %s"
 msgstr "falta expresíon antes de %s"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "expresión no esperada %s (sugerencia: usar -a o -o)"
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr "no hay expresión a cerrar"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 "de manera predeterminada urpmf espera una regexp. Debería usar la opción «--"
 "literal»"
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "el directorio chroot no existe"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "No se puede usar %s sin %s"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "No se puede usar %s con %s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Demasiados argumentos\n"
@@ -598,7 +599,8 @@ msgstr "no se puede escribir el archivo de configuración [%s]"
 #: ../urpm/download.pm:109
 #, c-format
 msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "no se pueden leer los ajustes del proxy (sin permiso suficiente para leer %s)"
+msgstr ""
+"no se pueden leer los ajustes del proxy (sin permiso suficiente para leer %s)"
 
 #: ../urpm/download.pm:134
 #, c-format
@@ -973,220 +975,220 @@ msgstr ""
 "--synthesis no se puede usar con --media, --excludemedia, --sortmedia, --"
 "update, --use-distrib o --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Inicio de la búsqueda: %s fin: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "omitiendo paquete %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "instalaría en vez de actualizar el paquete %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "ya existe el soporte «%s»"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(ignorado de manera predeterminada)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "añadiendo soporte «%s» antes del soporte remoto «%s»"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "añadiendo soporte «%s»"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "el directorio %s no existe"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "esta ubicación no parece contener una distribución"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "no se puede interpretar media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "no se puede acceder al soporte de la distribución (no se encontró el archivo "
 "media.cfg)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "omitiendo soporte no compatible «%s» (para %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "recuperando archivo media.cfg..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "intentando seleccionar soporte inexistente \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "seleccionando soportes múltiples: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "quitando el soporte «%s»"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "reconfigurando urpmi para el soporte  «%s»"
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...falló la reconfiguración"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "reconfiguración terminada"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 "Error generando el archivo de nombres: no se encontró la dependencia %d"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "el soporte «%s» está al día"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "examinando el archivo de síntesis [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problema leyendo el archivo de síntesis del soporte «%s»"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "copiando [%s] para el soporte «%s»..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...falló la copia"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copiando descripción de archivo de «%s»..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...copia hecha"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "falló la copia de [%s] (el archivo es sospechosamente pequeño)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "computando md5sum del synthesis fuente descargado"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "falló la descarga de [%s] (no coincide md5sum)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "falló genhdlist2 en %s"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "comparando %s y %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "archivo hdlist %s no válido para el soporte «%s»"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "copiando archivo MD5SUM de «%s»..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "archivo MD5SUM no válido (descargado desde %s)"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "descargando synthesis fuente de «%s»..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "encontrado synthesis por prueba como %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "no se encuentra el archivo synthesis para el soporte «%s»"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "examinando archivo de clave pública de «%s»..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "... se importó clave %s desde archivo de clave pública de «%s»"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "no se puede importar archivo de clave pública de «%s»"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "soporte «%s» actualizado"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "falló la descarga de [%s]"
@@ -1218,7 +1220,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "SsYy"
@@ -1288,7 +1290,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1296,8 +1298,12 @@ msgid ""
 msgid_plural ""
 "The following packages are now orphans, use \"urpme --auto-orphans\" to "
 "remove them."
-msgstr[0] "El paquete siguiente ahora quedó huérfano, utilice \"urpme --auto-orphans\" para quitarlo."
-msgstr[1] "Los paquetes siguientes ahora quedaron huérfanos, utilice \"urpmi --auto-orphans\" para quitarlos."
+msgstr[0] ""
+"El paquete siguiente ahora quedó huérfano, utilice \"urpme --auto-orphans\" "
+"para quitarlo."
+msgstr[1] ""
+"Los paquetes siguientes ahora quedaron huérfanos, utilice \"urpmi --auto-"
+"orphans\" para quitarlos."
 
 #: ../urpm/parallel.pm:14
 #, c-format
@@ -1354,7 +1360,9 @@ msgstr "falló cp en el equipo %s (%d)"
 msgid ""
 "%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
 "code: %d)"
-msgstr "falló %s en el equipo %s (¿tal vez no tiene la versión correcta de urpmi?) (código de salida: %d)"
+msgstr ""
+"falló %s en el equipo %s (¿tal vez no tiene la versión correcta de urpmi?) "
+"(código de salida: %d)"
 
 #: ../urpm/removable.pm:32
 #, c-format
@@ -1371,280 +1379,7 @@ msgstr "montando %s"
 msgid "unmounting %s"
 msgstr "desmontando %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "se reinició urpmi, y la lista de paquetes prioritarios no cambió"
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-"se reinició urpmi, y la lista de paquetes prioritarios cambió: %s vs. %s"
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Ningún paquete llamado %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Los siguientes paquetes contienen %s: %s"
-
-#: ../urpm/select.pm:296
-#, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "se encontraron los paquetes %s en la base de datos de urpmi, pero ninguno está instalado"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "El paquete %s ya está instalado"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Los paquetes %s ya están instalados"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "debido a que falta %s"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "debido a que ya está instalado %s"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "debido a que no se satisfizo %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "intentando promover %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "para mantener %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "para instalar %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "debido a conflictos con %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Firma no válida (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "ID de clave no válida (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Falta firma (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr "sistema"
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr "Debería reiniciar %s para %s"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't write file"
-msgstr "No se puede escribir archivo"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "No se puede abrir archivo"
-
-#: ../urpm/sys.pm:289
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "No se puede mover archivo %s a %s"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urmpe versión %s\n"
-"Copyright © 1999-2008 Mandriva.\n"
-"Esto es software libre y se debe redistribuir bajo los términos de la GNU "
-"GPL.\n"
-"\n"
-"uso:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto         - seleccionar un paquete en las elecciones "
-"automáticamente.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr "  --auto-orphans - quitar los huérfanos\n"
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr ""
-"  --test         - verificar si se puede llevar a cabo correctamante la "
-"desinstalación.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi distribuido entre máquinas de alias.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - Volver a empaquetar los archivos antes de borrar\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - usar otra raíz para la desinstalación de rpm.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../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   - usar otra raíz para la instalación de rpm y la base de "
-"datos de urpmi.\n"
-
-#: ../urpme:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - no ejecutar los scriptlets del paquete.\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - configurar urpme al vuelo desde un árbol de "
-"distribución,\n"
-"                   útil para (des)instalar un chroot con la opción --root.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - modo informativo.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - selecciona todas los paquetes que coincidan con la "
-"expresión.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Sólo el superusuario está autorizado a quitar paquetes"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "paquetes desconocidos "
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "paquete desconocido "
-
-#: ../urpme:119
-#, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "Quitar el paquete siguiente dañará su sistema:"
-msgstr[1] "Quitar los paquetes siguientes dañará su sistema:"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Nada que quitar"
-
-#: ../urpme:141
-#, c-format
-msgid "No orphans to remove"
-msgstr "No hay huérfanos para quitar"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "Para satisfacer las dependencias, se quitará el paquete siguiente"
-msgstr[1] ""
-"Para satisfacer las dependencias, se quitarán los %d paquetes siguientes"
-
-#: ../urpme:152
-#, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "(paquete huérfano)"
-msgstr[1] "(paquetes huérfanos)"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "¿Quitar %d paquete?"
-msgstr[1] "¿Quitar %d paquetes?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (s/N) "
-
-#: ../urpme:164
-#, c-format
-msgid "testing removal of %s"
-msgstr "probando la remoción de %s"
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Falló la desinstalación"
-
-#: ../urpme:180
-#, c-format
-msgid "Removal is possible"
-msgstr "Se puede quitar"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1661,24 +1396,24 @@ msgstr ""
 "\n"
 "usage: urpmf [opciones] patrón-expresión\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - mostrar el número de versión de esta herramienta.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - usar entorno específico (típicamente para reportar "
 "bugs).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - no usar soportes dados, separados por coma.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
@@ -1686,7 +1421,16 @@ msgstr ""
 "  --literal, -l  - no coincidir con patrones, usar argumento de manera "
 "literal.\n"
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../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   - usar otra raíz para la instalación de rpm y la base de "
+"datos de urpmi.\n"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1694,267 +1438,545 @@ msgstr ""
 "  --sortmedia    - clasificar soportes de acuerdo a subcadenas separadas por "
 "coma.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - usar la ruta dada para acceder a los soportes\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - usar síntesis provista en lugar de base de datos de "
 "urpmi.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - no imprime líneas idénticas.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - usa sólo soporte de actualización.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modo informativo.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - ignora distinción entre mayús. y minús. en los patrones.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -I             - hace la distinción entre mayús. y minús. en los "
 "patrones.\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 "  -F<cad>        - cambiar el separador de campos (':' es el predet.)\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Expresiones de patrón:\n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  texto           - cualquier texto se toma como regexp, a menos que se use -"
 "l.\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - incluye código Perl directamente como perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - operador binario Y.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - operador O binario.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - NO unario.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 "  ( )            - paréntesis izq. y der. para grupos de expresiones.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Lista de etiquetas:\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - especificar un formato de salida estilo printf\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   ejemplo: '%%nombre:%%archivos'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - arquitectura\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - máquina en la que se compiló.\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - hora de compilación\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - archivos de configuración\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts     - imprime conflictos\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr ""
 "  --description   - descripción del paquete\n"
 "\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - distribución\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr ""
 "  --epoch        - época\n"
 "\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr ""
 "  --filename     - nombre de archivo del paquete\n"
 "\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - lista de archivos contenidos en el paquete\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - grupo\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - licencia\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - nombre del paquete\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - todo lo obsoleto\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - quien lo empaquetó\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides      - lo que proporciona\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires      - lo que necesita\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size          - tamaño instalado\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - nombre del rpm fuente\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - lo que sugiere\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - resumen\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - fabricante\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - el soporte en el que se encontró el paquete\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - imprime versión, release y arquitectura con nombre.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr "expresión no terminada (%s)"
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Formato incorrecto: debe usar sólo una etiqueta multi-valor"
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "uasando un entorno específico en %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "no hay hdlist para el soporte «%s»"
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "no hay synthesis para el soporte «%s»"
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "no hay xml-info para el soporte «%s»"
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr "se reinició urpmi, y la lista de paquetes prioritarios no cambió"
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"se reinició urpmi, y la lista de paquetes prioritarios cambió: %s vs. %s"
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Ningún paquete llamado %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Los siguientes paquetes contienen %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr ""
+"se encontraron los paquetes %s en la base de datos de urpmi, pero ninguno "
+"está instalado"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "El paquete %s ya está instalado"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Los paquetes %s ya están instalados"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "debido a que falta %s"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "debido a que ya está instalado %s"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "debido a que no se satisfizo %s"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "intentando promover %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "para mantener %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "para instalar %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "debido a conflictos con %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Firma no válida (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "ID de clave no válida (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Falta firma (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr "sistema"
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr "Debería reiniciar %s para %s"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't write file"
+msgstr "No se puede escribir archivo"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "No se puede abrir archivo"
+
+#: ../urpm/sys.pm:289
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "No se puede mover archivo %s a %s"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urmpe versión %s\n"
+"Copyright © 1999-2008 Mandriva.\n"
+"Esto es software libre y se debe redistribuir bajo los términos de la GNU "
+"GPL.\n"
+"\n"
+"uso:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - seleccionar un paquete en las elecciones "
+"automáticamente.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr "  --auto-orphans - quitar los huérfanos\n"
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+"  --test         - verificar si se puede llevar a cabo correctamante la "
+"desinstalación.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi distribuido entre máquinas de alias.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - Volver a empaquetar los archivos antes de borrar\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - usar otra raíz para la desinstalación de rpm.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr ""
+"  --justdb       - actualizar sólo la BD de rpm, no el sistema de archivos.\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - no ejecutar los scriptlets del paquete.\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - configurar urpme al vuelo desde un árbol de "
+"distribución,\n"
+"                   útil para (des)instalar un chroot con la opción --root.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - modo informativo.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - selecciona todas los paquetes que coincidan con la "
+"expresión.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Sólo el superusuario está autorizado a quitar paquetes"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "paquetes desconocidos "
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "paquete desconocido "
+
+#: ../urpme:121
+#, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "Quitar el paquete siguiente dañará su sistema:"
+msgstr[1] "Quitar los paquetes siguientes dañará su sistema:"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Nada que quitar"
+
+#: ../urpme:143
+#, c-format
+msgid "No orphans to remove"
+msgstr "No hay huérfanos para quitar"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Para satisfacer las dependencias, se quitará el paquete siguiente"
+msgstr[1] ""
+"Para satisfacer las dependencias, se quitarán los %d paquetes siguientes"
+
+#: ../urpme:154
+#, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "(paquete huérfano)"
+msgstr[1] "(paquetes huérfanos)"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "¿Quitar %d paquete?"
+msgstr[1] "¿Quitar %d paquetes?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
+
+#: ../urpme:166
+#, c-format
+msgid "testing removal of %s"
+msgstr "probando la remoción de %s"
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Falló la desinstalación"
+
+#: ../urpme:183
+#, c-format
+msgid "Removal is possible"
+msgstr "Se puede quitar"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr "expresión no terminada (%s)"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2049,12 +2071,6 @@ msgstr "  --clean        - quitar rpm del cache antes que nada.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - no eliminar los rpms del cache.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr ""
-"  --justdb       - actualizar sólo la BD de rpm, no el sistema de archivos.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2083,7 +2099,8 @@ msgstr ""
 #: ../urpmi:108
 #, c-format
 msgid "  --allow-suggests - auto select \"suggested\" packages.\n"
-msgstr "  --allow-suggests - seleccionar automáticamente los paquetes «sugeridos».\n"
+msgstr ""
+"  --allow-suggests - seleccionar automáticamente los paquetes «sugeridos».\n"
 
 #: ../urpmi:112
 #, c-format
@@ -2395,7 +2412,7 @@ msgstr ""
 "\n"
 "¿Seguir adelante con la instalación?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (S/n) "
@@ -2588,10 +2605,12 @@ msgstr "  --aria2         - usa aria2 para recuperar archivos remotos.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - crea sólo soporte de actualización.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2603,22 +2622,22 @@ msgstr ""
 "                   una de: never, on-demand, update-only, always. ver urpmi."
 "cfg(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - usar archivo synthesis.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - usar archivos rpm (en vez de synthesis).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - no intentar encontrar archivos synthesis.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2627,18 +2646,18 @@ msgstr ""
 "  --distrib      - crear automáticamente todos los soportes desde un\n"
 "                   soporte de instalación.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - con --distrib, pedir confirmación para cada soporte\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - con --distrib, añadir cada soporte listado\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2647,91 +2666,93 @@ msgstr ""
 "  --from         - usar url especificada para la lista de réplicas, la\n"
 "                   predeterminada es %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - crear soportes virtuales que siempre están actualizados.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - deshabilitar la prueba MD5SUM sobre el archivo.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - no importar la clave pública del soporte añadido\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - añadir el soporte en config, pero no actualizarlo.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modo silencioso.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - modo informativo.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "las políticas xml-info conocidas son %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "no se necesita argumento para --distrib --mirrorlist <url>"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "<url> incorrecta (para el directorio local, la ruta debe ser absoluta)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Sólo el superusuario está autorizado a añadir soportes"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "creando el archivo de configuración [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "No se puede crear el archivo de configuración [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "no es necesario dar <ruta relativa de synthesis> con --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
-msgstr "\nDesea añadir el soporte «%s»"
+msgstr ""
+"\n"
+"Desea añadir el soporte «%s»"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "falta <ruta relativa de synthesis>\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "No se puede usar %s con un soporte remoto"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "no se puede añadir el soporte"
@@ -2974,12 +2995,12 @@ msgstr ""
 msgid "Only superuser is allowed to update media"
 msgstr "Sólo el superusuario está autorizado a actualizar soportes"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nada para actualizar (use urpmi.addmedia para agregar un soporte)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2988,17 +3009,17 @@ msgstr ""
 "falta la entrada a actualizar\n"
 "(una de %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "«%s»"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "Ignorando soporte %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "activando el soporte %s"
@@ -3290,6 +3311,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "No se encontró changelog\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - crea sólo soporte de actualización.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "URL mal formada: [%s]"
 
diff --git a/po/et.po b/po/et.po
index cb7e4e72..c6d6f9e3 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-07-28 12:45+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <linux-ee@lists.eenet.ee>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM-i paigaldamine"
@@ -27,7 +27,7 @@ msgstr "RPM-i paigaldamine"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Viga: faili %s ei leitud, toiming katkestatakse"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Olgu"
@@ -93,7 +93,7 @@ msgstr "_Paigalda"
 msgid "_Save"
 msgstr "_Salvesta"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Loobu"
@@ -125,8 +125,9 @@ msgstr ""
 msgid "Options:"
 msgstr "Võtmed:"
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - näitab seda abiteadet.\n"
@@ -163,7 +164,7 @@ msgstr ""
 "  --verify-rpm   - kontrollib RPM-i signatuuri enne paigaldust\n"
 "                   (--no-verify-rpm tühistab selle, vaikimisi on sees).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -216,7 +217,7 @@ msgstr "Palun oodake..."
 msgid "Must be root"
 msgstr "Vajalikud on administraatori õigused"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -227,42 +228,42 @@ msgstr ""
 "%s\n"
 "Kas siiski jätkata paigaldamist?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Olgu"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (uuendus)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (paigaldus)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Paketivalik"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Vajalik on üks järgnevatest pakettidest:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Katkesta"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -273,61 +274,61 @@ msgstr ""
 "%s\n"
 "Kas siiski jätkata paigaldamist?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmine pakett:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Sõltuvuste lahendamiseks paigaldatakse järgmised paketid:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pakett, %d MB)"
 msgstr[1] "(%d paketti, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Paketi paigaldamine..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "pakette ei õnnestunud hankida, katkestatakse"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Valmistumine..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Paketi '%s' paigaldamine (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Palun sisestage andmekandja nimega \"%s\""
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Paketi '%s' allalaadimine..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Tehtud"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -338,28 +339,28 @@ msgstr ""
 "%s\n"
 "Te võiksite ehk uuendada urpmi andmebaasi"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Paigaldamine nurjus:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Kõik on juba paigaldatud"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Paigaldus lõpetatud"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "%s eemaldamine"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi taaskäivitamine"
@@ -440,8 +441,8 @@ msgid "...retrieving done"
 msgstr "...tõmbamine tehtud"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...tõmbamine nurjus: %s"
@@ -481,53 +482,53 @@ msgstr "See operatsioon on piiratud režiimis keelatud"
 msgid "bad proxy declaration on command line\n"
 msgstr "käsureal on määratud vigane puhverserver\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: RPM-faili \"%s\" lugemine nurjus\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr "ootamatu avaldis %s"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, c-format
 msgid "missing expression before %s"
 msgstr "avaldis puudub %s ees"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "ootamatu avaldis %s (soovitus: kasutada võiks võtit -a või -o)"
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr "pole ühtegi avaldist lõpetada"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 "vaikimisi ootab urpmf regulaaravaldist, peaksite kasutama võtit \"--literal\""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot-kataloogi ei ole olemas"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s kasutamine on võimalik ainult koos %s-ga"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s kasutamine ei ole võimalik %s-ga"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Liiga palju argumente\n"
@@ -957,218 +958,218 @@ msgstr ""
 "võtit --synthesis ei saa kasutada võtmega --media, --excludemedia, --"
 "sortmedia, --update, --use-distrib või --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Otsingu algus: %s lõpp: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "pakett %s jäetakse vahele"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "paketti %s ei uuendata, seda saab ainult paigaldada"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "andmekandja \"%s\" on juba olemas"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(vaikimisi eiratakse)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "andmekandja \"%s\" lisamine enne võrguandmekandjat \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "andmekandja \"%s\" lisamine"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "kataloogi %s ei ole olemas"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "see asukoht ei paista sisaldavat ühtegi distributsiooni"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "faili media.cfg parsimine nurjus"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "ligipääs distributsiooniandmekandjale nurjus (ei leitud faili media.cfg)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "jäetakse vahele mitteühilduv andmekandja '%s' (%s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "faili media.cfg tõmbamine..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "püüti valida olematut andmekandjat \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "mitme andmekandja valik: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "andmekandja \"%s\" eemaldamine"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "urpmi ümberseadistamine andmekandja \"%s\" tarbeks"
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...ümberseadistamine nurjus"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "ümberseadistamine tehtud"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Viga nimedefaili loomisel: sõltuvust %d ei leitud"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "andmekandja \"%s\" on täiesti värske"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "sünteesifaili [%s] uurimine"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "probleem andmekandja \"%s\" sünteesifaili lugemisel"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "kopeeritakse [%s] andmekandjale \"%s\"..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...kopeerimine nurjus"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "\"%s\" kirjelduste faili kopeerimine..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...kopeerimine tehtud"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "[%s] kopeerimine nurjus (fail on kahtlaselt väike)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "tõmmatud allika sünteesifaili MD5SUM arvutamine"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] tõmbamine nurjus (MD5SUM ei klapi)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2 nurjus %s puhul"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "%s ja %s võrdlemine"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "vigane hdlist-fail %s andmekandjale \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "\"%s\" MD5SUM-faili kopeerimine..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "vigane MD5SUM-fail (alla laaditud asukohast %s)"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "\"%s\" allika sünteesifaili tõmbamine..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "leiti kontrollitud sünteesifail %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "andmekandjale \"%s\" ei leitud sünteesifaili"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" avaliku võtme faili uurimine..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...imporditi võti %s \"%s\" avaliku võtme failist"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\" avaliku võtme faili import nurjus"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "uuendati andmekandjat \"%s\""
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "[%s] tõmbamine nurjus"
@@ -1200,7 +1201,7 @@ msgstr "EeNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "JjYy"
@@ -1270,7 +1271,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1278,8 +1279,12 @@ msgid ""
 msgid_plural ""
 "The following packages are now orphans, use \"urpme --auto-orphans\" to "
 "remove them."
-msgstr[0] "Järgmine pakett on nüüd orb, kasutage eemaldamiseks  \"urpme --auto-orphans\"."
-msgstr[1] "Järgmised paketid on nüüd orvud, kasutage eemaldamiseks  \"urpme --auto-orphans\"."
+msgstr[0] ""
+"Järgmine pakett on nüüd orb, kasutage eemaldamiseks  \"urpme --auto-orphans"
+"\"."
+msgstr[1] ""
+"Järgmised paketid on nüüd orvud, kasutage eemaldamiseks  \"urpme --auto-"
+"orphans\"."
 
 #: ../urpm/parallel.pm:14
 #, c-format
@@ -1337,8 +1342,8 @@ msgid ""
 "%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
 "code: %d)"
 msgstr ""
-"%s nurjus masinas %s (võib-olla ei ole urpmi korraliku versiooniga?) (väljumiskood: "
-"%d)"
+"%s nurjus masinas %s (võib-olla ei ole urpmi korraliku versiooniga?) "
+"(väljumiskood: %d)"
 
 #: ../urpm/removable.pm:32
 #, c-format
@@ -1355,279 +1360,7 @@ msgstr "%s haakimine"
 msgid "unmounting %s"
 msgstr "%s lahutamine"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-"urpmi käivitati uuesti ja prioriteetsete pakettide nimekirja ei muudetud"
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-"urpmi käivitati uuesti ja muudeti prioriteetsete pakettide nimekirja: %s %s "
-"asemel"
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Paketti nimega %s ei ole"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "%s sisaldub järgmistes pakettides: %s"
-
-#: ../urpm/select.pm:296
-#, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Urpmi andmebaasis leiti paketid %s, aga need ei ole paigaldatud"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Pakett %s on juba paigaldatud"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Paketid %s on juba paigaldatud"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "puuduva %s tõttu"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "juba paigaldatud %s tõttu"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "rahuldamata %s tõttu"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "püüdes välja pakkuda %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "säilitamaks %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "paigaldamaks %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "konflikti tõttu %s-ga"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Vigane signatuur (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Vigane võtme ID (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Puudub signatuur (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr "süsteem"
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr "%s tuleks taaskäivitada, sest seda vajab %s"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't write file"
-msgstr "Faili kirjutamine nurjus"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "Faili avamine nurjus"
-
-#: ../urpm/sys.pm:289
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "Faili %s liigutamine asukohta %s ei ole võimalik"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme versioon %s\n"
-"Autoriõigus © 1999-2008 Mandriva.\n"
-"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
-"Litsentsi tingimustele.\n"
-"\n"
-"kasutamine:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto         - valib automaatselt ühe paketi, kui võimalusi on mitu.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr "  --auto-orphans - orbude eemaldamine\n"
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr ""
-"  --test         - kontrollitakse, kas eemaldamine on korrektselt võimalik.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-"  --parallel     - jagatud urpmi käivitamine üle mitme aliasega määratud "
-"masina.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - pakendab failid uuesti enne kustutamist.\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - muu baasi kasutamine RPM-ide eemaldamisel.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../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   - muu baasi kasutamine urpmi andmebaasi jaoks ja RPM-ide "
-"paigaldamisel.\n"
-
-#: ../urpme:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - pakettide skripte ei käivitata.\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - seadistab urpme lennult distributsioonipuu põhjal,\n"
-"                   kasulik chroot paigaldamiseks/eemaldamiseks võtmega --"
-"root.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - selgitav režiim.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - valib kõik käsureaga sobivad paketid.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Tarkvara võib eemaldada ainult administraator"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "tundmatud paketid"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "tundmatu pakett"
-
-#: ../urpme:119
-#, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "Järgmise paketi eemaldamine halvab Teie süsteemi:"
-msgstr[1] "Järgmiste pakettide eemaldamine halvab Teie süsteemi:"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Pole midagi eemaldada"
-
-#: ../urpme:141
-#, c-format
-msgid "No orphans to remove"
-msgstr "Pole ühtegi orbu eemaldada"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "Sõltuvuste lahendamiseks tuleb eemaldada järgmine pakett"
-msgstr[1] "Sõltuvuste lahendamiseks tuleb eemaldada järgmised %d paketti"
-
-#: ../urpme:152
-#, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "(orvust pakett)"
-msgstr[1] "(orvust paketid)"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Kas eemaldada %d pakett?"
-msgstr[1] "Kas eemaldada %d paketti?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (j/E) "
-
-#: ../urpme:164
-#, c-format
-msgid "testing removal of %s"
-msgstr "%s eemaldamise test"
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Eemaldamine nurjus"
-
-#: ../urpme:180
-#, c-format
-msgid "Removal is possible"
-msgstr "Eemaldamine on võimalik"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1644,26 +1377,26 @@ msgstr ""
 "\n"
 "kasutamine: urpmf [võtmed] pattern-expression\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - näitab programmi versiooni.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - kasutatakse spetsiifilist keskkonda (tavaliselt\n"
 "                   vearaportideks).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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        - ei kasutata määratud andmekandjaid (eraldajaks "
 "koma).\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
@@ -1671,7 +1404,16 @@ msgstr ""
 "  --literal, -l  - mustrina tõlgendamise asemel kasutatakse argumenti "
 "täpselt esitatud kujul.\n"
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../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   - muu baasi kasutamine urpmi andmebaasi jaoks ja RPM-ide "
+"paigaldamisel.\n"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1679,256 +1421,531 @@ msgstr ""
 "  --sortmedia    - sorteerib andmekandjad alamstringide põhjal (eraldajaks "
 "koma).\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 "  --use-distrib  - andmekandja kasutamiseks kasutatakse määratud asukohta.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - kasutatakse sünteesi urpmi andmebaasi asemel.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - ei näidata ühesuguseid ridu.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - kasutatakse ainult uuendus-andmekandjat.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - selgitav režiim.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - tõstutundetu igas olukorras.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -I             - tõstu arvestamine mustrites (vaikimisi).\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - väljade eraldaja muutmine (vaikimisi ':').\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Mustriavaldised:\n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  text           - suvalist teksti parsitakse regulaaravaldisena, kui ei "
 "kasutata võtit -l.\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - kaasab otseselt perli koodi kui perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - binaaroperaator AND.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - binaaroperaator OR.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unaaroperaator NOT.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - parem- ja vasakpoolne sulg.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Siltide nimekiri:\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - printf laadis vormindatud väljund\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   näide: '%%name:%%files'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - arhitektuur\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - valmistajamasin\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - valmistamisaeg\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - konfiguratsioonifailid\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - konfliktide sildid\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - paketi kirjeldus\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - distributsioon\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - epohh\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - paketi failinimi\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - paketi failide nimekiri\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - grupp\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - litsents\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - paketi nimi\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - iganenute sildid\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - paketi valmistaja\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - pakutavate sildid\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - nõutavate sildid\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - paigalduse suurus\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - lähtekoodi RPM-i nimi\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - pakkumiste sildid\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - kokkuvõte\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - URL\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - tootja\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - paketti sisaldav andmekandja\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - näitab koos nimega versiooni, väljalaset ja "
 "arhitektuuri.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr "lõpetamata avaldis (%s)"
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Vigane vorming: kasutada tohib ainult üht mitme väärtusega silti"
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "spetsiifilise keskkonna kasutamine %s puhul\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "andmekandjale \"%s\" ei leitud hdlist-faili"
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "andmekandjale \"%s\" ei leitud sünteesifaili"
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "andmekandjale \"%s\" ei leitud XML-infot"
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+"urpmi käivitati uuesti ja prioriteetsete pakettide nimekirja ei muudetud"
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi käivitati uuesti ja muudeti prioriteetsete pakettide nimekirja: %s %s "
+"asemel"
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Paketti nimega %s ei ole"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "%s sisaldub järgmistes pakettides: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Urpmi andmebaasis leiti paketid %s, aga need ei ole paigaldatud"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Pakett %s on juba paigaldatud"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Paketid %s on juba paigaldatud"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "puuduva %s tõttu"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "juba paigaldatud %s tõttu"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "rahuldamata %s tõttu"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "püüdes välja pakkuda %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "säilitamaks %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "paigaldamaks %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "konflikti tõttu %s-ga"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Vigane signatuur (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Vigane võtme ID (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Puudub signatuur (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr "süsteem"
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr "%s tuleks taaskäivitada, sest seda vajab %s"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't write file"
+msgstr "Faili kirjutamine nurjus"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "Faili avamine nurjus"
+
+#: ../urpm/sys.pm:289
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "Faili %s liigutamine asukohta %s ei ole võimalik"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme versioon %s\n"
+"Autoriõigus © 1999-2008 Mandriva.\n"
+"See on vaba tarkvara, mida võib levitada vastavalt GNU Üldise Avaliku "
+"Litsentsi tingimustele.\n"
+"\n"
+"kasutamine:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - valib automaatselt ühe paketi, kui võimalusi on mitu.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr "  --auto-orphans - orbude eemaldamine\n"
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+"  --test         - kontrollitakse, kas eemaldamine on korrektselt võimalik.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+"  --parallel     - jagatud urpmi käivitamine üle mitme aliasega määratud "
+"masina.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - pakendab failid uuesti enne kustutamist.\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - muu baasi kasutamine RPM-ide eemaldamisel.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr ""
+"  --justdb       - uuendab ainult RPM-ide andmebaasi, mitte failisüsteemi.\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - pakettide skripte ei käivitata.\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - seadistab urpme lennult distributsioonipuu põhjal,\n"
+"                   kasulik chroot paigaldamiseks/eemaldamiseks võtmega --"
+"root.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - selgitav režiim.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - valib kõik käsureaga sobivad paketid.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Tarkvara võib eemaldada ainult administraator"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "tundmatud paketid"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "tundmatu pakett"
+
+#: ../urpme:121
+#, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "Järgmise paketi eemaldamine halvab Teie süsteemi:"
+msgstr[1] "Järgmiste pakettide eemaldamine halvab Teie süsteemi:"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Pole midagi eemaldada"
+
+#: ../urpme:143
+#, c-format
+msgid "No orphans to remove"
+msgstr "Pole ühtegi orbu eemaldada"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Sõltuvuste lahendamiseks tuleb eemaldada järgmine pakett"
+msgstr[1] "Sõltuvuste lahendamiseks tuleb eemaldada järgmised %d paketti"
+
+#: ../urpme:154
+#, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "(orvust pakett)"
+msgstr[1] "(orvust paketid)"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Kas eemaldada %d pakett?"
+msgstr[1] "Kas eemaldada %d paketti?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (j/E) "
+
+#: ../urpme:166
+#, c-format
+msgid "testing removal of %s"
+msgstr "%s eemaldamise test"
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Eemaldamine nurjus"
+
+#: ../urpme:183
+#, c-format
+msgid "Removal is possible"
+msgstr "Eemaldamine on võimalik"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr "lõpetamata avaldis (%s)"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2020,12 +2037,6 @@ msgstr "  --clean        - eemaldab enne muud tegevust RPM-i puhvrist.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - säilitab puhvris mittekasutatud RPM-id.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr ""
-"  --justdb       - uuendab ainult RPM-ide andmebaasi, mitte failisüsteemi.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2359,7 +2370,7 @@ msgstr ""
 "\n"
 "Kas siiski paigaldamist jätkata?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/e) "
@@ -2553,10 +2564,12 @@ msgstr "  --aria2        - aria2 kasutamine kaugfailide tõmbamiseks.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - loob uuendatava andmekandja.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2568,22 +2581,22 @@ msgstr ""
 "                   reegel on üks järgmistest: never, on-demand, update-only, "
 "always. Vt urpmi.cfg(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - kasutatakse sünteesifaili.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - kasutatakse RPM-faile (sünteesifaili asemel).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - ei püüta kasutada sünteesifaili.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2591,21 +2604,21 @@ msgid ""
 msgstr ""
 "  --distrib      - loob automaatselt kõik andmekandjad paigalduskohalt.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - koos võtmega --distrib küsib kinnitust iga andmekandja "
 "puhul\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 "  --all-media    - koos võtmega --distrib lisab kõik loetletud "
 "andmekandjad.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2614,76 +2627,76 @@ msgstr ""
 "  --from         - kasutab määratud URL-i peeglite loendi jaoks, vaikimisi\n"
 "                   on see %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr "  --virtual      - loob virtuaalse andmekandja, mis on alati värske.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - keelatakse faili MD5SUM kontroll.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - lisatud andmekandja avalikku võtit ei impordita\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - andmekandja lisatakse seadistustefaili, aga seda ei "
 "uuendata.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - vaikne režiim.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - selgitav režiim.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "saadaolevad XML-info reeglid on %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "--distrib --mirrorlist <url> ei vaja mingeid argumente"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "vigane <url> (kohaliku kataloogi asukoht peab olema absoluutne)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Andmekandjaid võib lisada ainult administraator"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "luuakse seadistustefail [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Seadistustefaili [%s] loomine nurjus"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr ""
 "võtme --distrib puhul puudub vajadus anda <suhteline tee sünteesifaili "
 "juurde>"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
@@ -2692,17 +2705,17 @@ msgstr ""
 "\n"
 "Kas soovite lisada andmekandja '%s'?"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "Puudub <suhteline tee sünteesifaili juurde>\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "%s kasutamine ei ole võimalik võrguandmekandjaga"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "andmekandja lisamine nurjus"
@@ -2945,12 +2958,12 @@ msgstr "  -f             - sunnib jõuga uuendama sünteestifaile.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Andmekandjaid võib uuendada ainult administraator"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ei ole midagi uuendada (andmekandja lisamiskäsk: urpmi.addmedia)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2959,17 +2972,17 @@ msgstr ""
 "puudub uuendatava kirje nimi\n"
 "(võimalikud: %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "andmekandja %s ignoreerimine"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "andmekandja %s arvestamine"
@@ -3252,6 +3265,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Muutuste logi ei leitud\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - loob uuendatava andmekandja.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "vigane URL: [%s]"
 
diff --git a/po/eu.po b/po/eu.po
index 2bf90907..889cd0fd 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-06-11 09:42+0200\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Euskara <eu@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM instalaketa"
@@ -29,7 +29,7 @@ msgstr "RPM instalaketa"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Akatsa: ezin da %s fitxategia aurkitu, eragiketa galaraziko da"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ados"
@@ -95,7 +95,7 @@ msgstr "_Instalatu"
 msgid "_Save"
 msgstr "_Gorde"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Utzi"
@@ -127,8 +127,9 @@ msgstr ""
 msgid "Options:"
 msgstr "Aukerak:"
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - laguntza-mezu hau inprimatzen du.\n"
@@ -167,7 +168,7 @@ msgstr ""
 "                   (--no-verify-rpm ezgaitzeko, era lehenetsian gaituta "
 "dago).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -221,7 +222,7 @@ msgstr "Itxaron mesedez..."
 msgid "Must be root"
 msgstr "Root izan behar da"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -232,42 +233,42 @@ msgstr ""
 "%s\n"
 "Instalazioarekin jarraitu hala ere?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Kontuz"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ados"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (Eguneratu)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (instalatu)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Paketa aukera"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Ondoko paketeetako bat behar da:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Geldiarazi"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -278,61 +279,61 @@ msgstr ""
 "%s\n"
 "Instalazioarekin jarraitu hala ere?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Mendekotasunak asetzeko, ondorengo paketea instalatuko da:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Mendekotasunak asetzeko, ondoko paketeak instalatuko dira:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(pakete %d, %d MB)"
 msgstr[1] "(%d pakete, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Paketearen instalazioa..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ezin dira iturburuko paketeak lortu, abortatzen"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Prestatzen..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' paketea instalatzen (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Mesedez, sartu \"%s\" izeneko euskarria"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "`%s' paketea deskargatzen..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Eginda"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -343,28 +344,28 @@ msgstr ""
 "%s\n"
 "Zure urpmi datu-basea eguneratzea komeni da"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Instalaketak huts egin du:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Dena dago instalatuta"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Instalazioa amaitu da"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "%s kentzen"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi berrabiarazten"
@@ -444,8 +445,8 @@ msgid "...retrieving done"
 msgstr "...berreskuratu da"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...berreskuratzeak huts egin du: %s"
@@ -485,54 +486,54 @@ msgstr "Eragiketa hau debekatuta dago modu murriztuan exekutatzerakoan"
 msgid "bad proxy declaration on command line\n"
 msgstr "proxy-adierazpen okerra komando-lerroan\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: ezin da \"%s\" rpm fitxategia irakurri\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr "%s ezusteko adierazpena"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, c-format
 msgid "missing expression before %s"
 msgstr "%s-ren aurretik adierazpena falta da"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "%s ezusteko adierazpena (iradokizuna: erabili -a edo -o ?)"
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr "ez dago itxi beharreko adierazpenik"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 "era lehenetsian urpmf-k regexp bat espero du. \"--literal\" aukera erabili "
 "beharko zenuke"
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot direktorioa ez da existitzen"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Ezin da %s %s gabe erabili"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Ezin da %s %s-rekin erabili"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Argumentu gehiegi\n"
@@ -970,217 +971,217 @@ msgstr ""
 "--laburpena ezin da hauekin erabili: --media, --excludemedia, --sortmedia, --"
 "update, --use-distrib edo --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Bilaketa hasera: %s amaiera: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "%s paketea saltatzen"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "%s paketea eguneratu beharrean instalatu egingo luke"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "\"%s\" euskarria lehendik badago"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(era lehenetsian jaramonik ez)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "\"%s\" euskarria \"%s\" urruneko euskarriaren aurretik eransten"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "\"%s\" euskarria eransten"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "%s direktorioa ez da existitzen"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "kokapen honek ez dirudi banaketarik daukanik"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "ezin izan da media.cfg sintaktikoki egiaztatu"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "ezin da banaketa menua atzitu (ez da media.cfg fitxategirik aurkitu)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "alboratu '%s' euskarri ez bateragarria (%s-rentzako)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "media.cfg fitxategia berreskuratzen..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "existitzen ez den \"%s\" euskarria hautatu nahian zabiltza"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "hainbat euskarri hautatzen: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "\"%s\" euskarria kentzen"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "\"%s\" euskarriarentzako urpmi birkonfiguratzen"
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...birkonfiguraketak hutsegin du"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "birkonfiguraketa amaituta"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Akatsa izen fitxategia sortzerakoan: %d menpekotasuna ez da aurkitu"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "\"%s\" euskarria egunean dago"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "[%s] laburpen-fitxategia aztertzen"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "arazoa \"%s\" euskarriaren laburpen-fitxategia irakurtzean"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "[%s] kopiatzen \"%s\" euskarriarentzako..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...ezin izan da kopiatu"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "\"%s\"(r)en deskribapen-fitxategia kopiatzen..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...kopiatzea burutu da"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "ezin izan da [%s] kopiatu (fitxategia txikiegia da)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "berreskuratutako iturburu synthesis-en md5sum kalkulatzen"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s]-ren berreskuperaketak huts egin du (md5sum ez dator bat)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2-k huts egin du %s-rekin"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "%s eta %s parekatzen"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "%s hdlist fitxategi baliogabea \"%s\" euskarriarentzat"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "\"%s\"-ren MD5SUM fitxategia kopiatzen..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "rpm fitxategi-izen baliogabea [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "\"%s\"-ren synthesis iturburua berreskuratzen..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "aztertutako synthesis aurkitu da %s gisa"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "ez da \"%s\" euskarriaren synthesis fitxategirik aurkitu"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\"(r)en gako publikoen fitxategia aztertzen..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...%s gakoa inportatu da \"%s\"(r)en gako publikoen fitxategitik"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ezin da \"%s\"(r)en gako publikoen fitxategia inportatu"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "\"%s\" euskarri eguneratua"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "[%s] berreskurapenak huts egin du"
@@ -1212,7 +1213,7 @@ msgstr "eEnN"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "bByYsS"
@@ -1282,7 +1283,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1365,277 +1366,7 @@ msgstr "%s muntatzen"
 msgid "unmounting %s"
 msgstr "%s desmuntatzen"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-"urpmi berrabiatu egin da, eta lehentasuna duten paketeen zerrenda ez da "
-"aldatu"
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-"urpmi berrabiatu egin da, eta lehentasuna duten paketeen zerrenda aldatu "
-"egin da: %s vs %s"
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Ez dago %s izeneko paketerik"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Ondoko paketeek %s dute: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "%s paketeak ezin dira instalatu"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "%s paketea dagoeneko instalatuta dago"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "%s paketeak dagoeneko instalatuta daude"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "%s falta delako"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "dagoeneko instalatutako %s dela eta"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "%s bete gabe dagoelako"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "%s jaso nahian"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "%s gordetzeko"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "%s instalatzeko"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "%s(r)ekin gatazkak daudelako"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Sinadura ez da baliozkoa (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "ID gakoa ez da baliozkoa (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Sinadura falta da (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr "sistema"
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr "%s berrabiatu beharko zenuke %s-rentzako"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't write file"
-msgstr "Ezin da fitxategia idatzi"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "Ezin da fitxategia ireki"
-
-#: ../urpm/sys.pm:289
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "Ezin da %s fitxategiar %s-ra mugitu"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme %s bertsioa\n"
-"Copyright © 1999-2008 Mandriva.\n"
-"Software askea da hau eta GNU-ren GPL-k ezarritako baldintzak jarraituz "
-"birbanatu daiteke.\n"
-"\n"
-"erabilera:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - automatikoki pakete bat hautatzen du aukeratik.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - ezabaketa egokiro egin daitekeen egiaztatzen du.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi banatzen du alias-makinen artean.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - fitxategiak bir-paketatu ezabatu aurretik\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - beste root bat erabiltzen du rpm ezabaketarako.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../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   - erabili beste erro bat urpmi db eta rpm instalatzeko.\n"
-
-#: ../urpme:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - ez du scriptlet(s) paketea exekutatzen\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - urpme berehala konfiguratzen du distrib zuhaitzetik, \n"
-"                   erabilgarria chroot --root aukerarekin (des)"
-"instalatzeko.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v   - modu berritsua.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - pakete denak hautatzen ditu bat datozen adierazpenak "
-"kontuan hartuz.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Supererabiltzaileak soilik dauka paketeak ezabatzeko baimena"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "pakete ezezagunak"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "pakete ezezaguna"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "%s paketea kentzen baduzu, sistema apurtuko duzu"
-msgstr[1] "%s paketea kentzen baduzu, sistema apurtuko duzu"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Ez dago ezer kentzeko"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Ez dago ezer kentzeko"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "Mendekotasunak asetzeko, ondoko paketea ezabatuko da"
-msgstr[1] "Mendekotasunak asetzeko, ondoko %d paketeak ezabatuko dira"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "pakete ezezaguna"
-msgstr[1] "pakete ezezaguna"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "%d paketea ezabatu?"
-msgstr[1] "%d paketeak ezabatu?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (b/E) "
-
-#: ../urpme:164
-#, c-format
-msgid "testing removal of %s"
-msgstr ""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Kentzean huts egin du"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Kentzean huts egin du"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1652,25 +1383,25 @@ msgstr ""
 "\n"
 "erabilera: urpmf [aukerak] adierazpen-patroia\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - inprimatu tresna honen bertsio zenbakia.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - ingurune espezifikoa erabiltzen du (normalean\n"
 "                   errorearen berri ematea).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - ez erabili adierazitako euskarria, komaz bereizita.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
@@ -1678,7 +1409,15 @@ msgstr ""
 "  --literal, -l  - ez parekatu patroi gisa, erabili argumentua hitzez hitz "
 "testu ilara gisa.\n"
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../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   - erabili beste erro bat urpmi db eta rpm instalatzeko.\n"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1686,257 +1425,530 @@ msgstr ""
 "  --sortmedia    - euskarriak komaz bereizitako azpikateen arabera "
 "ordenatzen ditu.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - erabili emandako bidea euskarria atzitzeko\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - emandako laburpena erabiltzen du urpmi db-ren ordez.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - ez inprimatu lerro berdinak.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - eguneratze-euskarria bakarrik erabiltzen du.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modu berritsua.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - ereduetan ez bereiztu hizki larri eta xeheak.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -I             - ereduetan hizki larri eta xeheak bereiztu (lehenetsia).\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - aldatu eremu bakantzailea (lehenetsia ':').\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Adierazpen patroiak:\n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  text           - edozein testu regexp bezala aztertzen da, -l erabiltzen "
 "denean ezik..\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - perl kodea sartzen du zuzenean perl -e gisa.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - ETA eragile bitarra.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - EDO eragile bitarra.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - EZ unarioa.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - ezker eta eskuin parentesiak.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Etiketa zerrendak:\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - printf-antzeko irteera formatua zehazten du\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   adibidez: '%%name:%%files'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - arkitektura\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - eraikuntza ostalaria\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - eraikuntza ordua\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - konfiguraketa fitxategiak\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - \"gatazka\" etiketak\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description - paketeen deskribapena\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - banaketa\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - garaia.\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - paketearen fitxategi izena\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - paketeak biltzen dituen fitxategien izen zerrenda\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - taldea\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - lizentzia\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - pakete izena\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - \"zaharkituak\" etiketak\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - paketatzailea\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - \"hornitu\" etiketak.\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - \"beharrezko\" etiketak\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - neurria instalatu ondoren\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - rpm iturburu izena.\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - bilatu «suggests» bezala markatutakoen artean\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - laburpena\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - hornitzailea\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - paketea zeukan euskarria\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f - bertsioa, argitalpena eta fitxategia ere izenarekin inprimatzen "
 "ditu.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr "amaitugabeko adierazpena (%s)"
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Formatu okerra: etiketa balio-anitz bakarra erabili dezakezu"
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "%s(e)n ingurune espezifikoa erabiliz\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "ez dago \"%s\" euskarriarentzako hdlist eskuragarri"
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "ez dago \"%s\" euskarriarentzako synthesis eskuragarri"
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "ez dago \"%s\" euskarriarentzako xml-info eskuragarri"
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+"urpmi berrabiatu egin da, eta lehentasuna duten paketeen zerrenda ez da "
+"aldatu"
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi berrabiatu egin da, eta lehentasuna duten paketeen zerrenda aldatu "
+"egin da: %s vs %s"
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Ez dago %s izeneko paketerik"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Ondoko paketeek %s dute: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "%s paketeak ezin dira instalatu"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "%s paketea dagoeneko instalatuta dago"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "%s paketeak dagoeneko instalatuta daude"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "%s falta delako"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "dagoeneko instalatutako %s dela eta"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "%s bete gabe dagoelako"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "%s jaso nahian"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "%s gordetzeko"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "%s instalatzeko"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "%s(r)ekin gatazkak daudelako"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Sinadura ez da baliozkoa (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "ID gakoa ez da baliozkoa (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Sinadura falta da (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr "sistema"
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr "%s berrabiatu beharko zenuke %s-rentzako"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't write file"
+msgstr "Ezin da fitxategia idatzi"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "Ezin da fitxategia ireki"
+
+#: ../urpm/sys.pm:289
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "Ezin da %s fitxategiar %s-ra mugitu"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme %s bertsioa\n"
+"Copyright © 1999-2008 Mandriva.\n"
+"Software askea da hau eta GNU-ren GPL-k ezarritako baldintzak jarraituz "
+"birbanatu daiteke.\n"
+"\n"
+"erabilera:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - automatikoki pakete bat hautatzen du aukeratik.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - ezabaketa egokiro egin daitekeen egiaztatzen du.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi banatzen du alias-makinen artean.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - fitxategiak bir-paketatu ezabatu aurretik\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - beste root bat erabiltzen du rpm ezabaketarako.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --justdb       - eguneratu soilik rpm db, ez fitxategi-sistema.\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - ez du scriptlet(s) paketea exekutatzen\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - urpme berehala konfiguratzen du distrib zuhaitzetik, \n"
+"                   erabilgarria chroot --root aukerarekin (des)"
+"instalatzeko.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v   - modu berritsua.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - pakete denak hautatzen ditu bat datozen adierazpenak "
+"kontuan hartuz.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Supererabiltzaileak soilik dauka paketeak ezabatzeko baimena"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "pakete ezezagunak"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "pakete ezezaguna"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "%s paketea kentzen baduzu, sistema apurtuko duzu"
+msgstr[1] "%s paketea kentzen baduzu, sistema apurtuko duzu"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Ez dago ezer kentzeko"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Ez dago ezer kentzeko"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Mendekotasunak asetzeko, ondoko paketea ezabatuko da"
+msgstr[1] "Mendekotasunak asetzeko, ondoko %d paketeak ezabatuko dira"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "pakete ezezaguna"
+msgstr[1] "pakete ezezaguna"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "%d paketea ezabatu?"
+msgstr[1] "%d paketeak ezabatu?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (b/E) "
+
+#: ../urpme:166
+#, c-format
+msgid "testing removal of %s"
+msgstr ""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Kentzean huts egin du"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Kentzean huts egin du"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr "amaitugabeko adierazpena (%s)"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2028,11 +2040,6 @@ msgstr "  --clean        - kendu rpm cachetik beste ezer baino lehen.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - ez garbitu rpm-ak katxetik.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       - eguneratu soilik rpm db, ez fitxategi-sistema.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2371,7 +2378,7 @@ msgstr ""
 "\n"
 "Instalazioarekin jarraitu hala ere?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (B/e) "
@@ -2567,10 +2574,12 @@ msgstr "  --curl - curl erabiltzen du urruneko fitxategiak eskuratzeko.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - eguneratze-euskarria sortzen du.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2581,22 +2590,22 @@ msgstr ""
 "                   hauetako bat: never, on-demand, update-only, always. cf "
 "urpmi.cfg(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - synthesis fitxategia erabili.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - erabili rpm fitxategiak (synthesis ordez).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - ez saiatu synthesis fitxategiak aurkitzen.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2605,21 +2614,21 @@ msgstr ""
 "  --distrib      - instalazio-euskarri batetik euskarri guztiak sortzen \n"
 "                   ditu automatikoki.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - , --distrib aukerarekin, eskatu berrespena euskarri "
 "bakoitzarentzako\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 "  --all-media    - , --distrib aukerarekin, erantsi zerrendatutako euskarri "
 "bakoitza\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2628,73 +2637,73 @@ msgstr ""
 "  --from         - ispiluen zerrendaren url espezifikoa erabiltzen du,\n"
 "                   lehenetsia %s da\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr "  --virtual      - beti eguneratuta dauden euskarri birtualak sortu.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - MD5SUM fitxategiaren egiaztapena desgaitzen du.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - ez inportatu erantsitako euskarrien gako-publikoa\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - erantsi euskarria konfig-en, baino ez eguneratu.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modu lasaia.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - modu berritsua.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "xml-info politika ezagunak dira %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "ez da argumenturik behar honentzako: --distrib --mirrorlist <url>"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "<url> okerra (bertako direktorioentzako, bide absolutua behar da)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Supererabiltzaileak soilik dauka euskarriak eransteko baimena"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "Konfig fitxategia sortzen [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Ezin da konfig fitxategia sortu [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr ""
 "ez dago <synthesis-en bide erlatiboa> eman beharrik --distrib aukerarekin"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
@@ -2703,17 +2712,17 @@ msgstr ""
 "\n"
 "'%s' euskarria erantsi nahi duzu?"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<synthesis-en bide erlatiboa> falta da\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Urruneko euskarriekin ezin da %s erabili"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "ezin da euskarria erantsi"
@@ -2954,13 +2963,13 @@ msgstr "  -f             - benetan behartu synthesis eguneraketa.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Supererabiltzaileak soilik dauka euskarriak eguneratzeko baimena"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "ez dago eguneratzeko ezer (erabili urpmi.addmedia euskarria gehitzeko)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2969,17 +2978,17 @@ msgstr ""
 "eguneratu beharreko sarrera falta da\n"
 "(%s(e)tako bat\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "%s euskarria baztertzen"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "%s euskarria gaitzen"
@@ -3275,6 +3284,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Ez da changelog  aurkitu\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - eguneratze-euskarria sortzen du.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "gaizki osatutako URL: [%s]"
 
diff --git a/po/fa.po b/po/fa.po
index ca921580..361c54c9 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2005-02-06 08:42-0500\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "نصب RPM"
@@ -30,7 +30,7 @@ msgstr "نصب RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_تأیید"
@@ -96,7 +96,7 @@ msgstr "_نصب"
 msgid "_Save"
 msgstr "_ذخیره"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_لغو"
@@ -127,8 +127,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - چاپ این پیغام راهنما.\n"
@@ -162,7 +163,7 @@ msgstr ""
 "  --verify-rpm   - تصدیق امضاهای rpm قبل از نصب\n"
 "                   (--no-verify-rpm غیر فعال شود، پیش‌فرض فعال شده است).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -214,7 +215,7 @@ msgstr "لطفاً صبر کنید..."
 msgid "Must be root"
 msgstr "باید مدیر باشید"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -225,42 +226,42 @@ msgstr ""
 "%s\n"
 "ادامه میدهید؟"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "هشدار"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "تایید"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (ارتقاء دادن)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (نصب کردن)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "یکی از بسته‌های بدنبال آمده لازم است:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_ترک"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -271,60 +272,60 @@ msgstr ""
 "%s\n"
 "ادامه میدهید؟"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "برای ارضای وابستگی‌ها، بسته‌ی بدنبال آمده نصب خواهد شد (%d مگابایت)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "برای ارضای وابستگی‌ها، بسته‌ی بدنبال آمده نصب خواهد شد (%d مگابایت)"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(بسته‌های %d، %d مگابایت)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "نصب بسته..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "نمب‌توان بسته های منبع را دریافت کرد، پایان داده می‌شود"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "در حال آماده کردن..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "نصب بسته `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "لطفاً رسانه‌ی بنام \"%s\" بر دستگاه [%s] را داخل نمایید"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "بارگیری بسته `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_انجام شد"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -335,28 +336,28 @@ msgstr ""
 "%s\n"
 "بهتر است بانک اطلاعات urpmi را بروزسازی نمایید"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "نصب شکست خورد"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "همه چیز قبلاً نصب شده است"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "نصب پایان یافت"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "برداشتن %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "راه‌اندازی دوباره‌ی urpmi"
@@ -436,8 +437,8 @@ msgid "...retrieving done"
 msgstr "...دریافت انجام گرفت"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...دریافت شکست خورد: %s"
@@ -477,52 +478,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr "تعریف بد پراکسی بر خط فرمان\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: نمی‌توان پرونده rpm \"%s\" را خواند\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "عدم وجود امضا (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -949,217 +950,217 @@ msgstr ""
 "--synthesis نمی‌تواند با --media, --excludemedia, --sortmedia, --update یا --"
 "parallel استفاده شود"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "جستجو کردن با شروع در: %s پایان در: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "نادیده‌گیری بسته‌ی %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "بجای ارتقای بسته %s نصب خواهد شد"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "رسانه \"%s\" قبلاً وجود دارد"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "خواندن سرآیندها از رسانه \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "برداشتن رسانه‌ی \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "نمی‌توان rpmdb را باز کرد"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "ناتوان به دسترسی اولین رسانه‌ی نصب (هیچ پرونده‌ی hdlists دیسک پیدا شد)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "دریافت پرونده‌ی hdlists..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "تلاش برای انتخاب رسانه‌ \"%s\" که وجود ندارد"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "انتخاب چندین رسانه ها: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "برداشتن رسانه‌ی \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "تنظیم مجدد urpmi برای رسانه \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...تنظیم مجدد شکست خورد"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "تنظیم مجدد انجام گردید"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "رسانه \"%s\" انتخاب نشده است"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "آزمایش پرونده ترکیب [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "مشکل در خواندن پرونده‌ی ترکیب رسانه‌ی \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "نگارش پرونده لیست برای رسانه \"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...کپی کردن شکست خورد"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "کپی کردن پرونده‌ی توضیحات \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...کپی شد"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "کپی از [%s] شکست خورد (پرونده بطرز مشکوکی کوچک است)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "حساب کردن md5sum از hdlist منبع دریافت شده (یا ترکیب)"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "کپی کردن [%s] شکست خورد (عدم تطابق md5sum)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "آزمایش پرونده hdlist [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "نصب %s از %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "هیچ پرونده‌ی hdlist برای رسانه \"%s\" یافت شد"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "کپی کردن پرونده‌ی توضیحات \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "نام پرونده rpm نامعتبر [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "دریافت hdlist منبع (یا ترکیب) \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "hdlist (یا ترکیب) شناسایی شده مانند %s یافت شد"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "هیچ پرونده‌ی hdlist برای رسانه \"%s\" یافت شد"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "در حال آزمایش پرونده کلید عمومی \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...در حال وارد کردن کلید %s از پرونده کلیدعمومی \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "نمی‌توان پرونده کلید عمومی \"%s\" را وارد کرد"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "رسانه اضافه شده %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1191,7 +1192,7 @@ msgstr "NnخنoO"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyبfF"
@@ -1261,7 +1262,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1343,265 +1344,7 @@ msgstr "سوار کردن %s"
 msgid "unmounting %s"
 msgstr "پیاده کردن %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "هیچ بسته‌ای با نام %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "بسته‌های بدنبال آمده حاوی %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "همه چیز قبلاً نصب شده است"
-
-#: ../urpm/select.pm:539
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "همه چیز قبلاً نصب شده است"
-
-#: ../urpm/select.pm:540
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "همه چیز قبلاً نصب شده است"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "بدلیل عدم وجود %s"
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "همه چیز قبلاً نصب شده است"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "بدلیل عدم رضایت %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "تلاش برای ترفیع %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "برای نگهداشتن %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "برای نصب %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "بدلیل اختلاف با %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "امضای نامعتبر (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "شناسه کلید نامعتبر (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "عدم وجود امضا (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "نمی‌توان پرونده‌ی [%s] را نوشت"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "کپی کردن شکست خورد"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "کپی کردن شکست خورد"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme version %s\n"
-"Copyright © 1999-2008 Mandriva.\n"
-"این نرم‌افزار آزاد است ممکن است تحت شرایط GNU GPL پخش مجدد گردد.\n"
-"\n"
-"طرز استفاده:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - انتخاب یک بسته بطور خودکار در انتخاب‌ها.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr ""
-"  --test         - تصدیق کردن اینکه آیا حذف می‌تواند بدرستی انجام پذیرد.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi منتشر شده در بین ماشین‌های مستعار.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, fuzzy, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --packager     - چاپ برچسب بسته‌گر: packager.\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - استفاده از ریشه‌ی دیگری برای حذف نصب  rpm.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - استفاده از ریشه‌ی دیگری برای نصب rpm.\n"
-
-#: ../urpme:55
-#, fuzzy, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --description  - چاپ برچسب توضیحات: توضیحات.\n"
-
-#: ../urpme:56
-#, fuzzy, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - urpmi را در هوا از درخت distrib پیکربندی می‌کند، برای\n"
-"                   نصب(برداری) یک chroot با گزینه‌ی --root مفید است.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - حالت لغتی.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - انتخاب تمام بسته‌های مطابق با عبارت.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "فقط کاربر مدیر برای برداشتن بسته‌ها مجاز است"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "بسته‌های ناشناس"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "بسته‌ی ناشناس"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "برداشتن بسته‌ی %s سیستم شما را خواهد شکست"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "هیچ چیزی برای برداشتن"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "هیچ چیزی برای برداشتن"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "برای ارضای وابستگی‌ها، %dبسته‌های بدنبال آمده برداشته خواهند شد"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "بسته‌ی ناشناس"
-
-#: ../urpme:159
-#, fuzzy, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "برداشتن بسته %s"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "پذیرش دستگاه‌های قابل انتقال مانند \"%s\""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "برداشتن شکست خورد"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "برداشتن شکست خورد"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1617,284 +1360,553 @@ msgstr ""
 "\n"
 "طرز استفاده:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - چاپ این پیغام راهنما.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - استفاده از محیط مشخص (معمولاً یک گزارش اشکال).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - از رسانه‌ی داده نشده استفاده نشود، جدا شده توسط ویرگول.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - استفاده از ریشه‌ی دیگری برای نصب 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    - ترتیب دادن رسانه‌ها بر اساس زیررشته‌ها جدا شده با ویرگول.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --synthesis    - استفاده از ترکیب داده شده بجای urpmi db.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - استفاده از ترکیب داده شده بجای urpmi db.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - خطهای یکسان چاپ نشوند.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - فقط استفاده از رسانه‌های بروزسازی.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - حالت لغتی.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - نادیده‌گیری موارد تفاوتی در هر الگو.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -i             - نادیده‌گیری موارد تفاوتی در هر الگو.\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - ضمیمه مستقیم رمز پرل مانند perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, fuzzy, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr ""
 "  -a             - binary AND operator, true اگر هر دو عبارت درست باشند.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, fuzzy, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr ""
 "  -o             - binary OR operator, درست است اگر یک تعریف درست باشد.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, fuzzy, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  -q             - حالت ساکت.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  )              - پرانطز راست برای بستن عبارت گروه.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "لیست داده‌های برای ذخیره:\n"
 "\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - استفاده از واسط X.\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    %s پیش‌فرض است.\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - چاپ برچسب url: url.\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - چاپ برچسب ساخت‌میزبان: ساختن میزبان.\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "بخش تنظیم کنسول"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - چاپ برچسب اختلاف‌ها: همه اختلاف‌ها.\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - چاپ برچسب توضیحات: توضیحات.\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - چاپ برچسب epoch: epoch.\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name         - فقط نام‌های بسته چاپ شود.\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - پرونده‌های در بسته را فهرست می‌کند\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - چاپ برچسب گروه: گروه.\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --name         - فقط نام‌های بسته چاپ شود.\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - فقط نام‌های بسته چاپ شود.\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - چاپ برچسب کهنه‌ها: همه کهنه‌ها.\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - چاپ برچسب بسته‌گر: packager.\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - برچسب چاپ عرضه می‌دارد: عرضه‌ی همه.\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - چاپ برچسب لازمه: همه لازم.\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - چاپ برچسب اندازه: اندازه.\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - چاپ برچسب sourcerpm: منبع rpm.\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --obsoletes    - چاپ برچسب کهنه‌ها: همه کهنه‌ها.\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - برچسب خلاصه‌ی چاپ: خلاصه.\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - چاپ برچسب url: url.\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - حالت لغتی.\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - پرونده‌های در بسته را فهرست می‌کند\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - چاپ نسخه، انتشار و ساختار با نام.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "استفاده از محیط مشخص بر %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "هیچ پرونده‌ی hdlist برای رسانه \"%s\" یافت شد"
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "ساختن پرونده ترکیب hdlist برای رسانه \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "نگارش پرونده لیست برای رسانه \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "هیچ بسته‌ای با نام %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "بسته‌های بدنبال آمده حاوی %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "همه چیز قبلاً نصب شده است"
+
+#: ../urpm/select.pm:543
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "همه چیز قبلاً نصب شده است"
+
+#: ../urpm/select.pm:544
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "همه چیز قبلاً نصب شده است"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "بدلیل عدم وجود %s"
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "همه چیز قبلاً نصب شده است"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "بدلیل عدم رضایت %s"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "تلاش برای ترفیع %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "برای نگهداشتن %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "برای نصب %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "بدلیل اختلاف با %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "امضای نامعتبر (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "شناسه کلید نامعتبر (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "عدم وجود امضا (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "نمی‌توان پرونده‌ی [%s] را نوشت"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "کپی کردن شکست خورد"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "کپی کردن شکست خورد"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme version %s\n"
+"Copyright © 1999-2008 Mandriva.\n"
+"این نرم‌افزار آزاد است ممکن است تحت شرایط GNU GPL پخش مجدد گردد.\n"
+"\n"
+"طرز استفاده:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - انتخاب یک بسته بطور خودکار در انتخاب‌ها.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+"  --test         - تصدیق کردن اینکه آیا حذف می‌تواند بدرستی انجام پذیرد.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi منتشر شده در بین ماشین‌های مستعار.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, fuzzy, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --packager     - چاپ برچسب بسته‌گر: packager.\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - استفاده از ریشه‌ی دیگری برای حذف نصب  rpm.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       -  فقط بروزسازی رسانه‌های بروزسازی.\n"
+
+#: ../urpme:56
+#, fuzzy, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --description  - چاپ برچسب توضیحات: توضیحات.\n"
+
+#: ../urpme:57
+#, fuzzy, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - urpmi را در هوا از درخت distrib پیکربندی می‌کند، برای\n"
+"                   نصب(برداری) یک chroot با گزینه‌ی --root مفید است.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - حالت لغتی.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - انتخاب تمام بسته‌های مطابق با عبارت.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "فقط کاربر مدیر برای برداشتن بسته‌ها مجاز است"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "بسته‌های ناشناس"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "بسته‌ی ناشناس"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "برداشتن بسته‌ی %s سیستم شما را خواهد شکست"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "هیچ چیزی برای برداشتن"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "هیچ چیزی برای برداشتن"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "برای ارضای وابستگی‌ها، %dبسته‌های بدنبال آمده برداشته خواهند شد"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "بسته‌ی ناشناس"
+
+#: ../urpme:161
+#, fuzzy, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "برداشتن بسته %s"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "پذیرش دستگاه‌های قابل انتقال مانند \"%s\""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "برداشتن شکست خورد"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "برداشتن شکست خورد"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1982,11 +1994,6 @@ msgstr "  --clean        - برداشتن rpm از حافظه پنهان قبل
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - نگهداری rpm استفاده نشده در حافظه‌ی پنهان.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       -  فقط بروزسازی رسانه‌های بروزسازی.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2310,7 +2317,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "در هر حال ادامه می‌دهید؟"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -2495,10 +2502,12 @@ msgstr ""
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - ایجاد یک رسانه بروزسازی.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2506,24 +2515,24 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - تلاش برای یافتن و استفاده از پرونده ترکیب.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  --no-probe     - تلاش برای یافتن هیچ پرونده‌ی ترکیب یا\n"
 "                   hdlist نشود.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2532,17 +2541,17 @@ msgstr ""
 "  --distrib      - بطور خودکار همه‌ی رسانه‌ها را از یک رسانه‌ی نصب ایجاد\n"
 "                   می‌کند.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - لیست رسانه‌های موجود.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2551,91 +2560,91 @@ msgstr ""
 "  --from         - استفاده از url مشخص شده برای لیست آینه‌ها،پیش‌فرض\n"
 "                   %s می‌باشد\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - ایجاد رسانه مجازی که همیشه بروز شده هستند،\n"
 "                   فقط پایان‌نامه file:// مجاز می‌باشد.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - بررسی MD5SUM پرونده را از کار می‌اندازد.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - حالت ساکت.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - حالت لغتی.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "فقط کاربر مدیر برای افزودن رسانه مجاز است"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "پرونده پیکربندی [%s] ایجاد خواهد شد"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "نمیتوان پرونده پیکربندی [%s] را ایجاد کرد"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "احتیاجی به دادن <relative path of hdlist> با --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<relative path of hdlist> وجود ندارد\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "نمی‌توان به رسانه \"%s\" دسترسی پیدا کرد"
@@ -2873,13 +2882,13 @@ msgstr "  -f             - اجبار تولید پرونده‌های hdlist.\n
 msgid "Only superuser is allowed to update media"
 msgstr "فقط کاربر مدیر برای بروزسازی رسانه مجاز است"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "هیچ چیز برای بروزسازی (استفاده از urpmi.addmedia برای اضافه کردن یک رسانه)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2888,17 +2897,17 @@ msgstr ""
 "ورودی برای بروزسازی وجود ندارد\n"
 "(یکی از %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "نادیده‌گیری رسانه‌ی %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "بکار انداختن رسانه‌ی %s"
@@ -3171,6 +3180,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "هیچ ثبت تغییری یافت نشد\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - ایجاد یک رسانه بروزسازی.\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "درون‌ریز درهمریخته: [%s]"
diff --git a/po/fi.po b/po/fi.po
index 31acf148..8a60608e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-03-28 11:58+0200\n"
 "Last-Translator: Anssi Hannula <anssi@mandriva.org>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -24,7 +24,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM:n asentaminen"
@@ -34,7 +34,7 @@ msgstr "RPM:n asentaminen"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Virhe: tiedostoa %s ei löydy, peruutetaan toimenpide"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -100,7 +100,7 @@ msgstr "_Asenna"
 msgid "_Save"
 msgstr "_Tallenna"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Peruuta"
@@ -131,8 +131,9 @@ msgstr ""
 msgid "Options:"
 msgstr "Valitsimet:"
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - tulosta tämä viesti\n"
@@ -168,7 +169,7 @@ msgstr ""
 "  --verify-rpm   - varmista rpm-allekirjoitus ennen asennusta\n"
 "                   (--no-verify-rpm poistaa käytöstä, vakiona käytössä).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -220,7 +221,7 @@ msgstr "Odota hetki..."
 msgid "Must be root"
 msgstr "Pitää olla pääkäyttäjä"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -231,42 +232,42 @@ msgstr ""
 "%s\n"
 "Jatketaanko muiden pakettien asentamista?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (päivitettävä)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (asennettava)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Pakettivalinta"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Yksi seuraavista paketeista tarvitaan:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Hylkää"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -277,61 +278,61 @@ msgstr ""
 "%s\n"
 "Jatketaanko silti?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Riippuvuuksien täyttämiseksi seuraava paketti asennetaan:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Riippuvuuksien täyttämiseksi seuraavat paketit asennetaan:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d paketti, %d Mt)"
 msgstr[1] "(%d pakettia, %d Mt)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Pakettien asennus..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "lähteen paketteja ei saada, toiminto keskeytetään"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Valmistellaan..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Asennetaan pakettia `%s' (%s / %s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Aseta sisään media \"%s\""
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Ladataan pakettia `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Valmis"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -342,28 +343,28 @@ msgstr ""
 "%s\n"
 "Sinun kannattaisi päivittää urpmi-tietokanta"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Asennus epäonnistui:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Kaikki on jo asennettu"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Asennus on valmis"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "poistetaan %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "uudelleenkäynnistetään urpmi"
@@ -443,8 +444,8 @@ msgid "...retrieving done"
 msgstr "...noudettu"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...nouto epäonnistui: %s"
@@ -484,54 +485,54 @@ msgstr "Tämä toiminto on kielletty kon ohjelma käytetään rajoitetussa tilas
 msgid "bad proxy declaration on command line\n"
 msgstr "virheellinen välityspalvelinmääritys komentorivillä\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: rpm-tiedostoa \"%s\" ei voida lukea\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "Hakulausekkeet:\n"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Allekirjoitus puuttuu (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "Hakulausekkeet:\n"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 "urpmf odottaa oletuksena säännöllistä lauseketta. Käytä valitsinta \"--"
 "literal\""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot-kansio ei ole olemassa"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s ei voida käyttää ilman %s"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s ei voida käyttää %s kanssa"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Liian monta argumenttia\n"
@@ -961,217 +962,217 @@ msgstr ""
 "--synthesis -parametria ei voi käyttää yhdessä --media, --excludemedia, --"
 "sortmedia, --update, --use-distrib tai --parallel -parametrien kanssa"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Haun alku: %s loppu: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "ohitetaan paketti %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "paketti %s asennettaisiin päivittämisen sijaan"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "media \"%s\" on jo olemassa"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(oletuksena poissa käytöstä)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "lisätään media \"%s\" etämedian \"%s\" eteen"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "lisätään media \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "kansio %s ei ole olemassa"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "tämä sijainti ei vaikuta sisältävän jakelua"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "ei voida jäsentää media.cfg-tiedostoa "
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "jakelumediaa ei voida käyttää (media.cfg-tiedostoa ei löytynyt)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "ohitetaan yhteensopimaton media '%s' (%s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "noudetaan media.cfg-tiedostoa..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "yritettiin valita media \"%s\" jota ei ole olemassa"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "valitaan useampi media: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "poistetaan media \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "uudelleenasetetaan urpmi medialle \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...uudelleenasetus epäonnistui"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "uudelleenasetus tehty"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Virhe luodessa names-tiedostoa: riippuvuutta %d ei löytynyt"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "media \"%s\" on ajan tasalla"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "tutkitaan synthesis-tiedostoa [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "ongelmia luettaessa median \"%s\" synthesis-tiedostoa"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "kopioidaan tiedostoa [%s] medialle \"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiointi epäonnistui"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopioidaan \"%s\" kuvaustiedostoa..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...kopiointi valmis"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "[%s] kopiointi epäonnistui (tiedosto on epäilyttävän pieni)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "lasketaan md5sum haetulle lähde-synthesis-tiedostolle"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "tiedoston [%s] haku epäonnistui (md5sum ei täsmää)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2 epäonnistui %s kohdalla"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "verrataan kohteita %s ja %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "virheellinen hdlist-tiedosto %s medialle \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "kopioidaan lähteen \"%s\" MD5SUM-tiedostoa..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "virheellinen rpm-tiedoston nimi [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "noudetaan synthesis lähteelle \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "löydettiin synthesis-tiedosto nimellä %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "synthesis-tiedostoa ei löytynyt medialle \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "tarkistetaan median \"%s\" pubkey-tiedostoa..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...tuotu avain %s median \"%s\" pubkey-tiedostosta"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "median \"%s\" pubkey-tiedostoa ei voitu tuoda"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "media \"%s\" päivitetty"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "[%s] hakeminen epäonnistui"
@@ -1203,7 +1204,7 @@ msgstr "EeNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "KkYy"
@@ -1273,7 +1274,7 @@ msgstr "Gt"
 msgid "TB"
 msgstr "Tt"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1356,273 +1357,7 @@ msgstr "liitetään %s"
 msgid "unmounting %s"
 msgstr "irrotetaan %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-"urpmi uudelleenkäynnistettiin, eikä ensisijaisten pakettien lista muuttunut"
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-"urpmi uudelleenkäynnistettiin, ja ensisijaisten pakettien lista muuttui: "
-"ennen %s, nyt %s"
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Ei pakettia nimeltä %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Seuraavat paketit sisältävät %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Paketteja %s ei voida asentaa"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Paketti %s on jo asennettu"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Paketit %s on jo asennettu"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "puuttuvan %s takia"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "jo asennetun %s vuoksi"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "täyttämättömän %s takia"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "yritetään pakottaa %s valinta"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "%s säilyttämiseksi"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "%s asentamiseksi"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "johtuen ristiriidasta %s kanssa"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Virheellinen allekirjoitus (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Virheellinen avain-ID (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Allekirjoitus puuttuu (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't write file"
-msgstr "Ei voida kirjoittaa tiedostoon"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "Ei voida avata tiedostoa"
-
-#: ../urpm/sys.pm:289
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "Tiedostoa %s ei voi siirtää kohteeseen %s"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Tämä on vapaa ohjelmisto, jota saa levittää GNU GPL -lisenssin mukaisesti.\n"
-"\n"
-"käyttö:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - valitse automaattisesti paketit tarvittaessa\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - varmista että poisto voidaan hoitaa oikein\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi-toiminnot useille alias-koneille\n"
-
-#: ../urpme:52 ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - Paketoi tiedostot uudelleen ennen poistoa\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - käytä määriteltyä juurta rpm-poistolle\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../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   - käytä määriteltyä juurta urpmin tietokannalle ja\n"
-"                   rpm-pakettien asentamiseen.\n"
-
-#: ../urpme:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - älä suorita pakettien komentosarjoja.\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - aseta urpmi automaattisesti jakelun puusta, hyödyllinen\n"
-"                   asennettaessa juuri käyttäen --root -optiota\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - yksityiskohtainen tyyli\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - valitse kaikki lausekkeeseen täsmäävät\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Vain pääkäyttäjä saa poistaa paketteja"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "tuntemattomia paketteja"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "tuntematon paketti"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "paketin %s poisto rikkoisi järjestelmäsi"
-msgstr[1] "paketin %s poisto rikkoisi järjestelmäsi"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Ei mitään poistettavissa"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Ei mitään poistettavissa"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "Riippuvuuksien täyttämiseksi seuraava paketti poistetaan"
-msgstr[1] "Riippuvuuksien täyttämiseksi seuraavat %d pakettia poistetaan"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "tuntematon paketti"
-msgstr[1] "tuntematon paketti"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Poista %d paketti?"
-msgstr[1] "Poista %d pakettia?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (k/E) "
-
-#: ../urpme:164
-#, c-format
-msgid "testing removal of %s"
-msgstr ""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Poisto epäonnistui"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Poisto epäonnistui"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1638,23 +1373,23 @@ msgstr ""
 "\n"
 "käyttö: urpmf [valitsimet] hakulauseke\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - tulosta tämän työkalun versionumero.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - käytä määrättyä ympäristöä (yleensä virheraportti)\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - älä käytä seuraavia pilkuilla erotettuja medioita\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
@@ -1662,7 +1397,16 @@ msgstr ""
 "  --literal, -l  - käytä argumenttia pelkkänä hakusanana säännöllisen\n"
 "                   lausekkeen sijasta\n"
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../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   - käytä määriteltyä juurta urpmin tietokannalle ja\n"
+"                   rpm-pakettien asentamiseen.\n"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1670,260 +1414,530 @@ msgstr ""
 "  --sortmedia    - lajittele mediat pilkuilla erotettujen alimerkkijonojen "
 "mukaan\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - käytä annettua polkua jakelun hakuun\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - käytä annettua synthesis-tiedostoa urpmi-tietokannan "
 "sijasta\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - älä tulosta identtisiä rivejä\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - käytä ainoastaan päivitysmediaa\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - yksityiskohtainen tyyli\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - älä erottele isoja ja pieniä kirjaimia hakuehdoissa\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -I             - erottele isot ja pienet kirjaimet hakuehdoissa\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<erotin>     - vaihda kenttäerotinta (oletus \":\").\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Hakulausekkeet:\n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  teksti         - kaikki teksti jäsennetään säännöllisenä lausekkeena,\n"
 "                   ellei parametria -l käytetä.\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - sisällytä perl-koodia suoraan 'perl -e'\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - binaarinen JA-operaattori.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - binaarinen TAI-operaattori.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unaarinen EI-operaattori.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - sulkumerkit lausekeryhmän sulkemiseen\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr ""
 "Haettavat tiedot:\n"
 "\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - aseta printf-tyylinen tulostusmuoto\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   esimerkki: '%%name:%%files'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - laitteistoarkkitehtuuri\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - paketoimiskone\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - paketoimisaika\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - asetustiedostot\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - konfliktimerkinnät\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - paketin kuvaus\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - jakelu\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - aikakausi\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - paketin tiedostonimi\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - listaa paketissa olevat tiedostot\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - ryhmä\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - lisenssi\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - paketin nimi\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - vanhennusmerkinnät\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - paketoija\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - tarjoamismerkinnät\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - riippuvuusmerkinnät\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - koko asennettuna\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - lähde-rpm-tiedoston nimi\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - ehdotusmerkinnät\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - yhteenveto\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - URL\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - toimittaja\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - paketin media\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - tulosta versio, julkaisu ja arkkitehtuuri nimen lisäksi\n"
 
-#: ../urpmf:153
-#, fuzzy, c-format
-msgid "unterminated expression (%s)"
-msgstr "Hakulausekkeet:\n"
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 "Virheellinen muoto: vain yhtä moniarvoista merkintää voi käyttää kerrallaan"
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "käytetään määrättyä ympäristöä kohteelle %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "medialla \"%s\" ei ole hdlist-tiedostoa "
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "medialla \"%s\" ei ole synthesis-tiedostoa "
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "medialla \"%s\" ei ole xml-info -tietoja"
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+"urpmi uudelleenkäynnistettiin, eikä ensisijaisten pakettien lista muuttunut"
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi uudelleenkäynnistettiin, ja ensisijaisten pakettien lista muuttui: "
+"ennen %s, nyt %s"
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Ei pakettia nimeltä %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Seuraavat paketit sisältävät %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Paketteja %s ei voida asentaa"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Paketti %s on jo asennettu"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Paketit %s on jo asennettu"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "puuttuvan %s takia"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "jo asennetun %s vuoksi"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "täyttämättömän %s takia"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "yritetään pakottaa %s valinta"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "%s säilyttämiseksi"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "%s asentamiseksi"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "johtuen ristiriidasta %s kanssa"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Virheellinen allekirjoitus (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Virheellinen avain-ID (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Allekirjoitus puuttuu (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't write file"
+msgstr "Ei voida kirjoittaa tiedostoon"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "Ei voida avata tiedostoa"
+
+#: ../urpm/sys.pm:289
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "Tiedostoa %s ei voi siirtää kohteeseen %s"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Tämä on vapaa ohjelmisto, jota saa levittää GNU GPL -lisenssin mukaisesti.\n"
+"\n"
+"käyttö:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - valitse automaattisesti paketit tarvittaessa\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - varmista että poisto voidaan hoitaa oikein\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi-toiminnot useille alias-koneille\n"
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - Paketoi tiedostot uudelleen ennen poistoa\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - käytä määriteltyä juurta rpm-poistolle\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr ""
+"  --justdb       - päivitä ainoastaan rpm-tietokanta, älä\n"
+"                   tiedostojärjestelmää.\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - älä suorita pakettien komentosarjoja.\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - aseta urpmi automaattisesti jakelun puusta, hyödyllinen\n"
+"                   asennettaessa juuri käyttäen --root -optiota\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - yksityiskohtainen tyyli\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - valitse kaikki lausekkeeseen täsmäävät\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Vain pääkäyttäjä saa poistaa paketteja"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "tuntemattomia paketteja"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "tuntematon paketti"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "paketin %s poisto rikkoisi järjestelmäsi"
+msgstr[1] "paketin %s poisto rikkoisi järjestelmäsi"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Ei mitään poistettavissa"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Ei mitään poistettavissa"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Riippuvuuksien täyttämiseksi seuraava paketti poistetaan"
+msgstr[1] "Riippuvuuksien täyttämiseksi seuraavat %d pakettia poistetaan"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "tuntematon paketti"
+msgstr[1] "tuntematon paketti"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Poista %d paketti?"
+msgstr[1] "Poista %d pakettia?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (k/E) "
+
+#: ../urpme:166
+#, c-format
+msgid "testing removal of %s"
+msgstr ""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Poisto epäonnistui"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Poisto epäonnistui"
+
+#: ../urpmf:153
+#, fuzzy, c-format
+msgid "unterminated expression (%s)"
+msgstr "Hakulausekkeet:\n"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2016,13 +2030,6 @@ msgstr ""
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - älä poista rpm-paketteja välimuistista\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr ""
-"  --justdb       - päivitä ainoastaan rpm-tietokanta, älä\n"
-"                   tiedostojärjestelmää.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2359,7 +2366,7 @@ msgstr ""
 "\n"
 "Jatka muiden pakettien asennusta?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (K/e) "
@@ -2553,10 +2560,12 @@ msgstr "  --curl         - käytä curl:a etätiedostojen noutoon\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - luo päivitysmedia\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2567,22 +2576,22 @@ msgstr ""
 "                   never, on-demand, update-only, always. Katso urpmi.cfg"
 "(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - käytä synthesis-tiedostoa\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - käytä rpm-tiedostoja synthesis-tiedoston sijaan.\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - älä yritä etsiä synthesis-tiedostoa\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2590,18 +2599,18 @@ msgid ""
 msgstr ""
 "  --distrib      - luo automaattisesti kaikki mediat asennusmedioista\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - kysy varmistusta joka medialle --distrib -option kanssa\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    -lisää kaikki mediat --distrib -option kanssa\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2610,75 +2619,75 @@ msgstr ""
 "  --from         - käytä määritettyä URL:a peilipalvelinlistana, oletus on\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr "  --virtual      - luo virtuaalinen media, joka on aina ajantasalla.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - poista tiedostojen MD5SUM-tarkistus käytöstä\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - älä tuo pubkey-tiedostoa lisätystä mediasta\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - lisää mediaa asetuksissa, mutta älä päivitä sitä.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - hiljainen tyyli\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - yksityiskohtainen tyyli\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "tunnetut xml-info -toimintatavat ovat %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "argumenttia ei tarvita käytettäessä --distrib --mirrorlist <url>"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 "virheellinen <url> (paikallisille kansioille polun täytyy olla absoluuttinen)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Vain pääkäyttäjä saa asentaa paketteja"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "luodaan asetustiedosto [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Asetustiedosto [%s] ei voida luoda."
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr ""
 "kohtaa <synthesis-tiedoston suhteellinen polku> ei tarvita --distrib -"
 "valitsimen kanssa"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2687,17 +2696,17 @@ msgstr ""
 "\n"
 "Haluatko lisätä median '%s'"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<synthesis-tiedoston suhteellinen polku> puuttuu\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "%s ei voida käyttää etämedian kanssa"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "mediaa ei voitu lisätä"
@@ -2936,12 +2945,12 @@ msgstr "  -ff            - pakota enemmän\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Vain pääkäyttäjä saa päivittää mediat"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ei mitään päivitettävää (käytä urpmi.addmedia lisätäksesi median)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2950,17 +2959,17 @@ msgstr ""
 "Päivitettävä kohta puuttuu\n"
 "(jokin seuraavista: %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "Hylätään media %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "otetaan käyttöön media %s"
@@ -3240,6 +3249,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Muutoslokia ei löytynyt\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - luo päivitysmedia\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "virheellinen URL-osoite: [%s]"
 
diff --git a/po/fr.po b/po/fr.po
index 0209698d..398d86a5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-07-31 10:05+0200\n"
 "Last-Translator: Christophe Berthelé <cpjc@free.fr>\n"
 "Language-Team: French <cooker-i18n@mandrivalinux.org>\n"
@@ -34,7 +34,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2;plural=(n>1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Installation du RPM"
@@ -44,7 +44,7 @@ msgstr "Installation du RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Erreur : fichier %s introuvable, annulation de l'opération"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -113,7 +113,7 @@ msgstr "_Installer"
 msgid "_Save"
 msgstr "_Sauver"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Annuler"
@@ -145,8 +145,9 @@ msgstr ""
 msgid "Options:"
 msgstr "Options :"
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - afficher ce message d'aide\n"
@@ -187,7 +188,7 @@ msgstr ""
 
 # Les espaces supplémentaires sur la seconde ligne
 # sont volontaires
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -245,7 +246,7 @@ msgstr "Veuillez patienter ..."
 msgid "Must be root"
 msgstr "Vous devez être administrateur"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -256,42 +257,42 @@ msgstr ""
 "%s\n"
 "Continuer quand même l'installation ?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Attention"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (à mettre à jour)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (à installer)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Choix d'un paquetage"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Un des paquetages suivants est nécessaire :"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Abandonner"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -303,63 +304,63 @@ msgstr ""
 "%s\n"
 "Continuer quand même l'installation ?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "Pour satisfaire les dépendances, le paquetage suivant va être installé :"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Pour satisfaire les dépendances, les paquetages suivants vont être installés"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d paquetage, %d Mo)"
 msgstr[1] "(%d paquetages, %d Mo)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Installation du paquetage ..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "impossible de récupérer les paquetages de sources, abandon"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Préparation ..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installation du paquetage « %s » (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Veuillez insérer le média nommé « %s »"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Téléchargement du paquetage %s ..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Fini"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -370,28 +371,28 @@ msgstr ""
 "%s\n"
 "Vous devriez mettre à jour votre base de données urpmi."
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "L'installation a échoué :"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Tous les paquetages sont déjà installés"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "L'installation est terminée"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "désinstallation de %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "Redémarrage de urpmi"
@@ -473,8 +474,8 @@ msgid "...retrieving done"
 msgstr "... récupération effectuée"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... échec de la récupération : %s"
@@ -514,52 +515,52 @@ msgstr "Cette opération est interdite en mode restreint"
 msgid "bad proxy declaration on command line\n"
 msgstr "Mauvaise déclaration de serveur mandataire en ligne de commande\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq : impossible de lire le fichier rpm « %s »\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr "expression inattendue %s"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, c-format
 msgid "missing expression before %s"
 msgstr "expression manquante avant %s"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "expression inattendue %s (suggestion : utilisez -a ou -o ?)"
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr "pas d'expression à fermer"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "par défaut urpmf s'attend à une regexp, utilisez l'option « --literal »"
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "le répertoire chroot n'existe pas"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Impossible d'utiliser %s sans %s"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Impossible d'utiliser %s avec %s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Trop d'arguments\n"
@@ -990,219 +991,219 @@ msgstr ""
 "--synthesis ne peut être utilisé avec --media, --excludemedia, --sortmedia, "
 "--update, --use-distrib ou --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Recherche début : %s fin : %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "paquetage %s ignoré"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "effectuerait une installation plutôt qu'une mise à jour de %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "le média « %s » existe déjà"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(ignoré par défaut)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "ajout du média « %s » avant le média distant « %s »"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "ajout du média « %s »"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "le répertoire %s n'existe pas"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "cet emplacement ne semble pas contenir de distribution"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "impossible d'analyser media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "impossible d'accéder au média de distribution (pas de fichier media.cfg "
 "trouvé)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "média « %s » ignoré car incompatible (pour %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "récupération du fichier media.cfg..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "essai de sélection du média inexistant « %s »"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "sélection de plusieurs médias : %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "suppression du média « %s »"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "reconfiguration de urpmi pour le média « %s »..."
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "... la reconfiguration a échoué"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "reconfiguration effectuée"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Erreur de génération du fichier names : dépendance %d non trouvée"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "le média « %s » est à jour"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "examen de la liste de synthèse [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problème de lecture du fichier de synthèse du média « %s »"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "copie en cours [%s] pour le média « %s »..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "... copie impossible"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copie du fichier description de « %s »..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "... copie effectuée"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "La copie de [%s] a échoué (le fichier est étrangement petit)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "calcul de la somme de contrôle MD5 du fichier synthesis"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "échec de la récupération de [%s] (inégalité md5sum)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "échec de genhdlist2 sur [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "comparaison de %s et de %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "fichier hdlist %s invalide pour le média « %s »"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "copie du fichier MD5SUM de « %s »..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "fichier MD5SUM invalide (téléchargé sur %s)"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "récupération du fichier synthesis de « %s »..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "fichier synthesis localisé en tant que %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "pas de fichier synthesis trouvé pour le média « %s »"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "examen du fichier de la clé publique de « %s »..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "... clé %s importée à partir du fichier de la clé publique de « %s »"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "impossible d'importer le fichier de la clé publique de « %s »"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "média « %s » mis à jour"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "échec de la récupération de [%s]"
@@ -1234,7 +1235,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "OoYy"
@@ -1304,7 +1305,7 @@ msgstr "Go"
 msgid "TB"
 msgstr "To"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1393,6 +1394,317 @@ msgstr "montage de %s"
 msgid "unmounting %s"
 msgstr "démontage de %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 version %s\n"
+"Copyright © 2002-2006 Mandriva.\n"
+"Ceci est un logiciel libre pouvant être redistribué selon les termes de la "
+"licence GNU GPL.\n"
+"\n"
+"usage : urpmf [options] expression\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - afficher la version de cet utilitaire\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          - utiliser un environment spécifique (en général\n"
+"                   un rapport d'anomalie).\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 - ne pas utiliser les médias spécifiés (séparés\n"
+"                   par des virgules).\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  - ne remplace pas les jokers, applique l'argument tel "
+"quel.\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   - utiliser un autre répertoire racine pour l'installation "
+"et la base de donnée urpmi.\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    - trier les médias selon des sous-chaînes (séparées\n"
+"                   par des virgules).\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - utiliser le chemin spécifié pour accéder au média\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    - utiliser le fichier de synthèse donné plutôt que la base\n"
+"                   de données urpmi.\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - ne pas afficher les lignes identiques.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - n'utiliser que les médias de mise à jour.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - mode verbeux.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - ignorer la distinction majuscules/minuscules.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - respecter la distinction majuscules/minuscules.\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+"  -F<str>        - remplacer le séparateur par <str> (par défaut ':').\n"
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Motifs de substitution :\n"
+
+#: ../urpm/search.pm:52 ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  texte          - texte traité en expression régulière, sauf si option -l.\n"
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - inclure du code perl directement.\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - opérateur binaire ET.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - opérateur binaire OU.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - NON unaire.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - parenthèses droite et gauche.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Liste des champs de recherche :\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - spécifie un format d'affichage de type printf\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   exemple : '%%name:%%files'\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - chercher dans le champ architecture\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - chercher dans le champ « BuildHost »\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - chercher dans le champ « BuildTime »\n"
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr ""
+"  --conffiles    - chercher dans la liste des fichiers de configuration\n"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - chercher dans le champ « conflicts »\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - chercher dans les descriptions de paquetages\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - chercher dans le champ « distribution »\n"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - chercher dans le champ « epoch »\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - chercher dans le nom de fichier du paquetage\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr ""
+"  --files        - chercher dans la liste des fichiers d'un paquetage\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - chercher dans le champ « Group »\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - licence\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - chercher dans le nom du paquetage\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - chercher dans le champ « obsoletes »\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - chercher dans le nom du créateur du paquetage\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - chercher dans le champ « provides »\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - chercher dans la liste des dépendances\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - chercher dans le champ taille après installation\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - chercher dans le nom du paquetage source\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - chercher dans le champ «suggests»\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - chercher dans le résumé\n"
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - chercher dans le champ « Url »\n"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - chercher dans le nom du fournisseur\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr ""
+"  -m             - chercher dans le média où le paquetage a été trouvé\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - afficher la version, la release et l'architecture\n"
+"                   du paquetage avec le nom.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+"Format incorrect : vous ne pouvez utiliser qu'une seule option multi-valeur"
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "avec environnement spécifique sur %s\n"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "pas de fichier hdlist disponible pour le média « %s »"
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "pas de fichier synthesis disponible pour le média « %s »"
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "pas de fichier xml-info disponible pour le média « %s »"
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1407,62 +1719,67 @@ msgstr ""
 "urpmi a été relancé et la liste des paquetages prioritaires a changé : %s vs "
 "%s"
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, c-format
 msgid "No package named %s"
 msgstr "Pas de paquetage nommé %s"
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Les paquetages suivants contiennent %s : %s"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "paquetage(s) %s dans la base urpmi mais aucun n'est installé"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Le paquetage %s est déjà installé"
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Les paquetages %s sont déjà installés"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
 msgid "due to missing %s"
 msgstr "en raison du manque de %s"
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, c-format
 msgid "due to already installed %s"
 msgstr "car le paquetage %s est déjà installé"
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "car %s est non satisfait"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "Tentative de promouvoir %s"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "afin de garder %s"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, c-format
 msgid "in order to install %s"
 msgstr "pour installer le paquetage %s"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "en raison de conflit avec %s"
@@ -1561,20 +1878,19 @@ msgstr ""
 "  --root         - utiliser un autre répertoire racine pour la "
 "désinstallation.\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpme:55 ../urpmi:101
 #, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
 msgstr ""
-"  --urpmi-root   - utiliser un autre répertoire racine pour l'installation "
-"et la base de donnée urpmi.\n"
+"  --justdb       - mettre à jour la base rpm mais pas le système de "
+"fichiers.\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - ne pas exécuter les scripts de désinstallation.\n"
 
-#: ../urpme:56
+#: ../urpme:57
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1584,34 +1900,34 @@ msgstr ""
 "                   distribution, utile pour (dés)installer un chroot avec\n"
 "                   l'option --root.\n"
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - mode verbeux.\n"
 
-#: ../urpme:59
+#: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - sélectionner tous les paquetages correspondants à\n"
 "                   l'expression.\n"
 
-#: ../urpme:72
+#: ../urpme:73
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Seul l'administrateur système (root) peut supprimer des paquetages"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown packages"
 msgstr "paquetages inconnus"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown package"
 msgstr "paquetage inconnu"
 
-#: ../urpme:119
+#: ../urpme:121
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1620,17 +1936,17 @@ msgstr[0] ""
 msgstr[1] ""
 "La désinstallation des paquetages suivants rendra votre système instable"
 
-#: ../urpme:124
+#: ../urpme:126
 #, c-format
 msgid "Nothing to remove"
 msgstr "Rien à désinstaller"
 
-#: ../urpme:141
+#: ../urpme:143
 #, c-format
 msgid "No orphans to remove"
 msgstr "Aucun orphelin à supprimer"
 
-#: ../urpme:147
+#: ../urpme:149
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1641,347 +1957,45 @@ msgstr[1] ""
 "Pour satisfaire les dépendances, les %d paquetages suivants vont être "
 "désinstallés"
 
-#: ../urpme:152
+#: ../urpme:154
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "(paquetage orphelin)"
 msgstr[1] "(paquetages orphelins)"
 
-#: ../urpme:159
+#: ../urpme:161
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Supprimer %d paquetage ?"
 msgstr[1] "Supprimer %d paquetages ?"
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (o/N) "
 
-#: ../urpme:164
+#: ../urpme:166
 #, c-format
 msgid "testing removal of %s"
 msgstr "test de suppression de %s"
 
-#: ../urpme:178
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "Échec de la désinstallation"
 
-#: ../urpme:180
+#: ../urpme:183
 #, c-format
 msgid "Removal is possible"
 msgstr "La suppression est possible"
 
-#: ../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 version %s\n"
-"Copyright © 2002-2006 Mandriva.\n"
-"Ceci est un logiciel libre pouvant être redistribué selon les termes de la "
-"licence GNU GPL.\n"
-"\n"
-"usage : urpmf [options] expression\n"
-
-#: ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - afficher la version de cet utilitaire\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - utiliser un environment spécifique (en général\n"
-"                   un rapport d'anomalie).\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - ne pas utiliser les médias spécifiés (séparés\n"
-"                   par des virgules).\n"
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - ne remplace pas les jokers, applique l'argument tel "
-"quel.\n"
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - trier les médias selon des sous-chaînes (séparées\n"
-"                   par des virgules).\n"
-
-#: ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - utiliser le chemin spécifié pour accéder au média\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - utiliser le fichier de synthèse donné plutôt que la base\n"
-"                   de données urpmi.\n"
-
-#: ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - ne pas afficher les lignes identiques.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - n'utiliser que les médias de mise à jour.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - mode verbeux.\n"
-
-#: ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - ignorer la distinction majuscules/minuscules.\n"
-
-#: ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - respecter la distinction majuscules/minuscules.\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-"  -F<str>        - remplacer le séparateur par <str> (par défaut ':').\n"
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Motifs de substitution :\n"
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  texte          - texte traité en expression régulière, sauf si option -l.\n"
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - inclure du code perl directement.\n"
-
-#: ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - opérateur binaire ET.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - opérateur binaire OU.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - NON unaire.\n"
-
-#: ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - parenthèses droite et gauche.\n"
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Liste des champs de recherche :\n"
-
-#: ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - spécifie un format d'affichage de type printf\n"
-
-#: ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   exemple : '%%name:%%files'\n"
-
-#: ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - chercher dans le champ architecture\n"
-
-#: ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - chercher dans le champ « BuildHost »\n"
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - chercher dans le champ « BuildTime »\n"
-
-#: ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr ""
-"  --conffiles    - chercher dans la liste des fichiers de configuration\n"
-
-#: ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - chercher dans le champ « conflicts »\n"
-
-#: ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - chercher dans les descriptions de paquetages\n"
-
-#: ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - chercher dans le champ « distribution »\n"
-
-#: ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - chercher dans le champ « epoch »\n"
-
-#: ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - chercher dans le nom de fichier du paquetage\n"
-
-#: ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr ""
-"  --files        - chercher dans la liste des fichiers d'un paquetage\n"
-
-#: ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - chercher dans le champ « Group »\n"
-
-#: ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - licence\n"
-
-#: ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - chercher dans le nom du paquetage\n"
-
-#: ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - chercher dans le champ « obsoletes »\n"
-
-#: ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - chercher dans le nom du créateur du paquetage\n"
-
-#: ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - chercher dans le champ « provides »\n"
-
-#: ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - chercher dans la liste des dépendances\n"
-
-#: ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - chercher dans le champ taille après installation\n"
-
-#: ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - chercher dans le nom du paquetage source\n"
-
-#: ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - chercher dans le champ «suggests»\n"
-
-#: ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - chercher dans le résumé\n"
-
-#: ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - chercher dans le champ « Url »\n"
-
-#: ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - chercher dans le nom du fournisseur\n"
-
-#: ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr ""
-"  -m             - chercher dans le média où le paquetage a été trouvé\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - afficher la version, la release et l'architecture\n"
-"                   du paquetage avec le nom.\n"
-
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "expression non terminée (%s)"
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-"Format incorrect : vous ne pouvez utiliser qu'une seule option multi-valeur"
-
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "avec environnement spécifique sur %s\n"
-
-#: ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "pas de fichier hdlist disponible pour le média « %s »"
-
-#: ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "pas de fichier synthesis disponible pour le média « %s »"
-
-#: ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "pas de fichier xml-info disponible pour le média « %s »"
-
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2081,13 +2095,6 @@ msgstr ""
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - ne supprime aucun paquetage du cache.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr ""
-"  --justdb       - mettre à jour la base rpm mais pas le système de "
-"fichiers.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2437,7 +2444,7 @@ msgstr ""
 "\n"
 "Désirez-vous tout de même continuer ?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (O/n) "
@@ -2637,10 +2644,12 @@ msgstr ""
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - créer un média de mise à jour.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2652,23 +2661,23 @@ msgstr ""
 "                   parmi : never, on-demand, update-only, always. cf urpmi."
 "cfg(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - utiliser un fichier de synthèse.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 "  --probe-rpms   - utiliser les fichiers rpm (au lieu des synthesis).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - ne pas essayer de trouver de fichier synthesis.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2677,18 +2686,18 @@ msgstr ""
 "  --distrib      - créer automatiquement tous les médias à partir\n"
 "                   d'un média d'installation.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - avec --distrib, demande confirmation pour chaque média\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - avec --distrib, ajoute tous les médias listés\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2698,77 +2707,77 @@ msgstr ""
 "défaut\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr "  --virtual      - créer un média virtuel qui est toujours à jour,\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 "  --no-md5sum    - Supprime la vérification de la somme de contrôle MD5.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 "  --nopubkey     - ne pas importer la clé publique des nouveaux médias\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - ajoute le média dans la configuration, mais sans le "
 "mettre à jour.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - mode silencieux.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - mode verbeux.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "les politiques xml-info connues sont %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "pas d'arguments requis pour --distrib --mirrorlist <url>"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 "<url> incorrecte (pour un répertoire local, le chemin doit être absolu)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Seul l'administrateur système (root) peut ajouter un média"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "création du fichier de configuration [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Ne peut créer le fichier de configuration [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "inutile de spécifier le <chemin relatif de synthesis> avec --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
@@ -2777,17 +2786,17 @@ msgstr ""
 "\n"
 "Voulez-vous ajouter le média « %s » ?"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<chemin relatif de synthesis> manquant\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Impossible d'utiliser %s avec un média distant"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "impossible d'ajouter le média"
@@ -3034,12 +3043,12 @@ msgstr ""
 msgid "Only superuser is allowed to update media"
 msgstr "Seul l'administrateur système (root) peut mettre à jour un média"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "rien à mettre à jour (utiliser urpmi.addmedia pour ajouter un média)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -3048,17 +3057,17 @@ msgstr ""
 "l'entrée à mettre à jour est manquante\n"
 "(un parmi %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "« %s »"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "média %s ignoré"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "activation du média %s"
@@ -3356,3 +3365,6 @@ msgstr ""
 #, c-format
 msgid "No changelog found\n"
 msgstr "Aucun Changelog trouvé\n"
+
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - créer un média de mise à jour.\n"
diff --git a/po/fur.po b/po/fur.po
index 847bc653..eb49e157 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-fur\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2004-05-21 14:55+0200\n"
 "Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
 "Language-Team: Furlan <gft@freelists.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Instalazion dal pachet..."
@@ -29,7 +29,7 @@ msgstr "Instalazion dal pachet..."
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -95,7 +95,7 @@ msgstr "Instale"
 msgid "_Save"
 msgstr "Salve"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Scancele"
@@ -127,8 +127,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - stampe chist mes di jutori.\n"
@@ -164,7 +165,7 @@ msgstr ""
 "  --verify-rpm   - verifiche le firme RPM prin de instalazion\n"
 "                   (--no-verify-rpm le disabilite, predefinide abilitade).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -216,7 +217,7 @@ msgstr "Par plasè spiete."
 msgid "Must be root"
 msgstr ""
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -226,42 +227,42 @@ msgstr ""
 "Cualchidun dai pachets domandâts no puedin sedi instalât:\n"
 "%s"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Avertence"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr ""
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Instalazion Automatiche"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Al covente un di chiscj pachets:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid "_Abort"
 msgstr "Informazions"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -271,63 +272,63 @@ msgstr ""
 "I pachets listâts e an di sedi rimovûts par podê atualizâ altris:\n"
 "%s"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "Par sodisfâ les dipindincis, %d pachets e stan par sedi instalâts (%d MB)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Par sodisfâ les dipindincis, %d pachets e stan par sedi instalâts (%d MB)"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Instalazion dal pachet..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "no rivi a recuperâ i pachets sorzint, o fermi"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "In preparazion..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalazion dal pachet `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Par plasè insede le font clamade \"%s\" te periferiche [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "O stoi scjariant il pachet '%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "Fat"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -338,28 +339,28 @@ msgstr ""
 "%s\n"
 "Tu podaressis ve voe di atualizâ il to database urpmi"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Instalazion falade"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Al è dut dizà instalât"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Instalazion finide"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "rimozion di %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "rinviament di urpmi"
@@ -440,8 +441,8 @@ msgid "...retrieving done"
 msgstr "...copie finide"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...copie falade: %s"
@@ -481,52 +482,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr "declarazion di proxy falade doprant le rie di comant\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: no rivi a lei il file rpm \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Firme mancjant (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -955,219 +956,219 @@ msgstr ""
 "  synthesis a nol po sedi doprât cun --media, --excludemedia, --sortmedia, --"
 "update o --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr ""
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "o salti il pachet %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "e instalares il pachet invezit di atualizalu %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "le font \"%s\" e esist dizà"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "o stoi leint les intestaduris de font \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "o rimôf le font \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "no rivi a vierzi il database rpm"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "no rivi a acedi a le prime font di instalazion (no ai cjatât nissun file "
 "hdlists)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "o recuperi il file hdlist..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "o cîr di selezionâ une font che no esist \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "o stoi selezionant plui fonts: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "o rimôf le font \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, fuzzy, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "o recuperi il file rpm de font \"%s\"..."
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, fuzzy, c-format
 msgid "...reconfiguration failed"
 msgstr "Configurazion dal menu salvade"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, fuzzy, c-format
 msgid "reconfiguration done"
 msgstr "Configurazion Server"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "le font \"%s\" no je selezionade"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "o esamini il file synthesis [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "probleme leint il file synthesis o le font \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "o scrîf le liste pe font \"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...copie falade"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "o copii il file di descrizion di \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...copie finide"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "copie di [%s] falade (il file al è piçul in maniere suspiete)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "o calcoli md5sum dal file hdlist (o synthesis) scjariât"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "copie di [%s] falade (md5sum no valevul)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "o esamini il file hdlist [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "instalazion di %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "nissun file hdlist cjatât pe font \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "o copii il file di descrizion di \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "non dal file rpm no valevul [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "o recuperi il file hdlist (o synthesis) di \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "o ai cjatât le hdlist (o synthesis) analizade sicu %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "nissun file hdlist cjatât pe font \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "o controli il file pubkey di \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...impuartade le clâf %s dal file pubkey di \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "no rivi a impuartâ il file pubkey di \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "font zontade %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1199,7 +1200,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "SsYy"
@@ -1269,7 +1270,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1352,274 +1353,7 @@ msgstr "o stoi montant %s"
 msgid "unmounting %s"
 msgstr "o stoi dismontant %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Nissun pachet clamât %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "I pachets seguints e contegnin %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Al è dut dizà instalât"
-
-#: ../urpm/select.pm:539
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Al è dut dizà instalât"
-
-#: ../urpm/select.pm:540
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Al è dut dizà instalât"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "cause cal mancje %s"
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "Al è dut dizà instalât"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "cause che %s no l'è sodisfat"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "ricercje dal miôr pachet %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "par tignî %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "par instalâ %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "cause di conflits cun %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Firme no valevule (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Clâf ID (%s) no valevule"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Firme mancjant (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "no rivi a scrivi tal file di configurazion [%s]"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "Copie falade"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "Copie falade"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Chest software al è software libar e al po sedi redistribuît sot i termins "
-"de GNU GPL.\n"
-"\n"
-"ûs:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - selezione automatichementri un pachet de sieltis.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, fuzzy, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr ""
-"  --test         - verifiche se le instalazion e po sedi fate coretementri.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi distribuît tra diferentis machinis.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, fuzzy, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --packager     - mostre le clâf packager: assembladôr dal pachet.\n"
-
-#: ../urpme:53
-#, fuzzy, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr ""
-"  --root         - dopre une altre cartele di root par instalâ i file rpm.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --root         - dopre une altre cartele di root par instalâ i file rpm.\n"
-
-#: ../urpme:55
-#, fuzzy, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --description  - stampe il tag description: descrizion dal pachet.\n"
-
-#: ../urpme:56
-#, fuzzy, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - configure urpmi dal lamp di un arbul distribuît, zovevul\n"
-"                   par (dis)instalâ un pachet chroot cun opzion --root.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - modalitât fetôse.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - sielç ducj i pachets che cuadrin te espression.\n"
-
-#: ../urpme:72
-#, fuzzy, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Dome il superutent al po instalâ pachets"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "pachets no cognossûts"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "pachet no cognossût"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "rimovi il pachet %s al prejudicarâ il to sisteme"
-msgstr[1] "rimovi il pachet %s al prejudicarâ il to sisteme"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Nuie di rimovi"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Nuie di rimovi"
-
-#: ../urpme:147
-#, fuzzy, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] ""
-"Par sodisfâ les dipendencis, e saran rimovûts chescj pachets (%d MB)"
-msgstr[1] ""
-"Par sodisfâ les dipendencis, e saran rimovûts chescj pachets (%d MB)"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "pachet no cognossût"
-msgstr[1] "pachet no cognossût"
-
-#: ../urpme:159
-#, fuzzy, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "rimozion dal pachet %s"
-msgstr[1] "rimozion dal pachet %s"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (s/N) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "o consideri le font rimovibil sicu \"%s\""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Rimozion falade"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Rimozion falade"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1636,31 +1370,39 @@ msgstr ""
 "\n"
 "ûs:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - stampe chist mes di jutori.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - dopre un ambient specific (di solit un rapuart di bug).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - no sta a doprâ les fonts listadis, disseparadis di "
 "virgulis.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --root         - dopre une altre cartele di root par instalâ i file 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"
@@ -1668,268 +1410,538 @@ msgstr ""
 "  --sortmedia    - ordene fonts in base a les sotriis disseparadis di "
 "virgulis.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 "  --synthesis    - dopre il file synthesis specificât invezit dal db urpmi\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - dopre il file synthesis specificât invezit dal db urpmi\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - no sta a stampâ riis compagnis.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - dopre dome fonts di atualizazion.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modalitât fetôse.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - ignore le distinzion tra maiusculis e minusculis in "
 "cualsisei pattern.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -i             - ignore le distinzion tra maiusculis e minusculis in "
 "cualsisei pattern.\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 "  -e             - cjape dentri il codis perl diretementri sicu perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - AND binari.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - operadôr binari OR.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - NOT unari.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 "  )              - parentesis di diestre par sierâ un grop di espressions.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr ""
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - dopre le interface X.\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    il valôr predefinît al è %s.\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - stampe il tag url: url.\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr ""
 "  --buildhost    - stampe il tag buildhost: host di compilazion dal pachet.\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --files        - stampe i file tag: ducj i file.\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 "  --conflicts     - stampe il tag conflicts: ducj i conflits rilevâts par il "
 "pachet.\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - stampe il tag description: descrizion dal pachet.\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - stampe tag epoch: ete.\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --all           - stampe ducj i tag.\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l         - liste i file presints int'un pachet.\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - stampe il tag group: grop.\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --all           - stampe ducj i tag.\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --all           - stampe ducj i tag.\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 "  --obsoletes     - stampe il tag obsolete: dut chel fat deventâ vieli dal "
 "pachet.\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - mostre le clâf packager: assembladôr dal pachet.\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr ""
 "  --provides      - stampe il tag provides: elements furnîts dal pachet.\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr ""
 "  --requires     - stampe il tag requires: dutis les pretesis dal pachet.\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - stampe le tag size: dimension.\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - stampe il tag sourcerpm: pachets rpm sorzint.\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr ""
 "  --obsoletes     - stampe il tag obsolete: dut chel fat deventâ vieli dal "
 "pachet.\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - stampe il tag summary: sumari dal pachet.\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - stampe il tag url: url.\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - modalitât fetôse.\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l         - liste i file presints int'un pachet.\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - stampe version, release e architeture cun non.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "o dopri les variabilis di ambient su %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "nissun file hdlist cjatât pe font \"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "o ai creât il file synthesis pe font \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "o scrîf le liste pe font \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Nissun pachet clamât %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "I pachets seguints e contegnin %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Al è dut dizà instalât"
+
+#: ../urpm/select.pm:543
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Al è dut dizà instalât"
+
+#: ../urpm/select.pm:544
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Al è dut dizà instalât"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "cause cal mancje %s"
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Al è dut dizà instalât"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "cause che %s no l'è sodisfat"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "ricercje dal miôr pachet %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "par tignî %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "par instalâ %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "cause di conflits cun %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Firme no valevule (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Clâf ID (%s) no valevule"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Firme mancjant (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "no rivi a scrivi tal file di configurazion [%s]"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Copie falade"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "Copie falade"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Chest software al è software libar e al po sedi redistribuît sot i termins "
+"de GNU GPL.\n"
+"\n"
+"ûs:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - selezione automatichementri un pachet de sieltis.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, fuzzy, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+"  --test         - verifiche se le instalazion e po sedi fate coretementri.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi distribuît tra diferentis machinis.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, fuzzy, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --packager     - mostre le clâf packager: assembladôr dal pachet.\n"
+
+#: ../urpme:53
+#, fuzzy, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr ""
+"  --root         - dopre une altre cartele di root par instalâ i file rpm.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "--update       - dopre dome fonts di atualizazion.\n"
+
+#: ../urpme:56
+#, fuzzy, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --description  - stampe il tag description: descrizion dal pachet.\n"
+
+#: ../urpme:57
+#, fuzzy, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - configure urpmi dal lamp di un arbul distribuît, zovevul\n"
+"                   par (dis)instalâ un pachet chroot cun opzion --root.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - modalitât fetôse.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - sielç ducj i pachets che cuadrin te espression.\n"
+
+#: ../urpme:73
+#, fuzzy, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Dome il superutent al po instalâ pachets"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "pachets no cognossûts"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "pachet no cognossût"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "rimovi il pachet %s al prejudicarâ il to sisteme"
+msgstr[1] "rimovi il pachet %s al prejudicarâ il to sisteme"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Nuie di rimovi"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Nuie di rimovi"
+
+#: ../urpme:149
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Par sodisfâ les dipendencis, e saran rimovûts chescj pachets (%d MB)"
+msgstr[1] ""
+"Par sodisfâ les dipendencis, e saran rimovûts chescj pachets (%d MB)"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "pachet no cognossût"
+msgstr[1] "pachet no cognossût"
+
+#: ../urpme:161
+#, fuzzy, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "rimozion dal pachet %s"
+msgstr[1] "rimozion dal pachet %s"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "o consideri le font rimovibil sicu \"%s\""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Rimozion falade"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Rimozion falade"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2027,11 +2039,6 @@ msgstr ""
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - ten i rpm no doprâs te cache.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "--update       - dopre dome fonts di atualizazion.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2352,7 +2359,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Continue distès?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (s/N) "
@@ -2536,10 +2543,12 @@ msgstr "  --curl         - dopre curl par recuperâ i file rimîs.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - cree une font di atualizazion.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2547,24 +2556,24 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - cîr e dopre il file synthesis.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  --no-probe     - nol cîr nissun file synthesis o\n"
 "                   hdlist.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2573,17 +2582,17 @@ msgstr ""
 "  --distrib      - crê automaticamentri duç i sopuarts di chei di\n"
 "                   instalazion.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - liste les fonts disponibilis.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2592,91 +2601,91 @@ msgstr ""
 "  --from        -dopre le url specificade par otignî le liste dai mirror, \n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - cree une font virtuâl che je simpri atualizade,\n"
 "                   al è permitût dome il protocol file://.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - disabilite il control MD5SUM.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - maniere cidine.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - maniere fetôse.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, fuzzy, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Dome il superutent al po instalâ pachets"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "scrîf il file di configurazion [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, fuzzy, c-format
 msgid "Can't create config file [%s]"
 msgstr "scrîf il file di configurazion [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "no l'è di bisugne di furnî <percors relatîf di hdlist> cun --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<percors relatîf di hdlist> mancjant\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "no rivi a acedi a le font \"%s\""
@@ -2913,12 +2922,12 @@ msgstr "  -f             - sfuarçe gjenerazion di file hdlist.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Dome il superutent al po instalâ pachets"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nuie di atualizâ (dopre urpmi.addmedia par zontâ une font)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2927,17 +2936,17 @@ msgstr ""
 "le vôs di atualizâ e mancje\n"
 "(une di %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Modifiche de font \"%s\":"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "o rimôf le font \"%s\""
@@ -3225,6 +3234,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Nissun changelog cjatât\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - cree une font di atualizazion.\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "input malformât: [%s]"
diff --git a/po/ga.po b/po/ga.po
index 469f971d..4c782ddc 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 1.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2000-04-06 10:25+0100\n"
 "Last-Translator: Proinnsias Breathnach <breatpro@dublin.ml.com>\n"
 "Language-Team: Gaeilge <ga@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Ag Ullmhaigh feistiú"
@@ -27,7 +27,7 @@ msgstr "Ag Ullmhaigh feistiú"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, fuzzy, c-format
 msgid "_Ok"
 msgstr "Ceart go Leor"
@@ -75,7 +75,7 @@ msgstr "Ag Feistiú:"
 msgid "_Save"
 msgstr "_Sábháil"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Cealaigh"
@@ -101,8 +101,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr ""
@@ -133,7 +134,7 @@ msgid ""
 "                   (--no-verify-rpm disables it, default is enabled).\n"
 msgstr ""
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -181,7 +182,7 @@ msgstr "Fan go fóill, le do thoil..."
 msgid "Must be root"
 msgstr "Gaireas luchóige"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -189,42 +190,42 @@ msgid ""
 "Continue installation anyway?"
 msgstr "tá gach rud ann cheana féin"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Rabhadh"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ceart go Leor"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr ""
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Eirigh as Feistiú"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid "_Abort"
 msgstr "Tobscoir"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -232,63 +233,63 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Tá %s ins na pacáistí a leanas: %s \n"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "%d pacáistí"
 msgstr[1] "%d pacáistí"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, fuzzy, c-format
 msgid "Package installation..."
 msgstr "Ag Ullmhaigh feistiú"
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Á Ullmhú..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, fuzzy, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 "Ag feisteáil pacáiste %s\n"
 "%d%%"
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr ""
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "Ag feistiál  pacáiste %s"
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "Críochnithe"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -296,28 +297,28 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Theip ag feistiú"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "tá gach rud ann cheana féin"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, fuzzy, c-format
 msgid "Installation finished"
 msgstr "Theip ag feistiú"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "ag feistiú %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
@@ -395,8 +396,8 @@ msgid "...retrieving done"
 msgstr ""
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, fuzzy, c-format
 msgid "...retrieving failed: %s"
 msgstr "Theip ar uathathmhéadú FAT: %s"
@@ -436,52 +437,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, fuzzy, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "Teip ag leámh comhad chlár: %s"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, c-format
 msgid "missing expression before %s"
 msgstr ""
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -904,217 +905,217 @@ msgid ""
 "update, --use-distrib or --parallel"
 msgstr ""
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr ""
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, fuzzy, c-format
 msgid "skipping package %s"
 msgstr "Ag feistiál  pacáiste %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "Ag feistiál  pacáiste %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, fuzzy, c-format
 msgid "medium \"%s\" already exists"
 msgstr "Tá an próifíl \"%s\" ann cheana!"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "Téip ag oscailt comhad: %s\n"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, fuzzy, c-format
 msgid "selecting multiple media: %s"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, fuzzy, c-format
 msgid "removing medium \"%s\""
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, fuzzy, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, fuzzy, c-format
 msgid "...reconfiguration failed"
 msgstr "Cumraigh  'fetchmail'"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, fuzzy, c-format
 msgid "reconfiguration done"
 msgstr "Cumraíocht Xorg"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr ""
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, fuzzy, c-format
 msgid "examining synthesis file [%s]"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, fuzzy, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, fuzzy, c-format
 msgid "...copying failed"
 msgstr "Theip ar feistiú"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, fuzzy, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, fuzzy, c-format
 msgid "...copying done"
 msgstr "Theip ar feistiú"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, fuzzy, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "Téip cóip do [%s]"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "Téip cóip do [%s]"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "ag feistiú %s\n"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "Tá droch ainmchomad rpm [%s]"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "Téip ag oscailt comhad: %s\n"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "Téip ag oscailt comhad: %s\n"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1146,7 +1147,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "TtYy"
@@ -1216,7 +1217,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1299,542 +1300,553 @@ msgstr "ag feistiú %s"
 msgid "unmounting %s"
 msgstr "ag feistiú %s"
 
-#: ../urpm/select.pm:28
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
+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 ""
 
-#: ../urpm/select.pm:30
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid "  --version      - print this tool's version number.\n"
 msgstr ""
 
-#: ../urpm/select.pm:191
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
-msgid "No package named %s"
-msgstr "Pacáiste ar bith den ainm %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, fuzzy, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Tá ceann de na pacáistí seo de dhíth:"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "tá gach rud ann cheana féin"
-
-#: ../urpm/select.pm:539
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "tá gach rud ann cheana féin"
-
-#: ../urpm/select.pm:540
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "tá gach rud ann cheana féin"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, fuzzy, c-format
-msgid "due to missing %s"
-msgstr "kdesu ar iarraidh"
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "tá gach rud ann cheana féin"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, fuzzy, c-format
-msgid "due to unsatisfied %s"
-msgstr "kdesu ar iarraidh"
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
 
-#: ../urpm/select.pm:566
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
 #, c-format
-msgid "trying to promote %s"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpm/select.pm:567
-#, fuzzy, c-format
-msgid "in order to keep %s"
-msgstr "téama le haighaidh taobh an fuinneog"
-
-#: ../urpm/select.pm:603
-#, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "téama le haighaidh taobh an fuinneog"
-
-#: ../urpm/select.pm:613
-#, fuzzy, c-format
-msgid "due to conflicts with %s"
-msgstr "kdesu ar iarraidh"
-
-#: ../urpm/signature.pm:29
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
-msgid "Invalid signature (%s)"
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpm/signature.pm:60
+#: ../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 "Invalid Key ID (%s)"
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr ""
 
-#: ../urpm/signature.pm:62
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
-msgid "Missing signature (%s)"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpm/sys.pm:156
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
-msgid "system"
+msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 
-#: ../urpm/sys.pm:191
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
 #, c-format
-msgid "You should restart %s for %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "Téip ag oscailt comhad: %s\n"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "theip ar feistiú"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "theip ar feistiú"
-
-#: ../urpme:41
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr ""
 
-#: ../urpme:47
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpme:48
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
-msgid "  --auto-orphans - remove orphans\n"
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpme:49
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 
-#: ../urpme:52 ../urpmi:141
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpme:53
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
-msgid "  --root         - use another root for rpm removal.\n"
+msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpme:55
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpme:56
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+msgid "  -a             - binary AND operator.\n"
 msgstr ""
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
+msgid "  -o             - binary OR operator.\n"
 msgstr ""
 
-#: ../urpme:59
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid "  !              - unary NOT.\n"
 msgstr ""
 
-#: ../urpme:72
-#, fuzzy, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Téip ag oscailt comhad: %s\n"
-
-#: ../urpme:105
-#, fuzzy, c-format
-msgid "unknown packages"
-msgstr "%d pacáistí"
-
-#: ../urpme:105
-#, fuzzy, c-format
-msgid "unknown package"
-msgstr "gan aithne"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "Tá ceann de na pacáistí seo de dhíth:"
-msgstr[1] "Tá ceann de na pacáistí seo de dhíth:"
-
-#: ../urpme:124
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
-msgid "Nothing to remove"
+msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 
-#: ../urpme:141
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
-msgid "No orphans to remove"
+msgid "List of tags:\n"
 msgstr ""
 
-#: ../urpme:147
-#, fuzzy, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "Tá ceann de na pacáistí seo de dhíth:"
-msgstr[1] "Tá ceann de na pacáistí seo de dhíth:"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "gan aithne"
-msgstr[1] "gan aithne"
-
-#: ../urpme:159
-#, fuzzy, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Ag feistiál  pacáiste %s"
-msgstr[1] "Ag feistiál  pacáiste %s"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, fuzzy, c-format
-msgid " (y/N) "
-msgstr " (T/n) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "Gaireais inscortha"
-
-#: ../urpme:178
-#, fuzzy, c-format
-msgid "Removal failed"
-msgstr "Scríos modúil"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Scríos modúil"
+#: ../urpm/search.pm:59 ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr ""
 
-#: ../urpmf:29
+#: ../urpm/search.pm:60 ../urpmf:60
 #, 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"
+msgid "                   example: '%%name:%%files'\n"
 msgstr ""
 
-#: ../urpmf:36
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
-msgid "  --version      - print this tool's version number.\n"
+msgid "  --arch         - architecture\n"
 msgstr ""
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
+msgid "  --buildhost    - build host\n"
 msgstr ""
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:39
+#: ../urpm/search.pm:64 ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Modúl Cumraíochta Konsole"
+
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid "  --description  - package description\n"
 msgstr ""
 
-#: ../urpmf:43
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
+msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid "  --epoch        - epoch\n"
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
+msgid "  --filename     - filename of the package\n"
 msgstr ""
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
-msgid "  --update       - use only update media.\n"
+msgid "  --files        - list of files contained in the package\n"
 msgstr ""
 
-#: ../urpmf:47
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
+msgid "  --group        - group\n"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
+msgid "  --license      - license\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgid "  --name         - package name\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
-msgid "Pattern expressions:\n"
+msgid "  --packager     - packager\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgid "  --provides     - provides tags\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
+msgid "  --requires     - requires tags\n"
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
-msgid "  -a             - binary AND operator.\n"
+msgid "  --size         - installed size\n"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
-msgid "  -o             - binary OR operator.\n"
+msgid "  --sourcerpm    - source rpm name\n"
 msgstr ""
 
-#: ../urpmf:56
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
-msgid "  !              - unary NOT.\n"
+msgid "  --suggests     - suggests tags\n"
 msgstr ""
 
-#: ../urpmf:57
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
-msgid "  ( )            - left and right parentheses.\n"
+msgid "  --summary      - summary\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
-msgid "List of tags:\n"
+msgid "  --url          - url\n"
 msgstr ""
 
-#: ../urpmf:59
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
-msgid "  --qf           - specify a printf-like output format\n"
+msgid "  --vendor       - vendor\n"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
-msgid "                   example: '%%name:%%files'\n"
+msgid "  -m             - the media in which the package was found\n"
 msgstr ""
 
-#: ../urpmf:61
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
-msgid "  --arch         - architecture\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
-msgid "  --buildhost    - build host\n"
+msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
-msgid "  --buildtime    - build time\n"
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "Modúl Cumraíochta Konsole"
+msgid "no hdlist available for medium \"%s\""
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "léamh depslist comhad [%s]"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:304 ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "léamh depslist comhad [%s]"
+
+#: ../urpm/select.pm:28
 #, c-format
-msgid "  --conflicts    - conflict tags\n"
+msgid "urpmi was restarted, and the list of priority packages did not change"
 msgstr ""
 
-#: ../urpmf:66
+#: ../urpm/select.pm:30
 #, c-format
-msgid "  --description  - package description\n"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
-#: ../urpmf:67
+#: ../urpm/select.pm:168
 #, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
+msgid "No package named %s"
+msgstr "Pacáiste ar bith den ainm %s"
 
-#: ../urpmf:68
+#: ../urpm/select.pm:170 ../urpme:115
+#, fuzzy, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Tá ceann de na pacáistí seo de dhíth:"
+
+#: ../urpm/select.pm:172
 #, c-format
-msgid "  --epoch        - epoch\n"
+msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpmf:69
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "tá gach rud ann cheana féin"
+
+#: ../urpm/select.pm:543
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "tá gach rud ann cheana féin"
+
+#: ../urpm/select.pm:544
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "tá gach rud ann cheana féin"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, fuzzy, c-format
+msgid "due to missing %s"
+msgstr "kdesu ar iarraidh"
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "tá gach rud ann cheana féin"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, fuzzy, c-format
+msgid "due to unsatisfied %s"
+msgstr "kdesu ar iarraidh"
+
+#: ../urpm/select.pm:570
 #, c-format
-msgid "  --filename     - filename of the package\n"
+msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpmf:70
+#: ../urpm/select.pm:571
+#, fuzzy, c-format
+msgid "in order to keep %s"
+msgstr "téama le haighaidh taobh an fuinneog"
+
+#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr "téama le haighaidh taobh an fuinneog"
+
+#: ../urpm/select.pm:617
+#, fuzzy, c-format
+msgid "due to conflicts with %s"
+msgstr "kdesu ar iarraidh"
+
+#: ../urpm/signature.pm:29
 #, c-format
-msgid "  --files        - list of files contained in the package\n"
+msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpmf:71
+#: ../urpm/signature.pm:60
 #, c-format
-msgid "  --group        - group\n"
+msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpmf:72
+#: ../urpm/signature.pm:62
 #, c-format
-msgid "  --license      - license\n"
+msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpmf:73
+#: ../urpm/sys.pm:156
 #, c-format
-msgid "  --name         - package name\n"
+msgid "system"
 msgstr ""
 
-#: ../urpmf:74
+#: ../urpm/sys.pm:191
 #, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
+msgid "You should restart %s for %s"
 msgstr ""
 
-#: ../urpmf:75
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Téip ag oscailt comhad: %s\n"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "theip ar feistiú"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "theip ar feistiú"
+
+#: ../urpme:41
 #, c-format
-msgid "  --packager     - packager\n"
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpmf:76
+#: ../urpme:47
 #, c-format
-msgid "  --provides     - provides tags\n"
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpmf:77
+#: ../urpme:48
 #, c-format
-msgid "  --requires     - requires tags\n"
+msgid "  --auto-orphans - remove orphans\n"
 msgstr ""
 
-#: ../urpmf:78
+#: ../urpme:49
 #, c-format
-msgid "  --size         - installed size\n"
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpmf:79
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
 #, c-format
-msgid "  --sourcerpm    - source rpm name\n"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpmf:80
+#: ../urpme:52 ../urpmi:141
 #, c-format
-msgid "  --suggests     - suggests tags\n"
+msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr ""
 
-#: ../urpmf:81
+#: ../urpme:53
 #, c-format
-msgid "  --summary      - summary\n"
+msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 
-#: ../urpmf:82
+#: ../urpme:55 ../urpmi:101
 #, c-format
-msgid "  --url          - url\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
 msgstr ""
 
-#: ../urpmf:83
+#: ../urpme:56
 #, c-format
-msgid "  --vendor       - vendor\n"
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr ""
 
-#: ../urpmf:84
+#: ../urpme:57
 #, c-format
-msgid "  -m             - the media in which the package was found\n"
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid "  --verbose, -v  - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf:153
+#: ../urpme:60
 #, c-format
-msgid "unterminated expression (%s)"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpmf:198
+#: ../urpme:73
+#, fuzzy, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Téip ag oscailt comhad: %s\n"
+
+#: ../urpme:106
+#, fuzzy, c-format
+msgid "unknown packages"
+msgstr "%d pacáistí"
+
+#: ../urpme:106
+#, fuzzy, c-format
+msgid "unknown package"
+msgstr "gan aithne"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "Tá ceann de na pacáistí seo de dhíth:"
+msgstr[1] "Tá ceann de na pacáistí seo de dhíth:"
+
+#: ../urpme:126
 #, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpme:143
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "No orphans to remove"
 msgstr ""
 
-#: ../urpmf:291
+#: ../urpme:149
 #, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "léamh depslist comhad [%s]"
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Tá ceann de na pacáistí seo de dhíth:"
+msgstr[1] "Tá ceann de na pacáistí seo de dhíth:"
 
-#: ../urpmf:298
+#: ../urpme:154
 #, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "léamh depslist comhad [%s]"
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "gan aithne"
+msgstr[1] "gan aithne"
 
-#: ../urpmf:307
+#: ../urpme:161
 #, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "léamh depslist comhad [%s]"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Ag feistiál  pacáiste %s"
+msgstr[1] "Ag feistiál  pacáiste %s"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, fuzzy, c-format
+msgid " (y/N) "
+msgstr " (T/n) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "Gaireais inscortha"
+
+#: ../urpme:181
+#, fuzzy, c-format
+msgid "Removal failed"
+msgstr "Scríos modúil"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Scríos modúil"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
 
 #: ../urpmi:81
 #, c-format
@@ -1918,11 +1930,6 @@ msgstr ""
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr ""
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr ""
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2218,7 +2225,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Lean ar aghaidh ar aon nós?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (T/n) "
@@ -2376,10 +2383,12 @@ msgstr ""
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2387,128 +2396,128 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr ""
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "Téip ag cruthaigh comhad: %s"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, fuzzy, c-format
 msgid "Can't create config file [%s]"
 msgstr "Téip ag cruthaigh comhad: %s"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr ""
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr ""
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "Téip ag oscailt comhad: %s\n"
@@ -2730,29 +2739,29 @@ msgstr ""
 msgid "Only superuser is allowed to update media"
 msgstr ""
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "léamh depslist comhad [%s]"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "léamh depslist comhad [%s]"
diff --git a/po/gl.po b/po/gl.po
index 742dc5a1..471d9f66 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-04-15 18:06+0100\n"
 "Last-Translator: Leandro Regueiro <leandro DOT regueiro AT gmail DOT com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Instalación de RPMs"
@@ -30,7 +30,7 @@ msgstr "Instalación de RPMs"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Erro: non foi posible atopar o ficheiro %s, cancelarase a operación"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Aceptar"
@@ -97,7 +97,7 @@ msgstr "_Instalar"
 msgid "_Save"
 msgstr "_Gardar"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -128,8 +128,9 @@ msgstr ""
 msgid "Options:"
 msgstr "Opcións:"
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - amosa esta mensaxe de axuda.\n"
@@ -168,7 +169,7 @@ msgstr ""
 "                   instalalo (--no-verify-rpm desactívaa, por\n"
 "                   defecto está activada).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - usar só os soportes dados, separados por comas.\n"
@@ -221,7 +222,7 @@ msgstr "Agarde..."
 msgid "Must be root"
 msgstr "Debe ser root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -232,42 +233,42 @@ msgstr ""
 "%s\n"
 "Desexa continua-la instalación de tódolos xeitos?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Aceptar"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr "(para actualizar)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr "(para instalar)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Selección de paquetes"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Necesítase un dos seguintes paquetes:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Abortar"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -278,61 +279,61 @@ msgstr ""
 "%s\n"
 "Desexa continuar a instalación de tódolos xeitos?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Para satisface-las dependencias, vaise instala-lo seguinte paquete"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Para satisface-las dependencias, vanse instala-los seguintes paquetes"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d paquete, %d MB)"
 msgstr[1] "(%d paquetes, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Instalación de paquetes..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "Non foi posible consegui-los paquetes fonte, abortando"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Preparando..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalando o paquete `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Insira o soporte chamado \"%s\""
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Descargando o paquete `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Feito"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -343,28 +344,28 @@ msgstr ""
 "%s\n"
 "Pode ser que desexe actualizar a base de datos do seu urpmi"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "A instalación fallou:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Xa está todo instalado"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Instalación rematada"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "eliminando %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "reiniciando urpmi"
@@ -444,8 +445,8 @@ msgid "...retrieving done"
 msgstr "...obtención rematada"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...fallo ó obter: %s"
@@ -485,54 +486,54 @@ msgstr "Esta operación está prohibida mentres se executa en modo restrinxido"
 msgid "bad proxy declaration on command line\n"
 msgstr "declaración errónea do proxy na liña de comandos\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: non se puido ler o ficheiro rpm \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "Expresións patrón:\n"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Falta a sinatura (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "Expresións patrón:\n"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 "por defecto urpmf agarda unha expresión regular. Debería usar a opción \"--"
 "literal\""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "o directorio de chroot non existe"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Non se pode usar %s sen %s"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Non se pode usar %s con %s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Demasiados argumentos\n"
@@ -965,219 +966,219 @@ msgstr ""
 "non se pode usar --synthesis con  --media, --excludemedia, --sortmedia, --"
 "update, --use-distrib ou --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Comezo da busca: %s final: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "omitindo o paquete %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "instalaría no canto de actualizar o paquete %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "o soporte \"%s\" xa existe"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(ignorado por defecto)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "engadindo o soporte \"%s\" antes do soporte remoto \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "engadindo o soporte \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "o directorio %s non existe"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "parece que esta localización non contén ningunha distribución"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "non foi posible analizar media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "non foi posible acceder ó soporte de distribución (non se atopou o ficheiro "
 "media.cfg)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "obtendo o ficheiro media.cfg..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "intentando seleccionar o soporte inexistente \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "seleccionando varios soportes: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "eliminando o soporte \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "reconfigurando urpmi para o soporte \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...fallo ó reconfigurar"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr ""
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Erro ó xerar o ficheiro de nomes: non se atopou a dependencia %d"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "o soporte \"%s\" está actualizado"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "examinando o ficheiro synthesis [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problema ó ler o ficheiro synthesis do soporte \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...fallo ó copiar"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copiando o ficheiro de descrición de \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...copiado"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "fallo ó copiar [%s] (o ficheiro é sospeitosamente pequeno)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "calculando o md5sum do hdlist (ou synthesis) fonte recuperado"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "fallo ó obter [%s] (os md5sum non coinciden)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2 fallou en %s"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "comparando %s e %s..."
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "ficheiro hdlist %s incorrecto no soporte \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "copiando o ficheiro MD5SUM de \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "nome de ficheiro rpm incorrecto [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr ""
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "non se atopou un ficheiro synthesis para o soporte \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "examinando o ficheiro pubkey de \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importouse a clave %s dende o ficheiro pubkey de \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "non foi posible importar o ficheiro pubkey de \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "actualizouse o soporte \"%s\""
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "fallou a obtención de [%s]"
@@ -1209,7 +1210,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "SsYy"
@@ -1279,7 +1280,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1362,274 +1363,7 @@ msgstr "montando %s"
 msgid "unmounting %s"
 msgstr "desmontando %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "urpmi reiniciouse, e a lista de paquetes prioritarios non cambiou"
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-"urpmi reiniciouse, e a lista de paquetes prioritarios cambiou: %s vs %s"
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Non hai ningún paquete que se chame %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Os seguintes paquetes conteñen %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Non se poden instalar os paquetes %s"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "O paquete %s xa está instalado"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Os paquetes %s xa están instalados"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "debido a que falta %s"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "debido ó %s xa instalado"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "debido a %s non satisfeitas"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr ""
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "para manter %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "para instalar %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "debido a conflictos con %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Sinatura incorrecta (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr ""
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Falta a sinatura (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't write file"
-msgstr "Non se puido escribir o ficheiro"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "Non se puido abrir o ficheiro"
-
-#: ../urpm/sys.pm:289
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "Non se puido mover o ficheiro %s a %s"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme versión %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Isto é software libre e pode redistribuirse baixo os termos da GNU GPL.\n"
-"\n"
-"uso:\n"
-
-#: ../urpme:47
-#, fuzzy, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto         - selecciona automáticamente un paquete na selección.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr ""
-"  --test         - verifica se a eliminación se pode facer de xeito "
-"correcto.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-
-#: ../urpme:52 ../urpmi:141
-#, fuzzy, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - Reempaquetar os ficheiros antes de eliminar\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - usar outra raíz para a eliminación de rpms.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../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   - usar outra raíz para a base de datos de urpmi\n"
-"                   e a instalación de rpms.\n"
-
-#: ../urpme:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr ""
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - modo detallado.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - selecciona tódolos paquetes que concordan ca expresión.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Só o superusuario pode eliminar paquetes"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "paquetes descoñecidos"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "paquete descoñecido"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "Se se elimina o paquete %s o sistema estropearase"
-msgstr[1] "Se se elimina o paquete %s o sistema estropearase"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Non hai nada que eliminar"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Non hai nada que eliminar"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "Para satisfacer as dependencias, vaise eliminar o seguinte paquete"
-msgstr[1] ""
-"Para satisfacer as dependencias, vanse eliminar os seguintes paquetes"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "paquete descoñecido"
-msgstr[1] "paquete descoñecido"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Desexa eliminar %d paquete?"
-msgstr[1] "Desexa eliminar %d paquetes?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (s/N) "
-
-#: ../urpme:164
-#, c-format
-msgid "testing removal of %s"
-msgstr ""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Fallo ó eliminar"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Fallo ó eliminar"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1645,24 +1379,24 @@ msgstr ""
 "\n"
 "uso: urpmf [opcións] expresión-patrón\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - amosa o número de versión desta ferramenta.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - usar un ambiente específico (normalmente un informe de "
 "erro).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - non usar os soportes dados, separados por comas.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
@@ -1670,7 +1404,16 @@ msgstr ""
 "  --literal, -l  - non usar patróns, usar o argumento coma unha cadea "
 "literal.\n"
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../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   - usar outra raíz para a base de datos de urpmi\n"
+"                   e a instalación de rpms.\n"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1678,261 +1421,532 @@ msgstr ""
 "  --sortmedia    - ordenar os soportes de acordo cas cadeas separadas por "
 "comas.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - usar a ruta dada para acceder ó soporte\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - usar o ficheiro synthesis proporcionado no\n"
 "                   canto da base de datos de urpmi.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - non amosa as liñas idénticas.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - usar só soportes de actualización.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modo detallado.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - ignorar a distinción de maiúsculas-minúsculas nos "
 "patróns.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -i             - ignorar a distinción de maiúsculas-minúsculas nos "
 "patróns.\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 "  -F<str>        - cambiar o separador de campos (predeterminado ':').\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Expresións patrón:\n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  text           - todo o texto é analizado coma expresión\n"
 "                   regular, a non ser que se use -l.\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - inclúe o código perl directamente coma perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - operador binario AND.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - operador binario OR.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - NOT unario.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - parénteses esquerdo e dereito.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Lista de etiquetas:\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - especifica un formato de saída coma o de printf\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   exemplo: '%%nome:%%ficheiros'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - arquitectura\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - máquina de construcción\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - hora de construcción\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - ficheiros de configuración\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - etiquetas conflictos\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - descrición do paquete\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - distribución\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr ""
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - nome de ficheiro do paquete\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - lista dos ficheiros contidos no paquete\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - grupo\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - licenza\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - nome do paquete\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - empaquetador\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - etiquetas proporciona\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - etiquetas require\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - tamaño despois de instalar\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - nome do rpm fonte\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - etiquetas suxire\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - resumo\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - vendedor\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - o soporte no que se atopou o paquete\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - imprime a versión, a edición e o nome da arquitectura.\n"
 
-#: ../urpmf:153
-#, fuzzy, c-format
-msgid "unterminated expression (%s)"
-msgstr "Expresións patrón:\n"
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Formato incorrecto: só pode usar unha etiqueta multivaluada"
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "usando ambiente específico en %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "non hai un hdlist dispoñible para o soporte \"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "non hai un synthesis dispoñible para o soporte \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "non hai xml-info dispoñible para o soporte \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr "urpmi reiniciouse, e a lista de paquetes prioritarios non cambiou"
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi reiniciouse, e a lista de paquetes prioritarios cambiou: %s vs %s"
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Non hai ningún paquete que se chame %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Os seguintes paquetes conteñen %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Non se poden instalar os paquetes %s"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "O paquete %s xa está instalado"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Os paquetes %s xa están instalados"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "debido a que falta %s"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "debido ó %s xa instalado"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "debido a %s non satisfeitas"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr ""
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "para manter %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "para instalar %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "debido a conflictos con %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Sinatura incorrecta (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr ""
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Falta a sinatura (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't write file"
+msgstr "Non se puido escribir o ficheiro"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "Non se puido abrir o ficheiro"
+
+#: ../urpm/sys.pm:289
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "Non se puido mover o ficheiro %s a %s"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme versión %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Isto é software libre e pode redistribuirse baixo os termos da GNU GPL.\n"
+"\n"
+"uso:\n"
+
+#: ../urpme:47
+#, fuzzy, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - selecciona automáticamente un paquete na selección.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+"  --test         - verifica se a eliminación se pode facer de xeito "
+"correcto.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+
+#: ../urpme:52 ../urpmi:141
+#, fuzzy, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - Reempaquetar os ficheiros antes de eliminar\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - usar outra raíz para a eliminación de rpms.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr ""
+"  --justdb       - actualizar só a base de datos de rpm, non o sistema de "
+"ficheiros.\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr ""
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - modo detallado.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - selecciona tódolos paquetes que concordan ca expresión.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Só o superusuario pode eliminar paquetes"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "paquetes descoñecidos"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "paquete descoñecido"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "Se se elimina o paquete %s o sistema estropearase"
+msgstr[1] "Se se elimina o paquete %s o sistema estropearase"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Non hai nada que eliminar"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Non hai nada que eliminar"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Para satisfacer as dependencias, vaise eliminar o seguinte paquete"
+msgstr[1] ""
+"Para satisfacer as dependencias, vanse eliminar os seguintes paquetes"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "paquete descoñecido"
+msgstr[1] "paquete descoñecido"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Desexa eliminar %d paquete?"
+msgstr[1] "Desexa eliminar %d paquetes?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
+
+#: ../urpme:166
+#, c-format
+msgid "testing removal of %s"
+msgstr ""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Fallo ó eliminar"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Fallo ó eliminar"
+
+#: ../urpmf:153
+#, fuzzy, c-format
+msgid "unterminated expression (%s)"
+msgstr "Expresións patrón:\n"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2027,13 +2041,6 @@ msgstr "  --clean        - eliminar os rpms da caché antes de nada.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - non eliminar os rpms da caché.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr ""
-"  --justdb       - actualizar só a base de datos de rpm, non o sistema de "
-"ficheiros.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2370,7 +2377,7 @@ msgstr ""
 "\n"
 "¿Continuar a instalación de tódolos xeitos?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (S/n) "
@@ -2564,10 +2571,12 @@ msgstr "  --curl         - usar curl para descargar ficheiros distantes.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - crear un soporte de actualización.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2575,22 +2584,22 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - usar o ficheiro synthesis.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - usar ficheiros rpm (en vez de synthesis).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - non tentar buscar ningún ficheiro synthesis.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2599,18 +2608,18 @@ msgstr ""
 "  --distrib      - crea automáticamente tódolos soportes dende un\n"
 "                   soporte de instalación.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - con --distrib, solicita confirmación para cada soporte\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - con --distrib, engade tódolos soportes listados\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2620,74 +2629,74 @@ msgstr ""
 "                   espello, o predeterminado é\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - crear un soporte virtual que sempre está actualizado.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - deshabilitar a comprobación de ficheiros MD5SUM.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - non importar a clave pública do soporte engadido\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - engadir o soporte á configuración, pero non actualizalo.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -v             - modo abreviado.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - modo detallado.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "as políticas de xml-info coñecidas son %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "non fai falta un argumento para --distrib --mirrorlist <url>"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "<url> incorrecto (para un directorio local, a ruta debe ser absoluta)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Só o superusuario pode engadir soportes"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "creando o ficheiro de configuración [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Non se puido crear o ficheiro de configuración [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "non cómpre dar a <ruta relativa a synthesis> con --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2696,17 +2705,17 @@ msgstr ""
 "\n"
 "Desexa engadir o soporte '%s'"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "falta a <ruta relativa a synthesis>\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Non se pode usar %s cun soporte remoto"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "non foi posible engadir o soporte"
@@ -2942,13 +2951,13 @@ msgstr "  -ff            - forzar de verdade a actualización de synthesis\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Só o superusuario pode actualizar soportes"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "non hai nada que actualizar (use urpmi.addmedia para engadir un soporte)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2957,17 +2966,17 @@ msgstr ""
 "falta a entrada a actualizar\n"
 "(unha de %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignorando o soporte %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "habilitando o soporte %s"
@@ -3251,6 +3260,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Non se atopou o changelog\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - crear un soporte de actualización.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "URL malformada: [%s]"
 
diff --git a/po/he.po b/po/he.po
index 224198d4..f0529187 100644
--- a/po/he.po
+++ b/po/he.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-03-22 15:41+0200\n"
 "Last-Translator: Dotan Kamber <kamberd@yahoo.com>\n"
 "Language-Team: Hebrew\n"
@@ -24,7 +24,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "התקנת חבילות תוכנה"
@@ -34,7 +34,7 @@ msgstr "התקנת חבילות תוכנה"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "שגיאה: לא ניתן למצוא את הקובץ %s, הפעולה תבוטל"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_המשך"
@@ -100,7 +100,7 @@ msgstr "_התקנה"
 msgid "_Save"
 msgstr "_שמירה"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_ביטול"
@@ -132,8 +132,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - הצגת הודעת עזרה זו.\n"
@@ -167,7 +168,7 @@ msgstr ""
 "  --verify-rpm   - בדוק את חתימת החבילה לפני ההתקנה\n"
 "                   (--no-verify-rpm מבטל זאת, ברירת המחדל היא להפעיל\").\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - שימוש רק במקורות המסופקים, מופרדים ע\"י פסיק\n"
@@ -215,7 +216,7 @@ msgstr "נא להמתין..."
 msgid "Must be root"
 msgstr "עליך להיות בעל הרשאות מנהל מערכת"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -226,42 +227,42 @@ msgstr ""
 "%s\n"
 "האם להמשיך בכל זאת?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "אזהרה"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "אישור"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (לשדרג)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (להתקין)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "בחירת חבילות"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "אחת החבילות הבאות נדרשת:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_בטל"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -272,61 +273,61 @@ msgstr ""
 "%s\n"
 "האם להמשיך בכל זאת?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "כדי לספק את התלויות, החבילה הבאה הותקן:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "כדי לספק את התלויות החבילות הבאות יותקנו:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(חבילה %d, %d MB)"
 msgstr[1] "(%d חבילות, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "התקנת חבילה..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "אין אפשרות לקרוא חבילות מהמאגר, הפעולה מתבטלת"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "הכנה..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "מתקין חבילה `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "נא להכניס את המדיה בשם \"%s\""
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "מוריד חבילה `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_סיום"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -337,28 +338,28 @@ msgstr ""
 "%s\n"
 "יתכן ועליך לעדכן את מאגר הנתונים של urpmi"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "ההתקנה כשלה:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "הכל כבר מותקן"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "ההתקנה הסתיימה"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "מסיר %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "מפעיל מחדש את urpmi"
@@ -438,8 +439,8 @@ msgid "...retrieving done"
 msgstr "...האחזור הסתיים"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...האיחזור נכשל: %s"
@@ -479,52 +480,52 @@ msgstr "פעולה זו אינה מותרת באופן עבודה מוגבל"
 msgid "bad proxy declaration on command line\n"
 msgstr "הכרזת proxy לא תקנית בשורת הפקודה\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: לא יכול קובץ RPM \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "חתימה חסרה (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "ספרית ה-chroot אינה קיימת"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "לא ניתן להשתמש ב-%s ללא %s"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "לא ניתן להשתמש ב-%s עם %s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "יותר מדי משתנים\n"
@@ -951,217 +952,217 @@ msgstr ""
 "--synthesis לא יכול לשמש ביחד עם --media, --excludemedia, --sortmedia, --use-"
 "distrib או --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "תחילת חיפוש: %s סיום: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "מדלג על חבילה %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "האם להתקין במקום לשדרג את החבילה %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "המאגר \"%s\" כבר קיים"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "מוסיף את המקור \"%s\" לפני המקור המרוחק \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "מוסיף את המקור \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "הספריה %s אינה קיימת"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr ""
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "מאחזר את הקובץ  media.cfg..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "ניסיון לבחור במאגר שאינו קיים \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "בוחר הרבה מדיה:%s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "מסיר מאגר \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "מגדיר מחדש את urpmi למקור \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...ההגדרה מחדש נכשלה"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "ההגדרה מחדש הושלמה"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "המקור \"%s\" עדכני"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "בודק את קובץ הsynthesis [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "בעיה בקריאת קובץ מיזוג של מאגר \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "מעתיק [%s] עבור המקורר \"%s\"..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...ההעתקה נכשלה"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "מעתיק תיאור קובץ של \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...ההעתקה הסתיימה"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "העתקת [%s] נכשלה (הקובץ קטן מהמצופה)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "מחשב חתימות md5sum של קובץ synthesis"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "אחזור [%s] נכשל (חתימת md5sum אינה תואמת)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2 כשל על %s"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "מחשב את %s ואת %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "קובץ hdlist %s לא תקף עבור מאגר \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "מעתיק קובץ MD5SUM של \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "שם החבילה [%s] אינו תקין"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "מוריד את קובץ synthesis של \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "נמצא synthesis מאובחן כ-%s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "לא נמצא קובץ synthesis עבור מאגר \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "בודק קובץ מפתחות ציבורי של \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ".. מפתח %s מיובא מתוך קובץ ציבורי של \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "לא יכול לייבוא קובץ של מפתח ציבורי של \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "המקור \"%s\" עודכן"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1193,7 +1194,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "כfFטyY"
@@ -1263,7 +1264,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1346,6 +1347,300 @@ msgstr "מחבר את %s"
 msgid "unmounting %s"
 msgstr "מנתק את %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 %s\n"
+"כל הזכויות שמורות (C) 2002-2006 Mandriva.\n"
+"זוהי תוכנה חופשית וניתן להפיצה בהתאם לתנאי הרישיון GNU GPL.\n"
+"\n"
+"\n"
+"שימוש: urpmf [אפשרויות] ביטוי לדפוס\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version     - הדפסת מספר הגרסה של כלי זה.\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          - שימוש בסביבה מסויימת (בדרך כלל דיווח על בעיה).\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 - do not use the given media, separated by comma.\n"
+
+#: ../urpm/search.pm:39 ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../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         - השתמש בשורש מערכת קבצים אחר ל-urpmi db והתקנת 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    - מיון מדיה בהתאם לכותרות משנה המופרדים ע\"י פסיק.\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - השתמש בנתיב שהוגדר כדי לגשת למקור\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    - השתמש בקובץ synthesis המוגדר במקום בסיס הנתונים של "
+"urpmi.\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - אל תדפיס שורות זהות פעמיים.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       -שימוש במאגר העדכונים בלבד.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - verbose mode.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - ignore case distinctions in patterns.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpm/search.pm:52 ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - include perl code directly as perl -e.\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - אופרטור AND בינארי.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - אופרטור OR בינארי.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - שלילה של מרכיב.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr ""
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "רשימת תגים:\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr ""
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr ""
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch          - ארכיטקטורה\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr ""
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr ""
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr ""
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - תיאור החבילה\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - הפצה\n"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr ""
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename         - שם הקובץ של החבילה\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -files             - רשימת הקבצים הכלולים בחבילה.\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - קבוצה\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr ""
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - שם החבילה\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr ""
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - האורז\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr ""
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr ""
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         -  גודל מותקן\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr ""
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr ""
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr ""
+
+#: ../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 ""
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - המקור בו נמצאה החבילה\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - הדפסת גרסה, שחרור וארכיון עם שם.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "שימוש בסביבה מסוימת על  %s\n"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "אין קבצי hdlist זמינים עבור המקור \"%s\""
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "אין קבצי synthesis עבור המקור \"%s\""
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "אין קבצי xml info זמינים עבור המקור \"%s\""
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1357,62 +1652,67 @@ msgid ""
 "urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr "urpmi אותחל ורשימת החבילות הדחופות השתנתה: %s לעומת %s"
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, c-format
 msgid "No package named %s"
 msgstr "לא נמצאה חבילה בשם %s"
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "החבילות הבאות מכילות את %s: %s"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "לא ניתן להתקין את החבילות %s"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, c-format
 msgid "Package %s is already installed"
 msgstr "החבילה %s כבר מותקנת"
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "החבילות %s כבר מותקנות"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
 msgid "due to missing %s"
 msgstr "עקב %s חסר"
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, c-format
 msgid "due to already installed %s"
 msgstr "בגלל החבילה %s שכבר מותקנת"
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "עקב תלות %s שלא מולאה"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "מנסה לקדם %s"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "בכדי לשמור %s"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, c-format
 msgid "in order to install %s"
 msgstr "בכדי להתקין %s"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "עקב התנגשות עם %s"
@@ -1504,19 +1804,17 @@ msgstr "  --repackage    - אריזה מחדש של הקובץ לפני מחיק
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - שימוש בשורש אחר לצורך הסרת חבילות תוכנה.\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpme:55 ../urpmi:101
 #, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
 msgstr ""
-"  --urpmi-root         - השתמש בשורש מערכת קבצים אחר ל-urpmi db והתקנת rpm\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - אל תפעיל תסריטונים של החבילה.\n"
 
-#: ../urpme:56
+#: ../urpme:57
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1525,49 +1823,49 @@ msgstr ""
 "  --use-distrib  - הגדרת urpme בזמן ריצה לפי עץ ההפצה, שימושי\n"
 "                  להוסיף/להסיר מערכת chroot עם האפשרות --root.\n"
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr ""
 
-#: ../urpme:59
+#: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - בחירת כל החבילות עם ביטוי מתאים.\n"
 
-#: ../urpme:72
+#: ../urpme:73
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "רק מנהל מערכת מורשה להסיר חבילות תוכנה"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown packages"
 msgstr "חבילות לא מוכרות"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown package"
 msgstr "חבילה לא מוכרת"
 
-#: ../urpme:119
+#: ../urpme:121
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "הסרת החבילה %s תגרום נזק למערכת"
 msgstr[1] "הסרת החבילה %s תגרום נזק למערכת"
 
-#: ../urpme:124
+#: ../urpme:126
 #, c-format
 msgid "Nothing to remove"
 msgstr "אין מה להסיר"
 
-#: ../urpme:141
+#: ../urpme:143
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "אין מה להסיר"
 
-#: ../urpme:147
+#: ../urpme:149
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1575,331 +1873,45 @@ msgid_plural ""
 msgstr[0] "בכדי לענות על התלויות החבילה הבאה תוסר"
 msgstr[1] "כדי לענות על התלויות, %d החבילות הבאות ייוסרו"
 
-#: ../urpme:152
+#: ../urpme:154
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "חבילה לא מוכרת"
 msgstr[1] "חבילה לא מוכרת"
 
-#: ../urpme:159
+#: ../urpme:161
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "להסיר חבילה %d?"
 msgstr[1] "להסיר %d חבילות?"
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (כן/*לא) "
 
-#: ../urpme:164
+#: ../urpme:166
 #, c-format
 msgid "testing removal of %s"
 msgstr ""
 
-#: ../urpme:178
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "ההסרה נכשלה"
 
-#: ../urpme:180
+#: ../urpme:183
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "ההסרה נכשלה"
 
-#: ../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 %s\n"
-"כל הזכויות שמורות (C) 2002-2006 Mandriva.\n"
-"זוהי תוכנה חופשית וניתן להפיצה בהתאם לתנאי הרישיון GNU GPL.\n"
-"\n"
-"\n"
-"שימוש: urpmf [אפשרויות] ביטוי לדפוס\n"
-
-#: ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version     - הדפסת מספר הגרסה של כלי זה.\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - שימוש בסביבה מסויימת (בדרך כלל דיווח על בעיה).\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - do not use the given media, separated by comma.\n"
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - מיון מדיה בהתאם לכותרות משנה המופרדים ע\"י פסיק.\n"
-
-#: ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - השתמש בנתיב שהוגדר כדי לגשת למקור\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - השתמש בקובץ synthesis המוגדר במקום בסיס הנתונים של "
-"urpmi.\n"
-
-#: ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - אל תדפיס שורות זהות פעמיים.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       -שימוש במאגר העדכונים בלבד.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - verbose mode.\n"
-
-#: ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - ignore case distinctions in patterns.\n"
-
-#: ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - include perl code directly as perl -e.\n"
-
-#: ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - אופרטור AND בינארי.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - אופרטור OR בינארי.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - שלילה של מרכיב.\n"
-
-#: ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr ""
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "רשימת תגים:\n"
-
-#: ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr ""
-
-#: ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr ""
-
-#: ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch          - ארכיטקטורה\n"
-
-#: ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr ""
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr ""
-
-#: ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr ""
-
-#: ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - תיאור החבילה\n"
-
-#: ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - הפצה\n"
-
-#: ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr ""
-
-#: ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename         - שם הקובץ של החבילה\n"
-
-#: ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -files             - רשימת הקבצים הכלולים בחבילה.\n"
-
-#: ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - קבוצה\n"
-
-#: ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr ""
-
-#: ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - שם החבילה\n"
-
-#: ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr ""
-
-#: ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - האורז\n"
-
-#: ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr ""
-
-#: ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr ""
-
-#: ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         -  גודל מותקן\n"
-
-#: ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr ""
-
-#: ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr ""
-
-#: ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr ""
-
-#: ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - url\n"
-
-#: ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr ""
-
-#: ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - המקור בו נמצאה החבילה\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - הדפסת גרסה, שחרור וארכיון עם שם.\n"
-
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "שימוש בסביבה מסוימת על  %s\n"
-
-#: ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "אין קבצי hdlist זמינים עבור המקור \"%s\""
-
-#: ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "אין קבצי synthesis עבור המקור \"%s\""
-
-#: ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "אין קבצי xml info זמינים עבור המקור \"%s\""
-
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1988,11 +2000,6 @@ msgstr "  --clean        - remove rpm from cache before anything else.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - אל תמחק חבילות מהמטמון.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr ""
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2315,7 +2322,7 @@ msgstr ""
 "\n"
 "האם להמשיך בכל זאת?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr "אישור/ביטול (*כ/ל) "
@@ -2489,10 +2496,12 @@ msgstr "  --curl         - use curl to retrieve distant files.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - הגדרת מאגר עדכון.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2500,39 +2509,39 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - השתמש בקובץ synthesis.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - אל תנסה למצוא כל קובץ synthesis.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr "  --distrib      - יצירה אוטומטית של כל המקורות מתקליטורי ההתקנה\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2541,73 +2550,73 @@ msgstr ""
 "  --from         - השתמש בכתובת מרשימת השרתים, ברירת המחדל הוא \n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr "  --virtual      - יצירת מקור וירטואלי שתמיד יהיה עדכני,\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - נטרל בדיקת חתימת MD5SUM של הקובץ.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - אל תייבא את מפתח האימות של המקור שנוסף\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - הוסף את המקור לרשימה, אבל אל תעדכן את רשימת הקבצים.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - מצב שקט.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - verbose mode.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "רק מנהל מערכת מורשה להוסיף מקור תוכנה"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "יוצר את קובץ ההגדרות [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "לא מצליח ליצור את קובץ ההגדרות [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "אין צורך לספק <relative path of hdlist> עם --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2616,17 +2625,17 @@ msgstr ""
 "\n"
 "האם ברצונך להוסיף את המקור '%s'"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "חסר <relative path of hdlist>\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "לא מצליח להשתמש ב-%s עם מקור מרוחק"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "לא ניתן להוסיף את המקור"
@@ -2860,12 +2869,12 @@ msgstr "  -f             - באמת אלץ עדכון synthesis.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "רק מנהל מערכת מורשה לעדכן מקור תוכנה"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "אין מה לעדכן (יש להשתמש ב urpmi.addmedia לצורך הוספת מאגר)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2874,17 +2883,17 @@ msgstr ""
 "לא חסרה שום כניסה המיועדת לעדכון\n"
 "(אחד מ %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "מתעלם ממקור \"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "מאפשר את המקור %s"
@@ -3150,6 +3159,9 @@ msgstr "אין מידע ב-xml למקור \"%s\", אין כל תוצאה עבו�
 msgid "No changelog found\n"
 msgstr "לא נמצאה רשימת שינויים\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - הגדרת מאגר עדכון.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "URL לא תקין: [%s]"
 
diff --git a/po/hi.po b/po/hi.po
index 25821d87..e3c3ab5e 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2005-08-23 20:11+0530\n"
 "Last-Translator: धनञ्जय शर्मा (Dhananjaya Sharma)\n"
 "Language-Team: Hindi, India\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: KBabel 1.10\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "आरपीएम संसाधन"
@@ -28,7 +28,7 @@ msgstr "आरपीएम संसाधन"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "ठीक (_O)"
@@ -94,7 +94,7 @@ msgstr "संसाधन (_I)"
 msgid "_Save"
 msgstr "सुरक्षित (_S)"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "खत्म करें (_C)"
@@ -126,8 +126,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - यह सहायता संदेश मुद्रित करें\n"
@@ -162,7 +163,7 @@ msgstr ""
 "  --verify-rpm   - संसाधन के पहिले, आर०पी०एम० हस्ताक्षर की जाँच करें\n"
 "                   (--no-verify-rpm इसे अयोग्य करता है, डिफ़ॉल्ट जाँच के साथ है).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -215,7 +216,7 @@ msgstr "कृपया प्रतीक्षा करें..."
 msgid "Must be root"
 msgstr "रूट होना चाहिए"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -225,42 +226,42 @@ msgstr ""
 "निवेदित किये हुए कुछ पैकेज संसाधित नहीं किये जा सके:\n"
 "%sजारी रहा जाएँ?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "चेतावनी"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "ओ०के०"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr "(अपग्रेड के लिए)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr "(संसाधन के लिए)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "पैकेज चयन"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "निम्नलिखित पैकेजों में से एक की आवश्यकता है:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "निष्फ़ल (_A)"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -270,14 +271,14 @@ msgstr ""
 "अन्य पैकजों को उन्नयन करने के लिए, निम्नलिखित पैकेजों हटाना होगा:\n"
 "%sजारी रहा जाएँ?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "आधीनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेज का संसाधन होने जा रहा है(%d एमबी)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -285,49 +286,49 @@ msgstr ""
 "अधीनताओं को सन्तुष्ट करने के लिए, निम्नलिखित %d पैकेजों का संसाधन होने जा रहा है:\n"
 "%s\n"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "%d पैकेज"
 msgstr[1] "%d पैकेज"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "पैकेज संसाधित हो रहा है..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "स्रोत्र पैकेजों को पाने में असमर्थ, कार्यक्रम विफ़ल किया जा रहा है"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "तैयारी की जा रही है..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' (%s/%s) पैकेज को संसाधित किया जा रहा है..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "कृपया \"%s\" नामक माध्यम को [%s] साधन पर प्रवेश करें"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "`%s' पैकेज को डॉउनलोड किया जा रहा है..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "किया गया(_D)"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -338,28 +339,28 @@ msgstr ""
 "%s\n"
 "आपको अपना यू०आर०पी०एम०आई० डाटाबेस को अपडेट करना चाहिए"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "संसाधन असफ़ल"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "सभी कुछ पहिले से ही संसाधित है"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "संसाधन समाप्त"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "%s को हटाया जा रहा है"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "यू०आर०पी०एम०आई० को पुनः आरम्भ किया जा रहा है"
@@ -439,8 +440,8 @@ msgid "...retrieving done"
 msgstr "...पुनः प्राप्त करने की क्रिया संपन्न"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...पुनः प्राप्त करने में असफ़लता: %s "
@@ -480,52 +481,52 @@ msgstr "सीमित विधा में चलते समय, इस �
 msgid "bad proxy declaration on command line\n"
 msgstr "निर्देश वाक्य पर निकृष्ट प्रोक्सी की घोषणा\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: आर०पी०एम० संचिका \"%s\" को नहीं पढ़ सकता है\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "विलुप्त हस्ताक्षर (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -953,219 +954,219 @@ msgstr ""
 "--synthesis का उपयोग  --media, --excludemedia, --sortmedia, --update या --"
 "parallel के साथ नहीं किया जा सकता है"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "खोज आरम्भ: %s समाप्त: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "%s पैकेज को त्यागा जा रहा है"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "%s को उन्नयन करने की बजाय संसाधित किया जायेगा"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "\"%s\" माध्यम पहिले से विद्यमान है"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "\"%s\" माध्यम से शीर्षक पढ़े जा रहे है"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "\"%s\" माध्यम को हटाया जा रहा है"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "आर०पी०एम०डी०बी० को खोलने में असमर्थ"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "प्रथम संसाधन माध्यम को पाने में असमर्थ (कोई हार्डडिस्क सूची संचिका नहीं मिली)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "हार्डडिस्क सूची संचिका को पुनःप्राप्त किया जा रहा है..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "अविद्यमान माध्यम \"%s\" को चयन का प्रयास किया जा रहा है"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "बहुत सारे माध्यमों का चयन हो रहा है: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "\"%s\" माध्यम को हटाया जा रहा है"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "\"%s\" माध्यम हेतु यू०आर०पी०एम०आई० को पुनः संरचित किया जा रहा है"
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...पुनःसंरचना प्रक्रिया असफ़ल"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "पुनःसंरचना प्रक्रिया सम्पन्न हुई"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "माध्यम \"%s\" का चयन नहीं किया गया है"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "कृत्रिम संचिका [%s] का निरीक्षण किया जा रहा है"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "\"%s\" माध्यम की कृत्रिम संचिका को पढ़ने में समस्या"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "\"%s\" माध्यम के लिए संचिका-सूची लिखी जा रही है"
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...प्रतिलिपि बनना असफ़ल"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "\"%s\" संचिका के विवरण की प्रतिलिपि बनायी जा रहीं है..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...प्रतिलिपि बनना सम्पन्न हुआ"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "[%s] की प्रतिलिपि असफ़ल रही (संचिका सन्देहात्मक ढ़ग से छोटी है)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr ""
 "पुनः प्राप्त की हुई स्रोत्र हार्डडिस्क सूची (या कृत्रिम रचना) के एम०डी०५सम (md5sum) की "
 "गणना की जा रही है"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] की प्रतिलिपि अयोग्य है (एमडी५सम बेमेल है)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "हार्डडिस्क-सूची संचिका [%s] का निरीक्षण किया जा रहा है"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "%s को %s से संसाधित किया जा रहा है"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "\"%s\" माध्यम के लिए कोई हार्डडिस्क सूची संचिका नहीं मिली"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "\"%s\" संचिका के विवरण की प्रतिलिपि बनायी जा रहीं है..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "अवैध आर०पी०एम० संचिका नाम [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "\"%s\" की मूल (या कृत्रिम) हार्डडिस्क सूची पुनः प्राप्त की जा रही है..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "खोजी हुई हार्डडिस्क सूची (या कृत्रिम रचना)%s के रूप में मिली"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "\"%s\" माध्यम के लिए कोई हार्डडिस्क सूची संचिका नहीं मिली"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" की सामान्यजन कूंजी संचिका का निरीक्षण किया जा रहा है..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...\"%s\" की पब्लिककुंजी संचिका से %s कुंजी आयातित कर ली गई है"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\" की सामान्यजनकुंजी संचिका को आयात करने में असमर्थ"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "%s माध्यम को जोड़ा गया"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1197,7 +1198,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yy"
@@ -1267,7 +1268,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1350,273 +1351,7 @@ msgstr "%s को आरोह (माउन्ट) किया जा रह�
 msgid "unmounting %s"
 msgstr "%s को अवरोह (अनमाउन्ट) किया जा रहा है"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "%s नाम का कोई पैकेज नहीं है"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "निम्नलिखित पैकेज %s को समाहित करते है:  %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "सभी कुछ पहिले से ही संसाधित है"
-
-#: ../urpm/select.pm:539
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "सभी कुछ पहिले से ही संसाधित है"
-
-#: ../urpm/select.pm:540
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "सभी कुछ पहिले से ही संसाधित है"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "%s के ना मिलने के कारण"
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "सभी कुछ पहिले से ही संसाधित है"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "असन्तुष्ट %s के कारण"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "%s को प्रोत्साहित करने का प्रयास किया जा रहा है"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "%s को रखने के लिए"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "%s को संसाधित के लिए"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "%s के साथ विरोधाभास के कारण"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "अवैध हस्ताक्षर (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "अवैध कुंजी आई०डी० (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "विलुप्त हस्ताक्षर (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "संरचना-संचिका [%s] को निर्माण नहीं कर सकता है"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "प्रतिलिपि बनना असफ़ल"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "प्रतिलिपि बनना असफ़ल"
-
-#: ../urpme:41
-#, fuzzy, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"यू०आर०पी०एम०ई० संस्मरण %s\n"
-"सर्वाधिकार (C) १९९९-२००४ मैनड्रिव सॉफ़्ट ।\n"
-"यह एक मुक्त सॉफ़्टवेयर है और जी०एन०यू० सामान्य जन अधिकार-पत्र के अन्तर्गत पुनः वितरित "
-"किया जा सकता है।\n"
-"\n"
-"उपयोग विधि:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - इच्छित पैकेजों में से एक पैकेज स्वतः चयन\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - जाँच करें कि सही-सही तरीके से हटाया जा सकता है\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-"  --parallel     - वितरित यू०आर०पी०एम०आई०, उपनाम वाली प्रणालीयों के बीच में\n"
-
-#: ../urpme:52 ../urpmi:141
-#, fuzzy, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --packager     - टैग पैकेजर को मुद्रित करना: पैकेजर\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - आरपीएम को हटाने के अन्य रूट का उपयोग\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - आरपीएम संसाधन के लिए अन्य रूट का उपयोग\n"
-
-#: ../urpme:55
-#, fuzzy, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --description  - टैग विवरण मुद्रित करें: विवरण\n"
-
-#: ../urpme:56
-#, fuzzy, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - एक वितरित वृक्ष के लिए देखते-देखते यूआरपीएमआई की संरचना, \n"
-"                   एक सीएचरूट को --root विकल्प के साथ संसाधित (असंसाधित) करने में "
-"उपयोगी।\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, fuzzy, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose      - शब्दों का वॄथा प्रयोगिक विधि\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - मिलती हुई अभिव्यक्तियों वाले सभी पैकेजों का चयन करें\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "सिर्फ़ रूट यूज़र को ही पैकेजों को हटाने की अनुमति है"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "पैकेजों का प्रकार अज्ञात"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "अज्ञात पैकेज"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "%s पैकेज को हटाने से आपकी प्रणाली नष्ट हो जायेगी"
-msgstr[1] "%s पैकेज को हटाने से आपकी प्रणाली नष्ट हो जायेगी"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "हटाने को कुछ भी नहीं"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "हटाने को कुछ भी नहीं"
-
-#: ../urpme:147
-#, fuzzy, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] ""
-"अधिनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेजों %d को हटाया जायेगा (%d एमबी)"
-msgstr[1] ""
-"अधिनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेजों %d को हटाया जायेगा (%d एमबी)"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "अज्ञात पैकेज"
-msgstr[1] "अज्ञात पैकेज"
-
-#: ../urpme:159
-#, fuzzy, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "%s पैकेज को हटाया जा रहा है"
-msgstr[1] "%s पैकेज को हटाया जा रहा है"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr "(हाँ/ना:y/N)"
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "हटाने-योग्य साधनों को \"%s\" की भांति लिया जा रहा है"
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "हटाना असफ़ल"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "हटाना असफ़ल"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1633,30 +1368,37 @@ msgstr ""
 "\n"
 "उपयोग विधि:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - यह सहायता संदेश मुद्रित करें\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - विशिष्ट वातावरण का उपयोग (आदर्श रूप में एक दोष रिपोर्ट)\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - दिये हुए मीडीया का उपयोग ना करें, छोटे विराम चिह्न के द्वारा अलग "
 "किये हुए\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - आरपीएम संसाधन के लिए अन्य रूट का उपयोग\n"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1664,255 +1406,525 @@ msgstr ""
 "  --sortmedia    - मीडीया को कॉमा के द्वारा अलग की हुई सहायक-कड़ियों के अनुसार क्रम "
 "में लगाना\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 "  --synthesis    - यू०आर०पी०एन०आई० डी०बी० के बजाय, दी हुई कृत्रिमता का उपयोग करें\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - यू०आर०पी०एन०आई० डी०बी० के बजाय, दी हुई कृत्रिमता का उपयोग करें\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - एक जैसे वाक्यों को मुद्रित ना करें\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - सिर्फ़ अपडेट माध्यम का ही उपयोग करें\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - शब्दों का वॄथा प्रयोगिक विधि\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - सभी प्रतिरूपों में छोटे-बड़े शब्दों का ध्यान ना रखें\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -i             - सभी प्रतिरूपों में छोटे-बड़े शब्दों का ध्यान ना रखें\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - पर्ल कोड को perl -e जैसे सीधे सम्मलित\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - द्विआधारी \"और\" प्रवर्तक (ऑपरेटर).\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - द्विआधारी \"या\" प्रवर्तक (ऑपरेटर).\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - एकल \"नहीं\".\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  )              - दाहिना कोष्टक का चिह्न समूह अभिव्यक्ति का बंद करने के लिए\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "डाटा की सूची जिसे पुनःस्थापित करना है:\n"
 "\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - एक्स (X) इन्टरफ़ेस का उपयोग करें\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    %s डिफ़ाल्ट है ।\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - टैग यू०आर०एल० को मुद्रित करें:यू०आर०एल०\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - टैग होस्ट निर्माणकर्ता को मुद्रित करना: होस्ट निर्माणकर्ता\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "संरचना फ़ाइल में परिवर्तनों को लागू करें"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - टैग के विरोधाभासों को मुद्रित करें: सभी विरोधाभास\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - टैग विवरण मुद्रित करें: विवरण\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - टैग इपॉच्च को मुद्रित करें: इपॉच्च\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name         - सिर्फ़ पैकेजों के नामों को मुद्रित करें\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - पैकेज में स्थित संचिकाओं की सूची।\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - टैग समूह को मुद्रित करें: समूह\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --name         - सिर्फ़ पैकेजों के नामों को मुद्रित करें\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - सिर्फ़ पैकेजों के नामों को मुद्रित करें\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - टैग के अप्रचलितों को मुद्रित करें: सभी लुप्तप्रयोग\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - टैग पैकेजर को मुद्रित करना: पैकेजर\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     -  टैग की उपलब्धियां मुद्रित करें: सभी उपलब्धियां\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - टैग की आवश्यकताऐं मुद्रित करें: सभी आवश्यकताऐं (बहु-वाक्य)\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - टैग आकार को मुद्रित करें: आकार\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - टैग स्रोत्र आर०पी०एम० को मुद्रित करें: स्रोत्र आर०पी०एम०\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --obsoletes    - टैग के अप्रचलितों को मुद्रित करें: सभी लुप्तप्रयोग\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary, -S    - सारांश को मुद्रित करना।\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - टैग यू०आर०एल० को मुद्रित करें:यू०आर०एल०\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - शब्दों का वॄथा प्रयोगिक विधि\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - पैकेज में स्थित संचिकाओं की सूची।\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - \tमुद्रित संस्मरण, विमोचन और आर्च नाम के साथ\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "%s पर विशिष्ट वातावरण का उपयोग करते हुए\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "\"%s\" माध्यम के लिए कोई हार्डडिस्क सूची संचिका नहीं मिली"
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "\"%s\" माध्यम के लिए हार्डडिस्क-सूची की कृत्रिम संचिका बनायें"
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "\"%s\" माध्यम के लिए संचिका-सूची लिखी जा रही है"
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "%s नाम का कोई पैकेज नहीं है"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "निम्नलिखित पैकेज %s को समाहित करते है:  %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "सभी कुछ पहिले से ही संसाधित है"
+
+#: ../urpm/select.pm:543
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "सभी कुछ पहिले से ही संसाधित है"
+
+#: ../urpm/select.pm:544
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "सभी कुछ पहिले से ही संसाधित है"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "%s के ना मिलने के कारण"
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "सभी कुछ पहिले से ही संसाधित है"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "असन्तुष्ट %s के कारण"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "%s को प्रोत्साहित करने का प्रयास किया जा रहा है"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "%s को रखने के लिए"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "%s को संसाधित के लिए"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "%s के साथ विरोधाभास के कारण"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "अवैध हस्ताक्षर (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "अवैध कुंजी आई०डी० (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "विलुप्त हस्ताक्षर (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "संरचना-संचिका [%s] को निर्माण नहीं कर सकता है"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "प्रतिलिपि बनना असफ़ल"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "प्रतिलिपि बनना असफ़ल"
+
+#: ../urpme:41
+#, fuzzy, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"यू०आर०पी०एम०ई० संस्मरण %s\n"
+"सर्वाधिकार (C) १९९९-२००४ मैनड्रिव सॉफ़्ट ।\n"
+"यह एक मुक्त सॉफ़्टवेयर है और जी०एन०यू० सामान्य जन अधिकार-पत्र के अन्तर्गत पुनः वितरित "
+"किया जा सकता है।\n"
+"\n"
+"उपयोग विधि:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - इच्छित पैकेजों में से एक पैकेज स्वतः चयन\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - जाँच करें कि सही-सही तरीके से हटाया जा सकता है\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+"  --parallel     - वितरित यू०आर०पी०एम०आई०, उपनाम वाली प्रणालीयों के बीच में\n"
+
+#: ../urpme:52 ../urpmi:141
+#, fuzzy, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --packager     - टैग पैकेजर को मुद्रित करना: पैकेजर\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - आरपीएम को हटाने के अन्य रूट का उपयोग\n"
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - सिर्फ़ अपडेट माध्यम को अपडेट करें\n"
+
+#: ../urpme:56
+#, fuzzy, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --description  - टैग विवरण मुद्रित करें: विवरण\n"
+
+#: ../urpme:57
+#, fuzzy, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - एक वितरित वृक्ष के लिए देखते-देखते यूआरपीएमआई की संरचना, \n"
+"                   एक सीएचरूट को --root विकल्प के साथ संसाधित (असंसाधित) करने में "
+"उपयोगी।\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - शब्दों का वॄथा प्रयोगिक विधि\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - मिलती हुई अभिव्यक्तियों वाले सभी पैकेजों का चयन करें\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "सिर्फ़ रूट यूज़र को ही पैकेजों को हटाने की अनुमति है"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "पैकेजों का प्रकार अज्ञात"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "अज्ञात पैकेज"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "%s पैकेज को हटाने से आपकी प्रणाली नष्ट हो जायेगी"
+msgstr[1] "%s पैकेज को हटाने से आपकी प्रणाली नष्ट हो जायेगी"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "हटाने को कुछ भी नहीं"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "हटाने को कुछ भी नहीं"
+
+#: ../urpme:149
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"अधिनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेजों %d को हटाया जायेगा (%d एमबी)"
+msgstr[1] ""
+"अधिनताओं को सन्तुष्ट करने के लिए, निम्नलिखित पैकेजों %d को हटाया जायेगा (%d एमबी)"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "अज्ञात पैकेज"
+msgstr[1] "अज्ञात पैकेज"
+
+#: ../urpme:161
+#, fuzzy, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "%s पैकेज को हटाया जा रहा है"
+msgstr[1] "%s पैकेज को हटाया जा रहा है"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr "(हाँ/ना:y/N)"
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "हटाने-योग्य साधनों को \"%s\" की भांति लिया जा रहा है"
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "हटाना असफ़ल"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "हटाना असफ़ल"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2002,11 +2014,6 @@ msgstr "  --clean        - कुछ भी करने कि पहिले
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - कैश में से आरपीएमों की सफ़ाई ना करना\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - सिर्फ़ अपडेट माध्यम को अपडेट करें\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2333,7 +2340,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "कुछ भी हो जारी रहा जायें?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr "(हाँ/ना:Y/n)"
@@ -2520,10 +2527,12 @@ msgstr "  --curl         - कर्ल का उपयोग दूर स्�
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - एक अपडेट माध्यम का निर्माण करें\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2531,24 +2540,24 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - कृत्रिम संचिका को खोजने और उपयोग करने के प्रयास\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  --no-probe     - किसी कृत्रिम या हार्डडिस्क सूची संचिका को खोजने का \n"
 "                   प्रयास ना करें\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2557,17 +2566,17 @@ msgstr ""
 "  --distrib      - एक संसाधन माध्यम से सभी मीडीया का स्वतः \n"
 "                   निर्माण करें\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - उपलब्ध माध्यमों को दिखायें\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2577,91 +2586,91 @@ msgstr ""
 "करें, डिफ़ॉल्ट\n"
 "                   %s है\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - काल्पनिक माध्यम का निर्माण करना जो हमेशा अप-टु-डेट रहें,\n"
 "                   सिर्फ़  file:// प्रोटोकॉल की अनूमति है।\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - एम०डी०-५ सम संचिका की जाँच निष्क्रिय ।\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - जोड़े गये माध्यम की सामान्यजन कुँजी को इम्पोर्ट ना करना\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - संरचना में माध्यम को जोड़ना, परन्तु इसे अपडेट ना करना । \n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - शांत विधि\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - शब्दों का वॄथा प्रयोगिक विधि\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "सिर्फ़ महाउपयोगकर्ता को ही माध्यम को जोड़ने की अनुमति है"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "संरचना-संचिका [%s] का निर्माण करेगा"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "संरचना-संचिका [%s] को निर्माण नहीं कर सकता है"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "<हार्डडिस्क सूची का सापेक्ष पथ>  --distrib के साथ देने की कोई आवश्यकता नहीं है"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<हार्डडिस्क सूची का सापेक्ष पथ> लुप्त है\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "\"%s\" माध्यम को पाने में असमर्थ"
@@ -2899,14 +2908,14 @@ msgstr "  -f             - हार्डडिस्क सूची संच
 msgid "Only superuser is allowed to update media"
 msgstr "सिर्फ़ महाउपयोगकर्ता को ही माध्यम को अपडेट करने की अनुमति है"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "अपडेट करने को कुछ भी नहीं (urpmi.addmedia निर्देश का उपयोग एक माध्यम को जोड़ने के लिए "
 "करें)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2915,17 +2924,17 @@ msgstr ""
 "अपडेट की जाने वाली प्रविष्टि लुप्त है\n"
 "(%s में से एक)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "\"%s\" माध्यम की ओर ध्यान नहीं दिया जा रहा है"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "\"%s\" माध्यम को सक्रिय किया जा रहा है"
@@ -3204,6 +3213,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "कोई परिवर्तनलॉग नहीं मिला\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - एक अपडेट माध्यम का निर्माण करें\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "भ्रष्ट इन्पुट:  [%s]"
diff --git a/po/hr.po b/po/hr.po
index 221fd53a..470c279a 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2005-01-04 21:27+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
 "X-Generator: TransDict server\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Pripremam instalaciju"
@@ -26,7 +26,7 @@ msgstr "Pripremam instalaciju"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_U redu"
@@ -76,7 +76,7 @@ msgstr "Instaliraj"
 msgid "_Save"
 msgstr "_Spremi"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Odustani"
@@ -107,8 +107,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
@@ -142,7 +143,7 @@ msgstr ""
 "                   (--no-verify-rpm treba biti isključen, uobičajeno je "
 "uključen).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, fuzzy, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --update       - koristi samo medije za dogradnju.\n"
@@ -192,7 +193,7 @@ msgstr "Molim pričekajte..."
 msgid "Must be root"
 msgstr "Port miša"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -202,42 +203,42 @@ msgstr ""
 "Naki traženi paketi ne mogu biti instalirani:\n"
 "%s"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "Dogradnja"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Izlaz iz instalacije"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Jedan od slijedećih paketa je potreban:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Prekini"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -245,21 +246,21 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Slijedeći paketi će biti uklonjeni"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -267,42 +268,42 @@ msgstr[0] "%d paketa"
 msgstr[1] "%d paketa"
 msgstr[2] "%d paketa"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Pripremam se za instalaciju"
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ne mogu dohvatiti izvorne (source) pakete, prekidam"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Pripremam..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instaliram paket `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Molim umetnite medij pod nazivom \"%s\" u uređaj [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "Instaliram pakete..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "Gotov"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, fuzzy, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -312,28 +313,28 @@ msgstr ""
 "Instalacija neuspješna, neke datoteke nedostaju.\n"
 "Možda ćete poželjeti dograditi vašu urpmi bazu"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Instalacija nije uspjela"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "sve je već instalirano"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Instalirano"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "Uklanjam %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "restartam urpmi"
@@ -415,8 +416,8 @@ msgid "...retrieving done"
 msgstr "...dohvat završen"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...dohvaćanje neuspješno: %s"
@@ -456,52 +457,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr "pogrešna deklaracija proxyja u komandnom retku\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: ne mogu pročitati rpm datoteku \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Nedostaje potpis (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -926,217 +927,217 @@ msgid ""
 "update, --use-distrib or --parallel"
 msgstr ""
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, fuzzy, c-format
 msgid "Search start: %s end: %s"
 msgstr "Traži instalirane fontove"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, fuzzy, c-format
 msgid "skipping package %s"
 msgstr "Instaliram paket %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "Problem prilikom instaliranja paketa %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "medij \"%s\" već postoji"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "uklanjam medij \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "uklanjam medij \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "Ne mogu otvoriti datoteku %s\n"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "ne mogu pristupiti prvom instalacijskom mediju (nije pronađen hdlists)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "dohvaćam hdlists datoteku..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "pokušavam zaobiči postojeći medij \"%s\", izbjegavam"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, fuzzy, c-format
 msgid "selecting multiple media: %s"
 msgstr "pokušavam izabrati višestruki medij: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "uklanjam medij \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, fuzzy, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "Proxy postavke za medij \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, fuzzy, c-format
 msgid "...reconfiguration failed"
 msgstr "Postavke meni-a spremljene"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, fuzzy, c-format
 msgid "reconfiguration done"
 msgstr "Podešavanje poslužitelja"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "medij \"%s\" nije izabran"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "ispitujem synthesis datoteku [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, fuzzy, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiranje neuspješno"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopiranje opisne datoteke od \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...kopiranje završeno"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, fuzzy, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopiranje [%s] neuspješno"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "dohvaćanje hdlist (ili synthesis) izvora neuspješno"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "kopiranje [%s] neuspješno"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "ispitujem hdlist datoteku [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "instaliram %s\n"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "kopiranje opisne datoteke od \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "nepravilno ime rpm datoteke [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "dohvaćam hdlist (ili synthesis) izvor od \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "pronašao sam ispitani hdlist (ili synthesis) kao %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "kopiranje opisne datoteke od \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "ne mogu zapisati list datoteku za \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ne mogu zapisati list datoteku za \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "dodan medij %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1168,7 +1169,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyDd"
@@ -1238,7 +1239,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1322,273 +1323,7 @@ msgstr "montiram %s"
 msgid "unmounting %s"
 msgstr "odmontiravam %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Ne postoji paket pod nazivom %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Slijedeći paketi sadrže %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "sve je već instalirano"
-
-#: ../urpm/select.pm:539
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "sve je već instalirano"
-
-#: ../urpm/select.pm:540
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "sve je već instalirano"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, fuzzy, c-format
-msgid "due to missing %s"
-msgstr "zbog nezadovoljavajućeg %s"
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "sve je već instalirano"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "zbog nezadovoljavajućeg %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "odabirem %s izabiranjem datoteka"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "kako bi se zadržalo %s"
-
-#: ../urpm/select.pm:603
-#, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "kako bi se zadržalo %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "zbog sukoba sa %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Neispravan potpis (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Neispravan ID ključa (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Nedostaje potpis (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "ne mogu zapisati config datoteku [%s]"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "...kopiranje neuspješno"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "...kopiranje neuspješno"
-
-#: ../urpme:41
-#, fuzzy, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmq inačica %s\n"
-"Autorska prava (C) 2000, 2001, 2002 Mandriva.\n"
-"Ovo je slobodan software i može biti redistribuiran pod stavkama GNU GPLa.\n"
-"\n"
-"uporaba:\n"
-
-#: ../urpme:47
-#, fuzzy, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "Prikaži automatski odabrane pakete"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, fuzzy, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr " --test         - potvrdi da instalacija može biti dostignuta točno.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-
-#: ../urpme:52 ../urpmi:141
-#, fuzzy, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --group         -ispisuje oznaku group: grupu."
-
-#: ../urpme:53
-#, fuzzy, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --wget         - koristi wget za dohvaćanje udaljenih datoteka.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --wget         - koristi wget za dohvaćanje udaljenih datoteka.\n"
-
-#: ../urpme:55
-#, fuzzy, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --description   - ispisuje oznaku description: opis."
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, fuzzy, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  -v             - opširan mod.\n"
-
-#: ../urpme:59
-#, fuzzy, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - odabire sve odgovarajuće na komandnoj liniji.\n"
-
-#: ../urpme:72
-#, fuzzy, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Samo je administratoru dozvoljeno da instalira pakete"
-
-#: ../urpme:105
-#, fuzzy, c-format
-msgid "unknown packages"
-msgstr "Izaberite vaše pakete"
-
-#: ../urpme:105
-#, fuzzy, c-format
-msgid "unknown package"
-msgstr "Nepoznata greška"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "uklanjanje paketa %s će pokvariti vaš sustav\n"
-msgstr[1] "uklanjanje paketa %s će pokvariti vaš sustav\n"
-msgstr[2] "uklanjanje paketa %s će pokvariti vaš sustav\n"
-
-#: ../urpme:124
-#, fuzzy, c-format
-msgid "Nothing to remove"
-msgstr "Nema oznake za uklanjanje"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Nema oznake za uklanjanje"
-
-#: ../urpme:147
-#, fuzzy, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] ""
-"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
-msgstr[1] ""
-"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
-msgstr[2] ""
-"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "Nepoznata greška"
-msgstr[1] "Nepoznata greška"
-msgstr[2] "Nepoznata greška"
-
-#: ../urpme:159
-#, fuzzy, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Instaliram paket %s"
-msgstr[1] "Instaliram paket %s"
-msgstr[2] "Instaliram paket %s"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (d/N) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "uzimam prenosivi uređaj kao \"%s\""
-
-#: ../urpme:178
-#, fuzzy, c-format
-msgid "Removal failed"
-msgstr "Prijava nije uspjela"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Prijava nije uspjela"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1604,125 +1339,132 @@ msgstr ""
 "\n"
 "uporaba:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - koristi specifično okružje (tipično izvješće o grešci).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
 #, fuzzy, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --media        - koristi samo medije popisane zarezom.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --wget         - koristi wget za dohvaćanje udaljenih datoteka.\n"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, fuzzy, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --media        - koristi samo medije popisane zarezom.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --synthesis    - koristi datu synthesu umjesto urpmi db.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - koristi datu synthesu umjesto urpmi db.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, fuzzy, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr ""
 "  -P             - nemoj pretraživati u provides kako bi pronašli paket.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - koristi samo medije za dogradnju.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, fuzzy, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  -v             - opširan mod.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, fuzzy, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -c             - očisti keš direktorij zaglavlja.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -c             - očisti keš direktorij zaglavlja.\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, fuzzy, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -c             - očisti keš direktorij zaglavlja.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - binarni AND operator.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - binarni OR operator.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, fuzzy, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  -o             - binarni OR operator.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 "  -o             - binarni OR operator, istinit ukoliko je jedan izraz "
 "istinit.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "Popis podataka za povrat:\n"
 "\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - koristi X sučelje.\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr ""
@@ -1731,168 +1473,438 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --files         - ispisuje oznaku files: sve datoteke (više linija)."
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "Alat za podešavanje Konzole"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 "  --conflicts     - ispisuje oznaku conflicts: sve konflikte (više linija)."
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - ispisuje oznaku description: opis."
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr ""
 "  -p             - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 "  --obsoletes     - ispisuje oznaku obsoletes: sve zastarjele (više linija)."
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --group         -ispisuje oznaku group: grupu."
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr ""
 "  --provides      - ispisuje oznaku provides: sve što pruža (više linija)."
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr ""
 "  --requires      - ispisuje oznaku requires: sve što zahtjeva (više linija)."
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --group         -ispisuje oznaku group: grupu."
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr ""
 "  --obsoletes     - ispisuje oznaku obsoletes: sve zastarjele (više linija)."
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary       - ispisuje oznaku summary: sažeto."
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --help           - ispiši ovaj tekst s pomoći.\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  -v             - opširan mod.\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr ""
 "  -p             - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - ispiši verziju, izdanje i arhitekturu sa imenom.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "koristim posebno okružje na %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Ne postoji paket pod nazivom %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Slijedeći paketi sadrže %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "sve je već instalirano"
+
+#: ../urpm/select.pm:543
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "sve je već instalirano"
+
+#: ../urpm/select.pm:544
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "sve je već instalirano"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, fuzzy, c-format
+msgid "due to missing %s"
+msgstr "zbog nezadovoljavajućeg %s"
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "sve je već instalirano"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "zbog nezadovoljavajućeg %s"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "odabirem %s izabiranjem datoteka"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "kako bi se zadržalo %s"
+
+#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr "kako bi se zadržalo %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "zbog sukoba sa %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Neispravan potpis (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Neispravan ID ključa (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Nedostaje potpis (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "ne mogu zapisati config datoteku [%s]"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "...kopiranje neuspješno"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "...kopiranje neuspješno"
+
+#: ../urpme:41
+#, fuzzy, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmq inačica %s\n"
+"Autorska prava (C) 2000, 2001, 2002 Mandriva.\n"
+"Ovo je slobodan software i može biti redistribuiran pod stavkama GNU GPLa.\n"
+"\n"
+"uporaba:\n"
+
+#: ../urpme:47
+#, fuzzy, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "Prikaži automatski odabrane pakete"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, fuzzy, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr " --test         - potvrdi da instalacija može biti dostignuta točno.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+
+#: ../urpme:52 ../urpmi:141
+#, fuzzy, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --group         -ispisuje oznaku group: grupu."
+
+#: ../urpme:53
+#, fuzzy, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --wget         - koristi wget za dohvaćanje udaljenih datoteka.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - koristi samo medije za dogradnju.\n"
+
+#: ../urpme:56
+#, fuzzy, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --description   - ispisuje oznaku description: opis."
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  -v             - opširan mod.\n"
+
+#: ../urpme:60
+#, fuzzy, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - odabire sve odgovarajuće na komandnoj liniji.\n"
+
+#: ../urpme:73
+#, fuzzy, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Samo je administratoru dozvoljeno da instalira pakete"
+
+#: ../urpme:106
+#, fuzzy, c-format
+msgid "unknown packages"
+msgstr "Izaberite vaše pakete"
+
+#: ../urpme:106
+#, fuzzy, c-format
+msgid "unknown package"
+msgstr "Nepoznata greška"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "uklanjanje paketa %s će pokvariti vaš sustav\n"
+msgstr[1] "uklanjanje paketa %s će pokvariti vaš sustav\n"
+msgstr[2] "uklanjanje paketa %s će pokvariti vaš sustav\n"
+
+#: ../urpme:126
+#, fuzzy, c-format
+msgid "Nothing to remove"
+msgstr "Nema oznake za uklanjanje"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Nema oznake za uklanjanje"
+
+#: ../urpme:149
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
+msgstr[1] ""
+"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
+msgstr[2] ""
+"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "Nepoznata greška"
+msgstr[1] "Nepoznata greška"
+msgstr[2] "Nepoznata greška"
+
+#: ../urpme:161
+#, fuzzy, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Instaliram paket %s"
+msgstr[1] "Instaliram paket %s"
+msgstr[2] "Instaliram paket %s"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (d/N) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "uzimam prenosivi uređaj kao \"%s\""
+
+#: ../urpme:181
+#, fuzzy, c-format
+msgid "Removal failed"
+msgstr "Prijava nije uspjela"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Prijava nije uspjela"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1987,11 +1999,6 @@ msgstr "  --noclean      - zadrži rpm koji nije korišten u međuspremniku.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - zadrži rpm koji nije korišten u međuspremniku.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - koristi samo medije za dogradnju.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2307,7 +2314,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Da ipak nastavim?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (D/n) "
@@ -2490,10 +2497,12 @@ msgstr "  --curl         - koristi curl za dohvaćanje udaljenih datoteka.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - napravi medij za dogradnju.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2501,22 +2510,22 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-hdlist - pokušaj pronaći i upotrijebiti hdlist datoteku.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --probe-hdlist - pokušaj pronaći i upotrijebiti hdlist datoteku.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, fuzzy, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2524,17 +2533,17 @@ msgid ""
 msgstr ""
 "  --distrib      - automatski napravi sve medije iz instalacijskog medija.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all           - ispiši sve oznake."
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2544,91 +2553,91 @@ msgstr ""
 "(mirora),\n"
 "uobičajeno je %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - kreiraj virtualni medij koji je uvijek up-to-date,\n"
 "                   samo je file:// dopušten.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - isključi MD5SUM provjeru datoteka.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - tihi mod.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - opširan mod.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, fuzzy, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "zapisana config datoteka [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, fuzzy, c-format
 msgid "Can't create config file [%s]"
 msgstr "zapisana config datoteka [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "nema potrebe za davanje <relativne putanje do hdlist> sa --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<relativna putanja do hdlist> nedostaje\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "ne mogu pristupiti mediju \"%s\""
@@ -2863,13 +2872,13 @@ msgstr "  -f             - prisili pravljenje hdlist datoteka.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Samo je administratoru dozvoljeno da instalira pakete"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "nema ništa za nadogradnju (koristite urpmi.addmedia za dodavanje medija)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2878,17 +2887,17 @@ msgstr ""
 "nedostaje unos za nadogradnju\n"
 "(jedan od %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Mijenjam medij \"%s\":"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "uklanjam medij \"%s\""
@@ -3162,6 +3171,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Nije pronađena ni jedna slika"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - napravi medij za dogradnju.\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "nepravilan unos: [%s]"
diff --git a/po/hu.po b/po/hu.po
index 9806bee6..399a6825 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-2009.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-07-23 22:49+0100\n"
 "Last-Translator: Lónyai Gergely <aleph@mandriva.org>\n"
 "Language-Team: Hungarian <aleph@mandriva.org>\n"
@@ -24,8 +24,7 @@ msgstr ""
 "X-Poedit-Country: HUNGARY\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../gurpmi:32
-#: ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM-telepítés"
@@ -35,9 +34,7 @@ msgstr "RPM-telepítés"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Hiba: %s nevű fájl nem található - a művelet megszakítva"
 
-#: ../gurpmi:47
-#: ../gurpmi2:166
-#: ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_OK"
@@ -49,7 +46,8 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"You probably didn't want to install it on your computer (installing it would allow you to make modifications to its sourcecode then compile it).\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
 "\n"
 "What would you like to do?"
 msgstr ""
@@ -62,8 +60,7 @@ msgstr ""
 "\n"
 "Mit szeretne tenni?"
 
-#: ../gurpmi:75
-#: ../gurpmi:86
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -103,8 +100,7 @@ msgstr "_Telepítés"
 msgid "_Save"
 msgstr "M_entés"
 
-#: ../gurpmi:101
-#: ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Mégsem"
@@ -114,13 +110,13 @@ msgstr "_Mégsem"
 msgid "Choose location to save file"
 msgstr "Válasszon helyet a fájlnak"
 
-#: ../gurpmi.pm:39
-#: ../urpmi:67
+#: ../gurpmi.pm:39 ../urpmi:67
 #, c-format
 msgid ""
 "urpmi version %s\n"
 "Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -135,44 +131,37 @@ msgstr ""
 msgid "Options:"
 msgstr "Opciók:"
 
-#: ../gurpmi.pm:46
-#: ../urpme:46
-#: ../urpmf:35
-#: ../urpmi:72
-#: ../urpmi.addmedia:54
-#: ../urpmi.recover:33
-#: ../urpmi.removemedia:40
-#: ../urpmi.update:32
-#: ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - jelen segítség megjelenítése\n"
 
-#: ../gurpmi.pm:47
-#: ../urpmi:79
+#: ../gurpmi.pm:47 ../urpmi:79
 #, c-format
-msgid "  --auto         - non-interactive mode, assume default answers to questions.\n"
+msgid ""
+"  --auto         - non-interactive mode, assume default answers to "
+"questions.\n"
 msgstr ""
 "  --auto         - nem-interaktív mód, a kérdésekre az alapértelmezett\n"
 "                   válaszok lesznek feltételezve\n"
 
-#: ../gurpmi.pm:48
-#: ../urpmi:80
-#: ../urpmq:52
+#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - automatikusan kiválasztja a frissíthető csomagokat\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - automatikusan kiválasztja a frissíthető csomagokat\n"
 
-#: ../gurpmi.pm:49
-#: ../urpme:50
-#: ../urpmi:103
-#: ../urpmq:66
+#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - végrehajtás akkor is, ha néhány csomag nem elérhető\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - végrehajtás akkor is, ha néhány csomag nem elérhető\n"
 
-#: ../gurpmi.pm:50
-#: ../urpmi:133
+#: ../gurpmi.pm:50 ../urpmi:133
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -181,45 +170,40 @@ msgstr ""
 "  --verify-rpm   - RPM-aláírás ellenőrzése telepítés előtt (kikapcsolás:\n"
 "                   --no-verify-rpm; alapértelmezés: bekapcsolt állapot)\n"
 
-#: ../gurpmi.pm:52
-#: ../urpmf:41
-#: ../urpmi:73
-#: ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - csak a felsorolt (elválasztás: vessző) adatforrások\n"
 "                   használata\n"
 
-#: ../gurpmi.pm:53
-#: ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:149
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - csomag keresése a szolgáltatásjegyzékben\n"
 
-#: ../gurpmi.pm:54
-#: ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:150
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - a csomag ne legyen keresve a szolgáltatásjegyzékben\n"
+msgstr ""
+"  -P             - a csomag ne legyen keresve a szolgáltatásjegyzékben\n"
 
-#: ../gurpmi.pm:55
-#: ../urpmi:110
-#: ../urpmq:69
+#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - másik gyökér használata az RPM-csomagtelepítéshez\n"
 
-#: ../gurpmi.pm:56
-#: ../urpmi:135
+#: ../gurpmi.pm:56 ../urpmi:135
 #, c-format
-msgid "  --test         - only verify if the installation can be achieved correctly.\n"
+msgid ""
+"  --test         - only verify if the installation can be achieved "
+"correctly.\n"
 msgstr "  --test         - csak ellenőrzés, hogy a telepítés végrehajtható-e\n"
 
-#: ../gurpmi.pm:57
-#: ../urpmi:76
+#: ../gurpmi.pm:57 ../urpmi:76
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - csak a megadott adatforrások használata a kért csomagok\n"
 "                   kereséséhez\n"
@@ -239,7 +223,7 @@ msgstr "Kis türelmet..."
 msgid "Must be root"
 msgstr "Rendszergazdai jogosultság szükséges"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -250,112 +234,108 @@ msgstr ""
 "%s\n"
 "Kívánja folytatni a telepítést?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: ../gurpmi2:126
-#: ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (frissítés)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (telepítés)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Csomagválasztás"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "A következő csomagok valamelyikére szükség van:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Megszakítás"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
 "Continue installation anyway?"
 msgstr ""
-"A következő csomagokat el kell távolítani, hogy más csomagok frissíthetők legyenek:\n"
+"A következő csomagokat el kell távolítani, hogy más csomagok frissíthetők "
+"legyenek:\n"
 "%s\n"
 "Kívánja folytatni a telepítést?"
 
-#: ../gurpmi2:232
-#: ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
 msgstr "A függőségek feloldásához a következő csomag telepítésre kerül:"
 
-#: ../gurpmi2:233
-#: ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
 msgstr "A függőségek feloldásához a következő csomagok telepítésre kerülnek:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d csomag, %d MB)"
 msgstr[1] "(%d csomag, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Csomagtelepítés..."
 
-#: ../gurpmi2:243
-#: ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "a forráscsomagok nem elérhetők, ezért a művelet félbeszakad"
 
-#: ../gurpmi2:257
-#: ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Előkészítés..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "A(z) '%s' (%s/%s) csomag telepítése..."
 
-#: ../gurpmi2:278
-#: ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Kérem helyezze be a(z) \"%s\" nevű adathordozót"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "A(z) '%s' csomag letöltése folyik..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Kész"
 
-#: ../gurpmi2:316
-#: ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -366,33 +346,28 @@ msgstr ""
 "%s\n"
 "Érdemes lehet frissíteni az urpmi adatbázist."
 
-#: ../gurpmi2:322
-#: ../urpm/main_loop.pm:223
-#: ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259
-#: ../urpm/main_loop.pm:282
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "A telepítés nem sikerült:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "A csomag(ok) már telepítve van(nak)"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "A telepítés befejeződött"
 
-#: ../gurpmi2:330
-#: ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "\"%s\" eltávolítása"
 
-#: ../gurpmi2:338
-#: ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "az urpmi újraindítása"
@@ -433,8 +408,7 @@ msgstr "                    alapértelmezés: %s\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "   -f             - az RPM-csomag teljes nevének kiírása (NVRA)\n"
 
-#: ../rurpmi:11
-#: ../urpmi:281
+#: ../rurpmi:11 ../urpmi:281
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Csomagok telepítéséhez rendszergazdai jogosultság szükséges"
@@ -469,19 +443,14 @@ msgstr "érvénytelen csomagfájlnév: \"%s\""
 msgid "retrieving rpm file [%s] ..."
 msgstr "RPM-fájl behozatala: \"%s\"..."
 
-#: ../urpm.pm:280
-#: ../urpm/get_pkgs.pm:226
+#: ../urpm.pm:280 ../urpm/get_pkgs.pm:226
 #, c-format
 msgid "...retrieving done"
 msgstr "...behozatal megtörtént"
 
-#: ../urpm.pm:283
-#: ../urpm/download.pm:734
-#: ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824
-#: ../urpm/media.pm:1274
-#: ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...a behozatal sikertelen: %s"
@@ -516,82 +485,83 @@ msgstr "hiba a helyi csomagok regisztrálásakor"
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Korlátozott mód esetén ez a művelet nem végezhető el"
 
-#: ../urpm/args.pm:145
-#: ../urpm/args.pm:154
+#: ../urpm/args.pm:145 ../urpm/args.pm:154
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "helytelen proxy-megadás a parancssorban\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: egy RPM-fájl nem olvasható: \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr "váratlan kifejezés: %s"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, c-format
 msgid "missing expression before %s"
 msgstr "a %s előtt hiányzik a kifejezés"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "váratlan kifejezés: %s (javasolt a -a vagy -o használata)"
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr "nincs a kifejezés lezárárva"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
-msgstr "alapértelmezésben az urpmi egy regexpet vár, ezt megerősítheti a \"--literal\" opcióval"
+msgstr ""
+"alapértelmezésben az urpmi egy regexpet vár, ezt megerősítheti a \"--literal"
+"\" opcióval"
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot-könyvtár nem létezik"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "\"%s\" nem használható \"%s\" nélkül"
 
-#: ../urpm/args.pm:486
-#: ../urpm/args.pm:489
-#: ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "\"%s\" nem használható ezzel: \"%s\""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Túl sok argumentum\n"
 
-#: ../urpm/bug_report.pm:48
-#: ../urpmi:258
+#: ../urpm/bug_report.pm:48 ../urpmi:258
 #, c-format
 msgid "Copying failed"
 msgstr "A másolás sikertelen"
 
 #: ../urpm/cdrom.pm:66
 #, c-format
-msgid "You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done automatically)"
-msgstr "Muszáj a CD-ROM-ot kézzel csatlakoztatnia (vagy telepítse a perl-Hal-Cdroms csomagot az automatikus csatlakoztatáshoz)"
+msgid ""
+"You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+"Muszáj a CD-ROM-ot kézzel csatlakoztatnia (vagy telepítse a perl-Hal-Cdroms "
+"csomagot az automatikus csatlakoztatáshoz)"
 
 #: ../urpm/cdrom.pm:68
 #, c-format
 msgid "HAL daemon (hald) is not running or not ready"
 msgstr "A HAL démon (hald) nem fut vagy nem áll készen"
 
-#: ../urpm/cdrom.pm:161
-#: ../urpm/cdrom.pm:166
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
 #, c-format
 msgid "medium \"%s\" is not available"
 msgstr "a(z) \"%s\" adatforrás nem elérhető"
@@ -616,9 +586,7 @@ msgstr "nem sikerült olvasni a(z) \"%s\" beállítási fájlt"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "\"%s\" adatforrás kétszer van megadva - megszakítás"
 
-#: ../urpm/cfg.pm:251
-#: ../urpm/media.pm:486
-#: ../urpm/media.pm:492
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:486 ../urpm/media.pm:492
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "a beállítások mentése nem sikerült: \"%s\""
@@ -770,8 +738,11 @@ msgstr "[újracsomagolás]"
 
 #: ../urpm/install.pm:175
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "a telepítési műveletek elkezdődtek ide: %s (eltávolítás=%d, telepítés=%d, frissítés=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"a telepítési műveletek elkezdődtek ide: %s (eltávolítás=%d, telepítés=%d, "
+"frissítés=%d)"
 
 #: ../urpm/install.pm:178
 #, c-format
@@ -793,8 +764,7 @@ msgstr "a(z) \"%s\" csomag telepítése sikertelen"
 msgid "removing bad rpm (%s) from %s"
 msgstr "hibás RPM-csomagok (%s) eltávolítása innen: %s"
 
-#: ../urpm/install.pm:218
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:218 ../urpm/install.pm:275
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "%s eltávolítása sikertelen: %s"
@@ -839,8 +809,7 @@ msgstr "Nincs megadva kiszolgáló - hiányzó URI vagy gépnév"
 msgid "No base defined"
 msgstr "Nincs megadva alap"
 
-#: ../urpm/ldap.pm:172
-#: ../urpm/ldap.pm:175
+#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
 #, c-format
 msgid "Cannot connect to ldap uri:"
 msgstr "Nem lehet kapcsolódni az LDAP-URI-hoz:"
@@ -860,17 +829,13 @@ msgstr "leállítás"
 msgid "%s database is locked (another program is already using it)"
 msgstr "a(z) %s adatbázis zárolt (másik program már használja)"
 
-#: ../urpm/main_loop.pm:110
-#: ../urpm/main_loop.pm:120
-#: ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230
-#: ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
+#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "A telepítés nem sikerült"
 
-#: ../urpm/main_loop.pm:112
-#: ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
 #, c-format
 msgid "Try to go on anyway? (y/N) "
 msgstr "Menjen mindenféleképp? (i/N)"
@@ -934,8 +899,7 @@ msgstr "Ha problémát okozhat, akkor is legyen telepítés (--force)? (i/N) "
 msgid "Packages are up to date"
 msgstr "A csomagok naprakészek"
 
-#: ../urpm/main_loop.pm:306
-#: ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "A telepítés elvégezhető"
@@ -958,7 +922,9 @@ msgstr "figyelmeztetés: a(z) %s ellenőrzőösszege nincs benne az MD5SUM fájl
 #: ../urpm/media.pm:204
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "a(z) \"%s\" virtuális adatforrás nem tiszta URL-lel rendelkezik, ezért az adatforrás nem kerül feldolgozásra"
+msgstr ""
+"a(z) \"%s\" virtuális adatforrás nem tiszta URL-lel rendelkezik, ezért az "
+"adatforrás nem kerül feldolgozásra"
 
 #: ../urpm/media.pm:206
 #, c-format
@@ -968,7 +934,8 @@ msgstr "\"%s\" listafájlja nem elérhető; az adatforrás nem kerül feldolgoz�
 #: ../urpm/media.pm:213
 #, c-format
 msgid "unable to access synthesis file of \"%s\", medium ignored"
-msgstr "\"%s\" fejléclistája nem elérhető; az adatforrás nem kerül feldolgozásra"
+msgstr ""
+"\"%s\" fejléclistája nem elérhető; az adatforrás nem kerül feldolgozásra"
 
 #: ../urpm/media.pm:240
 #, c-format
@@ -978,10 +945,10 @@ msgstr "a(z) \"%s\" néven létező adatforrás elkerülése - kihagyás"
 #: ../urpm/media.pm:445
 #, c-format
 msgid "failed to migrate removable device, ignoring media"
-msgstr "Sikertelen az eltávolítható eszköz csatlakoztatása. Az adatforrás kihagyva..."
+msgstr ""
+"Sikertelen az eltávolítható eszköz csatlakoztatása. Az adatforrás kihagyva..."
 
-#: ../urpm/media.pm:488
-#: ../urpm/media.pm:494
+#: ../urpm/media.pm:488 ../urpm/media.pm:494
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "beállítások mentése: \"%s\""
@@ -998,228 +965,232 @@ msgstr "a hozzárendelt adatforrás használata párhuzamos módhoz: %s"
 
 #: ../urpm/media.pm:561
 #, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
-msgstr "a --synthesis nem használható ezekkel: --media, --excludemedia, --sortmedia, --update, --use-distrib, --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"a --synthesis nem használható ezekkel: --media, --excludemedia, --sortmedia, "
+"--update, --use-distrib, --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Keresés kezdete: %s  vége: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "a(z) %s csomag kihagyása"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "csomagfrissítés helyett telepítés szükséges: \"%s\""
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "\"%s\" adatforrás már létezik"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(alapértelmezésben figyelmen kívül hagyva)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "\"%s\" adatforrás hozzáadása a(z) \"%s\" távoli adatforrás előtt"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "\"%s\" adatforrás hozzáadása"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "%s könyvtár nem létezik"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "úgy tűnik, ez a hely nem tartalmaz disztribúciót"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "a media.cfg elemzése nem sikerült"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "a disztribúciós adatforrás nem elérhető (media.cfg fájl nem található)"
 
 # N("skipping non compatible media `%s' (for %s)",
 # 			       $media, $media_arch)
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "\"%s\" nevű nem kompatibilis adatforrás kihagyása (architektúra: %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "media.cfg fájl behozatala..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "kísérlet történt nem létező adatforrás (\"%s\") kiválasztására"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "több adatforrás kijelölése: \"%s\""
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "\"%s\" adatforrás eltávolítása"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "az urpmi beállításainak módosítása a(z) \"%s\" adatforráshoz"
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...a beállítások módosítása sikertelen"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "a beállítások módosítása megtörtént"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
-msgstr "Nem sikerült elkészíteni a névfájlt - nem található a következő függőség: %d"
+msgstr ""
+"Nem sikerült elkészíteni a névfájlt - nem található a következő függőség: %d"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "a(z) \"%s\" adatforrás naprakész"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "kiterjesztett függőséglista vizsgálata: \"%s\""
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
-msgstr "probléma a(z) \"%s\" adatforrás kiterjesztett függőséglistájának olvasásakor"
+msgstr ""
+"probléma a(z) \"%s\" adatforrás kiterjesztett függőséglistájának olvasásakor"
 
-#: ../urpm/media.pm:1163
-#: ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "\"%s\" másolása a(z) \"%s\" adatforrás számára..."
 
-#: ../urpm/media.pm:1165
-#: ../urpm/media.pm:1220
-#: ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...a másolás sikertelen"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "\"%s\" leírásfájljának másolása..."
 
-#: ../urpm/media.pm:1218
-#: ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...másolás megtörtént"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "\"%s\" másolása sikertelen (a fájl túl kicsi)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
-msgstr "a letöltött kiterjesztett függőséglista MD5-ös összegének kiszámítása folyik"
+msgstr ""
+"a letöltött kiterjesztett függőséglista MD5-ös összegének kiszámítása folyik"
 
-#: ../urpm/media.pm:1299
-#: ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "\"%s\" megszerzése sikertelen (az MD5-ös összegek nem egyeznek)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2 hibát jelzett \"%s\"-ben"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "%s és %s összehasonlítása"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "érvénytelen fejléclista-fájl (%s) a(z) \"%s\" adatforráshoz"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "\"%s\" leírásfájljának másolása..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "érvénytelen MD5SUM fájl (letöltve a %s tükörről)"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
-msgstr "\"%s\" forrás-fejléclistájának (illetve kiterjesztett függőséglistájának) behozatala..."
+msgstr ""
+"\"%s\" forrás-fejléclistájának (illetve kiterjesztett függőséglistájának) "
+"behozatala..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
-msgstr "a csomagkezelő fejléclistát (illetve kiterjesztett függőséglistát) talált: %s"
+msgstr ""
+"a csomagkezelő fejléclistát (illetve kiterjesztett függőséglistát) talált: %s"
 
-#: ../urpm/media.pm:1472
-#: ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "a(z) \"%s\" adatforráshoz nem található kiterjesztett függőséglista"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" nyilvánoskulcs-fájljának vizsgálata..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...%s kulcs importálva \"%s\" nyilvánoskulcs-fájljából"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\" nyilvánoskulcs-fájlja nem importálható"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "\"%s\" adatforrás frissítve"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "[%s] megszerzése sikertelen"
@@ -1237,28 +1208,22 @@ msgstr "Nem találok egy tükröt sem a %s tükörlistában."
 #: ../urpm/mirrors.pm:181
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
-msgstr "%s %.2f %.2f földrajzi helyet állapítottam meg a(z) %s időzóna alapján."
+msgstr ""
+"%s %.2f %.2f földrajzi helyet állapítottam meg a(z) %s időzóna alapján."
 
 #: ../urpm/mirrors.pm:226
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "tükörlista beolvasása innen: %s"
 
-#: ../urpm/msg.pm:63
-#: ../urpmi:514
-#: ../urpmi:529
-#: ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64
-#: ../urpme:38
-#: ../urpmi:568
-#: ../urpmi:663
-#: ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "IiyY"
@@ -1323,18 +1288,25 @@ msgstr "MB"
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190
-#: ../urpm/msg.pm:199
+#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
-msgid "The following package is now orphan, use \"urpme --auto-orphans\" to remove it."
-msgid_plural "The following packages are now orphans, use \"urpme --auto-orphans\" to remove them."
-msgstr[0] "A következő csomag elárvult. Használd az \"urpme --auto-orphans\" parancsot az eltávolítására."
-msgstr[1] "A következő csomagok elárvultak. Használd az \"urpme --auto-orphans\" parancsot az eltávolításukra."
+msgid ""
+"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
+"it."
+msgid_plural ""
+"The following packages are now orphans, use \"urpme --auto-orphans\" to "
+"remove them."
+msgstr[0] ""
+"A következő csomag elárvult. Használd az \"urpme --auto-orphans\" parancsot "
+"az eltávolítására."
+msgstr[1] ""
+"A következő csomagok elárvultak. Használd az \"urpme --auto-orphans\" "
+"parancsot az eltávolításukra."
 
 #: ../urpm/parallel.pm:14
 #, c-format
@@ -1388,16 +1360,19 @@ msgstr "cp hiba a %s gépen (%d)"
 
 #: ../urpm/parallel_ssh.pm:86
 #, c-format
-msgid "%s failed on host %s (maybe it does not have a good version of urpmi?) (exit code: %d)"
-msgstr "%s hiba a %s gépen (lehet, hogy az urpmi nem jó verziója található a gépen?)(kilépési kód: %d)"
+msgid ""
+"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
+"code: %d)"
+msgstr ""
+"%s hiba a %s gépen (lehet, hogy az urpmi nem jó verziója található a gépen?)"
+"(kilépési kód: %d)"
 
 #: ../urpm/removable.pm:32
 #, c-format
 msgid "unable to access medium \"%s\"."
 msgstr "a(z) \"%s\" adatforrás nem hozzáférhető"
 
-#: ../urpm/removable.pm:72
-#: ../urpm/removable.pm:90
+#: ../urpm/removable.pm:72 ../urpm/removable.pm:90
 #, c-format
 msgid "mounting %s"
 msgstr "%s csatolása"
@@ -1407,290 +1382,13 @@ msgstr "%s csatolása"
 msgid "unmounting %s"
 msgstr "%s leválasztása"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "az Urpmi újra lett indítva; a prioritásos csomagok listája nem változott"
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "az Urpmi újra lett indítva; a prioritásos csomagok listája változott: %s  -  %s"
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Nincs ilyen nevű csomag: %s"
-
-#: ../urpm/select.pm:193
-#: ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "A következő csomagok tartalmazzák a(z) %s komponenst: %s"
-
-#: ../urpm/select.pm:296
-#, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "%s csomagot talált az urpmi db-ben, de ezek nem telepíthetőek"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "A(z) \"%s\" csomag már telepítve van"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "A(z) \"%s\" csomagok már telepítve vannak"
-
-#: ../urpm/select.pm:558
-#: ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "\"%s\" hiánya miatt"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "mivel \"%s\" már telepítve van"
-
-#: ../urpm/select.pm:560
-#: ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "\"%s\" igényei miatt"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "a legalkalmasabb \"%s\" keresése"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "\"%s\" megtartása érdekében"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "\"%s\" telepítése érdekében"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "ezzel való ütközés miatt: \"%s\""
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Érvénytelen elektronikus aláírás (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Érvénytelen kulcsazonosító (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Hiányzó elektronikus aláírás (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr "rendszer"
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr "A(z) %s újraindítása szükséges a(z) %s számára"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't write file"
-msgstr "A fájl nem írható"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "Nem sikerült megnyitni a fájlt"
-
-#: ../urpm/sys.pm:289
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "%s nem mozgatható ide: %s"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme %s\n"
-"Copyright (C) Mandriva, 1999-2008.\n"
-"Ez a program szabad szoftver; a GNU GPL feltételei szerint terjeszthető.\n"
-"\n"
-"Használat:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - választási lehetőségnél automatikusan választ csomagot\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr "  --auto-orphans - árvák eltávolítása\n"
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - annak ellenőrzése, hogy az eltávolítás végrehajtható-e\n"
-
-#: ../urpme:51
-#: ../urpmi:109
-#: ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - elosztott urpmi több számítógép közt\n"
-
-#: ../urpme:52
-#: ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - a fájlok újracsomagolása törlés előtt\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - másik gyökér használata az RPM-csomageltávolításhoz\n"
-
-#: ../urpme:54
-#: ../urpmf:40
-#: ../urpmi:111
-#: ../urpmi.addmedia:71
-#: ../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   - másik gyökér használata az Urpmi-adatbázishoz és az\n"
-"                   RPM-csomagtelepítéshez\n"
-
-#: ../urpme:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - a csomagok szkriptjei ne legyenek végrehajtva\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - az urpme menet közben való beállítása egy disztribúciós\n"
-"                   fából - például chroot telepítéséhez/eltávolításához\n"
-"                   használható a --root opció esetén\n"
-
-#: ../urpme:58
-#: ../urpmi:152
-#: ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - részletes információ\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - a mintára illeszkedő csomagok kijelölése\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Csomagok eltávolításához rendszergazdai jogosultság szükséges"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "ismeretlen csomagok"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "ismeretlen csomag"
-
-#: ../urpme:119
-#, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "Az alábbi csomag eltávolítása tönkreteheti a rendszert:"
-msgstr[1] "Az alábbi csomagok eltávolítása tönkreteheti a rendszert:"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Nincs mit eltávolítani"
-
-#: ../urpme:141
-#, c-format
-msgid "No orphans to remove"
-msgstr "Nincs árva csomag."
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "A függőségek feloldásához a következő csomag el lesz távolítva"
-msgstr[1] "A függőségek feloldásához a következő %d csomag el lesz távolítva"
-
-#: ../urpme:152
-#, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "(árva csomag)"
-msgstr[1] "(árva csomagok)"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "%d csomag eltávolítása?"
-msgstr[1] "%d csomag eltávolítása?"
-
-#: ../urpme:159
-#: ../urpmi:569
-#: ../urpmi:664
-#: ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (i/N) "
-
-#: ../urpme:164
-#, c-format
-msgid "testing removal of %s"
-msgstr "%s eltávolításának tesztelése"
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Az eltávolítás sikertelen"
-
-#: ../urpme:180
-#, c-format
-msgid "Removal is possible"
-msgstr "Az eltávolítás elvégezhető"
-
-#: ../urpmf:29
+#: ../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"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage: urpmf [options] pattern-expression\n"
 msgstr ""
@@ -1700,307 +1398,584 @@ msgstr ""
 "\n"
 "Használat: urpmf [opciók] mintakifejezés\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - jelen program verziószámának megjelenítése\n"
 
-#: ../urpmf:37
-#: ../urpmi:132
-#: ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - megadott környezet használata (általában hibajelentés\n"
 "                   esetén használatos)\n"
 
-#: ../urpmf:38
-#: ../urpmi:74
-#: ../urpmq:49
+#: ../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 - a felsorolt (elválasztás: vessző) adatforrások\n"
 "                   feldolgozásának mellőzése\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
-"  --literal, -l  - mintaillesztés mellőzése, az argumentum normál szövegként\n"
+"  --literal, -l  - mintaillesztés mellőzése, az argumentum normál "
+"szövegként\n"
 "                   való kezelése\n"
 
-#: ../urpmf:42
-#: ../urpmi:77
-#: ../urpmq:50
+#: ../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   - másik gyökér használata az Urpmi-adatbázishoz és az\n"
+"                   RPM-csomagtelepítéshez\n"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 "  --sortmedia    - az adatforrások sorbarendezése vesszővel elválasztott\n"
 "                   sztringek alapján\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - a megadott útvonal használata az adatforrások eléréséhez\n"
+msgstr ""
+"  --use-distrib  - a megadott útvonal használata az adatforrások eléréséhez\n"
 
-#: ../urpmf:44
-#: ../urpmi:78
-#: ../urpmq:51
+#: ../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    - a megadott kiterjesztett függőséglista használata az\n"
 "                   urpmi-adatbázis helyett\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - az azonos sorok csak egyszer jelenjenek meg\n"
 
-#: ../urpmf:46
-#: ../urpmi:75
-#: ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - csak frissítési adatforrás legyen használva\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - részletes információ\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - a minták feldolgozása nem nagybetűérzékeny\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -I             - a minták feldolgozása nagybetűérzékeny (alapértelmezés)\n"
+msgstr ""
+"  -I             - a minták feldolgozása nagybetűérzékeny (alapértelmezés)\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<szöveg>     - mezőelválasztó módosítása (alapértelmezés: \":\")\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Mintakifejezések:\n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
-"  szöveg         - a szövegek reguláris kifejezésként vannak kezelve, ezt -l\n"
+"  szöveg         - a szövegek reguláris kifejezésként vannak kezelve, ezt -"
+"l\n"
 "                   opcióval lehet felülbírálni\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - Perl kód közvetlen betevése (perl -e)\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - bináris ÉS művelet.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - bináris VAGY művelet.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unáris NEM művelet.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - bal illetve jobb oldali zárójel\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Címkék listája:\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - printf-szerű kiírási formátum megadása\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   példa: '%%name:%%files'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - architektúra\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - a csomagkészítéshez használt gép\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - a csomagkészítés időpontja\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - beállítási fájlok\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - \"ütközés\" címkék\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - csomagleírás\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - disztribúció\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - generáció\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - a csomag fájlneve\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - a csomagban levő fájlok listája\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - csoport\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - licenc\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - csomagnév\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - \"elavulttá tesz\" címkék\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - csomagkészítő\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - \"szolgáltatásjegyzék\" címkék\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - \"követelmények\" címkék\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - telepített méret\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - a forráscsomag neve\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - \"javasol\" címkék\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - összefoglaló\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - URL\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - terjesztő\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - a csomagot tartalmazó adatforrás\n"
 
-#: ../urpmf:85
-#: ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - a névvel együtt a verzió, a kiadásszám és az\n"
 "                   architektúra is jelenjen meg\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr "befejezetlen kifejezés (%s)"
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Helytelen formátum: csak egy darab többértékű címke használható"
 
-#: ../urpmf:248
-#: ../urpmi:265
-#: ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "a következő környezet használata: %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "a(z) \"%s\" adatforráshoz nem elérhető a fejléclista (hdlist)"
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "a \"%s\" adatforrás kiterjesztett függőséglistája nem elérhető"
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "a(z) \"%s\" adatforrás listafájlja nem elérhető"
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+"az Urpmi újra lett indítva; a prioritásos csomagok listája nem változott"
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"az Urpmi újra lett indítva; a prioritásos csomagok listája változott: %s  -  "
+"%s"
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Nincs ilyen nevű csomag: %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "A következő csomagok tartalmazzák a(z) %s komponenst: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "%s csomagot talált az urpmi db-ben, de ezek nem telepíthetőek"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "A(z) \"%s\" csomag már telepítve van"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "A(z) \"%s\" csomagok már telepítve vannak"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "\"%s\" hiánya miatt"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "mivel \"%s\" már telepítve van"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "\"%s\" igényei miatt"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "a legalkalmasabb \"%s\" keresése"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "\"%s\" megtartása érdekében"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "\"%s\" telepítése érdekében"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "ezzel való ütközés miatt: \"%s\""
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Érvénytelen elektronikus aláírás (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Érvénytelen kulcsazonosító (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Hiányzó elektronikus aláírás (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr "rendszer"
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr "A(z) %s újraindítása szükséges a(z) %s számára"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't write file"
+msgstr "A fájl nem írható"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "Nem sikerült megnyitni a fájlt"
+
+#: ../urpm/sys.pm:289
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "%s nem mozgatható ide: %s"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme %s\n"
+"Copyright (C) Mandriva, 1999-2008.\n"
+"Ez a program szabad szoftver; a GNU GPL feltételei szerint terjeszthető.\n"
+"\n"
+"Használat:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - választási lehetőségnél automatikusan választ csomagot\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr "  --auto-orphans - árvák eltávolítása\n"
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+"  --test         - annak ellenőrzése, hogy az eltávolítás végrehajtható-e\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - elosztott urpmi több számítógép közt\n"
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - a fájlok újracsomagolása törlés előtt\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr ""
+"  --root         - másik gyökér használata az RPM-csomageltávolításhoz\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr ""
+"  --justdb       - csak az RPM-adatbázis legyen frissítve, a fájlrendszer "
+"ne\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - a csomagok szkriptjei ne legyenek végrehajtva\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - az urpme menet közben való beállítása egy disztribúciós\n"
+"                   fából - például chroot telepítéséhez/eltávolításához\n"
+"                   használható a --root opció esetén\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - részletes információ\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - a mintára illeszkedő csomagok kijelölése\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Csomagok eltávolításához rendszergazdai jogosultság szükséges"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "ismeretlen csomagok"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "ismeretlen csomag"
+
+#: ../urpme:121
+#, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "Az alábbi csomag eltávolítása tönkreteheti a rendszert:"
+msgstr[1] "Az alábbi csomagok eltávolítása tönkreteheti a rendszert:"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Nincs mit eltávolítani"
+
+#: ../urpme:143
+#, c-format
+msgid "No orphans to remove"
+msgstr "Nincs árva csomag."
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "A függőségek feloldásához a következő csomag el lesz távolítva"
+msgstr[1] "A függőségek feloldásához a következő %d csomag el lesz távolítva"
+
+#: ../urpme:154
+#, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "(árva csomag)"
+msgstr[1] "(árva csomagok)"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "%d csomag eltávolítása?"
+msgstr[1] "%d csomag eltávolítása?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (i/N) "
+
+#: ../urpme:166
+#, c-format
+msgid "testing removal of %s"
+msgstr "%s eltávolításának tesztelése"
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Az eltávolítás sikertelen"
+
+#: ../urpme:183
+#, c-format
+msgid "Removal is possible"
+msgstr "Az eltávolítás elvégezhető"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr "befejezetlen kifejezés (%s)"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
-msgstr "  --auto-update  - adatforrások frissítése, majd a rendszer frissítése\n"
+msgstr ""
+"  --auto-update  - adatforrások frissítése, majd a rendszer frissítése\n"
 
 #: ../urpmi:82
 #, c-format
@@ -2017,17 +1992,21 @@ msgstr "    --force-key    - a GPG-kulcs frissítésének kikényszerítése\n"
 msgid "  --auto-orphans - remove orphans without asking\n"
 msgstr "  --auto-orphans - kérdés nélkül eltávolítja az árva csomagokat\n"
 
-#: ../urpmi:85
-#: ../urpmq:54
+#: ../urpmi:85 ../urpmq:54
 #, c-format
 msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
-msgstr "  --suggests     - ne legyenek automatikusan kijelölve a \"javasolt\" csomagok.\n"
+msgstr ""
+"  --suggests     - ne legyenek automatikusan kijelölve a \"javasolt\" "
+"csomagok.\n"
 
 #: ../urpmi:86
 #, c-format
-msgid "  --no-uninstall - never ask to uninstall a package, abort the installation.\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
-"  --no-uninstall - a program soha ne ajánlja fel csomag eltávolítását, inkább\n"
+"  --no-uninstall - a program soha ne ajánlja fel csomag eltávolítását, "
+"inkább\n"
 "                   szakadjon félbe a telepítés\n"
 
 #: ../urpmi:87
@@ -2035,8 +2014,7 @@ msgstr ""
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - csomagok telepítésének mellőzése (csak letöltés)\n"
 
-#: ../urpmi:88
-#: ../urpmq:56
+#: ../urpmi:88 ../urpmq:56
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -2052,14 +2030,17 @@ msgid ""
 "                   are going to be installed or upgraded,\n"
 "                   default is %d.\n"
 msgstr ""
-"  --split-level  - a műveletek több részre bontása a megadottnál több csomag\n"
+"  --split-level  - a műveletek több részre bontása a megadottnál több "
+"csomag\n"
 "                   telepítése vagy frissítése esetén,\n"
 "                   az alapértelmezés szerinti érték: %d\n"
 
 #: ../urpmi:94
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - csökkentett művelethossz használata, az alapértelmezés: %d\n"
+msgstr ""
+"  --split-length - csökkentett művelethossz használata, az alapértelmezés: %"
+"d\n"
 
 #: ../urpmi:96
 #, c-format
@@ -2074,27 +2055,26 @@ msgstr "  --buildrequires     - csomagkövetelmények telepítése\n"
 #: ../urpmi:98
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - csak a forráscsomag telepítése (a programok mellőzése)\n"
+msgstr ""
+"  --install-src  - csak a forráscsomag telepítése (a programok mellőzése)\n"
 
 #: ../urpmi:99
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "  --clean        - RPM-fájl eltávolítása a gyorstárból a műveletek előtt\n"
+msgstr ""
+"  --clean        - RPM-fájl eltávolítása a gyorstárból a műveletek előtt\n"
 
 #: ../urpmi:100
 #, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - az RPM-fájlok ne törlődjenek a gyorstárból\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       - csak az RPM-adatbázis legyen frissítve, a fájlrendszer ne\n"
-
 #: ../urpmi:102
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
-msgstr "  --replacepkgs  - a már telepített csomagok telepítésének kikényszerítése\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
+msgstr ""
+"  --replacepkgs  - a már telepített csomagok telepítésének kikényszerítése\n"
 
 #: ../urpmi:104
 #, c-format
@@ -2103,7 +2083,8 @@ msgid ""
 "                   dependencies checking.\n"
 msgstr ""
 "  --allow-nodeps - lehetővé teszi a csomagok függőségellenőrzés nélküli\n"
-"                   telepítését (a felhasználótól érkező megerősítést követően)\n"
+"                   telepítését (a felhasználótól érkező megerősítést "
+"követően)\n"
 
 #: ../urpmi:106
 #, c-format
@@ -2111,8 +2092,10 @@ msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr ""
-"  --allow-force  - lehetővé teszi a csomagok függőség- és helyességellenőrzés\n"
-"                   nélküli telepítését (a felhasználótól érkező megerősítést\n"
+"  --allow-force  - lehetővé teszi a csomagok függőség- és "
+"helyességellenőrzés\n"
+"                   nélküli telepítését (a felhasználótól érkező "
+"megerősítést\n"
 "                   követően)\n"
 
 #: ../urpmi:108
@@ -2127,15 +2110,15 @@ msgid ""
 "                   to install a chroot with --root option.\n"
 msgstr ""
 "  --use-distrib  - az urpmi menet közben való beállítása egy disztribúciós\n"
-"                   fából - például chroot telepítéséhez használható a --root\n"
+"                   fából - például chroot telepítéséhez használható a --"
+"root\n"
 "                   opció esetén\n"
 
-#: ../urpmi:114
-#: ../urpmi.addmedia:59
-#: ../urpmi.update:37
+#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:37
 #, c-format
 msgid "  --metalink     - generate and use a local metalink.\n"
-msgstr "  --metalink     - Egy helyi metalink-et legenerál, és azt használja.\n"
+msgstr ""
+"  --metalink     - Egy helyi metalink-et legenerál, és azt használja.\n"
 
 #: ../urpmi:115
 #, c-format
@@ -2171,9 +2154,7 @@ msgstr "  --prozilla-options - további opciók a Prozilla program számára\n"
 msgid "  --aria2-options - additional options to pass to aria2\n"
 msgstr "  --aria2-options - további opciók az aria2 program számára\n"
 
-#: ../urpmi:123
-#: ../urpmi.addmedia:60
-#: ../urpmi.update:38
+#: ../urpmi:123 ../urpmi.addmedia:60 ../urpmi.update:38
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - a letöltési sebesség korlátozása\n"
@@ -2185,24 +2166,20 @@ msgid ""
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 "  --resume       - részlegesen letöltött fájlok átvitelének folytatása\n"
-"                   (a --no-resume kikapcsolja; alapértelmezésben kikapcsolt)\n"
+"                   (a --no-resume kikapcsolja; alapértelmezésben "
+"kikapcsolt)\n"
 
-#: ../urpmi:126
-#: ../urpmi.addmedia:61
-#: ../urpmi.update:39
-#: ../urpmq:76
+#: ../urpmi:126 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
-"  --proxy        - a megadott HTTP proxy használata; a portszám alapértelmezés\n"
+"  --proxy        - a megadott HTTP proxy használata; a portszám "
+"alapértelmezés\n"
 "                   szerint 1080 (formátum: <proxygép[:port]>)\n"
 
-#: ../urpmi:128
-#: ../urpmi.addmedia:63
-#: ../urpmi.update:41
-#: ../urpmq:78
+#: ../urpmi:128 ../urpmi.addmedia:63 ../urpmi.update:41 ../urpmq:78
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2223,7 +2200,8 @@ msgstr ""
 #: ../urpmi:136
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - bizonyos útvonalak (elválasztás: vessző) kihagyása\n"
+msgstr ""
+"  --excludepath  - bizonyos útvonalak (elválasztás: vessző) kihagyása\n"
 
 #: ../urpmi:137
 #, c-format
@@ -2233,13 +2211,15 @@ msgstr "  --excludedocs  - dokumentációs fájlok kihagyása\n"
 #: ../urpmi:138
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
-msgstr "  --ignoresize   - telepítés előtt ne legyen ellenőrizve az üres lemezhely\n"
+msgstr ""
+"  --ignoresize   - telepítés előtt ne legyen ellenőrizve az üres lemezhely\n"
 
 #: ../urpmi:139
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
 msgstr ""
-"  --ignorearch   - az RPM-csomagok telepítésének engedélyezése nem megfelelő\n"
+"  --ignorearch   - az RPM-csomagok telepítésének engedélyezése nem "
+"megfelelő\n"
 "                   architektúra esetén is\n"
 
 #: ../urpmi:140
@@ -2263,7 +2243,8 @@ msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
-"  --more-choices - ha nagyobb mennyiségű csomagot talált a rendszer, akkor az\n"
+"  --more-choices - ha nagyobb mennyiségű csomagot talált a rendszer, akkor "
+"az\n"
 "                   alapértelmezettnél több lehetőséget kínáljon fel\n"
 
 #: ../urpmi:146
@@ -2276,8 +2257,7 @@ msgstr "  --nolock       - ne legyen zárolva az RPM-adatbázis\n"
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - csak az azonos architektúrájú csomagok frissítése\n"
 
-#: ../urpmi:148
-#: ../urpmq:97
+#: ../urpmi:148 ../urpmq:97
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - kijelölés a parancssorban megadott minta szerint\n"
@@ -2295,7 +2275,8 @@ msgstr "  --debug        - nagyon részletes információ.\n"
 #: ../urpmi:154
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  a parancssorban megadott csomagok illetve RPM-fájlok lesznek telepítve\n"
+msgstr ""
+"  a parancssorban megadott csomagok illetve RPM-fájlok lesznek telepítve\n"
 
 #: ../urpmi:182
 #, c-format
@@ -2308,7 +2289,8 @@ msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
-"Hiba: hibajelentés készítéséhez adja meg a szokásos parancssori argumentumokat\n"
+"Hiba: hibajelentés készítéséhez adja meg a szokásos parancssori "
+"argumentumokat\n"
 "a --bug opcióval együtt.\n"
 
 #: ../urpmi:219
@@ -2328,18 +2310,27 @@ msgstr "alapértelmezésben --buildrequires"
 
 #: ../urpmi:232
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "használja a --buildrequires vagy --install-src opciót, alapértelmezés: --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"használja a --buildrequires vagy --install-src opciót, alapértelmezés: --"
+"buildrequires"
 
 #: ../urpmi:252
 #, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
-msgstr "\"%s\" nevű könyvtár már létezik. Használjon más könyvtárt a hibajelentéshez, vagy pedig törölje."
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"\"%s\" nevű könyvtár már létezik. Használjon más könyvtárt a "
+"hibajelentéshez, vagy pedig törölje."
 
 #: ../urpmi:253
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
-msgstr "A következő könyvtárnak a hibajelentés céljából való létrehozása sikertelen: \"%s\""
+msgstr ""
+"A következő könyvtárnak a hibajelentés céljából való létrehozása sikertelen: "
+"\"%s\""
 
 #: ../urpmi:264
 #, c-format
@@ -2386,8 +2377,11 @@ msgstr "%s (telepítés)"
 
 #: ../urpmi:462
 #, c-format
-msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
-msgstr "A(z) \"%s\" függőség feloldásához szükség van a következő csomagok egyikére:"
+msgid ""
+"In order to satisfy the '%s' dependency, one of the following packages is "
+"needed:"
+msgstr ""
+"A(z) \"%s\" függőség feloldásához szükség van a következő csomagok egyikére:"
 
 #: ../urpmi:465
 #, c-format
@@ -2416,8 +2410,7 @@ msgstr ""
 "amelyek régebbiek a telepítetteknél:\n"
 "%s"
 
-#: ../urpmi:515
-#: ../urpmi:530
+#: ../urpmi:515 ../urpmi:530
 #, c-format
 msgid ""
 "\n"
@@ -2426,10 +2419,7 @@ msgstr ""
 "\n"
 "Kívánja folytatni a telepítést?"
 
-#: ../urpmi:516
-#: ../urpmi:531
-#: ../urpmi:628
-#: ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (I/n) "
@@ -2485,7 +2475,8 @@ msgid ""
 "The following package has to be removed for others to be upgraded:\n"
 "%s"
 msgstr ""
-"A következő csomagot el kell távolítani, hogy a szükséges csomagok frissíthetők legyenek:\n"
+"A következő csomagot el kell távolítani, hogy a szükséges csomagok "
+"frissíthetők legyenek:\n"
 "%s"
 
 #: ../urpmi:561
@@ -2494,7 +2485,8 @@ msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s"
 msgstr ""
-"A következő csomagokat el kell távolítani, hogy a szükséges csomagok frissíthetők legyenek:\n"
+"A következő csomagokat el kell távolítani, hogy a szükséges csomagok "
+"frissíthetők legyenek:\n"
 "%s"
 
 #: ../urpmi:563
@@ -2505,10 +2497,12 @@ msgstr "(csak teszt; az eltávolítás nem lesz ténylegesen végrehajtva)"
 #: ../urpmi:583
 #, c-format
 msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
 "%s\n"
 msgstr ""
-"Használja az urpmi-hoz a --buildrequires opciót az alábbi függőségek telepítéséhez:\n"
+"Használja az urpmi-hoz a --buildrequires opciót az alábbi függőségek "
+"telepítéséhez:\n"
 "%s\n"
 
 #: ../urpmi:594
@@ -2588,7 +2582,8 @@ msgstr ""
 "       cdrom://<elérési út>\n"
 "\n"
 "használat: urpmi.addmedia [opciók] --distrib --mirrorlist <url>\n"
-"használat: urpmi.addmedia [opciók] --mirrorlist <url> <név> <relatív elérési út>\n"
+"használat: urpmi.addmedia [opciók] --mirrorlist <url> <név> <relatív elérési "
+"út>\n"
 "\n"
 "például:\n"
 "\n"
@@ -2598,80 +2593,82 @@ msgstr ""
 "\n"
 "az [opciók] pedig a következők lehetnek:\n"
 
-#: ../urpmi.addmedia:55
-#: ../urpmi.update:33
-#: ../urpmq:73
+#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:73
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - a Wget használata távoli fájlok letöltésére\n"
 
-#: ../urpmi.addmedia:56
-#: ../urpmi.update:34
-#: ../urpmq:74
+#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:74
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - a Curl használata távoli fájlok letöltésére\n"
 
-#: ../urpmi.addmedia:57
-#: ../urpmi.update:35
-#: ../urpmq:75
+#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:75
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --prozilla     - a Prozilla használata távoli fájlok letöltésére\n"
 
-#: ../urpmi.addmedia:58
-#: ../urpmi.update:36
+#: ../urpmi.addmedia:58 ../urpmi.update:36
 #, c-format
 msgid "  --aria2        - use aria2 to retrieve distant files.\n"
 msgstr "  --aria2         - az Aria2 használata távoli fájlok letöltésére\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - frissítési adatforrás létrehozása\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
-"                   one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+"                   one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
 msgstr ""
 "  --xml-info     - egyedi irányelv a listafájlok letöltéséhez:\n"
-"                   never, on-demand, update-only, always. Lásd: urpmi.cfg(5)\n"
+"                   never, on-demand, update-only, always. Lásd: urpmi.cfg"
+"(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - kiterjesztett függőséglista felhasználása\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - RPM-fájlok használata (fejléclista helyett)\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - fejléclista keresésének mellőzése\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
-msgstr "  --distrib      - az összes adatforrás létrehozása telepítési adatforrásból\n"
+msgstr ""
+"  --distrib      - az összes adatforrás létrehozása telepítési "
+"adatforrásból\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
-msgstr "  --interactive  - --distrib esetén: megerősítés kérése minden adatforráshoz\n"
+msgstr ""
+"  --interactive  - --distrib esetén: megerősítés kérése minden "
+"adatforráshoz\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
-msgstr "  --all-media    - --distrib esetén: minden listázott adatforrás felvétele\n"
+msgstr ""
+"  --all-media    - --distrib esetén: minden listázott adatforrás felvétele\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2681,77 +2678,77 @@ msgstr ""
 "                   tükörkiszolgáló-listaként; alapértelmezés:\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
-msgstr "  --virtual      - virtuális, mindig naprakész adatforrás létrehozása.\n"
+msgstr ""
+"  --virtual      - virtuális, mindig naprakész adatforrás létrehozása.\n"
 
-#: ../urpmi.addmedia:79
-#: ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - az MD5-ös összeg ellenőrzésének kikapcsolása\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
-msgstr "  --nopubkey     - a felvett adatforrás publikus kulcsa ne legyen importálva\n"
+msgstr ""
+"  --nopubkey     - a felvett adatforrás publikus kulcsa ne legyen "
+"importálva\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
-msgstr "  --raw          - az adatforrás felvétele, de a frissítésének mellőzése\n"
+msgstr ""
+"  --raw          - az adatforrás felvétele, de a frissítésének mellőzése\n"
 
-#: ../urpmi.addmedia:82
-#: ../urpmi.removemedia:43
-#: ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - néma üzemmód\n"
 
-#: ../urpmi.addmedia:83
-#: ../urpmi.removemedia:44
-#: ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - részletes információ\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "Ismert listafájl meghatározás a(z) %s-hez"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "Hiányzik az argumentum: --distrib --mirrorlist <url>"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
-msgstr "helytelen <url> (helyi könyvtár esetén az útvonalnak abszolútnak kell lennie)"
+msgstr ""
+"helytelen <url> (helyi könyvtár esetén az útvonalnak abszolútnak kell lennie)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Adatforrás felvételéhez rendszergazdai jogosultság szükséges"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "\"%s\" beállításfájl létrehozása"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "\"%s\" beállításfájl nem hozható létre"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "<a fejléclista relatív útvonala> --distrib esetén szükségtelen"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
@@ -2760,17 +2757,17 @@ msgstr ""
 "\n"
 "Szeretné felvenni ezt az adatforrást: '%s'?"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<a fejléclista relatív útvonala> hiányzik\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "\"%s\" távoli adatforrással nem használható"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "az adatforrás nem hozzáadható"
@@ -2780,7 +2777,8 @@ msgstr "az adatforrás nem hozzáadható"
 msgid ""
 "urpmi.recover version %s\n"
 "Copyright (C) 2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -2804,7 +2802,8 @@ msgstr ""
 
 #: ../urpmi.recover:37
 #, c-format
-msgid "  --list         - list transactions since provided date/duration argument\n"
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 "  --list         - tranzakciók listázása a megadott dátum/időtartam\n"
 "                   argumentumtól kezdődően\n"
@@ -2812,7 +2811,8 @@ msgstr ""
 #: ../urpmi.recover:38
 #, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
-msgstr "  --list-all     - az RPM-adatbázisban levő tranzakciók listázása (hosszú)\n"
+msgstr ""
+"  --list-all     - az RPM-adatbázisban levő tranzakciók listázása (hosszú)\n"
 
 #: ../urpmi.recover:39
 #, c-format
@@ -2897,8 +2897,7 @@ msgstr "Nem található ez utáni tranzakció: %s\n"
 msgid "You must be superuser to do this"
 msgstr "Ehhez rendszergazdai jogosultság szükséges"
 
-#: ../urpmi.recover:143
-#: ../urpmi.recover:209
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "RPM-makrófájl írása [%s]...\n"
@@ -2945,7 +2944,9 @@ msgstr "Adatforrás eltávolításához rendszergazdai jogosultság szükséges"
 #: ../urpmi.removemedia:72
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "nincs mit eltávolítani (használja az urpmi.addmedia parancsot adatforrás felvételéhez)\n"
+msgstr ""
+"nincs mit eltávolítani (használja az urpmi.addmedia parancsot adatforrás "
+"felvételéhez)\n"
 
 #: ../urpmi.removemedia:78
 #, c-format
@@ -2978,12 +2979,16 @@ msgstr "  --force-key    - a GPG-kulcs frissítésének kikényszerítése\n"
 #: ../urpmi.update:46
 #, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
-msgstr "  --ignore       - ne legyen frissítés; az adatforrások kihagyottnak jelölése\n"
+msgstr ""
+"  --ignore       - ne legyen frissítés; az adatforrások kihagyottnak "
+"jelölése\n"
 
 #: ../urpmi.update:47
 #, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
-msgstr "  --no-ignore    - ne legyen frissítés; az adatforrások bekapcsoltnak jelölése\n"
+msgstr ""
+"  --no-ignore    - ne legyen frissítés; az adatforrások bekapcsoltnak "
+"jelölése\n"
 
 #: ../urpmi.update:49
 #, c-format
@@ -3005,19 +3010,22 @@ msgstr "  -f             - fejléclista frissítésének kikényszerítése\n"
 #: ../urpmi.update:52
 #, c-format
 msgid "  -ff            - really force updating synthesis\n"
-msgstr "  -ff            - fejléclista frissítésének kikényszerítése (mindenképpen)\n"
+msgstr ""
+"  -ff            - fejléclista frissítésének kikényszerítése (mindenképpen)\n"
 
 #: ../urpmi.update:69
 #, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Adatforrás frissítéséhez rendszergazdai jogosultság szükséges"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "nincs mit frissíteni (használja az urpmi.addmedia parancsot adatforrás felvételéhez)\n"
+msgstr ""
+"nincs mit frissíteni (használja az urpmi.addmedia parancsot adatforrás "
+"felvételéhez)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -3026,17 +3034,17 @@ msgstr ""
 "a frissítendő bejegyzés hiányzik\n"
 "(valamelyik ezek közül: %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "\"%s\" adatforrás kihagyása"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "\"%s\" adatforrás bekapcsolása"
@@ -3046,7 +3054,8 @@ msgstr "\"%s\" adatforrás bekapcsolása"
 msgid ""
 "urpmq version %s\n"
 "Copyright (C) 2000-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -3058,7 +3067,9 @@ msgstr ""
 
 #: ../urpmq:48
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested (or updated) packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested (or updated) "
+"packages.\n"
 msgstr ""
 "  --searchmedia  - csak a megadott adatforrások használata a kért (vagy\n"
 "                   frissített) csomagok kereséséhez\n"
@@ -3091,7 +3102,8 @@ msgstr "  --list-url     - elérhető adatforrások és URL-jeik listázása\n"
 #: ../urpmq:61
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - az elérhető gépek listázása --parallel használata esetén\n"
+msgstr ""
+"  --list-nodes   - az elérhető gépek listázása --parallel használata esetén\n"
 
 #: ../urpmq:62
 #, c-format
@@ -3100,17 +3112,22 @@ msgstr "  --list-aliases - az elérhető párhuzamos aliasok listázása\n"
 
 #: ../urpmq:63
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr "  --dump-config  - beállítások kiírása urpmi.addmedia-argumentumok formájában\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - beállítások kiírása urpmi.addmedia-argumentumok "
+"formájában\n"
 
 #: ../urpmq:64
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - a következő csomag egy forráscsomag (-s opcióval azonos)\n"
+msgstr ""
+"  --src          - a következő csomag egy forráscsomag (-s opcióval azonos)\n"
 
 #: ../urpmq:65
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - a csomagok elérési útjának listázása letöltés előtt\n"
 "                   (rendszergazdai jogosultság szükséges)\n"
@@ -3119,7 +3136,8 @@ msgstr ""
 #, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
 msgstr ""
-"  --ignorearch   - a nem megfelelő architektúrájú RPM-csomagok lekérdezésének\n"
+"  --ignorearch   - a nem megfelelő architektúrájú RPM-csomagok "
+"lekérdezésének\n"
 "                   engedélyezése\n"
 
 #: ../urpmq:71
@@ -3192,7 +3210,8 @@ msgid ""
 "                   - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  --whatrequires-recursive\n"
-"                   - kiterjesztett fordított keresés (virtuális csomagokban is)\n"
+"                   - kiterjesztett fordított keresés (virtuális csomagokban "
+"is)\n"
 
 #: ../urpmq:95
 #, c-format
@@ -3206,7 +3225,8 @@ msgstr ""
 #: ../urpmq:98
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - teljes információ, az eltávolítandó csomaggal együtt\n"
+msgstr ""
+"  -c             - teljes információ, az eltávolítandó csomaggal együtt\n"
 
 #: ../urpmq:100
 #, c-format
@@ -3216,7 +3236,8 @@ msgstr "  -g             - a névvel együtt a csoportok is jelenjenek meg\n"
 #: ../urpmq:101
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - hasznos információk kiírása könnyen olvasható formában\n"
+msgstr ""
+"  -i             - hasznos információk kiírása könnyen olvasható formában\n"
 
 #: ../urpmq:102
 #, c-format
@@ -3231,32 +3252,41 @@ msgstr "  -m             - egyenértékű a -du opcióval\n"
 #: ../urpmq:104
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - a névvel együtt a verzió és a kiadásszám is jelenjen meg\n"
+msgstr ""
+"  -r             - a névvel együtt a verzió és a kiadásszám is jelenjen meg\n"
 
 #: ../urpmq:105
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - a következő csomag egy forráscsomag (--src opcióval azonos)\n"
+msgstr ""
+"  -s             - a következő csomag egy forráscsomag (--src opcióval "
+"azonos)\n"
 
 #: ../urpmq:106
 #, c-format
-msgid "  -u             - remove package if a more recent version is already installed.\n"
-msgstr "  -u             - csomag kihagyása, ha már van újabb verzió telepítve\n"
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+"  -u             - csomag kihagyása, ha már van újabb verzió telepítve\n"
 
 #: ../urpmq:107
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - fuzzy keresés használata (--fuzzy opcióval azonos)\n"
+msgstr ""
+"  -y             - fuzzy keresés használata (--fuzzy opcióval azonos)\n"
 
 #: ../urpmq:108
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
-msgstr "  -Y             - mint -y, de a kis- és nagybetűket nem különbözteti meg\n"
+msgstr ""
+"  -Y             - mint -y, de a kis- és nagybetűket nem különbözteti meg\n"
 
 #: ../urpmq:109
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  a parancssorban megadott csomagok illetve RPM-fájlok lesznek lekérdezve\n"
+msgstr ""
+"  a parancssorban megadott csomagok illetve RPM-fájlok lesznek lekérdezve\n"
 
 #: ../urpmq:156
 #, c-format
@@ -3276,42 +3306,61 @@ msgstr "használja a -l opciót a fájllistához"
 #: ../urpmq:404
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "nincs listafájlja a(z) \"%s\" adatforrásnak, ezért csak részleges eredmény van a(z) \"%s\" csomaghoz"
+msgstr ""
+"nincs listafájlja a(z) \"%s\" adatforrásnak, ezért csak részleges eredmény "
+"van a(z) \"%s\" csomaghoz"
 
 #: ../urpmq:405
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for packages %s"
-msgstr "nincs listafájlja a(z) \"%s\" adatforrásnak, ezért csak részleges eredmény van a(z) \"%s\" csomagokhoz"
+msgstr ""
+"nincs listafájlja a(z) \"%s\" adatforrásnak, ezért csak részleges eredmény "
+"van a(z) \"%s\" csomagokhoz"
 
 #: ../urpmq:408
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "nincs listafájlja a(z) \"%s\" adatforrásnak, ezért nincs eredmény a(z) \"%s\" csomaghoz"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"nincs listafájlja a(z) \"%s\" adatforrásnak, ezért nincs eredmény a(z) \"%s"
+"\" csomaghoz"
 
 #: ../urpmq:409
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "nincs listafájlja a(z) \"%s\" adatforrásnak, ezért nincs eredmény a(z) \"%s\" csomagokhoz"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"nincs listafájlja a(z) \"%s\" adatforrásnak, ezért nincs eredmény a(z) \"%s"
+"\" csomagokhoz"
 
 #: ../urpmq:473
 #, c-format
 msgid "No changelog found\n"
 msgstr "Változási lista nem található\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - frissítési adatforrás létrehozása\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "helytelen URL: [%s]"
+
 #~ msgid "sorry, you can't use --install-src to install remote .src.rpm files"
 #~ msgstr "távoli .src.rpm-fájlok nem telepíthetők a --install-src opcióval"
+
 #~ msgid "Error"
 #~ msgstr "Hiba"
+
 #~ msgid "%d installation transaction failed"
 #~ msgid_plural "%d installation transactions failed"
 #~ msgstr[0] "%d telepítési művelet nem sikerült"
 #~ msgstr[1] "%d telepítési művelet nem sikerült"
+
 #~ msgid "Package %s can not be installed"
 #~ msgstr "A(z) \"%s\" csomag nem telepíthető"
+
 #~ msgid "Checking to remove the following packages"
 #~ msgstr "Ellenőrzés a következő csomagok eltávolításához"
+
 #~ msgid "%s database locked"
 #~ msgstr "a(z) \"%s\" adatbázis zárolt"
 
@@ -3322,19 +3371,26 @@ msgstr "Változási lista nem található\n"
 #~ msgstr ""
 #~ "  --auto         - nem-interaktív mód, a kérdésekre az alapértelmezett\n"
 #~ "                   válaszok lesznek feltételezve\n"
+
 #~ msgid "Unknown option %s"
 #~ msgstr "Ismeretlen opció: \"%s\""
+
 #~ msgid "too many mount points for removable medium \"%s\""
 #~ msgstr "túl sok csatolási pont ehhez a cserélhető adatforráshoz: \"%s\""
+
 #~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
 #~ msgstr ""
 #~ "A(z) \"%s\" adatforrás egy ISO-képmás - menet közben csatolásra kerül"
+
 #~ msgid "using different removable device [%s] for \"%s\""
 #~ msgstr "eltérő cserélhető eszköz (\"%s\") használata ehhez: \"%s\""
+
 #~ msgid "unable to retrieve pathname for removable medium \"%s\""
 #~ msgstr "a következő cserélhető adatforrás útvonala nem elérhető: \"%s\""
+
 #~ msgid "unable to mount the distribution medium"
 #~ msgstr "nem sikerült csatolni a disztribúciós adatforrást"
+
 #~ msgid ""
 #~ "unable to access medium \"%s\",\n"
 #~ "this could happen if you mounted manually the directory when creating the "
@@ -3343,13 +3399,17 @@ msgstr "Változási lista nem található\n"
 #~ "A(z) \"%s\" adatforrás nem elérhető.\n"
 #~ "Lehetséges, hogy az adatforrás létrehozásakor kézzel lett csatolva a "
 #~ "megfelelő könyvtár."
+
 #~ msgid "inconsistent medium \"%s\" marked removable but not really"
 #~ msgstr ""
 #~ "a(z) \"%s\" hibás adatforrás cserélhetőnek van jelölve, pedig nem az"
+
 #~ msgid "  -c             - clean headers cache directory.\n"
 #~ msgstr "  -c             - a fejlécgyorstár könyvtárának kiürítése\n"
+
 #~ msgid "virtual medium needs to be local"
 #~ msgstr "minden virtuális adatforrásnak helyinek kell lennie"
+
 #~ msgid "Error generating names file: Can't write to file (%s)"
 #~ msgstr ""
 #~ "Nem sikerült elkészíteni a névfájlt - nem sikerült írni a fájlba (%s)"
@@ -3357,95 +3417,124 @@ msgstr "Változási lista nem található\n"
 #, fuzzy
 #~ msgid "unable to parse synthesis file of \"%s\""
 #~ msgstr "fejléclista nem elemezhető: \"%s\""
+
 #~ msgid "found %d rpm headers in cache, removing %d obsolete headers"
 #~ msgstr ""
 #~ "a gyorstárban %d RPM-fejléc található, %d elavult fejléc eltávolítása"
+
 #~ msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
 #~ msgstr ""
 #~ "a meglevő forrás-fejléclista (vagy kiterjesztett függőséglista) MD5-ös "
 #~ "összegének kiszámítása - %s"
+
 #~ msgid ""
 #~ "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 #~ "ignored"
 #~ msgstr ""
 #~ "a virtuális \"%s\" adatforráshoz nem tartozhat definiált fejléclista vagy "
 #~ "listafájl, ezért az adatforrás nem lesz feldolgozva"
+
 #~ msgid "invalid hdlist name"
 #~ msgstr "érvénytelen fejléclista-név"
+
 #~ msgid "unable to find list file for \"%s\", medium ignored"
 #~ msgstr ""
 #~ "\"%s\" listafájlja nem található; az adatforrás nem kerül feldolgozásra"
+
 #~ msgid "\"synthesis\" should not be set (medium \"%s\")"
 #~ msgstr ""
 #~ "a \"kiterjesztett függőséglista\" opció itt nem állítható be (adatforrás: "
 #~ "\"%s\")"
+
 #~ msgid "\"synthesis\" should be set (medium \"%s\")"
 #~ msgstr ""
 #~ "a \"kiterjesztett függőséglista\" opció itt beállítandó (adatforrás: \"%s"
 #~ "\")"
+
 #~ msgid "unable to access list file of \"%s\""
 #~ msgstr "\"%s\" listafájlja nem elérhető"
+
 #~ msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 #~ msgstr ""
 #~ "a(z) \"%s\" adatforrás egy használatban levő fejléclistát próbált "
 #~ "használni; az adatforrás nem kerül feldolgozásra"
+
 #~ msgid "medium \"%s\" trying to use an already used list, medium ignored"
 #~ msgstr ""
 #~ "a(z) \"%s\" adatforrás egy használatban levő listát próbált használni; az "
 #~ "adatforrás nem kerül feldolgozásra"
+
 #~ msgid "wrote %s"
 #~ msgstr "\"%s\" elkészítve"
+
 #~ msgid ""
 #~ "Note: no hdlist for medium \"%s\", unable to return any result for it"
 #~ msgstr ""
 #~ "Megjegyzés: nincs fejléclista a(z) \"%s\" adatforráshoz, ezért azt nem "
 #~ "lehet feldolgozni"
+
 #~ msgid "performing second pass to compute dependencies\n"
 #~ msgstr "függőségek meghatározása - második lépés\n"
+
 #~ msgid "building hdlist [%s]"
 #~ msgstr "fejléclista készítése: \"%s\""
+
 #~ msgid ""
 #~ "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
 #~ "corrupted."
 #~ msgstr ""
 #~ "A(z) \"%s\" adatforráshoz nem készíthető kiterjesztett függőséglista. "
 #~ "Lehetséges, hogy a fejléclista sérült."
+
 #~ msgid "problem reading hdlist or synthesis file of medium \"%s\""
 #~ msgstr ""
 #~ "hiba történt a(z) \"%s\" adatforrás fejléclistájának vagy kiterjesztett "
 #~ "függőséglistájának olvasásakor"
+
 #~ msgid "computing md5sum of copied source hdlist (or synthesis)"
 #~ msgstr ""
 #~ "a lemásolt forrás-fejléclista (vagy kiterjesztett függőséglista) MD5-ös "
 #~ "ellenőrzőösszegének kiszámítása"
+
 #~ msgid "...retrieving failed: md5sum mismatch"
 #~ msgstr "...a behozatal sikertelen: hibás MD5-ös ellenőrzőösszeg"
+
 #~ msgid "no rpm files found from [%s]"
 #~ msgstr "csomagfájlok (RPM) nem találhatók: \"%s\""
+
 #~ msgid "unable to read rpm files from [%s]: %s"
 #~ msgstr "csomagfájlok (RPM) nem olvashatók innen: \"%s\" - %s"
+
 #~ msgid "no rpms read"
 #~ msgstr "csomagfájlok (RPM) nem lettek beolvasva"
+
 #~ msgid "reading headers from medium \"%s\""
 #~ msgstr "\"%s\" adatforrás fejléceinek olvasása"
+
 #~ msgid "    --probe-synthesis - use synthesis file.\n"
 #~ msgstr "    --probe-synthesis - kiterjesztett függőséglista felhasználása\n"
+
 #~ msgid "    --probe-hdlist - use hdlist file.\n"
 #~ msgstr "    --probe-hdlist - fejléclista felhasználása\n"
+
 #~ msgid ""
 #~ "Note: since no media searched uses hdlists, urpmf was unable to return "
 #~ "any result\n"
 #~ msgstr ""
 #~ "Megjegyzés: a feldolgozott adatforrások egyike sem használ fejléclistát, "
 #~ "ezért az urpmf nem tudott eredményt adni\n"
+
 #~ msgid "You may want to use --name to search for package names.\n"
 #~ msgstr "Csomagnevek keresésére használható a --name opció.\n"
+
 #~ msgid "  --src, -s      - next package is a source package.\n"
 #~ msgstr "  --src, -s      - a következő csomag egy forráscsomag\n"
+
 #~ msgid "  --probe-hdlist - use hdlist file.\n"
 #~ msgstr "  --probe-hdlist - fejléclista felhasználása\n"
+
 #~ msgid "unable to update medium \"%s\"\n"
 #~ msgstr "a(z) \"%s\" adatforrás frissítése nem sikerült\n"
+
 #~ msgid "unable to create medium \"%s\"\n"
 #~ msgstr "a(z) \"%s\" adatforrás létrehozása nem sikerült\n"
-
diff --git a/po/id.po b/po/id.po
index e7c7eb14..42392e77 100644
--- a/po/id.po
+++ b/po/id.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2007-03-22 08:14+0700\n"
 "Last-Translator: Willy Sudiarto Raharjo <willysr@gmail.com>\n"
 "Language-Team: Indonesia <mdk-id@yahoogroups.com>\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Instalasi RPM"
@@ -34,7 +34,7 @@ msgstr "Instalasi RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Kesalahan: tidak dapat mencari file %s, membatalkan operasi"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -99,7 +99,7 @@ msgstr "Install"
 msgid "_Save"
 msgstr "_Simpan"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Batal"
@@ -131,8 +131,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - cetak pesan bantuan ini.\n"
@@ -167,7 +168,7 @@ msgstr ""
 "  --verify-rpm   - verifikasi tandatangan rpm sebelum installasi\n"
 "                   (--no-verify-rpm menonaktifkannya, defaultnya aktif).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -221,7 +222,7 @@ msgstr "Silahkan menunggu..."
 msgid "Must be root"
 msgstr "Harus sebagai root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -232,42 +233,42 @@ msgstr ""
 "%s\n"
 "Lanjutkan installasi?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Peringatan"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr "(untuk upgrade)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr "(untuk menginstal)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Pilihan paket"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Salah satu paket berikut dibutuhkan:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Batal"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -278,61 +279,61 @@ msgstr ""
 "%s\n"
 "Lanjutkan installasi?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Untuk memenuhi ketergantungan, paket berikut akan diinstall:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Untuk memenuhi ketergantungan, paket-paket berikut juga akan diinstal:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d paket, %d MB)"
 msgstr[1] "(%d paket, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Instalasi paket..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "tidak dapat mengambil paket sumber, dibatalkan"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Persiapan..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Menginstall paket `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Harap masukkan media bernama \"%s\" ke perangkat [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Mendownload paket `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Selesai"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -343,28 +344,28 @@ msgstr ""
 "%s\n"
 "Anda mungkin perlu meng-update database urpmi Anda"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Instalasi gagal:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Semua paket telah terinstal"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Instalasi selesai"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "menghapus %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "jalankan ulang urpmi"
@@ -444,8 +445,8 @@ msgid "...retrieving done"
 msgstr "...pengambilan selesai"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...pengambilan gagal: %s"
@@ -485,52 +486,52 @@ msgstr "Operasi ini dilarang ketika berjalan dalam mode terbatas"
 msgid "bad proxy declaration on command line\n"
 msgstr "deklarasi proxy buruk pada pada perintah baris\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: tidak dapat membaca file rpm \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "Pola ekspresi:\n"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Tanda tangan hilang (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "Pola ekspresi:\n"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Direktori chroot tidak ada"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Tidak bisa menggunakan %s tanpa %s"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Tidak bisa menggunakan %s dengan %s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Terlalu banyak argumen\n"
@@ -956,220 +957,220 @@ msgstr ""
 "--synthesis tidak dapat dipakai dengan --media, --excludemedia, --sortmedia, "
 "--update, --use-distrib atau --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Pencarian dimulai: %s akhir: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "lewatkan paket %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "paket %s akan diinstal, bukan diupgrade"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "media \"%s\" telah ada"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(diabaikan secara default)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "menambahkan media \"%s\" sebelum media remote \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "menambahkan media \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, fuzzy, c-format
 msgid "directory %s does not exist"
 msgstr "Direktori lingkungan %s tidak ada"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "lokasi ini tampaknya tidak mengandung sembarang distribusi"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "tidak dapat mengolah media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "tidak dapat mengakses media distribusi (tidak ada file media.cfg yang "
 "ditemukan)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "menerima file media.cfg..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "mencoba memilih media tak eksis \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "memilih banyak media: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "menghapus media \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "konfigurasi ulang urpmi untuk media \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...konfigurasi ulang gagal"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "konfigurasi ulang selesai"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 "Kesalahan dalam menghasilkan nama file : ketergantungan  %d tidak ditemukan"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "media \"%s\" sudah terbaru"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "memeriksa file sintesa [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "masalah membaca file sintesa hdlist untuk media \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "menyalin [%s] untuk media \"%s\"..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...penyalinan gagal"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "file deskripsi \"%s\" sedang disalin"
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...penyalinan selesai"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "penyalinan [%s] gagal (file dicurigai terlalu kecil)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "menghitung md5sum hdlist source (atau sintesa) yang diambil"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "penyalinan [%s] gagal (md5sum tidak cocok)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "memeriksa file hdlist [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "membersihkan %s dan %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "file hdlist %s untuk media \"%s\" tidak valid"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "file deskripsi \"%s\" sedang disalin"
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "nama file rpm [%s] tak valid"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "mengambil hdlist source (atau sintesa) \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "menemukan hdlist (atau sintesa) sebagai %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "file hdlist utk media \"%s\" tak ditemukan"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "memeriksa file pubkey dari \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...kunci %s terimport dari file pubkey \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "gagal mengimpor file pubkey dari \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "media \"%s\" sudah diupdate"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1201,7 +1202,7 @@ msgstr "TtNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yy"
@@ -1271,7 +1272,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1353,270 +1354,7 @@ msgstr "me-mount %s"
 msgid "unmounting %s"
 msgstr "melepas mount %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Tidak ada paket bernama %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Paket berikut berisi %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Paket-paket %s tidak bisa diinstall"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Paket %s telah terinstall"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Paket-paket %s telah terinstal"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "karena %s hilang"
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "Paket %s telah terinstall"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "karena %s tidak terpenuhi"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "mencoba mempromosikan %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "untuk menjaga %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "untuk menginstall %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "karena konflik dengan %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Tanda tangan tidak valid (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Kunci ID tidak valid (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Tanda tangan hilang (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "gagal menulis ke file konfigurasi [%s]"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "Penyalinan gagal"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "Tidak bisa menggunakan %s dengan %s"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme versi %s\n"
-"Hak cipta (C) 1999-2008 Mandriva.\n"
-"Ini adalah software bebas dan boleh didistribusikan ulang di bawah syarat "
-"GPL GNU.\n"
-"\n"
-"pemakaian:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - seleksi otomatis paket pilihan.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr ""
-"  --test         - pastikan apakah penghapusan bisa dilakukan dengan benar.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi tersebar di antara mesin-mesin alias.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage     - Paket ulang file sebelum menghapus\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - gunakan root lain untuk penghapusan rpm.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../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   - gunakan root lain untuk installasi db urpmi & rpm.\n"
-
-#: ../urpme:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts   - tidak menjalankan script paket.\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-" --use-distrib   - konfigurasikan urpme secara langsung dari pohon distrib, "
-"berguna\n"
-"                   untuk meng(un)install chroot dengan opsi --root.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - mode verbose.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - pilih semua paket yang cocok dengan ekspresi.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Hanya superuser yang diperbolehkan menghapus paket"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "paket tidak dikenal"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "paket tidak dikenal"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "menghapus paket %s akan merusak sistem Anda"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Tidak ada yang dihapus"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Tidak ada yang dihapus"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "Untuk memenuhi ketergantungan, paket berikut akan dihapus"
-msgstr[1] "Untuk memenuhi ketergantungan, paket-paket %d berikut akan dihapus"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "paket tidak dikenal"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Hapus %d paket?"
-msgstr[1] "Hapus %d paket?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (y/T) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "menganggap divais removable sebagai \"%s\""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Penghapusan gagal"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Penghapusan gagal"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1633,25 +1371,25 @@ msgstr ""
 "\n"
 "pemakaian:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version         - cetak nomor versi perkakas ini.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - gunakan lingkungan khusus (umumnya laporan kecacatan).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - jangan pakai media yang diberikan, dipisahkan dengan "
 "koma.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
@@ -1659,7 +1397,15 @@ msgstr ""
 "  --literal, -l  - jangan melakukan pencocokan pola, gunakan argumen  "
 "sebagai string literal.\n"
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../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   - gunakan root lain untuk installasi db urpmi & 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"
@@ -1667,260 +1413,526 @@ msgstr ""
 "  --sortmedia    - urutkan media menurut substring yang dipisahkan dengan "
 "koma.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --synthesis    - gunakan sintesa yang diberikan, bukan db urpmi.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - gunakan sintesa yang diberikan, bukan db urpmi.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - jangan cetak baris identik dua kali.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - hanya pakai media update.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - mode verbose.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - abaikan perbedaan huruf besar/kecil dalam setiap pola.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -I             - menerima perbedaan huruf besar/kecil pada pola "
 "(default).\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - ganti field pemisah (default menjadi ':').\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Pola ekspresi:\n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  teks           - sembarang teks diparsing sebagai regexp, kecuali -l "
 "digunakan.\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 "  -e             - sertakan kode perl secara langsung sebagai perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - operator AND biner.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - operator OR biner.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unary NOT.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )              - tanda kurung kiri dan kanan.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Daftar tag:\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr ""
 "  --qf            - tentukan sebuah format output yang menyerupai printf\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   contoh: '%%name:%%file'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch          - arsitektur\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - buat host\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - buat waktu\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - file konfigurasi\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - tag konflik tag\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - penjelasan paket\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - distribusi\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch          - epoch\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename          - nama file paket\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files             - daftar file yang terdapat pada paket\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group         - grup\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --name          - nama paket\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name          - nama paket\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - tag kadaluarsa\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - pemaket\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - tag yang disediakan\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - tag kebutuhan\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size          - ukuran yang terinstall\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - nama rpm sumber\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --obsoletes    - tag kadaluarsa\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary     - ringkasan\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor      - vendor\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - media dimana paket ditemukan\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - cetak versi, rilis dan arch dengan nama.\n"
 
-#: ../urpmf:153
-#, fuzzy, c-format
-msgid "unterminated expression (%s)"
-msgstr "Pola ekspresi:\n"
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 "Format tidak benar: Anda hanya boleh menggunakan satu tag yang bernilai "
 "banyak"
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "mengunakan lingkungan spesifik pada %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "file hdlist utk media \"%s\" tak ditemukan"
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "membangun file sintesa hdlist untuk media \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "menulis ke file list untuk media \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Tidak ada paket bernama %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Paket berikut berisi %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Paket-paket %s tidak bisa diinstall"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Paket %s telah terinstall"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Paket-paket %s telah terinstal"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "karena %s hilang"
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Paket %s telah terinstall"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "karena %s tidak terpenuhi"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "mencoba mempromosikan %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "untuk menjaga %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "untuk menginstall %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "karena konflik dengan %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Tanda tangan tidak valid (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Kunci ID tidak valid (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Tanda tangan hilang (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "gagal menulis ke file konfigurasi [%s]"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Penyalinan gagal"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "Tidak bisa menggunakan %s dengan %s"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme versi %s\n"
+"Hak cipta (C) 1999-2008 Mandriva.\n"
+"Ini adalah software bebas dan boleh didistribusikan ulang di bawah syarat "
+"GPL GNU.\n"
+"\n"
+"pemakaian:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - seleksi otomatis paket pilihan.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+"  --test         - pastikan apakah penghapusan bisa dilakukan dengan benar.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi tersebar di antara mesin-mesin alias.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage     - Paket ulang file sebelum menghapus\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - gunakan root lain untuk penghapusan rpm.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - update hanya media update.\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts   - tidak menjalankan script paket.\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+" --use-distrib   - konfigurasikan urpme secara langsung dari pohon distrib, "
+"berguna\n"
+"                   untuk meng(un)install chroot dengan opsi --root.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - mode verbose.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - pilih semua paket yang cocok dengan ekspresi.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Hanya superuser yang diperbolehkan menghapus paket"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "paket tidak dikenal"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "paket tidak dikenal"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "menghapus paket %s akan merusak sistem Anda"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Tidak ada yang dihapus"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Tidak ada yang dihapus"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Untuk memenuhi ketergantungan, paket berikut akan dihapus"
+msgstr[1] "Untuk memenuhi ketergantungan, paket-paket %d berikut akan dihapus"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "paket tidak dikenal"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Hapus %d paket?"
+msgstr[1] "Hapus %d paket?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/T) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "menganggap divais removable sebagai \"%s\""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Penghapusan gagal"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Penghapusan gagal"
+
+#: ../urpmf:153
+#, fuzzy, c-format
+msgid "unterminated expression (%s)"
+msgstr "Pola ekspresi:\n"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2011,11 +2023,6 @@ msgstr "  --clean        - hapus rpm dari cache sebelum hal-hal yg lain.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - jangan hapus rpm dari cache.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - update hanya media update.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2348,7 +2355,7 @@ msgstr ""
 "\n"
 "Lanjutkan installasi?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/t) "
@@ -2531,10 +2538,12 @@ msgstr "  --curl         - menggunakan curl untuk mengambil file jauh.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - buat media update.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2542,22 +2551,22 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - gunakan file sintesa.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, fuzzy, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - gunakan file rpm (daripada sintesa/hdlist).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - jangan coba mencari file hdlist atau sintesa.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2565,20 +2574,20 @@ msgid ""
 msgstr ""
 "  --distrib      - buat semua media dari media instalasi secara otomatis.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - dengan --distrib, menanyakan konfirmasi untuk setiap "
 "media\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 "  --all-media    - dengan --distrib, menambahkan semua media yang terdaftar\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2588,76 +2597,76 @@ msgstr ""
 "defaultnya\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - buat media maya yg selalu up-to-date,\n"
 "                   hanya protokol file:// yg diizinkan.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - nonaktifkan pengujian file MD5SUM.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 "  --nopubkey     - jangan import kunci publik dari media yang ditambahkan\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - tambahkan media pada konfigurasi, tetapi jangan update.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - mode diam.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - mode verbose.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, fuzzy, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "<url> salah (untuk direktori lokal, path harus absolut)\n"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Hanya superuser yang diijinkan menambahkan media"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "membuat file konfigurasi [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Tidak bisa menulis file konfigurasi [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "tidak perlu memberikan <path relatif hdlist> dengan --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2666,17 +2675,17 @@ msgstr ""
 "\n"
 "Apakah Anda hendak menambahkan media '%s'"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<path relatif hdlist> hilang\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Tidak bisa menggunakan %s tanpa media remote"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "gagal mengakses media \"%s\""
@@ -2919,13 +2928,13 @@ msgstr "  -f             - paksa pembuatan file sintesa/hdlist.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Hanya superuser yang diijinkan mengupdate media"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "tidak ada yang diupdate (pakailah urpmi.addmedia untuk menambah media)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2934,17 +2943,17 @@ msgstr ""
 "masukan update hilang\n"
 "(satu dari %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "Mengabaikan media %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "mengaktifkan media media %s"
@@ -3227,6 +3236,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Changelog tidak ditemukan\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - buat media update.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "URL cacat: [%s]"
 
diff --git a/po/is.po b/po/is.po
index 5d4851a5..5d805e60 100644
--- a/po/is.po
+++ b/po/is.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2007-11-29 14:14+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM innsetning"
@@ -28,7 +28,7 @@ msgstr "RPM innsetning"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Villa: finn ekki skrá %s, mun stöðva aðgerð"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "Í _lagi"
@@ -95,7 +95,7 @@ msgstr "Setja _upp"
 msgid "_Save"
 msgstr "Vi_sta"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "Hætta _við"
@@ -126,8 +126,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - prenta þetta.\n"
@@ -163,7 +164,7 @@ msgstr ""
 "                   (--no-verify-rpm aftengir, sjálfgefið er að athuga "
 "pakka).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - nota aðeins uppgefna miðla, aðskildir með kommum.\n"
@@ -215,7 +216,7 @@ msgstr "Vinsamlega bíðið..."
 msgid "Must be root"
 msgstr "Verður að vera root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -226,42 +227,42 @@ msgstr ""
 "%s\n"
 "Halda samt áfram með uppsetningu?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Aðvörun"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Í lagi"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (til að uppfæra)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (til að setja inn)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Pakkaval"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Krefst einnig eins af af eftirtöldum pökkum:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Hætta við"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -272,61 +273,61 @@ msgstr ""
 "%s\n"
 "Halda samt áfram með uppsetningu?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Til að viðhalda samræmi, verður eftirfarandi pakki settur inn:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Til að viðhalda samræmi, verða eftirtaldir pakkar settir inn"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pakki, %d MB)"
 msgstr[1] "(%d pakkar, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Pakka innsetning..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "Get ekki sótt frumpakka, hætti við"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Undirbý..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Set inn pakka `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Vinsamlega settu inn %s %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Sæki pakka `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Lokið"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -337,28 +338,28 @@ msgstr ""
 "%s\n"
 "Þú ættir sennilega að uppfæra urpmi gagnagrunninn"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Innsetning brást:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Allt er nú þegar komið inn"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Innsetningu lokið"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "fjarlægi %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "endurræsi urpmi"
@@ -438,8 +439,8 @@ msgid "...retrieving done"
 msgstr "...niðurhali lokið"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...mistókst að sækja: %s"
@@ -479,52 +480,52 @@ msgstr "Þessi aðgerð er bönnuð þegar keyrt er í vernduðum ham"
 msgid "bad proxy declaration on command line\n"
 msgstr "röng selskilgreining á skipanalínu\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: get ekki lesið rpm skrá \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "Mynstursegðir:\n"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Vantar undirskrift (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "Mynstursegðir:\n"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot mappa er ekki til"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Get ekki notað %s án %s"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Get ekki notað %s með %s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Of mörg viðföng\n"
@@ -950,217 +951,217 @@ msgstr ""
 "--synthesis er ekki hægt að nota saman með --media, --excludemedia, --"
 "sortmedia, --update, --use-distrib eða --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Leit byrjun: %s endir: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "sleppi pakka %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "mundi setja inn í stað uppfærslu á pakka %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "miðill  \"%s\" er þegar til"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(sjálfgefið hunsað)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "bæti við miðli \"%s\" á undan fjartengdum miðli \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "bæti við  miðli \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, fuzzy, c-format
 msgid "directory %s does not exist"
 msgstr "Umhverfismappa %s er ekki til"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "þessi staðsetning virðist ekki innihalda neina dreifingu"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "get ekki unnið úr media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "fann ekki dreifingarmiðil (engin media.cfg skrá fannst)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "sleppi ósamhæfðum miðli `%s' (fyrir %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "sæki media.cfg skrá..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "reynt að velja miðil sem er ekki til \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "vel marga miðla: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "fjarlægi miðil \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "endurstilli urpmi fyrir miðil \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...endurstilling mistókst"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "endurstillingu lokið"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Villa við myndun nafnaskrár: er háð %d sem finnst ekki"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "miðill \"%s\" er uppfærð"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "athuga samantektar-skrá [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "vandræði við lestur á samantektar-skrá fyrir miðil \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "afrita [%s] fyrir miðil \"%s\"..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...afritun brást"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "afrita lýsingaskrá fyrir \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...afritun lokið"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "afrit af [%s] brást (skráin er grunsamlega lítil)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "reikna md5 gátsummu yfir sótta hdlist skrá (eða samantektar-skrá)"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "afrit af [%s] brást (md5 gátsumma passar ekki)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "athuga hdlist [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "hreinsa %s og %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "ógild hdlist skrá %s fyrir miðil \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "afrita lýsingaskrá fyrir \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "ógilt rpm skráarnafn [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "sæki hdlist skrá (eða samantektar-skrá) fyrir \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "fann, við leit, hdlist skrá (eða samantektar-skrá) sem %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "engin hdlist skrá fannst fyrir miðil \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "athuga lykilskrá \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...flutti inn lykil %s úr lyklaskrá \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "gat ekki flutt inn lykilskrá \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "uppfærði miðil \"%s\""
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1192,7 +1193,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "JjYy"
@@ -1262,7 +1263,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1345,271 +1346,7 @@ msgstr "tengi %s"
 msgid "unmounting %s"
 msgstr "aftengi %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "urpmi var endurræst, og listi forgangspakka breyttist ekki"
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi var endurræst, og listi forgangspakka breyttist: %s í stað %s"
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Enginn pakki heitir %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Eftirfarandi pakkar innihalda %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Ekki er hægt að setja inn pakka %s"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Pakki %s er nú þegar kominn inn"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Pakkar %s eru nú þegar komnir inn"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "vegna þess að %s vantar"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "því pakki %s er uppsettur"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "vegna óuppfylltra %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "þegar reynt var að setja upp %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "til þess að halda %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "til þess að setja inn %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "vegna árekstra við %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "ógild undirskrift (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Ógilt auðkenni lykils (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Vantar undirskrift (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't write file"
-msgstr "Get ekki skrifað skrá"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "Get ekki opnað skrá"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "Get ekki notað %s með %s"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme útgáfa %s\n"
-"Höfundaréttur © 1999-2008 Mandriva.\n"
-"Þetta er frjáls hugbúnaður sem má dreifa samkvæmt skilmálum GNU GPL.\n"
-"\n"
-"notkun:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - velja sjálfvirkt pakka í vali.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - staðfesta að hægt sé að fjarlægja umbeðna pakka.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - dreifð urpmi yfir samnefndar vélar.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - Endur-pakka skrám áður en eytt\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - nota aðra rót til að fjarlægja rpm.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../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   - nota aðra rót fyrir urpmi gagnagrunn og rpm uppsetningu.\n"
-
-#: ../urpme:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - ekki keyra uppsetninga-skriftur í pakka.\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - stilla urpme frá dreifingartrénu, gott að nota\n"
-"                   til að setja inn/fjarlægja chroot með --root valkostnum.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - ítarlegri hamur.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - velja alla pakka sem passa við segð.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Aðeins kerfisstjóri hefur leyfi til að fjarlægja pakka"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "óþekktir pakkar"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "Óþekktur pakki"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "ef pakki %s er fjarlægður raskast uppsetning kerfisins"
-msgstr[1] "ef pakki %s er fjarlægður raskast uppsetning kerfisins"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Ekkert til að fjarlægja"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Ekkert til að fjarlægja"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] ""
-"Til að viðhalda samræmi, verður eftirtalinn %d pakki fjarlægður (%d MB)"
-msgstr[1] ""
-"Til að viðhalda samræmi, verða eftirtaldir %d pakkar fjarlægðir (%d MB)"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "Óþekktur pakki"
-msgstr[1] "Óþekktur pakki"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Fjarlæga %d pakka?"
-msgstr[1] "Fjarlæga %d pakka?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (J/n) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "tek útskiptanleg tæki sem \"%s\""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Mistókst að fjarlægja"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Mistókst að fjarlægja"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1625,24 +1362,24 @@ msgstr ""
 "\n"
 "notkun: urpmf [valkostir] mynstur\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - prenta útgáfunúmer þessa tóls.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - nota tiltekið umhverfi (yfirleitt vegna "
 "villutilkynninga).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - nota ekki uppgefna miðla, aðskildir með kommum.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
@@ -1650,264 +1387,539 @@ msgstr ""
 "  --literal, -l  - ekki leita að mynstrum, nota viðfang sem uppgefinn "
 "ákveðinn texta.\n"
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../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   - nota aðra rót fyrir urpmi gagnagrunn og rpm uppsetningu.\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    - raða miðlum eftir undirstrengjum, aðskildir með kommum.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - nota gefna slóð fyrir aðgang að miðli\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - nota gefna samantektar-skrá í stað urpmi gagnagrunns.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - ekki prenta tvíteknar línur.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - nota aðeins uppfærslu-miðil.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - ítarlegri hamur.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - hunsa stafastærð í samanburði allra mynstra.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -I             - virða stafastærð í samanburði allra mynstra "
 "(sjálfgefið).\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - breyta svæðis-skila-staf (sjálfgefið ':').\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Mynstursegðir:\n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  text           - allur texti er meðhöndlaður sem regluleg segð, nema -l sé "
 "notað.\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - innifela perl kóða beint sem perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - tvíundarvirki OG.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - tvíundarvirki EÐA.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - formerki EKKI.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - vinstri og hægri svigar.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Listi af tögum:\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - tilgreina printf-líkt úttakssnið\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   example: '%%nafn:%%skrár'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - vélbúnaðartegund\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - byggt á vél.\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - hvenær byggt\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - uppsetningaskrár\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts     - ósamræmanleg tög\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - lýsing pakka.\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - dreifing\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - tímapunktur.\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - skráarnafn pakka\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - listi af skrám sem eru í pakkanum\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - hópur.\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      -höfundarleyfi\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - pakkanafn.\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - úreldir\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - pakkað af\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - hvað er skaffað.\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires      - þarfnast\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - stærð.\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - frumrpm.\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - tillögur um tög\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - samantekt\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - slóð.\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - útgefandi\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - miðillinn sem innihélt pakkann\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - prenta útgáfu, undirnúmer og vélartegund með nafni.\n"
 
-#: ../urpmf:153
-#, fuzzy, c-format
-msgid "unterminated expression (%s)"
-msgstr "Mynstursegðir:\n"
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Ógilt snið: þú mátt aðeins nota eitt fjölgildis-tag"
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "nota tilgreint umhverfi á %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "engin hdlist skrá fannst fyrir miðil \"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "byggði hdlist samantektar-skrá fyrir miðil \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "skrifa lista-skrá fyrir miðil \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr "urpmi var endurræst, og listi forgangspakka breyttist ekki"
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr "urpmi var endurræst, og listi forgangspakka breyttist: %s í stað %s"
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Enginn pakki heitir %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Eftirfarandi pakkar innihalda %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Ekki er hægt að setja inn pakka %s"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Pakki %s er nú þegar kominn inn"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Pakkar %s eru nú þegar komnir inn"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "vegna þess að %s vantar"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "því pakki %s er uppsettur"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "vegna óuppfylltra %s"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "þegar reynt var að setja upp %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "til þess að halda %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "til þess að setja inn %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "vegna árekstra við %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "ógild undirskrift (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Ógilt auðkenni lykils (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Vantar undirskrift (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't write file"
+msgstr "Get ekki skrifað skrá"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "Get ekki opnað skrá"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "Get ekki notað %s með %s"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme útgáfa %s\n"
+"Höfundaréttur © 1999-2008 Mandriva.\n"
+"Þetta er frjáls hugbúnaður sem má dreifa samkvæmt skilmálum GNU GPL.\n"
+"\n"
+"notkun:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - velja sjálfvirkt pakka í vali.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - staðfesta að hægt sé að fjarlægja umbeðna pakka.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - dreifð urpmi yfir samnefndar vélar.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - Endur-pakka skrám áður en eytt\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - nota aðra rót til að fjarlægja rpm.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --justdb       - uppfæra aðens rpm gagnagrunn, ekki skráakerfið.\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - ekki keyra uppsetninga-skriftur í pakka.\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - stilla urpme frá dreifingartrénu, gott að nota\n"
+"                   til að setja inn/fjarlægja chroot með --root valkostnum.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - ítarlegri hamur.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - velja alla pakka sem passa við segð.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Aðeins kerfisstjóri hefur leyfi til að fjarlægja pakka"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "óþekktir pakkar"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "Óþekktur pakki"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "ef pakki %s er fjarlægður raskast uppsetning kerfisins"
+msgstr[1] "ef pakki %s er fjarlægður raskast uppsetning kerfisins"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Ekkert til að fjarlægja"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Ekkert til að fjarlægja"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Til að viðhalda samræmi, verður eftirtalinn %d pakki fjarlægður (%d MB)"
+msgstr[1] ""
+"Til að viðhalda samræmi, verða eftirtaldir %d pakkar fjarlægðir (%d MB)"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "Óþekktur pakki"
+msgstr[1] "Óþekktur pakki"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Fjarlæga %d pakka?"
+msgstr[1] "Fjarlæga %d pakka?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (J/n) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "tek útskiptanleg tæki sem \"%s\""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Mistókst að fjarlægja"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Mistókst að fjarlægja"
+
+#: ../urpmf:153
+#, fuzzy, c-format
+msgid "unterminated expression (%s)"
+msgstr "Mynstursegðir:\n"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1999,11 +2011,6 @@ msgstr "  --clean        - fjarlægja rpm úr biðminni áður en annað er gert
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - ekki hreinsa rpm pakka úr biðminni.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       - uppfæra aðens rpm gagnagrunn, ekki skráakerfið.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2335,7 +2342,7 @@ msgstr ""
 "\n"
 "Halda samt áfram með uppsetningu?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
@@ -2521,10 +2528,12 @@ msgstr "  --curl         - Nota curl til að ná í skrár.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - búa til uppfærslumiðil.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2532,23 +2541,23 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - nota samantektar-skrá.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, fuzzy, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - nota rpm skrár (í stað samantektar/hdlist skrár).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  --no-probe     - ekki reyna að finna neina hdlist eða samantektar-skrá.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2556,18 +2565,18 @@ msgid ""
 msgstr ""
 "  --distrib      - sjálfvirkt búa til alla miðla frá dreifingarmiðli.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - með --distrib, biðja um staðfestingu fyrir hvern miðil\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media     - með --distrib, bæta við öllum listuðum miðlum.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2577,76 +2586,76 @@ msgstr ""
 "slóð er\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - búa til sýndarmiðil sem þarf aldrei að uppfæra,\n"
 "                   aðeins file:// reglan er leyfð.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - aftengja MD5SUM skráarathugun.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 "  --nopubkey     - ekki flytja inn dulritunar-lykil fyrir viðbættan miðil\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - bæta miðlinum við uppsetningu, en ekki uppfæra hann.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - hljóður hamur.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - ítarlegri hamur.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "óggild <slóð> (slóð að staðbundnum möppum verður að vera algild)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Aðeins kerfisstjóra (root) er heimilt að bæta við miðli"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "bý til uppsetningarskrá [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Get ekki búið til uppsetningaskrá [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "engin þörf á að gefa upp <slóð að hdlist> með --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2655,17 +2664,17 @@ msgstr ""
 "\n"
 "Viltu bæta við miðli '%s'"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<slóð að hdlist> vantar\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Get ekki notað %s með fjartengdum miðli"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "get ekki lesið miðil \"%s\""
@@ -2904,12 +2913,12 @@ msgstr "  -f             - þvingauppfærslu samantektar/hdlist skráa\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Aðeins kerfisstjórar mega bæta við miðli"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ekkert til að uppfæra (notaðu urpmi.addmedia til að bæta við miðli)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2918,17 +2927,17 @@ msgstr ""
 "færsluna sem á að uppfæra vantar\n"
 "(ein af %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "hunsa miðil %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "virkja miðil %s"
@@ -3204,6 +3213,9 @@ msgstr "engin hdlist skrá fyrir miðil \"%s\", engar upplýsingar fyrir pakka %
 msgid "No changelog found\n"
 msgstr "Enginn breytilisti fannst\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - búa til uppfærslumiðil.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "gölluð slóð: [%s]"
 
diff --git a/po/it.po b/po/it.po
index 556295c1..ca0bbdbf 100644
--- a/po/it.po
+++ b/po/it.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-03-17 18:35+0100\n"
 "Last-Translator: Andrea Celli <andrea.celli@libero.it>\n"
 "Language-Team: Italian <timl@freelists.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Installazione RPM"
@@ -36,7 +36,7 @@ msgstr "Installazione RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Errore: impossibile trovare %s, annullo l'operazione"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_OK"
@@ -102,7 +102,7 @@ msgstr "_Installa"
 msgid "_Save"
 msgstr "_Salva"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Cancella"
@@ -134,8 +134,9 @@ msgstr ""
 msgid "Options:"
 msgstr "Opzioni:"
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - stampa questo messaggio di aiuto.\n"
@@ -175,7 +176,7 @@ msgstr ""
 "                   (--no-verify-rpm la disabilita, solitamente è "
 "abilitata).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -231,7 +232,7 @@ msgstr "Per favore attendi..."
 msgid "Must be root"
 msgstr "Devi essere root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -242,42 +243,42 @@ msgstr ""
 "%s\n"
 "Continuare?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Attenzione"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr "(da aggiornare)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (da installare)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Scelta dei pacchetti"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "È richiesto uno dei seguenti pacchetti:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Interrompi"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -288,61 +289,61 @@ msgstr ""
 "%s\n"
 "Continuare?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Per soddisfare le dipendenze, sarà installato il seguente pacchetto:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Per soddisfare le dipendenze, saranno installati i seguenti pacchetti:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pacchetto, %d MB)"
 msgstr[1] "(%d pacchetti, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Installazione dei pacchetti..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "impossibile recuperare il pacchetto dalla fonte, interrompo"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "In preparazione..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Sto installando il pacchetto `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Bisogna inserire il supporto denominato \"%s\""
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Download del pacchetto `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Fatto"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -353,28 +354,28 @@ msgstr ""
 "%s\n"
 "Potresti voler aggiornare il tuo database di urpmi"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Installazione fallita:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "È già tutto installato"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Installazione completata"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "rimozione di %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "Riavvio di urpmi"
@@ -454,8 +455,8 @@ msgid "...retrieving done"
 msgstr "...recupero terminato"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...recupero fallito: %s"
@@ -495,52 +496,52 @@ msgstr "Quest'operazione non è consentita in modalità \"restricted\""
 msgid "bad proxy declaration on command line\n"
 msgstr "errata dichiarazione di proxy usando la linea di comando\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: impossibile leggere il file rpm \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "Chiavi di ricerca:\n"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Firma mancante (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "Chiavi di ricerca:\n"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "se non usi l'opzione « --literal », urpmf si aspetta una regexp"
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "La directory chroot non esiste"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Impossibile utilizzare %s senza %s"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Impossibile utilizzare %s con %s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Troppi argomenti\n"
@@ -975,218 +976,218 @@ msgstr ""
 "--synthesis non può essere utilizzato con --media, --excludemedia, --"
 "sortmedia, --update, --use-distrib o --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Avvio ricerca: %s e finisce: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "salto il pacchetto %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "installerebbe il pacchetto %s invece di aggiornarlo "
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "il supporto \"%s\" esiste già"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(ignorato per default)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "viene aggiunto il supporto \"%s\" prima del supporto remoto \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "viene aggiunto il supporto \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "La directory %s non esiste"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "questo indirizzo non sembra contenere alcuna distribuzione"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "impossibile esaminare media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "impossibile accedere al supporto di installazione (manca il file media.cfg)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "ignoro il supporto non compatibile \"%s\" (per %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "recupero il file media.cfg..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "tentativo di selezionare un supporto inesistente \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "sto selezionando più supporti: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "rimuovo il supporto \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "riconfiguro urpmi per il supporto \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...riconfigurazione fallita"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "riconfigurazione eseguita"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Problemi nel generare i nomi dei file: non esiste la dipendenza %d"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "il supporto \"%s\" è aggiornato"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "esamino il file synthesis [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problema nel leggere il file synthesis del supporto \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "copia di [%s] per il supporto \"%s\"..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...copia fallita"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copio il file di descrizione di \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...copia terminata"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "copia di [%s] fallita (il file è stranamente piccolo)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "calcolo md5sum del file synthesis della fonte scaricata"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "acquisizione di [%s] fallita (md5sum non corretta)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2 non riuscito per %s"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "confronto di %s con %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "il file hdlist %s per il supporto \"%s\" non è corretto"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "copia del file MD5SUM di \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "nome del file rpm non valido [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "recupero del file synthesis di \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "trovato synthesis analizzato come %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "non trovo il file synthesis per il supporto \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "controllo il file pubkey di \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importata la chiave %s dal file pubkey di \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "impossibile importare il file pubkey di \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "supporto \"%s\" aggiornato"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "recupero di [%s] non riuscito"
@@ -1218,7 +1219,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "SsYy"
@@ -1288,7 +1289,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1371,6 +1372,311 @@ msgstr "sto montando %s"
 msgid "unmounting %s"
 msgstr "sto smontando %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 versione %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"Questo è software libero e può essere ridistribuito secondo i termini della "
+"licenza GNU GPL.\n"
+"\n"
+"uso: urpmf [options] chiave-ricerca\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version         - stampa la versione di questo tool.\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          - usa un ambiente specifico (tipicamente un bug report).\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 - non usa i supporti elencati, separati da virgole.\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  - non considerare i caratteri speciali, usa l'argomento come "
+"è.\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 ""
+"  --root         - cambia la directory radice per installare i file rpm e "
+"per il db di urpmi.\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    - ordina i supporti in base alle sottostringhe separate da "
+"virgole\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - utilizza questo percorso per accedere al supporto\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    - utilizza la synthesis specificata invece del db urpmi.\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - non stampa le linee uguali.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "--update       - usa solo supporti di aggiornamento.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - modalità prolissa.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - ignora la distinzione tra maiuscole/minuscole nella "
+"ricerca.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -I             - distingui maiuscole/minuscole nella ricerca "
+"(predefinito).\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "-F<str>       - cambia il separatore di campo (default ':').\n"
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Chiavi di ricerca:\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        - il testo è usato come regexp, se non viene specificato -l.\n"
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - include il codice perl direttamente come perl -e.\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - operatore binario AND.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - operatore binario OR.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - NOT unario.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "(  )              - parentesi destra e sinistra.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Elenco dei tag\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf            - specifica un formato di output simile a printf\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "           esempio: '%%name:%%files'\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch          - architettura.\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - mostra il nome dell'host\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "--buildtime     - data di compilazione\n"
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - file di configurazione\n"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts     - conflitti\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description   - descrizione del pacchetto.\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "--distribution - distribuzione\n"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch          - epoca di compilazione.\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename           - nome dei pacchetti.\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "--files         - elenca i file presenti in un pacchetto.\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group         - gruppo \n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - licenza\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name           -  nome del pacchetto.\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes     - lista di quanto reso obsoleto dal pacchetto.\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - curatore del pacchetto.\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides      - elementi forniti dal pacchetto.\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires      - requisiti necessari per installare il pacchetto.\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size          -  dimensione del pacchetto installato.\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - nome dei pacchetti rpm con sorgenti.\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - cerca nel campo \"suggests\"\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - sommario del pacchetto.\n"
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - cerca nel campo \"url\"\n"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - distributore\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m         - il supporto dov'è stato trovato il pacchetto\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - stampa versione, release e architettura con il nome.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "formato non corretto, puoi usare un solo tag "
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "uso le variabili d'ambiente su %s\n"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "manca il file hdlist per il supporto \"%s\""
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "manca il file di sintesi per il supporto \"%s\""
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "manca xml-info per il supporto \"%s\""
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1385,62 +1691,67 @@ msgstr ""
 "urpmi è stato riavviato. L'elenco dei pacchetti prioritari è cambiato da %s "
 "a %s"
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, c-format
 msgid "No package named %s"
 msgstr "Nessun pacchetto denominato %s"
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "I seguenti pacchetti contengono %s: %s"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "I pacchetti %s non possono essere installati"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Il pacchetto %s è già installato"
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "I pacchetti %s sono già installati"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
 msgid "due to missing %s"
 msgstr "perché manca %s"
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, c-format
 msgid "due to already installed %s"
 msgstr "perché è già installato %s"
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "perché non è soddisfatto %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "sto selezionando %s"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "per conservare %s"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, c-format
 msgid "in order to install %s"
 msgstr "per installare %s"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "per conflitti con %s"
@@ -1534,20 +1845,17 @@ msgstr "  --repackage     - Ri-pacchetta i file prima della cancellazione.\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - usa un'altra root per rimuovere i file rpm. \n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpme:55 ../urpmi:101
 #, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --root         - cambia la directory radice per installare i file rpm e "
-"per il db di urpmi.\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - aggiorna solo il DB degli rpm, non il filesystem.\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts   - non esegue gli scriptlet presenti nei pacchetti.\n"
 
-#: ../urpme:56
+#: ../urpme:57
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1558,51 +1866,51 @@ msgstr ""
 "                   per (dis)installare un pacchetto chroot con l'opzione --"
 "root.\n"
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - modalità prolissa.\n"
 
-#: ../urpme:59
+#: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - seleziona tutti i pacchetti che soddisfano "
 "l'espressione.\n"
 
-#: ../urpme:72
+#: ../urpme:73
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Solo superuser è abilitato a rimuovere pacchetti"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown packages"
 msgstr "pacchetti sconosciuti"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown package"
 msgstr "pacchetto sconosciuto"
 
-#: ../urpme:119
+#: ../urpme:121
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "la rimozione del pacchetto %s comprometterà il sistema"
 msgstr[1] "la rimozione del pacchetto %s comprometterà il sistema"
 
-#: ../urpme:124
+#: ../urpme:126
 #, c-format
 msgid "Nothing to remove"
 msgstr "Niente da rimuovere"
 
-#: ../urpme:141
+#: ../urpme:143
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Niente da rimuovere"
 
-#: ../urpme:147
+#: ../urpme:149
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1610,341 +1918,45 @@ msgid_plural ""
 msgstr[0] "Per soddisfare le dipendenze, sarà rimosso il seguente pacchetto"
 msgstr[1] "Per soddisfare le dipendenze, saranno rimossi i seguenti pacchetti"
 
-#: ../urpme:152
+#: ../urpme:154
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "pacchetto sconosciuto"
 msgstr[1] "pacchetto sconosciuto"
 
-#: ../urpme:159
+#: ../urpme:161
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Rimuovo %d pacchetto?"
 msgstr[1] "Rimuovo %d pacchetti?"
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (s/N) "
 
-#: ../urpme:164
+#: ../urpme:166
 #, c-format
 msgid "testing removal of %s"
 msgstr ""
 
-#: ../urpme:178
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "Rimozione fallita"
 
-#: ../urpme:180
+#: ../urpme:183
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Rimozione fallita"
 
-#: ../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 versione %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"Questo è software libero e può essere ridistribuito secondo i termini della "
-"licenza GNU GPL.\n"
-"\n"
-"uso: urpmf [options] chiave-ricerca\n"
-
-#: ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version         - stampa la versione di questo tool.\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - usa un ambiente specifico (tipicamente un bug report).\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - non usa i supporti elencati, separati da virgole.\n"
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"--literal, -l  - non considerare i caratteri speciali, usa l'argomento come "
-"è.\n"
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - ordina i supporti in base alle sottostringhe separate da "
-"virgole\n"
-
-#: ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - utilizza questo percorso per accedere al supporto\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - utilizza la synthesis specificata invece del db urpmi.\n"
-
-#: ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - non stampa le linee uguali.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "--update       - usa solo supporti di aggiornamento.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - modalità prolissa.\n"
-
-#: ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i             - ignora la distinzione tra maiuscole/minuscole nella "
-"ricerca.\n"
-
-#: ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -I             - distingui maiuscole/minuscole nella ricerca "
-"(predefinito).\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "-F<str>       - cambia il separatore di campo (default ':').\n"
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Chiavi di ricerca:\n"
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"-text        - il testo è usato come regexp, se non viene specificato -l.\n"
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - include il codice perl direttamente come perl -e.\n"
-
-#: ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - operatore binario AND.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - operatore binario OR.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - NOT unario.\n"
-
-#: ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "(  )              - parentesi destra e sinistra.\n"
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Elenco dei tag\n"
-
-#: ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf            - specifica un formato di output simile a printf\n"
-
-#: ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "           esempio: '%%name:%%files'\n"
-
-#: ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch          - architettura.\n"
-
-#: ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - mostra il nome dell'host\n"
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "--buildtime     - data di compilazione\n"
-
-#: ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - file di configurazione\n"
-
-#: ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts     - conflitti\n"
-
-#: ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description   - descrizione del pacchetto.\n"
-
-#: ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "--distribution - distribuzione\n"
-
-#: ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch          - epoca di compilazione.\n"
-
-#: ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename           - nome dei pacchetti.\n"
-
-#: ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "--files         - elenca i file presenti in un pacchetto.\n"
-
-#: ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group         - gruppo \n"
-
-#: ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - licenza\n"
-
-#: ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name           -  nome del pacchetto.\n"
-
-#: ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes     - lista di quanto reso obsoleto dal pacchetto.\n"
-
-#: ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - curatore del pacchetto.\n"
-
-#: ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides      - elementi forniti dal pacchetto.\n"
-
-#: ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires      - requisiti necessari per installare il pacchetto.\n"
-
-#: ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size          -  dimensione del pacchetto installato.\n"
-
-#: ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - nome dei pacchetti rpm con sorgenti.\n"
-
-#: ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - cerca nel campo \"suggests\"\n"
-
-#: ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - sommario del pacchetto.\n"
-
-#: ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - cerca nel campo \"url\"\n"
-
-#: ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - distributore\n"
-
-#: ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m         - il supporto dov'è stato trovato il pacchetto\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - stampa versione, release e architettura con il nome.\n"
-
 #: ../urpmf:153
 #, fuzzy, c-format
 msgid "unterminated expression (%s)"
 msgstr "Chiavi di ricerca:\n"
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "formato non corretto, puoi usare un solo tag "
-
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "uso le variabili d'ambiente su %s\n"
-
-#: ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "manca il file hdlist per il supporto \"%s\""
-
-#: ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "manca il file di sintesi per il supporto \"%s\""
-
-#: ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "manca xml-info per il supporto \"%s\""
-
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2045,11 +2057,6 @@ msgstr ""
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - tieni in cache gli rpm inutilizzati.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - aggiorna solo il DB degli rpm, non il filesystem.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2392,7 +2399,7 @@ msgstr ""
 "\n"
 "Continuo comunque l'istallazione?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (S/n) "
@@ -2585,10 +2592,12 @@ msgstr "  --curl         - usa curl per recuperare i file remoti.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - crea un supporto di aggiornamento.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2600,22 +2609,22 @@ msgstr ""
 "                   scelta tra: never, on-demand, update-only, always. cf "
 "urpmi.cfg(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - usa il file synthesis.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - usa i file rpm (invece di synthesis).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - non cerca nessun file synthesis.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2624,18 +2633,18 @@ msgstr ""
 "  --distrib      - crea automaticamente tutti i supporti da quello di\n"
 "                   installazione.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr "--interactive  - con   --distrib, chiede conferma per ogni supporto\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 "  --all-media   - with  --distrib, aggiunge tutti supporti disponibili.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2644,75 +2653,75 @@ msgstr ""
 "  --from         - usa l'url specificata per ottenere la lista dei mirror, \n"
 "                   quella predefinita è%s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - crea supporti virtuali che sono sempre aggiornati.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - disabilita il controllo MD5SUM sui file.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 "--nopubkey     - non importa la chiave pubblica dei supporti aggiunti\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "--raw       - aggiunge il supporto alla configurazione ma non lo aggiorna.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modalità silenziosa.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - modalità prolissa.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "le politiche conosciute per gli xml-info sono: %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "non servono argomenti per --distrib --mirrorlist <url>"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "<url> non valido (per una directory locale serve un percorso assoluto)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Solo superuser può aggiungere supporti"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "creazione del file di configurazione [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Impossibile creare il file di configurazione [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "con --distrib non serve fornire un <percorso relativo per synthesis>"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2721,17 +2730,17 @@ msgstr ""
 "\n"
 "Vuoi aggiungere il supporto '%s'"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "manca il <percorso relativo per synthesis>\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Non si può usare %s con un supporto remoto"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "impossibile aggiungere il supporto"
@@ -2973,12 +2982,12 @@ msgstr "  -ff            - impone con forza l'aggiornamento di synthesis\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Solo superuser è abilitato ad aggiornare i supporti"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "niente da aggiornare (usa urpmi.addmedia per aggiungere un supporto)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2987,17 +2996,17 @@ msgstr ""
 "la voce da aggiornare non è presente\n"
 "(uno di %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "Ignoro il supporto %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "rendo disponibile il supporto %s"
@@ -3287,6 +3296,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Nessun changelog trovato\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - crea un supporto di aggiornamento.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "URL malformata : [%s]"
 
diff --git a/po/ja.po b/po/ja.po
index 2453a0aa..5051d5d0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-08-30 00:39+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <cooker-i18n@mandrivalinux.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM のインストール"
@@ -30,7 +30,7 @@ msgstr "RPM のインストール"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "エラー: ファイル %s が見つかりません。操作をキャンセルします。"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_OK"
@@ -96,7 +96,7 @@ msgstr "インストール(_I)"
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
@@ -127,8 +127,9 @@ msgstr ""
 msgid "Options:"
 msgstr "オプション:"
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - このヘルプを表示\n"
@@ -161,7 +162,7 @@ msgstr ""
 "  --verify-rpm   - インストールする前に RPM の署名を確認する\n"
 "                   (デフォルトで有効。--no-verify-rpm で無効)\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 指定したメディアのみを使う (コンマで区切る)\n"
@@ -210,7 +211,7 @@ msgstr "お待ちください..."
 msgid "Must be root"
 msgstr "root 権限が必要です"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -221,42 +222,42 @@ msgstr ""
 "%s\n"
 "このままインストールを続けますか？"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (アップグレードするため)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (インストールするため)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "パッケージの選択"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "以下のパッケージのいずれかが必要です:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "中止(_A)"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -267,60 +268,60 @@ msgstr ""
 "%s\n"
 "このままインストールを続けますか？"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "依存を満たすために以下のパッケージをインストールします:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "依存を満たすために以下のパッケージをインストールします:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d 個のパッケージ, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "パッケージをインストール..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ソースパッケージを取得できませんでした。中止します。"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "準備中..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "パッケージ %s (%s/%s) をインストール..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "%s という名前のメディアを挿入してください"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "パッケージ %s をダウンロード..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "完了(_D)"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -331,28 +332,28 @@ msgstr ""
 "%s\n"
 "urpmi データベースを更新してください。"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "インストール失敗:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "パッケージは既にインストールされています"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "インストールが完了しました"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "%s を削除"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi を再スタートします"
@@ -432,8 +433,8 @@ msgid "...retrieving done"
 msgstr "...取得完了"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...取得に失敗: %s"
@@ -473,53 +474,53 @@ msgstr "この操作は制限モードでは禁止されています"
 msgid "bad proxy declaration on command line\n"
 msgstr "コマンドラインのプロキシ宣言が間違っています\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: RPM ファイル %s を読み込めません\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr "予期しない表現: %s"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, c-format
 msgid "missing expression before %s"
 msgstr "%s の前に表現がありません"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "予期しない表現 %s (提案: -a または -o を使用)"
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr "閉じる表現がありません"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 "urpmf はデフォルトで正規表現を期待します。\"--literal\" を使ってください。"
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot ディレクトリが存在しません"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%2$s なしで %1$s は使えません"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s は %s と一緒には使えません"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "引数が多すぎます\n"
@@ -951,219 +952,219 @@ msgstr ""
 "--synthesis は --media, --excludemedia, --sortmedia, --update, --use-"
 "distrib, --parallel と一緒には使えません"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "検索開始: %s 終了: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "パッケージ %s をスキップ"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "パッケージ %s を更新ではなくインストールする"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "メディア %s は既に存在します"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(デフォルトで無視)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "メディア %s をリモートメディア %s の前に追加"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "メディア %s を追加"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "ディレクトリ %s が存在しません"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "この場所にはディストリビューションが含まれていないようです"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "media.cfg を分析できません"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "ディストリビューションのメディアにアクセスできません (media.cfg ファイルがあ"
 "りません)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "互換性のないメディア %s をスキップします (%s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "media.cfg ファイルを取得..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "%s というメディアは存在しません"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "複数のメディアを選択: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "メディア %s を削除"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "メディア %s について urpmi を再設定"
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...再設定に失敗"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "再設定完了"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "名前ファイルの生成エラー: 依存 %d が見つかりません"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "メディア %s は最新です"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "synthesis ファイル [%s] を検査"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "メディア %s の synthesis ファイルの読み込み中に問題が発生"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "メディア %2$s のために [%1$s] をコピー..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...コピーに失敗"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "%s の説明ファイルをコピー..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...コピー完了"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "[%s] のコピーに失敗 (ファイルが異常に小さすぎます)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "取得した source synthesis の md5sum を計算"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] の取得に失敗 (md5sum 不一致)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2 が %s で失敗しました"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "%s と %s を比較"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "メディア %2$s の hdlist ファイル %1$s が無効"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "%s の MD5SUM ファイルをコピー..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "無効な MD5SUM ファイル (ダウンロード元: %s)"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "%s の source synthesis を取得..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "検出した synthesis を %s と認識しました"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "メディア %s に synthesis ファイルが見つかりません"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "%s の公開鍵ファイルを検査..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...%2$s の公開鍵ファイルから鍵 %1$s を取り込みました"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "%s の公開鍵ファイルを取り込めません"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "メディア %s を更新しました"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "[%s] の取得に失敗しました"
@@ -1195,7 +1196,7 @@ msgstr "NnＮｎいイ"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyＹｙはハ"
@@ -1265,7 +1266,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1351,6 +1352,298 @@ msgstr "%s をマウント"
 msgid "unmounting %s"
 msgstr "%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 version %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"これはフリーソフトウェアであり、GNU GPL の条件のもとで再配布できます。\n"
+"\n"
+"使い方: urpmf [オプション] パターン表現\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - このツールのバージョンを表示\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          - 特定の環境を使う (バグレポートなどのため)\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 - 指定したメディアは使わない (コンマで区切る)\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  - パターンで検索せずに引数を普通の文字列とみなす\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   - urpmi db と 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    - カンマ区切りで指定したメディアごとにソートする\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib    - メディアへのアクセスに指定したパスを使う\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    - urpmi のデータベースではなく指定した synthesis を使う\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - 全く同じ行は表示しない\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - 更新メディアのみを使う\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - 詳細モード\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - パターンの大文字小文字を区別しない\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -I             - パターンの大文字小文字を区別する (デフォルト)\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - 区切り文字を <str> に変更 (デフォルトは ':')\n"
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "パターン表現:\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           - テキストを正規表現とみなす (-l が使われていない限り)\n"
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - Perl コードをそのまま表示\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - binary AND operator\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - binary OR operator\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr " !               - unary NOT\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - 左右括弧\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "タグのリスト:\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf            - printf 風の出力形式を指定\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   例: '%%name:%%files'\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - アーキテクチャ\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - ビルドホスト\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - ビルド日時\n"
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - 設定ファイル\n"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - conflict (衝突) タグ\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - パッケージの説明\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - ディストリビューション\n"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - エポック\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - パッケージのファイル名\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - パッケージに含まれるファイルのリスト\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - グループ\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - ライセンス\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - パッケージ名\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - obsolete (廃止) タグ\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - パッケージ作成者\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - provide (提供) タグ\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - require (要求) タグ\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - インストール後のサイズ\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - ソース RPM の名前\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - suggest (提案) タグ\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - 要約\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       - ベンダー\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - パッケージのあるメディア\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - バージョン, リリース番号, アーキテクチャを表示\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "不正な形式: 多値タグは一つしか使えません"
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "%s に特定の環境を使用\n"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "メディア %s には hdlist がありません"
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "メディア %s には synthesis がありません"
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "メディア %s には XML 情報がありません"
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1362,64 +1655,69 @@ msgid ""
 "urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr "urpmi を再スタート、優先パッケージのリストに変更がありました: %s vs %s"
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, c-format
 msgid "No package named %s"
 msgstr "%s という名前のパッケージはありません"
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "以下のパッケージが %s を含んでいます: %s"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr ""
 "パッケージ %s が urpmi データベースに見つかりましたが、どれもインストールされ"
 "ていません"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, c-format
 msgid "Package %s is already installed"
 msgstr "パッケージ %s は既にインストールされています"
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "パッケージ %s は既にインストールされています"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
 msgid "due to missing %s"
 msgstr "%s がないために"
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, c-format
 msgid "due to already installed %s"
 msgstr "インストール済みの %s のために"
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s が依存を満たしていないために"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "%s をアップグレードするために"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "%s を維持するために"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, c-format
 msgid "in order to install %s"
 msgstr "%s をインストールするために"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "%s と衝突するために"
@@ -1510,18 +1808,18 @@ msgstr "  --repackage    - ファイルを削除する前に再パッケージ�
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - RPM の削除に他のルートを使う\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpme:55 ../urpmi:101
 #, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --urpmi-root   - urpmi db と RPM のインストールに他のルートを使う\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr ""
+"  --justdb       - RPM データベースのみを更新、ファイルシステムは更新しない\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - パッケージのスクリプトを実行しない\n"
 
-#: ../urpme:56
+#: ../urpme:57
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1531,376 +1829,91 @@ msgstr ""
 "                   で設定。chroot を --root オプション付きでインストール/\n"
 "                   アンインストールする際に使用。\n"
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - 詳細モード\n"
 
-#: ../urpme:59
+#: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - 指定した表現を含むすべてのパッケージを選択\n"
 
-#: ../urpme:72
+#: ../urpme:73
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "パッケージの削除はスーパーユーザにしかできません"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown packages"
 msgstr "不明なパッケージ"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown package"
 msgstr "不明なパッケージ"
 
-#: ../urpme:119
+#: ../urpme:121
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "以下のパッケージを削除するとシステムが壊れます:"
 
-#: ../urpme:124
+#: ../urpme:126
 #, c-format
 msgid "Nothing to remove"
 msgstr "削除するものはありません"
 
-#: ../urpme:141
+#: ../urpme:143
 #, c-format
 msgid "No orphans to remove"
 msgstr "削除するオーファンはありません"
 
-#: ../urpme:147
+#: ../urpme:149
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
 "To satisfy dependencies, the following %d packages will be removed"
 msgstr[0] "依存を満たすために以下の %d 個のパッケージを削除します"
 
-#: ../urpme:152
+#: ../urpme:154
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "(オーファン)"
 
-#: ../urpme:159
+#: ../urpme:161
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "%d 個のパッケージを削除しますか？"
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N)[デフォルトはN] "
 
-#: ../urpme:164
+#: ../urpme:166
 #, c-format
 msgid "testing removal of %s"
 msgstr "%s の削除をテスト"
 
-#: ../urpme:178
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "削除に失敗"
 
-#: ../urpme:180
+#: ../urpme:183
 #, c-format
 msgid "Removal is possible"
 msgstr "削除できます"
 
-#: ../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 version %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"これはフリーソフトウェアであり、GNU GPL の条件のもとで再配布できます。\n"
-"\n"
-"使い方: urpmf [オプション] パターン表現\n"
-
-#: ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - このツールのバージョンを表示\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - 特定の環境を使う (バグレポートなどのため)\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - 指定したメディアは使わない (コンマで区切る)\n"
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr "  --literal, -l  - パターンで検索せずに引数を普通の文字列とみなす\n"
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - カンマ区切りで指定したメディアごとにソートする\n"
-
-#: ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib    - メディアへのアクセスに指定したパスを使う\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - urpmi のデータベースではなく指定した synthesis を使う\n"
-
-#: ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - 全く同じ行は表示しない\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - 更新メディアのみを使う\n"
-
-#: ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - 詳細モード\n"
-
-#: ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - パターンの大文字小文字を区別しない\n"
-
-#: ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -I             - パターンの大文字小文字を区別する (デフォルト)\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - 区切り文字を <str> に変更 (デフォルトは ':')\n"
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "パターン表現:\n"
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           - テキストを正規表現とみなす (-l が使われていない限り)\n"
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - Perl コードをそのまま表示\n"
-
-#: ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - binary AND operator\n"
-
-#: ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - binary OR operator\n"
-
-#: ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr " !               - unary NOT\n"
-
-#: ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - 左右括弧\n"
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "タグのリスト:\n"
-
-#: ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf            - printf 風の出力形式を指定\n"
-
-#: ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   例: '%%name:%%files'\n"
-
-#: ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - アーキテクチャ\n"
-
-#: ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - ビルドホスト\n"
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - ビルド日時\n"
-
-#: ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - 設定ファイル\n"
-
-#: ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - conflict (衝突) タグ\n"
-
-#: ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - パッケージの説明\n"
-
-#: ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - ディストリビューション\n"
-
-#: ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - エポック\n"
-
-#: ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - パッケージのファイル名\n"
-
-#: ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - パッケージに含まれるファイルのリスト\n"
-
-#: ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - グループ\n"
-
-#: ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - ライセンス\n"
-
-#: ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - パッケージ名\n"
-
-#: ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - obsolete (廃止) タグ\n"
-
-#: ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - パッケージ作成者\n"
-
-#: ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - provide (提供) タグ\n"
-
-#: ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - require (要求) タグ\n"
-
-#: ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - インストール後のサイズ\n"
-
-#: ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - ソース RPM の名前\n"
-
-#: ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - suggest (提案) タグ\n"
-
-#: ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - 要約\n"
-
-#: ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - URL\n"
-
-#: ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - ベンダー\n"
-
-#: ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - パッケージのあるメディア\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - バージョン, リリース番号, アーキテクチャを表示\n"
-
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "終端のない表現 (%s)"
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "不正な形式: 多値タグは一つしか使えません"
-
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "%s に特定の環境を使用\n"
-
-#: ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "メディア %s には hdlist がありません"
-
-#: ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "メディア %s には synthesis がありません"
-
-#: ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "メディア %s には XML 情報がありません"
-
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1987,12 +2000,6 @@ msgstr "  --clean        - 最初にキャッシュから RPM を削除する\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - RPM をキャッシュに残す\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr ""
-"  --justdb       - RPM データベースのみを更新、ファイルシステムは更新しない\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2324,7 +2331,7 @@ msgstr ""
 "\n"
 "このままインストールを続けますか？"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n)[デフォルトはY] "
@@ -2516,10 +2523,12 @@ msgstr "  --aria2         - リモートファイルの取得に aria2 を使う
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - 更新メディアを作成\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2531,22 +2540,22 @@ msgstr ""
 "                   never, on-demand, update-only, always\n"
 "                   cf urpmi.cfg(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - synthesis ファイルを使う\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - RPM ファイルを使う (synthesis の代わりに)\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - synthesis ファイルの検出を試みない\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2555,19 +2564,19 @@ msgstr ""
 "  --distrib      - インストールに使用したすべてのメディアを自動的に追加\n"
 "                    する\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive -  --distrib と併用して、各メディアについて確認を求める\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 "  --all-media   - --distrib と併用して、リストのすべてのメディアを追加\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2576,72 +2585,72 @@ msgstr ""
 "  --from         - ミラーリストの取得に指定した URL を使う。デフォルトは\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr "  --virtual      - 常に最新状態に更新されている仮想メディアを作成\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - MD5SUM ファイルをチェックしない\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - 追加したメディアの公開鍵をインポートしない\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - 設定ファイルにメディアを追加、更新はしない\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 詳細を表示しない\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 詳細モード。\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "xml-info の既知のポリシーは %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "--distrib --mirrorlist <url> には引数は必要ありません"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "不正な <url> (ローカルディレクトリの場合は絶対パスが必要です)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "メディアの追加はスーパーユーザにしかできません"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "設定ファイル [%s] を作成"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "設定ファイル [%s] を作成できません"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "--distrib には <synthesis の相対パス> は必要ありません"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
@@ -2650,17 +2659,17 @@ msgstr ""
 "\n"
 "メディア '%s' を追加しますか？"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<synthesis の相対パス> の指定がありません\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "%s はリモートメディアには使えません"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "メディアを追加できません"
@@ -2896,12 +2905,12 @@ msgstr "  -ff             - synthesis を更に強制的に更新\n"
 msgid "Only superuser is allowed to update media"
 msgstr "メディアの更新はスーパーユーザにしかできません"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "更新するものがありません (urpmi.addmedia でメディアを追加できます)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2910,17 +2919,17 @@ msgstr ""
 "更新対象が見つかりません\n"
 "(%s の中のいずれか)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "「%s」"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "メディア %s を無視しています"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "メディア %s を有効にしています"
@@ -3195,6 +3204,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "変更ログはありません\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - 更新メディアを作成\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "不正な形式の URL: [%s]"
 
diff --git a/po/ka.po b/po/ka.po
index a62a57ba..4382dfcc 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2003-01-29 23:47+0400\n"
 "Last-Translator: Aiet Kolkhi <aiet@gmx.net>\n"
 "Language-Team: Georgian\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Generator: KBabel 0.9.6\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "ინსტალაცია ჩაიშალა"
@@ -29,7 +29,7 @@ msgstr "ინსტალაცია ჩაიშალა"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -77,7 +77,7 @@ msgstr "ინსტალირება"
 msgid "_Save"
 msgstr "_შენახვა"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_გაუქმება"
@@ -109,8 +109,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
@@ -141,7 +142,7 @@ msgid ""
 "                   (--no-verify-rpm disables it, default is enabled).\n"
 msgstr ""
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -189,7 +190,7 @@ msgstr "გთხოვთ იქონიოთ მოთმინება"
 msgid "Must be root"
 msgstr ""
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -197,42 +198,42 @@ msgid ""
 "Continue installation anyway?"
 msgstr "უკვე ყველაფერი ჩაწერილია"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "გაფრთხილება"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "ო-ქეი"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr ""
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "ავტომატური ინსტალირება"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid "_Abort"
 msgstr "შესახებ..."
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -240,60 +241,60 @@ msgid ""
 "Continue installation anyway?"
 msgstr "%s შედმეგ პაკეტებშია: %s\n"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] ""
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, fuzzy, c-format
 msgid "Package installation..."
 msgstr "ინსტალაციისათვის საჭირო ramdisk იმიჯები"
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, fuzzy, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ვერ ვიყენებ პარალელურ პარამეტრს \"%s\""
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "პაკეტის ინსტალაცია: `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "გთხოვთ ჩადოთ: %s სახელით: %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "პაკეტის ინსტალაცია: `%s' (%s/%s)..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "დასრულდა"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -301,28 +302,28 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "ინსტალაცია ჩაიშალა"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "უკვე ყველაფერი ჩაწერილია"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, fuzzy, c-format
 msgid "Installation finished"
 msgstr "ინსტალაცია ჩაიშალა"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "მომხმარებლის წაშლა : %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
@@ -402,8 +403,8 @@ msgid "...retrieving done"
 msgstr "...გამოძახება დასრულდა"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...გამოძახება ჩაიშალა: %s"
@@ -443,52 +444,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, fuzzy, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "ვერ წავიკითხე მენიუს ფაილი:%s"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, c-format
 msgid "missing expression before %s"
 msgstr ""
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -914,219 +915,219 @@ msgstr ""
 "--synthesis პარამეტრი ვერ გამოიყენება --media, --update ან --parallel "
 "პარამეტრებთან ერთად"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr ""
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, fuzzy, c-format
 msgid "skipping package %s"
 msgstr "კომპილირებული პაკეტები"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr ""
 "მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
 "ჩაწეროს პაკეტები."
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "მედიუმი \"%s\" უკვე არსებობს"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "ვაგდებ მედიას \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "ვერ ვიძახებ ფაილს %s\n"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "ვერ ვპოულობ პირველ საინსტალაციო მედიუმს (ვერ მივაკვლიე hdlists ფაილს)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "ვიძახებ hdlists ფაილს..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "ვცდილობ გადავახტე არსებულ მედიას \"%s\"-ს, თავიდან ვიშორებ"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "ვირჩევ მრავალ მედიას: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "ვაგდებ მედიას \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, fuzzy, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "პრობლემა hdlist ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, fuzzy, c-format
 msgid "...reconfiguration failed"
 msgstr "მენიუს კონფიგურაცია დამახსოვრებულია"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, fuzzy, c-format
 msgid "reconfiguration done"
 msgstr "სერვერის კონფიგურაცია"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "მედიუმი \"%s\" უკვე არსებობს"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "ვამოწმებ synthesis ფაილს [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, fuzzy, c-format
 msgid "...copying failed"
 msgstr "...კოპირება დასრულდა"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...კოპირება დასრულდა"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, fuzzy, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "...კოპირება ჩაიშალა"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "source hdlist-ის (ან synthesis-ის) კოპირება o"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "...კოპირება ჩაიშალა"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "ვამოწმებ hdlist ფაილს [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "ვაინსტალირებ: %s\n"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr ""
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "ვიძახებ hdlists ფაილს..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "ვიპოვე პარალელური სათაე (handler) nodes:-ისთვის %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\"-ის აღწერილობის ფაილის კოპირება..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "ვერ ვწერ საკონფიგურაციო ფაილს [%s]"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ვერ ვიძახებ ფაილს %s\n"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "დამატებული მედიუმი %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1158,7 +1159,7 @@ msgstr "nNaAა"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "yYkKxXხ"
@@ -1228,7 +1229,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1310,6 +1311,297 @@ msgstr "ვაინსტალირებ: %s\n"
 msgid "unmounting %s"
 msgstr "მოხსნა (unmount)"
 
+#: ../urpm/search.pm:29 ../urpmf:29
+#, fuzzy, 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 ""
+"mdkupdate ვერსია %s\n"
+"საავტორო უფლებები (C) %s Mandriva.\n"
+"პროგრამა უფასო გახლავთ და ნებადართულია მისი GNU GPL ლიცენზიის პირობების "
+"თანახმად გავრცელება.\n"
+"\n"
+"გამოყენება:\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+
+#: ../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 ""
+
+#: ../urpm/search.pm:39 ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../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 ""
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr ""
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, fuzzy, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, fuzzy, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - განახლების კვანძები\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, fuzzy, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "დააჭირეთ Esc ღილაკს ინტერაქტიული რეჟიმისათვის"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpm/search.pm:52 ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, fuzzy, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, fuzzy, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr ""
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr ""
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr ""
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr ""
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr ""
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr ""
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr ""
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --update       - განახლების კვანძები\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --update       - განახლების კვანძები\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr ""
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr ""
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --update       - განახლების კვანძები\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr ""
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "დააჭირეთ Esc ღილაკს ინტერაქტიული რეჟიმისათვის"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr ""
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1321,66 +1613,71 @@ msgid ""
 "urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, fuzzy, c-format
 msgid "No package named %s"
 msgstr "არც ერთ პაკეტს არ ქვია %s\n"
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, fuzzy, c-format
 msgid "The following packages contain %s: %s"
 msgstr "ერთერთი შემდეგი პაკეტი საჭიროა:"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "უკვე ყველაფერი ჩაწერილია"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "უკვე ყველაფერი ჩაწერილია"
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "უკვე ყველაფერი ჩაწერილია"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
 msgid "due to missing %s"
 msgstr ""
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "უკვე ყველაფერი ჩაწერილია"
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, fuzzy, c-format
 msgid "trying to promote %s"
 msgstr "ვერ ვპოულობ წასაშლელ შენატანს!"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr ""
 "მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
 "ჩაწეროს პაკეტები."
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr ""
 "მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
 "ჩაწეროს პაკეტები."
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, c-format
 msgid "due to conflicts with %s"
 msgstr ""
@@ -1472,395 +1769,110 @@ msgstr "  --update       - განახლების კვანძებ�
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../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 ""
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - განახლების კვანძები\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr ""
 
-#: ../urpme:56
+#: ../urpme:57
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, fuzzy, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "დააჭირეთ Esc ღილაკს ინტერაქტიული რეჟიმისათვის"
 
-#: ../urpme:59
+#: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpme:72
+#: ../urpme:73
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr ""
 "მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
 "ჩაწეროს პაკეტები."
 
-#: ../urpme:105
+#: ../urpme:106
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "უცნობი მდგომარეობა"
 
-#: ../urpme:105
+#: ../urpme:106
 #, fuzzy, c-format
 msgid "unknown package"
 msgstr "უცნობი მდგომარეობა"
 
-#: ../urpme:119
+#: ../urpme:121
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "ერთერთი შემდეგი პაკეტი საჭიროა:"
 
-#: ../urpme:124
+#: ../urpme:126
 #, fuzzy, c-format
 msgid "Nothing to remove"
 msgstr "ვერ ვპოულობ წასაშლელ შენატანს!"
 
-#: ../urpme:141
+#: ../urpme:143
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "ვერ ვპოულობ წასაშლელ შენატანს!"
 
-#: ../urpme:147
+#: ../urpme:149
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
 "To satisfy dependencies, the following %d packages will be removed"
 msgstr[0] "დამოკიდებულებების შესასრულებლად შემდეგი პაკეტები ჩაიწერება (%d მბ)"
 
-#: ../urpme:152
+#: ../urpme:154
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "უცნობი მდგომარეობა"
 
-#: ../urpme:159
+#: ../urpme:161
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "ვაგდებ მედიას \"%s\""
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, fuzzy, c-format
 msgid " (y/N) "
 msgstr " (ხ/ა) [ხ] "
 
-#: ../urpme:164
+#: ../urpme:166
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "ვიღებ შეცვლად მოწყობილობას როგორც \"%s\""
 
-#: ../urpme:178
+#: ../urpme:181
 #, fuzzy, c-format
 msgid "Removal failed"
 msgstr "შესვლა ვერ განხორციელდა"
 
-#: ../urpme:180
+#: ../urpme:183
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "შესვლა ვერ განხორციელდა"
 
-#: ../urpmf:29
-#, fuzzy, 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 ""
-"mdkupdate ვერსია %s\n"
-"საავტორო უფლებები (C) %s Mandriva.\n"
-"პროგრამა უფასო გახლავთ და ნებადართულია მისი GNU GPL ლიცენზიის პირობების "
-"თანახმად გავრცელება.\n"
-"\n"
-"გამოყენება:\n"
-
-#: ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-
-#: ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-
-#: ../urpmf:45
-#, fuzzy, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, fuzzy, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - განახლების კვანძები\n"
-
-#: ../urpmf:47
-#, fuzzy, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "დააჭირეთ Esc ღილაკს ინტერაქტიული რეჟიმისათვის"
-
-#: ../urpmf:48
-#, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr ""
-
-#: ../urpmf:54
-#, fuzzy, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpmf:55
-#, fuzzy, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr ""
-
-#: ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr ""
-
-#: ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr ""
-
-#: ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr ""
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr ""
-
-#: ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr ""
-
-#: ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr ""
-
-#: ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --update       - განახლების კვანძები\n"
-
-#: ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --update       - განახლების კვანძები\n"
-
-#: ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr ""
-
-#: ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr ""
-
-#: ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --update       - განახლების კვანძები\n"
-
-#: ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr ""
-
-#: ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "დააჭირეთ Esc ღილაკს ინტერაქტიული რეჟიმისათვის"
-
-#: ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
-
-#: ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-
-#: ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-
-#: ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "პრობლემა synthesis-ის ფაილის ან მედიუმის კითხვისას \"%s\""
-
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1943,11 +1955,6 @@ msgstr ""
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr ""
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - განახლების კვანძები\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2243,7 +2250,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "საინსტალაციო სერვერის კონფიგურირება"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (ხ/ა) [ხ] "
@@ -2398,11 +2405,13 @@ msgid "  --aria2        - use aria2 to retrieve distant files.\n"
 msgstr ""
 
 #: ../urpmi.addmedia:65
-#, fuzzy, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - განახლების კვანძები\n"
+#, c-format
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2410,130 +2419,130 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --help         - აჩვენე ეს დამხმარე ტექსტი.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, fuzzy, c-format
 msgid "Only superuser is allowed to add media"
 msgstr ""
 "მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
 "ჩაწეროს პაკეტები."
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "დაწერე საკონფიგურაციო ფაილი [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, fuzzy, c-format
 msgid "Can't create config file [%s]"
 msgstr "დაწერე საკონფიგურაციო ფაილი [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "თქვენ უჯრის გაზიარების უფლება უნდა გაგაჩნდეთ"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr ""
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "ვერ ვუკავშირდები მედიას \"%s\""
@@ -2764,29 +2773,29 @@ msgstr ""
 "მხოლოდ სრულუფლებიან მომხმარებელს აქვს უფლება \n"
 "ჩაწეროს პაკეტები."
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "ვაგდებ მედიას \"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "ვაგდებ მედიას \"%s\""
@@ -3045,6 +3054,10 @@ msgid "No changelog found\n"
 msgstr "სურათები ვერ ვიპოვე"
 
 #, fuzzy
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - განახლების კვანძები\n"
+
+#, fuzzy
 #~ msgid "%d installation transaction failed"
 #~ msgid_plural "%d installation transactions failed"
 #~ msgstr[0] "ინსტალაციაშტან დაკავშირებული მითითებები"
diff --git a/po/ko.po b/po/ko.po
index 182b9e90..9cf8fcf5 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2007-09-26 20:03+0200\n"
 "Last-Translator: Jaegeum Choe <baedaron@hananet.net>\n"
 "Language-Team: Korean <baedaron@hananet.net>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "설치 준비중입니다"
@@ -28,7 +28,7 @@ msgstr "설치 준비중입니다"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Error: %s 파일을 찾을 수 없습니다. 작업을 취소합니다. "
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "확인 (_O)"
@@ -93,7 +93,7 @@ msgstr "설치(_I)"
 msgid "_Save"
 msgstr "저장(_S)"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "취소 (_C)"
@@ -124,8 +124,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 이 도움말 출력.\n"
@@ -156,7 +157,7 @@ msgid ""
 "                   (--no-verify-rpm disables it, default is enabled).\n"
 msgstr ""
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -204,7 +205,7 @@ msgstr "잠시만 기다려 주십시오..."
 msgid "Must be root"
 msgstr "마우스 포트"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -215,42 +216,42 @@ msgstr ""
 "%s\n"
 "계속 진행하시겠습니까?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "경고"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "확인"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "업그레이드"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "설치 종료"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "패키지 선택"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "다음 패키지들 중 하나가 필요합니다:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "중단(_A)"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -260,60 +261,60 @@ msgstr ""
 "다음 패키지들이 제거될 것입니다.%s\n"
 "계속 설치를 진행하시겠습니까?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "의존성 문제로 인하여, 다음 패키지가 설치되어야 합니다:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "의존성 문제로 인하여, 다음 패키지들이 설치되어야 합니다:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d 패키지, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "패키지 설치 중..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "소스 패키지를 구할 수 없습니다, 설치를 중단합니다."
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, fuzzy, c-format
 msgid "Preparing..."
 msgstr "부트 로더 준비중"
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "패키지 설치 중: [%s] (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "장치 [%2$s]에 「%1$s」미디어를 넣으세요."
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "패키지 내려받는 중: [%s] (%s/%s)..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "완료"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -324,28 +325,28 @@ msgstr ""
 "%s\n"
 "urpmi 데이터베이스를 업데이트해야 할 수도 있습니다."
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "설치 실패."
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "모든 것이 이미 설치되어 있습니다."
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "설치 완료"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "%s 제거 중"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
@@ -427,8 +428,8 @@ msgid "...retrieving done"
 msgstr "[%s] 추출 중"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, fuzzy, c-format
 msgid "...retrieving failed: %s"
 msgstr "FAT크기조정 실패: %s"
@@ -468,52 +469,52 @@ msgstr "이 작업은 제한모드에서 작동되는 동안 금지됩니다."
 msgid "bad proxy declaration on command line\n"
 msgstr "명령줄 내의 잘못된 선언\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: RPM 파일 「%s」을 읽을 수 없습니다.\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "서명이 없습니다.(%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 디렉토리가 존재하지 않습니다."
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s 없이 %s를 사용할 수 없습니다."
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s 와 함께 %s를 사용할 수 없습니다."
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "너무 많은 인수.\n"
@@ -940,217 +941,217 @@ msgid ""
 "update, --use-distrib or --parallel"
 msgstr ""
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, fuzzy, c-format
 msgid "Search start: %s end: %s"
 msgstr "검색 시작: %s, 검색 종료: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, fuzzy, c-format
 msgid "skipping package %s"
 msgstr "%s 패키지 설치중"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "패키지 설치중 문제 발생 %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "매체「%s」는 이미 존재합니다."
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(기본적으로 무시함)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "매체「%2$s」에서 RPM 파일「%1$s」를 읽을 수 없습니다."
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "%s 제거 중"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, fuzzy, c-format
 msgid "directory %s does not exist"
 msgstr "chroot 디렉토리가 존재하지 않습니다."
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "이 위치는 어느 제품에서 포함되어있지 않는 듯 합니다."
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "media.cfg 파일을 분석할 수 없습니다.\n"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "(media.cfg파일을 발견할수 없기 때문에) 제품 매체에 접근할 수 없습니다."
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "media.cfg 파일 추출 중..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "존재하지 않는 매체 \"%s\" 선택하기 위해 시도중.\n"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, fuzzy, c-format
 msgid "selecting multiple media: %s"
 msgstr "존재하지 않는 매체「%s」 선택 시도"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, fuzzy, c-format
 msgid "removing medium \"%s\""
 msgstr "%s 제거 중"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, fuzzy, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "「%s」를 위해 urpmi 재설정 중 ..."
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, fuzzy, c-format
 msgid "...reconfiguration failed"
 msgstr "..재설정 실패."
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, fuzzy, c-format
 msgid "reconfiguration done"
 msgstr "재설정 완료"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "파일 이름 생성중 오류: %d 의존성을 찾을수 없습니다."
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "매체 [%s]는 최신의 상태입니다.."
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, fuzzy, c-format
 msgid "examining synthesis file [%s]"
 msgstr "의존목록 파일 [%s] 읽기"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, fuzzy, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "매체「%s」에 대한 목록 합성 파일 생성 완료."
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "매체\"%s\"에 대해 「%s」 복사 중...."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, fuzzy, c-format
 msgid "...copying failed"
 msgstr "...복사 실패"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, fuzzy, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "「%s」의 기록 파일 복사중..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, fuzzy, c-format
 msgid "...copying done"
 msgstr "....복사 완료"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, fuzzy, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "[%s]의 복사 실패 (파일이 의심되게 적습니다.)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "검색된 소스 hdlist(또는 synthesis)의 md5sum 계산중."
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] 복사 실패(부적절한 md5sum)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "hdlist 파일 [%s] 생성 중"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "%s 삭제 중...\n"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "「%s」의 기록 파일 복사중..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "유효하지 않은 RPM 파일 이름 [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "[%s] 추출 중"
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "목록 파일에「%s」에 대한 기록이 없습니다."
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "프린터 「%s」 제거 중 ..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "「%s」의 목록 파일을 기록할 수 없습니다."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "「%s」의 목록 파일을 기록할 수 없습니다."
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "매체 교환"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1182,7 +1183,7 @@ msgstr "Nn아니오"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yy예"
@@ -1252,7 +1253,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1334,6 +1335,297 @@ msgstr "%s 마운트 중"
 msgid "unmounting %s"
 msgstr "%s 마운트 해제 중"
 
+#: ../urpm/search.pm:29 ../urpmf:29
+#, fuzzy, 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 버전 %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"공개 소프트웨어이며, GNU GPL 조건하에서 재배포될 수 있습니다.\n"
+"\n"
+"사용법: urpmf [options] pattern-expression\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version        - 이 도구의 버전을 프린트합니다..\n"
+
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+
+#: ../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 ""
+
+#: ../urpm/search.pm:39 ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../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     - urpmi 데이터베이스 및 rpm 설치를 위해 다른 root사용\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 ""
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr ""
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, fuzzy, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --help         - 이 도움말 출력.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr ""
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, fuzzy, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpm/search.pm:52 ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr ""
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, fuzzy, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, fuzzy, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, fuzzy, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr ""
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --help         - 이 도움말 출력.\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr ""
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "K콘솔 설정 모듈"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr ""
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr ""
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --help         - 이 도움말 출력.\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --help         - 이 도움말 출력.\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --help         - 이 도움말 출력.\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --help         - 이 도움말 출력.\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --help         - 이 도움말 출력.\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr ""
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --help         - 이 도움말 출력.\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr ""
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr ""
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --help         - 이 도움말 출력.\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr ""
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr ""
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr ""
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --help         - 이 도움말 출력.\n"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, fuzzy, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -v             - 상세 정보 모드.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr ""
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "매체「%s」에 대한 목록 합성 파일 생성 완료."
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1345,62 +1637,67 @@ msgid ""
 "urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, c-format
 msgid "No package named %s"
 msgstr "%s라는 팩키지는 없습니다."
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "다음 팩키지들은 %s를 담고 있습니다: %s"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "[%s] 팩키지를 설치할 수 없습니다."
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "모든 것이 이미 설치되어 있습니다."
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "모든 것이 이미 설치되어 있습니다."
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, fuzzy, c-format
 msgid "due to missing %s"
 msgstr "%s가 없기 때문입니다."
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "모든 것이 이미 설치되어 있습니다."
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, fuzzy, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s에 만족하지 않기 때문입니다."
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, fuzzy, c-format
 msgid "trying to promote %s"
 msgstr "%s 활성화 시도중"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr "%s를 유지하기 위해"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr "%s를 설치하기 위해"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, fuzzy, c-format
 msgid "due to conflicts with %s"
 msgstr "%s와 충돌하기 때문"
@@ -1491,19 +1788,17 @@ msgstr "  --repackage     - 삭제전에 파일을 Re-package\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root          - Rpm 제거를 위해 다른 root사용\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpme:55 ../urpmi:101
 #, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
 msgstr ""
-"  --urpmi-root     - urpmi 데이터베이스 및 rpm 설치를 위해 다른 root사용\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts      - 패키지 scriptlet(s)를  실행하지 않습니다.\n"
 
-#: ../urpme:56
+#: ../urpme:57
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1512,48 +1807,48 @@ msgstr ""
 "  --use-distrib  - distrib 트리에서 서둘러 urpme를 설정합니다, \n"
 "chroot가 --root 옵션과 함께 인스톨(언인스톨)하기에 유용합니다.\n"
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, fuzzy, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v    - 상세 정보 모드.\n"
 
-#: ../urpme:59
+#: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr " -a           - 조건과 매칭되는 모든 패키지 선택\n"
 
-#: ../urpme:72
+#: ../urpme:73
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "오직 superuser만 패키지를 제거할 수 있습니다."
 
-#: ../urpme:105
+#: ../urpme:106
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "알수 없는 패키지"
 
-#: ../urpme:105
+#: ../urpme:106
 #, fuzzy, c-format
 msgid "unknown package"
 msgstr "알수 없는 패키지"
 
-#: ../urpme:119
+#: ../urpme:121
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "%s패키지를 제거하면 시스템이 깨질 수 있습니다."
 
-#: ../urpme:124
+#: ../urpme:126
 #, fuzzy, c-format
 msgid "Nothing to remove"
 msgstr "제거할 태그 없음!"
 
-#: ../urpme:141
+#: ../urpme:143
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "제거할 태그 없음!"
 
-#: ../urpme:147
+#: ../urpme:149
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1563,326 +1858,43 @@ msgstr[0] ""
 "제거될 것입니다..\n"
 "\n"
 
-#: ../urpme:152
+#: ../urpme:154
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "알수 없는 패키지"
 
-#: ../urpme:159
+#: ../urpme:161
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "%d 패키지를 제거하시겠습니까?"
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, fuzzy, c-format
 msgid " (y/N) "
 msgstr " (Y/n) "
 
-#: ../urpme:164
+#: ../urpme:166
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "탈착식 장치"
 
-#: ../urpme:178
+#: ../urpme:181
 #, fuzzy, c-format
 msgid "Removal failed"
 msgstr "제거 실패"
 
-#: ../urpme:180
+#: ../urpme:183
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "제거 실패"
 
-#: ../urpmf:29
-#, fuzzy, 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 버전 %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"공개 소프트웨어이며, GNU GPL 조건하에서 재배포될 수 있습니다.\n"
-"\n"
-"사용법: urpmf [options] pattern-expression\n"
-
-#: ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version        - 이 도구의 버전을 프린트합니다..\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-
-#: ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-
-#: ../urpmf:45
-#, fuzzy, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --help         - 이 도움말 출력.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr ""
-
-#: ../urpmf:47
-#, fuzzy, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpmf:48
-#, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr ""
-
-#: ../urpmf:54
-#, fuzzy, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpmf:55
-#, fuzzy, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpmf:56
-#, fuzzy, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr ""
-
-#: ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --help         - 이 도움말 출력.\n"
-
-#: ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr ""
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "K콘솔 설정 모듈"
-
-#: ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr ""
-
-#: ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr ""
-
-#: ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --help         - 이 도움말 출력.\n"
-
-#: ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --help         - 이 도움말 출력.\n"
-
-#: ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --help         - 이 도움말 출력.\n"
-
-#: ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --help         - 이 도움말 출력.\n"
-
-#: ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --help         - 이 도움말 출력.\n"
-
-#: ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr ""
-
-#: ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --help         - 이 도움말 출력.\n"
-
-#: ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr ""
-
-#: ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr ""
-
-#: ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --help         - 이 도움말 출력.\n"
-
-#: ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr ""
-
-#: ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr ""
-
-#: ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr ""
-
-#: ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --help         - 이 도움말 출력.\n"
-
-#: ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, fuzzy, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -v             - 상세 정보 모드.\n"
-
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
-
-#: ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
-
-#: ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "매체「%s」에 대한 목록 합성 파일 생성 완료."
-
-#: ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "매체「%s」에 대한 목록 파일을 찾을 수 없습니다."
-
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1965,11 +1977,6 @@ msgstr ""
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr ""
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr ""
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2272,7 +2279,7 @@ msgstr ""
 "\n"
 "계속하시겠습니까?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -2445,10 +2452,12 @@ msgstr "  --root          - Rpm 제거를 위해 다른 root사용\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2456,128 +2465,128 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "    --probe-synthesis  - synthesis파일을 사용합니다.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, fuzzy, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -v             - 상세 정보 모드.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 상세 정보 모드.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, fuzzy, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "설정 파일 [%s]에 기록"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, fuzzy, c-format
 msgid "Can't create config file [%s]"
 msgstr "설정 파일 [%s]에 기록"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "<팩키지 목록 파일의 상대경로>가 빠져 있습니다.\n"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<팩키지 목록 파일의 상대경로>가 빠져 있습니다.\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "매체「%s」에 접근할 수 없습니다."
@@ -2813,14 +2822,14 @@ msgstr "  -v             - 상세 정보 모드.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "루트 사용자만이 지역 팩키지를 설치할 수 있습니다."
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "업데이트할 것이 없습니다. (미디어를 추가하려면 「urpmi.addmedia」를 사용하세"
 "요.\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2829,17 +2838,17 @@ msgstr ""
 "업데이트하려는 항목이 빠져있습니다.\n"
 "(%s 중 하나)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "존재하지 않는 매체「%s」의 제거 시도"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "존재하지 않는 매체「%s」의 제거 시도"
diff --git a/po/ky.po b/po/ky.po
index 971225fb..d33c6a22 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-ky\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2005-07-13 13:23+0000\n"
 "Last-Translator: Timur Jamakeev <ztimur@mail..ru>\n"
 "Language-Team: Kyrgyz\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM орнотуу"
@@ -27,7 +27,7 @@ msgstr "RPM орнотуу"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -93,7 +93,7 @@ msgstr "_Орнотуу"
 msgid "_Save"
 msgstr "_Сактоо"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Калтыруу"
@@ -125,8 +125,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - бул жардамды чыгаруу.\n"
@@ -162,7 +163,7 @@ msgstr ""
 "  --verify-rpm   - орнотуу алдында rpm сигнатурасын текшерүү\n"
 "                   (--no-verify-rpm муну өчүрөт, алдынала күйгүзүлгөн).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -214,7 +215,7 @@ msgstr "Күтө туруңуз..."
 msgid "Must be root"
 msgstr "root укуктары талап кылынат"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -225,42 +226,42 @@ msgstr ""
 "%s\n"
 "Уланталыбы?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Эскертүү"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (жаңылоо)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (орнотуу)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Пакет тандоо"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Төмөнкү пакеттердин бири талап кылынат:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Токтотуу"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -271,14 +272,14 @@ msgstr ""
 "%s\n"
 "Уланталыбы?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "Көз карандылыктарды канаатандыруу үчүн, төмөнкү пакет орнотулат (%d Мб)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -286,49 +287,49 @@ msgstr ""
 "Көз карандылыктарды канаатандыруу үчүн, төмөнкү %d пакет орнотулат:\n"
 "%s\n"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Пакет орнотулууда..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "баштапкы пакеттерди алууга болбоду, күтүлбөгөн аяктоо"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Даярдоо ..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Пакет орнотулууда: `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "\"%s\" аттуу булагын [%s] түзүлүшүнө орнотуңуз"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "`%s' пакети жүктөлүүдө..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Даяр"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -339,28 +340,28 @@ msgstr ""
 "%s\n"
 "Мүмкүн сизге urpmi берилиштер базасын жаңылоо керек"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Орнотуу ишке ашпады"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Бардыгы алдагачан орнотулган"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Орнотуу аяктады"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "%s алынып салынууда"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi кайра ишке киргизилүүдө"
@@ -440,8 +441,8 @@ msgid "...retrieving done"
 msgstr "...кабыл алуу аяктады"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...кабыл алуу ийгиликсиз: %s"
@@ -481,52 +482,52 @@ msgstr "Чектелген режим учурунда бул операциян
 msgid "bad proxy declaration on command line\n"
 msgstr "командалык сапта туура эмес прокси көрсөтүлгөн\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: \"%s\" rpm файлын окууга болбоду\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Сигнатура жок (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -954,217 +955,217 @@ msgstr ""
 "--synthesis төмөнкүлөр менен бирге --media, --excludemedia, --sortmedia, --"
 "update же --parallel менен колдонууга болбойт"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Издөө: башы-%s, аягы-%s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "%s пакети коё берилүүдө"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "%s пакетин жаңылоонун ордуна аны орнотуу аткарылат"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "\"%s\" булагы алдагачан бар"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "\"%s\" булагынын башсаптары окулууда"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "\"%s\" булагы алынып салынууда"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "rpmdb ачууга болбоду"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "биринчи инсталлялык булакка жетүүгө болбоду (hdlists файлы табылбады)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "hdlists файлы кабыл алынууда..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "жашабаган \"%s\" булагын тандоо аракети"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "составдык булак тандалууда: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "\"%s\" булагы алынып салынууда"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "\"%s\" булагы үчүн urpmi программасын кайра конфигурациялоо"
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...кайра конфигурациялоо ишке ашпады"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "кайра конфигурациялоо аяктады"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "\"%s\" булагы тандалган эмес"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "[%s] synthesis файлы текшерилүүдө"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "\"%s\" булагынын synthesis файлын окуу проблемасы"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "\"%s\" булагы үчүн тизме файлы жазылууда"
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...көчүрүү ишке ашпады"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "\"%s\" үчүн баяндоо файлы көчүрүлүүдө..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...көчүрүү аяктады"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "[%s] көчүрүү ишке ашпады (файл күмөндүү кыска)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "кабыл алынган баштапкы hdlist (же synthesis) үчүн md5sum эсептелүүдө"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr " [%s] көчүрүү ишке ашпады (md5sum туура эмес)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "[%s] hdlist файлы текшерилүүдө"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "%2s булагынан %1s орнотулууда"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "\"%s\" булагы үчүн hdlist файлы табылбады"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "\"%s\" үчүн баяндоо файлы көчүрүлүүдө..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "[%s] туура эмес rpm файл аты"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "\"%s\" булагынын баштапкы hdlist (же synthesis) кабыл алынууда..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "изделген hdlist (же synthesis) табылды: %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "\"%s\" булагы үчүн hdlist файлы табылбады"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" үчүн ачык ачкыч файлы текшерилүүдө..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...%s ачкычы \"%s\" ачык ачкычынан импорттолду"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\" ачык ачкыч файлын импортоо мүмкүн эмес"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "%s булагы кошулду"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1196,7 +1197,7 @@ msgstr "NnжЖ;:"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyоО"
@@ -1266,7 +1267,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1349,273 +1350,7 @@ msgstr "%s бириктирилүүдө"
 msgid "unmounting %s"
 msgstr "%s ажыратылууда"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, fuzzy, c-format
-msgid "No package named %s"
-msgstr "%s аттуу пакет жок"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Төмөнкү пакеттер %s камтыйт: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Бардыгы алдагачан орнотулган"
-
-#: ../urpm/select.pm:539
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Бардыгы алдагачан орнотулган"
-
-#: ../urpm/select.pm:540
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Бардыгы алдагачан орнотулган"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "%s жоктугунан"
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "Бардыгы алдагачан орнотулган"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "%s канаатанбагандыгынан"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "%s активдештирүү аракети"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "%s сактоо үчүн"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "%s орнотуу үчүн"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "%s менен конфликтешкендиги үчүн"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Туура эмес сигнатура (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Туура эмес Key ID (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Сигнатура жок (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "[%s] конфигурация файлын түзүү"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "Көчүрүү ишке ашпады"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "Көчүрүү ишке ашпады"
-
-#: ../urpme:41
-#, fuzzy, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme версиясы %s\n"
-"Copyright (C) 1999-2005 Mandriva.\n"
-"Бул эркин программалык жабдуу жана аны GNU GPL\n"
-"шартынын негизинде таркатууга болот.\n"
-"\n"
-"колдонулушу:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto         - сунушталгандардын ичинен пакетти автоматтык тандоо.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - туура өчүрүү мүмүкүнчүлүгүн текшерүү.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - машиналардын алиастары боюнча бөлүнгөн urpmi.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, fuzzy, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --packager     - packager: пакеттөөчү тэгин чыгаруу.\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - rpm өчүрүү үчүн башка түп колдонуу.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - орнотуу үчүн башка түп колдонуу.\n"
-
-#: ../urpme:55
-#, fuzzy, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --description  - description: баяны тэгин чыгаруу.\n"
-
-#: ../urpme:56
-#, fuzzy, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - urpmi-ди иштөө маалында distrib дарагынан "
-"конфигурациялоо,\n"
-"                   chroot (кайра)орнотууда --root опциясы менен пайдалуу.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, fuzzy, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose      - кеңири режим.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - туюнтмага туура келген бардык пакеттерди тандоо.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Суперколдонуучу гана пакеттерди жогото алат"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "белгисиз пакеттер"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "белгисиз пакет"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "%s пакетин алып салуу сиздин системаңыздын ишин бузат"
-msgstr[1] "%s пакетин алып салуу сиздин системаңыздын ишин бузат"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Алып салууга эч нерсе жок"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Алып салууга эч нерсе жок"
-
-#: ../urpme:147
-#, fuzzy, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] ""
-"Көз карандылыктарды канаатандыруу үчүн төмөнкү %d пакет жоготулат (%d Мб)"
-msgstr[1] ""
-"Көз карандылыктарды канаатандыруу үчүн төмөнкү %d пакет жоготулат (%d Мб)"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "белгисиз пакет"
-msgstr[1] "белгисиз пакет"
-
-#: ../urpme:159
-#, fuzzy, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "%s пакети алынып салынууда"
-msgstr[1] "%s пакети алынып салынууда"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "чыгарылып алынуучу түзүлүш \"%s\" катары каралууда"
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Алып салуу ишке ашпады"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Алып салуу ишке ашпады"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1632,288 +1367,565 @@ msgstr ""
 "\n"
 "колдонулушу:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - бул жардамды чыгаруу.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - спецификалык чөйрөнү колдонуу (демейде ката жөнүндө "
 "отчет).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - үтүр менен бөлүнөп көрсөтүлгөн булактарды колдонбоо.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - орнотуу үчүн башка түп колдонуу.\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    - үтүр менен бөлүнгөп саптарга ылайык булактарды сорттоо.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --synthesis    - urpmi db ордуна көрсөтүлгөн synthesis колдонуу.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - urpmi db ордуна көрсөтүлгөн synthesis колдонуу.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - бирдей саптарды чыгарбоо.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - жаңылоо булагын гана колдонуу.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - кеңири режим.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - бардык шаблондордогу регистрлердин айырмаларын эске "
 "албоо.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -i             - бардык шаблондордогу регистрлердин айырмаларын эске "
 "албоо.\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - түздөн түз perl кодун perl -e сыяктуу кошуу.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - бинардык AND оператору.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - бинардык OR оператору.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - унардык NOT.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  )              - оң кашаа, туюнтмалардын группасын жабат.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr ""
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - X интерфейсин колдонуу.\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    алдыалынганы %s.\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - url: url тэгин чыгаруу.\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - buildhost: түзүүчү хост тэгин чыгаруу.\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "Konsole конфигурациялоо модулу"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - conflicts: бардык конфликтер тэгин чыгаруу.\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - description: баяны тэгин чыгаруу.\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - epoch: epoch тэгин чыгаруу.\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name          - пакет ысымдарын гана чыгаруу.\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - пакеттеги файлдар тизмеси.\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - group: группа тэгин чыгаруу.\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --name          - пакет ысымдарын гана чыгаруу.\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name          - пакет ысымдарын гана чыгаруу.\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - obsoletes: бардык эскирген файлдар тэгин чыгаруу.\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - packager: пакеттөөчү тэгин чыгаруу.\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - provides: бардык берилчү файлдар тэгин чыгаруу.\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - requires: бардык көз карандылыктар тэгин чыгаруу.\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - size: өлчөмү тэгин чыгаруу.\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - sourcerpm: баштапкы rpm тэгин чыгаруу.\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --obsoletes    - obsoletes: бардык эскирген файлдар тэгин чыгаруу.\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary, -S  - жалпы маалымат тэгин чыгаруу.\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url: url тэгин чыгаруу.\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - кеңири режим.\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - пакеттеги файлдар тизмеси.\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - версиясын, релизин жана архитектурасын аттары менен кошо "
 "чыгаруу.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "%s үчүн спецификалык чөйрө колдонулууда\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "\"%s\" булагы үчүн hdlist файлы табылбады"
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "\"%s\" булагы үчүн hdlist synthesis файлы түзүлдү"
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "\"%s\" булагы үчүн тизме файлы жазылууда"
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, fuzzy, c-format
+msgid "No package named %s"
+msgstr "%s аттуу пакет жок"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Төмөнкү пакеттер %s камтыйт: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Бардыгы алдагачан орнотулган"
+
+#: ../urpm/select.pm:543
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Бардыгы алдагачан орнотулган"
+
+#: ../urpm/select.pm:544
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Бардыгы алдагачан орнотулган"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "%s жоктугунан"
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Бардыгы алдагачан орнотулган"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "%s канаатанбагандыгынан"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "%s активдештирүү аракети"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "%s сактоо үчүн"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "%s орнотуу үчүн"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "%s менен конфликтешкендиги үчүн"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Туура эмес сигнатура (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Туура эмес Key ID (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Сигнатура жок (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "[%s] конфигурация файлын түзүү"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Көчүрүү ишке ашпады"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "Көчүрүү ишке ашпады"
+
+#: ../urpme:41
+#, fuzzy, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme версиясы %s\n"
+"Copyright (C) 1999-2005 Mandriva.\n"
+"Бул эркин программалык жабдуу жана аны GNU GPL\n"
+"шартынын негизинде таркатууга болот.\n"
+"\n"
+"колдонулушу:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - сунушталгандардын ичинен пакетти автоматтык тандоо.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - туура өчүрүү мүмүкүнчүлүгүн текшерүү.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - машиналардын алиастары боюнча бөлүнгөн urpmi.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, fuzzy, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --packager     - packager: пакеттөөчү тэгин чыгаруу.\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - rpm өчүрүү үчүн башка түп колдонуу.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - жаңылоо булагын гана жаңылоо.\n"
+
+#: ../urpme:56
+#, fuzzy, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --description  - description: баяны тэгин чыгаруу.\n"
+
+#: ../urpme:57
+#, fuzzy, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - urpmi-ди иштөө маалында distrib дарагынан "
+"конфигурациялоо,\n"
+"                   chroot (кайра)орнотууда --root опциясы менен пайдалуу.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - кеңири режим.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - туюнтмага туура келген бардык пакеттерди тандоо.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Суперколдонуучу гана пакеттерди жогото алат"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "белгисиз пакеттер"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "белгисиз пакет"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "%s пакетин алып салуу сиздин системаңыздын ишин бузат"
+msgstr[1] "%s пакетин алып салуу сиздин системаңыздын ишин бузат"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Алып салууга эч нерсе жок"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Алып салууга эч нерсе жок"
+
+#: ../urpme:149
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Көз карандылыктарды канаатандыруу үчүн төмөнкү %d пакет жоготулат (%d Мб)"
+msgstr[1] ""
+"Көз карандылыктарды канаатандыруу үчүн төмөнкү %d пакет жоготулат (%d Мб)"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "белгисиз пакет"
+msgstr[1] "белгисиз пакет"
+
+#: ../urpme:161
+#, fuzzy, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "%s пакети алынып салынууда"
+msgstr[1] "%s пакети алынып салынууда"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "чыгарылып алынуучу түзүлүш \"%s\" катары каралууда"
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Алып салуу ишке ашпады"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Алып салуу ишке ашпады"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2008,11 +2020,6 @@ msgstr "  --clean        - аракет кылуу алдында, адеген�
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - rpm-дерди кэштен тазалабоо.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - жаңылоо булагын гана жаңылоо.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2339,7 +2346,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Буга карабай улантайынбы?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -2525,10 +2532,12 @@ msgstr "  --curl         - алыста жайгашкан файлдары curl
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - жаңылоо булагын түзүү.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2536,24 +2545,24 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - synthesis файлын издөө жана аны колдонуу.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  --no-probe     - synthesis же hdlist файлын издөөгө\n"
 "                    аракет кылбоо.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2562,17 +2571,17 @@ msgstr ""
 "  --distrib      - автоматтык түрдө бардык булактарды орнотуу\n"
 "                   булагынан түзүү.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - мүмкүн болгон булактар тизмеси.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2581,94 +2590,94 @@ msgstr ""
 "  --from         - күзгүлөрдүн тизмеси үчүн көрсөтүлгөн url\n"
 "                   колдонуу, алдынала колдонулганы %s \n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - дайыма up-to-date болгон, виртуалдык булак түзүү\n"
 "                   file:// протоколу гана колдонулушу мүмкүн.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - MD5SUM файлын текшербөө.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - кошулган булактын жалпы ачкычын импорттобо\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - конфигурацияга булакты кошуу, бирок аны жаңылабоо.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - кыскартылган режим (quiet).\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - кеңири режим.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Суперколдонуучу гана пакет булактарын кошо алат"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "[%s] конфигурация файлын түзүү"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "[%s] конфигурация файлын түзүү"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr ""
 "--distrib менен кошо <hdlist файлынын салыштырма жолун> көрсөтүүнүн кереги "
 "жок"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<hdlist файлынын салыштырма жолу> жок\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "\"%s\" булагына жетүүгө мүмкүн эмес"
@@ -2907,12 +2916,12 @@ msgstr "  -f             - hdlist файлдардын түзүүгө мажбу
 msgid "Only superuser is allowed to update media"
 msgstr "Суперколдонуучу гана пакет булактарын жаңылай алат"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "жаңылоого эч нерсе жок (булак кошуу үчүн urpmi.addmedia колдонуңуз)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2921,17 +2930,17 @@ msgstr ""
 "жаңылоо үчүн пунк жок\n"
 "(%s ичинен бири)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "%s булагы оңдолууда:"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "%s булагы иштөөдө"
@@ -3221,6 +3230,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "changelog табылбады\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - жаңылоо булагын түзүү.\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "туура эмес форматталган кирүү: [%s]"
diff --git a/po/lt.po b/po/lt.po
index 69769373..018a19dc 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2005-08-18 23:34+0200\n"
 "Last-Translator: Arvydas Svirka <arvydas@arvis.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
 "100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM įdiegimas"
@@ -30,7 +30,7 @@ msgstr "RPM įdiegimas"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Gerai"
@@ -96,7 +96,7 @@ msgstr "Į_diegti"
 msgid "_Save"
 msgstr "Iš_saugoti"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Atšaukti"
@@ -128,8 +128,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - spausdinti šį pagalbos pranešimą.\n"
@@ -164,7 +165,7 @@ msgstr ""
 "                   (--no-verify-rpm funkciją išjungia, standartiškai ji yra "
 "įjungta).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -216,7 +217,7 @@ msgstr "Palaukite..."
 msgid "Must be root"
 msgstr "Turi būti pradinis"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -227,42 +228,42 @@ msgstr ""
 "%s\n"
 "Tęsti?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Dėmesio"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Gerai"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (atnaujinti)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (įdiegti)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Paketų pasirinkimas"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Vienas iš šių paketų yra reikalingas."
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Nutraukti"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -273,19 +274,19 @@ msgstr ""
 "%s\n"
 "Tęsti?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Priklausomybių patenkinimui, bus įdiegtas šis paketas (%d MB)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Priklausomybių patenkinimui, bus įdiegtas šis paketas (%d MB)"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -293,42 +294,42 @@ msgstr[0] "%d paketų"
 msgstr[1] "%d paketų"
 msgstr[2] "%d paketų"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Paketų įdiegimas..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "negaliu gauti pirminių paketų, nutraukiu"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Ruošiamasi..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Įdiegiamas paketas `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Įdėkite laikmeną, pavadintą \"%s\", į įrenginį [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Parsiunčiamas paketas `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "Baigta"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -339,28 +340,28 @@ msgstr ""
 "%s\n"
 "Jūs galite norėti atnaujinti urpmi duomenų bazę"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Įdiegimas nepavyko"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Paketas(-ai) jau įdiegti"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Įdiegimas baigtas"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "pašalinama %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "iš naujo paleidžiama urpmi"
@@ -440,8 +441,8 @@ msgid "...retrieving done"
 msgstr "...atkūrimas baigtas"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...atkūrimas nepavyko: %s"
@@ -481,52 +482,52 @@ msgstr "Operacija yra draudžiama, kai dirbama apribotoje veiksenoje"
 msgid "bad proxy declaration on command line\n"
 msgstr "blogas tarpinio serverio deklaravimas komandinėje eilutėje\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: negaliu perskaityti rpm bylos \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Nėra ženklo (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -953,217 +954,217 @@ msgstr ""
 "--sintezė negali būti naudojama su --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Paieškos pradžia: %s pabaiga: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "praleidžiamas paketas %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "bus įdiegtas vietoje atnaujinimo paketo %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "laikmena \"%s\" jau yra"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "iš laikmenos \"%s\" skaitomos antraštės"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "pašalinama laikmena \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "negaliu atverti rpmdb"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "negaliu prieiti prie pirmojo įdiegimo laikmenos (nerasta hdlists byla)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "atkuriama hdlists byla..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "bandoma išrinkti nesančią laikmeną \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "išrenkama daugialypė laikmena: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "pašalinama laikmena \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "laikmenai \"%s\" iš naujo konfigūruojama urpmi"
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...naujas konfigūravimas nepavyko"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "naujas konfigūravimas atliktas"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "laikmena \"%s\" neišrinkta"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "tikrinama sintezės byla [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "laikmenos \"%s\" sintezės bylos skaitymo problema"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "įrašoma laikmenos \"%s\" sąrašo byla"
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...kopijavimas nepavyko"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopijuojama \"%s\" aprašo byla..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...kopijavimas baigtas"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "[%s] kopijavimas nepavyko (byla per daug maža)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "atkurtam hdlist (arba sintezei) skaičiuojama md5sum"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] kopijavimas nepavyko (md5sum neatitikimas)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "tikrinama hdlist byla [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "iš %2$s įdiegiamas %1$s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "laikmenai \"%s\" nerasta hdlist byla"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "kopijuojama \"%s\" aprašo byla..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "netinkamas rpm bylos vardas [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "atkuriamas \"%s\" pirminis hdlist (arba zintezė)..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "rastas ištirtas hdlist (arba sintezė) kaip %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "laikmenai \"%s\" nerasta hdlist byla"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "tikrinama \"%s\" pubkey byla..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...iš \"%2$s\" pubkey bylos importuotas raktas %1$s"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "negaliu importuoti \"%s\" pubkey bylos"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "įtraukta laikmena %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1195,7 +1196,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "TtYy"
@@ -1265,7 +1266,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1349,276 +1350,7 @@ msgstr "prijungiama %s"
 msgid "unmounting %s"
 msgstr "atjungiama %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Nėra paketo, pavadinto %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Šie paketai turi %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Paketas(-ai) jau įdiegti"
-
-#: ../urpm/select.pm:539
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Paketas(-ai) jau įdiegti"
-
-#: ../urpm/select.pm:540
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Paketas(-ai) jau įdiegti"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "dėl trūkstamo %s"
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "Paketas(-ai) jau įdiegti"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "dėl nepatenkinto %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "bandau paaukštinti %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "%s išlaikymui"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "%s įdiegimui"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "dėl konfliktų su %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Netinkamas ženklas (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Netinkamas rakto ID (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Nėra ženklo (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "Įjungti ar išjungti bendrą naudojimąsi bylomis"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "Kopijavimas nepavyko"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "Kopijavimas nepavyko"
-
-#: ../urpme:41
-#, fuzzy, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme versija %s\n"
-"Autorinės teisės (C) 1999-2005 Mandriva.\n"
-"Tai yra nemokama programa, kuri gali būti platinama pagal GNU GPL "
-"licenciją.\n"
-"\n"
-"naudojimas:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - automatiškai parinkti paketą pasirinkimų sąraše.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr ""
-"  --test         - tikrinti, jei pašalinimas negali būti tinkamai "
-"įvykdytas.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi paskirstomas po kompiuterius.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, fuzzy, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --packager     - spausdinti žymens archyvatorių: archyvatorius.\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - naudokite kitą pradinį (root) rpm pašalinimui.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - rpm įdiegimui naudokite kitą pradinį.\n"
-
-#: ../urpme:55
-#, fuzzy, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --description  - spausdinti žymens aprašymą: aprašymas.\n"
-
-#: ../urpme:56
-#, fuzzy, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - konfigūruoti urpmi iš paskirstymo medžio on the fly "
-"metodu, naudinga\n"
-"                   įdiegti (pašalinti) chroot su --root parinktimi.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, fuzzy, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose      - verbose veiksena.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - išrinkti visus paketus, atitinkančius išraišką.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Paketus pašalinti gali tik supervartotojas"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "nežinomi paketai"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "nežinomas paketas"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "paketo %s pašalinimas sugadins jūsų sistemą"
-msgstr[1] "paketo %s pašalinimas sugadins jūsų sistemą"
-msgstr[2] "paketo %s pašalinimas sugadins jūsų sistemą"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Nėra ką pašalinti"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Nėra ką pašalinti"
-
-#: ../urpme:147
-#, fuzzy, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "Priklausomybių patenkinimui, šie paketai %d bus pašalinti (%d MB)"
-msgstr[1] "Priklausomybių patenkinimui, šie paketai %d bus pašalinti (%d MB)"
-msgstr[2] "Priklausomybių patenkinimui, šie paketai %d bus pašalinti (%d MB)"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "nežinomas paketas"
-msgstr[1] "nežinomas paketas"
-msgstr[2] "nežinomas paketas"
-
-#: ../urpme:159
-#, fuzzy, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "pašalinamas paketas %s"
-msgstr[1] "pašalinamas paketas %s"
-msgstr[2] "pašalinamas paketas %s"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (t/N) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "išimamas įrenginys priimamas kaip \"%s\""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Pašalinimas nepavyko"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Pašalinimas nepavyko"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1635,30 +1367,37 @@ msgstr ""
 "\n"
 "naudojimas:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - spausdinti šį pagalbos pranešimą.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - naudoti specifinę aplinką (paprastai klaidos "
 "pranešimas).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - nenaudoti duotųjų laikmenų, atskirtų kableliu.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - rpm įdiegimui naudokite kitą pradinį.\n"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1666,259 +1405,532 @@ msgstr ""
 "  --sortmedia    - rikiuoti laikmenas pagal papildomas eilutes, atskirtas "
 "kableliu.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 "  --synthesis    - vietoje urpmi duomenų bazės naudokite duotąją sintezę.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - vietoje urpmi duomenų bazės naudokite duotąją sintezę.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - nespausdinti identiškų eilučių.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - naudoti tik atnaujinimo laikmeną.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - verbose veiksena.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - ignoruoti kiekvieno pavyzdžio raidžių dydžio skirtumus.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -i             - ignoruoti kiekvieno pavyzdžio raidžių dydžio skirtumus.\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - perl kodą įtraukti tiesiogiai kaip perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - dvejetainis IR operatorius.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - dvejetainis ARBA operatorius.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - elementas NE.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 "  )              - dešinysis skliaustelis grupės išraiskos uždarymui.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr ""
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  -g             - spausdinti grupes kartu su pavadinimu.\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    standartinis yra %s.\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - spausdinti žymens url: url.\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - spausdinti žymens buildhost: build host.\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "taikyti konfigūracijos bylos pakeitimus"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - spausdinti žymenų konfliktus: visi konfliktai.\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - spausdinti žymens aprašymą: aprašymas.\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - spausdinti žymenų laikotarpį: laikotarpis.\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name         - spausdinti tik paketų pavadinimus.\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - paketo bylas sudėti į sąrašą.\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - spausdinti žymenų grupę: grupė.\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --name         - spausdinti tik paketų pavadinimus.\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - spausdinti tik paketų pavadinimus.\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - spausdinti pasenusius žymenis: visi pasenę.\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - spausdinti žymens archyvatorių: archyvatorius.\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - spausdinti: all provides.\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr ""
 "  --requires     - spausdinti žymenų pareikalavimus: visi pareikalavimai.\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - spausdinti žymenų dydį: dydis.\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - spausdinti žymens pirminį rpm: pirminis rpm.\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --obsoletes    - spausdinti pasenusius žymenis: visi pasenę.\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary, -S  - spausdinti suvestinę.\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - spausdinti žymens url: url.\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - verbose veiksena.\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - paketo bylas sudėti į sąrašą.\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - spausdinimo versija, išleisti ir archyvuoti su "
 "pavadinimu.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "%s naudojama specifinė aplinka\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "laikmenai \"%s\" nerasta hdlist byla"
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "\"%s\" laikmenai sudaryta hdlist sintezės byla"
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "įrašoma laikmenos \"%s\" sąrašo byla"
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Nėra paketo, pavadinto %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Šie paketai turi %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Paketas(-ai) jau įdiegti"
+
+#: ../urpm/select.pm:543
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Paketas(-ai) jau įdiegti"
+
+#: ../urpm/select.pm:544
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Paketas(-ai) jau įdiegti"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "dėl trūkstamo %s"
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Paketas(-ai) jau įdiegti"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "dėl nepatenkinto %s"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "bandau paaukštinti %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "%s išlaikymui"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "%s įdiegimui"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "dėl konfliktų su %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Netinkamas ženklas (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Netinkamas rakto ID (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Nėra ženklo (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Įjungti ar išjungti bendrą naudojimąsi bylomis"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Kopijavimas nepavyko"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "Kopijavimas nepavyko"
+
+#: ../urpme:41
+#, fuzzy, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme versija %s\n"
+"Autorinės teisės (C) 1999-2005 Mandriva.\n"
+"Tai yra nemokama programa, kuri gali būti platinama pagal GNU GPL "
+"licenciją.\n"
+"\n"
+"naudojimas:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - automatiškai parinkti paketą pasirinkimų sąraše.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+"  --test         - tikrinti, jei pašalinimas negali būti tinkamai "
+"įvykdytas.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi paskirstomas po kompiuterius.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, fuzzy, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --packager     - spausdinti žymens archyvatorių: archyvatorius.\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - naudokite kitą pradinį (root) rpm pašalinimui.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - atnaujinti tik atnaujinimo laikmenas.\n"
+
+#: ../urpme:56
+#, fuzzy, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --description  - spausdinti žymens aprašymą: aprašymas.\n"
+
+#: ../urpme:57
+#, fuzzy, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - konfigūruoti urpmi iš paskirstymo medžio on the fly "
+"metodu, naudinga\n"
+"                   įdiegti (pašalinti) chroot su --root parinktimi.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - verbose veiksena.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - išrinkti visus paketus, atitinkančius išraišką.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Paketus pašalinti gali tik supervartotojas"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "nežinomi paketai"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "nežinomas paketas"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "paketo %s pašalinimas sugadins jūsų sistemą"
+msgstr[1] "paketo %s pašalinimas sugadins jūsų sistemą"
+msgstr[2] "paketo %s pašalinimas sugadins jūsų sistemą"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Nėra ką pašalinti"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Nėra ką pašalinti"
+
+#: ../urpme:149
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Priklausomybių patenkinimui, šie paketai %d bus pašalinti (%d MB)"
+msgstr[1] "Priklausomybių patenkinimui, šie paketai %d bus pašalinti (%d MB)"
+msgstr[2] "Priklausomybių patenkinimui, šie paketai %d bus pašalinti (%d MB)"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "nežinomas paketas"
+msgstr[1] "nežinomas paketas"
+msgstr[2] "nežinomas paketas"
+
+#: ../urpme:161
+#, fuzzy, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "pašalinamas paketas %s"
+msgstr[1] "pašalinamas paketas %s"
+msgstr[2] "pašalinamas paketas %s"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (t/N) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "išimamas įrenginys priimamas kaip \"%s\""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Pašalinimas nepavyko"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Pašalinimas nepavyko"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2012,11 +2024,6 @@ msgstr "  --clean        - prieš ką nors atliekant, iš cache pašalinti rpm.\
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - rpms iš cache neišvalyti.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - atnaujinti tik atnaujinimo laikmenas.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2346,7 +2353,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Ar vis tiek tęsti?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (T/n) "
@@ -2533,10 +2540,12 @@ msgstr "  --curl         - tolimų bylų atkūrimui naudokite curl.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - sukurti atnaujinimo laikmeną.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2544,24 +2553,24 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - bandyti surasti ir panaudoti sintezės bylą.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  --no-probe     - nebandyti surasti nei sintezes, nei\n"
 "                   hdlist bylų.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2570,17 +2579,17 @@ msgstr ""
 "  --distrib      - automatiškai sukurti visas laikmenas iš įdiegimo\n"
 "                   laikmenos.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - pateikti galimų laikmenų sąrašą.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2590,92 +2599,92 @@ msgstr ""
 "yra\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - sukurti nuolat atnaujinamą laikmeną,\n"
 "                   leidžiamas tiks toks protokolas file:// .\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - išjungti MD5SUM bylos tikrinimą.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - įtrauktai laikmenai neimportuoti pubkey\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - įtraukti laikmenos konfigūraciją, bet jos neatnaujinti.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - paslėptoji veiksena.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - verbose veiksena.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Įtraukti laikmeną gali tik supervartotojas"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "Bus sukurta konfigūracijos byla [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Negaliu sukurti konfigūracijos bylos [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "nebūtina duoti <atitinkamas hdlist kelias> su --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<atitinkamas hdlist kelias> nėra\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "negaliu prieiti prie laikmenos \"%s\""
@@ -2913,12 +2922,12 @@ msgstr "  -f             - vykdyti hdlist bylų sudarymą.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Atnaujinti laikmenas gali tik supervartotojas"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nėra ką atnaujinti (laikmenos pridėjimui naudokite urpmi.addmedia)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2927,17 +2936,17 @@ msgstr ""
 "atnaujintino įrašo nėra\n"
 "(vienas iš %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignoruojama laikmena %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "įgalinama laikmena %s"
@@ -3224,6 +3233,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Nerastas changelog\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - sukurti atnaujinimo laikmeną.\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "blogai suformuotas įvedimas: [%s]"
diff --git a/po/lv.po b/po/lv.po
index aa5fef19..1b23bcc1 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2002-09-27 17:43+0200\n"
 "Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
 "Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Sagatavoju instalēšanu"
@@ -31,7 +31,7 @@ msgstr "Sagatavoju instalēšanu"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Labi"
@@ -81,7 +81,7 @@ msgstr "_Uzstādīt"
 msgid "_Save"
 msgstr "_Saglabāt"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "At_celt"
@@ -112,8 +112,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
@@ -144,7 +145,7 @@ msgid ""
 "                   (--no-verify-rpm disables it, default is enabled).\n"
 msgstr ""
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, fuzzy, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
@@ -193,7 +194,7 @@ msgstr "Lūdzu gaidiet..."
 msgid "Must be root"
 msgstr "Peles ports"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -204,42 +205,42 @@ msgstr ""
 "%s\n"
 "vai piekrītat?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Uzmanību"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Labi"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "Atjaunināt"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Instalēšanas beigas"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Ir nepieciešama viena no sekojošām pakotnēm:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Pārtraukt"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -247,19 +248,19 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Tiks noņemtas sekojošas pakotnes"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d MB)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d MB)"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -267,42 +268,42 @@ msgstr[0] "%d pakotnes"
 msgstr[1] "%d pakotnes"
 msgstr[2] "%d pakotnes"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, fuzzy, c-format
 msgid "Package installation..."
 msgstr "Sagatavoju instalēšanu"
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "nevar dabūt koda pakotnes, pārtraucu"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Sagatavoju..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, fuzzy, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalēju pakotnes..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Lūdzu ielieciet datu nesēju \"%s\" ierīcē [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "Instalēju pakotnes..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "Izdarīts"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -310,28 +311,28 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Instalēšana neizdevās"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "viss jau ir instalēts"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Instalēšana pabeigta"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "Atvienoju %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
@@ -413,8 +414,8 @@ msgid "...retrieving done"
 msgstr "...atgūšana veikta"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...atgūšana neizdevās: %s"
@@ -454,52 +455,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, fuzzy, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "nevar nolasīt izvēlnes failu:%s"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Neesoši ieraksti"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -924,217 +925,217 @@ msgid ""
 "update, --use-distrib or --parallel"
 msgstr "--synthesis nevar tikt lietots ar --media, --update vai --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, fuzzy, c-format
 msgid "Search start: %s end: %s"
 msgstr "Meklēt instalētos fontus"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, fuzzy, c-format
 msgid "skipping package %s"
 msgstr "Instalēju pakotni %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "Problēmas, instalējot pakotni %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "datu nesējs \"%s\" jau eksistē"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "problēma nolasot datu nesēja \"%s\" synthesis failu"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "noņemu datu nesēju \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "Nevar atvērt failu %s\n"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "nav iespējams piekļūt pirmajam instalācijas datu nesējam"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "atgūstu hdlists failu..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "nevar izveidot datu nesēju \"%s\"\n"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, fuzzy, c-format
 msgid "selecting multiple media: %s"
 msgstr "izvēlos vairākas vides: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "noņemu datu nesēju \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, fuzzy, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "Konfigurēju printeri \"%s\"..."
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, fuzzy, c-format
 msgid "...reconfiguration failed"
 msgstr "Izvēlnes konfigurācija saglabāta"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, fuzzy, c-format
 msgid "reconfiguration done"
 msgstr "Servera konfigurācija"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "datu nesējs \"%s\" nav izvēlēts"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "eksaminēju synthesis failu [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problēma nolasot datu nesēja \"%s\" synthesis failu"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, fuzzy, c-format
 msgid "...copying failed"
 msgstr "...kopēšana veikta"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopēju \"%s\" apraksta failu ..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...kopēšana veikta"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, fuzzy, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "[%s] kopēšana neizdevās"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "saraksta fails priekš \"%s\" ir tukšs"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] kopēšana neizdevās"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "eksaminēju hdlist failu [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "tiek instalēta %s\n"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "kopēju \"%s\" apraksta failu ..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "nederīgs rpm faila vārds [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "atgūstu hdlists failu..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "saraksta fails priekš \"%s\" ir tukšs"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "kopēju \"%s\" apraksta failu ..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "nevaru ierakstīt \"%s\" saraksta failu"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "nevaru ierakstīt \"%s\" saraksta failu"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "pievienoju datu nesēju %s."
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1166,7 +1167,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "jJYy"
@@ -1236,7 +1237,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1320,6 +1321,302 @@ msgstr "montēju %s"
 msgid "unmounting %s"
 msgstr "atmontēju %s"
 
+#: ../urpm/search.pm:29 ../urpmf:29
+#, fuzzy, 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 ""
+"mdkupdate versija %s\n"
+"Autortiesības (C) %s Mandriva.\n"
+"Šī ir brīva programmatūra, ko var izplatīt saskaņā ar GNU GPL noteikumiem.\n"
+"\n"
+"Pielietojums:\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
+
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
+#, fuzzy, c-format
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
+
+#: ../urpm/search.pm:39 ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --wget         - lietot wget, lai iegūtu attālinātos failus.\n"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
+#, fuzzy, c-format
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\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 ""
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, fuzzy, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, fuzzy, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, fuzzy, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             - runīgais režīms.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpm/search.pm:52 ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, fuzzy, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -q             - klusais režīms.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, fuzzy, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -q             - klusais režīms.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, fuzzy, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  -q             - klusais režīms.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  -c             - iztīrīt iesākumu kešatmiņas direktoriju.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Atjaunojamo datu saraksts:\n"
+"\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - lietot X saskarni.\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr ""
+"\n"
+"                    DrakBackup ziņojuma detaļas\n"
+"\n"
+"\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --files         - drukāt iezīmi: faili (vairākas rindiņas)."
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Konsoles konfigurācijas modulis"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts     - drukāt iezīmi: konflikti (vairākas rindiņas)."
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description   - drukāt iezīmui: apraksts."
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes     - drukāt iezīmi: novecojušas (vairākas rindiņas)."
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides      - drukāt iezīmi: nodrošina (vairākas rindiņas)."
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires      - drukāt iezīmi: nepieciešamas (vairākas rindiņas)."
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --group         - drukāt iezīmi: grupa."
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes     - drukāt iezīmi: novecojušas (vairākas rindiņas)."
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary       - drukāt iezīmi: kopsavilkums."
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  -v             - runīgais režīms.\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, fuzzy, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -v             - runīgais režīms.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr ""
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "uzbūvēju hdlist synthesis failu priekš datu nesēja \"%s\""
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1331,62 +1628,67 @@ msgid ""
 "urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, c-format
 msgid "No package named %s"
 msgstr "Nav pakotnes ar nosaukumu %s"
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Sekojošas pakotnes satur %s: %s"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "viss jau ir instalēts"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "viss jau ir instalēts"
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "viss jau ir instalēts"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, fuzzy, c-format
 msgid "due to missing %s"
 msgstr "trūkstošs kdesu"
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "viss jau ir instalēts"
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, fuzzy, c-format
 msgid "due to unsatisfied %s"
 msgstr "trūkstošs kdesu"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, fuzzy, c-format
 msgid "trying to promote %s"
 msgstr "Nav nekā, ko noņemt.\n"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, fuzzy, c-format
 msgid "in order to keep %s"
 msgstr "Loga rāmja tēma"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, fuzzy, c-format
 msgid "in order to install %s"
 msgstr "nevaru instalēt pakotni %s"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, fuzzy, c-format
 msgid "due to conflicts with %s"
 msgstr "%s konflikē ar %s"
@@ -1478,50 +1780,49 @@ msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --wget         - lietot wget, lai iegūtu attālinātos failus.\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --wget         - lietot wget, lai iegūtu attālinātos failus.\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --description   - drukāt iezīmui: apraksts."
 
-#: ../urpme:56
+#: ../urpme:57
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, fuzzy, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  -v             - runīgais režīms.\n"
 
-#: ../urpme:59
+#: ../urpme:60
 #, fuzzy, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -c             - iztīrīt iesākumu kešatmiņas direktoriju.\n"
 
-#: ../urpme:72
+#: ../urpme:73
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Tikai root drīkst instalēt pakotnes"
 
-#: ../urpme:105
+#: ../urpme:106
 #, fuzzy, c-format
 msgid "unknown packages"
 msgstr "%d pakotnes"
 
-#: ../urpme:105
+#: ../urpme:106
 #, fuzzy, c-format
 msgid "unknown package"
 msgstr "%d pakotnes"
 
-#: ../urpme:119
+#: ../urpme:121
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1529,17 +1830,17 @@ msgstr[0] "pakotnes %s noņemšana sabojās Jūsu sistēmu\n"
 msgstr[1] "pakotnes %s noņemšana sabojās Jūsu sistēmu\n"
 msgstr[2] "pakotnes %s noņemšana sabojās Jūsu sistēmu\n"
 
-#: ../urpme:124
+#: ../urpme:126
 #, fuzzy, c-format
 msgid "Nothing to remove"
 msgstr "Nav iezīmes ko noņemt!"
 
-#: ../urpme:141
+#: ../urpme:143
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Nav iezīmes ko noņemt!"
 
-#: ../urpme:147
+#: ../urpme:149
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1548,7 +1849,7 @@ msgstr[0] "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d M
 msgstr[1] "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d MB)"
 msgstr[2] "Lai apmierinātu atkarības, tiks noņemtas sekojošas pakotnes (%d MB)"
 
-#: ../urpme:152
+#: ../urpme:154
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1556,7 +1857,7 @@ msgstr[0] "%d pakotnes"
 msgstr[1] "%d pakotnes"
 msgstr[2] "%d pakotnes"
 
-#: ../urpme:159
+#: ../urpme:161
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1564,320 +1865,31 @@ msgstr[0] "Instalēju pakotni %s"
 msgstr[1] "Instalēju pakotni %s"
 msgstr[2] "Instalēju pakotni %s"
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (j/N) "
 
-#: ../urpme:164
+#: ../urpme:166
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "Atvienojama ierīce"
 
-#: ../urpme:178
+#: ../urpme:181
 #, fuzzy, c-format
 msgid "Removal failed"
 msgstr "Neveiksmīga Pieteikšanās"
 
-#: ../urpme:180
+#: ../urpme:183
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Neveiksmīga Pieteikšanās"
 
-#: ../urpmf:29
-#, fuzzy, 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 ""
-"mdkupdate versija %s\n"
-"Autortiesības (C) %s Mandriva.\n"
-"Šī ir brīva programmatūra, ko var izplatīt saskaņā ar GNU GPL noteikumiem.\n"
-"\n"
-"Pielietojums:\n"
-
-#: ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, fuzzy, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, fuzzy, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
-
-#: ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-
-#: ../urpmf:45
-#, fuzzy, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, fuzzy, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
-
-#: ../urpmf:47
-#, fuzzy, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             - runīgais režīms.\n"
-
-#: ../urpmf:48
-#, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
-
-#: ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpmf:53
-#, fuzzy, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
-
-#: ../urpmf:54
-#, fuzzy, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -q             - klusais režīms.\n"
-
-#: ../urpmf:55
-#, fuzzy, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -q             - klusais režīms.\n"
-
-#: ../urpmf:56
-#, fuzzy, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  -q             - klusais režīms.\n"
-
-#: ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  -c             - iztīrīt iesākumu kešatmiņas direktoriju.\n"
-
-#: ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Atjaunojamo datu saraksts:\n"
-"\n"
-
-#: ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - lietot X saskarni.\n"
-
-#: ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr ""
-"\n"
-"                    DrakBackup ziņojuma detaļas\n"
-"\n"
-"\n"
-
-#: ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
-
-#: ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --files         - drukāt iezīmi: faili (vairākas rindiņas)."
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "Konsoles konfigurācijas modulis"
-
-#: ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts     - drukāt iezīmi: konflikti (vairākas rindiņas)."
-
-#: ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description   - drukāt iezīmui: apraksts."
-
-#: ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
-
-#: ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-
-#: ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-
-#: ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
-
-#: ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-
-#: ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-
-#: ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes     - drukāt iezīmi: novecojušas (vairākas rindiņas)."
-
-#: ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-
-#: ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides      - drukāt iezīmi: nodrošina (vairākas rindiņas)."
-
-#: ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires      - drukāt iezīmi: nepieciešamas (vairākas rindiņas)."
-
-#: ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
-
-#: ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --group         - drukāt iezīmi: grupa."
-
-#: ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes     - drukāt iezīmi: novecojušas (vairākas rindiņas)."
-
-#: ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary       - drukāt iezīmi: kopsavilkums."
-
-#: ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --help         - izvadīt šo palīdzības ziņojumu.\n"
-
-#: ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  -v             - runīgais režīms.\n"
-
-#: ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, fuzzy, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -v             - runīgais režīms.\n"
-
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr ""
-
-#: ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
-
-#: ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "uzbūvēju hdlist synthesis failu priekš datu nesēja \"%s\""
-
-#: ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
-
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1960,11 +1972,6 @@ msgstr "  --clean        - izņemt rpm no kešatmiņas, pirms darīt ko citu.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --clean        - izņemt rpm no kešatmiņas, pirms darīt ko citu.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2268,7 +2275,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Tad turpināt?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
@@ -2447,10 +2454,12 @@ msgstr "  --curl         - lietot curl, lai iegūtu attālinātos failus.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2458,24 +2467,24 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr ""
 "  -h             - mēģināt atrast un lietot synthesis vai hdlist failu.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  -h             - mēģināt atrast un lietot synthesis vai hdlist failu.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, fuzzy, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2484,106 +2493,106 @@ msgstr ""
 "  --distrib      - automātiski veidot visas vides no instalācijas datu "
 "nesēja.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list         - izvadīt sarakstu ar pieejamām pakotnēm.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - klusais režīms.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - runīgais režīms.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, fuzzy, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Tikai root drīkst instalēt pakotnes"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "rakstu konfigurācijas failu [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, fuzzy, c-format
 msgid "Can't create config file [%s]"
 msgstr "rakstu konfigurācijas failu [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "nav nepieciešams uzrādīt <hdlist relatīvo ceļu> ar --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<relative path of hdlist> trūkst\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "nav iespējams piekļūt datu nesējam \"%s\""
@@ -2818,13 +2827,13 @@ msgstr "  -f             - forsēt hdlist failu ģenerēšanu.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Tikai root drīkst instalēt pakotnes"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "nav ko atjaunināt (lietojiet urpmi.addmedia, lai pievienotu datu nesēju)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2833,17 +2842,17 @@ msgstr ""
 "atjuninājumā trūkst kāda ieraksta\n"
 "(viens no %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "noņemu datu nesēju \"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "noņemu datu nesēju \"%s\""
@@ -3102,6 +3111,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Cietņi netika atrasti"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - izveidot atjaunināšanas datu nesēju.\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "nepareizi izveidots ievads: [%s]"
diff --git a/po/mk.po b/po/mk.po
index 37aa3417..b09a19a3 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2005-07-18 01:58+0200\n"
 "Last-Translator: Зоран Димовски <decata@mt.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Generator: KBabel 1.10.1\n"
 "Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM инсталација"
@@ -29,7 +29,7 @@ msgstr "RPM инсталација"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Во ред"
@@ -96,7 +96,7 @@ msgstr "_Инсталирај"
 msgid "_Save"
 msgstr "_Зачувај"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Откажи"
@@ -128,8 +128,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - ја испишува оваа помошна порака.\n"
@@ -165,7 +166,7 @@ msgstr ""
 "                   (--no-verify-rpm го оневозможува, стандардно е "
 "овозможен).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -216,7 +217,7 @@ msgstr "Ве молиме почекајте..."
 msgid "Must be root"
 msgstr "Мора да сте root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -227,42 +228,42 @@ msgstr ""
 "%s\n"
 "Да продолжам?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Предупредување"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Во ред"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (за надоградување)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (за инсталирање)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Избор на пакети"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Потребен е еден од следниве пакети:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Откажи"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -273,14 +274,14 @@ msgstr ""
 "%s\n"
 "Да продолжам?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "За да се задоволат зависностите, следниов пакет ќе биде инсталиран (%d MB)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -288,49 +289,49 @@ msgstr ""
 "За да се задоволат зависностите, ќе се инсталираат следниве %d пакети:\n"
 "%s\n"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "%d пакети"
 msgstr[1] "%d пакети"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Инсталација на пакетот..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "не можам да ги добија изворните пакети, прекинувам"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Се подготвувам..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Инсталирам пакет `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Ве молиме внесете го медиумот именуван како \"%s\" во уредот [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Го преземам пакетот `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Завршено"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -341,28 +342,28 @@ msgstr ""
 "%s\n"
 "Можеби сакате да ја ажурирате вашата urpmi база на податоци"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Инсталацијата не успеа"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Се е веќе инсталирано"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Инсталирањето заврши"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "отстранувам %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "рестартирам urpmi"
@@ -442,8 +443,8 @@ msgid "...retrieving done"
 msgstr "...преземањето заврши"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...преземањето не успеа: %s"
@@ -483,52 +484,52 @@ msgstr "Оваа акција не е дозволена додека работ
 msgid "bad proxy declaration on command line\n"
 msgstr "лоша декларација на прокси во командната линија\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: не можам да ја прочитам rpm датотеката \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Недостасува потпис (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -959,219 +960,219 @@ msgstr ""
 "--synthesis не може да се користи со --media, --excludemedia, --sortmedia, --"
 "update или --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Почеток на барањето: %s крај: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "го прескокнувам пакетот %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "пакетот %s ќе се инсталира наместо да се ажурира"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "медиумот \"%s\" веќе постои"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "ги читам заглавјата од медиумот \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "го отстранувам медиумот \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "не можам да отворам rpmdb"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "не можам да пристапам на првиот медиум за инсталација (не е пронајдена "
 "датотека на hdlist)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "преземам датотека на hdlist..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "се обидувам да изберем непостоечки медиум \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "избирам повеќе медиуми: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "го отстранувам медиумот \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "реконфигурирање на urpmi за медиумот \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...реконфигурирањето не успеа"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "реконфигурирањето заврши"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "не е избран медиумот \"%s\""
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "ја испитувам датотеката synthesis [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "проблем при читање на датотеката synthesis на медиумот \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "запишувам датотека со листа за медиумот \"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...копирањето не успеа"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "се копира датотеката за опис на \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...копирањето заврши"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "копирањето на [%s] не успеа (датотеката е премногу мала)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "пресметувам md5sum на преземаниот изворен hdlist (или synthesis)"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "копирањето на [%s] не успеа (md5sum не се совпаѓа)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "ја испитувам датотеката hdlist [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "инсталирање на %s од %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "не е пронајдена hdlist датотека за медиумот \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "се копира датотеката за опис на \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "невалидно име на rpm датотеката [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "преземам изворен hdlist (или synthesis) на \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "пронајден е пробан hdlist (или synthesis) како %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "не е пронајдена hdlist датотека за медиумот \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "испитувам датотека со јавен клуч од \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...внесен клуч %s од датотека со јавен клуч од \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "не можам да внесам датотека со јавен клуч од \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "додаден медиум %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1203,7 +1204,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Dd"
@@ -1273,7 +1274,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1356,276 +1357,7 @@ msgstr "монтирам %s"
 msgid "unmounting %s"
 msgstr "одмонтирам %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Нема пакет именуван како %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Следниве пакети содржат %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Се е веќе инсталирано"
-
-#: ../urpm/select.pm:539
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Се е веќе инсталирано"
-
-#: ../urpm/select.pm:540
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Се е веќе инсталирано"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "поради недостаток на %s"
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "Се е веќе инсталирано"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "поради незадоволени %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "се обидувам да промовирам %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "за да се задржи %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "за да се инсталира %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "поради конфликти со %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Невалиден потпис (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Невалиден ID на клучот (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Недостасува потпис (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "Не може да се направи конфигурациона датотека [%s]"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "Копирањето не успеа"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "Копирањето не успеа"
-
-#: ../urpme:41
-#, fuzzy, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme верзија %s\n"
-"Авторски права (C) 1999-2005 Mandriva.\n"
-"Ова е бесплатен софтвер и може да се редистрибуира под условите на GNU GPL.\n"
-"\n"
-"употреба:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - автоматски изберете пакет со избор.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - проверете дали отстранувањето ќе заврши успешно.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - дистрибуиран urpmi низ машини со прекари.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, fuzzy, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr ""
-"  --packager     - го испишува тагот на личноста која го направила пакетот: "
-"личност која го направила пакетот.\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - користи друг root за отстранување на rpm.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - користи друг root за инсталирање на rpm.\n"
-
-#: ../urpme:55
-#, fuzzy, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --description  - го испишува тагот на описот: опис.\n"
-
-#: ../urpme:56
-#, fuzzy, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - брзо конфигурирај го urpmi од дистрибуционо дрво, "
-"корисно\n"
-"                   за (де)инсталирање на chroot со опцијата --root.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, fuzzy, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose      - опширен режим.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - избери ги сите пакети кои се совпаѓаат со изразот.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Само на суперкорисникот му е дозволено да отстранува пакети"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "непознати пакети"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "непознат пакет"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "отстранувањето на пакетот %s ќе го растури вашиот систем"
-msgstr[1] "отстранувањето на пакетот %s ќе го растури вашиот систем"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Нема за отстранување"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Нема за отстранување"
-
-#: ../urpme:147
-#, fuzzy, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] ""
-"За да се задоволат зависностите, следниве %d пакети ќе бидат отстранети (%d "
-"MB)"
-msgstr[1] ""
-"За да се задоволат зависностите, следниве %d пакети ќе бидат отстранети (%d "
-"MB)"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "непознат пакет"
-msgstr[1] "непознат пакет"
-
-#: ../urpme:159
-#, fuzzy, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "го отстранувам пакетот %s"
-msgstr[1] "го отстранувам пакетот %s"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "отстранливите уреди се земаат како \"%s\""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Отстранувањето не успеа"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Отстранувањето не успеа"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1641,30 +1373,37 @@ msgstr ""
 "\n"
 "употреба:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - ја испишува оваа помошна порака.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - користи одредена околина (типично извештај за бубачка).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - не го користи дадениот медиум, одделено со запирка.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - користи друг root за инсталирање на 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"
@@ -1672,270 +1411,543 @@ msgstr ""
 "  --sortmedia    - сортира медиуми според подстринговите одделени со "
 "запирка.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 "  --synthesis    - ја користи дадената синтеза наместо базата на податоци на "
 "urpmi.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - ја користи дадената синтеза наместо базата на податоци на "
 "urpmi.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - не испишува идентични линии.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - користи само ажуриран медиум.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - опширен режим.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - игнорира разлика на буквите во секоја шема.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -i             - игнорира разлика на буквите во секоја шема.\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - вклучива код на perl директно како perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - бинарен И оператор.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - бинарен ИЛИ оператор.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - унарен НЕ.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  )              - десна мала заграда за затворање на групен израз.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "Листа на податоци за повраќање:\n"
 "\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - користи X интерфејс.\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    стандардните се %s.\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - го испишува тагот на url: url.\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr ""
 "  --buildhost    - го испишува тагот на машината каде е направен rpm: "
 "машината каде е направен rpm.\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "примени ги промените во конфигурационата датотека"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - го испишува тагот на конфликти: сите конфликти.\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - го испишува тагот на описот: опис.\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - го испишува тагот на epoch: epoch.\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name         - ги испишува само имињата на пакетите.\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - листа на датотеките во пакетот.\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - го испишува тагот на групата: група.\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --name         - ги испишува само имињата на пакетите.\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - ги испишува само имињата на пакетите.\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 "  --obsoletes    - го испишува тагот на пакетите кои ќе бидат отстранети или "
 "заменети: сите отстранети или заменети.\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr ""
 "  --packager     - го испишува тагот на личноста која го направила пакетот: "
 "личност која го направила пакетот.\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr ""
 "  --provides     - го испишува тагот што всушност инсталира пакетот: сите за "
 "инсталирање.\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr ""
 "  --requires     - го испишува тагот што всушност му е потребно на пакетот "
 "што ќе се инсталира: сите што се потребни.\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - го испишува тагот на големината: големина.\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - го испишува тагот на изворниот rpm: изворен rpm.\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr ""
 "  --obsoletes    - го испишува тагот на пакетите кои ќе бидат отстранети или "
 "заменети: сите отстранети или заменети.\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary, -S  - испишува резиме.\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - го испишува тагот на url: url.\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - опширен режим.\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - листа на датотеките во пакетот.\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - испишува верзија, објавување и архитектура со име.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "употребувам одредена околина на %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "не е пронајдена hdlist датотека за медиумот \"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "изградена е hdlist synthesis датотека за медиумот \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "запишувам датотека со листа за медиумот \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Нема пакет именуван како %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Следниве пакети содржат %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Се е веќе инсталирано"
+
+#: ../urpm/select.pm:543
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Се е веќе инсталирано"
+
+#: ../urpm/select.pm:544
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Се е веќе инсталирано"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "поради недостаток на %s"
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Се е веќе инсталирано"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "поради незадоволени %s"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "се обидувам да промовирам %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "за да се задржи %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "за да се инсталира %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "поради конфликти со %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Невалиден потпис (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Невалиден ID на клучот (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Недостасува потпис (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Не може да се направи конфигурациона датотека [%s]"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Копирањето не успеа"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "Копирањето не успеа"
+
+#: ../urpme:41
+#, fuzzy, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme верзија %s\n"
+"Авторски права (C) 1999-2005 Mandriva.\n"
+"Ова е бесплатен софтвер и може да се редистрибуира под условите на GNU GPL.\n"
+"\n"
+"употреба:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - автоматски изберете пакет со избор.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - проверете дали отстранувањето ќе заврши успешно.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - дистрибуиран urpmi низ машини со прекари.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, fuzzy, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr ""
+"  --packager     - го испишува тагот на личноста која го направила пакетот: "
+"личност која го направила пакетот.\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - користи друг root за отстранување на rpm.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - ажурирај само ажуриран медиум.\n"
+
+#: ../urpme:56
+#, fuzzy, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --description  - го испишува тагот на описот: опис.\n"
+
+#: ../urpme:57
+#, fuzzy, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - брзо конфигурирај го urpmi од дистрибуционо дрво, "
+"корисно\n"
+"                   за (де)инсталирање на chroot со опцијата --root.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - опширен режим.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - избери ги сите пакети кои се совпаѓаат со изразот.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Само на суперкорисникот му е дозволено да отстранува пакети"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "непознати пакети"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "непознат пакет"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "отстранувањето на пакетот %s ќе го растури вашиот систем"
+msgstr[1] "отстранувањето на пакетот %s ќе го растури вашиот систем"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Нема за отстранување"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Нема за отстранување"
+
+#: ../urpme:149
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"За да се задоволат зависностите, следниве %d пакети ќе бидат отстранети (%d "
+"MB)"
+msgstr[1] ""
+"За да се задоволат зависностите, следниве %d пакети ќе бидат отстранети (%d "
+"MB)"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "непознат пакет"
+msgstr[1] "непознат пакет"
+
+#: ../urpme:161
+#, fuzzy, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "го отстранувам пакетот %s"
+msgstr[1] "го отстранувам пакетот %s"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "отстранливите уреди се земаат како \"%s\""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Отстранувањето не успеа"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Отстранувањето не успеа"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2032,11 +2044,6 @@ msgstr "  --clean        - отстрани rpm од кешот пред се д
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - не ги бриши rpm пакетите од кешот.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - ажурирај само ажуриран медиум.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2374,7 +2381,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Продолжуваме?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (D/n) "
@@ -2562,10 +2569,12 @@ msgstr "  --curl         - користи curl за преземање на да
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - креирај ажуриран медиум.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2573,25 +2582,25 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - се обидува да пронајде и користи synthesis датотека.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  --no-probe     - не се обидува да пронајде било каква synthesis или\n"
 "                   hdlist датотека.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2600,17 +2609,17 @@ msgstr ""
 "  --distrib      - автоматски создади ги сите медиуми од инсталационен\n"
 "                   медиум.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - листа на достапни медиуми.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2620,92 +2629,92 @@ msgstr ""
 "е\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - создади виртуелени медиуми кои постојано се ажурирани,\n"
 "                   само протоколот file:// е дозволен.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - оневозможи MD5SUM датотечна проверка.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - не внесувај јавен клуч од додадениот медиум\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - додава медиум во конфигурацијата, но не го ажурира.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - тивок режим.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - опширен режим.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Само на суперкорисникот му е дозволено да додава медиуми"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "Ќе се направи конфигурациона датотека [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Не може да се направи конфигурациона датотека [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "нема потреба да давате <релативна патека на hdlist> со --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "недостасува <релативна патека на hdlist>\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "не можам да пристапам на медиумот \"%s\""
@@ -2943,12 +2952,12 @@ msgstr "  -f             - принуди генерирање на hdlist да�
 msgid "Only superuser is allowed to update media"
 msgstr "Само на суперкорисникот му е дозволено да ажурира медиуми"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "нема за ажурирање (користете urpmi.addmedia за додавање на медиум)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2957,17 +2966,17 @@ msgstr ""
 "недостасува внесот за ажурирање\n"
 "(еден од %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "игнорирање на медиумот %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "овозможување на медиумот %s"
@@ -3260,6 +3269,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Не е пронајдена измена на евиденцијата\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - креирај ажуриран медиум.\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "неисправен внес: [%s]"
diff --git a/po/mn.po b/po/mn.po
index 538356e9..2566d3f8 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2003-08-22 19:38+0200\n"
 "Last-Translator: Khurelbaatar Lkhagvasuren <hujii247@yahoo.com>\n"
 "Language-Team: Mongolian <openmn-core@lists.sourceforge.net>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: KBabel 1.0.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Суулгалтын бэлтгэл"
@@ -28,7 +28,7 @@ msgstr "Суулгалтын бэлтгэл"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ок"
@@ -76,7 +76,7 @@ msgstr "_Суулгах"
 msgid "_Save"
 msgstr "_Хадгалах"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Хүчингүй"
@@ -108,8 +108,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - Энэ тусламжийг хэвлэх.\n"
@@ -142,7 +143,7 @@ msgstr ""
 "\n"
 " үгүй бол"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -190,7 +191,7 @@ msgstr "Хүлээнэ үү."
 msgid "Must be root"
 msgstr ""
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -198,42 +199,42 @@ msgid ""
 "Continue installation anyway?"
 msgstr "г с вы?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Анхааруулга"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ок"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr ""
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "ямх"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Дараах багцуудын нэг нь шаардлагатай:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid "_Abort"
 msgstr "Таслах"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -241,61 +242,61 @@ msgid ""
 "Continue installation anyway?"
 msgstr "г с вы?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Дараах багцууд суулгагдах гэж байна"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Дараах багцууд суулгагдах гэж байна"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "Тааруухан багц"
 msgstr[1] "Тааруухан багц"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Багц суулгалт..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, fuzzy, c-format
 msgid "unable to get source packages, aborting"
 msgstr "%s багцийг устгаж болсонгүй"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Бэлдэж байна..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' (%s/%s) багцийг суулгаж байна..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "с с"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "`%s' багцыг татан авч байна..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "Биелэгдэв"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -306,28 +307,28 @@ msgstr ""
 "%s\n"
 "Та магадгүй urpmi баазаа шинэчлэх хэрэгтэй байх"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Суулгалтын асуудал"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Бүх зүйл хэдийн суусан байна"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, fuzzy, c-format
 msgid "Installation finished"
 msgstr "Суулгалт боломжтой"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "%s-г устгаж байна"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
@@ -405,8 +406,8 @@ msgid "...retrieving done"
 msgstr "...хүлээн авалт дууслаа"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...хүлээн авалт бүтэлгүйтлээ: %s"
@@ -446,52 +447,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr "тушаалын мөрөнд буруу proxy зарлалт\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: rpm файлыг уншиж чадахгүй \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, c-format
 msgid "missing expression before %s"
 msgstr ""
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -914,217 +915,217 @@ msgid ""
 "update, --use-distrib or --parallel"
 msgstr ""
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, fuzzy, c-format
 msgid "Search start: %s end: %s"
 msgstr "Суулгагдсан бичгийн хэвүүдийг хайх"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "%s багцийг алгасаж байна"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "%s багцийг устгаж болсонгүй"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, fuzzy, c-format
 msgid "medium \"%s\" already exists"
 msgstr "с"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "с"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "%s багцийг устгалт"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "rpmdb-г нээж болсонгүй"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "үгүй"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "hdlists файлыг хүлээн авч байна..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "с"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, fuzzy, c-format
 msgid "selecting multiple media: %s"
 msgstr "с"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, fuzzy, c-format
 msgid "removing medium \"%s\""
 msgstr "%s багцийг устгалт"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, fuzzy, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "с."
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, fuzzy, c-format
 msgid "...reconfiguration failed"
 msgstr "Цэсний тохируулга хадгалагдсан"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, fuzzy, c-format
 msgid "reconfiguration done"
 msgstr "Серверийн тохируулга"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "с бол"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, fuzzy, c-format
 msgid "examining synthesis file [%s]"
 msgstr "MD5SUM файлыг шалгаж байна"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, fuzzy, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "аас с"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "жигсаалт с"
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...хуулалт бүтэлгүйтэв"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, fuzzy, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "Тодорхойлолт аас с."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...хуулждууслаа"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, fuzzy, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "аас с"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "аас"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "аас с"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "hdlist [%s]-ийг байгуулж байна"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "%s-ийг суулгаж байна\n"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "[%s]-ээс ямар нэг rpm олдсонгүй"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "Тодорхойлолт аас с."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "буруу rpm файлын нэр [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "hdlists файлыг хүлээн авч байна..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "аас с."
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "[%s]-ээс ямар нэг rpm олдсонгүй"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" хэвлэгчийн устгаж байна..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "%s файлыг нээж болохгүй байна\n"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "%s файлыг нээж болохгүй байна\n"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "%s файлыг нээж болохгүй байна\n"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1156,7 +1157,7 @@ msgstr "NnүҮ"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyтТ"
@@ -1226,7 +1227,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1309,267 +1310,7 @@ msgstr "%s-ийг салгаж байна"
 msgid "unmounting %s"
 msgstr "%s-ийг салгаж байна"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, fuzzy, c-format
-msgid "No package named %s"
-msgstr "%s нэртэй багц байхгүй байна"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Дараах багцууд %s: %s-ийг агуулж байна"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Бүх зүйл хэдийн суусан байна"
-
-#: ../urpm/select.pm:539
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Бүх зүйл хэдийн суусан байна"
-
-#: ../urpm/select.pm:540
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Бүх зүйл хэдийн суусан байна"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr ""
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "Бүх зүйл хэдийн суусан байна"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr ""
-
-#: ../urpm/select.pm:566
-#, fuzzy, c-format
-msgid "trying to promote %s"
-msgstr "Юу ч үгүй"
-
-#: ../urpm/select.pm:567
-#, fuzzy, c-format
-msgid "in order to keep %s"
-msgstr "ямх"
-
-#: ../urpm/select.pm:603
-#, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "%s багцийг суулгаж болсонгүй"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr ""
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr ""
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr ""
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr ""
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "[%s] тохируулгын файлыг бичиж болсонгүй"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "Хуулалт бүтэлгүйтэв"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "Хуулалт бүтэлгүйтэв"
-
-#: ../urpme:41
-#, fuzzy, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"mdkupdate Version %s\n"
-"Copyright ® %s Mandriva.\n"
-"Энэ бол чөлөөт программ хангамж ба GNU GPL лицензын дагуу цааш \n"
-"тарааж болно.\n"
-"\n"
-"Ашиглалт: \n"
-
-#: ../urpme:47
-#, fuzzy, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "Автоматаар сонгогдсон багцуудыг харуулах"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr ""
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, fuzzy, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "аас"
-
-#: ../urpme:52 ../urpmi:141
-#, fuzzy, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
-
-#: ../urpme:53
-#, fuzzy, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "Мөр"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "Мөр"
-
-#: ../urpme:55
-#, fuzzy, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "Тодорхойлолт Тодорхойлолт Тодорхойлолт"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, fuzzy, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "Нарийвчилан харах бол Esc товч дарна уу"
-
-#: ../urpme:59
-#, fuzzy, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -c             - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
-
-#: ../urpme:72
-#, fuzzy, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "бол"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "үл мэдэгдэх багцууд"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "үл мэдэгдэх багц"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "%s багцийг устгах нь таны системийн ажиллагааг таслах болно"
-msgstr[1] "%s багцийг устгах нь таны системийн ажиллагааг таслах болно"
-
-#: ../urpme:124
-#, fuzzy, c-format
-msgid "Nothing to remove"
-msgstr "Юу ч үгүй"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Юу ч үгүй"
-
-#: ../urpme:147
-#, fuzzy, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "тийш МБ"
-msgstr[1] "тийш МБ"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "үл мэдэгдэх багц"
-msgstr[1] "үл мэдэгдэх багц"
-
-#: ../urpme:159
-#, fuzzy, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "%s багцийг устгалт"
-msgstr[1] "%s багцийг устгалт"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "с"
-
-#: ../urpme:178
-#, fuzzy, c-format
-msgid "Removal failed"
-msgstr "Хуулалт бүтэлгүйтэв"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Хуулалт бүтэлгүйтэв"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1586,280 +1327,551 @@ msgstr ""
 "\n"
 "Ашиглалт: \n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - Энэ тусламжийг хэвлэх.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 ""
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "Мөр"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "аас"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
 #, fuzzy, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "аас"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, fuzzy, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, fuzzy, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "Нарийвчилан харах бол Esc товч дарна уу"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, fuzzy, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -c             - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -c             - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, fuzzy, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -c             - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, fuzzy, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, fuzzy, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "бол"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, fuzzy, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "баруун бүлэг"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "Сэргээх өгөгдөлүүдийн жагсаалт:\n"
 "\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "Консол тохируулгын модул"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "Тодорхойлолт Тодорхойлолт Тодорхойлолт"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --help         - Энэ тусламжийг хэвлэх.\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --help         - Энэ тусламжийг хэвлэх.\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr ""
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr ""
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr ""
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr ""
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "Нарийвчилан харах бол Esc товч дарна уу"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, fuzzy, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "нэр"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, fuzzy, c-format
 msgid "using specific environment on %s\n"
 msgstr "с"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "[%s]-ээс ямар нэг rpm олдсонгүй"
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "с"
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "жигсаалт с"
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, fuzzy, c-format
+msgid "No package named %s"
+msgstr "%s нэртэй багц байхгүй байна"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Дараах багцууд %s: %s-ийг агуулж байна"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Бүх зүйл хэдийн суусан байна"
+
+#: ../urpm/select.pm:543
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Бүх зүйл хэдийн суусан байна"
+
+#: ../urpm/select.pm:544
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Бүх зүйл хэдийн суусан байна"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr ""
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Бүх зүйл хэдийн суусан байна"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr ""
+
+#: ../urpm/select.pm:570
+#, fuzzy, c-format
+msgid "trying to promote %s"
+msgstr "Юу ч үгүй"
+
+#: ../urpm/select.pm:571
+#, fuzzy, c-format
+msgid "in order to keep %s"
+msgstr "ямх"
+
+#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr "%s багцийг суулгаж болсонгүй"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr ""
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr ""
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr ""
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr ""
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "[%s] тохируулгын файлыг бичиж болсонгүй"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Хуулалт бүтэлгүйтэв"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "Хуулалт бүтэлгүйтэв"
+
+#: ../urpme:41
+#, fuzzy, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"mdkupdate Version %s\n"
+"Copyright ® %s Mandriva.\n"
+"Энэ бол чөлөөт программ хангамж ба GNU GPL лицензын дагуу цааш \n"
+"тарааж болно.\n"
+"\n"
+"Ашиглалт: \n"
+
+#: ../urpme:47
+#, fuzzy, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "Автоматаар сонгогдсон багцуудыг харуулах"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, fuzzy, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "аас"
+
+#: ../urpme:52 ../urpmi:141
+#, fuzzy, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
+
+#: ../urpme:53
+#, fuzzy, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "Мөр"
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "„mdkupdate“ хэрэгслээс багцуудыг шинэчилэхэд алдаа.\n"
+
+#: ../urpme:56
+#, fuzzy, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "Тодорхойлолт Тодорхойлолт Тодорхойлолт"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "Нарийвчилан харах бол Esc товч дарна уу"
+
+#: ../urpme:60
+#, fuzzy, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -c             - түр санах ойн хавтасын толгойг цэвэрлэх.\n"
+
+#: ../urpme:73
+#, fuzzy, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "бол"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "үл мэдэгдэх багцууд"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "үл мэдэгдэх багц"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "%s багцийг устгах нь таны системийн ажиллагааг таслах болно"
+msgstr[1] "%s багцийг устгах нь таны системийн ажиллагааг таслах болно"
+
+#: ../urpme:126
+#, fuzzy, c-format
+msgid "Nothing to remove"
+msgstr "Юу ч үгүй"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Юу ч үгүй"
+
+#: ../urpme:149
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "тийш МБ"
+msgstr[1] "тийш МБ"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "үл мэдэгдэх багц"
+msgstr[1] "үл мэдэгдэх багц"
+
+#: ../urpme:161
+#, fuzzy, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "%s багцийг устгалт"
+msgstr[1] "%s багцийг устгалт"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "с"
+
+#: ../urpme:181
+#, fuzzy, c-format
+msgid "Removal failed"
+msgstr "Хуулалт бүтэлгүйтэв"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Хуулалт бүтэлгүйтэв"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1942,11 +1954,6 @@ msgstr ""
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "ямх"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "„mdkupdate“ хэрэгслээс багцуудыг шинэчилэхэд алдаа.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2248,7 +2255,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Ямар ч байсан үргэлжлүүлэх үү?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -2405,11 +2412,13 @@ msgid "  --aria2        - use aria2 to retrieve distant files.\n"
 msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
 
 #: ../urpmi.addmedia:65
-#, fuzzy, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "„mdkupdate“ хэрэгслээс багцуудыг шинэчилэхэд алдаа.\n"
+#, c-format
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2417,39 +2426,39 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "аас"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "үгүй\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list         - боломжтой багцуудын жагсаалт.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, fuzzy, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2458,91 +2467,91 @@ msgstr ""
 "жигсаалт аас бол\n"
 " с"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, fuzzy, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  --all          - бүх тагуудыг хэвлэх.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - Ажилуулах горим.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, fuzzy, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "бол"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "[%s] тохируулгын файлыг бичиж болсонгүй"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, fuzzy, c-format
 msgid "Can't create config file [%s]"
 msgstr "[%s] тохируулгын файлыг бичиж болсонгүй"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "с<relative path of hdlist>"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr ""
 "с\n"
 "<relative path of hdlist>"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "[%s] rpm файл руу хандаж болсонгүй"
@@ -2770,29 +2779,29 @@ msgstr "  -c             - түр санах ойн хавтасын толго�
 msgid "Only superuser is allowed to update media"
 msgstr "бол"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, fuzzy, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "юу ч үгүй"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, fuzzy, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr "бол г аас с"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "с"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "с"
@@ -3052,6 +3061,10 @@ msgid "No changelog found\n"
 msgstr "Зураг олдсонгүй"
 
 #, fuzzy
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "„mdkupdate“ хэрэгслээс багцуудыг шинэчилэхэд алдаа.\n"
+
+#, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "с"
 
diff --git a/po/ms.po b/po/ms.po
index 817942fe..e3a5a0ff 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-08-21 23:48+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -15,8 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gurpmi:32
-#: ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Pemasangan RPM"
@@ -26,9 +25,7 @@ msgstr "Pemasangan RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47
-#: ../gurpmi2:166
-#: ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -40,13 +37,13 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"You probably didn't want to install it on your computer (installing it would allow you to make modifications to its sourcecode then compile it).\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
 "\n"
 "What would you like to do?"
 msgstr ""
 
-#: ../gurpmi:75
-#: ../gurpmi:86
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -81,8 +78,7 @@ msgstr "_Pasang"
 msgid "_Save"
 msgstr "_Simpan"
 
-#: ../gurpmi:101
-#: ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Batal"
@@ -92,13 +88,13 @@ msgstr "_Batal"
 msgid "Choose location to save file"
 msgstr "Pilih lokasi untuk menyimpan fail"
 
-#: ../gurpmi.pm:39
-#: ../urpmi:67
+#: ../gurpmi.pm:39 ../urpmi:67
 #, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
 "Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -113,85 +109,70 @@ msgstr ""
 msgid "Options:"
 msgstr "<b>Pilihan</b>"
 
-#: ../gurpmi.pm:46
-#: ../urpme:46
-#: ../urpmf:35
-#: ../urpmi:72
-#: ../urpmi.addmedia:54
-#: ../urpmi.recover:33
-#: ../urpmi.removemedia:40
-#: ../urpmi.update:32
-#: ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - cetak mesej bantuan ini.\n"
 
-#: ../gurpmi.pm:47
-#: ../urpmi:79
+#: ../gurpmi.pm:47 ../urpmi:79
 #, c-format
-msgid "  --auto         - non-interactive mode, assume default answers to questions.\n"
+msgid ""
+"  --auto         - non-interactive mode, assume default answers to "
+"questions.\n"
 msgstr ""
 
-#: ../gurpmi.pm:48
-#: ../urpmi:80
-#: ../urpmq:52
+#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 
-#: ../gurpmi.pm:49
-#: ../urpme:50
-#: ../urpmi:103
-#: ../urpmq:66
+#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - paksa instal meskipun beberapa pakej tiada.\n"
 
-#: ../gurpmi.pm:50
-#: ../urpmi:133
+#: ../gurpmi.pm:50 ../urpmi:133
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
 msgstr ""
 
-#: ../gurpmi.pm:52
-#: ../urpmf:41
-#: ../urpmi:73
-#: ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, fuzzy, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --update       - guna hanya kemaskini media.\n"
 
-#: ../gurpmi.pm:53
-#: ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:149
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - izinkan carian dlm sediaada utk mencari pakej.\n"
 
-#: ../gurpmi.pm:54
-#: ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:150
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - jangan cari dalam tersedia utk mencari pakej.\n"
 
-#: ../gurpmi.pm:55
-#: ../urpmi:110
-#: ../urpmq:69
+#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
 #, fuzzy, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - guna root lain untuk membuang rpm.\n"
 
-#: ../gurpmi.pm:56
-#: ../urpmi:135
+#: ../gurpmi.pm:56 ../urpmi:135
 #, c-format
-msgid "  --test         - only verify if the installation can be achieved correctly.\n"
+msgid ""
+"  --test         - only verify if the installation can be achieved "
+"correctly.\n"
 msgstr ""
 
-#: ../gurpmi.pm:57
-#: ../urpmi:76
+#: ../gurpmi.pm:57 ../urpmi:76
 #, fuzzy, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr "  --update       - guna hanya kemaskini media.\n"
 
 #: ../gurpmi.pm:100
@@ -209,7 +190,7 @@ msgstr "Sila tunggu..."
 msgid "Must be root"
 msgstr "Mesti menjadi root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -217,43 +198,42 @@ msgid ""
 "Continue installation anyway?"
 msgstr "semua telah diinstal"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Amaran"
 
-#: ../gurpmi2:126
-#: ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (untuk naiktaraf)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (untuk memasang)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Pilihan pakej"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Salah satu pakej berikut diperlukan:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Batal"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -264,67 +244,63 @@ msgstr ""
 "%s\n"
 "Teruskan?"
 
-#: ../gurpmi2:232
-#: ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
 msgstr "Pakej berikut akan dihapus agar syarat kebergantungan dipenuhi (%d MB)"
 
-#: ../gurpmi2:233
-#: ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
 "%s\n"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "_Saiz (MB):"
 msgstr[1] ""
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Pemasangan pakej..."
 
-#: ../gurpmi2:243
-#: ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "tidak dapat mengambil pakej asal, batal"
 
-#: ../gurpmi2:257
-#: ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Menyediakan..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Install pakej `%s' (%s/%s)..."
 
-#: ../gurpmi2:278
-#: ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Sila tunggu, mengeluarkan medium..."
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Memuatturun pakej `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Selesai"
 
-#: ../gurpmi2:316
-#: ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -332,33 +308,28 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../gurpmi2:322
-#: ../urpm/main_loop.pm:223
-#: ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259
-#: ../urpm/main_loop.pm:282
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Instalasi gagal"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "semua telah diinstal"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Pemasangan selesai"
 
-#: ../gurpmi2:330
-#: ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "membuang %s"
 
-#: ../gurpmi2:338
-#: ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, fuzzy, c-format
 msgid "restarting urpmi"
 msgstr "Tambah media urpmi"
@@ -383,7 +354,8 @@ msgstr "   --root <path>  - guna root yang diberi selain dari /\n"
 #: ../rpm-find-leaves:19
 #, c-format
 msgid "   -g [group]     - restrict results to specified group.\n"
-msgstr "   -g [kumpulan]   - hadkan keputusan kepada kumpulan yang diberikan.\n"
+msgstr ""
+"   -g [kumpulan]   - hadkan keputusan kepada kumpulan yang diberikan.\n"
 
 #: ../rpm-find-leaves:20
 #, c-format
@@ -395,8 +367,7 @@ msgstr "                    default adalah %s.\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -f             - cetak versi, keluaran dan arch dgn nama.\n"
 
-#: ../rurpmi:11
-#: ../urpmi:281
+#: ../rurpmi:11 ../urpmi:281
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Hanya superuser yang boleh menginstal pakej"
@@ -431,19 +402,14 @@ msgstr "nama fail rpm [%s] tidak sah"
 msgid "retrieving rpm file [%s] ..."
 msgstr "mengambil fail rpm [%s] ..."
 
-#: ../urpm.pm:280
-#: ../urpm/get_pkgs.pm:226
+#: ../urpm.pm:280 ../urpm/get_pkgs.pm:226
 #, c-format
 msgid "...retrieving done"
 msgstr "...capaian selesai"
 
-#: ../urpm.pm:283
-#: ../urpm/download.pm:734
-#: ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824
-#: ../urpm/media.pm:1274
-#: ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...gagal terambil: %s"
@@ -478,73 +444,71 @@ msgstr "ralat pendaftaran pakej setempat"
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
 
-#: ../urpm/args.pm:145
-#: ../urpm/args.pm:154
+#: ../urpm/args.pm:145 ../urpm/args.pm:154
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: tidak dapat membaca fail rpm \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "hujah tidak dijangka"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "12 pt sebelum"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "Ungkapan corak:\n"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, fuzzy, c-format
 msgid "Can't use %s without %s"
 msgstr "Tutup Tanpa Simpan"
 
-#: ../urpm/args.pm:486
-#: ../urpm/args.pm:489
-#: ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, fuzzy, c-format
 msgid "Can't use %s with %s"
 msgstr "hidupkan penggunaan TLS dengan LDAP"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, fuzzy, c-format
 msgid "Too many arguments\n"
 msgstr "%s: terlalu banyak hujah\n"
 
-#: ../urpm/bug_report.pm:48
-#: ../urpmi:258
+#: ../urpm/bug_report.pm:48 ../urpmi:258
 #, fuzzy, c-format
 msgid "Copying failed"
 msgstr "...gagal menyalin"
 
 #: ../urpm/cdrom.pm:66
 #, c-format
-msgid "You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done automatically)"
+msgid ""
+"You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
 msgstr ""
 
 #: ../urpm/cdrom.pm:68
@@ -552,8 +516,7 @@ msgstr ""
 msgid "HAL daemon (hald) is not running or not ready"
 msgstr ""
 
-#: ../urpm/cdrom.pm:161
-#: ../urpm/cdrom.pm:166
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
 #, fuzzy, c-format
 msgid "medium \"%s\" is not available"
 msgstr "%s adalah nama hos yang tidak sah"
@@ -578,9 +541,7 @@ msgstr "gagal tulis fail konfigurasi [%s]"
 msgid "medium `%s' is defined twice, aborting"
 msgstr ""
 
-#: ../urpm/cfg.pm:251
-#: ../urpm/media.pm:486
-#: ../urpm/media.pm:492
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:486 ../urpm/media.pm:492
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "gagal tulis fail konfigurasi [%s]"
@@ -732,7 +693,8 @@ msgstr ""
 
 #: ../urpm/install.pm:175
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 
 #: ../urpm/install.pm:178
@@ -755,8 +717,7 @@ msgstr "tidak dapat memasang pakej %s"
 msgid "removing bad rpm (%s) from %s"
 msgstr "mendapatkan fail rpm dari media \"%s\"..."
 
-#: ../urpm/install.pm:218
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:218 ../urpm/install.pm:275
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "Sambungan Gagal"
@@ -801,8 +762,7 @@ msgstr ""
 msgid "No base defined"
 msgstr " tiada kad bunyi ditakrif."
 
-#: ../urpm/ldap.pm:172
-#: ../urpm/ldap.pm:175
+#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
 #, c-format
 msgid "Cannot connect to ldap uri:"
 msgstr ""
@@ -822,17 +782,13 @@ msgstr "@r adalah bukan @d; menghentikan.\n"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:110
-#: ../urpm/main_loop.pm:120
-#: ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230
-#: ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
+#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Instalasi gagal"
 
-#: ../urpm/main_loop.pm:112
-#: ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
 #, c-format
 msgid "Try to go on anyway? (y/N) "
 msgstr ""
@@ -897,8 +853,7 @@ msgstr "Cuba instalasi lebih keras (--force)? (y/T) "
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../urpm/main_loop.pm:306
-#: ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
 #, fuzzy, c-format
 msgid "Installation is possible"
 msgstr "Pemasangan sekecil mungkin"
@@ -943,8 +898,7 @@ msgstr "mencuba untuk mengatasi media sedia ada \"%s\", melangkau"
 msgid "failed to migrate removable device, ignoring media"
 msgstr ""
 
-#: ../urpm/media.pm:488
-#: ../urpm/media.pm:494
+#: ../urpm/media.pm:488 ../urpm/media.pm:494
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "tulis fail konfigurasi [%s]"
@@ -961,226 +915,222 @@ msgstr ""
 
 #: ../urpm/media.pm:561
 #, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
 msgstr ""
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Carian mula: %s tamat: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "melangkau pakej %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "tidak dapat membuang pakej %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "media \"%s\" telah ada"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, fuzzy, c-format
 msgid "(ignored by default)"
 msgstr "hidupkan katalaluan bayang secara default"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "Gagal apabila menambah media"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "Menambah media:"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, fuzzy, c-format
 msgid "directory %s does not exist"
 msgstr "Partisyen Diminta Tidak Wujud"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "tidak dapat menghurai \"%s\" dalam fail [%s]"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "gagal mengakses media instalasi pertama (fail hdlists tidak dijumpai)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "ambil fail hdlist..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "cubaan untuk memilih media tidak wujud \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "memilih pelbagai media: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "hapus media \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "mengulangtetap urpmi untuk media \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...gagal mengulangtetap"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "selesai ulangtetap"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "media \"%s\" tidak dipilih"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "periksa file sintesis [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "masalah membaca fail sintesis untuk media \"%s\""
 
-#: ../urpm/media.pm:1163
-#: ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "Medium Boleh Buang Terlekap"
 
-#: ../urpm/media.pm:1165
-#: ../urpm/media.pm:1220
-#: ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...gagal menyalin"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "fail deskripsi \"%s\" sedang disalin"
 
-#: ../urpm/media.pm:1218
-#: ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...salin selesai"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, fuzzy, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "salinan [%s] gagal (md5sum tidak sepadan)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "mengira md5sum salinan sumber hdlist (atau sintesis)"
 
-#: ../urpm/media.pm:1299
-#: ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "salinan [%s] gagal (md5sum tidak sepadan)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "dikemaskini pada %(date)s"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "Membaca dan membanding:"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "fail hdlist utk media \"%s\" tak dijumpai"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "fail deskripsi \"%s\" sedang disalin"
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "nama fail rpm [%s] tidak sah"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "periksa file sintesis [%s]"
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "menjumpai hdlist dikesan (atau sintesis) seperti %s"
 
-#: ../urpm/media.pm:1472
-#: ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "fail hdlist utk media \"%s\" tak dijumpai"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "memeriksa fail pubkey \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "tidak dapat mengimport fail pubkey \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "tidak dapat mengimport fail pubkey \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "Tambah medium"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed"
 msgstr "Sambungan Gagal"
@@ -1205,21 +1155,14 @@ msgstr ""
 msgid "getting mirror list from %s"
 msgstr "Pilih dokumen dari senarai:"
 
-#: ../urpm/msg.pm:63
-#: ../urpmi:514
-#: ../urpmi:529
-#: ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
 #, c-format
 msgid "Nn"
 msgstr "NnTt"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64
-#: ../urpme:38
-#: ../urpmi:568
-#: ../urpmi:663
-#: ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yy"
@@ -1284,16 +1227,19 @@ msgstr "MB"
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190
-#: ../urpm/msg.pm:199
+#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
-msgid "The following package is now orphan, use \"urpme --auto-orphans\" to remove it."
-msgid_plural "The following packages are now orphans, use \"urpme --auto-orphans\" to remove them."
+msgid ""
+"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
+"it."
+msgid_plural ""
+"The following packages are now orphans, use \"urpme --auto-orphans\" to "
+"remove them."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -1349,7 +1295,9 @@ msgstr ""
 
 #: ../urpm/parallel_ssh.pm:86
 #, c-format
-msgid "%s failed on host %s (maybe it does not have a good version of urpmi?) (exit code: %d)"
+msgid ""
+"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
+"code: %d)"
 msgstr ""
 
 #: ../urpm/removable.pm:32
@@ -1357,8 +1305,7 @@ msgstr ""
 msgid "unable to access medium \"%s\"."
 msgstr "Tidak dapat mencipta media."
 
-#: ../urpm/removable.pm:72
-#: ../urpm/removable.pm:90
+#: ../urpm/removable.pm:72 ../urpm/removable.pm:90
 #, c-format
 msgid "mounting %s"
 msgstr "mounting %s"
@@ -1368,6 +1315,296 @@ msgstr "mounting %s"
 msgid "unmounting %s"
 msgstr "unmount %s"
 
+#: ../urpm/search.pm:29 ../urpmf:29
+#, fuzzy, 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 ""
+"versi mdkupdate %s\n"
+"Hakmilik (C) %s Mandriva.\n"
+"Ini adalah perisian percuma dan boleh disebarkan dibawah akta GNU GPL.\n"
+"\n"
+"penggunaan:\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version       - cetak nombor versi alatan ini.\n"
+
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
+#, c-format
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+
+#: ../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 ""
+
+#: ../urpm/search.pm:39 ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - guna root lain untuk membuang 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 ""
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --update       - guna hanya kemaskini media.\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 ""
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - jangan cetak baris yang sama.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - guna hanya kemaskini media.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - mod verbos.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, fuzzy, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "-i  --ignore-case  Abai perbezaan case dalam kandungan fail."
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "-i  --ignore-case  Abai perbezaan case dalam kandungan fail."
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Ungkapan corak:\n"
+
+#: ../urpm/search.pm:52 ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, fuzzy, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -c             - bersihkan direktori kache header.\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - operator binari AND.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - operator binari OR.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - unari NOT.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - kurungan kiri dan kanan.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Senarai tag:\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - nyatakan format keluaran seperti printf\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   contoh: '%%name:%%files'\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "Rekabentuk Sasaran:"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "%s %s pemasangan pada hos %s"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, fuzzy, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "Tarikh/masa bolehubah"
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "kemaskini semua fail tetapan"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "dijangkakan %d pengurangan/pengurangan konflik"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "Pelihat Pakej"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, fuzzy, c-format
+msgid "  --distribution - distribution\n"
+msgstr "Sumber edaran"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "Saat semenjak permulaan zaman"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "Pelihat Pakej"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "Cache Fail Pakej Jauh"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "Kumpulan"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "Nama Pakej"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "Pelihat Pakej"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "Senarai tag:\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "Tidak dapat menulis tag!"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "Senarai tag:\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "Senarai tag:\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "% dari saiz normal"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "nama fail rpm [%s] tidak sah"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "Senarai tag:\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "Ringkasan"
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "URL:"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "Pengeluar"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "Cache Fail Pakej Jauh"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - cetak versi, keluaran dan arch dgn nama.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, fuzzy, c-format
+msgid "using specific environment on %s\n"
+msgstr "Mencipta swap dienkrip pada %s using %s:"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "Tiada status tersedia utk pakej ini\n"
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "Tiada status tersedia utk pakej ini\n"
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "menulis senarai fail untuk media \"%s\""
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1375,68 +1612,71 @@ msgstr ""
 
 #: ../urpm/select.pm:30
 #, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, c-format
 msgid "No package named %s"
 msgstr "Tiada pakej bernama %s"
 
-#: ../urpm/select.pm:193
-#: ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Pakej berikut mengandungi %s: %s"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "semua telah diinstal"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "semua telah diinstal"
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "semua telah diinstal"
 
-#: ../urpm/select.pm:558
-#: ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
 msgid "due to missing %s"
 msgstr "kerana kehilangan %s"
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "semua telah diinstal"
 
-#: ../urpm/select.pm:560
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "kerana ketidakpuasan %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "cuba untuk menaikkan %s"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "untuk menyimpan %s"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, c-format
 msgid "in order to install %s"
 msgstr "untuk memasang %s"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "kerana konflik dengan %s"
@@ -1486,7 +1726,8 @@ msgstr "Fail untuk menyimpan suntingan:"
 msgid ""
 "urpme version %s\n"
 "Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -1511,15 +1752,12 @@ msgstr "Buang perubahan yang dicadangkan"
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpme:51
-#: ../urpmi:109
-#: ../urpmq:68
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpme:52
-#: ../urpmi:141
+#: ../urpme:52 ../urpmi:141
 #, fuzzy, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "Tidak dapat menulis tag!"
@@ -1529,78 +1767,70 @@ msgstr "Tidak dapat menulis tag!"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - guna root lain untuk membuang rpm.\n"
 
-#: ../urpme:54
-#: ../urpmf:40
-#: ../urpmi:111
-#: ../urpmi.addmedia:71
-#: ../urpmi.recover:36
-#: ../urpmi.removemedia:45
-#: ../urpmi.update:48
-#: ../urpmq:70
+#: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - guna root lain untuk membuang rpm.\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - guna hanya kemaskini media.\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "Pakej Hilang"
 
-#: ../urpme:56
+#: ../urpme:57
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpme:58
-#: ../urpmi:152
-#: ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, fuzzy, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose      - mod verbos.\n"
 
-#: ../urpme:59
+#: ../urpme:60
 #, fuzzy, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
 
-#: ../urpme:72
+#: ../urpme:73
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Hanya superuser dibenarkan untuk membuang pakej"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown packages"
 msgstr "pakej tidak diketahui"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown package"
 msgstr "pakej tidak diketahui"
 
-#: ../urpme:119
+#: ../urpme:121
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "Salah satu pakej berikut diperlukan:"
 msgstr[1] "Salah satu pakej berikut diperlukan:"
 
-#: ../urpme:124
+#: ../urpme:126
 #, c-format
 msgid "Nothing to remove"
 msgstr "Tiada untuk dibuang"
 
-#: ../urpme:141
+#: ../urpme:143
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "gagal untuk membuang direktori %s: %s\n"
 
-#: ../urpme:147
+#: ../urpme:149
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
 msgstr[0] ""
 "Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
 "%s\n"
@@ -1608,341 +1838,45 @@ msgstr[1] ""
 "Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
 "%s\n"
 
-#: ../urpme:152
+#: ../urpme:154
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "Pelihat Pakej"
 msgstr[1] "pakej tidak diketahui"
 
-#: ../urpme:159
+#: ../urpme:161
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Buang kekunci"
 msgstr[1] "membuang pakej %s"
 
-#: ../urpme:159
-#: ../urpmi:569
-#: ../urpmi:664
-#: ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (y/T) "
 
-#: ../urpme:164
+#: ../urpme:166
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "Membuang Sumber"
 
-#: ../urpme:178
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "Pembuangan gagal"
 
-#: ../urpme:180
+#: ../urpme:183
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Pemasangan sekecil mungkin"
 
-#: ../urpmf:29
-#, fuzzy, 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 ""
-"versi mdkupdate %s\n"
-"Hakmilik (C) %s Mandriva.\n"
-"Ini adalah perisian percuma dan boleh disebarkan dibawah akta GNU GPL.\n"
-"\n"
-"penggunaan:\n"
-
-#: ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version       - cetak nombor versi alatan ini.\n"
-
-#: ../urpmf:37
-#: ../urpmi:132
-#: ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-
-#: ../urpmf:38
-#: ../urpmi:74
-#: ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-
-#: ../urpmf:39
-#, c-format
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpmf:42
-#: ../urpmi:77
-#: ../urpmq:50
-#, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-
-#: ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --update       - guna hanya kemaskini media.\n"
-
-#: ../urpmf:44
-#: ../urpmi:78
-#: ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-
-#: ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - jangan cetak baris yang sama.\n"
-
-#: ../urpmf:46
-#: ../urpmi:75
-#: ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - guna hanya kemaskini media.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - mod verbos.\n"
-
-#: ../urpmf:48
-#, fuzzy, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "-i  --ignore-case  Abai perbezaan case dalam kandungan fail."
-
-#: ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "-i  --ignore-case  Abai perbezaan case dalam kandungan fail."
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Ungkapan corak:\n"
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpmf:53
-#, fuzzy, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -c             - bersihkan direktori kache header.\n"
-
-#: ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - operator binari AND.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - operator binari OR.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - unari NOT.\n"
-
-#: ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - kurungan kiri dan kanan.\n"
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Senarai tag:\n"
-
-#: ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - nyatakan format keluaran seperti printf\n"
-
-#: ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   contoh: '%%name:%%files'\n"
-
-#: ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "Rekabentuk Sasaran:"
-
-#: ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "%s %s pemasangan pada hos %s"
-
-#: ../urpmf:63
-#, fuzzy, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "Tarikh/masa bolehubah"
-
-#: ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "kemaskini semua fail tetapan"
-
-#: ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "dijangkakan %d pengurangan/pengurangan konflik"
-
-#: ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "Pelihat Pakej"
-
-#: ../urpmf:67
-#, fuzzy, c-format
-msgid "  --distribution - distribution\n"
-msgstr "Sumber edaran"
-
-#: ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "Saat semenjak permulaan zaman"
-
-#: ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "Pelihat Pakej"
-
-#: ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "Cache Fail Pakej Jauh"
-
-#: ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "Kumpulan"
-
-#: ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "Nama Pakej"
-
-#: ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "Pelihat Pakej"
-
-#: ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "Senarai tag:\n"
-
-#: ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "Tidak dapat menulis tag!"
-
-#: ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "Senarai tag:\n"
-
-#: ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "Senarai tag:\n"
-
-#: ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "% dari saiz normal"
-
-#: ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "nama fail rpm [%s] tidak sah"
-
-#: ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "Senarai tag:\n"
-
-#: ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "Ringkasan"
-
-#: ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "URL:"
-
-#: ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "Pengeluar"
-
-#: ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "Cache Fail Pakej Jauh"
-
-#: ../urpmf:85
-#: ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - cetak versi, keluaran dan arch dgn nama.\n"
-
 #: ../urpmf:153
 #, fuzzy, c-format
 msgid "unterminated expression (%s)"
 msgstr "Penyunting Ungkapan Nalar (regexp)"
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpmf:248
-#: ../urpmi:265
-#: ../urpmq:165
-#, fuzzy, c-format
-msgid "using specific environment on %s\n"
-msgstr "Mencipta swap dienkrip pada %s using %s:"
-
-#: ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "Tiada status tersedia utk pakej ini\n"
-
-#: ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "Tiada status tersedia utk pakej ini\n"
-
-#: ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "menulis senarai fail untuk media \"%s\""
-
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1963,15 +1897,16 @@ msgstr ""
 msgid "  --auto-orphans - remove orphans without asking\n"
 msgstr ""
 
-#: ../urpmi:85
-#: ../urpmq:54
+#: ../urpmi:85 ../urpmq:54
 #, fuzzy, c-format
 msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
 msgstr "Senarai tag:\n"
 
 #: ../urpmi:86
 #, c-format
-msgid "  --no-uninstall - never ask to uninstall a package, abort the installation.\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr ""
 
 #: ../urpmi:87
@@ -1979,8 +1914,7 @@ msgstr ""
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr ""
 
-#: ../urpmi:88
-#: ../urpmq:56
+#: ../urpmi:88 ../urpmq:56
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -2025,14 +1959,10 @@ msgstr "  --noclean      - jaga rpm tidak dipakai dalam kache.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - jaga rpm tidak dipakai dalam kache.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - guna hanya kemaskini media.\n"
-
 #: ../urpmi:102
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr ""
 
 #: ../urpmi:104
@@ -2061,9 +1991,7 @@ msgid ""
 "                   to install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmi:114
-#: ../urpmi.addmedia:59
-#: ../urpmi.update:37
+#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:37
 #, c-format
 msgid "  --metalink     - generate and use a local metalink.\n"
 msgstr ""
@@ -2100,9 +2028,7 @@ msgstr ""
 msgid "  --aria2-options - additional options to pass to aria2\n"
 msgstr ""
 
-#: ../urpmi:123
-#: ../urpmi.addmedia:60
-#: ../urpmi.update:38
+#: ../urpmi:123 ../urpmi.addmedia:60 ../urpmi.update:38
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr ""
@@ -2114,20 +2040,14 @@ msgid ""
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 
-#: ../urpmi:126
-#: ../urpmi.addmedia:61
-#: ../urpmi.update:39
-#: ../urpmq:76
+#: ../urpmi:126 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 
-#: ../urpmi:128
-#: ../urpmi.addmedia:63
-#: ../urpmi.update:41
-#: ../urpmq:78
+#: ../urpmi:128 ../urpmi.addmedia:63 ../urpmi.update:41 ../urpmq:78
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2193,8 +2113,7 @@ msgstr "  --noclean      - jaga rpm tidak dipakai dalam kache.\n"
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 
-#: ../urpmi:148
-#: ../urpmq:97
+#: ../urpmi:148 ../urpmq:97
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - pilih semua yg sama dgn baris perintah.\n"
@@ -2243,12 +2162,15 @@ msgstr "&Lompat ke hiperlink"
 
 #: ../urpmi:232
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr ""
 
 #: ../urpmi:252
 #, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr ""
 
 #: ../urpmi:253
@@ -2299,7 +2221,9 @@ msgstr " (untuk memasang)"
 
 #: ../urpmi:462
 #, fuzzy, c-format
-msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
+msgid ""
+"In order to satisfy the '%s' dependency, one of the following packages is "
+"needed:"
 msgstr ""
 "Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
 "%s\n"
@@ -2325,18 +2249,14 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../urpmi:515
-#: ../urpmi:530
+#: ../urpmi:515 ../urpmi:530
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Teruskan juga?"
 
-#: ../urpmi:516
-#: ../urpmi:531
-#: ../urpmi:628
-#: ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/t) "
@@ -2410,7 +2330,8 @@ msgstr ""
 #: ../urpmi:583
 #, fuzzy, c-format
 msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
 "%s\n"
 msgstr ""
 "Anda perlu menjadi root utk install kebergantungan berikutnya:\n"
@@ -2496,172 +2417,163 @@ msgstr ""
 "\n"
 "dan [pilihan] dari\n"
 
-#: ../urpmi.addmedia:55
-#: ../urpmi.update:33
-#: ../urpmq:73
+#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:73
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - guna wget utk mengambil fail jauh.\n"
 
-#: ../urpmi.addmedia:56
-#: ../urpmi.update:34
-#: ../urpmq:74
+#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:74
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - guna curl utk mengambil fail jauh.\n"
 
-#: ../urpmi.addmedia:57
-#: ../urpmi.update:35
-#: ../urpmq:75
+#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:75
 #, fuzzy, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --wget         - guna wget utk mengambil fail jauh.\n"
 
-#: ../urpmi.addmedia:58
-#: ../urpmi.update:36
+#: ../urpmi.addmedia:58 ../urpmi.update:36
 #, fuzzy, c-format
 msgid "  --aria2        - use aria2 to retrieve distant files.\n"
 msgstr "  --wget         - guna wget utk mengambil fail jauh.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - buat media update.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
-"                   one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+"                   one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "masalah membaca fail sintesis untuk media \"%s\""
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --uniq         - jangan cetak baris yang sama.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "Ralat mendapatkan senarai pakej yang ada"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:79
-#: ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82
-#: ../urpmi.removemedia:43
-#: ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - mod diam.\n"
 
-#: ../urpmi.addmedia:83
-#: ../urpmi.removemedia:44
-#: ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - mod verbos.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, fuzzy, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Hanya superuser yang boleh menginstal pakej"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "Fail Config Ruang Kerja"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, fuzzy, c-format
 msgid "Can't create config file [%s]"
 msgstr "gagal tulis fail konfigurasi [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "tak perlu memberikan <path relatif hdlist> dgn --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<path relatif hdlist> hilang\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "Tidak dapat mencipta media."
@@ -2671,7 +2583,8 @@ msgstr "Tidak dapat mencipta media."
 msgid ""
 "urpmi.recover version %s\n"
 "Copyright (C) 2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -2693,7 +2606,8 @@ msgstr "  --noclean      - jaga rpm tidak dipakai dalam kache.\n"
 
 #: ../urpmi.recover:37
 #, c-format
-msgid "  --list         - list transactions since provided date/duration argument\n"
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 
 #: ../urpmi.recover:38
@@ -2780,8 +2694,7 @@ msgstr "tiada webfetch dijumpai, webfetch yang disokong adalah: %s\n"
 msgid "You must be superuser to do this"
 msgstr "Maaf, anda mestilah root untuk melakukannya..."
 
-#: ../urpmi.recover:143
-#: ../urpmi.recover:209
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, fuzzy, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "nama fail rpm [%s] tidak sah"
@@ -2893,12 +2806,13 @@ msgstr "  -f             - paksa buat fail hdlist.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Hanya superuser yang boleh menginstal pakej"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "tiada apa-apa yang perlu dikemaskini (guna urpmi.addmedia utk tambah media)\n"
+msgstr ""
+"tiada apa-apa yang perlu dikemaskini (guna urpmi.addmedia utk tambah media)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2907,17 +2821,17 @@ msgstr ""
 "masukan kemaskini hilang\n"
 "(satu dari %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Media Storan"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "Media Storan"
@@ -2927,7 +2841,8 @@ msgstr "Media Storan"
 msgid ""
 "urpmq version %s\n"
 "Copyright (C) 2000-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -2939,7 +2854,9 @@ msgstr ""
 
 #: ../urpmq:48
 #, fuzzy, c-format
-msgid "  --searchmedia  - use only the given media to search requested (or updated) packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested (or updated) "
+"packages.\n"
 msgstr "  --update       - guna hanya kemaskini media.\n"
 
 #: ../urpmq:53
@@ -2979,7 +2896,8 @@ msgstr "Ralat mendapatkan senarai pakej yang ada"
 
 #: ../urpmq:63
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 
 #: ../urpmq:64
@@ -2989,8 +2907,10 @@ msgstr "  --src          - pakej berikut adalah pakej sumber (sama dgn -s).\n"
 
 #: ../urpmq:65
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources      - beri semua pakej sumber sebelum muatturun (hanya root).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr ""
+"  --sources      - beri semua pakej sumber sebelum muatturun (hanya root).\n"
 
 #: ../urpmq:67
 #, fuzzy, c-format
@@ -3089,7 +3009,9 @@ msgstr "  -g             - cetak kumpulan dengan nama juga.\n"
 #: ../urpmq:101
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - cetak maklumat berguna dalam bentuk boleh dibaca manusia.\n"
+msgstr ""
+"  -i             - cetak maklumat berguna dalam bentuk boleh dibaca "
+"manusia.\n"
 
 #: ../urpmq:102
 #, c-format
@@ -3109,12 +3031,16 @@ msgstr "  -r             - cetak versi dan keluaran dengan nama juga.\n"
 #: ../urpmq:105
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - pakej berikut adalah pakej sumber (sama dgn --src).\n"
+msgstr ""
+"  -s             - pakej berikut adalah pakej sumber (sama dgn --src).\n"
 
 #: ../urpmq:106
 #, c-format
-msgid "  -u             - remove package if a more recent version is already installed.\n"
-msgstr "  -u             - buang pakej jika versi lebih terkini telah dipasang.\n"
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+"  -u             - buang pakej jika versi lebih terkini telah dipasang.\n"
 
 #: ../urpmq:107
 #, c-format
@@ -3124,7 +3050,9 @@ msgstr "  -y             - lakukan pencarian fuzzy (sama dengan --fuzzy).\n"
 #: ../urpmq:108
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
-msgstr "  -Y             - seperti -y, tetapi memaksa untuk memadan tidak kira huruf besar atau kecil.\n"
+msgstr ""
+"  -Y             - seperti -y, tetapi memaksa untuk memadan tidak kira huruf "
+"besar atau kecil.\n"
 
 #: ../urpmq:109
 #, c-format
@@ -3158,12 +3086,14 @@ msgstr ""
 
 #: ../urpmq:408
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 
 #: ../urpmq:409
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 
 #: ../urpmq:473
@@ -3171,3 +3101,5 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Tiada log perubahan dijumpai\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - buat media update.\n"
diff --git a/po/mt.po b/po/mt.po
index aea5f306..e75209b3 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2004-09-07 05:59+0200\n"
 "Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
 "Language-Team: Maltese <mt@li.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Installazzjoni tas-sistema"
@@ -31,7 +31,7 @@ msgstr "Installazzjoni tas-sistema"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -97,7 +97,7 @@ msgstr "Installa"
 msgid "_Save"
 msgstr "Ikteb"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "I_kkanċella"
@@ -129,8 +129,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - uri dan il-messaġġ ta' għajnuna.\n"
@@ -165,7 +166,7 @@ msgstr ""
 "  --verify-rpm   - ivverifika l-firma tal-pakkett qabel tinstalla.\n"
 "                   (--no-verify-rpm itfih, impliċitament mixgħul).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - uża biss is-sorsi llistjati b'virgoli.\n"
@@ -214,7 +215,7 @@ msgstr "Stenna ftit."
 msgid "Must be root"
 msgstr "Port tal-maws"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -224,42 +225,42 @@ msgstr ""
 "Xi pakketti mitluba ma jistgħux jiġu nstallati:\n"
 "%s"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Twissija"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "Aġġornament"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Oħroġ mill-installazzjoni"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Wieħed minn dawn il-pakketti huwa meħtieġ:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid "_Abort"
 msgstr "Waqqaf"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -269,7 +270,7 @@ msgstr ""
 "Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\n"
 "%s"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
@@ -277,56 +278,56 @@ msgstr ""
 "Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jiġu nstallati wkoll (%"
 "d MB)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Biex nissodisfa d-dipendenzi, %d pakkett/i jridu jiġu nstallati wkoll (%d MB)"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Installazzjoni ta' pakketti..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ma nistax inġib il-pakketti tas-sors, se noħroġ"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Qed nipprepara..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Qed jiġi nstallat \"%s\" (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Jekk jogħġbok daħħal id-diska mmarkata \"%s\" fl-apparat [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Qed jitniżżel il-pakkett \"%s\"..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "Lest"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -338,28 +339,28 @@ msgstr ""
 "%s\n"
 "Forsi trid taġġorna d-database urpmi"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "installazzjoni falliet"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "kollox diġà installat"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Installazzjoni lesta"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "qed jitneħħa %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "qed jiġi ristartjat urpmi"
@@ -439,8 +440,8 @@ msgid "...retrieving done"
 msgstr "...qari lest"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...qari falla: %s"
@@ -480,52 +481,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr "dikjarazzjoni ta' \"proxy\" ħażina fil-linja ta' kmand\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: ma nistax naqra l-fajl rpm \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Firma nieqsa (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -950,219 +951,219 @@ msgstr ""
 "--synthesis ma jistax jintuża ma' --media, --excludemedia, --sortmedia,  --"
 "update jew --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, fuzzy, c-format
 msgid "Search start: %s end: %s"
 msgstr "Fittex fonts installati"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "qed jinqabeż pakkett %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "jaġġorna minflok jinstalla pakkett %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "sors \"%s\" diġà jeżisti"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "qed naqra l-\"headers\" mis-sors \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "qed jitneħħa s-sors \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "ma nistax niftaħ rpmdb"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "ma nistax naċċessa l-ewwel sors ta' installazzjoni (ma nstabx il-fajl "
 "hdlists)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "qed naqra l-fajl \"hdlists\"..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "qed nipprova naċċessa sors ineżistenti \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "qed nagħżel sors multiplu: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "qed jitneħħa s-sors \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "qed jiġi rikonfigurat urpmi għas-sors \"%s\"..."
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...rikonfigurazzjoni falliet"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "rikonfigurazzjoni lesta"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "sors \"%s\" mhuwiex magħżul"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "qed jiġi eżaminat il-fajl ta' sinteżi [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problema fil-qari tas-sinteżi għas-sors \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "qed jinkiteb il-fajl b'lista għas-sors \"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...ikkupjar falla"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "qed nikkopja l-fajl ta' deskrizzjoni ta' \"%s\""
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...ikkupjar lest"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "l-ikkuppjar tal-fajl [%s] falla (il-fajl jidher żgħir wisq)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "qed tiġi kalkulata l-md5sum għall-hdlist jew sinteżi tas-sors imniżżel"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "l-ikkuppjar tal-fajl [%s] falla (md5sum ma qablitx)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "qed jiġi eżaminat il-fajl hdlist [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "qed jiġi nstallat %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "qed nikkopja l-fajl ta' deskrizzjoni ta' \"%s\""
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "isem tal-fajl rpm [%s] invalidu"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "qed jinġab l-hdlist jew sinteżi sors għal \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "sibt l-hdlist (jew sinteżi) bħala %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "qed jiġi eżaminat fajl pubkey ta' \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...ċifrarju %s importat mill-fajl pubkey ta' \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ma stajtx nimporta fajl pubkey ta' \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "ġie miżjud is-sors %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1194,7 +1195,7 @@ msgstr "LlNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "IiYy"
@@ -1264,7 +1265,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1347,271 +1348,7 @@ msgstr "qed jiġi mmuntat %s"
 msgid "unmounting %s"
 msgstr "qed niżmonta %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Ebda pakkett imsejjaħ %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Dawn il-pakketti fihom %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "kollox diġà installat"
-
-#: ../urpm/select.pm:539
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "kollox diġà installat"
-
-#: ../urpm/select.pm:540
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "kollox diġà installat"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "minħabba %s nieqes"
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "kollox diġà installat"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "minħabba %s mhux sodisfatt"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "qed nipprova nippromwovi %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "sabiex inżomm %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "sabiex ninstalla %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "minħabba konflitt ma' %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Firma invalida (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "ID taċ-ċifrarju invalidu (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Firma nieqsa (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "ma setax jinkiteb il-fajl [%s]"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "Ikkupjar falla"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "Ikkupjar falla"
-
-#: ../urpme:41
-#, fuzzy, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme verżjoni %s\n"
-"Copyright (C) 1999-2005 Mandriva.\n"
-"Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU "
-"GPL.\n"
-"\n"
-"użu:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - agħżel pakkett awtomatikament fl-għażla.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, fuzzy, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - ivverifika li l-installazzjoni tista' ssir sew.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - iddistribwixxi urpmi fuq il-magni ta' alias.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, fuzzy, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --packager     - uri t-tag \"packager\": pakkeġġjatur.\n"
-
-#: ../urpme:53
-#, fuzzy, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - uża root ieħor għall-installazzjoni rpm.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - uża root ieħor għall-installazzjoni rpm.\n"
-
-#: ../urpme:55
-#, fuzzy, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --description   - uri t-tag \"description\": deskrizzjoni\n"
-
-#: ../urpme:56
-#, fuzzy, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - ikkonfigura urpmi dak il-ħin minn distrib, utli "
-"biex                   tinstalla jew tneħħi chroot permezz ta' --root.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, fuzzy, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  -verbose       - modalità b'ħafna dettalji.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - agħżel kull ma jaqbel fuq il-linja tal-kmand.\n"
-
-#: ../urpme:72
-#, fuzzy, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Is-\"superuser\" biss għandu l-awtorità ineħħi sorsi"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "pakketti mhux magħrufa"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "pakkett mhux magħruf"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "jekk tneħħi l-pakkett %s is-sistema ma tibqax taħdem sew"
-msgstr[1] "jekk tneħħi l-pakkett %s is-sistema ma tibqax taħdem sew"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "M'hemm xejn x'inneħħi"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "M'hemm xejn x'inneħħi"
-
-#: ../urpme:147
-#, fuzzy, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] ""
-"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jitneħħew ukoll (%d MB)"
-msgstr[1] ""
-"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jitneħħew ukoll (%d MB)"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "pakkett mhux magħruf"
-msgstr[1] "pakkett mhux magħruf"
-
-#: ../urpme:159
-#, fuzzy, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "ed jitneħħa l-pakkett %s"
-msgstr[1] "ed jitneħħa l-pakkett %s"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (i/L) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "qed nieħu l-apparat li jitneħħa bħala \"%s\""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Tneħħija falliet"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Tneħħija falliet"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1628,285 +1365,560 @@ msgstr ""
 "\n"
 "użu:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - uri dan il-messaġġ ta' għajnuna.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - uża ambjent speċifiku (tipikament f'rapport ta' bug).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - eskludi s-sorsi msemmija, separati b'virgoli.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - uża root ieħor għall-installazzjoni 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    - issortja s-sorsi skond strings separati b'virgola.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --synthesis    - uża s-sinteżi mogħti minflok id-database urpmi.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - uża s-sinteżi mogħti minflok id-database urpmi.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - turix linji identiċi.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - uża s-sorsi ta' aġġornament biss.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  -verbose       - modalità b'ħafna dettalji.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - qis ittri kbar u żgħar l-istess f'kull mudell.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -i             - qis ittri kbar u żgħar l-istess f'kull mudell.\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - includi kodiċi perl direttament bħala perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - operatur AND binarju.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - operatur OR binarju.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - operatur NOT.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 "  (              - parenteżi tal-lemin, biex tagħlaq grupp ta' "
 "espressjonijiet.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "Lista ta' informazzjoni x'tirrestawra:\n"
 "\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - uża l-interfaċċja X.\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    l-istandard huwa %s.\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - uri l-url.\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - uri t-tag \"buildhost\": kompjuter fejn inbena.\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "Konfigurazzjoni ta' Konsole"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts     - uri \"conflicts\": kull ma joħloq konflitt\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - uri t-tag \"description\": deskrizzjoni\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - uri t-tag epoch: epoka.\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name         - uri biss l-ismijiet tal-pakketti.\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - illistja l-fajls fil-pakkett.\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group         - uri l-grupp.\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --name         - uri biss l-ismijiet tal-pakketti.\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - uri biss l-ismijiet tal-pakketti.\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - ipprintja l-kontenut ta' \"obsoletes\"\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - uri t-tag \"packager\": pakkeġġjatur.\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides      - uri \"provides\" - kull ma jipprovdi\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires      - uri \"requires\": kull ma jeħtieġ\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size          - uri d-daqs.\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - print tag \"sourcerpm\": rpm tas-sors.\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --obsoletes     - ipprintja l-kontenut ta' \"obsoletes\"\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary       - uri t-tag \"summary\": sommarju.\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - uri l-url.\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  -verbose       - modalità b'ħafna dettalji.\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - illistja l-fajls fil-pakkett.\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - uri verżjoni, ħarġa u arkitettura flimkien ma' l-isem.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "qed jintuża ambjent speċifiku fuq %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "ibni l-fajl ta' sintesi tal-hdlist għas-sors \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "qed jinkiteb il-fajl b'lista għas-sors \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Ebda pakkett imsejjaħ %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Dawn il-pakketti fihom %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "kollox diġà installat"
+
+#: ../urpm/select.pm:543
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "kollox diġà installat"
+
+#: ../urpm/select.pm:544
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "kollox diġà installat"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "minħabba %s nieqes"
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "kollox diġà installat"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "minħabba %s mhux sodisfatt"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "qed nipprova nippromwovi %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "sabiex inżomm %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "sabiex ninstalla %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "minħabba konflitt ma' %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Firma invalida (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "ID taċ-ċifrarju invalidu (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Firma nieqsa (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "ma setax jinkiteb il-fajl [%s]"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Ikkupjar falla"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "Ikkupjar falla"
+
+#: ../urpme:41
+#, fuzzy, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme verżjoni %s\n"
+"Copyright (C) 1999-2005 Mandriva.\n"
+"Dan huwa softwer ħieles u jista' jiġi distribwit taħt it-termini tal-GNU "
+"GPL.\n"
+"\n"
+"użu:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - agħżel pakkett awtomatikament fl-għażla.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, fuzzy, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - ivverifika li l-installazzjoni tista' ssir sew.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - iddistribwixxi urpmi fuq il-magni ta' alias.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, fuzzy, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --packager     - uri t-tag \"packager\": pakkeġġjatur.\n"
+
+#: ../urpme:53
+#, fuzzy, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - uża root ieħor għall-installazzjoni rpm.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - uża s-sorsi ta' aġġornament biss.\n"
+
+#: ../urpme:56
+#, fuzzy, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --description   - uri t-tag \"description\": deskrizzjoni\n"
+
+#: ../urpme:57
+#, fuzzy, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - ikkonfigura urpmi dak il-ħin minn distrib, utli "
+"biex                   tinstalla jew tneħħi chroot permezz ta' --root.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  -verbose       - modalità b'ħafna dettalji.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - agħżel kull ma jaqbel fuq il-linja tal-kmand.\n"
+
+#: ../urpme:73
+#, fuzzy, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Is-\"superuser\" biss għandu l-awtorità ineħħi sorsi"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "pakketti mhux magħrufa"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "pakkett mhux magħruf"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "jekk tneħħi l-pakkett %s is-sistema ma tibqax taħdem sew"
+msgstr[1] "jekk tneħħi l-pakkett %s is-sistema ma tibqax taħdem sew"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "M'hemm xejn x'inneħħi"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "M'hemm xejn x'inneħħi"
+
+#: ../urpme:149
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jitneħħew ukoll (%d MB)"
+msgstr[1] ""
+"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jitneħħew ukoll (%d MB)"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "pakkett mhux magħruf"
+msgstr[1] "pakkett mhux magħruf"
+
+#: ../urpme:161
+#, fuzzy, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "ed jitneħħa l-pakkett %s"
+msgstr[1] "ed jitneħħa l-pakkett %s"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (i/L) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "qed nieħu l-apparat li jitneħħa bħala \"%s\""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Tneħħija falliet"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Tneħħija falliet"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2000,11 +2012,6 @@ msgstr "  --clean        - neħħi rpms mill-cache qabel affarijiet oħra.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - żomm rpms mhux użati fil-cache.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - uża s-sorsi ta' aġġornament biss.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2329,7 +2336,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Trid tkompli xorta?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (I/l) "
@@ -2515,10 +2522,12 @@ msgstr "  --curl         - uża curl biex iġġib fajls remoti.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - oħloq sors ta' aġġornament.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2526,22 +2535,22 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - ipprova sib il-fajl \"synthesis\".\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - tippruvax tfittex fajls sinteżi jew hdlist.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2549,17 +2558,17 @@ msgid ""
 msgstr ""
 "  --distrib      - oħloq is-sorsi kollha minn sors ta' installazzjoni.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - illistja s-sorsi disponibbli.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2569,7 +2578,7 @@ msgstr ""
 "huwa\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
@@ -2577,84 +2586,84 @@ msgstr ""
 "protokoll\n"
 "                   file:// biss huwa permess.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - tiċċekkjax MD5SUM.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modalità kwieta.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - modalità b'ħafna dettalji (verbose).\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Is-\"superuser\" biss għandu l-awtorità iżid sorsi"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "ikteb fajl ta' konfigurazzjoni [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, fuzzy, c-format
 msgid "Can't create config file [%s]"
 msgstr "ikteb fajl ta' konfigurazzjoni [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "m'hemmx għalfejn tagħti <isem tal-hdlist relattiv> ma' --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<isem tal-hdlist relattiv> mhux speċifikat\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "ma nistax naċċessa s-sors \"%s\""
@@ -2888,12 +2897,12 @@ msgstr "  -f             - ġiegħel il-fajls hdlist jiġu ġenerati.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Is-\"superuser\" biss għandu l-awtorità jaġġorna sorsi"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "m'hemm xejn x'naġġorna (uża urpmi.addmedia biex iżżid sors)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2902,17 +2911,17 @@ msgstr ""
 "l-element li trid taġġorna m'hux hemm\n"
 "(wieħed minn %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Editja s-sors \"%s\":"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "qed jitneħħa s-sors \"%s\""
@@ -3198,6 +3207,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Ma nstabx changelog\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - oħloq sors ta' aġġornament.\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "input iffurmat ħażin [%s]"
diff --git a/po/nb.po b/po/nb.po
index 57daf837..bb1e132d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2007-09-17 14:07+0200\n"
 "Last-Translator: Per Øyvind Karlsen <peroyvind@mandriva.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -26,7 +26,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM-installasjon"
@@ -36,7 +36,7 @@ msgstr "RPM-installasjon"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Feil: klarte ikke å finne fila «%s», vil avbryte operasjon."
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -102,7 +102,7 @@ msgstr "_Installer"
 msgid "_Save"
 msgstr "_Lagre"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Avbryt"
@@ -133,8 +133,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         – Vis denne hjelpeteksten.\n"
@@ -173,7 +174,7 @@ msgstr ""
 "                   (Bruk «--no-verify-rpm» for å ikke kontrollere.\n"
 "                   Standard er å kontrollere.)\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        – Bruk bare gitt medie (kommadelt liste).\n"
@@ -221,7 +222,7 @@ msgstr "Vent litt ..."
 msgid "Must be root"
 msgstr "Må være root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -232,42 +233,42 @@ msgstr ""
 "%s\n"
 "Fortsett installasjon uansett?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (å oppgradere)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (å installere)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Pakkevalg"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "En av følgende pakker trengs:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Avbryt"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -278,61 +279,61 @@ msgstr ""
 "%s\n"
 "Fortsett installasjon uansett?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "For å oppfylle avhengighet vil den følgende pakken bli installert:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "For å oppfylle avhengigheter vil disse pakkene bli installert:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pakke – %d MB)"
 msgstr[1] "(%d pakker– %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Pakkeinstallasjon ..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "kunne ikke få tak i kildepakker, avslutter"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Forbereder ..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installerer pakke «%s» (%s/%s) ..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Sett inn mediumet kalt «%s» på enhet [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Laster ned pakke «%s» ..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Ferdig"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -343,28 +344,28 @@ msgstr ""
 "%s\n"
 "Du ønsker antageligvis å oppdatere urpmi-databasen din"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Installasjon mislyktes:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Pakken(e) er allerede installert"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Installasjon ferdig"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "Fjerner «%s»."
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "starter urpmi på nytt"
@@ -444,8 +445,8 @@ msgid "...retrieving done"
 msgstr "... ferdig mottatt."
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... Mottak mislykket: %s"
@@ -485,52 +486,52 @@ msgstr "Du kan ikke kjøre denne i begrenset modus."
 msgid "bad proxy declaration on command line\n"
 msgstr "Ugyldig mellomlagerklarasjon på kommandolinjen.\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: Klarer ikke lese rpm-fila «%s»\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "Søkestrenguttrykk:\n"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Mangler signatur (%s)."
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "Søkestrenguttrykk:\n"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "«chroot»-mappa finnes ikke."
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Kan ikke bruke «%s» uten «%s»."
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Kan ikke bruke «%s» med «%s»."
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "For mange argumenter\n"
@@ -958,217 +959,217 @@ msgstr ""
 "Kan ikke bruke «--synthesis» sammen med «--media», «--excludemedia», «--"
 "sortmedia», «--update», «--use-distrib» eller «--parallel»."
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Søkestart: %s. Søkeslutt: %s."
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "Hopper over pakken «%s»."
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "Ville installert i stedet for å oppgradere pakke «%s»."
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "Medium «%s» eksisterer allerede."
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(hoppet over som standard)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "Legg til medium «%s» før det eksterne medium «%s»."
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "Legger til medium «%s»."
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, fuzzy, c-format
 msgid "directory %s does not exist"
 msgstr "Omgivelsekatalog %s eksisterer ikke"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "Denne adressa ser ikke ut til å inneholde en distribusjon."
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "Klarte ikke å tolke «media.cfg»."
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "Klarte ikke lese fra distribusjonsmediet (fant ingen «media.cfg»-fil)."
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "Hopper over ikke-kompatibelt medie «%s» (for %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "Mottar «media.cfg»-fil ..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "Prøver å velge ikke-eksisterende medium «%s»."
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "Velger flere medier: %s."
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "Fjerner medium «%s»."
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "Enddrer oppsett for mediet «%s» på nytt"
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "... klarte ikke endre oppsett."
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "Fullført endring av oppsett."
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Feil ved generering av navnfil: Fant ikke avhengigheten «%d»"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "Mediumet «%s» er av nyeste versjon."
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "Sjekker syntesefil [%s]."
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "Feil ved lesing av syntesefil til medium «%s»."
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "Kopierer [%s] for medium «%s» ..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "... mislykket kopiering."
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "Kopierer beskrivelsesfila til «%s» ..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "... kopiering fullført."
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "Mislykket kopiering av [%s] (fila er mistenkelig liten)."
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "Regner ut md5sum til mottatt kilde-«hdlist» (eller -syntese)"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "Mislykket kopiering av [%s] (md5sum stemmer ikke)."
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "Sjekker hdlistefil [%s]."
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "Rydder opp %s og %s."
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "Ugyldig «hdlist»-fil [%s] for medium «%s»."
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "Kopierer beskrivelsesfila til «%s» ..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "ugyldig rpm-filnavn [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "Mottar kilde-«hdlist» (eller -syntese) for «%s» ..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "Fant undersøkt «hdlist» (eller -syntese) som %s."
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "Fant ingen «hdlist»-fil funnet for medium «%s»"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "Undersøker offentlig nøkkel-til «%s» ..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "... Importerer nøkkelen «%s» fra offentlig nøkkel-fil «%s»."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "Klarte ikke importere offentlig nøkkel-fil «%s»."
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "Oppdatert medium «%s»."
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1200,7 +1201,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "JjYy"
@@ -1270,7 +1271,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1353,6 +1354,306 @@ msgstr "Monterer «%s»."
 msgid "unmounting %s"
 msgstr "Avmonterer «%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 – versjon %s\n"
+"Copyright © 2002-2006 Mandriva.\n"
+"Dette er fri programvare og kan videredistribueres under vilkårene til GNU "
+"GPL.\n"
+"\n"
+"Bruk: urpmf [valg] søkestrenguttrykk\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      – Vis versjonsnummerer til dette verktøyet.\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          – Bruk egendefinert miljø (vanligvis ved en feilrapport).\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 – Ikke bruk gitt medie (kommadelt liste).\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  – Ingen treff på søkestrenger, bruk bare argument som "
+"tekst.\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   – Bruk annen rot for urpmi-database og rpm-installering.\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    – Sorter medium etter delstrenger (kommadelt liste).\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  – Bruk denne stien for tilgang til media.\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    – Bruk syntese i stedet for hele databasen.\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         – Vis ikke identiske linjer.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       – Bruk bare oppdateringsmedie.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      – Utvida meldinger.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             – Ikke skill mellom store og små bokstaver.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -I             – Skill mellom store og små bokstaver i søkestrenger "
+"(standard).\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        – Bytt feltseparator (standard er «:»).\n"
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Søkestrenguttrykk:\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           – All tekst er lest som regulære uttrykk, med mindre «-l» er "
+"brukt.\n"
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             – Ta med perl-kode direkte, som «perl -e».\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             – Binær OG-operatør.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             – Binær ELLER-operatør.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              – Unær IKKE-operator.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            – Venstre- og høyreparentes.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Oversikt over etiketter:\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           – Bruk et printf-lignende utformat\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   Eksempel: «%%navn:%%filer»\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         – Arkitektur.\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    – Byggevert.\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    – Byggetidspunkt.\n"
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    – Oppsettfiler.\n"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    – Konfliktetiketter.\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  – Pakkebeskrivelse.\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution – Distribusjon.\n"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        – Epoch.\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     – Filnavn til pakka.\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        – liste over filer i pakka.\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        – Gruppe.\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      – Vis lisensvilkår.\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         – Pakkenavn.\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    – Utdatert-etiketter.\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     – Pakkebygger.\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     – Tilbudsetiketter.\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     – Avhengighetsetiketter.\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         – Installert størrelse.\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    – navn på kilde-rpm.\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     – Forslagsetiketter.\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      – Sammendrag.\n"
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          – Adresse.\n"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       – Leverandør.\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             – Mediet som pakken ble funnet i.\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             – Vis versjon, utgivelse og arkitektur med navn.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Ugyldig format: du kan bare bruke én flerverdietikett."
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "Bruker egendefinert miljø på «%s»\n"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "Fant ingen «hdlist»-fil funnet for medium «%s»"
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "bygd hdlistesyntese-fil for medium «%s»"
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "Skriver listefil for medium «%s»."
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1368,62 +1669,67 @@ msgstr ""
 "Installasjonsprogrammet urpmi ble startet på nytt, og programprioriteringene "
 "ble endra: %s mot %s"
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, c-format
 msgid "No package named %s"
 msgstr "Det finnes ingen  «%s»-pakke."
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Følgende pakker inneholder %s: %s"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Pakkene «%s» kan ikke installeres."
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Pakken «%s» er allerede installert."
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Pakkene «%s» er allerede installerte."
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
 msgid "due to missing %s"
 msgstr "da «%s» mangler"
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, c-format
 msgid "due to already installed %s"
 msgstr "da «%s» allerede er installert"
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "da «%s» ikke er tilfredsstilt"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "Prøver å priroritere «%s»"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "for å kunne beholde «%s»"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, c-format
 msgid "in order to install %s"
 msgstr "for å kunne installere «%s»"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "på grunn av konflikter med «%s»."
@@ -1515,19 +1821,17 @@ msgstr "  --repackage    – Pakk om filer før sletting\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         – bruk annen rot for rpm-fjerning.\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpme:55 ../urpmi:101
 #, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root   – Bruk annen rot for urpmi-database og rpm-installering.\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --justdb       – Bare oppdater rpm-databasen, og ikke filsystemet.\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    – Ikke kjør pakkeskript.\n"
 
-#: ../urpme:56
+#: ../urpme:57
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1537,49 +1841,49 @@ msgstr ""
 "                   nyttig for å (av)installere en «chroot» med «--root»-"
 "valget.\n"
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  – Utvidede meldingar.\n"
 
-#: ../urpme:59
+#: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             – Velg alle pakker som stemmer med uttrykket.\n"
 
-#: ../urpme:72
+#: ../urpme:73
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Bare superbruker har adgang til å fjerne pakker."
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown packages"
 msgstr "Ukjente pakker"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown package"
 msgstr "ukjent pakke"
 
-#: ../urpme:119
+#: ../urpme:121
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "Du vil ødelegge systemet ditt hvis du fjerner pakken «%s»."
 msgstr[1] "Du vil ødelegge systemet ditt hvis du fjerner pakken «%s»."
 
-#: ../urpme:124
+#: ../urpme:126
 #, c-format
 msgid "Nothing to remove"
 msgstr "Ingenting å fjerne."
 
-#: ../urpme:141
+#: ../urpme:143
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Ingenting å fjerne."
 
-#: ../urpme:147
+#: ../urpme:149
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1587,337 +1891,45 @@ msgid_plural ""
 msgstr[0] "For å oppfylle avhengigheter vil den følgende pakken bli fjernet"
 msgstr[1] "For å oppfylle avhengigheter vil de følgende %d pakkene bli fjernet"
 
-#: ../urpme:152
+#: ../urpme:154
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "ukjent pakke"
 msgstr[1] "ukjent pakke"
 
-#: ../urpme:159
+#: ../urpme:161
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Vil du fjerne %d pakke?"
 msgstr[1] "Vil du fjerne %d pakker?"
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (j/N) "
 
-#: ../urpme:164
+#: ../urpme:166
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "Bruker flyttbar enhet som «%s»."
 
-#: ../urpme:178
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "Klarte ikke fjerne."
 
-#: ../urpme:180
+#: ../urpme:183
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Klarte ikke fjerne."
 
-#: ../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 – versjon %s\n"
-"Copyright © 2002-2006 Mandriva.\n"
-"Dette er fri programvare og kan videredistribueres under vilkårene til GNU "
-"GPL.\n"
-"\n"
-"Bruk: urpmf [valg] søkestrenguttrykk\n"
-
-#: ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      – Vis versjonsnummerer til dette verktøyet.\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          – Bruk egendefinert miljø (vanligvis ved en feilrapport).\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia – Ikke bruk gitt medie (kommadelt liste).\n"
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  – Ingen treff på søkestrenger, bruk bare argument som "
-"tekst.\n"
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    – Sorter medium etter delstrenger (kommadelt liste).\n"
-
-#: ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  – Bruk denne stien for tilgang til media.\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    – Bruk syntese i stedet for hele databasen.\n"
-
-#: ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         – Vis ikke identiske linjer.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       – Bruk bare oppdateringsmedie.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      – Utvida meldinger.\n"
-
-#: ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             – Ikke skill mellom store og små bokstaver.\n"
-
-#: ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -I             – Skill mellom store og små bokstaver i søkestrenger "
-"(standard).\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        – Bytt feltseparator (standard er «:»).\n"
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Søkestrenguttrykk:\n"
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           – All tekst er lest som regulære uttrykk, med mindre «-l» er "
-"brukt.\n"
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             – Ta med perl-kode direkte, som «perl -e».\n"
-
-#: ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             – Binær OG-operatør.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             – Binær ELLER-operatør.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              – Unær IKKE-operator.\n"
-
-#: ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            – Venstre- og høyreparentes.\n"
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Oversikt over etiketter:\n"
-
-#: ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           – Bruk et printf-lignende utformat\n"
-
-#: ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   Eksempel: «%%navn:%%filer»\n"
-
-#: ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         – Arkitektur.\n"
-
-#: ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    – Byggevert.\n"
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    – Byggetidspunkt.\n"
-
-#: ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    – Oppsettfiler.\n"
-
-#: ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    – Konfliktetiketter.\n"
-
-#: ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  – Pakkebeskrivelse.\n"
-
-#: ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution – Distribusjon.\n"
-
-#: ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        – Epoch.\n"
-
-#: ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     – Filnavn til pakka.\n"
-
-#: ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        – liste over filer i pakka.\n"
-
-#: ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        – Gruppe.\n"
-
-#: ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      – Vis lisensvilkår.\n"
-
-#: ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         – Pakkenavn.\n"
-
-#: ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    – Utdatert-etiketter.\n"
-
-#: ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     – Pakkebygger.\n"
-
-#: ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     – Tilbudsetiketter.\n"
-
-#: ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     – Avhengighetsetiketter.\n"
-
-#: ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         – Installert størrelse.\n"
-
-#: ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    – navn på kilde-rpm.\n"
-
-#: ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     – Forslagsetiketter.\n"
-
-#: ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      – Sammendrag.\n"
-
-#: ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          – Adresse.\n"
-
-#: ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       – Leverandør.\n"
-
-#: ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             – Mediet som pakken ble funnet i.\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             – Vis versjon, utgivelse og arkitektur med navn.\n"
-
 #: ../urpmf:153
 #, fuzzy, c-format
 msgid "unterminated expression (%s)"
 msgstr "Søkestrenguttrykk:\n"
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Ugyldig format: du kan bare bruke én flerverdietikett."
-
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "Bruker egendefinert miljø på «%s»\n"
-
-#: ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "Fant ingen «hdlist»-fil funnet for medium «%s»"
-
-#: ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "bygd hdlistesyntese-fil for medium «%s»"
-
-#: ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "Skriver listefil for medium «%s»."
-
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2008,11 +2020,6 @@ msgstr "  --clean        – Fjern rpm fra mellomlager først.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      – Ikke fjern rpm-pakker fra mellomlager.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       – Bare oppdater rpm-databasen, og ikke filsystemet.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2342,7 +2349,7 @@ msgstr ""
 "\n"
 "Fortsett installasjon likevel?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
@@ -2525,10 +2532,12 @@ msgstr "  --curl         – Bruk curl til å hente fjerntliggende filer.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       – Opprett oppdateringsmedium.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2536,22 +2545,22 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis – Bruk syntesefil.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, fuzzy, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   – Bruk rpm-filer (i stedet for syntese/«hdlist»).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     – Ikke prøv å finne syntese eller «hdlist»-fil.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2560,18 +2569,18 @@ msgstr ""
 "  --distrib      – Opprett automatisk alle medier fra et installasjons-\n"
 "                   medium.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  – Med «--distrib», spør om bekreftelse for hvert medie\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    – Med «--distrib», legg til alle media\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2580,75 +2589,75 @@ msgstr ""
 "  --from         – Bruk spesifisert url for liste over speil, standard er\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      – Opprett virtuelt medie som alltid er oppdatert,\n"
 "                   bare file:// protokoll er tillatt.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    – Ikke utfør MD5SUM-filkontroll.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     – Ikke importer offentlig nøkkel till nytt medie\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          – Legg til medie i oppsettet, men ikke oppdater det.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             – Stillemodus.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             – Utvida meldinger.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "Ugyldig <adresse> (for lokale mapper må adressa være absolutt)."
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Bare superbruker har adgang til å legge til media."
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "Oppretter oppsettfil [%s]."
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Kan ikke skrive oppsettfil [%s]."
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "Trenger ikke oppgi <relativ sti til «hdlist»> med «--distrib»-valget"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2657,17 +2666,17 @@ msgstr ""
 "\n"
 "Ønsker du å installere medie «%s»?"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<relativ sti til «hdlist»> mangler\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Kan ikke bruke «%s» med ekstertn medium."
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "Klarte ikke nå medium «%s»."
@@ -2907,13 +2916,13 @@ msgstr "  -f             – Tving oppdatering av «synthesis»/«hdlist».\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Bare superbruker kan oppdatere media."
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "Ingenting å oppdatere (bruk «urpmi.addmedia» for å legge til et medie)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2922,17 +2931,17 @@ msgstr ""
 "Mangler oppføringen tsom skal oppdateres\n"
 "(en av %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "«%s»"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "Ignorerer medie «%s»."
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "Aktiverer medie «%s»."
@@ -3201,6 +3210,9 @@ msgstr "Inga «hdlist» for medium «%s». Kan ikke vise resultat for pakkene «
 msgid "No changelog found\n"
 msgstr "Fant ingen endringslogg\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       – Opprett oppdateringsmedium.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "Ugyldig adresse: [%s]."
 
diff --git a/po/nl.po b/po/nl.po
index 3047e418..1be8551c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-03-17 23:00+0100\n"
 "Last-Translator: Reinout van Schouwen <reinout@gmail.com>\n"
 "Language-Team: Nederlands <vertaling@vrijschrift.org>\n"
@@ -25,7 +25,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Dutch\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM-installatie"
@@ -35,7 +35,7 @@ msgstr "RPM-installatie"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Fout opgetreden: kan bestand %s niet vinden, operatie wordt afgebroken"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -104,7 +104,7 @@ msgstr "_Installeren"
 msgid "_Save"
 msgstr "_Opslaan"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Annuleren"
@@ -136,8 +136,9 @@ msgstr ""
 msgid "Options:"
 msgstr "Opties:"
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - geeft deze hulptekst.\n"
@@ -177,7 +178,7 @@ msgstr ""
 "                   (--no-verify-rpm schakelt dit uit, standaard "
 "ingeschakeld).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - alleen de aangegeven media, kommagescheiden.\n"
@@ -232,7 +233,7 @@ msgstr "Even geduld..."
 msgid "Must be root"
 msgstr "Dient 'root' te zijn"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -243,42 +244,42 @@ msgstr ""
 "%s\n"
 "Toch verdergaan met installatie?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (op te waarderen)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr "(te installeren)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Pakketkeuze"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Eén van de volgende pakketten is benodigd:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Afbreken"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -290,7 +291,7 @@ msgstr ""
 "%s\n"
 "Toch verdergaan met installatie?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
@@ -298,7 +299,7 @@ msgstr ""
 "Om aan afhankelijkheden te voldoen, wordt het volgende pakket geïnstalleerd:"
 
 # Should use ngettext plural forms :-/
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -306,49 +307,49 @@ msgstr ""
 "Om aan de afhankelijkheden te voldoen worden de volgende pakketten "
 "geïnstalleerd:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pakket, %d MB)"
 msgstr[1] "(%d pakketten, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Pakket-installatie..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "kan bronpakketten niet ontvangen, bezig met afbreken"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Voorbereiden..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Bezig met installeren van pakket `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Gelieve het medium genaamd \"%s\" te plaatsen"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Downloaden van pakket `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Klaar"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -359,28 +360,28 @@ msgstr ""
 "%s\n"
 "Misschien moet u de urpmi database opwaarderen"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Installatie mislukt:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "De pakketten zijn reeds geïnstalleerd"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Installatie voltooid"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "verwijderen van %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi herstarten"
@@ -461,8 +462,8 @@ msgid "...retrieving done"
 msgstr "...klaar met ontvangst"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...ontvangst mislukt: %s"
@@ -502,54 +503,54 @@ msgstr "Deze operatie is verboden tijdens het uitvoeren in beperkte modus"
 msgid "bad proxy declaration on command line\n"
 msgstr "ongeldige proxy-aanduiding op opdrachtregel\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: kon rpm bestand \"%s\" niet lezen\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "Patroonuitdrukkingen:\n"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Geen ondertekening aanwezig (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "Patroonuitdrukkingen:\n"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 "standaard verwacht urpmf een regexp, u dient de optie \"--literal\" te "
 "gebruiken"
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot-map bestaat niet"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Kan %s niet gebruiken zonder %s"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Kan %s niet gebruiken samen met %s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Te veel argumenten\n"
@@ -981,219 +982,219 @@ msgstr ""
 "--synthesis kan niet gebruikt worden met --media, --excludemedia, --"
 "sortmedia, --update, --use-distrib of --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Zoek begin: %s eind: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "pakket %s overslaan"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "Zou pakket %s installeren, niet opwaarderen"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "medium \"%s\" bestaat al"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(standaard niet in aanmerking genomen)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "toevoegen medium \"%s\" voor medium op afstand \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "toevoegen van medium \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "map %s bestaat niet"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "deze locatie lijkt geen distributie te bevatten"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "kon media.cfg niet analyseren"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "kon het installatiemedium niet vinden (geen media.cfg bestand gevonden)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "overslaan incompatibele media '%s' (voor %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "ontvangen van media.cfg-bestand..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "probeert een niet-bestaand medium \"%s\" te selecteren"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "selecteren van meerdere media: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "bezig met verwijderen van medium \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "herconfigureren van urpmi voor medium \"%s\"..."
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...herconfiguratie mislukt"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "herconfiguratie voltooid"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 "Fout bij het genereren van namenbestand: afhankelijkheid %d niet gevonden"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "medium \"%s\" is bijgewerkt"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "onderzoeken van het synthesis-bestand [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "probleem met lezen van synthesis bestand van medium \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "Kopiëren van bestand [%s] voor medium \"%s\"..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiëren mislukt"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "bezig met kopiëren omschrijving bestand van \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...kopiëren is klaar"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopiëren van [%s] mislukt (bestand is verdacht klein)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "berekenen md5sum van ontvangen bronsynthesis"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "ophalen van [%s] mislukt (md5sum onjuist)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2 mislukt op %s"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "vergelijken van %s en %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "ongeldig hdlist-bestand %s voor medium \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "kopiëren MD5SUM-bestand van \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "ongeldige rpm-bestandsnaam [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "bronsynthesis van \"%s\" ontvangen..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "afgezochte synthesis gevonden als %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "geen synthesis-bestand gevonden voor medium \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "onderzoeken van publieke sleutelbestand van \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...sleutel %s uit publiek sleutelbestand van \"%s\" geïmporteerd"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "kon publieke sleutelbestand van \"%s\" niet importeren"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "bijgewerkt medium \"%s\""
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "ophalen van [%s] mislukt"
@@ -1225,7 +1226,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyJj"
@@ -1295,7 +1296,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1378,6 +1379,311 @@ msgstr "%s koppelen..."
 msgid "unmounting %s"
 msgstr "%s afkoppelen..."
 
+#: ../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 versie %s\n"
+"Copyright © 2002-2006 Mandriva.\n"
+"Dit is vrije software en mag worden verspreid onder de voorwaarden van de "
+"GNU GPL.\n"
+"\n"
+"gebruik: urpmf [opties] patroon-expressie\n"
+
+#
+#: ../urpm/search.pm:36 ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - geeft het versienummer van dit programma weer.\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          - specifieke omgeving gebruiken (meestal een foutrapport).\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 - gebruik de gegeven media niet, kommagescheiden.\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  - geen patronen vergelijken, argument als letterlijke "
+"reeks.\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  - gebruik andere hoofdmap (root) voor urpmi db & rpm-"
+"installatie.\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    - media sorteren uitgaand van kommagescheiden subreeksen.\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib    - opgegeven pad gebruiken voor mediatoegang.\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    - opgegeven synthesis gebruiken in plaats van urpmi db.\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - geeft geen identieke regels weer.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - gebruik alleen bijwerkmedia.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - 'uitgebreid verslag'-modus.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - onderscheid hoofd-/kleine letters in elk patroon "
+"negeren.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -I             - onderscheid hoofd-/kleine letters in patronen honoreren "
+"(standaard).\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - veldscheidingsteken veranderen (standaard ':').\n"
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Patroonuitdrukkingen:\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           - alle tekst geïnterpreteerd als regexp, tenzij -l wordt \n"
+"\t\t\t\t\tgebruikt.\n"
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - voeg perl code direct als perl -e toe.\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - binaire AND operator.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - binaire OR operator.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - unary NOT.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - linker en rechter haakjes.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Lijst van tags:\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf            - een printf-achtig uitvoerformaat gebruiken.\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   voorbeeld: '%%name:%%files'\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch          - architectuur\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - buildhost ('bouwcomputer')\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - build-tijdstip\n"
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - configuratieestanden\n"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts     - conflict-tags\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description   - pakketomschrijving\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - distributie\n"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - epoch\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - bestandsnaam van het pakket\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - geeft alle bestanden in het pakket weer\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group         - groep\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - licentie\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name          - pakketnaam\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes     - obsoletes ('verouderd')-tags\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - pakketsamensteller.\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides      - provides ('levert')-tags\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires      - requires ('vereisten')-tags\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size          - geïnstalleerde grootte.\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - naam van de broncode-rpm.\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - geeft tag-suggesties\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - samenvatting\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      - leverancier\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - de media waarin het pakket gevonden is\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - geeft de versie, uitgave en arch met naam.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Onjuist formaat: u mag maar één tag gebruiken met meerdere waarden"
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "maakt gebruik van aangegeven omgeving op %s\n"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "geen hdlist-bestand beschikbaar voor medium \"%s\""
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "geen synthesis beschikbaar voor medium \"%s\""
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "geen xml-info beschikbaar voor medium \"%s\""
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1391,62 +1697,67 @@ msgid ""
 msgstr ""
 "urpmi is herstart en de prioriteitslijst van pakketten is gewijzigd: %s vs %s"
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, c-format
 msgid "No package named %s"
 msgstr "Geen pakket genaamd %s"
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "De volgende pakketten bevatten %s: %s"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Pakketten %s kunnen niet worden geïnstalleerd"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Pakket %s is reeds geïnstalleerd"
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "De pakketten %s zijn reeds geïnstalleerd"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
 msgid "due to missing %s"
 msgstr "vanwege ontbrekende %s"
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, c-format
 msgid "due to already installed %s"
 msgstr "vanwege reeds geïnstalleerde %s"
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "vanwege onvoldane %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "probeer %s op te waarderen"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "Om %s te behouden"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, c-format
 msgid "in order to install %s"
 msgstr "in volgorde om %s te installeren"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "vanwege conflicten met %s"
@@ -1542,20 +1853,18 @@ msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 "  --root         - gebruik andere hoofdmap (root) voor rpm-verwijdering.\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpme:55 ../urpmi:101
 #, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
 msgstr ""
-"  --urpmi-root  - gebruik andere hoofdmap (root) voor urpmi db & rpm-"
-"installatie.\n"
+"  --justdb       - ververs alleen de rpm-db, niet het bestandssysteem.\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - de pakketscriptlet(s) niet uitvoeren.\n"
 
-#: ../urpme:56
+#: ../urpme:57
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1564,51 +1873,51 @@ msgstr ""
 "  --use-distrib  - urpme dynamisch configureren vanuit distrib-boom, handig\n"
 "                   om een chroot te (de)installeren met de --root optie.\n"
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - 'uitgebreid verslag'-modus.\n"
 
-#: ../urpme:59
+#: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - selecteer alle pakketten die overeenkomen met de "
 "expressie.\n"
 
-#: ../urpme:72
+#: ../urpme:73
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Alleen de beheerder mag media verwijderen"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown packages"
 msgstr "onbekende pakketten"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown package"
 msgstr "onbekend pakket"
 
-#: ../urpme:119
+#: ../urpme:121
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "het verwijderen van %s zal uw systeem verstoren"
 msgstr[1] "het verwijderen van %s zal uw systeem verstoren"
 
-#: ../urpme:124
+#: ../urpme:126
 #, c-format
 msgid "Nothing to remove"
 msgstr "Niets te verwijderen"
 
-#: ../urpme:141
+#: ../urpme:143
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Niets te verwijderen"
 
-#: ../urpme:147
+#: ../urpme:149
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1619,341 +1928,45 @@ msgstr[1] ""
 "Om aan de afhankelijkheden te voldoen, worden de volgende %d pakketten "
 "verwijderd"
 
-#: ../urpme:152
+#: ../urpme:154
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "onbekend pakket"
 msgstr[1] "onbekend pakket"
 
-#: ../urpme:159
+#: ../urpme:161
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Eén pakket verwijderen?"
 msgstr[1] "%d Pakketten verwijderen?"
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (j/N) "
 
-#: ../urpme:164
+#: ../urpme:166
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "gebruikt verwisselbare schijf als \"%s\""
 
-#: ../urpme:178
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "Verwijderen is mislukt"
 
-#: ../urpme:180
+#: ../urpme:183
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Verwijderen is mislukt"
 
-#: ../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 versie %s\n"
-"Copyright © 2002-2006 Mandriva.\n"
-"Dit is vrije software en mag worden verspreid onder de voorwaarden van de "
-"GNU GPL.\n"
-"\n"
-"gebruik: urpmf [opties] patroon-expressie\n"
-
-#
-#: ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - geeft het versienummer van dit programma weer.\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - specifieke omgeving gebruiken (meestal een foutrapport).\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - gebruik de gegeven media niet, kommagescheiden.\n"
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - geen patronen vergelijken, argument als letterlijke "
-"reeks.\n"
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - media sorteren uitgaand van kommagescheiden subreeksen.\n"
-
-#: ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib    - opgegeven pad gebruiken voor mediatoegang.\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - opgegeven synthesis gebruiken in plaats van urpmi db.\n"
-
-#: ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - geeft geen identieke regels weer.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - gebruik alleen bijwerkmedia.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - 'uitgebreid verslag'-modus.\n"
-
-#: ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i             - onderscheid hoofd-/kleine letters in elk patroon "
-"negeren.\n"
-
-#: ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -I             - onderscheid hoofd-/kleine letters in patronen honoreren "
-"(standaard).\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - veldscheidingsteken veranderen (standaard ':').\n"
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Patroonuitdrukkingen:\n"
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           - alle tekst geïnterpreteerd als regexp, tenzij -l wordt \n"
-"\t\t\t\t\tgebruikt.\n"
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - voeg perl code direct als perl -e toe.\n"
-
-#: ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - binaire AND operator.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - binaire OR operator.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - unary NOT.\n"
-
-#: ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - linker en rechter haakjes.\n"
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Lijst van tags:\n"
-
-#: ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf            - een printf-achtig uitvoerformaat gebruiken.\n"
-
-#: ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   voorbeeld: '%%name:%%files'\n"
-
-#: ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch          - architectuur\n"
-
-#: ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - buildhost ('bouwcomputer')\n"
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - build-tijdstip\n"
-
-#: ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - configuratieestanden\n"
-
-#: ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts     - conflict-tags\n"
-
-#: ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description   - pakketomschrijving\n"
-
-#: ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - distributie\n"
-
-#: ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - epoch\n"
-
-#: ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - bestandsnaam van het pakket\n"
-
-#: ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - geeft alle bestanden in het pakket weer\n"
-
-#: ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group         - groep\n"
-
-#: ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - licentie\n"
-
-#: ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name          - pakketnaam\n"
-
-#: ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes     - obsoletes ('verouderd')-tags\n"
-
-#: ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - pakketsamensteller.\n"
-
-#: ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides      - provides ('levert')-tags\n"
-
-#: ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires      - requires ('vereisten')-tags\n"
-
-#: ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size          - geïnstalleerde grootte.\n"
-
-#: ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - naam van de broncode-rpm.\n"
-
-#: ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - geeft tag-suggesties\n"
-
-#: ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - samenvatting\n"
-
-#: ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - URL\n"
-
-#: ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor      - leverancier\n"
-
-#: ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - de media waarin het pakket gevonden is\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - geeft de versie, uitgave en arch met naam.\n"
-
 #: ../urpmf:153
 #, fuzzy, c-format
 msgid "unterminated expression (%s)"
 msgstr "Patroonuitdrukkingen:\n"
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Onjuist formaat: u mag maar één tag gebruiken met meerdere waarden"
-
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "maakt gebruik van aangegeven omgeving op %s\n"
-
-#: ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "geen hdlist-bestand beschikbaar voor medium \"%s\""
-
-#: ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "geen synthesis beschikbaar voor medium \"%s\""
-
-#: ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "geen xml-info beschikbaar voor medium \"%s\""
-
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2048,12 +2061,6 @@ msgstr "  --clean      - rpm uit cache verwijderen vóór al het andere\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - rpm's niet uit buffer wissen.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr ""
-"  --justdb       - ververs alleen de rpm-db, niet het bestandssysteem.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2397,7 +2404,7 @@ msgstr ""
 "\n"
 "Toch doorgaan met de installatie?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
@@ -2598,10 +2605,12 @@ msgstr ""
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - maak een bijwerkmedium aan.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2613,22 +2622,22 @@ msgstr ""
 "                   een van: never, on-demand, update-only, always. cf urpmi."
 "cfg(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - gebruik synthesis bestand.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - rpm-bestanden gebruiken (i.p.v. synthesis).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     -  probeer geen synthesisbestand te vinden.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2637,18 +2646,18 @@ msgstr ""
 "  --distrib      - maakt automatisch alle media van een installatiemedium\n"
 "                    aan.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive - with --distrib, om bevestiging vragen voor elke media\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - met --distrib, elke media in de lijst toevoegen.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2658,75 +2667,75 @@ msgstr ""
 "standaard\n"
 "                   is %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - maakt virtueel medium aan dat altijd bijgewerkt is.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - MD5SUM bestandscontrole uitschakelen.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 "  --nopubkey     - publieke sleutel van toegevoegde media niet importeren\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - media toevoegen in configuratie, maar niet bijwerken.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - stille modus.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 'extra informatie'-modus.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "bekende soorten xml-infobeleid zijn %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "geen argument nodig voor --distrib --mirrorlist <url>"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "ongeldige <url> (voor een lokale map dient het pad absoluut te zijn)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Alleen de beheerder mag media toevoegen"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "aanmaken config-bestand [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Niet mogelijk config-bestand [%s] te maken"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "niet nodig om <relatief pad van synthesis> te geven met --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2735,17 +2744,17 @@ msgstr ""
 "\n"
 "Wilt u media '%s' toevoegen"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<relatief pad van syntesis> ontbreekt\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Kan %s niet met medium op afstand gebruiken"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "kon medium niet toevoegen"
@@ -2985,13 +2994,13 @@ msgstr "  -ff             - het bijwerken van synthesis echt afdwingen\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Alleen de beheerder mag media bijwerken"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "niets om te verversen (gebruik urpmi.addmedia om media toe te voegen)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -3000,17 +3009,17 @@ msgstr ""
 "de invoer om op te waarderen ontbreekt\n"
 "(één van %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "negeren van medium \"%s\":"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "activeren van medium \"%s\""
@@ -3296,6 +3305,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Geen wijzigingslogboek gevonden\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - maak een bijwerkmedium aan.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "ongeldige URL: [%s]"
 
diff --git a/po/nn.po b/po/nn.po
index 922c2e39..b6b85091 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-08-22 18:31+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Lokalize 0.2\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM-installering"
@@ -28,7 +28,7 @@ msgstr "RPM-installering"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Feil: Fann ikkje fila «%s». Operasjonen vert avbroten."
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_OK"
@@ -94,7 +94,7 @@ msgstr "_Installer"
 msgid "_Save"
 msgstr "_Lagra"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Avbryt"
@@ -126,8 +126,9 @@ msgstr ""
 msgid "Options:"
 msgstr "Val:"
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         – Vis denne hjelpeteksten.\n"
@@ -143,13 +144,16 @@ msgstr ""
 
 #: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  – Vel automatisk alle pakkar som kan oppdaterast.\n"
 
 #: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        – Tving gjennomføring sjølv om ikkje alle pakkar finst.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        – Tving gjennomføring sjølv om ikkje alle pakkar finst.\n"
 
 #: ../gurpmi.pm:50 ../urpmi:133
 #, c-format
@@ -161,7 +165,7 @@ msgstr ""
 "                   (Bruk «--no-verify-rpm» til ikkje å kontrollera.\n"
 "                   Standard er å kontrollera.)\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        – Bruk berre gitt medium (kommadelt liste).\n"
@@ -190,7 +194,8 @@ msgstr "  --test         – Berre kontroller at installeringa kan fungera.\n"
 
 #: ../gurpmi.pm:57 ../urpmi:76
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr "  --searchmedia  – Berre sjå etter pakkar i dette mediet.\n"
 
 #: ../gurpmi.pm:100
@@ -208,7 +213,7 @@ msgstr "Vent litt ..."
 msgid "Must be root"
 msgstr "Må vera root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -219,42 +224,42 @@ msgstr ""
 "%s\n"
 "Vil du likevel halda fram?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Åtvaring"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (oppgradering)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (installering)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Pakkeval"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Du treng éin av desse pakkane:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Avbryt"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -265,59 +270,61 @@ msgstr ""
 "%s\n"
 "Vil du likevel halda fram?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
 msgstr "Grunna avhengnader vert denne pakken installert:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Grunna avhengnader vert desse pakkane installerte:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pakke – %d MB)"
 msgstr[1] "(%d pakkar – %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Installerer pakke ..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "Fann ikkje kjeldepakke. Avbryter."
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Førebur ... "
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installerer pakken «%s» (%s/%s) ..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Set inn mediet «%s»"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Lastar ned pakken «%s» ..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Ferdig"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -328,28 +335,28 @@ msgstr ""
 "%s\n"
 "Du bør oppdatera urpmi-databasen."
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Feil ved installering:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Alt er allereie installert."
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Installeringa er fullført"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "Fjernar «%s»."
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "Startar urpmi på nytt."
@@ -429,8 +436,8 @@ msgid "...retrieving done"
 msgstr "... ferdig motteken."
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... Ikkje motteken: %s"
@@ -470,54 +477,54 @@ msgstr "Du kan ikkje køyra denne operasjonen i avgrensa modus."
 msgid "bad proxy declaration on command line\n"
 msgstr "Ugyldig mellomtenardeklarasjon på kommandolinja.\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: Klarer ikkje lesa rpm-fila «%s».\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr "Uventa uttrykk: %s"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, c-format
 msgid "missing expression before %s"
 msgstr "Manglar uttrykk før «%s»."
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "Uventa uttrykk: %s (forslag: bruk «-a» eller «-o»)."
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr "Ingen uttrykk å lukka."
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 "Som standard ventar urpmf eit regulært uttrykk. Du bør bruka valet «--"
 "literal»."
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "«chroot»-mappa finst ikkje."
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Kan ikkje bruka «%s» utan «%s»."
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Kan ikkje bruka «%s» med «%s»."
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "For mange argument.\n"
@@ -574,7 +581,8 @@ msgstr "Klarte ikkje skriva oppsettfila [%s]."
 #: ../urpm/download.pm:109
 #, c-format
 msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "Klarte ikkje lesa mellomtenar-innstillingar (har ikkje løyve til å lesa «%s»)."
+msgstr ""
+"Klarte ikkje lesa mellomtenar-innstillingar (har ikkje løyve til å lesa «%s»)."
 
 #: ../urpm/download.pm:134
 #, c-format
@@ -718,7 +726,8 @@ msgstr "[pakkar om att]"
 
 #: ../urpm/install.pm:175
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "Laga transaksjon for installering på «%s» (remove: %d – install: %d – "
 "upgrade: %d)"
@@ -901,7 +910,8 @@ msgstr "Åtvaring: md5summen for «%s» er ikkje tilgjengeleg i MD5SUM-fila."
 #: ../urpm/media.pm:204
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "Det virtuelle mediet «%s» må ha ei eintydig adresse. Hoppar over medium."
+msgstr ""
+"Det virtuelle mediet «%s» må ha ei eintydig adresse. Hoppar over medium."
 
 #: ../urpm/media.pm:206
 #, c-format
@@ -947,217 +957,217 @@ msgstr ""
 "Kan ikkje bruka «--synthesis» saman med «--media», «--excludemedia», «--"
 "sortmedia», «--update», «--use-distrib» eller «--parallel»."
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Søkjestart: %s. Søkjeslutt: %s."
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "Hoppar over pakken «%s»."
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "Ville installert i staden for å oppgradera pakken «%s»."
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "Mediet «%s» finst allereie."
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(hoppa over som standard)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "Legg til mediet «%s» før fjernmediet «%s»."
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "Legg til mediet «%s»."
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "Mappa «%s» finst ikkje."
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "Denne adressa ser ikkje ut til å innehelda ein distribusjon."
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "Klarte ikkje tolka «media.cfg»."
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "Klarte ikkje lesa frå distribusjonsmediet (fann inga «media.cfg»-fil)."
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "Hoppar over ikkje-kompatibelt medium «%s» (for %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "Mottek «media.cfg»-fil ..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "Prøver å velja ikkje-eksisterande medium «%s»."
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "Vel fleire medium: %s."
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "Fjernar mediet «%s»."
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "Endrar oppsett for mediet «%s»."
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "... klarte ikkje endra oppsett."
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "Fullført endring av oppsett."
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Feil ved generering av namnefil. Fann ikkje avhengnaden %d."
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "Mediet «%s» er i nyaste versjon."
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "Les syntesefila [%s]."
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "Feil ved lesing av syntesefil til mediet «%s»."
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "Kopierer [%s] for mediet «%s»."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "... mislukka kopiering."
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "Kopierer beskrivingsfila til «%s» ..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "... kopiering fullført."
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "Mislykka kopiering av [%s] (fila er mistenkeleg liten)."
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "Reknar ut md5sum til motteken kjeldesyntese."
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "Feil ved mottak av [%s] (md5summen stemmer ikkje)."
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "Feil ved genhdlist2 på %s"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "Samanliknar %s og %s."
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "Ugyldig «hdlist»-fil [%s] for mediet «%s»."
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "Kopierer md5sum-fila til «%s» ..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "Ugyldig MD5SUM-fil (lasta ned frå %s)"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "Mottek kjeldesyntese for «%s» ..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "Fann undersøkt syntese som «%s»."
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "Fann inga syntesefil for mediet «%s»."
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "Les offentlegnøkkelfila til «%s» ..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "... Importerer nøkkelen «%s» frå offentlegnøkkelfila til «%s»."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "Klarte ikkje importera offentlegnøkkelfila til «%s»."
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "Oppdaterte mediet «%s»."
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "Feil ved mottak av [%s]."
@@ -1189,7 +1199,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "JjYy"
@@ -1259,7 +1269,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1267,8 +1277,11 @@ msgid ""
 msgid_plural ""
 "The following packages are now orphans, use \"urpme --auto-orphans\" to "
 "remove them."
-msgstr[0] "Denne pakken er no foreldrelaus. Bruk «urpme --auto-orphans» for å fjerna han."
-msgstr[1] "Desse pakkane er no foreldrelause. Bruk «urpme --auto-orphans» for å fjerna dei."
+msgstr[0] ""
+"Denne pakken er no foreldrelaus. Bruk «urpme --auto-orphans» for å fjerna han."
+msgstr[1] ""
+"Desse pakkane er no foreldrelause. Bruk «urpme --auto-orphans» for å fjerna "
+"dei."
 
 #: ../urpm/parallel.pm:14
 #, c-format
@@ -1344,6 +1357,303 @@ msgstr "Monterer «%s»."
 msgid "unmounting %s"
 msgstr "Avmonterer «%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 – versjon %s\n"
+"Copyright © 2002–2007 Mandriva.\n"
+"Dette er fri programvare, og kan distribuerast under vilkåra i GNU GPL-"
+"lisensen.\n"
+"\n"
+"Bruk: urpmf [val] mønster-uttrykk\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      – Vis versjonsnummeret til dette verktøyet.\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          – Bruk eigedefinert miljø (vanlegvis ein feilrapport).\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 – Ikkje bruk gitt medium (kommadelt liste).\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  – Ingen treff på mønster; bruk berre argument som tekst.\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   – Bruk anna rot for urpmi-database og rpm-installering.\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    – Sorter medium etter delstrengar (kommadelt liste).\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  – Bruk denne stigen for tilgang til medium.\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    – Bruk syntese i staden for heile databasen.\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         – Vis ikkje identiske linjer.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       – Bruk berre oppdateringsmedium.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      – Utvida meldingar.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             – Ikkje skil mellom store og små bokstavar.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -l             – Skil store og små bokstavar i mønster (standard).\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        – Byt feltskiljar (standard er «:»).\n"
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Mønsteruttrykk:\n"
+
+#: ../urpm/search.pm:52 ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  tekst          – All tekst vert tolka som regulære uttrykk, med mindre «-l» "
+"vert brukt.\n"
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             – Ta med perl-kode direkte, som «perl -e».\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             – Binær OG-operator.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             – Binær ELLER-operator.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              – Unær IKKJE-operator.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            – Venstre- og høgreparentes.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Oversikt over merkelappar:\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           – Bruk eit printf-liknande utformat.\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   Eksempel: «%%name:%%files»\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         – Arkitektur.\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    – Byggjevert.\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    – Byggjetidspunkt.\n"
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    – Oppsettfiler.\n"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    – Konfliktmerkelappar.\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  – Pakkeskildring.\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution – Distribusjon.\n"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        – Epoch.\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     – Filnamnet til pakken.\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        – Oversikt over filer i pakken.\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        – Gruppe.\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      – Vis lisensvilkår.\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         – Pakkenamn.\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    – Utdatert-merkelappar.\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     – Pakkebyggjar.\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     – Tilbod-merkelappar.\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     – Krev-merkelappar.\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         – Installert storleik.\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    – Namn på kjelde-RPM.\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     – Føreslegen-merkelappar.\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      – Samandrag.\n"
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - Adresse.\n"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       – Leverandør.\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             – Mediet som pakken vart funnen i.\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             – Vis versjon-, utgåve og arkitekturinformasjon.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Ugyldig format: Du kan berre bruka éin fleirverdi-merkelapp."
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "Brukar eigedefinert miljø på «%s»\n"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "Fann inga «hdlist» for mediet «%s»."
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "Fann inga syntesefil for mediet «%s»."
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "Fann ingen xml-info for mediet «%s»."
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1353,67 +1663,74 @@ msgstr ""
 
 #: ../urpm/select.pm:30
 #, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 "Installasjonsprogrammet urpmi vart starta på nytt, og programprioriteringane "
 "vart endra: %s mot %s"
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, c-format
 msgid "No package named %s"
 msgstr "Det finst ingen «%s»-pakke."
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Desse pakkane inneheld «%s»: %s"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Fann pakke/pakakr %s i urpmi-databsen, men ingen av dei er installerte."
+msgstr ""
+"Fann pakke/pakakr %s i urpmi-databsen, men ingen av dei er installerte."
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Pakken «%s» er alt installert."
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Pakkane «%s» er alt installerte."
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
 msgid "due to missing %s"
 msgstr "då «%s» manglar"
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, c-format
 msgid "due to already installed %s"
 msgstr "då «%s» alt er installert"
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "då «%s» ikkje er tilfredsstilt"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "Prøver å prioritera «%s»"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "for å kunna behalda «%s»"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, c-format
 msgid "in order to install %s"
 msgstr "for å kunna installera «%s»"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "på grunn av konfliktar med «%s»"
@@ -1505,18 +1822,18 @@ msgstr "  --repackage    – Pakk om filer før sletting.\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         – Bruka anna rot for rpm-fjerning.\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpme:55 ../urpmi:101
 #, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --urpmi-root   – Bruk anna rot for urpmi-database og rpm-installering.\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr ""
+"  --justdb       – Berre oppdater rpm-databasen, og ikkje filsystemet.\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    – Ikkje køyr pakkeskript.\n"
 
-#: ../urpme:56
+#: ../urpme:57
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1525,378 +1842,95 @@ msgstr ""
 "  --use-distrib  – Set opp urpme direkte frå eit «distrib»-tre.\n"
 "Nyttig for å (av)installera ei «chroot» med «--root»-valet.\n"
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  – Utvida meldingar.\n"
 
-#: ../urpme:59
+#: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             – Vel alle pakkar som samsvarer med uttrykket.\n"
 
-#: ../urpme:72
+#: ../urpme:73
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Berre superbrukaren kan fjerna pakkar."
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown packages"
 msgstr "Ukjende pakkar"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown package"
 msgstr "Ukjend pakke"
 
-#: ../urpme:119
+#: ../urpme:121
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "Du vil øydeleggja systemet viss du fjernar denne pakken:"
 msgstr[1] "Du vil øydeleggja systemet viss du fjernar desse pakkane:"
 
-#: ../urpme:124
+#: ../urpme:126
 #, c-format
 msgid "Nothing to remove"
 msgstr "Ingenting å fjerna."
 
-#: ../urpme:141
+#: ../urpme:143
 #, c-format
 msgid "No orphans to remove"
 msgstr "Ingen foreldrelause pakkar å fjerna"
 
-#: ../urpme:147
+#: ../urpme:149
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
 msgstr[0] "På grunn av avhengnader vert denne pakken fjerna"
 msgstr[1] "På grunn av avhengnader vert desse %d pakkane fjerna"
 
-#: ../urpme:152
+#: ../urpme:154
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "(foreldrelaus pakke)"
 msgstr[1] "(foreldrelause pakkar)"
 
-#: ../urpme:159
+#: ../urpme:161
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Vil du fjerna %d pakke?"
 msgstr[1] "Vil du fjerna %d pakkar?"
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (J/N) "
 
-#: ../urpme:164
+#: ../urpme:166
 #, c-format
 msgid "testing removal of %s"
 msgstr "Testar fjerning av «%s»"
 
-#: ../urpme:178
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "Klarte ikkje fjerna."
 
-#: ../urpme:180
+#: ../urpme:183
 #, c-format
 msgid "Removal is possible"
 msgstr "Fjerning er mogleg."
 
-#: ../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 – versjon %s\n"
-"Copyright © 2002–2007 Mandriva.\n"
-"Dette er fri programvare, og kan distribuerast under vilkåra i GNU GPL-"
-"lisensen.\n"
-"\n"
-"Bruk: urpmf [val] mønster-uttrykk\n"
-
-#: ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      – Vis versjonsnummeret til dette verktøyet.\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          – Bruk eigedefinert miljø (vanlegvis ein feilrapport).\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia – Ikkje bruk gitt medium (kommadelt liste).\n"
-
-#: ../urpmf:39
-#, c-format
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr "  --literal, -l  – Ingen treff på mønster; bruk berre argument som tekst.\n"
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    – Sorter medium etter delstrengar (kommadelt liste).\n"
-
-#: ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  – Bruk denne stigen for tilgang til medium.\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    – Bruk syntese i staden for heile databasen.\n"
-
-#: ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         – Vis ikkje identiske linjer.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       – Bruk berre oppdateringsmedium.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      – Utvida meldingar.\n"
-
-#: ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             – Ikkje skil mellom store og små bokstavar.\n"
-
-#: ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -l             – Skil store og små bokstavar i mønster (standard).\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        – Byt feltskiljar (standard er «:»).\n"
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Mønsteruttrykk:\n"
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  tekst          – All tekst vert tolka som regulære uttrykk, med mindre «-l» "
-"vert brukt.\n"
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             – Ta med perl-kode direkte, som «perl -e».\n"
-
-#: ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             – Binær OG-operator.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             – Binær ELLER-operator.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              – Unær IKKJE-operator.\n"
-
-#: ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            – Venstre- og høgreparentes.\n"
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Oversikt over merkelappar:\n"
-
-#: ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           – Bruk eit printf-liknande utformat.\n"
-
-#: ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   Eksempel: «%%name:%%files»\n"
-
-#: ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         – Arkitektur.\n"
-
-#: ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    – Byggjevert.\n"
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    – Byggjetidspunkt.\n"
-
-#: ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    – Oppsettfiler.\n"
-
-#: ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    – Konfliktmerkelappar.\n"
-
-#: ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  – Pakkeskildring.\n"
-
-#: ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution – Distribusjon.\n"
-
-#: ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        – Epoch.\n"
-
-#: ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     – Filnamnet til pakken.\n"
-
-#: ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        – Oversikt over filer i pakken.\n"
-
-#: ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        – Gruppe.\n"
-
-#: ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      – Vis lisensvilkår.\n"
-
-#: ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         – Pakkenamn.\n"
-
-#: ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    – Utdatert-merkelappar.\n"
-
-#: ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     – Pakkebyggjar.\n"
-
-#: ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     – Tilbod-merkelappar.\n"
-
-#: ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     – Krev-merkelappar.\n"
-
-#: ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         – Installert storleik.\n"
-
-#: ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    – Namn på kjelde-RPM.\n"
-
-#: ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     – Føreslegen-merkelappar.\n"
-
-#: ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      – Samandrag.\n"
-
-#: ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - Adresse.\n"
-
-#: ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       – Leverandør.\n"
-
-#: ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             – Mediet som pakken vart funnen i.\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             – Vis versjon-, utgåve og arkitekturinformasjon.\n"
-
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "Uavslutta uttrykk: %s"
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Ugyldig format: Du kan berre bruka éin fleirverdi-merkelapp."
-
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "Brukar eigedefinert miljø på «%s»\n"
-
-#: ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "Fann inga «hdlist» for mediet «%s»."
-
-#: ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "Fann inga syntesefil for mediet «%s»."
-
-#: ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "Fann ingen xml-info for mediet «%s»."
-
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1987,14 +2021,10 @@ msgstr "  --clean        – Fjern rpm-filer frå mellomlager først.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      – Behald rpm-filer i mellomlager.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       – Berre oppdater rpm-databasen, og ikkje filsystemet.\n"
-
 #: ../urpmi:102
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr ""
 "  --replacepkgs  – Tving gjennom installering av pakkar som alt er "
 "installerte.\n"
@@ -2129,7 +2159,8 @@ msgstr ""
 #: ../urpmi:139
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
-msgstr "  --ignorearch   – Tillat å installera pakkar for andre arkitekturar.\n"
+msgstr ""
+"  --ignorearch   – Tillat å installera pakkar for andre arkitekturar.\n"
 
 #: ../urpmi:140
 #, c-format
@@ -2151,7 +2182,8 @@ msgstr "  --prefer       – Pakkar som skal føretrekkast.\n"
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
-msgstr "  --more-choices – Vis fleire val enn standard ved treff på fleire pakkar.\n"
+msgstr ""
+"  --more-choices – Vis fleire val enn standard ved treff på fleire pakkar.\n"
 
 #: ../urpmi:146
 #, c-format
@@ -2214,8 +2246,10 @@ msgstr "Brukar standardvalet --buildrequires"
 
 #: ../urpmi:232
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "Bruk «--buildrequires» eller «--install-src». Standard er «--buildrequires»."
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"Bruk «--buildrequires» eller «--install-src». Standard er «--buildrequires»."
 
 #: ../urpmi:252
 #, c-format
@@ -2317,7 +2351,7 @@ msgstr ""
 "\n"
 "Vil du likevel halda fram?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/N) "
@@ -2511,10 +2545,12 @@ msgstr "  --aria2        – Bruk aria2 for å henta fjerntliggjande filer.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       – Lag oppdateringsmedium.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2525,22 +2561,22 @@ msgstr ""
 "                   Éin av: never, on-demand, update-only, always. Sjå urpmi."
 "cfg(5).\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis – Bruk syntesefil.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   – Bruk rpm-filer (i staden for syntese).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     – Ikkje prøv å finna syntesefil.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2549,17 +2585,18 @@ msgstr ""
 "  --distrib      – Lag automatisk alle medium frå\n"
 "                   eit installasjonsmedium.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
-msgstr "  --interactive  – med «--distrib»: Spør om stadfesting for kvart medium.\n"
+msgstr ""
+"  --interactive  – med «--distrib»: Spør om stadfesting for kvart medium.\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    – Med «--distrib»: Legg til alle media.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2568,72 +2605,73 @@ msgstr ""
 "  --from         – Bruk valt adresse for liste over speglar.\n"
 "                   Standardverdi: %s.\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr "  --virtual      – Lag virtuelt medium som alltid er oppdatert.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    – Ikkje bruk md5sum-kontroll.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     – Ikkje importer offentlegnøkkel til nytt medium.\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
-msgstr "  --raw          – Legg mediet til oppsettet, men ikkje oppdater det.\n"
+msgstr ""
+"  --raw          – Legg mediet til oppsettet, men ikkje oppdater det.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             – Stillemodus.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             – Utvida meldingar.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "Kjende xml-info-praksisar: %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "Treng ikkje noko argument for «--distrib --mirrorlist <adresse>»."
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "Ugyldig <adresse> (for lokale mapper må adressa vera absolutt)."
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Berre superbrukaren kan leggja til medium."
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "Lagar oppsettfil [%s]."
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Kan ikkje laga oppsettfil [%s]."
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "Treng ikkje oppgi <relativ stig til syntese> med «--distrib»-valet."
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
@@ -2642,17 +2680,17 @@ msgstr ""
 "\n"
 "Ønskjer du å leggja til mediet «%s»?"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "Manglar <relativ stig til syntese>.\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Kan ikkje bruka «%s» med fjernmedium."
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "Klarte ikkje leggja til medium."
@@ -2686,13 +2724,15 @@ msgstr "  --noclean      – Ikkje tøm ompakkingsmappe ved kontrollpunkt.\n"
 
 #: ../urpmi.recover:37
 #, c-format
-msgid "  --list         - list transactions since provided date/duration argument\n"
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
 msgstr "  --list         – Vis transaksjonar frå vald dato/lengd-argument.\n"
 
 #: ../urpmi.recover:38
 #, c-format
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
-msgstr "  --list-all     – Vis oversikt over alle transaksjonar i rpmdb (lang).\n"
+msgstr ""
+"  --list-all     – Vis oversikt over alle transaksjonar i rpmdb (lang).\n"
 
 #: ../urpmi.recover:39
 #, c-format
@@ -2891,14 +2931,14 @@ msgstr "  -f             – Tving oppdatering av syntese.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Berre superbrukaren kan oppdatera medium."
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "Det finst ingenting å oppdatera. (Bruk «urpmi.addmedia» til å leggja til "
 "medium.)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2907,17 +2947,17 @@ msgstr ""
 "Manglar oppføringa som skal oppdaterast\n"
 "(éin av %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "«%s»."
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "Hoppar over mediet «%s»."
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "Brukar mediet «%s»."
@@ -2969,7 +3009,8 @@ msgstr "  --list-media   – Vis oversikt over tilgjengelege medium.\n"
 #: ../urpmq:60
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
-msgstr "  --list-url     – Vis oversikt over tilgjengelge medium, med adresser.\n"
+msgstr ""
+"  --list-url     – Vis oversikt over tilgjengelge medium, med adresser.\n"
 
 #: ../urpmq:61
 #, c-format
@@ -2983,7 +3024,8 @@ msgstr "  --list-aliases – Vis oversikt over tilgjengelege parallellalias.\n"
 
 #: ../urpmq:63
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  – Dump oppsettet på same form som «urpmi.addmedia»-"
 "argument.\n"
@@ -2995,7 +3037,8 @@ msgstr "  --src          – Neste pakke er ein kjeldepakke (same som «-s»).\n
 
 #: ../urpmq:65
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      – Gi alle kjeldepakkar før nedlasting (berre for «root»-"
 "brukar).\n"
@@ -3003,7 +3046,8 @@ msgstr ""
 #: ../urpmq:67
 #, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
-msgstr "  --ignorearch   – Tillat førespurnad etter pakkar for andre arkitekturar.\n"
+msgstr ""
+"  --ignorearch   – Tillat førespurnad etter pakkar for andre arkitekturar.\n"
 
 #: ../urpmq:71
 #, c-format
@@ -3089,7 +3133,8 @@ msgstr ""
 #: ../urpmq:98
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             – Fullstendig oversikt over pakken som skal fjernast.\n"
+msgstr ""
+"  -c             – Fullstendig oversikt over pakken som skal fjernast.\n"
 
 #: ../urpmq:100
 #, c-format
@@ -3138,7 +3183,8 @@ msgstr "  -y             – Bruk òg ikkje-ordrett søk (same som «-fuzzy»).\
 #: ../urpmq:108
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
-msgstr "  -Y             – som «-y», men ikkje skil mellom store og små bokstavar.\n"
+msgstr ""
+"  -Y             – som «-y», men ikkje skil mellom store og små bokstavar.\n"
 
 #: ../urpmq:109
 #, c-format
@@ -3172,19 +3218,25 @@ msgstr "Ingen xml-info for mediet «%s». Berre delvis resultat for pakkane «%s
 
 #: ../urpmq:408
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr "Ingen xml-info for mediet «%s». Kan ikkje visa resultat for pakken «%s»."
 
 #: ../urpmq:409
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "Ingen  xml-info for mediet «%s». Kan ikkje visa resultat for pakkane «%s»."
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"Ingen  xml-info for mediet «%s». Kan ikkje visa resultat for pakkane «%s»."
 
 #: ../urpmq:473
 #, c-format
 msgid "No changelog found\n"
 msgstr "Fann ikkje endringslogg.\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       – Lag oppdateringsmedium.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "Ugyldig adresse: [%s]."
 
@@ -3249,4 +3301,3 @@ msgstr "Fann ikkje endringslogg.\n"
 
 #~ msgid "  -c             - clean headers cache directory.\n"
 #~ msgstr "  -c             – Tøm hovudlinjemellomlageret.\n"
-
diff --git a/po/pa_IN.po b/po/pa_IN.po
index 460f41ec..7f1ae47c 100644
--- a/po/pa_IN.po
+++ b/po/pa_IN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2005-03-23 21:55+0530\n"
 "Last-Translator: Kanwaljeet Singh Brar <kanwaljeetbrar@yahoo.co.in>\n"
 "Language-Team: Panjabi <fedora-trans-pa@redhat.com>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM ਇੰਸਟਾਲੇਸ਼ਨ"
@@ -27,7 +27,7 @@ msgstr "RPM ਇੰਸਟਾਲੇਸ਼ਨ"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "ਠੀਕ ਹੈ(_O)"
@@ -93,7 +93,7 @@ msgstr "ਇੰਸਟਾਲ(_I)"
 msgid "_Save"
 msgstr "ਸੰਭਾਲੋ(_S)"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "ਰੱਦ(_C)"
@@ -124,8 +124,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - print this help message.\n"
@@ -160,7 +161,7 @@ msgstr ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - use only the given media, separated by comma.\n"
@@ -211,7 +212,7 @@ msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੰਤਜ਼ਾਰ ਕਰੋ..."
 msgid "Must be root"
 msgstr "ਪ੍ਰਬੰਧਕ (root) ਬਣਨਾ ਪਵੇਗਾ"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -222,42 +223,42 @@ msgstr ""
 "%s\n"
 "ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "ਚੇਤਾਵਨੀ"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "ਠੀਕ ਹੈ"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (ਨਵੀਨੀਕਰਨ ਕਰਨ ਲਈ)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (ਇੰਸਟਾਲ ਕਰਨ ਲਈ)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਦੀ ਲੋੜ ਹੈ:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "ਛੱਡੋ(_A)"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -268,13 +269,13 @@ msgstr ""
 "%s\n"
 "ਕੀ ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "ਨਿਰਭਰਤਾ ਹੱਲ ਕਰਨ ਲਈ, ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ (%d ਮੈਬਾ)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -282,49 +283,49 @@ msgstr ""
 "ਨਿਰਭਰਤਾ ਸਮਾਪਤ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ:\n"
 "%s\n"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "ਪੈਕੇਜ ਇੰਸਟਾਲੇਸ਼ਨ..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ਸਰੋਤ ਪੈਕੇਜ ਪ੍ਰਾਪਤ ਕਰਨ ਤੋਂ ਅਸਫਲ, ਅਧੂਰਾ ਛੱਡਿਆ ਜਾਦਾ ਹੈ"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "`%s' (%s/%s) ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "ਕਿਪਾ ਕਰਕੇ \"%s\" ਨਾਂ ਮਾਧਿਅਮ [%s] ਜੰਤਰ ਵਿੱਚ ਪਾਓ"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "`%s' ਪੈਕੇਜ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "ਸਮਾਪਤ(_D)"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -335,28 +336,28 @@ msgstr ""
 "%s\n"
 "ਤੁਸੀਂ ਆਪਣੇ urpmi ਡਾਟਾਬੇਸ ਦਾ ਨਵੀਨੀਕਰਨ ਕਰ ਸਕਦੇ ਹੋ"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "ਇੰਸਟਾਲੇਸ਼ ਸਮਾਪਤ"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "%s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi ਮੁੜ ਚਾਲੂ"
@@ -436,8 +437,8 @@ msgid "...retrieving done"
 msgstr "...ਪ੍ਰਾਪਤੀ ਹੋਈ"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...ਪ੍ਰਾਪਤੀ ਅਸਫਲ: %s"
@@ -477,52 +478,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr "ਕਮਾਂਡ ਸਤਰ ਤੇ ਗਲਤ ਪਰਾਕਸੀ ਪ੍ਰਗਟਾ\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: rpm ਫਾਇਲ \"%s\" ਪੜੀ ਨਹੀਂ ਜਾ ਸਕਦੀ\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "ਦਸਤਖਤ (%s) ਗੁੰਮ ਹਨ"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -947,217 +948,217 @@ msgstr ""
 "--synthesis ਨੂੰ --media, --excludemedia, --sortmedia, --update ਜਾਂ --parallel "
 "ਨਹੀਂ ਵਰਤਿਆ ਜਾ ਸਕਦਾ"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "ਖੋਜ ਸ਼ੁਰੂ: %s ਅੰਤ: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "ਪੈਕੇਜ %s ਛੱਡਿਆ ਜਾਦਾ ਹੈ"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "ਪੈਕੇਜ %s ਨਵੀਨੀਕਰਨ ਕਰਨ ਦੀ ਬਜਾਏ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਵੇਗਾ"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "ਮਾਧਿਅਮ \"%s\" ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "ਮਾਧਿਅਮ \"%s\" ਤੋਂ ਸਿਰਲੇਖ ਵੇਖੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "ਮਾਧਿਅਮ \"%s\" ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "rpmdb ਖੋਲਣ ਲਈ ਅਸਫਲ"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "ਪਹਿਲੇ ਇੰਸਟਾਲੇਸ਼ਨ ਮਾਧਿਅਮ ਨੂੰ ਕੋਲਣ ਲ਼ਈ ਅਸਫਲ (ਕੋਈ hdlists ਫਾਇਲ ਨਹੀਂ ਲੱਭੀ)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "hdlists ਫਾਇਲ ਪ੍ਰਾਪਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "ਨਾ-ਮੌਜੂਦ ਮਾਧਿਅਮ \"%s\" ਨੂੰ ਚੁਣਨ ਦੀ ਕੋਸ਼ਿਸ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "ਕਈ ਮਾਧਿਅਮ ਚੁਣੇ ਜਾ ਰਹੇ ਹਨ: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "ਮਾਧਿਅਮ \"%s\" ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "\"%s\" ਮਾਧਿਅਮ ਲਈ urpmi ਮੁੜ-ਸੰਰਚਨਾ"
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...ਮੁੜ-ਸੰਰਚਨਾ ਅਸਫਲ"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "ਮੁੜ ਸੰਰਚਨਾ ਹੋਈ"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "ਮਾਧਿਅਮ \"%s\" ਚੁਣਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "ਸ਼ੰਸਲੇਸ਼ਨ ਫਾਇਲ [%s] ਪੜਤਾਲ ਜਾਰੀ"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "\"%s\" ਮਾਧਿਅਮ ਦੀ ਸੰਸਲੇਸ਼ਨ ਫਾਇਲ ਪੜਨ ਦੌਰਾਨ ਸਮੱਸਿਆ"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "\"%s\" ਮਾਧਿਅਮ ਲਈ list ਫਾਇਲ ਲਿਖੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...ਨਕਲ ਅਸਫਲ"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "\"%s\" ਦੀ ਵੇਰਵਾ ਫਾਇਲ ਦੀ ਨਕਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...ਨਕਲ ਹੋਈ"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "[%s] ਦੀ ਨਕਲ ਅਸਫਲ (ਫਾਇਲ ਸ਼ੱਕੀ ਰੂਪ ਵਿੱਚ ਛੋਟੀ ਹੈ)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "ਪ੍ਰਾਪਤ ਸਰੋਤ hdlist (ਜਾਂ ਸੰਸਲੇਸ਼ਣ) ਦਾ md5sum ਕੱਢਿਆ ਜਾਦਾ ਹੈ"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] ਦੀ ਨਕਲ ਅਸਫਲ (md5sum ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "hdlist ਫਾਇਲ [%s] ਪੜਤਾਲ ਜਾਰੀ"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "%s ਨੂੰ %s ਤੋਂ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਦਾ ਹੈ"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਫਾਇਲ ਨਹੀਂ ਮਿਲੀ"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "\"%s\" ਦੀ ਵੇਰਵਾ ਫਾਇਲ ਦੀ ਨਕਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "ਗਲਤ rpm ਫਾਇਲ ਨਾਂ [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "\"%s\" ਲਈ hdlist (ਜਾਂ ਸੰਸਲੇਸ਼ਨ) ਪ੍ਰਾਪਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "%s ਵਾਂਗ hdlist (ਜਾਂ ਸੰਸਲੇਸ਼ਨ) ਖੋਜੀ ਗਈ"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਫਾਇਲ ਨਹੀਂ ਮਿਲੀ"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" ਦੀ ਸਵਰਜਨਕ ਕੁੰਜੀ ਫਾਇਲ ਵੇਖੀ ਜਾਦੀ ਹੈ..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...\"%s\" ਦੀ ਸਰਵਜਨਕ ਕੁੰਜੀ ਤੋਂ %s ਕੁੰਜੀ ਆਯਾਤੀ ਕੀਤੀ"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\" ਦੀ ਸਵਰਜਨਕ ਕੁੰਜੀ ਆਯਾਤ ਕਰਨੀ ਅਸਫਲ"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "ਮਾਧਿਅਮ %s ਸ਼ਾਮਲ"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1189,7 +1190,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yy"
@@ -1259,7 +1260,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1342,268 +1343,7 @@ msgstr "%s ਮਾਊਟ ਕੀਤਾ ਜਾਦਾ ਹੈ"
 msgid "unmounting %s"
 msgstr "%s ਅਨਮਾਊਟ ਕੀਤਾ ਜਾਦਾ ਹੈ"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "ਕੋਈ ਪੈਕੇਜ %s ਨਾਂ ਨਾਲ ਨਹੀਂ"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਵਿੱਚ %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-
-#: ../urpm/select.pm:539
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-
-#: ../urpm/select.pm:540
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "ਗੁੰਮ %s ਹੋਣ ਕਰਕੇ"
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "ਨਾ-ਪੂਰਾ %s ਹੋਣ ਕਰਕੇ"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "%s ਨੂੰ ਵਧਾਉਣ ਦੀ ਕੋਸ਼ਿਸ ਦੌਰਾਨ"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "%s ਰੱਖਣ ਲਈ"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "%s ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "%s ਨਾਲ ਅਪਵਾਦ ਕਰਕੇ"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "ਗਲਤ ਦਸਤਖਤ (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "ਗਲਤ ਕੁੰਜੀ ID (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "ਦਸਤਖਤ (%s) ਗੁੰਮ ਹਨ"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "ਫਾਇਲ [%s] ਲਿਖਣ ਲਈ ਅਸਫਲ"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "ਨਕਲ ਕਰਨੀ ਅਸਫਲ"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "ਨਕਲ ਕਰਨੀ ਅਸਫਲ"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme ਵਰਜਨ %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"ਇਹ ਸਾਫਟਵੇਅਰ ਮੁਫਤ ਹੈ ਅਤੇ GNU GPL ਸ਼ਰਤਾਂ ਅਧੀਨ ਮੁਫਤ ਵੰਡਿਆ ਜਾ ਸਕਦਾ ਹੈ।\n"
-"\n"
-"ਵਰਤੋਂ:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - automatically select a package in choices.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - verify if the removal can be achieved correctly.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - distributed urpmi across machines of alias.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, fuzzy, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --packager     - print tag packager: packager.\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - use another root for rpm removal.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - use another root for rpm installation.\n"
-
-#: ../urpme:55
-#, fuzzy, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --description  - print tag description: description.\n"
-
-#: ../urpme:56
-#, fuzzy, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, fuzzy, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose      - verbose mode.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - select all packages matching expression.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "ਸਿਰਫ਼ ਪ੍ਰਬੰਧਕ ਹੀ ਪੈਕੇਜ ਹਟਾ ਸਕਦੇ ਹਨ"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "ਅਣਜਾਣ ਪੈਕੇਜ"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "ਅਣਜਾਣ ਪੈਕੇਜ"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "ਪੈਕੇਜ %s ਹਟਾਉਣ ਨਾਲ ਤੁਹਾਡਾ ਸਿਸਟਮ ਖਰਾਬ ਹੋ ਜਾਵੇਗਾ"
-msgstr[1] "ਪੈਕੇਜ %s ਹਟਾਉਣ ਨਾਲ ਤੁਹਾਡਾ ਸਿਸਟਮ ਖਰਾਬ ਹੋ ਜਾਵੇਗਾ"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "ਹਟਾਉਣ ਲਈ ਕੁਝ ਨਹੀਂ"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "ਹਟਾਉਣ ਲਈ ਕੁਝ ਨਹੀਂ"
-
-#: ../urpme:147
-#, fuzzy, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਹਟਾਏ ਜਾਣਗੇ (%d ਮੈਬਾ)"
-msgstr[1] "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਹਟਾਏ ਜਾਣਗੇ (%d ਮੈਬਾ)"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "ਅਣਜਾਣ ਪੈਕੇਜ"
-msgstr[1] "ਅਣਜਾਣ ਪੈਕੇਜ"
-
-#: ../urpme:159
-#, fuzzy, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
-msgstr[1] "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "\"%s\" ਨੂੰ ਹਟਾਉਣਯੋਗ ਜੰਤਰ ਵਾਂਗ ਲਵੋ"
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "ਹਟਾਉਣਾ ਅਸਫਲ"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "ਹਟਾਉਣਾ ਅਸਫਲ"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1619,285 +1359,557 @@ msgstr ""
 "\n"
 "ਵਰਤੋਂ:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - print this help message.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, fuzzy, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - use specific environment (typically a bug\n"
 "                   report).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - do not use the given media, separated by comma.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - use another root for rpm installation.\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    - sort media according to substrings separated by comma.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - use the given synthesis instead of urpmi db.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - do not print identical lines twice.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - use only update media.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - verbose mode.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - ignore case distinctions in patterns.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -i             - ignore case distinctions in patterns.\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - include perl code directly as perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, fuzzy, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr ""
 "  -a             - binary AND operator, true if both expression are true.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, fuzzy, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr ""
 "  -o             - binary OR operator, true if one expression is true.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, fuzzy, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  -q             - quiet mode.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  )              - right parenthesis to close group expression.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "ਮੁੜ ਸੰਭਾਲ ਵਾਲੇ ਡਾਟੇ ਦੀ ਸੂਚੀ:\n"
 "\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  -g             - print groups with name also.\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    %s ਮੂਲ ਹੈ।\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - print tag url: url.\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - print tag buildhost: build host.\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "ਕੇਸੋਲ ਸੰਰਚਨਾ ਮੈਡੀਊਲ"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - print tag conflicts: all conflicts.\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - print tag description: description.\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - print tag epoch: epoch.\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name         - print only package names.\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - list files in package.\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - print tag group: group.\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --name         - print only package names.\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - print only package names.\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - print tag packager: packager.\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - print tag provides: all provides.\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - print tag requires: all requires.\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - print tag size: size.\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - print tag summary: summary.\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - print tag url: url.\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - verbose mode.\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - list files in package.\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - print version, release and arch with name.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "%s ਤੇ ਖਾਸ ਵਾਤਾਵਰਣ ਦੀ ਵਰਤੋਂ ਕਰਕੇ\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਫਾਇਲ ਨਹੀਂ ਮਿਲੀ"
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਸੰਸਲੇਸ਼ਕ ਫਾਇਲ ਬਣਾਈ"
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "\"%s\" ਮਾਧਿਅਮ ਲਈ list ਫਾਇਲ ਲਿਖੀ ਜਾ ਰਹੀ ਹੈ"
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "ਕੋਈ ਪੈਕੇਜ %s ਨਾਂ ਨਾਲ ਨਹੀਂ"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਵਿੱਚ %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
+
+#: ../urpm/select.pm:543
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
+
+#: ../urpm/select.pm:544
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "ਗੁੰਮ %s ਹੋਣ ਕਰਕੇ"
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "ਨਾ-ਪੂਰਾ %s ਹੋਣ ਕਰਕੇ"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "%s ਨੂੰ ਵਧਾਉਣ ਦੀ ਕੋਸ਼ਿਸ ਦੌਰਾਨ"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "%s ਰੱਖਣ ਲਈ"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "%s ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "%s ਨਾਲ ਅਪਵਾਦ ਕਰਕੇ"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "ਗਲਤ ਦਸਤਖਤ (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "ਗਲਤ ਕੁੰਜੀ ID (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "ਦਸਤਖਤ (%s) ਗੁੰਮ ਹਨ"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "ਫਾਇਲ [%s] ਲਿਖਣ ਲਈ ਅਸਫਲ"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "ਨਕਲ ਕਰਨੀ ਅਸਫਲ"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "ਨਕਲ ਕਰਨੀ ਅਸਫਲ"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme ਵਰਜਨ %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"ਇਹ ਸਾਫਟਵੇਅਰ ਮੁਫਤ ਹੈ ਅਤੇ GNU GPL ਸ਼ਰਤਾਂ ਅਧੀਨ ਮੁਫਤ ਵੰਡਿਆ ਜਾ ਸਕਦਾ ਹੈ।\n"
+"\n"
+"ਵਰਤੋਂ:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - automatically select a package in choices.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - verify if the removal can be achieved correctly.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - distributed urpmi across machines of alias.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, fuzzy, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --packager     - print tag packager: packager.\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - use another root for rpm removal.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - update only update media.\n"
+
+#: ../urpme:56
+#, fuzzy, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --description  - print tag description: description.\n"
+
+#: ../urpme:57
+#, fuzzy, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - verbose mode.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - select all packages matching expression.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "ਸਿਰਫ਼ ਪ੍ਰਬੰਧਕ ਹੀ ਪੈਕੇਜ ਹਟਾ ਸਕਦੇ ਹਨ"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "ਅਣਜਾਣ ਪੈਕੇਜ"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "ਅਣਜਾਣ ਪੈਕੇਜ"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "ਪੈਕੇਜ %s ਹਟਾਉਣ ਨਾਲ ਤੁਹਾਡਾ ਸਿਸਟਮ ਖਰਾਬ ਹੋ ਜਾਵੇਗਾ"
+msgstr[1] "ਪੈਕੇਜ %s ਹਟਾਉਣ ਨਾਲ ਤੁਹਾਡਾ ਸਿਸਟਮ ਖਰਾਬ ਹੋ ਜਾਵੇਗਾ"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "ਹਟਾਉਣ ਲਈ ਕੁਝ ਨਹੀਂ"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "ਹਟਾਉਣ ਲਈ ਕੁਝ ਨਹੀਂ"
+
+#: ../urpme:149
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਹਟਾਏ ਜਾਣਗੇ (%d ਮੈਬਾ)"
+msgstr[1] "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਹਟਾਏ ਜਾਣਗੇ (%d ਮੈਬਾ)"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "ਅਣਜਾਣ ਪੈਕੇਜ"
+msgstr[1] "ਅਣਜਾਣ ਪੈਕੇਜ"
+
+#: ../urpme:161
+#, fuzzy, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
+msgstr[1] "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "\"%s\" ਨੂੰ ਹਟਾਉਣਯੋਗ ਜੰਤਰ ਵਾਂਗ ਲਵੋ"
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "ਹਟਾਉਣਾ ਅਸਫਲ"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "ਹਟਾਉਣਾ ਅਸਫਲ"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1988,11 +2000,6 @@ msgstr "  --clean        - remove rpm from cache before anything else.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - keep rpm not used in cache.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - update only update media.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2316,7 +2323,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "ਕਿਸੇ ਤਰਾਂ ਜਾਰੀ ਰਹੋ?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -2501,10 +2508,12 @@ msgstr "  --curl         - use curl to retrieve distant files.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - create an update medium.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2512,24 +2521,24 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - try to find and use synthesis file.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2538,17 +2547,17 @@ msgstr ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - list available media.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2557,91 +2566,91 @@ msgstr ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - disable MD5SUM file checking.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - quiet mode.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - verbose mode.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "ਸਿਰਫ਼ ਪ੍ਰਬੰਧਕਾਂ ਨੂੰ ਮਾਧਿਅਮ ਸ਼ਾਮਲ ਕਰਨ ਦੀ ਇਜ਼ਾਜਤ ਹੈ"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "ਸੰਰਚਨਾ ਫਾਇਲ [%s] ਲਿਖੀ ਜਾਵੇਗੀ"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "ਸੰਰਚਨਾ ਫਾਇਲ [%s] ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕੀ"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "--distrib ਨਾਲ <relative path of hdlist> ਦੀ ਲੋੜ ਨਹੀ"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<hdlist ਲਈ ਅਨੁਸਾਰੀ ਮਾਰਗ> ਗੁੰਮ\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "ਮਾਧਿਅਮ \"%s\" ਨੂੰ ਵਰਤਣ ਲਈ ਅਸਫਲ"
@@ -2876,12 +2885,12 @@ msgstr "  -f             - force generation of hdlist files.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "ਸਿਰਫ਼ ਪ੍ਰਬੰਧਕਾਂ ਨੂੰ ਹੀ ਨਵੀਨੀਕਰਨ ਮਾਧਿਅਮ ਵਰਤਣ ਦੀ ਇਜ਼ਾਜਤ ਹੈ"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ਕੁਝ ਵੀ ਨਵੀਨੀਕਰਨ ਨਹੀਂ (ਇੱਕ ਮਾਧਿਅਮ ਸ਼ਾਮਲ ਕਰਨ ਲਈ urpmi.addmedia ਵਰਤੋ)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2890,17 +2899,17 @@ msgstr ""
 "ਨਵੀਨੀਕਰਨ ਲਈ ਇੰਦਰਾਜ਼ ਗੁੰਮ ਹੈ\n"
 "(%s ਵਿੱਚੋਂ ਇੱਕ)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "ਮਾਧਿਅਮ %s ਅਣਡਿੱਠਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "ਮਾਧਿਅਮ %s ਯੋਗ ਕੀਤਾ ਜਾਦਾ ਹੈ"
@@ -3173,6 +3182,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "ਕੋਈ changelog ਨਹੀਂ\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - create an update medium.\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "ਗਲਤ ਇੰਪੁੱਟ: [%s]"
diff --git a/po/pl.po b/po/pl.po
index 4105483d..916b9b55 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-05-29 08:46+0200\n"
 "Last-Translator: Tomasz Bednarski - Amazis.net <tomasz.bednarski@mandriva."
 "pl>\n"
@@ -29,7 +29,7 @@ msgstr ""
 "Plural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%"
 "100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Instalacja pakietów RPM"
@@ -40,7 +40,7 @@ msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 "Błąd: odnalezienie pliku %s było niemożliwe, operacja zostanie anulowana"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -106,7 +106,7 @@ msgstr "Zainstaluj"
 msgid "_Save"
 msgstr "_Zapisz"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Anuluj"
@@ -138,8 +138,9 @@ msgstr ""
 msgid "Options:"
 msgstr "Opcje:"
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - wyświetla ten komunikat pomocy.\n"
@@ -177,7 +178,7 @@ msgstr ""
 "  --verify-rpm   - bada podpis cyfrowy pakietu przed instalacją.\n"
 "                   (--no-verify-rpm wyłącza, domyślnie włączone).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -233,7 +234,7 @@ msgstr "Proszę czekać..."
 msgid "Must be root"
 msgstr "Tylko root ma prawo do tego działania"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -244,42 +245,42 @@ msgstr ""
 "%s\n"
 "Czy kontynuować mimo to?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (do aktualizacji)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (do zainstalowania)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Wybór pakietów"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Wymagany jest jeden z następujących pakietów:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Przerwij"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -290,21 +291,21 @@ msgstr ""
 "%s\n"
 "Czy kontynuować mimo to?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "W celu spełnienia zależności zostanie zainstalowany następujący pakiet:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "W celu spełnienia zależności zostaną zainstalowane następujące pakiety:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -312,42 +313,42 @@ msgstr[0] "(%d pakiet, %d MB)"
 msgstr[1] "(%d pakietów, %d MB)"
 msgstr[2] "(%d pakietów, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Instalacja pakietu..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "nie można pobrać pakietów źródłowych, zaniechanie"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Przygotowywanie..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalowanie pakietu \"%s\" (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Włóż nośnik o nazwie \"%s\" "
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Pobieranie pakietu \"%s\"..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "Gotowe"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -358,28 +359,28 @@ msgstr ""
 "%s\n"
 "Może zachodzić potrzeba aktualizacji bazy danych urpmi"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Instalacja nie powiodła się:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Wszystko zostało już zainstalowane"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Instalacja zakończona"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "usuwanie %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "ponownie uruchamianie urpmi"
@@ -459,8 +460,8 @@ msgid "...retrieving done"
 msgstr "...pobieranie zakończone"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...pobieranie nie powiodło się: %s"
@@ -500,52 +501,52 @@ msgstr "Operacja niedozwolona podczas pracy w trybie restrykcyjnym"
 msgid "bad proxy declaration on command line\n"
 msgstr "niepoprawna deklaracja serwera pośredniczącego w wierszu poleceń\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: nie można odczytać pliku rpm \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr "niespodziewane wyrażenie %s"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, c-format
 msgid "missing expression before %s"
 msgstr "brakujące wyrażenie przed %s"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "niespodziewane wyrażenie %s (sugestia: użyj -a lub -o ?)"
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr "brak wyrażenia do zamknięcia"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "w domyślnym ustawieniu urpmf oczekuje regexp. Użyj opcji \"--literal\""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Katalog chroot nie istnieje"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Nie można użyć %s bez %s"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Nie można użyć %s z %s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Zbyt wiele argumentów\n"
@@ -981,220 +982,220 @@ msgstr ""
 "--synthesis nie można używać z opcjami --media, --excludemedia, --sortmedia, "
 "--update, --use-distrib i --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Początek wyszukiwania: %s koniec: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "pomijanie pakietu %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "mogłoby to spowodować zainstalowanie zamiast uaktualnienia pakietu %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "nośnik \"%s\" już istnieje"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(domyślnie ignorowany)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "dodawanie nośnika %s przed zdalnym nośnikiem %s"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "dodawanie nośnika %s"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "katalog %s nie istnieje"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "wygląda na to, że we wskazanej lokalizacji nie ma dystrybucji"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "nie można przetworzyć media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "uzyskanie dostępu do nośnika dystrybucji było niemożliwe (nie odnaleziono "
 "pliku media.cfg)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "pomijanie nie zgodnych nośników '%s' (dla %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "pobieranie pliku media.cfg..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "próba wyboru nieistniejącego nośnika \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "wybieranie wielu nośników: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "usuwanie nośnika \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "zmiana konfiguracji  urpmi dla nośnika \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...zmiana konfiguracji zakończone niepowodzeniem"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "zmiana konfiguracji zakończona"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 "Błąd podczas generowania pliku z nazwami: nie odnaleziono zależności %d"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "nośnik %s jest aktualny"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "sprawdzanie pliku syntezy [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "wystąpił problem podczas odczytu pliku syntezy dla nośnika \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "kopiowanie [%s] dla nośnika %s..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiowanie zakończone niepowodzeniem"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopiowanie pliku opisowego związanego z \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...kopiowanie zakończone"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopiowanie [%s] zakończone niepowodzeniem (plik jest podejrzanie mały)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "obliczanie sumy md5 pobranego pliku syntezy"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "pobieranie [%s] zakończone niepowodzeniem (niezgodna suma md5)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "polecenie genhdlist2 spowodowało błąd w %s"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "porównywanie %s i %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "nieprawidłowy plik hdlist %s dla nośnika %s"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "kopiowanie pliku MD5SUM dla \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "niepoprawna nazwa pliku rpm [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "pobieranie pliku syntezy związanego z \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "znaleziono zbadany plik syntezy jako %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "nie znaleziono pliku syntezy dla nośnika \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "sprawdzanie pliku klucza publicznego związanego z \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...zaimportowany klucz %s z klucza publicznego związanego z \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "nie można zaimportować pliku klucza publicznego związanego z \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "zaktualizowany nośnik %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "pobieranie [%s] nie powiodło się"
@@ -1228,7 +1229,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Tt"
@@ -1298,7 +1299,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1382,6 +1383,310 @@ msgstr "montowanie %s"
 msgid "unmounting %s"
 msgstr "odmontowywanie %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 wersja %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"To jest otwarte oprogramowanie i może być rozpowszechniane na zasadach "
+"licencji  GNU GPL.\n"
+"\n"
+"użycie: urpmf [opcje] pattern-expression\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version         - wyświetla numer wersji tego programu.\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          - używa określonego środowiska (typowo raport błędów).\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 - bez używania podanych nośników, rozdzielonych "
+"przecinkami.\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  - nie porównuj wzorców, użyj argumentu ciągu dosłownie.\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   - używa innego katalogu głównego  bazy danych urpmi i "
+"instalacji 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    - sortuje nośniki w zależności od podciągów rozdzielonych\n"
+"                   przecinkami.\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - użyj podanej ścieżki do nośnika\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    - używa podanego pliku syntezy zamiast bazy urpmi.\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - bez wyświetlania identycznych wierszy.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - używa tylko nośników aktualizacyjnych.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - tryb komunikatywny.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - ignoruje wielkość liter we wszystkich wzorcach.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -i             - bierze pod uwagę wielkość liter we wszystkich wzorcach "
+"(domyślnie).\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - zmień separator pola (domyślny to ':').\n"
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Wyrażenia wzorcowe:\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           - jakikolwiek tekst jest przetwarzany jako regexp, do "
+"chwili wykorzystania -l .\n"
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - dołącza kod perla bezpośrednio jako perl -e.\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - operator binarny AND.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -a             - operator binarny AND.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !             - modyfikator NOT.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )              - lewy i prawy nawias.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Lista znaczników:\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - określa format wyjścia w stylu funkcji printf\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   przykład: '%%name:%%files'\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - architektura\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr ""
+"  --buildhost    - wyświetla znacznik buildhost: komputer budujący pakiet.\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - czas utworzenia\n"
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - pliki konfiguracyjne\n"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - znaczniki konfliktów.\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description   - opis pakietu.\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - dystrybucja\n"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - iteracja\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename      - nazwa pakietu.\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - lista plików zawartych w pakiecie\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group         - grupa\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - licencja\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name          - nazwa pakietu\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - wszystkie przestarzałe znaczniki\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - osoba tworząca pakiet\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - znacznik provides: wszystkie. pakiety.\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - wszystkie zależności.\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size          - rozmiar\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - nazwa pakietu rpm ze źródłami\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - znaczniki z sugestiami\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary       - podsumowanie\n"
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, c-format
+msgid "  --url          - url\n"
+msgstr "  --URL          - adres URL\n"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --vendor       - dostawca\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - nośnik na którym znajduje się pakiet\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - wyświetla wersję, wydanie oraz archiwum z nazwą.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Nieprawidłowy format: możesz używać tylko znaczniki wielowartościowe"
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "używając określonego środowiska na %s\n"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "nie znaleziono pliku hdlist dla nośnika \"%s\""
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "brak pliku syntezy dla nośnika \"%s\""
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "brak informacji xml dla nośnika \"%s\""
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1397,62 +1702,67 @@ msgstr ""
 "urpmi zostało uruchomione ponownie. Lista preferowanych pakietów uległa "
 "zmianie: %s vs %s"
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, c-format
 msgid "No package named %s"
 msgstr "Brak pakietu o nazwie %s"
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Następujące pakiety zawierają %s: %s"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Pakiety %s nie mogą zostać zainstalowane"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Pakiet %s jest już zainstalowany w systemie"
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Pakiet %s jest już zainstalowany w systemie"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
 msgid "due to missing %s"
 msgstr "z powodu brakującego %s"
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, c-format
 msgid "due to already installed %s"
 msgstr "ponieważ w systemie zainstalowano %s"
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "z powodu niesatysfakcjonującego pakietu %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "próba ulepszenia %s"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "w celu zachowania pakietu %s"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, c-format
 msgid "in order to install %s"
 msgstr "w celu zainstalowania pakietu %s"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "z powodu kolizji z pakietem %s"
@@ -1546,20 +1856,17 @@ msgstr "  --repackage    - przebuduj pakiet przed usunięciem\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - używa innego katalogu głównego do usunięcia rpm.\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpme:55 ../urpmi:101
 #, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root   - używa innego katalogu głównego  bazy danych urpmi i "
-"instalacji rpm.\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --justdb       - aktualizuj tylko bazę rpm, a nie system plików.\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - nie uruchamiaj skryptów pakietu.\n"
 
-#: ../urpme:56
+#: ../urpme:57
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1568,32 +1875,32 @@ msgstr ""
 "  --use-distrib  - konfiguruje urpmi w locie z drzewa dystrybucyjnego,\n"
 "                   użyteczne przy (od)instalowywaniu chroot z opcją --root.\n"
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - tryb komunikatywny.\n"
 
-#: ../urpme:59
+#: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - wybiera wszystkie pasujące pakiety.\n"
 
-#: ../urpme:72
+#: ../urpme:73
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Tylko administrator ma prawo usuwać pakiety"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown packages"
 msgstr "nieznane pakiety"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown package"
 msgstr "nieznany pakiet"
 
-#: ../urpme:119
+#: ../urpme:121
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1601,17 +1908,17 @@ msgstr[0] "usuwanie pakietu %s spowoduje uszkodzenie systemu"
 msgstr[1] "usuwanie pakietu %s spowoduje uszkodzenie systemu"
 msgstr[2] "usuwanie pakietu %s spowoduje uszkodzenie systemu"
 
-#: ../urpme:124
+#: ../urpme:126
 #, c-format
 msgid "Nothing to remove"
 msgstr "Brak elementów do usunięcia"
 
-#: ../urpme:141
+#: ../urpme:143
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Brak elementów do usunięcia"
 
-#: ../urpme:147
+#: ../urpme:149
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1621,7 +1928,7 @@ msgstr[1] "W celu spełnienia zależności  usunięte zostaną %d pakiety"
 msgstr[2] ""
 "W celu spełnienia zależności zostaną usunięte następujące pakiety %d (%d MB)"
 
-#: ../urpme:152
+#: ../urpme:154
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1629,7 +1936,7 @@ msgstr[0] "nieznany pakiet"
 msgstr[1] "nieznany pakiet"
 msgstr[2] "nieznany pakiet"
 
-#: ../urpme:159
+#: ../urpme:161
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1637,326 +1944,31 @@ msgstr[0] "Usunąć pakiet %d?"
 msgstr[1] "Usunąć pakiety %d?"
 msgstr[2] "Usunąć pakiet %d?"
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (t/N) "
 
-#: ../urpme:164
+#: ../urpme:166
 #, c-format
 msgid "testing removal of %s"
 msgstr ""
 
-#: ../urpme:178
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "Usuwanie zakończone niepowodzeniem"
 
-#: ../urpme:180
+#: ../urpme:183
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Usuwanie zakończone niepowodzeniem"
 
-#: ../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 wersja %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"To jest otwarte oprogramowanie i może być rozpowszechniane na zasadach "
-"licencji  GNU GPL.\n"
-"\n"
-"użycie: urpmf [opcje] pattern-expression\n"
-
-#: ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version         - wyświetla numer wersji tego programu.\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - używa określonego środowiska (typowo raport błędów).\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - bez używania podanych nośników, rozdzielonych "
-"przecinkami.\n"
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - nie porównuj wzorców, użyj argumentu ciągu dosłownie.\n"
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - sortuje nośniki w zależności od podciągów rozdzielonych\n"
-"                   przecinkami.\n"
-
-#: ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - użyj podanej ścieżki do nośnika\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - używa podanego pliku syntezy zamiast bazy urpmi.\n"
-
-#: ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - bez wyświetlania identycznych wierszy.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - używa tylko nośników aktualizacyjnych.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - tryb komunikatywny.\n"
-
-#: ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - ignoruje wielkość liter we wszystkich wzorcach.\n"
-
-#: ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -i             - bierze pod uwagę wielkość liter we wszystkich wzorcach "
-"(domyślnie).\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - zmień separator pola (domyślny to ':').\n"
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Wyrażenia wzorcowe:\n"
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           - jakikolwiek tekst jest przetwarzany jako regexp, do "
-"chwili wykorzystania -l .\n"
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - dołącza kod perla bezpośrednio jako perl -e.\n"
-
-#: ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - operator binarny AND.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -a             - operator binarny AND.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !             - modyfikator NOT.\n"
-
-#: ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )              - lewy i prawy nawias.\n"
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Lista znaczników:\n"
-
-#: ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - określa format wyjścia w stylu funkcji printf\n"
-
-#: ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   przykład: '%%name:%%files'\n"
-
-#: ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - architektura\n"
-
-#: ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr ""
-"  --buildhost    - wyświetla znacznik buildhost: komputer budujący pakiet.\n"
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - czas utworzenia\n"
-
-#: ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - pliki konfiguracyjne\n"
-
-#: ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - znaczniki konfliktów.\n"
-
-#: ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description   - opis pakietu.\n"
-
-#: ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - dystrybucja\n"
-
-#: ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - iteracja\n"
-
-#: ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename      - nazwa pakietu.\n"
-
-#: ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - lista plików zawartych w pakiecie\n"
-
-#: ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group         - grupa\n"
-
-#: ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - licencja\n"
-
-#: ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name          - nazwa pakietu\n"
-
-#: ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - wszystkie przestarzałe znaczniki\n"
-
-#: ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - osoba tworząca pakiet\n"
-
-#: ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - znacznik provides: wszystkie. pakiety.\n"
-
-#: ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - wszystkie zależności.\n"
-
-#: ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size          - rozmiar\n"
-
-#: ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - nazwa pakietu rpm ze źródłami\n"
-
-#: ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - znaczniki z sugestiami\n"
-
-#: ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary       - podsumowanie\n"
-
-#: ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --URL          - adres URL\n"
-
-#: ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - dostawca\n"
-
-#: ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - nośnik na którym znajduje się pakiet\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - wyświetla wersję, wydanie oraz archiwum z nazwą.\n"
-
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "niezakończone wyrażenie (%s)"
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Nieprawidłowy format: możesz używać tylko znaczniki wielowartościowe"
-
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "używając określonego środowiska na %s\n"
-
-#: ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "nie znaleziono pliku hdlist dla nośnika \"%s\""
-
-#: ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "brak pliku syntezy dla nośnika \"%s\""
-
-#: ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "brak informacji xml dla nośnika \"%s\""
-
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2051,11 +2063,6 @@ msgstr ""
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - zachowuje pliki rpm w pamięci podręcznej.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       - aktualizuj tylko bazę rpm, a nie system plików.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2397,7 +2404,7 @@ msgstr ""
 "\n"
 "Czy kontynuować mimo to?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (T/n) "
@@ -2596,10 +2603,12 @@ msgstr "  --curl         - używa curla do pobierania zdalnych plików.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - tworzy nośnik aktualizacyjny.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2610,22 +2619,22 @@ msgstr ""
 "                   Do wyboru są opcje: never, on-demand, update-only, "
 "always. cf urpmi.cfg(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - użycie pliku syntezy.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - wykorzystuje pliki rpm (zamiast syntezy).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - bez próby odnalezienia żadnego pliku syntezy.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2634,18 +2643,18 @@ msgstr ""
 "  --distrib      - automatycznie tworzy wszystkie nośniki z nośnika\n"
 "                   instalacyjnego.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - z --distrib, prośba o potwierdzenie dla każdego nośnika\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - z --distrib, dodaje wszystkie wymienione nośniki\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2654,76 +2663,76 @@ msgstr ""
 "  --from         - używa określonego adresu URL z listy mirrorów, domyślnie\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr "  --virtual      - tworzy nośniki, które są zawsze aktualne,\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 "  --no-md5sum    - wyłącza sprawdzanie sumy kontrolnej MD5 dla pliku.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - bez importu klucza publicznego dodanego nośnika\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - dodaje nośnik, ale go nie aktualizuje.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - tryb cichy.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - tryb komunikatywny.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "zasady korzystania z informacji o programach w formacie XML: %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "argument nie jest potrzebny dla opcji --distrib --mirrorlist <url>"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 "nieprawidłowy <url> (dla katalogu lokalnego wymagana jest ścieżka "
 "bezwzględna)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Tylko administrator ma prawo dodawać nośniki"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "tworzenie pliku konfiguracyjnego [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Utworzenie pliku konfiguracyjnego było niemożliwe [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr ""
 "nie ma potrzeby podawania <ścieżki względnej do syntezy> z opcją --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
@@ -2732,17 +2741,17 @@ msgstr ""
 "\n"
 "Czy chcesz dodać nośnik '%s'?"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "brak <ścieżki względnej do pliku syntezy>\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Nie można użyć %s ze zdalnym nośnikiem"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "dodanie nośnika nie było możliwe"
@@ -2988,13 +2997,13 @@ msgstr "  -ff             - wymusza aktualizację plików syntezy.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Tylko administrator ma prawo aktualizować nośniki"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "brak elementów do aktualizacji (użyj urpmi.addmedia aby dodać nośnik)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -3003,17 +3012,17 @@ msgstr ""
 "brak wpisu do aktualizacji\n"
 "(jeden z %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignorowanie nośnika %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "włączanie nośnika \"%s\""
@@ -3304,6 +3313,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Nie znaleziono dziennika zmian\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - tworzy nośnik aktualizacyjny.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "niepoprawny adres URL: [%s]"
 
diff --git a/po/pt.po b/po/pt.po
index da102406..f3e91401 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-08-06 08:55+0100\n"
 "Last-Translator: Zé <ze@mandriva.org>\n"
 "Language-Team: Português <pt@li.org>\n"
@@ -35,7 +35,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Instalação RPM"
@@ -45,7 +45,7 @@ msgstr "Instalação RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Erro: não é possível encontrar o ficheiro %s, irá cancelar a operação"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -112,7 +112,7 @@ msgstr "_Instalar"
 msgid "_Save"
 msgstr "_Gravar"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -143,8 +143,9 @@ msgstr ""
 msgid "Options:"
 msgstr "Opções:"
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - mostra esta mensagem de ajuda.\n"
@@ -160,15 +161,18 @@ msgstr ""
 
 #: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr ""
 "  --auto-select  - selecciona automaticamente os pacotes para actualizar o "
 "sistema.\n"
 
 #: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - força a execução mesmo que alguns pacotes não existam.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - força a execução mesmo que alguns pacotes não existam.\n"
 
 #: ../gurpmi.pm:50 ../urpmi:133
 #, c-format
@@ -179,7 +183,7 @@ msgstr ""
 "  --verify-rpm   - verifica a assinatura do rpm antes de instalar.\n"
 "                   (--no-verify-rpm desactiva, activo por predefinição).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -216,7 +220,8 @@ msgstr ""
 
 #: ../gurpmi.pm:57 ../urpmi:76
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - usa apenas a média indicada para procurar os pacotes "
 "pedidos.\n"
@@ -236,7 +241,7 @@ msgstr "Por favor aguarde..."
 msgid "Must be root"
 msgstr "Deve ser root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -247,42 +252,42 @@ msgstr ""
 "%s\n"
 "Continuar a instalação?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (para actualizar)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (para instalar)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Escolha de pacotes"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "É necessário um dos seguintes pacotes:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Abortar"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -294,59 +299,62 @@ msgstr ""
 "%s\n"
 "Continuar a instalação?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
 msgstr "Para satisfazer as dependências, o seguinte pacote irá ser instalado:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "Para satisfazer as dependências, os seguintes pacotes irão ser instalados:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"Para satisfazer as dependências, os seguintes pacotes irão ser instalados:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pacote, %d MB)"
 msgstr[1] "(%d pacotes, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Instalação de pacotes..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "não é possível obter os pacotes fonte, abortar"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "A preparar..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "A instalar o pacote `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Por favor insira a média chamada \"%s\""
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "A transferir o pacote `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Terminado"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -357,28 +365,28 @@ msgstr ""
 "%s\n"
 "Talvez precise actualizar a sua base de dados urpmi."
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Instalação falhada:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Os pacote(s) já estão instalados"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Instalação finalizada"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "a remover %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "a reiniciar urpmi"
@@ -458,8 +466,8 @@ msgid "...retrieving done"
 msgstr "...transferência terminada"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...transferência falhada: %s"
@@ -499,54 +507,54 @@ msgstr "Esta operação é proibida enquanto correr em modo restrito"
 msgid "bad proxy declaration on command line\n"
 msgstr "declaração inválida do proxy na linha de commando\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: não consegue ler o ficheiro rpm \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr "expressão inesperada %s"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, c-format
 msgid "missing expression before %s"
 msgstr "expressão em falta antes de %s"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "expressão inesperada %s (sugestão: use -a ou -o ?)"
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr "nenhuma expressão para fechar"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 "por predefinição o urpmf espera uma expressão regular. Deve usar a opção \"--"
 "literal\""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "o directório chroot não existe"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Não pode usar %s sem %s"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Não pode usar %s com %s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Demasiados argumentos\n"
@@ -603,7 +611,8 @@ msgstr "não é possível escrever o ficheiro de configuração [%s]"
 #: ../urpm/download.pm:109
 #, c-format
 msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "não é possível ler as configurações do 'proxy' (sem permissão para ler %s)"
+msgstr ""
+"não é possível ler as configurações do 'proxy' (sem permissão para ler %s)"
 
 #: ../urpm/download.pm:134
 #, c-format
@@ -747,8 +756,10 @@ msgstr "[reempacotamento]"
 
 #: ../urpm/install.pm:175
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "transacção criada para instalar em %s (remove=%d, instala=%d, actualiza=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"transacção criada para instalar em %s (remove=%d, instala=%d, actualiza=%d)"
 
 #: ../urpm/install.pm:178
 #, c-format
@@ -974,219 +985,220 @@ msgstr ""
 "--synthesis não pode ser usado com --media, --excludemedia, --sortmedia, --"
 "update, --use-distrib ou --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Inicio de procura: %s fim: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "a ignorar o pacote %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "instalaria em vez de actualizar o pacote %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "a média \"%s\" já existe"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(ignorado por predefinição)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "a adicionar média \"%s\" antes da média remota \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "a adicionar média \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "o directório %s não existe"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "esta localização não parece conter uma distribuição"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "não é possível analisar o ficheiro media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "não é possível aceder à média de distribuição (nenhum ficheiro media.cfg "
 "encontrado)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "ignorar média não compatível `%s' (para %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "a transferir o ficheiro media.cfg..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "a tentar seleccionar uma média \"%s\" não existente"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "seleccionar várias médias: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "a remover a média \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "a reconfigurar urpmi para a média \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...reconfiguração falhada"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "reconfiguração terminada"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Erro ao gerar ficheiro de nomes: dependência %d não encontrada"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "a média \"%s\" está actualizada"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "a examinar o ficheiro synthesis [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problema ao ler o ficheiro synthesis da média \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "a copiar [%s] para a média \"%s\"..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...copia falhada"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "a copiar o ficheiro de descrição de \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...copia terminada"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "cópia de [%s] falhada (o ficheiro é suspeitosamente pequeno)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "a calcular o md5sum da fonte synthesis transferida"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "obtenção de [%s] falhada (md5sum diferente)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "o genhdlist2 falhou em %s"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "a comprar %s e %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "ficheiro hdlist %s inválido para a média \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "a copiar o ficheiro MD5SUM de \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "ficheiro MD5SUM inválido (transferido de %s)"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "a transferir a fonte synthesis de \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "synthesis encontrado e testado como %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "nenhum ficheiro synthesis encontrado para a média \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "a examinar o ficheiro de chaves públicas de \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...chave %s importada do ficheiro de chaves públicas de \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
-msgstr "não é possível importar o ficheiro de chaves públicas (pubkey) de \"%s\""
+msgstr ""
+"não é possível importar o ficheiro de chaves públicas (pubkey) de \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "média actualizada \"%s\""
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "obtenção de [%s] falhada"
@@ -1218,7 +1230,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "SsYy"
@@ -1288,7 +1300,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1296,8 +1308,12 @@ msgid ""
 msgid_plural ""
 "The following packages are now orphans, use \"urpme --auto-orphans\" to "
 "remove them."
-msgstr[0] "O seguinte pacote está agora orfão, use \"urpme --auto-orphans\" para o remover."
-msgstr[1] "Os seguintes pacotes estão agora orfãos, use \"urpme --auto-orphans\" para os remover."
+msgstr[0] ""
+"O seguinte pacote está agora orfão, use \"urpme --auto-orphans\" para o "
+"remover."
+msgstr[1] ""
+"Os seguintes pacotes estão agora orfãos, use \"urpme --auto-orphans\" para "
+"os remover."
 
 #: ../urpm/parallel.pm:14
 #, c-format
@@ -1371,271 +1387,7 @@ msgstr "a montar %s"
 msgid "unmounting %s"
 msgstr "a desmontar %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "o urpmi foi reiniciado, e a lista de prioridade de pacotes não foi alterada"
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-"o urpmi foi reiniciado, e a lista de prioridades de pacotes foi alterada: %s "
-"vs %s"
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Nenhum pacote chamado %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Os seguintes pacotes contêm %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Os pacotes %s não podem ser instalados"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "O pacote %s já se encontra instalado"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Os pacote %s já se encontram instalados"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "devido a faltar %s"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "devido a já se encontrar instalado %s"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "devido a não satisfazer %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "a tentar promover %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "para guardar %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "para instalar %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "devido a conflitos com %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Assinatura inválida (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "ID de chave inválida (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Assinatura em falta (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr "sistema"
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr "Deve reiniciar %s para %s"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't write file"
-msgstr "Não é possível escrever escrever o ficheiro"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "Não é possível abrir o ficheiro"
-
-#: ../urpm/sys.pm:289
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "Não é possível mover o ficheiro %s para %s"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme versão %s\n"
-"Direitos de autor (C) 1999-2008 Mandriva.\n"
-"Isto é um programa livre e pode ser redistribuído sob o termos da GPL GNU.\n"
-"\n"
-"uso:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - selecciona automaticamente um pacote nas escolhas.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr "  --auto-orphans - remove os orfãos\n"
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - verifica se a remoção pode ser conseguida correctamente.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi distribuído através das máquinas dos apelidos.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - Reempacota os ficheiros antes de os apagar\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - usa outra raiz para remover os rpm.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../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   - usa outra raiz para base de dados urpmi e instalação "
-"rpm.\n"
-
-#: ../urpme:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - não executa o(s) script(s) do pacote.\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - configura o urpme rapidamente de uma árvore da "
-"distribuição,\n"
-"                   útil para (des)instalar um chroot com opção --root.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - modo detalhado.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - selecciona todos os pacotes correspondentes à expressão.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Apenas o superutilizador tem permissão para remover os pacotes"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "pacotes desconhecidos"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "pacote desconhecido"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "a remoção do pacote %s irá danificar o seu sistema"
-msgstr[1] "a remoção do pacote %s irá danificar o seu sistema"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Nada a remover"
-
-#: ../urpme:141
-#, c-format
-msgid "No orphans to remove"
-msgstr "Nenhuns orfãos a remover"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "Para satisfazer as dependências, o seguinte pacote será removido"
-msgstr[1] "Para satisfazer as dependências, os seguintes %d pacotes serão removidos"
-
-#: ../urpme:152
-#, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "(pacote orfão)"
-msgstr[1] "(pacotes orfãos)"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Remover %d pacote?"
-msgstr[1] "Remover %d pacotes?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (s/N) "
-
-#: ../urpme:164
-#, c-format
-msgid "testing removal of %s"
-msgstr "a testar remoção de %s"
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Remoção falhada"
-
-#: ../urpme:180
-#, c-format
-msgid "Removal is possible"
-msgstr "A remoção é possível"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1651,290 +1403,578 @@ msgstr ""
 "\n"
 "uso:urpmf [opções] expressão-padrão\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - mostra o número da versão desta ferramenta.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - usa um ambiente especifico (geralmente um relatório de "
 "erro).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - não usa a média indicada, separada por vírgula.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 "  --literal, -l  - não combina médias padrões, usa o argumento como uma "
 "string literal.\n"
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../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 "  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --urpmi-root   - usa outra raiz para base de dados urpmi e instalação "
+"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    - organiza as médias de acordo com as substrings separadas "
 "por vírgula.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - usa a localização dada para aceder à média\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - usa o ficheiro synthesis dado em vez da base de dados "
 "urpmi.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - não mostra linhas idênticas.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - usa apenas a média de actualização.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  -verbose      - modo detalhado.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i            - ignora as diferenças de capitalização em todos os "
 "padrões.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -I             - honra as diferenças de capitalização em todos os padrões "
 "(predefinição).\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - muda o campo separador (predefinido para ':').\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Expressões padrão:\n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  text           - qualquer texto é analisado como uma expressão regular, a "
 "não ser que -l seja usado .\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e            - inclui o código perl directamente como perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - operador binário AND.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - operador binário OR.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - operador unário NOT.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - parêntesis esquerdo e direito.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Lista de marcas:\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - indica um formato de saída tipo o printf\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   exemplo: '%%nome:%%ficheiros'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - arquitectura\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - endereço de compilação\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - data de compilação\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - ficheiros de configuração\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - marcas de conflitos\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - descrição do pacote\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - distribuição\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - época\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - nome do ficheiro do pacote\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - lista dos ficheiros existentes no pacote\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - grupo\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - licença\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - nome do pacote\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - marcas de obsoletos\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - empacotador\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - marcas de fornecidos\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - marcas de requeridos.\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - tamanho instalado\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - nome do rpm de código fonte\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - sugere marcas\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - sumário\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - vendedor\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - a média onde o pacote foi encontrado\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - mostra a versão, a saída e a arquitectura com o nome.\n"
-
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr "expressão não terminada (%s)"
+msgstr ""
+"  -f             - mostra a versão, a saída e a arquitectura com o nome.\n"
 
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Formato incorrecto: pode apenas usar uma marca multi-avaliada"
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "a usar um ambiente específico em %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "nenhum ficheiro hdlist disponível para a média \"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "nenhum ficheiro synthesis disponível para a média \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "nenhuma informação xml disponível para a média \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+"o urpmi foi reiniciado, e a lista de prioridade de pacotes não foi alterada"
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"o urpmi foi reiniciado, e a lista de prioridades de pacotes foi alterada: %s "
+"vs %s"
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Nenhum pacote chamado %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Os seguintes pacotes contêm %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Os pacotes %s não podem ser instalados"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "O pacote %s já se encontra instalado"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Os pacote %s já se encontram instalados"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "devido a faltar %s"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "devido a já se encontrar instalado %s"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "devido a não satisfazer %s"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "a tentar promover %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "para guardar %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "para instalar %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "devido a conflitos com %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Assinatura inválida (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "ID de chave inválida (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Assinatura em falta (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr "sistema"
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr "Deve reiniciar %s para %s"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't write file"
+msgstr "Não é possível escrever escrever o ficheiro"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "Não é possível abrir o ficheiro"
+
+#: ../urpm/sys.pm:289
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "Não é possível mover o ficheiro %s para %s"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme versão %s\n"
+"Direitos de autor (C) 1999-2008 Mandriva.\n"
+"Isto é um programa livre e pode ser redistribuído sob o termos da GPL GNU.\n"
+"\n"
+"uso:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - selecciona automaticamente um pacote nas escolhas.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr "  --auto-orphans - remove os orfãos\n"
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+"  --test         - verifica se a remoção pode ser conseguida correctamente.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+"  --parallel     - urpmi distribuído através das máquinas dos apelidos.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - Reempacota os ficheiros antes de os apagar\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - usa outra raiz para remover os rpm.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr ""
+"  --justdb       - actualiza apenas a base de dados rpm, não o sistema de "
+"ficheiros.\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - não executa o(s) script(s) do pacote.\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - configura o urpme rapidamente de uma árvore da "
+"distribuição,\n"
+"                   útil para (des)instalar um chroot com opção --root.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - modo detalhado.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - selecciona todos os pacotes correspondentes à expressão.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Apenas o superutilizador tem permissão para remover os pacotes"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "pacotes desconhecidos"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "pacote desconhecido"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "a remoção do pacote %s irá danificar o seu sistema"
+msgstr[1] "a remoção do pacote %s irá danificar o seu sistema"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Nada a remover"
+
+#: ../urpme:143
+#, c-format
+msgid "No orphans to remove"
+msgstr "Nenhuns orfãos a remover"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Para satisfazer as dependências, o seguinte pacote será removido"
+msgstr[1] ""
+"Para satisfazer as dependências, os seguintes %d pacotes serão removidos"
+
+#: ../urpme:154
+#, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "(pacote orfão)"
+msgstr[1] "(pacotes orfãos)"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Remover %d pacote?"
+msgstr[1] "Remover %d pacotes?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
+
+#: ../urpme:166
+#, c-format
+msgid "testing removal of %s"
+msgstr "a testar remoção de %s"
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Remoção falhada"
+
+#: ../urpme:183
+#, c-format
+msgid "Removal is possible"
+msgstr "A remoção é possível"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr "expressão não terminada (%s)"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1958,7 +1998,8 @@ msgstr "  --auto-orphans - remove os orfãos sem perguntar\n"
 #: ../urpmi:85 ../urpmq:54
 #, c-format
 msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
-msgstr "  --no-suggests  - não selecciona automaticamente os pacotes \"sugeridos\".\n"
+msgstr ""
+"  --no-suggests  - não selecciona automaticamente os pacotes \"sugeridos\".\n"
 
 #: ../urpmi:86
 #, c-format
@@ -1997,7 +2038,8 @@ msgstr ""
 #: ../urpmi:94
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - pequeno comprimento de transacção, predefinido é %d.\n"
+msgstr ""
+"  --split-length - pequeno comprimento de transacção, predefinido é %d.\n"
 
 #: ../urpmi:96
 #, c-format
@@ -2024,16 +2066,10 @@ msgstr "  --clean        - remove os rpm da cache antes de qualquer coisa.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - não apaga os rpms da cache.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr ""
-"  --justdb       - actualiza apenas a base de dados rpm, não o sistema de "
-"ficheiros.\n"
-
 #: ../urpmi:102
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr ""
 "  --replacepkgs  - força a instalação de pacotes que já se encontram "
 "instalados.\n"
@@ -2059,7 +2095,8 @@ msgstr ""
 #: ../urpmi:108
 #, c-format
 msgid "  --allow-suggests - auto select \"suggested\" packages.\n"
-msgstr "  --allow-suggests - selecciona automaticamente os pacotes \"sugeridos\".\n"
+msgstr ""
+"  --allow-suggests - selecciona automaticamente os pacotes \"sugeridos\".\n"
 
 #: ../urpmi:112
 #, c-format
@@ -2166,7 +2203,8 @@ msgstr "  --excludedocs  - exclui os ficheiros de documentação.\n"
 #: ../urpmi:138
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
-msgstr "  --ignoresize   - não verifica o espaço em disco antes da instalação\n"
+msgstr ""
+"  --ignoresize   - não verifica o espaço em disco antes da instalação\n"
 
 #: ../urpmi:139
 #, c-format
@@ -2207,12 +2245,14 @@ msgstr "  --nolock       - não tranca a base de dados rpm.\n"
 #: ../urpmi:147
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
-msgstr "  --strict-arch  - apenas actualiza os pacotes com a mesma arquitectura.\n"
+msgstr ""
+"  --strict-arch  - apenas actualiza os pacotes com a mesma arquitectura.\n"
 
 #: ../urpmi:148 ../urpmq:97
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - escolhe todas as correspondências na linha de comando.\n"
+msgstr ""
+"  -a             - escolhe todas as correspondências na linha de comando.\n"
 
 #: ../urpmi:151
 #, c-format
@@ -2262,7 +2302,8 @@ msgstr "a predefinir para --buildrequires"
 
 #: ../urpmi:232
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr ""
 "por favor use --buildrequires ou --install-src, predefinição para --"
 "buildrequires"
@@ -2329,7 +2370,8 @@ msgstr "%s (para instalar)"
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
-msgstr "Para satisfazer as '%s' dependências, é necessário um dos seguintes pacotes:"
+msgstr ""
+"Para satisfazer as '%s' dependências, é necessário um dos seguintes pacotes:"
 
 #: ../urpmi:465
 #, c-format
@@ -2367,7 +2409,7 @@ msgstr ""
 "\n"
 "Continuar a instalação na mesma?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (S/n) "
@@ -2457,7 +2499,8 @@ msgstr ""
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Para satisfazer as dependências, o seguinte pacote será removido"
-msgstr[1] "Para satisfazer as dependências, os seguintes %d pacotes serão removidos"
+msgstr[1] ""
+"Para satisfazer as dependências, os seguintes %d pacotes serão removidos"
 
 #: ../urpmi:610
 #, c-format
@@ -2553,7 +2596,8 @@ msgstr "  --curl         - usa curl para transferir ficheiros distantes.\n"
 #: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:75
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
-msgstr "  --prozilla     - usa o prozilla para transferir ficheiros distantes.\n"
+msgstr ""
+"  --prozilla     - usa o prozilla para transferir ficheiros distantes.\n"
 
 #: ../urpmi.addmedia:58 ../urpmi.update:36
 #, c-format
@@ -2562,10 +2606,12 @@ msgstr "  --aria2        - usa aria2 para obter ficheiros distantes.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - cria uma média de actualização.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2577,22 +2623,22 @@ msgstr ""
 "                   um de: never, on-demand, update-only, always. cf urpmi.cfg"
 "(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - usa o ficheiro synthesis.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - usa ficheiros rpm (em vez de synthesis).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - não tenta procurar qualquer ficheiro synthesis.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2601,17 +2647,17 @@ msgstr ""
 "  --distrib      - automaticamente cria todas as médias a partir de\n"
 "                   uma média de instalação.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr "  --interactive  - com --distrib, pede confirmação para cada média\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - com --distrib, adiciona todas as médias listadas\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2620,72 +2666,76 @@ msgstr ""
 "  --from         - usa a url indicada para a lista de espelhos,\n"
 "                   o predefinido é %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
-msgstr "  --virtual      - cria uma média virtual que está sempre actualizada.\n"
+msgstr ""
+"  --virtual      - cria uma média virtual que está sempre actualizada.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - desactiva a verificação do ficheiro MD5SUM.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - não importa a chave pública da média adicionada\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
-msgstr "  --raw          - adiciona a média na configuração, mas não a actualiza.\n"
+msgstr ""
+"  --raw          - adiciona a média na configuração, mas não a actualiza.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modo silencioso.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - modo detalhado.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "as conhecidas políticas de informação xml são %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "não é necessário nenhum argumento para --distrib --mirrorlist <url>"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
-msgstr "<url> inválido (para directórios locais, a localização tem que ser absoluta)"
+msgstr ""
+"<url> inválido (para directórios locais, a localização tem que ser absoluta)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Apenas o superutilizador pode adicionar médias"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "a criar ficheiro de configuração [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Não pode criar o ficheiro de configuração [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
-msgstr "não é necessário indicar o <localização relativa do synthesis> com --distrib"
+msgstr ""
+"não é necessário indicar o <localização relativa do synthesis> com --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
@@ -2694,17 +2744,17 @@ msgstr ""
 "\n"
 "Deseja adicionar a média '%s'?"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "falta a <localização relativa de synthesis>\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Não é possível usar %s com uma média remota"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "não é possível adicionar a média"
@@ -2739,7 +2789,8 @@ msgstr ""
 
 #: ../urpmi.recover:37
 #, c-format
-msgid "  --list         - list transactions since provided date/duration argument\n"
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 "  --list         - lista transacções desde que dado o argumento de data/"
 "duração\n"
@@ -2939,19 +2990,20 @@ msgstr "  -f             - força a actualização dos ficheiros synthesis.\n"
 #: ../urpmi.update:52
 #, c-format
 msgid "  -ff            - really force updating synthesis\n"
-msgstr "  -f             - força realmente a actualização dos ficheiros synthesis.\n"
+msgstr ""
+"  -f             - força realmente a actualização dos ficheiros synthesis.\n"
 
 #: ../urpmi.update:69
 #, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "Apenas o superutilizador pode actualizar as médias"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nada a actualizar (use urpmi.addmedia para adicionar uma média)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2960,17 +3012,17 @@ msgstr ""
 "a entrada a actualizar está em falta\n"
 "(um de %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "a ignorar a média %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "a activar a média %s"
@@ -3028,7 +3080,8 @@ msgstr "  --list-url     - lista as médias disponíveis e as suas url.\n"
 #: ../urpmq:61
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - lista os nós disponíveis quando a usar --parallel.\n"
+msgstr ""
+"  --list-nodes   - lista os nós disponíveis quando a usar --parallel.\n"
 
 #: ../urpmq:62
 #, c-format
@@ -3037,7 +3090,8 @@ msgstr "  --list-aliases   - lista as aliases paralelas disponíveis.\n"
 
 #: ../urpmq:63
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr ""
 "  --dump-config  - deixa a configuração na forma de argumento urpmi."
 "addmedia.\n"
@@ -3045,11 +3099,13 @@ msgstr ""
 #: ../urpmq:64
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - o próximo pacote é um pacote fonte (o mesmo que -s).\n"
+msgstr ""
+"  --src          - o próximo pacote é um pacote fonte (o mesmo que -s).\n"
 
 #: ../urpmq:65
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - indica todos os pacotes fonte antes de transferir (apenas "
 "root).\n"
@@ -3130,7 +3186,8 @@ msgstr "  --whatrequires - reverte a procura para o que o pacote requer.\n"
 msgid ""
 "  --whatrequires-recursive\n"
 "                   - extended reverse search (includes virtual packages).\n"
-msgstr "  -R             - procura revertida extendida (inclui pacotes virtuais).\n"
+msgstr ""
+"  -R             - procura revertida extendida (inclui pacotes virtuais).\n"
 
 #: ../urpmq:95
 #, c-format
@@ -3175,7 +3232,8 @@ msgstr "  -r             - mostra a versão e o lançamento com o nome também.\
 #: ../urpmq:105
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - o próximo pacote é um pacote fonte (o mesmo que --src).\n"
+msgstr ""
+"  -s             - o próximo pacote é um pacote fonte (o mesmo que --src).\n"
 
 #: ../urpmq:106
 #, c-format
@@ -3189,17 +3247,20 @@ msgstr ""
 #: ../urpmq:107
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - impõe uma procura aproximada (o mesmo que --fuzzy).\n"
+msgstr ""
+"  -y             - impõe uma procura aproximada (o mesmo que --fuzzy).\n"
 
 #: ../urpmq:108
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
-msgstr "  -Y             - como -y, mas força para corresponder sem capitalização.\n"
+msgstr ""
+"  -Y             - como -y, mas força para corresponder sem capitalização.\n"
 
 #: ../urpmq:109
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  os nomes ou os ficheiros rpm dados na linha de comando são verificados.\n"
+msgstr ""
+"  os nomes ou os ficheiros rpm dados na linha de comando são verificados.\n"
 
 #: ../urpmq:156
 #, c-format
@@ -3232,14 +3293,16 @@ msgstr ""
 
 #: ../urpmq:408
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 "nenhuma informação xml da média \"%s\", não é possível devolver qualquer "
 "resultado do pacote %s"
 
 #: ../urpmq:409
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 "nenhuma informação xml da média \"%s\", não é possível devolver qualquer "
 "resultado dos pacotes %s"
@@ -3249,3 +3312,5 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Nenhum registo de mudanças (changelog) encontrado\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - cria uma média de actualização.\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1cba5825..4bac50ad 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-07-22 15:19-0300\n"
 "Last-Translator: \n"
 "Language-Team: Brazilian Portuguese <pt@li.org>\n"
@@ -33,7 +33,7 @@ msgstr ""
 "X-Generator: KBabel 1.10.2\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Instalação de RPM"
@@ -43,7 +43,7 @@ msgstr "Instalação de RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Erro: não foi possível encontrar arquivo %s, cancelando operação"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -112,7 +112,7 @@ msgstr "_Instalar"
 msgid "_Save"
 msgstr "_Salvar"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -144,8 +144,9 @@ msgstr ""
 msgid "Options:"
 msgstr "Opções:"
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - imprime esta mensagem de ajuda.\n"
@@ -182,7 +183,7 @@ msgstr ""
 "  --verify-rpm   - verifica a assinatura do rpm antes da instalação.\n"
 "                   (--no-verify-rpm desabilita, por padrão é habilitado).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -235,7 +236,7 @@ msgstr "Por favor aguarde..."
 msgid "Must be root"
 msgstr "É necesssário super usuário"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -246,42 +247,42 @@ msgstr ""
 "%s\n"
 "Prosseguir com a instalação mesmo assim?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (para atualizar)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (para instalar)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Escolha de pacotes"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Um dos pacotes a seguir é necessário:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Abortar"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -292,62 +293,62 @@ msgstr ""
 "%s\n"
 "Prosseguir com a instalação mesmo assim?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Para satisfazer as dependências, o seguinte pacote será instalado:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Para satisfazer as dependências, os seguintes pacotes serão instalados:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pacote, %d MB)"
 msgstr[1] "(%d pacotes, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Instalação de pacotes..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "incapaz de obter pacotes fonte, abortando"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Preparando..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalando pacote `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Por favor insira a mídia chamada \"%s\""
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Baixando o pacote `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Pronto"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -358,28 +359,28 @@ msgstr ""
 "%s\n"
 "Você deve atualizar a sua base de dados urpmi"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "A Instalação falhou:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Tudo já está instalado"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Instalação concluída"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "removendo %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "reiniciando urpmi"
@@ -459,8 +460,8 @@ msgid "...retrieving done"
 msgstr "...busca completa"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...a busca falhou: %s"
@@ -500,53 +501,53 @@ msgstr "Esta operação não é permitida no modo restrito"
 msgid "bad proxy declaration on command line\n"
 msgstr "declaração de proxy errada na linha de comando\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: não pode ler o arquivo rpm \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr "expressão inesperada %s"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, c-format
 msgid "missing expression before %s"
 msgstr "expressão faltando antes %s"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "expressão inesperada %s (sugestão: usar -a ou -o ?)"
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr "sem expressão para fechar"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 "por padrão urpmf espera uma regexp. você pode usar a opção \"--literal\""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "diretório chroot não existe"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Não é possível usar %s sem %s"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Não é possível usar %s com %s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Muitos parâmetros\n"
@@ -978,218 +979,218 @@ msgstr ""
 "--synthesis não pode ser usada com --media, -excludemedia, -sortmedia, --"
 "update, --use-distrib ou --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Procura inicia em %s e termina em %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "pulando o pacote %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "é necessário instalar ao invés de atualizar o pacote %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "mídia \"%s\" já existe"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(ignorado por default)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "adicionando mídia \"%s\" antes da mídia remota \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "adicionando a mídia \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "diretório %s não existe"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "não foi encontrada uma distribuinão nesta localização"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "incapaz de analisar media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "incapaz de acessar as mídias da distribuição (media.cfg não encontrado)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "ignorando mídias não compatívieis `%s' (para %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "recuperando o arquivo media.cfg"
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "tentando selecionar mídia inexistente \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "selecionando múltiplas mídias: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "removendo a mídia \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "reconfigurando o urpmi para as mídias \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...falha na reconfiguração"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "reconfiguração terminada"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Erro gerando arquivo de nomes: dependência %d não encontrada"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "mídia \"%s\" já está atualizada"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "examinando arquivo synthesis [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problema ao ler arquivo synthesis da mídia \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "copiando [%s] para a mídia \"%s\"..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...falha na cópia"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "Copiando o arquivo de descrição de \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "..cópia terminada"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "cópia de [%s] falhou (arquivo é suspeitamente pequeno)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "computando o md5sum de uma fonte synthesis"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "baixa de [%s] falhou (md5sum não é igual)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2 falhou em %s"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "comparando %s e %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "hdlist inválido %s para a mídia \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "copiando arquivo MD5SUM de \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "nome rpm inválido [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "obtendo a fonte synthesis de \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "encontrado synthesis como %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "nenhum arquivo synthesis encontrado para a mídia \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "examinando arquivo de chave pública em \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importando chave %s do arquivo de chaves públicas de \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "incapaz de importar arquivo de chave pública de \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "atualizada a mídia \"%s\""
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "busca de [%s] falhou"
@@ -1221,7 +1222,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "SsYy"
@@ -1291,7 +1292,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1374,274 +1375,7 @@ msgstr "montando %s"
 msgid "unmounting %s"
 msgstr "desmontando %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "o urpmi foi reiniciado, e a lista de pacotes prioritários não mudou"
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-"o urpmi foi reiniciado, e a lista de pacotes prioritários mudou: %s vs %s"
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Nenhum nome de pacote %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Os seguintes pacotes contém %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Pacotes %s não podem ser instalados"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Pacote %s já está instalado"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Pacotes %s já estão instalados"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "devido estar faltando %s"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "devido ao pacote já instalado %s"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "devido a estar faltando %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "tentando promover %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "para manter %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "para instalar %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "devido a conflitos com %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Assinatura inválida (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Chave Inválida ID (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Assinatura não encontrada (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr "sistema"
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr "Você deve reiniciar %s para %s"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't write file"
-msgstr "Não foi possível escrever arquivo"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "Não foi possível abrir arquivo"
-
-#: ../urpm/sys.pm:289
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "Não é possível mover arquivo %s para %s"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme versão %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Este é um software livre, e pode ser redistribuído sob os termos da GNU "
-"GPL.\n"
-"\n"
-"uso:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - automaticamente seleciona um pacote, em escolhas.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr ""
-"  --test         - verifica se a remoção pode ser feita corretamente.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi distribuído.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - reempacota os arquivos antes da remoção\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - use outro root para desisntalação de rpm.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../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    - use outro root para o urpmi e instalação rpm.\n"
-
-#: ../urpme:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - não executa script(s) dos pacotes.\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - configura o urpme automaticamente a partir de uma árvore\n"
-"                   de distribuição, útil para (des)instalar em um chroot\n"
-"                   com a opção --root.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - modo detalhado.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - seleciona todos os pacotes que combinam com a expressão.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Apenas super usuário tem permissão para remover pacotes"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "pacotes desconhecidos"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "pacote desconhecido."
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "a remoção do pacote %s irá danificar seu sistema"
-msgstr[1] "a remoção do pacote %s irá danificar seu sistema"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Nada para remover"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Nada para remover"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "Para satisfazer as dependências, o seguinte pacote será removido"
-msgstr[1] ""
-"Para satisfazer as dependências, os %d pacotes seguintes serão removidos"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "pacote desconhecido."
-msgstr[1] "pacote desconhecido."
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Remover %d pacote?"
-msgstr[1] "Remover %d pacotes?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (s/N) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "considerando dispositivos removíveis como \"%s\""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "A remoção falhou"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "A remoção falhou"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1658,25 +1392,25 @@ msgstr ""
 "\n"
 "uso: urpmf [opções] expressão\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - imprime o número da versão desta ferramenta.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - usa um ambiente específico (tipicamente para relatório\n"
 "                   de falhas).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - não usa as mídias fornecidas (separadas por vírgula).\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
@@ -1684,267 +1418,546 @@ msgstr ""
 "  --literal, -l  - não combina com padrão, utilize argumento como uma\n"
 "                   string de literais.\n"
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../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    - use outro root para o urpmi e instalação 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    - ordena as mídias (separadas por vírgulas).\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - usa o caminho dado para acessar mídias\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - usa synthesis fornecido ao invés do banco de dados "
 "urpmi.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - não lista linhas idênticas.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - use somente mídias de atualização.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - modo detalhado.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - ignora a distinção de maiúscula/minúscula em tudo.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -i             - Considera diferença entre maiúsculas/minúsculas.\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - altera o separador de campo (padrão é ':').\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Expressões Regulares:\n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  text           - qualquer texto é tratado como uma expressão regular, a\n"
 "                   menos que -l seja usado.\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 "  -e             - inclui o código perl diretamente como em 'perl -e'.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - operador binário 'E'.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - operador binário 'OU'.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - operador unário 'NÃO'.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - parênteses direito e esquerdo.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr ""
 "Lista de tags:\n"
 "\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - especifica um formato de impressão para a saída\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   exemplo: '%%nome:%%arquivos'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - arquitetura\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - máquina onde foi compilado\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - data que foi compilado\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - arquivos de configuração\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - lista conflitos\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - descrição do pacote\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - distribuição\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - epoch\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - nome do pacote\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - lista de arquivos contidos no pacote\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - grupo\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - licença\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - nome do pacote\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - lista todos arquivos obsoletos\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - empacotador\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - lista dos que provem o pacote\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - lista dos que requerem o pacote\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - tamanho da instalação.\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - nome da fonte do rpm\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - lista sugestões\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - sumário\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - fabricante\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - a mídia onde o pacote foi encontrado\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - imprime versão, 'release' e arquitetura, com nome.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr "expressão indeterminada (%s)"
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 "Formato incorreto: você deve utilizar somente uma opção com múltiplos valores"
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "usando o ambiente específico em %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "nenhum hdlist disponível para a mídia \"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "synthesis não disponível para a mídia \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "xml-info não disponível para a mídia \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr "o urpmi foi reiniciado, e a lista de pacotes prioritários não mudou"
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"o urpmi foi reiniciado, e a lista de pacotes prioritários mudou: %s vs %s"
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Nenhum nome de pacote %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Os seguintes pacotes contém %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Pacotes %s não podem ser instalados"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Pacote %s já está instalado"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Pacotes %s já estão instalados"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "devido estar faltando %s"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "devido ao pacote já instalado %s"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "devido a estar faltando %s"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "tentando promover %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "para manter %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "para instalar %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "devido a conflitos com %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Assinatura inválida (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Chave Inválida ID (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Assinatura não encontrada (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr "sistema"
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr "Você deve reiniciar %s para %s"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't write file"
+msgstr "Não foi possível escrever arquivo"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "Não foi possível abrir arquivo"
+
+#: ../urpm/sys.pm:289
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "Não é possível mover arquivo %s para %s"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme versão %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Este é um software livre, e pode ser redistribuído sob os termos da GNU "
+"GPL.\n"
+"\n"
+"uso:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - automaticamente seleciona um pacote, em escolhas.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+"  --test         - verifica se a remoção pode ser feita corretamente.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi distribuído.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - reempacota os arquivos antes da remoção\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - use outro root para desisntalação de rpm.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr ""
+"  --justdb       - atualiza somente a base rpm, não o sistema de arquivos.\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - não executa script(s) dos pacotes.\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - configura o urpme automaticamente a partir de uma árvore\n"
+"                   de distribuição, útil para (des)instalar em um chroot\n"
+"                   com a opção --root.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - modo detalhado.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - seleciona todos os pacotes que combinam com a expressão.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Apenas super usuário tem permissão para remover pacotes"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "pacotes desconhecidos"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "pacote desconhecido."
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "a remoção do pacote %s irá danificar seu sistema"
+msgstr[1] "a remoção do pacote %s irá danificar seu sistema"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Nada para remover"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Nada para remover"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Para satisfazer as dependências, o seguinte pacote será removido"
+msgstr[1] ""
+"Para satisfazer as dependências, os %d pacotes seguintes serão removidos"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "pacote desconhecido."
+msgstr[1] "pacote desconhecido."
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Remover %d pacote?"
+msgstr[1] "Remover %d pacotes?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (s/N) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "considerando dispositivos removíveis como \"%s\""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "A remoção falhou"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "A remoção falhou"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr "expressão indeterminada (%s)"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2035,12 +2048,6 @@ msgstr "  --clean        - remove os rpm do cache antes de iniciar.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - não remove os rpms do cache.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr ""
-"  --justdb       - atualiza somente a base rpm, não o sistema de arquivos.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2376,7 +2383,7 @@ msgstr ""
 "\n"
 "Prosseguir instalação mesmo assim?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (S/n) "
@@ -2570,10 +2577,12 @@ msgstr "  --curl         - usa curl para buscar arquivos remotos.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - cria uma mídia de atualização.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2585,22 +2594,22 @@ msgstr ""
 "                   um de: never, on-demand, update-only, always. cf urpmi.cfg"
 "(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - use o arquivo synthesis.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - use arquivos rpm (ao invés de synthesis).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - não tentar procurar qualquer arquivo synthesis.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2610,17 +2619,17 @@ msgstr ""
 "mídia\n"
 "                   de instalação.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr "  --interactive  - com --distrib, pede a confirmação para cada mídia\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - com --distrib, adiciona todas as mídias listadas\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2629,73 +2638,73 @@ msgstr ""
 "  --from         - usa um endereço url específico como lista de espelhos,\n"
 "                   o padrão é %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - cria mídias virtuais que estão sempre atualizadas.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - desabilita checagem de arquivo com MD5SUM.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - não importa chave pública da mídia adicionada\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - adiciona a mídia à configuração, sem atualizá-la.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modo silencioso (não informativo).\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - modo detalhado.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "políticas xml-info conhecidas são %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "nenhum argumento necessário para --distrib --mirrorlist <url>"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "<url> inválida (para diretório local o caminho deve ser absoluto)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Apenas o super usuário tem permissão para adicionar mídias"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "criando arquivo de configuração [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Não foi possível criar o arquivo de configuração [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "não é preciso fornecer <caminho relativo do synthesis> com --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
@@ -2704,17 +2713,17 @@ msgstr ""
 "\n"
 "Você deseja adicionar a mídia '%s'?"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<caminho relativo do synthesis> faltando\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Não se pode usar %s com mídia remota"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "incapaz de adicionar mídia"
@@ -2951,12 +2960,12 @@ msgstr "  -ff            - realmente força a atualização de synthesis\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Apenas o super usuário tem permissão para atualizar mídia"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nada a atualizar (use urpmi.addmedia para adicionar uma mídia)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2965,17 +2974,17 @@ msgstr ""
 "a entrada a ser atualizada está faltando\n"
 "(uma de %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignorando mídia \"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "habilitando mídia \"%s\""
@@ -3260,6 +3269,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Arquivo com as alterações não foi encontrado \n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - cria uma mídia de atualização.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "URL mal formada: [%s]"
 
diff --git a/po/ro.po b/po/ro.po
index 5c9d4969..194e75d5 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-ro\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-07-24 22:21+0200\n"
 "Last-Translator: Pîrîu Cristian Ionuţ <piriu.cristian@rdslink.ro>\n"
 "Language-Team: Romanian <rtfs-project@lists.sourceforge.net>\n"
@@ -27,7 +27,7 @@ msgstr ""
 "X-Poedit-Language: Romanian\n"
 "X-Poedit-Country: ROMANIA\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Instalare RPM"
@@ -37,7 +37,7 @@ msgstr "Instalare RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Eroare: nu s-a găsit fişierul %s, se anulează operaţiunea"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_OK"
@@ -105,7 +105,7 @@ msgstr "_Instalare"
 msgid "_Save"
 msgstr "_Salvare"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Renunţă"
@@ -137,8 +137,9 @@ msgstr ""
 msgid "Options:"
 msgstr "Opţiuni:"
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - afişează acest mesaj de ajutor.\n"
@@ -176,7 +177,7 @@ msgstr ""
 "                   (--no-verify-rpm o dezactivează, implicit este "
 "activată).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -231,7 +232,7 @@ msgstr "Vă rog să aşteptaţi..."
 msgid "Must be root"
 msgstr "Trebuie să fiţi administrator"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -242,42 +243,42 @@ msgstr ""
 "%s\n"
 "Continuaţi instalarea?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Avertisment"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (pentru actualizare)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (pentru instalare)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Alegerea pachetului"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Unul din următoarele pachete e necesar:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Abandonaţi"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -288,20 +289,20 @@ msgstr ""
 "%s\n"
 "Continuaţi instalarea?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Pentru satisfacerea dependenţelor, următorul pachet va fi instalat:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Pentru satisfacerea dependenţelor, următoarele pachete vor fi instalate:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -309,42 +310,42 @@ msgstr[0] "(%d pachet, %d MB)"
 msgstr[1] "(%d pachete, %d MB)"
 msgstr[2] "(%d pachete, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Instalare pachete..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "nu se pot prelua pachetele sursă, se întrerupe"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Pregătire..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalarea pachetului `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Vă rog să introduceţi mediul numit \"%s\""
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Se descarcă pachetul `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Gata"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -355,28 +356,28 @@ msgstr ""
 "%s\n"
 "Probabil ar trebui să actualizaţi baza de date urpmi"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Instalarea a eşuat:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "totul este deja instalat"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Instalare terminată"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "elimin %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "repornesc urpmi"
@@ -456,8 +457,8 @@ msgid "...retrieving done"
 msgstr "...copierea este terminată"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...copierea eşuată: %s"
@@ -497,52 +498,52 @@ msgstr "Operaţiune interzisă în timpul rulării în mod restricţionat"
 msgid "bad proxy declaration on command line\n"
 msgstr "declarare proxy greşită în linia de comandă\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: nu pot citi fişierul rpm \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr "expresie neprevăzută %s"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, c-format
 msgid "missing expression before %s"
 msgstr "lipsă expresie înaintea %s"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "expresie neprevăzută %s (sugestie: utilizaţi -a sau -o ?)"
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr "nici o expresie de închis"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "urpmf aşteaptă implicit un regexp. utilizaţi opţiunea \"--literal\""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "directorul chroot nu există"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Nu se poate utiliza %s fără %s"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Nu se poate utiliza %s cu %s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Prea multe argumente\n"
@@ -976,218 +977,218 @@ msgstr ""
 "--synthesis nu poate fi folosit cu --media, --excludemedia, --sortmedia, --"
 "update, --use-distrib sau --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Pornire căutare: %s terminare: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "se ignoră pachetul %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "instalare în locul actualizării pachetului %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "mediul \"%s\" deja există"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(se ignoră implicit)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "adăugare mediu \"%s\" înaintea mediului extern \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "se adaugă mediul \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "directorul %s nu există"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "această locaţie nu pare să conţină nici o distribuţie"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "nu se poate parcurge media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "nu se poate accesa mediul de instalare (nu s-a găsit fişierul media.cfg)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "se ignoră mediul incompatibil `%s' (pentru %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "se obţine fişierul media.cfg..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "se încearcă selectarea unui mediu inexistent \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "selectez medii multiple: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "se elimină mediul \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "reconfigurez urpmi pentru mediul \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...reconfigurarea a eşuat"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "reconfigurarea s-a încheiat"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Eroare la generarea fişierelor denumirilor: dependenţa %d lipseşte"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "mediul \"%s\" este actualizat"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "examinez fişierul synthesis [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problemă la citirea fişierului synthesis al mediului \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "copiere [%s] pentru mediul \"%s\"..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...copierea a eşuat"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copiez fişierul cu descrieri pentru \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...copierea s-a terminat"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "copierea fişierului [%s] a eşuat (fişier suspect de mic)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "se calculează md5sum pentru fişierului synthesis descărcat"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "descărcarea [%s] a eşuat (eroare md5sum)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2 a eşuat pentru %s"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "comparare %s şi %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "fişierul hdlist %s pentru mediul \"%s\" nu este valid"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "copiere fişier MD5SUM al \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "fişier nevalid MD5SUM (descărcat de la %s)"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "se primeşte sursa synthesis pentru \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "s-a găsit synthesis verificat ca %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "nu s-a găsit fişierul synthesis pentru mediul \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "examinez fişierul cheie publică pentru \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...cheia importată %s din fişierul cheie publică pentru \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "nu pot importa fişierul cheie publică pentru \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "mediul \"%s\" actualizat"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "primirea [%s] a eşuat"
@@ -1219,7 +1220,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "DdYy"
@@ -1289,7 +1290,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1381,6 +1382,309 @@ msgstr "montare %s"
 msgid "unmounting %s"
 msgstr "demontare %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 versiunea %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"Acest program este soft liber şi poate fi redistribuit în termenii GNU GPL.\n"
+"\n"
+"utilizare: urpmf [opţiuni] tipar-expresie\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version      - afişarea versiunii utilitarului.\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          - foloseşte un mediu specificat (tipic un raport de "
+"erori).\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 - nu folosiţi mediile date, separate prin virgulă.\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  - nu potriviţi modelele, utlizaţi argumentul ca literal.\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   - folosirea altui administrator pentru urpmi db & "
+"instalarea 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    - sortează mediile conform subşirurilor separate prin "
+"virgulă.\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - se utilizează calea indicată către mediu \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    - foloseşte fişierul synthesis dat în loc de urpmi db.\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - nu afişează liniile identice.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - foloseşte numai mediile de actualizare.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "   --verbose      - mod detaliat.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - ignoră diferenţierea majusculelor în toate modelele.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -I             - utilizarea diferitelor majuscule în modele (implicit).\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<str>        - schimbaţi câmpul separator (implicit ':').\n"
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Expresii regulate:\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         - orice text este parcurs ca regexp, exceptând utilizarea -"
+"l.\n"
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - include codul perl direct ca perl -e.\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - operator binar ŞI.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - operator binar SAU.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !             - Negare unară.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )            - paranteze stânga şi dreapta.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Listă de etichete:\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - se specifică un format de ieşire tip printf\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   exemplu: '%%nume:%%fişiere'\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - architectură\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - compilare host\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - la compilare\n"
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - fişiere de configurare\n"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts     - marcaj conflicte\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - descrierea pachetului\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - distribuţie\n"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - epocă\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename     - numele fişierelor pachetelor\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  --files        - afişarea fişierelor conţinute în pachet\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - grup\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - licenţă\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - numele pachetului\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - marcaj ca perimat\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - creator\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - marcaj ofertă\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - marcaj necesar\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - spaţiu instalat\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - nume rpm sursă\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - marcaj recomandat\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - sumar\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       - vânzător\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - mediul în care s-a găsit pachetul\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - afişează versiune, ediţie şi arhitectură cu nume.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+"Format incorect: puteţi utiliza numai o singură etichetă cu valori multiple"
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "folosind mediul specific pe %s\n"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "nu este disponibil un hdlist  pentru mediul \"%s\""
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "nu este disponibil un synthesis pentru mediul \"%s\""
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "nu sunt disponibile informaţii xml  pentru mediul \"%s\""
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1393,62 +1697,67 @@ msgid ""
 msgstr ""
 "urpmi s-a repornit, lista pachetelor prioritare s-a modificat: %s contra %s"
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, c-format
 msgid "No package named %s"
 msgstr "Nici un pachet numit %s"
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Următoarele pachete conţin %s: %s"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "s-a găsit pachetul(ele) %s în urpmi db, dar nu este instalat"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Pachetul %s este instalat deja"
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Pachetele %s sunt instalate deja"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
 msgid "due to missing %s"
 msgstr "datorită lipsei %s"
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, c-format
 msgid "due to already installed %s"
 msgstr "%s este deja instalat"
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "datorită %s nesatisfăcute"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "încerc să promovez %s"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "pentru a păstra %s"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, c-format
 msgid "in order to install %s"
 msgstr "pentru a instala %s"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "datorita conflictelor cu %s"
@@ -1542,21 +1851,20 @@ msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 "  --root         - folosiţi alt administrator pentru ştergerea rpm-urilor.\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpme:55 ../urpmi:101
 #, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
 msgstr ""
-"  --urpmi-root   - folosirea altui administrator pentru urpmi db & "
-"instalarea rpm.\n"
+"  --justdb       - se actualizează doar rpm db, nu şi sistemului de "
+"fişiere.\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr ""
 "  --noscripts    - nu se execută algoritmul(ii) suplimentar al pachetului.\n"
 
-#: ../urpme:56
+#: ../urpme:57
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1566,33 +1874,33 @@ msgstr ""
 "distribuţie, utilă\n"
 "                   pentru (dez)instalarea chroot cu opţiunea --root .\n"
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "   --verbose , -v  - mod detaliat.\n"
 
-#: ../urpme:59
+#: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 "  -a             - selectează toate pachetele ce se potrivesc cu expresia.\n"
 
-#: ../urpme:72
+#: ../urpme:73
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Doar administratorul poate şterge pachete"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown packages"
 msgstr "pachete necunoscute "
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown package"
 msgstr "pachet necunoscut "
 
-#: ../urpme:119
+#: ../urpme:121
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1600,17 +1908,17 @@ msgstr[0] "Ştergerea următorului pachet va corupe sistemul:"
 msgstr[1] "Ştergerea următoarelor pachete va corupe sistemul:"
 msgstr[2] "Ştergerea următoarelor pachete va corupe sistemul:"
 
-#: ../urpme:124
+#: ../urpme:126
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nimic de şters"
 
-#: ../urpme:141
+#: ../urpme:143
 #, c-format
 msgid "No orphans to remove"
 msgstr "Nu sunt pachete inutile de şters"
 
-#: ../urpme:147
+#: ../urpme:149
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1621,7 +1929,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Pentru satisfacerea dependenţelor, următoarele %d pachete vor fi şterse"
 
-#: ../urpme:152
+#: ../urpme:154
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1629,7 +1937,7 @@ msgstr[0] "(pachet inutil)"
 msgstr[1] "(pachete inutile)"
 msgstr[2] "(pachete inutile)"
 
-#: ../urpme:159
+#: ../urpme:161
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1637,325 +1945,31 @@ msgstr[0] "Se şterge %d pachet?"
 msgstr[1] "Se şterg %d pachete?"
 msgstr[2] "Se şterg %d pachete?"
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (d/N) "
 
-#: ../urpme:164
+#: ../urpme:166
 #, c-format
 msgid "testing removal of %s"
 msgstr "se verifică ştergerea %s"
 
-#: ../urpme:178
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "Ştergere nereuşită"
 
-#: ../urpme:180
+#: ../urpme:183
 #, c-format
 msgid "Removal is possible"
 msgstr "Ştergere posibilă"
 
-#: ../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 versiunea %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"Acest program este soft liber şi poate fi redistribuit în termenii GNU GPL.\n"
-"\n"
-"utilizare: urpmf [opţiuni] tipar-expresie\n"
-
-#: ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version      - afişarea versiunii utilitarului.\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - foloseşte un mediu specificat (tipic un raport de "
-"erori).\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - nu folosiţi mediile date, separate prin virgulă.\n"
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - nu potriviţi modelele, utlizaţi argumentul ca literal.\n"
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - sortează mediile conform subşirurilor separate prin "
-"virgulă.\n"
-
-#: ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - se utilizează calea indicată către mediu \n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - foloseşte fişierul synthesis dat în loc de urpmi db.\n"
-
-#: ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - nu afişează liniile identice.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - foloseşte numai mediile de actualizare.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "   --verbose      - mod detaliat.\n"
-
-#: ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i             - ignoră diferenţierea majusculelor în toate modelele.\n"
-
-#: ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -I             - utilizarea diferitelor majuscule în modele (implicit).\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<str>        - schimbaţi câmpul separator (implicit ':').\n"
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Expresii regulate:\n"
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text         - orice text este parcurs ca regexp, exceptând utilizarea -"
-"l.\n"
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - include codul perl direct ca perl -e.\n"
-
-#: ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - operator binar ŞI.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - operator binar SAU.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !             - Negare unară.\n"
-
-#: ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )            - paranteze stânga şi dreapta.\n"
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Listă de etichete:\n"
-
-#: ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - se specifică un format de ieşire tip printf\n"
-
-#: ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   exemplu: '%%nume:%%fişiere'\n"
-
-#: ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - architectură\n"
-
-#: ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - compilare host\n"
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - la compilare\n"
-
-#: ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - fişiere de configurare\n"
-
-#: ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts     - marcaj conflicte\n"
-
-#: ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - descrierea pachetului\n"
-
-#: ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - distribuţie\n"
-
-#: ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - epocă\n"
-
-#: ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename     - numele fişierelor pachetelor\n"
-
-#: ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  --files        - afişarea fişierelor conţinute în pachet\n"
-
-#: ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - grup\n"
-
-#: ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - licenţă\n"
-
-#: ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - numele pachetului\n"
-
-#: ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - marcaj ca perimat\n"
-
-#: ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - creator\n"
-
-#: ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - marcaj ofertă\n"
-
-#: ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - marcaj necesar\n"
-
-#: ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - spaţiu instalat\n"
-
-#: ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - nume rpm sursă\n"
-
-#: ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - marcaj recomandat\n"
-
-#: ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - sumar\n"
-
-#: ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - url\n"
-
-#: ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - vânzător\n"
-
-#: ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - mediul în care s-a găsit pachetul\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - afişează versiune, ediţie şi arhitectură cu nume.\n"
-
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr "expresie nedeterminată (%s)"
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-"Format incorect: puteţi utiliza numai o singură etichetă cu valori multiple"
-
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "folosind mediul specific pe %s\n"
-
-#: ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "nu este disponibil un hdlist  pentru mediul \"%s\""
-
-#: ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "nu este disponibil un synthesis pentru mediul \"%s\""
-
-#: ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "nu sunt disponibile informaţii xml  pentru mediul \"%s\""
-
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2049,13 +2063,6 @@ msgstr ""
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - nu se şterg rpm-urile din cache.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr ""
-"  --justdb       - se actualizează doar rpm db, nu şi sistemului de "
-"fişiere.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2403,7 +2410,7 @@ msgstr ""
 "\n"
 "Continuaţi totuşi instalarea?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (D/n) "
@@ -2602,10 +2609,12 @@ msgstr "  --aria2        - utilizaţi aria2 pentru aducerea fişierelor.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - creează un mediu de actualizare.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2616,22 +2625,22 @@ msgstr ""
 "                   una din: niciodată, la cerere, numai la actualizări, "
 "întotdeauna. cf urpmi.cfg(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - se foloseşte fişierul synthesis.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - utilizaţi fişiere rpm (în loc de synthesis).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  -no-probe     - nu se încearcă găsirea fişierului synthesis.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2640,18 +2649,18 @@ msgstr ""
 "  --distrib      - crearea automată a tuturor mediilor de pe un mediu\n"
 "                   de instalare.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - cu --distrib, se cere confirmarea pentru fiecare mediu\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - with --distrib, se adaugă toate mediile afişate\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2661,76 +2670,76 @@ msgstr ""
 "implicit este \n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - se creează mediu virtual ce este actualizat permanent.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 "  --no-md5sum    - dezactivează verificarea fişierelor folosind MD5SUM.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - nu se importă cheia publică a mediului adăugat\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - adăugaţi mediul în configurare, dar nu-l actualizaţi.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - mod silenţios.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - mod detaliat.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "regulile cunoscute xml-info sunt %s "
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "nu sunt necesare argumente pentru --distrib --mirrorlist <url>"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 "<url>greşit (pentru directoarele locale, adresa trebuie să fie absolută)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Doar administratorul poate adăuga un mediu"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "se creează fişierul de configurare [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Nu pot crea fişierul de configurare [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "nu e nevoie să daţi <calea relativă a synthesis> cu --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
@@ -2739,17 +2748,17 @@ msgstr ""
 "\n"
 "Doriţi adăugarea mediului '%s'?"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "lipseşte <calea relativă a synthesis>\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Nu se poate utiliza %s cu mediul extern"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "nu se poate adăuga mediul"
@@ -2994,13 +3003,13 @@ msgstr "  -ff            - se forţează suplimentar actualizarea synthesis\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Doar administratorul poate actualiza mediile"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "nimic de actualizat (folosiţi urpmi.addmedia pentru a adăuga un mediu)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -3009,17 +3018,17 @@ msgstr ""
 "intrarea de actualizat lipseşte\n"
 "(una din %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "mediul %s ignorat"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "mediul %s activat"
@@ -3310,6 +3319,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Nu s-a gasit changelog\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - creează un mediu de actualizare.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "URL incorect: [%s]"
 
diff --git a/po/ru.po b/po/ru.po
index 32251f5c..0e31eb2d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-08-17 17:30+0500\n"
 "Last-Translator: Alexander Kazancev <kazancas@gmail.com>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -25,8 +25,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../gurpmi:32
-#: ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Установка RPM"
@@ -36,9 +35,7 @@ msgstr "Установка RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Ошибка: не удаётся найти файл %s, операция отменяется"
 
-#: ../gurpmi:47
-#: ../gurpmi2:166
-#: ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_ОК"
@@ -50,7 +47,8 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"You probably didn't want to install it on your computer (installing it would allow you to make modifications to its sourcecode then compile it).\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
 "\n"
 "What would you like to do?"
 msgstr ""
@@ -63,8 +61,7 @@ msgstr ""
 "\n"
 "Что хотите сделать?"
 
-#: ../gurpmi:75
-#: ../gurpmi:86
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -104,8 +101,7 @@ msgstr "_Установить"
 msgid "_Save"
 msgstr "_Сохранить"
 
-#: ../gurpmi:101
-#: ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Отмена"
@@ -115,19 +111,20 @@ msgstr "_Отмена"
 msgid "Choose location to save file"
 msgstr "Укажите местоположение, где сохранить файл"
 
-#: ../gurpmi.pm:39
-#: ../urpmi:67
+#: ../gurpmi.pm:39 ../urpmi:67
 #, c-format
 msgid ""
 "urpmi version %s\n"
 "Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "urpmi версия %s\n"
 "Copyright (C) 1999-2008 Mandriva.\n"
-"Это свободное программное обеспечение и может распространяться согласно условиям GNU GPL.\n"
+"Это свободное программное обеспечение и может распространяться согласно "
+"условиям GNU GPL.\n"
 "\n"
 "использование:\n"
 
@@ -136,44 +133,38 @@ msgstr ""
 msgid "Options:"
 msgstr "Параметры:"
 
-#: ../gurpmi.pm:46
-#: ../urpme:46
-#: ../urpmf:35
-#: ../urpmi:72
-#: ../urpmi.addmedia:54
-#: ../urpmi.recover:33
-#: ../urpmi.removemedia:40
-#: ../urpmi.update:32
-#: ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - вывести это справочное сообщение\n"
 
-#: ../gurpmi.pm:47
-#: ../urpmi:79
+#: ../gurpmi.pm:47 ../urpmi:79
 #, c-format
-msgid "  --auto         - non-interactive mode, assume default answers to questions.\n"
-msgstr "  --auto         - неинтерактивный режим; на вопросы даются ответы по умолчанию.\n"
+msgid ""
+"  --auto         - non-interactive mode, assume default answers to "
+"questions.\n"
+msgstr ""
+"  --auto         - неинтерактивный режим; на вопросы даются ответы по "
+"умолчанию.\n"
 
-#: ../gurpmi.pm:48
-#: ../urpmi:80
-#: ../urpmq:52
+#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - автоматический выбор пакетов для обновления системы.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - автоматический выбор пакетов для обновления системы.\n"
 
-#: ../gurpmi.pm:49
-#: ../urpme:50
-#: ../urpmi:103
-#: ../urpmq:66
+#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - принудительное выполнение, даже если некоторые пакеты\n"
 "                   не существуют\n"
 
-#: ../gurpmi.pm:50
-#: ../urpmi:133
+#: ../gurpmi.pm:50 ../urpmi:133
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -182,45 +173,39 @@ msgstr ""
 "  --verify-rpm   - проверять подписи rpm перед установкой\n"
 "                   (--no-verify-rpm отключает её; по умолчанию включена)\n"
 
-#: ../gurpmi.pm:52
-#: ../urpmf:41
-#: ../urpmi:73
-#: ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
 "  --media        - использовать только указанные источники,\n"
 "                   перечисленные через запятую.\n"
 
-#: ../gurpmi.pm:53
-#: ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:149
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - разрешить искать пакеты в provides\n"
 
-#: ../gurpmi.pm:54
-#: ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:150
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - не искать пакеты в provides\n"
 
-#: ../gurpmi.pm:55
-#: ../urpmi:110
-#: ../urpmq:69
+#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - использовать другой корень для установки rpm.\n"
 
-#: ../gurpmi.pm:56
-#: ../urpmi:135
+#: ../gurpmi.pm:56 ../urpmi:135
 #, c-format
-msgid "  --test         - only verify if the installation can be achieved correctly.\n"
+msgid ""
+"  --test         - only verify if the installation can be achieved "
+"correctly.\n"
 msgstr "  --test         - проверить возможность корректной установки\n"
 
-#: ../gurpmi.pm:57
-#: ../urpmi:76
+#: ../gurpmi.pm:57 ../urpmi:76
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - использование только указанных источников для поиска\n"
 "                   запрошенных пакетов.\n"
@@ -240,7 +225,7 @@ msgstr "Подождите, пожалуйста..."
 msgid "Must be root"
 msgstr "Необходимы права root'а"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -251,43 +236,42 @@ msgstr ""
 "%s\n"
 "Всё равно продолжить установку?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Внимание"
 
-#: ../gurpmi2:126
-#: ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "ОК"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (обновить)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (установить)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Выбор пакета"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Нужен один из следующих пакетов:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Прервать"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -298,65 +282,61 @@ msgstr ""
 "%s\n"
 "Всё равно продолжить установку?"
 
-#: ../gurpmi2:232
-#: ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
 msgstr "Для удовлетворения зависимостей будет установлен следующий пакет:"
 
-#: ../gurpmi2:233
-#: ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Для удовлетворения зависимостей будут установлены следующие пакеты:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d пакет, %d МБ)"
 msgstr[1] "(%d пакетов, %d МБ)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Устанавливается пакет..."
 
-#: ../gurpmi2:243
-#: ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "не удаётся получить пакеты с исходными кодами, аварийное завершение"
 
-#: ../gurpmi2:257
-#: ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Подготовка..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Устанавливается пакет `%s' (%s/%s)..."
 
-#: ../gurpmi2:278
-#: ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Вставьте носитель под названием \"%s\""
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Загружается пакет `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Готово"
 
-#: ../gurpmi2:316
-#: ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -367,33 +347,28 @@ msgstr ""
 "%s\n"
 "Возможно вам необходимо обновить базу данных urpmi"
 
-#: ../gurpmi2:322
-#: ../urpm/main_loop.pm:223
-#: ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259
-#: ../urpm/main_loop.pm:282
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Установка не удалась:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Все уже установлено"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Установка завершена"
 
-#: ../gurpmi2:330
-#: ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "удаляется %s"
 
-#: ../gurpmi2:338
-#: ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi перезапускается"
@@ -432,8 +407,7 @@ msgstr "                    по умолчанию %s.\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "   -f             - выводить полное имя rpm (NVRA)\n"
 
-#: ../rurpmi:11
-#: ../urpmi:281
+#: ../rurpmi:11 ../urpmi:281
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Только суперпользователю разрешается устанавливать пакеты"
@@ -468,19 +442,14 @@ msgstr "неверное имя rpm-файла [%s]"
 msgid "retrieving rpm file [%s] ..."
 msgstr "извлекается rpm-файл [%s] ..."
 
-#: ../urpm.pm:280
-#: ../urpm/get_pkgs.pm:226
+#: ../urpm.pm:280 ../urpm/get_pkgs.pm:226
 #, c-format
 msgid "...retrieving done"
 msgstr "...извлечение выполнено"
 
-#: ../urpm.pm:283
-#: ../urpm/download.pm:734
-#: ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824
-#: ../urpm/media.pm:1274
-#: ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...извлечение не удалось: %s"
@@ -515,82 +484,84 @@ msgstr "ошибка регистрации локальных пакетов"
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Эта операция запрещена при работе в ограниченном режиме"
 
-#: ../urpm/args.pm:145
-#: ../urpm/args.pm:154
+#: ../urpm/args.pm:145 ../urpm/args.pm:154
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "неверное объявление proxy в командной строке\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: не удаётся прочитать rpm-файл \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr "неожиданное выражение %s"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, c-format
 msgid "missing expression before %s"
 msgstr "перед %s отсутствует выражение"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
-msgstr "неожиданное выражение %s (рекомендация: используйте параметр -a или -o)"
+msgstr ""
+"неожиданное выражение %s (рекомендация: используйте параметр -a или -o)"
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr "отсутствует выражения для закрытия"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
-msgstr "по умолчанию urpmf ожидает регулярное выражение. Используйте параметр \"--literal\""
+msgstr ""
+"по умолчанию urpmf ожидает регулярное выражение. Используйте параметр \"--"
+"literal\""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Каталог chroot не существует"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s нельзя использовать без %s"
 
-#: ../urpm/args.pm:486
-#: ../urpm/args.pm:489
-#: ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s нельзя использовать без %s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Слишком много аргументов\n"
 
-#: ../urpm/bug_report.pm:48
-#: ../urpmi:258
+#: ../urpm/bug_report.pm:48 ../urpmi:258
 #, c-format
 msgid "Copying failed"
 msgstr "Копирование не удалось"
 
 #: ../urpm/cdrom.pm:66
 #, c-format
-msgid "You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done automatically)"
-msgstr "Вы должны монтировать CD-ROM вручную (или установите perl-Hal-Cdroms чтобы это происходило автоматически)"
+msgid ""
+"You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
+msgstr ""
+"Вы должны монтировать CD-ROM вручную (или установите perl-Hal-Cdroms чтобы "
+"это происходило автоматически)"
 
 #: ../urpm/cdrom.pm:68
 #, c-format
 msgid "HAL daemon (hald) is not running or not ready"
 msgstr "HAL-демон (hald) не запущен или не готов к работе"
 
-#: ../urpm/cdrom.pm:161
-#: ../urpm/cdrom.pm:166
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
 #, c-format
 msgid "medium \"%s\" is not available"
 msgstr "источник \"%s\" недоступен"
@@ -615,9 +586,7 @@ msgstr "не удаётся прочитать конфигурационный
 msgid "medium `%s' is defined twice, aborting"
 msgstr "источник '%s' определён дважды; останов"
 
-#: ../urpm/cfg.pm:251
-#: ../urpm/media.pm:486
-#: ../urpm/media.pm:492
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:486 ../urpm/media.pm:492
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "не удаётся записать конфигурационный файл [%s]"
@@ -625,7 +594,9 @@ msgstr "не удаётся записать конфигурационный ф
 #: ../urpm/download.pm:109
 #, c-format
 msgid "can not read proxy settings (not enough rights to read %s)"
-msgstr "не удаётся прочитать параметры прокси-сервера (недостаточно прав, чтобы прочитать %s)"
+msgstr ""
+"не удаётся прочитать параметры прокси-сервера (недостаточно прав, чтобы "
+"прочитать %s)"
 
 #: ../urpm/download.pm:134
 #, c-format
@@ -769,8 +740,10 @@ msgstr "[повторная упаковка]"
 
 #: ../urpm/install.pm:175
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "создана транзакция для установки на %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"создана транзакция для установки на %s (remove=%d, install=%d, upgrade=%d)"
 
 #: ../urpm/install.pm:178
 #, c-format
@@ -792,8 +765,7 @@ msgstr "не удаётся установить пакет %s"
 msgid "removing bad rpm (%s) from %s"
 msgstr "удаляются неверные rpm-файлы (%s) из %s"
 
-#: ../urpm/install.pm:218
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:218 ../urpm/install.pm:275
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "не удалось удалить %s: %s"
@@ -838,8 +810,7 @@ msgstr "Сервер не определён; отсутствует URI или
 msgid "No base defined"
 msgstr "База не определена"
 
-#: ../urpm/ldap.pm:172
-#: ../urpm/ldap.pm:175
+#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
 #, c-format
 msgid "Cannot connect to ldap uri:"
 msgstr "Не удаётся подключиться к ldap по URI:"
@@ -859,17 +830,13 @@ msgstr "прерывается"
 msgid "%s database is locked (another program is already using it)"
 msgstr "%s база заблокирована (возможно ее использует другая программа)"
 
-#: ../urpm/main_loop.pm:110
-#: ../urpm/main_loop.pm:120
-#: ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230
-#: ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
+#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Установка не удалась"
 
-#: ../urpm/main_loop.pm:112
-#: ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
 #, c-format
 msgid "Try to go on anyway? (y/N) "
 msgstr "Попробовать в любом случае? (y/N)"
@@ -933,8 +900,7 @@ msgstr "Попробовать принудительную установку (
 msgid "Packages are up to date"
 msgstr "Пакеты находятся в актуальном состоянии"
 
-#: ../urpm/main_loop.pm:306
-#: ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Установка возможна."
@@ -957,7 +923,9 @@ msgstr "предупреждение: в файле MD5SUM нет md5-суммы
 #: ../urpm/media.pm:204
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "виртуальный источник \"%s\" должен содержать пустой url; источник проигнорирован"
+msgstr ""
+"виртуальный источник \"%s\" должен содержать пустой url; источник "
+"проигнорирован"
 
 #: ../urpm/media.pm:206
 #, c-format
@@ -977,10 +945,10 @@ msgstr "попытка переопределить существующий и�
 #: ../urpm/media.pm:445
 #, c-format
 msgid "failed to migrate removable device, ignoring media"
-msgstr "не удалось выполнить миграцию съёмного устройства; источник игнорируется"
+msgstr ""
+"не удалось выполнить миграцию съёмного устройства; источник игнорируется"
 
-#: ../urpm/media.pm:488
-#: ../urpm/media.pm:494
+#: ../urpm/media.pm:488 ../urpm/media.pm:494
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "записан конфигурационный файл [%s]"
@@ -997,226 +965,224 @@ msgstr "используется связанный источник для ре
 
 #: ../urpm/media.pm:561
 #, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
-msgstr "параметр --synthesis нельзя использовать с --media, --excludemedia, --sortmedia, --update или --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"параметр --synthesis нельзя использовать с --media, --excludemedia, --"
+"sortmedia, --update или --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Поиск: начало - %s, конец - %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "пропускается пакет %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "будет произведена установка вместо обновления пакета %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "источник \"%s\" уже существует"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(игнорируется по умолчанию)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "добавляется источник \"%s\" (перед удалённым источником \"%s\")"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "добавляется источник \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "Каталог %s не существует"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "не удаётся найти дистрибутив по указанному адресу"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "не удаётся обработать файл media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "нет доступа к источнику с дистрибутивом (не найден файл media.cfg)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "пропускается несовместимый источник `%s' (для %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "загружается файл media.cfg..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "был выбран несуществующий источник \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "выбирается составной источник: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "удаляется источник \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "перенастраивается urpmi для источника \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...перенастройка не удалась"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "перенастройка выполнена"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Ошибка создания файла имён: не найдена зависимость %d"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "источник \"%s\" уже обновлён"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "изучается файл synthesis [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "проблема чтения файла synthesis источника \"%s\""
 
-#: ../urpm/media.pm:1163
-#: ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "копируется [%s] для источника \"%s\"..."
 
-#: ../urpm/media.pm:1165
-#: ../urpm/media.pm:1220
-#: ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...копирование не удалось"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "копируется файл описания для \"%s\"..."
 
-#: ../urpm/media.pm:1218
-#: ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...копирование выполнено"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "копирование [%s] не удалось (файл подозрительно короткий)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "вычисляется md5-сумма для загруженного synthesis-файла источника"
 
-#: ../urpm/media.pm:1299
-#: ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "копирование [%s] не удалось (md5-суммы не совпадают)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "ошибка выполнения genhdlist2 для %s"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "сравниваются %s и %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "неверный файл hdlist %s для источника \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "копируется файл MD5SUM для \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "неверный файл MD5SUM (загружен из %s)"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "загружается synthesis-файл источника из \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "найден искомый synthesis-файл: %s"
 
-#: ../urpm/media.pm:1472
-#: ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "не найден synthesis-файл для источника \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "проверяется файл открытого ключа для \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...импортирован ключ %s из файла открытого ключа \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "не удаётся импортировать файл открытого ключа \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "обновлён источник \"%s\""
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "не удалось загрузить [%s]"
@@ -1241,21 +1207,14 @@ msgstr "найдено географическое расположение %s
 msgid "getting mirror list from %s"
 msgstr "загружается список зеркал из %s"
 
-#: ../urpm/msg.pm:63
-#: ../urpmi:514
-#: ../urpmi:529
-#: ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
 #, c-format
 msgid "Nn"
 msgstr "NnНн"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64
-#: ../urpme:38
-#: ../urpmi:568
-#: ../urpmi:663
-#: ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyДд"
@@ -1320,18 +1279,25 @@ msgstr "МБ"
 msgid "GB"
 msgstr "ГБ"
 
-#: ../urpm/msg.pm:190
-#: ../urpm/msg.pm:199
+#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
 #, c-format
 msgid "TB"
 msgstr "ТБ"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
-msgid "The following package is now orphan, use \"urpme --auto-orphans\" to remove it."
-msgid_plural "The following packages are now orphans, use \"urpme --auto-orphans\" to remove them."
-msgstr[0] "Следующий пакет теперь является осиротевшим, для его удаления используйте команду \"urpme --auto-orphans\""
-msgstr[1] "Следующие пакеты теперь являются осиротевшими, для их удаления используйте команду \"urpme --auto-orphans\""
+msgid ""
+"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
+"it."
+msgid_plural ""
+"The following packages are now orphans, use \"urpme --auto-orphans\" to "
+"remove them."
+msgstr[0] ""
+"Следующий пакет теперь является осиротевшим, для его удаления используйте "
+"команду \"urpme --auto-orphans\""
+msgstr[1] ""
+"Следующие пакеты теперь являются осиротевшими, для их удаления используйте "
+"команду \"urpme --auto-orphans\""
 
 #: ../urpm/parallel.pm:14
 #, c-format
@@ -1385,16 +1351,19 @@ msgstr "сбой cp на хосте %s (%d)"
 
 #: ../urpm/parallel_ssh.pm:86
 #, c-format
-msgid "%s failed on host %s (maybe it does not have a good version of urpmi?) (exit code: %d)"
-msgstr "Сбой %s на хосте %s (возможно он имеет неверную версию urpmi?) (код выхода: %d)"
+msgid ""
+"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
+"code: %d)"
+msgstr ""
+"Сбой %s на хосте %s (возможно он имеет неверную версию urpmi?) (код выхода: %"
+"d)"
 
 #: ../urpm/removable.pm:32
 #, c-format
 msgid "unable to access medium \"%s\"."
 msgstr "нет доступа к источнику \"%s\"."
 
-#: ../urpm/removable.pm:72
-#: ../urpm/removable.pm:90
+#: ../urpm/removable.pm:72 ../urpm/removable.pm:90
 #, c-format
 msgid "mounting %s"
 msgstr "монтируется %s"
@@ -1404,589 +1373,586 @@ msgstr "монтируется %s"
 msgid "unmounting %s"
 msgstr "отмонтируется %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "urpmi был перезапущен; список приоритетов пакетов не изменился"
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi был перезапущен; список приоритетов пакетов изменился: %s против %s"
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Нет пакета с именем %s"
-
-#: ../urpm/select.pm:193
-#: ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Следующие пакеты содержат %s: %s"
-
-#: ../urpm/select.pm:296
-#, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "в базе данных найдены пакеты %s, но не установлены"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Пакет %s уже установлен"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Пакеты %s уже установлен"
-
-#: ../urpm/select.pm:558
-#: ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "из-за отсутствия %s"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "из-за того, что %s уже установлен"
-
-#: ../urpm/select.pm:560
-#: ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "из-за неудовлетворённости %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "попытка активизировать %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "чтобы сохранить %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "чтобы установить %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "из-за конфликтов с %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Неверная подпись (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Неверный Key ID (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Отсутствует подпись (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr "система"
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr "Необходимо перезапустить %s для %s"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't write file"
-msgstr "Не удаётся записать файл"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "Не удаётся открыть файл"
-
-#: ../urpm/sys.pm:289
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "Не удаётся переместить файл %s в %s"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme версия %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Это свободное программное обеспечение и может распространяться согласно условиям GNU GPL.\n"
-"\n"
-"использование:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - автоматически выбрать пакет из предлагаемых\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr "  --auto-orphans - удаление сирот\n"
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - проверить возможность корректного удаления\n"
-
-#: ../urpme:51
-#: ../urpmi:109
-#: ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - распределённый urpmi через машины алиаса\n"
-
-#: ../urpme:52
-#: ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - повторно упаковывать файлы перед удалением\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - использовать другой корень для удаления rpm.\n"
-
-#: ../urpme:54
-#: ../urpmf:40
-#: ../urpmi:111
-#: ../urpmi.addmedia:71
-#: ../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 "  --root-root    - использовать другой корень для базы данных urpmi и установки пакетов.\n"
-
-#: ../urpme:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - не выполнять scriptlet'ы пакета\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - настроить urpme на лету из дерева distrib; полезно\n"
-"                   для установки/удаления в/из chroot с параметром --root\n"
-
-#: ../urpme:58
-#: ../urpmi:152
-#: ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - подробный режим.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - выбрать все пакеты, удовлетворяющие выражению\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Только суперпользователю разрешается удалять пакеты"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "неизвестные пакеты"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "неизвестный пакет"
-
-#: ../urpme:119
-#, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "после удаления следующего пакета будет нарушена работа всей системы:"
-msgstr[1] "после удаления следующих пакетов будет нарушена работа всей системы:"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Нечего удалять"
-
-#: ../urpme:141
-#, c-format
-msgid "No orphans to remove"
-msgstr "Нет осиротевших пакетов для удаления"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "Для удовлетворения зависимостей будет удалён следующий пакет"
-msgstr[1] "Для удовлетворения зависимостей будут удалены следующие %d пакетов"
-
-#: ../urpme:152
-#, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "(осиротевший пакет)"
-msgstr[1] "(осиротевшие пакеты)"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Удалить %d пакет?"
-msgstr[1] "Удалить %d пакетов?"
-
-#: ../urpme:159
-#: ../urpmi:569
-#: ../urpmi:664
-#: ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:164
-#, c-format
-msgid "testing removal of %s"
-msgstr "тестрование удаления из %s"
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Удаление не удалось"
-
-#: ../urpme:180
-#, c-format
-msgid "Removal is possible"
-msgstr "Удаление возможно"
-
-#: ../urpmf:29
+#: ../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"
+"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 версия %s\n"
 "Copyright (C) 2002-2006 Mandriva.\n"
-"Это свободное программное обеспечение и может распространяться согласно условиям GNU GPL.\n"
+"Это свободное программное обеспечение и может распространяться согласно "
+"условиям GNU GPL.\n"
 "\n"
 "использование: urpmf [параметры] путь-выражение\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - вывести номер версии этой утилиты.\n"
 
-#: ../urpmf:37
-#: ../urpmi:132
-#: ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - использовать особое окружение (обычно отчёт\n"
 "                   об ошибке).\n"
 
-#: ../urpmf:38
-#: ../urpmi:74
-#: ../urpmq:49
+#: ../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 - не использовать указанные источники,\n"
 "                   перечисленные через запятую.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 "  --literal, -l  - не искать соответствия шаблону, использовать аргумент\n"
 "                   как буквенную строку.\n"
 
-#: ../urpmf:42
-#: ../urpmi:77
-#: ../urpmq:50
+#: ../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 "  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --root-root    - использовать другой корень для базы данных urpmi и "
+"установки пакетов.\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    - сортировать источники по подстрокам, перечисленным\n"
 "                   через запятую.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - использовать указанный путь к источнику.\n"
 
-#: ../urpmf:44
-#: ../urpmi:78
-#: ../urpmq:51
+#: ../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    - использовать указанный synthesis вместо БД urpmi.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - не выводить идентичные строки.\n"
 
-#: ../urpmf:46
-#: ../urpmi:75
-#: ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - использовать только источник обновления.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - подробный режим.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - игнорировать учёт регистра в шаблонах.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -I             - учитывать регистра во шаблонах (по умолчанию).\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - изменение разделителя полей (по умолчанию - ':').\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Выражения для шаблонов:\n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  text           - любой текст считается регулярным выражением,\n"
 "                   если только не используется -l.\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - включение кода perl непосредственно как perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - двоичный оператор AND.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - бинарный оператор OR.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - унарный NOT.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - левая и правая скобки.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Список тегов:\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - указание выходного формата в стиле printf\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   пример: '%%name:%%files'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - архитектура\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - хост, на котором собран.\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - время сборки\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - конфигурационные файлы\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - конфликтующие теги\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - описание пакета\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - дистрибутив\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - epoch\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - имя пакета\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - список файлов в пакете\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - группа\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - лицензия\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - имя пакета\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - устаревшие теги\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - создатель пакета\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - предоставляемые теги\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - требуемые теги\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - установленный размер\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - rpm с исходными кодами\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - рекомендуемые теги\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - сводка\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - поставщик\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - источник, в котором был найден пакет\n"
 
-#: ../urpmf:85
-#: ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - вывод версии, релиза и архитектуры с названием.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr "незавершённое выражение (%s)"
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Неверный формат: вы можете использовать только один тег с несколькими значениями"
+msgstr ""
+"Неверный формат: вы можете использовать только один тег с несколькими "
+"значениями"
 
-#: ../urpmf:248
-#: ../urpmi:265
-#: ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "используется специфическое окружение для %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "не найден файл hdlist для источника \"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "не найден synthesis-файл для источника \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "не найден файл xml-info для источника \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr "urpmi был перезапущен; список приоритетов пакетов не изменился"
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi был перезапущен; список приоритетов пакетов изменился: %s против %s"
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Нет пакета с именем %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Следующие пакеты содержат %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "в базе данных найдены пакеты %s, но не установлены"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Пакет %s уже установлен"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Пакеты %s уже установлен"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "из-за отсутствия %s"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "из-за того, что %s уже установлен"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "из-за неудовлетворённости %s"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "попытка активизировать %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "чтобы сохранить %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "чтобы установить %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "из-за конфликтов с %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Неверная подпись (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Неверный Key ID (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Отсутствует подпись (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr "система"
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr "Необходимо перезапустить %s для %s"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't write file"
+msgstr "Не удаётся записать файл"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "Не удаётся открыть файл"
+
+#: ../urpm/sys.pm:289
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "Не удаётся переместить файл %s в %s"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme версия %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Это свободное программное обеспечение и может распространяться согласно "
+"условиям GNU GPL.\n"
+"\n"
+"использование:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - автоматически выбрать пакет из предлагаемых\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr "  --auto-orphans - удаление сирот\n"
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - проверить возможность корректного удаления\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - распределённый urpmi через машины алиаса\n"
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - повторно упаковывать файлы перед удалением\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - использовать другой корень для удаления rpm.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr ""
+"  --justdb       - обновить базу данных, но не изменять файловую систему.\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - не выполнять scriptlet'ы пакета\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - настроить urpme на лету из дерева distrib; полезно\n"
+"                   для установки/удаления в/из chroot с параметром --root\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - подробный режим.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - выбрать все пакеты, удовлетворяющие выражению\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Только суперпользователю разрешается удалять пакеты"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "неизвестные пакеты"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "неизвестный пакет"
+
+#: ../urpme:121
+#, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] ""
+"после удаления следующего пакета будет нарушена работа всей системы:"
+msgstr[1] ""
+"после удаления следующих пакетов будет нарушена работа всей системы:"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Нечего удалять"
+
+#: ../urpme:143
+#, c-format
+msgid "No orphans to remove"
+msgstr "Нет осиротевших пакетов для удаления"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Для удовлетворения зависимостей будет удалён следующий пакет"
+msgstr[1] "Для удовлетворения зависимостей будут удалены следующие %d пакетов"
+
+#: ../urpme:154
+#, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "(осиротевший пакет)"
+msgstr[1] "(осиротевшие пакеты)"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Удалить %d пакет?"
+msgstr[1] "Удалить %d пакетов?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpme:166
+#, c-format
+msgid "testing removal of %s"
+msgstr "тестрование удаления из %s"
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Удаление не удалось"
+
+#: ../urpme:183
+#, c-format
+msgid "Removal is possible"
+msgstr "Удаление возможно"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr "незавершённое выражение (%s)"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2007,31 +1973,35 @@ msgstr "    --force-key    - принудительно обновить gpg-к�
 msgid "  --auto-orphans - remove orphans without asking\n"
 msgstr "  --auto-orphans - удаления сирот без запроса\n"
 
-#: ../urpmi:85
-#: ../urpmq:54
+#: ../urpmi:85 ../urpmq:54
 #, c-format
 msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
-msgstr "  --no-suggests  - не выбирать автоматически \"рекомендованные\" пакеты.\n"
+msgstr ""
+"  --no-suggests  - не выбирать автоматически \"рекомендованные\" пакеты.\n"
 
 #: ../urpmi:86
 #, c-format
-msgid "  --no-uninstall - never ask to uninstall a package, abort the installation.\n"
-msgstr "  --no-uninstall - никогда не предлагать удалять пакет, прерывать установку.\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - никогда не предлагать удалять пакет, прерывать "
+"установку.\n"
 
 #: ../urpmi:87
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - не устанавливать пакеты (только загрузить)\n"
 
-#: ../urpmi:88
-#: ../urpmq:56
+#: ../urpmi:88 ../urpmq:56
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
 msgstr ""
 "  --keep         - по возможности сохранять существующие пакеты,\n"
-"                   отклонять запрошенные пакеты, которые приводят к удалению.\n"
+"                   отклонять запрошенные пакеты, которые приводят к "
+"удалению.\n"
 
 #: ../urpmi:90
 #, c-format
@@ -2076,15 +2046,12 @@ msgstr "  --clean        - перед началом операции удали
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - не удалять rpm из кэша.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       - обновить базу данных, но не изменять файловую систему.\n"
-
 #: ../urpmi:102
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
-msgstr "  --replacepkgs  - принудительная установка уже установленных пакетов.\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
+msgstr ""
+"  --replacepkgs  - принудительная установка уже установленных пакетов.\n"
 
 #: ../urpmi:104
 #, c-format
@@ -2107,7 +2074,8 @@ msgstr ""
 #: ../urpmi:108
 #, c-format
 msgid "  --allow-suggests - auto select \"suggested\" packages.\n"
-msgstr "  --allow-suggests - автоматически выбирать \"рекомендованные\" пакеты.\n"
+msgstr ""
+"  --allow-suggests - автоматически выбирать \"рекомендованные\" пакеты.\n"
 
 #: ../urpmi:112
 #, c-format
@@ -2118,9 +2086,7 @@ msgstr ""
 "  --use-distrib  - настроить urpmi на лету из дерева distrib; полезно\n"
 "                   для установки в chroot с параметром --root.\n"
 
-#: ../urpmi:114
-#: ../urpmi.addmedia:59
-#: ../urpmi.update:37
+#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:37
 #, c-format
 msgid "  --metalink     - generate and use a local metalink.\n"
 msgstr "  --metalink     - генерировать и использовать локальные метассылки.\n"
@@ -2152,16 +2118,16 @@ msgstr "  --wget-options - дополнительные параметры, пе
 #: ../urpmi:121
 #, c-format
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
-msgstr "  --prozilla-options - дополнительные параметры, передаваемые в prozilla\n"
+msgstr ""
+"  --prozilla-options - дополнительные параметры, передаваемые в prozilla\n"
 
 #: ../urpmi:122
 #, c-format
 msgid "  --aria2-options - additional options to pass to aria2\n"
-msgstr "  --aria2-options- дополнительные параметры, передаваемые в программу aria2\n"
+msgstr ""
+"  --aria2-options- дополнительные параметры, передаваемые в программу aria2\n"
 
-#: ../urpmi:123
-#: ../urpmi.addmedia:60
-#: ../urpmi.update:38
+#: ../urpmi:123 ../urpmi.addmedia:60 ../urpmi.update:38
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - ограничение скорости загрузки\n"
@@ -2175,10 +2141,7 @@ msgstr ""
 "  --resume       - возобновить загрузку частично загруженных файлов\n"
 "                   (--no-resume отключает её; по умолчанию отключена).\n"
 
-#: ../urpmi:126
-#: ../urpmi.addmedia:61
-#: ../urpmi.update:39
-#: ../urpmq:76
+#: ../urpmi:126 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -2187,10 +2150,7 @@ msgstr ""
 "  --proxy        - использовать указанный HTTP-прокси; по умолчанию\n"
 "                   используется порт 1080 (формат - <хост_прокси[:порт]>).\n"
 
-#: ../urpmi:128
-#: ../urpmi.addmedia:63
-#: ../urpmi.update:41
-#: ../urpmq:78
+#: ../urpmi:128 ../urpmi.addmedia:63 ../urpmi.update:41 ../urpmq:78
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2221,7 +2181,8 @@ msgstr "  --excludedocs  - исключить файлы документаци�
 #: ../urpmi:138
 #, c-format
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
-msgstr "  --ignoresize   - не проверять дисковое пространство перед установкой\n"
+msgstr ""
+"  --ignoresize   - не проверять дисковое пространство перед установкой\n"
 
 #: ../urpmi:139
 #, c-format
@@ -2264,8 +2225,7 @@ msgstr "  --nolock       - не блокировать базу данных rpm
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - обновить пакеты только с такой же архитектурой\n"
 
-#: ../urpmi:148
-#: ../urpmq:97
+#: ../urpmi:148 ../urpmq:97
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - выбрать все совпадения из командной строки\n"
@@ -2283,12 +2243,15 @@ msgstr "  --debug        - очень подробный режим.\n"
 #: ../urpmi:154
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  будут установлены имена или rpm-файлы, указанные в командной строке.\n"
+msgstr ""
+"  будут установлены имена или rpm-файлы, указанные в командной строке.\n"
 
 #: ../urpmi:182
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
-msgstr "Ошибка: параметр --auto-select нельзя использовать вместе со списком пакетов.\n"
+msgstr ""
+"Ошибка: параметр --auto-select нельзя использовать вместе со списком "
+"пакетов.\n"
 
 #: ../urpmi:189
 #, c-format
@@ -2302,7 +2265,9 @@ msgstr ""
 #: ../urpmi:219
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
-msgstr "При использовании параметра --install-src нельзя устанавливать бинарные rpm-файлы"
+msgstr ""
+"При использовании параметра --install-src нельзя устанавливать бинарные rpm-"
+"файлы"
 
 #: ../urpmi:220
 #, c-format
@@ -2316,13 +2281,20 @@ msgstr "умолчания для --buildrequires"
 
 #: ../urpmi:232
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "используйте параметр --buildrequires или --install-src (по умолчанию используется --buildrequires)"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"используйте параметр --buildrequires или --install-src (по умолчанию "
+"используется --buildrequires)"
 
 #: ../urpmi:252
 #, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
-msgstr "Каталог [%s] уже существует, используйте другой каталог для отчёта об ошибке или удалите его"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Каталог [%s] уже существует, используйте другой каталог для отчёта об ошибке "
+"или удалите его"
 
 #: ../urpmi:253
 #, c-format
@@ -2374,7 +2346,9 @@ msgstr "%s (для установки)"
 
 #: ../urpmi:462
 #, c-format
-msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
+msgid ""
+"In order to satisfy the '%s' dependency, one of the following packages is "
+"needed:"
 msgstr "Для удовлетворения зависимости '%s' нужен один из следующих пакетов:"
 
 #: ../urpmi:465
@@ -2404,8 +2378,7 @@ msgstr ""
 "более старых, чем установленные:\n"
 "%s"
 
-#: ../urpmi:515
-#: ../urpmi:530
+#: ../urpmi:515 ../urpmi:530
 #, c-format
 msgid ""
 "\n"
@@ -2414,10 +2387,7 @@ msgstr ""
 "\n"
 "Продолжить установку?"
 
-#: ../urpmi:516
-#: ../urpmi:531
-#: ../urpmi:628
-#: ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -2493,10 +2463,12 @@ msgstr "(только проверка; ничего удалено не буд�
 #: ../urpmi:583
 #, c-format
 msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
 "%s\n"
 msgstr ""
-"Сначала нужно запустить urpmi с параметром --buildrequires, чтобы установить следующие зависимости:\n"
+"Сначала нужно запустить urpmi с параметром --buildrequires, чтобы установить "
+"следующие зависимости:\n"
 "%s\n"
 
 #: ../urpmi:594
@@ -2576,7 +2548,8 @@ msgstr ""
 "       cdrom://<путь>\n"
 "\n"
 "Использование: urpmi.addmedia [параметры] --distrib --mirrorlist <url>\n"
-"Использование: urpmi.addmedia [параметры] --mirrorlist <url> <название> <относительный путь>\n"
+"Использование: urpmi.addmedia [параметры] --mirrorlist <url> <название> "
+"<относительный путь>\n"
 "\n"
 "Примеры:\n"
 "\n"
@@ -2586,63 +2559,62 @@ msgstr ""
 "\n"
 "а [параметры] могут быть следующими\n"
 
-#: ../urpmi.addmedia:55
-#: ../urpmi.update:33
-#: ../urpmq:73
+#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:73
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - использовать wget для загрузки удалённых файлов\n"
 
-#: ../urpmi.addmedia:56
-#: ../urpmi.update:34
-#: ../urpmq:74
+#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:74
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - использовать curl для загрузки удалённых файлов.\n"
 
-#: ../urpmi.addmedia:57
-#: ../urpmi.update:35
-#: ../urpmq:75
+#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:75
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
-msgstr "  --prozilla     - использовать prozilla для загрузки удалённых файлов\n"
+msgstr ""
+"  --prozilla     - использовать prozilla для загрузки удалённых файлов\n"
 
-#: ../urpmi.addmedia:58
-#: ../urpmi.update:36
+#: ../urpmi.addmedia:58 ../urpmi.update:36
 #, c-format
 msgid "  --aria2        - use aria2 to retrieve distant files.\n"
 msgstr "  --aria2        - использовать aria2 для загрузки удалённых файлов.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - создать источник обновления\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
-"                   one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+"                   one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
 msgstr ""
-"  --xml-info     - использовать определённую политику для загрузки xml-файлов\n"
-"                   варианты: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+"  --xml-info     - использовать определённую политику для загрузки xml-"
+"файлов\n"
+"                   варианты: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - использовать файл synthesis.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - использовать файлы rpm (вместо synthesis-файла).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - не искать synthesis-файл.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2651,21 +2623,21 @@ msgstr ""
 "  --distrib      - автоматически создать все источники из источника\n"
 "                   установки\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 "  --interactive  - (вместе с --distrib) ожидать подтверждения для каждого\n"
 "                   из источников\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 "  --all-media    - (вместе с --distrib) добавить все перечисленные\n"
 "                   источники\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2674,79 +2646,76 @@ msgstr ""
 "  --from         - использовать указанный url для поиска зеркал,\n"
 "                   по умолчанию используется %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - создать виртуальный источник, который всегда\n"
 "                   является самым актульным.\n"
 
-#: ../urpmi.addmedia:79
-#: ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - отключить проверку файла MD5SUM\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - не импортировать pubkey из добавленного источника\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - добавить источник в config, но не обновлять его\n"
 
-#: ../urpmi.addmedia:82
-#: ../urpmi.removemedia:43
-#: ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - тихий режим (quiet)\n"
 
-#: ../urpmi.addmedia:83
-#: ../urpmi.removemedia:44
-#: ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - подробный режим\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "возможные политики xml-info: %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "для параметра --distrib --mirrorlist <url> не нужны аргументы"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "неверный <url> (для локального каталога путь должен быть абсолютным)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Добавлять источники разрешено только суперпользователю"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "создаётся конфигурационный файл [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Не удаётся создать конфигурационный файл [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
-msgstr "с параметром --distrib <относительный путь к synthesis-файлу> указывать не нужно"
+msgstr ""
+"с параметром --distrib <относительный путь к synthesis-файлу> указывать не "
+"нужно"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
@@ -2755,17 +2724,17 @@ msgstr ""
 "\n"
 "Добавить источник '%s'?"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "не указан <относительный путь к synthesis-файлу>\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "%s нельзя использовать без удалённого источника"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "не удаётся добавить источник"
@@ -2775,13 +2744,15 @@ msgstr "не удаётся добавить источник"
 msgid ""
 "urpmi.recover version %s\n"
 "Copyright (C) 2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "urpme.recover версия %s\n"
 "Copyright (C) 2006 Mandriva.\n"
-"Это свободное программное обеспечение и может распространяться согласно условиям GNU GPL.\n"
+"Это свободное программное обеспечение и может распространяться согласно "
+"условиям GNU GPL.\n"
 "\n"
 "использование:\n"
 
@@ -2793,11 +2764,14 @@ msgstr "  --checkpoint   - установить точку для повторн
 #: ../urpmi.recover:35
 #, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
-msgstr "  --noclean      - не очищать каталог повторной упаковки в контрольной точке.\n"
+msgstr ""
+"  --noclean      - не очищать каталог повторной упаковки в контрольной "
+"точке.\n"
 
 #: ../urpmi.recover:37
 #, c-format
-msgid "  --list         - list transactions since provided date/duration argument\n"
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
 "  --list         - список транзакций относительно указанной\n"
 "                   даты/продолжительности\n"
@@ -2888,8 +2862,7 @@ msgstr "Не найдены транзакции от %s\n"
 msgid "You must be superuser to do this"
 msgstr "Для этого нужны права суперпользователя"
 
-#: ../urpmi.recover:143
-#: ../urpmi.recover:209
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "Записывается файл макроса rpm [%s]...\n"
@@ -2979,7 +2952,9 @@ msgstr "  --no-ignore    - не обновлять, пометить источ�
 #: ../urpmi.update:49
 #, c-format
 msgid "  --probe-rpms   - do not use synthesis, use rpm files directly\n"
-msgstr "  --probe-rpms   - не использовать synthesis-файл; использовать непосредственно rpm-файлы\n"
+msgstr ""
+"  --probe-rpms   - не использовать synthesis-файл; использовать "
+"непосредственно rpm-файлы\n"
 
 #: ../urpmi.update:50
 #, c-format
@@ -3001,12 +2976,12 @@ msgstr "  -ff            - принудительно обновить synthesis
 msgid "Only superuser is allowed to update media"
 msgstr "Обновлять источники разрешено только суперпользователю"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "нечего обновлять (добавьте источник с помощью urpmi.addmedia)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -3015,17 +2990,17 @@ msgstr ""
 "отсутствует обновляемый пункт\n"
 "(один из %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "игнорируется источник %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "включается источник %s"
@@ -3035,19 +3010,23 @@ msgstr "включается источник %s"
 msgid ""
 "urpmq version %s\n"
 "Copyright (C) 2000-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
 "urpmq версия %s\n"
 "Copyright (C) 2000-2006 Mandriva.\n"
-"Это свободное программное обеспечение и может распространяться согласно условиям GNU GPL.\n"
+"Это свободное программное обеспечение и может распространяться согласно "
+"условиям GNU GPL.\n"
 "\n"
 "использование:\n"
 
 #: ../urpmq:48
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested (or updated) packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested (or updated) "
+"packages.\n"
 msgstr ""
 "  --searchmedia  - использовать только указанные источники для поиска\n"
 "                   запрошенных (или обновляемых) пакетов.\n"
@@ -3080,7 +3059,8 @@ msgstr "  --list-url     - список доступных источников
 #: ../urpmq:61
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - список доступных узлов при использовании --parallel.\n"
+msgstr ""
+"  --list-nodes   - список доступных узлов при использовании --parallel.\n"
 
 #: ../urpmq:62
 #, c-format
@@ -3089,17 +3069,21 @@ msgstr "  --list-aliases - список доступных алиасов parall
 
 #: ../urpmq:63
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr "  --dump-config  - дамп config'а в виде аргумента для urpmi.addmedia.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - дамп config'а в виде аргумента для urpmi.addmedia.\n"
 
 #: ../urpmq:64
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - следующий пакет содержит исходные коды (эквивалент -s).\n"
+msgstr ""
+"  --src          - следующий пакет содержит исходные коды (эквивалент -s).\n"
 
 #: ../urpmq:65
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - вывод всех пакетов с исходными кодами перед загрузкой\n"
 "                   (только для root'a).\n"
@@ -3107,7 +3091,9 @@ msgstr ""
 #: ../urpmq:67
 #, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
-msgstr "  --ignorearch   - разрешить запрашивать rpm'ы для несоответствующих архитектур.\n"
+msgstr ""
+"  --ignorearch   - разрешить запрашивать rpm'ы для несоответствующих "
+"архитектур.\n"
 
 #: ../urpmq:71
 #, c-format
@@ -3179,7 +3165,8 @@ msgid ""
 "                   - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  --whatrequires-recursive\n"
-"                   - расширенный реверсивный поиск (включая виртуальные пакеты).\n"
+"                   - расширенный реверсивный поиск (включая виртуальные "
+"пакеты).\n"
 
 #: ../urpmq:95
 #, c-format
@@ -3203,7 +3190,8 @@ msgstr "  -g             - вывод групп с именами.\n"
 #: ../urpmq:101
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - вывод полезной информации в удобной для чтения форме.\n"
+msgstr ""
+"  -i             - вывод полезной информации в удобной для чтения форме.\n"
 
 #: ../urpmq:102
 #, c-format
@@ -3223,12 +3211,17 @@ msgstr "  -r             - показать версию и релиз с наз
 #: ../urpmq:105
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - следующий пакет содержит исходные коды (эквивалент --src).\n"
+msgstr ""
+"  -s             - следующий пакет содержит исходные коды (эквивалент --"
+"src).\n"
 
 #: ../urpmq:106
 #, c-format
-msgid "  -u             - remove package if a more recent version is already installed.\n"
-msgstr "  -u             - удалить пакет, если уже установлена более новая версия.\n"
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+"  -u             - удалить пакет, если уже установлена более новая версия.\n"
 
 #: ../urpmq:107
 #, c-format
@@ -3265,25 +3258,37 @@ msgstr "используйте  -l для вывода списка файлов
 #: ../urpmq:404
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "для источника \"%s\" отсутствует xml-info; только частичный результат для пакета %s"
+msgstr ""
+"для источника \"%s\" отсутствует xml-info; только частичный результат для "
+"пакета %s"
 
 #: ../urpmq:405
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for packages %s"
-msgstr "для источника \"%s\" отсутствует xml-info; только частичный результат для пакетов %s"
+msgstr ""
+"для источника \"%s\" отсутствует xml-info; только частичный результат для "
+"пакетов %s"
 
 #: ../urpmq:408
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "для источника \"%s\" отсутствует xml-info; невозможно возвратить результат для пакета %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"для источника \"%s\" отсутствует xml-info; невозможно возвратить результат "
+"для пакета %s"
 
 #: ../urpmq:409
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "для источника \"%s\" отсутствует xml-info; невозможно возвратить результат для пакетов %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"для источника \"%s\" отсутствует xml-info; невозможно возвратить результат "
+"для пакетов %s"
 
 #: ../urpmq:473
 #, c-format
 msgid "No changelog found\n"
 msgstr "Не найден журнал изменений\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - создать источник обновления\n"
diff --git a/po/sc.po b/po/sc.po
index 3d9e17ef..a463d575 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-sc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2005-09-07 15:57+0100\n"
 "Last-Translator: Antoni Pistis <antonio.pistis@virgilio.it>\n"
 "Language-Team: Sardu\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Aposentadura RPM"
@@ -29,7 +29,7 @@ msgstr "Aposentadura RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -95,7 +95,7 @@ msgstr "_Aposenta"
 msgid "_Save"
 msgstr "_Sarva"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "A_nnudda"
@@ -127,8 +127,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - amosta custa missada de ajudu.\n"
@@ -164,7 +165,7 @@ msgstr ""
 "  --verify-rpm   - aberiga sa firma rpm innantis de aposentai\n"
 "                   (--no-verify-rpm da disabivat, abivada desinuncas).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -216,7 +217,7 @@ msgstr "Abeta..."
 msgid "Must be root"
 msgstr "Depis essi root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -227,42 +228,42 @@ msgstr ""
 "%s\n"
 "Sigu?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Atentu"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Andat"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (de ajorronai)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (de aposentai)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Sçoberu de is pakitus"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Dui bolit unu de is pakitus ki sighint:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "L_assa"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -273,14 +274,14 @@ msgstr ""
 "%s\n"
 "Sigu?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "Po satisfai is dependèntzias, megu a aposentai su pakitu ki sighit (%d MB)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -288,49 +289,49 @@ msgstr ""
 "Po satisfai is dependèntzias, megu a aposentai is %d pakitus ki sighint:\n"
 "%s\n"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "%d pakitus"
 msgstr[1] "%d pakitus"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Aposentadura pakitus..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "no potzu lompi a is pakitus mitza, bessu"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Apariçu..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Aposentu su pakitu `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Intra su mèdiu nominau \"%s\" in su trastu [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Scarrigamentu de su pakitu `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Fatu"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -341,28 +342,28 @@ msgstr ""
 "%s\n"
 "Forsis bolis ajorronai su database de urpmi"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Aposentadura faddia"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Pakitu(s) jai aposentau(s)"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Aposentadura acabada"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "srèxinu %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "torru a aberri urpmi"
@@ -442,8 +443,8 @@ msgid "...retrieving done"
 msgstr "...agataus"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...no agataus: %s"
@@ -483,52 +484,52 @@ msgstr "Custa cosa no fait a da fai candu ses in modalidadi strinta"
 msgid "bad proxy declaration on command line\n"
 msgstr "decrarada de proxy mala in arraya de cumandu\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: no fait a ligi su file rpm \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Amancat sa firma (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -955,217 +956,217 @@ msgstr ""
 "--synthesis no fait a d'impreai cun --media, --excludemedia, --sortmedia, --"
 "update o --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Sa circa cumentzat: %s e acabat: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "sartu su pakitu %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "iat a aposentai su pakitu %s in logu de d'ajorronai"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "su mèdiu \"%s\" esistit jai"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "liju is header de su mèdiu \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "burru su mèdiu \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "no potzu aberri su database rpm"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "no potzu lompi a su primu mèdiu de aposentadura (no agatu hdlist)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "agatu is file hdlist..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "provu a sçoberai su mèdiu \"%s\" ki no esistit"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "sçoberu prus mèdius: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "burru su mèdiu \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "torru a assetiai urpmi po is mèdius \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...assètiu faddiu"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "assètiu fatu"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "su mèdiu \"%s\" no d'as sçoberau"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "Controllu su file synthesis [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "barrancu ligendi sa synthesis de su mèdiu \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "scriu sa llist po su mèdiu \"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...còpia faddia"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "còpiu su file descriidori de \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...còpia fata"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "còpia de [%s] faddia (est stranu ki unu file aici piticu)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "càrculu su md5sum de sa hdlist (o synthesis) agatada"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "còpia de [%s] faddia (su md5sum no cunsonat)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "controllu su file hdlist [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "aposentu %s de %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "no apu agatau hdlist po su mèdiu \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "còpiu su file descriidori de \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "nòmini file rpm [%s] no bàlidu"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "agatu sa hdlist (o synthesis) de \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "apu agatau una hdlist (o synthesis) analisada ke %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "no apu agatau hdlist po su mèdiu \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "controllu sa crai pùbriga de \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...apu importau sa crai %s de sa crai pùbriga de \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "no potzu importai sa crai pùbriga de \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "apu açuntu su mèdiu %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1197,7 +1198,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yy"
@@ -1267,7 +1268,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1350,276 +1351,7 @@ msgstr "càrrigu %s"
 msgid "unmounting %s"
 msgstr "scàrrigu %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Nisçunu pakitu nominau %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Is pakitus ki sighint cuntenint %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Pakitu(s) jai aposentau(s)"
-
-#: ../urpm/select.pm:539
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Pakitu(s) jai aposentau(s)"
-
-#: ../urpm/select.pm:540
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Pakitu(s) jai aposentau(s)"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "ca amancat %s"
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "Pakitu(s) jai aposentau(s)"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "ca no est satisfatu %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "provu a sçoberai %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "po podi apoderai %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "po podi aposentai %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "ca gherrat cun %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Firma (%s) no bàlida"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Crai ID (%s) no bàlida"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Amancat sa firma (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "No fait a creai su file de assètiu [%s]"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "Còpia faddia"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "Còpia faddia"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme versioni %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Custu est programa lìberu e fait a du spainai basçu is tèrminis de sa GNU "
-"GPL.\n"
-"\n"
-"impreu:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto         - sçobera in automàtigu unu pakitu intr''e is sceras.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - aberiga ki fait a srexinai in manera lìmpia.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - urpmi distribuiu intr''e màkinas diferentis.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, fuzzy, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr ""
-"  --packager     - amosta su tag packager: cuncordadori de su pakitu.\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - imprea un'atra root po srexinai is rpm.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - imprea un'atra root po aposentai is rpm.\n"
-
-#: ../urpme:55
-#, fuzzy, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --description  - amosta su tag description: descriidura.\n"
-
-#: ../urpme:56
-#, fuzzy, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - assètia urpmi a sa bolada de una mata de ditribuidura,\n"
-"                   utilosu po (dis)aposentai a chroot cun scera --root.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, fuzzy, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose      - po ndi sciri de prus.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - sçobera tpotu is pakitus ki cunsonant cun s'espressada.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Feti superuser podit srexinai pakitus"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "pakitus disconnotus"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "pakitu disconnotu"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "srexinai su pakitu %s at a arrogai su sistema"
-msgstr[1] "srexinai su pakitu %s at a arrogai su sistema"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Nudda de srexinai"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Nudda de srexinai"
-
-#: ../urpme:147
-#, fuzzy, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] ""
-"Po satisfai is dependèntzias, is %d pakitus ki sighint dus apu a srexinai (%"
-"d MB)"
-msgstr[1] ""
-"Po satisfai is dependèntzias, is %d pakitus ki sighint dus apu a srexinai (%"
-"d MB)"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "pakitu disconnotu"
-msgstr[1] "pakitu disconnotu"
-
-#: ../urpme:159
-#, fuzzy, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "srèxinu su pakitu %s"
-msgstr[1] "srèxinu su pakitu %s"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "pigu su mèdiu arremoviditzu ke \"%s\""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Srexinadura faddia"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Srexinadura faddia"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1636,31 +1368,38 @@ msgstr ""
 "\n"
 "impreu:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - amosta custa missada de ajudu.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - imprea unu ambienti indidau (unu arrelatadori normalli\n"
 "                   de fartas).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - no impreist is mèdius indidaus, pratzius de vìrgula.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - imprea un'atra root po aposentai is 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"
@@ -1668,261 +1407,534 @@ msgstr ""
 "  --sortmedia    - òrdina is mèdius segundu is sutarrayas pratzias de "
 "vìrgula.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 "  --synthesis    - imprea sa synthesis indidada in logu de su db de urpmi.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - imprea sa synthesis indidada in logu de su db de urpmi.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - no amostist arrayas ugualis.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - imprea feti mèdius de ajorronamentu.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - po ndi sciri de prus.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - innyora sa diferèntzia mannas/piticas in totu is "
 "pattern.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -i             - innyora sa diferèntzia mannas/piticas in totu is "
 "pattern.\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - apega su còixi perl ke perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - obradori binàriu AND.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - obradori binàriu OR.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unàriu NOT.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 "  )              - parèntesi dereta po serrai unu grupu de espressadas.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr ""
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  -g             - amosta is grupus cun su nòmini puru.\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    predefiniu est %s.\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - amosta su tag url: url.\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - amosta su tag buildhost: host de fraigadura.\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "àpriga sa muda a su file de assètiu"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - amosta tag conflicts: totu su ki nci gherrat.\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - amosta su tag description: descriidura.\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - amosta su tag epoch: tempus.\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name         - amosta feti is nòminis de is pakitus.\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - allistra is file in su pakitu.\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - amosta su tag group: grupu.\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --name         - amosta feti is nòminis de is pakitus.\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - amosta feti is nòminis de is pakitus.\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - amosta su tag obsoletes: totu is ki imbeçat.\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr ""
 "  --packager     - amosta su tag packager: cuncordadori de su pakitu.\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - amosta su tag provides: totu su ki donat.\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - amosta su tag requires: totu su ki bolit.\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - amosta su tag size: mesura.\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - amosta su tag sourcerpm: rpm mitza.\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --obsoletes    - amosta su tag obsoletes: totu is ki imbeçat.\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary, -S  - amosta s'arresùmini.\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - amosta su tag url: url.\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - po ndi sciri de prus.\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - allistra is file in su pakitu.\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - amosta sa versioni, arrelasçu e arkidetura cun su "
 "nòmini.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "impreu unu ambienti indidau in %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "no apu agatau hdlist po su mèdiu \"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "apu fraigau sa hdlist synthesis po su mèdiu \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "scriu sa llist po su mèdiu \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Nisçunu pakitu nominau %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Is pakitus ki sighint cuntenint %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Pakitu(s) jai aposentau(s)"
+
+#: ../urpm/select.pm:543
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Pakitu(s) jai aposentau(s)"
+
+#: ../urpm/select.pm:544
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Pakitu(s) jai aposentau(s)"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "ca amancat %s"
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Pakitu(s) jai aposentau(s)"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "ca no est satisfatu %s"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "provu a sçoberai %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "po podi apoderai %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "po podi aposentai %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "ca gherrat cun %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Firma (%s) no bàlida"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Crai ID (%s) no bàlida"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Amancat sa firma (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "No fait a creai su file de assètiu [%s]"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Còpia faddia"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "Còpia faddia"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme versioni %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Custu est programa lìberu e fait a du spainai basçu is tèrminis de sa GNU "
+"GPL.\n"
+"\n"
+"impreu:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - sçobera in automàtigu unu pakitu intr''e is sceras.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - aberiga ki fait a srexinai in manera lìmpia.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - urpmi distribuiu intr''e màkinas diferentis.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, fuzzy, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr ""
+"  --packager     - amosta su tag packager: cuncordadori de su pakitu.\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - imprea un'atra root po srexinai is rpm.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - ajorrona feti is mèdius de ajorronu.\n"
+
+#: ../urpme:56
+#, fuzzy, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --description  - amosta su tag description: descriidura.\n"
+
+#: ../urpme:57
+#, fuzzy, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - assètia urpmi a sa bolada de una mata de ditribuidura,\n"
+"                   utilosu po (dis)aposentai a chroot cun scera --root.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - po ndi sciri de prus.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - sçobera tpotu is pakitus ki cunsonant cun s'espressada.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Feti superuser podit srexinai pakitus"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "pakitus disconnotus"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "pakitu disconnotu"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "srexinai su pakitu %s at a arrogai su sistema"
+msgstr[1] "srexinai su pakitu %s at a arrogai su sistema"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Nudda de srexinai"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Nudda de srexinai"
+
+#: ../urpme:149
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Po satisfai is dependèntzias, is %d pakitus ki sighint dus apu a srexinai (%"
+"d MB)"
+msgstr[1] ""
+"Po satisfai is dependèntzias, is %d pakitus ki sighint dus apu a srexinai (%"
+"d MB)"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "pakitu disconnotu"
+msgstr[1] "pakitu disconnotu"
+
+#: ../urpme:161
+#, fuzzy, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "srèxinu su pakitu %s"
+msgstr[1] "srèxinu su pakitu %s"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "pigu su mèdiu arremoviditzu ke \"%s\""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Srexinadura faddia"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Srexinadura faddia"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2014,11 +2026,6 @@ msgstr ""
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - no boghist is rpm de sa cache.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - ajorrona feti is mèdius de ajorronu.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2344,7 +2351,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Sigu comuncas?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -2532,10 +2539,12 @@ msgstr "  --curl         - imprea curl po agatai is file atesu.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - crea unu mèdiu de ajorronamentu.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2543,24 +2552,24 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - prova a agatai e impreai sa synthesis.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  --no-probe     - no provist a agatai una synthesis o\n"
 "                   una hdlist.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2569,17 +2578,17 @@ msgstr ""
 "  --distrib      - crea in automàtigu totu is mèdius de unu mèdiu\n"
 "                   de aposentadura.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - allistra is mèdius disponiditzus.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2589,91 +2598,91 @@ msgstr ""
 "est\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - crea mèdius virtualis sempri ajorronaus,\n"
 "                   est permìtiu feti su protocollu file://.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - disabiva su controllu de su file MD5SUM.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - no importist pubkey de su mèdiu açuntu\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - açungi su mèdiu in s'assètiu, ma no d'ajorronist.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modalidadi citia.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - po ndi sciri de prus.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Feti superuser podit açungi mèdius"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "At a creai su file de assètiu [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "No fait a creai su file de assètiu [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "no serbit a donai <bia acapiada po hdlist> cun --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "amancat <bia acapiada po hdlist>\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "no potzu lompi a su mèdiu \"%s\""
@@ -2909,12 +2918,12 @@ msgstr "  -f             - fortza sa fraigadura de is file hdlist.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Feti superuser podit ajorronai mèdius"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nudda de ajorronai (imprea urpmi.addmedia po açungi mèdius)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2923,17 +2932,17 @@ msgstr ""
 "amancat sa boxi de ajorronai\n"
 "(una de %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "innyoru su mèdiu %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "abivu su mèdiu %s"
@@ -3216,6 +3225,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "No apu agatau s'arrelata de is mudas\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - crea unu mèdiu de ajorronamentu.\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "input mali formau: [%s]"
diff --git a/po/sk.po b/po/sk.po
index f3c71fe9..3accdc44 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2005-09-07 16:34+0100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@mandriva.org>\n"
 "Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Inštalácia RPM"
@@ -27,7 +27,7 @@ msgstr "Inštalácia RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -93,7 +93,7 @@ msgstr "_Inštalácia"
 msgid "_Save"
 msgstr "_Uložiť"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Zrušiť"
@@ -125,8 +125,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - zobraziť túto pomoc.\n"
@@ -162,7 +163,7 @@ msgstr ""
 "rpm\n"
 "                   zakáže overovanie, štandardne sa podpis overuje).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -215,7 +216,7 @@ msgstr "Čakajte prosím..."
 msgid "Must be root"
 msgstr "Sú vyžadované právomoci root-a"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -226,42 +227,42 @@ msgstr ""
 "%s\n"
 "Pokračovať?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Varovanie"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (na aktualizáciu)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (na inštaláciu)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Výber balíka"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Jeden z nasledujúcich balíkov je potrebný:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Zrušiť"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -272,7 +273,7 @@ msgstr ""
 "%s\n"
 "Pokračovať?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
@@ -280,7 +281,7 @@ msgstr ""
 "Kvôli zachovaniu závislostí, by mali byť nainštalované nasledujúce balíky (%"
 "d MB)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -288,7 +289,7 @@ msgstr ""
 "Kvôli zachovaniu závislostí, by mali byť nainštalované nasledujúce balíky (%"
 "d MB)"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -296,42 +297,42 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Inštalácia balíkov..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "nie je možné získať zdrojové balíky, prerušenie"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Príprava..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Inštalácia balíka `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Prosím vložte médium \"%s\" do zariadenia [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Získavanie balíka `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Hotovo"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -342,28 +343,28 @@ msgstr ""
 "%s\n"
 "Možno budete chcieť aktualizovať Vašu urpmi databázu"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Inštalácia zlyhala"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Všetko je už nainštalované"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Inštalácia ukončená"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "odstraňovanie %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "znovuspustenie urpmi"
@@ -444,8 +445,8 @@ msgid "...retrieving done"
 msgstr "...získavanie ukončené"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...získavanie zlyhalo: %s"
@@ -485,52 +486,52 @@ msgstr "Táto operácia nie je povolená ak program beží v reštriktívnom re�
 msgid "bad proxy declaration on command line\n"
 msgstr "nesprávna deklarácia proxy v príkazovom riadku\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: nie je možné prečítať súbor \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Chýbajúci podpis (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -961,219 +962,219 @@ msgstr ""
 "--synthesis nie je možné používať s --media, --excludemedia, --sortmedia, --"
 "update alebo --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Spustenie vyhľadávania: %s ukončenie: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "vynechávanie balíka %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "mala by byť vykonaná inštalácia namiesto aktualizácie balíka %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "zdroj \"%s\" už existuje"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "načitávanie hlavičiek pre zdroj \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "odstránenie zdroja \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "nemôžem otvoriť rpmdb"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "nie je možné pristúpiť k prvému inštalačnému zdroju (nebol nájdený súbor "
 "hdlists)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "získavanie hdlists súboru..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "pokus o výber neexistujúceho zdroja \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "výber viacerých zdrojov: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "odstránenie zdroja \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "rekonfigurovanie urpmi pre zdroj \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...rekonfigurovanie zlyhalo"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "rekonfigoranie hotové"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "zdroj \"%s\" nebol zvolený"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "preverovanie synthesis súboru [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problém s čítaním synthesis súboru pre zdroj \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "zápis súboru so zoznamom pre zdroj \"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...kopírovanie zlyhalo"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopírovanie súboru popisov pre \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...kopírovanie ukončené"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopírovanie [%s] zlyhalo (súbor je podozrivo malý)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "výpočet md5sum zo získaných súborov hdlist (alebo synthesis)"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "kopírovanie [%s] zlyhalo zlyhalo (nesprávny md5sum)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "preverovanie hdlist súboru [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "inštalácia %s z %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "nebol nájdený hdlist súbor pre zdroj \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "kopírovanie súboru popisov pre \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "nesprávne meno rpm súboru [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "získavanie zdrojového hdlist (alebo synthesis) pre \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "nájdený overený hdlist (alebo synthesis) ako %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "nebol nájdený hdlist súbor pre zdroj \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "prehliada sa súbor s verejnými kľúčmi \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importuje sa kľúč %s zo súboru s verejnými kľúčmi \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "nie je možné naimportovať súbor s verejnými kľúčmi \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "pridaný zdroj %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1205,7 +1206,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyAaÁá"
@@ -1275,7 +1276,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1359,6 +1360,307 @@ msgstr "pripájanie %s"
 msgid "unmounting %s"
 msgstr "odpája sa %s"
 
+#: ../urpm/search.pm:29 ../urpmf:29
+#, fuzzy, 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 verzia %s\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
+"Toto je slobodný softvér a môže byť redistribuovaný pod licenciou GNU GPL.\n"
+"použitie:\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - zobraziť túto pomoc.\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          - použiť špecifické prostredie (typické pre oznámenie\n"
+"                   o chybe).\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 - nepoužívať zadané zdroje; viaceré je možné oddeliť "
+"čiarkou.\n"
+
+#: ../urpm/search.pm:39 ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --root         - použiť iný koreňový adresár pre inštaláciu rpm balíkov.\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    - zoradiť zdroje podľa kľúčov; viaceré je možné oddeliť\n"
+"                   čiarkou.\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+"  --synthesis    - použiť zadaný synthesis súbor namiesto urpmi databázy.\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    - použiť zadaný synthesis súbor namiesto urpmi databázy.\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - nezobrazovať zhodné riadky.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - použiť iba aktualizačné zroje.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - zobraziť podrobnosti.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - ignorovať veľkosť písma vo vzore.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - ignorovať veľkosť písma vo vzore.\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpm/search.pm:52 ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - vložiť perl kód priamo, podobne ako perl -e.\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - binárny AND operátor.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - binárny OR operátor.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - unárne NOT.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  )              - pravá zátvorka pre uzatvorenie skupiny výrazov.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Zoznam dát pre obnovu:\n"
+"\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - použiť X rozhranie.\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    implicitná je %s.\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - zobraziť značku url: url.\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - zobraziť značku kompilovací hostiteľ: buildhost.\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "aplikovať zmeny do konfiguračného súboru"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - zobraziť značku konflikty: conflicts.\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - zobraziť značku popis: description.\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - zobraziť značku epocha: epoch.\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --name         - zobraziť iba názvy balíkov.\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - zoznam súborov v balíku.\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - zobraziť značku skupina: group.\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name         - zobraziť iba názvy balíkov.\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - zobraziť iba názvy balíkov.\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - zobraziť značku zastaralé: obsoletes.\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - zobraziť značku autor balíka: packager.\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - zobraziť značku poskytované: provides.\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - zobraziť značku vyžadované: requires.\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - zobraziť značku veľkosť: size.\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - zobraziť značku zdrojové rpm: sourcerpm.\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes    - zobraziť značku zastaralé: obsoletes.\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary, -S  - zobraziť značku sumár: summary.\n"
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - zobraziť značku url: url.\n"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - zobraziť podrobnosti.\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - zoznam súborov v balíku.\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - zobraziť verziu, vydanie a architektúru spolu s menom.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "použitie špecifického prostredia na %s\n"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "nebol nájdený hdlist súbor pre zdroj \"%s\""
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "vytváranie hdlist synthesis súboru pre zdroj \"%s\""
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "zápis súboru so zoznamom pre zdroj \"%s\""
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1370,62 +1672,67 @@ msgid ""
 "urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, c-format
 msgid "No package named %s"
 msgstr "Žiaden balík s menom %s"
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Nasledujúce balíky obsahujú %s: %s"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Všetko je už nainštalované"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "Všetko je už nainštalované"
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "Všetko je už nainštalované"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
 msgid "due to missing %s"
 msgstr "kvôli chýbajucemu %s"
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "Všetko je už nainštalované"
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "kvôli neuspokojenému %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "pokus o povýšenie %s"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "pre zachovanie poradia %s"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, c-format
 msgid "in order to install %s"
 msgstr "pre inštaláciu balíka %s"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "kvôli konfliktom s %s"
@@ -1519,19 +1826,17 @@ msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 "  --root         - použiť iný koreňový adresár pre odstránenie rpm balíkov.\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --root         - použiť iný koreňový adresár pre inštaláciu rpm balíkov.\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - použiť len aktualizačné zdroje.\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --description  - zobraziť značku popis: description.\n"
 
-#: ../urpme:56
+#: ../urpme:57
 #, fuzzy, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1541,32 +1846,32 @@ msgstr ""
 "vhodné\n"
 "                   pri inštalácii v chroot prostredí s prepínačom --root.\n"
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, fuzzy, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose      - zobraziť podrobnosti.\n"
 
-#: ../urpme:59
+#: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - vybrať všetky balíky zodpovedajúce výrazu.\n"
 
-#: ../urpme:72
+#: ../urpme:73
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Iba superpoužívateľ môže odstraňovať balíky"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown packages"
 msgstr "neznáme balíky"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown package"
 msgstr "neznámy balík"
 
-#: ../urpme:119
+#: ../urpme:121
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1574,17 +1879,17 @@ msgstr[0] "odstránenie balíka %s zrejme poškodí váš systém"
 msgstr[1] "odstránenie balíka %s zrejme poškodí váš systém"
 msgstr[2] "odstránenie balíka %s zrejme poškodí váš systém"
 
-#: ../urpme:124
+#: ../urpme:126
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nič na odstránenie"
 
-#: ../urpme:141
+#: ../urpme:143
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Nič na odstránenie"
 
-#: ../urpme:147
+#: ../urpme:149
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1596,7 +1901,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Z dôvodu zachovania závislostí, balíky %d by mali byť odinštalované (%d MB)"
 
-#: ../urpme:152
+#: ../urpme:154
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1604,7 +1909,7 @@ msgstr[0] "neznámy balík"
 msgstr[1] "neznámy balík"
 msgstr[2] "neznámy balík"
 
-#: ../urpme:159
+#: ../urpme:161
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1612,324 +1917,31 @@ msgstr[0] "odstraňovanie balíka %s"
 msgstr[1] "odstraňovanie balíka %s"
 msgstr[2] "odstraňovanie balíka %s"
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (á/N) "
 
-#: ../urpme:164
+#: ../urpme:166
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "výber vymeniteľného zariadenia ako \"%s\""
 
-#: ../urpme:178
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "Odstránenie neskončilo úspechom"
 
-#: ../urpme:180
+#: ../urpme:183
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Odstránenie neskončilo úspechom"
 
-#: ../urpmf:29
-#, fuzzy, 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 verzia %s\n"
-"Copyright (C) 2002-2006 Mandriva.\n"
-"Toto je slobodný softvér a môže byť redistribuovaný pod licenciou GNU GPL.\n"
-"použitie:\n"
-
-#: ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - zobraziť túto pomoc.\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - použiť špecifické prostredie (typické pre oznámenie\n"
-"                   o chybe).\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - nepoužívať zadané zdroje; viaceré je možné oddeliť "
-"čiarkou.\n"
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - zoradiť zdroje podľa kľúčov; viaceré je možné oddeliť\n"
-"                   čiarkou.\n"
-
-#: ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-"  --synthesis    - použiť zadaný synthesis súbor namiesto urpmi databázy.\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - použiť zadaný synthesis súbor namiesto urpmi databázy.\n"
-
-#: ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - nezobrazovať zhodné riadky.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - použiť iba aktualizačné zroje.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - zobraziť podrobnosti.\n"
-
-#: ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - ignorovať veľkosť písma vo vzore.\n"
-
-#: ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - ignorovať veľkosť písma vo vzore.\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - vložiť perl kód priamo, podobne ako perl -e.\n"
-
-#: ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - binárny AND operátor.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - binárny OR operátor.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - unárne NOT.\n"
-
-#: ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  )              - pravá zátvorka pre uzatvorenie skupiny výrazov.\n"
-
-#: ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Zoznam dát pre obnovu:\n"
-"\n"
-
-#: ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - použiť X rozhranie.\n"
-
-#: ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                    implicitná je %s.\n"
-
-#: ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - zobraziť značku url: url.\n"
-
-#: ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - zobraziť značku kompilovací hostiteľ: buildhost.\n"
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "aplikovať zmeny do konfiguračného súboru"
-
-#: ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - zobraziť značku konflikty: conflicts.\n"
-
-#: ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - zobraziť značku popis: description.\n"
-
-#: ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - zobraziť značku epocha: epoch.\n"
-
-#: ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --name         - zobraziť iba názvy balíkov.\n"
-
-#: ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - zoznam súborov v balíku.\n"
-
-#: ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - zobraziť značku skupina: group.\n"
-
-#: ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name         - zobraziť iba názvy balíkov.\n"
-
-#: ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - zobraziť iba názvy balíkov.\n"
-
-#: ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - zobraziť značku zastaralé: obsoletes.\n"
-
-#: ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - zobraziť značku autor balíka: packager.\n"
-
-#: ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - zobraziť značku poskytované: provides.\n"
-
-#: ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - zobraziť značku vyžadované: requires.\n"
-
-#: ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - zobraziť značku veľkosť: size.\n"
-
-#: ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - zobraziť značku zdrojové rpm: sourcerpm.\n"
-
-#: ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes    - zobraziť značku zastaralé: obsoletes.\n"
-
-#: ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary, -S  - zobraziť značku sumár: summary.\n"
-
-#: ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - zobraziť značku url: url.\n"
-
-#: ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - zobraziť podrobnosti.\n"
-
-#: ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - zoznam súborov v balíku.\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - zobraziť verziu, vydanie a architektúru spolu s menom.\n"
-
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "použitie špecifického prostredia na %s\n"
-
-#: ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "nebol nájdený hdlist súbor pre zdroj \"%s\""
-
-#: ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "vytváranie hdlist synthesis súboru pre zdroj \"%s\""
-
-#: ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "zápis súboru so zoznamom pre zdroj \"%s\""
-
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2021,11 +2033,6 @@ msgstr "  --clean        - odstrániť nepoužité rpm súbory z dočasnej pamä
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - nevymazať nepoužité rpm súbory z dočasnej pamäti.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - použiť len aktualizačné zdroje.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2360,7 +2367,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Pokračovať?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Á/n) "
@@ -2549,10 +2556,12 @@ msgstr "  --curl         - použiť curl pre získanie vzdialených súborov.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - vytvoriť aktualizačný zdroj.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2560,22 +2569,22 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - pokúsiť sa nájsť a použiť synthesis súbor.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - neskúšať hľadať synthesis alebo hdlist súbor.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2584,17 +2593,17 @@ msgstr ""
 "  --distrib      - automaticky vytvoriť všetky zdroje z inštalačného\n"
 "                   zdroja.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - zobraziť dostupné zdroje.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2603,92 +2612,92 @@ msgstr ""
 "  --from         - použiť zadanú url pre zoznam mirrorov, štandardne je to\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - vytvorenie virtuálneho zdroja ktorý je vždy aktuálny,\n"
 "                   povolený je iba file:// protokol.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - zakázať MD5SUM kontrolu.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - neimportovať verejný kľúč pridaného média\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - pridať médium do konfigurácie, ale neaktualizovať.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - zobrazovať minimum informácií.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - zobraziť podrobnosti.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Iba superpoužívateľ môže pridávať zdroje"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "Vytvoriť konfiguračný súbor [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Nebolo možné vytvoriť konfiguračný súbor [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "nie je potrebné zadať <relatívnu cesta k hdlist> s --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "chýba <relatívna cesta k hdlist>\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "nie je možné pristúpiť k zdroju \"%s\""
@@ -2923,12 +2932,12 @@ msgstr "  -f             - vnúť generovanie hdlist súborov.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Iba superpoužívateľ môže aktualizovať médiá"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "nie je čo aktualizovať (použiť urpmi.addmedia na pridanie zdroja)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2937,17 +2946,17 @@ msgstr ""
 "chýba názov média pre aktualizáciu\n"
 "(jeden z %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignorovanie zdroja %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "povolenie zdroja %s"
@@ -3230,6 +3239,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Nebol nájdený zoznam zmien\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - vytvoriť aktualizačný zdroj.\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "zle zadaný vstup: [%s]"
diff --git a/po/sl.po b/po/sl.po
index 41d0c709..ac64e404 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-03-31 03:04+0200\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -28,7 +28,7 @@ msgstr ""
 "Plural-Forms:  nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
 "n%100==4 ? 2 : 3);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Namestitev RPM"
@@ -38,7 +38,7 @@ msgstr "Namestitev RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Napaka: ni bilo mogoče najti datoteke %s, prekinitev"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "V _redu"
@@ -104,7 +104,7 @@ msgstr "_Namesti"
 msgid "_Save"
 msgstr "_Shrani"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Prekliči"
@@ -136,8 +136,9 @@ msgstr ""
 msgid "Options:"
 msgstr "Možnosti:"
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - prikaži to sporočilo s pomočjo.\n"
@@ -173,7 +174,7 @@ msgstr ""
 "  --verify-rpm   - preveri podpis paketa rpm pred namestitvijo\n"
 "                   (--no-verify-rpm to onemogoči, privzeto je omogočeno).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - uporabi samo podane vire, ločene z vejico.\n"
@@ -224,7 +225,7 @@ msgstr "Prosim počakajte ..."
 msgid "Must be root"
 msgstr "Morate biti uporabnik root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -235,42 +236,42 @@ msgstr ""
 "%s\n"
 "Naj se namestitev vseeno nadaljuje?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "V redu"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (za nadgradnjo)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (za namestitev)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Izbira paketov"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Potreben je eden od sledečih paketov:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Prekini"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -281,19 +282,19 @@ msgstr ""
 "%s\n"
 "Naj se namestitev vseeno nadaljuje?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Za zadovoljitev odvisnosti bo nameščen naslednji paket:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Za zadovoljitev odvisnosti bodo nameščeni naslednji paketi:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -302,42 +303,42 @@ msgstr[1] "(%d paketa, %d MiB)"
 msgstr[2] "(%d paketi, %d MiB)"
 msgstr[3] "(%d paketov, %d MiB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Namestitev paketov ..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ni mogoče dobiti paketov z izvorno kodo, predčasna prekinitev"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Priprava ..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Nameščanje paketa `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Prosim vstavite nosilec imenovan »%s«"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Pobiranje paketa `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Končano"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -348,28 +349,28 @@ msgstr ""
 "%s\n"
 "Mogoče bi morali obnoviti podatkovno bazo urpmi"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Namestitev ni uspela:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Paketi so že nameščeni"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Namestitev je končana"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "odstranjevanje %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "ponovno zaganjanje urpmi"
@@ -450,8 +451,8 @@ msgid "...retrieving done"
 msgstr "...pridobivanje je končano"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...pridobivanje je spodletelo: %s"
@@ -491,53 +492,53 @@ msgstr "Ta postopek ni dovoljen v omejenem načinu"
 msgid "bad proxy declaration on command line\n"
 msgstr "napačna deklaracija posrednika v ukazni vrstici\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: ni mogoče brati datoteke rpm \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "Regularni izrazi:\n"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Manjkajoč podpis (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "Regularni izrazi:\n"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 "Privzeto urpmf pričakuje regularni izraz. Uporabiti bi morali »--literal«"
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "mapa za chroot ne obstaja"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Ni moč uporabiti %s brez %s"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Ni moč uporabiti %s z %s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Prveč argumentov\n"
@@ -971,218 +972,218 @@ msgstr ""
 "update, --use-distrib ali --parallel"
 
 # barabe
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Iskanje; začetek: %s konec: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "izpuščanje paketa %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "bi namestilo namesto nadgradilo paket %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "vir \"%s\" že obstaja"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(privzeto se spregleda)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "dodajanje vira »%s« pred oddaljen vir »%s«"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "dodajanje vira »%s«"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "Mapa %s ne obstaja"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "izgleda, da ta lokacija ne vsebuje nobene distribucije"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "ni mogoče razčleniti media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "ni moč dostopati do vira distribucije (ni moč najti datoteke media.cfg)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "spuščam nezdružljivi vir »%s« (za %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "pridobivanje datoteke cfg za vir"
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "poskušanje izbire neobstoječega vira \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "izbiranje več virov: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "odstranjevanje vira \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "ponovno nastavljanje urpmi za vir \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...ponovno nastavljanje je spodletelo"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "ponovno nastavljanje je končano"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Napaka pri ustvarjanju imenske datoteke: odvisnosti %d ni moč najti"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "vir »%s« je posodobljen"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "preverjanje synthesis datoteke [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "težava pri branju synthesis datoteke vira \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "kopiranje [%s] za vir »%s« ..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiranje je spodletelo"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopiranje datoteke z opisi \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...kopiranje končano"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopiranje [%s] je spodletelo (datoteka je sumljivo majhna)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "računanje md5sum izvorne datoteke synthesis"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "pridobivanje [%s] je spodletelo (md5sum se ne ujema)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2 na [%s] je spodletel"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "primerjanje %s in %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "neveljavna datoteka hdlist %s za vir »%s«"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "kopiranje datoteke MD5SUM od »%s« ..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "napačno ime datoteke rpm [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "pridobivanje izvorne datoteke synthesis od »%s« ..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "datoteka synthesis je bila najdena kot %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "ni bilo mogoče najti datoteke synthesis za vir »%s«"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "preverjanje datoteke z javnimi ključi od \"%s\" ..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...uvožen je ključ %s iz datoteke javnih ključev od \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ni mogoče uvoziti javnega ključa od \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "vir »%s« posodobljen"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "pridobivanje [%s] je spodletelo"
@@ -1214,7 +1215,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Dd"
@@ -1284,7 +1285,7 @@ msgstr "GiB"
 msgid "TB"
 msgstr "TiB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1370,6 +1371,308 @@ msgstr "priklapljanje %s"
 msgid "unmounting %s"
 msgstr "odklapljanje %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 različica %s\n"
+"Avtorske pravice (C) 2002-2006 Mandriva.\n"
+"To je prosta programska oprema in se sme razmnoževati pod dovoljenjem GNU "
+"GPL\n"
+"\n"
+"uporaba: urpmf [možnosti] vzorec(regularni izraz)\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --version       - prikaži različico urpmf.\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          - uporabi specifično okolje (ponavadi poročilo o napaki).\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 - ne uporabi podanih virov, ločenih z vejico.\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  - vzemi argument kot dobeseden niz, ne regularni izraz.\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   - uporabi drugo izhodišče za podatkovno zbirko urpmi in "
+"namestitev 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    - vire razvrsti glede na podnize, ločene z vejico.\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr "  --use-distrib  - za dostop do vira uporabi podano pot\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    - uporabi podan synthesis namesto baze urpmi.\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - ne izpiši identičnih vrstic.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - uporabi samo vir za posodobitev.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - zgovorni način.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - ignoriraj razlike malih/velikih črk v vsakem vzorcu.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr ""
+"  -i             - upoštevaj razlike malih/velikih črk v vsakem vzorcu.\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr "  -F<niz>        - spremeni ločitelj polj (privzeto je ':').\n"
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr "Regularni izrazi:\n"
+
+#: ../urpm/search.pm:52 ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+"  besedilo       - brez -l se vsako besedilo razčleni kot regularni izraz.\n"
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - vključi kodo perl neposredno kot perl -e.\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - binarni AND operator.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - binarni OR operator.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - NOT operator.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  ( )             - levi in desni oklepaj.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, c-format
+msgid "List of tags:\n"
+msgstr "Seznam oznak:\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --qf           - uporabi printf format izpisa\n"
+
+# je to res prevedljivo?
+#: ../urpm/search.pm:60 ../urpmf:60
+#, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   primer: '%%ime:%%datoteke'.\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --arch         - arhitektura\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - strežnik, kjer je bil paket zgrajen.\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr "  --buildtime    - čas gradnje\n"
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "  --conffiles    - nastavitvene datoteke\n"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - konfliktne oznake\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - opis paketa\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr "  --distribution - distribucija\n"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - era\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --filename    - datotečno ime paketa\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -files        - seznam datotek v paketu\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - skupina\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, c-format
+msgid "  --license      - license\n"
+msgstr "  --license      - licenca\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name         - ime paketa\n"
+
+# obsolete? man pravi da ne
+#: ../urpm/search.pm:74 ../urpmf:74
+#, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - zastarani nizi\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - avtor paketa\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - niz vsebuje\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - niz zahteva\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - velikost na disku\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - ime izvornega rpm paketa\n"
+
+# obsolete? man pravi da ne
+#: ../urpm/search.pm:80 ../urpmf:80
+#, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --suggests     - oznake priporočil\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary      - povzetek\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       - prodajalec\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -m             - vir, kjer je bil paket najden\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - izpiši različico, izdajo in arhitekturo z vsakim imenom.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr "Nepravilen format: Uporabite lahko samo eno oznako z več vrednostmi"
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "uporabljam specifično okolje pri %s\n"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "ni bilo mogoče najti datoteke hdlist za vir »%s«"
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "ni bilo moč najti datoteke synthesis za vir »%s«"
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "ni bilo moč najti datoteke xml-info za vir »%s«"
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1384,63 +1687,68 @@ msgstr ""
 "urpmi se je ponovno zagnal in seznam prednostnih paketov se je spremenil: %s "
 "<-> %s"
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, c-format
 msgid "No package named %s"
 msgstr "Ni paketa poimenovanega %s"
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Sledeči paketi vsebujejo %s: %s"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Paketov %s ni moč namestiti"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Paket %s je že nameščen"
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Paketi %s so že nameščeni"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
 msgid "due to missing %s"
 msgstr "zaradi manjkajočega %s"
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, c-format
 msgid "due to already installed %s"
 msgstr "zaradi že nameščenega %s"
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "zaradi nezadovoljstva %s"
 
 # promote vzet kot renice
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "poskus podpiranja %s"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "za ohranitev %s"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, c-format
 msgid "in order to install %s"
 msgstr "za namestitev %s"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "zaradi konfliktov z/s %s"
@@ -1533,20 +1841,19 @@ msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 "  --root         - uporabi drug korenski imenik za odstranitev paketov rpm.\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpme:55 ../urpmi:101
 #, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
 msgstr ""
-"  --urpmi-root   - uporabi drugo izhodišče za podatkovno zbirko urpmi in "
-"namestitev rpm.\n"
+"  --justdb       - posodobi samo podatkovno zbirko rpm, brez datotečnega "
+"sistema.\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - ne izvedi paketnih mini-skript. \n"
 
-#: ../urpme:56
+#: ../urpme:57
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1556,32 +1863,32 @@ msgstr ""
 "                   za namestitev ali odstranitev chroot z možnostjo --"
 "root . \n"
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - zgovoren način.\n"
 
-#: ../urpme:59
+#: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - izberi vse pakete ki ustrezajo izrazu.\n"
 
-#: ../urpme:72
+#: ../urpme:73
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Samo uporabniku root je dovoljeno odstranjevanje paketov"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown packages"
 msgstr "neznani paketi"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown package"
 msgstr "neznan paket"
 
-#: ../urpme:119
+#: ../urpme:121
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1590,17 +1897,17 @@ msgstr[1] "odstranitev paketa %s bo zrušilo vaš sistem"
 msgstr[2] "odstranitev paketa %s bo zrušilo vaš sistem"
 msgstr[3] "odstranitev paketa %s bo zrušilo vaš sistem"
 
-#: ../urpme:124
+#: ../urpme:126
 #, c-format
 msgid "Nothing to remove"
 msgstr "Ničesar za odstraniti"
 
-#: ../urpme:141
+#: ../urpme:143
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Ničesar za odstraniti"
 
-#: ../urpme:147
+#: ../urpme:149
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1610,7 +1917,7 @@ msgstr[1] "Za zadovoljitev odvisnosti bosta odstranjena sledeča %d paketa"
 msgstr[2] "Za zadovoljitev odvisnosti bodo odstranjeni sledeči %d paketi"
 msgstr[3] "Za zadovoljitev odvisnosti bo odstranjenih sledečih %d paketov"
 
-#: ../urpme:152
+#: ../urpme:154
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1619,7 +1926,7 @@ msgstr[1] "neznan paket"
 msgstr[2] "neznan paket"
 msgstr[3] "neznan paket"
 
-#: ../urpme:159
+#: ../urpme:161
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1628,324 +1935,31 @@ msgstr[1] "Ali odstranim %d paketa?"
 msgstr[2] "Ali odstranim %d pakete?"
 msgstr[3] "Ali odstranim %d paketov?"
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (d/N) "
 
-#: ../urpme:164
+#: ../urpme:166
 #, c-format
 msgid "testing removal of %s"
 msgstr ""
 
-#: ../urpme:178
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "Odstranjevanje je spodletelo"
 
-#: ../urpme:180
+#: ../urpme:183
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Odstranjevanje je spodletelo"
 
-#: ../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 različica %s\n"
-"Avtorske pravice (C) 2002-2006 Mandriva.\n"
-"To je prosta programska oprema in se sme razmnoževati pod dovoljenjem GNU "
-"GPL\n"
-"\n"
-"uporaba: urpmf [možnosti] vzorec(regularni izraz)\n"
-
-#: ../urpmf:36
-#, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --version       - prikaži različico urpmf.\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - uporabi specifično okolje (ponavadi poročilo o napaki).\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - ne uporabi podanih virov, ločenih z vejico.\n"
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - vzemi argument kot dobeseden niz, ne regularni izraz.\n"
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - vire razvrsti glede na podnize, ločene z vejico.\n"
-
-#: ../urpmf:43
-#, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --use-distrib  - za dostop do vira uporabi podano pot\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - uporabi podan synthesis namesto baze urpmi.\n"
-
-#: ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - ne izpiši identičnih vrstic.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - uporabi samo vir za posodobitev.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - zgovorni način.\n"
-
-#: ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i             - ignoriraj razlike malih/velikih črk v vsakem vzorcu.\n"
-
-#: ../urpmf:49
-#, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -i             - upoštevaj razlike malih/velikih črk v vsakem vzorcu.\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr "  -F<niz>        - spremeni ločitelj polj (privzeto je ':').\n"
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr "Regularni izrazi:\n"
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  besedilo       - brez -l se vsako besedilo razčleni kot regularni izraz.\n"
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - vključi kodo perl neposredno kot perl -e.\n"
-
-#: ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - binarni AND operator.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - binarni OR operator.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - NOT operator.\n"
-
-#: ../urpmf:57
-#, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  ( )             - levi in desni oklepaj.\n"
-
-#: ../urpmf:58
-#, c-format
-msgid "List of tags:\n"
-msgstr "Seznam oznak:\n"
-
-#: ../urpmf:59
-#, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --qf           - uporabi printf format izpisa\n"
-
-# je to res prevedljivo?
-#: ../urpmf:60
-#, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                   primer: '%%ime:%%datoteke'.\n"
-
-#: ../urpmf:61
-#, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --arch         - arhitektura\n"
-
-#: ../urpmf:62
-#, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - strežnik, kjer je bil paket zgrajen.\n"
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr "  --buildtime    - čas gradnje\n"
-
-#: ../urpmf:64
-#, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "  --conffiles    - nastavitvene datoteke\n"
-
-#: ../urpmf:65
-#, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - konfliktne oznake\n"
-
-#: ../urpmf:66
-#, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - opis paketa\n"
-
-#: ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr "  --distribution - distribucija\n"
-
-#: ../urpmf:68
-#, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - era\n"
-
-#: ../urpmf:69
-#, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --filename    - datotečno ime paketa\n"
-
-#: ../urpmf:70
-#, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -files        - seznam datotek v paketu\n"
-
-#: ../urpmf:71
-#, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - skupina\n"
-
-#: ../urpmf:72
-#, c-format
-msgid "  --license      - license\n"
-msgstr "  --license      - licenca\n"
-
-#: ../urpmf:73
-#, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name         - ime paketa\n"
-
-# obsolete? man pravi da ne
-#: ../urpmf:74
-#, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - zastarani nizi\n"
-
-#: ../urpmf:75
-#, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - avtor paketa\n"
-
-#: ../urpmf:76
-#, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - niz vsebuje\n"
-
-#: ../urpmf:77
-#, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - niz zahteva\n"
-
-#: ../urpmf:78
-#, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - velikost na disku\n"
-
-#: ../urpmf:79
-#, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - ime izvornega rpm paketa\n"
-
-# obsolete? man pravi da ne
-#: ../urpmf:80
-#, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --suggests     - oznake priporočil\n"
-
-#: ../urpmf:81
-#, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary      - povzetek\n"
-
-#: ../urpmf:82
-#, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - url\n"
-
-#: ../urpmf:83
-#, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --vendor       - prodajalec\n"
-
-#: ../urpmf:84
-#, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -m             - vir, kjer je bil paket najden\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - izpiši različico, izdajo in arhitekturo z vsakim imenom.\n"
-
 #: ../urpmf:153
 #, fuzzy, c-format
 msgid "unterminated expression (%s)"
 msgstr "Regularni izrazi:\n"
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr "Nepravilen format: Uporabite lahko samo eno oznako z več vrednostmi"
-
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "uporabljam specifično okolje pri %s\n"
-
-#: ../urpmf:291
-#, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "ni bilo mogoče najti datoteke hdlist za vir »%s«"
-
-#: ../urpmf:298
-#, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "ni bilo moč najti datoteke synthesis za vir »%s«"
-
-#: ../urpmf:307
-#, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "ni bilo moč najti datoteke xml-info za vir »%s«"
-
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2038,13 +2052,6 @@ msgstr ""
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - ne odstrani paketov rpm iz predpomnilika.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr ""
-"  --justdb       - posodobi samo podatkovno zbirko rpm, brez datotečnega "
-"sistema.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2376,7 +2383,7 @@ msgstr ""
 "\n"
 "Vseeno nadaljujem z namestitvijo?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (D/n) "
@@ -2573,10 +2580,12 @@ msgstr "  --curl         - uporabi curl za pridobivanje datotek.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - ustvari vir za posodabljanje.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2588,22 +2597,22 @@ msgstr ""
 "                   eno izmed: never (nikoli), on-demand (na zahtevo), update-"
 "only (samo posodobitev), always (vedno). Nastavitvena datoteka urpmi.cfg(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - uporabi datoteko synthesis.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - uporabi datoteke rpm (namesto synthesis).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - ne poskusi najti datoteke synthesis.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2612,17 +2621,17 @@ msgstr ""
 "  --distrib      - samodejno ustvari vse vire iz namestitvenega\n"
 "                   vira.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr "  --interactive  - with --distrib, potrdi vsak vir posebej\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - with --distrib, dodaj vse naštete vire\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2631,72 +2640,72 @@ msgstr ""
 "  --from         - uporabi podan url za seznam zrcalnih mest, privzeto je\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr "  --virtual      - ustvari navidezne vire, ki so vedno posodobljeni,\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - onemogoči preverjanje datoteke z MD5SUM.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - ne uvozi javnega ključa dodanih virov\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - dodaj vir v nastavitve, a ga ne posodobi.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - tihi način.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - zgovoren način.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "znani načini za xml-info so %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "za --distrib --mirrorlist <url> ni potreben noben argument"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "napačen <url> (za krajevno mapo mora biti pot absolutna)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Samo root uporabnik lahko dodaja vire"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "ustvarjanje nastavitvene datoteke [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Ni mogoče ustvariti nastavitvene datoteke [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "z --distrib ni potrebno podajati <relativna pot do synthesis>"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2705,17 +2714,17 @@ msgstr ""
 "\n"
 "Želite dodati vir '%s'?"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "manjka <relativna pot do synthesis>\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Ni moč uporabiti %s z oddaljenim virom"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "ni moč dodati vira"
@@ -2960,14 +2969,14 @@ msgstr "  -ff            - zares prisili posodabljanje datotek synthesis\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Samo uporabnik root lahko posodobi vire"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "ničesar ni za posodobiti (uporabite urpmi.addmedia za dodajanje novega "
 "vira)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2976,17 +2985,17 @@ msgstr ""
 "manjka vnos za posodobitev\n"
 "(eden od %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "onemogočanje vira %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "omogočanje vira %s"
@@ -3284,6 +3293,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Dnevnik sprememb ni bil najden\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - ustvari vir za posodabljanje.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "popačen URL: [%s]"
 
diff --git a/po/sq.po b/po/sq.po
index 6cf2b290..876b2ff8 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2002-12-04 23:55+0200\n"
 "Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
 "Language-Team: Albanian <LL@li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Instalimi i sistemit"
@@ -26,7 +26,7 @@ msgstr "Instalimi i sistemit"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -76,7 +76,7 @@ msgstr "_Instalo"
 msgid "_Save"
 msgstr "_Ruaj"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Anulo"
@@ -107,8 +107,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - shtype këtë lajmë ndihmues.\n"
@@ -143,7 +144,7 @@ msgstr ""
 "  --verify-rpm   - verifikoje nënshkrimin e rpm para instalimit\n"
 "                   (--no-verify-rpm dezaktivizoje verifikim e tyre).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -196,7 +197,7 @@ msgstr "Një moment ju lutemi."
 msgid "Must be root"
 msgstr "Porta e Minit"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -206,42 +207,42 @@ msgstr ""
 "Disa nga pakot e kërkuara nuk mund të instalohen:\n"
 "%s"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Kujdes"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "Azhurno"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Fundi i instalimit"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Një nga pakot e radhitura nevojitet:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid "_Abort"
 msgstr "Ndërpreje"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -251,13 +252,13 @@ msgstr ""
 "Pakot a radhitura duhet të zhduken që të tjerat të azhurnohen:\n"
 "%s"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Për ta plotësuar mvarësin, pakotë me radhë do të zhduken (%d MB)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -266,49 +267,49 @@ msgstr ""
 "instalohen:\n"
 "\n"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Instalimi i pakos..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "e pa mundur marrja e burimit të pakos, ndërpritje"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Përgatitje..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instalimi i pakove `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Ju lutemi futni burimin e emruar \"%s\" në mjetin [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Shkarkimi i pakos `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "Përfundoi"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -319,28 +320,28 @@ msgstr ""
 "%s\n"
 "A dëshironi t'azhurnoni bazën e të dhënave urpmi"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Instalimi dështio"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Gjdo gjë është veçse e instaluar"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Instalimi përfundoi"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "zhdukja e %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
@@ -422,8 +423,8 @@ msgid "...retrieving done"
 msgstr "...rikuperim i bërë"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...rikuperimi dështoi: %s"
@@ -463,52 +464,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr "proxy që është deklaruar në linjën komanduese nuk është i saktë\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: nuk mund ta lexojë skedaren rpm \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Mungon nënshkrimi (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -936,219 +937,219 @@ msgstr ""
 "--synthesis nuk mund të përdoret me --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, fuzzy, c-format
 msgid "Search start: %s end: %s"
 msgstr "Hulumtoi polisat e instaluara"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "kalimi i pakos %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "dëshiron ta instaloj në vend që t'azhurnoj pakon %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "burimi \"%s\" ekziston me heret"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "leximi i majës nga burimi \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "zhdukja e burimit \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "e pa mundur hapja e rpmdb"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "hyrja e pa mundur në burimin e parë instalues (asnjë skedare e gjetur në "
 "hdlists)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "rikuperimi i skedares hdlist..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "tento zgjedhjen e një burimi jo ekzistues \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "zgjedhje të shumta burimesh: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "zhdukja e burimit \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, fuzzy, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "rikuperimi i skedareve rpm nga burimi\"%s\"..."
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, fuzzy, c-format
 msgid "...reconfiguration failed"
 msgstr "Menyja e konfigurimit është regjistruar"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, fuzzy, c-format
 msgid "reconfiguration done"
 msgstr "Konfigurimi i Serverit"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "burimi \"%s\" nuk është i zgjedhur"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "kontrollimi i skedares sintezë [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problem gjatë leximit të skedares sitezë të burimit \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "shkruarja e skedares për listën e burimit \"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...kopjimi dështoi"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopjimi i skedares përshkruese të \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...kopjimi i bërë"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, fuzzy, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopjimi i [%s] dështoi"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "llogaritja md5sum e rikuperimit të burimit hdlist (ose sintezës)"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "kopjimi i [%s] dështoi"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "kontrollimi i skedares hdlist [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "instalimi i %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "asnjë skedare e gjetur hdlist për burimin \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "kopjimi i skedares përshkruese të \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "emri i skedares rpm është invalid [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "rikuperim i burimit hdlist (ose sintezës) të \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "hdlista tesntuese është gjetur (ose sintezuar) sikur %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "asnjë skedare e gjetur hdlist për burimin \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "verifimi i skedares pubkey të \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importimi i çelësit %s nga skedarja pubkey e \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "është e pa mundur importimi i skedares pubkey të \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "shtuarja e burimit %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1180,7 +1181,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yy"
@@ -1250,7 +1251,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1333,271 +1334,7 @@ msgstr "montimi i %s"
 msgid "unmounting %s"
 msgstr "demontimi i %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Asnjë pako e emruar %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Pakot e radhitura përmbajnë %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Gjdo gjë është veçse e instaluar"
-
-#: ../urpm/select.pm:539
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Gjdo gjë është veçse e instaluar"
-
-#: ../urpm/select.pm:540
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Gjdo gjë është veçse e instaluar"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "ka arritur nga mungesa %s"
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "Gjdo gjë është veçse e instaluar"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "ka arritur gjatë mosmarrëveshjes %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "tentim në gradimin e %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "në urdhër për ta mbajturë %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "në urdhër për instalim %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "ka arritur gjatë konflikteve me %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Nënshkrim i pa pranueshëm (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Çelës invalid ID (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Mungon nënshkrimi (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "i pa mundur shkrimi i skedares konfiguruese [%s]"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "Kopjimi dështoi"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "Kopjimi dështoi"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme versioni %s\n"
-"E drejtë autori (C) 1999-2008 Mandriva.\n"
-"Ky është software gratis dhe mund të shpërndahet ndër termet e GNU GPL.\n"
-"\n"
-"përdorim:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto         - zgjedhje automatike në njërën ndër pakot zgjedhëse.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, fuzzy, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr ""
-"  --test        - verifikoje nëse instalimi përfundon në mënyrë korrekte.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-"  --parallel     - urmpi është i shpërndarë në pseudo makina të shumëta.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, fuzzy, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --packager      - çfaqe etiketën packager: paketues.\n"
-
-#: ../urpme:53
-#, fuzzy, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr ""
-"  --wget         - përdore wget për rikuperimin e skedareve në distancë.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --wget         - përdore wget për rikuperimin e skedareve në distancë.\n"
-
-#: ../urpme:55
-#, fuzzy, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --description   - çfaqe etiketën description: përshkrimi.\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, fuzzy, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose      - model oratori.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - zgjedhni të gjitha pakot me përshkrim të njëjtë.\n"
-
-#: ../urpme:72
-#, fuzzy, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Vetëm administratori i sistemin ka mundësi të instalojë pakot"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "pako të pa njoftura"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "pako e pa njoftur"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "zhdukja a pakove %s do të dëmtoj sistemin tuaj"
-msgstr[1] "zhdukja a pakove %s do të dëmtoj sistemin tuaj"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Mos zhduk asgjë"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Mos zhduk asgjë"
-
-#: ../urpme:147
-#, fuzzy, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "Për ta plotësuar mvarësin, pakotë me radhë do të zhduken (%d MB)"
-msgstr[1] "Për ta plotësuar mvarësin, pakotë me radhë do të zhduken (%d MB)"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "pako e pa njoftur"
-msgstr[1] "pako e pa njoftur"
-
-#: ../urpme:159
-#, fuzzy, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "zhdukja e pakos %s"
-msgstr[1] "zhdukja e pakos %s"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (p/J)"
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "marrje e mjetit tërheqës si \"%s\""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Zhdukja dështoi"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Zhdukja dështoi"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1613,32 +1350,40 @@ msgstr ""
 "\n"
 "përdorim:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - shtype këtë lajmë ndihmues.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - përdore mjedisin e veçantë (veçënarishtë një raport "
 "bugi).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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        - mos i përdor vetëm burimet e dhëna, të ndara me "
 "presje.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --wget         - përdore wget për rikuperimin e skedareve në distancë.\n"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1646,257 +1391,524 @@ msgstr ""
 "  --sortmedia        - radhitja e burimit akordohet me ndër-rreshtat e ndarë "
 "me presje.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --synthesis    - përdori skedaret e dhëna sintezë në vend të db.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - përdori skedaret e dhëna sintezë në vend të db.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq          - mos i çfaqë rreshtat e njëjtë.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - përdori vetëm burimet azhurnuese.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - model oratori.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - injoroje rastin e ndryshëm në gjdo model.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -i             - injoroje rastin e ndryshëm në gjdo model.\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - përfshije kodin perl direkt sikur perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - operues AND binar.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - operues OR binar.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  -!             - njëjsi NOT.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 "  )             - kllapë e djathtë për ta mbyllur shprehjen e grupit.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "Listoi të dhënat për ti riparuar:\n"
 "\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - përdore sipërfaqën ndarëse X.\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr ""
 "\n"
 "                      Raporti DrakBackup \n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url        - çfaqe etiketën serial: url.\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - çfaqe etiketën buildhost: ndërtoje ftuesin.\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "Konfigurimi i modulit të Konsolës"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts     - çfaqe etiketën conflicts: gjitha konfliktet.\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - çfaqe etiketën description: përshkrimi.\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch          - çfaqe etiketën epoch: epokë.\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --all           - çfaqi të gjitha etiketat.\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --list         - shpalosi pakotë lira.\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group         - çfaqe etiketën group: grupi.\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --all           - çfaqi të gjitha etiketat.\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --all           - çfaqi të gjitha etiketat.\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - çfaqe etiketën obsoletes: gjitha absolutisht.\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager      - çfaqe etiketën packager: paketues.\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides      - çfaqe etiketën provides: gjitha pajisjet.\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires      - çfaqe etiketën requires: gjitha dëshiratë.\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size          - çfaqe etiketën size: madhësia.\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm     - çfaqe etiketën sourcerpm: burimi rpm.\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --obsoletes     - çfaqe etiketën obsoletes: gjitha absolutisht.\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary        - çfaqe etiketën summary: përmbledhje.\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url        - çfaqe etiketën serial: url.\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - model oratori.\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  --list         - shpalosi pakotë lira.\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - çfaqe versionin, hollësitë dhe arkitekturen me emër.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "përdorim specifik i mjedisit në %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "asnjë skedare e gjetur hdlist për burimin \"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "krijimi i skedares sintezë për burimin \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "shkruarja e skedares për listën e burimit \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Asnjë pako e emruar %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Pakot e radhitura përmbajnë %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Gjdo gjë është veçse e instaluar"
+
+#: ../urpm/select.pm:543
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Gjdo gjë është veçse e instaluar"
+
+#: ../urpm/select.pm:544
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Gjdo gjë është veçse e instaluar"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "ka arritur nga mungesa %s"
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Gjdo gjë është veçse e instaluar"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "ka arritur gjatë mosmarrëveshjes %s"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "tentim në gradimin e %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "në urdhër për ta mbajturë %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "në urdhër për instalim %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "ka arritur gjatë konflikteve me %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Nënshkrim i pa pranueshëm (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Çelës invalid ID (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Mungon nënshkrimi (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "i pa mundur shkrimi i skedares konfiguruese [%s]"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Kopjimi dështoi"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "Kopjimi dështoi"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme versioni %s\n"
+"E drejtë autori (C) 1999-2008 Mandriva.\n"
+"Ky është software gratis dhe mund të shpërndahet ndër termet e GNU GPL.\n"
+"\n"
+"përdorim:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - zgjedhje automatike në njërën ndër pakot zgjedhëse.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, fuzzy, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+"  --test        - verifikoje nëse instalimi përfundon në mënyrë korrekte.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+"  --parallel     - urmpi është i shpërndarë në pseudo makina të shumëta.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, fuzzy, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --packager      - çfaqe etiketën packager: paketues.\n"
+
+#: ../urpme:53
+#, fuzzy, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr ""
+"  --wget         - përdore wget për rikuperimin e skedareve në distancë.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - azhurno vetëm burimet azhurnuese.\n"
+
+#: ../urpme:56
+#, fuzzy, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --description   - çfaqe etiketën description: përshkrimi.\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - model oratori.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - zgjedhni të gjitha pakot me përshkrim të njëjtë.\n"
+
+#: ../urpme:73
+#, fuzzy, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Vetëm administratori i sistemin ka mundësi të instalojë pakot"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "pako të pa njoftura"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "pako e pa njoftur"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "zhdukja a pakove %s do të dëmtoj sistemin tuaj"
+msgstr[1] "zhdukja a pakove %s do të dëmtoj sistemin tuaj"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Mos zhduk asgjë"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Mos zhduk asgjë"
+
+#: ../urpme:149
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Për ta plotësuar mvarësin, pakotë me radhë do të zhduken (%d MB)"
+msgstr[1] "Për ta plotësuar mvarësin, pakotë me radhë do të zhduken (%d MB)"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "pako e pa njoftur"
+msgstr[1] "pako e pa njoftur"
+
+#: ../urpme:161
+#, fuzzy, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "zhdukja e pakos %s"
+msgstr[1] "zhdukja e pakos %s"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (p/J)"
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "marrje e mjetit tërheqës si \"%s\""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Zhdukja dështoi"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Zhdukja dështoi"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1991,11 +2003,6 @@ msgstr ""
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - mbane rpm dhe mos e përdor në fshehje.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - azhurno vetëm burimet azhurnuese.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2311,7 +2318,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Vazhdo pa marrë parasyshë?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (P/j) "
@@ -2499,10 +2506,12 @@ msgstr ""
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - krijo një burim azhurnimi.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2510,25 +2519,25 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - tento në gjetjen dhe përdorimin e skedares sintezë.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  --no-probe     - mos tento gjetjen e ndonjë sintezë apo\n"
 "                   skedare hdlist.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2537,17 +2546,17 @@ msgstr ""
 "  --distrib      - krijo automatikisht të gjitha burimet nga një\n"
 "                   burim instalues.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - shpalosi burimet e lira.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2556,7 +2565,7 @@ msgstr ""
 "  --from          - përdore url e specifikuar të pasqyreve me marrëvshje\n"
 "                    është %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
@@ -2564,84 +2573,84 @@ msgstr ""
 "azhurnim,\n"
 "                   vetëm file:// protokoli është i lejuar.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - model i qetë.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - model oratori.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, fuzzy, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Vetëm administratori i sistemin ka mundësi të instalojë pakot"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "shkruaja e skedares konfiguruese [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, fuzzy, c-format
 msgid "Can't create config file [%s]"
 msgstr "shkruaja e skedares konfiguruese [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "specifikim i pa nevojshëm <shteg relativë i hdlist> me --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<shteg relativë i hdlist> mungon\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "hyrje e pa mundur në burimin \"%s\""
@@ -2877,13 +2886,13 @@ msgstr "  -f             - përfitim i forcuar në skedaret hdlist.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Vetëm administratori i sistemin ka mundësi të instalojë pakot"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "asgjë për tu azhurnuar (përdore urpmi.addmedia për të shtuar një burim)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2892,17 +2901,17 @@ msgstr ""
 "hyrja për azhurnim mungon\n"
 "(një nga %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Botimi i burimit \"%s\":"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "zhdukja e burimit \"%s\""
@@ -3172,6 +3181,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Asnjë imazh i gjetur"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - krijo një burim azhurnimi.\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "hyrje e çformuarë: [%s]"
diff --git a/po/sr.po b/po/sr.po
index ff883c85..d2769825 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2004-02-01 19:27+0100\n"
 "Last-Translator: Toma Jankovic <webmaster@mandrake.co.yu>\n"
 "Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -25,7 +25,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Инсталација система"
@@ -35,7 +35,7 @@ msgstr "Инсталација система"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_У реду"
@@ -85,7 +85,7 @@ msgstr "Инсталирај"
 msgid "_Save"
 msgstr "_Сачувај"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Поништи"
@@ -116,8 +116,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - приказује овај екран о помоћи.\n"
@@ -153,7 +154,7 @@ msgstr ""
 "                   (--no-verify-rpm не веригикује, стандардна је "
 "верификација).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - користи само дати медиј, одвојен зарезом.\n"
@@ -203,7 +204,7 @@ msgstr "Молим сачекајте..."
 msgid "Must be root"
 msgstr "Порт за миша"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -213,42 +214,42 @@ msgstr ""
 "Неки изабрани пакети се не могу инсталирати:\n"
 "%s"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Упозорење"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "У реду"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "Ажурирање"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Излаз из инсталације"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Потребан(и) су следећи пакет(и):"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Одустати"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -258,19 +259,19 @@ msgstr ""
 "Следећи пакети се морају уклонити да би други могли да буду ажурирани:\n"
 "%s"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -278,42 +279,42 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Инсталација пакета..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "извор пакета није доступан, излазим..."
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Припремам..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Инсталирам пакет `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Убаците медиј са именом %s у уређај [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Скидам пакет `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "Урађено"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -324,28 +325,28 @@ msgstr ""
 "%s\n"
 "Можда желите да ажурирате вашу urpmi базу података."
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Инсталација није успела"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "све је већ инсталирано"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Инсталација готова"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "уклањам %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "рестартујем urpmi"
@@ -424,8 +425,8 @@ msgid "...retrieving done"
 msgstr "... добављање завршено"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...повраћај неуспео: %s"
@@ -465,52 +466,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr "лоша proxy-декларација у командној линији\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: не могу да прочитам rpm датотеку \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Недостаје потпис (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -937,218 +938,218 @@ msgstr ""
 "--synthesis се не може користити са --media, --excludemedia, --sortmedia, --"
 "update или --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, fuzzy, c-format
 msgid "Search start: %s end: %s"
 msgstr "Тражи инсталиране фонтове"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "прескачем пакет %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "ће инсталирати уместо ажурирати пакет %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "медиј \"%s\" већ постоји"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "читам хедере са медија \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "уклањам медиј \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "не могу да отворим rpmdb"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "не могу да приступим првом инсталационом медију (није пронађен hdlists фајл)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "добављам hdlists фајл..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "покушавам да селектујем непостојећи медиј \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "покушавам да селектујем вишеструки медиј: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "уклањам медиј \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, fuzzy, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "добављам rpm фајлове ѕа медиј \"%s\"..."
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, fuzzy, c-format
 msgid "...reconfiguration failed"
 msgstr "Конфигурација менија сачувана"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, fuzzy, c-format
 msgid "reconfiguration done"
 msgstr "Подешавање сервера"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "медиј \"%s\" није изабран"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "испитујем synthesis фајл [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "проблем са читањем synthesis фајла за медиј \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "уписујем листу фајлова за медиј \"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...копирање није успело"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "копирам описни фајл за \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...копирање завршено"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, fuzzy, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "копирање [%s] неуспело"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "прорачунавам md5sum копиране  source hdlist (или  synthesis)"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "копирање [%s] неуспело"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "испитујем  hdlist фајл [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "Инсталирам %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "није пронађена hdlist датотека за медиј \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "копирам описни фајл за \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "погрешно име rpm датотеке [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "добављам изорни hdlist (или synthesis) за \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "пронађена тестирана hdlist (или synthesis) као %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "није пронађена hdlist датотека за медиј \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "испитукем фајл са јавним кључем за \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "..импортовани кључ %s од јавног кључа за \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "не могу да импортујем јавни кључ за \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "додани медиј %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1180,7 +1181,7 @@ msgstr "НнNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "ДдDdYy"
@@ -1250,7 +1251,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1334,6 +1335,304 @@ msgstr "монтирам %s"
 msgid "unmounting %s"
 msgstr "демонтирам %s"
 
+#: ../urpm/search.pm:29 ../urpmf:29
+#, fuzzy, 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 верзија %s\n"
+"Copyright (C) 2002-2004 Mandriva.\n"
+"Ово је бесплатан софтвер и може бити редистрибуиран под условима GNU GPL.\n"
+"\n"
+"употреба:\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - приказује овај екран о помоћи.\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          - користи специфично окружење (типично извештај о грешци).\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 - не користи дати медиј, одвојен зарезом.\n"
+
+#: ../urpm/search.pm:39 ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --curl         - користи још један root за 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    - сортира медије на основу подстрингова одвојених зарезом.\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+"  --synthesis    - користи дати synthesis уместо urpmi-јеве базе података.\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    - користи дати synthesis уместо urpmi-јеве базе података.\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - не приказује идентичне линије.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - користи само update медиј.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -verbose       - verbose режим.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - игнорише разлику у карактеру у било којој шеми.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - игнорише разлику у карактеру у било којој шеми.\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpm/search.pm:52 ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - укључује перл код директно као perl -e.\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - бинарни AND оператор.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - бинарни OR оператор.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - уинарни NOT.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  )              - десна заграда за затварање групе израза.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Листа података за обнављање:\n"
+"\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - користи X интерфејс.\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "  -l             - приказује фајлове у пакету.\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - приказује таг url: url.\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - приказује таг buildhost: build host.\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Модул за подешавање Konsole"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts     - приказује таг конфликата: сви конфликти.\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description   - приказује таг описа: опис.\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, fuzzy, c-format
+msgid "  --distribution - distribution\n"
+msgstr "Прикључак KAB-а за дистрибуционе листе"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --size          - приказује таг величине: величина.\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --all           - приказује све тагове.\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - приказује фајлове у пакету.\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group         - приказује таг групе: група.\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --all           - приказује све тагове.\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --all           - приказује све тагове.\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes     - приказује таг вишак: сви вишкови (у више реда).\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - приказује таг packager: packager.\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides      - приказује таг обезбеђује: све обезбеђује.\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires      - приказује таг захтева: сви захтеви\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size          - приказује таг величине: величина.\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - приказује таг sourcerpm: source rpm.\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes     - приказује таг вишак: сви вишкови (у више реда).\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary       - приказује таг сажетка: сажетак.\n"
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - приказује таг url: url.\n"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  -verbose       - verbose режим.\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - приказује фајлове у пакету.\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - приказује верзију, издање и архитектуру, укључујући и "
+"име.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "користим дато окружење на %s\n"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "није пронађена hdlist датотека за медиј \"%s\""
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "креирам hdlist симтезну датотеку за медиј \"%s\""
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "уписујем листу фајлова за медиј \"%s\""
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1345,62 +1644,67 @@ msgid ""
 "urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, c-format
 msgid "No package named %s"
 msgstr "Нема пакета са именом %s"
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Следећи пакети садрже %s: %s"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "све је већ инсталирано"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "све је већ инсталирано"
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "све је већ инсталирано"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
 msgid "due to missing %s"
 msgstr "због не постојања %s"
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "све је већ инсталирано"
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "због не задовољеног %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "покушавам да прикажем %s"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "да бих задржао %s"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, c-format
 msgid "in order to install %s"
 msgstr "да би инсталирао %s"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "због конфликта са %s"
@@ -1492,18 +1796,17 @@ msgstr "  --packager     - приказује таг packager: packager.\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --curl         - користи још један root за rpm инсталацију.\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --curl         - користи још један root за rpm инсталацију.\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - ажурирај само медијум за ажурирање.\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --description   - приказује таг описа: опис.\n"
 
-#: ../urpme:56
+#: ../urpme:57
 #, fuzzy, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1512,32 +1815,32 @@ msgstr ""
 "  --use-distrib  - подешава urpmi у лету са distrib стабла.\n"
 "                   Ова опција дозвољава испитивање дистрибуције.\n"
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, fuzzy, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  -verbose       - verbose режим.\n"
 
-#: ../urpme:59
+#: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - изабери све пакете који одговарају изразу.\n"
 
-#: ../urpme:72
+#: ../urpme:73
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Само администратор може да инсталира пакете"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown packages"
 msgstr "непознати пакети"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown package"
 msgstr "непознати пакет"
 
-#: ../urpme:119
+#: ../urpme:121
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1545,17 +1848,17 @@ msgstr[0] "уклањање пакета %s ће нарушити Ваш сис�
 msgstr[1] "уклањање пакета %s ће нарушити Ваш систем"
 msgstr[2] "уклањање пакета %s ће нарушити Ваш систем"
 
-#: ../urpme:124
+#: ../urpme:126
 #, c-format
 msgid "Nothing to remove"
 msgstr "Нема ничега што би се могло уклонити"
 
-#: ../urpme:141
+#: ../urpme:143
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Нема ничега што би се могло уклонити"
 
-#: ../urpme:147
+#: ../urpme:149
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1564,7 +1867,7 @@ msgstr[0] "Ради задовољења зависности, следећи п
 msgstr[1] "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
 msgstr[2] "Ради задовољења зависности, следећи пакети ће бити уклоњени (%d MB)"
 
-#: ../urpme:152
+#: ../urpme:154
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1572,7 +1875,7 @@ msgstr[0] "непознати пакет"
 msgstr[1] "непознати пакет"
 msgstr[2] "непознати пакет"
 
-#: ../urpme:159
+#: ../urpme:161
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1580,322 +1883,31 @@ msgstr[0] "уклањам пакет %s"
 msgstr[1] "уклањам пакет %s"
 msgstr[2] "уклањам пакет %s"
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (д/Н) "
 
-#: ../urpme:164
+#: ../urpme:166
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "узимам преносни уређај као \"%s\""
 
-#: ../urpme:178
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "Уклањање није успело"
 
-#: ../urpme:180
+#: ../urpme:183
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Уклањање није успело"
 
-#: ../urpmf:29
-#, fuzzy, 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 верзија %s\n"
-"Copyright (C) 2002-2004 Mandriva.\n"
-"Ово је бесплатан софтвер и може бити редистрибуиран под условима GNU GPL.\n"
-"\n"
-"употреба:\n"
-
-#: ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - приказује овај екран о помоћи.\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - користи специфично окружење (типично извештај о грешци).\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - не користи дати медиј, одвојен зарезом.\n"
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - сортира медије на основу подстрингова одвојених зарезом.\n"
-
-#: ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-"  --synthesis    - користи дати synthesis уместо urpmi-јеве базе података.\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - користи дати synthesis уместо urpmi-јеве базе података.\n"
-
-#: ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - не приказује идентичне линије.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - користи само update медиј.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -verbose       - verbose режим.\n"
-
-#: ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - игнорише разлику у карактеру у било којој шеми.\n"
-
-#: ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - игнорише разлику у карактеру у било којој шеми.\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - укључује перл код директно као perl -e.\n"
-
-#: ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - бинарни AND оператор.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - бинарни OR оператор.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - уинарни NOT.\n"
-
-#: ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  )              - десна заграда за затварање групе израза.\n"
-
-#: ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Листа података за обнављање:\n"
-"\n"
-
-#: ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - користи X интерфејс.\n"
-
-#: ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "  -l             - приказује фајлове у пакету.\n"
-
-#: ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - приказује таг url: url.\n"
-
-#: ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - приказује таг buildhost: build host.\n"
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "Модул за подешавање Konsole"
-
-#: ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts     - приказује таг конфликата: сви конфликти.\n"
-
-#: ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description   - приказује таг описа: опис.\n"
-
-#: ../urpmf:67
-#, fuzzy, c-format
-msgid "  --distribution - distribution\n"
-msgstr "Прикључак KAB-а за дистрибуционе листе"
-
-#: ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --size          - приказује таг величине: величина.\n"
-
-#: ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --all           - приказује све тагове.\n"
-
-#: ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - приказује фајлове у пакету.\n"
-
-#: ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group         - приказује таг групе: група.\n"
-
-#: ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --all           - приказује све тагове.\n"
-
-#: ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --all           - приказује све тагове.\n"
-
-#: ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes     - приказује таг вишак: сви вишкови (у више реда).\n"
-
-#: ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - приказује таг packager: packager.\n"
-
-#: ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides      - приказује таг обезбеђује: све обезбеђује.\n"
-
-#: ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires      - приказује таг захтева: сви захтеви\n"
-
-#: ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size          - приказује таг величине: величина.\n"
-
-#: ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - приказује таг sourcerpm: source rpm.\n"
-
-#: ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes     - приказује таг вишак: сви вишкови (у више реда).\n"
-
-#: ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary       - приказује таг сажетка: сажетак.\n"
-
-#: ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - приказује таг url: url.\n"
-
-#: ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  -verbose       - verbose режим.\n"
-
-#: ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - приказује фајлове у пакету.\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - приказује верзију, издање и архитектуру, укључујући и "
-"име.\n"
-
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "користим дато окружење на %s\n"
-
-#: ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "није пронађена hdlist датотека за медиј \"%s\""
-
-#: ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "креирам hdlist симтезну датотеку за медиј \"%s\""
-
-#: ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "уписујем листу фајлова за медиј \"%s\""
-
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1986,11 +1998,6 @@ msgstr "  --clean        - уклања rpm из кеша пре било чег
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - чува rpm који нису коришћени у кешу.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - ажурирај само медијум за ажурирање.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2312,7 +2319,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Свеједно наставити ?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Д/н) "
@@ -2497,10 +2504,12 @@ msgstr "  --curl         - користи curl за добављање удаљ�
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - креира update медиј.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2508,24 +2517,24 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - покушава да пронађе и користи synthesis фајл.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  --no-probe     - не покушава да пронађе било који synthesis или\n"
 "                   hdlist фајл.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2534,17 +2543,17 @@ msgstr ""
 "  --distrib      - аутоматски направи све медије са инсталационог\n"
 "                   медија.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media         - приказује листу медија.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2553,91 +2562,91 @@ msgstr ""
 "  --from         - користи дату url адресу за лист мирора, подразумевано је\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - креира виртуелни медиј који су увек ажурирани ,\n"
 "                   дозвољен је само file:// protocol.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - деактивира MD5SUM проверу фајла.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - тихи режим (мало порука).\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - verbose режим.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, fuzzy, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Само администратор може да инсталира пакете"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "уписујем у конфигурациону датотеку [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, fuzzy, c-format
 msgid "Can't create config file [%s]"
 msgstr "уписујем у конфигурациону датотеку [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "недостаје <релативна путања hdlist> са --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "недостаје <релативна путања hdlist>\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "не могу да приступим медију \"%s\""
@@ -2873,12 +2882,12 @@ msgstr "  -f             - приморава на генерисање hdlist �
 msgid "Only superuser is allowed to update media"
 msgstr "Само администратор може да инсталира пакете"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "нема ничега за ажурирање (користи urpmi.addmedia за додавање медија)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2887,17 +2896,17 @@ msgstr ""
 "недостаје унос за ажурирање\n"
 "(један од %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Мењам медиј \"%s\":"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "уклањам медиј \"%s\""
@@ -3166,6 +3175,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "НИје пронађен image"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - креира update медиј.\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "погрешан унос: [%s]"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index a7debb0c..64cf654f 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2004-02-01 19:27+0100\n"
 "Last-Translator: Toma Jankovic <webmaster@mandrake.co.yu>\n"
 "Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -25,7 +25,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Instalacija sistema"
@@ -35,7 +35,7 @@ msgstr "Instalacija sistema"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_U redu"
@@ -85,7 +85,7 @@ msgstr "Instaliraj"
 msgid "_Save"
 msgstr "_Sačuvaj"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Poništi"
@@ -116,8 +116,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - prikazuje ovaj ekran o pomoći.\n"
@@ -153,7 +154,7 @@ msgstr ""
 "                   (--no-verify-rpm ne verigikuje, standardna je "
 "verifikacija).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - koristi samo dati medij, odvojen zarezom.\n"
@@ -204,7 +205,7 @@ msgstr "Molim sačekajte..."
 msgid "Must be root"
 msgstr "Port za miša"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -214,42 +215,42 @@ msgstr ""
 "Neki izabrani paketi se ne mogu instalirati:\n"
 "%s"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "Ažuriranje"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Izlaz iz instalacije"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Potreban(i) su sledeći paket(i):"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Odustati"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -259,19 +260,19 @@ msgstr ""
 "Sledeći paketi se moraju ukloniti da bi drugi mogli da budu ažurirani:\n"
 "%s"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Radi zadovoljenja zavisnosti, sledeći paketi će biti uklonjeni (%d MB)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Radi zadovoljenja zavisnosti, sledeći paketi će biti uklonjeni (%d MB)"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -279,42 +280,42 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Instalacija paketa..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "izvor paketa nije dostupan, izlazim..."
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Pripremam..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instaliram paket `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Ubacite medij sa imenom %s u uređaj [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Skidam paket `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "Urađeno"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -325,28 +326,28 @@ msgstr ""
 "%s\n"
 "Možda želite da ažurirate vašu urpmi bazu podataka."
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Instalacija nije uspela"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "sve je već instalirano"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Instalacija gotova"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "uklanjam %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "restartujem urpmi"
@@ -425,8 +426,8 @@ msgid "...retrieving done"
 msgstr "... dobavljanje završeno"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...povraćaj neuspeo: %s"
@@ -466,52 +467,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr "loša proxy-deklaracija u komandnoj liniji\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: ne mogu da pročitam rpm datoteku \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Nedostaje potpis (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -938,218 +939,218 @@ msgstr ""
 "--synthesis se ne može koristiti sa --media, --excludemedia, --sortmedia, --"
 "update ili --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, fuzzy, c-format
 msgid "Search start: %s end: %s"
 msgstr "Traži instalirane fontove"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "preskačem paket %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "će instalirati umesto ažurirati paket %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "medij \"%s\" već postoji"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "čitam hedere sa medija \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "uklanjam medij \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "ne mogu da otvorim rpmdb"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "ne mogu da pristupim prvom instalacionom mediju (nije pronađen hdlists fajl)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "dobavljam hdlists fajl..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "pokušavam da selektujem nepostojeći medij \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "pokušavam da selektujem višestruki medij: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "uklanjam medij \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, fuzzy, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "dobavljam rpm fajlove dza medij \"%s\"..."
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, fuzzy, c-format
 msgid "...reconfiguration failed"
 msgstr "Konfiguracija menija sačuvana"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, fuzzy, c-format
 msgid "reconfiguration done"
 msgstr "Podešavanje servera"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "medij \"%s\" nije izabran"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "ispitujem synthesis fajl [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problem sa čitanjem synthesis fajla za medij \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "upisujem listu fajlova za medij \"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiranje nije uspelo"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopiram opisni fajl za \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...kopiranje završeno"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, fuzzy, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopiranje [%s] neuspelo"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "proračunavam md5sum kopirane  source hdlist (ili  synthesis)"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "kopiranje [%s] neuspelo"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "ispitujem  hdlist fajl [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "Instaliram %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "kopiram opisni fajl za \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "pogrešno ime rpm datoteke [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "dobavljam izorni hdlist (ili synthesis) za \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "pronađena testirana hdlist (ili synthesis) kao %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "ispitukem fajl sa javnim ključem za \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "..importovani ključ %s od javnog ključa za \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ne mogu da importujem javni ključ za \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "dodani medij %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1181,7 +1182,7 @@ msgstr "NnNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "DdDdYy"
@@ -1251,7 +1252,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1335,6 +1336,305 @@ msgstr "montiram %s"
 msgid "unmounting %s"
 msgstr "demontiram %s"
 
+#: ../urpm/search.pm:29 ../urpmf:29
+#, fuzzy, 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 verzija %s\n"
+"Copyright (C) 2002-2004 Mandriva.\n"
+"Ovo je besplatan softver i može biti redistribuiran pod uslovima GNU GPL.\n"
+"\n"
+"upotreba:\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - prikazuje ovaj ekran o pomoći.\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          - koristi specifično okruženje (tipično izveštaj o "
+"grešci).\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 - ne koristi dati medij, odvojen zarezom.\n"
+
+#: ../urpm/search.pm:39 ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --curl         - koristi još jedan root za rpm instalaciju.\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    - sortira medije na osnovu podstringova odvojenih zarezom.\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+"  --synthesis    - koristi dati synthesis umesto urpmi-jeve baze podataka.\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    - koristi dati synthesis umesto urpmi-jeve baze podataka.\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - ne prikazuje identične linije.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - koristi samo update medij.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -verbose       - verbose režim.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - ignoriše razliku u karakteru u bilo kojoj šemi.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - ignoriše razliku u karakteru u bilo kojoj šemi.\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpm/search.pm:52 ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - uključuje perl kod direktno kao perl -e.\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - binarni AND operator.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - binarni OR operator.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - uinarni NOT.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  )              - desna zagrada za zatvaranje grupe izraza.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Lista podataka za obnavljanje:\n"
+"\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - koristi X interfejs.\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "  -l             - prikazuje fajlove u paketu.\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - prikazuje tag url: url.\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - prikazuje tag buildhost: build host.\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Modul za podešavanje Konsole"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts     - prikazuje tag konflikata: svi konflikti.\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description   - prikazuje tag opisa: opis.\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, fuzzy, c-format
+msgid "  --distribution - distribution\n"
+msgstr "Priključak KAB-a za distribucione liste"
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --size          - prikazuje tag veličine: veličina.\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --all           - prikazuje sve tagove.\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - prikazuje fajlove u paketu.\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group         - prikazuje tag grupe: grupa.\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --all           - prikazuje sve tagove.\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --all           - prikazuje sve tagove.\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes     - prikazuje tag višak: svi viškovi (u više reda).\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - prikazuje tag packager: packager.\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides      - prikazuje tag obezbeđuje: sve obezbeđuje.\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires      - prikazuje tag zahteva: svi zahtevi\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size          - prikazuje tag veličine: veličina.\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - prikazuje tag sourcerpm: source rpm.\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes     - prikazuje tag višak: svi viškovi (u više reda).\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary       - prikazuje tag sažetka: sažetak.\n"
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - prikazuje tag url: url.\n"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  -verbose       - verbose režim.\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - prikazuje fajlove u paketu.\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr ""
+"  -f             - prikazuje verziju, izdanje i arhitekturu, uključujući i "
+"ime.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "koristim dato okruženje na %s\n"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "nije pronađena hdlist datoteka za medij \"%s\""
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "kreiram hdlist simteznu datoteku za medij \"%s\""
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "upisujem listu fajlova za medij \"%s\""
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1346,62 +1646,67 @@ msgid ""
 "urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, c-format
 msgid "No package named %s"
 msgstr "Nema paketa sa imenom %s"
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Sledeći paketi sadrže %s: %s"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
 msgid "due to missing %s"
 msgstr "zbog ne postojanja %s"
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "zbog ne zadovoljenog %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "pokušavam da prikažem %s"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "da bih zadržao %s"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, c-format
 msgid "in order to install %s"
 msgstr "da bi instalirao %s"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "zbog konflikta sa %s"
@@ -1493,18 +1798,17 @@ msgstr "  --packager     - prikazuje tag packager: packager.\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --curl         - koristi još jedan root za rpm instalaciju.\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --curl         - koristi još jedan root za rpm instalaciju.\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - ažuriraj samo medijum za ažuriranje.\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --description   - prikazuje tag opisa: opis.\n"
 
-#: ../urpme:56
+#: ../urpme:57
 #, fuzzy, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1513,32 +1817,32 @@ msgstr ""
 "  --use-distrib  - podešava urpmi u letu sa distrib stabla.\n"
 "                   Ova opcija dozvoljava ispitivanje distribucije.\n"
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, fuzzy, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  -verbose       - verbose režim.\n"
 
-#: ../urpme:59
+#: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - izaberi sve pakete koji odgovaraju izrazu.\n"
 
-#: ../urpme:72
+#: ../urpme:73
 #, fuzzy, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Samo administrator može da instalira pakete"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown packages"
 msgstr "nepoznati paketi"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown package"
 msgstr "nepoznati paket"
 
-#: ../urpme:119
+#: ../urpme:121
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1546,17 +1850,17 @@ msgstr[0] "uklanjanje paketa %s će narušiti Vaš sistem"
 msgstr[1] "uklanjanje paketa %s će narušiti Vaš sistem"
 msgstr[2] "uklanjanje paketa %s će narušiti Vaš sistem"
 
-#: ../urpme:124
+#: ../urpme:126
 #, c-format
 msgid "Nothing to remove"
 msgstr "Nema ničega što bi se moglo ukloniti"
 
-#: ../urpme:141
+#: ../urpme:143
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Nema ničega što bi se moglo ukloniti"
 
-#: ../urpme:147
+#: ../urpme:149
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1568,7 +1872,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Radi zadovoljenja zavisnosti, sledeći paketi će biti uklonjeni (%d MB)"
 
-#: ../urpme:152
+#: ../urpme:154
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1576,7 +1880,7 @@ msgstr[0] "nepoznati paket"
 msgstr[1] "nepoznati paket"
 msgstr[2] "nepoznati paket"
 
-#: ../urpme:159
+#: ../urpme:161
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1584,323 +1888,31 @@ msgstr[0] "uklanjam paket %s"
 msgstr[1] "uklanjam paket %s"
 msgstr[2] "uklanjam paket %s"
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (d/N) "
 
-#: ../urpme:164
+#: ../urpme:166
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "uzimam prenosni uređaj kao \"%s\""
 
-#: ../urpme:178
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "Uklanjanje nije uspelo"
 
-#: ../urpme:180
+#: ../urpme:183
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Uklanjanje nije uspelo"
 
-#: ../urpmf:29
-#, fuzzy, 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 verzija %s\n"
-"Copyright (C) 2002-2004 Mandriva.\n"
-"Ovo je besplatan softver i može biti redistribuiran pod uslovima GNU GPL.\n"
-"\n"
-"upotreba:\n"
-
-#: ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - prikazuje ovaj ekran o pomoći.\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - koristi specifično okruženje (tipično izveštaj o "
-"grešci).\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - ne koristi dati medij, odvojen zarezom.\n"
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - sortira medije na osnovu podstringova odvojenih zarezom.\n"
-
-#: ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-"  --synthesis    - koristi dati synthesis umesto urpmi-jeve baze podataka.\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - koristi dati synthesis umesto urpmi-jeve baze podataka.\n"
-
-#: ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - ne prikazuje identične linije.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - koristi samo update medij.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -verbose       - verbose režim.\n"
-
-#: ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - ignoriše razliku u karakteru u bilo kojoj šemi.\n"
-
-#: ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - ignoriše razliku u karakteru u bilo kojoj šemi.\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - uključuje perl kod direktno kao perl -e.\n"
-
-#: ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - binarni AND operator.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - binarni OR operator.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - uinarni NOT.\n"
-
-#: ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  )              - desna zagrada za zatvaranje grupe izraza.\n"
-
-#: ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Lista podataka za obnavljanje:\n"
-"\n"
-
-#: ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - koristi X interfejs.\n"
-
-#: ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "  -l             - prikazuje fajlove u paketu.\n"
-
-#: ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - prikazuje tag url: url.\n"
-
-#: ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - prikazuje tag buildhost: build host.\n"
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "Modul za podešavanje Konsole"
-
-#: ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts     - prikazuje tag konflikata: svi konflikti.\n"
-
-#: ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description   - prikazuje tag opisa: opis.\n"
-
-#: ../urpmf:67
-#, fuzzy, c-format
-msgid "  --distribution - distribution\n"
-msgstr "Priključak KAB-a za distribucione liste"
-
-#: ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --size          - prikazuje tag veličine: veličina.\n"
-
-#: ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --all           - prikazuje sve tagove.\n"
-
-#: ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - prikazuje fajlove u paketu.\n"
-
-#: ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group         - prikazuje tag grupe: grupa.\n"
-
-#: ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --all           - prikazuje sve tagove.\n"
-
-#: ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --all           - prikazuje sve tagove.\n"
-
-#: ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes     - prikazuje tag višak: svi viškovi (u više reda).\n"
-
-#: ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - prikazuje tag packager: packager.\n"
-
-#: ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides      - prikazuje tag obezbeđuje: sve obezbeđuje.\n"
-
-#: ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires      - prikazuje tag zahteva: svi zahtevi\n"
-
-#: ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size          - prikazuje tag veličine: veličina.\n"
-
-#: ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - prikazuje tag sourcerpm: source rpm.\n"
-
-#: ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes     - prikazuje tag višak: svi viškovi (u više reda).\n"
-
-#: ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary       - prikazuje tag sažetka: sažetak.\n"
-
-#: ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - prikazuje tag url: url.\n"
-
-#: ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  -verbose       - verbose režim.\n"
-
-#: ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - prikazuje fajlove u paketu.\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr ""
-"  -f             - prikazuje verziju, izdanje i arhitekturu, uključujući i "
-"ime.\n"
-
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "koristim dato okruženje na %s\n"
-
-#: ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-
-#: ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "kreiram hdlist simteznu datoteku za medij \"%s\""
-
-#: ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "upisujem listu fajlova za medij \"%s\""
-
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1991,11 +2003,6 @@ msgstr "  --clean        - uklanja rpm iz keša pre bilo čega drugog.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - čuva rpm koji nisu korišćeni u kešu.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - ažuriraj samo medijum za ažuriranje.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2317,7 +2324,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Svejedno nastaviti ?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (D/n) "
@@ -2505,10 +2512,12 @@ msgstr "  --curl         - koristi curl za dobavljanje udaljenih fajlova.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - kreira update medij.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2516,24 +2525,24 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - pokušava da pronađe i koristi synthesis fajl.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  --no-probe     - ne pokušava da pronađe bilo koji synthesis ili\n"
 "                   hdlist fajl.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2542,17 +2551,17 @@ msgstr ""
 "  --distrib      - automatski napravi sve medije sa instalacionog\n"
 "                   medija.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media         - prikazuje listu medija.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2561,91 +2570,91 @@ msgstr ""
 "  --from         - koristi datu url adresu za list mirora, podrazumevano je\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - kreira virtuelni medij koji su uvek ažurirani ,\n"
 "                   dozvoljen je samo file:// protocol.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - deaktivira MD5SUM proveru fajla.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - tihi režim (malo poruka).\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - verbose režim.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, fuzzy, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Samo administrator može da instalira pakete"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "upisujem u konfiguracionu datoteku [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, fuzzy, c-format
 msgid "Can't create config file [%s]"
 msgstr "upisujem u konfiguracionu datoteku [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "nedostaje <relativna putanja hdlist> sa --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "nedostaje <relativna putanja hdlist>\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "ne mogu da pristupim mediju \"%s\""
@@ -2881,13 +2890,13 @@ msgstr "  -f             - primorava na generisanje hdlist fajlova.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Samo administrator može da instalira pakete"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "nema ničega za ažuriranje (koristi urpmi.addmedia za dodavanje medija)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2896,17 +2905,17 @@ msgstr ""
 "nedostaje unos za ažuriranje\n"
 "(jedan od %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Menjam medij \"%s\":"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "uklanjam medij \"%s\""
@@ -3177,6 +3186,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "NIje pronađen image"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - kreira update medij.\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "pogrešan unos: [%s]"
diff --git a/po/sv.po b/po/sv.po
index 147c91cc..ab8ecb7d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-08-01 16:43+0200\n"
 "Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -28,8 +28,7 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../gurpmi:32
-#: ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM installation"
@@ -39,9 +38,7 @@ msgstr "RPM installation"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Fel: kan inte hitta filen %s, avbryter operationen"
 
-#: ../gurpmi:47
-#: ../gurpmi2:166
-#: ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_OK"
@@ -53,7 +50,8 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"You probably didn't want to install it on your computer (installing it would allow you to make modifications to its sourcecode then compile it).\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
 "\n"
 "What would you like to do?"
 msgstr ""
@@ -66,8 +64,7 @@ msgstr ""
 "\n"
 "Vad vill du göra?"
 
-#: ../gurpmi:75
-#: ../gurpmi:86
+#: ../gurpmi:75 ../gurpmi:86
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -107,8 +104,7 @@ msgstr "_Installera"
 msgid "_Save"
 msgstr "_Spara"
 
-#: ../gurpmi:101
-#: ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "Av_bryt"
@@ -118,13 +114,13 @@ msgstr "Av_bryt"
 msgid "Choose location to save file"
 msgstr "Välj var filen ska sparas"
 
-#: ../gurpmi.pm:39
-#: ../urpmi:67
+#: ../gurpmi.pm:39 ../urpmi:67
 #, c-format
 msgid ""
 "urpmi version %s\n"
 "Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -139,42 +135,35 @@ msgstr ""
 msgid "Options:"
 msgstr "Alternativ:"
 
-#: ../gurpmi.pm:46
-#: ../urpme:46
-#: ../urpmf:35
-#: ../urpmi:72
-#: ../urpmi.addmedia:54
-#: ../urpmi.recover:33
-#: ../urpmi.removemedia:40
-#: ../urpmi.update:32
-#: ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - visar det här hjälpmeddelandet.\n"
 
-#: ../gurpmi.pm:47
-#: ../urpmi:79
+#: ../gurpmi.pm:47 ../urpmi:79
 #, c-format
-msgid "  --auto         - non-interactive mode, assume default answers to questions.\n"
-msgstr "  --auto         - ej interaktivt läge. väljer standardsvar på alla frågor.\n"
+msgid ""
+"  --auto         - non-interactive mode, assume default answers to "
+"questions.\n"
+msgstr ""
+"  --auto         - ej interaktivt läge. väljer standardsvar på alla frågor.\n"
 
-#: ../gurpmi.pm:48
-#: ../urpmi:80
-#: ../urpmq:52
+#: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - välj automatiskt paket för att uppdatera systemet.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr ""
+"  --auto-select  - välj automatiskt paket för att uppdatera systemet.\n"
 
-#: ../gurpmi.pm:49
-#: ../urpme:50
-#: ../urpmi:103
-#: ../urpmq:66
+#: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - tvinga användning även om vissa paket inte finns.\n"
 
-#: ../gurpmi.pm:50
-#: ../urpmi:133
+#: ../gurpmi.pm:50 ../urpmi:133
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -183,44 +172,42 @@ msgstr ""
 "  --verify-rpm   - verifiera rpm-signatur före installation (standard)\n"
 "                   (--no-verify-rpm inaktiverar det).\n"
 
-#: ../gurpmi.pm:52
-#: ../urpmf:41
-#: ../urpmi:73
-#: ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - använd endast givet media, separerat med komma.\n"
 
-#: ../gurpmi.pm:53
-#: ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:149
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - tillåt sökning i \"provides\" för att hitta paket.\n"
+msgstr ""
+"  -p             - tillåt sökning i \"provides\" för att hitta paket.\n"
 
-#: ../gurpmi.pm:54
-#: ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:150
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - sök inte i \"provides\" för att hitta paket.\n"
 
-#: ../gurpmi.pm:55
-#: ../urpmi:110
-#: ../urpmq:69
+#: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - använd en annan root för rpm installation.\n"
 
-#: ../gurpmi.pm:56
-#: ../urpmi:135
+#: ../gurpmi.pm:56 ../urpmi:135
 #, c-format
-msgid "  --test         - only verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - verifiera endast om installationen kan utföras korrekt.\n"
+msgid ""
+"  --test         - only verify if the installation can be achieved "
+"correctly.\n"
+msgstr ""
+"  --test         - verifiera endast om installationen kan utföras korrekt.\n"
 
-#: ../gurpmi.pm:57
-#: ../urpmi:76
+#: ../gurpmi.pm:57 ../urpmi:76
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
-msgstr "  --searchmedia  - använd endast givet media för att söka efter valda paket.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
+msgstr ""
+"  --searchmedia  - använd endast givet media för att söka efter valda "
+"paket.\n"
 
 #: ../gurpmi.pm:100
 #, c-format
@@ -237,7 +224,7 @@ msgstr "Var god vänta..."
 msgid "Must be root"
 msgstr "Måste vara root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -248,43 +235,42 @@ msgstr ""
 "%s\n"
 "Vill du fortsätta ändå?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Varning"
 
-#: ../gurpmi2:126
-#: ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (för att uppdatera)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (för att installera)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Val av paket"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Ett av följande paket är nödvändigt:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Avbryt"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -295,65 +281,63 @@ msgstr ""
 "%s\n"
 "Vill du fortsätta ändå?"
 
-#: ../gurpmi2:232
-#: ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
-msgstr "För att tillfredsställa beroenden, kommer följande paket att installeras:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
+msgstr ""
+"För att tillfredsställa beroenden, kommer följande paket att installeras:"
 
-#: ../gurpmi2:233
-#: ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "För att tillfredsställa beroenden kommer följande paket att installeras:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"För att tillfredsställa beroenden kommer följande paket att installeras:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d paket, %d MB)"
 msgstr[1] "(%d paket, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Paketinstallation..."
 
-#: ../gurpmi2:243
-#: ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "kunde inte läsa källan, avbryter"
 
-#: ../gurpmi2:257
-#: ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Förbereder..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installerar paket \"%s\" (%s/%s)..."
 
-#: ../gurpmi2:278
-#: ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Lägg i media med namnet \"%s\" i enhet [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Laddar ner paket \"%s\"..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Klar"
 
-#: ../gurpmi2:316
-#: ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -364,33 +348,28 @@ msgstr ""
 "%s\n"
 "Du bör försöka uppdatera urpmi-databasen."
 
-#: ../gurpmi2:322
-#: ../urpm/main_loop.pm:223
-#: ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259
-#: ../urpm/main_loop.pm:282
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Installationen misslyckades:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Allt är redan installerat"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Installation slutförd"
 
-#: ../gurpmi2:330
-#: ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "tar bort %s"
 
-#: ../gurpmi2:338
-#: ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "startar om urpmi"
@@ -429,8 +408,7 @@ msgstr "                    standard är %s.\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -f             - visa hela rpm namnet (NVRA).\n"
 
-#: ../rurpmi:11
-#: ../urpmi:281
+#: ../rurpmi:11 ../urpmi:281
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Endast systemadministratörer får installera paket"
@@ -465,19 +443,14 @@ msgstr "ogiltigt RPM-filnamn [%s]"
 msgid "retrieving rpm file [%s] ..."
 msgstr "hämtar RPM-fil [%s]..."
 
-#: ../urpm.pm:280
-#: ../urpm/get_pkgs.pm:226
+#: ../urpm.pm:280 ../urpm/get_pkgs.pm:226
 #, c-format
 msgid "...retrieving done"
 msgstr "...hämtning klar"
 
-#: ../urpm.pm:283
-#: ../urpm/download.pm:734
-#: ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824
-#: ../urpm/media.pm:1274
-#: ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...hämtning misslyckades: %s"
@@ -512,73 +485,73 @@ msgstr "fel vid registrering av lokala paket"
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Denna operation är inte tillåten i begränsat läge"
 
-#: ../urpm/args.pm:145
-#: ../urpm/args.pm:154
+#: ../urpm/args.pm:145 ../urpm/args.pm:154
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "felaktig proxydeklaration på kommandorad\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: kan inte läsa rpm-fil \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "Mönster-uttryck:\n"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Signatur saknas (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "oväntat uttryck %s (förslag: använd -a eller -o)"
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "Mönster-uttryck:\n"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
-msgstr "som standard väntar urpmf på en regexp. du borde använda alternativet \"--literal\""
+msgstr ""
+"som standard väntar urpmf på en regexp. du borde använda alternativet \"--"
+"literal\""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot katalog existerar inte"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Kan inte använda %s utan %s"
 
-#: ../urpm/args.pm:486
-#: ../urpm/args.pm:489
-#: ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Kan inte använda %s med %s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "För många argument\n"
 
-#: ../urpm/bug_report.pm:48
-#: ../urpmi:258
+#: ../urpm/bug_report.pm:48 ../urpmi:258
 #, c-format
 msgid "Copying failed"
 msgstr "Kopiering misslyckades"
 
 #: ../urpm/cdrom.pm:66
 #, c-format
-msgid "You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done automatically)"
+msgid ""
+"You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
+"automatically)"
 msgstr ""
 
 #: ../urpm/cdrom.pm:68
@@ -586,8 +559,7 @@ msgstr ""
 msgid "HAL daemon (hald) is not running or not ready"
 msgstr ""
 
-#: ../urpm/cdrom.pm:161
-#: ../urpm/cdrom.pm:166
+#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
 #, c-format
 msgid "medium \"%s\" is not available"
 msgstr "mediat \"%s\" är inte tillgängligt"
@@ -612,9 +584,7 @@ msgstr "kan inte läsa inställningsfil [%s]"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "medium '%s' är definierat två gånger, avbryter"
 
-#: ../urpm/cfg.pm:251
-#: ../urpm/media.pm:486
-#: ../urpm/media.pm:492
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:486 ../urpm/media.pm:492
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "kan inte skriva inställningsfil [%s]"
@@ -766,8 +736,11 @@ msgstr "[ompaketering]"
 
 #: ../urpm/install.pm:175
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "skapade transaktion för installation på %s (ta bort=%d, installera=%d, uppdatera=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"skapade transaktion för installation på %s (ta bort=%d, installera=%d, "
+"uppdatera=%d)"
 
 #: ../urpm/install.pm:178
 #, c-format
@@ -789,8 +762,7 @@ msgstr "kan inte installera paket %s"
 msgid "removing bad rpm (%s) from %s"
 msgstr "tar bort felaktig rpm (%s) från %s"
 
-#: ../urpm/install.pm:218
-#: ../urpm/install.pm:275
+#: ../urpm/install.pm:218 ../urpm/install.pm:275
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "borttagning av %s misslyckades: %s"
@@ -835,8 +807,7 @@ msgstr "Ingen server definierad, uri eller host saknas"
 msgid "No base defined"
 msgstr "Ingen bas definierad"
 
-#: ../urpm/ldap.pm:172
-#: ../urpm/ldap.pm:175
+#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
 #, c-format
 msgid "Cannot connect to ldap uri:"
 msgstr "Kan inte ansluta till ldap uri:"
@@ -856,17 +827,13 @@ msgstr "avbryter"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:110
-#: ../urpm/main_loop.pm:120
-#: ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230
-#: ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
+#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
 #, c-format
 msgid "Installation failed"
 msgstr "Installationen misslyckades"
 
-#: ../urpm/main_loop.pm:112
-#: ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
 #, c-format
 msgid "Try to go on anyway? (y/N) "
 msgstr "Försök fortsätta ändå? (j/N)"
@@ -930,8 +897,7 @@ msgstr "Försök ännu hårdare att installera (--force)? (j/N) "
 msgid "Packages are up to date"
 msgstr "Paket är uppdaterade"
 
-#: ../urpm/main_loop.pm:306
-#: ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Installation är möjlig"
@@ -976,8 +942,7 @@ msgstr "försöker gå förbi befintligt media \"%s\", hoppar över"
 msgid "failed to migrate removable device, ignoring media"
 msgstr ""
 
-#: ../urpm/media.pm:488
-#: ../urpm/media.pm:494
+#: ../urpm/media.pm:488 ../urpm/media.pm:494
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "skriv inställningsfil [%s]"
@@ -994,226 +959,224 @@ msgstr "använder associerad media för parallelläge: %s"
 
 #: ../urpm/media.pm:561
 #, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
-msgstr "--synthesis kan inte användas med --media, --excludemedia, --sortmedia, -- update, --use-distrib eller --parallel"
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update, --use-distrib or --parallel"
+msgstr ""
+"--synthesis kan inte användas med --media, --excludemedia, --sortmedia, -- "
+"update, --use-distrib eller --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Sök början: %s slut: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "hoppar över paket %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "skulle installera istället för att uppdatera paket %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "media \"%s\" finns redan"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(ignorerat som standard)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "lägger till media \"%s\" före fjärrmedia \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "lägger till media \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, fuzzy, c-format
 msgid "directory %s does not exist"
 msgstr "Omgivning sökväg %s existerar inte"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "denna sökväg verkar inte innehålla någon distribution"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "kan inte tyda media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "kan inte läsa distributionsmediat (hittade ingen media.cfg fil)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "ignorerar icke-kompatibelt media '%s' (för %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "hämtar media.cfg fil..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "försöker välja media som inte finns \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "väljer flera media: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "tar bort media \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "omkonfigurerar urpmi för media \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...omkonfigurering misslyckades"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "omkonfigurering utförd"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "mediat \"%s\" är uppdaterat"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "undersöker synthesis-fil [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problem med att läsa synthesis-fil för media \"%s\""
 
-#: ../urpm/media.pm:1163
-#: ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "kopierar [%s] för media \"%s\"..."
 
-#: ../urpm/media.pm:1165
-#: ../urpm/media.pm:1220
-#: ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiering misslyckades"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopierar beskrivningsfil för \"%s\"..."
 
-#: ../urpm/media.pm:1218
-#: ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...kopiering klar"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopiering av [%s] misslyckades (filen är misstänkligt liten)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "beräknar MD5-summa för hämtade syntheses källor"
 
-#: ../urpm/media.pm:1299
-#: ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "hämtning av [%s] misslyckades (md5sum stämmer inte)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2 misslyckades på %s"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "jämför %s och %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "felaktig hdlist-fil %s för media \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "kopierar MD5SUM-fil för \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "ogiltigt RPM-filnamn [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "hämtar käll-synthesis för \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "hittat undersökt synthesis som %s"
 
-#: ../urpm/media.pm:1472
-#: ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "ingen synthesis-fil hittad för media \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "undersöker \"pubkey\"-fil för \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importerarde nyckel %s från \"pubkey\"-fil av \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "kunde inte importera \"pubkey\"-fil för \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "uppdaterade media %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "hämtning av [%s] misslyckades"
@@ -1238,21 +1201,14 @@ msgstr "hittade geolokalisering %s %.2f %.2f från tidszon %s"
 msgid "getting mirror list from %s"
 msgstr "hämtar spegel-lista från %s"
 
-#: ../urpm/msg.pm:63
-#: ../urpmi:514
-#: ../urpmi:529
-#: ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64
-#: ../urpme:38
-#: ../urpmi:568
-#: ../urpmi:663
-#: ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "JjYy"
@@ -1317,16 +1273,19 @@ msgstr "MB"
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:190
-#: ../urpm/msg.pm:199
+#: ../urpm/msg.pm:190 ../urpm/msg.pm:199
 #, c-format
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
-msgid "The following package is now orphan, use \"urpme --auto-orphans\" to remove it."
-msgid_plural "The following packages are now orphans, use \"urpme --auto-orphans\" to remove them."
+msgid ""
+"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
+"it."
+msgid_plural ""
+"The following packages are now orphans, use \"urpme --auto-orphans\" to "
+"remove them."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -1382,7 +1341,9 @@ msgstr ""
 
 #: ../urpm/parallel_ssh.pm:86
 #, c-format
-msgid "%s failed on host %s (maybe it does not have a good version of urpmi?) (exit code: %d)"
+msgid ""
+"%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
+"code: %d)"
 msgstr ""
 
 #: ../urpm/removable.pm:32
@@ -1390,8 +1351,7 @@ msgstr ""
 msgid "unable to access medium \"%s\"."
 msgstr "kunde inte komma åt media \"%s\""
 
-#: ../urpm/removable.pm:72
-#: ../urpm/removable.pm:90
+#: ../urpm/removable.pm:72 ../urpm/removable.pm:90
 #, c-format
 msgid "mounting %s"
 msgstr "monterar %s"
@@ -1401,287 +1361,13 @@ msgstr "monterar %s"
 msgid "unmounting %s"
 msgstr "avmonterar %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "urpmi startades om, och listan av prioriterade paket ändrades inte"
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi startades om, och listan av prioriterade paket ändrades: %s mot %s"
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Inget paket med namn %s"
-
-#: ../urpm/select.pm:193
-#: ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Följande paket innehåller %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Paketen %s kan inte installeras"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Paket %s är redan installerat"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Paketen %s är redan installerade"
-
-#: ../urpm/select.pm:558
-#: ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "för att %s saknas"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "på grund av redan installerad %s"
-
-#: ../urpm/select.pm:560
-#: ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "på grund av otillräckliga %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "försöker befordra %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "för att behålla %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "för att installera %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "på grund av konflikter med %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Ogiltig signatur (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Ogiltigt nyckel-id (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Signatur saknas (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr "system"
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr "Du borde starta om %s för %s"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't write file"
-msgstr "Kan inte skriva fil"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "Kan inte öppna fil"
-
-#: ../urpm/sys.pm:289
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "Kan inte flytta fil %s till %s"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Det här är fri programvara och får distribueras enligt villkoren i GNU GPL\n"
-"\n"
-"användning:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - välj automatiskt ett paket från valen.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - verifiera om borttagningen kan utföras korrekt.\n"
-
-#: ../urpme:51
-#: ../urpmi:109
-#: ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - distribuerad urpmi över alla maskiner med alias.\n"
-
-#: ../urpme:52
-#: ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - ompaketera filerna före avinstallation\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - använd en annan root för att ta bort rpm .\n"
-
-#: ../urpme:54
-#: ../urpmf:40
-#: ../urpmi:111
-#: ../urpmi.addmedia:71
-#: ../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   - använd en annan rot för db & rpm installation.\n"
-
-#: ../urpme:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - kör inga skript i paket(en).\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - konfigurera urpmi 'on the fly' från ett distributionsträd, användbart\n"
-"                   vid (av)installation av chroot med --root option.\n"
-
-#: ../urpme:58
-#: ../urpmi:152
-#: ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - utförligt läge.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - välj alla paket som matchar uttryck.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Endast systemadministratör får ta bort paket"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "okända paket"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "okänt paket"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "att ta bort paketet %s skulle förstöra systemet"
-msgstr[1] "att ta bort paketet %s skulle förstöra systemet"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Ingenting att ta bort"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Ingenting att ta bort"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "För att tillfredsställa beroenden kommer följande paket att tas bort"
-msgstr[1] "För att tillfredsställa beroenden kommer följande %d paket att tas bort"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "okänt paket"
-msgstr[1] "okänt paket"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Ta bort %d paket?"
-msgstr[1] "Ta bort %d paket?"
-
-#: ../urpme:159
-#: ../urpmi:569
-#: ../urpmi:664
-#: ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (j/N) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "tar flyttbar enhet som \"%s\""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Borttagning misslyckades"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Borttagning misslyckades"
-
-#: ../urpmf:29
+#: ../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"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage: urpmf [options] pattern-expression\n"
 msgstr ""
@@ -1691,291 +1377,561 @@ msgstr ""
 "\n"
 "användning:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - visa detta verktygs versionsnummer.\n"
 
-#: ../urpmf:37
-#: ../urpmi:132
-#: ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - använd specifik miljö (vanligen en felrapport).\n"
 
-#: ../urpmf:38
-#: ../urpmi:74
-#: ../urpmq:49
+#: ../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 - använd inte givet media, separerat med komma.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
-msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr "  --literal, -l  - sök inte mönster, använd argument som söksträng.\n"
 
-#: ../urpmf:42
-#: ../urpmi:77
-#: ../urpmq:50
+#: ../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 "  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - sorterar media enligt kommaseparerade delsträngar.\n"
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --urpmi-root   - använd en annan rot för db & rpm installation.\n"
 
-#: ../urpmf:43
+#: ../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    - sorterar media enligt kommaseparerade delsträngar.\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - använd angiven sökväg för att nå media\n"
 
-#: ../urpmf:44
-#: ../urpmi:78
-#: ../urpmq:51
+#: ../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    - använd given synthesis istället för urpmi db.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - visa inte identiska rader.\n"
 
-#: ../urpmf:46
-#: ../urpmi:75
-#: ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - använd endast uppdateringsmedia.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose             - utförligt läge.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - versaler och gemener jämförs lika i varje mönster.\n"
+msgstr ""
+"  -i             - versaler och gemener jämförs lika i varje mönster.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -I             - versaler och gemener jämförs olika i varje mönster.\n"
+msgstr ""
+"  -I             - versaler och gemener jämförs olika i varje mönster.\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<str>        - ändra fältavgränsare (standard ':').\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Mönster-uttryck:\n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr "  text           - vilken text som helst används för att söka, om inte -l är använt.\n"
+msgstr ""
+"  text           - vilken text som helst används för att söka, om inte -l är "
+"använt.\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - inkludera perl-kod direkt som perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - binär AND operator.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - binär OR operator.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - unär NOT.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - vänster och höger parentes.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr ""
 "Lista på taggar:\n"
 "\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - använd printf-likt visningsformat\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   exempel: '%%namn:%%files'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - arkitektur\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - kompileringsmaskin\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - kompilerigstid\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - konfigurationsfiler\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - visa konflikter\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - visa paketbeskrivning\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - visa distribution\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - visa epok\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - paketets filnamn\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - lista filer i paketet\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - visa grupp\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - licens\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - visa paketnamn\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - visa ersätter\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - visa paketerare\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - visa tillhandahålls\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - visa krav\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - visa installerad storlek\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - visa källrpm-namn\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - suggests tag\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - visa summerig\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - visa url\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - visa distributör\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - visa källan paketet finns i\n"
 
-#: ../urpmf:85
-#: ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - visa version, utgåva och arkitektur med namn.\n"
 
-#: ../urpmf:153
-#, fuzzy, c-format
-msgid "unterminated expression (%s)"
-msgstr "Mönster-uttryck:\n"
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Felaktigt format: du kan endast använda en flervals-tagg"
 
-#: ../urpmf:248
-#: ../urpmi:265
-#: ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "använder specifik miljö på %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "ingen hdlist-fil tillgänglig för media \"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "ingen synthesis-fil tillgänglig för media \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "ingen xml-info tillgänglig för media \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr "urpmi startades om, och listan av prioriterade paket ändrades inte"
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi startades om, och listan av prioriterade paket ändrades: %s mot %s"
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Inget paket med namn %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Följande paket innehåller %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Paketen %s kan inte installeras"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Paket %s är redan installerat"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Paketen %s är redan installerade"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "för att %s saknas"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "på grund av redan installerad %s"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "på grund av otillräckliga %s"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "försöker befordra %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "för att behålla %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "för att installera %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "på grund av konflikter med %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Ogiltig signatur (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Ogiltigt nyckel-id (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Signatur saknas (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr "system"
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr "Du borde starta om %s för %s"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't write file"
+msgstr "Kan inte skriva fil"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "Kan inte öppna fil"
+
+#: ../urpm/sys.pm:289
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "Kan inte flytta fil %s till %s"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Det här är fri programvara och får distribueras enligt villkoren i GNU GPL\n"
+"\n"
+"användning:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - välj automatiskt ett paket från valen.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - verifiera om borttagningen kan utföras korrekt.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - distribuerad urpmi över alla maskiner med alias.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - ompaketera filerna före avinstallation\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - använd en annan root för att ta bort rpm .\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --justdb       - updatera endast rpm db, inte filsystemet\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - kör inga skript i paket(en).\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - konfigurera urpmi 'on the fly' från ett "
+"distributionsträd, användbart\n"
+"                   vid (av)installation av chroot med --root option.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - utförligt läge.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - välj alla paket som matchar uttryck.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Endast systemadministratör får ta bort paket"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "okända paket"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "okänt paket"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "att ta bort paketet %s skulle förstöra systemet"
+msgstr[1] "att ta bort paketet %s skulle förstöra systemet"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Ingenting att ta bort"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Ingenting att ta bort"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"För att tillfredsställa beroenden kommer följande paket att tas bort"
+msgstr[1] ""
+"För att tillfredsställa beroenden kommer följande %d paket att tas bort"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "okänt paket"
+msgstr[1] "okänt paket"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Ta bort %d paket?"
+msgstr[1] "Ta bort %d paket?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (j/N) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "tar flyttbar enhet som \"%s\""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Borttagning misslyckades"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Borttagning misslyckades"
+
+#: ../urpmf:153
+#, fuzzy, c-format
+msgid "unterminated expression (%s)"
+msgstr "Mönster-uttryck:\n"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1996,30 +1952,33 @@ msgstr "  --force-key    - tvinga uppdatering av gpg-nyckel.\n"
 msgid "  --auto-orphans - remove orphans without asking\n"
 msgstr ""
 
-#: ../urpmi:85
-#: ../urpmq:54
+#: ../urpmi:85 ../urpmq:54
 #, c-format
 msgid "  --no-suggests  - do not auto select \"suggested\" packages.\n"
 msgstr "  --no-suggests  - välj inte \"föreslagna\" paket automatiskt.\n"
 
 #: ../urpmi:86
 #, c-format
-msgid "  --no-uninstall - never ask to uninstall a package, abort the installation.\n"
-msgstr "  --no-uninstall - fråga aldrig om ett paket ska avinstalleras, avbryt installationen.\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr ""
+"  --no-uninstall - fråga aldrig om ett paket ska avinstalleras, avbryt "
+"installationen.\n"
 
 #: ../urpmi:87
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - installera inte paket (endast nedladdning)\n"
 
-#: ../urpmi:88
-#: ../urpmq:56
+#: ../urpmi:88 ../urpmq:56
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
 msgstr ""
-"  --keep         - behåll om möjligt existerande paket, ignorera efterfrågade \n"
+"  --keep         - behåll om möjligt existerande paket, ignorera "
+"efterfrågade \n"
 "                   paket som leder till avinstalleringar.\n"
 
 #: ../urpmi:90
@@ -2063,15 +2022,12 @@ msgstr "  --clean        - ta bort rpm från cache före allt annat.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - rensa inte rpms från cache.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       - updatera endast rpm db, inte filsystemet\n"
-
 #: ../urpmi:102
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
-msgstr "  --replacepkgs  - tvinga installation av paket som redan är installerade.\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
+msgstr ""
+"  --replacepkgs  - tvinga installation av paket som redan är installerade.\n"
 
 #: ../urpmi:104
 #, c-format
@@ -2102,12 +2058,11 @@ msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
 msgstr ""
-"  --use-distrib  - konfigurera urpmi 'on the fly' från ett distributionsträd, användbart\n"
+"  --use-distrib  - konfigurera urpmi 'on the fly' från ett "
+"distributionsträd, användbart\n"
 "                   vid installation av chroot med --root option.\n"
 
-#: ../urpmi:114
-#: ../urpmi.addmedia:59
-#: ../urpmi.update:37
+#: ../urpmi:114 ../urpmi.addmedia:59 ../urpmi.update:37
 #, c-format
 msgid "  --metalink     - generate and use a local metalink.\n"
 msgstr ""
@@ -2146,9 +2101,7 @@ msgstr "  --prozilla-options - tilläggsalternativ för prozilla\n"
 msgid "  --aria2-options - additional options to pass to aria2\n"
 msgstr "  --aria2-options - tilläggsalternativ för aria2\n"
 
-#: ../urpmi:123
-#: ../urpmi.addmedia:60
-#: ../urpmi.update:38
+#: ../urpmi:123 ../urpmi.addmedia:60 ../urpmi.update:38
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - begränsa nedladdningshastigheten.\n"
@@ -2160,24 +2113,20 @@ msgid ""
 "                   (--no-resume disables it, default is disabled).\n"
 msgstr ""
 "  --resume       - återuppta nedladdning av delvis nedladdade filer\n"
-"                   (--no-resume inaktiverar det, som standard är det inaktiverat).\n"
+"                   (--no-resume inaktiverar det, som standard är det "
+"inaktiverat).\n"
 
-#: ../urpmi:126
-#: ../urpmi.addmedia:61
-#: ../urpmi.update:39
-#: ../urpmq:76
+#: ../urpmi:126 ../urpmi.addmedia:61 ../urpmi.update:39 ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
 msgstr ""
 "  --proxy        - använd specificerad HTTP-proxy, portnumret antas\n"
-"                   vara 1080 som standard (formatet är <proxydator[:port]>).\n"
+"                   vara 1080 som standard (formatet är <proxydator[:port]"
+">).\n"
 
-#: ../urpmi:128
-#: ../urpmi.addmedia:63
-#: ../urpmi.update:41
-#: ../urpmq:78
+#: ../urpmi:128 ../urpmi.addmedia:63 ../urpmi.update:41 ../urpmq:78
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2213,7 +2162,8 @@ msgstr "  --ignoresize   - kontrollera inte diskutrymme före installation.\n"
 #: ../urpmi:139
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
-msgstr "  --ignorearch   - tillåt installation av rpm som inte matchar arkitektur.\n"
+msgstr ""
+"  --ignorearch   - tillåt installation av rpm som inte matchar arkitektur.\n"
 
 #: ../urpmi:140
 #, c-format
@@ -2249,8 +2199,7 @@ msgstr "  --nolock       - lås inte rpm db.\n"
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - uppdatera endast paket med samma arkitektur.\n"
 
-#: ../urpmi:148
-#: ../urpmq:97
+#: ../urpmi:148 ../urpmq:97
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - välj alla träffar på kommandoraden.\n"
@@ -2301,13 +2250,20 @@ msgstr ""
 
 #: ../urpmi:232
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "vänligen använd --buildrequires eller --install-src, använder --buildrequires som standard"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"vänligen använd --buildrequires eller --install-src, använder --"
+"buildrequires som standard"
 
 #: ../urpmi:252
 #, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
-msgstr "Katalogen [%s] finns redan, välj en annan katalog för felrapport eller radera den"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
+msgstr ""
+"Katalogen [%s] finns redan, välj en annan katalog för felrapport eller "
+"radera den"
 
 #: ../urpmi:253
 #, c-format
@@ -2359,7 +2315,9 @@ msgstr "%s (för att installera)"
 
 #: ../urpmi:462
 #, c-format
-msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
+msgid ""
+"In order to satisfy the '%s' dependency, one of the following packages is "
+"needed:"
 msgstr "För att tillfredsställa beroendet '%s', ett av följande paket behövs:"
 
 #: ../urpmi:465
@@ -2389,8 +2347,7 @@ msgstr ""
 "är äldre än de installerade paketen:\n"
 "%s"
 
-#: ../urpmi:515
-#: ../urpmi:530
+#: ../urpmi:515 ../urpmi:530
 #, c-format
 msgid ""
 "\n"
@@ -2399,10 +2356,7 @@ msgstr ""
 "\n"
 "Fortsätt installation ändå?"
 
-#: ../urpmi:516
-#: ../urpmi:531
-#: ../urpmi:628
-#: ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (J/n) "
@@ -2478,18 +2432,22 @@ msgstr "(endast test, ingenting kommer att bli borttaget)"
 #: ../urpmi:583
 #, c-format
 msgid ""
-"You must first call urpmi with --buildrequires to install the following dependencies:\n"
+"You must first call urpmi with --buildrequires to install the following "
+"dependencies:\n"
 "%s\n"
 msgstr ""
-"Du måste först använda urpmi --buildqequires för att installera följande beroenden:\n"
+"Du måste först använda urpmi --buildqequires för att installera följande "
+"beroenden:\n"
 "%s\n"
 
 #: ../urpmi:594
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
-msgstr[0] "För att tillfredsställa beroenden kommer följande paket att tas bort"
-msgstr[1] "För att tillfredsställa beroenden kommer följande %d paket att tas bort"
+msgstr[0] ""
+"För att tillfredsställa beroenden kommer följande paket att tas bort"
+msgstr[1] ""
+"För att tillfredsställa beroenden kommer följande %d paket att tas bort"
 
 #: ../urpmi:610
 #, c-format
@@ -2561,7 +2519,8 @@ msgstr ""
 "       removable://<sökväg>\n"
 "\n"
 "usage: urpmi.addmedia [flaggor] --distrib --mirrorlist <address>\n"
-"usage: urpmi.addmedia [flaggor] --mirrorlist <address> <namn> <relativ sökväg>\n"
+"usage: urpmi.addmedia [flaggor] --mirrorlist <address> <namn> <relativ "
+"sökväg>\n"
 "\n"
 "exempel:\n"
 "\n"
@@ -2571,63 +2530,60 @@ msgstr ""
 "\n"
 "och [flaggor] är från\n"
 
-#: ../urpmi.addmedia:55
-#: ../urpmi.update:33
-#: ../urpmq:73
+#: ../urpmi.addmedia:55 ../urpmi.update:33 ../urpmq:73
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - använd wget för att hämta fjärrfiler.\n"
 
-#: ../urpmi.addmedia:56
-#: ../urpmi.update:34
-#: ../urpmq:74
+#: ../urpmi.addmedia:56 ../urpmi.update:34 ../urpmq:74
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - använd curl för att hämta fjärrfiler.\n"
 
-#: ../urpmi.addmedia:57
-#: ../urpmi.update:35
-#: ../urpmq:75
+#: ../urpmi.addmedia:57 ../urpmi.update:35 ../urpmq:75
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --prozilla     - använd prozilla för att hämta fjärr-filer.\n"
 
-#: ../urpmi.addmedia:58
-#: ../urpmi.update:36
+#: ../urpmi.addmedia:58 ../urpmi.update:36
 #, c-format
 msgid "  --aria2        - use aria2 to retrieve distant files.\n"
 msgstr "  --curl         - använd aria2 för att hämta fjärrfiler.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - skapa ett uppdateringsmedia.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
-"                   one of: never, on-demand, update-only, always. cf urpmi.cfg(5)\n"
+"                   one of: never, on-demand, update-only, always. cf urpmi."
+"cfg(5)\n"
 msgstr ""
 "  --xml-info     - använd specifik policy för hämtning av xml info-filer\n"
-"                   en av: never, on-demand, update-only, always. se urpmi.cfg(5)\n"
+"                   en av: never, on-demand, update-only, always. se urpmi.cfg"
+"(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - använd synthesis fil.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - använd rpm filer (i stället för synthesis).\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - försök ej hitta någon synthesis-fil.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2636,96 +2592,93 @@ msgstr ""
 "  --distrib      - skapa automatiskt all media från ett\n"
 "                 installationsmedia.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr "  --interactive  - med --distrib, begär bekräftelse för varje källa\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - med --distrib, lägg till alla listade källor\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
-"  --from         - använd specificerad url för en lista av speglingar, standard är\n"
+"  --from         - använd specificerad url för en lista av speglingar, "
+"standard är\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr "  --virtual      - skapa virtuellt media som alltid är uppdaterat\n"
 
-#: ../urpmi.addmedia:79
-#: ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - inaktivera md5sum-kontroll av filer.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - importera inte pubkey för adderat media\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
-msgstr "  --raw          - lägg till mediat i config, men uppdatera inte det.\n"
+msgstr ""
+"  --raw          - lägg till mediat i config, men uppdatera inte det.\n"
 
-#: ../urpmi.addmedia:82
-#: ../urpmi.removemedia:43
-#: ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - tyst läge.\n"
 
-#: ../urpmi.addmedia:83
-#: ../urpmi.removemedia:44
-#: ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - utförligt läge.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "kända xml-info policyn är %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "inget argument behövs för --distrib --mirrorlist <address>"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "felaktig <address> (för lokal katalog måste sökvägen vara absolut)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Endast systemadministratörer får lägga till media"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "skapar inställningsfil [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Kan inte skapa inställningsfil [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "behöver inte ange <relativ sökväg till synthesis> med --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
@@ -2734,17 +2687,17 @@ msgstr ""
 "\n"
 "Vill du lägga till källa '%s'"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<relativ sökväg till synthesis> saknas\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Kan inte använda %s med fjärr-media"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "kunde inte lägga till media"
@@ -2754,7 +2707,8 @@ msgstr "kunde inte lägga till media"
 msgid ""
 "urpmi.recover version %s\n"
 "Copyright (C) 2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -2772,12 +2726,15 @@ msgstr "  --checkpoint   - sätt ompaketeringsstart nu\n"
 #: ../urpmi.recover:35
 #, c-format
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
-msgstr "  --noclean      - rensa inte ompaketeringskatalog vid kontrollpunkt.\n"
+msgstr ""
+"  --noclean      - rensa inte ompaketeringskatalog vid kontrollpunkt.\n"
 
 #: ../urpmi.recover:37
 #, c-format
-msgid "  --list         - list transactions since provided date/duration argument\n"
-msgstr "  --list         - lista transaktioner efter angivet datum/period argument\n"
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
+msgstr ""
+"  --list         - lista transaktioner efter angivet datum/period argument\n"
 
 #: ../urpmi.recover:38
 #, c-format
@@ -2865,8 +2822,7 @@ msgstr "Ingen transaktion hittad sedan %s\n"
 msgid "You must be superuser to do this"
 msgstr "Du måste ha administratörsrättigheter för att göra detta"
 
-#: ../urpmi.recover:143
-#: ../urpmi.recover:209
+#: ../urpmi.recover:143 ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "Skriver rpm makro fil [%s]...\n"
@@ -2978,12 +2934,12 @@ msgstr "  -ff            - hård-tvinga uppdatering av synthesis\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Endast systemadministratör får uppdatera media"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "inget att uppdatera (använd urpmi.addmedia för att lägga till media)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2992,17 +2948,17 @@ msgstr ""
 "objektet som ska uppdateras saknas\n"
 "(en av %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "ignorerar media %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "aktiverar media %s"
@@ -3012,7 +2968,8 @@ msgstr "aktiverar media %s"
 msgid ""
 "urpmq version %s\n"
 "Copyright (C) 2000-2006 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -3024,8 +2981,12 @@ msgstr ""
 
 #: ../urpmq:48
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested (or updated) packages.\n"
-msgstr "  --searchmedia  - använd endast givet media för att söka efter valda (eller uppdaterade) paket.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested (or updated) "
+"packages.\n"
+msgstr ""
+"  --searchmedia  - använd endast givet media för att söka efter valda (eller "
+"uppdaterade) paket.\n"
 
 #: ../urpmq:53
 #, c-format
@@ -3055,7 +3016,8 @@ msgstr "  --list-url     - lista tillgänglig media och dess sökväg.\n"
 #: ../urpmq:61
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - visa tillgängliga noder vid användning av --parallel.\n"
+msgstr ""
+"  --list-nodes   - visa tillgängliga noder vid användning av --parallel.\n"
 
 #: ../urpmq:62
 #, c-format
@@ -3064,8 +3026,10 @@ msgstr "  --list-aliases - lista tillgängliga parallellalias.\n"
 
 #: ../urpmq:63
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr "  --dump-config  - dumpa konfigurationen i form av urpmi.addmedia argument.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr ""
+"  --dump-config  - dumpa konfigurationen i form av urpmi.addmedia argument.\n"
 
 #: ../urpmq:64
 #, c-format
@@ -3074,13 +3038,16 @@ msgstr "  --src          - nästa paket är ett källpaket (samma som -s).\n"
 
 #: ../urpmq:65
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr "  --sources      - ge alla källpaket före nedladdning (endast root).\n"
 
 #: ../urpmq:67
 #, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
-msgstr "  --ignorearch   - tillåt sökande för rpm-paket som inte motsvarar arkitekturen.\n"
+msgstr ""
+"  --ignorearch   - tillåt sökande för rpm-paket som inte motsvarar "
+"arkitekturen.\n"
 
 #: ../urpmq:71
 #, c-format
@@ -3088,7 +3055,8 @@ msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
 msgstr ""
-"  --use-distrib  - konfigurera urpmi 'on the fly' från ett distributionsträd.\n"
+"  --use-distrib  - konfigurera urpmi 'on the fly' från ett "
+"distributionsträd.\n"
 "                   Detta tillåter kontroll av distribution.\n"
 
 #: ../urpmq:81
@@ -3166,7 +3134,8 @@ msgstr ""
 #: ../urpmq:98
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - fullständig utmatning med paketet som ska tas bort.\n"
+msgstr ""
+"  -c             - fullständig utmatning med paketet som ska tas bort.\n"
 
 #: ../urpmq:100
 #, c-format
@@ -3176,7 +3145,9 @@ msgstr "  -g             - visa grupper med namn.\n"
 #: ../urpmq:101
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
-msgstr "  -i             - visa användbar information i en för människan läsbar form.\n"
+msgstr ""
+"  -i             - visa användbar information i en för människan läsbar "
+"form.\n"
 
 #: ../urpmq:102
 #, c-format
@@ -3200,8 +3171,11 @@ msgstr "  -s             - nästa paket är ett källpaket (samma som --src).\n"
 
 #: ../urpmq:106
 #, c-format
-msgid "  -u             - remove package if a more recent version is already installed.\n"
-msgstr "  -u             - ta bort paket om en nyare version redan är installerad.\n"
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr ""
+"  -u             - ta bort paket om en nyare version redan är installerad.\n"
 
 #: ../urpmq:107
 #, c-format
@@ -3211,7 +3185,9 @@ msgstr "  -y             - kräv luddig sökning (samma som --fuzzy).\n"
 #: ../urpmq:108
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
-msgstr "  -Y             - som -y, fast tvingar matchning av stora och små bokstäver.\n"
+msgstr ""
+"  -Y             - som -y, fast tvingar matchning av stora och små "
+"bokstäver.\n"
 
 #: ../urpmq:109
 #, c-format
@@ -3236,42 +3212,56 @@ msgstr ""
 #: ../urpmq:404
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
-msgstr "ingen xml-info för media \"%s\", endast ofullständigt resultat för paketet %s"
+msgstr ""
+"ingen xml-info för media \"%s\", endast ofullständigt resultat för paketet %s"
 
 #: ../urpmq:405
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for packages %s"
-msgstr "ingen xml-info för media \"%s\", endast ofullständigt resultat för paketen %s"
+msgstr ""
+"ingen xml-info för media \"%s\", endast ofullständigt resultat för paketen %s"
 
 #: ../urpmq:408
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "ingen xml-info för media \"%s\", kan inte returnera resultat för paketet %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"ingen xml-info för media \"%s\", kan inte returnera resultat för paketet %s"
 
 #: ../urpmq:409
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
-msgstr "ingen xml-info för media \"%s\", kan inte returnera resultat för paketen %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"ingen xml-info för media \"%s\", kan inte returnera resultat för paketen %s"
 
 #: ../urpmq:473
 #, c-format
 msgid "No changelog found\n"
 msgstr "Ingen ändringslogg hittades\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - skapa ett uppdateringsmedia.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "felaktig sökväg: [%s]"
+
 #~ msgid "sorry, you can't use --install-src to install remote .src.rpm files"
 #~ msgstr ""
 #~ "tyvärr, du kan inte använda --install-src för att installera fjärr src."
 #~ "rpm filer"
+
 #~ msgid "%d installation transaction failed"
 #~ msgid_plural "%d installation transactions failed"
 #~ msgstr[0] "%d installationstransaktion misslyckades"
 #~ msgstr[1] "%d installationstransaktioner misslyckades"
+
 #~ msgid "Package %s can not be installed"
 #~ msgstr "Paket %s kan inte installeras"
+
 #~ msgid "Checking to remove the following packages"
 #~ msgstr "Kontrollerar för att ta bort följande paket"
+
 #~ msgid "%s database locked"
 #~ msgstr "%s databas låst"
 
@@ -3282,20 +3272,27 @@ msgstr "Ingen ändringslogg hittades\n"
 #~ msgstr ""
 #~ "  --auto         - ej interaktivt läge. väljer standardsvar på alla "
 #~ "frågor.\n"
+
 #~ msgid "Unknown option %s"
 #~ msgstr "Okända flagga %s"
+
 #~ msgid "too many mount points for removable medium \"%s\""
 #~ msgstr "för många monteringspunkter för flyttbar media \"%s\""
+
 #~ msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
 #~ msgstr ""
 #~ "Meia \"%s\" är en ISO avbild, den kommer att monteras automatiskt vid "
 #~ "behov."
+
 #~ msgid "using different removable device [%s] for \"%s\""
 #~ msgstr "använder annan flyttbar enhet [%s] för \"%s\""
+
 #~ msgid "unable to retrieve pathname for removable medium \"%s\""
 #~ msgstr "Kunde inte hämta sökväg för flyttbart media \"%s\""
+
 #~ msgid "unable to mount the distribution medium"
 #~ msgstr "kan inte montera distributionsmediat"
+
 #~ msgid ""
 #~ "unable to access medium \"%s\",\n"
 #~ "this could happen if you mounted manually the directory when creating the "
@@ -3304,9 +3301,10 @@ msgstr "Ingen ändringslogg hittades\n"
 #~ "Kan inte läsa media \"%s\",\n"
 #~ "detta kan hända om du manuellt monterade katalogen när du skapade detta "
 #~ "media."
+
 #~ msgid "inconsistent medium \"%s\" marked removable but not really"
 #~ msgstr ""
 #~ "Felkonfigurerat media \"%s\" är markerat som flyttbart men är inte det"
+
 #~ msgid "  -c             - clean headers cache directory.\n"
 #~ msgstr "  -c             - rensa huvudcachekatalogen.\n"
-
diff --git a/po/tg.po b/po/tg.po
index 1d501d86..994d5f5a 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-tg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2005-09-17 16:34+0500\n"
 "Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
 "Language-Team: Tajik\n"
@@ -25,7 +25,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Коргузориши RPM"
@@ -35,7 +35,7 @@ msgstr "Коргузориши RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ок"
@@ -104,7 +104,7 @@ msgstr "_Коргузорӣ"
 msgid "_Save"
 msgstr "_Нигоҳ доштан"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Бекор кардан"
@@ -136,8 +136,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - чопи ин пайғоми ёрӣ.\n"
@@ -175,7 +176,7 @@ msgstr ""
 "                   (--no-verify-rpm онро хомӯш намоед, дохил шудааст аз "
 "рӯипешфарз).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -229,7 +230,7 @@ msgstr "Интизор бошед..."
 msgid "Must be root"
 msgstr "Даргоҳи муш"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -239,42 +240,42 @@ msgstr ""
 "Якчанд барномаҳои коромода коргузорӣ нахоҳанд шуд:\n"
 "%s"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Огоҳӣ"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr "Афзоиш"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "Коргузорӣ ба итмом расид"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Яке аз қуттиҳои зерин даркор аст:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Қатъ кардан"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -285,63 +286,63 @@ msgstr ""
 "%s\n"
 "Шумо розӣ ҳастед?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "Барои қаноатмандии тобеиятҳо бастаҳои зерин кор гузошта мешаванд (%d Мб)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Барои қаноатмандии тобеиятҳо бастаҳои %d зерин кор гузошта мешаванд (%d МБ)"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "барномаи коромода насб мегардад..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "қуттиҳои сарчашмавӣ гирифтан номумкин, кандашавӣ"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Тайёрӣ..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Барномаи коромодаи `%s' (%s/%s) коргузорӣ мешавад..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Лутфан муҳити бо номи \"%s\" ба дастгоҳи [%s] дароред"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Фаровири қуттии `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Шуд"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -352,28 +353,28 @@ msgstr ""
 "%s\n"
 "Мумкин шумо додаҳои urpmi-ро нав мекунед"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Коргузорӣ нагузашт"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Ҳамааш аллакай кор гузошта шудааст"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Коргузориш шуд"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "хориҷи қуттии %s "
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi бозоғоз шуда истодааст"
@@ -453,8 +454,8 @@ msgid "...retrieving done"
 msgstr "...барқароркунӣ шуд"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...барқароркунӣ нагузашт: %s"
@@ -494,52 +495,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr "дар сатри фармонӣ proxy нодуруст нишон дода шудааст\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: хондани файли rpm \"%s\" намешавад\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Имзо мавҷуд нест (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -965,219 +966,219 @@ msgstr ""
 "--synthesis бо --media, --excludemedia, --sortmedia, --update ё --parallel "
 "истифода бурда намешавад"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, fuzzy, c-format
 msgid "Search start: %s end: %s"
 msgstr "Кофтукови рамзҳои муқарраршуда"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "қуттӣ парофта мешавад %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "ба ҷои аз нав намудани қуттӣ коргузорӣ амалӣ хоҳад шуд %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "муҳити \"%s\" аллакай вуҷуд дорад"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "хониши сарлавҳаҳо аз миёнаи \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "хориҷкунии миёнаи \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "кушодани rpmdb номумкин"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "дохилшавӣ ба миёнаи коргузориши аввала номумкин (файли hdlists ёфт нашуд)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "барқароркунии файли hdlists..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "кӯшиши интихоби муҳити вуҷуд надоштаи \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "интихобкунии миёнаи бисёр: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "хориҷкунии миёнаи \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "бозтанзимкунии urpmi барои миёнаи \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...бозтанзимкунӣ бо нокомӣ анҷомид"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "бозтанзимгузорӣ хотима ёфт"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "муҳити \"%s\" интихоб нашудааст"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "санҷидани файли synthesis [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "муаммои хондани файли synthesis-и муҳити \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "навиштани файли рӯйхат барои миёнаи \"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...нусхабардорӣ нагузашт"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "нусхабардории файли тавсифоти \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...нусхабардорӣ шуд"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "нусхабардории [%s] бо нокомӣ анҷомид (файл шубҳаомез кӯтоҳ аст)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr ""
 "аз hdlist-и аввалаи гирифташуда md5sum ҳисоб карда мешавад(ё ин ки synthesis)"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "нусхабардории [%s] бо нокомӣ анҷомид (ба md5sum мутобиқат намекунад)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "санҷидани файли hdlist [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "коргузории %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "нусхабардории файли тавсифоти \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "номи файли rpm-и нодурусти [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "барқароркунии сарчашмаи hdlist (ё synthesis) \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "hdlist (ё synthesis)-и таҳқиқшуда ёфт шуд ҳамчун %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "барои \"%s\"файли калиди кушод тафтиш карда мешавад..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...калиди гирифта шуда %s  аз файли калиди кушода \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "навиштани файли рӯйхатии \"%s\" номумкин"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "миёнаи иловашуда %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1209,7 +1210,7 @@ msgstr "НнNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "ҲҳYy"
@@ -1279,7 +1280,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1362,278 +1363,7 @@ msgstr "васлкунии %s"
 msgid "unmounting %s"
 msgstr "ҷудокунии %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Қуттии бо номи %s нест"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Қуттиҳои зерин соҳиби %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Ҳамааш аллакай кор гузошта шудааст"
-
-#: ../urpm/select.pm:539
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Ҳамааш аллакай кор гузошта шудааст"
-
-#: ../urpm/select.pm:540
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Ҳамааш аллакай кор гузошта шудааст"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "аз сабаби мавҷуд набудан %s"
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "Ҳамааш аллакай кор гузошта шудааст"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "аз сабаби қонеъ набудан %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "кӯшиши фаъол намудан %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "барои нигоҳдории %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "барои коргузоштани %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "аз ҳисоби ба вуҷуд омадани муаммо бо %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Имзои нодуруст (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Калиди нодуруст ID (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Имзо мавҷуд нест (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "файли танзимдарории [%s] нависед"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "Нусхабардорӣ нагузашт"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "Нусхабардорӣ нагузашт"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"нусхаи urpme %s\n"
-"Copyright © 1999-2008 Mandriva.\n"
-"Ин нармафзори озод аст ва метавонад дар зери шартҳои GNU GPL паҳн карда "
-"шавад.\n"
-"\n"
-"истифода:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-" --auto         - ба таври автоматӣ барномаҳои коромодаро аз "
-"барномаҳоипешниҳодшуда интихоб намоед.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, fuzzy, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr ""
-" --test         - тафтиш намоед, ки оё коргузории дуруст ба амал меояд.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-"  --parallel     - urpmi, ки аз рӯи ангалҳои мошинаҳо тақсим шудааст.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, fuzzy, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --packager     - тэг packager-ро чоп намоед: қуттӣ тартибдиҳанда.\n"
-
-#: ../urpme:53
-#, fuzzy, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - дигар решаро барои коргузории rpm истифода баред.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - дигар решаро барои коргузории rpm истифода баред.\n"
-
-#: ../urpme:55
-#, fuzzy, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --description  - чопи тасвироти тэг: тасвирот.\n"
-
-#: ../urpme:56
-#, fuzzy, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - дар ҳаракат urpmi-ро аз дарахти distrib танзим мекунад\n"
-"                   барои коргузорӣ (на)кардани chroot бо хосият --root "
-"фоиданок аст.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, fuzzy, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose      - ҳолати муфассал.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - интихоби ҳамаи қуттиҳои бо ифода мувофиқ буда.\n"
-
-#: ../urpme:72
-#, fuzzy, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Танҳо фавқулкорванд барои хориҷкунии муҳит рухсат дорад"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "қуттиҳои номаълум"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "қуттии номаълум"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] ""
-"хориҷ намудани барномаи коромода %s боиси қатъи кори системи шумомегардад"
-msgstr[1] ""
-"хориҷ намудани барномаи коромода %s боиси қатъи кори системи шумомегардад"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Ҳеҷ чизро хориҷ карда намешавад"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Ҳеҷ чизро хориҷ карда намешавад"
-
-#: ../urpme:147
-#, fuzzy, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] ""
-"Барои қаноатмандии тобеиятҳо, қуттиҳои зерин хориҷ карда мешаванд (%d МБ)"
-msgstr[1] ""
-"Барои қаноатмандии тобеиятҳо, қуттиҳои зерин хориҷ карда мешаванд (%d МБ)"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "қуттии номаълум"
-msgstr[1] "қуттии номаълум"
-
-#: ../urpme:159
-#, fuzzy, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "хориҷкунии қуттии %s"
-msgstr[1] "хориҷкунии қуттии %s"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (ҳ/Н) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "қабули дастгоҳи хориҷшаванда ҳамчун \"%s\""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Хориҷкунӣ нагузашт"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Хориҷкунӣ нагузашт"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1650,31 +1380,38 @@ msgstr ""
 "\n"
 "истифода:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - чопи ин пайғоми ёрӣ.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - муҳити махсусро истифода баред (одатан ҳисоботи "
 "хатогиҳо).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - сарчашмаҳое ки бо вергул ҷудо шудаанд, истифода набаред.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - дигар решаро барои коргузории 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"
@@ -1682,262 +1419,537 @@ msgstr ""
 "  --sortmedia    - аз рӯи сатрҳое ки бо вергул ҷудо шудааст сарчашмаҳоро "
 "банавъҳо ҷудо намоед.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 "  --synthesis    - synthesis -и додашударо ба ивази urpmi db истифода "
 "намоед.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - synthesis -и додашударо ба ивази urpmi db истифода "
 "намоед.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - хати рости монандро чоп накунед.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - танҳо муҳити навкунӣ истифода баред.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - ҳолати муфассал.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - инкоркунии фарқиятҳои вазъият дар ҳар восита.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -i             - инкоркунии фарқиятҳои вазъият дар ҳар восита.\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - дарбаргирии рамзи perl бевосита ҳамчун perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - амалгари дучанда AND.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, fuzzy, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -a             - амалгари дучанда AND.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - ягонӣ НЕ.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  )              - қавси рост барои пӯшидани ифодаи гурӯҳ.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "Рӯйхати додаҳо барои барқарор намудан:\n"
 "\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - интерфейси X истифода баред.\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    бо нобаёнӣ %s.\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - чоп намоед тэг url: url.\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - tag buildhost: build host -ро чоп намоед.\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "Модули танзимоти Konsole"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - тэг conflicts-ро чоп намоед: ҳамаи мухолифатро.\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - чопи тасвироти тэг: тасвирот.\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - чопи epoch тэг: epoch.\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name         - танҳо номҳои бастаҳоро чоп кунед.\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - барориш рӯйхати файлҳои баста.\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - чопи гурӯҳи тэг: гурӯҳ.\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --name         - танҳо номҳои бастаҳоро чоп кунед.\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - танҳо номҳои бастаҳоро чоп кунед.\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 "  --obsoletes    - тэг obsoletes-ро чоп намоед: ҳамаи файлҳои кӯҳнашуда.\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - тэг packager-ро чоп намоед: қуттӣ тартибдиҳанда.\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr ""
 "  --provides     - тэг provides-ро чоп намоед: ҳамаи файлҳои "
 "пешниҳодшаванда.\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     -  тэг requires-ро чоп намоед: ҳамаи вобастагиҳоро.\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - чопи ҳаҷми тэг: ҳаҷм.\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - тэг sourcerpm-ро чоп намоед: rpm-и аввала.\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr ""
 "  --obsoletes    - тэг obsoletes-ро чоп намоед: ҳамаи файлҳои кӯҳнашуда.\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - чопи ҷамъбасти тэг: ҷамъбаст.\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - чоп намоед тэг url: url.\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - ҳолати муфассал.\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - барориш рӯйхати файлҳои баста.\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - тафсир, релиз ва архитектураро бо номҳояшон чоп намоед.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "барои %s давраи махсус истифода мегардад\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "файли сунъии офаридаи hdlist барои муҳити \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "навиштани файли рӯйхат барои миёнаи \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Қуттии бо номи %s нест"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Қуттиҳои зерин соҳиби %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Ҳамааш аллакай кор гузошта шудааст"
+
+#: ../urpm/select.pm:543
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Ҳамааш аллакай кор гузошта шудааст"
+
+#: ../urpm/select.pm:544
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Ҳамааш аллакай кор гузошта шудааст"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "аз сабаби мавҷуд набудан %s"
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Ҳамааш аллакай кор гузошта шудааст"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "аз сабаби қонеъ набудан %s"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "кӯшиши фаъол намудан %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "барои нигоҳдории %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "барои коргузоштани %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "аз ҳисоби ба вуҷуд омадани муаммо бо %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Имзои нодуруст (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Калиди нодуруст ID (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Имзо мавҷуд нест (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "файли танзимдарории [%s] нависед"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Нусхабардорӣ нагузашт"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "Нусхабардорӣ нагузашт"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"нусхаи urpme %s\n"
+"Copyright © 1999-2008 Mandriva.\n"
+"Ин нармафзори озод аст ва метавонад дар зери шартҳои GNU GPL паҳн карда "
+"шавад.\n"
+"\n"
+"истифода:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+" --auto         - ба таври автоматӣ барномаҳои коромодаро аз "
+"барномаҳоипешниҳодшуда интихоб намоед.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, fuzzy, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+" --test         - тафтиш намоед, ки оё коргузории дуруст ба амал меояд.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+"  --parallel     - urpmi, ки аз рӯи ангалҳои мошинаҳо тақсим шудааст.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, fuzzy, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --packager     - тэг packager-ро чоп намоед: қуттӣ тартибдиҳанда.\n"
+
+#: ../urpme:53
+#, fuzzy, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - дигар решаро барои коргузории rpm истифода баред.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - навкунии танҳо муҳити навкунӣ.\n"
+
+#: ../urpme:56
+#, fuzzy, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --description  - чопи тасвироти тэг: тасвирот.\n"
+
+#: ../urpme:57
+#, fuzzy, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - дар ҳаракат urpmi-ро аз дарахти distrib танзим мекунад\n"
+"                   барои коргузорӣ (на)кардани chroot бо хосият --root "
+"фоиданок аст.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - ҳолати муфассал.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - интихоби ҳамаи қуттиҳои бо ифода мувофиқ буда.\n"
+
+#: ../urpme:73
+#, fuzzy, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Танҳо фавқулкорванд барои хориҷкунии муҳит рухсат дорад"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "қуттиҳои номаълум"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "қуттии номаълум"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] ""
+"хориҷ намудани барномаи коромода %s боиси қатъи кори системи шумомегардад"
+msgstr[1] ""
+"хориҷ намудани барномаи коромода %s боиси қатъи кори системи шумомегардад"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Ҳеҷ чизро хориҷ карда намешавад"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Ҳеҷ чизро хориҷ карда намешавад"
+
+#: ../urpme:149
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Барои қаноатмандии тобеиятҳо, қуттиҳои зерин хориҷ карда мешаванд (%d МБ)"
+msgstr[1] ""
+"Барои қаноатмандии тобеиятҳо, қуттиҳои зерин хориҷ карда мешаванд (%d МБ)"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "қуттии номаълум"
+msgstr[1] "қуттии номаълум"
+
+#: ../urpme:161
+#, fuzzy, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "хориҷкунии қуттии %s"
+msgstr[1] "хориҷкунии қуттии %s"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (ҳ/Н) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "қабули дастгоҳи хориҷшаванда ҳамчун \"%s\""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Хориҷкунӣ нагузашт"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Хориҷкунӣ нагузашт"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2041,11 +2053,6 @@ msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr ""
 "  --noclean      - rpm-и истифода бурда нашударо дар пинҳонӣ нигоҳ доред.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - навкунии танҳо муҳити навкунӣ.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2375,7 +2382,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Ба ҳар ҳол давом диҳем?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Ҳ/н) "
@@ -2572,10 +2579,12 @@ msgstr ""
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - create an update medium.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2583,24 +2592,24 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - кӯшиши ёфтан ва истифодаи файли synthesis-ро намоед.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 " --no-probe     - барои дарёфти  synthesis ё файли hdlist кӯшиш накунед.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2609,17 +2618,17 @@ msgstr ""
 "  --distrib      - аз сарчашмаи коргузорӣ ба таври автоматикӣ дигар\n"
 "манбаъҳоро                    созед.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - рӯйхаткунии муҳити дастрас.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2628,91 +2637,91 @@ msgstr ""
 "  --from         - барои оинаҳои рӯйхати url-и додашуда истифода баред\n"
 "                   аз рӯи пешфарз истифода мешавад%s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - сарчашмаи маҷозие ки ҳамеша up-to-date аст тартиб диҳед,\n"
 "                   танҳо файли суратҷаласа иҷозат дода шудааст file://.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - тафтиши файли MD5SUM-ро хомӯш кунед.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - усули ором.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - намуди муфассал.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Танҳо фавқулкорванд барои коргузоштани муҳит рухсат дорад"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "файли танзимдарории [%s] нависед"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, fuzzy, c-format
 msgid "Can't create config file [%s]"
 msgstr "файли танзимдарории [%s] нависед"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "ҳоҷат нест барои додани <роҳи нисбии hdlist> бо --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<роҳи нисбии hdlist> ҳозир нест\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "дохилшавии муҳити \"%s\" номумкин"
@@ -2950,13 +2959,13 @@ msgstr "  -f             - ба таври маҷбурӣ файлҳои hdlist-
 msgid "Only superuser is allowed to update media"
 msgstr "Танҳо фавқулкорванд барои навсозии муҳит рухсат дорад"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "ба навкунӣ чизе нест (барои иловаи муҳит urpmi.addmedia-ро истифода баред)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2965,17 +2974,17 @@ msgstr ""
 "элемент барои нав кардан ҳозир нест\n"
 "(яке аз %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Таҳрири сарчашмаи \"%s\":"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "хориҷкунии миёнаи \"%s\""
@@ -3264,6 +3273,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Ягон номнависи тағиротҳо пайдо нагардид\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - create an update medium.\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "даровардани бад: [%s]"
diff --git a/po/th.po b/po/th.po
index a27caab0..0465ffc8 100644
--- a/po/th.po
+++ b/po/th.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2002-11-25 13:52-0500\n"
 "Last-Translator: Wachara Chinsettawong <wachara@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Generator: KBabel 0.9.6\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "กำลังเตรียมการติดตั้ง"
@@ -29,7 +29,7 @@ msgstr "กำลังเตรียมการติดตั้ง"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -79,7 +79,7 @@ msgstr "_ติดตั้ง"
 msgid "_Save"
 msgstr "_บันทึก"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_ยกเลิก"
@@ -110,8 +110,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - พิมพ์ข้อความช่วย\n"
@@ -144,7 +145,7 @@ msgstr ""
 "  --verify-rpm   - ตรวจสอบความถูกต้องของ rpm signature ก่อนการติดตั้ง\n"
 "                   (--no-verify-rpm disable it, default is enabled)\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, fuzzy, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --update       - ใช้เพื่ออัพเดตมีเดีย\n"
@@ -192,7 +193,7 @@ msgstr "กรุณารอ"
 msgid "Must be root"
 msgstr "พอร์ตของเม้าส์"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -200,42 +201,42 @@ msgid ""
 "Continue installation anyway?"
 msgstr "ไม่สามารถ install บางเพกเกจได้"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "คำเตือน"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "ตกลง"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr ""
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr "ออกจากการติดตั้ง"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "หนึ่งใน Packages ต่อไปนี้ต้องได้รับการติดตั้ง "
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid "_Abort"
 msgstr "เลิก"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -243,62 +244,62 @@ msgid ""
 "Continue installation anyway?"
 msgstr "แพ็คเก็จเหล่านี้กำลังจะถูกลบ"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(แพ็คเก็จ %d ชุด, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, fuzzy, c-format
 msgid "Package installation..."
 msgstr "การ install package"
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ไม่สามารถเรียก source package,กำลังยกเลิก"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "กำลังเตรียม..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, fuzzy, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 "กำลังติดตั้งแพ็คเก็จ %s\n"
 "%d%%"
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "กรุณาใส่อุปกรณ์ที่มีชื่อ \"%s\" ใน [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, fuzzy, c-format
 msgid "Downloading package `%s'..."
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "ทำเรียบร้อยแล้ว"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, fuzzy, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -308,28 +309,28 @@ msgstr ""
 "การติดตั้งล้มเหลวมีบางไฟล์ที่ขาดหายไป\n"
 "ขอแนะนำให้ทำการอัพเดตฐานข้อมูล urpmi"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "การติดตั้งไม่สำเร็จ"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "install เสร็จเรียบร้อย"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, fuzzy, c-format
 msgid "removing %s"
 msgstr "กำลังติดตั้ง %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, fuzzy, c-format
 msgid "restarting urpmi"
 msgstr "กำลังติดตั้ง $rpm\n"
@@ -407,8 +408,8 @@ msgid "...retrieving done"
 msgstr "การอ่านข้อมูลเรียบร้อย"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "การอ่านข้อมูลล้มเหลว: %s"
@@ -448,52 +449,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr "การแจ้งพร็อกซี่ที่ไม่ดี\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq:ไม่สามารถอ่าน rpm file \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "ข้อมูลบางตัวยังไม่ได้ใส่ลงไป"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -916,217 +917,217 @@ msgid ""
 "update, --use-distrib or --parallel"
 msgstr ""
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr ""
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, fuzzy, c-format
 msgid "skipping package %s"
 msgstr "กำลังติดตั้งแพ็คเก็จ %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, fuzzy, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "ปัญหาการติดตั้งแพ็คเก็จ %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "อุปกรณ์\"%s\"มีอยู่แล้ว"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "กำลังทำการอ่าน headers จากอุปกรณ์\"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "กำลังทำการย้ายออกอุปกรณ์\"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "ไม่สามารถเปิดแฟ้ม %s\n"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "ไม่สามารถที่จะเข้าถึงอุปกรณ์เพื่อการติดตั้งตัวแรก (ไม่พบไฟล์ hdlists)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "กำลังอ่านข้อมูลจากไฟล์ hdlists"
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, fuzzy, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "กำลังเลี่ยงการทำงานของอุปกรณ์ \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "พยายามที่จะเลือกใช้มีเดียหลายๆตัว: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "กำลังทำการย้ายออกอุปกรณ์\"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, fuzzy, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "กำลังเขียน list file สำหรับอุปกรณ์\"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, fuzzy, c-format
 msgid "...reconfiguration failed"
 msgstr "บัันทึกการตั้งค่าเมนูแล้ว"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, fuzzy, c-format
 msgid "reconfiguration done"
 msgstr "คอนฟิกเซอเวอร์"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "อุปกรณ์ \"%s\" ไม่ได้ถูกเลือก"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "กำลังตรวจสอบไฟล์ synthesis [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "มีปัญหาในการอ่านไฟล์ synthesis สำหรับอุปกรณ์\"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "กำลังเขียน list file สำหรับอุปกรณ์\"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, fuzzy, c-format
 msgid "...copying failed"
 msgstr "การคัดลอกสมบูรณ์"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "กำลังคัดลอกคำอธิบายไฟล์ของ \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "การคัดลอกสมบูรณ์"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, fuzzy, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "การทำสำเนา [%s] ไม่สำเร็จ"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "การดึงโค้ดจาก hdlist (หรือ synthesis)ล้มเหลว"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "การทำสำเนา [%s] ไม่สำเร็จ"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "กำลังตรวจสอบไฟล์ hdlist [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "กำลังติดตั้ง %s\n"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "ไม่พบ hdlist file สำหรับอุปกรณ์\"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "กำลังคัดลอกคำอธิบายไฟล์ของ \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "ชื่อ rpm fileไม่ถูกต้อง [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "กำลังดึงโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "กำลังคัดลอกโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "ไม่พบ hdlist file สำหรับอุปกรณ์\"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, fuzzy, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "กำลังคัดลอกคำอธิบายไฟล์ของ \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, fuzzy, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "ไม่สามารถเขียน list file ของ\"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, fuzzy, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ไม่สามารถเขียน list file ของ\"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "อุปกรณ์ที่ถูกเพิ่มเข้ามา %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1158,7 +1159,7 @@ msgstr "Nnม"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yyช"
@@ -1228,7 +1229,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1310,262 +1311,7 @@ msgstr "กำลังติดตั้ง %s"
 msgid "unmounting %s"
 msgstr "กำลังถอดถอน %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "ไม่มี package ที่ชื่อ %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "packages ต่อไปนี้มี %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
-
-#: ../urpm/select.pm:539
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
-
-#: ../urpm/select.pm:540
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, fuzzy, c-format
-msgid "due to missing %s"
-msgstr "ไม่มี kdesu "
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, fuzzy, c-format
-msgid "due to unsatisfied %s"
-msgstr "ไม่มี kdesu "
-
-#: ../urpm/select.pm:566
-#, fuzzy, c-format
-msgid "trying to promote %s"
-msgstr "ไม่มีอะไรที่ต้องลบทิ้ง\n"
-
-#: ../urpm/select.pm:567
-#, fuzzy, c-format
-msgid "in order to keep %s"
-msgstr "Window border theme"
-
-#: ../urpm/select.pm:603
-#, fuzzy, c-format
-msgid "in order to install %s"
-msgstr "ไม่สามารถติดตั้งแพ็คเกจ %s"
-
-#: ../urpm/select.pm:613
-#, fuzzy, c-format
-msgid "due to conflicts with %s"
-msgstr "%s ขัดแย้งกับ %s"
-
-#: ../urpm/signature.pm:29
-#, fuzzy, c-format
-msgid "Invalid signature (%s)"
-msgstr "ข้อมูลบางตัวยังไม่ได้ใส่ลงไป"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr ""
-
-#: ../urpm/signature.pm:62
-#, fuzzy, c-format
-msgid "Missing signature (%s)"
-msgstr "ข้อมูลบางตัวยังไม่ได้ใส่ลงไป"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "ไม่สามารถเขียน config file [%s]"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "ล็อกอินล้มเหลว"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "ล็อกอินล้มเหลว"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme เวอร์ชั่นที่ %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"ซอฟท์แวร์นี่เป็นฟรีซอฟท์แวร์และแจกจ่ายภายใต้ระเบียบของ GNU GPL.\n"
-"\n"
-"วิธีใช้:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - ทำการเลือกแพ็คเกจโดยอัตโนมัติ.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, fuzzy, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - ตรวจสอบว่าการติดตั้งสามารถทำได้ถูกต้องหรือไม่.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - distributed urpmi across machines of alias.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, fuzzy, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
-
-#: ../urpme:53
-#, fuzzy, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --wget         - ใช้ wget เพื่อดึงไฟล์ที่อยู่ภายนอก\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --wget         - ใช้ wget เพื่อดึงไฟล์ที่อยู่ภายนอก\n"
-
-#: ../urpme:55
-#, fuzzy, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --description  - พิมพ์ tag รายละเอียด  : รายละเอียด"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, fuzzy, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  -v             - โหมดคำ\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - เลือกทั้งหมดที่ตรงกับคำสั่ง\n"
-
-#: ../urpme:72
-#, fuzzy, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "superuser เท่านั้นที่มีสิทธิติดตั้ง packages"
-
-#: ../urpme:105
-#, fuzzy, c-format
-msgid "unknown packages"
-msgstr "แพ็คเก็จ %d ชุด"
-
-#: ../urpme:105
-#, fuzzy, c-format
-msgid "unknown package"
-msgstr "เกิดการผิดพลาดแบบไม่ทราบสาเหตุ"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "แพ็คเกจ %s ที่กำลังลบอยู่จะทำให้ระบบเสียหายได้\n"
-
-#: ../urpme:124
-#, fuzzy, c-format
-msgid "Nothing to remove"
-msgstr "ไม่มีแท็กที่จะลบ!"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "ไม่มีแท็กที่จะลบ!"
-
-#: ../urpme:147
-#, fuzzy, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "เกิดการผิดพลาดแบบไม่ทราบสาเหตุ"
-
-#: ../urpme:159
-#, fuzzy, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "กำลังติดตั้งแพ็คเก็จ %s"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "กำลังนำอุปกรณ์ที่เคลื่อนย้ายได้จาก \"%s\" ออกมา"
-
-#: ../urpme:178
-#, fuzzy, c-format
-msgid "Removal failed"
-msgstr "ล็อกอินล้มเหลว"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "ล็อกอินล้มเหลว"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1581,278 +1327,544 @@ msgstr ""
 "\n"
 "วิธีใช้:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - พิมพ์ข้อความช่วย\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - ใช้เอ็นไวลอนเม็นท์แบบเฉพาะ(โดยทั่วไปใช้กับการรายงาน บัก).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
 #, fuzzy, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --media        - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --wget         - ใช้ wget เพื่อดึงไฟล์ที่อยู่ภายนอก\n"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, fuzzy, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --media        - เลือกใช้เฉพาะมีเดียที่ถูกขั้นด้วยเครื่องหมายลูกน้ำ\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
 #, fuzzy, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, fuzzy, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  -P             - ไม่จำเป็นต้องค้นในส่วนแพ็คเกจที่ไว้สำหรับค้นเท่านั้น\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - ใช้เพื่ออัพเดตมีเดีย\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, fuzzy, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  -v             - โหมดคำ\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, fuzzy, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -c             - ทำความสะอาดส่วน headers ของไดเร็คตอรี่ cache \n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -c             - ทำความสะอาดส่วน headers ของไดเร็คตอรี่ cache \n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, fuzzy, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -c             - ทำความสะอาดส่วน headers ของไดเร็คตอรี่ cache \n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, fuzzy, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -u             - ลบแพ็คเกจถ้าแพ็คเกจที่ดีกว่ามีการติดตั้งอยู่แล้ว.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, fuzzy, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -q             - โหมดเงียบ\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, fuzzy, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  -q             - โหมดเงียบ\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  -a             - เลือกทั้งหมดที่ตรงกับคำสั่ง\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr ""
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - ใช้อินเทอร์เฟส X\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "  -a             - เลือกมีเดียทั้งหมด\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --help         - พิมพ์ข้อความช่วย\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --files        - พิมพ์  tag files: file ทั้งหมด (หลายบรรทัด)."
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "โมดูลปรับแต่งคอนโซล K"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    -พิมพ์ tag ที่เข้ากันไม่ได้:เข้ากันไม่ได้ทั้งหมด(หลายบรรทัด)."
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - พิมพ์ tag รายละเอียด  : รายละเอียด"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --help         - พิมพ์ข้อความช่วย\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --help         - พิมพ์ข้อความช่วย\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    -พิมพ์ tag ไม่ใช้แล้ว:ใช้ไม่ได้ทั้งหมด(หลายบรรทัด)."
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     -พิมพ์  tag provides: all provides (หลายบรรทัด). "
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - พิมพ์  tag ที่ต้องการ:ที่ต้องการทั้งหมด(หลายบรรทัด)."
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --help         - พิมพ์ข้อความช่วย\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --group        - พิมพ์ tag group: group."
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --obsoletes    -พิมพ์ tag ไม่ใช้แล้ว:ใช้ไม่ได้ทั้งหมด(หลายบรรทัด)."
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - พิมพ์ tag summary: summary"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --help         - พิมพ์ข้อความช่วย\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  -v             - โหมดคำ\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - เวอร์ชั่นที่พิมพ์, รีลีสและ arch พร้อมชื่อ.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "ไม่พบ hdlist file สำหรับอุปกรณ์\"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "สร้าง hdlist synthesis file สำหรับ อุปกรณ์ \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "กำลังเขียน list file สำหรับอุปกรณ์\"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "ไม่มี package ที่ชื่อ %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "packages ต่อไปนี้มี %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
+
+#: ../urpm/select.pm:543
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
+
+#: ../urpm/select.pm:544
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, fuzzy, c-format
+msgid "due to missing %s"
+msgstr "ไม่มี kdesu "
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "ทุกอย่างได้ถูกติดตั้งเรียบร้อยแล้ว"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, fuzzy, c-format
+msgid "due to unsatisfied %s"
+msgstr "ไม่มี kdesu "
+
+#: ../urpm/select.pm:570
+#, fuzzy, c-format
+msgid "trying to promote %s"
+msgstr "ไม่มีอะไรที่ต้องลบทิ้ง\n"
+
+#: ../urpm/select.pm:571
+#, fuzzy, c-format
+msgid "in order to keep %s"
+msgstr "Window border theme"
+
+#: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid "in order to install %s"
+msgstr "ไม่สามารถติดตั้งแพ็คเกจ %s"
+
+#: ../urpm/select.pm:617
+#, fuzzy, c-format
+msgid "due to conflicts with %s"
+msgstr "%s ขัดแย้งกับ %s"
+
+#: ../urpm/signature.pm:29
+#, fuzzy, c-format
+msgid "Invalid signature (%s)"
+msgstr "ข้อมูลบางตัวยังไม่ได้ใส่ลงไป"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr ""
+
+#: ../urpm/signature.pm:62
+#, fuzzy, c-format
+msgid "Missing signature (%s)"
+msgstr "ข้อมูลบางตัวยังไม่ได้ใส่ลงไป"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "ไม่สามารถเขียน config file [%s]"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "ล็อกอินล้มเหลว"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "ล็อกอินล้มเหลว"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme เวอร์ชั่นที่ %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"ซอฟท์แวร์นี่เป็นฟรีซอฟท์แวร์และแจกจ่ายภายใต้ระเบียบของ GNU GPL.\n"
+"\n"
+"วิธีใช้:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - ทำการเลือกแพ็คเกจโดยอัตโนมัติ.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, fuzzy, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - ตรวจสอบว่าการติดตั้งสามารถทำได้ถูกต้องหรือไม่.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - distributed urpmi across machines of alias.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, fuzzy, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --list         - แสดงรายชื่อแพ็คเกจที่มีอยู่\n"
+
+#: ../urpme:53
+#, fuzzy, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --wget         - ใช้ wget เพื่อดึงไฟล์ที่อยู่ภายนอก\n"
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - ใช้เพื่ออัพเดตมีเดีย\n"
+
+#: ../urpme:56
+#, fuzzy, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --description  - พิมพ์ tag รายละเอียด  : รายละเอียด"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  -v             - โหมดคำ\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - เลือกทั้งหมดที่ตรงกับคำสั่ง\n"
+
+#: ../urpme:73
+#, fuzzy, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "superuser เท่านั้นที่มีสิทธิติดตั้ง packages"
+
+#: ../urpme:106
+#, fuzzy, c-format
+msgid "unknown packages"
+msgstr "แพ็คเก็จ %d ชุด"
+
+#: ../urpme:106
+#, fuzzy, c-format
+msgid "unknown package"
+msgstr "เกิดการผิดพลาดแบบไม่ทราบสาเหตุ"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "แพ็คเกจ %s ที่กำลังลบอยู่จะทำให้ระบบเสียหายได้\n"
+
+#: ../urpme:126
+#, fuzzy, c-format
+msgid "Nothing to remove"
+msgstr "ไม่มีแท็กที่จะลบ!"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "ไม่มีแท็กที่จะลบ!"
+
+#: ../urpme:149
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "เพื่อความถูกต้องของการเป็นอิสระระหว่างโปรแกรมแพ็คเกจบางตัวจะถูกลบทิ้ง(%d MB)"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "เกิดการผิดพลาดแบบไม่ทราบสาเหตุ"
+
+#: ../urpme:161
+#, fuzzy, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "กำลังติดตั้งแพ็คเก็จ %s"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "กำลังนำอุปกรณ์ที่เคลื่อนย้ายได้จาก \"%s\" ออกมา"
+
+#: ../urpme:181
+#, fuzzy, c-format
+msgid "Removal failed"
+msgstr "ล็อกอินล้มเหลว"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "ล็อกอินล้มเหลว"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1935,11 +1947,6 @@ msgstr "  --noclean      - เก็บ rpm ซึ่งไม่ถูกใช
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - เก็บ rpm ซึ่งไม่ถูกใช้ใน cache.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - ใช้เพื่ออัพเดตมีเดีย\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2247,7 +2254,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "คุณยังต้องการจะติดตั้งอีกต่อไปหรือไม่ ?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -2411,10 +2418,12 @@ msgstr "  --curl         - ใช้ curl เพื่อดึงไฟล์�
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - สร้างอุปกรณ์เพื่อการอัพเดต\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2422,39 +2431,39 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  -h             - พยายามค้นหาและใช้ไฟล์ synthesis หรือ hdlist\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  -h             - พยายามค้นหาและใช้ไฟล์ synthesis หรือ hdlist\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, fuzzy, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr "  --distrib      - ทำการสร้างมีเดียจากอุปกรณ์สำหรับติดตั้งโดยอัตโนมัติ\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media    - แสดงรายชื่ออุปกรณ์ที่มีอยู่\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, fuzzy, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2463,89 +2472,89 @@ msgstr ""
 "  --env          - ใช้เอ็นไวลอนเม็นท์แบบเฉพาะ(โดยทั่วไปใช้กับการรายงาน\n"
 "                   บัก).\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - โหมดเงียบ\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - โหมดคำ\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, fuzzy, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "superuser เท่านั้นที่มีสิทธิติดตั้ง packages"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "เขียน config file[%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, fuzzy, c-format
 msgid "Can't create config file [%s]"
 msgstr "เขียน config file[%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "ไม่จำเป็นจะต้องให้ <relative path ของ hdlist>กับ -distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "ไม่พบ<ลู่ทางที่เกี่ยวข้องของhdlist>\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "ไม่สามารถใช้อุปกรณ์\"%s\""
@@ -2777,29 +2786,29 @@ msgstr "  -f             - บังคับการสร้างไฟล�
 msgid "Only superuser is allowed to update media"
 msgstr "superuser เท่านั้นที่มีสิทธิติดตั้ง packages"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "ไม่มีการแก้ไข(use urpmi.addmedia เพื่อเพิ่มอุปกรณ์)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr "ขาดข้อมูลที่จะนำไป update(หนึ่งใน %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "กำลังทำการย้ายออกอุปกรณ์\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "กำลังทำการย้ายออกอุปกรณ์\"%s\""
@@ -3057,6 +3066,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "ไม่พบรุปภาพ"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - สร้างอุปกรณ์เพื่อการอัพเดต\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr " inputไม่ถูกต้อง :[%s]"
diff --git a/po/tl.po b/po/tl.po
index 32335aca..72d72d4a 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-tl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2005-03-08 20:24+0800\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Filipino <salinpinoy@comitus.net>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Previous-Translator: Arys P. Deloso <arys@deloso.org>\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, fuzzy, c-format
 msgid "RPM installation"
 msgstr "Pag-install ng RPM"
@@ -27,7 +27,7 @@ msgstr "Pag-install ng RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -96,7 +96,7 @@ msgstr "I-install"
 msgid "_Save"
 msgstr "Save"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Cancel"
@@ -128,8 +128,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - i-print itong tulong na mensahe.\n"
@@ -167,7 +168,7 @@ msgstr ""
 "                   (--no-verify-rpm ay idi-disable ito, default ay "
 "gumagana).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -222,7 +223,7 @@ msgstr "Pakihintay."
 msgid "Must be root"
 msgstr "Kailangan na kayo ay root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -232,42 +233,42 @@ msgstr ""
 "Ilang package na hiniling ay hindi ma-install:\n"
 "%s"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Babala"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ayos"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, fuzzy, c-format
 msgid " (to upgrade)"
 msgstr " (i-upgrade)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, fuzzy, c-format
 msgid " (to install)"
 msgstr " (i-install)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Isa sa mga sumusunod na package ay kailangan:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, fuzzy, c-format
 msgid "_Abort"
 msgstr "_Abort"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -278,7 +279,7 @@ msgstr ""
 "%s\n"
 "Magpatuloy?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
@@ -286,7 +287,7 @@ msgstr ""
 "Para ma-satisfy ang dependency/pagkaka-asa-asa, ang mga sumusunod na %d "
 "package ay ii-install (%d MB)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -294,49 +295,49 @@ msgstr ""
 "Para ma-satisfy ang dependency/pagkaka-asa-asa, ang mga sumusunod na %d "
 "package ay ii-install (%d MB)"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Pag-i-install ng package..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "hindi makuha ang mga source package, hindi tumutuloy"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Naghahanda..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Ini-install ang package na `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Pakisuksok ang medium na may pangalang \"%s\" sa device na [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Dina-download ang package na `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, fuzzy, c-format
 msgid "_Done"
 msgstr "Tapos"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -347,28 +348,28 @@ msgstr ""
 "%s\n"
 "Baka gusto mong i-update ang iyong urpmi database"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Pag-i-install ay nabigo"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Lahat ay naka-install na"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Natapos na ang pag-install"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "inaalis ang %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "sinisimulan muli ang urpmi"
@@ -450,8 +451,8 @@ msgid "...retrieving done"
 msgstr "...pagkukuha muli natapos"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...pagkukuha muli nabigo: %s"
@@ -491,52 +492,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr "masamang pagdeklara ng proxy sa command line\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: hindi mabasa ang rpm file na \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Nawawalang signature (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -964,217 +965,217 @@ msgstr ""
 "--synthesis ay hindi magagamit kasama ang --media, --excludemedia,--"
 "sortmedia, --update o --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, fuzzy, c-format
 msgid "Search start: %s end: %s"
 msgstr "Hanapin ang mga naka-install na font"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "nilalaktawan ang package na %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "i-install imbis na i-upgrade ang package na %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "medium na \"%s\" ay mayroon na"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "binabasa ang mga header mula sa medium na \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "inaalis ang medium na \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "hindi mabuksan ang rpmdb"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "hindi ma-access ang unang installation medium (walang hdlists na file)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "kinukuha muli ang hdlists file..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "sinusubukang piliin ang di-mayroong medium na \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "pumipili ng maramihang media: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "inaalis ang medium na \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, fuzzy, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "kinukuha muli ang mga rpm file mula sa medium na \"%s\"..."
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, fuzzy, c-format
 msgid "...reconfiguration failed"
 msgstr "Configuration file"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, fuzzy, c-format
 msgid "reconfiguration done"
 msgstr "Pagsasaayos ng Server"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "medium na \"%s\" ay hindi nakapili"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "sinusuri ang synthesis file [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problema sa pagbabasa ng synthesis file ng medium na \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "isinusulat ang list file para sa medium na \"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...pagkokopya nabigo"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kinokopya ang paglalarawan na file ng \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...pagkokopya natapos"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "pagkopya ng [%s] nabigo (file ay kahina-hinalang maliit)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "kino-compute ang md5sum ng nakuhang source hdlist (o synthesis)"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "pagkopya ng [%s] nabigo (md5sum di-tugma)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "sinusuri ang hdlist file [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "ini-install ang %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "walang nahanap na hdlist file para sa medium na \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "kinokopya ang paglalarawan na file ng \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "inbalidong pangalan ng rpm file [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "kinukuha muli ang source hdlist (o synthesis) ng \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "nahanap ang sinuring hdlist (o synthesis) bilang %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "walang nahanap na hdlist file para sa medium na \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "sinusuri ang pubkey file ng \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...in-import ang key na %s mula sa pubkey file ng \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "hindi ma-import ang pubkey file ng \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "idinagdag ang medium na %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1206,7 +1207,7 @@ msgstr "HhNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "OoYy"
@@ -1276,7 +1277,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1359,279 +1360,7 @@ msgstr "mina-mount ang %s"
 msgid "unmounting %s"
 msgstr "ina-unmount ang %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Walang package na may pangalang %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Ang mga sumusunod na package ay naglalaman ng %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Lahat ay naka-install na"
-
-#: ../urpm/select.pm:539
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Lahat ay naka-install na"
-
-#: ../urpm/select.pm:540
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Lahat ay naka-install na"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "dahil sa nawawalang %s"
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "Lahat ay naka-install na"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "dahil sa hindi na-satisfy na %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "sinusubukang i-promote ang %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "para maitago ang %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "para ma-install ang %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "dahil sa pagkakasalungat sa %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Inbalidong signature (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Inbalidong Key ID (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Nawawalang signature (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "hindi maisulat ang config file [%s]"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "Pagkokopya nabigo"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "Pagkokopya nabigo"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Ito ay libreng software at maaaring ipamahagi ayon sa mga nasasaad sa GNU "
-"GPL.\n"
-"\n"
-"paggamit:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto         - automatic na pumili ng package sa mga pagpipilian.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, fuzzy, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - subukan kung makakamit ng tama ang pag-i-install.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-"  --parallel     - distributed/nakapamahagi na urpmi sa mga makina ng "
-"alias.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, fuzzy, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --packager     - i-print ang tag packager: taga-package.\n"
-
-#: ../urpme:53
-#, fuzzy, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr ""
-"  --root         - gumamit ng ibang root para sa pag-i-install ng rpm.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --root         - gumamit ng ibang root para sa pag-i-install ng rpm.\n"
-
-#: ../urpme:55
-#, fuzzy, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --description  - i-print ang tag description: paglalarawan.\n"
-
-#: ../urpme:56
-#, fuzzy, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - i-configure ang urpmi \"on the fly\" mula sa isang "
-"distrib\n"
-"                   tree, magagamit para sa mag-(un)install ng chroot na may\n"
-"                   option na --root.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, fuzzy, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose      - masalita na paraan.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - piliin lahat ng package na tumutugma sa expression.\n"
-
-#: ../urpme:72
-#, fuzzy, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Superuser lamang ang pinapayagang mag-install ng mga package"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "hindi kilalang mga package"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "hindi kilalang package"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "ang pag-aalis ng package na %s ay sisira ng sistema mo"
-msgstr[1] "ang pag-aalis ng package na %s ay sisira ng sistema mo"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Walang maaalis"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Walang maaalis"
-
-#: ../urpme:147
-#, fuzzy, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] ""
-"Para ma-satisfy ang dependency, ang sumusunod na package ay aalisin (%d MB)"
-msgstr[1] ""
-"Para ma-satisfy ang dependency, ang sumusunod na package ay aalisin (%d MB)"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "hindi kilalang package"
-msgstr[1] "hindi kilalang package"
-
-#: ../urpme:159
-#, fuzzy, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "inaalis ang package na %s"
-msgstr[1] "inaalis ang package na %s"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (o/H) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "kinukuha ang naaalis na device bilang \"%s\""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Pag-aalis nabigo"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Pag-aalis nabigo"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1648,31 +1377,39 @@ msgstr ""
 "\n"
 "paggamit:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - i-print itong tulong na mensahe.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - gumamit ng specific na environment o kapaligiran\n"
 "                   (karaniwan ay isang ulat sa bug).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - huwag gamitin ang binigay na media, hiniwalay ng kuwit.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr ""
+"  --root         - gumamit ng ibang root para sa pag-i-install ng 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"
@@ -1680,231 +1417,231 @@ msgstr ""
 "  --sortmedia    - iayos ang media ayon sa mga substring na hiniwalay ng "
 "kuwit.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 "  --synthesis    - gamitin ang binigay na synthesis imbis na urpmi "
 "database.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - gamitin ang binigay na synthesis imbis na urpmi "
 "database.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - huwag i-print ang mga magkatulad na linya.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - gamitin lang ang update media.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - masalita na paraan.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - balewalain ang pagkakaiba ng case/laki ng titik sa bawat\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -i             - balewalain ang pagkakaiba ng case/laki ng titik sa bawat\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - isama nang direkta ang perl code bilang perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, fuzzy, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr ""
 "  -a             - binary AND operator, totoo kung parehong expression ay "
 "totoo.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, fuzzy, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr ""
 "  -o             - binary OR operator, totoo kung isang expression ay "
 "totoo.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, fuzzy, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  -q             - tahimik na paraan.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 "  )              - kanang parenthesis para isara ang grupo ng expression.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "Talaan ng data na ibabalik:\n"
 "\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - gamitin ang X interface.\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    defaults ay %s.\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - i-print ang tag url: url.\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - i-print ang tag buildhost: build host.\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "Module para sa pagco-configure ng Konsole"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 "  --conflicts    - i-print ang tag conflicts: lahat ng pagkakasalungat.\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - i-print ang tag description: paglalarawan.\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - i-print ang tag epoch: epoch.\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --all          - i-print lahat ng mga tag.\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - ilista ang mga file sa package.\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - i-print ang tag group: grupo.\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --all          - i-print lahat ng mga tag.\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --all          - i-print lahat ng mga tag.\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - i-print ang tag obsoletes: lahat ng pinapalaos.\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - i-print ang tag packager: taga-package.\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - i-print ang tag provides: lahat ng binibigay.\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - i-print ang tag requires: lahat ng kinakailangan.\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - i-print ang tag size: laki.\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - i-print ang tag sourcerpm: source rpm.\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --obsoletes    - i-print ang tag obsoletes: lahat ng pinapalaos.\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - i-print ang tag summary: kabuuan.\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - i-print ang tag url: url.\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - masalita na paraan.\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - ilista ang mga file sa package.\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
@@ -1912,36 +1649,311 @@ msgstr ""
 "arkitektura\n"
 "                   kasama ang pangalan.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "ginagamit ang specific environment sa %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "walang nahanap na hdlist file para sa medium na \"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "nakabuo ng hdlist synthesis file para sa medium na \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "isinusulat ang list file para sa medium na \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Walang package na may pangalang %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Ang mga sumusunod na package ay naglalaman ng %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Lahat ay naka-install na"
+
+#: ../urpm/select.pm:543
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Lahat ay naka-install na"
+
+#: ../urpm/select.pm:544
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Lahat ay naka-install na"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "dahil sa nawawalang %s"
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Lahat ay naka-install na"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "dahil sa hindi na-satisfy na %s"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "sinusubukang i-promote ang %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "para maitago ang %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "para ma-install ang %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "dahil sa pagkakasalungat sa %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Inbalidong signature (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Inbalidong Key ID (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Nawawalang signature (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "hindi maisulat ang config file [%s]"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Pagkokopya nabigo"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "Pagkokopya nabigo"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Ito ay libreng software at maaaring ipamahagi ayon sa mga nasasaad sa GNU "
+"GPL.\n"
+"\n"
+"paggamit:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - automatic na pumili ng package sa mga pagpipilian.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, fuzzy, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - subukan kung makakamit ng tama ang pag-i-install.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+"  --parallel     - distributed/nakapamahagi na urpmi sa mga makina ng "
+"alias.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, fuzzy, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --packager     - i-print ang tag packager: taga-package.\n"
+
+#: ../urpme:53
+#, fuzzy, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr ""
+"  --root         - gumamit ng ibang root para sa pag-i-install ng rpm.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - i-update ang update media lamang.\n"
+
+#: ../urpme:56
+#, fuzzy, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --description  - i-print ang tag description: paglalarawan.\n"
+
+#: ../urpme:57
+#, fuzzy, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - i-configure ang urpmi \"on the fly\" mula sa isang "
+"distrib\n"
+"                   tree, magagamit para sa mag-(un)install ng chroot na may\n"
+"                   option na --root.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - masalita na paraan.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - piliin lahat ng package na tumutugma sa expression.\n"
+
+#: ../urpme:73
+#, fuzzy, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Superuser lamang ang pinapayagang mag-install ng mga package"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "hindi kilalang mga package"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "hindi kilalang package"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "ang pag-aalis ng package na %s ay sisira ng sistema mo"
+msgstr[1] "ang pag-aalis ng package na %s ay sisira ng sistema mo"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Walang maaalis"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Walang maaalis"
+
+#: ../urpme:149
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Para ma-satisfy ang dependency, ang sumusunod na package ay aalisin (%d MB)"
+msgstr[1] ""
+"Para ma-satisfy ang dependency, ang sumusunod na package ay aalisin (%d MB)"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "hindi kilalang package"
+msgstr[1] "hindi kilalang package"
+
+#: ../urpme:161
+#, fuzzy, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "inaalis ang package na %s"
+msgstr[1] "inaalis ang package na %s"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (o/H) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "kinukuha ang naaalis na device bilang \"%s\""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Pag-aalis nabigo"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Pag-aalis nabigo"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2035,11 +2047,6 @@ msgstr "  --clean        - alisin ang rpm sa cache bago pa ang kung ano.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - ingatan ang rpm na hindi ginagamit sa cache.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - i-update ang update media lamang.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2376,7 +2383,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Magpatuloy kahit paano?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (O/h) "
@@ -2567,10 +2574,12 @@ msgstr ""
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - gumawa ng update medium.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2578,24 +2587,24 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - subukang hanapin at gamitin ang synthesis file.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  --no-probe     - huwag subukang maghanap ng synthesis o hdlist file.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2605,17 +2614,17 @@ msgstr ""
 "installation\n"
 "                   medium.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - ilista ang mga available na media.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2625,92 +2634,92 @@ msgstr ""
 "mirror,\n"
 "                   default ay %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - gumawa ng virtual media na parating naka-update,\n"
 "                   ang file:// protocol lamang ang pinahihintulutan.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - i-disable ang MD5SUM na pagsusuri ng file.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - tahimik na paraan.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - masalita na paraan.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, fuzzy, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Superuser lamang ang pinapayagang mag-install ng mga package"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "isulat ang config file [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, fuzzy, c-format
 msgid "Can't create config file [%s]"
 msgstr "isulat ang config file [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr ""
 "hindi kailangang ibigay ang <relative path ng hdlist> kasama ang --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<relative path ng hdlist> ay nawawala\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "hindi ma-access ang medium na \"%s\""
@@ -2948,13 +2957,13 @@ msgstr "  -f             - pilitin ang paggawa ng mga hdlist file.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Superuser lamang ang pinapayagang mag-install ng mga package"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "walang ia-update (gamitin ang urpmi.addmedia para magdagdag ng media)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2963,17 +2972,17 @@ msgstr ""
 "ang entry na ia-update ay nawawala\n"
 "(isa sa mga %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "ignoring media %s"
 msgstr "Ini-edit ang medium na \"%s\":"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, fuzzy, c-format
 msgid "enabling media %s"
 msgstr "inaalis ang medium na \"%s\""
@@ -3268,6 +3277,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Walang nahanap na changelog\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - gumawa ng update medium.\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "sirang anyo ng input: [%s]"
diff --git a/po/tr.po b/po/tr.po
index 07e00186..59ad6a1f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-04-28 01:10+0300\n"
 "Last-Translator: Atilla ÖNTAŞ <atilla_ontas@hotmail.com>\n"
 "Language-Team: Türkçe <tr@li.org>\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM Paketi Kurulumu"
@@ -34,7 +34,7 @@ msgstr "RPM Paketi Kurulumu"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Hata: %s bulunamadı, işlem iptal edilecek"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Tamam"
@@ -100,7 +100,7 @@ msgstr "_Kur"
 msgid "_Save"
 msgstr "_Kaydet"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "İp_tal"
@@ -132,8 +132,9 @@ msgstr ""
 msgid "Options:"
 msgstr "Seçenekler:"
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - bu yardım mesajını görüntüler.\n"
@@ -170,7 +171,7 @@ msgstr ""
 "  --verify-rpm   - kurulumdan önce rpm imzasını doğrula\n"
 "                   (--no-verify-rpm bunu iptal eder, öntanımlı etkindir).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -221,7 +222,7 @@ msgstr "Lütfen bekleyiniz..."
 msgid "Must be root"
 msgstr "Yetkili kullanıcı olunmalı"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -232,42 +233,42 @@ msgstr ""
 "%s\n"
 "Yinde de kuruluma devam edilsin mi?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Uyarı"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Tamam"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (güncellenecek)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (yüklenecek)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Paket seçimi"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Aşağıdaki paketlerden birine ihtiyaç var:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "D_urdur"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -279,63 +280,63 @@ msgstr ""
 "%s\n"
 "Yine de devam edilsin mi?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 "Bağımlılık sorununu aşabilmek için, aşağıdaki paketin kurulması gerekiyor:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 "Bağımlılık sorununu aşabilmek için, aşağıdaki paketlerin kurulması gerekiyor:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d paket, %d MB)"
 msgstr[1] "(%d paket, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Paket kurulumu..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "kaynak paketleri alınamadı, çıkılıyor"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Hazırlanıyor..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "'%s' paketi kuruluyor ( %s/%s )..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Lütfen \"%s\" isimli ortamı yerleştirin"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "'%s' paketi indiriliyor..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Bitti"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -346,28 +347,28 @@ msgstr ""
 "%s\n"
 "Urpmi veritabanınızı güncellemek isteyebilirsiniz"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Kurulum başarısız oldu"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Herşey zaten kurulu"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Kurulum tamamlandı"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "%s kaldırılıyor"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi yeniden başlatılıyor."
@@ -447,8 +448,8 @@ msgid "...retrieving done"
 msgstr "...alma tamamlandı"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...getirme başarısız: [%s]"
@@ -488,54 +489,54 @@ msgstr "Sınırlı kipte çalışılırken bu işlem yasaklanmıştır."
 msgid "bad proxy declaration on command line\n"
 msgstr "komut satırından kötü vekil sunucu bildirimi\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: \"%s\" rpm dosyası okunamıyor\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr "beklenmeyen ifade %s"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, c-format
 msgid "missing expression before %s"
 msgstr "%s 'den önce kayıp ifade"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "beklenmeyen ifade %s (öneri: -a or -o kullanın ?)"
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr "kapatmak için ifade yok"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 "varsayılan olarak upmf bir regexp bekler. \"--literal\" seçeneğini "
 "kullanmalısınız."
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot dizini geçerli değil"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s, %s olmadan kullanılamaz"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s, %s ile kullanılamaz"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Çok fazla parametre\n"
@@ -965,217 +966,217 @@ msgstr ""
 "--synthesis bu parametrelerle kullanılamaz --media, --excludemedia, --"
 "sortmedia, --update, --use-distrib veya --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Arama başlangıcı: %s bitişi: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "%s paketi atlanıyor"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "%s paketinin yükseltilmesi yerine kurulması"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "\"%s\" ortamı zaten var"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(varsayılan olarak yok sayıldı)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "\"%s\" ortamı, \"%s\" uzak medyasından önce ekleniyor"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "\"%s\" ortamı ekleniyor."
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "%s dizini mevcut değil"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "bu konum herhangi bir dağıtım içermiyor"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "media.cfg dosyasının sözdizimsel analizi yapılamıyor."
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "dağıtım ortamına ulaşılamıyor. (media.cfg dosyası bulunamadı.)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "desteklenmeyen ortam atlanıyor `%s' (for %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "media.cfg dosyası alınıyor..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "var olmayan \"%s\" ortamı seçilmeye çalışılıyor"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "Çoklu medya seçiliyor: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "\"%s\" ortamı kaldırılıyor."
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "\"%s\" ortamı için urpmi yeniden ayarlanıyor."
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "yeniden ayarlama başarısız oldu."
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "yeniden ayarlama tamamlandı."
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Adlar dosyasının üretiminde hata: %d bağımlılığı bulunamadı."
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "\"%s\" ortamı güncel."
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "sentez dosyası [%s] inceleniyor"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "\"%s\" ortamının sentezleme dosyasının okunmasında hata"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "\"%s\" ortamı için [%s] kopyalanıyor..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...kopyalama başarısız"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "\"%s\"in açıklama dosyası kopyalanıyor..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...kopyalama tamamlandı."
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "[%s] kopyalaması başarısız. (dosya şüphe çekecek kadar ufak)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "Alınan kaynak sentezi'nin md5sum özeti hesaplanıyor."
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] alımı başarısız oldu. (md5sum eşleşmedi.)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "%s üzerinde genhdlist2 başarısız oldu."
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "%s ve %s karşılaştırılıyor."
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "\"%s\" ortamı için geçersiz %s hdlist dosyası."
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "\"%s\"in MD5SUM dosyası kopyalanıyor..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "rpm dosya ismi [%s] geçersiz"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "\"%s\" in kaynak sentezi getiriliyor..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "incelenmiş sentez %s olarak bulundu."
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "\"%s\" ortamı için sentez dosyası bulunamadı."
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "\"%s\" pubanahtarı sınanıyor..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...%s anahtarı \"%s\" pubanahtarından içe aktarıldı."
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "\"%s\" pubanahtarı içe aktarılamıyor."
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "\"%s\" ortamı güncellendi."
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "[%s] alımı başarısız oldu"
@@ -1207,7 +1208,7 @@ msgstr "HhNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "EeYy"
@@ -1277,7 +1278,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1360,275 +1361,7 @@ msgstr "%s bağlanıyor"
 msgid "unmounting %s"
 msgstr "%s ayrılıyor"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "urpmi yeniden başlatıldı, önemli paketlerin listesi değişmedi"
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-"urpmi yeniden başlatıldı ve önemli paketlerin listesi değişti: %s vs %s"
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "%s adında bir paket yok"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Bu paketler %s içeriyor: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "%s paketleri kurulamıyor"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "%s paketi kurulu"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "%s paketleri kurulu"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "%s paketinin kayıplığından"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "%s 'in zaten kurulu olmasından dolayı."
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "%s' den dolayı yetersiz"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "%s yükseltilmeye çalışılıyor."
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "%s 'in tutlması sırasında"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "%s 'in kurulumu sırasında"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "%s paketi ile çelişkisinden"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Geçersiz imza (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Geçersiz Anahtar ID'si (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Kayıp imza (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr "sistem"
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr "%s'i %s için yeniden başlatmalısınız"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't write file"
-msgstr "Dosya yazılamıyor."
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "Dosya açılamıyor."
-
-#: ../urpm/sys.pm:289
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "%s dosyası%s 'e taşınamıyor."
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme sürüm %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Bu bir serbest yazılımdır ve GNU GPL lisansı altında tekrar dağıtılabilir.\n"
-"\n"
-"kullanımı:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - Otomatik seçenekler arasından paketleri seç.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - kurulumun başarılı olup olmayacağını doğrula.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - benzer makineler arasında dağıtılmış urpmi.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - Paketleri silmeden önce yeniden paketle.\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - rpm kaldırma için bir başka kök kullanıcı kullan.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../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   - urpmi veritabanı ve rpm kurulumu için bir başka kök "
-"kullan.\n"
-
-#: ../urpme:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - paket betiklerini çalıştıma.\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - urpme'yi bir dağıtım ağacından ayarla. Bir \"chroot\"u,\n"
-"                   --root seçeneğiyle (kur/kaldır)mak için yararlıdır.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - kalabalık kipi.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - ifadeye uyan tüm paketleri seçer. \n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Paketleri kaldırmak için sadece sistem yöneticisi yetkilidir"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "bilinmeyen paketler "
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "bilinmeyen paket"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "%s paketinin kaldırılması sisteminizi çökertecektir."
-msgstr[1] "%s paketinin kaldırılması sisteminizi çökertecektir."
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Kaldırılacak bir şey yok"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Kaldırılacak bir şey yok"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] ""
-"Bağımlılık sorununu aşabilmek için, aşağıdaki paketin kaldırılması gerekiyor."
-"(%d)"
-msgstr[1] ""
-"Bağımlılık sorununu aşabilmek için, aşağıdaki paketin kaldırılması gerekiyor."
-"(%d)"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "bilinmeyen paket"
-msgstr[1] "bilinmeyen paket"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "%d adet paket kaldırılsın mı?"
-msgstr[1] "%d adet paket kaldırılsın mı?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " ( y, e / H , N ) "
-
-#: ../urpme:164
-#, c-format
-msgid "testing removal of %s"
-msgstr ""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Kaldırma başarısız"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Kaldırma başarısız"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1644,23 +1377,23 @@ msgstr ""
 "\n"
 "kullanımı: urpmf [seçenekler] örnek-ifade\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - bu aracın sürüm numarasını yazdır.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - belirli bir çevre kullan (genellikle bir hata raporu).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - virgülle ayrılmış olan verilen medyayı kullanma.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
@@ -1668,264 +1401,544 @@ msgstr ""
 "  --literal, -l  - örnekleri eşleştirme, argümanı bri tam satır olarak "
 "kullan.\n"
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../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   - urpmi veritabanı ve rpm kurulumu için bir başka kök "
+"kullan.\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    - virgülle ayrılan alt satırlara göre medyayı sırala.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - medyaya erişim için verilen yolu kullan.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - urpmi veri tabanı yerine belirtilen sentezi kullan.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - açıklayıcı satırları ikinci kez yadırma.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - sadece güncelleme ortamını kullan.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose             - kalabalık kipi.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 "  -i             - her örnekte büyük-küçük harf farklılığını göz ardı et.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 "  -I             -  örneklerde büyük/küçük harf ayrımını gözet.(varsayılan)\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 "  -F<str>        - alan ayracını değiştir. (':' işaretinde varsayılan).\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Kalıp ifadeler:\n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  text           - \"-l\" kullanılmadığı sürece regexp olarak sözdizimsel "
 "analizi yapılan herhangi bir metin.\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - perl kocunu doğrudan perl olarak ekle -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - ikili AND operatörü.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - ikili OR operatör.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - tekli NOT.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - sol ve sağ parantezler.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Etiketlerin listesi:\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           -  printf benzeri bir çıktı biçimi belirtir\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   örnek: '%%isim:%%dosyalar'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - mimari\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - derlendiği makine\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - derlenme zamanı\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - yapılandırma dosyaları\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - çakışanlar etiketi\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - paket açıklaması\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - dağıtım\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - tarih\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - paketin dosya adı\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - paketin içerdiği dosyaların listesi\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - grup\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - lisans\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - paket adı\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - gereksiz kılınanlar etiketi\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - paketleyen\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - sunulanlar etiketi\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - gereklilikler etiketi\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - kurulu boyut\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - kaynak rpm adı\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - önerilenler etiket\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - özet\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - sağlayıcı\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - paketin bulunduğu medya.\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             -  sürüm, yayımı ve mimarisini yazdırır.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr "sonlandırılmamış ifade (%s)"
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Geçeresiz biçim: sadece multi-valued etiket kullanılabilir"
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "%s' de belirtilen ortam kullanılıyor\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "\"%s\" ortamı için hdlist mevcut değil."
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "\"%s\" ortamı için sentez mevcut değil."
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "\"%s\" ortamı için xml-info mevcut değil."
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr "urpmi yeniden başlatıldı, önemli paketlerin listesi değişmedi"
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+"urpmi yeniden başlatıldı ve önemli paketlerin listesi değişti: %s vs %s"
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "%s adında bir paket yok"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Bu paketler %s içeriyor: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "%s paketleri kurulamıyor"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "%s paketi kurulu"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "%s paketleri kurulu"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "%s paketinin kayıplığından"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "%s 'in zaten kurulu olmasından dolayı."
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "%s' den dolayı yetersiz"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "%s yükseltilmeye çalışılıyor."
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "%s 'in tutlması sırasında"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "%s 'in kurulumu sırasında"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "%s paketi ile çelişkisinden"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Geçersiz imza (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Geçersiz Anahtar ID'si (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Kayıp imza (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr "sistem"
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr "%s'i %s için yeniden başlatmalısınız"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't write file"
+msgstr "Dosya yazılamıyor."
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "Dosya açılamıyor."
+
+#: ../urpm/sys.pm:289
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "%s dosyası%s 'e taşınamıyor."
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme sürüm %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Bu bir serbest yazılımdır ve GNU GPL lisansı altında tekrar dağıtılabilir.\n"
+"\n"
+"kullanımı:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - Otomatik seçenekler arasından paketleri seç.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - kurulumun başarılı olup olmayacağını doğrula.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - benzer makineler arasında dağıtılmış urpmi.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - Paketleri silmeden önce yeniden paketle.\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - rpm kaldırma için bir başka kök kullanıcı kullan.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr ""
+"  --justdb       - sadece rpm veritabanını güncelle, dosya sistemini değil.\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - paket betiklerini çalıştıma.\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - urpme'yi bir dağıtım ağacından ayarla. Bir \"chroot\"u,\n"
+"                   --root seçeneğiyle (kur/kaldır)mak için yararlıdır.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - kalabalık kipi.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - ifadeye uyan tüm paketleri seçer. \n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Paketleri kaldırmak için sadece sistem yöneticisi yetkilidir"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "bilinmeyen paketler "
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "bilinmeyen paket"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "%s paketinin kaldırılması sisteminizi çökertecektir."
+msgstr[1] "%s paketinin kaldırılması sisteminizi çökertecektir."
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Kaldırılacak bir şey yok"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Kaldırılacak bir şey yok"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Bağımlılık sorununu aşabilmek için, aşağıdaki paketin kaldırılması gerekiyor."
+"(%d)"
+msgstr[1] ""
+"Bağımlılık sorununu aşabilmek için, aşağıdaki paketin kaldırılması gerekiyor."
+"(%d)"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "bilinmeyen paket"
+msgstr[1] "bilinmeyen paket"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "%d adet paket kaldırılsın mı?"
+msgstr[1] "%d adet paket kaldırılsın mı?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " ( y, e / H , N ) "
+
+#: ../urpme:166
+#, c-format
+msgid "testing removal of %s"
+msgstr ""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Kaldırma başarısız"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Kaldırma başarısız"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr "sonlandırılmamış ifade (%s)"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2014,12 +2027,6 @@ msgstr "  --clean        - herhangi birşeyden önce rpm'yi önbellekten sil.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - rpm'yi ön bellekte kullanılmadan sakla\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr ""
-"  --justdb       - sadece rpm veritabanını güncelle, dosya sistemini değil.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2357,7 +2364,7 @@ msgstr ""
 "\n"
 "Yine de devam edilsin mi?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (E/h) "
@@ -2557,10 +2564,12 @@ msgstr "  --curl         - uzak dosyaları almak için curl kullan.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - bir güncelleme ortamı oluştur.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2572,22 +2581,22 @@ msgstr ""
 "                   şunlardan birini: hiç bir zaman, gerektiğinde,sadece-"
 "güncellemede, herzaman. cf urpmi. cfg (5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - sentez dosyası kullan.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - rpm dosyaları kullan.(sentez yerine)\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - herhangi bir sentez dosyası bulmaya çalışma.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2596,17 +2605,17 @@ msgstr ""
 "  --distrib      - tüm medyaları otomatik olarak bir kurulum medyasından\n"
 "                   oluştur.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr "  --interactive  - --distirb ile, her medya için onaylama sorar.\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - --distirb ile, listelenen her medyayı ekler.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2615,74 +2624,74 @@ msgstr ""
 "  --from         - yansı adreslerini almak için belirtilen adresi kullan,\n"
 "                   öntanımlı adres: %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr "  --virtual      -her zaman güncel olan sanal bir medya oluştur.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - MD5SUM kontrolünü devre dışı bırak.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     -eklenen medyanın pubanahtarını alma.\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - yapılandırmaya medyayı ekle; ancak güncelleme.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - Sessiz kipi.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - kalabalık kipi.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "bilinen xml-bilgisi kuralları şunlardır: %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 "--distrib --mirrorlist <url> ile birlikte herhangi bir argüman gerekli "
 "değildir."
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "hatalı <url> (yerel dizin için, yol kesin olmalıdır.)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Ortam eklemek için sadece sistem yöneticisi yetkilidir."
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "[%s] yapılandırma dosyası oluşturuluyor."
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "[%s] yapılandırma dosyası oluşturulamıyor."
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "<sentez'in göreceli konumu> --distrib ile gerekli değil "
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
@@ -2691,17 +2700,17 @@ msgstr ""
 "\n"
 "'%s' medyasını eklemek ister misiniz?"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<sentez'in göreli yolu> eksik\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "%s , uzak ortam ile birlikte kullanılamıyor."
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "ortam eklenemiyor."
@@ -2949,14 +2958,14 @@ msgstr "  -ff            - gerçekten sentez dosyalarını güncellemeye zorla.\
 msgid "Only superuser is allowed to update media"
 msgstr "Paketleri kurmak için sadece sistem yöneticisi yetkilidir"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "Güncellenecek hiç birşey yok. (yeni ortam eklemek için \"urpmi.addmedia\" "
 "kullanın).\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2965,17 +2974,17 @@ msgstr ""
 "Güncelleme için girdi eksik\n"
 "(bunlardan biri %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "%s meydası yoksayılıyor."
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "medya \"%s\" etkinleştiriliyor."
@@ -3262,6 +3271,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Değişiklik günlüğü bulunamadı!\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - bir güncelleme ortamı oluştur.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "bozuk girdi: [%s]"
 
diff --git a/po/uk.po b/po/uk.po
index c1ecbd6f..64656967 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2006-01-25 11:16+0200\n"
 "Last-Translator: Taras Boychuk <btr1@mail.ru>\n"
 "Language-Team: ukrainian <translation@linux.org.ua>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Встановлення RPM"
@@ -31,7 +31,7 @@ msgstr "Встановлення RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Помилка: неможливо знайти файл %s, дію припинено"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_O Гаразд"
@@ -97,7 +97,7 @@ msgstr "_Встановити"
 msgid "_Save"
 msgstr "З_берегти"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_C Скасувати"
@@ -128,8 +128,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - виводити цю довідку.\n"
@@ -166,7 +167,7 @@ msgstr ""
 "                   (--no-verify-rpm вимикає це і встановлює типове "
 "значення).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -217,7 +218,7 @@ msgstr "Будь ласка, зачекайте..."
 msgid "Must be root"
 msgstr "Потрібно бути root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -228,42 +229,42 @@ msgstr ""
 "%s\n"
 "Продовжувати встановлення?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Попередження"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Гаразд"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (поновити)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (встановити)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Вибір пакунків"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Потрібен один із наступних пакунків:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Перервати"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -274,19 +275,19 @@ msgstr ""
 "%s\n"
 "Продовжувати встановлення?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Наступні пакунки буде встановлено для задоволення залежностей (%d Мб)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Наступні пакунки буде встановлено для задоволення залежностей (%d Мб)"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -294,42 +295,42 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Встановлюється пакунок..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "неможливо одержати початкові пакунки, завершується"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Підготовка..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Встановлюється пакунок `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Вставте, будь ласка, носія %s у пристрій %s"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Звантажується пакунок %s"
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "Виконано"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -340,28 +341,28 @@ msgstr ""
 "%s\n"
 "Можливо, Вам потрібно поновити вашу базу даних urpmi"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Встановлення неуспішне"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Все вже встановлено"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Встановлення завершено"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "вилучається %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "перезапуск urpmi"
@@ -441,8 +442,8 @@ msgid "...retrieving done"
 msgstr "...відновлення завершено"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...відновлення невдале: %s"
@@ -482,52 +483,52 @@ msgstr "Цю дію заборонено до виконання в обмеже
 msgid "bad proxy declaration on command line\n"
 msgstr "неправильне оголошення проксі в командному рядку\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: неможливо прочитати rpm-файл \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Немає підпису (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -956,218 +957,218 @@ msgstr ""
 "--synthesis не може використовуватися з --media, --excludemedia, --"
 "sortmedia, --update або --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Початок пошуку: %s, кінець: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "пропускається пакунок %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "буде встановлено замість поновлення пакунка %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "носій \"%s\" вже існує"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "читаються заголовки з носія \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "видаляється носій \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "неможливо відкрити rpmdb"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "немає доступу до першого носія встановлення (немає файла hdlists)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "відновлюється файл hdlists..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "спроба вибрати неіснуючого носія \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "вибір багатьох носіїв: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "видаляється носій \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "переконфігурація urpmi з носія \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...переконфігурація невдала"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "переконфігурацію виконано"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Помилка при створенні файла назв: залежність %d не знайдено"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "носія \"%s\" не вибрано"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "перевіряється файл synthesis [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "проблема читання файла synthesis для носія \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "записується файл списку для носія \"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...копіювання невдале"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "копіюється файл опису \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...копіювання завершено"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "копіювання [%s] завершилось невдало (файл є підозріло малим)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr ""
 "розраховується md5sum для hdlist (або synthesis) джерела, що поновлюється"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "копіювання [%s] невдале (не співпадає md5sum)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "перевіряється файл hdlist [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "встановлюється %s з %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "немає файла hdlist для носія \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "копіюється файл опису \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "неправильна назва rpm-файла [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "відновлюється джерело hdlist (або synthesis) \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "знайдено випробуваний hdlist (або synthesis) як %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "немає файла hdlist для носія \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "перевіряється файл ключів з \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...імпортовано ключ %s з файла ключів \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "неможливо імпортувати файл ключів з \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "додано носія %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1199,7 +1200,7 @@ msgstr "НнNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "ТтYy"
@@ -1269,7 +1270,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1353,6 +1354,307 @@ msgstr "монтується %s"
 msgid "unmounting %s"
 msgstr "розмонтовується %s"
 
+#: ../urpm/search.pm:29 ../urpmf:29
+#, fuzzy, 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 %s\n"
+" Авторські права (C) 2002-2006 Mandriva.\n"
+" Це безкоштовна програма, може розповсюджуватися за умовами GNU GPL.\n"
+"\n"
+"використання:\n"
+
+#: ../urpm/search.pm:36 ../urpmf:36
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - виводити цю довідку.\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          - використовувати специфічне оточення (звичайно звіт\n"
+"                   про помилку).\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 - не використовувати вказані джерела, розділені комами.\n"
+
+#: ../urpm/search.pm:39 ../urpmf:39
+#, c-format
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - використовувати інший root для встановлення 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    - сортувати джерела відповідно до підписів, відділених "
+"комами.\n"
+
+#: ../urpm/search.pm:43 ../urpmf:43
+#, fuzzy, c-format
+msgid "  --use-distrib  - use the given path to access media\n"
+msgstr ""
+"  --synthesis    - використовувати вказаний файл synthesis замість бази "
+"даних urpmi.\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    - використовувати вказаний файл synthesis замість бази "
+"даних urpmi.\n"
+
+#: ../urpm/search.pm:45 ../urpmf:45
+#, c-format
+msgid "  --uniq         - do not print identical lines twice.\n"
+msgstr "  --uniq         - не виводити однакові рядки.\n"
+
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
+#, c-format
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - використовування тільки носії з поновленнями.\n"
+
+#: ../urpm/search.pm:47 ../urpmf:47
+#, c-format
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - детальний режим.\n"
+
+#: ../urpm/search.pm:48 ../urpmf:48
+#, c-format
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr "  -i             - нехтувати регістрами в усіх шаблонах.\n"
+
+#: ../urpm/search.pm:49 ../urpmf:49
+#, fuzzy, c-format
+msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgstr "  -i             - нехтувати регістрами в усіх шаблонах.\n"
+
+#: ../urpm/search.pm:50 ../urpmf:50
+#, c-format
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
+
+#: ../urpm/search.pm:51 ../urpmf:51
+#, c-format
+msgid "Pattern expressions:\n"
+msgstr ""
+
+#: ../urpm/search.pm:52 ../urpmf:52
+#, c-format
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
+
+#: ../urpm/search.pm:53 ../urpmf:53
+#, c-format
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - включати код perl безпосередньо як perl -e.\n"
+
+#: ../urpm/search.pm:54 ../urpmf:54
+#, c-format
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - двійковий оператор AND.\n"
+
+#: ../urpm/search.pm:55 ../urpmf:55
+#, c-format
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - двійковий оператор OR.\n"
+
+#: ../urpm/search.pm:56 ../urpmf:56
+#, c-format
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - унарний NOT.\n"
+
+#: ../urpm/search.pm:57 ../urpmf:57
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  )              - права дужка, щоб закрити груповий вираз.\n"
+
+#: ../urpm/search.pm:58 ../urpmf:58
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Перелік даних для відновлення:\n"
+"\n"
+
+#: ../urpm/search.pm:59 ../urpmf:59
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - використовувати X інтерфейс.\n"
+
+#: ../urpm/search.pm:60 ../urpmf:60
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                    типово %s.\n"
+
+#: ../urpm/search.pm:61 ../urpmf:61
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - виводити параметр url: адреса.\n"
+
+#: ../urpm/search.pm:62 ../urpmf:62
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - виводити параметр buildhost: основний host.\n"
+
+#: ../urpm/search.pm:63 ../urpmf:63
+#, c-format
+msgid "  --buildtime    - build time\n"
+msgstr ""
+
+#: ../urpm/search.pm:64 ../urpmf:64
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "записати зміни у файл конфігурації"
+
+#: ../urpm/search.pm:65 ../urpmf:65
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - виводити параметр conflicts: всі конфлікти.\n"
+
+#: ../urpm/search.pm:66 ../urpmf:66
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --description  - виводити параметр description: опис.\n"
+
+#: ../urpm/search.pm:67 ../urpmf:67
+#, c-format
+msgid "  --distribution - distribution\n"
+msgstr ""
+
+#: ../urpm/search.pm:68 ../urpmf:68
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - виводити параметр epoch: період.\n"
+
+#: ../urpm/search.pm:69 ../urpmf:69
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --name          - виводити тільки назви пакунків.\n"
+
+#: ../urpm/search.pm:70 ../urpmf:70
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l         - вивести список файлів у пакунку.\n"
+
+#: ../urpm/search.pm:71 ../urpmf:71
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - виводити параметр group: група.\n"
+
+#: ../urpm/search.pm:72 ../urpmf:72
+#, fuzzy, c-format
+msgid "  --license      - license\n"
+msgstr "  --name          - виводити тільки назви пакунків.\n"
+
+#: ../urpm/search.pm:73 ../urpmf:73
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name          - виводити тільки назви пакунків.\n"
+
+#: ../urpm/search.pm:74 ../urpmf:74
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr "  --obsoletes    - виводити параметр obsoletes: всі застарілі файли.\n"
+
+#: ../urpm/search.pm:75 ../urpmf:75
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager     - виводити параметр packager: пакувальник.\n"
+
+#: ../urpm/search.pm:76 ../urpmf:76
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides     - виводити параметр provides: всі використання.\n"
+
+#: ../urpm/search.pm:77 ../urpmf:77
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - виводити параметр requires: всі вимоги.\n"
+
+#: ../urpm/search.pm:78 ../urpmf:78
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - виводити параметр size: розмір.\n"
+
+#: ../urpm/search.pm:79 ../urpmf:79
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - виводити параметр sourcerpm: джерельний rpm.\n"
+
+#: ../urpm/search.pm:80 ../urpmf:80
+#, fuzzy, c-format
+msgid "  --suggests     - suggests tags\n"
+msgstr "  --obsoletes    - виводити параметр obsoletes: всі застарілі файли.\n"
+
+#: ../urpm/search.pm:81 ../urpmf:81
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary, -S  - виводити короткий звіт.\n"
+
+#: ../urpm/search.pm:82 ../urpmf:82
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - виводити параметр url: адреса.\n"
+
+#: ../urpm/search.pm:83 ../urpmf:83
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - детальний режим.\n"
+
+#: ../urpm/search.pm:84 ../urpmf:84
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l         - вивести список файлів у пакунку.\n"
+
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
+#, c-format
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - вивести версію, випуск і архів з назвою.\n"
+
+#: ../urpm/search.pm:197 ../urpmf:198
+#, c-format
+msgid "Incorrect format: you may use only one multi-valued tag"
+msgstr ""
+
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "використовується особливе оточення на %s\n"
+
+#: ../urpm/search.pm:290 ../urpmf:291
+#, fuzzy, c-format
+msgid "no hdlist available for medium \"%s\""
+msgstr "немає файла hdlist для носія \"%s\""
+
+#: ../urpm/search.pm:297 ../urpmf:298
+#, fuzzy, c-format
+msgid "no synthesis available for medium \"%s\""
+msgstr "побудовано hdlist synthesis файл для носія \"%s\""
+
+#: ../urpm/search.pm:304 ../urpmf:307
+#, fuzzy, c-format
+msgid "no xml-info available for medium \"%s\""
+msgstr "записується файл списку для носія \"%s\""
+
 #: ../urpm/select.pm:28
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
@@ -1364,62 +1666,67 @@ msgid ""
 "urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
-#: ../urpm/select.pm:191
+#: ../urpm/select.pm:168
 #, c-format
 msgid "No package named %s"
 msgstr "Немає пакунку з назвою %s"
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Наступні пакунки містять %s: %s"
 
-#: ../urpm/select.pm:296
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "Все вже встановлено"
 
-#: ../urpm/select.pm:539
+#: ../urpm/select.pm:543
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "Все вже встановлено"
 
-#: ../urpm/select.pm:540
+#: ../urpm/select.pm:544
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "Все вже встановлено"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
 msgid "due to missing %s"
 msgstr "через відсутність %s"
 
-#: ../urpm/select.pm:559
+#: ../urpm/select.pm:563
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "Все вже встановлено"
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "через незадоволеність %s"
 
-#: ../urpm/select.pm:566
+#: ../urpm/select.pm:570
 #, c-format
 msgid "trying to promote %s"
 msgstr "намагаюсь активізувати %s"
 
-#: ../urpm/select.pm:567
+#: ../urpm/select.pm:571
 #, c-format
 msgid "in order to keep %s"
 msgstr "для того, щоб зберегти %s"
 
-#: ../urpm/select.pm:603
+#: ../urpm/select.pm:607
 #, c-format
 msgid "in order to install %s"
 msgstr "для того, щоб встановити %s"
 
-#: ../urpm/select.pm:613
+#: ../urpm/select.pm:617
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "через конфлікти з %s"
@@ -1512,18 +1819,17 @@ msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 "  --root         - використовувати інший root для rpm на змінному пристрої.\n"
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpme:55 ../urpmi:101
 #, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - використовувати інший root для встановлення rpm.\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - поновити тільки носія з поновленнями.\n"
 
-#: ../urpme:55
+#: ../urpme:56
 #, fuzzy, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --description  - виводити параметр description: опис.\n"
 
-#: ../urpme:56
+#: ../urpme:57
 #, fuzzy, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1533,32 +1839,32 @@ msgstr ""
 "використовується\n"
 "                   для встановлення (вилучення) chroot з параметром --root.\n"
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, fuzzy, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose      - детальний режим.\n"
 
-#: ../urpme:59
+#: ../urpme:60
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - вибрати всі пакунки відповідно до розширення.\n"
 
-#: ../urpme:72
+#: ../urpme:73
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "Тільки користувачу root дозволяється видаляти пакунки"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown packages"
 msgstr "невідомі пакунки"
 
-#: ../urpme:105
+#: ../urpme:106
 #, c-format
 msgid "unknown package"
 msgstr "невідомий пакунок"
 
-#: ../urpme:119
+#: ../urpme:121
 #, fuzzy, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
@@ -1566,17 +1872,17 @@ msgstr[0] "вилучення пакунка %s пошкодить систем�
 msgstr[1] "вилучення пакунка %s пошкодить систему"
 msgstr[2] "вилучення пакунка %s пошкодить систему"
 
-#: ../urpme:124
+#: ../urpme:126
 #, c-format
 msgid "Nothing to remove"
 msgstr "Нічого вилучати"
 
-#: ../urpme:141
+#: ../urpme:143
 #, fuzzy, c-format
 msgid "No orphans to remove"
 msgstr "Нічого вилучати"
 
-#: ../urpme:147
+#: ../urpme:149
 #, fuzzy, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
@@ -1588,7 +1894,7 @@ msgstr[1] ""
 msgstr[2] ""
 "Щоб задовольнити залежності, наступні %d пакунків буде вилучено (%d Мб)"
 
-#: ../urpme:152
+#: ../urpme:154
 #, fuzzy, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
@@ -1596,7 +1902,7 @@ msgstr[0] "невідомий пакунок"
 msgstr[1] "невідомий пакунок"
 msgstr[2] "невідомий пакунок"
 
-#: ../urpme:159
+#: ../urpme:161
 #, fuzzy, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
@@ -1604,325 +1910,31 @@ msgstr[0] "вилучається пакунок %s"
 msgstr[1] "вилучається пакунок %s"
 msgstr[2] "вилучається пакунок %s"
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (Т/н) "
 
-#: ../urpme:164
+#: ../urpme:166
 #, fuzzy, c-format
 msgid "testing removal of %s"
 msgstr "отримується змінний пристрій як \"%s\""
 
-#: ../urpme:178
+#: ../urpme:181
 #, c-format
 msgid "Removal failed"
 msgstr "Видалення невдале"
 
-#: ../urpme:180
+#: ../urpme:183
 #, fuzzy, c-format
 msgid "Removal is possible"
 msgstr "Видалення невдале"
 
-#: ../urpmf:29
-#, fuzzy, 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 %s\n"
-" Авторські права (C) 2002-2006 Mandriva.\n"
-" Це безкоштовна програма, може розповсюджуватися за умовами GNU GPL.\n"
-"\n"
-"використання:\n"
-
-#: ../urpmf:36
-#, fuzzy, c-format
-msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - виводити цю довідку.\n"
-
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
-#, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - використовувати специфічне оточення (звичайно звіт\n"
-"                   про помилку).\n"
-
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
-#, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - не використовувати вказані джерела, розділені комами.\n"
-
-#: ../urpmf:39
-#, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
-#, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"  --sortmedia    - сортувати джерела відповідно до підписів, відділених "
-"комами.\n"
-
-#: ../urpmf:43
-#, fuzzy, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
-msgstr ""
-"  --synthesis    - використовувати вказаний файл synthesis замість бази "
-"даних urpmi.\n"
-
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr ""
-"  --synthesis    - використовувати вказаний файл synthesis замість бази "
-"даних urpmi.\n"
-
-#: ../urpmf:45
-#, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
-msgstr "  --uniq         - не виводити однакові рядки.\n"
-
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - використовування тільки носії з поновленнями.\n"
-
-#: ../urpmf:47
-#, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - детальний режим.\n"
-
-#: ../urpmf:48
-#, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr "  -i             - нехтувати регістрами в усіх шаблонах.\n"
-
-#: ../urpmf:49
-#, fuzzy, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr "  -i             - нехтувати регістрами в усіх шаблонах.\n"
-
-#: ../urpmf:50
-#, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
-
-#: ../urpmf:51
-#, c-format
-msgid "Pattern expressions:\n"
-msgstr ""
-
-#: ../urpmf:52
-#, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-
-#: ../urpmf:53
-#, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - включати код perl безпосередньо як perl -e.\n"
-
-#: ../urpmf:54
-#, c-format
-msgid "  -a             - binary AND operator.\n"
-msgstr "  -a             - двійковий оператор AND.\n"
-
-#: ../urpmf:55
-#, c-format
-msgid "  -o             - binary OR operator.\n"
-msgstr "  -o             - двійковий оператор OR.\n"
-
-#: ../urpmf:56
-#, c-format
-msgid "  !              - unary NOT.\n"
-msgstr "  !              - унарний NOT.\n"
-
-#: ../urpmf:57
-#, fuzzy, c-format
-msgid "  ( )            - left and right parentheses.\n"
-msgstr "  )              - права дужка, щоб закрити груповий вираз.\n"
-
-#: ../urpmf:58
-#, fuzzy, c-format
-msgid "List of tags:\n"
-msgstr ""
-"Перелік даних для відновлення:\n"
-"\n"
-
-#: ../urpmf:59
-#, fuzzy, c-format
-msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - використовувати X інтерфейс.\n"
-
-#: ../urpmf:60
-#, fuzzy, c-format
-msgid "                   example: '%%name:%%files'\n"
-msgstr "                    типово %s.\n"
-
-#: ../urpmf:61
-#, fuzzy, c-format
-msgid "  --arch         - architecture\n"
-msgstr "  --url          - виводити параметр url: адреса.\n"
-
-#: ../urpmf:62
-#, fuzzy, c-format
-msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - виводити параметр buildhost: основний host.\n"
-
-#: ../urpmf:63
-#, c-format
-msgid "  --buildtime    - build time\n"
-msgstr ""
-
-#: ../urpmf:64
-#, fuzzy, c-format
-msgid "  --conffiles    - configuration files\n"
-msgstr "записати зміни у файл конфігурації"
-
-#: ../urpmf:65
-#, fuzzy, c-format
-msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - виводити параметр conflicts: всі конфлікти.\n"
-
-#: ../urpmf:66
-#, fuzzy, c-format
-msgid "  --description  - package description\n"
-msgstr "  --description  - виводити параметр description: опис.\n"
-
-#: ../urpmf:67
-#, c-format
-msgid "  --distribution - distribution\n"
-msgstr ""
-
-#: ../urpmf:68
-#, fuzzy, c-format
-msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - виводити параметр epoch: період.\n"
-
-#: ../urpmf:69
-#, fuzzy, c-format
-msgid "  --filename     - filename of the package\n"
-msgstr "  --name          - виводити тільки назви пакунків.\n"
-
-#: ../urpmf:70
-#, fuzzy, c-format
-msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l         - вивести список файлів у пакунку.\n"
-
-#: ../urpmf:71
-#, fuzzy, c-format
-msgid "  --group        - group\n"
-msgstr "  --group        - виводити параметр group: група.\n"
-
-#: ../urpmf:72
-#, fuzzy, c-format
-msgid "  --license      - license\n"
-msgstr "  --name          - виводити тільки назви пакунків.\n"
-
-#: ../urpmf:73
-#, fuzzy, c-format
-msgid "  --name         - package name\n"
-msgstr "  --name          - виводити тільки назви пакунків.\n"
-
-#: ../urpmf:74
-#, fuzzy, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
-msgstr "  --obsoletes    - виводити параметр obsoletes: всі застарілі файли.\n"
-
-#: ../urpmf:75
-#, fuzzy, c-format
-msgid "  --packager     - packager\n"
-msgstr "  --packager     - виводити параметр packager: пакувальник.\n"
-
-#: ../urpmf:76
-#, fuzzy, c-format
-msgid "  --provides     - provides tags\n"
-msgstr "  --provides     - виводити параметр provides: всі використання.\n"
-
-#: ../urpmf:77
-#, fuzzy, c-format
-msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - виводити параметр requires: всі вимоги.\n"
-
-#: ../urpmf:78
-#, fuzzy, c-format
-msgid "  --size         - installed size\n"
-msgstr "  --size         - виводити параметр size: розмір.\n"
-
-#: ../urpmf:79
-#, fuzzy, c-format
-msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - виводити параметр sourcerpm: джерельний rpm.\n"
-
-#: ../urpmf:80
-#, fuzzy, c-format
-msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes    - виводити параметр obsoletes: всі застарілі файли.\n"
-
-#: ../urpmf:81
-#, fuzzy, c-format
-msgid "  --summary      - summary\n"
-msgstr "  --summary, -S  - виводити короткий звіт.\n"
-
-#: ../urpmf:82
-#, fuzzy, c-format
-msgid "  --url          - url\n"
-msgstr "  --url          - виводити параметр url: адреса.\n"
-
-#: ../urpmf:83
-#, fuzzy, c-format
-msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - детальний режим.\n"
-
-#: ../urpmf:84
-#, fuzzy, c-format
-msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l         - вивести список файлів у пакунку.\n"
-
-#: ../urpmf:85 ../urpmq:99
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - вивести версію, випуск і архів з назвою.\n"
-
 #: ../urpmf:153
 #, c-format
 msgid "unterminated expression (%s)"
 msgstr ""
 
-#: ../urpmf:198
-#, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
-
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "використовується особливе оточення на %s\n"
-
-#: ../urpmf:291
-#, fuzzy, c-format
-msgid "no hdlist available for medium \"%s\""
-msgstr "немає файла hdlist для носія \"%s\""
-
-#: ../urpmf:298
-#, fuzzy, c-format
-msgid "no synthesis available for medium \"%s\""
-msgstr "побудовано hdlist synthesis файл для носія \"%s\""
-
-#: ../urpmf:307
-#, fuzzy, c-format
-msgid "no xml-info available for medium \"%s\""
-msgstr "записується файл списку для носія \"%s\""
-
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2016,11 +2028,6 @@ msgstr "  --clean        - спочатку видалити rpm з кешу.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - не стирати rpm з кешу.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - поновити тільки носія з поновленнями.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2348,7 +2355,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Все-таки продовжувати?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) (Т/н) "
@@ -2542,10 +2549,12 @@ msgstr ""
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - створити носія поновлення.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2553,25 +2562,25 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr ""
 "  --probe-synthesis - намагатися знайти і використати файл synthesis.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  --no-probe     - не намагатися знайти файли synthesis або\n"
 "                   hdlist.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2579,17 +2588,17 @@ msgid ""
 msgstr ""
 "  --distrib      - автоматично створювати всі носії із носія встановлення.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media - вивести список доступних носіїв.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2598,92 +2607,92 @@ msgstr ""
 "  --from         - використовувати url для списку дзеркал, типове значення\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - створити віртуального носія з найновішими даними,\n"
 "                   дозволяється тільки протокол file:// .\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - вимкнути перевірку файлів на MD5SUM.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - не імпортувати публічний ключ з доданого носія\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - додати носія в конфігурацію, але не поновлювати його.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - режим мовчання.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - детальний режим.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Тільки користувачу root дозволяється додавати носії"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "Створить конфігураційний файл [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Неможливо створити конфігураційний файл [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "немає потреби задавати <відносний шлях hdlist> з --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "немає <відносного шляху hdlist>\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "немає доступу до носія \"%s\""
@@ -2919,12 +2928,12 @@ msgstr "  -f             - змушувати генерувати hdlist фай
 msgid "Only superuser is allowed to update media"
 msgstr "Тільки користувачу root дозволяється поновлювати носії"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "нічого поновлювати (використовуйте urpmi.addmedia, щоб додати носія)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2933,17 +2942,17 @@ msgstr ""
 "об'єкта для поновлення немає\n"
 "(один з %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "ігнорується джерело %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "джерело робиться доступним %s"
@@ -3229,6 +3238,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Не знайдено журналу змін\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - створити носія поновлення.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "неправильно сформована адреса: [%s]"
 
diff --git a/po/urpmi.pot b/po/urpmi.pot
index 1f707975..e24fd7d5 100644
--- a/po/urpmi.pot
+++ b/po/urpmi.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr ""
@@ -24,7 +24,7 @@ msgstr ""
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr ""
@@ -72,7 +72,7 @@ msgstr ""
 msgid "_Save"
 msgstr ""
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr ""
@@ -98,8 +98,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr ""
@@ -130,7 +131,7 @@ msgid ""
 "                   (--no-verify-rpm disables it, default is enabled).\n"
 msgstr ""
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -178,7 +179,7 @@ msgstr ""
 msgid "Must be root"
 msgstr ""
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -186,42 +187,42 @@ msgid ""
 "Continue installation anyway?"
 msgstr ""
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr ""
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr ""
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr ""
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr ""
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr ""
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -229,61 +230,61 @@ msgid ""
 "Continue installation anyway?"
 msgstr ""
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr ""
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr ""
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr ""
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr ""
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr ""
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr ""
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr ""
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr ""
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -291,28 +292,28 @@ msgid ""
 "You may want to update your urpmi database"
 msgstr ""
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr ""
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr ""
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr ""
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr ""
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr ""
@@ -390,8 +391,8 @@ msgid "...retrieving done"
 msgstr ""
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr ""
@@ -431,52 +432,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr ""
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, c-format
 msgid "missing expression before %s"
 msgstr ""
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -899,217 +900,217 @@ msgid ""
 "update, --use-distrib or --parallel"
 msgstr ""
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr ""
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr ""
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr ""
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr ""
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr ""
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr ""
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr ""
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr ""
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr ""
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr ""
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr ""
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr ""
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr ""
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr ""
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr ""
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr ""
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr ""
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1141,7 +1142,7 @@ msgstr ""
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr ""
@@ -1211,7 +1212,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1294,541 +1295,552 @@ msgstr ""
 msgid "unmounting %s"
 msgstr ""
 
-#: ../urpm/select.pm:28
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
+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 ""
 
-#: ../urpm/select.pm:30
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid "  --version      - print this tool's version number.\n"
 msgstr ""
 
-#: ../urpm/select.pm:191
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
-msgid "No package named %s"
+msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 
-#: ../urpm/select.pm:193 ../urpme:114
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
 #, c-format
-msgid "The following packages contain %s: %s"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr ""
 
-#: ../urpm/select.pm:296
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
+msgid ""
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpm/select.pm:539
+#: ../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 "Package %s is already installed"
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr ""
 
-#: ../urpm/select.pm:540
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
-msgid "Packages %s are already installed"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
-msgid "due to missing %s"
+msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 
-#: ../urpm/select.pm:559
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
 #, c-format
-msgid "due to already installed %s"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr ""
 
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
-msgid "due to unsatisfied %s"
+msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr ""
 
-#: ../urpm/select.pm:566
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
-msgid "trying to promote %s"
+msgid "  --update       - use only update media.\n"
 msgstr ""
 
-#: ../urpm/select.pm:567
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
-msgid "in order to keep %s"
+msgid "  --verbose      - verbose mode.\n"
 msgstr ""
 
-#: ../urpm/select.pm:603
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
-msgid "in order to install %s"
+msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 
-#: ../urpm/select.pm:613
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
-msgid "due to conflicts with %s"
+msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 
-#: ../urpm/signature.pm:29
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
-msgid "Invalid signature (%s)"
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpm/signature.pm:60
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
-msgid "Invalid Key ID (%s)"
+msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpm/signature.pm:62
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
-msgid "Missing signature (%s)"
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpm/sys.pm:156
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
-msgid "system"
+msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpm/sys.pm:191
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
-msgid "You should restart %s for %s"
+msgid "  -a             - binary AND operator.\n"
 msgstr ""
 
-#: ../urpm/sys.pm:276
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
-msgid "Can't write file"
+msgid "  -o             - binary OR operator.\n"
 msgstr ""
 
-#: ../urpm/sys.pm:276
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
-msgid "Can't open file"
+msgid "  !              - unary NOT.\n"
 msgstr ""
 
-#: ../urpm/sys.pm:289
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
-msgid "Can't move file %s to %s"
+msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 
-#: ../urpme:41
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
+msgid "List of tags:\n"
 msgstr ""
 
-#: ../urpme:47
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
+msgid "  --qf           - specify a printf-like output format\n"
 msgstr ""
 
-#: ../urpme:48
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
-msgid "  --auto-orphans - remove orphans\n"
+msgid "                   example: '%%name:%%files'\n"
 msgstr ""
 
-#: ../urpme:49
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgid "  --arch         - architecture\n"
 msgstr ""
 
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgid "  --buildhost    - build host\n"
 msgstr ""
 
-#: ../urpme:52 ../urpmi:141
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
+msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpme:53
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
-msgid "  --root         - use another root for rpm removal.\n"
+msgid "  --conffiles    - configuration files\n"
 msgstr ""
 
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 
-#: ../urpme:55
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgid "  --description  - package description\n"
 msgstr ""
 
-#: ../urpme:56
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
+msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
+msgid "  --epoch        - epoch\n"
 msgstr ""
 
-#: ../urpme:59
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
+msgid "  --filename     - filename of the package\n"
 msgstr ""
 
-#: ../urpme:72
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
-msgid "Only superuser is allowed to remove packages"
+msgid "  --files        - list of files contained in the package\n"
 msgstr ""
 
-#: ../urpme:105
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
-msgid "unknown packages"
+msgid "  --group        - group\n"
 msgstr ""
 
-#: ../urpme:105
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
-msgid "unknown package"
+msgid "  --license      - license\n"
 msgstr ""
 
-#: ../urpme:119
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] ""
-msgstr[1] ""
+msgid "  --name         - package name\n"
+msgstr ""
 
-#: ../urpme:124
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
-msgid "Nothing to remove"
+msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 
-#: ../urpme:141
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
-msgid "No orphans to remove"
+msgid "  --packager     - packager\n"
 msgstr ""
 
-#: ../urpme:147
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] ""
-msgstr[1] ""
+msgid "  --provides     - provides tags\n"
+msgstr ""
 
-#: ../urpme:152
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "  --requires     - requires tags\n"
+msgstr ""
 
-#: ../urpme:159
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] ""
-msgstr[1] ""
+msgid "  --size         - installed size\n"
+msgstr ""
 
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
-msgid " (y/N) "
+msgid "  --sourcerpm    - source rpm name\n"
 msgstr ""
 
-#: ../urpme:164
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
-msgid "testing removal of %s"
+msgid "  --suggests     - suggests tags\n"
 msgstr ""
 
-#: ../urpme:178
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
-msgid "Removal failed"
+msgid "  --summary      - summary\n"
 msgstr ""
 
-#: ../urpme:180
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
-msgid "Removal is possible"
+msgid "  --url          - url\n"
 msgstr ""
 
-#: ../urpmf:29
+#: ../urpm/search.pm:83 ../urpmf:83
 #, 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"
+msgid "  --vendor       - vendor\n"
 msgstr ""
 
-#: ../urpmf:36
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
-msgid "  --version      - print this tool's version number.\n"
+msgid "  -m             - the media in which the package was found\n"
 msgstr ""
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
-msgid "  --env          - use specific environment (typically a bug report).\n"
+msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:39
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid "no hdlist available for medium \"%s\""
 msgstr ""
 
-#: ../urpmf:43
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
-msgid "  --use-distrib  - use the given path to access media\n"
+msgid "no synthesis available for medium \"%s\""
 msgstr ""
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../urpm/search.pm:304 ../urpmf:307
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid "no xml-info available for medium \"%s\""
 msgstr ""
 
-#: ../urpmf:45
+#: ../urpm/select.pm:28
 #, c-format
-msgid "  --uniq         - do not print identical lines twice.\n"
+msgid "urpmi was restarted, and the list of priority packages did not change"
 msgstr ""
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/select.pm:30
 #, c-format
-msgid "  --update       - use only update media.\n"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 
-#: ../urpmf:47
+#: ../urpm/select.pm:168
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
+msgid "No package named %s"
 msgstr ""
 
-#: ../urpmf:48
+#: ../urpm/select.pm:170 ../urpme:115
 #, c-format
-msgid "  -i             - ignore case distinctions in patterns.\n"
+msgid "The following packages contain %s: %s"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpm/select.pm:172
 #, c-format
-msgid "  -I             - honor case distinctions in patterns (default).\n"
+msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpm/select.pm:300
 #, c-format
-msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/select.pm:543
 #, c-format
-msgid "Pattern expressions:\n"
+msgid "Package %s is already installed"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/select.pm:544
 #, c-format
-msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgid "Packages %s are already installed"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
+msgid "due to missing %s"
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpm/select.pm:563
 #, c-format
-msgid "  -a             - binary AND operator.\n"
+msgid "due to already installed %s"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
 #, c-format
-msgid "  -o             - binary OR operator.\n"
+msgid "due to unsatisfied %s"
 msgstr ""
 
-#: ../urpmf:56
+#: ../urpm/select.pm:570
 #, c-format
-msgid "  !              - unary NOT.\n"
+msgid "trying to promote %s"
 msgstr ""
 
-#: ../urpmf:57
+#: ../urpm/select.pm:571
 #, c-format
-msgid "  ( )            - left and right parentheses.\n"
+msgid "in order to keep %s"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpm/select.pm:607
 #, c-format
-msgid "List of tags:\n"
+msgid "in order to install %s"
 msgstr ""
 
-#: ../urpmf:59
+#: ../urpm/select.pm:617
 #, c-format
-msgid "  --qf           - specify a printf-like output format\n"
+msgid "due to conflicts with %s"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpm/signature.pm:29
 #, c-format
-msgid "                   example: '%%name:%%files'\n"
+msgid "Invalid signature (%s)"
 msgstr ""
 
-#: ../urpmf:61
+#: ../urpm/signature.pm:60
 #, c-format
-msgid "  --arch         - architecture\n"
+msgid "Invalid Key ID (%s)"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpm/signature.pm:62
 #, c-format
-msgid "  --buildhost    - build host\n"
+msgid "Missing signature (%s)"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpm/sys.pm:156
 #, c-format
-msgid "  --buildtime    - build time\n"
+msgid "system"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/sys.pm:191
 #, c-format
-msgid "  --conffiles    - configuration files\n"
+msgid "You should restart %s for %s"
 msgstr ""
 
-#: ../urpmf:65
+#: ../urpm/sys.pm:276
 #, c-format
-msgid "  --conflicts    - conflict tags\n"
+msgid "Can't write file"
 msgstr ""
 
-#: ../urpmf:66
+#: ../urpm/sys.pm:276
 #, c-format
-msgid "  --description  - package description\n"
+msgid "Can't open file"
 msgstr ""
 
-#: ../urpmf:67
+#: ../urpm/sys.pm:289
 #, c-format
-msgid "  --distribution - distribution\n"
+msgid "Can't move file %s to %s"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpme:41
 #, c-format
-msgid "  --epoch        - epoch\n"
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
 msgstr ""
 
-#: ../urpmf:69
+#: ../urpme:47
 #, c-format
-msgid "  --filename     - filename of the package\n"
+msgid "  --auto         - automatically select a package in choices.\n"
 msgstr ""
 
-#: ../urpmf:70
+#: ../urpme:48
 #, c-format
-msgid "  --files        - list of files contained in the package\n"
+msgid "  --auto-orphans - remove orphans\n"
 msgstr ""
 
-#: ../urpmf:71
+#: ../urpme:49
 #, c-format
-msgid "  --group        - group\n"
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 
-#: ../urpmf:72
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
 #, c-format
-msgid "  --license      - license\n"
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr ""
 
-#: ../urpmf:73
+#: ../urpme:52 ../urpmi:141
 #, c-format
-msgid "  --name         - package name\n"
+msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr ""
 
-#: ../urpmf:74
+#: ../urpme:53
 #, c-format
-msgid "  --obsoletes    - obsoletes tags\n"
+msgid "  --root         - use another root for rpm removal.\n"
 msgstr ""
 
-#: ../urpmf:75
+#: ../urpme:55 ../urpmi:101
 #, c-format
-msgid "  --packager     - packager\n"
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
 msgstr ""
 
-#: ../urpmf:76
+#: ../urpme:56
 #, c-format
-msgid "  --provides     - provides tags\n"
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr ""
 
-#: ../urpmf:77
+#: ../urpme:57
 #, c-format
-msgid "  --requires     - requires tags\n"
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
 msgstr ""
 
-#: ../urpmf:78
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
 #, c-format
-msgid "  --size         - installed size\n"
+msgid "  --verbose, -v  - verbose mode.\n"
 msgstr ""
 
-#: ../urpmf:79
+#: ../urpme:60
 #, c-format
-msgid "  --sourcerpm    - source rpm name\n"
+msgid "  -a             - select all packages matching expression.\n"
 msgstr ""
 
-#: ../urpmf:80
+#: ../urpme:73
 #, c-format
-msgid "  --suggests     - suggests tags\n"
+msgid "Only superuser is allowed to remove packages"
 msgstr ""
 
-#: ../urpmf:81
+#: ../urpme:106
 #, c-format
-msgid "  --summary      - summary\n"
+msgid "unknown packages"
 msgstr ""
 
-#: ../urpmf:82
+#: ../urpme:106
 #, c-format
-msgid "  --url          - url\n"
+msgid "unknown package"
 msgstr ""
 
-#: ../urpmf:83
+#: ../urpme:121
 #, c-format
-msgid "  --vendor       - vendor\n"
-msgstr ""
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmf:84
+#: ../urpme:126
 #, c-format
-msgid "  -m             - the media in which the package was found\n"
+msgid "Nothing to remove"
 msgstr ""
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpme:143
 #, c-format
-msgid "  -f             - print version, release and arch with name.\n"
+msgid "No orphans to remove"
 msgstr ""
 
-#: ../urpmf:153
+#: ../urpme:149
 #, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../urpmf:198
+#: ../urpme:154
 #, c-format
-msgid "Incorrect format: you may use only one multi-valued tag"
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpme:166
 #, c-format
-msgid "using specific environment on %s\n"
+msgid "testing removal of %s"
 msgstr ""
 
-#: ../urpmf:291
+#: ../urpme:181
 #, c-format
-msgid "no hdlist available for medium \"%s\""
+msgid "Removal failed"
 msgstr ""
 
-#: ../urpmf:298
+#: ../urpme:183
 #, c-format
-msgid "no synthesis available for medium \"%s\""
+msgid "Removal is possible"
 msgstr ""
 
-#: ../urpmf:307
+#: ../urpmf:153
 #, c-format
-msgid "no xml-info available for medium \"%s\""
+msgid "unterminated expression (%s)"
 msgstr ""
 
 #: ../urpmi:81
@@ -1913,11 +1925,6 @@ msgstr ""
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr ""
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr ""
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2213,7 +2220,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr ""
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr ""
@@ -2371,10 +2378,12 @@ msgstr ""
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2382,128 +2391,128 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr ""
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr ""
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr ""
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr ""
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr ""
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr ""
@@ -2725,29 +2734,29 @@ msgstr ""
 msgid "Only superuser is allowed to update media"
 msgstr ""
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
 "(one of %s)\n"
 msgstr ""
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr ""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr ""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr ""
diff --git a/po/uz.po b/po/uz.po
index 173b8de5..f127ffc9 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2007-09-13 16:43+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM o'rnatish"
@@ -28,7 +28,7 @@ msgstr "RPM o'rnatish"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Xato: %s fayli topilmadi, amal bekor qilinadi"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ok"
@@ -86,7 +86,7 @@ msgstr "O'r_natish"
 msgid "_Save"
 msgstr "_Saqlash"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Bekor qilish"
@@ -117,8 +117,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - shu yordam xabarini ko'rsatish.\n"
@@ -153,7 +154,7 @@ msgstr ""
 "                   (--no-verify-rpm ushbu amalning teskarisi, andoza "
 "bo'yicha paketning elektron imzosi tekshiriladi).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -204,7 +205,7 @@ msgstr "Iltimos kutib turing..."
 msgid "Must be root"
 msgstr "root bo'lish kerak"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -215,42 +216,42 @@ msgstr ""
 "%s\n"
 "Bunga qaramasdan o'rnatishni davom ettirishni istaysizmi?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Diqqat"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (yangilash)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (o'rnatish)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Paket tanlovi"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Quyidagi paketlardan biri kerak:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "To'_xtatish"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -261,60 +262,60 @@ msgstr ""
 "%s\n"
 "O'rnatishni davom ettirishni istaysizmi?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Bog'liqliklarni ta'minlash uchun quyidagi paket ham o'rnatiladi:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Bog'liqliklarni ta'minlash uchun quyidagi paketlar ham o'rnatiladi:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d-ta paket, %d Mb)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Paketni o'rnatish..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Tayyorlanmoqda..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "\"%s\" (%s/%s) paketi o'rnatilmoqda..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Iltimos \"%s\" nomli to'plamni [%s] uskunasiga qo'ying"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "\"%s\" paketi olinmoqda..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Tayyor"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -325,28 +326,28 @@ msgstr ""
 "%s\n"
 "Balki urpmi ma'lumot bazasini yangilashingiz kerak."
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "O'rnatish muvaffaqiyatsiz tugadi:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Hamma narsa allaqachon o'rnatilgan"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "O'rnatish tugadi"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "%s o'chirilmoqda"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi qaytadan ishga tushmoqda"
@@ -428,8 +429,8 @@ msgid "...retrieving done"
 msgstr "...olish tugadi"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...olish muvaffaqiyatsiz tugadi: %s"
@@ -469,52 +470,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: RPM-faylini (%s) o'qib bo'lmadi\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Imzo yetishmaydi (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot direktoriyasi mavjud emas"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s amalidan %s amalisiz foydalanib bo'lmaydi"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s amalidan %s amali bilan birga foydalanib bo'lmaydi"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -943,220 +944,220 @@ msgstr ""
 "--synthesis'dan --media, --excludemedia, --sortmedia, --update, --use-"
 "distrib yoki --parallel bilan birga foydalanib bo'lmaydi"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Qidirish boshi: %s oxiri: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "%s paketi tashlab o'tilmoqda"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "to'plam allaqachon mavjud: \"%s\""
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(andoza bo'yicha e'tiborga olinmadi)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "to'plam qo'shilmoqda: %s"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, fuzzy, c-format
 msgid "directory %s does not exist"
 msgstr "chroot direktoriyasi mavjud emas"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr ""
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "media.cfg fayli yozib olinmoqda..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "to'plam olib tashlanmoqda: \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "to'plam uchun urpmi qaytadan moslanmoqda: \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...qaytadan moslash muvaffaqiyatsiz tugadi"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "...qaytadan moslash tugadi"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "to'plamni yangilash hojati yo'q: \"%s\""
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "synthesis fayli (%s) tekshirilmoqda"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "to'plamining synthesis faylini o'qishda muammo ro'y berdi: \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...nusxa ko'chirish muvaffaqiyatsiz tugadi"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...nusxa ko'chirish bajarildi"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 "'%s' faylidan nusxa ko'chirish muvaffaqiyatsiz tugadi (uning hajmi juda "
 "kichik)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr ""
 "olingan hdlist (yoki synthesis) fayli uchun md5sum soni hisoblanmoqda..."
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "%s'dan nusxa ko'chirish muvaffaqiyatsiz tugadi (md5sum noto'g'ri)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "hdlist fayli (%s) tekshirilmoqda"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "%s va %s tozalanmoqda"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "to'plamning hdlist fayli %s xato: %s"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "'%s' uchun pubkey fayli tekshirilmoqda..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "RPM-faylining nomi (%s) noto'g'ri"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "'%s' uchun hdlist (yoki synthesis) fayli yozib olinmoqda..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "qidirilgan hdlist (yoki synthesis) fayli topildi: %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "to'plam uchun hech qanday hdlist fayli topilmadi: \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "'%s' uchun pubkey fayli tekshirilmoqda..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "'%s' uchun pubkey faylini import qilib bo'lmadi"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "to'plam yangilandi: \"%s\""
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1188,7 +1189,7 @@ msgstr "JjJjNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "HhHhYy"
@@ -1258,7 +1259,7 @@ msgstr "Gb"
 msgid "TB"
 msgstr "Tb"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1340,265 +1341,7 @@ msgstr "%s ulanmoqda"
 msgid "unmounting %s"
 msgstr "%s uzilmoqda"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "%s nomli paket mavjud emas"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Quyidagi paketlarda %s bor: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "%s paketlarini o'rnatib bo'lmaydi"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "%s paketi allaqachon o'rnatilgan"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "%s paketlari allaqachon o'rnatilgan"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "%s yetishmaganiga ko'ra"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "%s paketi allaqachon o'rnatilganligi uchun"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr ""
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr ""
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "%s'ni qoldirish uchun"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "%s'ni o'rnatish uchun"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr ""
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Imzo haqiqiy emas (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr ""
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Imzo yetishmaydi (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't write file"
-msgstr "Faylini saqlab bo'lmadi"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "Faylini ochib bo'lmadi"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "%s amalidan %s amali bilan birga foydalanib bo'lmaydi"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme, versiya %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
-"\n"
-"Foydalanish:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr ""
-"  --test         - olib tashlashni to'g'ri bajarish imkoniyatini "
-"tekshirish.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-
-#: ../urpme:52 ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr ""
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr ""
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../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 ""
-
-#: ../urpme:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr ""
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - ortiqcha xabarlar bilan.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Paketlarni faqat root olib tashlashi mumkin"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "Noma'lum paketlar"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "noma'lum paket"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "paketni (%s) olib tashlash tizimni ishdan chiqaradi"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "O'chirish uchun hech narsa yo'q"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "O'chirish uchun hech narsa yo'q"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] ""
-"Bog'liqliklarni ta'minlash uchun quyidagi %d-ta paket olib tashlanadi"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "noma'lum paket"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "%d-ta paketni olib tashlashni istaysizmi?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (h/Y) "
-
-#: ../urpme:164
-#, c-format
-msgid "testing removal of %s"
-msgstr ""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "O'chirish muvaffaqiyatsiz tugadi"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "O'chirish muvaffaqiyatsiz tugadi"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1614,280 +1357,549 @@ msgstr ""
 "\n"
 "Foydalanish: urpmf [parametrlar] qidirish uchun ifoda\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr ""
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - ko'rsatilgan, vergul bilan ajratilgan, to'plamlardan "
 "foydalanilmasin.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../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 ""
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - ko'rsatilgan synthesis faylidan foydalanish.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - bir xil qatorlar ko'rsatilmasin.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - faqat yangilash to'plamidan foydalanish.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - ortiqcha xabarlar bilan.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr ""
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr ""
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Teglar ro'yxati:\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   masalan: '%%name:%%files'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr ""
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - paket ta'rifi\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr ""
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr ""
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - paketdagi fayllar ro'yxatini ko'rsatish\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - guruh\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr ""
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - paketning nomi\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr ""
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr ""
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr ""
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr ""
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr ""
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr ""
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr ""
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr ""
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr ""
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - paket qaysi to'plamda topilganini ko'rsatish\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "to'plam uchun hech qanday hdlist fayli topilmadi: \"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "to'plam uchun hdlist synthesis fayli yaratildi: \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "to'plam uchun ro'yxat fayli yozilmoqda: \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "%s nomli paket mavjud emas"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Quyidagi paketlarda %s bor: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "%s paketlarini o'rnatib bo'lmaydi"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "%s paketi allaqachon o'rnatilgan"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "%s paketlari allaqachon o'rnatilgan"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "%s yetishmaganiga ko'ra"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "%s paketi allaqachon o'rnatilganligi uchun"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr ""
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr ""
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "%s'ni qoldirish uchun"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "%s'ni o'rnatish uchun"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr ""
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Imzo haqiqiy emas (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr ""
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Imzo yetishmaydi (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't write file"
+msgstr "Faylini saqlab bo'lmadi"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "Faylini ochib bo'lmadi"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "%s amalidan %s amali bilan birga foydalanib bo'lmaydi"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme, versiya %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
+"\n"
+"Foydalanish:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+"  --test         - olib tashlashni to'g'ri bajarish imkoniyatini "
+"tekshirish.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr ""
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr ""
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr ""
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr ""
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - ortiqcha xabarlar bilan.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Paketlarni faqat root olib tashlashi mumkin"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "Noma'lum paketlar"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "noma'lum paket"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "paketni (%s) olib tashlash tizimni ishdan chiqaradi"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "O'chirish uchun hech narsa yo'q"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "O'chirish uchun hech narsa yo'q"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Bog'liqliklarni ta'minlash uchun quyidagi %d-ta paket olib tashlanadi"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "noma'lum paket"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "%d-ta paketni olib tashlashni istaysizmi?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (h/Y) "
+
+#: ../urpme:166
+#, c-format
+msgid "testing removal of %s"
+msgstr ""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "O'chirish muvaffaqiyatsiz tugadi"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "O'chirish muvaffaqiyatsiz tugadi"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1970,11 +1982,6 @@ msgstr "  --clean        - avvalo paketlarni keshdan olib tashlash.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - paketlar keshdan olib tashlanmasin.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr ""
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2282,7 +2289,7 @@ msgstr ""
 "\n"
 "Bunga qaramasdan davom etishni istaysizmi?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (H/y) "
@@ -2472,10 +2479,12 @@ msgstr ""
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - yangilash to'plamini yaratish.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2483,111 +2492,111 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - synthesis faylidan foydalanish.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - synthesis yoki hdlist faylini topishga urinmash.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - MD5SUM faylini tekshirishni o'chirish.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - xabarsiz.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - ortiqcha xabarlar bilan.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Paketlar to'plamini faqat root qo'shishi mumkin"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "moslama fayli (%s) yaratilmoqda"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Moslama faylini (%s) yaratib bo'lmadi"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr ""
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2596,17 +2605,17 @@ msgstr ""
 "\n"
 "\"%s\" to'plamini qo'shishni istaysizmi?"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "synthesis/hdlist fayliga nisbiy yo'l ko'rsatilmagan\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Masofadagi to'plam uchun %s amalidan foydalanib bo'lmaydi"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "to'plamga murojaat qilib bo'lmadi: \"%s\""
@@ -2840,14 +2849,14 @@ msgstr ""
 msgid "Only superuser is allowed to update media"
 msgstr "Faqat boshqaruvchi (root ) to'plami yangilashi mumkin"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "yangilash uchun hech narsa yo'q (to'plamni qo'shish uchun\n"
 "urpmi.addmedia buyrug'idan foydalaning)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2856,17 +2865,17 @@ msgstr ""
 "yangilash parametri yetishmayapti\n"
 "(quyidagilardan bittasi: %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "to'plamga e'tibor berilmaydi: \"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr ""
@@ -3124,6 +3133,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Changelog fayli topilmadi\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - yangilash to'plamini yaratish.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "xato URL: [%s]"
 
diff --git a/po/uz@cyrillic.po b/po/uz@cyrillic.po
index 60a41d08..cc7746c6 100644
--- a/po/uz@cyrillic.po
+++ b/po/uz@cyrillic.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2007-09-13 16:43+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM ўрнатиш"
@@ -28,7 +28,7 @@ msgstr "RPM ўрнатиш"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Хато: %s файли топилмади, амал бекор қилинади"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_Ок"
@@ -86,7 +86,7 @@ msgstr "Ўр_натиш"
 msgid "_Save"
 msgstr "_Сақлаш"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Бекор қилиш"
@@ -117,8 +117,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - шу ёрдам хабарини кўрсатиш.\n"
@@ -152,7 +153,7 @@ msgstr ""
 "                   (--no-verify-rpm ушбу амалнинг тескариси, андоза бўйича "
 "пакетнинг электрон имзоси текширилади).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -202,7 +203,7 @@ msgstr "Илтимос кутиб туринг..."
 msgid "Must be root"
 msgstr "root бўлиш керак"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -213,42 +214,42 @@ msgstr ""
 "%s\n"
 "Бунга қарамасдан ўрнатишни давом эттиришни истайсизми?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Диққат"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "Ок"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (янгилаш)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (ўрнатиш)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Пакет танлови"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Қуйидаги пакетлардан бири керак:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "Тў_хтатиш"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -259,60 +260,60 @@ msgstr ""
 "%s\n"
 "Ўрнатишни давом эттиришни истайсизми?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакет ҳам ўрнатилади:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакетлар ҳам ўрнатилади:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d-та пакет, %d Мб)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Пакетни ўрнатиш..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr ""
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Тайёрланмоқда..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "\"%s\" (%s/%s) пакети ўрнатилмоқда..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Илтимос \"%s\" номли тўпламни [%s] ускунасига қўйинг"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "\"%s\" пакети олинмоқда..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Тайёр"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -323,28 +324,28 @@ msgstr ""
 "%s\n"
 "Балки urpmi маълумот базасини янгилашингиз керак."
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "Ўрнатиш муваффақиятсиз тугади:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Ҳамма нарса аллақачон ўрнатилган"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Ўрнатиш тугади"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "%s ўчирилмоқда"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "urpmi қайтадан ишга тушмоқда"
@@ -426,8 +427,8 @@ msgid "...retrieving done"
 msgstr "...олиш тугади"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...олиш муваффақиятсиз тугади: %s"
@@ -467,52 +468,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr ""
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: RPM-файлини (%s) ўқиб бўлмади\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Имзо етишмайди (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot директорияси мавжуд эмас"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "%s амалидан %s амалисиз фойдаланиб бўлмайди"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "%s амалидан %s амали билан бирга фойдаланиб бўлмайди"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -939,218 +940,218 @@ msgstr ""
 "--synthesis'дан --media, --excludemedia, --sortmedia, --update, --use-"
 "distrib ёки --parallel билан бирга фойдаланиб бўлмайди"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Қидириш боши: %s охири: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "%s пакети ташлаб ўтилмоқда"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr ""
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "тўплам аллақачон мавжуд: \"%s\""
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(андоза бўйича эътиборга олинмади)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "тўплам қўшилмоқда: %s"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, fuzzy, c-format
 msgid "directory %s does not exist"
 msgstr "chroot директорияси мавжуд эмас"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr ""
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "media.cfg файли ёзиб олинмоқда..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr ""
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "тўплам олиб ташланмоқда: \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "тўплам учун urpmi қайтадан мосланмоқда: \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...қайтадан мослаш муваффақиятсиз тугади"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "...қайтадан мослаш тугади"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "тўпламни янгилаш ҳожати йўқ: \"%s\""
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "synthesis файли (%s) текширилмоқда"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "тўпламининг synthesis файлини ўқишда муаммо рўй берди: \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...нусха кўчириш муваффақиятсиз тугади"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr ""
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...нусха кўчириш бажарилди"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 "'%s' файлидан нусха кўчириш муваффақиятсиз тугади (унинг ҳажми жуда кичик)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "олинган hdlist (ёки synthesis) файли учун md5sum сони ҳисобланмоқда..."
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "%s'дан нусха кўчириш муваффақиятсиз тугади (md5sum нотўғри)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "hdlist файли (%s) текширилмоқда"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "%s ва %s тозаланмоқда"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "тўпламнинг hdlist файли %s хато: %s"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "'%s' учун pubkey файли текширилмоқда..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "RPM-файлининг номи (%s) нотўғри"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "'%s' учун hdlist (ёки synthesis) файли ёзиб олинмоқда..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "қидирилган hdlist (ёки synthesis) файли топилди: %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "тўплам учун ҳеч қандай hdlist файли топилмади: \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "'%s' учун pubkey файли текширилмоқда..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr ""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "'%s' учун pubkey файлини импорт қилиб бўлмади"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "тўплам янгиланди: \"%s\""
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1182,7 +1183,7 @@ msgstr "ЖжJjNn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "ҲҳHhYy"
@@ -1252,7 +1253,7 @@ msgstr "Гб"
 msgid "TB"
 msgstr "Тб"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1334,262 +1335,7 @@ msgstr "%s уланмоқда"
 msgid "unmounting %s"
 msgstr "%s узилмоқда"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "%s номли пакет мавжуд эмас"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Қуйидаги пакетларда %s бор: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "%s пакетларини ўрнатиб бўлмайди"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "%s пакети аллақачон ўрнатилган"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "%s пакетлари аллақачон ўрнатилган"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "%s етишмаганига кўра"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "%s пакети аллақачон ўрнатилганлиги учун"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr ""
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr ""
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "%s'ни қолдириш учун"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "%s'ни ўрнатиш учун"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr ""
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Имзо ҳақиқий эмас (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr ""
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Имзо етишмайди (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't write file"
-msgstr "Файлини сақлаб бўлмади"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "Файлини очиб бўлмади"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "%s амалидан %s амали билан бирга фойдаланиб бўлмайди"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme, версия %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"
-"\n"
-"Фойдаланиш:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - олиб ташлашни тўғри бажариш имкониятини текшириш.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-
-#: ../urpme:52 ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr ""
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr ""
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../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 ""
-
-#: ../urpme:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr ""
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - ортиқча хабарлар билан.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Пакетларни фақат root олиб ташлаши мумкин"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "Номаълум пакетлар"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "номаълум пакет"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "пакетни (%s) олиб ташлаш тизимни ишдан чиқаради"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Ўчириш учун ҳеч нарса йўқ"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Ўчириш учун ҳеч нарса йўқ"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "Боғлиқликларни таъминлаш учун қуйидаги %d-та пакет олиб ташланади"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "номаълум пакет"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "%d-та пакетни олиб ташлашни истайсизми?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (ҳ/Й) "
-
-#: ../urpme:164
-#, c-format
-msgid "testing removal of %s"
-msgstr ""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Ўчириш муваффақиятсиз тугади"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Ўчириш муваффақиятсиз тугади"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1605,280 +1351,546 @@ msgstr ""
 "\n"
 "Фойдаланиш: urpmf [параметрлар] қидириш учун ифода\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr ""
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - кўрсатилган, вергул билан ажратилган, тўпламлардан "
 "фойдаланилмасин.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../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 ""
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - кўрсатилган synthesis файлидан фойдаланиш.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - бир хил қаторлар кўрсатилмасин.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - фақат янгилаш тўпламидан фойдаланиш.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - ортиқча хабарлар билан.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr ""
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr ""
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr ""
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr ""
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr ""
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr ""
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Тэглар рўйхати:\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr ""
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   масалан: '%%name:%%files'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr ""
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr ""
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr ""
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr ""
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - пакет таърифи\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr ""
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr ""
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - пакетдаги файллар рўйхатини кўрсатиш\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - гуруҳ\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr ""
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - пакетнинг номи\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr ""
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr ""
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr ""
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr ""
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr ""
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr ""
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr ""
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr ""
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr ""
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - пакет қайси тўпламда топилганини кўрсатиш\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr ""
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "тўплам учун ҳеч қандай hdlist файли топилмади: \"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "тўплам учун hdlist synthesis файли яратилди: \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "тўплам учун рўйхат файли ёзилмоқда: \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "%s номли пакет мавжуд эмас"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Қуйидаги пакетларда %s бор: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "%s пакетларини ўрнатиб бўлмайди"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "%s пакети аллақачон ўрнатилган"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "%s пакетлари аллақачон ўрнатилган"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "%s етишмаганига кўра"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "%s пакети аллақачон ўрнатилганлиги учун"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr ""
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr ""
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "%s'ни қолдириш учун"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "%s'ни ўрнатиш учун"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr ""
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Имзо ҳақиқий эмас (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr ""
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Имзо етишмайди (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't write file"
+msgstr "Файлини сақлаб бўлмади"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "Файлини очиб бўлмади"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "%s амалидан %s амали билан бирга фойдаланиб бўлмайди"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme, версия %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"Бу эркин дастур ва GNU GPL шартлари асосида тарқатилиши мумкин.\n"
+"\n"
+"Фойдаланиш:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - олиб ташлашни тўғри бажариш имкониятини текшириш.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr ""
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr ""
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr ""
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr ""
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - ортиқча хабарлар билан.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Пакетларни фақат root олиб ташлаши мумкин"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "Номаълум пакетлар"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "номаълум пакет"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "пакетни (%s) олиб ташлаш тизимни ишдан чиқаради"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Ўчириш учун ҳеч нарса йўқ"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Ўчириш учун ҳеч нарса йўқ"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Боғлиқликларни таъминлаш учун қуйидаги %d-та пакет олиб ташланади"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "номаълум пакет"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "%d-та пакетни олиб ташлашни истайсизми?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (ҳ/Й) "
+
+#: ../urpme:166
+#, c-format
+msgid "testing removal of %s"
+msgstr ""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Ўчириш муваффақиятсиз тугади"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Ўчириш муваффақиятсиз тугади"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1961,11 +1973,6 @@ msgstr "  --clean        - аввало пакетларни кэшдан оли
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - пакетлар кэшдан олиб ташланмасин.\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr ""
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2273,7 +2280,7 @@ msgstr ""
 "\n"
 "Бунга қарамасдан давом этишни истайсизми?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Ҳ/й) "
@@ -2459,10 +2466,12 @@ msgstr ""
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - янгилаш тўпламини яратиш.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2470,111 +2479,111 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - synthesis файлидан фойдаланиш.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - synthesis ёки hdlist файлини топишга уринмаш.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - MD5SUM файлини текширишни ўчириш.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - хабарсиз.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - ортиқча хабарлар билан.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Пакетлар тўпламини фақат root қўшиши мумкин"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "мослама файли (%s) яратилмоқда"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Мослама файлини (%s) яратиб бўлмади"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr ""
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2583,17 +2592,17 @@ msgstr ""
 "\n"
 "\"%s\" тўпламини қўшишни истайсизми?"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "synthesis/hdlist файлига нисбий йўл кўрсатилмаган\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "Масофадаги тўплам учун %s амалидан фойдаланиб бўлмайди"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "тўпламга мурожаат қилиб бўлмади: \"%s\""
@@ -2827,14 +2836,14 @@ msgstr ""
 msgid "Only superuser is allowed to update media"
 msgstr "Фақат бошқарувчи (root ) тўплами янгилаши мумкин"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr ""
 "янгилаш учун ҳеч нарса йўқ (тўпламни қўшиш учун\n"
 "urpmi.addmedia буйруғидан фойдаланинг)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2843,17 +2852,17 @@ msgstr ""
 "янгилаш параметри етишмаяпти\n"
 "(қуйидагилардан биттаси: %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "тўпламга эътибор берилмайди: \"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr ""
@@ -3110,6 +3119,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Changelog файли топилмади\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - янгилаш тўпламини яратиш.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "хато URL: [%s]"
 
diff --git a/po/vi.po b/po/vi.po
index 4f546c9f..f4e6254c 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi-vi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2005-06-08 15:13+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Cài đặt RPM"
@@ -25,7 +25,7 @@ msgstr "Cài đặt RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "_OK"
@@ -91,7 +91,7 @@ msgstr "_Cài đặt"
 msgid "_Save"
 msgstr "_Lưu"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "Bỏ _qua"
@@ -123,8 +123,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - in thông tin trợ giúp này.\n"
@@ -159,7 +160,7 @@ msgstr ""
 "  --verify-rpm   - xác minh chữ ký rpm trước khi cài đặt.\n"
 "                   (--no-verify-rpm để tắt nó, mặc định là bật).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -210,7 +211,7 @@ msgstr "Hãy chờ..."
 msgid "Must be root"
 msgstr "Phải là root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, fuzzy, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -221,42 +222,42 @@ msgstr ""
 "%s\n"
 "Tiếp tục?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr "(để nâng cấp)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr "(để cài đặt)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr ""
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Cần một gói trong các gói tin sau đây:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "Hủy _bỏ"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -267,60 +268,60 @@ msgstr ""
 "%s\n"
 "Tiếp tục?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Để thỏa mãn phụ thuộc, gói tin sau đây sẽ được cài đặt (%d MB)"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, fuzzy, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Để thỏa mãn phụ thuộc, gói tin sau đây sẽ được cài đặt (%d MB)"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d các gói, %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Cài đặt gói..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "không thể lấy các gói nguồn, hủy bỏ"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Đang chuẩn bị..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Đang cài đặt gói `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Hãy nạp phương tiện có tên \"%s\" trên thiết bị [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Đang tải về gói `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "H_oàn thành"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -331,28 +332,28 @@ msgstr ""
 "%s\n"
 "Có thể bạn nên cập nhật cơ sở dữ liệu của urpmi."
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, fuzzy, c-format
 msgid "Installation failed:"
 msgstr "Cài đặt không được"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Mọi thứ đã được cài đặt rồi"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "Kết thúc cài đặt"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "gỡ bỏ %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "khởi chạy lại urpmi"
@@ -432,8 +433,8 @@ msgid "...retrieving done"
 msgstr "...hoàn thành việc thu thập"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...không thu thập được: %s"
@@ -473,52 +474,52 @@ msgstr ""
 msgid "bad proxy declaration on command line\n"
 msgstr "khai báo proxy sai trong dòng lệnh\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: không thể đọc tập tin rpm \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, c-format
 msgid "unexpected expression %s"
 msgstr ""
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Thiếu chữ ký (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, c-format
 msgid "no expression to close"
 msgstr ""
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr ""
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr ""
@@ -945,218 +946,218 @@ msgstr ""
 "--synthesis không thể dùng với  --media, --excludemedia, --sortmedia, --"
 "update hoặc --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Tìm kiếm bắt đầu: %s kết thúc: %s "
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "bỏ qua gói tin %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "nên cài đặt thay vì nâng cấp gói %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "phương tiện \"%s\" đã tồn tại rồi"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "đang đọc các header từ phương tiện \"%s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "gỡ bỏ phương tiện \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr ""
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr ""
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, fuzzy, c-format
 msgid "unable to parse media.cfg"
 msgstr "không thể mở rpmdb"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "không thể truy cập phương tiện cài đặt thứ nhất (không thấy tập tin hdlists)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, fuzzy, c-format
 msgid "retrieving media.cfg file..."
 msgstr "đang lấy về tập tin hdlists..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "đang thử chọn phương tiện không tồn tại \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "đang chọn đa phương tiện: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "gỡ bỏ phương tiện \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "đang cấu hình lại urpmi cho phương tiện \"%s\""
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...không cấu hình lại được"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "hoàn thành việc cấu hình lại"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "phương tiện \"%s\" không được chọn"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "đang kiểm tra tập tin tổng hợp [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "trục trặc khi đọc tập tin tổng hợp của phương tiện \"%s\""
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "đang ghi tập tin danh sách cho phương tiện \"%s\""
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...sao chép không được"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "đang sao chép tập tin mô tả của \"%s\"..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...sao chép hoàn thành"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "lỗi sao chép [%s] (có lẽ tập tin nhỏ)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "tính toán md5sum của hdlist (hoặc synthesis) nguồn thu thập được"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "Lỗi bản sao của [%s] (md5sum không so khớp)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "đang kiểm tra tập tin hdlist [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "cài đặt %s từ %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "không tìm thấy tập tin hdlist cho phương tiện \"%s\""
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "đang sao chép tập tin mô tả của \"%s\"..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "tên tập tin rpm [%s] không hợp lệ"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "đang thu thập hdlist (hoặc synthesis) nguồn của \"%s\"..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "đã tìm thấy hdlist (hoặc synthesis) nguồn được dò là %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "không tìm thấy tập tin hdlist cho phương tiện \"%s\""
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "đang kiểm tra tập tin pubkey của \"%s\"..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...đã nhập key %s từ tập tin pubkey của \"%s\""
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "không thể nhập tập tin pubkey của \"%s\""
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "đã thêm phương tiện %s"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1192,7 +1193,7 @@ msgstr "NnKk"
 #  please keep the 'Yy' for compatibility reasons
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "YyVvDdCc"
@@ -1262,7 +1263,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1344,266 +1345,7 @@ msgstr "gắn kết %s"
 msgid "unmounting %s"
 msgstr "thôi gắn kết %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Không có gói tin với tên %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Các gói tin sau đây chứa %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Mọi thứ đã được cài đặt rồi"
-
-#: ../urpm/select.pm:539
-#, fuzzy, c-format
-msgid "Package %s is already installed"
-msgstr "Mọi thứ đã được cài đặt rồi"
-
-#: ../urpm/select.pm:540
-#, fuzzy, c-format
-msgid "Packages %s are already installed"
-msgstr "Mọi thứ đã được cài đặt rồi"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "do thiếu %s"
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "Mọi thứ đã được cài đặt rồi"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "vì không thỏa mãn %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "thử xúc tiến %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "để giữ %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "để cài đặt %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "vì xung đột với %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Chữ ký không hợp lệ (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "Key ID không hợp lệ (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "Thiếu chữ ký (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "không thể ghi tập tin [%s]"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "Sao chép không được"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "Sao chép không được"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"Phiên bản urpme %s\n"
-"Bản quyền (C) 1999-2008 Mandriva.\n"
-"Đây là phần mềm miễn phí và có thể phân phối lại theo các điều khoản của GNU "
-"GPL.\n"
-"\n"
-"Cách dùng:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - tự động chọn một gói tin trong các gói.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr ""
-"  --test         - xác minh nếu việc gỡ bỏ có thể được lưu trữ chính xác.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - phân phối urpmi qua các máy của alias.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, fuzzy, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --packager     - in ra tag packager: packager.\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - dùng root khác để thực hiện gỡ bỏ rpm.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, fuzzy, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --root         - dùng root khác để thực hiện cài đặt rpm.\n"
-
-#: ../urpme:55
-#, fuzzy, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --description   - in ra mô tả tag: mô tả.\n"
-
-#: ../urpme:56
-#, fuzzy, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - cấu hình nhanh chóng urpmi từ một distrib tree, giúp\n"
-"                   cài đặt/bỏ cài đặt một chroot bằng tùy chọn --root.\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, fuzzy, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose      - phương thức verbose.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - chọn toàn bộ các gói tin khớp với sự diễn đạt.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Chỉ có superuser mới được phép gỡ bỏ các gói"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "các gói tin không xác định "
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "gói tin không xác định"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "việc gỡ bỏ gói tin %s sẽ phá vỡ hệ thống"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Không có gì để gỡ bỏ"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Không có gì để gỡ bỏ"
-
-#: ../urpme:147
-#, fuzzy, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "Để thỏa mãn các phụ thuộc, %d gói sau đây sẽ được gỡ bỏ (%d MB)"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "gói tin không xác định"
-
-#: ../urpme:159
-#, fuzzy, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "gỡ bỏ gói %s"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (Có/Không) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "coi phương tiện tháo lắp là \"%s\""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Gỡ bỏ không được"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Gỡ bỏ không được"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1620,30 +1362,37 @@ msgstr ""
 "\n"
 "Cách dùng:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, fuzzy, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - in thông tin trợ giúp này.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - dùng môi trường riêng (điển hình là báo cáo lỗi).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - không dùng phương tiện được trao, ngăn cách bởi dấu "
 "phẩy.\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, fuzzy, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --root         - dùng root khác để thực hiện cài đặt 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"
@@ -1651,255 +1400,518 @@ msgstr ""
 "  --sortmedia         - xếp loại phương tiện theo các chuỗi con được ngăn "
 "cách bởi dấu phẩy.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --synthesis    - dùng synthesis nhận được thay cho urpmi db.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - dùng synthesis nhận được thay cho urpmi db.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - không in ra các dòng giống nhau.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - chỉ dùng phương tiện cập nhật.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - phương thức verbose.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - bỏ qua các dấu hiệu phân biệt trong mọi mẫu.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, fuzzy, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -i             - bỏ qua các dấu hiệu phân biệt trong mọi mẫu.\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr ""
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - bao gồm mã perl trực tiếp như perl -e.\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, fuzzy, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr ""
 "  -a             - binary AND operator, đúng nếu cả hai expression là đúng.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, fuzzy, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr ""
 "  -o             - binary OR operator, đúng nếu một expression là đúng.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, fuzzy, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  -q             - chế độ yên lặng.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, fuzzy, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  )              - dấu ngoặc phải để đóng group expression.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, fuzzy, c-format
 msgid "List of tags:\n"
 msgstr ""
 "Danh sách dữ liệu để khôi phục:\n"
 "\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, fuzzy, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --X            - dùng giao diện X.\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, fuzzy, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                    mặc định là %s.\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, fuzzy, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --url          - in ra tag url: url.\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, fuzzy, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - in ra tag buildhost: build host.\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr ""
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, fuzzy, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "Module cấu hình Konsole "
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, fuzzy, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts     - in ra xung đột tag: toàn bộ các xung đột.\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, fuzzy, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - in ra mô tả tag: mô tả.\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr ""
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, fuzzy, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - in ra tag epoch: epoch.\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, fuzzy, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --name         - chỉ in ra tên gói.\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, fuzzy, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  -l             - liệt kê các tập tin trong gói tin.\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, fuzzy, c-format
 msgid "  --group        - group\n"
 msgstr "  --group         - in ra nhóm tag: nhóm.\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --name         - chỉ in ra tên gói.\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, fuzzy, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - chỉ in ra tên gói.\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, fuzzy, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes     - in ra các dòng tag: toàn bộ dòng.\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, fuzzy, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - in ra tag packager: packager.\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, fuzzy, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides      - in ra cung cấp tag: toàn bộ các cung cấp.\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, fuzzy, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires      - in ra yêu cầu tag: toàn bộ các yêu cầu.\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, fuzzy, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size          - in ra kích thước tag: kích thước.\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, fuzzy, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - in ra tag sourcerpm: source rpm.\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --obsoletes     - in ra các dòng tag: toàn bộ dòng.\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, fuzzy, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary       - in ra tóm tắt tag: tóm tắt.\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, fuzzy, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - in ra tag url: url.\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, fuzzy, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --verbose      - phương thức verbose.\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, fuzzy, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - liệt kê các tập tin trong gói tin.\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - in phiên bản, phát hành và arch với tên.\n"
 
-#: ../urpmf:153
-#, c-format
-msgid "unterminated expression (%s)"
-msgstr ""
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "đang dùng môi trường đặc hiệu trên %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "không tìm thấy tập tin hdlist cho phương tiện \"%s\""
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "build tập tin tổng hợp hdlist cho phương tiện \"%s\""
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "đang ghi tập tin danh sách cho phương tiện \"%s\""
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Không có gói tin với tên %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Các gói tin sau đây chứa %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Mọi thứ đã được cài đặt rồi"
+
+#: ../urpm/select.pm:543
+#, fuzzy, c-format
+msgid "Package %s is already installed"
+msgstr "Mọi thứ đã được cài đặt rồi"
+
+#: ../urpm/select.pm:544
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Mọi thứ đã được cài đặt rồi"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "do thiếu %s"
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Mọi thứ đã được cài đặt rồi"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "vì không thỏa mãn %s"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "thử xúc tiến %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "để giữ %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "để cài đặt %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "vì xung đột với %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Chữ ký không hợp lệ (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "Key ID không hợp lệ (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "Thiếu chữ ký (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "không thể ghi tập tin [%s]"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Sao chép không được"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "Sao chép không được"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"Phiên bản urpme %s\n"
+"Bản quyền (C) 1999-2008 Mandriva.\n"
+"Đây là phần mềm miễn phí và có thể phân phối lại theo các điều khoản của GNU "
+"GPL.\n"
+"\n"
+"Cách dùng:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - tự động chọn một gói tin trong các gói.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr ""
+"  --test         - xác minh nếu việc gỡ bỏ có thể được lưu trữ chính xác.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - phân phối urpmi qua các máy của alias.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, fuzzy, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --packager     - in ra tag packager: packager.\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - dùng root khác để thực hiện gỡ bỏ rpm.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - chỉ cập nhật phương tiện cập nhật.\n"
+
+#: ../urpme:56
+#, fuzzy, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --description   - in ra mô tả tag: mô tả.\n"
+
+#: ../urpme:57
+#, fuzzy, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - cấu hình nhanh chóng urpmi từ một distrib tree, giúp\n"
+"                   cài đặt/bỏ cài đặt một chroot bằng tùy chọn --root.\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, fuzzy, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose      - phương thức verbose.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - chọn toàn bộ các gói tin khớp với sự diễn đạt.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Chỉ có superuser mới được phép gỡ bỏ các gói"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "các gói tin không xác định "
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "gói tin không xác định"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "việc gỡ bỏ gói tin %s sẽ phá vỡ hệ thống"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Không có gì để gỡ bỏ"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Không có gì để gỡ bỏ"
+
+#: ../urpme:149
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Để thỏa mãn các phụ thuộc, %d gói sau đây sẽ được gỡ bỏ (%d MB)"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "gói tin không xác định"
+
+#: ../urpme:161
+#, fuzzy, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "gỡ bỏ gói %s"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (Có/Không) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "coi phương tiện tháo lắp là \"%s\""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Gỡ bỏ không được"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Gỡ bỏ không được"
+
+#: ../urpmf:153
+#, c-format
+msgid "unterminated expression (%s)"
+msgstr ""
+
 #: ../urpmi:81
 #, fuzzy, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1990,11 +2002,6 @@ msgstr "  --clean          - gỡ bỏ rpm khỏi cache trước tiên.\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - không xóa rpms khỏi cache.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - chỉ cập nhật phương tiện cập nhật.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2320,7 +2327,7 @@ msgid ""
 "Continue installation anyway?"
 msgstr "Vẫn tiếp tục bằng bất cứ giá nào?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Có/Không) "
@@ -2503,10 +2510,12 @@ msgstr "  --curl         - dùng curl để thu thập các tập tin ở xa.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - tạo phương tiện cập nhật.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2514,24 +2523,24 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, fuzzy, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - thử tìm và sử dụng tập tin synthesis.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  --no-probe      - không thử tìm bất kỳ tập tin hdlist hoặc\n"
 "                   synthesis.\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2540,17 +2549,17 @@ msgstr ""
 "  --distrib      - tự động tạo mọi phương tiện từ một phương tiện cài\n"
 "                     đặt.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, fuzzy, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --list-media   - liệt kê phương tiện hiệc có.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2559,92 +2568,92 @@ msgstr ""
 "  --from         - dùng url chỉ định cho danh sách các mirror, mặc định là\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - tạo phương tiện ảo luôn được cập nhật,\n"
 "                   chỉ cho phép tập file:// protocol.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - không thực hiện kiểm tra tập tin MD5SUM.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - không nhập pubkey của phương tiện được thêm\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
 "  --raw          - thêm phương tiện vào cấu hình, nhưng không cập nhật nó.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - chế độ yên lặng.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - chế độ verbose.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Chỉ có người dùng cao cấp được phép thêm phương tiện"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, fuzzy, c-format
 msgid "creating config file [%s]"
 msgstr "Sẽ tạo tập tin cấu hình [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Không thể tạo tập tin cấu hình [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "không cần cho <đường dẫn liên quan của hdlist> với --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "thiếu <đường dẫn liên quan của hdlist> \n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "không thể truy cập phương tiện \"%s\""
@@ -2883,12 +2892,12 @@ msgstr "  -f             - cố tạo các tập tin hdlist.\n"
 msgid "Only superuser is allowed to update media"
 msgstr "Chỉ có người dùng cao cấp được phép cập nhật phương tiện"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "Không có gì để cập nhật (dùng urpmi.addmedia để thêm phương tiện)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2897,17 +2906,17 @@ msgstr ""
 "thiếu mục cập nhật\n"
 "(một mục của %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "bỏ qua phương tiện %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "bật chạy phương tiện %s"
@@ -3184,6 +3193,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Không thấy changelog\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - tạo phương tiện cập nhật.\n"
+
 #, fuzzy
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "input bất thường: [%s]"
diff --git a/po/wa.po b/po/wa.po
index b4787843..5c05b46a 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2004-08-08 20:26+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "Astalaedje do pacaedje"
@@ -32,7 +32,7 @@ msgstr "Astalaedje do pacaedje"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Aroke: dji n' a savou trover l' fitchî %s, dj' arestêye l' operåcion"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "'l est bon"
@@ -98,7 +98,7 @@ msgstr "_Astaler"
 msgid "_Save"
 msgstr "_Schaper"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "_Rinoncî"
@@ -130,8 +130,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - mostere ci messaedje d' aidance chal.\n"
@@ -170,7 +171,7 @@ msgstr ""
 "  --verify-rpm   - verifyî li sinateure rpm divant d' astaler.\n"
 "                   (--no-verify-rpm po n' nén l' fé, prémetou=verifyî).\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr ""
@@ -225,7 +226,7 @@ msgstr "Tårdjîz on pô s' i vos plait..."
 msgid "Must be root"
 msgstr "Vos dvoz esse root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -236,42 +237,42 @@ msgstr ""
 "%s\n"
 "Continouwer tot l' minme avou l' astalaedje?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "Adviertixhmint"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "'l est bon"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (a mete a djoû)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (a-z astaler)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "Tchoezixhaedje des pacaedjes"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "I gn a mezåjhe d' onk des pacaedjes ki shuvèt:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "_Rinoncî"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -283,61 +284,61 @@ msgstr ""
 "%s\n"
 "Continouwer tot l' minme avou l' astalaedje?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Po satisfyî les aloyaedjes, li pacaedje aloyî ki shût va esse astalé:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Po satisfyî les aloyaedjes, les pacaedjes shuvants vont esse astalés"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d pacaedje, %d Mo)"
 msgstr[1] "(%d pacaedjes, %d Mo)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "Astalaedje do pacaedje..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "dji n' a savou prinde les pacaedjes sourdants, dji lai toumer"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "Dj' aprestêye..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Dj' astale li pacaedje «%s» (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "S' i vs plait metoz li sopoirt lomé «%s» el éndjin [%s]"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Dj' aberwetêye li pacaedje «%s»..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "_Fwait"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -348,28 +349,28 @@ msgstr ""
 "%s\n"
 "Vos dvrîz motoit mete a djoû li båze di dnêyes urpmi."
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "L' astalåcion a fwait berwete:"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "tot a ddja stî astalé"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "L' astalåcion a fini"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "dji oistêye li pacaedje %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "renondant urpmi"
@@ -450,8 +451,8 @@ msgid "...retrieving done"
 msgstr "...l' aberwetaedje a stî comifåt"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...l' aberwetaedje a fwait berwete: %s"
@@ -491,52 +492,52 @@ msgstr "Ciste operåcion ci n' est nén possibe e môde rastrindou"
 msgid "bad proxy declaration on command line\n"
 msgstr "måle declaråcion do procsi sol roye di comande\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: dji n' sai lére li fitchî rpm «%s»\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "Patrons po les ratourneures:\n"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "I manke li sinateure (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "Patrons po les ratourneures:\n"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "li ridant po candjî d' raecene (chroot) n' egzistêye nén"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Dji n' sai eployî %s sins %s"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Dji n' sai eployî %s avou %s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Pår trop d' årgumints\n"
@@ -967,223 +968,223 @@ msgstr ""
 "--synthesis èn pout nén esse eployî avou --media, --excludemedia, --"
 "sortmedia, --update, --use-distrib ou --parallel"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Cweraedje kimincî: %s fini: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "dji passe houte do pacaedje %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "dji va-st astaler purade ki mete a djoû l' pacaedje %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "li sopoirt «%s» egzistêye dedja"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(ignoré come prémetowe dujhance)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "radjoutant l' sopoirt «%s» divant l' sopoirt då lon «%s»"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "radjoutaedje do sopoirt «%s»"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, fuzzy, c-format
 msgid "directory %s does not exist"
 msgstr "li ridant po candjî d' raecene (chroot) n' egzistêye nén"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "i shonne ki cist eplaeçmint la n' a nole distribucion"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "dji n' sai analijhî l' fitchî media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "dji n' a savou trover l' sopoirt d' astalaedje (nou fitchî media.cfg di "
 "trové)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "aberwetaedje do fitchî media.cfg..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "dji saye di tchoezi l' sopoirt «%s» ki n' egzistêye nén"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "dji tchoezixh des sopoirts multipes: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "dji bodje li sopoirt «%s»"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "rapontiaedje d' urpmi pol sopoirt «%s»"
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...li rapontiaedje a fwait berwete"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "li rapontiaedje a stî fwait"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "li sopoirt «%s» est a djoû"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "corwaitaedje do fitchî d' sinteze [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "åk n' a nén stî tot lijhant li fitchî di sinteze do sopoirt «%s»"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "dji copeye [%s] pol sopoirt «%s»..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...li copiaedje a fwait berwete"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copiaedje do fitchî di discrijhaedjes di «%s»..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...li copiaedje a stî comifåt"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr ""
 "li copeye di [%s] a fwait berwete (li fitchî est pår pitit ki s' end est "
 "bizåre)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr ""
 "dji carcule li md5sum do fitchî «hdlist» (ou del sinteze) ki vént d' esse "
 "aberweté"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "li copeye di [%s] a fwait berwete (li md5sum ni corespond nén)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "corwaitaedje do fitchî hdlist [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "netiaedje di %s et %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "fitchî hdlist %s nén valide pol sopoirt «%s»"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "copiaedje do fitchî di discrijhaedjes di «%s»..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "no d' fitchî rpm nén valåbe [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, fuzzy, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "aberwetaedje do sourdant «hdlist» (ou del sinteze) po «%s»..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "«hdlist» (ou sinteze) ki vént d' esse sayî trové come «%s»"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, fuzzy, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "nou fitchî hdlist di trové pol sopoirt «%s»"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "corwaitaedje do fitchî avou l' clé publike da «%s»..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...aberwetaedje del clé %s do fitchî di clés publikes da «%s»"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "dji n' sai aberweter li clé publike da «%s»"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "sopoirt «%s» metou a djoû"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1215,7 +1216,7 @@ msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "OoAaYyWw"
@@ -1285,7 +1286,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1368,278 +1369,7 @@ msgstr "dji monte %s"
 msgid "unmounting %s"
 msgstr "dji dismonte %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "Nou pacaedje lomé %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "Les pacaedjes ki shuvèt ont å dvins %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "Les pacaedjes %s èn polèt nén esse astalés"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "Li pacaedje %s a ddja stî astalé"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "Les pacaedjes %s ont ddja stî astalés"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "cåze di %s ki n' est nén la"
-
-#: ../urpm/select.pm:559
-#, fuzzy, c-format
-msgid "due to already installed %s"
-msgstr "Li pacaedje %s a ddja stî astalé"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "cåze di %s ki n' est nén satisfyî"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "dji saye di promouvwer %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "po wårder %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "po-z astaler %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "cåze di conflits avou %s"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "Sinateure nén valide (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "ID di clé nén valide (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "I manke li sinateure (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't write file"
-msgstr "Dji n' sai ahiver l' fitchî d' apontiaedje [%s]"
-
-#: ../urpm/sys.pm:276
-#, fuzzy, c-format
-msgid "Can't open file"
-msgstr "Li copiaedje a fwait berwete"
-
-#: ../urpm/sys.pm:289
-#, fuzzy, c-format
-msgid "Can't move file %s to %s"
-msgstr "Dji n' sai eployî %s avou %s"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme modêye %s\n"
-"Copyright © 1999-2008 Mandriva.\n"
-"Çouci est on libe programe et pout esse cossemé so les termes del licince "
-"GPL.\n"
-"\n"
-"Po s' è siervi:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr ""
-"  --auto         - tchoezi otomaticmint on pacaedje divins les tchuzes.\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - verifyî si l' oistaedje si pout fé comifåt.\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-"  --parallel     - distribouwaedje di l' ovraedje d' urpmi so\n"
-"                   so sacwantès éndjoles defineyes come alias.\n"
-
-#: ../urpme:52 ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - Rifé l' pacaedje divant d' disfacer.\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - eployî ene ôte raecene po l' oistaedje des rpm.\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../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   - eployî ene ôte raecene po l' astalaedje des rpm.\n"
-
-#: ../urpme:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - èn nén enonder les scripes do pacaedje.\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - apontyî urpme al volêye a pårti d' on coxhlaedje di\n"
-"                   distribucion, ahessåve po (diz)astaler on sistinme\n"
-"                   chroot avou l' tchuze «--root».\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - môde badjawe.\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr ""
-"  -a             - tchoezi tos les pacaedjes ki corespondèt al ratourneure.\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "Seulmint li super-uzeu a l' droet d' oister des pacaedjes"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "pacaedjes nén cnoxhous"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "pacaedje nén cnoxhou"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "oister li pacaedje %s va spiyî vosse sistinme"
-msgstr[1] "oister li pacaedje %s va spiyî vosse sistinme"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "Rén a oister"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "Rén a oister"
-
-#: ../urpme:147
-#, fuzzy, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] ""
-"Po satisfyî les aloyaedjes, les %d pacaedjes ki shuvèt vont esse disastalés "
-"(%d Mo)"
-msgstr[1] ""
-"Po satisfyî les aloyaedjes, les %d pacaedjes ki shuvèt vont esse disastalés "
-"(%d Mo)"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "pacaedje nén cnoxhou"
-msgstr[1] "pacaedje nén cnoxhou"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "Oister %d pacaedje?"
-msgstr[1] "Oister %d pacaedjes?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (o/N) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "dji prind li bodjåve sopoirt come «%s»"
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "Li oistaedje a fwait berwete"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "Li oistaedje a fwait berwete"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1656,32 +1386,39 @@ msgstr ""
 "\n"
 "Po s' è siervi: urpmf [tchuzes] erîlêye-ratourneure\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - mostere li modêye do programe.\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr ""
 "  --env          - eployî on evironmint dné (tipike po les rapoirts di "
 "bug).\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - èn nén eployî les dnés sopoirts, separés pa des comas.\n"
 
-#: ../urpmf:39
+#: ../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  - nén ene erîlêye ratourneure, mins ene tchinne literåle.\n"
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../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   - eployî ene ôte raecene po l' astalaedje des 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"
@@ -1689,266 +1426,541 @@ msgstr ""
 "  --sortmedia    - relére les sopoirts sorlon les tchinnes dinêyes, "
 "separêyes pa des comas.\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, fuzzy, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr ""
 "  --synthesis    - eployî l' fitchî d' sinteze diné purade kel\n"
 "                   båze di dnêyes d' urpmi.\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - eployî l' fitchî d' sinteze diné purade kel\n"
 "                   båze di dnêyes d' urpmi.\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr ""
 "  --uniq         - èn nén håyner deus côps les royes ki sont les minmes.\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - eployî kel sopoirt di metaedje a djoû.\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - môde badjawe.\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - èn nén fé di diferince pititès/grandès letes.\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -I             - fé l' diferince pititès/grandès letes (prémetou).\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<car>        - candjî l' separateur di tchamps (prémetou «:»).\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "Patrons po les ratourneures:\n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 "  tecse          - on tecse est veyou come ene erîlêye ratourneure,\n"
 "                   a moens ki l' paramete «-l» soeye eployî.\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - sititchî do côde perl directumint, come «perl -e».\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - operateur binaire EYET.\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - operateur binaire OU.\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - operateur unaire NENI.\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr ""
 "  ( )            - åtchetes (hintche/droete) po grouper des ratourneures.\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "Djivêye des etiketes:\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf            - definixh ene cogne di rexhowe a môde di printf.\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   egzimpe: «%%name:%%files»\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - årtchitecteure\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - lodjoe wice ki l' pacaedje a stî fwait.\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - date ey eure ki l' pacaedje a stî fwait\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - djivêye des fitchîs d' apontiaedje\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - les conflits avou ds ôtes pacaedjes ou modêyes.\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - longou discrijhaedje do pacaedje.\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - li distribucion ki l' pacaedje a stî fwait po.\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - etikete «epoch»\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - li no d' fitchî do pacaedje.\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - djivêye des fitchîs å dvins do pacaedje\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - li groupe do pacaedje.\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, fuzzy, c-format
 msgid "  --license      - license\n"
 msgstr "  --name         - li no do pacaedje.\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - li no do pacaedje.\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr ""
 "  --obsoletes    - les vîs pacaedjes (avou ds ôtès nos) replaecîs pa ci-"
 "chal.\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - li ci k' a fwait l' pacaedje.\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - tot çou k' est ahessî på pacaedje.\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - tot çou k' i gn a mezåjhe po l' pacaedje.\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - li grandeu sol deure plake on côp astalé.\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - no do fitchî src.rpm sourdant.\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, fuzzy, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr ""
 "  --obsoletes    - les vîs pacaedjes (avou ds ôtès nos) replaecîs pa ci-"
 "chal.\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - discrijhaedje rascourti.\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - hårdêye avou des informåcions.\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - vindeu do pacaedje.\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - li sopoirt wice ki l' pacaedje a stî trové\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr ""
 "  -f             - mostere li modêye et release, eyet l' årtchitecteure avou "
 "l' no.\n"
 
-#: ../urpmf:153
-#, fuzzy, c-format
-msgid "unterminated expression (%s)"
-msgstr "Patrons po les ratourneures:\n"
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 "Cogne nén comifåt: vos n' poloz eployî k' ene seule etike multi-valixhances"
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "eployant on evironmint specifike so %s\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "nou fitchî hdlist di trové pol sopoirt «%s»"
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, fuzzy, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "dji fwai li fitchî d' sinteze hdlist pol sopoirt «%s»"
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, fuzzy, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "dji screye li fitchî d' djivêye («list») pol sopoirt «%s»"
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "Nou pacaedje lomé %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "Les pacaedjes ki shuvèt ont å dvins %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "Les pacaedjes %s èn polèt nén esse astalés"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "Li pacaedje %s a ddja stî astalé"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Les pacaedjes %s ont ddja stî astalés"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "cåze di %s ki n' est nén la"
+
+#: ../urpm/select.pm:563
+#, fuzzy, c-format
+msgid "due to already installed %s"
+msgstr "Li pacaedje %s a ddja stî astalé"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "cåze di %s ki n' est nén satisfyî"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "dji saye di promouvwer %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "po wårder %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "po-z astaler %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "cåze di conflits avou %s"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "Sinateure nén valide (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "ID di clé nén valide (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "I manke li sinateure (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't write file"
+msgstr "Dji n' sai ahiver l' fitchî d' apontiaedje [%s]"
+
+#: ../urpm/sys.pm:276
+#, fuzzy, c-format
+msgid "Can't open file"
+msgstr "Li copiaedje a fwait berwete"
+
+#: ../urpm/sys.pm:289
+#, fuzzy, c-format
+msgid "Can't move file %s to %s"
+msgstr "Dji n' sai eployî %s avou %s"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme modêye %s\n"
+"Copyright © 1999-2008 Mandriva.\n"
+"Çouci est on libe programe et pout esse cossemé so les termes del licince "
+"GPL.\n"
+"\n"
+"Po s' è siervi:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr ""
+"  --auto         - tchoezi otomaticmint on pacaedje divins les tchuzes.\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - verifyî si l' oistaedje si pout fé comifåt.\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr ""
+"  --parallel     - distribouwaedje di l' ovraedje d' urpmi so\n"
+"                   so sacwantès éndjoles defineyes come alias.\n"
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - Rifé l' pacaedje divant d' disfacer.\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - eployî ene ôte raecene po l' oistaedje des rpm.\n"
+
+#: ../urpme:55 ../urpmi:101
+#, fuzzy, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --update       - mete a djoû rén kel sopoirt di metaedje a djoû.\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - èn nén enonder les scripes do pacaedje.\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - apontyî urpme al volêye a pårti d' on coxhlaedje di\n"
+"                   distribucion, ahessåve po (diz)astaler on sistinme\n"
+"                   chroot avou l' tchuze «--root».\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - môde badjawe.\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr ""
+"  -a             - tchoezi tos les pacaedjes ki corespondèt al ratourneure.\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "Seulmint li super-uzeu a l' droet d' oister des pacaedjes"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "pacaedjes nén cnoxhous"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "pacaedje nén cnoxhou"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "oister li pacaedje %s va spiyî vosse sistinme"
+msgstr[1] "oister li pacaedje %s va spiyî vosse sistinme"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "Rén a oister"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "Rén a oister"
+
+#: ../urpme:149
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Po satisfyî les aloyaedjes, les %d pacaedjes ki shuvèt vont esse disastalés "
+"(%d Mo)"
+msgstr[1] ""
+"Po satisfyî les aloyaedjes, les %d pacaedjes ki shuvèt vont esse disastalés "
+"(%d Mo)"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "pacaedje nén cnoxhou"
+msgstr[1] "pacaedje nén cnoxhou"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Oister %d pacaedje?"
+msgstr[1] "Oister %d pacaedjes?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (o/N) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "dji prind li bodjåve sopoirt come «%s»"
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "Li oistaedje a fwait berwete"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "Li oistaedje a fwait berwete"
+
+#: ../urpmf:153
+#, fuzzy, c-format
+msgid "unterminated expression (%s)"
+msgstr "Patrons po les ratourneures:\n"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -2042,11 +2054,6 @@ msgstr ""
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - wårder el muchete les pacaedjes rpm nén eployîs.\n"
 
-#: ../urpmi:101
-#, fuzzy, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update       - mete a djoû rén kel sopoirt di metaedje a djoû.\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2385,7 +2392,7 @@ msgstr ""
 "\n"
 "Voloz vs tot l' minme continouwer l' astalaedje?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (O/n) "
@@ -2573,10 +2580,12 @@ msgstr "  --curl         - eployî curl po-z aberweter les fitchî då lon.\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - fé on sopoirt di metaedje a djoû.\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2584,23 +2593,23 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - eployî les fitchîs di sinteze.\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr ""
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, fuzzy, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr ""
 "  --no-probe     - èn nén sayî di trover on fitchî di sinteze ou «hdlist».\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
@@ -2609,17 +2618,17 @@ msgstr ""
 "  --distrib      - fé otomaticmint tos les sopoirts a pårti d' on sopoirt\n"
 "                   d' astalåcion.\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr ""
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media   - avou --distrib, radjoute tos les sopoirts dinés.\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2628,93 +2637,93 @@ msgstr ""
 "  --from         - eployî li dnêye hårdêye pol djivêye des muroes,\n"
 "                   li prémetowe hårdêye est %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, fuzzy, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr ""
 "  --virtual      - ahiver on forveyou sopoirt ki sont tofer a djoû,\n"
 "                   rén ki l' protocole «file://» est permetou.\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - dismete li verifiaedje di fitchîs MD5SUM.\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - n' aberwete nén li clé publike pol sopoirt\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - radjouter l' sopoirt, mins nén l' mete a djoû.\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - môde taijheu.\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - môde badjawe.\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr ""
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr ""
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr ""
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr ""
 "Seulmint li super-uzeu a l' droet d' radjouter des sopoirts d' astalaedje"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "ahivaedje do fitchî d' apontiaedje [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Dji n' sai ahiver l' fitchî d' apontiaedje [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, fuzzy, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr ""
 "nén mezåjhe di dner li <tchmin relatif pol fitchî hdlist> avou --distrib"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
 msgstr ""
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, fuzzy, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "i manke li tchmin relatif pol fitchî hdlist\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr ""
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, fuzzy, c-format
 msgid "unable to add medium"
 msgstr "dji n' sai aveur accès å sopoirt «%s»"
@@ -2959,12 +2968,12 @@ msgid "Only superuser is allowed to update media"
 msgstr ""
 "Seulmint li super-uzeu a l' droet d' mete a djoû des sopoirts d' astalaedje"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "rén a mete a djoû (eployîz urpmi.addmedia po-z adjouter on sopoirt)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2973,17 +2982,17 @@ msgstr ""
 "i gn a pont d' intrêye a mete a djoû\n"
 "(ene di %s)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "«%s»"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "dj' ignore li sopoirt «%s»"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "dji mete en alaedje li sopoirt «%s»"
@@ -3279,6 +3288,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Nou djournå des candjmints di trové\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - fé on sopoirt di metaedje a djoû.\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "crombe hårdêye: [%s]"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8e0ec278..a115f08b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-03-30 14:22+0800\n"
 "Last-Translator: 汤诗语 <shiyu@mandriva.org>\n"
 "Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM 安装"
@@ -33,7 +33,7 @@ msgstr "RPM 安装"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "错误: 找不到文件 %s，将取消操作"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "确定(_O)"
@@ -99,7 +99,7 @@ msgstr "安装(_I)"
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "取消(_C)"
@@ -130,8 +130,9 @@ msgstr ""
 msgid "Options:"
 msgstr "选项："
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 打印帮助信息。\n"
@@ -164,7 +165,7 @@ msgstr ""
 "  --verify-rpm   - 安装之前验证 rpm 签署\n"
 "                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
@@ -212,7 +213,7 @@ msgstr "请稍候..."
 msgid "Must be root"
 msgstr "必须是 root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -223,42 +224,42 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr "(升级)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr "(安装)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "软件包选择"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "中止(_A)"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -269,60 +270,60 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d 个软件包，%d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "请插入介质“%s”"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -333,28 +334,28 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "安装失败: "
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "软件包已经安装"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
@@ -434,8 +435,8 @@ msgid "...retrieving done"
 msgstr "...获取完成"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
@@ -475,52 +476,52 @@ msgstr "运行于限制模式运行时，禁止执行此操作"
 msgid "bad proxy declaration on command line\n"
 msgstr "命令行声明的代理服务器无效\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "模式表达式: \n"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "缺少签名(%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "模式表达式: \n"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "默认情况下，urpmf 使用正则表达式。您应该使用选项“--literal”"
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目录不存在"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "没有 %2$s 无法使用 %1$s"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "无法和 %2$s 一起使用 %1$s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "参数太多\n"
@@ -947,217 +948,217 @@ msgstr ""
 "--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update, --use-"
 "distrib 或 --parallel 一起使用"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "搜索开始: %s 结束: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "跳过软件包 %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "将安装而非升级软件包 %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "介质“%s”已存在"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(默认忽略)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "在远程介质“%2$s”之前添加介质“%1$s”"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "添加介质“%s”"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "目录 %s 不存在"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "此位置似乎不包含任何发行版"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "无法分析 media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "无法访问发行版介质(未发现 media.cfg 文件)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "跳过不兼容的介质“%s”(原因是 %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "正在获取 media.cfg 文件..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在从介质“%s”重新配置 urpmi"
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...重新配置失败"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "重新配置完成"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "生成命名文件出错：依赖关系 %d 未找到"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "介质“%s”已为最新"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "正在复制介质“%2$s”的 [%1$s]..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "复制 [%s] 失败(文件太小了)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "正在计算所获取的源综合文件的 md5sum"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "获取[%s]失败(md5sum 不匹配)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "在 %s 上 genhdlist2 失败"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "比较 %s 和 %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "介质“%2$s”的 hdlist 文件 %1$s 无效"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "正在复制“%s”的 MD5SUM..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "正在获取“%s”的源综合文件..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "发现探测的综合文件 为 %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "介质“%s”未发现综合文件"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%2$s”中导入了密钥 %1$s"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "已更新介质“%s”"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "获取[%s]失败"
@@ -1189,7 +1190,7 @@ msgstr "nN否"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "yY是"
@@ -1259,7 +1260,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1341,264 +1342,7 @@ msgstr "正在装载 %s"
 msgid "unmounting %s"
 msgstr "正在拆卸 %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "urpmi 已经重新启动，而优先的软件包列表未更新"
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi 已经重新启动，优先的软件包列表进行了如下更改：%s vs %s"
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "没有叫做 %s 的软件包"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "下列软件包里有 %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "软件包 %s 无法安装"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "软件包 %s 已经安装"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "软件包 %s 已经安装"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "原因是丢失 %s"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "原因是已经安装 %s"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "原因是不满足 %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "正在试图推广 %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "为了保留 %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "为了安装 %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "原因是与 %s 冲突"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "无效的签名(%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "无效的密钥 ID(%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "缺少签名(%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't write file"
-msgstr "无法写入文件"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "无法打开文件"
-
-#: ../urpm/sys.pm:289
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "无法将文件 %s 移动到 %s"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmf 版本 %s\n"
-"版权 (C) 1999-2008 Mandriva。\n"
-"这是自由软件，可以依照 GNU GPL 重新发布。\n"
-"\n"
-"用法:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - 自动选中软件包。\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - 验证删除是否可以正确进行。\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
-
-#: ../urpme:52 ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - 在删除之前重新对文件打包\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - 使用另一个 root 删除 rpm。\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../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   - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
-
-#: ../urpme:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - 不执行软件包脚本。\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - 从发行版树中实时配置 urpme，特别用于在 --root 选项\n"
-"                   下安装/卸载 chroot。\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - 详细提示。\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "只允许超级用户删除软件包"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "未知的软件包"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "未知的软件包"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "如果删除软件包 %s 会破坏您的系统"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "不需要删除任何东西。"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "不需要删除任何东西。"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "为满足相关性要求，需要删除下列%d个软件包"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "未知的软件包"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "删除 %d 个软件包吗?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr "(是(y)/否(N))[否]"
-
-#: ../urpme:164
-#, c-format
-msgid "testing removal of %s"
-msgstr ""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "删除失败"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "删除失败"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1614,278 +1358,546 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 打印此工具的版本号。\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - 不使用给定介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:39
+#: ../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  - 不匹配模式，参数为字面字符串。\n"
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../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   - 使用另一个 root 来存储 urpmi db 和安装 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    - 根据用逗号分隔的子字符串排序介质。\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - 使用给定的路径访问介质\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - 使用指定的综合文件而不是 urpmi db。\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - 不打印相同行。\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用升级介质。\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - 详细提示。\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - 忽略各种情况下的冲突。\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -I             - 在模式中遵从大小写(默认值)。\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<字符串>     - 更改字段分隔符(默认为“:”)。\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "模式表达式: \n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr "  文本           - 任何文本都将被处理为正则表达式，除非使用了 -l。\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - 直接保留 perl 代码，就像 perl -e。\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - 二元 AND 操作符。\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - 二元 OR 操作符。\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - 一元 NOT。\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - 左右括号。\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "标记清单:\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - 指定类似 printf 的输出格式\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   例如:“%%name:%%files”\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - 体系\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - 编译主机\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - 编译时间\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - 配置文件\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - conflict 标签\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - 软件包描述\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - 发行版\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - 周期\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --fiename      - 软件包文件名\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - 列出软件包中包含的文件\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - 分组\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - 许可协议\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - 软件包名称\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - obsolets 标签\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - 打包者\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - provides 标签\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - requires 标签\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - 安装大小\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - 源 rpm 名称\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - suggests 标签\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - 摘要\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - 提供者\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - 软件包所在介质\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
 
-#: ../urpmf:153
-#, fuzzy, c-format
-msgid "unterminated expression (%s)"
-msgstr "模式表达式: \n"
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "格式不对: 您只能使用一个多值标签"
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "介质“%s”的 hdlist 不可用"
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "介质“%s”的综合文件不可用"
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "介质“%s”没有可用的 xml-info"
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr "urpmi 已经重新启动，而优先的软件包列表未更新"
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr "urpmi 已经重新启动，优先的软件包列表进行了如下更改：%s vs %s"
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "没有叫做 %s 的软件包"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "下列软件包里有 %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "软件包 %s 无法安装"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "软件包 %s 已经安装"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "软件包 %s 已经安装"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "原因是丢失 %s"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "原因是已经安装 %s"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "原因是不满足 %s"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "正在试图推广 %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "为了保留 %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "为了安装 %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "原因是与 %s 冲突"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "无效的签名(%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "无效的密钥 ID(%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "缺少签名(%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't write file"
+msgstr "无法写入文件"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "无法打开文件"
+
+#: ../urpm/sys.pm:289
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "无法将文件 %s 移动到 %s"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf 版本 %s\n"
+"版权 (C) 1999-2008 Mandriva。\n"
+"这是自由软件，可以依照 GNU GPL 重新发布。\n"
+"\n"
+"用法:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - 自动选中软件包。\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - 验证删除是否可以正确进行。\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - 在删除之前重新对文件打包\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - 使用另一个 root 删除 rpm。\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --justdb       - 只使用 rpm 数据库，不更新文件系统。\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - 不执行软件包脚本。\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - 从发行版树中实时配置 urpme，特别用于在 --root 选项\n"
+"                   下安装/卸载 chroot。\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - 详细提示。\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "只允许超级用户删除软件包"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "未知的软件包"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "未知的软件包"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "如果删除软件包 %s 会破坏您的系统"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "不需要删除任何东西。"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "不需要删除任何东西。"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "为满足相关性要求，需要删除下列%d个软件包"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "未知的软件包"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "删除 %d 个软件包吗?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr "(是(y)/否(N))[否]"
+
+#: ../urpme:166
+#, c-format
+msgid "testing removal of %s"
+msgstr ""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "删除失败"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "删除失败"
+
+#: ../urpmf:153
+#, fuzzy, c-format
+msgid "unterminated expression (%s)"
+msgstr "模式表达式: \n"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1971,11 +1983,6 @@ msgstr "   --clean       - 首先删除缓存中的 rpm。\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - 不从缓存中清除 rpm。\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       - 只使用 rpm 数据库，不更新文件系统。\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2292,7 +2299,7 @@ msgstr ""
 "\n"
 "仍然继续安装吗?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
@@ -2480,10 +2487,12 @@ msgstr "  --curl         - 用 crul 取远程文件。\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - 创建一个更新介质。\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2494,111 +2503,111 @@ msgstr ""
 "                   以下中的一个: never, on-demand, update-only, always. cf "
 "urpmi.cfg(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - 使用综合文件。\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - 使用 rpm 文件(而不是综合文件)。\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - 不试图查找任何综合文件文件。\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr "  --distrib      - 自动从安装介质创建全部介质。\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr "  --interactive  - 对于 --distrib，请求每个介质的确认\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - 对于 --distrib，添加列出的每个介质\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr "  --from         - 使用指定的 URL 列出镜像，默认为 %s。\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr "  --virtual      - 创建常为最新的虚拟介质。\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - 不导入所添加介质的密钥\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - 在配置中添加介质，但不进行更新。\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安静模式。\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 详细的提示。\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "已知的 xml-info 策略是 %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "没有参数需要于 --distrib --mirrorlist <url>"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "无效的 <url> (如果是本地目录，必须是绝对路径)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "只允许超级用户添加介质"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "创建配置文件[%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "无法创建配置文件[%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "使用 --distrib 不需要提供 <综合文件的相对路径>"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2607,17 +2616,17 @@ msgstr ""
 "\n"
 "您是否想要添加介质“%s”"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<综合文件的相对路径>找不到\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "远程介质无法使用 %s"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "无法添加介质"
@@ -2849,12 +2858,12 @@ msgstr "  -ff            - 强迫更新综合文件。\n"
 msgid "Only superuser is allowed to update media"
 msgstr "只允许超级用户更新介质"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "没有要升级的软件(用 urpmi.addmedia 添加介质)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2863,17 +2872,17 @@ msgstr ""
 "找不到要升级的项\n"
 "(%s 中之一)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "“%s”"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "忽略介质 %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "启用介质 %s"
@@ -3136,6 +3145,9 @@ msgstr "由于介质“%s”没有 xml 信息，软件包 %s 无法返回任何�
 msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - 创建一个更新介质。\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "URL 格式错误: [%s]"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f08a367f..f6db6f14 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-03-22 15:16+0800\n"
 "Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -32,7 +32,7 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM 套件安裝"
@@ -42,7 +42,7 @@ msgstr "RPM 套件安裝"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "錯誤：無法找到檔案 %s，作業將取消"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "確定 (_O)"
@@ -108,7 +108,7 @@ msgstr "安裝 (_I)"
 msgid "_Save"
 msgstr "儲存 (_S)"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "取消 (_C)"
@@ -139,8 +139,9 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 顯示此說明訊息。\n"
@@ -173,7 +174,7 @@ msgstr ""
 "  --verify-rpm   - 安裝前檢驗 RPM 檔案的簽章。\n"
 "                   (--no-verify-rpm 會停用它，預設值為啟用)。\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用給定的媒體，不同媒體間請以逗號分隔。\n"
@@ -221,7 +222,7 @@ msgstr "請稍候..."
 msgid "Must be root"
 msgstr "必須擁有管理者權限"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -232,42 +233,42 @@ msgstr ""
 "%s\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "確定"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr " (升級用)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr " (安裝用)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "套件選擇"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列套件之一："
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "放棄 (_A)"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -278,60 +279,60 @@ msgstr ""
 "%s\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "為了滿足相依性，將會安裝下列套件："
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "為了滿足相依性，將會一併安裝下列套件："
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d 個套件，共 %d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "套件安裝..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "無法取得原始碼套件，放棄"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "準備中..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安裝套件 `%s' (%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "請置入名為 \"%s\" 的媒體"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下載套件 `%s'..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "完成 (_D)"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -342,28 +343,28 @@ msgstr ""
 "%s\n"
 "您或許要更新您的 urpmi 資料庫"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "安裝失敗；"
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "每個套件都已經安裝了"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "安裝完畢"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "正在移除 %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新啟動 urpmi"
@@ -443,8 +444,8 @@ msgid "...retrieving done"
 msgstr "...擷取完成"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...擷取失敗：%s"
@@ -484,52 +485,52 @@ msgstr "使用限制模式執行時禁止該操作程序"
 msgid "bad proxy declaration on command line\n"
 msgstr "命令列傳入的代理伺服器宣告錯誤\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq：無法讀取 rpm 檔案 \"%s\"\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "樣版表示式：\n"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "遺失簽名 (%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "樣版表示式：\n"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目錄不存在"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "參數太多\n"
@@ -956,217 +957,217 @@ msgstr ""
 "--synthesis 不能夠與 --media、--excludemedia、--sortmedia、--update、--use-"
 "distrib 以及 --parallel 一起使用"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "搜尋開始於：%s 結束於：%s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "正在略過套件 %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "將會安裝而非升級套件 %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "媒體 \"%s\" 已經存在"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(預設為忽略)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "在遠端媒體 \"%2$s\" 前新增媒體 \"%1$s\""
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "新增媒體 \"%s\""
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "目錄 %s 不存在"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "這個位置似乎並沒有包含任何散佈套件"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "無法解析 media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "無法存取散佈媒體 (找不到 media.cfg 檔案)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "正在擷取 media.cfg 檔案..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "正在嘗試選擇不存在的媒體 \"%s\""
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "正在選擇多個媒體：\"%s\""
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "移除媒體 \"%s\""
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在重新設定媒體 \"%s\" 的 urpmi 設定"
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "重新設定失敗"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "重新設定完成"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "生成名稱檔案時發生錯誤：相依性 %d 沒有找到"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "媒體 \"%s\" 已經處於最新狀態"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "檢驗 synthesis 檔案 [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "讀取 \"%s\" 媒體的 synthesis 檔案時發生問題"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "正在複製媒體 \"%2$s\" 的 [%1$s]..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...複製失敗"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在複製 \"%s\" 的敘述檔案..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...複製完成"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "複製 [%s] 失敗 (檔案小得可疑)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "正在計算來源 synthesis 的 md5sum"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "[%s] 擷取失敗 (md5sum 不合)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "檢驗 hdlist 檔案 [%s]"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "正在比對 %s 與 %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "沒有找到媒體 \"%s\" 的 hdlist 檔案"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "正在複製 \"%s\" 的 MD5SUM 檔案..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "無效的 rpm 檔案名稱 [%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "正在擷取 \"%s\" 的來源 synthesis..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, fuzzy, c-format
 msgid "found probed synthesis as %s"
 msgstr "發現尋找到的 hdlist (或 synthesis) 為 %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "沒有找到 \"%s\" 媒體的 synthesis 檔案"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "檢驗 \"%s\" 的公鑰..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...由 \"%2$s\" 的公鑰檔案匯入鑰匙 %1$s"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "無法匯入 \"%s\" 的公鑰"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "已更新媒體 \"%s\""
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
@@ -1198,7 +1199,7 @@ msgstr "Nn否"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "Yy是"
@@ -1268,7 +1269,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1350,264 +1351,7 @@ msgstr "正在掛載 %s"
 msgid "unmounting %s"
 msgstr "正在卸載 %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "沒有套件命名為 %s"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "以下套件包含 %s：%s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "%s 套件無法安裝"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "%s 套件已經安裝了"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "%s 套件已經安裝了"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "由於遺失了 %s"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "由於已經安裝了 %s"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "由於未滿足 %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "正在試著促進 %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "為了要保留 %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "為了要安裝 %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "由於與 %s 發生衝突"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "無效的簽名 (%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "無效的公鑰 ID (%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "遺失簽名 (%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't write file"
-msgstr "無法寫入檔案"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "無法開啟檔案"
-
-#: ../urpm/sys.pm:289
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "無法移動檔案 %s 至 %s"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpme 版本號 %s\n"
-"Copyright (C) 1999-2008 Mandriva。\n"
-"這是自由軟體並可於 GNU GPL 條款下重新散佈。\n"
-"\n"
-"用法：\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - 自動選擇套件。\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - 確認刪除是否能夠正確進行。\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - 在同步管理的機器上分散式的執行 urpmi。\n"
-
-#: ../urpme:52 ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - 在移除前重新打包檔案\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - 使用另一個根目錄移除 rpm 套件。\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../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   - 使用另一個根目錄存放 urpmi 資料庫與 RPM 的安裝。\n"
-
-#: ../urpme:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - 不執行套件中的命令稿。\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - 立即由一個散佈套件樹設定 urpme，在搭配 --root 選項來安\n"
-"                   裝/移除一個 chroot 時很方便。\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - 詳細訊息模式。\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - 選擇所有符合描述的套件。\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "只有擁有管理者權限的使用者才能移除套件"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "未知的套件"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "未知的套件"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "移除套件 %s 將破壞您的系統"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "沒有東西可移除"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "沒有東西可移除"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "為了滿足相依性，下列 %d 個套件將被移除"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "未知的套件"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "要移除這 %d 個套件嗎？"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr " (y/N) (是/否) "
-
-#: ../urpme:164
-#, fuzzy, c-format
-msgid "testing removal of %s"
-msgstr "將可移除式裝置當成 \"%s\""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "移除失敗"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "移除失敗"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1623,278 +1367,546 @@ msgstr ""
 "\n"
 "用法：urpmf [選項] pattern-expression\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 印出這個工具的版本編號。\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - 使用特定環境 (一般用於臭蟲回報)。\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../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 - 不使用給定的媒體，不同媒體間請以逗號分隔。\n"
 
-#: ../urpmf:39
+#: ../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  - 不比對樣版，把參數當作一般字串。\n"
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../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   - 使用另一個根目錄存放 urpmi 資料庫與 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    - 依據子字串排序媒體，以逗號分開。\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - 使用指定的路徑來存取媒體\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../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    - 使用指定的 synthesis 檔而非 urpmi 資料庫。\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - 不顯示相同的訊息。\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用更新媒體。\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - 完整訊息模式。\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - 忽略樣版中的大小寫差異。\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -I             - 分辨樣版中的大小寫差異 (預設值)。\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<字串>       - 更改字串分隔符號 (預設為“:”)。\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "樣版表示式：\n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr "  文字           - 任何文字都將被分析為正規表示式，除非使用了 -l。\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - 直接包含 perl 原始碼，類似 perl -e。\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - 二元 AND 運算子。\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - 二元 OR 運算子。\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - 一元 NOT 運算子。\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - 左右括弧。\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "標籤清單：\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - 使用類似 printf 的輸出格式\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   範例：'%%name:%%files'\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - 硬體架構\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - 建立主機\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - 建立時間\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - 組態檔\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - 衝突標籤\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - 套件描述\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - 發行版\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - 時期\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - 套件檔案名稱\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - 列出套件內包含的檔案\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - 群組\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - 授權\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - 套件名稱\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - 淘汰標籤\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - 打包者\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - 提供標籤\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - 需要標籤\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - 安裝大小\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - 原始碼套件名稱\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - 建議標籤\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - 摘要\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - URL\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - 提供者\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - 這個套件被找到的媒介\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 顯示版本、發行編號與平台。\n"
 
-#: ../urpmf:153
-#, fuzzy, c-format
-msgid "unterminated expression (%s)"
-msgstr "樣版表示式：\n"
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "格式錯誤：您只能使用一個多值標籤"
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "正在 %s 上使用特定的環境\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "媒體 \"%s\" 沒有可用的 hdlist"
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "媒體 \"%s\" 沒有可用的 synthesis"
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "媒體 \"%s\" 沒有可用的 xml-info"
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr ""
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr ""
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "沒有套件命名為 %s"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "以下套件包含 %s：%s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "%s 套件無法安裝"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "%s 套件已經安裝了"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "%s 套件已經安裝了"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "由於遺失了 %s"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "由於已經安裝了 %s"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "由於未滿足 %s"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "正在試著促進 %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "為了要保留 %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "為了要安裝 %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "由於與 %s 發生衝突"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "無效的簽名 (%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "無效的公鑰 ID (%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "遺失簽名 (%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't write file"
+msgstr "無法寫入檔案"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "無法開啟檔案"
+
+#: ../urpm/sys.pm:289
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "無法移動檔案 %s 至 %s"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme 版本號 %s\n"
+"Copyright (C) 1999-2008 Mandriva。\n"
+"這是自由軟體並可於 GNU GPL 條款下重新散佈。\n"
+"\n"
+"用法：\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - 自動選擇套件。\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - 確認刪除是否能夠正確進行。\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - 在同步管理的機器上分散式的執行 urpmi。\n"
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - 在移除前重新打包檔案\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - 使用另一個根目錄移除 rpm 套件。\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --justdb       - 只更新 RPM 資料庫，而非檔案系統。\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - 不執行套件中的命令稿。\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - 立即由一個散佈套件樹設定 urpme，在搭配 --root 選項來安\n"
+"                   裝/移除一個 chroot 時很方便。\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - 詳細訊息模式。\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - 選擇所有符合描述的套件。\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "只有擁有管理者權限的使用者才能移除套件"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "未知的套件"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "未知的套件"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "移除套件 %s 將破壞您的系統"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "沒有東西可移除"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "沒有東西可移除"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "為了滿足相依性，下列 %d 個套件將被移除"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "未知的套件"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "要移除這 %d 個套件嗎？"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr " (y/N) (是/否) "
+
+#: ../urpme:166
+#, fuzzy, c-format
+msgid "testing removal of %s"
+msgstr "將可移除式裝置當成 \"%s\""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "移除失敗"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "移除失敗"
+
+#: ../urpmf:153
+#, fuzzy, c-format
+msgid "unterminated expression (%s)"
+msgstr "樣版表示式：\n"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1984,11 +1996,6 @@ msgstr "  --clean        - 在執行任何事前先由快取中移除 RPM 檔案
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - 不清除快取中的 RPM 檔案。\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       - 只更新 RPM 資料庫，而非檔案系統。\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2305,7 +2312,7 @@ msgstr ""
 "\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) (是/否) "
@@ -2493,10 +2500,12 @@ msgstr "  --curl         - 使用 curl 擷取遠端檔案。\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - 建立更新的媒體。\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2504,39 +2513,39 @@ msgid ""
 "cfg(5)\n"
 msgstr ""
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - 使用 synthesis 檔案。\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - 使用 RPM 檔案 (而非 synthesis)。\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - 不嘗試尋找任何 synthesis 檔案。\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr "  --distrib      - 自動根據安裝媒體建立所有的媒體。\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr "  --interactive  - 搭配 --distrib，每個媒體都要徵詢同意\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - 搭配 --distrib，加入所有列出的媒體\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
@@ -2545,72 +2554,72 @@ msgstr ""
 "  --from         - 使用指定的 URL 取得映射站台清單，預設為\n"
 "                   %s\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr "  --virtual      - 建立永遠保持於最新狀態的虛擬媒體。\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - 不使用 MD5SUM 檔案檢查功能。\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - 不匯入新增的媒體的公鑰\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - 加入這個媒介到設定檔中，但不更新它。\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安靜模式。\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 完整訊息模式。\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "已知的 xml-info 政策為 %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "--distrib --mirrorlist <url> 不需要參數"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "錯誤的 <url> (對於本地目錄，必須使用絕對路徑)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "只有管理者才能新增媒體"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "正在建立設定檔 [%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "無法建立設定檔 [%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "--distrib 不需給予 <synthesis 檔案的相對路徑>"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2619,17 +2628,17 @@ msgstr ""
 "\n"
 "您要加入媒體 '%s'"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<synthesis 檔案的相對路徑> 遺失\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "遠端媒體無法使用 %s"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "無法增加媒體"
@@ -2861,12 +2870,12 @@ msgstr "  -f             - 強制產生 hdlist 檔案。\n"
 msgid "Only superuser is allowed to update media"
 msgstr "只有管理者才能跟新媒體"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "沒有東西可供更新 (使用 urpmi.addmedia 以新增一個媒體)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2875,17 +2884,17 @@ msgstr ""
 "要更新的項目遺失\n"
 "(%s 的其中之一)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "略過媒體 %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "啟用媒體 %s"
@@ -3150,6 +3159,9 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "沒有找到更新紀錄\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - 建立更新的媒體。\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "畸形的 URL：[%s]"