sync with code

1 files changed, 421 insertions, 344 deletions

diff --git a/po/sl.po b/po/sl.po
index a8e1b528..7f37426e 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-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
 "PO-Revision-Date: 2008-09-22 16:13+0200\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -25,8 +25,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 0.3\n"
-"Plural-Forms:  nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 "
-": 3);\n"
+"Plural-Forms:  nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
+"n%100==4 ? 2 : 3);\n"
 
 #: ../gurpmi:31 ../gurpmi2:74
 #, c-format
@@ -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:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
 #, c-format
 msgid "_Ok"
 msgstr "V _redu"
@@ -104,7 +104,7 @@ msgstr "_Namesti"
 msgid "_Save"
 msgstr "_Shrani"
 
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
 #, c-format
 msgid "_Cancel"
 msgstr "_Prekliči"
@@ -136,9 +136,8 @@ msgstr ""
 msgid "Options:"
 msgstr "Možnosti:"
 
-#: ../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
+#: ../gurpmi.pm:46 ../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"
@@ -154,13 +153,16 @@ msgstr ""
 
 #: ../gurpmi.pm:48 ../urpmi:80 ../urpmq:52
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - samodejna izbira paketov za nadgraditev sistema.\n"
 
 #: ../gurpmi.pm:49 ../urpme:50 ../urpmi:103 ../urpmq:66
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - prisili v dejanje celo, če nekateri paketi ne obstajajo.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr ""
+"  --force        - prisili v dejanje celo, če nekateri paketi ne obstajajo.\n"
 
 #: ../gurpmi.pm:50 ../urpmi:133
 #, c-format
@@ -171,17 +173,17 @@ msgstr ""
 "  --verify-rpm   - preveri podpis paketa rpm pred namestitvijo\n"
 "                   (--no-verify-rpm to onemogoči, privzeto je omogočeno).\n"
 
-#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../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"
 
-#: ../gurpmi.pm:53 ../urpmi:149
+#: ../gurpmi.pm:53 ../urpmi:150
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - dovoli iskanje v polju provides za najdbo paketa.\n"
 
-#: ../gurpmi.pm:54 ../urpmi:150
+#: ../gurpmi.pm:54 ../urpmi:151
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - ne išči v polju provides da za najdbo paketa.\n"
@@ -189,19 +191,23 @@ msgstr "  -P             - ne išči v polju provides da za najdbo paketa.\n"
 #: ../gurpmi.pm:55 ../urpmi:110 ../urpmq:69
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
-msgstr "  --root         - uporabi drug korenski imenik za namestitev paketov rpm.\n"
+msgstr ""
+"  --root         - uporabi drug korenski imenik za namestitev paketov rpm.\n"
 
 #: ../gurpmi.pm:56 ../urpmi:135
 #, c-format
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
-msgstr "  --test         - samo preveri, če je namestitev lahko pravilno izvedena.\n"
+msgstr ""
+"  --test         - samo preveri, če je namestitev lahko pravilno izvedena.\n"
 
 #: ../gurpmi.pm:57 ../urpmi:76
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested packages.\n"
-msgstr "  --searchmedia   - uporabi samo podane vire za iskanje zahtevanih paketov.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested packages.\n"
+msgstr ""
+"  --searchmedia   - uporabi samo podane vire za iskanje zahtevanih paketov.\n"
 
 #: ../gurpmi.pm:100
 #, c-format
@@ -218,7 +224,22 @@ msgstr "Prosim počakajte ..."
 msgid "Must be root"
 msgstr "Morate biti uporabnik root"
 
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "porazdeljevanje %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Namestitev paketov ..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Namestitev paketov ..."
+
+#: ../gurpmi2:111
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -234,37 +255,37 @@ msgstr ""
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
 #, c-format
 msgid "Ok"
 msgstr "V redu"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:170
 #, c-format
 msgid " (to upgrade)"
 msgstr " (za nadgradnjo)"
 
-#: ../gurpmi2:172
+#: ../gurpmi2:171
 #, c-format
 msgid " (to install)"
 msgstr " (za namestitev)"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:174
 #, c-format
 msgid "Package choice"
 msgstr "Izbira paketov"
 
-#: ../gurpmi2:176
+#: ../gurpmi2:175
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Potreben je eden od sledečih paketov:"
 
-#: ../gurpmi2:200
+#: ../gurpmi2:199
 #, c-format
 msgid "_Abort"
 msgstr "_Prekini"
 
-#: ../gurpmi2:222
+#: ../gurpmi2:221
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -275,17 +296,19 @@ msgstr ""
 "%s\n"
 "Naj se namestitev vseeno nadaljuje?"
 
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
 #, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
 msgstr "Za zadovoljitev odvisnosti bo nameščen naslednji paket:"
 
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
 #, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Za zadovoljitev odvisnosti bodo nameščeni naslednji paketi:"
 
-#: ../gurpmi2:244
+#: ../gurpmi2:243
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -294,42 +317,37 @@ msgstr[1] "(%d paketa, %d MiB)"
 msgstr[2] "(%d paketi, %d MiB)"
 msgstr[3] "(%d paketov, %d MiB)"
 
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Namestitev paketov ..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../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:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
 #, c-format
 msgid "Preparing..."
 msgstr "Priprava ..."
 
-#: ../gurpmi2:270
+#: ../gurpmi2:269
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Nameščanje paketa `%s' (%s/%s)..."
 
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Prosim vstavite nosilec imenovan »%s«"
 
-#: ../gurpmi2:298
+#: ../gurpmi2:297
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Pobiranje paketa `%s'..."
 
-#: ../gurpmi2:324
+#: ../gurpmi2:323
 #, c-format
 msgid "_Done"
 msgstr "_Končano"
 
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -340,28 +358,28 @@ msgstr ""
 "%s\n"
 "Mogoče bi morali obnoviti podatkovno bazo urpmi"
 
-#: ../gurpmi2:338 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
-#: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
+#: ../gurpmi2:337 ../urpm/main_loop.pm:226 ../urpm/main_loop.pm:244
+#: ../urpm/main_loop.pm:262 ../urpm/main_loop.pm:289
 #, c-format
 msgid "Installation failed:"
 msgstr "Namestitev ni uspela:"
 
-#: ../gurpmi2:343
+#: ../gurpmi2:342
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Paketi so že nameščeni"
 
-#: ../gurpmi2:345
+#: ../gurpmi2:344
 #, c-format
 msgid "Installation finished"
 msgstr "Namestitev je končana"
 
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "odstranjevanje %s"
 
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
 #, c-format
 msgid "restarting urpmi"
 msgstr "ponovno zaganjanje urpmi"
@@ -401,7 +419,7 @@ msgstr "                    privzeto je %s.\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -f             - izpiši polno ime rpm-ja (NVRA)\n"
 
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Samo uporabniku root je dovoljeno nameščati pakete"
@@ -411,130 +429,144 @@ msgstr "Samo uporabniku root je dovoljeno nameščati pakete"
 msgid "Running urpmi in restricted mode..."
 msgstr "Poganjanje urpmi v omejenem načinu ..."
 
-#: ../urpm.pm:111
+#: ../urpm.pm:112
 #, c-format
 msgid "fail to create directory %s"
 msgstr "Ustvarjanje mape %s je spodletelo"
 
-#: ../urpm.pm:112
+#: ../urpm.pm:113
 #, c-format
 msgid "invalid owner for directory %s"
 msgstr "Neveljaven lastnik mape %s"
 
-#: ../urpm.pm:124, c-format
+#: ../urpm.pm:125
+#, c-format
 msgid "Can not download packages into %s"
 msgstr "V imenik %s ni mogoče prenašati paketov"
 
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "Mapa %s ne obstaja"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "uporabljam specifično okolje pri %s\n"
+
+#: ../urpm.pm:305
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "ni mogoče odpreti rpmdb"
 
-#: ../urpm.pm:288
+#: ../urpm.pm:319
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "napačno ime datoteke rpm [%s]"
 
-#: ../urpm.pm:294
+#: ../urpm.pm:325
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "pridobivanje datoteke rpm [%s] ..."
 
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
 #, c-format
 msgid "...retrieving done"
 msgstr "...pridobivanje je končano"
 
-#: ../urpm.pm:299 ../urpm/download.pm:731 ../urpm/get_pkgs.pm:219
-#: ../urpm/media.pm:836 ../urpm/media.pm:1287 ../urpm/media.pm:1432
-#: ../urpm/media.pm:1486
+#: ../urpm.pm:330 ../urpm/download.pm:777 ../urpm/get_pkgs.pm:219
+#: ../urpm/media.pm:830 ../urpm/media.pm:1291 ../urpm/media.pm:1442
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...pridobivanje je spodletelo: %s"
 
-#: ../urpm.pm:304
+#: ../urpm.pm:335
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ni mogoče dostopati do datoteke rpm [%s]"
 
-#: ../urpm.pm:309
+#: ../urpm.pm:340
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "ni mogoče razčleniti  %s [%s]"
 
-#: ../urpm.pm:317
+#: ../urpm.pm:348
 #, c-format
 msgid "unable to register rpm file"
 msgstr "ni mogoče registrirati datoteke rpm"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:350
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Zgradba paketa ni združljiva z rpm [%s]"
 
-#: ../urpm.pm:323
+#: ../urpm.pm:354
 #, c-format
 msgid "error registering local packages"
 msgstr "napaka pri registraciji krajevnih paketov"
 
-#: ../urpm.pm:410
+#: ../urpm.pm:441
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Ta postopek ni dovoljen v omejenem načinu"
 
-#: ../urpm/args.pm:145 ../urpm/args.pm:154
+#: ../urpm/args.pm:152 ../urpm/args.pm:161
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "napačna deklaracija posrednika v ukazni vrstici\n"
 
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: ni mogoče brati datoteke rpm \"%s\"\n"
 
-#: ../urpm/args.pm:375, c-format
+#: ../urpm/args.pm:383
+#, c-format
 msgid "unexpected expression %s"
 msgstr "nepričakovan izraz %s"
 
-#: ../urpm/args.pm:376, c-format
+#: ../urpm/args.pm:384
+#, c-format
 msgid "missing expression before %s"
 msgstr "manjkajoč izraz pred %s"
 
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "nepričakovan izraz %s (predlog: uporabite  -a ali -o ?)"
 
-#: ../urpm/args.pm:386, c-format
+#: ../urpm/args.pm:394
+#, c-format
 msgid "no expression to close"
 msgstr "ni izraza za zaprtje"
 
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
 #, 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«"
+msgstr ""
+"Privzeto urpmf pričakuje regularni izraz. Uporabiti bi morali »--literal«"
 
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "mapa za chroot ne obstaja"
 
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "Ni moč uporabiti %s brez %s"
 
-#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
+#: ../urpm/args.pm:497 ../urpm/args.pm:500 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Ni moč uporabiti %s z %s"
 
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Prveč argumentov\n"
 
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
 #, c-format
 msgid "Copying failed"
 msgstr "Kopiranje je spodletelo"
@@ -583,122 +615,122 @@ msgstr "vir »%s« je naveden dvakrat, prekinjam"
 msgid "unable to write config file [%s]"
 msgstr "ni mogoče napisati nastavitvene datoteke [%s]"
 
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s ni na voljo, vrnitev na %s"
+
+#: ../urpm/download.pm:157
 #, c-format
 msgid "can not read proxy settings (not enough rights to read %s)"
 msgstr "ni moč prebrati nastavitev posrednika (ni dovolj pravic za branje %s)"
 
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
 #, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Prosim vnesite podatke za dostop do posrednika (proxyja)\n"
 
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
 #, c-format
 msgid "User name:"
 msgstr "Ime uporabnika:"
 
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
 #, c-format
 msgid "Password:"
 msgstr "Geslo:"
 
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
 #, c-format
 msgid "Unknown webfetch `%s' !!!\n"
 msgstr "neznan program za prenos »%s«!\n"
 
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
 #, c-format
 msgid "%s failed: exited with signal %d"
 msgstr "%s je spodletelo: izhod s signalom %d"
 
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
 #, c-format
 msgid "%s failed: exited with %d"
 msgstr "%s je spodletelo: izhod z %d"
 
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
 #, c-format
 msgid "copy failed"
 msgstr "kopiranje je spodletelo"
 
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
 #, c-format
 msgid "wget is missing\n"
 msgstr "manjka wget\n"
 
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
 #, c-format
 msgid "curl is missing\n"
 msgstr "manjka curl\n"
 
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl je spodletelo: prenos preklican\n"
 
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
 #, c-format
 msgid "rsync is missing\n"
 msgstr "manjka rsync\n"
 
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
 #, c-format
 msgid "ssh is missing\n"
 msgstr "manjka ssh\n"
 
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "manjka prozilla\n"
 
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "ni bilo moč zagnati prozilla\n"
 
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "manjka aria2\n"
 
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        %s%% od %s preneseno, do konca = %s, hitrost = %s"
 
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% preneseno, hitrost = %s"
 
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
 #, c-format
 msgid "retrieving %s"
 msgstr "prenašanje %s"
 
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
 #, c-format
 msgid "retrieved %s"
 msgstr "prenesen %s"
 
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "za %s je določen neznan protokol "
 
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s ni na voljo, vrnitev na %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "ni programa za spletno pridobivanje, podprti so: %s\n"
 
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ni mogoče obravnavati protokola: %s"
@@ -718,59 +750,60 @@ msgstr "paketa %s ni mogoče najti."
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "pridobivanje datotek rpm iz vira \"%s\" ..."
 
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
 #, c-format
 msgid "[repackaging]"
 msgstr "[ponovna gradnja paketa]"
 
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr ""
 "določeno je bilo opravilo za nameščanje na %s (odstrani=%d, namesti=%d, "
 "nadgradi=%d)"
 
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
 #, c-format
 msgid "unable to create transaction"
 msgstr "opravila ni mogoče izvesti"
 
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
 #, 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:214
+#: ../urpm/install.pm:208
 #, c-format
 msgid "unable to install package %s"
 msgstr "ni mogoče namestiti paketa  %s"
 
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "odstranjevanje slabega rpm-ja (%s) iz %s"
 
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "odstranjevanje %s je spodletelo: %s"
 
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
 #, c-format
 msgid "Removing package %s"
 msgstr "Odstranjevanje paketa %s"
 
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
 #, c-format
 msgid "removing package %s"
 msgstr "odstranjevanje paketa %s"
 
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "odstranjevanje nameščenega rpm (%s) iz %s"
 
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
 #, c-format
 msgid "More information on package %s"
 msgstr "Več podatkov o paketu %s"
@@ -815,18 +848,18 @@ msgstr "prekinjam"
 msgid "%s database is locked (another program is already using it)"
 msgstr "Podatkovna zbirka %s je zaklenjena (uporablja jo že nek drug program)"
 
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm:113 ../urpm/main_loop.pm:123 ../urpm/main_loop.pm:157
+#: ../urpm/main_loop.pm:233 ../urpm/main_loop.pm:251
 #, c-format
 msgid "Installation failed"
 msgstr "Namestitev ni uspela"
 
-#: ../urpm/main_loop.pm:112 ../urpm/main_loop.pm:122
+#: ../urpm/main_loop.pm:115 ../urpm/main_loop.pm:125
 #, c-format
 msgid "Try to go on anyway? (y/N) "
 msgstr "Ali želite vseeno nadaljevati? (d/N)"
 
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
 #, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
@@ -835,73 +868,63 @@ msgstr ""
 "Namestitev ni uspela, slabi rpm-ji:\n"
 "%s"
 
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
 #, c-format
 msgid "The following package has bad signature"
 msgstr "Sledeči paket ima slab podpis"
 
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Sledeči paketi imajo slabe podpise"
 
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ali želite nadaljevati namestitev?"
 
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
 #, c-format
 msgid "removing installed rpms (%s)"
 msgstr "odstranjevanje nameščenih rpm-jev (%s)"
 
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
 #, c-format
 msgid "distributing %s"
 msgstr "porazdeljevanje %s"
 
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
 #, c-format
 msgid "installing %s from %s"
 msgstr "nameščanje %s iz %s"
 
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
 #, c-format
 msgid "installing %s"
 msgstr "nameščanje %s"
 
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Poskusi z namestitvijo brez preverjanj odvisnosti? (d/N) "
 
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Poskusi s prisilno namestitvijo(--force)? (d/N) "
 
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
 #, c-format
 msgid "Packages are up to date"
 msgstr "Paketi so posodobljeni"
 
-#: ../urpm/main_loop.pm:306 ../urpm/parallel.pm:298
+#: ../urpm/main_loop.pm:313 ../urpm/parallel.pm:298
 #, c-format
 msgid "Installation is possible"
 msgstr "Namestitev je mogoča"
 
 #: ../urpm/md5sum.pm:26
 #, c-format
-msgid "examining %s file"
-msgstr "preučevanje datoteke %s"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr "neveljavna datoteka MD5SUM"
-
-#: ../urpm/md5sum.pm:28
-#, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "opozorilo: vsote MD5 za %s ni v datoteki MD5SUM"
 
@@ -913,7 +936,8 @@ msgstr "navidezni vir \"%s\" mora imeti jasen url, vir je bil zato prezrt"
 #: ../urpm/media.pm:206
 #, 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"
+msgstr ""
+"ni mogoče dostopati do seznama datotek od \"%s\", vir je bil zato prezrt"
 
 #: ../urpm/media.pm:213
 #, c-format
@@ -976,227 +1000,229 @@ msgstr "bi namestilo namesto nadgradilo paket %s"
 msgid "medium \"%s\" already exists"
 msgstr "vir \"%s\" že obstaja"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
 #, c-format
 msgid "(ignored by default)"
 msgstr "(privzeto se spregleda)"
 
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "dodajanje vira »%s« pred oddaljen vir »%s«"
 
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "dodajanje vira »%s«"
 
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
 #, c-format
 msgid "directory %s does not exist"
 msgstr "Mapa %s ne obstaja"
 
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "izgleda, da ta lokacija ne vsebuje nobene distribucije"
 
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "ni mogoče razčleniti media.cfg"
 
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
 #, 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)"
+msgstr ""
+"ni moč dostopati do vira distribucije (ni moč najti datoteke media.cfg)"
 
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "spuščam nezdružljivi vir »%s« (za %s)"
 
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "pridobivanje datoteke cfg za vir"
 
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "poskušanje izbire neobstoječega vira \"%s\""
 
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "izbiranje več virov: %s"
 
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "odstranjevanje vira \"%s\""
 
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "ponovno nastavljanje urpmi za vir \"%s\""
 
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...ponovno nastavljanje je spodletelo"
 
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
 #, c-format
 msgid "reconfiguration done"
 msgstr "ponovno nastavljanje je končano"
 
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
 #, 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:1132
+#: ../urpm/media.pm:1124
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "vir »%s« je posodobljen"
 
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "preverjanje synthesis datoteke [%s]"
 
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "težava pri branju synthesis datoteke vira \"%s\""
 
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "kopiranje [%s] za vir »%s« ..."
 
-#: ../urpm/media.pm:1178 ../urpm/media.pm:1233 ../urpm/media.pm:1502
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1240 ../urpm/media.pm:1493
 #, c-format
 msgid "...copying failed"
 msgstr "...kopiranje je spodletelo"
 
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopiranje datoteke z opisi \"%s\"..."
 
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
 #, c-format
 msgid "...copying done"
 msgstr "...kopiranje končano"
 
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopiranje [%s] je spodletelo (datoteka je sumljivo majhna)"
 
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "računanje md5sum izvorne datoteke synthesis"
 
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "pridobivanje [%s] je spodletelo (md5sum se ne ujema)"
 
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "genhdlist2 na [%s] je spodletel"
 
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
 #, c-format
 msgid "comparing %s and %s"
 msgstr "primerjanje %s in %s"
 
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "neveljavna datoteka hdlist %s za vir »%s«"
 
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "kopiranje datoteke MD5SUM od »%s« ..."
 
-#: ../urpm/media.pm:1430, c-format
+#: ../urpm/media.pm:1440
+#, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "neveljavna datoteka MD5SUM (prenešena z %s)"
 
-#: ../urpm/media.pm:1461
+#: ../urpm/media.pm:1443
+#, fuzzy, c-format
+msgid "no metadata found for medium \"%s\""
+msgstr "ni bilo mogoče najti datoteke synthesis za vir »%s«"
+
+#: ../urpm/media.pm:1475
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "pridobivanje izvorne datoteke synthesis od »%s« ..."
 
-#: ../urpm/media.pm:1478
-#, c-format
-msgid "found probed synthesis as %s"
-msgstr "datoteka synthesis je bila najdena kot %s"
-
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
-#, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "ni bilo mogoče najti datoteke synthesis za vir »%s«"
-
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "preverjanje datoteke z javnimi ključi od \"%s\" ..."
 
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
 #, 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:1552
+#: ../urpm/media.pm:1543
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ni mogoče uvoziti javnega ključa od \"%s\""
 
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "ni bilo mogoče najti datoteke synthesis za vir »%s«"
+
+#: ../urpm/media.pm:1612
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "vir »%s« posodobljen"
 
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "pridobivanje [%s] je spodletelo"
 
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
 #, c-format
 msgid "trying again with mirror %s"
 msgstr "ponovno poskušanje z zrcalnim strežnikom %s"
 
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
 #, c-format
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr "Ni bilo moč najti zrcalnega strežnika s seznama %s"
 
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr "najdena geolokacija %s %.2f %.2f iz časovnega pasu %s"
 
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
 #, c-format
 msgid "getting mirror list from %s"
 msgstr "pridobivanje seznama zrcalnih strežnikov od %s"
 
-#: ../urpm/msg.pm:63 ../urpmi:514 ../urpmi:529 ../urpmi:627
+#: ../urpm/msg.pm:63 ../urpmi:502 ../urpmi:517 ../urpmi:612
 #, c-format
 msgid "Nn"
 msgstr "Nn"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
+#: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:553 ../urpmi:648 ../urpmi:654
 #: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
@@ -1267,7 +1293,7 @@ msgstr "GiB"
 msgid "TB"
 msgstr "TiB"
 
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1275,10 +1301,14 @@ msgid ""
 msgid_plural ""
 "The following packages are now orphans, use \"urpme --auto-orphans\" to "
 "remove them."
-msgstr[0] "Ta paket je osirotel, uporabite »urpme --auto-orphans« da ga odstranite."
-msgstr[1] "Ta paketa sta osirotela, uprabite »urpme --auto-orphans« da ju odstranite."
-msgstr[2] "Ti paketi so osiroteli, uporabite »urpme --auto-orphans« da jih odstranite."
-msgstr[3] "Ti paketi so osiroteli, uporabite »urpme --auto-orphans« da jih odstranite."
+msgstr[0] ""
+"Ta paket je osirotel, uporabite »urpme --auto-orphans« da ga odstranite."
+msgstr[1] ""
+"Ta paketa sta osirotela, uprabite »urpme --auto-orphans« da ju odstranite."
+msgstr[2] ""
+"Ti paketi so osiroteli, uporabite »urpme --auto-orphans« da jih odstranite."
+msgstr[3] ""
+"Ti paketi so osiroteli, uporabite »urpme --auto-orphans« da jih odstranite."
 
 #: ../urpm/parallel.pm:14
 #, c-format
@@ -1306,7 +1336,8 @@ msgstr "ni mogoče uporabiti vzporedne izbire \"%s\""
 msgid "on node %s"
 msgstr "na vozlišču %s"
 
-#: ../urpm/parallel.pm:293, c-format
+#: ../urpm/parallel.pm:293
+#, c-format
 msgid "Installation failed on node %s"
 msgstr "Na vozlišču %s namestitev ni bila uspešna"
 
@@ -1336,7 +1367,8 @@ msgid ""
 "%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
 "code: %d)"
 msgstr ""
-"%s je spodletel pri gostitelju %s (mogoče nima prave različice urpmi?) (izhodna koda: %d)"
+"%s je spodletel pri gostitelju %s (mogoče nima prave različice urpmi?) "
+"(izhodna koda: %d)"
 
 #: ../urpm/removable.pm:32
 #, c-format
@@ -1378,7 +1410,8 @@ 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"
+msgstr ""
+"  --env          - uporabi specifično okolje (ponavadi poročilo o napaki).\n"
 
 #: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
 #, c-format
@@ -1387,8 +1420,10 @@ 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"
+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
@@ -1401,7 +1436,8 @@ msgstr ""
 
 #: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --sortmedia    - vire razvrsti glede na podnize, ločene z vejico.\n"
 
 #: ../urpm/search.pm:43 ../urpmf:43
@@ -1432,12 +1468,14 @@ 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"
+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"
+msgstr ""
+"  -i             - upoštevaj razlike malih/velikih črk v vsakem vzorcu.\n"
 
 #: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
@@ -1452,7 +1490,8 @@ 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"
+msgstr ""
+"  besedilo       - brez -l se vsako besedilo razčleni kot regularni izraz.\n"
 
 #: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
@@ -1620,18 +1659,14 @@ 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"
+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\""
@@ -1647,119 +1682,141 @@ msgstr "ni bilo moč najti datoteke synthesis za vir »%s«"
 msgid "no xml-info available for medium \"%s\""
 msgstr "ni bilo moč najti datoteke xml-info za vir »%s«"
 
-#: ../urpm/select.pm:28
+#: ../urpm/select.pm:30
 #, 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"
+msgstr ""
+"urpmi se je ponovno zagnal in seznam prednostnih paketov se ni spremenil"
 
-#: ../urpm/select.pm:30
+#: ../urpm/select.pm:32
 #, c-format
-msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
 msgstr ""
 "urpmi se je ponovno zagnal in seznam prednostnih paketov se je spremenil: %s "
 "<-> %s"
 
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
 #, c-format
 msgid "No package named %s"
 msgstr "Ni paketa poimenovanega %s"
 
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Sledeči paketi vsebujejo %s: %s"
 
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
 #, c-format
 msgid "You should use \"-a\" to use all of them"
 msgstr "Da izberete vse, uporabite »-a«"
 
-#: ../urpm/select.pm:300, c-format
+#: ../urpm/select.pm:295
+#, 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"
+msgstr ""
+"v zbirki podatkov za urpmi so bili najdeni paketi %s , a ni noben nameščen"
 
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
 #, c-format
 msgid "Package %s is already installed"
 msgstr "Paket %s je že nameščen"
 
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
 #, c-format
 msgid "Packages %s are already installed"
 msgstr "Paketi %s so že nameščeni"
 
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
 #, c-format
 msgid "due to missing %s"
 msgstr "zaradi manjkajočega %s"
 
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
 #, c-format
 msgid "due to already installed %s"
 msgstr "zaradi že nameščenega %s"
 
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "zaradi nezadovoljstva %s"
 
 # promote vzet kot renice
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
 #, c-format
 msgid "trying to promote %s"
 msgstr "poskus podpiranja %s"
 
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
 #, c-format
 msgid "in order to keep %s"
 msgstr "za ohranitev %s"
 
 #: ../urpm/select.pm:607
 #, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Sledeči paket mora biti odstranjen, da bodo drugi lahko nadgrajeni:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Sledeči paketi morajo biti odstranjeni, da bodo drugi lahko nadgrajeni:\n"
+"%s"
+
+#: ../urpm/select.pm:635
+#, c-format
 msgid "in order to install %s"
 msgstr "za namestitev %s"
 
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "zaradi konfliktov z/s %s"
 
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Neveljaven podpis (%s)"
 
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Neveljaven ID ključa (%s)"
 
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Manjkajoč podpis (%s)"
 
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
 #, c-format
 msgid "system"
 msgstr "sistem"
 
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
 #, c-format
 msgid "You should restart %s for %s"
 msgstr "Priporočamo, da ponovno zaženete %s zaradi %s"
 
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
 #, c-format
 msgid "Can't write file"
 msgstr "Ni moč pisati v datoteko"
 
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
 #, c-format
 msgid "Can't open file"
 msgstr "Ni moč odpreti datoteke"
 
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
 #, c-format
 msgid "Can't move file %s to %s"
 msgstr "Ni moč premakniti datoteke %s v %s"
@@ -1801,7 +1858,7 @@ msgstr "  --test         - preveri, če je možna pravilna odstranitev.\n"
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - porazdeljen urpmi po napravah z vzdevki.\n"
 
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - Pred izbrisom ponovno zgradi pakete\n"
@@ -1809,7 +1866,8 @@ msgstr "  --repackage    - Pred izbrisom ponovno zgradi pakete\n"
 #: ../urpme:53
 #, c-format
 msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - uporabi drug korenski imenik za odstranitev paketov rpm.\n"
+msgstr ""
+"  --root         - uporabi drug korenski imenik za odstranitev paketov rpm.\n"
 
 #: ../urpme:55 ../urpmi:101
 #, c-format
@@ -1833,7 +1891,7 @@ msgstr ""
 "                   za namestitev ali odstranitev chroot z možnostjo --"
 "root . \n"
 
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - zgovoren način.\n"
@@ -1858,7 +1916,8 @@ msgstr "neznani paketi"
 msgid "unknown package"
 msgstr "neznan paket"
 
-#: ../urpme:121, c-format
+#: ../urpme:121
+#, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "Odstranitev tega paketa bo pokvarila vaš sistem:"
@@ -1871,20 +1930,23 @@ msgstr[3] "Odstranitev teh paketov bo pokvarila vaš sistem:"
 msgid "Nothing to remove"
 msgstr "Ničesar za odstraniti"
 
-#: ../urpme:143, c-format
+#: ../urpme:143
+#, c-format
 msgid "No orphans to remove"
 msgstr "Ni osirotelih paketov za odstraniti"
 
 #: ../urpme:149
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural "To satisfy dependencies, the following %d packages will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
 msgstr[0] "Za zadovoljitev odvisnosti bo odstranjen sledeči %d paket"
 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:154, c-format
+#: ../urpme:154
+#, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "(osiroteli paket)"
@@ -1901,7 +1963,7 @@ msgstr[1] "Ali odstranim %d paketa?"
 msgstr[2] "Ali odstranim %d pakete?"
 msgstr[3] "Ali odstranim %d paketov?"
 
-#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#: ../urpme:161 ../urpmi:554 ../urpmi:649 ../urpmi.addmedia:144
 #, c-format
 msgid " (y/N) "
 msgstr " (d/N) "
@@ -1916,11 +1978,13 @@ msgstr "preverjanje možnosti odstranitve %s"
 msgid "Removal failed"
 msgstr "Odstranjevanje je spodletelo"
 
-#: ../urpme:183, c-format
+#: ../urpme:183
+#, c-format
 msgid "Removal is possible"
 msgstr "Odstranitev je mogoča"
 
-#: ../urpmf:153, c-format
+#: ../urpmf:153
+#, c-format
 msgid "unterminated expression (%s)"
 msgstr "nezaključen izraz (%s)"
 
@@ -2018,7 +2082,8 @@ msgstr "  --noclean      - ne odstrani paketov rpm iz predpomnilika.\n"
 
 #: ../urpmi:102
 #, c-format
-msgid "  --replacepkgs  - force installing packages which are already installed.\n"
+msgid ""
+"  --replacepkgs  - force installing packages which are already installed.\n"
 msgstr "  --replacepkgs  - vsili namestitev paketov, ki so že nameščeni.\n"
 
 #: ../urpmi:104
@@ -2041,7 +2106,8 @@ msgstr ""
 "                   preverjanja odvisnosti in integritete.\n"
 
 # obsolete? man pravi da ne
-#: ../urpmi:108, c-format
+#: ../urpmi:108
+#, c-format
 msgid "  --allow-suggests - auto select \"suggested\" packages.\n"
 msgstr "  --allow-suggests - samodejno izbere »predlagane« pakete.\n"
 
@@ -2152,24 +2218,30 @@ msgstr "  --ignoresize   - ne preverjaj količine praznega prostora.\n"
 #: ../urpmi:139
 #, c-format
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
-msgstr "  --ignorearch   - dovoli namestitev rpm paketov različnih arhitektur.\n"
+msgstr ""
+"  --ignorearch   - dovoli namestitev rpm paketov različnih arhitektur.\n"
 
 #: ../urpmi:140
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - ne izvedi paketnih mini-skript.\n"
 
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid "  --replacefiles - ignore file conflicts\n"
+msgstr "  --conflicts    - izpiše konflikte.\n"
+
+#: ../urpmi:143
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - paketi, ki naj bodo pri namestitvi preskočeni\n"
 
-#: ../urpmi:143
+#: ../urpmi:144
 #, c-format
 msgid "  --prefer       - packages which should be preferred\n"
 msgstr "  --prefer       - paketi, ki so bolj zaželjeni\n"
 
-#: ../urpmi:144
+#: ../urpmi:145
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -2178,42 +2250,42 @@ msgstr ""
 "  --more-choices - ko je najdenih več paketov, ponudi več izbir\n"
 "                   kot je privzeto.\n"
 
-#: ../urpmi:146
+#: ../urpmi:147
 #, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - ne zakleni podatkovne baze rpm.\n"
 
-#: ../urpmi:147
+#: ../urpmi:148
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - nadgradi samo pakete iste arhitekture.\n"
 
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - izberi vsa ujemanja v ukazni vrstici.\n"
 
-#: ../urpmi:151
+#: ../urpmi:152
 #, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q    - tihi način.\n"
 
-#: ../urpmi:153
+#: ../urpmi:154
 #, c-format
 msgid "  --debug        - very verbose mode.\n"
 msgstr "  --debug        - zelo zgovoren način.\n"
 
-#: ../urpmi:154
+#: ../urpmi:155
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  imena ali datoteke rpm podane v ukazni vrstici bodo nameščene.\n"
 
-#: ../urpmi:182
+#: ../urpmi:183
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "Napaka: ni moč uporabiti --auto-select skupaj s seznamom paketov.\n"
 
-#: ../urpmi:189
+#: ../urpmi:190
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2222,27 +2294,29 @@ msgstr ""
 "Napaka: Da bi ustvarili poročilo o hrošču uporabite običajne argumente "
 "ukazne vrstice.\n"
 
-#: ../urpmi:219
+#: ../urpmi:220
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "Ob uporabi --install-src ne morete nameščati binarnih rpm paketov."
 
-#: ../urpmi:220
+#: ../urpmi:221
 #, c-format
 msgid "You can't install spec files"
 msgstr "Ni moč namestiti datotek spec"
 
-#: ../urpmi:227
+#: ../urpmi:228
 #, c-format
 msgid "defaulting to --buildrequires"
 msgstr "Uporabljanje privzetega --buildrequires"
 
-#: ../urpmi:232
+#: ../urpmi:233
 #, c-format
-msgid "please use --buildrequires or --install-src, defaulting to --buildrequires"
-msgstr "uporabite --buildrequires ali --install-src, ki privzema --buildrequires"
+msgid ""
+"please use --buildrequires or --install-src, defaulting to --buildrequires"
+msgstr ""
+"uporabite --buildrequires ali --install-src, ki privzema --buildrequires"
 
-#: ../urpmi:252
+#: ../urpmi:253
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -2251,17 +2325,12 @@ msgstr ""
 "Imenik [%s] že obstaja, prosim da uporabite drugega za poročilo o napaki ali "
 "pa ga izbrišite"
 
-#: ../urpmi:253
+#: ../urpmi:254
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Ni mogoče ustvariti imenika [%s] za poročilo o napaki"
 
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "Mapa %s ne obstaja"
-
-#: ../urpmi:287
+#: ../urpmi:275
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2270,48 +2339,48 @@ msgstr ""
 "Napaka: izgleda, da je %s priklopljen v (samo) bralnem načinu.\n"
 "Uporabite --allow-force, da prisilite izvedbo operacije."
 
-#: ../urpmi:361
+#: ../urpmi:349
 #, c-format
 msgid "Updating media...\n"
 msgstr "Posodabljanje vira ....\n"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (za nadgradnjo)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (za nadgradnjo)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (za namestitev)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (za namestitev)"
 
-#: ../urpmi:462
+#: ../urpmi:450
 #, 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:465
+#: ../urpmi:453
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Kakšna je vaša izbira? (1-%d) "
 
-#: ../urpmi:507
+#: ../urpmi:495
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2322,7 +2391,7 @@ msgstr ""
 "odvisni od paketov, ki so starejši od že nameščenih:\n"
 "%s"
 
-#: ../urpmi:509
+#: ../urpmi:497
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2333,7 +2402,7 @@ msgstr ""
 "ki so starejši od nameščenih.\n"
 "%s"
 
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
 #, c-format
 msgid ""
 "\n"
@@ -2342,12 +2411,12 @@ msgstr ""
 "\n"
 "Vseeno nadaljujem z namestitvijo?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
+#: ../urpmi:504 ../urpmi:519 ../urpmi:613 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr " (D/n) "
 
-#: ../urpmi:524
+#: ../urpmi:512
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2356,7 +2425,7 @@ msgstr ""
 "Zahtevanega paketa ni moč namestiti:\n"
 "%s"
 
-#: ../urpmi:525
+#: ../urpmi:513
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2365,12 +2434,12 @@ msgstr ""
 "Nekateri zahtevani paketi ne morejo biti nameščeni:\n"
 "%s"
 
-#: ../urpmi:542
+#: ../urpmi:530
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "odstranitev paketa %s bo zrušilo vaš sistem"
 
-#: ../urpmi:551
+#: ../urpmi:538
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2381,7 +2450,7 @@ msgstr ""
 "sledeče pakete, da bodo drugi lahko nadgrajeni:\n"
 "%s\n"
 
-#: ../urpmi:553
+#: ../urpmi:540
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2392,30 +2461,12 @@ msgstr ""
 "sledeče pakete, da bodo drugi lahko nadgrajeni:\n"
 "%s\n"
 
-#: ../urpmi:560
-#, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Sledeči paket mora biti odstranjen, da bodo drugi lahko nadgrajeni:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Sledeči paketi morajo biti odstranjeni, da bodo drugi lahko nadgrajeni:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(samo test, brisanje se ne bo izvedlo)"
 
-#: ../urpmi:583
+#: ../urpmi:568
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2426,7 +2477,8 @@ msgstr ""
 "buildrequires:\n"
 "%s\n"
 
-#: ../urpmi:594, c-format
+#: ../urpmi:579
+#, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "Naslednji osiroteli paket bo odstranjen."
@@ -2434,27 +2486,27 @@ msgstr[1] "Naslednja osirotela paketa bosta odstranjena."
 msgstr[2] "Naslednji osiroteli paketi bodo odstranjeni."
 msgstr[3] "Naslednji osiroteli paketi bodo odstranjeni."
 
-#: ../urpmi:610
+#: ../urpmi:595
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(samo test, namestitev se ne bo izvedla)"
 
-#: ../urpmi:616
+#: ../urpmi:601
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "Uporabljenega bo %s dodatnega prostora na disku."
 
-#: ../urpmi:617
+#: ../urpmi:602
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "Sproščenega bo %s prostora na disku."
 
-#: ../urpmi:618
+#: ../urpmi:603
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "Prenesenih bo %s paketov."
 
-#: ../urpmi:619
+#: ../urpmi:604
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
@@ -2463,12 +2515,12 @@ msgstr[1] "Nadaljujem z namestitvijo %d paketov?"
 msgstr[2] "Nadaljujem z namestitvijo %d paketov?"
 msgstr[3] "Nadaljujem z namestitvijo %d paketov?"
 
-#: ../urpmi:640
+#: ../urpmi:625
 #, c-format
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: ../urpmi:648
+#: ../urpmi:633
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "Pritisnite Enter, ko bo priklopljeno ..."
@@ -2531,7 +2583,8 @@ msgstr "  --curl         - uporabi curl za pridobivanje datotek.\n"
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --prozilla     - uporabi prozilla za pridobivanje datotek.\n"
 
-#: ../urpmi.addmedia:58 ../urpmi.update:36, c-format
+#: ../urpmi.addmedia:58 ../urpmi.update:36
+#, c-format
 msgid "  --aria2        - use aria2 to retrieve distant files.\n"
 msgstr "  --aria2        - uprabi aria2 za pridobivanje oddaljenih datotek.\n"
 
@@ -2664,7 +2717,8 @@ msgstr "Ni mogoče ustvariti nastavitvene datoteke [%s]"
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "z --distrib ni potrebno podajati <relativna pot do synthesis>"
 
-#: ../urpmi.addmedia:144, c-format
+#: ../urpmi.addmedia:144
+#, c-format
 msgid ""
 "\n"
 "Do you want to add media '%s'?"
@@ -2716,13 +2770,15 @@ msgstr "  --noclean      - ne počisti mape za ponovno izgradnjo paketov.\n"
 
 #: ../urpmi.recover:37
 #, c-format
-msgid "  --list         - list transactions since provided date/duration argument\n"
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
 msgstr "  --list         - 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"
+msgstr ""
+"  --list-all     - prikaži vsa izvedena opravila v rpmdb (dolga oblika)\n"
 
 #: ../urpmi.recover:39
 #, c-format
@@ -2782,7 +2838,8 @@ 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"
+msgstr ""
+"Ne morete hkrati izbrati --ponovne izgradnje paketov in --obnove sistema\n"
 
 #: ../urpmi.recover:86
 #, c-format
@@ -2901,7 +2958,8 @@ msgstr "  --no-ignore    - ne obnovi, označi vir kot omogočen.\n"
 #: ../urpmi.update:49
 #, c-format
 msgid "  --probe-rpms   - do not use synthesis, use rpm files directly\n"
-msgstr "  --probe-rpms   - ne uporabi synthesis, uporabi datoteke rpm neposredno\n"
+msgstr ""
+"  --probe-rpms   - ne uporabi synthesis, uporabi datoteke rpm neposredno\n"
 
 #: ../urpmi.update:50
 #, c-format
@@ -3003,7 +3061,8 @@ msgstr "  --list-media   - izpiši seznam virov, ki so na voljo.\n"
 #: ../urpmq:60
 #, c-format
 msgid "  --list-url     - list available media and their url.\n"
-msgstr "  --list-url     - izpiši seznam virov, ki so na voljo, in njihove url-je.\n"
+msgstr ""
+"  --list-url     - izpiši seznam virov, ki so na voljo, in njihove url-je.\n"
 
 #: ../urpmq:61
 #, c-format
@@ -3015,22 +3074,26 @@ msgstr ""
 #: ../urpmq:62
 #, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - izpiši seznam vzporednih vzdevkov, ki so na voljo.\n"
+msgstr ""
+"  --list-aliases - izpiši seznam vzporednih vzdevkov, ki so na voljo.\n"
 
 #: ../urpmq:63
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr "  --dump-config  - izvrži nastavitve v formatu za urpmi.addmedia.\n"
 
 #: ../urpmq:64
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - naslednji paket je paket z izvorno kodo (isto kot -s).\n"
+msgstr ""
+"  --src          - naslednji paket je paket z izvorno kodo (isto kot -s).\n"
 
 # kaj? man pravi: Print source URLs (or file names) of all selected packages.
 #: ../urpmq:65
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr ""
 "  --sources      - prikaži izvorni url (ali imena datotek) vseh izbranih "
 "paketov.\n"
@@ -3062,7 +3125,8 @@ msgid "  --conflicts    - print conflicts.\n"
 msgstr "  --conflicts    - izpiše konflikte.\n"
 
 # obsolete? man pravi da ne
-#: ../urpmq:83, c-format
+#: ../urpmq:83
+#, c-format
 msgid "  --obsoletes    - print obsoletes.\n"
 msgstr "  --obsoletes    - prikaže seznam zastarelih paketov.\n"
 
@@ -3077,7 +3141,8 @@ msgid "  --requires     - print requires.\n"
 msgstr "  --requires     - izpiše zahtevano.\n"
 
 # obsolete? man pravi da ne
-#: ../urpmq:86, c-format
+#: ../urpmq:86
+#, c-format
 msgid "  --suggests     - print suggests.\n"
 msgstr "  --suggests     - prikaže priporočene pakete.\n"
 
@@ -3104,7 +3169,8 @@ msgstr ""
 #: ../urpmq:92
 #, c-format
 msgid "  --whatrequires - reverse search to what requires package.\n"
-msgstr "  --whatrequires - iskanje paketov, katerim je podan paket odvisnost.\n"
+msgstr ""
+"  --whatrequires - iskanje paketov, katerim je podan paket odvisnost.\n"
 
 #: ../urpmq:93
 #, c-format
@@ -3173,7 +3239,8 @@ msgstr ""
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
-msgstr "  -u             - odstrani paket, če je že nameščena novejša verzija.\n"
+msgstr ""
+"  -u             - odstrani paket, če je že nameščena novejša verzija.\n"
 
 #: ../urpmq:107
 #, c-format
@@ -3219,14 +3286,16 @@ msgstr "za vir »%s« ni podatkov v obliki XML, samo delni rezultat za pakete %s
 
 #: ../urpmq:408
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for package %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr ""
 "za vir »%s« ni podatkov v obliki XML, ni moč vrniti nobenega rezultata za "
 "paket %s"
 
 #: ../urpmq:409
 #, c-format
-msgid "no xml info for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr ""
 "za vir »%s« ni podatkov v obliki XML, ni moč vrniti nobenega rezultata za "
 "pakete %s"
@@ -3236,6 +3305,15 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Dnevnik sprememb ni bil najden\n"
 
+#~ msgid "examining %s file"
+#~ msgstr "preučevanje datoteke %s"
+
+#~ msgid "invalid MD5SUM file"
+#~ msgstr "neveljavna datoteka MD5SUM"
+
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "datoteka synthesis je bila najdena kot %s"
+
 #~ msgid "  --update       - create an update medium.\n"
 #~ msgstr "  --update       - ustvari vir za posodabljanje.\n"
 
@@ -3262,4 +3340,3 @@ msgstr "Dnevnik sprememb ni bil najden\n"
 
 #~ msgid "Checking to remove the following packages"
 #~ msgstr "Preverjanje za odstranitev sledečih paketov"
-