usync with code

1 files changed, 468 insertions, 456 deletions

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]"