adapted to plural-form

1 files changed, 1171 insertions, 627 deletions

diff --git a/po/sr.po b/po/sr.po
index c6ff2be5..0800824f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 18:39+0200\n"
+"POT-Creation-Date: 2006-12-21 17:11+0100\n"
 "PO-Revision-Date: 2004-02-01 19:31+0100\n"
 "Last-Translator: Toma Jankovic <webmaster@mandrake.co.yu>\n"
 "Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -20,12 +20,15 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
+"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:80
+#: ../edit-urpm-sources.pl:85
+#, c-format
 msgid "Choose media type"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:81
+#: ../edit-urpm-sources.pl:86
+#, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -39,17 +42,18 @@ msgid ""
 "to do this in two steps.)"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:94
+#, c-format
 msgid "Distribution sources"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:89
-#, fuzzy
+#: ../edit-urpm-sources.pl:94
+#, fuzzy, c-format
 msgid "Official updates"
 msgstr "Обичне надоградње"
 
-#: ../edit-urpm-sources.pl:92
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:97
+#, fuzzy, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
@@ -64,87 +68,104 @@ msgstr ""
 "\n"
 "Да ли је У реду да наставим?"
 
-#: ../edit-urpm-sources.pl:102
-#, fuzzy
+#: ../edit-urpm-sources.pl:111
+#, fuzzy, c-format
 msgid "Please wait, adding media..."
 msgstr "Молим Вас сачекајте, ажурирам медијум..."
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:144
+#, c-format
 msgid "Add a medium"
 msgstr "Додај медиј"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Local files"
 msgstr "Локални фајлови"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:146
+#, c-format
 msgid "Path:"
 msgstr "Путања:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:147
+#, c-format
 msgid "FTP server"
 msgstr "FTP сервер"
 
-#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
-#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
+#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
+#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:138
-#, fuzzy
+#: ../edit-urpm-sources.pl:148
+#, fuzzy, c-format
 msgid "RSYNC server"
 msgstr "FTP сервер"
 
-#: ../edit-urpm-sources.pl:139
+#: ../edit-urpm-sources.pl:149
+#, c-format
 msgid "HTTP server"
 msgstr "HTTP сервер"
 
-#: ../edit-urpm-sources.pl:140
-msgid "Path or mount point:"
-msgstr "Путања или тачка монтирања:"
-
-#: ../edit-urpm-sources.pl:140
+#: ../edit-urpm-sources.pl:150
+#, c-format
 msgid "Removable device"
 msgstr "Преносни уређај"
 
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:150
+#, c-format
+msgid "Path or mount point:"
+msgstr "Путања или тачка монтирања:"
+
+#: ../edit-urpm-sources.pl:169
+#, c-format
 msgid "Browse..."
 msgstr "Тражи..."
 
-#: ../edit-urpm-sources.pl:187
+#: ../edit-urpm-sources.pl:196
+#, c-format
 msgid "Login:"
 msgstr "Пријава:"
 
-#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#, c-format
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
+#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Релативна путања ка synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:194
+#: ../edit-urpm-sources.pl:203
+#, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "уколико оставите празно, synthesis/hdlist ће бити аутоматски тестирана"
 
-#: ../edit-urpm-sources.pl:199
+#: ../edit-urpm-sources.pl:208
+#, c-format
 msgid "Name:"
 msgstr "Име:"
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
+#, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:218
-#, fuzzy
+#: ../edit-urpm-sources.pl:227
+#, fuzzy, c-format
 msgid "Search this media for updates"
 msgstr "Изаберите медиј који желите да ажурирате:"
 
-#: ../edit-urpm-sources.pl:228
+#: ../edit-urpm-sources.pl:237
+#, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "Морате да попуните најмање прва два поља."
 
-#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:241
+#, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -152,115 +173,134 @@ msgstr ""
 "Веќ постоји медиј са тим именом, да ли\n"
 "заиста желите да је замените?"
 
-#: ../edit-urpm-sources.pl:243
+#: ../edit-urpm-sources.pl:252
+#, c-format
 msgid "Adding a medium:"
 msgstr "Додајем медиј:"
 
-#: ../edit-urpm-sources.pl:245
+#: ../edit-urpm-sources.pl:254
+#, c-format
 msgid "Type of medium:"
 msgstr "Тип медија:"
 
-#: ../edit-urpm-sources.pl:253 ../edit-urpm-sources.pl:328
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:439
-#: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:586
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:684
-#: ../edit-urpm-sources.pl:823 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:1752 ../rpmdrake:1760 ../rpmdrake.pm:284 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:687 ../rpmdrake.pm:760
+#: ../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
+#, c-format
 msgid "Cancel"
 msgstr "Одустани"
 
-#: ../edit-urpm-sources.pl:255 ../edit-urpm-sources.pl:330
-#: ../edit-urpm-sources.pl:439 ../edit-urpm-sources.pl:494
-#: ../edit-urpm-sources.pl:583 ../edit-urpm-sources.pl:625
-#: ../edit-urpm-sources.pl:677 ../edit-urpm-sources.pl:749
-#: ../edit-urpm-sources.pl:816 ../edit-urpm-sources.pl:869
-#: ../edit-urpm-sources.pl:1018 ../rpmdrake:191 ../rpmdrake:849
-#: ../rpmdrake:866 ../rpmdrake:871 ../rpmdrake:1662 ../rpmdrake:1752
-#: ../rpmdrake:1903 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
-#: ../rpmdrake.pm:597
+#: ../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
+#, c-format
 msgid "Ok"
 msgstr "У реду"
 
-#: ../edit-urpm-sources.pl:312
-#, fuzzy
+#: ../edit-urpm-sources.pl:321
+#, fuzzy, c-format
 msgid "Global options for package installation"
 msgstr "Припремам инсталацију пакета"
 
-#: ../edit-urpm-sources.pl:314
+#: ../edit-urpm-sources.pl:323
+#, c-format
 msgid "always"
 msgstr "увек"
 
-#: ../edit-urpm-sources.pl:315
+#: ../edit-urpm-sources.pl:324
+#, c-format
 msgid "never"
 msgstr "никад"
 
-#: ../edit-urpm-sources.pl:324
-#, fuzzy
+#: ../edit-urpm-sources.pl:333
+#, fuzzy, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Неки пакети не могу да се инсталирају"
 
-#: ../edit-urpm-sources.pl:325
-#, fuzzy
+#: ../edit-urpm-sources.pl:334
+#, fuzzy, c-format
 msgid "Download program to use:"
 msgstr "Download са `%s', брзина:%s"
 
-#: ../edit-urpm-sources.pl:355
-#, fuzzy
+#: ../edit-urpm-sources.pl:364
+#, fuzzy, c-format
 msgid "Source Removal"
 msgstr "Уклањање пакета"
 
-#: ../edit-urpm-sources.pl:356
-#, fuzzy, perl-format
+#: ../edit-urpm-sources.pl:365
+#, fuzzy, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr ""
 "Да ли сте сигурни да желите да уклоните кључ %s са медија %s?\n"
 "(име кључа: %s)"
 
-#: ../edit-urpm-sources.pl:361
+#: ../edit-urpm-sources.pl:370
+#, c-format
 msgid "Please wait, removing medium..."
 msgstr "Молимо Вас да сачекате, уклањам медијум..."
 
-#: ../edit-urpm-sources.pl:398
+#: ../edit-urpm-sources.pl:405
+#, c-format
 msgid "Edit a medium"
 msgstr "Измени медиј"
 
-#: ../edit-urpm-sources.pl:404
-#, perl-format
+#: ../edit-urpm-sources.pl:411
+#, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Мењам медиј \"%s\":"
 
-#: ../edit-urpm-sources.pl:418
+#: ../edit-urpm-sources.pl:416
+#, c-format
+msgid "Downloader:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:428
+#, c-format
 msgid "Save changes"
 msgstr "Сачувај измене"
 
-#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
+#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#, c-format
 msgid "Proxy..."
 msgstr "Прокси..."
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:449
+#, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Морате да убаците медијум како би сте наставили"
 
-#: ../edit-urpm-sources.pl:438
+#: ../edit-urpm-sources.pl:450
+#, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "Да би сте сачували измене, морате да убаците медијум у уређај."
 
-#: ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:471
+#, c-format
 msgid "Configure proxies"
 msgstr "Подешавање проксија"
 
-#: ../edit-urpm-sources.pl:470
-#, perl-format
+#: ../edit-urpm-sources.pl:482
+#, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr ""
 
-#: ../edit-urpm-sources.pl:471
+#: ../edit-urpm-sources.pl:483
+#, c-format
 msgid "Global proxy settings"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:473
+#: ../edit-urpm-sources.pl:485
+#, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -268,138 +308,172 @@ msgstr ""
 "Ако Вам је потребна прокси, унесите име домаћина и необавезни порт "
 "(синтакса: <proksi-domacin[:port]>):"
 
-#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:488
+#, c-format
 msgid "Proxy hostname:"
 msgstr "Име прокси домаћина(hostname):"
 
-#: ../edit-urpm-sources.pl:479
+#: ../edit-urpm-sources.pl:491
+#, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Можете да подесите корисника/лозинку за идентификацију проксија:"
 
-#: ../edit-urpm-sources.pl:482
+#: ../edit-urpm-sources.pl:494
+#, c-format
 msgid "User:"
 msgstr "Корисник:"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Add a parallel group"
 msgstr "Доај паралелну групу"
 
-#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:566
+#, c-format
 msgid "Edit a parallel group"
 msgstr "Уредите паралелну групу"
 
-#: ../edit-urpm-sources.pl:565
+#: ../edit-urpm-sources.pl:577
+#, c-format
 msgid "Add a medium limit"
 msgstr "Додај лимит за медиј"
 
-#: ../edit-urpm-sources.pl:577
+#: ../edit-urpm-sources.pl:589
+#, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Изаберите медиј за додавање у лимит за медије:"
 
-#: ../edit-urpm-sources.pl:614
+#: ../edit-urpm-sources.pl:626
+#, c-format
 msgid "Add a host"
 msgstr "Додај host"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:632
+#, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Унесите у име хоста или  IP адресу хоста за додавање:"
 
-#: ../edit-urpm-sources.pl:651
-#, perl-format
+#: ../edit-urpm-sources.pl:663
+#, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Измени паралелну групу \"%s\":"
 
-#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:667
+#, c-format
 msgid "Group name:"
 msgstr "Име групе:"
 
-#: ../edit-urpm-sources.pl:656
+#: ../edit-urpm-sources.pl:668
+#, c-format
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: ../edit-urpm-sources.pl:658
+#: ../edit-urpm-sources.pl:670
+#, c-format
 msgid "Media limit:"
 msgstr "Лимит медија:"
 
-#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
+#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#, c-format
 msgid "Add"
 msgstr "Додај"
 
-#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
-#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
+#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#, c-format
 msgid "Remove"
 msgstr "Уклони"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:677
+#, c-format
 msgid "Hosts:"
 msgstr "Hosts:"
 
-#: ../edit-urpm-sources.pl:699
+#: ../edit-urpm-sources.pl:711
+#, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Подесите паралелни urpmi (дистрибуирано покретање urpmi-ја)"
 
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Group"
 msgstr "Група"
 
-#: ../edit-urpm-sources.pl:702
-msgid "Media limit"
-msgstr "Лимит за медије"
-
-#: ../edit-urpm-sources.pl:702
+#: ../edit-urpm-sources.pl:714
+#, c-format
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../edit-urpm-sources.pl:703
+#: ../edit-urpm-sources.pl:714
+#, c-format
+msgid "Media limit"
+msgstr "Лимит за медије"
+
+#: ../edit-urpm-sources.pl:715
+#, c-format
 msgid "Command"
 msgstr "Команда"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
-#: ../rpmdrake:775
+#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
+#: ../rpmdrake:882 ../rpmdrake:1773
+#, c-format
 msgid "(none)"
 msgstr "(ниједан)"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
+#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#, c-format
 msgid "Edit..."
-msgstr "Измени"
+msgstr "Измени..."
 
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#, c-format
 msgid "Add..."
 msgstr "Додај..."
 
-#: ../edit-urpm-sources.pl:757
+#: ../edit-urpm-sources.pl:769
+#, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Управља кључевима за дигиталне потписе пакета"
 
-#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
+#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#, c-format
 msgid "Medium"
 msgstr "Медиј"
 
-#: ../edit-urpm-sources.pl:766
+#: ../edit-urpm-sources.pl:780
+#, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:785
+#: ../edit-urpm-sources.pl:803
+#, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "име није пронађено, кључ не постоји у rpm keyring!"
 
-#: ../edit-urpm-sources.pl:798
+#: ../edit-urpm-sources.pl:816
+#, c-format
 msgid "Add a key"
 msgstr "Додај кључ"
 
-#: ../edit-urpm-sources.pl:810
-#, perl-format
+#: ../edit-urpm-sources.pl:828
+#, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Изабери кљул који треба додати медијуму %s"
 
-#: ../edit-urpm-sources.pl:838
+#: ../edit-urpm-sources.pl:834
+#, c-format
+msgid "Close"
+msgstr "Затвори"
+
+#: ../edit-urpm-sources.pl:856
+#, c-format
 msgid "Remove a key"
 msgstr "Уклони кључ"
 
-#: ../edit-urpm-sources.pl:839
-#, perl-format
+#: ../edit-urpm-sources.pl:857
+#, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
@@ -407,66 +481,76 @@ msgstr ""
 "Да ли сте сигурни да желите да уклоните кључ %s са медија %s?\n"
 "(име кључа: %s)"
 
-#: ../edit-urpm-sources.pl:857
+#: ../edit-urpm-sources.pl:875
+#, c-format
 msgid "Add a key..."
 msgstr "Додај кључ..."
 
-#: ../edit-urpm-sources.pl:861
+#: ../edit-urpm-sources.pl:879
+#, c-format
 msgid "Remove key"
 msgstr "Уклони кључ"
 
-#: ../edit-urpm-sources.pl:877
+#: ../edit-urpm-sources.pl:895
+#, c-format
 msgid "Configure media"
 msgstr "Подешавање медија"
 
-#: ../edit-urpm-sources.pl:916
+#: ../edit-urpm-sources.pl:934
+#, c-format
 msgid "Enabled?"
 msgstr "Укључи?"
 
-#: ../edit-urpm-sources.pl:917
-#, fuzzy
+#: ../edit-urpm-sources.pl:935
+#, fuzzy, c-format
 msgid "Updates?"
 msgstr "Ажурирање"
 
-#: ../edit-urpm-sources.pl:933
+#: ../edit-urpm-sources.pl:951
+#, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:963
-#, perl-format
+#: ../edit-urpm-sources.pl:981
+#, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:997
-#, fuzzy
+#: ../edit-urpm-sources.pl:1015
+#, fuzzy, c-format
 msgid "Add custom..."
 msgstr "Додај..."
 
-#: ../edit-urpm-sources.pl:1001
+#: ../edit-urpm-sources.pl:1019
+#, c-format
 msgid "Update..."
 msgstr "Ажурирај..."
 
-#: ../edit-urpm-sources.pl:1004
+#: ../edit-urpm-sources.pl:1022
+#, c-format
 msgid "Manage keys..."
 msgstr "Уреди кључеве..."
 
-#: ../edit-urpm-sources.pl:1006
+#: ../edit-urpm-sources.pl:1024
+#, c-format
 msgid "Parallel..."
 msgstr "Паралелно..."
 
-#: ../edit-urpm-sources.pl:1007
+#: ../edit-urpm-sources.pl:1025
+#, c-format
 msgid "Global options..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
+#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#, c-format
 msgid "Help"
 msgstr "Помоћ"
 
-#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
-#, perl-format
+#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -476,7 +560,8 @@ msgstr ""
 "\n"
 "Да ли је У реду да наставим?"
 
-#: ../edit-urpm-sources.pl:1033
+#: ../edit-urpm-sources.pl:1054
+#, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -491,7 +576,8 @@ msgstr ""
 "на вашем рачунару. Након тога ће бити спреми за инсталацију као нови пакети\n"
 "или за ажурирање старих."
 
-#: ../edit-urpm-sources.pl:1045
+#: ../edit-urpm-sources.pl:1067
+#, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -499,100 +585,115 @@ msgid ""
 "packages as well?)."
 msgstr ""
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:88
+#, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr ""
 
-#: ../gurpmi.addmedia:101
-#, perl-format
+#: ../gurpmi.addmedia:102
+#, 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 ""
 
-#: ../gurpmi.addmedia:104
-#, perl-format
+#: ../gurpmi.addmedia:105
+#, 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 ""
 
-#: ../gurpmi.addmedia:129
-#, perl-format
+#: ../gurpmi.addmedia:130
+#, c-format
 msgid "Successfully added media %s."
 msgstr ""
 
-#: ../gurpmi.addmedia:130
-#, perl-format
+#: ../gurpmi.addmedia:131
+#, c-format
 msgid "Successfully added medium `%s'."
 msgstr ""
 
-#: ../rpmdrake:38
-#, perl-format
+#: ../rpmdrake:39
+#, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Употреба: %s [ОПЦИЈА]..."
 
-#: ../rpmdrake:39
+#: ../rpmdrake:40
+#, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr ""
 
-#: ../rpmdrake:40
+#: ../rpmdrake:41
+#, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr ""
 
-#: ../rpmdrake:41
+#: ../rpmdrake:42
+#, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 
-#: ../rpmdrake:42
+#: ../rpmdrake:43
+#, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr ""
 
-#: ../rpmdrake:43
+#: ../rpmdrake:44
+#, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 
-#: ../rpmdrake:44
+#: ../rpmdrake:45
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr ""
 
-#: ../rpmdrake:45
+#: ../rpmdrake:46
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr ""
 
-#: ../rpmdrake:46
+#: ../rpmdrake:47
+#, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
 "\" machine to show needed deps"
 msgstr ""
 
-#: ../rpmdrake:47
+#: ../rpmdrake:48
+#, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr ""
 
-#: ../rpmdrake:48
+#: ../rpmdrake:49
+#, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr ""
 
-#: ../rpmdrake:49
+#: ../rpmdrake:50
+#, c-format
 msgid "  --root                 force to run as root"
 msgstr ""
 
-#: ../rpmdrake:50
+#: ../rpmdrake:51
+#, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr ""
 
-#: ../rpmdrake:188
+#: ../rpmdrake:205
+#, c-format
 msgid "Running in user mode"
 msgstr "Покренуто у корисничком моду"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:206
+#, 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"
@@ -602,547 +703,786 @@ msgstr ""
 "Нећете бити у могућности да извршите модификације на систему,\n"
 "али можете да претражујете постојеће базе података."
 
-#: ../rpmdrake:197
+#: ../rpmdrake:214
+#, c-format
 msgid "Accessibility"
 msgstr "Доступност"
 
-#: ../rpmdrake:198 ../rpmdrake:199 ../rpmdrake:200 ../rpmdrake:201
-#: ../rpmdrake:202
+#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
+#: ../rpmdrake:219
+#, c-format
 msgid "Archiving"
 msgstr "Архивирање"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:216
+#, c-format
 msgid "Backup"
 msgstr "Backup"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:217
+#, c-format
 msgid "Cd burning"
 msgstr "Нарезивање дискова"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:218
+#, c-format
 msgid "Compression"
 msgstr "Комресија"
 
-#: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
-#: ../rpmdrake:383
+#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
+#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
+#: ../rpmdrake:426
+#, c-format
 msgid "Other"
 msgstr "Остало"
 
-#: ../rpmdrake:203 ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206
-#: ../rpmdrake:207 ../rpmdrake:208
+#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
+#: ../rpmdrake:224 ../rpmdrake:225
+#, c-format
 msgid "Books"
 msgstr "Књиге"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:221
+#, c-format
 msgid "Computer books"
 msgstr "Рачунарске књиге"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:222
+#, c-format
 msgid "Faqs"
 msgstr "Често постављана питања"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:223
+#, c-format
 msgid "Howtos"
 msgstr "Упуства"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:224
+#, c-format
 msgid "Literature"
 msgstr "Литература"
 
-#: ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#, c-format
 msgid "Cluster"
 msgstr ""
 
-#: ../rpmdrake:210
+#: ../rpmdrake:227
+#, c-format
 msgid "Message Passing"
 msgstr ""
 
-#: ../rpmdrake:211
+#: ../rpmdrake:228
+#, c-format
 msgid "Queueing Services"
 msgstr ""
 
-#: ../rpmdrake:212
+#: ../rpmdrake:229
+#, c-format
 msgid "Communications"
 msgstr "Комуникације"
 
-#: ../rpmdrake:213 ../rpmdrake:217
+#: ../rpmdrake:230 ../rpmdrake:234
+#, c-format
 msgid "Databases"
 msgstr "Базе података"
 
-#: ../rpmdrake:214 ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217
-#: ../rpmdrake:218 ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221
-#: ../rpmdrake:222 ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225
+#: ../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
+#, c-format
 msgid "Development"
 msgstr "Развој"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:232
+#, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:233
+#, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:235
+#, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME и GTK+"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:236
+#, c-format
 msgid "Java"
 msgstr "Јава"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:237
+#, c-format
 msgid "KDE and Qt"
 msgstr "KDE и Qt"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:238
+#, c-format
 msgid "Kernel"
 msgstr "Кернел"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:240
+#, c-format
 msgid "Perl"
 msgstr "Перл"
 
-#: ../rpmdrake:224
+#: ../rpmdrake:241
+#, c-format
 msgid "PHP"
 msgstr ""
 
-#: ../rpmdrake:225
+#: ../rpmdrake:242
+#, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:243
+#, c-format
 msgid "Editors"
 msgstr "Едитори"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:244
+#, c-format
 msgid "Education"
 msgstr "Учење"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:245
+#, c-format
 msgid "Emulators"
 msgstr "Емулатори"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:246
+#, c-format
 msgid "File tools"
 msgstr "Алати за фајлове"
 
-#: ../rpmdrake:230 ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233
-#: ../rpmdrake:234 ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237
-#: ../rpmdrake:238
+#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
+#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:255
+#, c-format
 msgid "Games"
 msgstr "Игрице"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:248
+#, c-format
 msgid "Adventure"
 msgstr "Авантура"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:249
+#, c-format
 msgid "Arcade"
 msgstr "Аркаде"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:250
+#, c-format
 msgid "Boards"
 msgstr "Форуми"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:251
+#, c-format
 msgid "Cards"
 msgstr "Карте"
 
-#: ../rpmdrake:236
+#: ../rpmdrake:253
+#, c-format
 msgid "Puzzles"
 msgstr "Укрштенице"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:254
+#, c-format
 msgid "Sports"
 msgstr "Спортови"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:255
+#, c-format
 msgid "Strategy"
 msgstr "Стратегија"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:257 ../rpmdrake:260
+#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
+#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
+#: ../rpmdrake:274 ../rpmdrake:277
+#, c-format
 msgid "Graphical desktop"
 msgstr "Графички десктоп"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:242
+#: ../rpmdrake:259
+#, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:243
+#: ../rpmdrake:260
+#, c-format
 msgid "FVWM based"
 msgstr "базирано на FVWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:246
+#: ../rpmdrake:263
+#, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:249
+#: ../rpmdrake:266
+#, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:252
+#: ../rpmdrake:269
+#, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:256
+#: ../rpmdrake:273
+#, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../rpmdrake:276
+#, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:262
+#: ../rpmdrake:279
+#, c-format
 msgid "Xfce"
 msgstr ""
 
-#: ../rpmdrake:263
+#: ../rpmdrake:280
+#, c-format
 msgid "Graphics"
 msgstr "Графика"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:281
+#, c-format
 msgid "Monitoring"
 msgstr "Мониторинг"
 
-#: ../rpmdrake:265 ../rpmdrake:266
+#: ../rpmdrake:282 ../rpmdrake:283
+#, c-format
 msgid "Multimedia"
 msgstr "Мултимедија"
 
-#: ../rpmdrake:266 ../rpmdrake:317
+#: ../rpmdrake:283 ../rpmdrake:334
+#, c-format
 msgid "Video"
 msgstr "Видео"
 
-#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
-#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
-#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
+#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#, c-format
 msgid "Networking"
 msgstr "Мрежа"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:285
+#, c-format
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:286
+#, c-format
 msgid "File transfer"
 msgstr "Трансфер фајлова"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:287
+#, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:288
+#, c-format
 msgid "Instant messaging"
 msgstr "Инстант поруке"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:289 ../rpmdrake:360
+#, c-format
 msgid "Mail"
 msgstr "Пошта"
 
-#: ../rpmdrake:273
+#: ../rpmdrake:290
+#, c-format
 msgid "News"
 msgstr "Вести"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:292
+#, c-format
 msgid "Remote access"
 msgstr "Удаљени приступ"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:293
+#, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:277
+#: ../rpmdrake:294
+#, c-format
 msgid "Office"
 msgstr "Канцеларија"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:295
+#, c-format
 msgid "Public Keys"
 msgstr ""
 
-#: ../rpmdrake:279
+#: ../rpmdrake:296
+#, c-format
 msgid "Publishing"
 msgstr "Публиковање"
 
-#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
+#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
+#: ../rpmdrake:305
+#, c-format
 msgid "Sciences"
 msgstr "Науке"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:298
+#, c-format
 msgid "Astronomy"
 msgstr "Астрономија"
 
-#: ../rpmdrake:282
+#: ../rpmdrake:299
+#, c-format
 msgid "Biology"
 msgstr "Биологија"
 
-#: ../rpmdrake:283
+#: ../rpmdrake:300
+#, c-format
 msgid "Chemistry"
 msgstr "Хемија"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:301
+#, c-format
 msgid "Computer science"
 msgstr "Наука о рачунарима"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:302
+#, c-format
 msgid "Geosciences"
 msgstr "Природне науке"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:303
+#, c-format
 msgid "Mathematics"
 msgstr "Математика"
 
-#: ../rpmdrake:288
+#: ../rpmdrake:305
+#, c-format
 msgid "Physics"
 msgstr "Физика"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:306
+#, c-format
 msgid "Shells"
 msgstr "Шелови"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:307
+#, c-format
 msgid "Sound"
 msgstr "Звук"
 
-#: ../rpmdrake:291 ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:294
-#: ../rpmdrake:295 ../rpmdrake:296 ../rpmdrake:297 ../rpmdrake:298
-#: ../rpmdrake:299 ../rpmdrake:300 ../rpmdrake:301 ../rpmdrake:302
-#: ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305 ../rpmdrake:306
-#: ../rpmdrake:307 ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310
-#: ../rpmdrake:311
+#: ../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
+#, c-format
 msgid "System"
 msgstr "Систем"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:309
+#, c-format
 msgid "Base"
 msgstr "Основно"
 
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
+#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
+#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#, c-format
 msgid "Configuration"
 msgstr "Подешавање"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:311
+#, c-format
 msgid "Boot and Init"
 msgstr "Boot и Init"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:312
+#, c-format
 msgid "Hardware"
 msgstr "Хардвер"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:315
+#, c-format
 msgid "Packaging"
 msgstr "Паковање"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:316
+#, c-format
 msgid "Printing"
 msgstr "Штампање"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:317
+#, c-format
 msgid "Deploiement"
 msgstr "Искориштење"
 
-#: ../rpmdrake:301
+#: ../rpmdrake:318
+#, c-format
 msgid "Deployment"
 msgstr "Искориштење"
 
-#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
-#: ../rpmdrake:306
+#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
+#: ../rpmdrake:323
+#, c-format
 msgid "Fonts"
 msgstr "Фонтови"
 
-#: ../rpmdrake:303
+#: ../rpmdrake:320
+#, c-format
 msgid "Console"
 msgstr "Конзола"
 
-#: ../rpmdrake:304
+#: ../rpmdrake:321
+#, c-format
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:305
+#: ../rpmdrake:322
+#, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:306
+#: ../rpmdrake:323
+#, c-format
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:307
+#: ../rpmdrake:324
+#, c-format
 msgid "Internationalization"
 msgstr "Интернационализација"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:325
+#, c-format
 msgid "Kernel and hardware"
 msgstr "Кернел и хардвер"
 
-#: ../rpmdrake:309
+#: ../rpmdrake:326
+#, c-format
 msgid "Libraries"
 msgstr "Библиотеке"
 
-#: ../rpmdrake:310
+#: ../rpmdrake:327
+#, c-format
 msgid "Servers"
 msgstr "Сервери"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:313
+#: ../rpmdrake:330
+#, c-format
 msgid "X11"
 msgstr ""
 
-#: ../rpmdrake:314
+#: ../rpmdrake:331
+#, c-format
 msgid "Terminals"
 msgstr "Терминали"
 
-#: ../rpmdrake:315
+#: ../rpmdrake:332
+#, c-format
 msgid "Text tools"
 msgstr "Алати за текст"
 
-#: ../rpmdrake:316
+#: ../rpmdrake:333
+#, c-format
 msgid "Toys"
 msgstr "Играчке"
 
-#. - to highlight information
-#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
-#: ../rpmdrake:635
+#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
+#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
+#: ../rpmdrake:345 ../rpmdrake:346
+#, c-format
+msgid "Workstation"
+msgstr "Радна станица"
+
+#: ../rpmdrake:339
+#, c-format
+msgid "Console Tools"
+msgstr "Конзолни алати"
+
+#: ../rpmdrake:340 ../rpmdrake:355
+#, c-format
+msgid "Documentation"
+msgstr "Документација"
+
+#: ../rpmdrake:341
+#, c-format
+msgid "Game station"
+msgstr "Станица за игру"
+
+#: ../rpmdrake:342
+#, c-format
+msgid "Internet station"
+msgstr "Интернет станица"
+
+#: ../rpmdrake:343
+#, c-format
+msgid "Multimedia station"
+msgstr "Мултимедијална станица"
+
+#: ../rpmdrake:344
+#, c-format
+msgid "Network Computer (client)"
+msgstr "Мрежни компјутер, (клијент)"
+
+#: ../rpmdrake:345
+#, c-format
+msgid "Office Workstation"
+msgstr "Радна(Office) станица"
+
+#: ../rpmdrake:346
+#, c-format
+msgid "Scientific Workstation"
+msgstr "Научна радна станица"
+
+#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
+#: ../rpmdrake:352
+#, c-format
+msgid "Graphical Environment"
+msgstr "Графичко Окружење"
+
+#: ../rpmdrake:349
+#, c-format
+msgid "GNOME Workstation"
+msgstr "Gnome радна станица"
+
+#: ../rpmdrake:350
+#, fuzzy, c-format
+msgid "IceWm Desktop"
+msgstr "Десктоп"
+
+#: ../rpmdrake:351
+#, c-format
+msgid "KDE Workstation"
+msgstr "KDE падна станица"
+
+#: ../rpmdrake:352
+#, c-format
+msgid "Other Graphical Desktops"
+msgstr "Други графички десктопови"
+
+#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
+#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#, c-format
+msgid "Server"
+msgstr "Сервер"
+
+#: ../rpmdrake:357
+#, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+#: ../rpmdrake:358
+#, c-format
+msgid "Database"
+msgstr "Сервер,Базе података"
+
+#: ../rpmdrake:359
+#, c-format
+msgid "Firewall/Router"
+msgstr "Сервер, Firewall/Router"
+
+#: ../rpmdrake:361
+#, c-format
+msgid "Mail/Groupware/News"
+msgstr ""
+
+#: ../rpmdrake:362
+#, c-format
+msgid "Network Computer server"
+msgstr "Мрежни Сервер"
+
+#: ../rpmdrake:363
+#, c-format
+msgid "Web/FTP"
+msgstr "Сервер, Web/FTP"
+
+#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
+#: ../rpmdrake:724
+#, c-format
 msgid "(Not available)"
 msgstr "(Није доступно)"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534 ../rpmdrake:616
+#, c-format
 msgid "Search results"
 msgstr "Резултати претраге"
 
-#: ../rpmdrake:475
+#: ../rpmdrake:534
+#, c-format
 msgid "Search results (none)"
 msgstr "Резултат претраге (нема)"
 
-#: ../rpmdrake:486
+#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
+#, c-format
 msgid "Please wait, searching..."
 msgstr "Молим Вас сачекајте, тражим..."
 
-#: ../rpmdrake:558 ../rpmdrake:810
-msgid "Addable"
-msgstr "Могу се додати"
+#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
+#, fuzzy, c-format
+msgid "Software Management"
+msgstr "Менаџер за Медије са софтвером"
 
-#: ../rpmdrake:558 ../rpmdrake:810
+#: ../rpmdrake:578
+#, c-format
+msgid "Stop"
+msgstr "Стоп"
+
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
 msgid "Upgradable"
 msgstr "Могу се ажурирати"
 
-#: ../rpmdrake:560
-msgid "Not selected"
-msgstr "Нису изабрани"
+#: ../rpmdrake:617 ../rpmdrake:917
+#, c-format
+msgid "Addable"
+msgstr "Могу се додати"
 
-#: ../rpmdrake:560
+#: ../rpmdrake:619
+#, c-format
 msgid "Selected"
 msgstr "Изабрани"
 
-#: ../rpmdrake:602 ../rpmdrake:651
+#: ../rpmdrake:619
+#, c-format
+msgid "Not selected"
+msgstr "Нису изабрани"
+
+#: ../rpmdrake:683 ../rpmdrake:740
+#, c-format
 msgid "Importance: "
 msgstr "Важност: "
 
-#: ../rpmdrake:603 ../rpmdrake:659
+#: ../rpmdrake:684 ../rpmdrake:748
+#, c-format
 msgid "Reason for update: "
 msgstr "Разлог ажурирања:"
 
-#: ../rpmdrake:647
-#, fuzzy
+#: ../rpmdrake:688
+#, fuzzy, c-format
 msgid "Security advisory"
 msgstr "Сигурносне надоградње"
 
-#: ../rpmdrake:655 ../rpmdrake:708
+#: ../rpmdrake:696 ../rpmdrake:750
+#, c-format
 msgid "No description"
 msgstr "Без описа"
 
-#: ../rpmdrake:609
+#: ../rpmdrake:699
+#, c-format
 msgid "Files:"
 msgstr "Фајлови:"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:707
+#, c-format
 msgid "Changelog:"
 msgstr "Измене:"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:719
+#, c-format
 msgid "Files:\n"
 msgstr "Фајлови:\n"
 
-#: ../rpmdrake:635
+#: ../rpmdrake:724
+#, c-format
 msgid "Changelog:\n"
 msgstr "Измене:\n"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:729 ../rpmdrake.pm:809
+#, c-format
 msgid "Medium: "
 msgstr "Медиј: "
 
-#: ../rpmdrake:641
+#: ../rpmdrake:730
+#, c-format
 msgid "Currently installed version: "
 msgstr "Тренутно инсталирана верзија: "
 
-#: ../rpmdrake:645
+#: ../rpmdrake:734
+#, c-format
 msgid "Name: "
 msgstr "Име: "
 
-#: ../rpmdrake:646
+#: ../rpmdrake:735
+#, c-format
 msgid "Version: "
 msgstr "Верзија: "
 
-#: ../rpmdrake:647
+#: ../rpmdrake:736
+#, c-format
 msgid "Architecture: "
 msgstr ""
 
-#: ../rpmdrake:648
-#, perl-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:648
+#: ../rpmdrake:737
+#, c-format
 msgid "Size: "
 msgstr "Величина: "
 
-#. extra empty line
-#: ../rpmdrake:655
+#: ../rpmdrake:737
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:744
+#, c-format
 msgid "Summary: "
 msgstr "Сажетак: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:750
+#, c-format
 msgid "Description: "
 msgstr "Опис:"
 
-#: ../rpmdrake:698 ../rpmdrake.pm:178
-#, fuzzy
-msgid "Software Management"
-msgstr "Менаџер за Медије са софтвером"
-
-#. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
+#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#, c-format
 msgid "More information on package..."
 msgstr "Додатне информације о пакету..."
 
-#: ../rpmdrake:717
-msgid "One of the following packages is needed:"
-msgstr "Један од следећих пакета је потребан:"
-
-#: ../rpmdrake:717
+#: ../rpmdrake:825
+#, c-format
 msgid "Please choose"
 msgstr "Изаберите"
 
-#: ../rpmdrake:759
+#: ../rpmdrake:825
+#, fuzzy, c-format
+msgid "The following package is needed:"
+msgid_plural "One of the following packages is needed:"
+msgstr[0] "Један од следећих пакета је потребан:"
+msgstr[1] "Један од следећих пакета је потребан:"
+msgstr[2] "Један од следећих пакета је потребан:"
+
+#: ../rpmdrake:866
+#, c-format
 msgid "Please wait, listing packages..."
 msgstr "Молим Вас сачекајте, приказујем пакете..."
 
-#: ../rpmdrake:777
+#: ../rpmdrake:884
+#, c-format
 msgid "No update"
 msgstr "Без ажурирања"
 
-#: ../rpmdrake:778
+#: ../rpmdrake:885
+#, 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"
@@ -1153,24 +1493,29 @@ msgstr ""
 "пакета за ажурирање за ваш рачунар,\n"
 "или су они веќ инсталирани."
 
-#: ../rpmdrake:801 ../rpmdrake:1057
+#: ../rpmdrake:908 ../rpmdrake:1171
+#, c-format
 msgid "All"
 msgstr "Све"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:849 ../rpmdrake:854
+#: ../rpmdrake:956 ../rpmdrake:961
+#, c-format
 msgid "More info"
 msgstr "Још информација"
 
-#: ../rpmdrake:857 ../rpmdrake:1882
+#: ../rpmdrake:964
+#, c-format
 msgid "Information on packages"
 msgstr "Информације о пакетима"
 
-#: ../rpmdrake:879
+#: ../rpmdrake:987
+#, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Још неки пакети морају бити уклоњени"
 
-#: ../rpmdrake:880
+#: ../rpmdrake:988
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
@@ -1178,11 +1523,13 @@ msgstr ""
 "Да би задовољили све зависности,следећи пакет(и) би такође требало да се "
 "уклоне:"
 
-#: ../rpmdrake:886 ../rpmdrake:895
+#: ../rpmdrake:994 ../rpmdrake:1003
+#, c-format
 msgid "Some packages can't be removed"
 msgstr "Неки пакети се не могу уклонити"
 
-#: ../rpmdrake:887
+#: ../rpmdrake:995
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1190,7 +1537,8 @@ msgstr ""
 "Жалим, али уклањањем ових пакета би сте оштетити систем:\n"
 "\n"
 
-#: ../rpmdrake:896 ../rpmdrake:961
+#: ../rpmdrake:1004 ../rpmdrake:1070
+#, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1200,11 +1548,13 @@ msgstr ""
 "да буду неизабрани:\n"
 "\n"
 
-#: ../rpmdrake:925
+#: ../rpmdrake:1033
+#, c-format
 msgid "Additional packages needed"
 msgstr "Потребни су додатни пакети"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:1034
+#, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1214,132 +1564,169 @@ msgstr ""
 "да се инсталирају:\n"
 "\n"
 
-#: ../rpmdrake:941
-#, perl-format
+#: ../rpmdrake:1049
+#, c-format
 msgid "%s (belongs to the skip list)"
 msgstr ""
 
-#: ../rpmdrake:944
-msgid "Some packages can't be installed"
-msgstr "Неки пакети не могу да се инсталирају"
+#: ../rpmdrake:1053
+#, fuzzy, c-format
+msgid "One package cannot be installed"
+msgid_plural "Some packages can't be installed"
+msgstr[0] "Неки пакети не могу да се инсталирају"
+msgstr[1] "Неки пакети не могу да се инсталирају"
+msgstr[2] "Неки пакети не могу да се инсталирају"
 
-#: ../rpmdrake:945
-#, perl-format
+#: ../rpmdrake:1054
+#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Sorry, the following package cannot be selected:\n"
 "\n"
 "%s"
-msgstr ""
+msgid_plural ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Жалим, али  следећи пакет(и)не могу да буду изабрани:\n"
+"\n"
+"%s"
+msgstr[1] ""
+"Жалим, али  следећи пакет(и)не могу да буду изабрани:\n"
+"\n"
+"%s"
+msgstr[2] ""
 "Жалим, али  следећи пакет(и)не могу да буду изабрани:\n"
 "\n"
 "%s"
 
-#: ../rpmdrake:960 ../rpmdrake:1729
+#: ../rpmdrake:1069 ../rpmdrake:1924
+#, c-format
 msgid "Some packages need to be removed"
 msgstr "Неки пакети морају да се уклоне"
 
-#: ../rpmdrake:985
-#, perl-format
+#: ../rpmdrake:1098
+#, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Изабрано: %s / Слободан простор на диску: %s"
 
-#: ../rpmdrake:986
-#, perl-format
+#: ../rpmdrake:1099
+#, c-format
 msgid "Selected size: %d MB"
 msgstr "Величина изабраног: %d MB"
 
-#. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:991
+#: ../rpmdrake:1104
+#, c-format
 msgid "Description not available for this package\n"
 msgstr ""
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1110 ../rpmdrake:1506
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Појавила се фатална грешка: %s."
+
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Installed"
 msgstr "Инсталирај"
 
-#: ../rpmdrake:1057
-#, fuzzy
+#: ../rpmdrake:1171
+#, fuzzy, c-format
 msgid "Non installed"
 msgstr "Инсталирај"
 
-#: ../rpmdrake:1058
-#, perl-format
+#: ../rpmdrake:1172
+#, c-format
 msgid "%s choices"
 msgstr ""
 
-#: ../rpmdrake:1058
+#: ../rpmdrake:1172
+#, c-format
 msgid "Mandriva Linux choices"
 msgstr "Mandriva Linux-ов избор"
 
-#. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1060
+#: ../rpmdrake:1174
+#, c-format
 msgid "All packages, alphabetical"
 msgstr "Сви пакети, по абецеди"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1175
+#, c-format
 msgid "All packages, by update availability"
 msgstr "Сви пакети, по доступности нове верзије"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1176
+#, c-format
 msgid "All packages, by size"
 msgstr "Сви пакети, по величини"
 
-#: ../rpmdrake:1063
+#: ../rpmdrake:1177
+#, c-format
 msgid "All packages, by selection state"
 msgstr "Сви пакети, по стању бирања"
 
-#: ../rpmdrake:1064
+#: ../rpmdrake:1178
+#, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "сортирани по датуму инсталације"
 
-#: ../rpmdrake:1065
+#: ../rpmdrake:1179
+#, c-format
 msgid "All packages, by group"
 msgstr "Сви пакети, по групи"
 
-#: ../rpmdrake:1067
-#, fuzzy
+#: ../rpmdrake:1181
+#, fuzzy, c-format
 msgid "All updates"
 msgstr "Обичне надоградње"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
+msgid "Security updates"
+msgstr "Сигурносне надоградње"
+
+#: ../rpmdrake:1181
+#, c-format
 msgid "Bugfixes updates"
 msgstr "Надоградње са исправкама"
 
-#: ../rpmdrake:1067
+#: ../rpmdrake:1181
+#, c-format
 msgid "Normal updates"
 msgstr "Обичне надоградње"
 
-#: ../rpmdrake:1067
-msgid "Security updates"
-msgstr "Сигурносне надоградње"
-
-#: ../rpmdrake:1123
+#: ../rpmdrake:1244
+#, c-format
 msgid "in names"
 msgstr "у именима"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1246
+#, c-format
 msgid "in descriptions"
 msgstr "у описима"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1248
+#, c-format
 msgid "in file names"
 msgstr "у именима фајлова"
 
-#: ../rpmdrake:1230
-#, perl-format
+#: ../rpmdrake:1275
+#, c-format
 msgid "Error: %s appears to be mounted read-only."
 msgstr ""
 
-#: ../rpmdrake:1153
+#: ../rpmdrake:1279
+#, c-format
 msgid "You need to select some packages first."
 msgstr "Прво морате да одаберете неке пакете."
 
-#: ../rpmdrake:1158
+#: ../rpmdrake:1284
+#, c-format
 msgid "Too many packages are selected"
 msgstr "Изабрали сте превише пакета"
 
-#: ../rpmdrake:1159
+#: ../rpmdrake:1285
+#, 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"
@@ -1355,133 +1742,171 @@ msgstr ""
 "\n"
 "Да ли заиста желите да инсталирате изабране пакете?"
 
-#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
-#: ../rpmdrake:1219
+#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_File"
 msgstr "/_Фајл"
 
-#: ../rpmdrake:1191
+#: ../rpmdrake:1320
+#, c-format
 msgid "/_Update media"
 msgstr "/_Ажурирање медиј"
 
-#: ../rpmdrake:1201
+#: ../rpmdrake:1331
+#, c-format
 msgid "/_Reset the selection"
 msgstr "/_Поново изабери"
 
-#: ../rpmdrake:1213
+#: ../rpmdrake:1344
+#, c-format
 msgid "/Reload the _packages list"
 msgstr "/П_оново учитај листу пакета"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "/_Quit"
 msgstr "/_Крај"
 
-#: ../rpmdrake:1219
+#: ../rpmdrake:1353
+#, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Options"
 msgstr "/_Опције"
 
-#: ../rpmdrake:1223
-#, fuzzy
+#: ../rpmdrake:1357
+#, fuzzy, c-format
 msgid "/_Media Manager"
 msgstr "Менаџер за Медије са софтвером"
 
-#: ../rpmdrake:1226 ../rpmdrake:1256
+#: ../rpmdrake:1360 ../rpmdrake:1390
+#, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/Аутоматски прикажи изабране пакете"
 
-#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
+#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
+#, c-format
 msgid "/_Help"
 msgstr "/_Помоћ"
 
-#: ../rpmdrake:1231
+#: ../rpmdrake:1365
+#, c-format
 msgid "/_Report Bug"
 msgstr "/_Пријавите Баг"
 
-#: ../rpmdrake:1233
+#: ../rpmdrake:1367
+#, c-format
 msgid "/_About..."
 msgstr "/_О..."
 
-#. nicer formatting
-#: ../rpmdrake:1236
-#, fuzzy
-msgid "About Rpmdrake"
-msgstr "Rpmdrake"
+#: ../rpmdrake:1370
+#, fuzzy, c-format
+msgid "Rpmdrake"
+msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:1238
-#, perl-format
+#: ../rpmdrake:1372
+#, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr ""
 
-#: ../rpmdrake:1240
+#: ../rpmdrake:1374
+#, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr ""
 
-#: ../rpmdrake:1242
-#, fuzzy
+#: ../rpmdrake:1376
+#, fuzzy, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Online"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1247
+#: ../rpmdrake:1381
+#, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Toma Jankovic <tomaja@net.yu>\n"
 
-#: ../rpmdrake:1271
+#: ../rpmdrake:1405
+#, c-format
 msgid "Find:"
 msgstr "Пронађи:"
 
-#: ../rpmdrake:1280
+#: ../rpmdrake:1414
+#, c-format
 msgid "Search"
 msgstr "Тражи"
 
-#: ../rpmdrake:1282
+#: ../rpmdrake:1416
+#, c-format
 msgid "Clear"
 msgstr "Очисти"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1430 ../rpmdrake.pm:760
+#, c-format
+msgid "Select all"
+msgstr "Изабери све"
+
+#: ../rpmdrake:1437
+#, c-format
 msgid "Apply"
 msgstr "Промени"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1441
+#, c-format
 msgid "Quit"
 msgstr "Крај"
 
-#: ../rpmdrake:1315
+#: ../rpmdrake:1457
+#, c-format
 msgid "Quick Introduction"
 msgstr ""
 
-#: ../rpmdrake:1316
+#: ../rpmdrake:1458
+#, c-format
 msgid "You can browse the packages through the categories tree on the left."
 msgstr ""
 
-#: ../rpmdrake:1317
+#: ../rpmdrake:1459
+#, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
 msgstr ""
 
-#: ../rpmdrake:1318
+#: ../rpmdrake:1460
+#, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
 
-#: ../rpmdrake:1360
+#: ../rpmdrake:1505
+#, c-format
 msgid "Fatal error"
 msgstr "Фатална грешка"
 
-#: ../rpmdrake:1361
-#, perl-format
-msgid "A fatal error occurred: %s."
-msgstr "Појавила се фатална грешка: %s."
+#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#, c-format
+msgid "Please wait"
+msgstr "Само моменат..."
 
-#: ../rpmdrake:1368
-#, fuzzy
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Package installation..."
+msgstr "Инсталација пакета..."
+
+#: ../rpmdrake:1510 ../rpmdrake:1935
+#, c-format
+msgid "Initializing..."
+msgstr "Инициялизация..."
+
+#: ../rpmdrake:1533 ../rpmdrake:1924
+#, fuzzy, c-format
 msgid "Confirmation"
-msgstr "LAN конфигурација"
+msgstr "Конфигурација"
 
-#: ../rpmdrake:1369
+#: ../rpmdrake:1534
+#, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1493,12 +1918,13 @@ msgstr ""
 "\n"
 "Да ли је У реду да наставим?"
 
-#: ../rpmdrake:1378
+#: ../rpmdrake:1543
+#, c-format
 msgid "Already existing update media"
 msgstr "Већ постојићи медиј за ажурирање"
 
-#: ../rpmdrake:1379
-#, perl-format
+#: ../rpmdrake:1544
+#, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
 "all of them are currently disabled. You should run the Software\n"
@@ -1515,12 +1941,13 @@ msgstr ""
 "\n"
 "Затим  рестартујте  %s."
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1555
+#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Како ручно изабрати свој мирор сајт"
 
-#: ../rpmdrake:1390
-#, perl-format
+#: ../rpmdrake:1556
+#, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Media Manager, and then add a `Security\n"
@@ -1534,56 +1961,73 @@ msgstr ""
 "\n"
 "Затим, рестарујте %s."
 
-#: ../rpmdrake:1427
+#: ../rpmdrake:1570
+#, fuzzy, c-format
+msgid "Reading updates description"
+msgstr "у описима"
+
+#: ../rpmdrake:1596 ../rpmdrake:1673
+#, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Молим Вас сачекајте, проналазим доступне пакете..."
 
-#: ../rpmdrake:1428
-msgid "Please wait, reading packages database..."
-msgstr "Молим вас сачекајте, учитавам базу података о пакетима..."
+#: ../rpmdrake:1604
+#, fuzzy, c-format
+msgid "Please wait, listing base packages..."
+msgstr "Молим Вас сачекајте, приказујем пакете..."
+
+#: ../rpmdrake:1640
+#, fuzzy, c-format
+msgid "Please wait, finding installed packages..."
+msgstr "Молим Вас сачекајте, проналазим доступне пакете..."
 
-#: ../rpmdrake:1584
-#, perl-format
+#: ../rpmdrake:1774
+#, c-format
 msgid "Inspecting %s"
 msgstr "Проверавам %s"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1797
+#, c-format
 msgid "changes:"
 msgstr "измене:"
 
-#: ../rpmdrake:1615
-#, perl-format
+#: ../rpmdrake:1805
+#, c-format
 msgid "Remove .%s"
 msgstr "Уклони: %s"
 
-#: ../rpmdrake:1619
-#, perl-format
+#: ../rpmdrake:1809
+#, c-format
 msgid "Use .%s as main file"
 msgstr "Користи %s као главни фајл"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1813
+#, c-format
 msgid "Do nothing"
 msgstr "Не ради ништа"
 
-#: ../rpmdrake:1639
+#: ../rpmdrake:1829
+#, c-format
 msgid "Installation finished"
 msgstr "Инсталација готова"
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1844
+#, c-format
 msgid "Inspect..."
 msgstr "Провери..."
 
-#. N("Everything installed successfully"),
-#: ../rpmdrake:1687 ../rpmdrake:1879
+#: ../rpmdrake:1877 ../rpmdrake:2070
+#, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Сви пакети, који сте захтевали, су успешно инсталирани."
 
-#: ../rpmdrake:1691 ../rpmdrake:1859
+#: ../rpmdrake:1881 ../rpmdrake:2050
+#, c-format
 msgid "Problem during installation"
 msgstr "Проблем за време инсталирања"
 
-#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
-#, perl-format
+#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#, c-format
 msgid ""
 "There was a problem during the installation:\n"
 "\n"
@@ -1593,17 +2037,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1709
+#: ../rpmdrake:1901
+#, c-format
 msgid "Unable to get source packages."
 msgstr "Не могу да добавим изворне пакете."
 
-#: ../rpmdrake:1710
-#, perl-format
+#: ../rpmdrake:1902
+#, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Не могу да добавим изворне пакете, жао ми је. %s"
 
-#: ../rpmdrake:1711 ../rpmdrake:1806
-#, perl-format
+#: ../rpmdrake:1903 ../rpmdrake:2001
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1615,68 +2060,96 @@ msgstr ""
 "Пријављена Грешка(е):\n"
 "%s"
 
-#: ../rpmdrake:1727
-#, fuzzy, perl-format
+#. -PO: in singular form, we use %2\$
+#: ../rpmdrake:1921
+#, fuzzy, c-format
 msgid ""
+"To satisfy dependencies, the following package is going to be installed:\n"
+"%2$s\n"
+msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be "
 "installed:\n"
 "%s\n"
-msgstr ""
+msgstr[0] ""
+"Да би задовољили међузависности, следећи пакет(и) такође треба\n"
+"да се инсталирају:\n"
+"\n"
+msgstr[1] ""
+"Да би задовољили међузависности, следећи пакет(и) такође треба\n"
+"да се инсталирају:\n"
+"\n"
+msgstr[2] ""
 "Да би задовољили међузависности, следећи пакет(и) такође треба\n"
 "да се инсталирају:\n"
 "\n"
 
-#: ../rpmdrake:1730
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
+#: ../rpmdrake:1926
+#, fuzzy, c-format
+msgid "Remove one package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Уклони кључ"
+msgstr[1] "Уклони кључ"
+msgstr[2] "Уклони кључ"
+
+#: ../rpmdrake:1927
+#, 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] ""
+"Следећи пакети треба да буду уклоњени да би се други инсталирали:\n"
 "\n"
 "%s\n"
 "\n"
-"Is it ok to continue?"
-msgstr ""
+"да ли је у реду да наставим?"
+msgstr[1] ""
+"Следећи пакети треба да буду уклоњени да би се други инсталирали:\n"
+"\n"
+"%s\n"
+"\n"
+"да ли је у реду да наставим?"
+msgstr[2] ""
 "Следећи пакети треба да буду уклоњени да би се други инсталирали:\n"
 "\n"
 "%s\n"
 "\n"
 "да ли је у реду да наставим?"
 
-#: ../rpmdrake:1741
-msgid "Initializing..."
-msgstr "Инициялизация..."
-
-#: ../rpmdrake:1741
-msgid "Package installation..."
-msgstr "Инсталација пакета..."
-
-#: ../rpmdrake:1741 ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "Само моменат..."
+#: ../rpmdrake:1927
+#, fuzzy, c-format
+msgid "Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Да ли је У реду да наставим?"
 
-#: ../rpmdrake:1750
+#: ../rpmdrake:1944
+#, c-format
 msgid "Change medium"
 msgstr "Промени медијум"
 
-#: ../rpmdrake:1751
-#, perl-format
+#: ../rpmdrake:1945
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Убаците медијум са именом \"%s\" у уређај [%s]"
 
-#: ../rpmdrake:1758
-#, perl-format
+#: ../rpmdrake:1952
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Довнлоад-ујем пакете `%s' (%s/%s)..."
 
-#: ../rpmdrake:1781
+#: ../rpmdrake:1972
+#, c-format
 msgid "Verifying package signatures..."
 msgstr "Провера потписа на пакетима..."
 
-#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#, c-format
 msgid "Warning"
 msgstr "Упозорење"
 
-#: ../rpmdrake:1794
-#, perl-format
+#: ../rpmdrake:1986
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -1690,12 +2163,13 @@ msgstr ""
 "\n"
 "да ли желите да наставите инсталацију?"
 
-#: ../rpmdrake:1803 ../rpmdrake:1919
+#: ../rpmdrake:1998 ../rpmdrake:2108
+#, c-format
 msgid "Installation failed"
 msgstr "Инсталација неуспела"
 
-#: ../rpmdrake:1804
-#, perl-format
+#: ../rpmdrake:1999
+#, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
 "%s\n"
@@ -1707,26 +2181,28 @@ msgstr ""
 "\n"
 "Можда желите да ажурирате базу података за медије."
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing packages installation..."
 msgstr "Припремам инсталацију пакета"
 
-#: ../rpmdrake:1819
+#: ../rpmdrake:2013
+#, c-format
 msgid "Preparing..."
 msgstr "Припремам..."
 
-#: ../rpmdrake:1822
-#, perl-format
+#: ../rpmdrake:2016
+#, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Инсталирам пакет `%s' (%s/%s)..."
 
-#: ../rpmdrake:1838
-#, perl-format
+#: ../rpmdrake:2031
+#, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "не могу да приступим rpm датотеци [%s]"
 
-#: ../rpmdrake:1874
-#, fuzzy
+#: ../rpmdrake:2065
+#, fuzzy, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1738,33 +2214,48 @@ msgstr ""
 "Направио сам неке фајлове са подешавањима, пример `.rpmnew' или `.rpmsave',\n"
 "можете да их проверите како би сте нешто предузели:"
 
-#: ../rpmdrake:1884
+#: ../rpmdrake:2073
+#, fuzzy, c-format
+msgid "Upgrade information"
+msgstr "Нормалана информација"
+
+#: ../rpmdrake:2075
+#, c-format
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1896
-#, fuzzy, perl-format
-msgid "More information on package... [%s]"
+#: ../rpmdrake:2083
+#, fuzzy, c-format
+msgid "Upgrade information about this package"
 msgstr "Додатне информације о пакету..."
 
-#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:2086
+#, fuzzy, c-format
+msgid "Upgrade information about package %s"
+msgstr "Додатне информације о пакету..."
+
+#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#, c-format
 msgid "Error"
 msgstr "Грешка"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:2099
+#, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Непоправљива грешка: није пронађен пакет за инсталацију."
 
-#: ../rpmdrake:1935
+#: ../rpmdrake:2124
+#, c-format
 msgid "Please wait, removing packages..."
 msgstr "Молим Вас сачекајте, уклањам пакете..."
 
-#: ../rpmdrake:1946
+#: ../rpmdrake:2135
+#, c-format
 msgid "Problem during removal"
 msgstr "Проблем приликом уклањања"
 
-#: ../rpmdrake:1947
-#, perl-format
+#: ../rpmdrake:2136
+#, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
 "\n"
@@ -1774,11 +2265,13 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1977
+#: ../rpmdrake:2168
+#, c-format
 msgid "Welcome"
 msgstr "Добродошли"
 
-#: ../rpmdrake:1982
+#: ../rpmdrake:2173
+#, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1790,8 +2283,8 @@ msgstr ""
 "Овај алат вам може помоћи да изаберете софтвер желите да уклоните са\n"
 "вашег рачунара."
 
-#: ../rpmdrake:1987
-#, perl-format
+#: ../rpmdrake:2178
+#, c-format
 msgid ""
 "Welcome to %s!\n"
 "\n"
@@ -1804,11 +2297,13 @@ msgstr ""
 "инсталирате на\n"
 "ваш рачунар."
 
-#: ../rpmdrake:1992
+#: ../rpmdrake:2183
+#, c-format
 msgid "Welcome to the software installation tool!"
 msgstr ""
 
-#: ../rpmdrake:1993
+#: ../rpmdrake:2184
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1822,176 +2317,213 @@ msgstr ""
 "са програмима, на CD-у или DVD-у. Овај алат ће Вам помоћи да изаберете\n"
 "пакете које желите да инсталирате на Ваш рачунар."
 
-#: ../rpmdrake.pm:102
-msgid "Mandriva Linux Update"
-msgstr "Mandriva Linux Update"
-
-#: ../rpmdrake.pm:102
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, fuzzy, c-format
 msgid "Software Update"
 msgstr "Уклањање пакета"
 
-#: ../rpmdrake.pm:129
-#, fuzzy
+#: ../rpmdrake.pm:104
+#, c-format
+msgid "Mandriva Linux Update"
+msgstr "Mandriva Linux Update"
+
+#: ../rpmdrake.pm:131
+#, fuzzy, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Унесите своју email адресу доле"
 
-#: ../rpmdrake.pm:130
+#: ../rpmdrake.pm:132
+#, c-format
 msgid "User name:"
 msgstr "Корисничко име:"
 
-#: ../rpmdrake.pm:173
+#: ../rpmdrake.pm:175
+#, c-format
 msgid "Software Packages Removal"
 msgstr "Уклањање пакета"
 
-#: ../rpmdrake.pm:174
-#, fuzzy
+#: ../rpmdrake.pm:176
+#, fuzzy, c-format
 msgid "Software Packages Update"
 msgstr "Уклањање пакета"
 
-#: ../rpmdrake.pm:175
+#: ../rpmdrake.pm:177
+#, c-format
 msgid "Software Packages Installation"
 msgstr "Инсталација пакета"
 
-#: ../rpmdrake.pm:217
+#: ../rpmdrake.pm:219
+#, c-format
 msgid "No"
 msgstr "Не"
 
-#: ../rpmdrake.pm:221
+#: ../rpmdrake.pm:223
+#, c-format
 msgid "Yes"
 msgstr "Да"
 
-#: ../rpmdrake.pm:269
+#: ../rpmdrake.pm:273
+#, c-format
 msgid "Info..."
 msgstr "Информације..."
 
-#: ../rpmdrake.pm:386
+#: ../rpmdrake.pm:390
+#, c-format
 msgid "Austria"
 msgstr "Аустрија"
 
-#: ../rpmdrake.pm:387
+#: ../rpmdrake.pm:391
+#, c-format
 msgid "Australia"
 msgstr "Аустралија"
 
-#: ../rpmdrake.pm:388
+#: ../rpmdrake.pm:392
+#, c-format
 msgid "Belgium"
 msgstr "Белгија"
 
-#: ../rpmdrake.pm:389
+#: ../rpmdrake.pm:393
+#, c-format
 msgid "Brazil"
 msgstr "Бразил"
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:394
+#, c-format
 msgid "Canada"
 msgstr "Канада"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:395
+#, c-format
 msgid "Switzerland"
 msgstr "Швајцарска"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:396
+#, c-format
 msgid "Costa Rica"
 msgstr "Костарика"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:397
+#, c-format
 msgid "Czech Republic"
 msgstr "Чешка"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:398
+#, c-format
 msgid "Germany"
 msgstr "Немачка"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:399
+#, c-format
 msgid "Danmark"
 msgstr "Данска"
 
-#: ../rpmdrake.pm:396 ../rpmdrake.pm:400
+#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#, c-format
 msgid "Greece"
 msgstr "Грчка"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:401
+#, c-format
 msgid "Spain"
 msgstr "Шпанија"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:402
+#, c-format
 msgid "Finland"
 msgstr "Финска"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:403
+#, c-format
 msgid "France"
 msgstr "Француска"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:405
+#, c-format
 msgid "Hungary"
 msgstr "Мађарска"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:406
+#, c-format
 msgid "Israel"
 msgstr "Израел"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:407
+#, c-format
 msgid "Italy"
 msgstr "Италија"
 
-#: ../rpmdrake.pm:404
+#: ../rpmdrake.pm:408
+#, c-format
 msgid "Japan"
 msgstr "Јапан"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:409
+#, c-format
 msgid "Korea"
 msgstr "Кореја"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:410
+#, c-format
 msgid "Netherlands"
 msgstr "Холандија"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:411
+#, c-format
 msgid "Norway"
 msgstr "Норвешка"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:412
+#, c-format
 msgid "Poland"
 msgstr "Пољска"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:413
+#, c-format
 msgid "Portugal"
 msgstr "Португал"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:414
+#, c-format
 msgid "Russia"
 msgstr "Русија"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:415
+#, c-format
 msgid "Sweden"
 msgstr "Шведска"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:416
+#, c-format
 msgid "Singapore"
 msgstr "Сингапур"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:417
+#, c-format
 msgid "Slovakia"
 msgstr "Славачка"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:418
+#, c-format
 msgid "Taiwan"
 msgstr "Тајван"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:419
+#, c-format
 msgid "United Kingdom"
 msgstr "Уједињено Краљевство"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:420
+#, c-format
 msgid "China"
 msgstr "Кина"
 
-#: ../rpmdrake.pm:417 ../rpmdrake.pm:418 ../rpmdrake.pm:419 ../rpmdrake.pm:420
-#: ../rpmdrake.pm:509
+#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#, c-format
 msgid "United States"
 msgstr "Сједињене Америчке Државе"
 
-#: ../rpmdrake.pm:523
-#, fuzzy
+#: ../rpmdrake.pm:521
+#, fuzzy, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2003,7 +2535,8 @@ msgstr ""
 "\n"
 "Да ли је У реду да наставим?"
 
-#: ../rpmdrake.pm:527
+#: ../rpmdrake.pm:525
+#, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
@@ -2015,28 +2548,30 @@ msgstr ""
 "\n"
 "Да ли је У реду да наставим?"
 
-#: ../rpmdrake.pm:532 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#, c-format
 msgid "Mirror choice"
 msgstr ""
 
-#: ../rpmdrake.pm:535
-#, fuzzy
+#: ../rpmdrake.pm:534
+#, fuzzy, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr ""
 "Молим Вас сачекајте, скидам листу додатних адреса са Mandriva-овог веб сајта."
 
-#: ../rpmdrake.pm:536
+#: ../rpmdrake.pm:535
+#, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr ""
 "Молим Вас сачекајте, скидам листу додатних адреса са Mandriva-овог веб сајта."
 
-#. - seems that value is bitten before being printed by next func..
 #: ../rpmdrake.pm:542
+#, c-format
 msgid "Error during download"
 msgstr "Грешка током преузимања са интернета"
 
 #: ../rpmdrake.pm:544
-#, fuzzy, perl-format
+#, fuzzy, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2051,7 +2586,7 @@ msgstr ""
 "Покушајте касније поново."
 
 #: ../rpmdrake.pm:549
-#, perl-format
+#, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
@@ -2066,14 +2601,17 @@ msgstr ""
 "Покушајте касније поново."
 
 #: ../rpmdrake.pm:559
+#, c-format
 msgid "No mirror"
 msgstr "Нема мирора"
 
 #: ../rpmdrake.pm:561
+#, c-format
 msgid "I can't find any suitable mirror."
 msgstr ""
 
 #: ../rpmdrake.pm:562
+#, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -2088,63 +2626,68 @@ msgstr ""
 "од стране Mandriva Linux Official Updates."
 
 #: ../rpmdrake.pm:581
+#, c-format
 msgid "Please choose the desired mirror."
 msgstr "Изаберите сајт по жељи."
 
-#: ../rpmdrake.pm:639
-#, perl-format
+#: ../rpmdrake.pm:634
+#, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Копирам фајл за медиј `%s'..."
 
-#: ../rpmdrake.pm:642
-#, perl-format
+#: ../rpmdrake.pm:637
+#, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Испитујем фајл за медиј `%s'..."
 
-#: ../rpmdrake.pm:645
-#, perl-format
+#: ../rpmdrake.pm:640
+#, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Испитујем удаљени фајл  за медиј `%s'..."
 
-#: ../rpmdrake.pm:649
+#: ../rpmdrake.pm:644
+#, c-format
 msgid " done."
 msgstr " урађено."
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:648
+#, c-format
 msgid " failed!"
 msgstr " неуспело!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:657
-#, perl-format
+#: ../rpmdrake.pm:652
+#, c-format
 msgid "%s from medium %s"
 msgstr "%s за медиј %s"
 
-#: ../rpmdrake.pm:661
-#, perl-format
+#: ../rpmdrake.pm:656
+#, c-format
 msgid "Starting download of `%s'..."
 msgstr "Покрећем download са `%s'..."
 
-#: ../rpmdrake.pm:665
-#, perl-format
+#: ../rpmdrake.pm:660
+#, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Download са `%s', време до краја:%s, брзина:%s"
 
-#: ../rpmdrake.pm:668
-#, perl-format
+#: ../rpmdrake.pm:663
+#, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Download са `%s', брзина:%s"
 
-#: ../rpmdrake.pm:679
+#: ../rpmdrake.pm:674
+#, c-format
 msgid "Please wait, updating media..."
 msgstr "Молим Вас сачекајте, ажурирам медијум..."
 
-#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:702
+#, c-format
 msgid "Error retrieving packages"
 msgstr ""
 
-#: ../rpmdrake.pm:707
-#, perl-format
+#: ../rpmdrake.pm:703
+#, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
@@ -2154,29 +2697,29 @@ msgid ""
 "later."
 msgstr ""
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:734
+#, c-format
 msgid "Update media"
 msgstr "Ажурирање медија"
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:739
+#, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 
-#: ../rpmdrake.pm:750
+#: ../rpmdrake.pm:746
+#, c-format
 msgid "Select the media you wish to update:"
 msgstr "Изаберите медиј који желите да ажурирате:"
 
 #: ../rpmdrake.pm:764
-msgid "Select all"
-msgstr "Изабери све"
-
-#: ../rpmdrake.pm:768
+#, c-format
 msgid "Update"
 msgstr "Ажурирање"
 
-#: ../rpmdrake.pm:789
-#, perl-format
+#: ../rpmdrake.pm:785
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
@@ -2188,25 +2731,26 @@ msgstr ""
 "Грешке:\n"
 "%s"
 
-#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
-#, perl-format
+#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../rpmdrake.pm:835
+#: ../rpmdrake.pm:831
+#, c-format
 msgid "Unable to create medium."
 msgstr "Не могу да направим медијум."
 
-#: ../rpmdrake.pm:840
-#, fuzzy
+#: ../rpmdrake.pm:836
+#, fuzzy, c-format
 msgid "Failure when adding medium"
 msgstr "Молимо Вас да сачекате, додајем медијум..."
 
-#: ../rpmdrake.pm:841
-#, fuzzy, perl-format
+#: ../rpmdrake.pm:837
+#, fuzzy, c-format
 msgid ""
 "There was a problem adding medium:\n"
 "\n"
@@ -2216,27 +2760,29 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:854
-#, perl-format
+#: ../rpmdrake.pm:850
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
 "running (%s).\n"
 "It will be disabled."
 msgstr ""
 
-#: ../rpmdrake.pm:857
-#, perl-format
+#: ../rpmdrake.pm:853
+#, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
 "Linux you're running (%s).\n"
 "It will be disabled."
 msgstr ""
 
-#: ../rpmdrake.pm:874
+#: ../rpmdrake.pm:870
+#, c-format
 msgid "Help launched in background"
 msgstr "Помоћ покренута у позадини"
 
-#: ../rpmdrake.pm:875
+#: ../rpmdrake.pm:871
+#, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
@@ -2309,7 +2855,7 @@ msgstr "Одговор Фтп Веирд PASV-а\n"
 
 #: ../grpmi/curl_download/curl_download.xs:172
 msgid "FTP unexpected 227 format\n"
-msgstr "ФТП унехпецтед 227 формат\n"
+msgstr "FTP unexpected 227 format\n"
 
 #: ../grpmi/curl_download/curl_download.xs:175
 msgid "FTP can't get host\n"
@@ -2512,21 +3058,22 @@ msgstr "Уклони софтвер"
 msgid "Software Media Manager"
 msgstr "Менаџер за Медије са софтвером"
 
+#~ msgid "Please wait, reading packages database..."
+#~ msgstr "Молим вас сачекајте, учитавам базу података о пакетима..."
+
+#, fuzzy
+#~ msgid "About Rpmdrake"
+#~ msgstr "Rpmdrake"
+
 #~ msgid "XFree86"
 #~ msgstr "XFree86"
 
 #~ msgid "No package found for installation."
 #~ msgstr "Није пронађен пакет за инсталацију."
 
-#~ msgid "Stop"
-#~ msgstr "Стоп"
-
 #~ msgid "All packages, by medium repository"
 #~ msgstr "Сви пакети, по медијима"
 
-#~ msgid "Normal information"
-#~ msgstr "Нормалана информација"
-
 #~ msgid "Maximum information"
 #~ msgstr "Потпуна информација"
 
@@ -2548,9 +3095,6 @@ msgstr "Менаџер за Медије са софтвером"
 #~ msgid "Keys"
 #~ msgstr "Кључеви"
 
-#~ msgid "Rpmdrake %s"
-#~ msgstr "Rpmdrake %s"
-
 #~ msgid "/_View"
 #~ msgstr "/П_реглед"