sync with code

1 files changed, 87 insertions, 82 deletions

diff --git a/po/bs.po b/po/bs.po
index 319fa69a..d79300f5 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: 2012-02-13 11:06+0100\n"
+"POT-Creation-Date: 2012-02-27 21:09+0100\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"
@@ -33,7 +33,7 @@ msgstr "RPM instalacija"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Greška: ne mogu naći datoteku %s, prekidam operaciju"
 
-#: ../gurpmi:47 ../gurpmi2:187 ../gurpmi2:212
+#: ../gurpmi:47 ../gurpmi2:196 ../gurpmi2:221
 #, c-format
 msgid "_Ok"
 msgstr "_U redu"
@@ -99,7 +99,7 @@ msgstr "_Instaliraj"
 msgid "_Save"
 msgstr "_Snimi"
 
-#: ../gurpmi:101 ../gurpmi2:187
+#: ../gurpmi:101 ../gurpmi2:196
 #, c-format
 msgid "_Cancel"
 msgstr "_Odustani"
@@ -233,7 +233,16 @@ msgstr "Instalacija paketa..."
 msgid "Preparing packages installation..."
 msgstr "Pripremam instalaciju paketa..."
 
-#: ../gurpmi2:111
+#: ../gurpmi2:112 ../urpmi:509
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr ""
+"Neki od traženih paketa se ne mogu instalirati:\n"
+"%s"
+
+#: ../gurpmi2:120
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -244,42 +253,42 @@ msgstr ""
 "%s\n"
 "Da nastavim?"
 
-#: ../gurpmi2:146
+#: ../gurpmi2:155
 #, c-format
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../gurpmi2:146 ../urpmi:626
+#: ../gurpmi2:155 ../urpmi:632
 #, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../gurpmi2:183
+#: ../gurpmi2:192
 #, c-format
 msgid " (to upgrade)"
 msgstr " (za ažuriranje)"
 
-#: ../gurpmi2:184
+#: ../gurpmi2:193
 #, c-format
 msgid " (to install)"
 msgstr " (za instalaciju)"
 
-#: ../gurpmi2:187
+#: ../gurpmi2:196
 #, c-format
 msgid "Package choice"
 msgstr "Izbor paketa"
 
-#: ../gurpmi2:188
+#: ../gurpmi2:197
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Jedan od sljedećih paketa je potreban:"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:222
 #, c-format
 msgid "_Abort"
 msgstr "_Prekini"
 
-#: ../gurpmi2:248
+#: ../gurpmi2:257
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -290,19 +299,19 @@ msgstr ""
 "%s\n"
 "Da nastavim?"
 
-#: ../gurpmi2:267 ../urpmi:593
+#: ../gurpmi2:276 ../urpmi:599
 #, 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:268 ../urpmi:594
+#: ../gurpmi2:277 ../urpmi:600
 #, 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:270
+#: ../gurpmi2:279
 #, fuzzy, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
@@ -310,44 +319,44 @@ msgstr[0] "(%d paketa, %d MB)"
 msgstr[1] "(%d paketa, %d MB)"
 msgstr[2] "(%d paketa, %d MB)"
 
-#: ../gurpmi2:278 ../urpm/main_loop.pm:49
+#: ../gurpmi2:287 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "ne mogu dobiti izvorne pakete, prekidam"
 
-#: ../gurpmi2:310 ../urpm/install.pm:81
+#: ../gurpmi2:319 ../urpm/install.pm:81
 #, c-format
 msgid "Preparing..."
 msgstr "Pripremam..."
 
-#: ../gurpmi2:316
+#: ../gurpmi2:325
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Instaliram paket `%s' (%s/%s)..."
 
-#: ../gurpmi2:334 ../urpmi:621
+#: ../gurpmi2:343 ../urpmi:627
 #, fuzzy, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "Molim ubacite medij sa imenom \"%s\" u uređaj [%s]"
 
-#: ../gurpmi2:348
+#: ../gurpmi2:357
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Downloadujem paket `%s'..."
 
-#: ../gurpmi2:360 ../urpm.pm:334 ../urpm/download.pm:831
+#: ../gurpmi2:369 ../urpm.pm:338 ../urpm/download.pm:831
 #: ../urpm/get_pkgs.pm:262 ../urpm/media.pm:981 ../urpm/media.pm:1493
 #: ../urpm/media.pm:1644
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...dobavljanje nije uspjelo: %s"
 
-#: ../gurpmi2:376
+#: ../gurpmi2:385
 #, c-format
 msgid "_Done"
 msgstr "_Gotovo"
 
-#: ../gurpmi2:393
+#: ../gurpmi2:402
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -358,27 +367,27 @@ msgstr ""
 "%s\n"
 "Možda ćete trebati osvježiti vašu urpmi bazu podataka"
 
-#: ../gurpmi2:399 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
+#: ../gurpmi2:408 ../urpm/main_loop.pm:292 ../urpm/main_loop.pm:335
 #, c-format
 msgid "Installation failed:"
 msgstr "Instalacija nije uspjela:"
 
-#: ../gurpmi2:404
+#: ../gurpmi2:413
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "sve je već instalirano"
 
-#: ../gurpmi2:406
+#: ../gurpmi2:415
 #, c-format
 msgid "Installation finished"
 msgstr "Instalacija završena"
 
-#: ../gurpmi2:407 ../urpme:169
+#: ../gurpmi2:416 ../urpme:169
 #, c-format
 msgid "removing %s"
 msgstr "uklanjam %s"
 
-#: ../gurpmi2:415 ../urpmi:686
+#: ../gurpmi2:427 ../urpmi:695
 #, c-format
 msgid "restarting urpmi"
 msgstr "restartujem urpmi"
@@ -427,77 +436,82 @@ 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:106
+#: ../urpm.pm:23
+#, c-format
+msgid "While some packages may have been installed, there were failures.\n"
+msgstr ""
+
+#: ../urpm.pm:110
 #, fuzzy, c-format
 msgid "fail to create directory %s"
 msgstr "Ne mogu pisati u direktorij za prepakiranje [%s]\n"
 
-#: ../urpm.pm:107
+#: ../urpm.pm:111
 #, fuzzy, c-format
 msgid "invalid owner for directory %s"
 msgstr "Neispravan datum ili trajanje [%s]\n"
 
-#: ../urpm.pm:131
+#: ../urpm.pm:135
 #, fuzzy, c-format
 msgid "Can not download packages into %s"
 msgstr "Ne mogu pisati u direktorij za prepakiranje [%s]\n"
 
-#: ../urpm.pm:146
+#: ../urpm.pm:150
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "Direktorij okruženja %s ne postoji"
 
-#: ../urpm.pm:147 ../urpmf:248 ../urpmq:167
+#: ../urpm.pm:151 ../urpmf:248 ../urpmq:167
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "koristim navedenu okolinu na %s\n"
 
-#: ../urpm.pm:309
+#: ../urpm.pm:313
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "ne mogu otvoriti rpmdb"
 
-#: ../urpm.pm:323
+#: ../urpm.pm:327
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "neispravno ime rpm datoteke [%s]"
 
-#: ../urpm.pm:329
+#: ../urpm.pm:333
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "dobavljam rpm datoteku [%s] ..."
 
-#: ../urpm.pm:331 ../urpm/get_pkgs.pm:260
+#: ../urpm.pm:335 ../urpm/get_pkgs.pm:260
 #, c-format
 msgid "...retrieving done"
 msgstr "...download završen"
 
-#: ../urpm.pm:339
+#: ../urpm.pm:343
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ne mogu pristupiti rpm datoteci [%s]"
 
-#: ../urpm.pm:344
+#: ../urpm.pm:348
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "ne mogu obraditi spec datoteku %s [%s]"
 
-#: ../urpm.pm:352
+#: ../urpm.pm:356
 #, c-format
 msgid "unable to register rpm file"
 msgstr "ne mogu registrovati rpm datoteku"
 
-#: ../urpm.pm:354
+#: ../urpm.pm:358
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "Nekompatibilna arhitektura za paket [%s]"
 
-#: ../urpm.pm:358
+#: ../urpm.pm:362
 #, c-format
 msgid "error registering local packages"
 msgstr "greška pri registrovanju lokalnih paketa"
 
-#: ../urpm.pm:446
+#: ../urpm.pm:450
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Ova operacija je zabranjena dok ste u ograničenom režimu"
@@ -507,52 +521,52 @@ msgstr "Ova operacija je zabranjena dok ste u ograničenom režimu"
 msgid "bad proxy declaration on command line\n"
 msgstr "pogrešna deklaracija proxy-ja na komandnoj liniji\n"
 
-#: ../urpm/args.pm:306
+#: ../urpm/args.pm:307
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: ne mogu pročitati rpm datoteku \"%s\"\n"
 
-#: ../urpm/args.pm:381
+#: ../urpm/args.pm:384
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "Izrazi za uzorke:\n"
 
-#: ../urpm/args.pm:382
+#: ../urpm/args.pm:385
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "Nedostaje potpis (%s)"
 
-#: ../urpm/args.pm:388
+#: ../urpm/args.pm:391
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:392
+#: ../urpm/args.pm:395
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "Izrazi za uzorke:\n"
 
-#: ../urpm/args.pm:401
+#: ../urpm/args.pm:404
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr ""
 
-#: ../urpm/args.pm:475
+#: ../urpm/args.pm:478
 #, fuzzy, c-format
 msgid "chroot directory doesn't exist"
 msgstr "Direktorij okruženja %s ne postoji"
 
-#: ../urpm/args.pm:498
+#: ../urpm/args.pm:501
 #, c-format
 msgid "Can't use %s without %s"
 msgstr ""
 
-#: ../urpm/args.pm:501 ../urpm/args.pm:504 ../urpmq:159
+#: ../urpm/args.pm:504 ../urpm/args.pm:507 ../urpmq:159
 #, c-format
 msgid "Can't use %s with %s"
 msgstr ""
 
-#: ../urpm/args.pm:512
+#: ../urpm/args.pm:515
 #, c-format
 msgid "Too many arguments\n"
 msgstr "Previše argumenata\n"
@@ -1249,7 +1263,7 @@ msgstr ""
 msgid "getting mirror list from %s"
 msgstr "čitam RPM datoteke iz [%s]"
 
-#: ../urpm/msg.pm:76 ../urpmi:495 ../urpmi:510 ../urpmi:613
+#: ../urpm/msg.pm:76 ../urpmi:495 ../urpmi:513 ../urpmi:619
 #, c-format
 msgid "Nn"
 msgstr "Nn"
@@ -1569,17 +1583,17 @@ msgstr ""
 msgid "You should restart %s for %s"
 msgstr ""
 
-#: ../urpm/sys.pm:331
+#: ../urpm/sys.pm:352
 #, fuzzy, c-format
 msgid "Can't write file"
 msgstr "Ne mogu napraviti konf. datoteku [%s]"
 
-#: ../urpm/sys.pm:331
+#: ../urpm/sys.pm:352
 #, fuzzy, c-format
 msgid "Can't open file"
 msgstr "Kopiranje nije uspjelo"
 
-#: ../urpm/sys.pm:344
+#: ../urpm/sys.pm:365
 #, fuzzy, c-format
 msgid "Can't move file %s to %s"
 msgstr "Kopiranje nije uspjelo"
@@ -2438,7 +2452,7 @@ msgstr ""
 "koji su stariji od instaliranih:\n"
 "%s"
 
-#: ../urpmi:496 ../urpmi:511
+#: ../urpmi:496 ../urpmi:514
 #, c-format
 msgid ""
 "\n"
@@ -2447,12 +2461,12 @@ msgstr ""
 "\n"
 "Svejedno nastavljate instalaciju?"
 
-#: ../urpmi:497 ../urpmi:512 ../urpmi:614 ../urpmi.addmedia:136
+#: ../urpmi:497 ../urpmi:515 ../urpmi:620 ../urpmi.addmedia:136
 #, c-format
 msgid " (Y/n) "
 msgstr " (D/n) "
 
-#: ../urpmi:505
+#: ../urpmi:508
 #, fuzzy, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2461,21 +2475,12 @@ msgstr ""
 "Neki od traženih paketa se ne mogu instalirati:\n"
 "%s"
 
-#: ../urpmi:506
-#, c-format
-msgid ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr ""
-"Neki od traženih paketa se ne mogu instalirati:\n"
-"%s"
-
-#: ../urpmi:523
+#: ../urpmi:529
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "uklanjanje paketa %s će pokvariti vaš sistem"
 
-#: ../urpmi:531
+#: ../urpmi:537
 #, fuzzy, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2486,7 +2491,7 @@ msgstr ""
 "uklonjeni da bi drugi mogli biti nadograđeni:\n"
 "%s\n"
 
-#: ../urpmi:533
+#: ../urpmi:539
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2497,12 +2502,12 @@ msgstr ""
 "uklonjeni da bi drugi mogli biti nadograđeni:\n"
 "%s\n"
 
-#: ../urpmi:541
+#: ../urpmi:547
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(samo testiraj, uklanjanje neće biti izvršeno)"
 
-#: ../urpmi:560
+#: ../urpmi:566
 #, fuzzy, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2512,7 +2517,7 @@ msgstr ""
 "Morate biti root da biste instalirali sljedeće ovisnosti:\n"
 "%s\n"
 
-#: ../urpmi:570
+#: ../urpmi:576
 #, fuzzy, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
@@ -2520,27 +2525,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:596
+#: ../urpmi:602
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(samo testiraj, instalacija neće biti izvršena)"
 
-#: ../urpmi:602
+#: ../urpmi:608
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr ""
 
-#: ../urpmi:603
+#: ../urpmi:609
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr ""
 
-#: ../urpmi:604
+#: ../urpmi:610
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr ""
 
-#: ../urpmi:605
+#: ../urpmi:611
 #, fuzzy, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
@@ -2548,12 +2553,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:626
+#: ../urpmi:632
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../urpmi:634
+#: ../urpmi:640
 #, fuzzy, c-format
 msgid "Press Enter when mounted..."
 msgstr "Pritisnite Enter kada budete spremni..."