merge

1 files changed, 380 insertions, 354 deletions

diff --git a/po/sr.po b/po/sr.po
index f4091044..9afb6908 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-sr\n"
-"POT-Creation-Date: 2004-07-12 12:14+0200\n"
+"POT-Creation-Date: 2004-07-19 10:03+0200\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"
@@ -61,7 +61,7 @@ msgstr "Преносни уређај"
 msgid "Path or mount point:"
 msgstr "Путања или тaчка монтирања:"
 
-#: ../edit-urpm-sources.pl:68 ../rpmdrake:734
+#: ../edit-urpm-sources.pl:68 ../rpmdrake:739
 #, c-format
 msgid "Security updates"
 msgstr "Сигурносне надоградње"
@@ -130,8 +130,8 @@ msgstr "Тип медија:"
 #: ../edit-urpm-sources.pl:406 ../edit-urpm-sources.pl:447
 #: ../edit-urpm-sources.pl:504 ../edit-urpm-sources.pl:568
 #: ../edit-urpm-sources.pl:605 ../edit-urpm-sources.pl:716 ../rpmdrake:93
-#: ../rpmdrake:519 ../rpmdrake:535 ../rpmdrake:540 ../rpmdrake:1205
-#: ../rpmdrake:1266 ../rpmdrake:1400 ../rpmdrake.pm:182 ../rpmdrake.pm:231
+#: ../rpmdrake:524 ../rpmdrake:540 ../rpmdrake:545 ../rpmdrake:1210
+#: ../rpmdrake:1271 ../rpmdrake:1405 ../rpmdrake.pm:182 ../rpmdrake.pm:231
 #: ../rpmdrake.pm:428
 #, c-format
 msgid "Ok"
@@ -141,7 +141,7 @@ msgstr "У реду"
 #: ../edit-urpm-sources.pl:233 ../edit-urpm-sources.pl:293
 #: ../edit-urpm-sources.pl:373 ../edit-urpm-sources.pl:407
 #: ../edit-urpm-sources.pl:454 ../edit-urpm-sources.pl:573 ../rpmdrake:93
-#: ../rpmdrake:519 ../rpmdrake:1266 ../rpmdrake:1272 ../rpmdrake.pm:428
+#: ../rpmdrake:524 ../rpmdrake:1271 ../rpmdrake:1277 ../rpmdrake.pm:428
 #: ../rpmdrake.pm:563
 #, c-format
 msgid "Cancel"
@@ -278,7 +278,7 @@ msgid "Add"
 msgstr "Додај"
 
 #: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:444
-#: ../edit-urpm-sources.pl:493 ../edit-urpm-sources.pl:694 ../rpmdrake:1005
+#: ../edit-urpm-sources.pl:493 ../edit-urpm-sources.pl:694 ../rpmdrake:1010
 #, c-format
 msgid "Remove"
 msgstr "Уклони"
@@ -313,8 +313,8 @@ msgstr "Лимит за медије"
 msgid "Command"
 msgstr "Команда"
 
-#: ../edit-urpm-sources.pl:482 ../rpmdrake:257 ../rpmdrake:274 ../rpmdrake:385
-#: ../rpmdrake:457
+#: ../edit-urpm-sources.pl:482 ../rpmdrake:262 ../rpmdrake:279 ../rpmdrake:390
+#: ../rpmdrake:462
 #, c-format
 msgid "(none)"
 msgstr "(ниjедан)"
@@ -428,24 +428,24 @@ msgstr "Уреди кључеве..."
 msgid "Parallel..."
 msgstr "Паралелно..."
 
-#: ../edit-urpm-sources.pl:711 ../rpmdrake:994
+#: ../edit-urpm-sources.pl:711 ../rpmdrake:999
 #, c-format
 msgid "Help"
 msgstr "Помоћ"
 
-#: ../edit-urpm-sources.pl:713 ../rpmdrake:997
+#: ../edit-urpm-sources.pl:713 ../rpmdrake:1002
 #, c-format
 msgid "Help launched in background"
 msgstr "Помоћ покренута у позадини"
 
-#: ../edit-urpm-sources.pl:714 ../rpmdrake:998
+#: ../edit-urpm-sources.pl:714 ../rpmdrake:1003
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
 msgstr ""
 "Прозор за помоћ је покренут, требало би убрзо да се појави на десктопу."
 
-#: ../edit-urpm-sources.pl:725 ../gurpmi.addmedia:75 ../rpmdrake:1510
+#: ../edit-urpm-sources.pl:725 ../gurpmi.addmedia:75 ../rpmdrake:1515
 #, c-format
 msgid ""
 "%s\n"
@@ -521,521 +521,547 @@ msgid "Accessibility"
 msgstr "Доступност"
 
 #: ../rpmdrake:99 ../rpmdrake:100 ../rpmdrake:101 ../rpmdrake:102
-#: ../rpmdrake:103 ../rpmdrake:104 ../rpmdrake:105 ../rpmdrake:106
-#: ../rpmdrake:107 ../rpmdrake:108 ../rpmdrake:109 ../rpmdrake:110
-#: ../rpmdrake:111 ../rpmdrake:112 ../rpmdrake:113 ../rpmdrake:114
 #, c-format
-msgid "System"
-msgstr "Систем"
+msgid "Archiving"
+msgstr "Архивирање"
 
 #: ../rpmdrake:99
 #, c-format
-msgid "Servers"
-msgstr "Сервери"
+msgid "Backup"
+msgstr "Backup"
 
 #: ../rpmdrake:100
 #, c-format
-msgid "Kernel and hardware"
-msgstr "Кернел и хардвер"
+msgid "Cd burning"
+msgstr "Нарезивање дискова"
 
 #: ../rpmdrake:101
 #, c-format
-msgid "Libraries"
-msgstr "Библиотеке"
+msgid "Compression"
+msgstr "Комресија"
 
-#: ../rpmdrake:102
+#: ../rpmdrake:102 ../rpmdrake:107 ../rpmdrake:119 ../rpmdrake:130
+#: ../rpmdrake:139 ../rpmdrake:150 ../rpmdrake:161 ../rpmdrake:169
+#: ../rpmdrake:240
 #, c-format
-msgid "XFree86"
-msgstr "XFree86"
+msgid "Other"
+msgstr "Остало"
 
 #: ../rpmdrake:103 ../rpmdrake:104 ../rpmdrake:105 ../rpmdrake:106
+#: ../rpmdrake:107
 #, c-format
-msgid "Fonts"
-msgstr "Фонтови"
+msgid "Books"
+msgstr "Књиге"
 
 #: ../rpmdrake:103
 #, c-format
-msgid "Console"
-msgstr "Конзола"
+msgid "Computer books"
+msgstr "Рачунарске књиге"
 
 #: ../rpmdrake:104
 #, c-format
-msgid "True type"
-msgstr "True type"
+msgid "Faqs"
+msgstr "Често постављана питања"
 
 #: ../rpmdrake:105
 #, c-format
-msgid "Type1"
-msgstr "Type1"
+msgid "Howtos"
+msgstr "Упуства"
 
 #: ../rpmdrake:106
 #, c-format
-msgid "X11 bitmap"
-msgstr "X11 bitmap"
-
-#: ../rpmdrake:107
-#, c-format
-msgid "Base"
-msgstr "Основно"
+msgid "Literature"
+msgstr "Литература"
 
-#: ../rpmdrake:108 ../rpmdrake:109 ../rpmdrake:110 ../rpmdrake:111
-#: ../rpmdrake:112 ../rpmdrake:113
+#: ../rpmdrake:108 ../rpmdrake:109
 #, c-format
-msgid "Configuration"
-msgstr "Подешавање"
+msgid "Cluster"
+msgstr ""
 
 #: ../rpmdrake:108
 #, c-format
-msgid "Hardware"
-msgstr "Хардвер"
+msgid "Message Passing"
+msgstr ""
 
 #: ../rpmdrake:109
 #, c-format
-msgid "Packaging"
-msgstr "Паковање"
-
-#: ../rpmdrake:110 ../rpmdrake:154 ../rpmdrake:155 ../rpmdrake:156
-#: ../rpmdrake:157 ../rpmdrake:158 ../rpmdrake:159 ../rpmdrake:160
-#: ../rpmdrake:161 ../rpmdrake:162
-#, c-format
-msgid "Networking"
-msgstr "Мрежа"
+msgid "Queueing Services"
+msgstr ""
 
-#: ../rpmdrake:111
+#: ../rpmdrake:110
 #, c-format
-msgid "Printing"
-msgstr "Штампање"
+msgid "Communications"
+msgstr "Комуникације"
 
-#: ../rpmdrake:112
+#: ../rpmdrake:111 ../rpmdrake:114
 #, c-format
-msgid "Boot and Init"
-msgstr "Boot и Init"
+msgid "Databases"
+msgstr "Базе података"
 
-#: ../rpmdrake:113 ../rpmdrake:124 ../rpmdrake:132 ../rpmdrake:144
-#: ../rpmdrake:149 ../rpmdrake:162 ../rpmdrake:176 ../rpmdrake:181
-#: ../rpmdrake:235
+#: ../rpmdrake:112 ../rpmdrake:113 ../rpmdrake:114 ../rpmdrake:115
+#: ../rpmdrake:116 ../rpmdrake:117 ../rpmdrake:118 ../rpmdrake:119
+#: ../rpmdrake:120 ../rpmdrake:121
 #, c-format
-msgid "Other"
-msgstr "Остало"
+msgid "Development"
+msgstr "Развој"
 
-#: ../rpmdrake:114
+#: ../rpmdrake:112
 #, c-format
-msgid "Internationalization"
-msgstr "Интернационализација"
+msgid "C"
+msgstr "C"
 
-#: ../rpmdrake:115 ../rpmdrake:116 ../rpmdrake:117 ../rpmdrake:118
-#: ../rpmdrake:119 ../rpmdrake:120 ../rpmdrake:121 ../rpmdrake:122
-#: ../rpmdrake:123 ../rpmdrake:124
+#: ../rpmdrake:113
 #, c-format
-msgid "Development"
-msgstr "Развој"
+msgid "C++"
+msgstr "C++"
 
 #: ../rpmdrake:115
 #, c-format
-msgid "Kernel"
-msgstr "Кернел"
+msgid "GNOME and GTK+"
+msgstr "GNOME и GTK+"
 
-#: ../rpmdrake:116 ../rpmdrake:134
+#: ../rpmdrake:116
 #, c-format
-msgid "Databases"
-msgstr "Базе података"
+msgid "Java"
+msgstr "Јава"
 
 #: ../rpmdrake:117
 #, c-format
-msgid "Perl"
-msgstr "Перл"
+msgid "KDE and Qt"
+msgstr "KDE и Qt"
 
 #: ../rpmdrake:118
 #, c-format
-msgid "Python"
-msgstr "Python"
-
-#: ../rpmdrake:119
-#, c-format
-msgid "C"
-msgstr "C"
+msgid "Kernel"
+msgstr "Кернел"
 
 #: ../rpmdrake:120
 #, c-format
-msgid "C++"
-msgstr "C++"
+msgid "Perl"
+msgstr "Перл"
 
 #: ../rpmdrake:121
 #, c-format
-msgid "Java"
-msgstr "Јава"
+msgid "Python"
+msgstr "Python"
 
 #: ../rpmdrake:122
 #, c-format
-msgid "GNOME and GTK+"
-msgstr "GNOME и GTK+"
+msgid "Editors"
+msgstr "Едитори"
 
 #: ../rpmdrake:123
-#, c-format
-msgid "KDE and Qt"
-msgstr "KDE и Qt"
+#, fuzzy, c-format
+msgid "Education"
+msgstr "Комуникације"
 
-#: ../rpmdrake:125 ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128
-#: ../rpmdrake:129 ../rpmdrake:130 ../rpmdrake:131 ../rpmdrake:132
+#: ../rpmdrake:124
 #, c-format
-msgid "Sciences"
-msgstr "Науке"
+msgid "Emulators"
+msgstr "Емулатори"
 
 #: ../rpmdrake:125
 #, c-format
-msgid "Astronomy"
-msgstr "Астрономија"
+msgid "File tools"
+msgstr "Алати за фајлове"
+
+#: ../rpmdrake:126 ../rpmdrake:127 ../rpmdrake:128 ../rpmdrake:129
+#: ../rpmdrake:130 ../rpmdrake:131 ../rpmdrake:132 ../rpmdrake:133
+#, c-format
+msgid "Games"
+msgstr "Игрице"
 
 #: ../rpmdrake:126
 #, c-format
-msgid "Biology"
-msgstr "Биологија"
+msgid "Adventure"
+msgstr "Авантура"
 
 #: ../rpmdrake:127
 #, c-format
-msgid "Chemistry"
-msgstr "Хемија"
+msgid "Arcade"
+msgstr "Аркаде"
 
 #: ../rpmdrake:128
 #, c-format
-msgid "Computer science"
-msgstr "Наука о рачунарима"
+msgid "Boards"
+msgstr "Форуми"
 
 #: ../rpmdrake:129
 #, c-format
-msgid "Geosciences"
-msgstr "Природне науке"
+msgid "Cards"
+msgstr "Карте"
 
-#: ../rpmdrake:130
+#: ../rpmdrake:131
 #, c-format
-msgid "Mathematics"
-msgstr "Математика"
+msgid "Puzzles"
+msgstr "Укрштенице"
 
-#: ../rpmdrake:131
+#: ../rpmdrake:132
 #, c-format
-msgid "Physics"
-msgstr "Физика"
+msgid "Sports"
+msgstr "Спортови"
 
 #: ../rpmdrake:133
 #, c-format
-msgid "Communications"
-msgstr "Комуникације"
+msgid "Strategy"
+msgstr "Стратегија"
 
-#: ../rpmdrake:135
+#: ../rpmdrake:134 ../rpmdrake:135 ../rpmdrake:136 ../rpmdrake:137
+#: ../rpmdrake:138 ../rpmdrake:139 ../rpmdrake:140 ../rpmdrake:141
 #, c-format
-msgid "Editors"
-msgstr "Едитори"
+msgid "Graphical desktop"
+msgstr "Графички десктоп"
 
-#: ../rpmdrake:136
+#: ../rpmdrake:134
 #, c-format
-msgid "Emulators"
-msgstr "Емулатори"
+msgid "Enlightenment"
+msgstr "Enlightenment"
 
-#: ../rpmdrake:137 ../rpmdrake:138 ../rpmdrake:139 ../rpmdrake:140
-#: ../rpmdrake:141 ../rpmdrake:142 ../rpmdrake:143 ../rpmdrake:144
+#: ../rpmdrake:135
 #, c-format
-msgid "Games"
-msgstr "Игрице"
+msgid "FVWM based"
+msgstr "базирано на FVWM"
 
-#: ../rpmdrake:137
+#: ../rpmdrake:136
 #, c-format
-msgid "Adventure"
-msgstr "Авантура"
+msgid "GNOME"
+msgstr "GNOME"
 
-#: ../rpmdrake:138
+#: ../rpmdrake:137
 #, c-format
-msgid "Arcade"
-msgstr "Аркаде"
+msgid "Icewm"
+msgstr "Icewm"
 
-#: ../rpmdrake:139
+#: ../rpmdrake:138
 #, c-format
-msgid "Boards"
-msgstr "Форуми"
+msgid "KDE"
+msgstr "KDE"
 
 #: ../rpmdrake:140
 #, c-format
-msgid "Cards"
-msgstr "Карте"
+msgid "Sawfish"
+msgstr "Sawfish"
 
 #: ../rpmdrake:141
 #, c-format
-msgid "Puzzles"
-msgstr "Укрштенице"
+msgid "WindowMaker"
+msgstr "WindowMaker"
 
 #: ../rpmdrake:142
 #, c-format
-msgid "Sports"
-msgstr "Спортови"
+msgid "Graphics"
+msgstr "Графика"
 
 #: ../rpmdrake:143
 #, c-format
-msgid "Strategy"
-msgstr "Стратегија"
+msgid "Monitoring"
+msgstr "Мониторинг"
 
-#: ../rpmdrake:145
+#: ../rpmdrake:144 ../rpmdrake:145 ../rpmdrake:146 ../rpmdrake:147
+#: ../rpmdrake:148 ../rpmdrake:149 ../rpmdrake:150 ../rpmdrake:151
+#: ../rpmdrake:152 ../rpmdrake:168
 #, c-format
-msgid "Toys"
-msgstr "Играчке"
+msgid "Networking"
+msgstr "Мрежа"
 
-#: ../rpmdrake:146 ../rpmdrake:147 ../rpmdrake:148 ../rpmdrake:149
+#: ../rpmdrake:144
 #, c-format
-msgid "Archiving"
-msgstr "Архивирање"
+msgid "Chat"
+msgstr "Chat"
+
+#: ../rpmdrake:145
+#, c-format
+msgid "File transfer"
+msgstr "Трансфер фајлова"
 
 #: ../rpmdrake:146
 #, c-format
-msgid "Compression"
-msgstr "Комресија"
+msgid "Instant messaging"
+msgstr "Инстант поруке"
 
 #: ../rpmdrake:147
 #, c-format
-msgid "Cd burning"
-msgstr "Нарезивање дискова"
+msgid "IRC"
+msgstr "IRC"
 
 #: ../rpmdrake:148
 #, c-format
-msgid "Backup"
-msgstr "Backup"
+msgid "Mail"
+msgstr "Пошта"
 
-#: ../rpmdrake:150
+#: ../rpmdrake:149
 #, c-format
-msgid "Monitoring"
-msgstr "Мониторинг"
+msgid "News"
+msgstr "Вести"
 
 #: ../rpmdrake:151
 #, c-format
-msgid "Sound"
-msgstr "Звук"
+msgid "Remote access"
+msgstr "Удаљени приступ"
 
 #: ../rpmdrake:152
 #, c-format
-msgid "Graphics"
-msgstr "Графика"
+msgid "WWW"
+msgstr "WWW"
 
 #: ../rpmdrake:153
 #, c-format
-msgid "Video"
-msgstr "Видео"
+msgid "Office"
+msgstr "Канцеларија"
 
 #: ../rpmdrake:154
 #, c-format
-msgid "File transfer"
-msgstr "Трансфер фајлова"
+msgid "Publishing"
+msgstr "Публиковање"
+
+#: ../rpmdrake:155 ../rpmdrake:156 ../rpmdrake:157 ../rpmdrake:158
+#: ../rpmdrake:159 ../rpmdrake:160 ../rpmdrake:161 ../rpmdrake:162
+#, c-format
+msgid "Sciences"
+msgstr "Науке"
 
 #: ../rpmdrake:155
 #, c-format
-msgid "IRC"
-msgstr "IRC"
+msgid "Astronomy"
+msgstr "Астрономија"
 
 #: ../rpmdrake:156
 #, c-format
-msgid "Instant messaging"
-msgstr "Инстант поруке"
+msgid "Biology"
+msgstr "Биологија"
 
 #: ../rpmdrake:157
 #, c-format
-msgid "Chat"
-msgstr "Chat"
+msgid "Chemistry"
+msgstr "Хемија"
 
 #: ../rpmdrake:158
 #, c-format
-msgid "News"
-msgstr "Вести"
+msgid "Computer science"
+msgstr "Наука о рачунарима"
 
 #: ../rpmdrake:159
 #, c-format
-msgid "Mail"
-msgstr "Пошта"
+msgid "Geosciences"
+msgstr "Природне науке"
 
 #: ../rpmdrake:160
 #, c-format
-msgid "WWW"
-msgstr "WWW"
+msgid "Mathematics"
+msgstr "Математика"
 
-#: ../rpmdrake:161
+#: ../rpmdrake:162
 #, c-format
-msgid "Remote access"
-msgstr "Удаљени приступ"
+msgid "Physics"
+msgstr "Физика"
 
 #: ../rpmdrake:163
 #, c-format
-msgid "Office"
-msgstr "Канцеларија"
+msgid "Shells"
+msgstr "Шелови"
 
 #: ../rpmdrake:164
 #, c-format
-msgid "Publishing"
-msgstr "Публиковање"
-
-#: ../rpmdrake:165
-#, c-format
-msgid "Terminals"
-msgstr "Терминали"
+msgid "Sound"
+msgstr "Звук"
 
-#: ../rpmdrake:166
+#: ../rpmdrake:165 ../rpmdrake:166 ../rpmdrake:167 ../rpmdrake:168
+#: ../rpmdrake:169 ../rpmdrake:170 ../rpmdrake:171 ../rpmdrake:172
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
+#: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
+#: ../rpmdrake:181
 #, c-format
-msgid "Shells"
-msgstr "Шелови"
+msgid "System"
+msgstr "Систем"
 
-#: ../rpmdrake:167
+#: ../rpmdrake:165
 #, c-format
-msgid "File tools"
-msgstr "Алати за фајлове"
+msgid "Base"
+msgstr "Основно"
 
-#: ../rpmdrake:168
+#: ../rpmdrake:166 ../rpmdrake:167 ../rpmdrake:168 ../rpmdrake:169
+#: ../rpmdrake:170 ../rpmdrake:171
 #, c-format
-msgid "Text tools"
-msgstr "Алати за текст"
+msgid "Configuration"
+msgstr "Подешавање"
 
-#: ../rpmdrake:169 ../rpmdrake:170 ../rpmdrake:171 ../rpmdrake:172
-#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
+#: ../rpmdrake:166
 #, c-format
-msgid "Graphical desktop"
-msgstr "Графички десктоп"
+msgid "Boot and Init"
+msgstr "Boot и Init"
 
-#: ../rpmdrake:169
+#: ../rpmdrake:167
 #, c-format
-msgid "GNOME"
-msgstr "GNOME"
+msgid "Hardware"
+msgstr "Хардвер"
 
 #: ../rpmdrake:170
 #, c-format
-msgid "Icewm"
-msgstr "Icewm"
+msgid "Packaging"
+msgstr "Паковање"
 
 #: ../rpmdrake:171
 #, c-format
-msgid "FVWM based"
-msgstr "базирано на FVWM"
+msgid "Printing"
+msgstr "Штампање"
 
 #: ../rpmdrake:172
+#, fuzzy, c-format
+msgid "Deploiement"
+msgstr "Развој"
+
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #, c-format
-msgid "KDE"
-msgstr "KDE"
+msgid "Fonts"
+msgstr "Фонтови"
 
 #: ../rpmdrake:173
 #, c-format
-msgid "Sawfish"
-msgstr "Sawfish"
+msgid "Console"
+msgstr "Конзола"
 
 #: ../rpmdrake:174
 #, c-format
-msgid "WindowMaker"
-msgstr "WindowMaker"
+msgid "True type"
+msgstr "True type"
 
 #: ../rpmdrake:175
 #, c-format
-msgid "Enlightenment"
-msgstr "Enlightenment"
+msgid "Type1"
+msgstr "Type1"
 
-#: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
-#: ../rpmdrake:181
+#: ../rpmdrake:176
 #, c-format
-msgid "Books"
-msgstr "Књиге"
+msgid "X11 bitmap"
+msgstr "X11 bitmap"
 
 #: ../rpmdrake:177
 #, c-format
-msgid "Howtos"
-msgstr "Упуства"
+msgid "Internationalization"
+msgstr "Интернационализација"
 
 #: ../rpmdrake:178
 #, c-format
-msgid "Faqs"
-msgstr "Често постављана питања"
+msgid "Kernel and hardware"
+msgstr "Кернел и хардвер"
 
 #: ../rpmdrake:179
 #, c-format
-msgid "Computer books"
-msgstr "Рачунарске књиге"
+msgid "Libraries"
+msgstr "Библиотеке"
 
 #: ../rpmdrake:180
 #, c-format
-msgid "Literature"
-msgstr "Литература"
+msgid "Servers"
+msgstr "Сервери"
+
+#: ../rpmdrake:181
+#, c-format
+msgid "XFree86"
+msgstr "XFree86"
+
+#: ../rpmdrake:182
+#, c-format
+msgid "Terminals"
+msgstr "Терминали"
 
-#: ../rpmdrake:280 ../rpmdrake:650 ../rpmdrake:651
+#: ../rpmdrake:183
+#, c-format
+msgid "Text tools"
+msgstr "Алати за текст"
+
+#: ../rpmdrake:184
+#, c-format
+msgid "Toys"
+msgstr "Играчке"
+
+#: ../rpmdrake:185
+#, c-format
+msgid "Video"
+msgstr "Видео"
+
+#: ../rpmdrake:285 ../rpmdrake:655 ../rpmdrake:656
 #, c-format
 msgid "(Not available)"
 msgstr "(Није доступно)"
 
-#: ../rpmdrake:308 ../rpmdrake:366
+#: ../rpmdrake:313 ../rpmdrake:371
 #, c-format
 msgid "Search results"
 msgstr "Резултати претрагe"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:313
 #, c-format
 msgid "Search results (none)"
 msgstr "Резултат претрагe (нема)"
 
-#: ../rpmdrake:318 ../rpmdrake:329
+#: ../rpmdrake:323 ../rpmdrake:334
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Молим Вас сачекајте, тражим..."
 
-#: ../rpmdrake:327 ../rpmdrake:1051 ../rpmdrake:1297 ../rpmdrake:1509
+#: ../rpmdrake:332 ../rpmdrake:1056 ../rpmdrake:1302 ../rpmdrake:1514
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:332
+#: ../rpmdrake:337
 #, c-format
 msgid "Stop"
 msgstr "Стоп"
 
-#: ../rpmdrake:367 ../rpmdrake:486
+#: ../rpmdrake:372 ../rpmdrake:491
 #, c-format
 msgid "Upgradable"
 msgstr "Могу се ажурирати"
 
-#: ../rpmdrake:367 ../rpmdrake:486
+#: ../rpmdrake:372 ../rpmdrake:491
 #, c-format
 msgid "Addable"
 msgstr "Могу се додати"
 
-#: ../rpmdrake:369
+#: ../rpmdrake:374
 #, c-format
 msgid "Selected"
 msgstr "Изабрани"
 
-#: ../rpmdrake:369
+#: ../rpmdrake:374
 #, c-format
 msgid "Not selected"
 msgstr "Нису изабрани"
 
-#: ../rpmdrake:403
+#: ../rpmdrake:408
 #, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:421 ../rpmdrake:530 ../rpmdrake:532 ../rpmdrake:1390
-#: ../rpmdrake:1393
+#: ../rpmdrake:426 ../rpmdrake:535 ../rpmdrake:537 ../rpmdrake:1395
+#: ../rpmdrake:1398
 #, c-format
 msgid "More information on package..."
 msgstr "Додатне информације о пакету..."
 
-#: ../rpmdrake:422
+#: ../rpmdrake:427
 #, c-format
 msgid "Please choose"
 msgstr "Изаберите"
 
-#: ../rpmdrake:422
+#: ../rpmdrake:427
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Један од следећих пакета је потребан:"
 
-#: ../rpmdrake:442
+#: ../rpmdrake:447
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Молим Вас сaчекаjте, приказујем пакете..."
 
-#: ../rpmdrake:459
+#: ../rpmdrake:464
 #, c-format
 msgid "No update"
 msgstr "Без ажурирaња"
 
-#: ../rpmdrake:460
+#: ../rpmdrake:465
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1047,28 +1073,28 @@ msgstr ""
 "пакета за ажурирање за ваш рачунар,\n"
 "или су они веќ инсталирани."
 
-#: ../rpmdrake:480
+#: ../rpmdrake:485
 #, c-format
 msgid "All"
 msgstr "Све"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:519 ../rpmdrake:522
+#: ../rpmdrake:524 ../rpmdrake:527
 #, c-format
 msgid "More info"
 msgstr "Још информација"
 
-#: ../rpmdrake:525 ../rpmdrake:1380
+#: ../rpmdrake:530 ../rpmdrake:1385
 #, c-format
 msgid "Information on packages"
 msgstr "Информације о пакетима"
 
-#: ../rpmdrake:548
+#: ../rpmdrake:553
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Још неки пакети морају бити уклоњени"
 
-#: ../rpmdrake:549
+#: ../rpmdrake:554
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1079,12 +1105,12 @@ msgstr ""
 "требало да се уклоне:\n"
 "\n"
 
-#: ../rpmdrake:555 ../rpmdrake:564
+#: ../rpmdrake:560 ../rpmdrake:569
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Неки пакети се не могу уклонити"
 
-#: ../rpmdrake:556
+#: ../rpmdrake:561
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1093,7 +1119,7 @@ msgstr ""
 "Жалим, али уклањањем ових пакета би сте оштетити систем:\n"
 "\n"
 
-#: ../rpmdrake:565 ../rpmdrake:620
+#: ../rpmdrake:570 ../rpmdrake:625
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1104,12 +1130,12 @@ msgstr ""
 "да буду неизабрани:\n"
 "\n"
 
-#: ../rpmdrake:588
+#: ../rpmdrake:593
 #, c-format
 msgid "Additional packages needed"
 msgstr "Потребни су додатни пакети"
 
-#: ../rpmdrake:589
+#: ../rpmdrake:594
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1120,12 +1146,12 @@ msgstr ""
 "да се инсталирају:\n"
 "\n"
 
-#: ../rpmdrake:605
+#: ../rpmdrake:610
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Неки пакети не могу да се инсталирају"
 
-#: ../rpmdrake:606
+#: ../rpmdrake:611
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1136,182 +1162,182 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:619 ../rpmdrake:931
+#: ../rpmdrake:624 ../rpmdrake:936
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Неки пакети морају да се уклоне"
 
-#: ../rpmdrake:638
+#: ../rpmdrake:643
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Изабрано: %d MB / Слободан простор на диску: %d MB"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:645
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Величина изабраног: %d MB"
 
-#: ../rpmdrake:648
+#: ../rpmdrake:653
 #, c-format
 msgid "Files:\n"
 msgstr "Фајлови:\n"
 
-#: ../rpmdrake:651
+#: ../rpmdrake:656
 #, c-format
 msgid "Changelog:\n"
 msgstr "Измене:\n"
 
-#: ../rpmdrake:653
+#: ../rpmdrake:658
 #, c-format
 msgid "Medium: "
 msgstr "Медиј: "
 
-#: ../rpmdrake:655
+#: ../rpmdrake:660
 #, c-format
 msgid "Currently installed version: "
 msgstr "Тренутно инсталирана верзија: "
 
-#: ../rpmdrake:659
+#: ../rpmdrake:664
 #, c-format
 msgid "Name: "
 msgstr "Име: "
 
-#: ../rpmdrake:660
+#: ../rpmdrake:665
 #, c-format
 msgid "Version: "
 msgstr "Верзија: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:666
 #, c-format
 msgid "Size: "
 msgstr "Величина: "
 
-#: ../rpmdrake:661
+#: ../rpmdrake:666
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:663
+#: ../rpmdrake:668
 #, c-format
 msgid "Importance: "
 msgstr "Важност: "
 
-#: ../rpmdrake:665
+#: ../rpmdrake:670
 #, c-format
 msgid "Summary: "
 msgstr "Сажетак: "
 
-#: ../rpmdrake:667
+#: ../rpmdrake:672
 #, c-format
 msgid "Reason for update: "
 msgstr "Разлог ажурирања:"
 
-#: ../rpmdrake:669
+#: ../rpmdrake:674
 #, c-format
 msgid "Description: "
 msgstr "Опис:"
 
-#: ../rpmdrake:734
+#: ../rpmdrake:739
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Надоградње са исправкама"
 
-#: ../rpmdrake:734
+#: ../rpmdrake:739
 #, c-format
 msgid "Normal updates"
 msgstr "Обичне надоградње"
 
-#: ../rpmdrake:752
+#: ../rpmdrake:757
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Mandrakelinux-ов избор"
 
-#: ../rpmdrake:753
+#: ../rpmdrake:758
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Сви пакети, по абецеди"
 
-#: ../rpmdrake:761
+#: ../rpmdrake:766
 #, c-format
 msgid "All packages, by group"
 msgstr "Сви пакети, по групи"
 
-#: ../rpmdrake:762
+#: ../rpmdrake:767
 #, c-format
 msgid "All packages, by size"
 msgstr "Сви пакети, по величини"
 
-#: ../rpmdrake:763
+#: ../rpmdrake:768
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Сви пакети, по стању бирања"
 
-#: ../rpmdrake:767
+#: ../rpmdrake:772
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Сви пакети, по медијима"
 
-#: ../rpmdrake:768
+#: ../rpmdrake:773
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Сви пакети, по доступности нове верзије"
 
-#: ../rpmdrake:772
+#: ../rpmdrake:777
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "сортирани по датуму инсталације"
 
-#: ../rpmdrake:843
+#: ../rpmdrake:848
 #, c-format
 msgid "in names"
 msgstr "у именима"
 
-#: ../rpmdrake:845
+#: ../rpmdrake:850
 #, c-format
 msgid "in descriptions"
 msgstr "у описима"
 
-#: ../rpmdrake:847
+#: ../rpmdrake:852
 #, c-format
 msgid "in file names"
 msgstr "у именима фајлова"
 
-#: ../rpmdrake:858
+#: ../rpmdrake:863
 #, c-format
 msgid "Reset the selection"
 msgstr "Поново изабери"
 
-#: ../rpmdrake:859
+#: ../rpmdrake:864
 #, c-format
 msgid "Reload the packages list"
 msgstr "Поново учитај листу пакета"
 
-#: ../rpmdrake:862 ../rpmdrake.pm:543
+#: ../rpmdrake:867 ../rpmdrake.pm:543
 #, c-format
 msgid "Update media"
 msgstr "Ажурирање медија"
 
-#: ../rpmdrake:893
+#: ../rpmdrake:898
 #, c-format
 msgid "Normal information"
 msgstr "Нормалана информација"
 
-#: ../rpmdrake:893
+#: ../rpmdrake:898
 #, c-format
 msgid "Maximum information"
 msgstr "Потпуна информација"
 
-#: ../rpmdrake:913
+#: ../rpmdrake:918
 #, c-format
 msgid "You need to select some packages first."
 msgstr "Прво морате да одаберете неке пакете."
 
-#: ../rpmdrake:918
+#: ../rpmdrake:923
 #, c-format
 msgid "Too many packages are selected"
 msgstr "Изабрали сте превише пакета"
 
-#: ../rpmdrake:919
+#: ../rpmdrake:924
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -1328,7 +1354,7 @@ msgstr ""
 "\n"
 "Да ли заиста желите да инсталирате изабране пакете?"
 
-#: ../rpmdrake:932
+#: ../rpmdrake:937
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1343,52 +1369,52 @@ msgstr ""
 "\n"
 "да ли је у реду да наставим?"
 
-#: ../rpmdrake:968
+#: ../rpmdrake:973
 #, c-format
 msgid "Software Packages Removal"
 msgstr "Уклањање пакета"
 
-#: ../rpmdrake:969
+#: ../rpmdrake:974
 #, c-format
 msgid "Mandrake Update"
 msgstr "Mandrake Update"
 
-#: ../rpmdrake:970
+#: ../rpmdrake:975
 #, c-format
 msgid "Software Packages Installation"
 msgstr "Инсталација пакета"
 
-#: ../rpmdrake:983
+#: ../rpmdrake:988
 #, c-format
 msgid "Find:"
 msgstr "Пронaђи: "
 
-#: ../rpmdrake:988
+#: ../rpmdrake:993
 #, c-format
 msgid "Search"
 msgstr "Тражи"
 
-#: ../rpmdrake:1005
+#: ../rpmdrake:1010
 #, c-format
 msgid "Install"
 msgstr "Инсталираj"
 
-#: ../rpmdrake:1009
+#: ../rpmdrake:1014
 #, c-format
 msgid "Quit"
 msgstr "Краj"
 
-#: ../rpmdrake:1043
+#: ../rpmdrake:1048
 #, c-format
 msgid "Fatal error"
 msgstr "Фатална грешка"
 
-#: ../rpmdrake:1044
+#: ../rpmdrake:1049
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Појавила се фатална грешка: %s."
 
-#: ../rpmdrake:1052
+#: ../rpmdrake:1057
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1401,12 +1427,12 @@ msgstr ""
 "\n"
 "Да ли је У реду да наставим?"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1066
 #, c-format
 msgid "Already existing update media"
 msgstr "Већ постојићи медиј за ажурирање"
 
-#: ../rpmdrake:1062
+#: ../rpmdrake:1067
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1424,12 +1450,12 @@ msgstr ""
 "\n"
 "Затим  рестартујте  MandrakeUpdate."
 
-#: ../rpmdrake:1072
+#: ../rpmdrake:1077
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "Како ручно изабрати свој мирор сајт"
 
-#: ../rpmdrake:1073
+#: ../rpmdrake:1078
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1444,62 +1470,62 @@ msgstr ""
 "\n"
 "Затим, рестарујте MandrakeUpdate."
 
-#: ../rpmdrake:1102
+#: ../rpmdrake:1107
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Молим Вас сачекајте, проналазим доступне пакете..."
 
-#: ../rpmdrake:1150
+#: ../rpmdrake:1155
 #, c-format
 msgid "Inspecting %s"
 msgstr "Проверавам %s"
 
-#: ../rpmdrake:1169
+#: ../rpmdrake:1174
 #, c-format
 msgid "changes:"
 msgstr "измене:"
 
-#: ../rpmdrake:1173
+#: ../rpmdrake:1178
 #, c-format
 msgid "Remove .%s"
 msgstr "Уклони: %s"
 
-#: ../rpmdrake:1175
+#: ../rpmdrake:1180
 #, c-format
 msgid "Use .%s as main file"
 msgstr "Користи %s као главни фајл"
 
-#: ../rpmdrake:1177
+#: ../rpmdrake:1182
 #, c-format
 msgid "Do nothing"
 msgstr "Не ради ништа"
 
-#: ../rpmdrake:1189
+#: ../rpmdrake:1194
 #, c-format
 msgid "Installation finished"
 msgstr "Инсталација готова"
 
-#: ../rpmdrake:1199
+#: ../rpmdrake:1204
 #, c-format
 msgid "Inspect..."
 msgstr "Провери..."
 
-#: ../rpmdrake:1225 ../rpmdrake:1376
+#: ../rpmdrake:1230 ../rpmdrake:1381
 #, c-format
 msgid "Everything installed successfully"
 msgstr "Све је добро инсталирано"
 
-#: ../rpmdrake:1226 ../rpmdrake:1377
+#: ../rpmdrake:1231 ../rpmdrake:1382
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Сви пакети, који сте захтевали, су успешно инсталирани."
 
-#: ../rpmdrake:1228 ../rpmdrake:1361
+#: ../rpmdrake:1233 ../rpmdrake:1366
 #, c-format
 msgid "Problem during installation"
 msgstr "Проблем за време инсталирања"
 
-#: ../rpmdrake:1229 ../rpmdrake:1362 ../rpmdrake:1416
+#: ../rpmdrake:1234 ../rpmdrake:1367 ../rpmdrake:1421
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1510,17 +1536,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1250
+#: ../rpmdrake:1255
 #, c-format
 msgid "Unable to get source packages."
 msgstr "Не могу да добавим изворне пакете."
 
-#: ../rpmdrake:1251
+#: ../rpmdrake:1256
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Не могу да добавим изворне пакете, жао ми је. %s"
 
-#: ../rpmdrake:1252 ../rpmdrake:1308
+#: ../rpmdrake:1257 ../rpmdrake:1313
 #, c-format
 msgid ""
 "\n"
@@ -1533,37 +1559,37 @@ msgstr ""
 "Пријављена Грешка(е):\n"
 "%s"
 
-#: ../rpmdrake:1259
+#: ../rpmdrake:1264
 #, c-format
 msgid "Package installation..."
 msgstr "Инсталација пакета..."
 
-#: ../rpmdrake:1259
+#: ../rpmdrake:1264
 #, c-format
 msgid "Initializing..."
 msgstr "Инициялизация..."
 
-#: ../rpmdrake:1264
+#: ../rpmdrake:1269
 #, c-format
 msgid "Change medium"
 msgstr "Промени медијум"
 
-#: ../rpmdrake:1265
+#: ../rpmdrake:1270
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Убаците медијум са именом \"%s\" у уређај [%s]"
 
-#: ../rpmdrake:1270
+#: ../rpmdrake:1275
 #, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Доwнлоад-ујем пакете `%s' (%s/%s)..."
 
-#: ../rpmdrake:1289
+#: ../rpmdrake:1294
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr "Провера потписа на пакетима..."
 
-#: ../rpmdrake:1298
+#: ../rpmdrake:1303
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1578,12 +1604,12 @@ msgstr ""
 "\n"
 "да ли желите да наставите инсталацију?"
 
-#: ../rpmdrake:1305 ../rpmdrake:1415
+#: ../rpmdrake:1310 ../rpmdrake:1420
 #, c-format
 msgid "Installation failed"
 msgstr "Инсталација неуспела"
 
-#: ../rpmdrake:1306
+#: ../rpmdrake:1311
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1596,22 +1622,22 @@ msgstr ""
 "\n"
 "Можда желите да ажурирате базу података за медије."
 
-#: ../rpmdrake:1320
+#: ../rpmdrake:1325
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Припремам инсталацију пакета"
 
-#: ../rpmdrake:1323
+#: ../rpmdrake:1328
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Инсталирам пакет `%s' (%s/%s)..."
 
-#: ../rpmdrake:1339
+#: ../rpmdrake:1344
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr ""
 
-#: ../rpmdrake:1374
+#: ../rpmdrake:1379
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -1624,42 +1650,42 @@ msgstr ""
 "Направио сам неке фајлове са подешавањима, пример `.rpmnew' или `.rpmsave',\n"
 "можете да их проверите како би сте нешто предузели:"
 
-#: ../rpmdrake:1374
+#: ../rpmdrake:1379
 #, c-format
 msgid "everything was installed correctly"
 msgstr "сви пакети су добро инсталирани"
 
-#: ../rpmdrake:1382
+#: ../rpmdrake:1387
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr ""
 
-#: ../rpmdrake:1406
+#: ../rpmdrake:1411
 #, c-format
 msgid "No package found for installation."
 msgstr "Није пронађен пакет за инсталацију."
 
-#: ../rpmdrake:1407
+#: ../rpmdrake:1412
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Непоправљива грешка: није пронађен пакет за инсталацију."
 
-#: ../rpmdrake:1429
+#: ../rpmdrake:1434
 #, c-format
 msgid "Please wait, reading packages database..."
 msgstr "Молим вас сачекајте, учитавам базу података о пакетима..."
 
-#: ../rpmdrake:1476
+#: ../rpmdrake:1481
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "Молим Вас сачекајте, уклањам пакете..."
 
-#: ../rpmdrake:1481
+#: ../rpmdrake:1486
 #, c-format
 msgid "Problem during removal"
 msgstr "Проблем приликом уклањања"
 
-#: ../rpmdrake:1482
+#: ../rpmdrake:1487
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -1670,7 +1696,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1514
+#: ../rpmdrake:1519
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1683,7 +1709,7 @@ msgstr ""
 "Овај алат вам може помоћи да изаберете софтвер желите да уклоните са\n"
 "вашег рачунара."
 
-#: ../rpmdrake:1519
+#: ../rpmdrake:1524
 #, c-format
 msgid ""
 "Welcome to MandrakeUpdate!\n"
@@ -1697,7 +1723,7 @@ msgstr ""
 "инсталирате на\n"
 "ваш рачунар."
 
-#: ../rpmdrake:1524
+#: ../rpmdrake:1529
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"