sync with code

1 files changed, 362 insertions, 390 deletions

diff --git a/po/sl.po b/po/sl.po
index a9a9605c..54a74e31 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-10-28 15:12+0100\n"
+"POT-Creation-Date: 2009-03-30 16:09+0200\n"
 "PO-Revision-Date: 2009-03-03 16:13+0100\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -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:186 ../gurpmi2:210
+#: ../gurpmi:47 ../gurpmi2:187 ../gurpmi2:212
 #, c-format
 msgid "_Ok"
 msgstr "V _redu"
@@ -104,7 +104,7 @@ msgstr "_Namesti"
 msgid "_Save"
 msgstr "_Shrani"
 
-#: ../gurpmi:101 ../gurpmi2:186
+#: ../gurpmi:101 ../gurpmi2:187
 #, c-format
 msgid "_Cancel"
 msgstr "_Prekliči"
@@ -137,7 +137,7 @@ 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
+#: ../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"
@@ -255,37 +255,37 @@ msgstr ""
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: ../gurpmi2:146 ../urpmi:612
+#: ../gurpmi2:146 ../urpmi:626
 #, c-format
 msgid "Ok"
 msgstr "V redu"
 
-#: ../gurpmi2:182
+#: ../gurpmi2:183
 #, c-format
 msgid " (to upgrade)"
 msgstr " (za nadgradnjo)"
 
-#: ../gurpmi2:183
+#: ../gurpmi2:184
 #, c-format
 msgid " (to install)"
 msgstr " (za namestitev)"
 
-#: ../gurpmi2:186
+#: ../gurpmi2:187
 #, c-format
 msgid "Package choice"
 msgstr "Izbira paketov"
 
-#: ../gurpmi2:187
+#: ../gurpmi2:188
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Potreben je eden od sledečih paketov:"
 
-#: ../gurpmi2:211
+#: ../gurpmi2:213
 #, c-format
 msgid "_Abort"
 msgstr "_Prekini"
 
-#: ../gurpmi2:234
+#: ../gurpmi2:248
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -296,19 +296,19 @@ msgstr ""
 "%s\n"
 "Naj se namestitev vseeno nadaljuje?"
 
-#: ../gurpmi2:253 ../urpmi:579
+#: ../gurpmi2:267 ../urpmi:593
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Za zadovoljitev odvisnosti bo nameščen naslednji paket:"
 
-#: ../gurpmi2:254 ../urpmi:580
+#: ../gurpmi2:268 ../urpmi:594
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Za zadovoljitev odvisnosti bodo nameščeni naslednji paketi:"
 
-#: ../gurpmi2:256
+#: ../gurpmi2:270
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -317,44 +317,44 @@ msgstr[1] "(%d paketa, %d MiB)"
 msgstr[2] "(%d paketi, %d MiB)"
 msgstr[3] "(%d paketov, %d MiB)"
 
-#: ../gurpmi2:264 ../urpm/main_loop.pm:49
+#: ../gurpmi2:278 ../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:296 ../urpm/install.pm:80
+#: ../gurpmi2:310 ../urpm/install.pm:81
 #, c-format
 msgid "Preparing..."
 msgstr "Priprava ..."
 
-#: ../gurpmi2:302
+#: ../gurpmi2:316
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Nameščanje paketa `%s' (%s/%s)..."
 
-#: ../gurpmi2:319 ../urpmi:607
+#: ../gurpmi2:333 ../urpmi:621
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Prosim vstavite nosilec imenovan »%s«"
 
-#: ../gurpmi2:333
+#: ../gurpmi2:347
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Pobiranje paketa `%s'..."
 
-#: ../gurpmi2:345 ../urpm.pm:327 ../urpm/download.pm:811
-#: ../urpm/get_pkgs.pm:222 ../urpm/media.pm:830 ../urpm/media.pm:1291
-#: ../urpm/media.pm:1442
+#: ../gurpmi2:359 ../urpm.pm:327 ../urpm/download.pm:811
+#: ../urpm/get_pkgs.pm:236 ../urpm/media.pm:810 ../urpm/media.pm:1271
+#: ../urpm/media.pm:1422
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...pridobivanje je spodletelo: %s"
 
-#: ../gurpmi2:361
+#: ../gurpmi2:375
 #, c-format
 msgid "_Done"
 msgstr "_Končano"
 
-#: ../gurpmi2:369 ../urpm/main_loop.pm:120
+#: ../gurpmi2:391
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -365,27 +365,27 @@ msgstr ""
 "%s\n"
 "Mogoče bi morali obnoviti podatkovno bazo urpmi"
 
-#: ../gurpmi2:375 ../urpm/main_loop.pm:239 ../urpm/main_loop.pm:275
+#: ../gurpmi2:397 ../urpm/main_loop.pm:250 ../urpm/main_loop.pm:290
 #, c-format
 msgid "Installation failed:"
 msgstr "Namestitev ni uspela:"
 
-#: ../gurpmi2:380
+#: ../gurpmi2:402
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Paketi so že nameščeni"
 
-#: ../gurpmi2:382
+#: ../gurpmi2:404
 #, c-format
 msgid "Installation finished"
 msgstr "Namestitev je končana"
 
-#: ../gurpmi2:383 ../urpme:169
+#: ../gurpmi2:405 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "odstranjevanje %s"
 
-#: ../gurpmi2:391 ../urpmi:674
+#: ../gurpmi2:413 ../urpmi:688
 #, c-format
 msgid "restarting urpmi"
 msgstr "ponovno zaganjanje urpmi"
@@ -475,7 +475,7 @@ msgstr "napačno ime datoteke rpm [%s]"
 msgid "retrieving rpm file [%s] ..."
 msgstr "pridobivanje datoteke rpm [%s] ..."
 
-#: ../urpm.pm:324 ../urpm/get_pkgs.pm:220
+#: ../urpm.pm:324 ../urpm/get_pkgs.pm:234
 #, c-format
 msgid "...retrieving done"
 msgstr "...pridobivanje je končano"
@@ -505,7 +505,7 @@ msgstr "Zgradba paketa ni združljiva z rpm [%s]"
 msgid "error registering local packages"
 msgstr "napaka pri registraciji krajevnih paketov"
 
-#: ../urpm.pm:438
+#: ../urpm.pm:439
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Ta postopek ni dovoljen v omejenem načinu"
@@ -520,58 +520,58 @@ msgstr "napačna deklaracija posrednika v ukazni vrstici\n"
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: ni mogoče brati datoteke rpm \"%s\"\n"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:371
 #, c-format
 msgid "unexpected expression %s"
 msgstr "nepričakovan izraz %s"
 
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:372
 #, c-format
 msgid "missing expression before %s"
 msgstr "manjkajoč izraz pred %s"
 
-#: ../urpm/args.pm:390
+#: ../urpm/args.pm:378
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "nepričakovan izraz %s (predlog: uporabite  -a ali -o ?)"
 
-#: ../urpm/args.pm:394
+#: ../urpm/args.pm:382
 #, c-format
 msgid "no expression to close"
 msgstr "ni izraza za zaprtje"
 
-#: ../urpm/args.pm:403
+#: ../urpm/args.pm:391
 #, 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:472
+#: ../urpm/args.pm:460
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "mapa za chroot ne obstaja"
 
-#: ../urpm/args.pm:495
+#: ../urpm/args.pm:483
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Ni moč uporabiti %s brez %s"
 
-#: ../urpm/args.pm:498 ../urpm/args.pm:501 ../urpmq:157
+#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Ni moč uporabiti %s z %s"
 
-#: ../urpm/args.pm:509
+#: ../urpm/args.pm:497
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Prveč argumentov\n"
 
-#: ../urpm/bug_report.pm:54 ../urpmi:259
+#: ../urpm/bug_report.pm:55 ../urpmi:259
 #, c-format
 msgid "Copying failed"
 msgstr "Kopiranje je spodletelo"
 
-#: ../urpm/cdrom.pm:66
+#: ../urpm/cdrom.pm:67
 #, c-format
 msgid ""
 "You must mount CD-ROM yourself (or install perl-Hal-Cdroms to have it done "
@@ -580,17 +580,17 @@ msgstr ""
 "CD-ROM morate priključiti sami (ali pa namestiti perl-Hal-Cdroms in se bo "
 "priklopil samodejno)"
 
-#: ../urpm/cdrom.pm:68
+#: ../urpm/cdrom.pm:69
 #, c-format
 msgid "HAL daemon (hald) is not running or not ready"
 msgstr "Pritajeni program HAL (hald) ne teče oziroma ni pripravljen"
 
-#: ../urpm/cdrom.pm:161 ../urpm/cdrom.pm:166
+#: ../urpm/cdrom.pm:162 ../urpm/cdrom.pm:167
 #, c-format
 msgid "medium \"%s\" is not available"
 msgstr "vir »%s« ni na voljo"
 
-#: ../urpm/cdrom.pm:205
+#: ../urpm/cdrom.pm:206
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "ni mogoče brati datoteke rpm [%s] iz vira \"%s\""
@@ -610,7 +610,7 @@ msgstr "ni moč brati nastavitvene datoteke [%s]"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "vir »%s« je naveden dvakrat, prekinjam"
 
-#: ../urpm/cfg.pm:251 ../urpm/media.pm:497 ../urpm/media.pm:503
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:477
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "ni mogoče napisati nastavitvene datoteke [%s]"
@@ -740,27 +740,27 @@ msgstr "ni programa za spletno pridobivanje, podprti so: %s\n"
 msgid "unable to handle protocol: %s"
 msgstr "ni mogoče obravnavati protokola: %s"
 
-#: ../urpm/get_pkgs.pm:15
+#: ../urpm/get_pkgs.pm:16
 #, c-format
 msgid "cleaning %s and %s"
 msgstr "čiščenje %s in %s"
 
-#: ../urpm/get_pkgs.pm:127
+#: ../urpm/get_pkgs.pm:128
 #, c-format
 msgid "package %s is not found."
 msgstr "paketa %s ni mogoče najti."
 
-#: ../urpm/get_pkgs.pm:213
+#: ../urpm/get_pkgs.pm:227
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "pridobivanje datotek rpm iz vira \"%s\" ..."
 
-#: ../urpm/install.pm:86
+#: ../urpm/install.pm:87
 #, c-format
 msgid "[repackaging]"
 msgstr "[ponovna gradnja paketa]"
 
-#: ../urpm/install.pm:167
+#: ../urpm/install.pm:168
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -768,67 +768,67 @@ msgstr ""
 "določeno je bilo opravilo za nameščanje na %s (odstrani=%d, namesti=%d, "
 "nadgradi=%d)"
 
-#: ../urpm/install.pm:170
+#: ../urpm/install.pm:171
 #, c-format
 msgid "unable to create transaction"
 msgstr "opravila ni mogoče izvesti"
 
-#: ../urpm/install.pm:193
+#: ../urpm/install.pm:196
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "ni mogoče izvleči paketa rpm iz paketa delta-rpm %s"
 
-#: ../urpm/install.pm:206
+#: ../urpm/install.pm:209
 #, c-format
 msgid "unable to install package %s"
 msgstr "ni mogoče namestiti paketa  %s"
 
-#: ../urpm/install.pm:209
+#: ../urpm/install.pm:212
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "odstranjevanje slabega rpm-ja (%s) iz %s"
 
-#: ../urpm/install.pm:210 ../urpm/install.pm:267
+#: ../urpm/install.pm:213 ../urpm/install.pm:277
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "odstranjevanje %s je spodletelo: %s"
 
-#: ../urpm/install.pm:248
+#: ../urpm/install.pm:258
 #, c-format
 msgid "Removing package %s"
 msgstr "Odstranjevanje paketa %s"
 
-#: ../urpm/install.pm:249
+#: ../urpm/install.pm:259
 #, c-format
 msgid "removing package %s"
 msgstr "odstranjevanje paketa %s"
 
-#: ../urpm/install.pm:265
+#: ../urpm/install.pm:275
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "odstranjevanje nameščenega rpm (%s) iz %s"
 
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:283
 #, c-format
 msgid "More information on package %s"
 msgstr "Več podatkov o paketu %s"
 
-#: ../urpm/ldap.pm:71
+#: ../urpm/ldap.pm:70
 #, c-format
 msgid "Cannot create ldap cache directory"
 msgstr "Ni moč ustvariti predpomnilniške mape za LDAP"
 
-#: ../urpm/ldap.pm:73
+#: ../urpm/ldap.pm:72
 #, c-format
 msgid "Cannot write cache file for ldap\n"
 msgstr "Ni moč zapisati predpomnilniške datoteke za LDAP\n"
 
-#: ../urpm/ldap.pm:162
+#: ../urpm/ldap.pm:161
 #, c-format
 msgid "No server defined, missing uri or host"
 msgstr "Strežnik ni naveden, manjka URI ali pa gostitelj"
 
-#: ../urpm/ldap.pm:163
+#: ../urpm/ldap.pm:162
 #, c-format
 msgid "No base defined"
 msgstr "Izhodišče ni navedeno"
@@ -838,17 +838,17 @@ msgstr "Izhodišče ni navedeno"
 msgid "Cannot connect to ldap uri:"
 msgstr "Ni se moč povezati z LDAP URI-jem:"
 
-#: ../urpm/lock.pm:62
+#: ../urpm/lock.pm:63
 #, c-format
 msgid "%s database is locked. Waiting..."
 msgstr "Podatkovna zbirka %s je zaklenjena, čakanje ..."
 
-#: ../urpm/lock.pm:63
+#: ../urpm/lock.pm:64
 #, c-format
 msgid "aborting"
 msgstr "prekinjam"
 
-#: ../urpm/lock.pm:65
+#: ../urpm/lock.pm:66
 #, c-format
 msgid "%s database is locked (another program is already using it)"
 msgstr "Podatkovna zbirka %s je zaklenjena (uporablja jo že nek drug program)"
@@ -858,18 +858,24 @@ msgstr "Podatkovna zbirka %s je zaklenjena (uporablja jo že nek drug program)"
 msgid "Retry?"
 msgstr "Poskusim znova?"
 
-#: ../urpm/main_loop.pm:119 ../urpm/main_loop.pm:129 ../urpm/main_loop.pm:163
-#: ../urpm/main_loop.pm:241 ../urpm/main_loop.pm:248
-#, c-format
-msgid "Installation failed"
-msgstr "Namestitev ni uspela"
+#: ../urpm/main_loop.pm:119
+#, fuzzy, c-format
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s"
+msgstr ""
+"Namestitev ni uspela, slabi rpm-ji:\n"
+"%s"
 
-#: ../urpm/main_loop.pm:121 ../urpm/main_loop.pm:131
-#, c-format
-msgid "Try to go on anyway?"
-msgstr "Ali želite vseeno nadaljevati?"
+#: ../urpm/main_loop.pm:121
+#, fuzzy, c-format
+msgid "You may want to update your urpmi database."
+msgstr ""
+"Namestitev ni uspela, ker manjkajo nekatere datoteke:\n"
+"%s\n"
+"Mogoče bi morali obnoviti podatkovno bazo urpmi"
 
-#: ../urpm/main_loop.pm:130
+#: ../urpm/main_loop.pm:124
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -878,109 +884,120 @@ msgstr ""
 "Namestitev ni uspela, slabi rpm-ji:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:148
+#: ../urpm/main_loop.pm:132 ../urpm/main_loop.pm:171 ../urpm/main_loop.pm:252
+#: ../urpm/main_loop.pm:259
+#, c-format
+msgid "Installation failed"
+msgstr "Namestitev ni uspela"
+
+#: ../urpm/main_loop.pm:133
+#, c-format
+msgid "Try to go on anyway?"
+msgstr "Ali želite vseeno nadaljevati?"
+
+#: ../urpm/main_loop.pm:156
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Sledeči paket ima slab podpis"
 
-#: ../urpm/main_loop.pm:149
+#: ../urpm/main_loop.pm:157
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Sledeči paketi imajo slabe podpise"
 
-#: ../urpm/main_loop.pm:150
+#: ../urpm/main_loop.pm:158
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ali želite nadaljevati namestitev?"
 
-#: ../urpm/main_loop.pm:167
+#: ../urpm/main_loop.pm:175
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "odstranjevanje nameščenih rpm-jev (%s)"
 
-#: ../urpm/main_loop.pm:187
+#: ../urpm/main_loop.pm:195
 #, c-format
 msgid "distributing %s"
 msgstr "porazdeljevanje %s"
 
-#: ../urpm/main_loop.pm:202
+#: ../urpm/main_loop.pm:210
 #, c-format
 msgid "installing %s from %s"
 msgstr "nameščanje %s iz %s"
 
-#: ../urpm/main_loop.pm:204
+#: ../urpm/main_loop.pm:212
 #, c-format
 msgid "installing %s"
 msgstr "nameščanje %s"
 
-#: ../urpm/main_loop.pm:242
+#: ../urpm/main_loop.pm:253
 #, c-format
 msgid "Try installation without checking dependencies?"
 msgstr "Poskusim z namestitvijo brez preverjanj odvisnosti?"
 
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:260
 #, c-format
 msgid "Try harder to install (--force)?"
 msgstr "Poskusim s prisilno namestitvijo (--force)?"
 
-#: ../urpm/main_loop.pm:288
+#: ../urpm/main_loop.pm:300
 #, c-format
 msgid "Packages are up to date"
 msgstr "Paketi so ažurni"
 
-#: ../urpm/main_loop.pm:299 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:311 ../urpm/parallel.pm:299
 #, c-format
 msgid "Installation is possible"
 msgstr "Namestitev je mogoča"
 
-#: ../urpm/md5sum.pm:26
+#: ../urpm/md5sum.pm:27
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "opozorilo: vsote MD5 za %s ni v datoteki MD5SUM"
 
-#: ../urpm/media.pm:204
+#: ../urpm/media.pm:194
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "navidezni vir \"%s\" mora imeti jasen url, vir je bil zato prezrt"
 
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:196
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr ""
 "ni mogoče dostopati do seznama datotek od \"%s\", vir je bil zato prezrt"
 
-#: ../urpm/media.pm:213
+#: ../urpm/media.pm:199
 #, c-format
 msgid "unable to access synthesis file of \"%s\", medium ignored"
 msgstr "ni moč dostopati do datoteke synthesis od »%s«, vir je bil zato prezrt"
 
-#: ../urpm/media.pm:240
+#: ../urpm/media.pm:225
 #, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr "poskušam obiti obstoječi vir, izpuščanje \"%s\""
 
-#: ../urpm/media.pm:456
+#: ../urpm/media.pm:441
 #, c-format
 msgid "failed to migrate removable device, ignoring media"
 msgstr "Migracija odstranljive naprave ni uspela. Vir bo spregledan."
 
-#: ../urpm/media.pm:499 ../urpm/media.pm:505
+#: ../urpm/media.pm:479
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "končano pisanje nastavitvene datoteke [%s]"
 
-#: ../urpm/media.pm:548
+#: ../urpm/media.pm:521
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Ni mogoče uporabiti vzporednega načina z načinom use-distrib"
 
 # kaj sploh je associated media?
-#: ../urpm/media.pm:556
+#: ../urpm/media.pm:529
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "uporaba združenega vira za vzporeden način: %s"
 
-#: ../urpm/media.pm:572
+#: ../urpm/media.pm:545
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -989,219 +1006,213 @@ msgstr ""
 "--synthesis ni mogoče uporabiti z --media, --excludemedia, --sortmedia, --"
 "update, --use-distrib ali --parallel"
 
-# barabe
-#: ../urpm/media.pm:666
-#, c-format
-msgid "Search start: %s end: %s"
-msgstr "Iskanje; začetek: %s konec: %s"
-
-#: ../urpm/media.pm:683
+#: ../urpm/media.pm:663
 #, c-format
 msgid "skipping package %s"
 msgstr "izpuščanje paketa %s"
 
-#: ../urpm/media.pm:699
+#: ../urpm/media.pm:679
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "bi namestilo namesto nadgradilo paket %s"
 
-#: ../urpm/media.pm:724
+#: ../urpm/media.pm:704
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "vir \"%s\" že obstaja"
 
-#: ../urpm/media.pm:763
+#: ../urpm/media.pm:743
 #, c-format
 msgid "(ignored by default)"
 msgstr "(privzeto se spregleda)"
 
-#: ../urpm/media.pm:769
+#: ../urpm/media.pm:749
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "dodajanje vira »%s« pred oddaljen vir »%s«"
 
-#: ../urpm/media.pm:775
+#: ../urpm/media.pm:755
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "dodajanje vira »%s«"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:784
 #, c-format
 msgid "directory %s does not exist"
 msgstr "Mapa %s ne obstaja"
 
-#: ../urpm/media.pm:812
+#: ../urpm/media.pm:792
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "izgleda, da ta lokacija ne vsebuje nobene distribucije"
 
-#: ../urpm/media.pm:828
+#: ../urpm/media.pm:808
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "ni mogoče razčleniti media.cfg"
 
-#: ../urpm/media.pm:831
+#: ../urpm/media.pm:811
 #, 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:849
+#: ../urpm/media.pm:829
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "spuščam nezdružljivi vir »%s« (za %s)"
 
-#: ../urpm/media.pm:900
+#: ../urpm/media.pm:880
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "pridobivanje datoteke cfg za vir"
 
-#: ../urpm/media.pm:941
+#: ../urpm/media.pm:921
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "poskušanje izbire neobstoječega vira \"%s\""
 
-#: ../urpm/media.pm:944
+#: ../urpm/media.pm:924
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "izbiranje več virov: %s"
 
-#: ../urpm/media.pm:964
+#: ../urpm/media.pm:944
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "odstranjevanje vira \"%s\""
 
-#: ../urpm/media.pm:1047
+#: ../urpm/media.pm:1027
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "ponovno nastavljanje urpmi za vir \"%s\""
 
-#: ../urpm/media.pm:1081
+#: ../urpm/media.pm:1061
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...ponovno nastavljanje je spodletelo"
 
-#: ../urpm/media.pm:1087
+#: ../urpm/media.pm:1067
 #, c-format
 msgid "reconfiguration done"
 msgstr "ponovno nastavljanje je končano"
 
-#: ../urpm/media.pm:1103
+#: ../urpm/media.pm:1083
 #, 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:1124
+#: ../urpm/media.pm:1104
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "vir »%s« je ažuren"
 
-#: ../urpm/media.pm:1135
+#: ../urpm/media.pm:1115
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "preverjanje synthesis datoteke [%s]"
 
-#: ../urpm/media.pm:1155
+#: ../urpm/media.pm:1135
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "težava pri branju synthesis datoteke vira \"%s\""
 
-#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1148 ../urpm/media.pm:1243
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "kopiranje [%s] za vir »%s« ..."
 
-#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
+#: ../urpm/media.pm:1150 ../urpm/media.pm:1220 ../urpm/media.pm:1473
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiranje je spodletelo"
 
-#: ../urpm/media.pm:1236
+#: ../urpm/media.pm:1216
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopiranje datoteke z opisi \"%s\"..."
 
-#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
+#: ../urpm/media.pm:1218 ../urpm/media.pm:1247
 #, c-format
 msgid "...copying done"
 msgstr "...kopiranje končano"
 
-#: ../urpm/media.pm:1269
+#: ../urpm/media.pm:1249
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopiranje [%s] je spodletelo (datoteka je sumljivo majhna)"
 
-#: ../urpm/media.pm:1317
+#: ../urpm/media.pm:1297
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "računanje md5sum izvorne datoteke synthesis"
 
-#: ../urpm/media.pm:1319 ../urpm/media.pm:1758
+#: ../urpm/media.pm:1299 ../urpm/media.pm:1736
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "pridobivanje [%s] je spodletelo (md5sum se ne ujema)"
 
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1314
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2 na [%s] je spodletel"
 
-#: ../urpm/media.pm:1344
+#: ../urpm/media.pm:1324
 #, c-format
 msgid "comparing %s and %s"
 msgstr "primerjanje %s in %s"
 
-#: ../urpm/media.pm:1374
+#: ../urpm/media.pm:1354
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "neveljavna datoteka hdlist %s za vir »%s«"
 
-#: ../urpm/media.pm:1400
+#: ../urpm/media.pm:1380
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "kopiranje datoteke MD5SUM od »%s« ..."
 
-#: ../urpm/media.pm:1440
+#: ../urpm/media.pm:1420
 #, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "neveljavna datoteka MD5SUM (prenešena z %s)"
 
-#: ../urpm/media.pm:1443
+#: ../urpm/media.pm:1423
 #, c-format
 msgid "no metadata found for medium \"%s\""
 msgstr "za vir »%s« ni bilo moč najti metapodatkov"
 
-#: ../urpm/media.pm:1475
+#: ../urpm/media.pm:1455
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "pridobivanje izvorne datoteke synthesis od »%s« ..."
 
-#: ../urpm/media.pm:1541
+#: ../urpm/media.pm:1521
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "preverjanje datoteke z javnimi ključi od \"%s\" ..."
 
-#: ../urpm/media.pm:1553
+#: ../urpm/media.pm:1533
 #, 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:1557
+#: ../urpm/media.pm:1537
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ni mogoče uvoziti javnega ključa od \"%s\""
 
-#: ../urpm/media.pm:1598
+#: ../urpm/media.pm:1578
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "ni bilo mogoče najti datoteke synthesis za vir »%s«"
 
-#: ../urpm/media.pm:1631
+#: ../urpm/media.pm:1611
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "vir »%s« je bil posodobljen"
 
-#: ../urpm/media.pm:1752
+#: ../urpm/media.pm:1730
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "pridobivanje [%s] je spodletelo"
@@ -1226,19 +1237,19 @@ msgstr "najdena geolokacija %s %.2f %.2f iz časovnega pasu %s"
 msgid "getting mirror list from %s"
 msgstr "pridobivanje seznama zrcalnih strežnikov od %s"
 
-#: ../urpm/msg.pm:76 ../urpmi:489 ../urpmi:504 ../urpmi:599
+#: ../urpm/msg.pm:76 ../urpmi:494 ../urpmi:509 ../urpmi:613
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:540 ../urpmi:635 ../urpmi:641
-#: ../urpmi.addmedia:141
+#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi:545 ../urpmi:649 ../urpmi:655
+#: ../urpmi.addmedia:132
 #, c-format
 msgid "Yy"
 msgstr "Dd"
 
-#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:144
+#: ../urpm/msg.pm:107 ../urpme:163 ../urpmi.addmedia:135
 #, c-format
 msgid " (y/N) "
 msgstr " (d/N) "
@@ -1308,14 +1319,19 @@ msgstr "GiB"
 msgid "TB"
 msgstr "TiB"
 
-#: ../urpm/orphans.pm:311
+#: ../urpm/orphans.pm:51
 #, c-format
+msgid "Marking %s as manually installed, it won't be auto-orphaned"
+msgstr ""
+
+#: ../urpm/orphans.pm:362
+#, fuzzy, c-format
 msgid ""
-"The following package is now orphan, use \"urpme --auto-orphans\" to remove "
-"it."
+"The following package is now orphan, if you wish to remove it, you can use "
+"\"urpme --auto-orphans\"."
 msgid_plural ""
-"The following packages are now orphans, use \"urpme --auto-orphans\" to "
-"remove them."
+"The following packages are now orphans, if you wish to remove them, you can "
+"use \"urpme --auto-orphans\"."
 msgstr[0] ""
 "Ta paket je osirotel, uporabite »urpme --auto-orphans« da ga odstranite."
 msgstr[1] ""
@@ -1325,33 +1341,33 @@ msgstr[2] ""
 msgstr[3] ""
 "Ti paketi so osiroteli, uporabite »urpme --auto-orphans« da jih odstranite."
 
-#: ../urpm/parallel.pm:14
+#: ../urpm/parallel.pm:15
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "ni mogoče razčleniti \"%s\" v datoteki [%s]"
 
 # handler? x3
-#: ../urpm/parallel.pm:23
+#: ../urpm/parallel.pm:24
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "preverjanje vzporednega upravljavca v datoteki [%s]"
 
-#: ../urpm/parallel.pm:34
+#: ../urpm/parallel.pm:35
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "najden je bil vzporedni upravljavec za vozlišča: %s"
 
-#: ../urpm/parallel.pm:38
+#: ../urpm/parallel.pm:39
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "ni mogoče uporabiti vzporedne izbire \"%s\""
 
-#: ../urpm/parallel.pm:93
+#: ../urpm/parallel.pm:94
 #, c-format
 msgid "on node %s"
 msgstr "na vozlišču %s"
 
-#: ../urpm/parallel.pm:293
+#: ../urpm/parallel.pm:294
 #, c-format
 msgid "Installation failed on node %s"
 msgstr "Na vozlišču %s namestitev ni bila uspešna"
@@ -1385,28 +1401,28 @@ msgstr ""
 "%s je spodletel pri gostitelju %s (mogoče nima prave različice urpmi?) "
 "(izhodna koda: %d)"
 
-#: ../urpm/removable.pm:32
+#: ../urpm/removable.pm:33
 #, c-format
 msgid "unable to access medium \"%s\"."
 msgstr "Ni moč dostopati do vira »%s«."
 
-#: ../urpm/removable.pm:72 ../urpm/removable.pm:90
+#: ../urpm/removable.pm:73 ../urpm/removable.pm:91
 #, c-format
 msgid "mounting %s"
 msgstr "priklapljanje %s"
 
-#: ../urpm/removable.pm:103
+#: ../urpm/removable.pm:104
 #, c-format
 msgid "unmounting %s"
 msgstr "odklapljanje %s"
 
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:31
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
 msgstr ""
 "urpmi se je ponovno zagnal in seznam prednostnih paketov se ni spremenil"
 
-#: ../urpm/select.pm:32
+#: ../urpm/select.pm:33
 #, c-format
 msgid ""
 "urpmi was restarted, and the list of priority packages did change: %s vs %s"
@@ -1414,64 +1430,64 @@ msgstr ""
 "urpmi se je ponovno zagnal in seznam prednostnih paketov se je spremenil: %s "
 "<-> %s"
 
-#: ../urpm/select.pm:170
+#: ../urpm/select.pm:176
 #, c-format
 msgid "No package named %s"
 msgstr "Ni paketa poimenovanega %s"
 
-#: ../urpm/select.pm:172 ../urpme:117
+#: ../urpm/select.pm:178 ../urpme:117
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Sledeči paketi vsebujejo %s: %s"
 
-#: ../urpm/select.pm:174
+#: ../urpm/select.pm:180
 #, c-format
 msgid "You should use \"-a\" to use all of them"
 msgstr "Da izberete vse, uporabite »-a«"
 
-#: ../urpm/select.pm:294
+#: ../urpm/select.pm:298
 #, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr ""
 "v zbirki podatkov za urpmi so bili najdeni paketi %s , a ni noben nameščen"
 
-#: ../urpm/select.pm:537
+#: ../urpm/select.pm:545
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Paket %s je že nameščen"
 
-#: ../urpm/select.pm:538
+#: ../urpm/select.pm:546
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Paketi %s so že nameščeni"
 
-#: ../urpm/select.pm:556 ../urpm/select.pm:640
+#: ../urpm/select.pm:564 ../urpm/select.pm:648
 #, c-format
 msgid "due to missing %s"
 msgstr "zaradi manjkajočega %s"
 
-#: ../urpm/select.pm:557
+#: ../urpm/select.pm:565
 #, c-format
 msgid "due to already installed %s"
 msgstr "zaradi že nameščenega %s"
 
-#: ../urpm/select.pm:558 ../urpm/select.pm:638
+#: ../urpm/select.pm:566 ../urpm/select.pm:646
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "zaradi nezadovoljstva %s"
 
 # promote vzet kot renice
-#: ../urpm/select.pm:564
+#: ../urpm/select.pm:572
 #, c-format
 msgid "trying to promote %s"
 msgstr "poskus podpiranja %s"
 
-#: ../urpm/select.pm:565
+#: ../urpm/select.pm:573
 #, c-format
 msgid "in order to keep %s"
 msgstr "za ohranitev %s"
 
-#: ../urpm/select.pm:606
+#: ../urpm/select.pm:614
 #, c-format
 msgid ""
 "The following package has to be removed for others to be upgraded:\n"
@@ -1480,7 +1496,7 @@ msgstr ""
 "Sledeči paket mora biti odstranjen, da bodo drugi lahko nadgrajeni:\n"
 "%s"
 
-#: ../urpm/select.pm:607
+#: ../urpm/select.pm:615
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1489,27 +1505,27 @@ msgstr ""
 "Sledeči paketi morajo biti odstranjeni, da bodo drugi lahko nadgrajeni:\n"
 "%s"
 
-#: ../urpm/select.pm:634
+#: ../urpm/select.pm:642
 #, c-format
 msgid "in order to install %s"
 msgstr "za namestitev %s"
 
-#: ../urpm/select.pm:644
+#: ../urpm/select.pm:652
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "zaradi konfliktov z/s %s"
 
-#: ../urpm/signature.pm:32
+#: ../urpm/signature.pm:33
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Neveljaven podpis (%s)"
 
-#: ../urpm/signature.pm:63
+#: ../urpm/signature.pm:64
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Neveljaven ID ključa (%s)"
 
-#: ../urpm/signature.pm:65
+#: ../urpm/signature.pm:66
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Manjkajoč podpis (%s)"
@@ -1588,7 +1604,7 @@ msgstr ""
 "  --root         - uporabi drug korenski imenik za odstranitev paketov rpm.\n"
 
 #: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:72
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
+#: ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
 #, c-format
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr ""
@@ -2349,42 +2365,42 @@ msgstr ""
 "Uporabite --allow-force, da prisilite izvedbo operacije."
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:423
+#: ../urpmi:428
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (za nadgradnjo)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:425
+#: ../urpmi:430
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (za nadgradnjo)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:429
+#: ../urpmi:434
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (za namestitev)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:431
+#: ../urpmi:436
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (za namestitev)"
 
-#: ../urpmi:437
+#: ../urpmi:442
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "Za zadovoljitev odvisnosti »%s« je potreben en izmed sledečih paketov:"
 
-#: ../urpmi:440
+#: ../urpmi:445
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Kakšna je vaša izbira? (1-%d) "
 
-#: ../urpmi:482
+#: ../urpmi:487
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2395,7 +2411,7 @@ msgstr ""
 "odvisni od paketov, ki so starejši od že nameščenih:\n"
 "%s"
 
-#: ../urpmi:484
+#: ../urpmi:489
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2406,7 +2422,7 @@ msgstr ""
 "ki so starejši od nameščenih.\n"
 "%s"
 
-#: ../urpmi:490 ../urpmi:505
+#: ../urpmi:495 ../urpmi:510
 #, c-format
 msgid ""
 "\n"
@@ -2415,12 +2431,12 @@ msgstr ""
 "\n"
 "Vseeno nadaljujem z namestitvijo?"
 
-#: ../urpmi:491 ../urpmi:506 ../urpmi:600 ../urpmi.addmedia:144
+#: ../urpmi:496 ../urpmi:511 ../urpmi:614 ../urpmi.addmedia:135
 #, c-format
 msgid " (Y/n) "
 msgstr " (D/n) "
 
-#: ../urpmi:499
+#: ../urpmi:504
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2429,7 +2445,7 @@ msgstr ""
 "Zahtevanega paketa ni moč namestiti:\n"
 "%s"
 
-#: ../urpmi:500
+#: ../urpmi:505
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2438,12 +2454,12 @@ msgstr ""
 "Nekateri zahtevani paketi ne morejo biti nameščeni:\n"
 "%s"
 
-#: ../urpmi:517
+#: ../urpmi:522
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "odstranitev paketa %s bo zrušilo vaš sistem"
 
-#: ../urpmi:525
+#: ../urpmi:530
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2454,7 +2470,7 @@ msgstr ""
 "sledeče pakete, da bodo drugi lahko nadgrajeni:\n"
 "%s\n"
 
-#: ../urpmi:527
+#: ../urpmi:532
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2465,12 +2481,12 @@ msgstr ""
 "sledeče pakete, da bodo drugi lahko nadgrajeni:\n"
 "%s\n"
 
-#: ../urpmi:535
+#: ../urpmi:540
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(samo test, brisanje se ne bo izvedlo)"
 
-#: ../urpmi:555
+#: ../urpmi:560
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2481,7 +2497,7 @@ msgstr ""
 "buildrequires:\n"
 "%s\n"
 
-#: ../urpmi:566
+#: ../urpmi:571
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2490,27 +2506,27 @@ msgstr[1] "Naslednja osirotela paketa bosta odstranjena."
 msgstr[2] "Naslednji osiroteli paketi bodo odstranjeni."
 msgstr[3] "Naslednji osiroteli paketi bodo odstranjeni."
 
-#: ../urpmi:582
+#: ../urpmi:596
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(samo test, namestitev se ne bo izvedla)"
 
-#: ../urpmi:588
+#: ../urpmi:602
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Uporabljenega bo %s dodatnega prostora na disku."
 
-#: ../urpmi:589
+#: ../urpmi:603
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Sproščenega bo %s prostora na disku."
 
-#: ../urpmi:590
+#: ../urpmi:604
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "Prenesenih bo %s paketov."
 
-#: ../urpmi:591
+#: ../urpmi:605
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
@@ -2519,12 +2535,12 @@ msgstr[1] "Nadaljujem z namestitvijo %d paketov?"
 msgstr[2] "Nadaljujem z namestitvijo %d paketov?"
 msgstr[3] "Nadaljujem z namestitvijo %d paketov?"
 
-#: ../urpmi:612
+#: ../urpmi:626
 #, c-format
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: ../urpmi:620
+#: ../urpmi:634
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Pritisnite Enter, ko bo priklopljeno ..."
@@ -2649,79 +2665,70 @@ msgstr "  --all-media    - with --distrib, dodaj vse naštete vire\n"
 
 #: ../urpmi.addmedia:77
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr ""
-"  --from         - uporabi podan url za seznam zrcalnih mest, privzeto je\n"
-"                   %s\n"
-
-#: ../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:80 ../urpmi.update:44
+#: ../urpmi.addmedia:78 ../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:81
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - ne uvozi javnega ključa dodanih virov\n"
 
-#: ../urpmi.addmedia:82
+#: ../urpmi.addmedia:80
 #, 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:83 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:81 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - tihi način.\n"
 
-#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:82 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - zgovoren način.\n"
 
-#: ../urpmi.addmedia:104
+#: ../urpmi.addmedia:95
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "znani načini za xml-info so %s"
 
-#: ../urpmi.addmedia:115
+#: ../urpmi.addmedia:106
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "za --distrib --mirrorlist <url> ni potreben noben argument"
 
-#: ../urpmi.addmedia:120
+#: ../urpmi.addmedia:111
 #, 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:124
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "Samo root uporabnik lahko dodaja vire"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:118
 #, c-format
 msgid "creating config file [%s]"
 msgstr "ustvarjanje nastavitvene datoteke [%s]"
 
-#: ../urpmi.addmedia:128
+#: ../urpmi.addmedia:119
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "Ni mogoče ustvariti nastavitvene datoteke [%s]"
 
-#: ../urpmi.addmedia:136
+#: ../urpmi.addmedia:127
 #, 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:144
+#: ../urpmi.addmedia:135
 #, c-format
 msgid ""
 "\n"
@@ -2730,165 +2737,20 @@ msgstr ""
 "\n"
 "Ali želite dodati vir '%s'?"
 
-#: ../urpmi.addmedia:170
-#, c-format
-msgid "<relative path of synthesis> missing\n"
-msgstr "manjka <relativna pot do synthesis>\n"
-
-#: ../urpmi.addmedia:173
-#, c-format
-msgid "Can't use %s with remote medium"
-msgstr "Ni moč uporabiti %s z oddaljenim virom"
-
-#: ../urpmi.addmedia:185
+#: ../urpmi.addmedia:153 ../urpmi.addmedia:176
 #, c-format
 msgid "unable to add medium"
 msgstr "ni moč dodati vira"
 
-#: ../urpmi.recover:28
-#, c-format
-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"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmi.recover različica %s\n"
-"Avtorske pravice (C) 1999-2008 Mandriva.\n"
-"To je prosta programska oprema in se sme razmnoževati pod dovoljenjem GNU "
-"GPL\n"
-"\n"
-"uporaba:\n"
-
-#: ../urpmi.recover:34
-#, c-format
-msgid "  --checkpoint   - set repackaging start now\n"
-msgstr " --checkpoint   - določite pričetek ponovne izgradnje paketov\n"
-
-#: ../urpmi.recover:35
-#, c-format
-msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
-msgstr "  --noclean      - ne počisti mape za ponovno izgradnjo paketov.\n"
-
-#: ../urpmi.recover:37
+#: ../urpmi.addmedia:161
 #, c-format
-msgid ""
-"  --list         - list transactions since provided date/duration argument\n"
-msgstr "  --list         - prikaži čas in trajanje vseh izvedenih opravil\n"
-
-#: ../urpmi.recover:38
-#, c-format
-msgid "  --list-all     - list all transactions in rpmdb (long)\n"
-msgstr ""
-"  --list-all     - prikaži vsa izvedena opravila v rpmdb (dolga oblika)\n"
-
-#: ../urpmi.recover:39
-#, c-format
-msgid "  --list-safe    - list transactions since checkpoint\n"
-msgstr ""
-"  --list-safe    - prikaži seznam izvedenih opravil od ponovne izgradnje "
-"paketov naprej\n"
-
-#: ../urpmi.recover:40
-#, c-format
-msgid ""
-"  --rollback     - rollback until specified date,\n"
-"                   or rollback the specified number of transactions\n"
-msgstr ""
-"  --rollback     - povrni v stanje pred določenim datumom,\n"
-"                   ali določenim številom izvedenih opravil\n"
-
-#: ../urpmi.recover:42
-#, c-format
-msgid "  --disable      - turn off repackaging\n"
-msgstr "  --disable      - onemogoči ponovno izgradnjo paketov\n"
-
-#: ../urpmi.recover:57
-#, c-format
-msgid "Invalid date or duration [%s]\n"
-msgstr "Neveljaven datum oziroma trajanje [%s]\n"
-
-#: ../urpmi.recover:65
-#, c-format
-msgid "Repackage directory not defined\n"
-msgstr "Imenik za ponovno izgradnjo paketov ni določen.\n"
-
-#: ../urpmi.recover:68
-#, c-format
-msgid "Can't write to repackage directory [%s]\n"
-msgstr "V imenik za ponovno izgradnjo paketov ni mogoče pisati.[%s]\n"
-
-#: ../urpmi.recover:70
-#, c-format
-msgid "Cleaning up repackage directory [%s]...\n"
-msgstr "Čiščenje imenika za ponovno izgradnjo paketov [%s]...\n"
-
-#: ../urpmi.recover:72
-#, c-format
-msgid "%d file removed\n"
-msgid_plural "%d files removed\n"
-msgstr[0] "Odstranjena %d datoteka\n"
-msgstr[1] "Odstranjeni %d datoteki\n"
-msgstr[2] "Odstranjene %d datoteke\n"
-msgstr[3] "Odstranjenih %d datotek\n"
-
-#: ../urpmi.recover:82
-#, c-format
-msgid "Spurious command-line arguments [%s]\n"
-msgstr "Napačni argumenti ukazne vrstice[%s]\n"
-
-#: ../urpmi.recover:84
-#, c-format
-msgid "You can't specify --checkpoint and --rollback at the same time\n"
-msgstr ""
-"Ne morete hkrati izbrati --ponovne izgradnje paketov in --obnove sistema\n"
-
-#: ../urpmi.recover:86
-#, c-format
-msgid "You can't specify --checkpoint and --list at the same time\n"
-msgstr "Ne morete hkrati izbrati --ponovne izgradnje paketov in --seznama\n"
-
-#: ../urpmi.recover:88
-#, c-format
-msgid "You can't specify --rollback and --list at the same time\n"
-msgstr "Ne morete hkrati izbrati --obnove sistema in --seznama\n"
-
-#: ../urpmi.recover:90
-#, c-format
-msgid "You can't specify --disable along with another option"
-msgstr "Ne morete izbrati --onemogoči skupaj z drugo opcijo"
-
-#: ../urpmi.recover:115
-#, c-format
-msgid "No transaction found since %s\n"
-msgstr "Od %s ni bilo izvedeno nobeno opravilo\n"
-
-#: ../urpmi.recover:130
-#, c-format
-msgid "You must be superuser to do this"
-msgstr "Za dejanje morate biti prijavljeni kot uporabnik root "
-
-#: ../urpmi.recover:143 ../urpmi.recover:209
-#, c-format
-msgid "Writing rpm macros file [%s]...\n"
-msgstr "Pridobivanje datoteke rpm [%s] ...\n"
-
-#: ../urpmi.recover:185
-#, c-format
-msgid "No rollback date found\n"
-msgstr "Datuma obnove sistema ni mogoče najti\n"
-
-#: ../urpmi.recover:188
-#, c-format
-msgid "Rollback until %s...\n"
-msgstr "Obnovitev sistema na %s...\n"
+msgid "<relative path of synthesis> missing\n"
+msgstr "manjka <relativna pot do synthesis>\n"
 
-#: ../urpmi.recover:195
+#: ../urpmi.addmedia:164
 #, c-format
-msgid "Disabling repackaging\n"
-msgstr "Onemogočanje ponovne izgradnje paketov\n"
+msgid "Can't use %s with remote medium"
+msgstr "Ni moč uporabiti %s z oddaljenim virom"
 
 #: ../urpmi.removemedia:38
 #, c-format
@@ -2985,14 +2847,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:82
+#: ../urpmi.update:86
 #, 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:91
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -3001,17 +2863,17 @@ msgstr ""
 "manjka vnos za posodobitev\n"
 "(eden od %s)\n"
 
-#: ../urpmi.update:106
+#: ../urpmi.update:98
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
 
-#: ../urpmi.update:107
+#: ../urpmi.update:99
 #, c-format
 msgid "ignoring media %s"
 msgstr "onemogočanje vira %s"
 
-#: ../urpmi.update:107
+#: ../urpmi.update:99
 #, c-format
 msgid "enabling media %s"
 msgstr "omogočanje vira %s"
@@ -3304,11 +3166,121 @@ msgstr ""
 "za vir »%s« ni podatkov v obliki XML, ni moč vrniti nobenega rezultata za "
 "pakete %s"
 
-#: ../urpmq:473
+#: ../urpmq:476
 #, c-format
 msgid "No changelog found\n"
 msgstr "Dnevnik sprememb ni bil najden\n"
 
+# barabe
+#~ msgid "Search start: %s end: %s"
+#~ msgstr "Iskanje; začetek: %s konec: %s"
+
+#~ msgid ""
+#~ "  --from         - use specified url for list of mirrors, the default is\n"
+#~ "                   %s\n"
+#~ msgstr ""
+#~ "  --from         - uporabi podan url za seznam zrcalnih mest, privzeto "
+#~ "je\n"
+#~ "                   %s\n"
+
+#~ 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"
+#~ "\n"
+#~ "usage:\n"
+#~ msgstr ""
+#~ "urpmi.recover različica %s\n"
+#~ "Avtorske pravice (C) 1999-2008 Mandriva.\n"
+#~ "To je prosta programska oprema in se sme razmnoževati pod dovoljenjem GNU "
+#~ "GPL\n"
+#~ "\n"
+#~ "uporaba:\n"
+
+#~ msgid "  --checkpoint   - set repackaging start now\n"
+#~ msgstr " --checkpoint   - določite pričetek ponovne izgradnje paketov\n"
+
+#~ msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
+#~ msgstr "  --noclean      - ne počisti mape za ponovno izgradnjo paketov.\n"
+
+#~ msgid ""
+#~ "  --list         - list transactions since provided date/duration "
+#~ "argument\n"
+#~ msgstr "  --list         - prikaži čas in trajanje vseh izvedenih opravil\n"
+
+#~ msgid "  --list-all     - list all transactions in rpmdb (long)\n"
+#~ msgstr ""
+#~ "  --list-all     - prikaži vsa izvedena opravila v rpmdb (dolga oblika)\n"
+
+#~ msgid "  --list-safe    - list transactions since checkpoint\n"
+#~ msgstr ""
+#~ "  --list-safe    - prikaži seznam izvedenih opravil od ponovne izgradnje "
+#~ "paketov naprej\n"
+
+#~ msgid ""
+#~ "  --rollback     - rollback until specified date,\n"
+#~ "                   or rollback the specified number of transactions\n"
+#~ msgstr ""
+#~ "  --rollback     - povrni v stanje pred določenim datumom,\n"
+#~ "                   ali določenim številom izvedenih opravil\n"
+
+#~ msgid "  --disable      - turn off repackaging\n"
+#~ msgstr "  --disable      - onemogoči ponovno izgradnjo paketov\n"
+
+#~ msgid "Invalid date or duration [%s]\n"
+#~ msgstr "Neveljaven datum oziroma trajanje [%s]\n"
+
+#~ msgid "Repackage directory not defined\n"
+#~ msgstr "Imenik za ponovno izgradnjo paketov ni določen.\n"
+
+#~ msgid "Can't write to repackage directory [%s]\n"
+#~ msgstr "V imenik za ponovno izgradnjo paketov ni mogoče pisati.[%s]\n"
+
+#~ msgid "Cleaning up repackage directory [%s]...\n"
+#~ msgstr "Čiščenje imenika za ponovno izgradnjo paketov [%s]...\n"
+
+#~ msgid "%d file removed\n"
+#~ msgid_plural "%d files removed\n"
+#~ msgstr[0] "Odstranjena %d datoteka\n"
+#~ msgstr[1] "Odstranjeni %d datoteki\n"
+#~ msgstr[2] "Odstranjene %d datoteke\n"
+#~ msgstr[3] "Odstranjenih %d datotek\n"
+
+#~ msgid "Spurious command-line arguments [%s]\n"
+#~ msgstr "Napačni argumenti ukazne vrstice[%s]\n"
+
+#~ msgid "You can't specify --checkpoint and --rollback at the same time\n"
+#~ msgstr ""
+#~ "Ne morete hkrati izbrati --ponovne izgradnje paketov in --obnove sistema\n"
+
+#~ msgid "You can't specify --checkpoint and --list at the same time\n"
+#~ msgstr "Ne morete hkrati izbrati --ponovne izgradnje paketov in --seznama\n"
+
+#~ msgid "You can't specify --rollback and --list at the same time\n"
+#~ msgstr "Ne morete hkrati izbrati --obnove sistema in --seznama\n"
+
+#~ msgid "You can't specify --disable along with another option"
+#~ msgstr "Ne morete izbrati --onemogoči skupaj z drugo opcijo"
+
+#~ msgid "No transaction found since %s\n"
+#~ msgstr "Od %s ni bilo izvedeno nobeno opravilo\n"
+
+#~ msgid "You must be superuser to do this"
+#~ msgstr "Za dejanje morate biti prijavljeni kot uporabnik root "
+
+#~ msgid "Writing rpm macros file [%s]...\n"
+#~ msgstr "Pridobivanje datoteke rpm [%s] ...\n"
+
+#~ msgid "No rollback date found\n"
+#~ msgstr "Datuma obnove sistema ni mogoče najti\n"
+
+#~ msgid "Rollback until %s...\n"
+#~ msgstr "Obnovitev sistema na %s...\n"
+
+#~ msgid "Disabling repackaging\n"
+#~ msgstr "Onemogočanje ponovne izgradnje paketov\n"
+
 #~ msgid "Updating media...\n"
 #~ msgstr "Posodabljanje vira ...\n"