sync with code

1 files changed, 293 insertions, 282 deletions

diff --git a/po/bs.po b/po/bs.po
index 6aa09531..54f0043b 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: bs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-04 18:36+0200\n"
+"POT-Creation-Date: 2008-10-07 19:04+0200\n"
 "PO-Revision-Date: 2006-09-13 21:02+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -32,7 +32,7 @@ msgstr "RPM instalacija"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Greška: ne mogu naći datoteku %s, prekidam operaciju"
 
-#: ../gurpmi:46 ../gurpmi2:175 ../gurpmi2:199
+#: ../gurpmi:46 ../gurpmi2:174 ../gurpmi2:198
 #, c-format
 msgid "_Ok"
 msgstr "_U redu"
@@ -98,7 +98,7 @@ msgstr "_Instaliraj"
 msgid "_Save"
 msgstr "_Snimi"
 
-#: ../gurpmi:100 ../gurpmi2:175
+#: ../gurpmi:100 ../gurpmi2:174
 #, c-format
 msgid "_Cancel"
 msgstr "_Odustani"
@@ -129,9 +129,8 @@ msgstr ""
 msgid "Options:"
 msgstr ""
 
-#: ../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         - ispiši ovu poruku.\n"
@@ -168,18 +167,18 @@ msgstr ""
 "  --verify-rpm   - provjeri potpis rpm-a prije instalacije\n"
 "                   (--no-verify-rpm isključuje, normalno je uključ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        - koristi samo navedene medije, razdvojene zarezom.\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             - uključi pretragu 'provides' taga radi nalaženja 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 pretražuj 'provides' pri traženju paketa.\n"
@@ -218,7 +217,22 @@ msgstr "Molim sačekajte..."
 msgid "Must be root"
 msgstr "Morate biti root"
 
-#: ../gurpmi2:106
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Distribution Upgrade"
+msgstr "distribuiram %s"
+
+#: ../gurpmi2:70
+#, fuzzy, c-format
+msgid "Packages installation"
+msgstr "Instalacija paketa..."
+
+#: ../gurpmi2:97
+#, fuzzy, c-format
+msgid "Preparing packages installation..."
+msgstr "Instalacija paketa..."
+
+#: ../gurpmi2:111
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -234,37 +248,37 @@ msgstr ""
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../gurpmi2:134 ../urpmi:640
+#: ../gurpmi2:134 ../urpmi:625
 #, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../gurpmi2:171
+#: ../gurpmi2:170
 #, c-format
 msgid " (to upgrade)"
 msgstr " (za ažuriranje)"
 
-#: ../gurpmi2:172
+#: ../gurpmi2:171
 #, c-format
 msgid " (to install)"
 msgstr " (za instalaciju)"
 
-#: ../gurpmi2:175
+#: ../gurpmi2:174
 #, c-format
 msgid "Package choice"
 msgstr "Izbor paketa"
 
-#: ../gurpmi2:176
+#: ../gurpmi2:175
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Jedan od sljedećih paketa je potreban:"
 
-#: ../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,19 +289,19 @@ msgstr ""
 "%s\n"
 "Da nastavim?"
 
-#: ../gurpmi2:241 ../urpmi:607
+#: ../gurpmi2:240 ../urpmi:592
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "Da bih zadovoljio ovisnosti, instaliraću sljedeći paket"
 
-#: ../gurpmi2:242 ../urpmi:608
+#: ../gurpmi2:241 ../urpmi:593
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "Da bih zadovoljio ovisnosti, instaliraću sljedeće pakete"
 
-#: ../gurpmi2:244
+#: ../gurpmi2:243
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -295,42 +309,37 @@ msgstr[0] "(%d paketa, %d MB)"
 msgstr[1] "(%d paketa, %d MB)"
 msgstr[2] "(%d paketa, %d MB)"
 
-#: ../gurpmi2:250
-#, c-format
-msgid "Package installation..."
-msgstr "Instalacija paketa..."
-
-#: ../gurpmi2:252 ../urpm/main_loop.pm:49
+#: ../gurpmi2:257 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ne mogu dobiti izvorne pakete, prekidam"
 
-#: ../gurpmi2:266 ../urpm/install.pm:88
+#: ../gurpmi2:265 ../urpm/install.pm:81
 #, c-format
 msgid "Preparing..."
 msgstr "Pripremam..."
 
-#: ../gurpmi2:270
+#: ../gurpmi2:269
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instaliram paket `%s' (%s/%s)..."
 
-#: ../gurpmi2:287 ../urpmi:635
+#: ../gurpmi2:286 ../urpmi:620
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Molim ubacite medij sa imenom \"%s\" u uređaj [%s]"
 
-#: ../gurpmi2:298
+#: ../gurpmi2:297
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Downloadujem paket `%s'..."
 
-#: ../gurpmi2:324
+#: ../gurpmi2:323
 #, c-format
 msgid "_Done"
 msgstr "_Gotovo"
 
-#: ../gurpmi2:332 ../urpm/main_loop.pm:111
+#: ../gurpmi2:331 ../urpm/main_loop.pm:114
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -341,28 +350,28 @@ msgstr ""
 "%s\n"
 "Možda ćete trebati osvježiti vašu urpmi bazu podataka"
 
-#: ../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 "Instalacija nije uspjela:"
 
-#: ../gurpmi2:343
+#: ../gurpmi2:342
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "sve je već instalirano"
 
-#: ../gurpmi2:345
+#: ../gurpmi2:344
 #, c-format
 msgid "Installation finished"
 msgstr "Instalacija završena"
 
-#: ../gurpmi2:346 ../urpme:167
+#: ../gurpmi2:345 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "uklanjam %s"
 
-#: ../gurpmi2:354 ../urpmi:702
+#: ../gurpmi2:353 ../urpmi:687
 #, c-format
 msgid "restarting urpmi"
 msgstr "restartujem urpmi"
@@ -401,7 +410,7 @@ msgstr "                    podrazumijeva se %s.\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -g             - ispiši grupe sa imenom.\n"
 
-#: ../rurpmi:11 ../urpmi:281
+#: ../rurpmi:11 ../urpmi:269
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Samo administrator (root) može instalirati pakete"
@@ -411,134 +420,143 @@ msgstr "Samo administrator (root) može instalirati pakete"
 msgid "Running urpmi in restricted mode..."
 msgstr "Pokrećem urpmi u ograničenom režimu..."
 
-#: ../urpm.pm:111
+#: ../urpm.pm:112
 #, fuzzy, c-format
 msgid "fail to create directory %s"
 msgstr "Ne mogu pisati u direktorij za prepakiranje [%s]\n"
 
-#: ../urpm.pm:112
+#: ../urpm.pm:113
 #, fuzzy, c-format
 msgid "invalid owner for directory %s"
 msgstr "Neispravan datum ili trajanje [%s]\n"
 
-#: ../urpm.pm:124
+#: ../urpm.pm:125
 #, fuzzy, c-format
 msgid "Can not download packages into %s"
 msgstr "Ne mogu pisati u direktorij za prepakiranje [%s]\n"
 
-#: ../urpm.pm:274
+#: ../urpm.pm:140
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr "Direktorij okruženja %s ne postoji"
+
+#: ../urpm.pm:141 ../urpmf:248 ../urpmq:165
+#, c-format
+msgid "using specific environment on %s\n"
+msgstr "koristim navedenu okolinu na %s\n"
+
+#: ../urpm.pm:305
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "ne mogu otvoriti rpmdb"
 
-#: ../urpm.pm:288
+#: ../urpm.pm:319
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "neispravno ime rpm datoteke [%s]"
 
-#: ../urpm.pm:294
+#: ../urpm.pm:325
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "dobavljam rpm datoteku [%s] ..."
 
-#: ../urpm.pm:296 ../urpm/get_pkgs.pm:217
+#: ../urpm.pm:327 ../urpm/get_pkgs.pm:217
 #, c-format
 msgid "...retrieving done"
 msgstr "...download završen"
 
-#: ../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 "...dobavljanje nije uspjelo: %s"
 
-#: ../urpm.pm:304
+#: ../urpm.pm:335
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ne mogu pristupiti rpm datoteci [%s]"
 
-#: ../urpm.pm:309
+#: ../urpm.pm:340
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "ne mogu obraditi spec datoteku %s [%s]"
 
-#: ../urpm.pm:317
+#: ../urpm.pm:348
 #, c-format
 msgid "unable to register rpm file"
 msgstr "ne mogu registrovati rpm datoteku"
 
-#: ../urpm.pm:319
+#: ../urpm.pm:350
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Nekompatibilna arhitektura za paket [%s]"
 
-#: ../urpm.pm:323
+#: ../urpm.pm:354
 #, c-format
 msgid "error registering local packages"
 msgstr "greška pri registrovanju lokalnih paketa"
 
-#: ../urpm.pm:410
+#: ../urpm.pm:441
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Ova operacija je zabranjena dok ste u ograničenom režimu"
 
-#: ../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 "pogrešna deklaracija proxy-ja na komandnoj liniji\n"
 
-#: ../urpm/args.pm:298
+#: ../urpm/args.pm:306
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: ne mogu pročitati rpm datoteku \"%s\"\n"
 
-#: ../urpm/args.pm:375
+#: ../urpm/args.pm:383
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "Izrazi za uzorke:\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:384
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Nedostaje potpis (%s)"
 
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:390
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:386
+#: ../urpm/args.pm:394
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "Izrazi za uzorke:\n"
 
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:403
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:463
+#: ../urpm/args.pm:471
 #, fuzzy, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Direktorij okruženja %s ne postoji"
 
-#: ../urpm/args.pm:482
+#: ../urpm/args.pm:494
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../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 ""
 
-#: ../urpm/args.pm:496
+#: ../urpm/args.pm:508
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Previše argumenata\n"
 
-#: ../urpm/bug_report.pm:51 ../urpmi:258
+#: ../urpm/bug_report.pm:54 ../urpmi:259
 #, c-format
 msgid "Copying failed"
 msgstr "Kopiranje nije uspjelo"
@@ -585,122 +603,122 @@ msgstr ""
 msgid "unable to write config file [%s]"
 msgstr "ne mogu da zapišem konf. datoteku [%s]"
 
-#: ../urpm/download.pm:113
+#: ../urpm/download.pm:82
+#, c-format
+msgid "%s is not available, falling back on %s"
+msgstr "%s nije dostupan, prelazim na %s"
+
+#: ../urpm/download.pm:157
 #, c-format
 msgid "can not read proxy settings (not enough rights to read %s)"
 msgstr ""
 
-#: ../urpm/download.pm:138
+#: ../urpm/download.pm:182
 #, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Molim unesite vaše podatke radi pristupa proxy serveru\n"
 
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
 #, c-format
 msgid "User name:"
 msgstr "Korisničko ime:"
 
-#: ../urpm/download.pm:139
+#: ../urpm/download.pm:183
 #, c-format
 msgid "Password:"
 msgstr "Šifra:"
 
-#: ../urpm/download.pm:214
+#: ../urpm/download.pm:258
 #, c-format
 msgid "Unknown webfetch `%s' !!!\n"
 msgstr ""
 
-#: ../urpm/download.pm:222
+#: ../urpm/download.pm:266
 #, c-format
 msgid "%s failed: exited with signal %d"
 msgstr ""
 
-#: ../urpm/download.pm:223
+#: ../urpm/download.pm:267
 #, c-format
 msgid "%s failed: exited with %d"
 msgstr ""
 
-#: ../urpm/download.pm:252
+#: ../urpm/download.pm:296
 #, fuzzy, c-format
 msgid "copy failed"
 msgstr "Kopiranje nije uspjelo"
 
-#: ../urpm/download.pm:258
+#: ../urpm/download.pm:302
 #, fuzzy, c-format
 msgid "wget is missing\n"
 msgstr "zbog nedostajućeg %s"
 
-#: ../urpm/download.pm:325
+#: ../urpm/download.pm:369
 #, fuzzy, c-format
 msgid "curl is missing\n"
 msgstr "zbog nedostajućeg %s"
 
-#: ../urpm/download.pm:450
+#: ../urpm/download.pm:494
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr ""
 
-#: ../urpm/download.pm:489
+#: ../urpm/download.pm:533
 #, c-format
 msgid "rsync is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:557
+#: ../urpm/download.pm:601
 #, c-format
 msgid "ssh is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:576
+#: ../urpm/download.pm:620
 #, c-format
 msgid "prozilla is missing\n"
 msgstr ""
 
-#: ../urpm/download.pm:592
+#: ../urpm/download.pm:636
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr ""
 
-#: ../urpm/download.pm:600
+#: ../urpm/download.pm:646
 #, fuzzy, c-format
 msgid "aria2 is missing\n"
 msgstr "zbog nedostajućeg %s"
 
-#: ../urpm/download.pm:715
+#: ../urpm/download.pm:761
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:717
+#: ../urpm/download.pm:763
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr ""
 
-#: ../urpm/download.pm:782
+#: ../urpm/download.pm:828
 #, fuzzy, c-format
 msgid "retrieving %s"
 msgstr "uklanjam %s"
 
-#: ../urpm/download.pm:786
+#: ../urpm/download.pm:835
 #, fuzzy, c-format
 msgid "retrieved %s"
 msgstr "...dobavljanje nije uspjelo: %s"
 
-#: ../urpm/download.pm:834
+#: ../urpm/download.pm:899
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "nepoznat protokol je definisan za %s"
 
-#: ../urpm/download.pm:862
-#, c-format
-msgid "%s is not available, falling back on %s"
-msgstr "%s nije dostupan, prelazim na %s"
-
-#: ../urpm/download.pm:866
+#: ../urpm/download.pm:909
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "nije pronađen download program, podržani su: %s\n"
 
-#: ../urpm/download.pm:886
+#: ../urpm/download.pm:930
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "ne mogu rukovati protokolom: %s"
@@ -720,12 +738,12 @@ msgstr "paket %s nije pronađen"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "dobavljam rpm datoteke za medij \"%s\"..."
 
-#: ../urpm/install.pm:95
+#: ../urpm/install.pm:88
 #, c-format
 msgid "[repackaging]"
 msgstr "[prepakujem]"
 
-#: ../urpm/install.pm:175
+#: ../urpm/install.pm:169
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -733,47 +751,47 @@ msgstr ""
 "napravio transakciju za instaliranje na %s (ukloni=%d, instaliraj=%d, "
 "unaprijedi=%d)"
 
-#: ../urpm/install.pm:178
+#: ../urpm/install.pm:172
 #, c-format
 msgid "unable to create transaction"
 msgstr "ne mogu napraviti transakciju"
 
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:195
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "ne mogu ekstraktovati rpm iz delta-rpm paketa %s"
 
-#: ../urpm/install.pm:214
+#: ../urpm/install.pm:208
 #, c-format
 msgid "unable to install package %s"
 msgstr "ne mogu instalirati paket %s"
 
-#: ../urpm/install.pm:217
+#: ../urpm/install.pm:211
 #, fuzzy, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "instaliram %s iz %s"
 
-#: ../urpm/install.pm:218 ../urpm/install.pm:275
+#: ../urpm/install.pm:212 ../urpm/install.pm:269
 #, fuzzy, c-format
 msgid "removing %s failed: %s"
 msgstr "...dobavljanje nije uspjelo: %s"
 
-#: ../urpm/install.pm:256
+#: ../urpm/install.pm:250
 #, fuzzy, c-format
 msgid "Removing package %s"
 msgstr "uklanjam paket %s"
 
-#: ../urpm/install.pm:257
+#: ../urpm/install.pm:251
 #, c-format
 msgid "removing package %s"
 msgstr "uklanjam paket %s"
 
-#: ../urpm/install.pm:273
+#: ../urpm/install.pm:267
 #, fuzzy, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "instaliram %s iz %s"
 
-#: ../urpm/install.pm:281
+#: ../urpm/install.pm:275
 #, c-format
 msgid "More information on package %s"
 msgstr "Više informacija o paketu %s"
@@ -818,90 +836,80 @@ msgstr "Upozorenje"
 msgid "%s database is locked (another program is already using it)"
 msgstr ""
 
-#: ../urpm/main_loop.pm:110 ../urpm/main_loop.pm:120 ../urpm/main_loop.pm:154
-#: ../urpm/main_loop.pm:230 ../urpm/main_loop.pm:248
+#: ../urpm/main_loop.pm: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 "Instalacija nije uspjela"
 
-#: ../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 ""
 
-#: ../urpm/main_loop.pm:121
+#: ../urpm/main_loop.pm:124
 #, fuzzy, c-format
 msgid ""
 "Installation failed, bad rpms:\n"
 "%s"
 msgstr "Instalacija nije uspjela na čvoru %s"
 
-#: ../urpm/main_loop.pm:139
+#: ../urpm/main_loop.pm:142
 #, fuzzy, c-format
 msgid "The following package has bad signature"
 msgstr "Sljedeći paketi imaju neispravne potpise"
 
-#: ../urpm/main_loop.pm:140
+#: ../urpm/main_loop.pm:143
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Sljedeći paketi imaju neispravne potpise"
 
-#: ../urpm/main_loop.pm:141
+#: ../urpm/main_loop.pm:144
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Želite li nastaviti instalaciju ?"
 
-#: ../urpm/main_loop.pm:158
+#: ../urpm/main_loop.pm:161
 #, fuzzy, c-format
 msgid "removing installed rpms (%s)"
 msgstr "instaliram %s iz %s"
 
-#: ../urpm/main_loop.pm:178
+#: ../urpm/main_loop.pm:181
 #, c-format
 msgid "distributing %s"
 msgstr "distribuiram %s"
 
-#: ../urpm/main_loop.pm:193
+#: ../urpm/main_loop.pm:196
 #, c-format
 msgid "installing %s from %s"
 msgstr "instaliram %s iz %s"
 
-#: ../urpm/main_loop.pm:195
+#: ../urpm/main_loop.pm:198
 #, c-format
 msgid "installing %s"
 msgstr "instaliram %s"
 
-#: ../urpm/main_loop.pm:231
+#: ../urpm/main_loop.pm:234
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Da pokušam instalaciju bez provjere ovisnosti? (d/N) "
 
-#: ../urpm/main_loop.pm:249
+#: ../urpm/main_loop.pm:252
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Pokušaj instalaciju još jače (--force opcija)? (d/N) "
 
-#: ../urpm/main_loop.pm:295
+#: ../urpm/main_loop.pm:302
 #, c-format
 msgid "Packages are up to date"
 msgstr ""
 
-#: ../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 "Instalacija nije moguća"
 
 #: ../urpm/md5sum.pm:26
-#, fuzzy, c-format
-msgid "examining %s file"
-msgstr "ispitujem MD5SUM datoteku"
-
-#: ../urpm/md5sum.pm:27
-#, c-format
-msgid "invalid MD5SUM file"
-msgstr ""
-
-#: ../urpm/md5sum.pm:28
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "pažnja: md5 suma za %s nije dostupna u datoteci MD5SUM"
@@ -975,230 +983,230 @@ msgstr "instaliraću umjesto unaprjeđenja paketa %s"
 msgid "medium \"%s\" already exists"
 msgstr "medij \"%s\" već postoji"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:763
 #, c-format
 msgid "(ignored by default)"
 msgstr ""
 
-#: ../urpm/media.pm:773
+#: ../urpm/media.pm:769
 #, fuzzy, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "dobavljam zaglavlja sa medija \"%s\""
 
-#: ../urpm/media.pm:779
+#: ../urpm/media.pm:775
 #, fuzzy, c-format
 msgid "adding medium \"%s\""
 msgstr "uklanjam medij \"%s\""
 
-#: ../urpm/media.pm:808
+#: ../urpm/media.pm:804
 #, fuzzy, c-format
 msgid "directory %s does not exist"
 msgstr "Direktorij okruženja %s ne postoji"
 
-#: ../urpm/media.pm:816
+#: ../urpm/media.pm:812
 #, fuzzy, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "izgleda da ovaj URL ne sadrži distrib"
 
-#: ../urpm/media.pm:834
+#: ../urpm/media.pm:828
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "ne mogu obraditi media.cfg"
 
-#: ../urpm/media.pm:837
+#: ../urpm/media.pm:831
 #, fuzzy, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr ""
 "ne mogu pristupiti prvom instalacionom mediju (nije pronađena hdlist "
 "datoteka)"
 
-#: ../urpm/media.pm:855
+#: ../urpm/media.pm:849
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr ""
 
-#: ../urpm/media.pm:907
+#: ../urpm/media.pm:900
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "skidam media.cfg datoteku..."
 
-#: ../urpm/media.pm:948
+#: ../urpm/media.pm:941
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "ne mogu izabrati nepostojeći medij \"%s\""
 
-#: ../urpm/media.pm:951
+#: ../urpm/media.pm:944
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "biram više medija: %s"
 
-#: ../urpm/media.pm:971
+#: ../urpm/media.pm:964
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "uklanjam medij \"%s\""
 
-#: ../urpm/media.pm:1055
+#: ../urpm/media.pm:1047
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "rekonfigurišem uprmi za medij \"%s\""
 
-#: ../urpm/media.pm:1089
+#: ../urpm/media.pm:1081
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...rekonfiguracija nije uspjela"
 
-#: ../urpm/media.pm:1095
+#: ../urpm/media.pm:1087
 #, c-format
 msgid "reconfiguration done"
 msgstr "rekonfiguracija završena"
 
-#: ../urpm/media.pm:1111
+#: ../urpm/media.pm:1103
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "Greška pri pravljenju names datoteke: zavisnost %d nedostaje"
 
-#: ../urpm/media.pm:1132
+#: ../urpm/media.pm:1124
 #, fuzzy, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "medij \"%s\" nije izabran"
 
-#: ../urpm/media.pm:1143
+#: ../urpm/media.pm:1135
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "ispitujem synthesis datoteku [%s]"
 
-#: ../urpm/media.pm:1163
+#: ../urpm/media.pm:1155
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problem pri čitanju synthesis datoteke za medij \"%s\""
 
-#: ../urpm/media.pm:1176 ../urpm/media.pm:1259
+#: ../urpm/media.pm:1168 ../urpm/media.pm:1263
 #, fuzzy, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "ispisujem list datoteku za medij \"%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 nije uspjelo"
 
-#: ../urpm/media.pm:1229
+#: ../urpm/media.pm:1236
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopiram opisnu datoteku za \"%s\"..."
 
-#: ../urpm/media.pm:1231 ../urpm/media.pm:1263
+#: ../urpm/media.pm:1238 ../urpm/media.pm:1267
 #, c-format
 msgid "...copying done"
 msgstr "...kopiranje završeno"
 
-#: ../urpm/media.pm:1265
+#: ../urpm/media.pm:1269
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopiranje [%s] nije uspjelo (datoteka je sumnjivo mala)"
 
-#: ../urpm/media.pm:1310
+#: ../urpm/media.pm:1317
 #, fuzzy, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "izračunavam md5sum za dobavljeni hdlist (ili synthesis)"
 
-#: ../urpm/media.pm:1312 ../urpm/media.pm:1752
+#: ../urpm/media.pm:1319 ../urpm/media.pm:1738
 #, fuzzy, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "kopiranje [%s] nije uspjelo (md5sum se ne poklapa)"
 
-#: ../urpm/media.pm:1327
+#: ../urpm/media.pm:1334
 #, fuzzy, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "ispitujem hdlist datoteku [%s]"
 
-#: ../urpm/media.pm:1337
+#: ../urpm/media.pm:1344
 #, fuzzy, c-format
 msgid "comparing %s and %s"
 msgstr "Instaliram %s na %s..."
 
-#: ../urpm/media.pm:1362
+#: ../urpm/media.pm:1374
 #, fuzzy, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
-#: ../urpm/media.pm:1388
+#: ../urpm/media.pm:1400
 #, fuzzy, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "kopiram opisnu datoteku za \"%s\"..."
 
-#: ../urpm/media.pm:1430
+#: ../urpm/media.pm:1440
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "neispravno ime rpm datoteke [%s]"
 
-#: ../urpm/media.pm:1461
-#, fuzzy, c-format
-msgid "retrieving source synthesis of \"%s\"..."
-msgstr "dobavljam hdlist (ili synthesis) za \"%s\"..."
-
-#: ../urpm/media.pm:1478
+#: ../urpm/media.pm:1443
 #, fuzzy, c-format
-msgid "found probed synthesis as %s"
-msgstr "pronašao traženi hdlist (ili synthesis) kao %s"
+msgid "no metadata found for medium \"%s\""
+msgstr "nije pronađena hdlist datoteka za medij \"%s\""
 
-#: ../urpm/media.pm:1485 ../urpm/media.pm:1593
+#: ../urpm/media.pm:1475
 #, fuzzy, c-format
-msgid "no synthesis file found for medium \"%s\""
-msgstr "nije pronađena hdlist datoteka za medij \"%s\""
+msgid "retrieving source synthesis of \"%s\"..."
+msgstr "dobavljam hdlist (ili synthesis) za \"%s\"..."
 
-#: ../urpm/media.pm:1536
+#: ../urpm/media.pm:1527
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "istražujem pubkey datoteku za \"%s\"..."
 
-#: ../urpm/media.pm:1548
+#: ../urpm/media.pm:1539
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...uveo sam ključ %s iz pubkey datoteke \"%s\"-a"
 
-#: ../urpm/media.pm:1552
+#: ../urpm/media.pm:1543
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "ne mogu uvesti pubkey datoteku za \"%s\""
 
-#: ../urpm/media.pm:1626
+#: ../urpm/media.pm:1579
+#, fuzzy, c-format
+msgid "no synthesis file found for medium \"%s\""
+msgstr "nije pronađena hdlist datoteka za medij \"%s\""
+
+#: ../urpm/media.pm:1612
 #, fuzzy, c-format
 msgid "updated medium \"%s\""
 msgstr "dodao medij %s"
 
-#: ../urpm/media.pm:1746
+#: ../urpm/media.pm:1732
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr ""
 
-#: ../urpm/mirrors.pm:19
+#: ../urpm/mirrors.pm:19 ../urpm/mirrors.pm:40
 #, c-format
 msgid "trying again with mirror %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:71
+#: ../urpm/mirrors.pm:92
 #, c-format
 msgid "Could not find a mirror from mirrorlist %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:194
+#: ../urpm/mirrors.pm:215
 #, c-format
 msgid "found geolocalisation %s %.2f %.2f from timezone %s"
 msgstr ""
 
-#: ../urpm/mirrors.pm:239
+#: ../urpm/mirrors.pm:260
 #, fuzzy, c-format
 msgid "getting mirror list from %s"
 msgstr "čitam RPM datoteke iz [%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"
@@ -1269,7 +1277,7 @@ msgstr ""
 msgid "TB"
 msgstr ""
 
-#: ../urpm/orphans.pm:307
+#: ../urpm/orphans.pm:310
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1630,11 +1638,6 @@ msgstr "  -f             - štampa verziju, izdanje i arhitekturu sa imenom.\n"
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Neispravan format: možete koristiti samo jedan viševrijednosni tag"
 
-#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
-#, c-format
-msgid "using specific environment on %s\n"
-msgstr "koristim navedenu okolinu na %s\n"
-
 #: ../urpm/search.pm:290 ../urpmf:291
 #, fuzzy, c-format
 msgid "no hdlist available for medium \"%s\""
@@ -1650,118 +1653,136 @@ msgstr "izgrađena hdlist synthesis datoteka za medij \"%s\""
 msgid "no xml-info available for medium \"%s\""
 msgstr "ispisujem list datoteku za medij \"%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 ""
 
-#: ../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"
 msgstr ""
 
-#: ../urpm/select.pm:168
+#: ../urpm/select.pm:170
 #, c-format
 msgid "No package named %s"
 msgstr "Nema paketa pod imenom %s"
 
-#: ../urpm/select.pm:170 ../urpme:115
+#: ../urpm/select.pm:172 ../urpme:115
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Sljedeći paketi sadrže %s: %s"
 
-#: ../urpm/select.pm:172
+#: ../urpm/select.pm:174
 #, c-format
 msgid "You should use \"-a\" to use all of them"
 msgstr ""
 
-#: ../urpm/select.pm:300
+#: ../urpm/select.pm:295
 #, fuzzy, c-format
 msgid "found package(s) %s in urpmi db, but none are installed"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:543
+#: ../urpm/select.pm:538
 #, fuzzy, c-format
 msgid "Package %s is already installed"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:544
+#: ../urpm/select.pm:539
 #, fuzzy, c-format
 msgid "Packages %s are already installed"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#: ../urpm/select.pm:557 ../urpm/select.pm:641
 #, c-format
 msgid "due to missing %s"
 msgstr "zbog nedostajućeg %s"
 
-#: ../urpm/select.pm:563
+#: ../urpm/select.pm:558
 #, fuzzy, c-format
 msgid "due to already installed %s"
 msgstr "sve je već instalirano"
 
-#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#: ../urpm/select.pm:559 ../urpm/select.pm:639
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "zbog nezadovoljenih %s"
 
-#: ../urpm/select.pm:570
+#: ../urpm/select.pm:565
 #, c-format
 msgid "trying to promote %s"
 msgstr "pokušavam promovirati %s"
 
-#: ../urpm/select.pm:571
+#: ../urpm/select.pm:566
 #, c-format
 msgid "in order to keep %s"
 msgstr "kako bi zadržao %s"
 
 #: ../urpm/select.pm:607
+#, fuzzy, c-format
+msgid ""
+"The following package has to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Sljedeći paketi trebaju biti uklonjeni da bi drugi mogli biti nadograđeni:\n"
+"%s"
+
+#: ../urpm/select.pm:608
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
+"Sljedeći paketi trebaju biti uklonjeni da bi drugi mogli biti nadograđeni:\n"
+"%s"
+
+#: ../urpm/select.pm:635
 #, c-format
 msgid "in order to install %s"
 msgstr "da bih instalirao %s"
 
-#: ../urpm/select.pm:617
+#: ../urpm/select.pm:645
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "zbog konflikta sa %s"
 
-#: ../urpm/signature.pm:29
+#: ../urpm/signature.pm:32
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Neispravan potpis (%s)"
 
-#: ../urpm/signature.pm:60
+#: ../urpm/signature.pm:63
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Neispravan ID ključa (%s)"
 
-#: ../urpm/signature.pm:62
+#: ../urpm/signature.pm:65
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Nedostaje potpis (%s)"
 
-#: ../urpm/sys.pm:156
+#: ../urpm/sys.pm:178
 #, c-format
 msgid "system"
 msgstr ""
 
-#: ../urpm/sys.pm:191
+#: ../urpm/sys.pm:213
 #, c-format
 msgid "You should restart %s for %s"
 msgstr ""
 
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
 #, fuzzy, c-format
 msgid "Can't write file"
 msgstr "Ne mogu napraviti konf. datoteku [%s]"
 
-#: ../urpm/sys.pm:276
+#: ../urpm/sys.pm:316
 #, fuzzy, c-format
 msgid "Can't open file"
 msgstr "Kopiranje nije uspjelo"
 
-#: ../urpm/sys.pm:289
+#: ../urpm/sys.pm:329
 #, fuzzy, c-format
 msgid "Can't move file %s to %s"
 msgstr "Kopiranje nije uspjelo"
@@ -1803,7 +1824,7 @@ msgstr ""
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - distribuirani urpmi preko mašina sa aliasom.\n"
 
-#: ../urpme:52 ../urpmi:141
+#: ../urpme:52 ../urpmi:142
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - Prepakuj datoteke prije brisanja\n"
@@ -1832,7 +1853,7 @@ msgstr ""
 "  --use-distrib  - podesi urpme u letu iz distrib stabla, korisno za\n"
 "                   chroot de-instalacije uz korištenje --root opcije.\n"
 
-#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#: ../urpme:59 ../urpmi:153 ../urpmq:89
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - rječiti mod.\n"
@@ -1900,7 +1921,7 @@ msgstr[0] "Da uklonim %d paketa?"
 msgstr[1] "Da uklonim %d paketa?"
 msgstr[2] "Da uklonim %d paketa?"
 
-#: ../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) "
@@ -2156,17 +2177,22 @@ msgstr "  --ignorearch   - dozvoli instalaciju RPMova za druge arhitekture.\n"
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
 msgstr "  --noscripts    - ne izvršavaj skripte u paketu\n"
 
-#: ../urpmi:142
+#: ../urpmi:141
+#, fuzzy, c-format
+msgid "  --replacefiles - ignore file conflicts\n"
+msgstr "  --conflicts    - tagovi za konflikte\n"
+
+#: ../urpmi:143
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - paketi čija instalacija treba biti preskočena\n"
 
-#: ../urpmi:143
+#: ../urpmi:144
 #, fuzzy, c-format
 msgid "  --prefer       - packages which should be preferred\n"
 msgstr "  --skip         - paketi čija instalacija treba biti preskočena\n"
 
-#: ../urpmi:144
+#: ../urpmi:145
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -2175,43 +2201,43 @@ msgstr ""
 "  --more-choices - ako je pronađeno više paketa, ponudi više izbora\n"
 "                   nego što je uobičajeno.\n"
 
-#: ../urpmi:146
+#: ../urpmi:147
 #, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - ne zaključavaj RPM bazu.\n"
 
-#: ../urpmi:147
+#: ../urpmi:148
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - ažuriraj samo pakete sa istom arhitekturom.\n"
 
-#: ../urpmi:148 ../urpmq:97
+#: ../urpmi:149 ../urpmq:97
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - izaberi sve pogotke na komandnoj liniji.\n"
 
-#: ../urpmi:151
+#: ../urpmi:152
 #, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q    - tihi mod.\n"
 
-#: ../urpmi:153
+#: ../urpmi:154
 #, fuzzy, c-format
 msgid "  --debug        - very verbose mode.\n"
 msgstr "  --verbose      - rječiti mod.\n"
 
-#: ../urpmi:154
+#: ../urpmi:155
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr ""
 "  imena ili rpm datoteke dati na komandnoj liniji će biti instalirani.\n"
 
-#: ../urpmi:182
+#: ../urpmi:183
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr ""
 
-#: ../urpmi:189
+#: ../urpmi:190
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
@@ -2220,28 +2246,28 @@ msgstr ""
 "Greška: Da biste generisali prijavu buga, navedite uobičajene argumente i\n"
 "dodajte --bug.\n"
 
-#: ../urpmi:219
+#: ../urpmi:220
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "Ne možete instalirati binarne RPM datoteke koristeći --install-src"
 
-#: ../urpmi:220
+#: ../urpmi:221
 #, c-format
 msgid "You can't install spec files"
 msgstr ""
 
-#: ../urpmi:227
+#: ../urpmi:228
 #, c-format
 msgid "defaulting to --buildrequires"
 msgstr ""
 
-#: ../urpmi:232
+#: ../urpmi:233
 #, c-format
 msgid ""
 "please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr ""
 
-#: ../urpmi:252
+#: ../urpmi:253
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -2250,17 +2276,12 @@ msgstr ""
 "Direktorij [%s] već postoji, molim koristite neki drugi direktorij za "
 "prijavu buga ili ga obrišite"
 
-#: ../urpmi:253
+#: ../urpmi:254
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Ne mogu napraviti direktorij [%s] za prijavu buga"
 
-#: ../urpmi:264
-#, c-format
-msgid "Environment directory %s does not exist"
-msgstr "Direktorij okruženja %s ne postoji"
-
-#: ../urpmi:287
+#: ../urpmi:275
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2269,48 +2290,48 @@ msgstr ""
 "Greška: izgleda da je %s montiran samo za čitanje.\n"
 "Koristite opciju --allow-force za prinudnu operaciju."
 
-#: ../urpmi:361
+#: ../urpmi:349
 #, c-format
 msgid "Updating media...\n"
 msgstr "Ažuriram medije...\n"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:448
+#: ../urpmi:436
 #, fuzzy, c-format
 msgid "%s: %s (to upgrade)"
 msgstr " (za ažuriranje)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:450
+#: ../urpmi:438
 #, fuzzy, c-format
 msgid "%s (to upgrade)"
 msgstr " (za ažuriranje)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:454
+#: ../urpmi:442
 #, fuzzy, c-format
 msgid "%s: %s (to install)"
 msgstr " (za instalaciju)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:456
+#: ../urpmi:444
 #, fuzzy, c-format
 msgid "%s (to install)"
 msgstr " (za instalaciju)"
 
-#: ../urpmi:462
+#: ../urpmi:450
 #, fuzzy, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
 
-#: ../urpmi:465
+#: ../urpmi:453
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Vaš izbor je? (1-%d) "
 
-#: ../urpmi:507
+#: ../urpmi:495
 #, fuzzy, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2321,7 +2342,7 @@ msgstr ""
 "koji su stariji od instaliranih:\n"
 "%s"
 
-#: ../urpmi:509
+#: ../urpmi:497
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2332,7 +2353,7 @@ msgstr ""
 "koji su stariji od instaliranih:\n"
 "%s"
 
-#: ../urpmi:515 ../urpmi:530
+#: ../urpmi:503 ../urpmi:518
 #, c-format
 msgid ""
 "\n"
@@ -2341,12 +2362,12 @@ msgstr ""
 "\n"
 "Svejedno nastavljate instalaciju?"
 
-#: ../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
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2355,7 +2376,7 @@ msgstr ""
 "Neki od traženih paketa se ne mogu instalirati:\n"
 "%s"
 
-#: ../urpmi:525
+#: ../urpmi:513
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -2364,12 +2385,12 @@ msgstr ""
 "Neki od traženih paketa se ne mogu instalirati:\n"
 "%s"
 
-#: ../urpmi:542
+#: ../urpmi:530
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "uklanjanje paketa %s će pokvariti vaš sistem"
 
-#: ../urpmi:551
+#: ../urpmi:538
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2380,7 +2401,7 @@ msgstr ""
 "uklonjeni da bi drugi mogli biti nadograđeni:\n"
 "%s\n"
 
-#: ../urpmi:553
+#: ../urpmi:540
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2391,30 +2412,12 @@ msgstr ""
 "uklonjeni da bi drugi mogli biti nadograđeni:\n"
 "%s\n"
 
-#: ../urpmi:560
-#, fuzzy, c-format
-msgid ""
-"The following package has to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Sljedeći paketi trebaju biti uklonjeni da bi drugi mogli biti nadograđeni:\n"
-"%s"
-
-#: ../urpmi:561
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr ""
-"Sljedeći paketi trebaju biti uklonjeni da bi drugi mogli biti nadograđeni:\n"
-"%s"
-
-#: ../urpmi:563
+#: ../urpmi:548
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(samo testiraj, uklanjanje neće biti izvršeno)"
 
-#: ../urpmi:583
+#: ../urpmi:568
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2424,7 +2427,7 @@ msgstr ""
 "Morate biti root da biste instalirali sljedeće ovisnosti:\n"
 "%s\n"
 
-#: ../urpmi:594
+#: ../urpmi:579
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2432,27 +2435,27 @@ msgstr[0] "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
 msgstr[1] "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
 msgstr[2] "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
 
-#: ../urpmi:610
+#: ../urpmi:595
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(samo testiraj, instalacija neće biti izvršena)"
 
-#: ../urpmi:616
+#: ../urpmi:601
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:617
+#: ../urpmi:602
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:618
+#: ../urpmi:603
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:619
+#: ../urpmi:604
 #, fuzzy, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
@@ -2460,12 +2463,12 @@ msgstr[0] "Da nastavim sa instalacijom %d paketa? (%d MB)"
 msgstr[1] "Da nastavim sa instalacijom %d paketa? (%d MB)"
 msgstr[2] "Da nastavim sa instalacijom %d paketa? (%d MB)"
 
-#: ../urpmi:640
+#: ../urpmi:625
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../urpmi:648
+#: ../urpmi:633
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Pritisnite Enter kada budete spremni..."
@@ -3213,6 +3216,14 @@ msgstr ""
 msgid "No changelog found\n"
 msgstr "Nije pronađen changelog\n"
 
+#, fuzzy
+#~ msgid "examining %s file"
+#~ msgstr "ispitujem MD5SUM datoteku"
+
+#, fuzzy
+#~ msgid "found probed synthesis as %s"
+#~ msgstr "pronašao traženi hdlist (ili synthesis) kao %s"
+
 #~ msgid "  --update       - create an update medium.\n"
 #~ msgstr "  --update       - napravi medij za unaprjeđenje.\n"