merge

1 files changed, 380 insertions, 354 deletions

diff --git a/po/ru.po b/po/ru.po
index 0a3c6037..4e2cade5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-ru\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-06-24 12:14+0300\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -60,7 +60,7 @@ msgstr "Съемное устройство"
 msgid "Path or mount point:"
 msgstr "Путь или точка монтирования:"
 
-#: ../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 "(нет)"
@@ -428,17 +428,17 @@ 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."
@@ -446,7 +446,7 @@ 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"
@@ -529,521 +529,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 "Резервирование"
 
 #: ../rpmdrake:100
 #, c-format
-msgid "Kernel and hardware"
-msgstr "Ядро и оборудование"
+msgid "Cd burning"
+msgstr "Запись CD"
 
 #: ../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 "HOWTO"
 
 #: ../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 "Загрузка и инициализация"
+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 "Java"
 
 #: ../rpmdrake:117
 #, c-format
-msgid "Perl"
-msgstr "Perl"
+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 "Perl"
 
 #: ../rpmdrake:121
 #, c-format
-msgid "Java"
-msgstr "Java"
+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 "Чат"
+
+#: ../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 "Запись CD"
+msgid "IRC"
+msgstr "IRC"
 
 #: ../rpmdrake:148
 #, c-format
-msgid "Backup"
-msgstr "Резервирование"
+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 "Чат"
+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 "Командные процессоры (Shells)"
 
 #: ../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 "Командные процессоры (Shells)"
+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 "Загрузка и инициализация"
 
-#: ../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 "HOWTO"
+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 "Результаты поиска"
 
-#: ../rpmdrake:308
+#: ../rpmdrake:313
 #, c-format
 msgid "Search results (none)"
 msgstr "Результаты поиска (нет)"
 
-#: ../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 "Пожалуйста, подождите, составляется список пакетов..."
 
-#: ../rpmdrake:459
+#: ../rpmdrake:464
 #, c-format
 msgid "No update"
 msgstr "Обновлений нет"
 
-#: ../rpmdrake:460
+#: ../rpmdrake:465
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1054,28 +1080,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"
@@ -1085,12 +1111,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"
@@ -1099,7 +1125,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"
@@ -1110,12 +1136,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"
@@ -1126,12 +1152,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"
@@ -1142,182 +1168,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 МБ / Свободно на диске: %d МБ"
 
-#: ../rpmdrake:640
+#: ../rpmdrake:645
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Выбранный размер: %d МБ"
 
-#: ../rpmdrake:648
+#: ../rpmdrake:653
 #, c-format
 msgid "Files:\n"
 msgstr "Файлы:\n"
 
-#: ../rpmdrake:651
+#: ../rpmdrake:656
 #, c-format
 msgid "Changelog:\n"
 msgstr "Changelog:\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 КБ"
 
-#: ../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"
@@ -1334,7 +1360,7 @@ msgstr ""
 "\n"
 "Вы действительно хотите установить все выбранные пакеты?"
 
-#: ../rpmdrake:932
+#: ../rpmdrake:937
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1349,52 +1375,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"
 
-#: ../rpmdrake:970
+#: ../rpmdrake:975
 #, c-format
 msgid "Software Packages Installation"
 msgstr "Установка пакетов программ"
 
-#: ../rpmdrake:983
+#: ../rpmdrake:988
 #, c-format
 msgid "Find:"
 msgstr "Найти:"
 
-#: ../rpmdrake:988
+#: ../rpmdrake:993
 #, c-format
 msgid "Search"
 msgstr "Поиск"
 
-#: ../rpmdrake:1005
+#: ../rpmdrake:1010
 #, c-format
 msgid "Install"
 msgstr "Установить"
 
-#: ../rpmdrake:1009
+#: ../rpmdrake:1014
 #, c-format
 msgid "Quit"
 msgstr "Выйти"
 
-#: ../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"
@@ -1407,12 +1433,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"
@@ -1430,12 +1456,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"
@@ -1450,62 +1476,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"
@@ -1516,17 +1542,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"
@@ -1539,37 +1565,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 "Загружается пакет `%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"
@@ -1584,12 +1610,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"
@@ -1602,22 +1628,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"
@@ -1630,42 +1656,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"
@@ -1676,7 +1702,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1514
+#: ../rpmdrake:1519
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1689,7 +1715,7 @@ msgstr ""
 "Этот инструмент поможет вам выбрать пакеты для удаления с вашего\n"
 "компьютера."
 
-#: ../rpmdrake:1519
+#: ../rpmdrake:1524
 #, c-format
 msgid ""
 "Welcome to MandrakeUpdate!\n"
@@ -1702,7 +1728,7 @@ msgstr ""
 "Этот инструмент поможет вам выбрать обновления для установки на ваш\n"
 "компьютер."
 
-#: ../rpmdrake:1524
+#: ../rpmdrake:1529
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"