reuse an urpmi string

1 files changed, 1147 insertions, 1109 deletions

diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index be6ff35a..0744d132 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-21 17:11+0100\n"
+"POT-Creation-Date: 2007-03-06 16:07+0100\n"
 "PO-Revision-Date: 2004-02-01 19:31+0100\n"
 "Last-Translator: Miodrag Zivkovic <miodragz@linuxo.org\n"
 "Language-Team: serbian <www.linuxo.org>\n"
@@ -21,12 +21,12 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../edit-urpm-sources.pl:85
+#: ../Rpmdrake/edit_urpm_sources.pm:75
 #, c-format
 msgid "Choose media type"
 msgstr "Izaberi tip medija"
 
-#: ../edit-urpm-sources.pl:86
+#: ../Rpmdrake/edit_urpm_sources.pm:76
 #, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
@@ -41,17 +41,17 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:94
+#: ../Rpmdrake/edit_urpm_sources.pm:84
 #, c-format
 msgid "Distribution sources"
 msgstr "Izvori distribucije"
 
-#: ../edit-urpm-sources.pl:94
+#: ../Rpmdrake/edit_urpm_sources.pm:84
 #, c-format
 msgid "Official updates"
 msgstr "Zvanične nadogradnje"
 
-#: ../edit-urpm-sources.pl:97
+#: ../Rpmdrake/edit_urpm_sources.pm:87
 #, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
@@ -70,103 +70,104 @@ msgstr ""
 "\n"
 "Da li je U redu da nastavim?"
 
-#: ../edit-urpm-sources.pl:111
+#: ../Rpmdrake/edit_urpm_sources.pm:101
 #, c-format
 msgid "Please wait, adding media..."
 msgstr "Molim Vas sačekajte, ubacujem medijum..."
 
-#: ../edit-urpm-sources.pl:144
+#: ../Rpmdrake/edit_urpm_sources.pm:134
 #, c-format
 msgid "Add a medium"
 msgstr "Dodaj medij"
 
-#: ../edit-urpm-sources.pl:146
+#: ../Rpmdrake/edit_urpm_sources.pm:138
 #, c-format
 msgid "Local files"
 msgstr "Lokalni fajlovi"
 
-#: ../edit-urpm-sources.pl:146
+#: ../Rpmdrake/edit_urpm_sources.pm:138
 #, c-format
 msgid "Path:"
 msgstr "Putanja:"
 
-#: ../edit-urpm-sources.pl:147
+#: ../Rpmdrake/edit_urpm_sources.pm:139
 #, c-format
 msgid "FTP server"
 msgstr "FTP server"
 
-#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
-#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#: ../Rpmdrake/edit_urpm_sources.pm:139 ../Rpmdrake/edit_urpm_sources.pm:140
+#: ../Rpmdrake/edit_urpm_sources.pm:141 ../Rpmdrake/edit_urpm_sources.pm:418
 #, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:148
+#: ../Rpmdrake/edit_urpm_sources.pm:140
 #, c-format
 msgid "RSYNC server"
 msgstr "RSYNC server"
 
-#: ../edit-urpm-sources.pl:149
+#: ../Rpmdrake/edit_urpm_sources.pm:141
 #, c-format
 msgid "HTTP server"
 msgstr "HTTP server"
 
-#: ../edit-urpm-sources.pl:150
+#: ../Rpmdrake/edit_urpm_sources.pm:142
 #, c-format
 msgid "Removable device"
 msgstr "Prenosni uređaj"
 
-#: ../edit-urpm-sources.pl:150
+#: ../Rpmdrake/edit_urpm_sources.pm:142
 #, c-format
 msgid "Path or mount point:"
 msgstr "Putanja ili tačka montiranja:"
 
-#: ../edit-urpm-sources.pl:169
+#: ../Rpmdrake/edit_urpm_sources.pm:160
 #, c-format
 msgid "Browse..."
 msgstr "Traži..."
 
-#: ../edit-urpm-sources.pl:196
+#: ../Rpmdrake/edit_urpm_sources.pm:187
 #, c-format
 msgid "Login:"
 msgstr "Prijava:"
 
-#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#: ../Rpmdrake/edit_urpm_sources.pm:187 ../Rpmdrake/edit_urpm_sources.pm:504
+#: ../rpmdrake.pm:135
 #, c-format
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#: ../Rpmdrake/edit_urpm_sources.pm:192 ../Rpmdrake/edit_urpm_sources.pm:419
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Relativna putanja ka synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:203
+#: ../Rpmdrake/edit_urpm_sources.pm:194
 #, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Ukoliko ostavite prazno, synthesis/hdlist će biti automatski testirana"
 
-#: ../edit-urpm-sources.pl:208
+#: ../Rpmdrake/edit_urpm_sources.pm:199
 #, c-format
 msgid "Name:"
 msgstr "Ime:"
 
-#: ../edit-urpm-sources.pl:216
+#: ../Rpmdrake/edit_urpm_sources.pm:207
 #, c-format
 msgid "Create media for a whole distribution"
 msgstr "Napravi medij za celu distribuciju"
 
-#: ../edit-urpm-sources.pl:227
+#: ../Rpmdrake/edit_urpm_sources.pm:218
 #, c-format
 msgid "Search this media for updates"
 msgstr "Pretražite ovaj medij za nadogradnjama"
 
-#: ../edit-urpm-sources.pl:237
+#: ../Rpmdrake/edit_urpm_sources.pm:228
 #, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "Morate da popunite najmanje prva dva polja."
 
-#: ../edit-urpm-sources.pl:241
+#: ../Rpmdrake/edit_urpm_sources.pm:232
 #, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
@@ -175,131 +176,137 @@ msgstr ""
 "Već postoji medij sa tim imenom, da li\n"
 "zaista želite da ga zamenite?"
 
-#: ../edit-urpm-sources.pl:252
+#: ../Rpmdrake/edit_urpm_sources.pm:244
 #, c-format
 msgid "Adding a medium:"
 msgstr "Dodajem medij:"
 
-#: ../edit-urpm-sources.pl:254
+#: ../Rpmdrake/edit_urpm_sources.pm:246
 #, c-format
 msgid "Type of medium:"
 msgstr "Tip medija:"
 
-#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
-#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
-#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
-#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
-#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
-#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#: ../Rpmdrake/edit_urpm_sources.pm:256 ../Rpmdrake/edit_urpm_sources.pm:332
+#: ../Rpmdrake/edit_urpm_sources.pm:428 ../Rpmdrake/edit_urpm_sources.pm:455
+#: ../Rpmdrake/edit_urpm_sources.pm:521 ../Rpmdrake/edit_urpm_sources.pm:608
+#: ../Rpmdrake/edit_urpm_sources.pm:649 ../Rpmdrake/edit_urpm_sources.pm:707
+#: ../Rpmdrake/edit_urpm_sources.pm:856 ../Rpmdrake/gui.pm:473
+#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:527 ../Rpmdrake/pkg.pm:573
+#: ../rpmdrake.pm:296 ../rpmdrake.pm:609 ../rpmdrake.pm:694 ../rpmdrake.pm:767
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
-#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
-#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
-#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
-#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
-#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
-#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
-#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#: ../Rpmdrake/edit_urpm_sources.pm:258 ../Rpmdrake/edit_urpm_sources.pm:334
+#: ../Rpmdrake/edit_urpm_sources.pm:455 ../Rpmdrake/edit_urpm_sources.pm:511
+#: ../Rpmdrake/edit_urpm_sources.pm:605 ../Rpmdrake/edit_urpm_sources.pm:648
+#: ../Rpmdrake/edit_urpm_sources.pm:700 ../Rpmdrake/edit_urpm_sources.pm:773
+#: ../Rpmdrake/edit_urpm_sources.pm:902 ../Rpmdrake/edit_urpm_sources.pm:1062
+#: ../Rpmdrake/gui.pm:473 ../Rpmdrake/gui.pm:489 ../Rpmdrake/gui.pm:494
+#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:527 ../Rpmdrake/pkg.pm:756
+#: ../Rpmdrake/rpmnew.pm:172 ../rpmdrake.pm:126 ../rpmdrake.pm:236
+#: ../rpmdrake.pm:298 ../rpmdrake.pm:609
 #, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../edit-urpm-sources.pl:321
+#: ../Rpmdrake/edit_urpm_sources.pm:315
 #, c-format
 msgid "Global options for package installation"
 msgstr "Globalne opcije za instalaciju paketa"
 
-#: ../edit-urpm-sources.pl:323
+#: ../Rpmdrake/edit_urpm_sources.pm:318
 #, c-format
 msgid "always"
 msgstr "uvek"
 
-#: ../edit-urpm-sources.pl:324
+#: ../Rpmdrake/edit_urpm_sources.pm:319
 #, c-format
 msgid "never"
 msgstr "nikad"
 
-#: ../edit-urpm-sources.pl:333
+#: ../Rpmdrake/edit_urpm_sources.pm:328
 #, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Verifikovani RPM paketi koji će biti instalirani:"
 
-#: ../edit-urpm-sources.pl:334
+#: ../Rpmdrake/edit_urpm_sources.pm:329
 #, c-format
 msgid "Download program to use:"
 msgstr "Preuzmi programe koji će biti korišćeni:"
 
-#: ../edit-urpm-sources.pl:364
+#: ../Rpmdrake/edit_urpm_sources.pm:360
 #, c-format
 msgid "Source Removal"
 msgstr "Uklanjanje izvora"
 
-#: ../edit-urpm-sources.pl:365
+#: ../Rpmdrake/edit_urpm_sources.pm:362
 #, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Da li ste sigurni da želite da uklonite izvore \"%s\"?"
 
-#: ../edit-urpm-sources.pl:370
+#: ../Rpmdrake/edit_urpm_sources.pm:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the following sources ?"
+msgstr "Da li ste sigurni da želite da uklonite izvore \"%s\"?"
+
+#: ../Rpmdrake/edit_urpm_sources.pm:369
 #, c-format
 msgid "Please wait, removing medium..."
 msgstr "Molimo Vas sačekajte, uklanjam medijum..."
 
-#: ../edit-urpm-sources.pl:405
+#: ../Rpmdrake/edit_urpm_sources.pm:408
 #, c-format
 msgid "Edit a medium"
 msgstr "Izmeni medij"
 
-#: ../edit-urpm-sources.pl:411
+#: ../Rpmdrake/edit_urpm_sources.pm:415
 #, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Menjam medij \"%s\":"
 
-#: ../edit-urpm-sources.pl:416
+#: ../Rpmdrake/edit_urpm_sources.pm:420
 #, c-format
 msgid "Downloader:"
 msgstr "Preuzimač:"
 
-#: ../edit-urpm-sources.pl:428
+#: ../Rpmdrake/edit_urpm_sources.pm:432
 #, c-format
 msgid "Save changes"
 msgstr "Sačuvaj izmene"
 
-#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#: ../Rpmdrake/edit_urpm_sources.pm:441 ../Rpmdrake/edit_urpm_sources.pm:1049
 #, c-format
 msgid "Proxy..."
 msgstr "Proksi..."
 
-#: ../edit-urpm-sources.pl:449
+#: ../Rpmdrake/edit_urpm_sources.pm:453
 #, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Morate da ubacite medijum kako bi ste nastavili"
 
-#: ../edit-urpm-sources.pl:450
+#: ../Rpmdrake/edit_urpm_sources.pm:454
 #, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Da bi ste sačuvali izmene, morate da ubacite medijum u uređaj."
 
-#: ../edit-urpm-sources.pl:471
+#: ../Rpmdrake/edit_urpm_sources.pm:475
 #, c-format
 msgid "Configure proxies"
 msgstr "Podešavanje proksija"
 
-#: ../edit-urpm-sources.pl:482
+#: ../Rpmdrake/edit_urpm_sources.pm:487
 #, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Proksi podešavanja da medij \"%s\""
 
-#: ../edit-urpm-sources.pl:483
+#: ../Rpmdrake/edit_urpm_sources.pm:488
 #, c-format
 msgid "Global proxy settings"
 msgstr "Globalna proksi podešavanja"
 
-#: ../edit-urpm-sources.pl:485
+#: ../Rpmdrake/edit_urpm_sources.pm:490
 #, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
@@ -308,139 +315,140 @@ msgstr ""
 "Ako Vam je potreban proksi, unesite ime domaćina i opcioni port (sintaksa: "
 "<proksi-domacin[:port]>):"
 
-#: ../edit-urpm-sources.pl:488
+#: ../Rpmdrake/edit_urpm_sources.pm:493
 #, c-format
 msgid "Proxy hostname:"
 msgstr "Ime proksi domaćina(hostname):"
 
-#: ../edit-urpm-sources.pl:491
+#: ../Rpmdrake/edit_urpm_sources.pm:496
 #, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Možete da podesite korisnika/lozinku za identifikaciju proksija:"
 
-#: ../edit-urpm-sources.pl:494
+#: ../Rpmdrake/edit_urpm_sources.pm:499
 #, c-format
 msgid "User:"
 msgstr "Korisnik:"
 
-#: ../edit-urpm-sources.pl:566
+#: ../Rpmdrake/edit_urpm_sources.pm:574
 #, c-format
 msgid "Add a parallel group"
 msgstr "Dodaj paralelnu grupu"
 
-#: ../edit-urpm-sources.pl:566
+#: ../Rpmdrake/edit_urpm_sources.pm:574
 #, c-format
 msgid "Edit a parallel group"
 msgstr "Uredite paralelnu grupu"
 
-#: ../edit-urpm-sources.pl:577
+#: ../Rpmdrake/edit_urpm_sources.pm:586
 #, c-format
 msgid "Add a medium limit"
 msgstr "Dodaj limit za medij"
 
-#: ../edit-urpm-sources.pl:589
+#: ../Rpmdrake/edit_urpm_sources.pm:599
 #, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Izaberite medij za dodavanje u limit za medije:"
 
-#: ../edit-urpm-sources.pl:626
+#: ../Rpmdrake/edit_urpm_sources.pm:636
 #, c-format
 msgid "Add a host"
 msgstr "Dodaj host"
 
-#: ../edit-urpm-sources.pl:632
+#: ../Rpmdrake/edit_urpm_sources.pm:643
 #, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Unesite u ime hosta ili  IP adresu hosta za dodavanje:"
 
-#: ../edit-urpm-sources.pl:663
+#: ../Rpmdrake/edit_urpm_sources.pm:674
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Izmeni paralelnu grupu \"%s\":"
 
-#: ../edit-urpm-sources.pl:667
+#: ../Rpmdrake/edit_urpm_sources.pm:678
 #, c-format
 msgid "Group name:"
 msgstr "Ime grupe:"
 
-#: ../edit-urpm-sources.pl:668
+#: ../Rpmdrake/edit_urpm_sources.pm:679
 #, c-format
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../edit-urpm-sources.pl:670
+#: ../Rpmdrake/edit_urpm_sources.pm:681
 #, c-format
 msgid "Media limit:"
 msgstr "Limit medija:"
 
-#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#: ../Rpmdrake/edit_urpm_sources.pm:686 ../Rpmdrake/edit_urpm_sources.pm:693
 #, c-format
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#: ../Rpmdrake/edit_urpm_sources.pm:687 ../Rpmdrake/edit_urpm_sources.pm:694
+#: ../Rpmdrake/edit_urpm_sources.pm:753 ../Rpmdrake/edit_urpm_sources.pm:1027
 #, c-format
 msgid "Remove"
 msgstr "Ukloni"
 
-#: ../edit-urpm-sources.pl:677
+#: ../Rpmdrake/edit_urpm_sources.pm:688
 #, c-format
 msgid "Hosts:"
 msgstr "Domaćini(Hosts):"
 
-#: ../edit-urpm-sources.pl:711
+#: ../Rpmdrake/edit_urpm_sources.pm:722
 #, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Podesite paralelni urpmi (distribuirano pokretanje urpmi-ja)"
 
-#: ../edit-urpm-sources.pl:714
+#: ../Rpmdrake/edit_urpm_sources.pm:726
 #, c-format
 msgid "Group"
 msgstr "Grupa"
 
-#: ../edit-urpm-sources.pl:714
+#: ../Rpmdrake/edit_urpm_sources.pm:726
 #, c-format
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../edit-urpm-sources.pl:714
+#: ../Rpmdrake/edit_urpm_sources.pm:726
 #, c-format
 msgid "Media limit"
 msgstr "Limit za medije"
 
-#: ../edit-urpm-sources.pl:715
+#: ../Rpmdrake/edit_urpm_sources.pm:727
 #, c-format
 msgid "Command"
 msgstr "Komanda"
 
-#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
-#: ../rpmdrake:882 ../rpmdrake:1773
+#: ../Rpmdrake/edit_urpm_sources.pm:737 ../Rpmdrake/gui.pm:675
+#: ../Rpmdrake/pkg.pm:98 ../Rpmdrake/pkg.pm:128 ../Rpmdrake/pkg.pm:167
+#: ../Rpmdrake/rpmnew.pm:77
 #, c-format
 msgid "(none)"
 msgstr "(nijedan)"
 
-#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#: ../Rpmdrake/edit_urpm_sources.pm:757 ../Rpmdrake/edit_urpm_sources.pm:1031
 #, c-format
 msgid "Edit..."
 msgstr "Izmeni"
 
-#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#: ../Rpmdrake/edit_urpm_sources.pm:765 ../Rpmdrake/edit_urpm_sources.pm:1037
 #, c-format
 msgid "Add..."
 msgstr "Dodaj..."
 
-#: ../edit-urpm-sources.pl:769
+#: ../Rpmdrake/edit_urpm_sources.pm:781
 #, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Upravlja ključevima za digitalne potpise paketa"
 
-#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#: ../Rpmdrake/edit_urpm_sources.pm:787 ../Rpmdrake/edit_urpm_sources.pm:959
 #, c-format
 msgid "Medium"
 msgstr "Medij"
 
-#: ../edit-urpm-sources.pl:780
+#: ../Rpmdrake/edit_urpm_sources.pm:793
 #, c-format
 msgid ""
 "_:cryptographic keys\n"
@@ -449,32 +457,32 @@ msgstr ""
 "_:kriptografski ključevi\n"
 "Ključevi"
 
-#: ../edit-urpm-sources.pl:803
+#: ../Rpmdrake/edit_urpm_sources.pm:817
 #, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "ime nije pronađeno, ključ ne postoji u rpm keyring!"
 
-#: ../edit-urpm-sources.pl:816
+#: ../Rpmdrake/edit_urpm_sources.pm:830
 #, c-format
 msgid "Add a key"
 msgstr "Dodaj ključ"
 
-#: ../edit-urpm-sources.pl:828
+#: ../Rpmdrake/edit_urpm_sources.pm:843
 #, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Izaberi ključ koji treba dodati medijumu %s"
 
-#: ../edit-urpm-sources.pl:834
+#: ../Rpmdrake/edit_urpm_sources.pm:849
 #, c-format
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../edit-urpm-sources.pl:856
+#: ../Rpmdrake/edit_urpm_sources.pm:871
 #, c-format
 msgid "Remove a key"
 msgstr "Ukloni ključ"
 
-#: ../edit-urpm-sources.pl:857
+#: ../Rpmdrake/edit_urpm_sources.pm:872
 #, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
@@ -483,39 +491,39 @@ msgstr ""
 "Da li ste sigurni da želite da uklonite ključ %s sa medija %s?\n"
 "(ime ključa: %s)"
 
-#: ../edit-urpm-sources.pl:875
+#: ../Rpmdrake/edit_urpm_sources.pm:890
 #, c-format
 msgid "Add a key..."
 msgstr "Dodaj ključ..."
 
-#: ../edit-urpm-sources.pl:879
+#: ../Rpmdrake/edit_urpm_sources.pm:894
 #, c-format
 msgid "Remove key"
 msgstr "Ukloni ključ"
 
-#: ../edit-urpm-sources.pl:895
+#: ../Rpmdrake/edit_urpm_sources.pm:911
 #, c-format
 msgid "Configure media"
 msgstr "Podešavanje medija"
 
-#: ../edit-urpm-sources.pl:934
+#: ../Rpmdrake/edit_urpm_sources.pm:957
 #, c-format
-msgid "Enabled?"
-msgstr "Uključi?"
+msgid "Enabled"
+msgstr "Uključi"
 
-#: ../edit-urpm-sources.pl:935
+#: ../Rpmdrake/edit_urpm_sources.pm:958
 #, c-format
-msgid "Updates?"
-msgstr "Nadogradnje?"
+msgid "Updates"
+msgstr "Nadogradnje"
 
-#: ../edit-urpm-sources.pl:951
+#: ../Rpmdrake/edit_urpm_sources.pm:974
 #, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 "Ovaj medij se mora nadograditi da bio upotrebljiv. Da li želite sada da se "
 "nadogradi ?"
 
-#: ../edit-urpm-sources.pl:981
+#: ../Rpmdrake/edit_urpm_sources.pm:1006
 #, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
@@ -526,37 +534,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:1015
+#: ../Rpmdrake/edit_urpm_sources.pm:1041
 #, c-format
 msgid "Add custom..."
 msgstr "Dodaj uobičajno..."
 
-#: ../edit-urpm-sources.pl:1019
+#: ../Rpmdrake/edit_urpm_sources.pm:1045
 #, c-format
 msgid "Update..."
 msgstr "Nadogradi..."
 
-#: ../edit-urpm-sources.pl:1022
+#: ../Rpmdrake/edit_urpm_sources.pm:1048
 #, c-format
 msgid "Manage keys..."
 msgstr "Uredi ključeve..."
 
-#: ../edit-urpm-sources.pl:1024
+#: ../Rpmdrake/edit_urpm_sources.pm:1050
 #, c-format
 msgid "Parallel..."
 msgstr "Paralelno..."
 
-#: ../edit-urpm-sources.pl:1025
+#: ../Rpmdrake/edit_urpm_sources.pm:1051
 #, c-format
 msgid "Global options..."
 msgstr "Globalne opcije"
 
-#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#: ../Rpmdrake/edit_urpm_sources.pm:1061 ../rpmdrake:470
 #, c-format
 msgid "Help"
 msgstr "Pomoć"
 
-#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#: ../Rpmdrake/edit_urpm_sources.pm:1077 ../Rpmdrake/init.pm:132
+#: ../gurpmi.addmedia:93
 #, c-format
 msgid ""
 "%s\n"
@@ -567,7 +576,7 @@ msgstr ""
 "\n"
 "Da li je u redu da nastavim?"
 
-#: ../edit-urpm-sources.pl:1054
+#: ../Rpmdrake/edit_urpm_sources.pm:1080
 #, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
@@ -583,7 +592,7 @@ msgstr ""
 "na vašem računaru. Nakon toga će biti spremni za instalaciju novih paketa\n"
 "ili za nadogradnju starih."
 
-#: ../edit-urpm-sources.pl:1067
+#: ../Rpmdrake/edit_urpm_sources.pm:1096
 #, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
@@ -592,1341 +601,1115 @@ msgid ""
 "packages as well?)."
 msgstr ""
 
-#: ../gurpmi.addmedia:88
+#: ../Rpmdrake/gui.pm:59 ../Rpmdrake/gui.pm:116
 #, c-format
-msgid "Unable to add medium, wrong or missing arguments"
-msgstr "Nemoguće je ubaciti medij,argumenti su pogrešni ili nedostaju "
+msgid "Importance: "
+msgstr "Važnost: "
 
-#: ../gurpmi.addmedia:102
+#: ../Rpmdrake/gui.pm:60 ../Rpmdrake/gui.pm:124
 #, c-format
-msgid ""
-"You are about to add new packages media, %s.\n"
-"That means you will be able to add new software packages\n"
-"to your system from these new media."
-msgstr ""
+msgid "Reason for update: "
+msgstr "Razlog za nadogradnju:"
 
-#: ../gurpmi.addmedia:105
+#: ../Rpmdrake/gui.pm:64
 #, c-format
-msgid ""
-"You are about to add a new packages medium, `%s'.\n"
-"That means you will be able to add new software packages\n"
-"to your system from that new medium."
-msgstr ""
-"Na putu ste da dodate novi medij sa paketima, `%s'.\n"
-"To znači da će te moći da dodate nove softverske pakete\n"
-"u Vaš sistem sa tih novih medija."
+msgid "Security advisory"
+msgstr "Sigurnosni saveti"
 
-#: ../gurpmi.addmedia:130
+#: ../Rpmdrake/gui.pm:72 ../Rpmdrake/gui.pm:126
 #, c-format
-msgid "Successfully added media %s."
-msgstr "Uspešno dodat medij `%s'."
+msgid "No description"
+msgstr "Bez opisa"
 
-#: ../gurpmi.addmedia:131
+#: ../Rpmdrake/gui.pm:75
 #, c-format
-msgid "Successfully added medium `%s'."
-msgstr "Uspešno dodat medij `%s'"
+msgid "Files:"
+msgstr "Fajlovi:"
 
-#: ../rpmdrake:39
+#: ../Rpmdrake/gui.pm:79 ../Rpmdrake/gui.pm:84 ../Rpmdrake/gui.pm:98
+#: ../Rpmdrake/gui.pm:100 ../Rpmdrake/pkg.pm:134
 #, c-format
-msgid "Usage: %s [OPTION]..."
-msgstr "Upotreba: %s [OPCIJA]..."
+msgid "(Not available)"
+msgstr "(Nije dostupno)"
+
+#: ../Rpmdrake/gui.pm:83
+#, c-format
+msgid "Changelog:"
+msgstr "Izmene:"
+
+#: ../Rpmdrake/gui.pm:95
+#, c-format
+msgid "Files:\n"
+msgstr "Fajlovi:\n"
+
+#: ../Rpmdrake/gui.pm:100
+#, c-format
+msgid "Changelog:\n"
+msgstr "Izmene:\n"
+
+#: ../Rpmdrake/gui.pm:105 ../rpmdrake.pm:820
+#, c-format
+msgid "Medium: "
+msgstr "Medij: "
+
+#: ../Rpmdrake/gui.pm:106
+#, c-format
+msgid "Currently installed version: "
+msgstr "Trenutno instalirana verzija: "
 
-#: ../rpmdrake:40
+#: ../Rpmdrake/gui.pm:110
+#, c-format
+msgid "Name: "
+msgstr "Ime: "
+
+#: ../Rpmdrake/gui.pm:111
+#, c-format
+msgid "Version: "
+msgstr "Verzija: "
+
+#: ../Rpmdrake/gui.pm:112
+#, c-format
+msgid "Architecture: "
+msgstr "Arhitektura"
+
+#: ../Rpmdrake/gui.pm:113
+#, c-format
+msgid "Size: "
+msgstr "Veličina: "
+
+#: ../Rpmdrake/gui.pm:113
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../Rpmdrake/gui.pm:120
+#, c-format
+msgid "Summary: "
+msgstr "Sažetak: "
+
+#: ../Rpmdrake/gui.pm:126
+#, c-format
+msgid "Description: "
+msgstr "Opis:"
+
+#: ../Rpmdrake/gui.pm:448 ../Rpmdrake/gui.pm:485 ../Rpmdrake/gui.pm:487
+#, c-format
+msgid "More information on package..."
+msgstr "Dodatne informacije o paketu..."
+
+#: ../Rpmdrake/gui.pm:450
+#, c-format
+msgid "Please choose"
+msgstr "Molim Vas izaberite"
+
+#: ../Rpmdrake/gui.pm:451
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgstr "Jedan od sledećih paketa je potreban:"
+
+#: ../Rpmdrake/gui.pm:451
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Jedan od sledećih paketa je potreban:"
+
+#. -PO: Keep it short, this is gonna be on a button
+#: ../Rpmdrake/gui.pm:473 ../Rpmdrake/gui.pm:478
+#, c-format
+msgid "More info"
+msgstr "Još informacija"
+
+#: ../Rpmdrake/gui.pm:480
+#, c-format
+msgid "Information on packages"
+msgstr "Informacije o paketima"
+
+#: ../Rpmdrake/gui.pm:503
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Još neki paketi moraju biti uklonjeni"
+
+#: ../Rpmdrake/gui.pm:504
 #, c-format
 msgid ""
-"  --changelog-first      display changelog before filelist in the "
-"description window"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:"
 msgstr ""
-"  --changelog-first      pokaži beleške promena pre liste datoteka u prozoru "
-"za objašnjenje"
+"Da bi zadovoljili sve zavisnosti,sledeći paket(i) bi takođe trebalo da se "
+"uklone:"
 
-#: ../rpmdrake:41
+#: ../Rpmdrake/gui.pm:510 ../Rpmdrake/gui.pm:519
 #, c-format
-msgid "  --media=medium1,..     limit to given media"
-msgstr "  --media=medium1,..     granica za dati medij"
+msgid "Some packages can't be removed"
+msgstr "Neki paketi se ne mogu ukloniti"
 
-#: ../rpmdrake:42
+#: ../Rpmdrake/gui.pm:511
 #, c-format
 msgid ""
-"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
-"  --merge-all-rpmnew     predloži da budu sjedinjeni svi fajlovi .rpmnew/."
-"rpmsave koji su nađeni"
+"Žalim, ali uklanjanjem ovih paketa bi ste oštetiti sistem:\n"
+"\n"
 
-#: ../rpmdrake:43
+#: ../Rpmdrake/gui.pm:520 ../Rpmdrake/gui.pm:587
 #, c-format
-msgid "  --mode=MODE            set mode (install (default), remove, update)"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
-"  --mode=MODE            postavi mod (instalacija (osnovna), ukloni, "
-"nadogradnja)"
+"Zbog međuzavisnosti, sledeći paket(i) moraju\n"
+"da budu neizabrani:\n"
+"\n"
+
+#: ../Rpmdrake/gui.pm:549
+#, c-format
+msgid "Additional packages needed"
+msgstr "Potrebni su dodatni paketi"
 
-#: ../rpmdrake:44
+#: ../Rpmdrake/gui.pm:550
 #, c-format
 msgid ""
-"  --no-confirmation      don't ask first confirmation question in update mode"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 msgstr ""
-"  --no-confirmation      ne postavljaj prvo pitanje za potvrđivanje u modu za "
-"nadogradnju"
+"Da bi zadovoljili međuzavisnosti, sledeći paket(i) takođe treba\n"
+"da budu instalirani:\n"
+"\n"
 
-#: ../rpmdrake:45
+#: ../Rpmdrake/gui.pm:564
 #, c-format
-msgid "  --no-media-update      don't update media at startup"
-msgstr "  --no-media-update      ne nadograđuj medij prilim startovanja"
+msgid "%s (belongs to the skip list)"
+msgstr "%s (pripadaju preskočenoj listi)"
 
-#: ../rpmdrake:46
-#, c-format
-msgid "  --no-verify-rpm        don't verify packages signatures"
-msgstr "  --no-verify-rpm        ne verifikuj potpise paketa"
+#: ../Rpmdrake/gui.pm:568
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgstr "Neki paketi ne mogu da se instaliraju"
 
-#: ../rpmdrake:47
+#: ../Rpmdrake/gui.pm:568
 #, c-format
+msgid "Some packages can't be installed"
+msgstr "Neki paketi ne mogu biti instalirani"
+
+#: ../Rpmdrake/gui.pm:570
+#, fuzzy, c-format
 msgid ""
-"  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
-"\" machine to show needed deps"
+"Sorry, the following package cannot be selected:\n"
+"\n"
+"%s"
 msgstr ""
-"  --parallel=alias,host  će biti u paralelnom modu, koristi kao \"alias\" "
-"group, koristi kao \"host\" mašina će pokazati potrebne međuzavisnosti"
+"Žalim, ali  sledeći paket(i)ne mogu da budu izabrani:\n"
+"\n"
+"%s"
+
+#: ../Rpmdrake/gui.pm:571
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr ""
+"Žao mi je, ali  sledeći paket(i)ne mogu biti izabrani:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:48
+#: ../Rpmdrake/gui.pm:586 ../Rpmdrake/pkg.pm:497
 #, c-format
-msgid "  --pkg-nosel=pkg1,..    show only these packages"
-msgstr "  --pkg-nosel=pkg1,..    pokaži samo te pakete"
+msgid "Some packages need to be removed"
+msgstr "Neki paketi moraju da se uklone"
 
-#: ../rpmdrake:49
+#: ../Rpmdrake/gui.pm:617
 #, c-format
-msgid "  --pkg-sel=pkg1,..      preselect these packages"
-msgstr "  --pkg-sel=pkg1,..      već izabrani paketi"
+msgid "Error: %s appears to be mounted read-only."
+msgstr "Greška: %s"
 
-#: ../rpmdrake:50
+#: ../Rpmdrake/gui.pm:621
 #, c-format
-msgid "  --root                 force to run as root"
-msgstr "  --root                forsiraj pokretanje kao root"
+msgid "You need to select some packages first."
+msgstr "Prvo morate da odaberete neke pakete."
 
-#: ../rpmdrake:51
+#: ../Rpmdrake/gui.pm:626
 #, c-format
-msgid "  --search=pkg           run search for \"pkg\""
-msgstr "  --search=pkg         pokreni potraži za \"pkg\""
+msgid "Too many packages are selected"
+msgstr "Izabrali ste previše paketa"
 
-#: ../rpmdrake:205
+#: ../Rpmdrake/gui.pm:627
 #, c-format
-msgid "Running in user mode"
-msgstr "Pokrenuto u korisničkom modu"
+msgid ""
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
+"\n"
+"Do you really want to install all the selected packages?"
+msgstr ""
+"Upozorenje: izgleda da pokušavate da dodate toliko\n"
+"paketa da vaš fajl sistem može ostati bez slobodnog prostora,\n"
+"tokom ili nakon instalacije paketa ; ovo je posebno\n"
+"opasno i treba obratiti dodatnu pažnju.\n"
+"\n"
+"Da li zaista želite da instalirate izabrane pakete?"
 
-#: ../rpmdrake:206
+#: ../Rpmdrake/gui.pm:659
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr "Molim Vas sačekajte, listam pakete..."
+
+#: ../Rpmdrake/gui.pm:677
+#, c-format
+msgid "No update"
+msgstr "Bez nadogradnje"
+
+#: ../Rpmdrake/gui.pm:678
 #, c-format
 msgid ""
-"You are launching this program as a normal user.\n"
-"You will not be able to perform modifications on the system,\n"
-"but you may still browse the existing database."
+"The list of updates is empty. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
 msgstr ""
-"Vi ste pokrenuli ovaj program kao običan korisnik.\n"
-"Nećete biti u mogućnosti da izvršite modifikacije na sistemu,\n"
-"ali možete da pretražujete postojeće baze podataka."
+"Lista paketa za nadogradnju nije kreirana. Ovo ili znači ili da nema "
+"dostupnih\n"
+"paketa za nadogradnju za vaš računar,\n"
+"ili su oni već instalirani."
 
-#: ../rpmdrake:214
+#: ../Rpmdrake/gui.pm:701 ../rpmdrake:255
+#, c-format
+msgid "All"
+msgstr "Sve"
+
+#: ../Rpmdrake/gui.pm:710 ../rpmdrake:141
+#, c-format
+msgid "Upgradable"
+msgstr "Mogu se nadograditi"
+
+#: ../Rpmdrake/gui.pm:710 ../rpmdrake:141
+#, c-format
+msgid "Addable"
+msgstr "Mogu se dodati"
+
+#: ../Rpmdrake/gui.pm:730
+#, c-format
+msgid "Description not available for this package\n"
+msgstr "Opis nije dostupan za ovaj paket\n"
+
+#: ../Rpmdrake/gui.pm:736 ../Rpmdrake/pkg.pm:188
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Pojavila se fatalna greška: %s."
+
+#: ../Rpmdrake/icon.pm:35
 #, c-format
 msgid "Accessibility"
 msgstr "Dostupnost"
 
-#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
-#: ../rpmdrake:219
+#: ../Rpmdrake/icon.pm:36 ../Rpmdrake/icon.pm:37 ../Rpmdrake/icon.pm:38
+#: ../Rpmdrake/icon.pm:39 ../Rpmdrake/icon.pm:40
 #, c-format
 msgid "Archiving"
 msgstr "Arhiviranje"
 
-#: ../rpmdrake:216
+#: ../Rpmdrake/icon.pm:37
 #, c-format
 msgid "Backup"
 msgstr "Backup"
 
-#: ../rpmdrake:217
+#: ../Rpmdrake/icon.pm:38
 #, c-format
 msgid "Cd burning"
 msgstr "Narezivanje diskova"
 
-#: ../rpmdrake:218
+#: ../Rpmdrake/icon.pm:39
 #, c-format
 msgid "Compression"
 msgstr "Komresija"
 
-#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
-#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
-#: ../rpmdrake:426
+#: ../Rpmdrake/icon.pm:40 ../Rpmdrake/icon.pm:46 ../Rpmdrake/icon.pm:60
+#: ../Rpmdrake/icon.pm:73 ../Rpmdrake/icon.pm:91 ../Rpmdrake/icon.pm:112
+#: ../Rpmdrake/icon.pm:125 ../Rpmdrake/icon.pm:135 ../Rpmdrake/pkg.pm:75
 #, c-format
 msgid "Other"
 msgstr "Ostalo"
 
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#: ../rpmdrake:224 ../rpmdrake:225
+#: ../Rpmdrake/icon.pm:41 ../Rpmdrake/icon.pm:42 ../Rpmdrake/icon.pm:43
+#: ../Rpmdrake/icon.pm:44 ../Rpmdrake/icon.pm:45 ../Rpmdrake/icon.pm:46
 #, c-format
 msgid "Books"
 msgstr "Knjige"
 
-#: ../rpmdrake:221
+#: ../Rpmdrake/icon.pm:42
 #, c-format
 msgid "Computer books"
 msgstr "Računarske knjige"
 
-#: ../rpmdrake:222
+#: ../Rpmdrake/icon.pm:43
 #, c-format
 msgid "Faqs"
 msgstr "Često postavljana pitanja"
 
-#: ../rpmdrake:223
+#: ../Rpmdrake/icon.pm:44
 #, c-format
 msgid "Howtos"
 msgstr "Upustva"
 
-#: ../rpmdrake:224
+#: ../Rpmdrake/icon.pm:45
 #, c-format
 msgid "Literature"
 msgstr "Literatura"
 
-#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#: ../Rpmdrake/icon.pm:47 ../Rpmdrake/icon.pm:48 ../Rpmdrake/icon.pm:49
 #, c-format
 msgid "Cluster"
 msgstr "Klasteri"
 
-#: ../rpmdrake:227
+#: ../Rpmdrake/icon.pm:48
 #, c-format
 msgid "Message Passing"
 msgstr "Prolaz poruka"
 
-#: ../rpmdrake:228
+#: ../Rpmdrake/icon.pm:49
 #, c-format
 msgid "Queueing Services"
 msgstr "Servisi na čekanju"
 
-#: ../rpmdrake:229
+#: ../Rpmdrake/icon.pm:50
 #, c-format
 msgid "Communications"
 msgstr "Komunikacije"
 
-#: ../rpmdrake:230 ../rpmdrake:234
+#: ../Rpmdrake/icon.pm:51 ../Rpmdrake/icon.pm:55
 #, c-format
 msgid "Databases"
 msgstr "Baze podataka"
 
-#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#: ../Rpmdrake/icon.pm:52 ../Rpmdrake/icon.pm:53 ../Rpmdrake/icon.pm:54
+#: ../Rpmdrake/icon.pm:55 ../Rpmdrake/icon.pm:56 ../Rpmdrake/icon.pm:57
+#: ../Rpmdrake/icon.pm:58 ../Rpmdrake/icon.pm:59 ../Rpmdrake/icon.pm:60
+#: ../Rpmdrake/icon.pm:61 ../Rpmdrake/icon.pm:62 ../Rpmdrake/icon.pm:63
+#: ../Rpmdrake/icon.pm:174 ../Rpmdrake/icon.pm:175 ../Rpmdrake/icon.pm:176
 #, c-format
 msgid "Development"
 msgstr "Razvoj"
 
-#: ../rpmdrake:232
+#: ../Rpmdrake/icon.pm:53
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:233
+#: ../Rpmdrake/icon.pm:54
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:235
+#: ../Rpmdrake/icon.pm:56
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME i GTK+"
 
-#: ../rpmdrake:236
+#: ../Rpmdrake/icon.pm:57
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:237
+#: ../Rpmdrake/icon.pm:58
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE i Qt"
 
-#: ../rpmdrake:238
+#: ../Rpmdrake/icon.pm:59
 #, c-format
 msgid "Kernel"
 msgstr "Kernel"
 
-#: ../rpmdrake:240
+#: ../Rpmdrake/icon.pm:61
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:241
+#: ../Rpmdrake/icon.pm:62
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: ../rpmdrake:242
+#: ../Rpmdrake/icon.pm:63
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:243
+#: ../Rpmdrake/icon.pm:64
 #, c-format
 msgid "Editors"
 msgstr "Editori"
 
-#: ../rpmdrake:244
+#: ../Rpmdrake/icon.pm:65
 #, c-format
 msgid "Education"
 msgstr "Učenje"
 
-#: ../rpmdrake:245
+#: ../Rpmdrake/icon.pm:66
 #, c-format
 msgid "Emulators"
 msgstr "Emulatori"
 
-#: ../rpmdrake:246
+#: ../Rpmdrake/icon.pm:67
 #, c-format
 msgid "File tools"
 msgstr "Alati za fajlove"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:255
+#: ../Rpmdrake/icon.pm:68 ../Rpmdrake/icon.pm:69 ../Rpmdrake/icon.pm:70
+#: ../Rpmdrake/icon.pm:71 ../Rpmdrake/icon.pm:72 ../Rpmdrake/icon.pm:73
+#: ../Rpmdrake/icon.pm:74 ../Rpmdrake/icon.pm:75 ../Rpmdrake/icon.pm:76
 #, c-format
 msgid "Games"
 msgstr "Igrice"
 
-#: ../rpmdrake:248
+#: ../Rpmdrake/icon.pm:69
 #, c-format
 msgid "Adventure"
 msgstr "Avantura"
 
-#: ../rpmdrake:249
+#: ../Rpmdrake/icon.pm:70
 #, c-format
 msgid "Arcade"
 msgstr "Arkade"
 
-#: ../rpmdrake:250
+#: ../Rpmdrake/icon.pm:71
 #, c-format
 msgid "Boards"
 msgstr "Table"
 
-#: ../rpmdrake:251
+#: ../Rpmdrake/icon.pm:72
 #, c-format
 msgid "Cards"
 msgstr "Karte"
 
-#: ../rpmdrake:253
+#: ../Rpmdrake/icon.pm:74
 #, c-format
 msgid "Puzzles"
 msgstr "Ukrštenice"
 
-#: ../rpmdrake:254
+#: ../Rpmdrake/icon.pm:75
 #, c-format
 msgid "Sports"
 msgstr "Sportovi"
 
-#: ../rpmdrake:255
+#: ../Rpmdrake/icon.pm:76
 #, c-format
 msgid "Strategy"
 msgstr "Strategija"
 
-#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
-#: ../rpmdrake:274 ../rpmdrake:277
+#: ../Rpmdrake/icon.pm:77 ../Rpmdrake/icon.pm:78 ../Rpmdrake/icon.pm:81
+#: ../Rpmdrake/icon.pm:82 ../Rpmdrake/icon.pm:85 ../Rpmdrake/icon.pm:88
+#: ../Rpmdrake/icon.pm:91 ../Rpmdrake/icon.pm:92 ../Rpmdrake/icon.pm:95
+#: ../Rpmdrake/icon.pm:98
 #, c-format
 msgid "Graphical desktop"
 msgstr "Grafički desktop"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../Rpmdrake/icon.pm:80
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:260
+#: ../Rpmdrake/icon.pm:81
 #, c-format
 msgid "FVWM based"
 msgstr "bazirano na FVWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:263
+#: ../Rpmdrake/icon.pm:84
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:266
+#: ../Rpmdrake/icon.pm:87
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:269
+#: ../Rpmdrake/icon.pm:90
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:273
+#: ../Rpmdrake/icon.pm:94
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:276
+#: ../Rpmdrake/icon.pm:97
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:279
+#: ../Rpmdrake/icon.pm:100
 #, c-format
 msgid "Xfce"
 msgstr "Xfce"
 
-#: ../rpmdrake:280
+#: ../Rpmdrake/icon.pm:101
 #, c-format
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../rpmdrake:281
+#: ../Rpmdrake/icon.pm:102
 #, c-format
 msgid "Monitoring"
 msgstr "Monitoring"
 
-#: ../rpmdrake:282 ../rpmdrake:283
+#: ../Rpmdrake/icon.pm:103 ../Rpmdrake/icon.pm:104
 #, c-format
 msgid "Multimedia"
 msgstr "Multimedija"
 
-#: ../rpmdrake:283 ../rpmdrake:334
+#: ../Rpmdrake/icon.pm:104 ../Rpmdrake/icon.pm:155
 #, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
-#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#: ../Rpmdrake/icon.pm:105 ../Rpmdrake/icon.pm:106 ../Rpmdrake/icon.pm:107
+#: ../Rpmdrake/icon.pm:108 ../Rpmdrake/icon.pm:109 ../Rpmdrake/icon.pm:110
+#: ../Rpmdrake/icon.pm:111 ../Rpmdrake/icon.pm:112 ../Rpmdrake/icon.pm:113
+#: ../Rpmdrake/icon.pm:114 ../Rpmdrake/icon.pm:134
 #, c-format
 msgid "Networking"
 msgstr "Mreža"
 
-#: ../rpmdrake:285
+#: ../Rpmdrake/icon.pm:106
 #, c-format
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:286
+#: ../Rpmdrake/icon.pm:107
 #, c-format
 msgid "File transfer"
 msgstr "Transfer fajlova"
 
-#: ../rpmdrake:287
+#: ../Rpmdrake/icon.pm:108
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:288
+#: ../Rpmdrake/icon.pm:109
 #, c-format
 msgid "Instant messaging"
 msgstr "Instant poruke"
 
-#: ../rpmdrake:289 ../rpmdrake:360
+#: ../Rpmdrake/icon.pm:110 ../Rpmdrake/icon.pm:181
 #, c-format
 msgid "Mail"
 msgstr "Pošta"
 
-#: ../rpmdrake:290
+#: ../Rpmdrake/icon.pm:111
 #, c-format
 msgid "News"
 msgstr "Vesti"
 
-#: ../rpmdrake:292
+#: ../Rpmdrake/icon.pm:113
 #, c-format
 msgid "Remote access"
 msgstr "Udaljeni pristup"
 
-#: ../rpmdrake:293
+#: ../Rpmdrake/icon.pm:114
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:294
+#: ../Rpmdrake/icon.pm:115
 #, c-format
 msgid "Office"
 msgstr "Kancelarija"
 
-#: ../rpmdrake:295
+#: ../Rpmdrake/icon.pm:116
 #, c-format
 msgid "Public Keys"
 msgstr "Javni ključevi"
 
-#: ../rpmdrake:296
+#: ../Rpmdrake/icon.pm:117
 #, c-format
 msgid "Publishing"
 msgstr "Publikovanje"
 
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
-#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
-#: ../rpmdrake:305
+#: ../Rpmdrake/icon.pm:118 ../Rpmdrake/icon.pm:119 ../Rpmdrake/icon.pm:120
+#: ../Rpmdrake/icon.pm:121 ../Rpmdrake/icon.pm:122 ../Rpmdrake/icon.pm:123
+#: ../Rpmdrake/icon.pm:124 ../Rpmdrake/icon.pm:125 ../Rpmdrake/icon.pm:126
 #, c-format
 msgid "Sciences"
 msgstr "Nauke"
 
-#: ../rpmdrake:298
+#: ../Rpmdrake/icon.pm:119
 #, c-format
 msgid "Astronomy"
 msgstr "Astronomija"
 
-#: ../rpmdrake:299
+#: ../Rpmdrake/icon.pm:120
 #, c-format
 msgid "Biology"
 msgstr "Biologija"
 
-#: ../rpmdrake:300
+#: ../Rpmdrake/icon.pm:121
 #, c-format
 msgid "Chemistry"
 msgstr "Hemija"
 
-#: ../rpmdrake:301
+#: ../Rpmdrake/icon.pm:122
 #, c-format
 msgid "Computer science"
 msgstr "Nauka o računarima"
 
-#: ../rpmdrake:302
+#: ../Rpmdrake/icon.pm:123
 #, c-format
 msgid "Geosciences"
 msgstr "Prirodne nauke"
 
-#: ../rpmdrake:303
+#: ../Rpmdrake/icon.pm:124
 #, c-format
 msgid "Mathematics"
 msgstr "Matematika"
 
-#: ../rpmdrake:305
+#: ../Rpmdrake/icon.pm:126
 #, c-format
 msgid "Physics"
 msgstr "Fizika"
 
-#: ../rpmdrake:306
+#: ../Rpmdrake/icon.pm:127
 #, c-format
 msgid "Shells"
 msgstr "Šelovi"
 
-#: ../rpmdrake:307
+#: ../Rpmdrake/icon.pm:128
 #, c-format
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
-#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
-#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
-#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
-#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
-#: ../rpmdrake:328
+#: ../Rpmdrake/icon.pm:129 ../Rpmdrake/icon.pm:130 ../Rpmdrake/icon.pm:131
+#: ../Rpmdrake/icon.pm:132 ../Rpmdrake/icon.pm:133 ../Rpmdrake/icon.pm:134
+#: ../Rpmdrake/icon.pm:135 ../Rpmdrake/icon.pm:136 ../Rpmdrake/icon.pm:137
+#: ../Rpmdrake/icon.pm:138 ../Rpmdrake/icon.pm:139 ../Rpmdrake/icon.pm:140
+#: ../Rpmdrake/icon.pm:141 ../Rpmdrake/icon.pm:142 ../Rpmdrake/icon.pm:143
+#: ../Rpmdrake/icon.pm:144 ../Rpmdrake/icon.pm:145 ../Rpmdrake/icon.pm:146
+#: ../Rpmdrake/icon.pm:147 ../Rpmdrake/icon.pm:148 ../Rpmdrake/icon.pm:149
 #, c-format
 msgid "System"
 msgstr "Sistem"
 
-#: ../rpmdrake:309
+#: ../Rpmdrake/icon.pm:130
 #, c-format
 msgid "Base"
 msgstr "Osnovno"
 
-#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
-#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#: ../Rpmdrake/icon.pm:131 ../Rpmdrake/icon.pm:132 ../Rpmdrake/icon.pm:133
+#: ../Rpmdrake/icon.pm:134 ../Rpmdrake/icon.pm:135 ../Rpmdrake/icon.pm:136
+#: ../Rpmdrake/icon.pm:137 ../Rpmdrake/icon.pm:159
 #, c-format
 msgid "Configuration"
 msgstr "Podešavanje"
 
-#: ../rpmdrake:311
+#: ../Rpmdrake/icon.pm:132
 #, c-format
 msgid "Boot and Init"
 msgstr "Boot i Init"
 
-#: ../rpmdrake:312
+#: ../Rpmdrake/icon.pm:133
 #, c-format
 msgid "Hardware"
 msgstr "Hardver"
 
-#: ../rpmdrake:315
+#: ../Rpmdrake/icon.pm:136
 #, c-format
 msgid "Packaging"
 msgstr "Pakovanje"
 
-#: ../rpmdrake:316
+#: ../Rpmdrake/icon.pm:137
 #, c-format
 msgid "Printing"
 msgstr "Štampanje"
 
-#: ../rpmdrake:317
+#: ../Rpmdrake/icon.pm:138
 #, c-format
 msgid "Deploiement"
 msgstr "Iskorištenje"
 
-#: ../rpmdrake:318
+#: ../Rpmdrake/icon.pm:139
 #, c-format
 msgid "Deployment"
 msgstr "Iskorištenje"
 
-#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
-#: ../rpmdrake:323
+#: ../Rpmdrake/icon.pm:140 ../Rpmdrake/icon.pm:141 ../Rpmdrake/icon.pm:142
+#: ../Rpmdrake/icon.pm:143 ../Rpmdrake/icon.pm:144
 #, c-format
 msgid "Fonts"
 msgstr "Fontovi"
 
-#: ../rpmdrake:320
+#: ../Rpmdrake/icon.pm:141
 #, c-format
 msgid "Console"
 msgstr "Konzola"
 
-#: ../rpmdrake:321
+#: ../Rpmdrake/icon.pm:142
 #, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:322
+#: ../Rpmdrake/icon.pm:143
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:323
+#: ../Rpmdrake/icon.pm:144
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:324
+#: ../Rpmdrake/icon.pm:145
 #, c-format
 msgid "Internationalization"
 msgstr "Internacionalizacija"
 
-#: ../rpmdrake:325
+#: ../Rpmdrake/icon.pm:146
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Kernel i hardver"
 
-#: ../rpmdrake:326
+#: ../Rpmdrake/icon.pm:147
 #, c-format
 msgid "Libraries"
 msgstr "Biblioteke"
 
-#: ../rpmdrake:327
+#: ../Rpmdrake/icon.pm:148
 #, c-format
 msgid "Servers"
 msgstr "Serveri"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:330
+#: ../Rpmdrake/icon.pm:151
 #, c-format
 msgid "X11"
 msgstr "X11"
 
-#: ../rpmdrake:331
+#: ../Rpmdrake/icon.pm:152
 #, c-format
 msgid "Terminals"
 msgstr "Terminali"
 
-#: ../rpmdrake:332
+#: ../Rpmdrake/icon.pm:153
 #, c-format
 msgid "Text tools"
 msgstr "Alati za tekst"
 
-#: ../rpmdrake:333
+#: ../Rpmdrake/icon.pm:154
 #, c-format
 msgid "Toys"
 msgstr "Igračke"
 
-#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
-#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
-#: ../rpmdrake:345 ../rpmdrake:346
+#: ../Rpmdrake/icon.pm:158 ../Rpmdrake/icon.pm:159 ../Rpmdrake/icon.pm:160
+#: ../Rpmdrake/icon.pm:161 ../Rpmdrake/icon.pm:162 ../Rpmdrake/icon.pm:163
+#: ../Rpmdrake/icon.pm:164 ../Rpmdrake/icon.pm:165 ../Rpmdrake/icon.pm:166
+#: ../Rpmdrake/icon.pm:167
 #, c-format
 msgid "Workstation"
 msgstr "Radna stanica"
 
-#: ../rpmdrake:339
+#: ../Rpmdrake/icon.pm:160
 #, c-format
 msgid "Console Tools"
 msgstr "Konzolni alati"
 
-#: ../rpmdrake:340 ../rpmdrake:355
+#: ../Rpmdrake/icon.pm:161 ../Rpmdrake/icon.pm:176
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: ../rpmdrake:341
+#: ../Rpmdrake/icon.pm:162
 #, c-format
 msgid "Game station"
 msgstr "Stanica za igru"
 
-#: ../rpmdrake:342
+#: ../Rpmdrake/icon.pm:163
 #, c-format
 msgid "Internet station"
 msgstr "Internet stanica"
 
-#: ../rpmdrake:343
+#: ../Rpmdrake/icon.pm:164
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimedijalna stanica"
 
-#: ../rpmdrake:344
+#: ../Rpmdrake/icon.pm:165
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Mrežni kompjuter, (klijent)"
 
-#: ../rpmdrake:345
+#: ../Rpmdrake/icon.pm:166
 #, c-format
 msgid "Office Workstation"
 msgstr "Radna (Office) stanica"
 
-#: ../rpmdrake:346
+#: ../Rpmdrake/icon.pm:167
 #, c-format
 msgid "Scientific Workstation"
 msgstr "Naučna radna stanica"
 
-#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
-#: ../rpmdrake:352
+#: ../Rpmdrake/icon.pm:168 ../Rpmdrake/icon.pm:170 ../Rpmdrake/icon.pm:171
+#: ../Rpmdrake/icon.pm:172 ../Rpmdrake/icon.pm:173
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafičko Okruženje"
 
-#: ../rpmdrake:349
+#: ../Rpmdrake/icon.pm:170
 #, c-format
 msgid "GNOME Workstation"
 msgstr "Gnome radna stanica"
 
-#: ../rpmdrake:350
+#: ../Rpmdrake/icon.pm:171
 #, c-format
 msgid "IceWm Desktop"
 msgstr "IceWm Desktop"
 
-#: ../rpmdrake:351
+#: ../Rpmdrake/icon.pm:172
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE radna stanica"
 
-#: ../rpmdrake:352
+#: ../Rpmdrake/icon.pm:173
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Drugi grafički desktopovi"
 
-#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
-#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#: ../Rpmdrake/icon.pm:177 ../Rpmdrake/icon.pm:178 ../Rpmdrake/icon.pm:179
+#: ../Rpmdrake/icon.pm:180 ../Rpmdrake/icon.pm:181 ../Rpmdrake/icon.pm:182
+#: ../Rpmdrake/icon.pm:183 ../Rpmdrake/icon.pm:184
 #, c-format
 msgid "Server"
 msgstr "Server"
 
-#: ../rpmdrake:357
+#: ../Rpmdrake/icon.pm:178
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: ../rpmdrake:358
+#: ../Rpmdrake/icon.pm:179
 #, c-format
 msgid "Database"
 msgstr "Server,Baze podataka"
 
-#: ../rpmdrake:359
+#: ../Rpmdrake/icon.pm:180
 #, c-format
 msgid "Firewall/Router"
 msgstr "Server, Firewall/Router"
 
-#: ../rpmdrake:361
+#: ../Rpmdrake/icon.pm:182
 #, c-format
 msgid "Mail/Groupware/News"
 msgstr "Pošta/Grupe/Vesti"
 
-#: ../rpmdrake:362
+#: ../Rpmdrake/icon.pm:183
 #, c-format
 msgid "Network Computer server"
 msgstr "Mrežni Server"
 
-#: ../rpmdrake:363
+#: ../Rpmdrake/icon.pm:184
 #, c-format
 msgid "Web/FTP"
 msgstr "Server, Web/FTP"
 
-#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
-#: ../rpmdrake:724
-#, c-format
-msgid "(Not available)"
-msgstr "(Nije dostupno)"
-
-#: ../rpmdrake:534 ../rpmdrake:616
-#, c-format
-msgid "Search results"
-msgstr "Rezultati pretrage"
-
-#: ../rpmdrake:534
-#, c-format
-msgid "Search results (none)"
-msgstr "Rezultat pretrage (nema)"
-
-#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
-#, c-format
-msgid "Please wait, searching..."
-msgstr "Molim Vas sačekajte, tražim..."
-
-#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
-#, c-format
-msgid "Software Management"
-msgstr "Softverski Menadžment"
-
-#: ../rpmdrake:578
-#, c-format
-msgid "Stop"
-msgstr "Stop"
-
-#: ../rpmdrake:617 ../rpmdrake:917
-#, c-format
-msgid "Upgradable"
-msgstr "Mogu se nadograditi"
-
-#: ../rpmdrake:617 ../rpmdrake:917
-#, c-format
-msgid "Addable"
-msgstr "Mogu se dodati"
-
-#: ../rpmdrake:619
+#: ../Rpmdrake/init.pm:40
 #, c-format
-msgid "Selected"
-msgstr "Izabrani"
-
-#: ../rpmdrake:619
-#, c-format
-msgid "Not selected"
-msgstr "Nisu izabrani"
-
-#: ../rpmdrake:683 ../rpmdrake:740
-#, c-format
-msgid "Importance: "
-msgstr "Važnost: "
-
-#: ../rpmdrake:684 ../rpmdrake:748
-#, c-format
-msgid "Reason for update: "
-msgstr "Razlog za nadogradnju:"
-
-#: ../rpmdrake:688
-#, c-format
-msgid "Security advisory"
-msgstr "Sigurnosni saveti"
-
-#: ../rpmdrake:696 ../rpmdrake:750
-#, c-format
-msgid "No description"
-msgstr "Bez opisa"
-
-#: ../rpmdrake:699
-#, c-format
-msgid "Files:"
-msgstr "Fajlovi:"
-
-#: ../rpmdrake:707
-#, c-format
-msgid "Changelog:"
-msgstr "Izmene:"
-
-#: ../rpmdrake:719
-#, c-format
-msgid "Files:\n"
-msgstr "Fajlovi:\n"
+msgid "Usage: %s [OPTION]..."
+msgstr "Upotreba: %s [OPCIJA]..."
 
-#: ../rpmdrake:724
+#: ../Rpmdrake/init.pm:41
 #, c-format
-msgid "Changelog:\n"
-msgstr "Izmene:\n"
+msgid ""
+"  --changelog-first      display changelog before filelist in the "
+"description window"
+msgstr ""
+"  --changelog-first      pokaži beleške promena pre liste datoteka u prozoru "
+"za objašnjenje"
 
-#: ../rpmdrake:729 ../rpmdrake.pm:809
+#: ../Rpmdrake/init.pm:42
 #, c-format
-msgid "Medium: "
-msgstr "Medij: "
+msgid "  --media=medium1,..     limit to given media"
+msgstr "  --media=medium1,..     granica za dati medij"
 
-#: ../rpmdrake:730
+#: ../Rpmdrake/init.pm:43
 #, c-format
-msgid "Currently installed version: "
-msgstr "Trenutno instalirana verzija: "
+msgid ""
+"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+msgstr ""
+"  --merge-all-rpmnew     predloži da budu sjedinjeni svi fajlovi .rpmnew/."
+"rpmsave koji su nađeni"
 
-#: ../rpmdrake:734
+#: ../Rpmdrake/init.pm:44
 #, c-format
-msgid "Name: "
-msgstr "Ime: "
+msgid "  --mode=MODE            set mode (install (default), remove, update)"
+msgstr ""
+"  --mode=MODE            postavi mod (instalacija (osnovna), ukloni, "
+"nadogradnja)"
 
-#: ../rpmdrake:735
+#: ../Rpmdrake/init.pm:45
 #, c-format
-msgid "Version: "
-msgstr "Verzija: "
+msgid ""
+"  --no-confirmation      don't ask first confirmation question in update mode"
+msgstr ""
+"  --no-confirmation      ne postavljaj prvo pitanje za potvrđivanje u modu "
+"za nadogradnju"
 
-#: ../rpmdrake:736
+#: ../Rpmdrake/init.pm:46
 #, c-format
-msgid "Architecture: "
-msgstr "Arhitektura"
+msgid "  --no-media-update      don't update media at startup"
+msgstr "  --no-media-update      ne nadograđuj medij prilim startovanja"
 
-#: ../rpmdrake:737
+#: ../Rpmdrake/init.pm:47
 #, c-format
-msgid "Size: "
-msgstr "Veličina: "
+msgid "  --no-verify-rpm        don't verify packages signatures"
+msgstr "  --no-verify-rpm        ne verifikuj potpise paketa"
 
-#: ../rpmdrake:737
+#: ../Rpmdrake/init.pm:48
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid ""
+"  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
+"\" machine to show needed deps"
+msgstr ""
+"  --parallel=alias,host  će biti u paralelnom modu, koristi kao \"alias\" "
+"group, koristi kao \"host\" mašina će pokazati potrebne međuzavisnosti"
 
-#: ../rpmdrake:744
+#: ../Rpmdrake/init.pm:49
 #, c-format
-msgid "Summary: "
-msgstr "Sažetak: "
+msgid "  --pkg-nosel=pkg1,..    show only these packages"
+msgstr "  --pkg-nosel=pkg1,..    pokaži samo te pakete"
 
-#: ../rpmdrake:750
+#: ../Rpmdrake/init.pm:50
 #, c-format
-msgid "Description: "
-msgstr "Opis:"
+msgid "  --pkg-sel=pkg1,..      preselect these packages"
+msgstr "  --pkg-sel=pkg1,..      već izabrani paketi"
 
-#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#: ../Rpmdrake/init.pm:51
 #, c-format
-msgid "More information on package..."
-msgstr "Dodatne informacije o paketu..."
+msgid "  --root                 force to run as root"
+msgstr "  --root                forsiraj pokretanje kao root"
 
-#: ../rpmdrake:825
+#: ../Rpmdrake/init.pm:52
 #, c-format
-msgid "Please choose"
-msgstr "Molim Vas izaberite"
+msgid "  --search=pkg           run search for \"pkg\""
+msgstr "  --search=pkg         pokreni potraži za \"pkg\""
 
-#: ../rpmdrake:825
+#: ../Rpmdrake/init.pm:53
 #, fuzzy, c-format
-msgid "The following package is needed:"
-msgid_plural "One of the following packages is needed:"
-msgstr[0] "Jedan od sledećih paketa je potreban:"
-msgstr[1] "Jedan od sledećih paketa je potreban:"
-msgstr[2] "Jedan od sledećih paketa je potreban:"
-
-#: ../rpmdrake:866
-#, c-format
-msgid "Please wait, listing packages..."
-msgstr "Molim Vas sačekajte, listam pakete..."
-
-#: ../rpmdrake:884
-#, c-format
-msgid "No update"
-msgstr "Bez nadogradnje"
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - prikazuje ovaj ekran o pomoći.\n"
 
-#: ../rpmdrake:885
+#: ../Rpmdrake/init.pm:123
 #, c-format
-msgid ""
-"The list of updates is empty. This means that either there is\n"
-"no available update for the packages installed on your computer,\n"
-"or you already installed all of them."
-msgstr ""
-"Lista paketa za nadogradnju nije kreirana. Ovo ili znači ili da nema "
-"dostupnih\n"
-"paketa za nadogradnju za vaš računar,\n"
-"ili su oni već instalirani."
-
-#: ../rpmdrake:908 ../rpmdrake:1171
-#, c-format
-msgid "All"
-msgstr "Sve"
-
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:956 ../rpmdrake:961
-#, c-format
-msgid "More info"
-msgstr "Još informacija"
-
-#: ../rpmdrake:964
-#, c-format
-msgid "Information on packages"
-msgstr "Informacije o paketima"
-
-#: ../rpmdrake:987
-#, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Još neki paketi moraju biti uklonjeni"
+msgid "Running in user mode"
+msgstr "Pokrenuto u korisničkom modu"
 
-#: ../rpmdrake:988
+#: ../Rpmdrake/init.pm:124
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:"
+"You are launching this program as a normal user.\n"
+"You will not be able to perform modifications on the system,\n"
+"but you may still browse the existing database."
 msgstr ""
-"Da bi zadovoljili sve zavisnosti,sledeći paket(i) bi takođe trebalo da se "
-"uklone:"
+"Vi ste pokrenuli ovaj program kao običan korisnik.\n"
+"Nećete biti u mogućnosti da izvršite modifikacije na sistemu,\n"
+"ali možete da pretražujete postojeće baze podataka."
 
-#: ../rpmdrake:994 ../rpmdrake:1003
+#: ../Rpmdrake/init.pm:131 ../Rpmdrake/init.pm:156
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "Neki paketi se ne mogu ukloniti"
+msgid "Welcome"
+msgstr "Dobrodošli"
 
-#: ../rpmdrake:995
+#: ../Rpmdrake/init.pm:136
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"Welcome to the software removal tool!\n"
 "\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
-"Žalim, ali uklanjanjem ovih paketa bi ste oštetiti sistem:\n"
+"Dobrodošli u program za uklanjanje softvera!\n"
 "\n"
+"Ovaj alat vam može pomoći da izaberete softver želite da uklonite sa\n"
+"vašeg računara."
 
-#: ../rpmdrake:1004 ../rpmdrake:1070
+#: ../Rpmdrake/init.pm:141
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"Welcome to %s!\n"
 "\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
-"Zbog međuzavisnosti, sledeći paket(i) moraju\n"
-"da budu neizabrani:\n"
+"Dobrodošli u %s!\n"
 "\n"
+"Ovaj alat vam pomaže da izabete nadogradnje koje želite da instalirate na\n"
+"vaš računar."
 
-#: ../rpmdrake:1033
+#: ../Rpmdrake/init.pm:146
 #, c-format
-msgid "Additional packages needed"
-msgstr "Potrebni su dodatni paketi"
+msgid "Welcome to the software installation tool!"
+msgstr "Dobrodošli u alat za instalaciju softvera!"
 
-#: ../rpmdrake:1034
+#: ../Rpmdrake/init.pm:147
 #, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
+"Welcome to the software installation tool!\n"
 "\n"
+"Your Mandriva Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
 msgstr ""
-"Da bi zadovoljili međuzavisnosti, sledeći paket(i) takođe treba\n"
-"da budu instalirani:\n"
-"\n"
-
-#: ../rpmdrake:1049
-#, c-format
-msgid "%s (belongs to the skip list)"
-msgstr "%s (pripadaju preskočenoj listi)"
-
-#: ../rpmdrake:1053
-#, fuzzy, c-format
-msgid "One package cannot be installed"
-msgid_plural "Some packages can't be installed"
-msgstr[0] "Neki paketi ne mogu da se instaliraju"
-msgstr[1] "Neki paketi ne mogu da se instaliraju"
-msgstr[2] "Neki paketi ne mogu da se instaliraju"
-
-#: ../rpmdrake:1054
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package cannot be selected:\n"
-"\n"
-"%s"
-msgid_plural ""
-"Sorry, the following packages can't be selected:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"Žalim, ali  sledeći paket(i)ne mogu da budu izabrani:\n"
-"\n"
-"%s"
-msgstr[1] ""
-"Žalim, ali  sledeći paket(i)ne mogu da budu izabrani:\n"
-"\n"
-"%s"
-msgstr[2] ""
-"Žalim, ali  sledeći paket(i)ne mogu da budu izabrani:\n"
+"Dobrodošli u alat za instalaciju softvera!\n"
 "\n"
-"%s"
-
-#: ../rpmdrake:1069 ../rpmdrake:1924
-#, c-format
-msgid "Some packages need to be removed"
-msgstr "Neki paketi moraju da se uklone"
-
-#: ../rpmdrake:1098
-#, c-format
-msgid "Selected: %s / Free disk space: %s"
-msgstr "Izabrano: %s / Slobodan prostor na disku: %s"
-
-#: ../rpmdrake:1099
-#, c-format
-msgid "Selected size: %d MB"
-msgstr "Veličina izabranog: %d MB"
-
-#: ../rpmdrake:1104
-#, c-format
-msgid "Description not available for this package\n"
-msgstr "Opis nije dostupan za ovaj paket\n"
-
-#: ../rpmdrake:1110 ../rpmdrake:1506
-#, c-format
-msgid "A fatal error occurred: %s."
-msgstr "Pojavila se fatalna greška: %s."
-
-#: ../rpmdrake:1171
-#, c-format
-msgid "Installed"
-msgstr "Instalirano"
-
-#: ../rpmdrake:1171
-#, c-format
-msgid "Non installed"
-msgstr "Nije instalirano"
-
-#: ../rpmdrake:1172
-#, c-format
-msgid "%s choices"
-msgstr "%s izbori"
-
-#: ../rpmdrake:1172
-#, c-format
-msgid "Mandriva Linux choices"
-msgstr "Mandriva Linux-ovi izbori"
-
-#: ../rpmdrake:1174
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "Svi paketi, po abecedi"
-
-#: ../rpmdrake:1175
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Svi paketi, po dostupnosti nove verzije"
-
-#: ../rpmdrake:1176
-#, c-format
-msgid "All packages, by size"
-msgstr "Svi paketi, po veličini"
-
-#: ../rpmdrake:1177
-#, c-format
-msgid "All packages, by selection state"
-msgstr "Svi paketi, po stanju biranja"
-
-#: ../rpmdrake:1178
-#, c-format
-msgid "Leaves only, sorted by install date"
-msgstr "Sortirano je po datumu instalacije"
-
-#: ../rpmdrake:1179
-#, c-format
-msgid "All packages, by group"
-msgstr "Svi paketi, po grupi"
-
-#: ../rpmdrake:1181
-#, c-format
-msgid "All updates"
-msgstr "Sve nadogradnje"
-
-#: ../rpmdrake:1181
-#, c-format
-msgid "Security updates"
-msgstr "Sigurnosne nadogradnje"
-
-#: ../rpmdrake:1181
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Nadogradnje sa ispravkama"
-
-#: ../rpmdrake:1181
-#, c-format
-msgid "Normal updates"
-msgstr "Obične nadogradnje"
-
-#: ../rpmdrake:1244
-#, c-format
-msgid "in names"
-msgstr "u imenima"
-
-#: ../rpmdrake:1246
-#, c-format
-msgid "in descriptions"
-msgstr "u opisima"
-
-#: ../rpmdrake:1248
-#, c-format
-msgid "in file names"
-msgstr "u imenima fajlova"
-
-#: ../rpmdrake:1275
-#, c-format
-msgid "Error: %s appears to be mounted read-only."
-msgstr "Greška: %s"
-
-#: ../rpmdrake:1279
-#, c-format
-msgid "You need to select some packages first."
-msgstr "Prvo morate da odaberete neke pakete."
-
-#: ../rpmdrake:1284
-#, c-format
-msgid "Too many packages are selected"
-msgstr "Izabrali ste previše paketa"
+"Vaš Mandriva Linux operativni sistem je došao sa nekoliko hiljada paketa\n"
+"sa programima, na CD-u ili DVD-u. Ovaj alat će Vam pomoći da izaberete\n"
+"pakete koje želite da instalirate na Vaš računar."
 
-#: ../rpmdrake:1285
+#: ../Rpmdrake/init.pm:158
 #, c-format
-msgid ""
-"Warning: it seems that you are attempting to add so much\n"
-"packages that your filesystem may run out of free diskspace,\n"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
+msgid "The software installation tool can set up media sources."
 msgstr ""
-"Upozorenje: izgleda da pokušavate da dodate toliko\n"
-"paketa da vaš fajl sistem može ostati bez slobodnog prostora,\n"
-"tokom ili nakon instalacije paketa ; ovo je posebno\n"
-"opasno i treba obratiti dodatnu pažnju.\n"
-"\n"
-"Da li zaista želite da instalirate izabrane pakete?"
-
-#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
-#: ../rpmdrake:1353
-#, c-format
-msgid "/_File"
-msgstr "/_Fajl"
-
-#: ../rpmdrake:1320
-#, c-format
-msgid "/_Update media"
-msgstr "/_Nadogradnja medija"
-
-#: ../rpmdrake:1331
-#, c-format
-msgid "/_Reset the selection"
-msgstr "/_Ponovo izaberi"
-
-#: ../rpmdrake:1344
-#, c-format
-msgid "/Reload the _packages list"
-msgstr "/Ponovo učitaj listu paketa"
-
-#: ../rpmdrake:1353
-#, c-format
-msgid "/_Quit"
-msgstr "/_Kraj"
-
-#: ../rpmdrake:1353
-#, c-format
-msgid "<control>Q"
-msgstr "<control>Q"
 
-#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
-#, c-format
-msgid "/_Options"
-msgstr "/_Opcije"
-
-#: ../rpmdrake:1357
-#, c-format
-msgid "/_Media Manager"
-msgstr "/_Menadžer za Medije"
-
-#: ../rpmdrake:1360 ../rpmdrake:1390
-#, c-format
-msgid "/_Show automatically selected packages"
-msgstr "/Automatski prikaži izabrane pakete"
-
-#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
-#, c-format
-msgid "/_Help"
-msgstr "/_Pomoć"
-
-#: ../rpmdrake:1365
-#, c-format
-msgid "/_Report Bug"
-msgstr "/_Prijavite Bag"
-
-#: ../rpmdrake:1367
-#, c-format
-msgid "/_About..."
-msgstr "/_O..."
-
-#: ../rpmdrake:1370
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:1372
-#, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Sva prava (C) %s zadržava Mandriva"
-
-#: ../rpmdrake:1374
-#, c-format
-msgid "Rpmdrake is Mandriva Linux package management tool."
-msgstr "Rpmdrake je Mandriva Linux alat za rukovanje paketima"
-
-#: ../rpmdrake:1376
-#, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
-
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1381
-#, c-format
-msgid "_: Translator(s) name(s) & email(s)\n"
-msgstr "Miodrag Živković <miodragz@linuxo.org>\n"
-
-#: ../rpmdrake:1405
-#, c-format
-msgid "Find:"
-msgstr "Pronađi:"
-
-#: ../rpmdrake:1414
-#, c-format
-msgid "Search"
-msgstr "Traži"
-
-#: ../rpmdrake:1416
-#, c-format
-msgid "Clear"
-msgstr "Očisti"
-
-#: ../rpmdrake:1430 ../rpmdrake.pm:760
-#, c-format
-msgid "Select all"
-msgstr "Izaberi sve"
-
-#: ../rpmdrake:1437
-#, c-format
-msgid "Apply"
-msgstr "Primeni"
-
-#: ../rpmdrake:1441
-#, c-format
-msgid "Quit"
-msgstr "Kraj"
-
-#: ../rpmdrake:1457
-#, c-format
-msgid "Quick Introduction"
-msgstr "Kratak uvod"
-
-#: ../rpmdrake:1458
-#, c-format
-msgid "You can browse the packages through the categories tree on the left."
-msgstr "Pakete možeš razgledati pomoću stabla kategorija na levoj strani"
-
-#: ../rpmdrake:1459
-#, c-format
-msgid ""
-"You can view information about a package by clicking on it on the right list."
-msgstr "Informacije o paketu možeš pogledati klikom na njega na listi desno"
-
-#: ../rpmdrake:1460
-#, c-format
-msgid "To install, update or remove a package, just click on its \"checkbox\"."
-msgstr ""
-"Da bi instalirali, nadogradili ili uklonili paket samo kliknite na njegov"
+#: ../Rpmdrake/init.pm:159
+#, fuzzy, c-format
+msgid "Do you want to add media sources now?"
+msgstr "Da li ste sigurni da želite da uklonite izvore \"%s\"?"
 
-#: ../rpmdrake:1505
+#: ../Rpmdrake/pkg.pm:187
 #, c-format
 msgid "Fatal error"
 msgstr "Fatalna greška"
 
-#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:512 ../Rpmdrake/pkg.pm:786
+#: ../rpmdrake.pm:323
 #, c-format
 msgid "Please wait"
 msgstr "Samo momenat..."
 
-#: ../rpmdrake:1510 ../rpmdrake:1935
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:512
 #, c-format
 msgid "Package installation..."
 msgstr "Instalacija paketa..."
 
-#: ../rpmdrake:1510 ../rpmdrake:1935
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:512 ../Rpmdrake/pkg.pm:786
 #, c-format
 msgid "Initializing..."
 msgstr "Inicijalizacija..."
 
-#: ../rpmdrake:1533 ../rpmdrake:1924
+#: ../Rpmdrake/pkg.pm:215 ../Rpmdrake/pkg.pm:497
 #, c-format
 msgid "Confirmation"
 msgstr "Potvrđivanje"
 
-#: ../rpmdrake:1534
+#: ../Rpmdrake/pkg.pm:216
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1940,12 +1723,12 @@ msgstr ""
 "\n"
 "Da li je U redu da nastavim?"
 
-#: ../rpmdrake:1543
+#: ../Rpmdrake/pkg.pm:225
 #, c-format
 msgid "Already existing update media"
 msgstr "Već postojići medij za nadogradnju"
 
-#: ../rpmdrake:1544
+#: ../Rpmdrake/pkg.pm:226
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1963,12 +1746,12 @@ msgstr ""
 "\n"
 "Zatim  restartujte  %s."
 
-#: ../rpmdrake:1555
+#: ../Rpmdrake/pkg.pm:237
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "Kako ručno izabrati svoj miror sajt"
 
-#: ../rpmdrake:1556
+#: ../Rpmdrake/pkg.pm:238
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1983,72 +1766,37 @@ msgstr ""
 "\n"
 "Zatim, restarujte %s."
 
-#: ../rpmdrake:1570
+#: ../Rpmdrake/pkg.pm:252
 #, c-format
 msgid "Reading updates description"
 msgstr "Čitam opise nadogradnji"
 
-#: ../rpmdrake:1596 ../rpmdrake:1673
+#: ../Rpmdrake/pkg.pm:278 ../Rpmdrake/pkg.pm:358
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Molim Vas sačekajte, pronalazim dostupne pakete..."
 
-#: ../rpmdrake:1604
+#: ../Rpmdrake/pkg.pm:286
 #, c-format
 msgid "Please wait, listing base packages..."
 msgstr "Molim Vas sačekajte, prelistvam bazu paketa"
 
-#: ../rpmdrake:1640
+#: ../Rpmdrake/pkg.pm:323
 #, c-format
 msgid "Please wait, finding installed packages..."
 msgstr "Molim Vas sačekajte, pronalazim već instalirane pakete..."
 
-#: ../rpmdrake:1774
-#, c-format
-msgid "Inspecting %s"
-msgstr "Proveravam %s"
-
-#: ../rpmdrake:1797
-#, c-format
-msgid "changes:"
-msgstr "izmene:"
-
-#: ../rpmdrake:1805
-#, c-format
-msgid "Remove .%s"
-msgstr "Ukloni: %s"
-
-#: ../rpmdrake:1809
-#, c-format
-msgid "Use .%s as main file"
-msgstr "Koristi %s kao glavni fajl"
-
-#: ../rpmdrake:1813
-#, c-format
-msgid "Do nothing"
-msgstr "Ne radi ništa"
-
-#: ../rpmdrake:1829
-#, c-format
-msgid "Installation finished"
-msgstr "Instalacija gotova"
-
-#: ../rpmdrake:1844
-#, c-format
-msgid "Inspect..."
-msgstr "Proveri..."
-
-#: ../rpmdrake:1877 ../rpmdrake:2070
+#: ../Rpmdrake/pkg.pm:445 ../Rpmdrake/pkg.pm:733
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Svi paketi, koji ste zahtevali, su uspešno instalirani."
 
-#: ../rpmdrake:1881 ../rpmdrake:2050
+#: ../Rpmdrake/pkg.pm:449 ../Rpmdrake/pkg.pm:712
 #, c-format
 msgid "Problem during installation"
 msgstr "Problem za vreme instaliranja"
 
-#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#: ../Rpmdrake/pkg.pm:450 ../Rpmdrake/pkg.pm:714 ../Rpmdrake/pkg.pm:772
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -2059,17 +1807,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1901
+#: ../Rpmdrake/pkg.pm:475
 #, c-format
 msgid "Unable to get source packages."
 msgstr "Ne mogu da dobavim izvorne pakete."
 
-#: ../rpmdrake:1902
+#: ../Rpmdrake/pkg.pm:476
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Ne mogu da dobavim izvorne pakete, žao mi je. %s"
 
-#: ../rpmdrake:1903 ../rpmdrake:2001
+#: ../Rpmdrake/pkg.pm:477 ../Rpmdrake/pkg.pm:702
 #, c-format
 msgid ""
 "\n"
@@ -2082,62 +1830,42 @@ msgstr ""
 "Prijavljena Greška(e):\n"
 "%s"
 
-#. -PO: in singular form, we use %2\$
-#: ../rpmdrake:1921
-#, fuzzy, c-format
+#: ../Rpmdrake/pkg.pm:494
+#, c-format
 msgid ""
-"To satisfy dependencies, the following package is going to be installed:\n"
-"%2$s\n"
+"To satisfy dependencies, the following package is going to be installed:"
 msgid_plural ""
-"To satisfy dependencies, the following %d packages are going to be "
-"installed:\n"
-"%s\n"
+"To satisfy dependencies, the following %d packages are going to be installed:"
 msgstr[0] ""
-"Da bi zadovoljili međuzavisnosti, sledeći paket(i) takođe treba\n"
-"da se instaliraju:\n"
-"\n"
 msgstr[1] ""
-"Da bi zadovoljili međuzavisnosti, sledeći paket(i) takođe treba\n"
-"da se instaliraju:\n"
-"\n"
 msgstr[2] ""
-"Da bi zadovoljili međuzavisnosti, sledeći paket(i) takođe treba\n"
-"da se instaliraju:\n"
-"\n"
 
-#: ../rpmdrake:1926
-#, fuzzy, c-format
+#: ../Rpmdrake/pkg.pm:499
+#, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Ukloni ključ"
 msgstr[1] "Ukloni ključ"
 msgstr[2] "Ukloni ključ"
 
-#: ../rpmdrake:1927
+#: ../Rpmdrake/pkg.pm:501
 #, fuzzy, c-format
 msgid "The following package has to be removed for others to be upgraded:"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:"
-msgstr[0] ""
-"Sledeći paketi treba da budu uklonjeni da bi se drugi instalirali:\n"
-"\n"
-"%s\n"
-"\n"
-"da li je u redu da nastavim?"
-msgstr[1] ""
-"Sledeći paketi treba da budu uklonjeni da bi se drugi instalirali:\n"
-"\n"
-"%s\n"
-"\n"
-"da li je u redu da nastavim?"
-msgstr[2] ""
+msgstr ""
 "Sledeći paketi treba da budu uklonjeni da bi se drugi instalirali:\n"
 "\n"
 "%s\n"
 "\n"
 "da li je u redu da nastavim?"
 
-#: ../rpmdrake:1927
+#: ../Rpmdrake/pkg.pm:502
+#, fuzzy, c-format
+msgid "The following packages have to be removed for others to be upgraded:"
+msgstr ""
+"Sledeći paketi se moraju ukloniti da bi drugi mogli da budu ažurirani:\n"
+"%s"
+
+#: ../Rpmdrake/pkg.pm:502
 #, fuzzy, c-format
 msgid "Is it ok to continue?"
 msgstr ""
@@ -2145,32 +1873,47 @@ msgstr ""
 "\n"
 "Da li je U redu da nastavim?"
 
-#: ../rpmdrake:1944
+#: ../Rpmdrake/pkg.pm:525
 #, c-format
 msgid "Change medium"
 msgstr "Promeni medijum"
 
-#: ../rpmdrake:1945
+#: ../Rpmdrake/pkg.pm:526
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Ubacite medijum sa imenom \"%s\" u uređaj [%s]"
 
-#: ../rpmdrake:1952
+#: ../Rpmdrake/pkg.pm:547
+#, c-format
+msgid "Preparing packages installation..."
+msgstr "Pripremam instalaciju paketa"
+
+#: ../Rpmdrake/pkg.pm:547
+#, c-format
+msgid "Preparing..."
+msgstr "Pripremam..."
+
+#: ../Rpmdrake/pkg.pm:550
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Instaliram paket `%s' (%s/%s)..."
+
+#: ../Rpmdrake/pkg.pm:571
 #, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Preuzimanje paketa `%s' (%s/%s)..."
 
-#: ../rpmdrake:1972
+#: ../Rpmdrake/pkg.pm:591
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "Provera potpisa na paketima..."
 
-#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#: ../Rpmdrake/pkg.pm:604 ../rpmdrake.pm:750 ../rpmdrake.pm:859
 #, c-format
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../rpmdrake:1986
+#: ../Rpmdrake/pkg.pm:605
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -2185,12 +1928,48 @@ msgstr ""
 "\n"
 "Da li želite da nastavite instalaciju?"
 
-#: ../rpmdrake:1998 ../rpmdrake:2108
+#: ../Rpmdrake/pkg.pm:618
+#, fuzzy, c-format
+msgid "installing %s from %s"
+msgstr "Instaliram %s"
+
+#: ../Rpmdrake/pkg.pm:620
+#, c-format
+msgid "installing %s"
+msgstr "Instaliram %s"
+
+#: ../Rpmdrake/pkg.pm:624
+#, c-format
+msgid "removing %s"
+msgstr "uklanjam %s"
+
+#: ../Rpmdrake/pkg.pm:650 ../Rpmdrake/pkg.pm:668 ../Rpmdrake/pkg.pm:761
+#: ../rpmdrake.pm:737 ../rpmdrake.pm:818 ../rpmdrake.pm:842
+#, c-format
+msgid "Error"
+msgstr "Greška"
+
+#: ../Rpmdrake/pkg.pm:651 ../Rpmdrake/pkg.pm:669
+#, fuzzy, c-format
+msgid "Installation failed:"
+msgstr "Instalacija nije uspela"
+
+#: ../Rpmdrake/pkg.pm:652
+#, c-format
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "Instaliacija bez provere zavisnosti (da/Ne)? "
+
+#: ../Rpmdrake/pkg.pm:670
+#, fuzzy, c-format
+msgid "Try harder to install (--force)? (y/N) "
+msgstr "Prisilna instalacija (--force)? (da/Ne) ?"
+
+#: ../Rpmdrake/pkg.pm:682 ../Rpmdrake/pkg.pm:699 ../Rpmdrake/pkg.pm:771
 #, c-format
 msgid "Installation failed"
 msgstr "Instalacija neuspela"
 
-#: ../rpmdrake:1999
+#: ../Rpmdrake/pkg.pm:700
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -2203,27 +1982,12 @@ msgstr ""
 "\n"
 "Možda želite da nadogradite bazu podataka za medije."
 
-#: ../rpmdrake:2013
-#, c-format
-msgid "Preparing packages installation..."
-msgstr "Pripremam instalaciju paketa"
-
-#: ../rpmdrake:2013
-#, c-format
-msgid "Preparing..."
-msgstr "Pripremam..."
-
-#: ../rpmdrake:2016
-#, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Instaliram paket `%s' (%s/%s)..."
-
-#: ../rpmdrake:2031
+#: ../Rpmdrake/pkg.pm:713
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "ne mogu da pristupim rpm datoteci [%s]"
+msgid "%d installation transactions failed"
+msgstr "%d instlaciona transakcija nije uspela"
 
-#: ../rpmdrake:2065
+#: ../Rpmdrake/pkg.pm:728
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -2231,53 +1995,48 @@ msgid ""
 "Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
 "you may now inspect some in order to take actions:"
 msgstr ""
-"Instalacija je gotova,sve je dobro instalirano.\n"
+"Instalacija je gotova, sve je dobro instalirano.\n"
 "\n"
-"Napravio sam neke fajlove sa podešavanjima, neki su napravljeni kao `.rpmnew' "
-"ili `.rpmsave',\n"
+"Napravio sam neke fajlove sa podešavanjima, neki su napravljeni kao `."
+"rpmnew' ili `.rpmsave',\n"
 "morate da ih proverite kako bi ste nešto preduzeli:"
 
-#: ../rpmdrake:2073
+#: ../Rpmdrake/pkg.pm:736
 #, c-format
 msgid "Upgrade information"
 msgstr "Informacija o nadogradnji"
 
-#: ../rpmdrake:2075
+#: ../Rpmdrake/pkg.pm:738
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "Ovi paketi dolaze sa informacijama o nadogradnji "
 
-#: ../rpmdrake:2083
+#: ../Rpmdrake/pkg.pm:746
 #, c-format
 msgid "Upgrade information about this package"
 msgstr "Nadogradnja informacija o ovom paketu"
 
-#: ../rpmdrake:2086
+#: ../Rpmdrake/pkg.pm:749
 #, c-format
 msgid "Upgrade information about package %s"
 msgstr "Nadogradnja informacija o paketu %s"
 
-#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
-#, c-format
-msgid "Error"
-msgstr "Greška"
-
-#: ../rpmdrake:2099
+#: ../Rpmdrake/pkg.pm:762
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Nepopravljiva greška: Žao mi je jer nije pronađen paket za instalaciju"
 
-#: ../rpmdrake:2124
+#: ../Rpmdrake/pkg.pm:786 ../Rpmdrake/pkg.pm:791
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "Molim Vas sačekajte, uklanjam pakete..."
 
-#: ../rpmdrake:2135
+#: ../Rpmdrake/pkg.pm:802
 #, c-format
 msgid "Problem during removal"
 msgstr "Problem prilikom uklanjanja"
 
-#: ../rpmdrake:2136
+#: ../Rpmdrake/pkg.pm:803
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -2288,263 +2047,550 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:2168
+#: ../Rpmdrake/rpmnew.pm:78
 #, c-format
-msgid "Welcome"
-msgstr "Dobrodošli"
+msgid "Inspecting %s"
+msgstr "Proveravam %s"
+
+#: ../Rpmdrake/rpmnew.pm:102
+#, c-format
+msgid "Changes:"
+msgstr "Izmene:"
 
-#: ../rpmdrake:2173
+#: ../Rpmdrake/rpmnew.pm:110
+#, c-format
+msgid "Remove .%s"
+msgstr "Ukloni: %s"
+
+#: ../Rpmdrake/rpmnew.pm:114
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Koristi %s kao glavni fajl"
+
+#: ../Rpmdrake/rpmnew.pm:118
+#, c-format
+msgid "Do nothing"
+msgstr "Ne radi ništa"
+
+#: ../Rpmdrake/rpmnew.pm:149
+#, c-format
+msgid "Installation finished"
+msgstr "Instalacija gotova"
+
+#: ../Rpmdrake/rpmnew.pm:164
+#, c-format
+msgid "Inspect..."
+msgstr "Proveri..."
+
+#: ../Rpmdrake/rpmnew.pm:182 ../rpmdrake:70 ../rpmdrake:97
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Molim Vas sačekajte, tražim..."
+
+#: ../gurpmi.addmedia:83
+#, c-format
+msgid "Unable to add medium, wrong or missing arguments"
+msgstr "Nemoguće je ubaciti medij,argumenti su pogrešni ili nedostaju "
+
+#: ../gurpmi.addmedia:97
 #, c-format
 msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
 msgstr ""
-"Dobrodošli u program za uklanjanje softvera!\n"
-"\n"
-"Ovaj alat vam može pomoći da izaberete softver želite da uklonite sa\n"
-"vašeg računara."
 
-#: ../rpmdrake:2178
+#: ../gurpmi.addmedia:100
 #, c-format
 msgid ""
-"Welcome to %s!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+"You are about to add a new packages medium, `%s'.\n"
+"That means you will be able to add new software packages\n"
+"to your system from that new medium."
 msgstr ""
-"Dobrodošli u %s!\n"
-"\n"
-"Ovaj alat vam pomaže da izabete nadogradnje koje želite da instalirate na\n"
-"vaš računar."
+"Na putu ste da dodate novi medij sa paketima, `%s'.\n"
+"To znači da će te moći da dodate nove softverske pakete\n"
+"u Vaš sistem sa tih novih medija."
 
-#: ../rpmdrake:2183
+#: ../gurpmi.addmedia:125
 #, c-format
-msgid "Welcome to the software installation tool!"
-msgstr "Dobrodošli u alat za instalaciju softvera!"
+msgid "Successfully added media %s."
+msgstr "Uspešno dodat medij `%s'."
+
+#: ../gurpmi.addmedia:126
+#, c-format
+msgid "Successfully added medium `%s'."
+msgstr "Uspešno dodat medij `%s'"
+
+#: ../rpmdrake:59 ../rpmdrake:140
+#, c-format
+msgid "Search results"
+msgstr "Rezultati pretrage"
+
+#: ../rpmdrake:59
+#, c-format
+msgid "Search results (none)"
+msgstr "Rezultat pretrage (nema)"
+
+#: ../rpmdrake:92 ../rpmdrake:186 ../rpmdrake.pm:187
+#, c-format
+msgid "Software Management"
+msgstr "Softverski Menadžment"
+
+#: ../rpmdrake:102
+#, c-format
+msgid "Stop"
+msgstr "Stop"
+
+#: ../rpmdrake:143
+#, c-format
+msgid "Selected"
+msgstr "Izabrani"
+
+#: ../rpmdrake:143
+#, c-format
+msgid "Not selected"
+msgstr "Nisu izabrani"
 
-#: ../rpmdrake:2184
+#: ../rpmdrake:199
+#, c-format
+msgid "Selected: %s / Free disk space: %s"
+msgstr "Izabrano: %s / Slobodan prostor na disku: %s"
+
+#: ../rpmdrake:200
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Veličina izabranog: %d MB"
+
+#: ../rpmdrake:255
+#, c-format
+msgid "Installed"
+msgstr "Instalirano"
+
+#: ../rpmdrake:255
+#, c-format
+msgid "Non installed"
+msgstr "Nije instalirano"
+
+#: ../rpmdrake:256
+#, c-format
+msgid "%s choices"
+msgstr "%s izbori"
+
+#: ../rpmdrake:256
+#, c-format
+msgid "Mandriva Linux choices"
+msgstr "Mandriva Linux-ovi izbori"
+
+#: ../rpmdrake:258
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Svi paketi, po abecedi"
+
+#: ../rpmdrake:259
+#, c-format
+msgid "All packages, by update availability"
+msgstr "Svi paketi, po dostupnosti nove verzije"
+
+#: ../rpmdrake:260
+#, c-format
+msgid "All packages, by size"
+msgstr "Svi paketi, po veličini"
+
+#: ../rpmdrake:261
+#, c-format
+msgid "All packages, by selection state"
+msgstr "Svi paketi, po stanju biranja"
+
+#: ../rpmdrake:262
+#, c-format
+msgid "Leaves only, sorted by install date"
+msgstr "Sortirano je po datumu instalacije"
+
+#: ../rpmdrake:263
+#, c-format
+msgid "All packages, by group"
+msgstr "Svi paketi, po grupi"
+
+#: ../rpmdrake:265
+#, c-format
+msgid "All updates"
+msgstr "Sve nadogradnje"
+
+#: ../rpmdrake:265
+#, c-format
+msgid "Security updates"
+msgstr "Sigurnosne nadogradnje"
+
+#: ../rpmdrake:265
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Nadogradnje sa ispravkama"
+
+#: ../rpmdrake:265
+#, c-format
+msgid "Normal updates"
+msgstr "Obične nadogradnje"
+
+#: ../rpmdrake:326
+#, c-format
+msgid "in names"
+msgstr "u imenima"
+
+#: ../rpmdrake:328
+#, c-format
+msgid "in descriptions"
+msgstr "u opisima"
+
+#: ../rpmdrake:330
+#, c-format
+msgid "in file names"
+msgstr "u imenima fajlova"
+
+#: ../rpmdrake:361 ../rpmdrake:364 ../rpmdrake:375 ../rpmdrake:388
+#: ../rpmdrake:397
+#, c-format
+msgid "/_File"
+msgstr "/_Fajl"
+
+#: ../rpmdrake:364
+#, c-format
+msgid "/_Update media"
+msgstr "/_Nadogradnja medija"
+
+#: ../rpmdrake:375
+#, c-format
+msgid "/_Reset the selection"
+msgstr "/_Ponovo izaberi"
+
+#: ../rpmdrake:388
+#, c-format
+msgid "/Reload the _packages list"
+msgstr "/Ponovo učitaj listu paketa"
+
+#: ../rpmdrake:397
+#, c-format
+msgid "/_Quit"
+msgstr "/_Kraj"
+
+#: ../rpmdrake:397
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../rpmdrake:400 ../rpmdrake:401 ../rpmdrake:405 ../rpmdrake:435
+#, c-format
+msgid "/_Options"
+msgstr "/_Opcije"
+
+#: ../rpmdrake:401
+#, c-format
+msgid "/_Media Manager"
+msgstr "/_Menadžer za Medije"
+
+#: ../rpmdrake:405 ../rpmdrake:435
+#, c-format
+msgid "/_Show automatically selected packages"
+msgstr "/Automatski prikaži izabrane pakete"
+
+#: ../rpmdrake:409 ../rpmdrake:410 ../rpmdrake:411 ../rpmdrake:412
+#, c-format
+msgid "/_Help"
+msgstr "/_Pomoć"
+
+#: ../rpmdrake:410
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Prijavite Bag"
+
+#: ../rpmdrake:412
+#, c-format
+msgid "/_About..."
+msgstr "/_O..."
+
+#: ../rpmdrake:415
+#, c-format
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
+
+#: ../rpmdrake:417
+#, c-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr "Sva prava (C) %s zadržava Mandriva"
+
+#: ../rpmdrake:419
+#, c-format
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr "Rpmdrake je Mandriva Linux alat za rukovanje paketima"
+
+#: ../rpmdrake:421
+#, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:426
+#, c-format
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr "Miodrag Živković <miodragz@linuxo.org>\n"
+
+#: ../rpmdrake:450
+#, c-format
+msgid "Find:"
+msgstr "Pronađi:"
+
+#: ../rpmdrake:459
+#, c-format
+msgid "Search"
+msgstr "Traži"
+
+#: ../rpmdrake:461
+#, c-format
+msgid "Clear"
+msgstr "Očisti"
+
+#: ../rpmdrake:475 ../rpmdrake.pm:771
+#, c-format
+msgid "Select all"
+msgstr "Izaberi sve"
+
+#: ../rpmdrake:482
+#, c-format
+msgid "Apply"
+msgstr "Primeni"
+
+#: ../rpmdrake:486
+#, c-format
+msgid "Quit"
+msgstr "Kraj"
+
+#: ../rpmdrake:502
+#, c-format
+msgid "Quick Introduction"
+msgstr "Kratak uvod"
+
+#: ../rpmdrake:503
+#, c-format
+msgid "You can browse the packages through the categories tree on the left."
+msgstr "Pakete možeš razgledati pomoću stabla kategorija na levoj strani"
+
+#: ../rpmdrake:504
 #, c-format
 msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandriva Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
+"You can view information about a package by clicking on it on the right list."
+msgstr "Informacije o paketu možeš pogledati klikom na njega na listi desno"
+
+#: ../rpmdrake:505
+#, c-format
+msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
-"Dobrodošli u alat za instalaciju softvera!\n"
-"\n"
-"Vaš Mandriva Linux operativni sistem je došao sa nekoliko hiljada paketa\n"
-"sa programima, na CD-u ili DVD-u. Ovaj alat će Vam pomoći da izaberete\n"
-"pakete koje želite da instalirate na Vaš računar."
+"Da bi instalirali, nadogradili ili uklonili paket samo kliknite na njegov"
 
-#: ../rpmdrake.pm:104
+#: ../rpmdrake.pm:107
 #, c-format
 msgid "Software Update"
 msgstr "Nadogradnja softvera"
 
-#: ../rpmdrake.pm:104
+#: ../rpmdrake.pm:107
 #, c-format
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux Nadogradnja"
 
-#: ../rpmdrake.pm:131
+#: ../rpmdrake.pm:134
 #, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Molimo unesite Vaša ovlašćenja za pristup proksiju\n"
 
-#: ../rpmdrake.pm:132
+#: ../rpmdrake.pm:135
 #, c-format
 msgid "User name:"
 msgstr "Korisničko ime:"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:182
 #, c-format
 msgid "Software Packages Removal"
 msgstr "Uklanjanje softverskih paketa paketa"
 
-#: ../rpmdrake.pm:176
+#: ../rpmdrake.pm:183 ../rpmdrake.pm:187
 #, c-format
 msgid "Software Packages Update"
 msgstr "Nadogradnja softverskih paketa"
 
-#: ../rpmdrake.pm:177
+#: ../rpmdrake.pm:184
 #, c-format
 msgid "Software Packages Installation"
 msgstr "Instalacija paketa"
 
-#: ../rpmdrake.pm:219
+#: ../rpmdrake.pm:227
 #, c-format
 msgid "No"
 msgstr "Ne"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:231
 #, c-format
 msgid "Yes"
 msgstr "Da"
 
-#: ../rpmdrake.pm:273
+#: ../rpmdrake.pm:281
 #, c-format
 msgid "Info..."
 msgstr "Informacije..."
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:402
 #, c-format
 msgid "Austria"
 msgstr "Austrija"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:403
 #, c-format
 msgid "Australia"
 msgstr "Australija"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:404
 #, c-format
 msgid "Belgium"
 msgstr "Belgija"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:405
 #, c-format
 msgid "Brazil"
 msgstr "Brazil"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:406
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:407
 #, c-format
 msgid "Switzerland"
 msgstr "Švajcarska"
 
-#: ../rpmdrake.pm:396
+#: ../rpmdrake.pm:408
 #, c-format
 msgid "Costa Rica"
 msgstr "Kostarika"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:409
 #, c-format
 msgid "Czech Republic"
 msgstr "Češka"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:410
 #, c-format
 msgid "Germany"
 msgstr "Nemačka"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:411
 #, c-format
 msgid "Danmark"
 msgstr "Danska"
 
-#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#: ../rpmdrake.pm:412 ../rpmdrake.pm:416
 #, c-format
 msgid "Greece"
 msgstr "Grčka"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:413
 #, c-format
 msgid "Spain"
 msgstr "Španija"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:414
 #, c-format
 msgid "Finland"
 msgstr "Finska"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:415
 #, c-format
 msgid "France"
 msgstr "Francuska"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:417
 #, c-format
 msgid "Hungary"
 msgstr "Mađarska"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:418
 #, c-format
 msgid "Israel"
 msgstr "Izrael"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:419
 #, c-format
 msgid "Italy"
 msgstr "Italija"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:420
 #, c-format
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:421
 #, c-format
 msgid "Korea"
 msgstr "Koreja"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Netherlands"
 msgstr "Holandija"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:423
 #, c-format
 msgid "Norway"
 msgstr "Norveška"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:424
 #, c-format
 msgid "Poland"
 msgstr "Poljska"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:425
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:426
 #, c-format
 msgid "Russia"
 msgstr "Rusija"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:427
 #, c-format
 msgid "Sweden"
 msgstr "Švedska"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:428
 #, c-format
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../rpmdrake.pm:417
+#: ../rpmdrake.pm:429
 #, c-format
 msgid "Slovakia"
 msgstr "Slovačka"
 
-#: ../rpmdrake.pm:418
+#: ../rpmdrake.pm:430
 #, c-format
 msgid "Taiwan"
 msgstr "Tajvan"
 
-#: ../rpmdrake.pm:419
+#: ../rpmdrake.pm:431
 #, c-format
 msgid "United Kingdom"
 msgstr "Ujedinjeno Kraljevstvo"
 
-#: ../rpmdrake.pm:420
+#: ../rpmdrake.pm:432
 #, c-format
 msgid "China"
 msgstr "Kina"
 
-#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#: ../rpmdrake.pm:433 ../rpmdrake.pm:434 ../rpmdrake.pm:435 ../rpmdrake.pm:436
 #, c-format
 msgid "United States"
 msgstr "Sjedinjene Američke Države"
 
-#: ../rpmdrake.pm:521
+#: ../rpmdrake.pm:533
 #, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
@@ -2557,7 +2603,7 @@ msgstr ""
 "\n"
 "Da li je U redu da nastavim?"
 
-#: ../rpmdrake.pm:525
+#: ../rpmdrake.pm:537
 #, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
@@ -2571,29 +2617,29 @@ msgstr ""
 "\n"
 "Da li je U redu da nastavim?"
 
-#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:543 ../rpmdrake.pm:581
 #, c-format
 msgid "Mirror choice"
 msgstr "Izbor servera ( mirora )"
 
-#: ../rpmdrake.pm:534
+#: ../rpmdrake.pm:546
 #, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Molim Vas sačekajte, skidam listu dodatnih adresa servera ( mirora ) "
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:547
 #, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Molim Vas sačekajte, skidam listu dodatnih adresa servera ( mirora ) sa "
 "Mandrivinog veb sajta."
 
-#: ../rpmdrake.pm:542
+#: ../rpmdrake.pm:554
 #, c-format
 msgid "Error during download"
 msgstr "Greška tokom preuzimanja sa interneta"
 
-#: ../rpmdrake.pm:544
+#: ../rpmdrake.pm:556
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2608,7 +2654,7 @@ msgstr ""
 "Internet, ili Mandriva-ov veb sajt možda nisu trenutno dostupni.\n"
 "Pokušajte kasnije ponovo."
 
-#: ../rpmdrake.pm:549
+#: ../rpmdrake.pm:561
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2623,17 +2669,17 @@ msgstr ""
 "Internet ili Mandriva veb sajt možda nisu trenutno dostupni.\n"
 "Pokušajte kasnije ponovo."
 
-#: ../rpmdrake.pm:559
+#: ../rpmdrake.pm:571
 #, c-format
 msgid "No mirror"
 msgstr "Nema servera"
 
-#: ../rpmdrake.pm:561
+#: ../rpmdrake.pm:573
 #, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Ne mogu da nađem odgovarajući server ( server )"
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:574
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2648,68 +2694,68 @@ msgstr ""
 "slučaj da arhitektura vašeg procesora nije podržana\n"
 "od strane Mandriva Linux Zvanične Nadogradnje."
 
-#: ../rpmdrake.pm:581
+#: ../rpmdrake.pm:593
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Izaberite server po želji."
 
-#: ../rpmdrake.pm:634
+#: ../rpmdrake.pm:646
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopiram fajl za medij `%s'..."
 
-#: ../rpmdrake.pm:637
+#: ../rpmdrake.pm:649
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Ispitujem fajl za medij `%s'..."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:652
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Ispitujem udaljeni fajl  za medij `%s'..."
 
-#: ../rpmdrake.pm:644
+#: ../rpmdrake.pm:656
 #, c-format
 msgid " done."
 msgstr " urađeno."
 
-#: ../rpmdrake.pm:648
+#: ../rpmdrake.pm:660
 #, c-format
 msgid " failed!"
 msgstr " neuspelo!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:652
+#: ../rpmdrake.pm:664
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s za medij %s"
 
-#: ../rpmdrake.pm:656
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Pokrećem preuzimanje sa `%s'..."
 
-#: ../rpmdrake.pm:660
+#: ../rpmdrake.pm:672
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Preuzimanje sa `%s', vreme do kraja:%s, brzina:%s"
 
-#: ../rpmdrake.pm:663
+#: ../rpmdrake.pm:675
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Preuzimanje sa `%s', brzina:%s"
 
-#: ../rpmdrake.pm:674
+#: ../rpmdrake.pm:686
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Molim Vas sačekajte, nadograđujem medij..."
 
-#: ../rpmdrake.pm:702
+#: ../rpmdrake.pm:713
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Greška prilikom pristizanja paketa"
 
-#: ../rpmdrake.pm:703
+#: ../rpmdrake.pm:714
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2725,12 +2771,12 @@ msgstr ""
 "kako bi se ponovo konfigurisao,ili je trenutno nedostupan i treba pokušati\n"
 "kasnije."
 
-#: ../rpmdrake.pm:734
+#: ../rpmdrake.pm:745
 #, c-format
 msgid "Update media"
 msgstr "Nadogradnja medija"
 
-#: ../rpmdrake.pm:739
+#: ../rpmdrake.pm:750
 #, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
@@ -2738,17 +2784,17 @@ msgstr ""
 "Nisu nađeni mediji koji su aktivni. Morate ih učiniti dostupnim da bi ih "
 "mogli nadograditi."
 
-#: ../rpmdrake.pm:746
+#: ../rpmdrake.pm:757
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Izaberite medij koji želite da nadogradite:"
 
-#: ../rpmdrake.pm:764
+#: ../rpmdrake.pm:775
 #, c-format
 msgid "Update"
 msgstr "Nadogradnja"
 
-#: ../rpmdrake.pm:785
+#: ../rpmdrake.pm:796
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2761,7 +2807,7 @@ msgstr ""
 "Greške:\n"
 "%s"
 
-#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#: ../rpmdrake.pm:819 ../rpmdrake.pm:830
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2772,17 +2818,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:831
+#: ../rpmdrake.pm:842
 #, c-format
 msgid "Unable to create medium."
 msgstr "Ne mogu da napravim medij."
 
-#: ../rpmdrake.pm:836
+#: ../rpmdrake.pm:847
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Greška pri ubacivanju medija"
 
-#: ../rpmdrake.pm:837
+#: ../rpmdrake.pm:848
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2793,7 +2839,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:850
+#: ../rpmdrake.pm:861
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
@@ -2804,7 +2850,7 @@ msgstr ""
 "koristite (%s).\n"
 "I biće onemogućeno njegovo korišćenje."
 
-#: ../rpmdrake.pm:853
+#: ../rpmdrake.pm:864
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
@@ -2815,12 +2861,12 @@ msgstr ""
 "koji se koristi (%s).\n"
 "I biće onemogućeno njegovo korišćenje."
 
-#: ../rpmdrake.pm:870
+#: ../rpmdrake.pm:881
 #, c-format
 msgid "Help launched in background"
 msgstr "Pomoć pokrenuta u pozadini"
 
-#: ../rpmdrake.pm:871
+#: ../rpmdrake.pm:882
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
@@ -3097,6 +3143,13 @@ msgstr "Ukloni softver"
 msgid "Software Media Manager"
 msgstr "Menadžer za Medije sa softverom"
 
+#, fuzzy
+#~ msgid "  --version              output version information and exit"
+#~ msgstr "  --root                forsiraj pokretanje kao root"
+
+#~ msgid "unable to access rpm file [%s]"
+#~ msgstr "ne mogu da pristupim rpm datoteci [%s]"
+
 #~ msgid ""
 #~ "This step enables you to add sources from a Mandriva Linux web or FTP "
 #~ "mirror.\n"
@@ -3111,8 +3164,8 @@ msgstr "Menadžer za Medije sa softverom"
 #~ "have\n"
 #~ "to do this in two steps.)\n"
 #~ msgstr ""
-#~ "Ovaj korak Vam omogućava da ubacite izvore podataka sa Mandriva Linux "
-#~ "Web ili FTP mirora.\n"
+#~ "Ovaj korak Vam omogućava da ubacite izvore podataka sa Mandriva Linux Web "
+#~ "ili FTP mirora.\n"
 #~ "\n"
 #~ "Ima dve vrste zvaničnih mirora. Možete da izaberete da dodate izvore koji "
 #~ "sadrže \n"
@@ -3141,21 +3194,6 @@ msgstr "Menadžer za Medije sa softverom"
 #~ "To znači da će te moći da dodate nove softverske pakete\n"
 #~ "u Vaš sistem sa ovih novih medija.\n"
 
-#~ msgid "One of the following packages is needed:"
-#~ msgstr "Jedan od sledećih paketa je potreban:"
-
-#~ msgid "Some packages can't be installed"
-#~ msgstr "Neki paketi ne mogu biti instalirani"
-
-#~ msgid ""
-#~ "Sorry, the following package(s) can't be selected:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Žao mi je, ali  sledeći paket(i)ne mogu biti izabrani:\n"
-#~ "\n"
-#~ "%s"
-
 #~ msgid ""
 #~ "To satisfy dependencies, the following %d packages are going to be "
 #~ "installed:\n"