sync with code

1 files changed, 385 insertions, 350 deletions

diff --git a/po/ru.po b/po/ru.po
index 5e88a159..c37115db 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-07 13:31+0200\n"
+"POT-Creation-Date: 2006-09-13 18:32+0200\n"
 "PO-Revision-Date: 2006-09-10 23:15+0300\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -21,11 +21,11 @@ msgstr ""
 "X-Generator: KBabel 1.11.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../edit-urpm-sources.pl:77
+#: ../edit-urpm-sources.pl:80
 msgid "Choose media type"
 msgstr "Выберите тип источника"
 
-#: ../edit-urpm-sources.pl:78
+#: ../edit-urpm-sources.pl:81
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
 "mirror.\n"
@@ -50,15 +50,15 @@ msgstr ""
 "добавить\n"
 "и оба типа источников, но в два этапа.)"
 
-#: ../edit-urpm-sources.pl:86
+#: ../edit-urpm-sources.pl:89
 msgid "Distribution sources"
 msgstr "Источники дистрибутива"
 
-#: ../edit-urpm-sources.pl:86
+#: ../edit-urpm-sources.pl:89
 msgid "Official updates"
 msgstr "Официальные обновления"
 
-#: ../edit-urpm-sources.pl:89
+#: ../edit-urpm-sources.pl:92
 #, perl-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
@@ -78,84 +78,85 @@ msgstr ""
 "\n"
 "Всё в порядке? Можно продолжать?"
 
-#: ../edit-urpm-sources.pl:99
+#: ../edit-urpm-sources.pl:102
 msgid "Please wait, adding media..."
 msgstr "Подождите, пожалуйста, добавляется источник..."
 
-#: ../edit-urpm-sources.pl:131
+#: ../edit-urpm-sources.pl:134
 msgid "Add a medium"
 msgstr "Добавить источник"
 
-#: ../edit-urpm-sources.pl:133
+#: ../edit-urpm-sources.pl:136
 msgid "Local files"
 msgstr "Локальные файлы"
 
-#: ../edit-urpm-sources.pl:133
+#: ../edit-urpm-sources.pl:136
 msgid "Path:"
 msgstr "Путь:"
 
-#: ../edit-urpm-sources.pl:134
+#: ../edit-urpm-sources.pl:137
 msgid "FTP server"
 msgstr "Сервер FTP"
 
-#: ../edit-urpm-sources.pl:134 ../edit-urpm-sources.pl:135
-#: ../edit-urpm-sources.pl:136 ../edit-urpm-sources.pl:404
+#: ../edit-urpm-sources.pl:137 ../edit-urpm-sources.pl:138
+#: ../edit-urpm-sources.pl:139 ../edit-urpm-sources.pl:407
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:135
+#: ../edit-urpm-sources.pl:138
 msgid "RSYNC server"
 msgstr "Сервер RSYNC"
 
-#: ../edit-urpm-sources.pl:136
+#: ../edit-urpm-sources.pl:139
 msgid "HTTP server"
 msgstr "Сервер HTTP"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:140
 msgid "Path or mount point:"
 msgstr "Путь или точка монтирования:"
 
-#: ../edit-urpm-sources.pl:137
+#: ../edit-urpm-sources.pl:140
 msgid "Removable device"
 msgstr "Съемное устройство"
 
-#: ../edit-urpm-sources.pl:156
+#: ../edit-urpm-sources.pl:159
 msgid "Browse..."
 msgstr "Найти..."
 
-#: ../edit-urpm-sources.pl:184
+#: ../edit-urpm-sources.pl:187
 msgid "Login:"
 msgstr "Логин:"
 
-#: ../edit-urpm-sources.pl:184 ../edit-urpm-sources.pl:480 ../rpmdrake.pm:130
+#: ../edit-urpm-sources.pl:187 ../edit-urpm-sources.pl:487 ../rpmdrake.pm:130
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../edit-urpm-sources.pl:189 ../edit-urpm-sources.pl:405
+#: ../edit-urpm-sources.pl:192 ../edit-urpm-sources.pl:408
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Относительный путь к synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:191
+#: ../edit-urpm-sources.pl:194
 msgid "If left blank, synthesis/hdlist will be automatically probed"
-msgstr "Если ничего не указывать, synthesis/hdlist будет исследован автоматически"
+msgstr ""
+"Если ничего не указывать, synthesis/hdlist будет исследован автоматически"
 
-#: ../edit-urpm-sources.pl:196
+#: ../edit-urpm-sources.pl:199
 msgid "Name:"
 msgstr "Имя:"
 
-#: ../edit-urpm-sources.pl:204
+#: ../edit-urpm-sources.pl:207
 msgid "Create media for a whole distribution"
 msgstr "Создать источник для всего дистрибутива"
 
-#: ../edit-urpm-sources.pl:215
+#: ../edit-urpm-sources.pl:218
 msgid "Search this media for updates"
 msgstr "Искать обновления в этом источнике"
 
-#: ../edit-urpm-sources.pl:225
+#: ../edit-urpm-sources.pl:228
 msgid "You need to fill up at least the two first entries."
 msgstr "Вам необходимо заполнить по крайней мере два первых пункта."
 
-#: ../edit-urpm-sources.pl:229
+#: ../edit-urpm-sources.pl:232
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
@@ -163,108 +164,109 @@ msgstr ""
 "Источник с таким названием уже существует,\n"
 "вы действительно хотите его заменить?"
 
-#: ../edit-urpm-sources.pl:240
+#: ../edit-urpm-sources.pl:243
 msgid "Adding a medium:"
 msgstr "Добавляется источник:"
 
-#: ../edit-urpm-sources.pl:242
+#: ../edit-urpm-sources.pl:245
 msgid "Type of medium:"
 msgstr "Тип источника:"
 
-#: ../edit-urpm-sources.pl:250 ../edit-urpm-sources.pl:325
-#: ../edit-urpm-sources.pl:411 ../edit-urpm-sources.pl:436
-#: ../edit-urpm-sources.pl:497 ../edit-urpm-sources.pl:578
-#: ../edit-urpm-sources.pl:618 ../edit-urpm-sources.pl:676
-#: ../edit-urpm-sources.pl:815 ../rpmdrake:191 ../rpmdrake:819
-#: ../rpmdrake:1715 ../rpmdrake:1723 ../rpmdrake.pm:284 ../rpmdrake.pm:597
+#: ../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
 msgid "Cancel"
 msgstr "Отмена"
 
-#: ../edit-urpm-sources.pl:252 ../edit-urpm-sources.pl:327
-#: ../edit-urpm-sources.pl:436 ../edit-urpm-sources.pl:487
-#: ../edit-urpm-sources.pl:575 ../edit-urpm-sources.pl:617
-#: ../edit-urpm-sources.pl:669 ../edit-urpm-sources.pl:741
-#: ../edit-urpm-sources.pl:808 ../edit-urpm-sources.pl:861
-#: ../edit-urpm-sources.pl:1010 ../rpmdrake:191 ../rpmdrake:819
-#: ../rpmdrake:836 ../rpmdrake:841 ../rpmdrake:1646 ../rpmdrake:1715
-#: ../rpmdrake:1866 ../rpmdrake.pm:121 ../rpmdrake.pm:226 ../rpmdrake.pm:286
+#: ../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
 msgid "Ok"
 msgstr "ОК"
 
-#: ../edit-urpm-sources.pl:309
+#: ../edit-urpm-sources.pl:312
 msgid "Global options for package installation"
 msgstr "Глобальные параметры для установки пакета"
 
-#: ../edit-urpm-sources.pl:311
+#: ../edit-urpm-sources.pl:314
 msgid "always"
 msgstr "всегда"
 
-#: ../edit-urpm-sources.pl:312
+#: ../edit-urpm-sources.pl:315
 msgid "never"
 msgstr "никогда"
 
-#: ../edit-urpm-sources.pl:321
+#: ../edit-urpm-sources.pl:324
 msgid "Verify RPMs to be installed:"
 msgstr "Проверять устанавливаемые RPM'ы:"
 
-#: ../edit-urpm-sources.pl:322
+#: ../edit-urpm-sources.pl:325
 msgid "Download program to use:"
 msgstr "Используемая программа загрузки:"
 
-#: ../edit-urpm-sources.pl:352
+#: ../edit-urpm-sources.pl:355
 msgid "Source Removal"
 msgstr "Удаление источников"
 
-#: ../edit-urpm-sources.pl:353
+#: ../edit-urpm-sources.pl:356
 #, perl-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Вы действительно хотите удалить источник \"%s\"?"
 
-#: ../edit-urpm-sources.pl:358
+#: ../edit-urpm-sources.pl:361
 msgid "Please wait, removing medium..."
 msgstr "Пожалуйста, подождите, удаляется источник..."
 
-#: ../edit-urpm-sources.pl:395
+#: ../edit-urpm-sources.pl:398
 msgid "Edit a medium"
 msgstr "Редактировать источник"
 
-#: ../edit-urpm-sources.pl:401
+#: ../edit-urpm-sources.pl:404
 #, perl-format
 msgid "Editing medium \"%s\":"
 msgstr "Редактирование источника \"%s\":"
 
-#: ../edit-urpm-sources.pl:415
+#: ../edit-urpm-sources.pl:418
 msgid "Save changes"
 msgstr "Сохранить изменения"
 
-#: ../edit-urpm-sources.pl:423 ../edit-urpm-sources.pl:997
+#: ../edit-urpm-sources.pl:426 ../edit-urpm-sources.pl:1005
 msgid "Proxy..."
 msgstr "Прокси..."
 
-#: ../edit-urpm-sources.pl:434
+#: ../edit-urpm-sources.pl:437
 msgid "You need to insert the medium to continue"
 msgstr "Вам необходимо вставить носитель для продолжения"
 
-#: ../edit-urpm-sources.pl:435
-msgid "In order to save the changes, you need to insert the medium in the drive."
+#: ../edit-urpm-sources.pl:438
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
 msgstr "Чтобы сохранить изменения, вам необходимо вставить носитель в привод."
 
-#: ../edit-urpm-sources.pl:456
+#: ../edit-urpm-sources.pl:459
 msgid "Configure proxies"
 msgstr "Настроить прокси"
 
-#: ../edit-urpm-sources.pl:466
+#: ../edit-urpm-sources.pl:470
 #, perl-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Настройки proxy для носителя \"%s\""
 
-#: ../edit-urpm-sources.pl:467
+#: ../edit-urpm-sources.pl:471
 msgid "Global proxy settings"
 msgstr "Общие настройки proxy"
 
-#: ../edit-urpm-sources.pl:469
+#: ../edit-urpm-sources.pl:473
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
@@ -272,137 +274,137 @@ msgstr ""
 "Если вам нужен прокси, введите имя хоста и, при необходимости, порт "
 "(синтаксис: <хост_прокси[:порт]>):"
 
-#: ../edit-urpm-sources.pl:472
+#: ../edit-urpm-sources.pl:476
 msgid "Proxy hostname:"
 msgstr "Имя хоста прокси:"
 
-#: ../edit-urpm-sources.pl:475
+#: ../edit-urpm-sources.pl:479
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Вы можете указать пользователя/пароль для аутентификации на прокси:"
 
-#: ../edit-urpm-sources.pl:478
+#: ../edit-urpm-sources.pl:482
 msgid "User:"
 msgstr "Пользователь:"
 
-#: ../edit-urpm-sources.pl:546
+#: ../edit-urpm-sources.pl:554
 msgid "Add a parallel group"
 msgstr "Добавить параллельную группу"
 
-#: ../edit-urpm-sources.pl:546
+#: ../edit-urpm-sources.pl:554
 msgid "Edit a parallel group"
 msgstr "Редактировать параллельную группу"
 
-#: ../edit-urpm-sources.pl:557
+#: ../edit-urpm-sources.pl:565
 msgid "Add a medium limit"
 msgstr "Добавить предел источника"
 
-#: ../edit-urpm-sources.pl:569
+#: ../edit-urpm-sources.pl:577
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Выберите источник для установки его предела:"
 
-#: ../edit-urpm-sources.pl:606
+#: ../edit-urpm-sources.pl:614
 msgid "Add a host"
 msgstr "Добавить хост"
 
-#: ../edit-urpm-sources.pl:612
+#: ../edit-urpm-sources.pl:620
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Введите имя добавляемого хоста или его IP-адрес:"
 
-#: ../edit-urpm-sources.pl:643
+#: ../edit-urpm-sources.pl:651
 #, perl-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Редактирование параллельной группы \"%s\":"
 
-#: ../edit-urpm-sources.pl:647
+#: ../edit-urpm-sources.pl:655
 msgid "Group name:"
 msgstr "Имя группы:"
 
-#: ../edit-urpm-sources.pl:648
+#: ../edit-urpm-sources.pl:656
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: ../edit-urpm-sources.pl:650
+#: ../edit-urpm-sources.pl:658
 msgid "Media limit:"
 msgstr "Предел источника:"
 
-#: ../edit-urpm-sources.pl:655 ../edit-urpm-sources.pl:662
+#: ../edit-urpm-sources.pl:663 ../edit-urpm-sources.pl:670
 msgid "Add"
 msgstr "Добавить"
 
-#: ../edit-urpm-sources.pl:656 ../edit-urpm-sources.pl:663
-#: ../edit-urpm-sources.pl:721 ../edit-urpm-sources.pl:975
+#: ../edit-urpm-sources.pl:664 ../edit-urpm-sources.pl:671
+#: ../edit-urpm-sources.pl:729 ../edit-urpm-sources.pl:983
 msgid "Remove"
 msgstr "Удалить"
 
-#: ../edit-urpm-sources.pl:657
+#: ../edit-urpm-sources.pl:665
 msgid "Hosts:"
 msgstr "Хосты:"
 
-#: ../edit-urpm-sources.pl:691
+#: ../edit-urpm-sources.pl:699
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Настроить параллельный urpmi (распределенное выполнение urpmi)"
 
-#: ../edit-urpm-sources.pl:694
+#: ../edit-urpm-sources.pl:702
 msgid "Group"
 msgstr "Группа"
 
-#: ../edit-urpm-sources.pl:694
+#: ../edit-urpm-sources.pl:702
 msgid "Media limit"
 msgstr "Предел источника"
 
-#: ../edit-urpm-sources.pl:694
+#: ../edit-urpm-sources.pl:702
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../edit-urpm-sources.pl:695
+#: ../edit-urpm-sources.pl:703
 msgid "Command"
 msgstr "Команда"
 
-#: ../edit-urpm-sources.pl:705 ../rpmdrake:399 ../rpmdrake:423 ../rpmdrake:562
-#: ../rpmdrake:745
+#: ../edit-urpm-sources.pl:713 ../rpmdrake:413 ../rpmdrake:437 ../rpmdrake:576
+#: ../rpmdrake:775
 msgid "(none)"
 msgstr "(нет)"
 
-#: ../edit-urpm-sources.pl:725 ../edit-urpm-sources.pl:979
+#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:987
 msgid "Edit..."
 msgstr "Редактировать"
 
-#: ../edit-urpm-sources.pl:733 ../edit-urpm-sources.pl:985
+#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:993
 msgid "Add..."
 msgstr "Добавить..."
 
-#: ../edit-urpm-sources.pl:749
+#: ../edit-urpm-sources.pl:757
 msgid "Manage keys for digital signatures of packages"
 msgstr "Управление ключами для цифровых подписей пакетов"
 
-#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:910
+#: ../edit-urpm-sources.pl:761 ../edit-urpm-sources.pl:918
 msgid "Medium"
 msgstr "Источник"
 
-#: ../edit-urpm-sources.pl:758
+#: ../edit-urpm-sources.pl:766
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Ключи"
 
-#: ../edit-urpm-sources.pl:777
+#: ../edit-urpm-sources.pl:785
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "имя не найдено, ключ отсутствует в rpm keyring!"
 
-#: ../edit-urpm-sources.pl:790
+#: ../edit-urpm-sources.pl:798
 msgid "Add a key"
 msgstr "Добавить ключ"
 
-#: ../edit-urpm-sources.pl:802
+#: ../edit-urpm-sources.pl:810
 #, perl-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Выберите ключ для добавления к источнику %s"
 
-#: ../edit-urpm-sources.pl:830
+#: ../edit-urpm-sources.pl:838
 msgid "Remove a key"
 msgstr "Удалить ключ"
 
-#: ../edit-urpm-sources.pl:831
+#: ../edit-urpm-sources.pl:839
 #, perl-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
@@ -411,33 +413,33 @@ msgstr ""
 "Вы действительно хотите удалить ключ %s из источника %s?\n"
 "(имя ключа: %s)"
 
-#: ../edit-urpm-sources.pl:849
+#: ../edit-urpm-sources.pl:857
 msgid "Add a key..."
 msgstr "Добавить ключ"
 
-#: ../edit-urpm-sources.pl:853
+#: ../edit-urpm-sources.pl:861
 msgid "Remove key"
 msgstr "Удалить ключ"
 
-#: ../edit-urpm-sources.pl:869
+#: ../edit-urpm-sources.pl:877
 msgid "Configure media"
 msgstr "Настроить источник"
 
-#: ../edit-urpm-sources.pl:908
+#: ../edit-urpm-sources.pl:916
 msgid "Enabled?"
 msgstr "Включен?"
 
-#: ../edit-urpm-sources.pl:909
+#: ../edit-urpm-sources.pl:917
 msgid "Updates?"
 msgstr "Обновления?"
 
-#: ../edit-urpm-sources.pl:925
+#: ../edit-urpm-sources.pl:933
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr ""
 "Этот источник необходимо обновить, чтобы его можно было использовать. "
 "Обновить его сейчас?"
 
-#: ../edit-urpm-sources.pl:955
+#: ../edit-urpm-sources.pl:963
 #, perl-format
 msgid ""
 "Unable to update medium, errors reported:\n"
@@ -448,31 +450,31 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:989
+#: ../edit-urpm-sources.pl:997
 msgid "Add custom..."
 msgstr "Добавить пользовательский..."
 
-#: ../edit-urpm-sources.pl:993
+#: ../edit-urpm-sources.pl:1001
 msgid "Update..."
 msgstr "Обновить..."
 
-#: ../edit-urpm-sources.pl:996
+#: ../edit-urpm-sources.pl:1004
 msgid "Manage keys..."
 msgstr "Управление ключами..."
 
-#: ../edit-urpm-sources.pl:998
+#: ../edit-urpm-sources.pl:1006
 msgid "Parallel..."
 msgstr "Распараллеливание..."
 
-#: ../edit-urpm-sources.pl:999
+#: ../edit-urpm-sources.pl:1007
 msgid "Global options..."
 msgstr "Глобальные параметры..."
 
-#: ../edit-urpm-sources.pl:1009 ../rpmdrake:1274
+#: ../edit-urpm-sources.pl:1017 ../rpmdrake:1290
 msgid "Help"
 msgstr "Справка"
 
-#: ../edit-urpm-sources.pl:1022 ../gurpmi.addmedia:97 ../rpmdrake:1941
+#: ../edit-urpm-sources.pl:1030 ../gurpmi.addmedia:97 ../rpmdrake:1978
 #, perl-format
 msgid ""
 "%s\n"
@@ -483,7 +485,7 @@ msgstr ""
 "\n"
 "Всё в порядке? Можно продолжать?"
 
-#: ../edit-urpm-sources.pl:1025
+#: ../edit-urpm-sources.pl:1033
 msgid ""
 "Welcome to the Software Media Manager!\n"
 "\n"
@@ -498,7 +500,7 @@ msgstr ""
 "они будут доступны для установки пакетов новых программ или\n"
 "для выполнения обновлений."
 
-#: ../edit-urpm-sources.pl:1037
+#: ../edit-urpm-sources.pl:1045
 msgid ""
 "Packages database is locked. Please close other applications\n"
 "working with packages database (do you have another media\n"
@@ -564,8 +566,10 @@ msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=источник1,..   ограничиться указанными источниками"
 
 #: ../rpmdrake:41
-msgid "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
-msgstr "  --merge-all-rpmnew     объединить все найденные файлы .rpmnew/.rpmsave"
+msgid ""
+"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+msgstr ""
+"  --merge-all-rpmnew     объединить все найденные файлы .rpmnew/.rpmsave"
 
 #: ../rpmdrake:42
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
@@ -574,7 +578,8 @@ msgstr ""
 "update)"
 
 #: ../rpmdrake:43
-msgid "  --no-confirmation      don't ask first confirmation question in update mode"
+msgid ""
+"  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr ""
 "  --no-confirmation      не выводить первый запрос на подтверждение в режиме "
 "update"
@@ -647,8 +652,8 @@ msgid "Compression"
 msgstr "Сжатие"
 
 #: ../rpmdrake:202 ../rpmdrake:208 ../rpmdrake:222 ../rpmdrake:235
-#: ../rpmdrake:245 ../rpmdrake:260 ../rpmdrake:273 ../rpmdrake:283
-#: ../rpmdrake:368
+#: ../rpmdrake:253 ../rpmdrake:274 ../rpmdrake:287 ../rpmdrake:297
+#: ../rpmdrake:383
 msgid "Other"
 msgstr "Другое"
 
@@ -785,9 +790,9 @@ msgstr "Спортивные"
 msgid "Strategy"
 msgstr "Стратегии"
 
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:243 ../rpmdrake:244 ../rpmdrake:245 ../rpmdrake:246
-#: ../rpmdrake:247 ../rpmdrake:248
+#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:243 ../rpmdrake:244
+#: ../rpmdrake:247 ../rpmdrake:250 ../rpmdrake:253 ../rpmdrake:254
+#: ../rpmdrake:257 ../rpmdrake:260
 msgid "Graphical desktop"
 msgstr "Графический рабочий стол"
 
@@ -796,7 +801,7 @@ msgstr "Графический рабочий стол"
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:241
+#: ../rpmdrake:243
 msgid "FVWM based"
 msgstr "На основе FVWM"
 
@@ -820,337 +825,349 @@ msgstr "KDE"
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:247
+#. -PO: This is a package/product name. Only translate it if needed:
+#: ../rpmdrake:259
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:260
+#: ../rpmdrake:262
 msgid "Xfce"
 msgstr "Xfce"
 
-#: ../rpmdrake:249
+#: ../rpmdrake:263
 msgid "Graphics"
 msgstr "Графика"
 
-#: ../rpmdrake:250
+#: ../rpmdrake:264
 msgid "Monitoring"
 msgstr "Мониторинг"
 
-#: ../rpmdrake:251 ../rpmdrake:252
+#: ../rpmdrake:265 ../rpmdrake:266
 msgid "Multimedia"
 msgstr "Мультимедиа"
 
-#: ../rpmdrake:252 ../rpmdrake:301
+#: ../rpmdrake:266 ../rpmdrake:317
 msgid "Video"
 msgstr "Видео"
 
-#: ../rpmdrake:253 ../rpmdrake:254 ../rpmdrake:255 ../rpmdrake:256
-#: ../rpmdrake:257 ../rpmdrake:258 ../rpmdrake:259 ../rpmdrake:260
-#: ../rpmdrake:261 ../rpmdrake:262 ../rpmdrake:282
+#: ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269 ../rpmdrake:270
+#: ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273 ../rpmdrake:274
+#: ../rpmdrake:275 ../rpmdrake:276 ../rpmdrake:296
 msgid "Networking"
 msgstr "Сеть"
 
-#: ../rpmdrake:254
+#: ../rpmdrake:268
 msgid "Chat"
 msgstr "Чат"
 
-#: ../rpmdrake:255
+#: ../rpmdrake:269
 msgid "File transfer"
 msgstr "Передача файла"
 
-#: ../rpmdrake:256
+#: ../rpmdrake:270
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:257
+#: ../rpmdrake:271
 msgid "Instant messaging"
 msgstr "Обмен мгновенными сообщениями"
 
-#: ../rpmdrake:258
+#: ../rpmdrake:272
 msgid "Mail"
 msgstr "Почта"
 
-#: ../rpmdrake:259
+#: ../rpmdrake:273
 msgid "News"
 msgstr "Новости"
 
-#: ../rpmdrake:261
+#: ../rpmdrake:275
 msgid "Remote access"
 msgstr "Удаленный доступ"
 
-#: ../rpmdrake:262
+#: ../rpmdrake:276
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:263
+#: ../rpmdrake:277
 msgid "Office"
 msgstr "Офис"
 
-#: ../rpmdrake:264
+#: ../rpmdrake:278
 msgid "Public Keys"
 msgstr "Публичные ключи"
 
-#: ../rpmdrake:265
+#: ../rpmdrake:279
 msgid "Publishing"
 msgstr "Издательство"
 
-#: ../rpmdrake:266 ../rpmdrake:267 ../rpmdrake:268 ../rpmdrake:269
-#: ../rpmdrake:270 ../rpmdrake:271 ../rpmdrake:272 ../rpmdrake:273
-#: ../rpmdrake:274
+#: ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283
+#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
+#: ../rpmdrake:288
 msgid "Sciences"
 msgstr "Наука"
 
-#: ../rpmdrake:267
+#: ../rpmdrake:281
 msgid "Astronomy"
 msgstr "Астрономия"
 
-#: ../rpmdrake:268
+#: ../rpmdrake:282
 msgid "Biology"
 msgstr "Биология"
 
-#: ../rpmdrake:269
+#: ../rpmdrake:283
 msgid "Chemistry"
 msgstr "Химия"
 
-#: ../rpmdrake:270
+#: ../rpmdrake:284
 msgid "Computer science"
 msgstr "Компьютерная наука"
 
-#: ../rpmdrake:271
+#: ../rpmdrake:285
 msgid "Geosciences"
 msgstr "География"
 
-#: ../rpmdrake:272
+#: ../rpmdrake:286
 msgid "Mathematics"
 msgstr "Математика"
 
-#: ../rpmdrake:274
+#: ../rpmdrake:288
 msgid "Physics"
 msgstr "Физика"
 
-#: ../rpmdrake:275
+#: ../rpmdrake:289
 msgid "Shells"
 msgstr "Командные процессоры (Shells)"
 
-#: ../rpmdrake:276
+#: ../rpmdrake:290
 msgid "Sound"
 msgstr "Звук"
 
-#: ../rpmdrake:277 ../rpmdrake:278 ../rpmdrake:279 ../rpmdrake:280
-#: ../rpmdrake:281 ../rpmdrake:282 ../rpmdrake:283 ../rpmdrake:284
-#: ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287 ../rpmdrake:288
-#: ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291 ../rpmdrake:292
-#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
-#: ../rpmdrake:297
+#: ../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
 msgid "System"
 msgstr "Система"
 
-#: ../rpmdrake:278
+#: ../rpmdrake:292
 msgid "Base"
 msgstr "Стандартные"
 
-#: ../rpmdrake:279 ../rpmdrake:280 ../rpmdrake:281 ../rpmdrake:282
-#: ../rpmdrake:283 ../rpmdrake:284 ../rpmdrake:285
+#: ../rpmdrake:293 ../rpmdrake:294 ../rpmdrake:295 ../rpmdrake:296
+#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299
 msgid "Configuration"
 msgstr "Настройка"
 
-#: ../rpmdrake:280
+#: ../rpmdrake:294
 msgid "Boot and Init"
 msgstr "Загрузка и инициализация"
 
-#: ../rpmdrake:281
+#: ../rpmdrake:295
 msgid "Hardware"
 msgstr "Оборудование"
 
-#: ../rpmdrake:284
+#: ../rpmdrake:298
 msgid "Packaging"
 msgstr "Пакеты"
 
-#: ../rpmdrake:285
+#: ../rpmdrake:299
 msgid "Printing"
 msgstr "Печать"
 
-#: ../rpmdrake:286
+#: ../rpmdrake:300
 msgid "Deploiement"
 msgstr "Развертывание"
 
-#: ../rpmdrake:287
+#: ../rpmdrake:301
 msgid "Deployment"
 msgstr "Развертывание"
 
-#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
-#: ../rpmdrake:292
+#: ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304 ../rpmdrake:305
+#: ../rpmdrake:306
 msgid "Fonts"
 msgstr "Шрифты"
 
-#: ../rpmdrake:289
+#: ../rpmdrake:303
 msgid "Console"
 msgstr "Консоль"
 
-#: ../rpmdrake:290
+#: ../rpmdrake:304
 msgid "True type"
 msgstr "True type"
 
-#: ../rpmdrake:291
+#: ../rpmdrake:305
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:292
+#: ../rpmdrake:306
 msgid "X11 bitmap"
 msgstr "X11 bitmap"
 
-#: ../rpmdrake:293
+#: ../rpmdrake:307
 msgid "Internationalization"
 msgstr "Локализация"
 
-#: ../rpmdrake:294
+#: ../rpmdrake:308
 msgid "Kernel and hardware"
 msgstr "Ядро и оборудование"
 
-#: ../rpmdrake:295
+#: ../rpmdrake:309
 msgid "Libraries"
 msgstr "Библиотеки"
 
-#: ../rpmdrake:296
+#: ../rpmdrake:310
 msgid "Servers"
 msgstr "Серверы"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:311
+#: ../rpmdrake:313
 msgid "X11"
 msgstr "X11"
 
-#: ../rpmdrake:298
+#: ../rpmdrake:314
 msgid "Terminals"
 msgstr "Терминалы"
 
-#: ../rpmdrake:299
+#: ../rpmdrake:315
 msgid "Text tools"
 msgstr "Текстовые утилиты"
 
-#: ../rpmdrake:300
+#: ../rpmdrake:316
 msgid "Toys"
 msgstr "Игрушки"
 
 #. - to highlight information
-#: ../rpmdrake:429 ../rpmdrake:603 ../rpmdrake:605
+#: ../rpmdrake:443 ../rpmdrake:614 ../rpmdrake:619 ../rpmdrake:633
+#: ../rpmdrake:635
 msgid "(Not available)"
 msgstr "(Недоступен)"
 
-#: ../rpmdrake:461
+#: ../rpmdrake:475
 msgid "Search results"
 msgstr "Результаты поиска"
 
-#: ../rpmdrake:461
+#: ../rpmdrake:475
 msgid "Search results (none)"
 msgstr "Результаты поиска (нет)"
 
-#: ../rpmdrake:472
+#: ../rpmdrake:486
 msgid "Please wait, searching..."
 msgstr "Пожалуйста, подождите, выполняется поиск..."
 
-#: ../rpmdrake:544 ../rpmdrake:780
+#: ../rpmdrake:558 ../rpmdrake:810
 msgid "Addable"
 msgstr "Можно добавить"
 
-#: ../rpmdrake:544 ../rpmdrake:780
+#: ../rpmdrake:558 ../rpmdrake:810
 msgid "Upgradable"
 msgstr "Можно обновить"
 
-#: ../rpmdrake:546
+#: ../rpmdrake:560
 msgid "Not selected"
 msgstr "Не выбрано"
 
-#: ../rpmdrake:546
+#: ../rpmdrake:560
 msgid "Selected"
 msgstr "Выбранные"
 
-#: ../rpmdrake:588 ../rpmdrake:621
+#: ../rpmdrake:602 ../rpmdrake:651
 msgid "Importance: "
 msgstr "Важность: "
 
-#: ../rpmdrake:589 ../rpmdrake:629
+#: ../rpmdrake:603 ../rpmdrake:659
 msgid "Reason for update: "
 msgstr "Причина обновления:"
 
 #. extra empty line
-#: ../rpmdrake:592 ../rpmdrake:631
+#: ../rpmdrake:606 ../rpmdrake:661
 msgid "No description"
 msgstr "Без описания"
 
-#: ../rpmdrake:600
+#: ../rpmdrake:609
 msgid "Files:"
 msgstr "Файлы:"
 
-#: ../rpmdrake:605
+#: ../rpmdrake:618
 msgid "Changelog:"
 msgstr "Changelog:"
 
-#: ../rpmdrake:610
+#: ../rpmdrake:630
+#, fuzzy
+msgid "Files:\n"
+msgstr "Файлы:"
+
+#: ../rpmdrake:635
+#, fuzzy
+msgid "Changelog:\n"
+msgstr "Changelog:"
+
+#: ../rpmdrake:640
 msgid "Medium: "
 msgstr "Источник:"
 
-#: ../rpmdrake:611
+#: ../rpmdrake:641
 msgid "Currently installed version: "
 msgstr "Установленная версия:"
 
-#: ../rpmdrake:615
+#: ../rpmdrake:645
 msgid "Name: "
 msgstr "Название: "
 
-#: ../rpmdrake:616
+#: ../rpmdrake:646
 msgid "Version: "
 msgstr "Версия: "
 
-#: ../rpmdrake:617
+#: ../rpmdrake:647
 msgid "Architecture: "
 msgstr "Архитектура: "
 
-#: ../rpmdrake:618
+#: ../rpmdrake:648
 #, perl-format
 msgid "%s KB"
 msgstr "%s КБ"
 
-#: ../rpmdrake:618
+#: ../rpmdrake:648
 msgid "Size: "
 msgstr "Размер: "
 
 #. extra empty line
-#: ../rpmdrake:625
+#: ../rpmdrake:655
 msgid "Summary: "
 msgstr "Сводка: "
 
-#: ../rpmdrake:631
+#: ../rpmdrake:661
 msgid "Description: "
 msgstr "Описание:"
 
-#: ../rpmdrake:668 ../rpmdrake.pm:178
+#: ../rpmdrake:698 ../rpmdrake.pm:178
 msgid "Software Management"
 msgstr "Управление программами"
 
 #. - TODO change those labels to something more sensible, e.g. "Upgrade information about this package"
-#: ../rpmdrake:685 ../rpmdrake:832 ../rpmdrake:834 ../rpmdrake:1856
+#: ../rpmdrake:715 ../rpmdrake:862 ../rpmdrake:864 ../rpmdrake:1893
 msgid "More information on package..."
 msgstr "Дополнительная информация о пакете..."
 
-#: ../rpmdrake:687
+#: ../rpmdrake:717
 msgid "One of the following packages is needed:"
 msgstr "Нужен один из следующих пакетов:"
 
-#: ../rpmdrake:687
+#: ../rpmdrake:717
 msgid "Please choose"
 msgstr "Пожалуйста, выберите"
 
-#: ../rpmdrake:729
+#: ../rpmdrake:759
 msgid "Please wait, listing packages..."
 msgstr "Пожалуйста, подождите, составляется список пакетов..."
 
-#: ../rpmdrake:747
+#: ../rpmdrake:777
 msgid "No update"
 msgstr "Обновлений нет"
 
-#: ../rpmdrake:748
+#: ../rpmdrake:778
 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"
@@ -1160,35 +1177,35 @@ msgstr ""
 "пакетов, установленных на вашем компьютере, либо они уже все\n"
 "установлены."
 
-#: ../rpmdrake:771 ../rpmdrake:1027
+#: ../rpmdrake:801 ../rpmdrake:1057
 msgid "All"
 msgstr "Все"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:819 ../rpmdrake:824
+#: ../rpmdrake:849 ../rpmdrake:854
 msgid "More info"
 msgstr "Дополнительно"
 
-#: ../rpmdrake:827 ../rpmdrake:1845
+#: ../rpmdrake:857 ../rpmdrake:1882
 msgid "Information on packages"
 msgstr "Информация о пакетах"
 
-#: ../rpmdrake:849
+#: ../rpmdrake:879
 msgid "Some additional packages need to be removed"
 msgstr "Некоторые дополнительные пакеты должны быть удалены"
 
-#: ../rpmdrake:850
+#: ../rpmdrake:880
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:"
 msgstr ""
 "По причине своих зависимостей, следующие пакеты также должны быть удалены "
 
-#: ../rpmdrake:856 ../rpmdrake:865
+#: ../rpmdrake:886 ../rpmdrake:895
 msgid "Some packages can't be removed"
 msgstr "Некоторые пакеты не могут быть удалены"
 
-#: ../rpmdrake:857
+#: ../rpmdrake:887
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1196,7 +1213,7 @@ msgstr ""
 "К сожалению удаление этих пакетов нарушит работу системы:\n"
 "\n"
 
-#: ../rpmdrake:866 ../rpmdrake:931
+#: ../rpmdrake:896 ../rpmdrake:961
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -1206,11 +1223,11 @@ msgstr ""
 "должен быть отменен:\n"
 "\n"
 
-#: ../rpmdrake:895
+#: ../rpmdrake:925
 msgid "Additional packages needed"
 msgstr "Требуются дополнительные пакеты"
 
-#: ../rpmdrake:896
+#: ../rpmdrake:926
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -1220,16 +1237,16 @@ msgstr ""
 "следующие пакеты:\n"
 "\n"
 
-#: ../rpmdrake:911
+#: ../rpmdrake:941
 #, perl-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (принадлежит списку пропущенных)"
 
-#: ../rpmdrake:914
+#: ../rpmdrake:944
 msgid "Some packages can't be installed"
 msgstr "Некоторые пакеты не могут быть установлены"
 
-#: ../rpmdrake:915
+#: ../rpmdrake:945
 #, perl-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1240,104 +1257,104 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:930 ../rpmdrake:1140
+#: ../rpmdrake:960 ../rpmdrake:1729
 msgid "Some packages need to be removed"
 msgstr "Некоторые пакеты должны быть удалены"
 
-#: ../rpmdrake:955
+#: ../rpmdrake:985
 #, perl-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Выбрано: %s МБ / Свободно на диске: %d МБ"
 
-#: ../rpmdrake:956
+#: ../rpmdrake:986
 #, perl-format
 msgid "Selected size: %d MB"
 msgstr "Выбранный размер: %d МБ"
 
 #. - the package information hasn't been loaded. Instead of rescanning the media, just give up.
-#: ../rpmdrake:961
+#: ../rpmdrake:991
 msgid "Description not available for this package\n"
 msgstr "К данному пакету нет описания\n"
 
-#: ../rpmdrake:1027
+#: ../rpmdrake:1057
 msgid "Installed"
 msgstr "Установлен"
 
-#: ../rpmdrake:1027
+#: ../rpmdrake:1057
 msgid "Non installed"
 msgstr "Не установлен"
 
-#: ../rpmdrake:1028
+#: ../rpmdrake:1058
 #, perl-format
 msgid "%s choices"
 msgstr "Выбор %s"
 
-#: ../rpmdrake:1028
+#: ../rpmdrake:1058
 msgid "Mandriva Linux choices"
 msgstr "Выбор Mandriva Linux"
 
 #. let's keep the translated strings (to be resurected as sorting the treeview):
-#: ../rpmdrake:1030
+#: ../rpmdrake:1060
 msgid "All packages, alphabetical"
 msgstr "Все пакеты, по алфавиту"
 
-#: ../rpmdrake:1031
+#: ../rpmdrake:1061
 msgid "All packages, by update availability"
 msgstr "Все пакеты, по доступности обновлений"
 
-#: ../rpmdrake:1032
+#: ../rpmdrake:1062
 msgid "All packages, by size"
 msgstr "Все пакеты, по размеру"
 
-#: ../rpmdrake:1033
+#: ../rpmdrake:1063
 msgid "All packages, by selection state"
 msgstr "Все пакеты, по состоянию выбора"
 
-#: ../rpmdrake:1034
+#: ../rpmdrake:1064
 msgid "Leaves only, sorted by install date"
 msgstr "Только остатки, отсортированные по дате установки"
 
-#: ../rpmdrake:1035
+#: ../rpmdrake:1065
 msgid "All packages, by group"
 msgstr "Все пакеты, по группе"
 
-#: ../rpmdrake:1037
+#: ../rpmdrake:1067
 msgid "All updates"
 msgstr "Все обновления"
 
-#: ../rpmdrake:1037
+#: ../rpmdrake:1067
 msgid "Bugfixes updates"
 msgstr "Баг-фиксы"
 
-#: ../rpmdrake:1037
+#: ../rpmdrake:1067
 msgid "Normal updates"
 msgstr "Нормальные обновления"
 
-#: ../rpmdrake:1037
+#: ../rpmdrake:1067
 msgid "Security updates"
 msgstr "Обновления по безопасности"
 
-#: ../rpmdrake:1092
+#: ../rpmdrake:1123
 msgid "in names"
 msgstr "в именах"
 
-#: ../rpmdrake:1094
+#: ../rpmdrake:1125
 msgid "in descriptions"
 msgstr "в описаниях"
 
-#: ../rpmdrake:1096
+#: ../rpmdrake:1127
 msgid "in file names"
 msgstr "в именах файлов"
 
-#: ../rpmdrake:1122
+#: ../rpmdrake:1153
 msgid "You need to select some packages first."
 msgstr "Вы должны сначала выбрать какие-либо пакеты."
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1158
 msgid "Too many packages are selected"
 msgstr "Выбрано слишком много пакетов"
 
-#: ../rpmdrake:1128
+#: ../rpmdrake:1159
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -1353,147 +1370,134 @@ msgstr ""
 "\n"
 "Вы действительно хотите установить все выбранные пакеты?"
 
-#: ../rpmdrake:1141
-#, perl-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Следующие пакеты нужно удалить. Это позволит другим пакетам обновиться:\n"
-"\n"
-"%s\n"
-"\n"
-"Всё в порядке? Можно продолжать?"
-
-#: ../rpmdrake:1172 ../rpmdrake:1175 ../rpmdrake:1185 ../rpmdrake:1197
-#: ../rpmdrake:1203
+#: ../rpmdrake:1188 ../rpmdrake:1191 ../rpmdrake:1201 ../rpmdrake:1213
+#: ../rpmdrake:1219
 msgid "/_File"
 msgstr "/_Файл"
 
-#: ../rpmdrake:1175
+#: ../rpmdrake:1191
 msgid "/_Update media"
 msgstr "/_Обновить источник"
 
-#: ../rpmdrake:1185
+#: ../rpmdrake:1201
 msgid "/_Reset the selection"
 msgstr "/_Сбросить выбор"
 
-#: ../rpmdrake:1197
+#: ../rpmdrake:1213
 msgid "/Reload the _packages list"
 msgstr "/_Перезагрузить список пакетов"
 
-#: ../rpmdrake:1203
+#: ../rpmdrake:1219
 msgid "/_Quit"
 msgstr "/В_ыход"
 
-#: ../rpmdrake:1203
+#: ../rpmdrake:1219
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1206 ../rpmdrake:1207 ../rpmdrake:1210 ../rpmdrake:1240
+#: ../rpmdrake:1222 ../rpmdrake:1223 ../rpmdrake:1226 ../rpmdrake:1256
 msgid "/_Options"
 msgstr "/_Параметры"
 
-#: ../rpmdrake:1207
+#: ../rpmdrake:1223
 msgid "/_Media Manager"
 msgstr "/_Менеджер источников"
 
-#: ../rpmdrake:1210 ../rpmdrake:1240
+#: ../rpmdrake:1226 ../rpmdrake:1256
 msgid "/_Show automatically selected packages"
 msgstr "/Показывать _автоматически выбранные пакеты"
 
-#: ../rpmdrake:1214 ../rpmdrake:1215 ../rpmdrake:1216 ../rpmdrake:1217
+#: ../rpmdrake:1230 ../rpmdrake:1231 ../rpmdrake:1232 ../rpmdrake:1233
 msgid "/_Help"
 msgstr "/_Справка"
 
-#: ../rpmdrake:1215
+#: ../rpmdrake:1231
 msgid "/_Report Bug"
 msgstr "/С_ообщить об ошибке"
 
-#: ../rpmdrake:1217
+#: ../rpmdrake:1233
 msgid "/_About..."
 msgstr "/О _программе..."
 
 #. nicer formatting
-#: ../rpmdrake:1220
+#: ../rpmdrake:1236
 msgid "About Rpmdrake"
 msgstr "Об утилите Rpmdrake"
 
-#: ../rpmdrake:1222
+#: ../rpmdrake:1238
 #, perl-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s Mandriva"
 
-#: ../rpmdrake:1224
+#: ../rpmdrake:1240
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake - это утилита Mandriva Linux для управления пакетами."
 
-#: ../rpmdrake:1226
+#: ../rpmdrake:1242
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1231
+#: ../rpmdrake:1247
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Pavel Maryanov <acid_jack@ukr.net>\n"
 
-#: ../rpmdrake:1255
+#: ../rpmdrake:1271
 msgid "Find:"
 msgstr "Найти:"
 
-#: ../rpmdrake:1264
+#: ../rpmdrake:1280
 msgid "Search"
 msgstr "Поиск"
 
-#: ../rpmdrake:1266
+#: ../rpmdrake:1282
 msgid "Clear"
 msgstr "Очистить"
 
-#: ../rpmdrake:1279
+#: ../rpmdrake:1295
 msgid "Apply"
 msgstr "Применить"
 
-#: ../rpmdrake:1283
+#: ../rpmdrake:1299
 msgid "Quit"
 msgstr "Выход"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1315
 msgid "Quick Introduction"
 msgstr "Краткое введение"
 
-#: ../rpmdrake:1300
+#: ../rpmdrake:1316
 msgid "You can browse the packages through the categories tree on the left."
 msgstr "Вы можете просматривать пакеты в виде дерева категорий в левой части."
 
-#: ../rpmdrake:1301
+#: ../rpmdrake:1317
+#, fuzzy
 msgid ""
-"You can view information about a packages by clicking on it on the right "
-"list."
+"You can view information about a package by clicking on it on the right list."
 msgstr ""
 "Вы можете просматривать информацию о пакетах в правом окне, щёлкнув по "
 "названию пакета."
 
 #: ../rpmdrake:1318
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
-msgstr "Чтобы установить, обновить или удалить пакет, просто щёлкните по его \"кнопке-флажку\"."
+msgstr ""
+"Чтобы установить, обновить или удалить пакет, просто щёлкните по его "
+"\"кнопке-флажку\"."
 
-#: ../rpmdrake:1345
+#: ../rpmdrake:1360
 msgid "Fatal error"
 msgstr "Неисправимая ошибка"
 
-#: ../rpmdrake:1346
+#: ../rpmdrake:1361
 #, perl-format
 msgid "A fatal error occurred: %s."
 msgstr "Произошла критическая ошибка: %s."
 
-#: ../rpmdrake:1352
+#: ../rpmdrake:1368
 msgid "Confirmation"
 msgstr "Подтверждение"
 
-#: ../rpmdrake:1353
+#: ../rpmdrake:1369
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -1506,11 +1510,11 @@ msgstr ""
 "\n"
 "Всё в порядке? Можно продолжать?"
 
-#: ../rpmdrake:1362
+#: ../rpmdrake:1378
 msgid "Already existing update media"
 msgstr "Уже существующий источник обновления"
 
-#: ../rpmdrake:1363
+#: ../rpmdrake:1379
 #, perl-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1528,11 +1532,11 @@ msgstr ""
 "\n"
 "Затем перезапустите %s."
 
-#: ../rpmdrake:1373
+#: ../rpmdrake:1389
 msgid "How to choose manually your mirror"
 msgstr "Как вручную выбрать свое зеркало"
 
-#: ../rpmdrake:1374
+#: ../rpmdrake:1390
 #, perl-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1547,55 +1551,55 @@ msgstr ""
 "\n"
 "Затем перезапустите %s."
 
-#: ../rpmdrake:1411
+#: ../rpmdrake:1427
 msgid "Please wait, finding available packages..."
 msgstr "Подождите, пожалуйста, выполняется поиск доступных пакетов..."
 
-#: ../rpmdrake:1412
+#: ../rpmdrake:1428
 msgid "Please wait, reading packages database..."
 msgstr "Пожалуйста, подождите, читается база пакетов..."
 
-#: ../rpmdrake:1568
+#: ../rpmdrake:1584
 #, perl-format
 msgid "Inspecting %s"
 msgstr "Изучается %s"
 
-#: ../rpmdrake:1591
+#: ../rpmdrake:1607
 msgid "changes:"
 msgstr "изменения:"
 
-#: ../rpmdrake:1599
+#: ../rpmdrake:1615
 #, perl-format
 msgid "Remove .%s"
 msgstr "Удалить .%s"
 
-#: ../rpmdrake:1603
+#: ../rpmdrake:1619
 #, perl-format
 msgid "Use .%s as main file"
 msgstr "Использовать .%s в качестве главного файла"
 
-#: ../rpmdrake:1607
+#: ../rpmdrake:1623
 msgid "Do nothing"
 msgstr "Ничего не делать"
 
-#: ../rpmdrake:1623
+#: ../rpmdrake:1639
 msgid "Installation finished"
 msgstr "Установка завершена"
 
-#: ../rpmdrake:1638
+#: ../rpmdrake:1654
 msgid "Inspect..."
 msgstr "Изучение..."
 
 #. N("Everything installed successfully"),
-#: ../rpmdrake:1671 ../rpmdrake:1842
+#: ../rpmdrake:1687 ../rpmdrake:1879
 msgid "All requested packages were installed successfully."
 msgstr "Все запрошенные пакеты были успешно установлены."
 
-#: ../rpmdrake:1675 ../rpmdrake:1822
+#: ../rpmdrake:1691 ../rpmdrake:1859
 msgid "Problem during installation"
 msgstr "Во время установки возникла проблема"
 
-#: ../rpmdrake:1676 ../rpmdrake:1823 ../rpmdrake:1883
+#: ../rpmdrake:1692 ../rpmdrake:1860 ../rpmdrake:1920
 #, perl-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1606,16 +1610,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1693
+#: ../rpmdrake:1709
 msgid "Unable to get source packages."
 msgstr "Невозможно получить исходные пакеты."
 
-#: ../rpmdrake:1694
+#: ../rpmdrake:1710
 #, perl-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "К сожалению невозможно получить пакеты с исходниками. %s"
 
-#: ../rpmdrake:1695 ../rpmdrake:1769
+#: ../rpmdrake:1711 ../rpmdrake:1806
 #, perl-format
 msgid ""
 "\n"
@@ -1628,37 +1632,66 @@ msgstr ""
 "Об ошибке(ах) сообщено:\n"
 "%s"
 
-#: ../rpmdrake:1704
+#: ../rpmdrake:1727
+#, fuzzy, perl-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be "
+"installed:\n"
+msgstr ""
+"Для удовлетворения зависимостей должны быть установлены\n"
+"следующие пакеты:\n"
+"\n"
+
+#: ../rpmdrake:1730
+#, perl-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Следующие пакеты нужно удалить. Это позволит другим пакетам обновиться:\n"
+"\n"
+"%s\n"
+"\n"
+"Всё в порядке? Можно продолжать?"
+
+#: ../rpmdrake:1741
 msgid "Initializing..."
 msgstr "Инициализация..."
 
-#: ../rpmdrake:1704
+#: ../rpmdrake:1741
 msgid "Package installation..."
 msgstr "Устанавливается пакет..."
 
-#: ../rpmdrake:1713
+#: ../rpmdrake:1741 ../rpmdrake.pm:307
+msgid "Please wait"
+msgstr "Подождите, пожалуйста"
+
+#: ../rpmdrake:1750
 msgid "Change medium"
 msgstr "Изменить носитель"
 
-#: ../rpmdrake:1714
+#: ../rpmdrake:1751
 #, perl-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Пожалуйста, вставьте носитель с меткой \"%s\" в устройство [%s]"
 
-#: ../rpmdrake:1721
+#: ../rpmdrake:1758
 #, perl-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Загружается пакет `%s' (%s/%s)..."
 
-#: ../rpmdrake:1744
+#: ../rpmdrake:1781
 msgid "Verifying package signatures..."
 msgstr "Проверяются подписи пакетов..."
 
-#: ../rpmdrake:1756 ../rpmdrake.pm:743 ../rpmdrake.pm:852
+#: ../rpmdrake:1793 ../rpmdrake.pm:743 ../rpmdrake.pm:852
 msgid "Warning"
 msgstr "Внимание"
 
-#: ../rpmdrake:1757
+#: ../rpmdrake:1794
 #, perl-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1673,11 +1706,11 @@ msgstr ""
 "\n"
 "Хотите продолжить установку?"
 
-#: ../rpmdrake:1766 ../rpmdrake:1882
+#: ../rpmdrake:1803 ../rpmdrake:1919
 msgid "Installation failed"
 msgstr "Установка была прервана"
 
-#: ../rpmdrake:1767
+#: ../rpmdrake:1804
 #, perl-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1690,21 +1723,25 @@ msgstr ""
 "\n"
 "Возможно вам понадобится обновить свою базу данных источников."
 
-#: ../rpmdrake:1782
+#: ../rpmdrake:1819
 msgid "Preparing packages installation..."
 msgstr "Подготовка к установке пакетов..."
 
-#: ../rpmdrake:1785
+#: ../rpmdrake:1819
+msgid "Preparing..."
+msgstr ""
+
+#: ../rpmdrake:1822
 #, perl-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Устанавливается пакет `%s' (%s/%s)..."
 
-#: ../rpmdrake:1801
+#: ../rpmdrake:1838
 #, perl-format
 msgid "unable to access rpm file [%s]"
 msgstr "нет доступа к rpm-файлу [%s]"
 
-#: ../rpmdrake:1837
+#: ../rpmdrake:1874
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
 "\n"
@@ -1716,32 +1753,32 @@ msgstr ""
 "Некоторые конфигурационные файлы созданы как `.rpmnew' или `.rpmsave',\n"
 "теперь вы можете просмотреть их чтобы принять меры:"
 
-#: ../rpmdrake:1847
+#: ../rpmdrake:1884
 msgid "These packages come with upgrade information"
 msgstr "Данные пакеты поставляются с информацией об обновлении"
 
-#: ../rpmdrake:1859
+#: ../rpmdrake:1896
 #, perl-format
 msgid "More information on package... [%s]"
 msgstr "Дополнительная информация о пакете... [%s]"
 
-#: ../rpmdrake:1872 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
+#: ../rpmdrake:1909 ../rpmdrake.pm:730 ../rpmdrake.pm:811 ../rpmdrake.pm:835
 msgid "Error"
 msgstr "Ошибка"
 
-#: ../rpmdrake:1873
+#: ../rpmdrake:1910
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Неисправимая ошибка: к сожалению не найден пакет для установки."
 
-#: ../rpmdrake:1898
+#: ../rpmdrake:1935
 msgid "Please wait, removing packages..."
 msgstr "Пожалуйста, подождите, удаляются пакеты..."
 
-#: ../rpmdrake:1909
+#: ../rpmdrake:1946
 msgid "Problem during removal"
 msgstr "Проблема во время удаления"
 
-#: ../rpmdrake:1910
+#: ../rpmdrake:1947
 #, perl-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -1752,11 +1789,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1940
+#: ../rpmdrake:1977
 msgid "Welcome"
 msgstr "Добро пожаловать"
 
-#: ../rpmdrake:1945
+#: ../rpmdrake:1982
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -1768,7 +1805,7 @@ msgstr ""
 "Она поможет вам выбрать пакеты для удаления с вашего\n"
 "компьютера."
 
-#: ../rpmdrake:1950
+#: ../rpmdrake:1987
 #, perl-format
 msgid ""
 "Welcome to %s!\n"
@@ -1781,11 +1818,11 @@ msgstr ""
 "Эта утилита поможет вам выбрать обновления для установки на ваш\n"
 "компьютер."
 
-#: ../rpmdrake:1955
+#: ../rpmdrake:1992
 msgid "Welcome to the software installation tool!"
 msgstr "Вас приветствует утилита установки программ!"
 
-#: ../rpmdrake:1956
+#: ../rpmdrake:1993
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1839,10 +1876,6 @@ msgstr "Да"
 msgid "Info..."
 msgstr "Информация..."
 
-#: ../rpmdrake.pm:307
-msgid "Please wait"
-msgstr "Подождите, пожалуйста"
-
 #: ../rpmdrake.pm:386
 msgid "Austria"
 msgstr "Австрия"
@@ -2140,7 +2173,8 @@ msgid "Update media"
 msgstr "Обновить источник"
 
 #: ../rpmdrake.pm:743
-msgid "No active medium found. You must enable some media to be able to update them."
+msgid ""
+"No active medium found. You must enable some media to be able to update them."
 msgstr ""
 "Не найден активный источник. Вы должны активировать источники, чтобы их "
 "можно было обновить."
@@ -2227,7 +2261,8 @@ msgid "Help launched in background"
 msgstr "Справка запущена в фоновом режиме"
 
 #: ../rpmdrake.pm:875
-msgid "The help window has been started, it should appear shortly on your desktop."
+msgid ""
+"The help window has been started, it should appear shortly on your desktop."
 msgstr ""
 "Окно справки было запущено, скоро оно должно появиться на вашем рабочем "
 "столе."
@@ -2455,7 +2490,8 @@ msgstr "Движок SSL-шифрования не найден\n"
 
 #: ../grpmi/curl_download/curl_download.xs:294
 msgid "can not set SSL crypto engine as default\n"
-msgstr "невозможно установить движок SSL-шифрования используемым по умолчанию\n"
+msgstr ""
+"невозможно установить движок SSL-шифрования используемым по умолчанию\n"
 
 #: ../grpmi/curl_download/curl_download.xs:297
 msgid "failed sending network data\n"
@@ -2534,4 +2570,3 @@ msgstr "Менеджер источников программ"
 
 #~ msgid "Everything installed successfully"
 #~ msgstr "Все установлено успешно."
-