summaryrefslogtreecommitdiffstats
path: root/perl-install/share/po/ru.po
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>2000-05-13 02:41:57 +0000
committerPablo Saratxaga <pablo@mandriva.com>2000-05-13 02:41:57 +0000
commit4b7908a57cd538d7c6398a0e30af42ee6502c074 (patch)
treedeca23ab967e1a0cc612066b74d856162545199a /perl-install/share/po/ru.po
parentb1b6644cd0d867d5b39b8bdecb1145e4e9f56e8a (diff)
downloaddrakx-backup-do-not-use-4b7908a57cd538d7c6398a0e30af42ee6502c074.tar
drakx-backup-do-not-use-4b7908a57cd538d7c6398a0e30af42ee6502c074.tar.gz
drakx-backup-do-not-use-4b7908a57cd538d7c6398a0e30af42ee6502c074.tar.bz2
drakx-backup-do-not-use-4b7908a57cd538d7c6398a0e30af42ee6502c074.tar.xz
drakx-backup-do-not-use-4b7908a57cd538d7c6398a0e30af42ee6502c074.zip
Updated Norwegian file
Diffstat (limited to 'perl-install/share/po/ru.po')
-rw-r--r--perl-install/share/po/ru.po3677
1 files changed, 2378 insertions, 1299 deletions
diff --git a/perl-install/share/po/ru.po b/perl-install/share/po/ru.po
index 349dbdf55..e86542114 100644
--- a/perl-install/share/po/ru.po
+++ b/perl-install/share/po/ru.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-01-10 01:09+0100\n"
+"POT-Creation-Date: 2000-05-11 22:37+0200\n"
"PO-Revision-Date: 1999-09-24 10:07 +0200\n"
"Last-Translator: Aleksey Smirnov <smi@logic.ru>\n"
"Language-Team: \n"
@@ -12,39 +12,43 @@ msgstr ""
"Content-Type: text/plain; charset=koi8-r\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../Xconfigurator.pm_.c:159
+#: ../../Xconfigurator.pm_.c:116 ../../Xconfigurator.pm_.c:228
+msgid "Generic"
+msgstr ""
+
+#: ../../Xconfigurator.pm_.c:165
msgid "Graphic card"
msgstr "Видеокарта"
-#: ../Xconfigurator.pm_.c:159
+#: ../../Xconfigurator.pm_.c:165
msgid "Select a graphic card"
msgstr "Выберите видеокарту"
-#: ../Xconfigurator.pm_.c:160
+#: ../../Xconfigurator.pm_.c:166
msgid "Choose a X server"
msgstr "Выберите X сервер"
-#: ../Xconfigurator.pm_.c:160
+#: ../../Xconfigurator.pm_.c:166
msgid "X server"
msgstr "X сервер"
-#: ../Xconfigurator.pm_.c:181
+#: ../../Xconfigurator.pm_.c:190
msgid "Select the memory size of your graphic card"
msgstr "Укажите размер видеопамяти"
-#: ../Xconfigurator.pm_.c:203
+#: ../../Xconfigurator.pm_.c:217
msgid "Choose options for server"
msgstr "Выберите опции для сервера"
-#: ../Xconfigurator.pm_.c:221
+#: ../../Xconfigurator.pm_.c:228
msgid "Choose a monitor"
msgstr "Выберите монитор"
-#: ../Xconfigurator.pm_.c:221
+#: ../../Xconfigurator.pm_.c:228
msgid "Monitor"
msgstr "Монитор"
-#: ../Xconfigurator.pm_.c:224
+#: ../../Xconfigurator.pm_.c:231
msgid ""
"The two critical parameters are the vertical refresh rate, which is the "
"rate\n"
@@ -67,68 +71,69 @@ msgstr ""
"вне фактических возможностей вашего монитора: вы можете испортитьмонитор.\n"
" В случае сомнений лучше выбрать консервативные установки."
-#: ../Xconfigurator.pm_.c:231
+#: ../../Xconfigurator.pm_.c:238
msgid "Horizontal refresh rate"
msgstr "Частота горизонтальной развертки"
-#: ../Xconfigurator.pm_.c:231
+#: ../../Xconfigurator.pm_.c:238
msgid "Vertical refresh rate"
msgstr "Частота вертикальной развертки"
-#: ../Xconfigurator.pm_.c:272
+#: ../../Xconfigurator.pm_.c:277
msgid "Monitor not configured"
msgstr "Монитор еще не настроен"
-#: ../Xconfigurator.pm_.c:275
+#: ../../Xconfigurator.pm_.c:280
msgid "Graphic card not configured yet"
msgstr "Видеокарта еще не настроена"
-#: ../Xconfigurator.pm_.c:278
+#: ../../Xconfigurator.pm_.c:283
msgid "Resolutions not chosen yet"
msgstr "Разрешение не указано"
-#: ../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:296
msgid "Do you want to test the configuration?"
msgstr "Хотите протестировать настройки?"
-#: ../Xconfigurator.pm_.c:293
+#: ../../Xconfigurator.pm_.c:300
msgid "Warning: testing is dangerous on this graphic card"
msgstr "Предупреждение: тестирование на этой видеокарте опасно"
-#: ../Xconfigurator.pm_.c:296
-msgid "Test configuration"
+#: ../../Xconfigurator.pm_.c:303
+msgid "Test of the configuration"
msgstr "Проверка настроек"
-#: ../Xconfigurator.pm_.c:334
-msgid "An error occurred:"
-msgstr "Ошибка:"
-
-#: ../Xconfigurator.pm_.c:336
+#: ../../Xconfigurator.pm_.c:342
msgid ""
"\n"
-"try changing some parameters"
+"try to change some parameters"
msgstr ""
"\n"
"попробуйте измениить некоторые параметры"
-#: ../Xconfigurator.pm_.c:358
+#: ../../Xconfigurator.pm_.c:342
+msgid "An error has occurred:"
+msgstr "Ошибка:"
+
+#: ../../Xconfigurator.pm_.c:365
#, c-format
-msgid "(leaving in %d seconds)"
-msgstr "(осталось %d сукунд)"
+msgid "Leaving in %d seconds"
+msgstr "Осталось %d сукунд"
-#: ../Xconfigurator.pm_.c:362 ../my_gtk.pm_.c:425
-msgid "Is this correct?"
+#: ../../Xconfigurator.pm_.c:369
+#, fuzzy
+msgid "Is this the correct setting?"
msgstr "Это верно?"
-#: ../Xconfigurator.pm_.c:370
-msgid "An error occurred, try changing some parameters"
+#: ../../Xconfigurator.pm_.c:377
+msgid "An error has occurred, try to change some parameters"
msgstr "Произошла ошибка, попробуйте изменить параметры"
-#: ../Xconfigurator.pm_.c:378 ../Xconfigurator.pm_.c:547
+#: ../../Xconfigurator.pm_.c:385 ../../Xconfigurator.pm_.c:558
msgid "Automatic resolutions"
msgstr "Автоматическое определение разрешения"
-#: ../Xconfigurator.pm_.c:379
+#: ../../Xconfigurator.pm_.c:386
msgid ""
"To find the available resolutions I will try different ones.\n"
"Your screen will blink...\n"
@@ -138,23 +143,33 @@ msgstr ""
"Ваш экран будет мигать...\n"
"Если хотите, можете это отключить, по окончании услышите гудок"
-#: ../Xconfigurator.pm_.c:434 ../printerdrake.pm_.c:208
+#: ../../Xconfigurator.pm_.c:441 ../../printerdrake.pm_.c:167
msgid "Resolution"
msgstr "Разрешение"
-#: ../Xconfigurator.pm_.c:469
-msgid "Choose resolution and color depth"
+#: ../../Xconfigurator.pm_.c:476
+msgid "Choose the resolution and the color depth"
msgstr "Выбор разрешения и глубины цвета"
-#: ../Xconfigurator.pm_.c:477
+#: ../../Xconfigurator.pm_.c:478
+#, c-format
+msgid "Graphic card: %s"
+msgstr "Видеокарта: %s"
+
+#: ../../Xconfigurator.pm_.c:479
+#, c-format
+msgid "XFree86 server: %s"
+msgstr "Сервер XFree86: %s"
+
+#: ../../Xconfigurator.pm_.c:488
msgid "Show all"
msgstr "Показать все"
-#: ../Xconfigurator.pm_.c:501
+#: ../../Xconfigurator.pm_.c:512
msgid "Resolutions"
msgstr "Разрешение"
-#: ../Xconfigurator.pm_.c:548
+#: ../../Xconfigurator.pm_.c:559
msgid ""
"I can try to find the available resolutions (eg: 800x600).\n"
"Sometimes, though, it may hang the machine.\n"
@@ -164,7 +179,7 @@ msgstr ""
"Впрочем, изредка это может подвесить машину .\n"
"Хотите попробовать?"
-#: ../Xconfigurator.pm_.c:553
+#: ../../Xconfigurator.pm_.c:564
msgid ""
"No valid modes found\n"
"Try with another video card or monitor"
@@ -172,109 +187,109 @@ msgstr ""
"Не обнаружено подходящих режимов\n"
"Попробуйте указать другую видеокарту или монитор"
-#: ../Xconfigurator.pm_.c:772
+#: ../../Xconfigurator.pm_.c:904
#, c-format
msgid "Keyboard layout: %s\n"
msgstr "Тип клавиатуры: %s\n"
-#: ../Xconfigurator.pm_.c:773
+#: ../../Xconfigurator.pm_.c:905
#, c-format
msgid "Mouse type: %s\n"
msgstr "Тип мыши: %s\n"
-#: ../Xconfigurator.pm_.c:774
+#: ../../Xconfigurator.pm_.c:906
#, c-format
msgid "Mouse device: %s\n"
msgstr "Мышь: %s\n"
-#: ../Xconfigurator.pm_.c:775
+#: ../../Xconfigurator.pm_.c:907
#, c-format
msgid "Monitor: %s\n"
msgstr "Монитор: %s\n"
-#: ../Xconfigurator.pm_.c:776
+#: ../../Xconfigurator.pm_.c:908
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr "Частота гор.разв. монитора: %s\n"
-#: ../Xconfigurator.pm_.c:777
+#: ../../Xconfigurator.pm_.c:909
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr "Частота верт.разв. монитора: %s\n"
-#: ../Xconfigurator.pm_.c:778
+#: ../../Xconfigurator.pm_.c:910
#, c-format
msgid "Graphic card: %s\n"
msgstr "Видеокарта: %s\n"
-#: ../Xconfigurator.pm_.c:779
+#: ../../Xconfigurator.pm_.c:911
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr "Видеопамять: %s KB\n"
-#: ../Xconfigurator.pm_.c:780
+#: ../../Xconfigurator.pm_.c:912
#, c-format
msgid "XFree86 server: %s\n"
msgstr "Сервер XFree86: %s\n"
-#: ../Xconfigurator.pm_.c:794
+#: ../../Xconfigurator.pm_.c:927
msgid "Preparing X-Window configuration"
msgstr "Подготовка настройки X-Window"
-#: ../Xconfigurator.pm_.c:808
+#: ../../Xconfigurator.pm_.c:941
msgid "Change Monitor"
msgstr "Измените монитор"
-#: ../Xconfigurator.pm_.c:809
+#: ../../Xconfigurator.pm_.c:942
msgid "Change Graphic card"
msgstr "Измените видеокарту"
-#: ../Xconfigurator.pm_.c:810
+#: ../../Xconfigurator.pm_.c:943
msgid "Change Server options"
msgstr "Измените опции Сервера"
-#: ../Xconfigurator.pm_.c:811
+#: ../../Xconfigurator.pm_.c:944
msgid "Change Resolution"
msgstr "Измените разрешение"
-#: ../Xconfigurator.pm_.c:812
+#: ../../Xconfigurator.pm_.c:945
msgid "Automatical resolutions search"
msgstr "Автоматический поиск разрешения"
-#: ../Xconfigurator.pm_.c:816
+#: ../../Xconfigurator.pm_.c:949
msgid "Show information"
msgstr "Информация"
-#: ../Xconfigurator.pm_.c:817
+#: ../../Xconfigurator.pm_.c:950
msgid "Test again"
msgstr "Снова проверить"
-#: ../Xconfigurator.pm_.c:818 ../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:951 ../../standalone/rpmdrake_.c:46
msgid "Quit"
msgstr "Выход"
-#: ../Xconfigurator.pm_.c:822
+#: ../../Xconfigurator.pm_.c:955 ../../standalone/drakboot_.c:36
msgid "What do you want to do?"
msgstr "Что вы хотите делать?"
-#: ../Xconfigurator.pm_.c:829
+#: ../../Xconfigurator.pm_.c:962
msgid "Forget the changes?"
msgstr "Забыть изменения?"
-#: ../Xconfigurator.pm_.c:845
+#: ../../Xconfigurator.pm_.c:980
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr "Войдите повторно в %s для активации изменений"
-#: ../Xconfigurator.pm_.c:861
+#: ../../Xconfigurator.pm_.c:996
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr "Выйдите, а сатем используйте Ctrl-Alt-BackSpace"
-#: ../Xconfigurator.pm_.c:864
+#: ../../Xconfigurator.pm_.c:999
msgid "X at startup"
msgstr "Запуск X при загрузке"
-#: ../Xconfigurator.pm_.c:865
+#: ../../Xconfigurator.pm_.c:1000
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
@@ -282,237 +297,462 @@ msgstr ""
"Можно настроить систему для автоматического запуска X после загрузки.\n"
"Хотите, чтобы X стартовал при перезагрузке?"
-#: ../Xconfigurator_consts.pm_.c:4
+#: ../../Xconfigurator_consts.pm_.c:4
msgid "256 colors (8 bits)"
msgstr "256 цветов (8 бит)"
-#: ../Xconfigurator_consts.pm_.c:5
+#: ../../Xconfigurator_consts.pm_.c:5
msgid "32 thousand colors (15 bits)"
msgstr "32 тысячи цветов (15 бит)"
-#: ../Xconfigurator_consts.pm_.c:6
+#: ../../Xconfigurator_consts.pm_.c:6
msgid "65 thousand colors (16 bits)"
msgstr "65 тысяч цветов (16 бит)"
-#: ../Xconfigurator_consts.pm_.c:7
+#: ../../Xconfigurator_consts.pm_.c:7
msgid "16 million colors (24 bits)"
msgstr "16 миллионов цветов (24 бита)"
-#: ../Xconfigurator_consts.pm_.c:8
+#: ../../Xconfigurator_consts.pm_.c:8
msgid "4 billion colors (32 bits)"
msgstr "4 миллиарда цветов (24 бита)"
-#: ../Xconfigurator_consts.pm_.c:96
+#: ../../Xconfigurator_consts.pm_.c:103
msgid "256 kB"
msgstr "256 kB"
-#: ../Xconfigurator_consts.pm_.c:97
+#: ../../Xconfigurator_consts.pm_.c:104
msgid "512 kB"
msgstr "512 kB"
-#: ../Xconfigurator_consts.pm_.c:98
+#: ../../Xconfigurator_consts.pm_.c:105
msgid "1 MB"
msgstr "1 MB"
-#: ../Xconfigurator_consts.pm_.c:99
+#: ../../Xconfigurator_consts.pm_.c:106
msgid "2 MB"
msgstr "2 MB"
-#: ../Xconfigurator_consts.pm_.c:100
+#: ../../Xconfigurator_consts.pm_.c:107
msgid "4 MB"
msgstr "4 Mb"
-#: ../Xconfigurator_consts.pm_.c:101
+#: ../../Xconfigurator_consts.pm_.c:108
msgid "8 MB"
msgstr "8 Mb"
-#: ../Xconfigurator_consts.pm_.c:102
+#: ../../Xconfigurator_consts.pm_.c:109
msgid "16 MB or more"
msgstr "16 MB или больше"
-#: ../Xconfigurator_consts.pm_.c:107 ../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
msgid "Standard VGA, 640x480 at 60 Hz"
msgstr "Стандартный VGA, 640x480 при 60 Hz"
-#: ../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:116
msgid "Super VGA, 800x600 at 56 Hz"
msgstr "Super VGA, 800x600 при 56 Hz"
-#: ../Xconfigurator_consts.pm_.c:110
+#: ../../Xconfigurator_consts.pm_.c:117
msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
msgstr "Совместима с 8514, 1024x768 при 87 Hz чрезстрочный (нет 800x600)"
-#: ../Xconfigurator_consts.pm_.c:111
+#: ../../Xconfigurator_consts.pm_.c:118
msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
msgstr "Super VGA, 1024x768 при 87 Hz чрезстрочный, 800x600 при 56 Hz"
-#: ../Xconfigurator_consts.pm_.c:112
+#: ../../Xconfigurator_consts.pm_.c:119
msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
msgstr "Extended Super VGA, 800x600 при 60 Hz, 640x480 при 72 Hz"
-#: ../Xconfigurator_consts.pm_.c:113
+#: ../../Xconfigurator_consts.pm_.c:120
msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
msgstr "Non-Interlaced SVGA, 1024x768 при 60 Hz, 800x600 при 72 Hz"
-#: ../Xconfigurator_consts.pm_.c:114
+#: ../../Xconfigurator_consts.pm_.c:121
msgid "High Frequency SVGA, 1024x768 at 70 Hz"
msgstr "SVGA Высокой Частоты, 1024x768 при 70 Hz"
-#: ../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:122
msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
msgstr "Multi-frequency способный поддерживать 1280x1024 при 60 Hz"
-#: ../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:123
msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
msgstr "Multi-frequency способный поддерживать 1280x1024 при 74 Hz"
-#: ../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:124
msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
msgstr "Multi-frequency способный поддерживать 1280x1024 при 76 Hz"
-#: ../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:125
msgid "Monitor that can do 1600x1200 at 70 Hz"
msgstr "Monitor способный поддерживать 1600x1200 при 70 Hz"
-#: ../Xconfigurator_consts.pm_.c:119
+#: ../../Xconfigurator_consts.pm_.c:126
msgid "Monitor that can do 1600x1200 at 76 Hz"
msgstr "Monitor способный поддерживать 1600x1200 при 76 Hz"
-#: ../diskdrake.pm_.c:16 ../diskdrake.pm_.c:370
+#: ../../any.pm_.c:17
+msgid "curly"
+msgstr ""
+
+#: ../../any.pm_.c:17
+#, fuzzy
+msgid "default"
+msgstr "Умолчание"
+
+#. -PO: names (tie, curly...) have corresponding icons for kdm
+#: ../../any.pm_.c:17
+#, fuzzy
+msgid "tie"
+msgstr "Активный"
+
+#: ../../any.pm_.c:18
+msgid "brunette"
+msgstr ""
+
+#: ../../any.pm_.c:18
+msgid "girl"
+msgstr ""
+
+#: ../../any.pm_.c:18
+msgid "woman-blond"
+msgstr ""
+
+#: ../../any.pm_.c:19
+#, fuzzy
+msgid "automagic"
+msgstr "Автоматический IP"
+
+#: ../../any.pm_.c:60
+msgid "First sector of boot partition"
+msgstr "Первый сектор загрузочного раздела"
+
+#: ../../any.pm_.c:60
+msgid "First sector of drive (MBR)"
+msgstr "Первый сектор устройства (MBR)"
+
+#: ../../any.pm_.c:65
+#, fuzzy
+msgid "LILO/grub Installation"
+msgstr "Установка LILO"
+
+#: ../../any.pm_.c:66
+msgid "Where do you want to install the bootloader?"
+msgstr "Куда вы хотите установить начальный загрузчик?"
+
+#: ../../any.pm_.c:73
+#, fuzzy
+msgid "None"
+msgstr "Готово"
+
+#: ../../any.pm_.c:73
+#, fuzzy
+msgid "Which bootloader(s) do you want to use?"
+msgstr "Какой тип пункта хотите добавить?"
+
+#: ../../any.pm_.c:84
+msgid "Boot device"
+msgstr "Загрузочное устройство"
+
+#: ../../any.pm_.c:85
+msgid "LBA (doesn't work on old BIOSes)"
+msgstr ""
+
+#: ../../any.pm_.c:86
+msgid "Compact"
+msgstr "Компактно"
+
+#: ../../any.pm_.c:86
+msgid "compact"
+msgstr "компактно"
+
+#: ../../any.pm_.c:87 ../../install_steps_interactive.pm_.c:809
+msgid "Delay before booting default image"
+msgstr "Задержка перед загрузкой образа по умолчанию"
+
+#: ../../any.pm_.c:88
+msgid "Video mode"
+msgstr "Видео-режим"
+
+#: ../../any.pm_.c:90 ../../install_steps_interactive.pm_.c:531
+#: ../../install_steps_interactive.pm_.c:654
+#: ../../install_steps_interactive.pm_.c:705
+#: ../../install_steps_interactive.pm_.c:811 ../../printerdrake.pm_.c:85
+#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
+msgid "Password"
+msgstr "Пароль:"
+
+#: ../../any.pm_.c:91 ../../install_steps_interactive.pm_.c:655
+#: ../../install_steps_interactive.pm_.c:706
+#: ../../install_steps_interactive.pm_.c:812
+#: ../../standalone/adduserdrake_.c:43
+msgid "Password (again)"
+msgstr "Повторите пароль:"
+
+#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+msgid "Restrict command line options"
+msgstr "Ограничение опций командной строки"
+
+#: ../../any.pm_.c:92 ../../install_steps_interactive.pm_.c:813
+msgid "restrict"
+msgstr "ограничение"
+
+#: ../../any.pm_.c:98
+#, fuzzy
+msgid "Bootloader main options"
+msgstr "главные опции LILO"
+
+#: ../../any.pm_.c:101 ../../install_steps_interactive.pm_.c:820
+msgid ""
+"Option ``Restrict command line options'' is of no use without a password"
+msgstr ""
+"Опция ``Ограничение опций командной строки'' не используется без пароля"
+
+#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
+#: ../../install_steps_interactive.pm_.c:719
+#: ../../install_steps_interactive.pm_.c:821
+#: ../../standalone/adduserdrake_.c:56
+msgid "Please try again"
+msgstr "Попробуйте еще раз"
+
+#: ../../any.pm_.c:102 ../../install_steps_interactive.pm_.c:664
+#: ../../install_steps_interactive.pm_.c:719
+#: ../../install_steps_interactive.pm_.c:821
+#: ../../standalone/adduserdrake_.c:56
+msgid "The passwords do not match"
+msgstr "Пароли не совпадают"
+
+#: ../../any.pm_.c:112
+#, fuzzy
+msgid ""
+"Here are the different entries.\n"
+"You can add some more or change the existing ones."
+msgstr ""
+"В LILO есть следующие пункты.\n"
+"Вы можете добавить еще, или изменить существующие."
+
+#: ../../any.pm_.c:114 ../../install_steps_interactive.pm_.c:832
+#: ../../printerdrake.pm_.c:245 ../../standalone/rpmdrake_.c:302
+msgid "Add"
+msgstr "Добавить"
+
+#: ../../any.pm_.c:114 ../../diskdrake.pm_.c:42
+#: ../../install_steps_interactive.pm_.c:699
+#: ../../install_steps_interactive.pm_.c:832 ../../printerdrake.pm_.c:245
+#: ../../standalone/adduserdrake_.c:36
+msgid "Done"
+msgstr "Готово"
+
+#: ../../any.pm_.c:123
+msgid "Linux"
+msgstr "Linux"
+
+#: ../../any.pm_.c:123
+msgid "Other OS (windows...)"
+msgstr "Другая OS (windows...)"
+
+#: ../../any.pm_.c:123
+msgid "Which type of entry do you want to add?"
+msgstr "Какой тип пункта хотите добавить?"
+
+#: ../../any.pm_.c:142 ../../install_steps_interactive.pm_.c:857
+msgid "Image"
+msgstr "Образ"
+
+#: ../../any.pm_.c:143 ../../any.pm_.c:151
+#: ../../install_steps_interactive.pm_.c:859
+msgid "Root"
+msgstr "Root"
+
+#: ../../any.pm_.c:144 ../../install_steps_interactive.pm_.c:860
+msgid "Append"
+msgstr "Присоединить"
+
+#: ../../any.pm_.c:145 ../../install_steps_interactive.pm_.c:861
+msgid "Initrd"
+msgstr "Initrd"
+
+#: ../../any.pm_.c:146 ../../install_steps_interactive.pm_.c:862
+msgid "Read-write"
+msgstr "Чтение-запись"
+
+#: ../../any.pm_.c:152
+msgid "Table"
+msgstr "Таблица"
+
+#: ../../any.pm_.c:153
+msgid "Unsafe"
+msgstr "Unsafe"
+
+#: ../../any.pm_.c:158 ../../install_steps_interactive.pm_.c:869
+msgid "Label"
+msgstr "Метка"
+
+#: ../../any.pm_.c:160 ../../install_steps_interactive.pm_.c:871
+msgid "Default"
+msgstr "Умолчание"
+
+#: ../../any.pm_.c:163 ../../install_steps_gtk.pm_.c:674
+#: ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:874 ../../interactive.pm_.c:74
+#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
+#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
+#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:200
+#: ../../my_gtk.pm_.c:459 ../../my_gtk.pm_.c:634 ../../printerdrake.pm_.c:272
+msgid "Ok"
+msgstr "Ок"
+
+#: ../../any.pm_.c:163 ../../install_steps_interactive.pm_.c:874
+msgid "Remove entry"
+msgstr "Удалить пункт"
+
+#: ../../any.pm_.c:166 ../../install_steps_interactive.pm_.c:877
+msgid "Empty label not allowed"
+msgstr "Пустая метка не допускается"
+
+#: ../../any.pm_.c:167
+#, fuzzy
+msgid "This label is already used"
+msgstr "Эта метка уже используется"
+
+#: ../../diskdrake.pm_.c:18 ../../diskdrake.pm_.c:413
msgid "Create"
msgstr "Создать"
-#: ../diskdrake.pm_.c:17
+#: ../../diskdrake.pm_.c:19
msgid "Unmount"
msgstr "Размонтировать"
-#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:372
+#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:415
msgid "Delete"
msgstr "Удалить"
-#: ../diskdrake.pm_.c:18
+#: ../../diskdrake.pm_.c:20
msgid "Format"
msgstr "Форматирование"
-#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:527
+#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:590
msgid "Resize"
msgstr "Изменение размера"
-#: ../diskdrake.pm_.c:18 ../diskdrake.pm_.c:370 ../diskdrake.pm_.c:414
+#: ../../diskdrake.pm_.c:20 ../../diskdrake.pm_.c:413
+#: ../../diskdrake.pm_.c:466
msgid "Type"
msgstr "Тип"
-#: ../diskdrake.pm_.c:19 ../diskdrake.pm_.c:430
+#: ../../diskdrake.pm_.c:21 ../../diskdrake.pm_.c:485
msgid "Mount point"
msgstr "Точка монтирования"
-#: ../diskdrake.pm_.c:33
+#: ../../diskdrake.pm_.c:35
msgid "Write /etc/fstab"
msgstr "Запись /etc/fstab"
-#: ../diskdrake.pm_.c:34
+#: ../../diskdrake.pm_.c:36
msgid "Toggle to expert mode"
msgstr "Нормально > Эксперт"
-#: ../diskdrake.pm_.c:35
+#: ../../diskdrake.pm_.c:37
msgid "Toggle to normal mode"
msgstr "Эксперт > Нормально"
-#: ../diskdrake.pm_.c:36
+#: ../../diskdrake.pm_.c:38
msgid "Restore from file"
msgstr "Восстановление из файла"
-#: ../diskdrake.pm_.c:37
+#: ../../diskdrake.pm_.c:39
msgid "Save in file"
msgstr "Сохранение в файле"
-#: ../diskdrake.pm_.c:38
+#: ../../diskdrake.pm_.c:40
msgid "Restore from floppy"
msgstr "Восстановление с дискеты"
-#: ../diskdrake.pm_.c:39
+#: ../../diskdrake.pm_.c:41
msgid "Save on floppy"
msgstr "Сохранение на дискете"
-#: ../diskdrake.pm_.c:40 ../install_steps_interactive.pm_.c:618
-#: ../install_steps_interactive.pm_.c:748 ../standalone/adduserdrake_.c:34
-msgid "Done"
-msgstr "Готово"
-
-#: ../diskdrake.pm_.c:43
+#: ../../diskdrake.pm_.c:45
msgid "Clear all"
msgstr "Очистить все"
-#: ../diskdrake.pm_.c:44
+#: ../../diskdrake.pm_.c:46
msgid "Format all"
msgstr "Форматировать все"
-#: ../diskdrake.pm_.c:45
+#: ../../diskdrake.pm_.c:47
msgid "Auto allocate"
msgstr "Разместить автоматически"
-#: ../diskdrake.pm_.c:48
+#: ../../diskdrake.pm_.c:50
msgid "All primary partitions are used"
msgstr "Все первичные разделы использованы"
-#: ../diskdrake.pm_.c:48
+#: ../../diskdrake.pm_.c:50
msgid "I can't add any more partition"
msgstr "Добавление разделов невозможно"
-#: ../diskdrake.pm_.c:48
+#: ../../diskdrake.pm_.c:50
msgid ""
"To have more partitions, please delete one to be able to create an extended "
"partition"
msgstr "Чтобы сделать больше разделов, удалите один и создайте extended"
-#: ../diskdrake.pm_.c:51
+#: ../../diskdrake.pm_.c:53
msgid "Rescue partition table"
msgstr "Запасная таблицы разделов"
-#: ../diskdrake.pm_.c:52
+#: ../../diskdrake.pm_.c:54
msgid "Undo"
msgstr "Откат"
-#: ../diskdrake.pm_.c:53
+#: ../../diskdrake.pm_.c:55
msgid "Write partition table"
msgstr "Запись таблицы разделов"
-#: ../diskdrake.pm_.c:54
+#: ../../diskdrake.pm_.c:56
msgid "Reload"
msgstr "Перезагрузить"
-#: ../diskdrake.pm_.c:98
+#: ../../diskdrake.pm_.c:96
+msgid "loopback"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:109
msgid "Empty"
msgstr "Пусто"
-#: ../diskdrake.pm_.c:98
+#: ../../diskdrake.pm_.c:109
msgid "Ext2"
msgstr "Ext2"
-#: ../diskdrake.pm_.c:98
+#: ../../diskdrake.pm_.c:109
msgid "FAT"
msgstr "FAT"
-#: ../diskdrake.pm_.c:98
+#: ../../diskdrake.pm_.c:109
msgid "Other"
msgstr "Другие"
-#: ../diskdrake.pm_.c:98
+#: ../../diskdrake.pm_.c:109
msgid "Swap"
msgstr "Swap"
-#: ../diskdrake.pm_.c:104
+#: ../../diskdrake.pm_.c:115
msgid "Filesystem types:"
msgstr "Типы файловой системы:"
-#: ../diskdrake.pm_.c:113
+#: ../../diskdrake.pm_.c:124
msgid "Details"
msgstr "Подробности"
-#: ../diskdrake.pm_.c:127
+#: ../../diskdrake.pm_.c:138
+#, fuzzy
msgid ""
-"You have one big fat partition\n"
-"(generally use by MicroSoft Dos/Windows).\n"
+"You have one big FAT partition\n"
+"(generally used by MicroSoft Dos/Windows).\n"
"I suggest you first resize that partition\n"
"(click on it, then click on \"Resize\")"
msgstr ""
@@ -521,85 +761,94 @@ msgstr ""
"Предлагаю прежде всего изменить размер раздела\n"
"(кликните на него, а затем на \"Изменение размера\")"
-#: ../diskdrake.pm_.c:132
+#: ../../diskdrake.pm_.c:143
msgid "Please make a backup of your data first"
msgstr "Прежде всего сделайте резервную копию данных"
-#: ../diskdrake.pm_.c:132 ../diskdrake.pm_.c:146 ../diskdrake.pm_.c:458
-#: ../diskdrake.pm_.c:487
+#: ../../diskdrake.pm_.c:143 ../../diskdrake.pm_.c:160
+#: ../../diskdrake.pm_.c:169 ../../diskdrake.pm_.c:517
+#: ../../diskdrake.pm_.c:546
msgid "Read carefully!"
msgstr "Читайте внимательно!"
-#: ../diskdrake.pm_.c:146
-#, c-format
-msgid "After %s partition %s,"
-msgstr "После %s разбейте %s,"
+#: ../../diskdrake.pm_.c:146
+msgid ""
+"If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
+"enough)\n"
+"at the beginning of the disk"
+msgstr ""
-#: ../diskdrake.pm_.c:146
-msgid "all data on this partition will be lost"
-msgstr "все данные в этом разделе пропадут"
+#: ../../diskdrake.pm_.c:160
+msgid "Be careful: this operation is dangerous."
+msgstr ""
-#: ../diskdrake.pm_.c:165 ../install_any.pm_.c:193 ../install_steps.pm_.c:71
-#: ../install_steps_interactive.pm_.c:37 ../standalone/diskdrake_.c:60
-#: ../standalone/rpmdrake_.c:294 ../standalone/rpmdrake_.c:304
+#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:330
+#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
+#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
+#: ../../standalone/rpmdrake_.c:304
msgid "Error"
msgstr "Ошибка"
-#: ../diskdrake.pm_.c:189 ../diskdrake.pm_.c:610
+#: ../../diskdrake.pm_.c:221 ../../diskdrake.pm_.c:680
msgid "Mount point: "
msgstr "Точка монтирования:"
-#: ../diskdrake.pm_.c:190 ../diskdrake.pm_.c:228
+#: ../../diskdrake.pm_.c:222 ../../diskdrake.pm_.c:263
msgid "Device: "
msgstr "Устройство:"
-#: ../diskdrake.pm_.c:191
+#: ../../diskdrake.pm_.c:223
#, c-format
msgid "DOS drive letter: %s (just a guess)\n"
msgstr "буква для DOS-диска %s (наугад)\n"
-#: ../diskdrake.pm_.c:192 ../diskdrake.pm_.c:231
+#: ../../diskdrake.pm_.c:224 ../../diskdrake.pm_.c:266
msgid "Type: "
msgstr "Тип"
-#: ../diskdrake.pm_.c:193
+#: ../../diskdrake.pm_.c:225
#, c-format
msgid "Start: sector %s\n"
msgstr "Начало: сектор %s\n"
-#: ../diskdrake.pm_.c:194
-#, c-format
-msgid "Size: %s MB"
-msgstr "Размер: %s MB"
+#: ../../diskdrake.pm_.c:226
+#, fuzzy, c-format
+msgid "Size: %d MB"
+msgstr "Размер : %d MB\n"
-#: ../diskdrake.pm_.c:196
+#: ../../diskdrake.pm_.c:228
#, c-format
msgid ", %s sectors"
msgstr ", %s секторов"
-#: ../diskdrake.pm_.c:198
+#: ../../diskdrake.pm_.c:230
#, c-format
msgid "Cylinder %d to cylinder %d\n"
msgstr "Цилиндры с %d по %d\n"
-#: ../diskdrake.pm_.c:199
+#: ../../diskdrake.pm_.c:231
msgid "Formatted\n"
msgstr "Форматирование\n"
-#: ../diskdrake.pm_.c:200
+#: ../../diskdrake.pm_.c:232
msgid "Not formatted\n"
msgstr "Не отформатировано\n"
-#: ../diskdrake.pm_.c:201
+#: ../../diskdrake.pm_.c:233
msgid "Mounted\n"
msgstr "Смонтировано\n"
-#: ../diskdrake.pm_.c:202
+#: ../../diskdrake.pm_.c:234
#, c-format
msgid "RAID md%s\n"
msgstr "RAID md%s\n"
-#: ../diskdrake.pm_.c:203
+#: ../../diskdrake.pm_.c:235
+#, c-format
+msgid "Loopback file(s): %s\n"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:236
msgid ""
"Partition booted by default\n"
" (for MS-DOS boot, not for lilo)\n"
@@ -607,65 +856,79 @@ msgstr ""
"Загрузочный раздел по умолчанию\n"
" (для загрузки MS-DOS, не для lilo)\n"
-#: ../diskdrake.pm_.c:205
+#: ../../diskdrake.pm_.c:238
#, c-format
msgid "Level %s\n"
msgstr "Уровень %s\n"
-#: ../diskdrake.pm_.c:206
+#: ../../diskdrake.pm_.c:239
#, c-format
msgid "Chunk size %s\n"
msgstr "Chunk размер %s\n"
-#: ../diskdrake.pm_.c:207
+#: ../../diskdrake.pm_.c:240
#, c-format
msgid "RAID-disks %s\n"
msgstr "RAID-диски %s\n"
-#: ../diskdrake.pm_.c:224
+#: ../../diskdrake.pm_.c:242
+#, c-format
+msgid "Loopback file name: %s"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:259
msgid "Please click on a partition"
msgstr "Нажмите на раздел"
-#: ../diskdrake.pm_.c:229
+#: ../../diskdrake.pm_.c:264
#, c-format
msgid "Size: %d MB\n"
msgstr "Размер : %d MB\n"
-#: ../diskdrake.pm_.c:230
+#: ../../diskdrake.pm_.c:265
#, c-format
msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
msgstr "Геометрия: %s цилиндров, %s головок, %s секторов\n"
-#: ../diskdrake.pm_.c:232
+#: ../../diskdrake.pm_.c:267
+#, fuzzy, c-format
+msgid "Partition table type: %s\n"
+msgstr "Корневой раздел"
+
+#: ../../diskdrake.pm_.c:268
#, c-format
msgid "on bus %d id %d\n"
msgstr "на шине %d id %d\n"
-#: ../diskdrake.pm_.c:245
+#: ../../diskdrake.pm_.c:281
msgid "Mount"
msgstr "Монтирование"
-#: ../diskdrake.pm_.c:246
+#: ../../diskdrake.pm_.c:282
msgid "Active"
msgstr "Активный"
-#: ../diskdrake.pm_.c:247
+#: ../../diskdrake.pm_.c:283
msgid "Add to RAID"
msgstr "Добавить к RAID"
-#: ../diskdrake.pm_.c:248
+#: ../../diskdrake.pm_.c:284
msgid "Remove from RAID"
msgstr "Удалить из RAID"
-#: ../diskdrake.pm_.c:249
+#: ../../diskdrake.pm_.c:285
msgid "Modify RAID"
msgstr "Изменить RAID"
-#: ../diskdrake.pm_.c:256
+#: ../../diskdrake.pm_.c:286
+msgid "Use for loopback"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:293
msgid "Choose action"
msgstr "Выберите действие"
-#: ../diskdrake.pm_.c:349
+#: ../../diskdrake.pm_.c:386
msgid ""
"Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
"1024).\n"
@@ -676,7 +939,7 @@ msgstr ""
"Либо вы используете LILO - тогда это не будет работать, либо LILO не "
"используется, и тогда /boot не нужен."
-#: ../diskdrake.pm_.c:353
+#: ../../diskdrake.pm_.c:390
msgid ""
"The partition you've selected to add as root (/) is physically located "
"beyond\n"
@@ -689,145 +952,198 @@ msgstr ""
"Если будет использоваться диспетчер загрузки LILO, не забудьте добавить "
"раздел /boot"
-#: ../diskdrake.pm_.c:370 ../diskdrake.pm_.c:372
+#: ../../diskdrake.pm_.c:396
+msgid ""
+"You've selected a software RAID partition as root (/).\n"
+"No bootloader is able to handle this without a /boot partition.\n"
+"So be careful to add a /boot partition if you want to use lilo or grub"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:413 ../../diskdrake.pm_.c:415
#, c-format
msgid "Use ``%s'' instead"
msgstr "Взамен используйте ``%s'' "
-#: ../diskdrake.pm_.c:375
+#: ../../diskdrake.pm_.c:418
msgid "Use ``Unmount'' first"
msgstr "Сначала сделайте ``Unmount''"
-#: ../diskdrake.pm_.c:376 ../diskdrake.pm_.c:409
-msgid "changing type of"
-msgstr "изменение типа"
+#: ../../diskdrake.pm_.c:419 ../../diskdrake.pm_.c:461
+#, fuzzy, c-format
+msgid ""
+"After changing type of partition %s, all data on this partition will be lost"
+msgstr "все данные в этом разделе пропадут"
-#: ../diskdrake.pm_.c:388
+#: ../../diskdrake.pm_.c:431
msgid "Continue anyway?"
msgstr "Все-таки продолжать?"
-#: ../diskdrake.pm_.c:393
+#: ../../diskdrake.pm_.c:436
msgid "Quit without saving"
msgstr "Выйти без сохранения"
-#: ../diskdrake.pm_.c:393
+#: ../../diskdrake.pm_.c:436
msgid "Quit without writing the partition table?"
msgstr "Выйти без записи таблицы разделов"
-#: ../diskdrake.pm_.c:412
+#: ../../diskdrake.pm_.c:464
msgid "Change partition type"
msgstr "Изменить тип раздела"
-#: ../diskdrake.pm_.c:413
+#: ../../diskdrake.pm_.c:465
msgid "Which partition type do you want?"
msgstr "Какой тип раздела вам нужен"
-#: ../diskdrake.pm_.c:429
+#: ../../diskdrake.pm_.c:483
+#, fuzzy, c-format
+msgid "Where do you want to mount loopback file %s?"
+msgstr "Куда вы хотите смонтировать устройство %s?"
+
+#: ../../diskdrake.pm_.c:484
#, c-format
msgid "Where do you want to mount device %s?"
msgstr "Куда вы хотите смонтировать устройство %s?"
-#: ../diskdrake.pm_.c:451
-msgid "formatting"
-msgstr "форматирование"
+#: ../../diskdrake.pm_.c:489
+msgid ""
+"Can't unset mount point as this partition is used for loop back.\n"
+"Remove the loopback first"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:508
+#, fuzzy, c-format
+msgid "After formatting partition %s, all data on this partition will be lost"
+msgstr "все данные в этом разделе пропадут"
-#: ../diskdrake.pm_.c:453
+#: ../../diskdrake.pm_.c:510
msgid "Formatting"
msgstr "Форматирование"
-#: ../diskdrake.pm_.c:453 ../install_steps_interactive.pm_.c:221
+#: ../../diskdrake.pm_.c:511
+#, fuzzy, c-format
+msgid "Formatting loopback file %s"
+msgstr "Форматирование разделов %s"
+
+#: ../../diskdrake.pm_.c:512 ../../install_steps_interactive.pm_.c:253
#, c-format
msgid "Formatting partition %s"
msgstr "Форматирование разделов %s"
-#: ../diskdrake.pm_.c:458
+#: ../../diskdrake.pm_.c:517
msgid "After formatting all partitions,"
msgstr "После форматирования всех разделов"
-#: ../diskdrake.pm_.c:458
+#: ../../diskdrake.pm_.c:517
msgid "all data on these partitions will be lost"
msgstr "все данные в этих разделах будут потеряны"
-#: ../diskdrake.pm_.c:468
+#: ../../diskdrake.pm_.c:527
msgid "Move"
msgstr "Перемещение"
-#: ../diskdrake.pm_.c:469
-msgid "Which disk do you want to move to?"
+#: ../../diskdrake.pm_.c:528
+msgid "Which disk do you want to move it to?"
msgstr "На какой диск переместить?"
-#: ../diskdrake.pm_.c:473
+#: ../../diskdrake.pm_.c:532
msgid "Sector"
msgstr "Сектор"
-#: ../diskdrake.pm_.c:474
-msgid "Which sector do you want to move to?"
+#: ../../diskdrake.pm_.c:533
+msgid "Which sector do you want to move it to?"
msgstr "На какой сектор переместить?"
-#: ../diskdrake.pm_.c:477
+#: ../../diskdrake.pm_.c:536
msgid "Moving"
msgstr "Перемещаем"
-#: ../diskdrake.pm_.c:477
+#: ../../diskdrake.pm_.c:536
msgid "Moving partition..."
msgstr "Перемещается раздел..."
-#: ../diskdrake.pm_.c:487
+#: ../../diskdrake.pm_.c:546
#, c-format
msgid "Partition table of drive %s is going to be written to disk!"
msgstr "Таблица размещения устройтва %s будет записана на диск!"
-#: ../diskdrake.pm_.c:489
+#: ../../diskdrake.pm_.c:548
msgid "You'll need to reboot before the modification can take place"
msgstr "Чтобы изменения осуществились, необходимо перезагрузиться"
-#: ../diskdrake.pm_.c:510 ../install_steps_gtk.pm_.c:255
-msgid "Computing fat filesystem bounds"
+#: ../../diskdrake.pm_.c:569 ../../install_steps_gtk.pm_.c:208
+msgid "Computing FAT filesystem bounds"
msgstr "Вычисление границ файловой системы fat"
-#: ../diskdrake.pm_.c:510 ../diskdrake.pm_.c:555
-#: ../install_steps_gtk.pm_.c:255
+#: ../../diskdrake.pm_.c:569 ../../diskdrake.pm_.c:618
+#: ../../install_steps_gtk.pm_.c:208
msgid "Resizing"
msgstr "Изменение размера"
-#: ../diskdrake.pm_.c:524
-msgid "resizing"
-msgstr "изменение размера"
+#: ../../diskdrake.pm_.c:585
+#, fuzzy
+msgid "All data on this partition should be backed-up"
+msgstr "все данные в этом разделе пропадут"
-#: ../diskdrake.pm_.c:534
+#: ../../diskdrake.pm_.c:587
+#, fuzzy, c-format
+msgid "After resizing partition %s, all data on this partition will be lost"
+msgstr "все данные в этом разделе пропадут"
+
+#: ../../diskdrake.pm_.c:597
msgid "Choose the new size"
msgstr "Выбор нового размера"
-#: ../diskdrake.pm_.c:534 ../install_steps_gtk.pm_.c:317
-#: ../install_steps_gtk.pm_.c:361
+#: ../../diskdrake.pm_.c:597 ../../install_steps_graphical.pm_.c:287
+#: ../../install_steps_graphical.pm_.c:334
msgid "MB"
msgstr "MB"
-#: ../diskdrake.pm_.c:587
+#: ../../diskdrake.pm_.c:652
msgid "Create a new partition"
msgstr "Создание нового раздела"
-#: ../diskdrake.pm_.c:603
+#: ../../diskdrake.pm_.c:672
msgid "Start sector: "
msgstr "Начальный сектор:"
-#: ../diskdrake.pm_.c:606
+#: ../../diskdrake.pm_.c:676 ../../diskdrake.pm_.c:750
msgid "Size in MB: "
msgstr "Размер в MB:"
-#: ../diskdrake.pm_.c:609
+#: ../../diskdrake.pm_.c:679 ../../diskdrake.pm_.c:753
msgid "Filesystem type: "
msgstr "Тип файловой системы:"
-#: ../diskdrake.pm_.c:611
+#: ../../diskdrake.pm_.c:682
msgid "Preference: "
msgstr "Предпочтение: "
-#: ../diskdrake.pm_.c:655 ../diskdrake.pm_.c:671
+#: ../../diskdrake.pm_.c:729 ../../install_steps.pm_.c:132
+msgid "This partition can't be used for loopback"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:739
+msgid "Loopback"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:749
+msgid "Loopback file name: "
+msgstr ""
+
+#: ../../diskdrake.pm_.c:775
+msgid "File already used by another loopback, choose another one"
+msgstr ""
+
+#: ../../diskdrake.pm_.c:776
+#, fuzzy
+msgid "File already exists. Use it?"
+msgstr "Пункт %s уже существует"
+
+#: ../../diskdrake.pm_.c:798 ../../diskdrake.pm_.c:814
msgid "Select file"
msgstr "Выберите файл"
-#: ../diskdrake.pm_.c:664
+#: ../../diskdrake.pm_.c:807
msgid ""
"The backup partition table has not the same size\n"
"Still continue?"
@@ -835,11 +1151,11 @@ msgstr ""
"Резервная таблица размещения диска имеет другой разиер\n"
"Все-таки продолжать?"
-#: ../diskdrake.pm_.c:672
+#: ../../diskdrake.pm_.c:815
msgid "Warning"
msgstr "Внимание!"
-#: ../diskdrake.pm_.c:673
+#: ../../diskdrake.pm_.c:816
msgid ""
"Insert a floppy in drive\n"
"All data on this floppy will be lost"
@@ -847,68 +1163,77 @@ msgstr ""
"Вставьте дискету в устройство\n"
"Все данные на этой дискете пропадут"
-#: ../diskdrake.pm_.c:687
+#: ../../diskdrake.pm_.c:830
msgid "Trying to rescue partition table"
msgstr "Пробуем спасти таблицу разделов"
-#: ../diskdrake.pm_.c:698
+#: ../../diskdrake.pm_.c:841
msgid "device"
msgstr "устройство:"
-#: ../diskdrake.pm_.c:699
+#: ../../diskdrake.pm_.c:842
msgid "level"
msgstr "уровень"
-#: ../diskdrake.pm_.c:700
+#: ../../diskdrake.pm_.c:843
msgid "chunk size"
msgstr "размер chunk"
-#: ../diskdrake.pm_.c:712
+#: ../../diskdrake.pm_.c:855
msgid "Choose an existing RAID to add to"
msgstr "Выберите существующий RAID для добавления"
-#: ../diskdrake.pm_.c:713
+#: ../../diskdrake.pm_.c:856
msgid "new"
msgstr "новый"
-#: ../fs.pm_.c:67 ../fs.pm_.c:73
+#: ../../fs.pm_.c:85 ../../fs.pm_.c:91 ../../fs.pm_.c:97 ../../fs.pm_.c:103
#, c-format
msgid "%s formatting of %s failed"
msgstr "%s ошибка форматирования %s"
-#: ../fs.pm_.c:93
-#, c-format
-msgid "don't know how to format %s in type %s"
+#: ../../fs.pm_.c:129
+#, fuzzy, c-format
+msgid "I don't know how to format %s in type %s"
msgstr "Не знаю как форматировать %s с типом %s"
-#: ../fs.pm_.c:106
+#: ../../fs.pm_.c:186
msgid "nfs mount failed"
msgstr "ошибка монтирования nfs"
-#: ../fs.pm_.c:123
+#: ../../fs.pm_.c:209
msgid "mount failed: "
msgstr "ошибка монтирования: "
-#: ../fs.pm_.c:134
+#: ../../fs.pm_.c:220
#, c-format
msgid "error unmounting %s: %s"
msgstr "Ошибка размонтирования %s: %s"
-#: ../fsedit.pm_.c:219
+#: ../../fsedit.pm_.c:250
msgid "Mount points must begin with a leading /"
msgstr "Точка монтирования должна начинаться с /"
-#: ../fsedit.pm_.c:222
-#, c-format
-msgid "There is already a partition with mount point %s"
+#: ../../fsedit.pm_.c:253
+#, fuzzy, c-format
+msgid "There is already a partition with mount point %s\n"
msgstr "Уже есть раздел с точкой монтирования %s"
-#: ../fsedit.pm_.c:306
+#: ../../fsedit.pm_.c:261
+#, c-format
+msgid "Circular mounts %s\n"
+msgstr ""
+
+#: ../../fsedit.pm_.c:273
+msgid "You need a true filesystem (ext2, reiserfs) for this mount point\n"
+msgstr ""
+
+#: ../../fsedit.pm_.c:355
#, c-format
msgid "Error opening %s for writing: %s"
msgstr "Ошибка открытия %s для записи: %s"
-#: ../fsedit.pm_.c:388
+#: ../../fsedit.pm_.c:437
msgid ""
"An error has occurred - no valid devices were found on which to create new "
"filesystems. Please check your hardware for the cause of this problem"
@@ -916,59 +1241,91 @@ msgstr ""
"Произошла ошибка: устройства для создания новых файловых систем не найдены. "
"Проверьте оборудование для обнаружения вероятной причины."
-#: ../fsedit.pm_.c:403
+#: ../../fsedit.pm_.c:452
msgid "You don't have any partitions!"
msgstr "У вас не создано никаких разделов!"
-#: ../help.pm_.c:7
+#: ../../help.pm_.c:7
msgid "Choose preferred language for install and system usage."
msgstr "Выберите язык установки и работы системы"
-#: ../help.pm_.c:10
+#: ../../help.pm_.c:10
msgid "Choose the layout corresponding to your keyboard from the list above"
msgstr "Выберите раскладку своей клавиатуры в приведенном списке"
-#: ../help.pm_.c:13
+#: ../../help.pm_.c:13
+#, fuzzy
msgid ""
"Choose \"Install\" if there are no previous versions of Linux\n"
"installed, or if you wish to use multiple distributions or versions.\n"
"\n"
+"Choose \"Upgrade\" if you wish to update a previous version of Mandrake "
+"Linux:\n"
+"5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus), 6.1 (Helios), Gold "
+"2000\n"
+"or 7.0 (Air).\n"
+"\n"
+"\n"
+"Select:\n"
+"\n"
+" - Automated (recommended): If you have never installed Linux before, "
+"choose this. NOTE:\n"
+" networking will not be configured during installation, use "
+"\"LinuxConf\"\n"
+" to configure it after the install completes.\n"
+"\n"
+" - Customized: If you are familiar enough with GNU/Linux, you may then "
+"choose\n"
+" the primary usage for your machine. See below for details.\n"
"\n"
-"Choose \"Upgrade\" if you wish to update a previous version of Mandrake\n"
-"Linux: 5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus), 6.1\n"
-"(Helios) or Gold 2000."
+" - Expert: This supposes that you are fluent with GNU/Linux and want to\n"
+" perform a highly customized installation. As for a \"Customized\"\n"
+" installation class, you will be able to select the usage for your "
+"system.\n"
+" But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
+"DOING!\n"
msgstr ""
"Выберите \"Установка\", если нет установленных предшествующих версий Linux,\n"
"или если хотите использовать несколько дистрибутивов или версий.\n"
"\n"
-"\n"
"Выберите \"Обновить\" если вы надеетесь обновить предыдущую версию\n"
"Mandrake Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus),\n"
-"6.1 (Helios) или Gold 2000."
-
-#: ../help.pm_.c:22
-msgid ""
-"Select:\n"
+"6.1 (Helios), Gold 2000 или 7.0 (Air).\n"
"\n"
-" - Recommended: If you have never installed Linux before.\n"
"\n"
+"Выберите:\n"
"\n"
-" - Customized: If you are familiar with Linux, you will be able to \n"
-"select the usage for the installed system between normal, development or\n"
-"server. Choose \"Normal\" for a general purpose installation of your\n"
-"computer. You may choose \"Development\" if you will be using the computer\n"
-"primarily for software development, or choose \"Server\" if you wish to\n"
-"install a general purpose server (for mail, printing...).\n"
+" - Рекомендуется: если вы раньше никогда не устанавливали Linux.\n"
"\n"
+" - С настройкой: Если вы знакомы с Linux, то сможете выбрать из следующих \n"
+"видов использования системы: нормальный, для разработчика, или\n"
+"сервер. Выберите \"нормальный\" для установки системы общего назначения.\n"
+"Можно выбрать \"Разработка\" если вы будете использовать компьютер прежде\n"
+"всего для разработки программ, или выберите \"Сервер\" если хотите "
+"установить\n"
+"сервер общего назначения (для почты, печати...).\n"
"\n"
-" - Expert: If you are fluent with GNU/Linux and want to perform\n"
-"a highly customized installation, this Install Class is for you. You will\n"
-"be able to select the usage of your installed system as for \"Customized\"."
+" - Эксперт: Если вы свободно владеете GNU/Linux и хотите выполнить\n"
+"установку с глубокой настройкой, то этот Класс Установки - для вас. Вы \n"
+"сможете выбрать назначение системы, как и при \"С настройкой\".\n"
+
+#: ../../help.pm_.c:37
+msgid ""
+"Select:\n"
+"\n"
+" - Customized: If you are familiar enough with GNU/Linux, you may then "
+"choose\n"
+" the primary usage for your machine. See below for details.\n"
+"\n"
+" - Expert: This supposes that you are fluent with GNU/Linux and want to\n"
+" perform a highly customized installation. As for a \"Customized\"\n"
+" installation class, you will be able to select the usage for your "
+"system.\n"
+" But please, please, DO NOT CHOOSE THIS UNLESS YOU KNOW WHAT YOU ARE "
+"DOING!\n"
msgstr ""
"Выберите:\n"
"\n"
-" - Рекомендуется: если вы раньше никогда не устанавливали Linux.\n"
-"\n"
" - С настройкой: Если вы знакомы с Linux, то сможете выбрать из следующих \n"
"видов использования системы: нормальный, для разработчика, или\n"
"сервер. Выберите \"нормальный\" для установки системы общего назначения.\n"
@@ -980,9 +1337,36 @@ msgstr ""
"\n"
" - Эксперт: Если вы свободно владеете GNU/Linux и хотите выполнить\n"
"установку с глубокой настройкой, то этот Класс Установки - для вас. Вы \n"
-"сможете выбрать назначение системы, как и при \"С настройкой\"."
+"сможете выбрать назначение системы, как и при \"С настройкой\".\n"
+
+#: ../../help.pm_.c:49
+msgid ""
+"The different choices for your machine's usage (provided, hence, that you "
+"have\n"
+"chosen either \"Custom\" or \"Expert\" as an installation class) are the\n"
+"following:\n"
+"\n"
+" - Normal: choose this if you intend to use your machine primarily for\n"
+" everyday use (office work, graphics manipulation and so on). Do not\n"
+" expect any compiler, development utility et al. installed.\n"
+"\n"
+" - Development: as its name says. Choose this if you intend to use your\n"
+" machine primarily for software development. You will then have a "
+"complete\n"
+" collection of software installed in order to compile, debug and format\n"
+" source code, or create software packages.\n"
+"\n"
+" - Server: choose this if the machine which you're installing "
+"Linux-Mandrake\n"
+" on is intended to be used as a server. Either a file server (NFS or "
+"SMB),\n"
+" a print server (Unix' lp (Line Printer) protocol or Windows style SMB\n"
+" printing), an authentication server (NIS), a database server and so on. "
+"As\n"
+" such, do not expect any gimmicks (KDE, GNOME...) to be installed.\n"
+msgstr ""
-#: ../help.pm_.c:40
+#: ../../help.pm_.c:70
msgid ""
"DrakX will attempt at first to look for one or more PCI\n"
"SCSI adapter(s). If it finds it (or them) and knows which driver(s)\n"
@@ -1027,7 +1411,8 @@ msgstr ""
"рекомендуется руководством по установке. Это те опции, которые\n"
"надо задать драйверу."
-#: ../help.pm_.c:64
+#: ../../help.pm_.c:94
+#, fuzzy
msgid ""
"At this point, you may choose what partition(s) to use to install\n"
"your Linux-Mandrake system if they have been already defined (from a\n"
@@ -1052,8 +1437,19 @@ msgid ""
"\n"
"Because the effects of this process are usually irreversible, partitioning\n"
"can be intimidating and stressful to the unexperienced user. DiskDrake\n"
-"simplifies the process so that it need not be. Consult the documentation\n"
-"and take your time before proceeding."
+"simplifies the process so that it must not be. Consult the documentation\n"
+"and take your time before proceeding.\n"
+"\n"
+"\n"
+"You can reach any option using the keyboard: navigate through the "
+"partitions\n"
+"using Tab and Up/Down arrows. When a partition is selected, you can use:\n"
+"\n"
+"- Ctrl-c to create a new partition (when an empty partition is selected)\n"
+"\n"
+"- Ctrl-d to delete a partition\n"
+"\n"
+"- Ctrl-m to set the mount point\n"
msgstr ""
"Здесь можно определить, какие разделы использовать для установки\n"
"вашей системы Linux-Mandrake, если они уже были заданы (при предыдущей \n"
@@ -1074,7 +1470,7 @@ msgstr ""
"упрощает этот процесс, так что напряжение должно сниматься. Просмотрите\n"
"документацию и подготовьтесь заранее."
-#: ../help.pm_.c:90
+#: ../../help.pm_.c:131
msgid ""
"Any partitions that have been newly defined must be formatted for\n"
"use (formatting meaning creating a filesystem). At this time, you may\n"
@@ -1091,34 +1487,30 @@ msgstr ""
"особенно если они содержат файлы и данные, которые вы хотите сохранить.\n"
"Обычно сохраняют /home и /usr/local."
-#: ../help.pm_.c:98
+#: ../../help.pm_.c:139
msgid ""
-"You may now select the packages you wish to install.\n"
-"\n"
-"\n"
-"First you can select group of package to install or upgrade. After that\n"
-"you can select more packages according to the total size you wish to\n"
-"select.\n"
-"\n"
-"\n"
-"If you are in expert mode, you can select packages individually.\n"
-"Please note that some packages require the installation of others.\n"
-"These are referred to as package dependencies. The packages you select,\n"
-"and the packages they require will be automatically selected for\n"
-"install. It is impossible to install a package without installing all\n"
-"of its dependencies."
+"You may now select the group of packages you wish to\n"
+"install or upgrade.\n"
+"\n"
+"DrakX will then check whether you have enough room to install them all. If "
+"not,\n"
+"it will warn you about it. If you want to go on anyway, it will proceed "
+"onto\n"
+"the installation of all selected groups but will drop some packages of "
+"lesser\n"
+"interest. At the bottom of the list you can select the option\n"
+"\"Individual package selection\"; in this case you will have to browse\n"
+"through more than 1000 packages..."
+msgstr ""
+
+#: ../../help.pm_.c:150
+msgid ""
+"If you have all the CDs in the list above, click Ok.\n"
+"If you have none of those CDs, click Cancel.\n"
+"If only some CDs are missing, unselect them, then click Ok."
msgstr ""
-"Теперь можно выбрать пакеты, которые вы хотите установить.\n"
-"\n"
-"\n"
-"Если вы в режиме эксперта, то пакеты можно выбирать индивидуально.\n"
-"Имейте в виду, что некоторые пакеты требуют установки других пакетов.\n"
-"Это называется зависимостью пакетов. Пакеты, выбранные вами, и пакеты,\n"
-"от которых они зависят будут автоматически выбраны для установки.\n"
-"Невозможно установить пакет до установки всех пакетов, от которых\n"
-"он зависит."
-#: ../help.pm_.c:114
+#: ../../help.pm_.c:155
msgid ""
"The packages selected are now being installed. This operation\n"
"should take a few minutes unless you have chosen to upgrade an\n"
@@ -1130,7 +1522,7 @@ msgstr ""
"в последнем случае много времени потребуется еще до начала\n"
"обновления."
-#: ../help.pm_.c:120
+#: ../../help.pm_.c:161
msgid ""
"If DrakX failed to find your mouse, or if you want to\n"
"check what it has done, you will be presented the list of mice\n"
@@ -1160,15 +1552,15 @@ msgstr ""
"В случае последовательной мыши, вам также придется сообщить DrakX\n"
"к какому последовательному порту она подключена."
-#: ../help.pm_.c:135
+#: ../../help.pm_.c:176
msgid ""
-"Please select the correct port. For example, the COM1 port in MS Windows\n"
-"is named ttyS0 in Linux."
+"Please select the correct port. For example, the COM1 port under MS Windows\n"
+"is named ttyS0 under Linux."
msgstr ""
"Правильно выберите порт. Например, порт COM1 в MS Windows\n"
"называется ttyS0 в Linux."
-#: ../help.pm_.c:139
+#: ../../help.pm_.c:180
msgid ""
"This section is dedicated to configuring a local area\n"
"network (LAN) or a modem.\n"
@@ -1222,7 +1614,7 @@ msgstr ""
"частную сеть, например дома, вы должны выбрать \n"
"адреса "
-#: ../help.pm_.c:169
+#: ../../help.pm_.c:210
msgid ""
"Enter:\n"
"\n"
@@ -1251,7 +1643,7 @@ msgstr ""
"выберите этот вариант. В этом случае не надо задавать \"IP адрес\". \n"
"Если вы не уверены, спросите системного администратора.\n"
-#: ../help.pm_.c:184
+#: ../../help.pm_.c:225
msgid ""
"You may now enter dialup options. If you're not sure what to enter, the\n"
"correct information can be obtained from your ISP."
@@ -1259,15 +1651,15 @@ msgstr ""
"Теперь можно ввести параметры dialup. Если вы не знаете, что вводить, \n"
"можете получить точную информацию у своего провайдера интернет (ISP)."
-#: ../help.pm_.c:188
+#: ../../help.pm_.c:229
msgid ""
"If you will use proxies, please configure them now. If you don't know if\n"
-"you will use proxies, ask your network administrator or your ISP."
+"you should use proxies, ask your network administrator or your ISP."
msgstr ""
"Если будете использовать proxy, настройте сейчас. Если не знаете,\n"
"нужно ли это, обратитесь к администратору сети или интернет провайдеру."
-#: ../help.pm_.c:192
+#: ../../help.pm_.c:233
msgid ""
"You can install cryptographic package if your internet connection has been\n"
"set up correctly. First choose a mirror where you wish to download packages "
@@ -1285,12 +1677,12 @@ msgstr ""
"Учтите, что выбирать зеркало и пакеты надо с учетом законодательства\n"
"вашей страны."
-#: ../help.pm_.c:200
+#: ../../help.pm_.c:241
msgid ""
"You can now select your timezone according to where you live.\n"
"\n"
"\n"
-"Linux manages time in GMT or \"Greenwich Meridian Time\" and translates it\n"
+"Linux manages time in GMT or \"Greenwich Mean Time\" and translates it\n"
"in local time according to the time zone you have selected."
msgstr ""
"Теперь выберите часовой пояс в соответствии с местом своего проживания.\n"
@@ -1299,17 +1691,31 @@ msgstr ""
"Linux оперирует временем по Гринвичу (GMT) и переводит его в местное время\n"
"в соответствии с указанным вами часовым поясом."
-#: ../help.pm_.c:207
-msgid "Help"
-msgstr "Помощь"
+#: ../../help.pm_.c:248
+msgid ""
+"You may now choose which services you want to see started at boot time.\n"
+"When your mouse comes over an item, a small balloon help will popup which\n"
+"describes the role of the service.\n"
+"\n"
+"Be especially careful in this step if you intend to use your machine as a\n"
+"server: you will probably want not to start any services which you don't\n"
+"want."
+msgstr ""
-#: ../help.pm_.c:210
+#: ../../help.pm_.c:257
+#, fuzzy
msgid ""
"Linux can deal with many types of printer. Each of these\n"
-"types require a different setup.\n"
+"types require a different setup. Note however that the print\n"
+"spooler uses 'lp' as the default printer name; so you\n"
+"must have one printer with such a name; but you can give\n"
+"several names, separated by '|' characters, to a printer.\n"
+"So, if you prefer to have a more meaningful name you just have\n"
+"to put it first, eg: \"My Printer|lp\".\n"
+"The printer having \"lp\" in its name(s) will be the default printer.\n"
"\n"
"\n"
-"If your printer is directly connected to your computer, select\n"
+"If your printer is physically connected to your computer, select\n"
"\"Local printer\". You will then have to tell which port your\n"
"printer is connected to, and select the appropriate filter.\n"
"\n"
@@ -1349,7 +1755,7 @@ msgstr ""
"доступа к принтеру, и, конечно, имя принтера. То же самое и для\n"
"принтера NetWare, только не требутся информация о рабочей группе."
-#: ../help.pm_.c:233
+#: ../../help.pm_.c:286
msgid ""
"You can now enter the root password for your Linux-Mandrake\n"
"system. The password must be entered twice to verify that both\n"
@@ -1362,7 +1768,7 @@ msgid ""
"be extremely dangerous to the integrity of the system and its data,\n"
"and other systems connected to it. The password should be a\n"
"mixture of alphanumeric characters and a least 8 characters long. It\n"
-"should *never* be written down. Do not make the password too long or\n"
+"should NEVER be written down. Do not make the password too long or\n"
"complicated, though: you must be able to remember without too much\n"
"effort."
msgstr ""
@@ -1381,7 +1787,7 @@ msgstr ""
"длинным или сложным: он должен запоминаться без особого\n"
"напряжения."
-#: ../help.pm_.c:249
+#: ../../help.pm_.c:302
msgid ""
"To enable a more secure system, you should select \"Use shadow file\" and\n"
"\"Use MD5 passwords\"."
@@ -1390,7 +1796,7 @@ msgstr ""
"файл\" \n"
"и \"Использовать пароли MD5\"."
-#: ../help.pm_.c:253
+#: ../../help.pm_.c:306
msgid ""
"If your network uses NIS, select \"Use NIS\". If you don't know, ask your\n"
"network administrator."
@@ -1398,7 +1804,7 @@ msgstr ""
"Если в вашей сети используется NIS, выберите \"Использовать NIS\". Если \n"
"не знаете, спросите администратора сети."
-#: ../help.pm_.c:257
+#: ../../help.pm_.c:310
msgid ""
"You may now create one or more \"regular\" user account(s), as\n"
"opposed to the \"privileged\" user account, root. You can create\n"
@@ -1440,7 +1846,7 @@ msgstr ""
"которого вы сейчас и создадите, а входить с правами root надо только\n"
"в целях администрирования и обслуживания системы."
-#: ../help.pm_.c:276
+#: ../../help.pm_.c:329
msgid ""
"It is strongly recommended that you answer \"Yes\" here. If you install\n"
"Microsoft Windows at a later date it will overwrite the boot sector.\n"
@@ -1452,7 +1858,7 @@ msgstr ""
"И если вы не создали загрузочный диск, вы не сможете больше загрузить\n"
"Linux!"
-#: ../help.pm_.c:282
+#: ../../help.pm_.c:335
msgid ""
"You need to indicate where you wish\n"
"to place the information required to boot to Linux.\n"
@@ -1468,57 +1874,38 @@ msgstr ""
"Если вы не представляете абсолютно ясно, что вы делаете, \n"
"\"Первй сектор на диске (MBR)\"."
-#: ../help.pm_.c:290
+#: ../../help.pm_.c:343
+#, fuzzy
msgid ""
"Unless you know specifically otherwise, the usual choice is \"/dev/hda\"\n"
-"(the master drive on the primary channel)."
+" (primary master IDE disk) or \"/dev/sda\" (first SCSI disk)."
msgstr ""
"Если не знаете точно, обычным выбором является \"/dev/hda\"\n"
"(мастер диск на первом канале)."
-#: ../help.pm_.c:294
+#: ../../help.pm_.c:347
msgid ""
-"LILO (the LInux LOader) can boot Linux and other operating systems.\n"
-"Normally they are correctly detected during installation. If you don't\n"
-"see yours detected, you can add one or more now.\n"
+"LILO (the LInux LOader) and Grub are bootloaders: they are able to boot\n"
+"either Linux or any other operating system present on your computer.\n"
+"Normally, these other operating systems are correctly detected and\n"
+"installed. If this is not the case, you can add an entry by hand in this\n"
+"screen. Be careful as to choose the correct parameters.\n"
"\n"
"\n"
-"If you don't want that everybody could access at one of them, you can "
-"remove\n"
-"it now (a boot disk will be needed to boot it)."
+"You may also want not to give access to these other operating systems to\n"
+"anyone, in which case you can delete the corresponding entries. But\n"
+"in this case, you will need a boot disk in order to boot them!"
msgstr ""
-"LILO (LInux LOader) может загрузить Linux и другие операционные системы.\n"
-"Обычно они корректно определяются при установке. Если ваша не определится,\n"
-"вы можете добавить сейчас одну или несколько.\n"
-"\n"
-"\n"
-"Если не хотите, чтобы все имели доступ к одной из них, удалите ее сейчас\n"
-"(для ее загрузки потребуется загрузочный диск)."
-#: ../help.pm_.c:303
+#: ../../help.pm_.c:359
+#, fuzzy
msgid ""
-"LILO main options are:\n"
+"LILO and grub main options are:\n"
" - Boot device: Sets the name of the device (e.g. a hard disk\n"
"partition) that contains the boot sector. Unless you know specifically\n"
"otherwise, choose \"/dev/hda\".\n"
"\n"
"\n"
-" - Linear: Generate linear sector addresses instead of\n"
-"sector/head/cylinder addresses. Linear addresses are translated at run\n"
-"time and do not depend on disk geometry. Note that boot disks may not be\n"
-"portable if \"linear\" is used, because the BIOS service to determine the\n"
-"disk geometry does not work reliably for floppy disks. When using\n"
-"\"linear\" with large disks, /sbin/lilo may generate references to\n"
-"inaccessible disk areas, because 3D sector addresses are not known\n"
-"before boot time.\n"
-"\n"
-"\n"
-" - Compact: Tries to merge read requests for adjacent sectors into a\n"
-"single read request. This drastically reduces load time and keeps the\n"
-"map smaller. Using \"compact\" is especially recommended when booting from\n"
-"a floppy disk.\n"
-"\n"
-"\n"
" - Delay before booting default image: Specifies the number in tenths\n"
"of a second the boot loader should wait before booting the first image.\n"
"This is useful on systems that immediately boot from the hard disk after\n"
@@ -1567,7 +1954,7 @@ msgstr ""
" * normal: выбрать текстовый режим 80x25.\n"
" * <number>: выбрать соответствующий текстовый режим."
-#: ../help.pm_.c:338
+#: ../../help.pm_.c:378
msgid ""
"Now it's time to configure the X Window System, which is the\n"
"core of the Linux GUI (Graphical User Interface). For this purpose,\n"
@@ -1592,7 +1979,7 @@ msgstr ""
"ли вас установки. Если нет, вы можете вернуться и изменять их\n"
"сколько вам угодно."
-#: ../help.pm_.c:351
+#: ../../help.pm_.c:391
msgid ""
"If something is wrong in X configuration, use these options to correctly\n"
"configure the X Window System."
@@ -1600,7 +1987,7 @@ msgstr ""
"Если что то не в порядке с насройкой X , используйте эти параметры для \n"
"корректной настройки X Window System."
-#: ../help.pm_.c:355
+#: ../../help.pm_.c:395
msgid ""
"If you prefer to use a graphical login, select \"Yes\". Otherwise, select\n"
"\"No\"."
@@ -1608,34 +1995,43 @@ msgstr ""
"Если вы предпочитаете графический вход (login), Выберите \"Да\". Иначе - \n"
"\"нет\"."
-#: ../help.pm_.c:359
+#: ../../help.pm_.c:399
+#, fuzzy
msgid ""
-"You can now select some miscellaneous options for you system.\n"
-"\n"
-" - Use hard drive optimizations: This option can improve hard disk\n"
-"accesses but is only for advanced users, it can ruin your hard drive if\n"
-"used incorrectly. Use it only if you know how.\n"
-"\n"
-"\n"
-" - Choose security level: You can choose a security level for your\n"
-"system.\n"
-" Please refer to the manual for more information.\n"
-"\n"
-"\n"
-" - Precise RAM size if needed: In some cases, Linux is unable to\n"
-"correctly detect all the installed RAM on some systems. If this is the\n"
-"case, specify the correct quantity. Note: a difference of 2 or 4 Mb is\n"
-"normal.\n"
-"\n"
-"\n"
-" - Removable media automounting: If you would prefer not to manually\n"
-"mount removable drives (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
-"\"umount\", select this option. \n"
-"\n"
-"\n"
-" - Enable Num Lock at startup: If you want Number Lock enabled after\n"
-"booting, select this option (Note: Num Lock will still not work under\n"
-"X)."
+"You can now select some miscellaneous options for your system.\n"
+"\n"
+" - Use hard drive optimizations: this option can improve hard disk "
+"performance\n"
+" but is only for advanced users: some buggy chipsets can ruin your data, "
+"so\n"
+" beware. Note that the kernel has a builtin blacklist of drives and\n"
+" chipsets, but if you want to avoid bad surprises, leave this option "
+"unset.\n"
+"\n"
+" - Choose security level: you can choose a security level for your\n"
+" system. Please refer to the manual for complete information. Basically: "
+"if\n"
+" you don't know, select \"Medium\" ; if you really want to have a secure\n"
+" machine, choose \"Paranoid\" but beware: IN THIS LEVEL, ROOT LOGIN AT\n"
+" CONSOLE IS NOT ALLOWED! If you want to be root, you have to login as a "
+"user\n"
+" and then use \"su\". More generally, do not expect to use your machine\n"
+" for anything but as a server. You have been warned.\n"
+"\n"
+" - Precise RAM size if needed: unfortunately, in today's PC world, there is "
+"no\n"
+" standard method to ask the BIOS about the amount of RAM present in your\n"
+" computer. As a consequence, Linux may fail to detect your amount of RAM\n"
+" correctly. If this is the case, you can specify the correct amount of "
+"RAM\n"
+" here. Note that a difference of 2 or 4 MB is normal.\n"
+"\n"
+" - Removable media automounting: if you would prefer not to manually\n"
+" mount removable media (CD-ROM, Floppy, Zip) by typing \"mount\" and\n"
+" \"umount\", select this option. \n"
+"\n"
+" - Enable NumLock at startup: if you want NumLock enabled after booting,\n"
+" select this option (Note: NumLock may or may not work under X)."
msgstr ""
"Теперь вы можете выбрать некоторые дополнительные параметры системы.\n"
"\n"
@@ -1665,7 +2061,7 @@ msgstr ""
"включен под\n"
"X)."
-#: ../help.pm_.c:387
+#: ../../help.pm_.c:428
msgid ""
"Your system is going to reboot.\n"
"\n"
@@ -1680,108 +2076,98 @@ msgstr ""
"Если хотите перезагрузиться другой операционной системой, читайте \n"
"дополнительные инструкции."
-#: ../install2.pm_.c:43
+#: ../../install2.pm_.c:43
msgid "Choose your language"
msgstr "Выберите язык"
-#: ../install2.pm_.c:44
+#: ../../install2.pm_.c:44
msgid "Select installation class"
msgstr "Класс установки"
-#: ../install2.pm_.c:45
-msgid "Setup SCSI"
-msgstr "Настройка SCSI"
-
-#: ../install2.pm_.c:46
-msgid "Choose install or upgrade"
-msgstr "Установка или обновление"
+#: ../../install2.pm_.c:45
+#, fuzzy
+msgid "Hard drive detection"
+msgstr "Использовать оптимизацию жесткого диска?"
-#: ../install2.pm_.c:47
+#: ../../install2.pm_.c:46
msgid "Configure mouse"
msgstr "Настройка мыши"
-#: ../install2.pm_.c:48
+#: ../../install2.pm_.c:47
msgid "Choose your keyboard"
msgstr "Выбор клавиатуры"
-#: ../install2.pm_.c:49
+#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:318
msgid "Miscellaneous"
msgstr "Прочее"
-#: ../install2.pm_.c:50
+#: ../../install2.pm_.c:49
msgid "Setup filesystems"
msgstr "Настр. файловых систем"
-#: ../install2.pm_.c:51
+#: ../../install2.pm_.c:50
msgid "Format partitions"
msgstr "форматирование разделов"
-#: ../install2.pm_.c:52
+#: ../../install2.pm_.c:51
msgid "Choose packages to install"
msgstr "Выбор пакетов"
-#: ../install2.pm_.c:53
+#: ../../install2.pm_.c:52
msgid "Install system"
msgstr "Установка системы"
-#: ../install2.pm_.c:54
+#: ../../install2.pm_.c:53
msgid "Configure networking"
msgstr "Настройка сети"
-#: ../install2.pm_.c:55
+#: ../../install2.pm_.c:54
msgid "Cryptographic"
msgstr "Криптография"
-#: ../install2.pm_.c:56
+#: ../../install2.pm_.c:55
msgid "Configure timezone"
msgstr "Настройка часового пояса"
-#: ../install2.pm_.c:58
+#: ../../install2.pm_.c:56
+#, fuzzy
+msgid "Configure services"
+msgstr "Настройка принтера"
+
+#: ../../install2.pm_.c:57
msgid "Configure printer"
msgstr "Настройка принтера"
-#: ../install2.pm_.c:59 ../install_steps_interactive.pm_.c:576
-#: ../install_steps_interactive.pm_.c:577
+#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:652
+#: ../../install_steps_interactive.pm_.c:653
msgid "Set root password"
msgstr "Пароль для root"
-#: ../install2.pm_.c:60
+#: ../../install2.pm_.c:59
msgid "Add a user"
msgstr "Добавить пользователя"
-#: ../install2.pm_.c:61
+#: ../../install2.pm_.c:61
msgid "Create a bootdisk"
msgstr "Создать загруз. диск"
-#: ../install2.pm_.c:62
+#: ../../install2.pm_.c:63
msgid "Install bootloader"
msgstr "Установка LILO"
-#: ../install2.pm_.c:63
+#: ../../install2.pm_.c:64
msgid "Configure X"
msgstr "Настройка X Window"
-#: ../install2.pm_.c:64
+#: ../../install2.pm_.c:65
+msgid "Auto install floppy"
+msgstr ""
+
+#: ../../install2.pm_.c:66
msgid "Exit install"
msgstr "Выход из инсталляции"
-#: ../install2.pm_.c:83
-msgid "beginner"
-msgstr "начинающий"
-
-#: ../install2.pm_.c:83
-msgid "developer"
-msgstr "разработчик"
-
-#: ../install2.pm_.c:83
-msgid "expert"
-msgstr "эксперт"
-
-#: ../install2.pm_.c:83
-msgid "server"
-msgstr "сервер"
-
-#: ../install2.pm_.c:311
+#: ../../install2.pm_.c:308
msgid ""
"You must have a root partition.\n"
"For this, create a partition (or click on an existing one).\n"
@@ -1791,11 +2177,7 @@ msgstr ""
"Для этого создайте раздел (или укажите уже существующий).\n"
"Затем выберите ``Точка монтирования'' и установите ее в `/'"
-#: ../install2.pm_.c:327
-msgid "Not enough swap to fulfill installation, please add some"
-msgstr "Недостаточный размер буфера (swap) для установки, немного увеличьте"
-
-#: ../install_any.pm_.c:194 ../standalone/diskdrake_.c:61
+#: ../../install_any.pm_.c:331 ../../standalone/diskdrake_.c:61
msgid ""
"I can't read your partition table, it's too corrupted for me :(\n"
"I'll try to go on blanking bad partitions"
@@ -1803,43 +2185,38 @@ msgstr ""
"Таблица разделов не читается, она слишком испорчена :(\n"
"Постараюсь идти дальше, пропуская плохие разделы"
-#: ../install_any.pm_.c:210
+#: ../../install_any.pm_.c:348
msgid ""
"DiskDrake failed to read correctly the partition table.\n"
"Continue at your own risk!"
msgstr "Продолжать на свой страх и риск"
-#: ../install_any.pm_.c:220
+#: ../../install_any.pm_.c:370
msgid "Searching root partition."
msgstr "Поиск корневого раздела"
-#: ../install_any.pm_.c:249
+#: ../../install_any.pm_.c:399
msgid "Information"
msgstr "Информация"
-#: ../install_any.pm_.c:250
+#: ../../install_any.pm_.c:400
#, c-format
msgid "%s: This is not a root partition, please select another one."
msgstr "%s: Это не корневой раздел, пожалуйста выберите другой"
-#: ../install_any.pm_.c:252
+#: ../../install_any.pm_.c:402
msgid "No root partition found"
msgstr "Корневой раздел не найден"
-#: ../install_any.pm_.c:289
+#: ../../install_any.pm_.c:440
msgid "Can't use broadcast with no NIS domain"
msgstr "Невозможно использовать broadcast без домена NIS"
-#: ../install_any.pm_.c:473
+#: ../../install_any.pm_.c:602
msgid "Error reading file $f"
msgstr "Ошибка чтения файла $f"
-#: ../install_any.pm_.c:479
-#, c-format
-msgid "Bad kickstart file %s (failed %s)"
-msgstr "Плохой стартовый (kickstart) файл %s (ошибка %s)"
-
-#: ../install_steps.pm_.c:72
+#: ../../install_steps.pm_.c:75
msgid ""
"An error occurred, but I don't know how to handle it nicely.\n"
"Continue at your own risk."
@@ -1847,54 +2224,39 @@ msgstr ""
"Произошла ошибка, но я не знаю, как ее корректно обработать,\n"
"поэтому продолжайте на свой страх и риск :("
-#: ../install_steps.pm_.c:136
+#: ../../install_steps.pm_.c:174
#, c-format
msgid "Duplicate mount point %s"
msgstr "Дублирование точки монтирования %s"
-#: ../install_steps.pm_.c:295
+#: ../../install_steps.pm_.c:318
+msgid ""
+"Some important packages didn't get installed properly.\n"
+"Either your cdrom drive or your cdrom is defective.\n"
+"Check the cdrom on an installed computer using \"rpm -qpl "
+"Mandrake/RPMS/*.rpm\"\n"
+msgstr ""
+
+#: ../../install_steps.pm_.c:385
#, fuzzy, c-format
msgid "Welcome to %s"
msgstr "Добро пожаловить в Crackers"
-#: ../install_steps.pm_.c:562
+#: ../../install_steps.pm_.c:737
msgid "No floppy drive available"
msgstr "Дисковод недоступен"
-#: ../install_steps_auto_install.pm_.c:18 ../install_steps_stdio.pm_.c:26
+#: ../../install_steps_auto_install.pm_.c:18 ../../install_steps_gtk.pm_.c:125
+#: ../../install_steps_stdio.pm_.c:26
#, c-format
msgid "Entering step `%s'\n"
msgstr "Переход на этап `%s'\n"
-#: ../install_steps_gtk.pm_.c:259
-msgid ""
-"WARNING!\n"
-"\n"
-"DrakX now needs to resize your Windows partition. Be careful: this operation "
-"is\n"
-"dangerous. If you have not already done so, you should first exit the\n"
-"installation, run scandisk under Windows (and optionally run defrag), then\n"
-"restart the installation. You should also backup your data.\n"
-"When sure, press Ok."
-msgstr ""
-"ВНИМАНИЕ!\n"
-"\n"
-"DrakX теперь должен изменить размер вашего раздела Windows. Будьте "
-"осторожны: эта операция опасна. \n"
-"Запустите scandisk, если вы не сделали это до сих пор.(и \n"
-"желательно defrag) на этом разделе, а также сделайте резервную копию "
-"данных.\n"
-"Если готовы, нажмите Ok."
-
-#: ../install_steps_gtk.pm_.c:278
-msgid "Automatic resizing failed"
-msgstr "Авто изменение размера провалилось"
-
-#: ../install_steps_gtk.pm_.c:294
+#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:249
msgid "You must have a swap partition"
msgstr "У вас должен быть раздел swap"
-#: ../install_steps_gtk.pm_.c:296
+#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:251
msgid ""
"You don't have a swap partition\n"
"\n"
@@ -1904,232 +2266,467 @@ msgstr ""
"\n"
"Все-таки продолжать?"
-#: ../install_steps_gtk.pm_.c:312
-msgid ""
-"Now that you've selected desired groups, please choose \n"
-"how many packages you want, ranging from minimal to full \n"
-"installation of each selected groups."
-msgstr ""
-
-#: ../install_steps_gtk.pm_.c:315
-msgid "You will be able to choose more precisely in next step"
-msgstr "Более точный выбор можно будет сделать на следующем шаге"
-
-#: ../install_steps_gtk.pm_.c:317
+#: ../../install_steps_graphical.pm_.c:287
msgid "Choose the size you want to install"
msgstr "Выберите желательный размер установки"
-#: ../install_steps_gtk.pm_.c:361
+#: ../../install_steps_graphical.pm_.c:334
msgid "Total size: "
msgstr "Общий размер:"
-#: ../install_steps_gtk.pm_.c:372
-msgid "Bad package"
-msgstr "Плохой пакета"
-
-#: ../install_steps_gtk.pm_.c:373 ../standalone/rpmdrake_.c:136
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:447
+#: ../../standalone/rpmdrake_.c:136
#, c-format
msgid "Version: %s\n"
msgstr "Версия: %s\n"
-#: ../install_steps_gtk.pm_.c:374 ../standalone/rpmdrake_.c:137
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:448
+#: ../../standalone/rpmdrake_.c:137
#, c-format
msgid "Size: %d KB\n"
msgstr "Размер : %d KB\n"
-#: ../install_steps_gtk.pm_.c:489
+#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:360
msgid "Choose the packages you want to install"
msgstr "Выбор пакетов для установки"
-#: ../install_steps_gtk.pm_.c:492
+#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:363
msgid "Info"
msgstr "Информация"
-#: ../install_steps_gtk.pm_.c:500 ../install_steps_interactive.pm_.c:81
-#: ../standalone/rpmdrake_.c:161
+#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:368
+#: ../../install_steps_interactive.pm_.c:129 ../../standalone/rpmdrake_.c:161
msgid "Install"
msgstr "Установка"
-#: ../install_steps_gtk.pm_.c:519 ../install_steps_interactive.pm_.c:317
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:533
+#: ../../install_steps_interactive.pm_.c:382
msgid "Installing"
msgstr "Установка"
-#: ../install_steps_gtk.pm_.c:522
-msgid "Estimating"
-msgstr "Смета"
-
-#: ../install_steps_gtk.pm_.c:526
+#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:539
msgid "Please wait, "
msgstr "Подождите пожалуйста, "
-#: ../install_steps_gtk.pm_.c:528
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:541
msgid "Time remaining "
msgstr "Оставшееся время "
-#: ../install_steps_gtk.pm_.c:529
+#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:542
msgid "Total time "
msgstr "Общее время"
-#: ../install_steps_gtk.pm_.c:534 ../install_steps_interactive.pm_.c:317
+#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:551
+#: ../../install_steps_interactive.pm_.c:382
msgid "Preparing installation"
msgstr "Подготовка установки"
-#: ../install_steps_gtk.pm_.c:544
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:566
+#, c-format
+msgid "Installing package %s"
+msgstr "Установка пакета %s"
+
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:607
+#: ../../install_steps_gtk.pm_.c:611
+msgid "Go on anyway?"
+msgstr "Все равно продолжать?"
+
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:607
+msgid "There was an error ordering packages:"
+msgstr "Произошла ошибка упорядочения пакетов:"
+
+#: ../../install_steps_graphical.pm_.c:577
+#: ../../install_steps_interactive.pm_.c:997
+msgid "Use existing configuration for X11?"
+msgstr "Использовать существующую настройку для X11?"
+
+#: ../../install_steps_gtk.pm_.c:154
+#, fuzzy
+msgid "Please, choose one of the following classes of installation:"
+msgstr "Предоставьте следующую информацию"
+
+#: ../../install_steps_gtk.pm_.c:195
+#, fuzzy
+msgid "You don't have any windows partitions!"
+msgstr "У вас не создано никаких разделов!"
+
+#: ../../install_steps_gtk.pm_.c:197
+#, fuzzy
+msgid "You don't have any enough room for Lnx4win"
+msgstr "У вас не создано никаких разделов!"
+
+#: ../../install_steps_gtk.pm_.c:213
+msgid ""
+"WARNING!\n"
+"\n"
+"DrakX now needs to resize your Windows partition. Be careful: this operation "
+"is\n"
+"dangerous. If you have not already done so, you should first exit the\n"
+"installation, run scandisk under Windows (and optionally run defrag), then\n"
+"restart the installation. You should also backup your data.\n"
+"When sure, press Ok."
+msgstr ""
+"ВНИМАНИЕ!\n"
+"\n"
+"DrakX теперь должен изменить размер вашего раздела Windows. Будьте "
+"осторожны: эта операция опасна. \n"
+"Запустите scandisk, если вы не сделали это до сих пор.(и \n"
+"желательно defrag) на этом разделе, а также сделайте резервную копию "
+"данных.\n"
+"Если готовы, нажмите Ok."
+
+#: ../../install_steps_gtk.pm_.c:232
+msgid "Automatic resizing failed"
+msgstr "Авто изменение размера провалилось"
+
+#: ../../install_steps_gtk.pm_.c:261
+#, fuzzy
+msgid "Which partition do you want to use to put Linux4Win?"
+msgstr "Какой раздел диска хотите использовать в качестве корневого?"
+
+#: ../../install_steps_gtk.pm_.c:280
+#, fuzzy
+msgid "Choose the sizes"
+msgstr "Выбор нового размера"
+
+#: ../../install_steps_gtk.pm_.c:282
+#, fuzzy
+msgid "Root partition size in MB: "
+msgstr "Корневой раздел"
+
+#: ../../install_steps_gtk.pm_.c:284
+#, fuzzy
+msgid "Swap partition size in MB: "
+msgstr "Размер в MB:"
+
+#: ../../install_steps_gtk.pm_.c:316
+#, c-format
+msgid ""
+"The total size for the groups you have selected is approximately %d MB.\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:318
+msgid ""
+"If you wish to install less than this size,\n"
+"select the percentage of packages that you want to install.\n"
+"\n"
+"A low percentage will install only the most important packages;\n"
+"a percentage of 100%% will install all selected packages."
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:323
+msgid ""
+"You have space on your disk for only %d%% of these packages.\n"
+"\n"
+"If you wish to install less than this,\n"
+"select the percentage of packages that you want to install.\n"
+"A low percentage will install only the most important packages;\n"
+"a percentage of %d%% will install as many packages as possible."
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:329
+#, fuzzy
+msgid "You will be able to choose them more specifically in the next step."
+msgstr "Более точный выбор можно будет сделать на следующем шаге"
+
+#: ../../install_steps_gtk.pm_.c:331
+#, fuzzy
+msgid "Percentage of packages to install"
+msgstr "Выбор пакетов"
+
+#: ../../install_steps_gtk.pm_.c:372
+#, fuzzy
+msgid "Automatic dependencies"
+msgstr "Проверка завистимостей"
+
+#: ../../install_steps_gtk.pm_.c:425 ../../standalone/rpmdrake_.c:101
+msgid "Expand Tree"
+msgstr "Развернуть дерево"
+
+#: ../../install_steps_gtk.pm_.c:426 ../../standalone/rpmdrake_.c:102
+msgid "Collapse Tree"
+msgstr "Свернуть дерево"
+
+#: ../../install_steps_gtk.pm_.c:427
+msgid "Toggle between flat and group sorted"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:445
+msgid "Bad package"
+msgstr "Плохой пакета"
+
+#: ../../install_steps_gtk.pm_.c:446
+#, c-format
+msgid "Name: %s\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:449
+#, c-format
+msgid "Importance: %s\n"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:457
+#, fuzzy, c-format
+msgid "Total size: %d / %d MB"
+msgstr "Общий размер:"
+
+#: ../../install_steps_gtk.pm_.c:467
+msgid "This is a mandatory package, it can't be unselected"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:469
+msgid "You can't unselect this package. It is already installed"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:473
+msgid ""
+"This package must be upgraded\n"
+"Are you sure you want to deselect it?"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:476
+msgid "You can't unselect this package. It must be upgraded"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:489
+msgid ""
+"You can't select this package as there is not enough space left to install it"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:492
+#, fuzzy
+msgid "The following packages are going to be installed/removed"
+msgstr "Намечены к удалению из системы следующие пакеты"
+
+#: ../../install_steps_gtk.pm_.c:501
+msgid "You can't select/unselect this package"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:536
+msgid "Estimating"
+msgstr "Смета"
+
+#: ../../install_steps_gtk.pm_.c:548 ../../interactive.pm_.c:84
+#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
+#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:201 ../../my_gtk.pm_.c:459
+msgid "Cancel"
+msgstr "Отмена"
+
+#: ../../install_steps_gtk.pm_.c:561
#, c-format
msgid "%d packages"
msgstr "пакетов: %d "
-#: ../install_steps_gtk.pm_.c:544
+#: ../../install_steps_gtk.pm_.c:561
msgid ", %U MB"
msgstr ", %U MB"
-#: ../install_steps_gtk.pm_.c:549
+#: ../../install_steps_gtk.pm_.c:592
#, c-format
-msgid "Installing package %s"
-msgstr "Установка пакета %s"
-
-#: ../install_steps_gtk.pm_.c:574
-msgid "Go on anyway?"
-msgstr "Все равно продолжать?"
+msgid ""
+"Change your Cd-Rom!\n"
+"\n"
+"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
+"done.\n"
+"If you don't have it, press Cancel to avoid installation from this Cd-Rom."
+msgstr ""
-#: ../install_steps_gtk.pm_.c:574
-msgid "There was an error ordering packages:"
+#: ../../install_steps_gtk.pm_.c:611
+#, fuzzy
+msgid "There was an error installing packages:"
msgstr "Произошла ошибка упорядочения пакетов:"
-#: ../install_steps_interactive.pm_.c:37
+#: ../../install_steps_interactive.pm_.c:40
msgid "An error occurred"
msgstr "Произошла ошибка"
-#: ../install_steps_interactive.pm_.c:54
-msgid "Which language do you want?"
-msgstr "Выберите язык"
+#: ../../install_steps_interactive.pm_.c:57
+msgid "Please, choose a language to use."
+msgstr ""
-#: ../install_steps_interactive.pm_.c:68 ../standalone/keyboarddrake_.c:22
+#: ../../install_steps_interactive.pm_.c:72
+#: ../../standalone/keyboarddrake_.c:22
msgid "Keyboard"
msgstr "Клавиатура"
-#: ../install_steps_interactive.pm_.c:69 ../standalone/keyboarddrake_.c:23
-msgid "What is your keyboard layout?"
+#: ../../install_steps_interactive.pm_.c:73
+#, fuzzy
+msgid "Please, choose your keyboard layout."
msgstr "Укажите тип клавиатуры"
-#: ../install_steps_interactive.pm_.c:79
-msgid "Install/Upgrade"
-msgstr "Установка/Обновление"
-
-#: ../install_steps_interactive.pm_.c:80
-msgid "Is this an install or an upgrade?"
-msgstr "Это установка или обновление?"
-
-#: ../install_steps_interactive.pm_.c:81
-msgid "Upgrade"
-msgstr "Обновление"
+#: ../../install_steps_interactive.pm_.c:81
+msgid "You can choose other languages that will be available after install"
+msgstr ""
-#: ../install_steps_interactive.pm_.c:89
+#: ../../install_steps_interactive.pm_.c:91
msgid "Root Partition"
msgstr "Корневой раздел"
-#: ../install_steps_interactive.pm_.c:90
+#: ../../install_steps_interactive.pm_.c:92
msgid "What is the root partition (/) of your system?"
msgstr "Выбор разделов для форматирования"
-#: ../install_steps_interactive.pm_.c:100
-msgid "Recommended"
-msgstr "Рекомендуется"
+#: ../../install_steps_interactive.pm_.c:100
+#: ../../install_steps_interactive.pm_.c:140
+msgid "Install Class"
+msgstr "Класс Установки"
-#: ../install_steps_interactive.pm_.c:101
+#: ../../install_steps_interactive.pm_.c:100
+#, fuzzy
+msgid "Which installation class do you want?"
+msgstr "Выберите класс установки"
+
+#: ../../install_steps_interactive.pm_.c:102
+msgid "Install/Upgrade"
+msgstr "Установка/Обновление"
+
+#: ../../install_steps_interactive.pm_.c:102
+msgid "Is this an install or an upgrade?"
+msgstr "Это установка или обновление?"
+
+#: ../../install_steps_interactive.pm_.c:110
+#, fuzzy
+msgid "Automated"
+msgstr "Автоматический IP"
+
+#: ../../install_steps_interactive.pm_.c:112
+#: ../../install_steps_interactive.pm_.c:124
msgid "Customized"
msgstr "Настроено"
-#: ../install_steps_interactive.pm_.c:102
+#: ../../install_steps_interactive.pm_.c:113
+#: ../../install_steps_interactive.pm_.c:124
msgid "Expert"
msgstr "Эксперт"
-#: ../install_steps_interactive.pm_.c:104
-#: ../install_steps_interactive.pm_.c:118
-msgid "Install Class"
-msgstr "Класс Установки"
+#: ../../install_steps_interactive.pm_.c:122
+msgid ""
+"Are you sure you are an expert? \n"
+"You will be allowed to make powerfull but dangerous things here."
+msgstr ""
-#: ../install_steps_interactive.pm_.c:105
-msgid "What installation class do you want?"
-msgstr "Выберите класс установки"
+#: ../../install_steps_interactive.pm_.c:129
+msgid "Upgrade"
+msgstr "Обновление"
-#: ../install_steps_interactive.pm_.c:114
+#: ../../install_steps_interactive.pm_.c:135
msgid "Normal"
msgstr "Нормально"
-#: ../install_steps_interactive.pm_.c:115
+#: ../../install_steps_interactive.pm_.c:136
msgid "Development"
msgstr "Разработчик"
-#: ../install_steps_interactive.pm_.c:116
+#: ../../install_steps_interactive.pm_.c:137
msgid "Server"
msgstr "Сервер"
-#: ../install_steps_interactive.pm_.c:119
-msgid "What usage do you want?"
-msgstr "Какое применение выбираете?"
+#: ../../install_steps_interactive.pm_.c:141
+#, fuzzy
+msgid "Which usage is your system used for ?"
+msgstr "Каков ваш временной пояс?"
-#: ../install_steps_interactive.pm_.c:132 ../standalone/mousedrake_.c:25
-msgid "What is the type of your mouse?"
+#: ../../install_steps_interactive.pm_.c:152
+#, fuzzy
+msgid "Please, choose the type of your mouse."
msgstr "Укажите тип вашей мыши"
-#: ../install_steps_interactive.pm_.c:140 ../standalone/mousedrake_.c:38
+#: ../../install_steps_interactive.pm_.c:160 ../../standalone/mousedrake_.c:38
msgid "Mouse Port"
msgstr "Порт мыши"
-#: ../install_steps_interactive.pm_.c:141 ../standalone/mousedrake_.c:39
-msgid "Which serial port is your mouse connected to?"
+#: ../../install_steps_interactive.pm_.c:161
+#, fuzzy
+msgid "Please choose on which serial port your mouse is connected to."
msgstr "К какому последовательному порту подключена ваша мышь?"
-#: ../install_steps_interactive.pm_.c:157
+#: ../../install_steps_interactive.pm_.c:172
+#, fuzzy
+msgid "Configuring IDE"
+msgstr "Настройка"
+
+#: ../../install_steps_interactive.pm_.c:172
+msgid "IDE"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:182
msgid "no available partitions"
msgstr "нет доступных разделов"
-#: ../install_steps_interactive.pm_.c:159
+#: ../../install_steps_interactive.pm_.c:184
#, c-format
-msgid "(%dMb)"
-msgstr "(%dMb)"
+msgid "(%dMB)"
+msgstr "(%dMB)"
-#: ../install_steps_interactive.pm_.c:166
-msgid "Which partition do you want to use as your root partition"
+#: ../../install_steps_interactive.pm_.c:191
+#, fuzzy
+msgid "Please choose a partition to use as your root partition."
msgstr "Какой раздел диска хотите использовать в качестве корневого?"
-#: ../install_steps_interactive.pm_.c:173
+#: ../../install_steps_interactive.pm_.c:198
msgid "Choose the mount points"
msgstr "Выберите точки монтирования"
-#: ../install_steps_interactive.pm_.c:185
+#: ../../install_steps_interactive.pm_.c:210
msgid "You need to reboot for the partition table modifications to take place"
msgstr "Чтобы модификация таблицы разделов осуществилась, перезагрузитесь"
-#: ../install_steps_interactive.pm_.c:207
+#: ../../install_steps_interactive.pm_.c:236
msgid "Choose the partitions you want to format"
msgstr "Выбор разделов для форматирования"
-#: ../install_steps_interactive.pm_.c:211
+#: ../../install_steps_interactive.pm_.c:240
msgid "Check bad blocks?"
msgstr ""
-#: ../install_steps_interactive.pm_.c:230
+#: ../../install_steps_interactive.pm_.c:248
+#, fuzzy
+msgid "Formatting partitions"
+msgstr "Форматирование разделов %s"
+
+#: ../../install_steps_interactive.pm_.c:252
+#, c-format
+msgid "Creating and formatting file %s"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:255
+msgid "Not enough swap to fulfill installation, please add some"
+msgstr "Недостаточный размер буфера (swap) для установки, немного увеличьте"
+
+#: ../../install_steps_interactive.pm_.c:261
msgid "Looking for available packages"
msgstr "Просмотр доступных пакетов"
-#: ../install_steps_interactive.pm_.c:236
+#: ../../install_steps_interactive.pm_.c:267
msgid "Finding packages to upgrade"
msgstr "Поиск пакетов для обновления"
-#: ../install_steps_interactive.pm_.c:266
-#, c-format
-msgid ""
-"You need %dMB for a full install of the groups you selected.\n"
-"You can go on anyway, but be warned that you won't get all packages"
+#: ../../install_steps_interactive.pm_.c:284
+msgid "Your system has not enough space left for installation or upgrade"
msgstr ""
-#: ../install_steps_interactive.pm_.c:290
+#: ../../install_steps_interactive.pm_.c:317
msgid "Package Group Selection"
msgstr "Выбор группы пакетов"
-#: ../install_steps_interactive.pm_.c:326
+#: ../../install_steps_interactive.pm_.c:320
+msgid "Individual package selection"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:360
+msgid ""
+"If you have all the CDs in the list below, click Ok.\n"
+"If you have none of those CDs, click Cancel.\n"
+"If only some CDs are missing, unselect them, then click Ok."
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:363
+#, c-format
+msgid "Cd-Rom labeled \"%s\""
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:391
msgid ""
"Installing package %s\n"
"%d%%"
@@ -2137,55 +2734,58 @@ msgstr ""
"Установка пакета %s\n"
"%d%%"
-#: ../install_steps_interactive.pm_.c:335
-msgid "Post install configuration"
+#: ../../install_steps_interactive.pm_.c:400
+msgid "Post-install configuration"
msgstr "Настройка после установки"
-#: ../install_steps_interactive.pm_.c:346
+#: ../../install_steps_interactive.pm_.c:410
msgid "Keep the current IP configuration"
msgstr "Сохранение текущей конфигурации IP"
-#: ../install_steps_interactive.pm_.c:347
+#: ../../install_steps_interactive.pm_.c:411
msgid "Reconfigure network now"
msgstr "Переконфигурировать сеть"
-#: ../install_steps_interactive.pm_.c:348
-#: ../install_steps_interactive.pm_.c:360
+#: ../../install_steps_interactive.pm_.c:412
msgid "Do not set up networking"
msgstr "Не устанавливать сетевые службы"
-#: ../install_steps_interactive.pm_.c:350
-#: ../install_steps_interactive.pm_.c:358
+#: ../../install_steps_interactive.pm_.c:415
+#: ../../install_steps_interactive.pm_.c:420
msgid "Network Configuration"
msgstr "Конфигурация сети"
-#: ../install_steps_interactive.pm_.c:351
+#: ../../install_steps_interactive.pm_.c:416
msgid "Local networking has already been configured. Do you want to:"
msgstr "Настройки LAN уже заданы. Хотите ли вы:"
-#: ../install_steps_interactive.pm_.c:359
-msgid "Do you want to configure networking for your system?"
+#: ../../install_steps_interactive.pm_.c:421
+#, fuzzy
+msgid "Do you want to configure a local network for your system?"
msgstr "Хотите ли вы настроить сетевую конфигурацию?"
-#: ../install_steps_interactive.pm_.c:360
-msgid "Dialup with modem"
-msgstr "Dialup через модем"
-
-#: ../install_steps_interactive.pm_.c:360
-msgid "Local LAN"
-msgstr "Локальная сеть"
-
-#: ../install_steps_interactive.pm_.c:369
+#: ../../install_steps_interactive.pm_.c:427
msgid "no network card found"
msgstr "сетевая карта не найдена"
-#: ../install_steps_interactive.pm_.c:399
-#: ../install_steps_interactive.pm_.c:400
+#: ../../install_steps_interactive.pm_.c:449
+#, fuzzy
+msgid "Modem Configuration"
+msgstr "Настройка"
+
+#: ../../install_steps_interactive.pm_.c:450
+#, fuzzy
+msgid ""
+"Do you want to configure a dialup connection with modem for your system?"
+msgstr "Хотите ли вы настроить сетевую конфигурацию?"
+
+#: ../../install_steps_interactive.pm_.c:462
+#: ../../install_steps_interactive.pm_.c:463
#, c-format
msgid "Configuring network device %s"
msgstr "Настройка сетевого устройства %s"
-#: ../install_steps_interactive.pm_.c:401
+#: ../../install_steps_interactive.pm_.c:464
msgid ""
"Please enter the IP configuration for this machine.\n"
"Each item should be entered as an IP address in dotted-decimal\n"
@@ -2195,31 +2795,31 @@ msgstr ""
"Каждый пункт должен быть заполнен как IP адрес в десятично-точечной \n"
"нотации (например, 1.2.3.4)."
-#: ../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:467
msgid "Automatic IP"
msgstr "Автоматический IP"
-#: ../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:467
msgid "IP address:"
msgstr "IP адрес:"
-#: ../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:467
msgid "Netmask:"
msgstr "Маска сети"
-#: ../install_steps_interactive.pm_.c:405
+#: ../../install_steps_interactive.pm_.c:468
msgid "(bootp/dhcp)"
msgstr "bootp/dhcp"
-#: ../install_steps_interactive.pm_.c:411 ../printerdrake.pm_.c:149
+#: ../../install_steps_interactive.pm_.c:474 ../../printerdrake.pm_.c:89
msgid "IP address should be in format 1.2.3.4"
msgstr "IP адрес должен быть в формате 1.2.3.4"
-#: ../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:492
msgid "Configuring network"
msgstr "Настройка сети"
-#: ../install_steps_interactive.pm_.c:430
+#: ../../install_steps_interactive.pm_.c:493
msgid ""
"Please enter your host name.\n"
"Your host name should be a fully-qualified host name,\n"
@@ -2231,90 +2831,80 @@ msgstr ""
"например ``mybox.mylab.myco.com''.\n"
"Вы можете также ввести IP адрес шлюза, если он у вас есть."
-#: ../install_steps_interactive.pm_.c:434
+#: ../../install_steps_interactive.pm_.c:497
msgid "DNS server:"
msgstr "DNS сервер:"
-#: ../install_steps_interactive.pm_.c:434
+#: ../../install_steps_interactive.pm_.c:497
msgid "Gateway device:"
msgstr "Устройство-шлюз:"
-#: ../install_steps_interactive.pm_.c:434
+#: ../../install_steps_interactive.pm_.c:497
msgid "Gateway:"
msgstr "Шлюз:"
-#: ../install_steps_interactive.pm_.c:434
+#: ../../install_steps_interactive.pm_.c:497
msgid "Host name:"
msgstr "Имя машины:"
-#: ../install_steps_interactive.pm_.c:447
+#: ../../install_steps_interactive.pm_.c:510
msgid "Try to find a modem?"
msgstr "Попробовать найти модем?"
-#: ../install_steps_interactive.pm_.c:457
-msgid "Which serial port is your modem connected to?"
+#: ../../install_steps_interactive.pm_.c:521
+#, fuzzy
+msgid "Please choose which serial port your modem is connected to."
msgstr "К какому последовательному порту подключен модем?"
-#: ../install_steps_interactive.pm_.c:462
+#: ../../install_steps_interactive.pm_.c:527
msgid "Dialup options"
msgstr "Параметры Dialup"
-#: ../install_steps_interactive.pm_.c:463
+#: ../../install_steps_interactive.pm_.c:528
msgid "Connection name"
msgstr "Имя соединения"
-#: ../install_steps_interactive.pm_.c:464
+#: ../../install_steps_interactive.pm_.c:529
msgid "Phone number"
msgstr "Номер телефона"
-#: ../install_steps_interactive.pm_.c:465
+#: ../../install_steps_interactive.pm_.c:530
msgid "Login ID"
msgstr "Имя"
-#: ../install_steps_interactive.pm_.c:466
-#: ../install_steps_interactive.pm_.c:578
-#: ../install_steps_interactive.pm_.c:624
-#: ../install_steps_interactive.pm_.c:724 ../standalone/adduserdrake_.c:40
-msgid "Password"
-msgstr "Пароль:"
-
-#: ../install_steps_interactive.pm_.c:467
+#: ../../install_steps_interactive.pm_.c:532
msgid "Authentication"
msgstr "Аутентификация"
-#: ../install_steps_interactive.pm_.c:467
+#: ../../install_steps_interactive.pm_.c:532
msgid "CHAP"
msgstr "CHAP"
-#: ../install_steps_interactive.pm_.c:467
+#: ../../install_steps_interactive.pm_.c:532
msgid "PAP"
msgstr "PAP"
-#: ../install_steps_interactive.pm_.c:467
+#: ../../install_steps_interactive.pm_.c:532
msgid "Script-based"
msgstr "на базе скрипта"
-#: ../install_steps_interactive.pm_.c:467
+#: ../../install_steps_interactive.pm_.c:532
msgid "Terminal-based"
msgstr "на базе терминала"
-#: ../install_steps_interactive.pm_.c:468
+#: ../../install_steps_interactive.pm_.c:533
msgid "Domain name"
msgstr "Имя домена"
-#: ../install_steps_interactive.pm_.c:469
+#: ../../install_steps_interactive.pm_.c:535
msgid "First DNS Server"
msgstr "Первый сервер DNS"
-#: ../install_steps_interactive.pm_.c:470
+#: ../../install_steps_interactive.pm_.c:536
msgid "Second DNS Server"
msgstr "Второй сервер DNS:"
-#: ../install_steps_interactive.pm_.c:483
-msgid "Bringing up the network"
-msgstr "Подключение к сети"
-
-#: ../install_steps_interactive.pm_.c:492
+#: ../../install_steps_interactive.pm_.c:549
#, fuzzy
msgid ""
"You have now the possibility to download software aimed for encryption.\n"
@@ -2332,7 +2922,7 @@ msgid ""
"In addition customer and/or end user shall particularly be aware to not "
"infringe\n"
"the laws of his/their jurisdiction. Should customer and/or end user do not\n"
-"respect the provision of these applicable laws, he/they will incur serious\n"
+"respect the provision of these applicable laws, he/they will incure serious\n"
"sanctions.\n"
"\n"
"In no event shall Mandrakesoft nor its manufacturers and/or suppliers be "
@@ -2387,124 +2977,90 @@ msgstr ""
"Altadena California 91001\n"
"USA"
-#: ../install_steps_interactive.pm_.c:523
+#: ../../install_steps_interactive.pm_.c:580
msgid "Choose a mirror from which to get the packages"
msgstr "Выбор зеркала для получения пакетов"
-#: ../install_steps_interactive.pm_.c:528
+#: ../../install_steps_interactive.pm_.c:588
msgid "Contacting the mirror to get the list of available packages"
msgstr "Связь с зеркалом для получения списка доступных пакетов"
-#: ../install_steps_interactive.pm_.c:532
-msgid "Which packages do you want to install"
+#: ../../install_steps_interactive.pm_.c:592
+#, fuzzy
+msgid "Please choose the packages you want to install."
msgstr "Выбор пакетов для установки"
-#: ../install_steps_interactive.pm_.c:534
-msgid "Downloading cryptographic packages"
-msgstr "Загрузка крипторафических пакетов"
-
-#: ../install_steps_interactive.pm_.c:544
+#: ../../install_steps_interactive.pm_.c:606
msgid "Which is your timezone?"
msgstr "Каков ваш временной пояс?"
-#: ../install_steps_interactive.pm_.c:545
+#: ../../install_steps_interactive.pm_.c:607
msgid "Is your hardware clock set to GMT?"
msgstr "Ваши системные часы установлены на GMT?"
-#: ../install_steps_interactive.pm_.c:555
-msgid "Printer"
-msgstr "Принтер"
-
-#: ../install_steps_interactive.pm_.c:556
-msgid "Would you like to configure a printer?"
-msgstr "Хотите настроить принтер?"
-
-#: ../install_steps_interactive.pm_.c:576
+#: ../../install_steps_interactive.pm_.c:652
msgid "No password"
msgstr "Нет пароля"
-#: ../install_steps_interactive.pm_.c:576
-#: ../install_steps_interactive.pm_.c:798 ../interactive.pm_.c:74
-#: ../interactive.pm_.c:84 ../interactive.pm_.c:164
-#: ../interactive_newt.pm_.c:50 ../interactive_newt.pm_.c:97
-#: ../interactive_stdio.pm_.c:27 ../my_gtk.pm_.c:192 ../my_gtk.pm_.c:425
-#: ../my_gtk.pm_.c:525
-msgid "Ok"
-msgstr "Ок"
-
-#: ../install_steps_interactive.pm_.c:579
-#: ../install_steps_interactive.pm_.c:625
-#: ../install_steps_interactive.pm_.c:725 ../standalone/adduserdrake_.c:41
-msgid "Password (again)"
-msgstr "Повторите пароль:"
-
-#: ../install_steps_interactive.pm_.c:581
+#: ../../install_steps_interactive.pm_.c:657
msgid "Use shadow file"
msgstr "Использовать теневой файл"
-#: ../install_steps_interactive.pm_.c:581
+#: ../../install_steps_interactive.pm_.c:657
msgid "shadow"
msgstr "тень"
-#: ../install_steps_interactive.pm_.c:582
+#: ../../install_steps_interactive.pm_.c:658
msgid "MD5"
msgstr "MD5"
-#: ../install_steps_interactive.pm_.c:582
+#: ../../install_steps_interactive.pm_.c:658
msgid "Use MD5 passwords"
msgstr "Использовать пароли MD5"
-#: ../install_steps_interactive.pm_.c:584
+#: ../../install_steps_interactive.pm_.c:660
msgid "Use NIS"
msgstr "Использовать NIS"
-#: ../install_steps_interactive.pm_.c:584
+#: ../../install_steps_interactive.pm_.c:660
msgid "yellow pages"
msgstr "желтые страницы"
-#: ../install_steps_interactive.pm_.c:588
-#: ../install_steps_interactive.pm_.c:636
-#: ../install_steps_interactive.pm_.c:736 ../standalone/adduserdrake_.c:52
-msgid "Please try again"
-msgstr "Попробуйте еще раз"
-
-#: ../install_steps_interactive.pm_.c:588
-#: ../install_steps_interactive.pm_.c:636
-#: ../install_steps_interactive.pm_.c:736 ../standalone/adduserdrake_.c:52
-msgid "The passwords do not match"
-msgstr "Пароли не совпадают"
-
-#: ../install_steps_interactive.pm_.c:590
+#: ../../install_steps_interactive.pm_.c:666
#, c-format
msgid "This password is too simple (must be at least %d characters long)"
msgstr "Этот пароль слишком прост (его длина должна быть не менее %d символов)"
-#: ../install_steps_interactive.pm_.c:597
+#: ../../install_steps_interactive.pm_.c:673
msgid "Authentification NIS"
msgstr "Аутентификация NIS"
-#: ../install_steps_interactive.pm_.c:598
+#: ../../install_steps_interactive.pm_.c:674
msgid "NIS Domain"
msgstr "NIS Domain"
-#: ../install_steps_interactive.pm_.c:598
+#: ../../install_steps_interactive.pm_.c:674
msgid "NIS Server"
msgstr "NIS сервер:"
-#: ../install_steps_interactive.pm_.c:618 ../standalone/adduserdrake_.c:34
+#: ../../install_steps_interactive.pm_.c:699
+#: ../../standalone/adduserdrake_.c:36
msgid "Accept user"
msgstr "Принять пользователя"
-#: ../install_steps_interactive.pm_.c:618 ../standalone/adduserdrake_.c:34
+#: ../../install_steps_interactive.pm_.c:699
+#: ../../standalone/adduserdrake_.c:36
msgid "Add user"
msgstr "Добавить пользователя"
-#: ../install_steps_interactive.pm_.c:619 ../standalone/adduserdrake_.c:35
+#: ../../install_steps_interactive.pm_.c:700
+#: ../../standalone/adduserdrake_.c:37
#, c-format
msgid "(already added %s)"
msgstr "уже добавлено %s"
-#: ../install_steps_interactive.pm_.c:619 ../standalone/adduserdrake_.c:35
+#: ../../install_steps_interactive.pm_.c:700
+#: ../../standalone/adduserdrake_.c:37
#, c-format
msgid ""
"Enter a user\n"
@@ -2513,56 +3069,71 @@ msgstr ""
"Ввести пользователя\n"
"%s"
-#: ../install_steps_interactive.pm_.c:621 ../standalone/adduserdrake_.c:37
+#: ../../install_steps_interactive.pm_.c:702
+#: ../../standalone/adduserdrake_.c:39
msgid "Real name"
msgstr "Собственное имя"
-#: ../install_steps_interactive.pm_.c:622 ../standalone/adduserdrake_.c:38
+#: ../../install_steps_interactive.pm_.c:703 ../../printerdrake.pm_.c:84
+#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
msgid "User name"
msgstr "Имя пользователя:"
-#: ../install_steps_interactive.pm_.c:627 ../standalone/adduserdrake_.c:43
+#: ../../install_steps_interactive.pm_.c:708
+#: ../../standalone/adduserdrake_.c:45
msgid "Shell"
msgstr "Оболочка:"
-#: ../install_steps_interactive.pm_.c:637 ../standalone/adduserdrake_.c:53
+#: ../../install_steps_interactive.pm_.c:710
+#: ../../standalone/adduserdrake_.c:47
+msgid "Icon"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:720
+#: ../../standalone/adduserdrake_.c:57
msgid "This password is too simple"
msgstr "Этот пароль слишком прост"
-#: ../install_steps_interactive.pm_.c:638 ../standalone/adduserdrake_.c:54
+#: ../../install_steps_interactive.pm_.c:721
+#: ../../standalone/adduserdrake_.c:58
msgid "Please give a user name"
msgstr "Введите имя пользователя"
-#: ../install_steps_interactive.pm_.c:639 ../standalone/adduserdrake_.c:55
+#: ../../install_steps_interactive.pm_.c:722
+#: ../../standalone/adduserdrake_.c:59
msgid ""
"The user name must contain only lower cased letters, numbers, `-' and `_'"
msgstr ""
"Имя пользователя должно содержать буквы только на нижнем регистре, \n"
"цифры , `-' и `_'"
-#: ../install_steps_interactive.pm_.c:640 ../standalone/adduserdrake_.c:56
+#: ../../install_steps_interactive.pm_.c:723
+#: ../../standalone/adduserdrake_.c:60
msgid "This user name is already added"
msgstr "Это имя пользователя уже добавлено"
-#: ../install_steps_interactive.pm_.c:659
-msgid "First drive"
+#: ../../install_steps_interactive.pm_.c:747
+#, fuzzy
+msgid "First floppy drive"
msgstr "Первый диск"
-#: ../install_steps_interactive.pm_.c:660
-msgid "Second drive"
+#: ../../install_steps_interactive.pm_.c:748
+#, fuzzy
+msgid "Second floppy drive"
msgstr "Второй диск"
-#: ../install_steps_interactive.pm_.c:661
+#: ../../install_steps_interactive.pm_.c:749
msgid "Skip"
msgstr "Пропустить"
-#: ../install_steps_interactive.pm_.c:666
+#: ../../install_steps_interactive.pm_.c:755
+#, fuzzy
msgid ""
"A custom bootdisk provides a way of booting into your Linux system without\n"
"depending on the normal bootloader. This is useful if you don't want to "
"install\n"
-"LILO on your system, or another operating system removes LILO, or LILO "
-"doesn't\n"
+"LILO (or grub) on your system, or another operating system removes LILO, or "
+"LILO doesn't\n"
"work with your hardware configuration. A custom bootdisk can also be used "
"with\n"
"the Mandrake rescue image, making it much easier to recover from severe "
@@ -2578,263 +3149,188 @@ msgstr ""
"\n"
"Хотите создать загрузочный диск сейчас?"
-#: ../install_steps_interactive.pm_.c:675
+#: ../../install_steps_interactive.pm_.c:764
msgid "Sorry, no floppy drive available"
msgstr "Простите, но дисковод недоступен"
-#: ../install_steps_interactive.pm_.c:678
+#: ../../install_steps_interactive.pm_.c:767
msgid "Choose the floppy drive you want to use to make the bootdisk"
msgstr "Выберите дисковод, в котором будет создаваться загрузочная дискета"
-#: ../install_steps_interactive.pm_.c:683
+#: ../../install_steps_interactive.pm_.c:772
#, c-format
msgid "Insert a floppy in drive %s"
msgstr "Вставьте дискету в дисковод %s"
-#: ../install_steps_interactive.pm_.c:684
-#: ../install_steps_interactive.pm_.c:1042
+#: ../../install_steps_interactive.pm_.c:773
msgid "Creating bootdisk"
msgstr "Создание загрузочной дискеты"
-#: ../install_steps_interactive.pm_.c:691
-msgid "Preparing bootloader"
-msgstr "Устанавливается загрузчик..."
-
-#: ../install_steps_interactive.pm_.c:703
-msgid "First sector of boot partition"
-msgstr "Первый сектор загрузочного раздела"
-
-#: ../install_steps_interactive.pm_.c:703
-msgid "First sector of drive (MBR)"
-msgstr "Первый сектор устройства (MBR)"
-
-#: ../install_steps_interactive.pm_.c:708
-msgid "LILO Installation"
-msgstr "Установка LILO"
-
-#: ../install_steps_interactive.pm_.c:709
-msgid "Where do you want to install the bootloader?"
-msgstr "Куда вы хотите установить начальный загрузчик?"
-
-#: ../install_steps_interactive.pm_.c:715
-msgid "Do you want to use LILO?"
-msgstr "Вы хотите использовать LILO?"
-
-#: ../install_steps_interactive.pm_.c:718
-msgid "Boot device"
-msgstr "Загрузочное устройство"
-
-#: ../install_steps_interactive.pm_.c:719
-msgid "Linear (needed for some SCSI drives)"
-msgstr "Линейно (необходимо для некоторых адаптеров SCSI)"
-
-#: ../install_steps_interactive.pm_.c:719
-msgid "linear"
-msgstr "линейно"
-
-#: ../install_steps_interactive.pm_.c:720
-msgid "Compact"
-msgstr "Компактно"
-
-#: ../install_steps_interactive.pm_.c:720
-msgid "compact"
-msgstr "компактно"
-
-#: ../install_steps_interactive.pm_.c:721
-msgid "Delay before booting default image"
-msgstr "Задержка перед загрузкой образа по умолчанию"
-
-#: ../install_steps_interactive.pm_.c:722
-msgid "Video mode"
-msgstr "Видео-режим"
-
-#: ../install_steps_interactive.pm_.c:726
-msgid "Restrict command line options"
-msgstr "Ограничение опций командной строки"
-
-#: ../install_steps_interactive.pm_.c:726
-msgid "restrict"
-msgstr "ограничение"
+#: ../../install_steps_interactive.pm_.c:785 ../../standalone/drakboot_.c:55
+msgid "Installation of LILO failed. The following error occured:"
+msgstr "Установка LILO не прошла. Произошла следующая ошибка:"
-#: ../install_steps_interactive.pm_.c:732
-msgid "LILO main options"
-msgstr "главные опции LILO"
+#: ../../install_steps_interactive.pm_.c:806
+msgid "Do you want to use SILO?"
+msgstr "Вы хотите использовать SILO?"
-#: ../install_steps_interactive.pm_.c:735
-msgid ""
-"Option ``Restrict command line options'' is of no use without a password"
-msgstr ""
-"Опция ``Ограничение опций командной строки'' не используется без пароля"
+#: ../../install_steps_interactive.pm_.c:817
+msgid "SILO main options"
+msgstr "главные опции SILO"
-#: ../install_steps_interactive.pm_.c:746
+#: ../../install_steps_interactive.pm_.c:830
msgid ""
-"Here are the following entries in LILO.\n"
+"Here are the following entries in SILO.\n"
"You can add some more or change the existing ones."
msgstr ""
-"В LILO есть следующие пункты.\n"
+"В SILO есть следующие пункты.\n"
"Вы можете добавить еще, или изменить существующие."
-#: ../install_steps_interactive.pm_.c:748 ../standalone/rpmdrake_.c:302
-msgid "Add"
-msgstr "Добавить"
-
-#: ../install_steps_interactive.pm_.c:757
-msgid "Linux"
-msgstr "Linux"
-
-#: ../install_steps_interactive.pm_.c:757
-msgid "Other OS (windows...)"
-msgstr "Другая OS (windows...)"
-
-#: ../install_steps_interactive.pm_.c:757
-msgid "Which type of entry do you want to add"
-msgstr "Какой тип пункта хотите добавить?"
-
-#: ../install_steps_interactive.pm_.c:777
-msgid "Image"
-msgstr "Образ"
-
-#: ../install_steps_interactive.pm_.c:778
-#: ../install_steps_interactive.pm_.c:786
-msgid "Root"
-msgstr "Root"
-
-#: ../install_steps_interactive.pm_.c:779
-msgid "Append"
-msgstr "Присоединить"
-
-#: ../install_steps_interactive.pm_.c:780
-msgid "Initrd"
-msgstr "Initrd"
-
-#: ../install_steps_interactive.pm_.c:781
-msgid "Read-write"
-msgstr "Чтение-запись"
-
-#: ../install_steps_interactive.pm_.c:787
-msgid "Table"
-msgstr "Таблица"
-
-#: ../install_steps_interactive.pm_.c:788
-msgid "Unsafe"
-msgstr "Unsafe"
-
-#: ../install_steps_interactive.pm_.c:793
-msgid "Label"
-msgstr "Метка"
-
-#: ../install_steps_interactive.pm_.c:795
-msgid "Default"
-msgstr "Умолчание"
-
-#: ../install_steps_interactive.pm_.c:798
-msgid "Remove entry"
-msgstr "Удалить пункт"
-
-#: ../install_steps_interactive.pm_.c:801
-msgid "Empty label not allowed"
-msgstr "Пустая метка не допускается"
+#: ../../install_steps_interactive.pm_.c:858
+#, fuzzy
+msgid "Partition"
+msgstr "Корневой раздел"
-#: ../install_steps_interactive.pm_.c:802
+#: ../../install_steps_interactive.pm_.c:878
msgid "This label is already in use"
msgstr "Эта метка уже используется"
-#: ../install_steps_interactive.pm_.c:803
-#, c-format
-msgid "A entry %s already exists"
-msgstr "Пункт %s уже существует"
+#: ../../install_steps_interactive.pm_.c:891
+msgid "Installation of SILO failed. The following error occured:"
+msgstr "Установка SILO не прошла. Произошла следующая ошибка:"
-#: ../install_steps_interactive.pm_.c:817
-msgid "Installation of LILO failed. The following error occured:"
-msgstr "Установка LILO не прошла. Произошла следующая ошибка:"
+#: ../../install_steps_interactive.pm_.c:901
+msgid "Preparing bootloader"
+msgstr "Устанавливается загрузчик..."
+
+#: ../../install_steps_interactive.pm_.c:909
+msgid "Do you want to use aboot?"
+msgstr "Вы хотите использовать aboot?"
+
+#: ../../install_steps_interactive.pm_.c:912
+msgid ""
+"Error installing aboot, \n"
+"try to force installation even if that destroys the first partition?"
+msgstr ""
-#: ../install_steps_interactive.pm_.c:831
+#: ../../install_steps_interactive.pm_.c:929
msgid "Proxies configuration"
msgstr "Настройка proxy"
-#: ../install_steps_interactive.pm_.c:832
+#: ../../install_steps_interactive.pm_.c:930
msgid "HTTP proxy"
msgstr "HTTP proxy"
-#: ../install_steps_interactive.pm_.c:833
+#: ../../install_steps_interactive.pm_.c:931
msgid "FTP proxy"
msgstr "FTP proxy"
-#: ../install_steps_interactive.pm_.c:839
+#: ../../install_steps_interactive.pm_.c:937
msgid "Proxy should be http://..."
msgstr "Proxy должно быть http://..."
-#: ../install_steps_interactive.pm_.c:840
+#: ../../install_steps_interactive.pm_.c:938
msgid "Proxy should be ftp://..."
msgstr "Proxy должно быть ftp://..."
-#: ../install_steps_interactive.pm_.c:850 ../standalone/draksec_.c:20
+#: ../../install_steps_interactive.pm_.c:948 ../../standalone/draksec_.c:20
msgid "Welcome To Crackers"
msgstr "Добро пожаловить в Crackers"
-#: ../install_steps_interactive.pm_.c:851 ../standalone/draksec_.c:21
+#: ../../install_steps_interactive.pm_.c:949 ../../standalone/draksec_.c:21
msgid "Poor"
msgstr "Мизерный"
-#: ../install_steps_interactive.pm_.c:852 ../standalone/draksec_.c:22
+#: ../../install_steps_interactive.pm_.c:950 ../../standalone/draksec_.c:22
msgid "Low"
msgstr "Слабый"
-#: ../install_steps_interactive.pm_.c:853 ../standalone/draksec_.c:23
+#: ../../install_steps_interactive.pm_.c:951 ../../standalone/draksec_.c:23
msgid "Medium"
msgstr "Средний"
-#: ../install_steps_interactive.pm_.c:854 ../standalone/draksec_.c:24
+#: ../../install_steps_interactive.pm_.c:952 ../../standalone/draksec_.c:24
msgid "High"
msgstr "Высокий"
-#: ../install_steps_interactive.pm_.c:855 ../standalone/draksec_.c:25
+#: ../../install_steps_interactive.pm_.c:953 ../../standalone/draksec_.c:25
msgid "Paranoid"
msgstr "Параноидальный"
-#: ../install_steps_interactive.pm_.c:868
+#: ../../install_steps_interactive.pm_.c:966
msgid "Miscellaneous questions"
msgstr "Дополнительные вопросы"
-#: ../install_steps_interactive.pm_.c:869
+#: ../../install_steps_interactive.pm_.c:967
msgid "(may cause data corruption)"
msgstr "(может вызвать потерю данных)"
-#: ../install_steps_interactive.pm_.c:869
+#: ../../install_steps_interactive.pm_.c:967
msgid "Use hard drive optimisations?"
msgstr "Использовать оптимизацию жесткого диска?"
-#: ../install_steps_interactive.pm_.c:870 ../standalone/draksec_.c:46
+#: ../../install_steps_interactive.pm_.c:968 ../../standalone/draksec_.c:46
msgid "Choose security level"
msgstr "Уровень безопасности"
-#: ../install_steps_interactive.pm_.c:871
+#: ../../install_steps_interactive.pm_.c:969
#, c-format
msgid "Precise RAM size if needed (found %d MB)"
msgstr "Укажите точный размер RAM (найдено %d MB)"
-#: ../install_steps_interactive.pm_.c:872
+#: ../../install_steps_interactive.pm_.c:970
msgid "Removable media automounting"
msgstr "Автомонтирование сменных носителей"
-#: ../install_steps_interactive.pm_.c:874
+#: ../../install_steps_interactive.pm_.c:972
+msgid "Clean /tmp at each boot"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:975
+msgid "Enable multi profiles"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:977
msgid "Enable num lock at startup"
msgstr "Включение num lock при запуске"
-#: ../install_steps_interactive.pm_.c:877
-msgid "Give the ram size in Mb"
+#: ../../install_steps_interactive.pm_.c:980
+msgid "Give the ram size in MB"
msgstr "Задайте размер RAM в Mb"
-#: ../install_steps_interactive.pm_.c:893
-msgid "Use existing configuration for X11?"
-msgstr "Использовать существующую настройку для X11?"
+#: ../../install_steps_interactive.pm_.c:982
+#, fuzzy
+msgid "Can't use supermount in high security level"
+msgstr "Уровень безопасности"
-#: ../install_steps_interactive.pm_.c:905
-#: ../install_steps_interactive.pm_.c:1075
+#: ../../install_steps_interactive.pm_.c:1002
+msgid ""
+"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
+"By default, the 3.3 server is used because it works on more graphic cards.\n"
+"\n"
+"Do you want to try XFree 4.0?"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:1015
+#: ../../install_steps_interactive.pm_.c:1167
msgid "Try to find PCI devices?"
msgstr "Попробовать найти PCI устройства"
-#: ../install_steps_interactive.pm_.c:920
+#: ../../install_steps_interactive.pm_.c:1034
+msgid "Do you want to generate an auto install floppy for linux replication?"
+msgstr ""
+
+#: ../../install_steps_interactive.pm_.c:1036
+#, fuzzy, c-format
+msgid "Insert a blank floppy in drive %s"
+msgstr "Вставьте дискету в дисковод %s"
+
+#: ../../install_steps_interactive.pm_.c:1044
+#, fuzzy
+msgid "Creating auto install floppy"
+msgstr "Подготовка установки"
+
+#: ../../install_steps_interactive.pm_.c:1068
msgid ""
"Some steps are not completed.\n"
"\n"
@@ -2843,7 +3339,7 @@ msgstr ""
"Некоторые шаги не завершены.\n"
"Вы действительно хотите выйти сейчас?"
-#: ../install_steps_interactive.pm_.c:927
+#: ../../install_steps_interactive.pm_.c:1075
msgid ""
"Congratulations, installation is complete.\n"
"Remove the boot media and press return to reboot.\n"
@@ -2862,26 +3358,26 @@ msgstr ""
"Информация о настройке вашей системы есть в после-установочной\n"
"главе вашего Руководства Пользователя из Официального Linux-Mandrake."
-#: ../install_steps_interactive.pm_.c:936
+#: ../../install_steps_interactive.pm_.c:1084
msgid "Shutting down"
msgstr "Shutting down"
-#: ../install_steps_interactive.pm_.c:950
+#: ../../install_steps_interactive.pm_.c:1096
#, c-format
msgid "Installing driver for %s card %s"
msgstr "Установка драйвера для %s карты %s"
-#: ../install_steps_interactive.pm_.c:951
+#: ../../install_steps_interactive.pm_.c:1097
#, c-format
msgid "(module %s)"
msgstr "(модуль %s)"
-#: ../install_steps_interactive.pm_.c:961
+#: ../../install_steps_interactive.pm_.c:1107
#, c-format
msgid "Which %s driver should I try?"
msgstr "Какой %s драйвер мне попробовать?"
-#: ../install_steps_interactive.pm_.c:969
+#: ../../install_steps_interactive.pm_.c:1115
#, c-format
msgid ""
"In some cases, the %s driver needs to have extra information to work\n"
@@ -2899,20 +3395,20 @@ msgstr ""
"но оно \n"
"ничего не сломает."
-#: ../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:1120
msgid "Autoprobe"
msgstr "Автопоиск"
-#: ../install_steps_interactive.pm_.c:974
+#: ../../install_steps_interactive.pm_.c:1120
msgid "Specify options"
msgstr "Укажите параметры"
-#: ../install_steps_interactive.pm_.c:978
+#: ../../install_steps_interactive.pm_.c:1124
#, c-format
msgid "You may now provide its options to module %s."
msgstr "Вы не можете задать опции модулю %s."
-#: ../install_steps_interactive.pm_.c:984
+#: ../../install_steps_interactive.pm_.c:1130
#, c-format
msgid ""
"You may now provide its options to module %s.\n"
@@ -2923,11 +3419,11 @@ msgstr ""
"Опции - в формате ``имя=значение имя2=значение2 ...''.\n"
"Например, ``io=0x300 irq=7''"
-#: ../install_steps_interactive.pm_.c:987
+#: ../../install_steps_interactive.pm_.c:1133
msgid "Module options:"
msgstr "Опции модуля:"
-#: ../install_steps_interactive.pm_.c:997
+#: ../../install_steps_interactive.pm_.c:1143
#, c-format
msgid ""
"Loading module %s failed.\n"
@@ -2936,306 +3432,309 @@ msgstr ""
"Загрузка модуля %s не прошла.\n"
"Хотите попробовать еще с другими параметрами?"
-#: ../install_steps_interactive.pm_.c:1010
+#: ../../install_steps_interactive.pm_.c:1156
msgid "Try to find PCMCIA cards?"
msgstr "Попробовать найти карты PCMCIA?"
-#: ../install_steps_interactive.pm_.c:1011
+#: ../../install_steps_interactive.pm_.c:1157
msgid "Configuring PCMCIA cards..."
msgstr "Настройка еарт PCMCIA ..."
-#: ../install_steps_interactive.pm_.c:1011
+#: ../../install_steps_interactive.pm_.c:1157
msgid "PCMCIA"
msgstr "PCMCIA"
-#: ../install_steps_interactive.pm_.c:1018
-msgid ""
-"Linux does not yet fully support ultra dma 66 HPT.\n"
-"As a work-around i can make a custom floppy giving access the hard drive on "
-"ide2 and ide3"
-msgstr ""
-"Linux все еще не полностью поддерживает ultra dma 66 HPT.\n"
-"В качестве выхода могу создать дискету, обеспечивающую доступ к диску наide2 "
-"и ide3"
-
-#: ../install_steps_interactive.pm_.c:1039
-msgid ""
-"Enter a floppy to create an HTP enabled boot\n"
-"(all data on floppy will be lost)"
-msgstr ""
-"Вставьте дискету для записи загрузчика с HTP\n"
-"(все данные на этой дискете пропадут)"
-
-#: ../install_steps_interactive.pm_.c:1056
-msgid "It is necessary to restart installation booting on the floppy"
-msgstr "Необходимо перезапустить установку, загрузившись с дискеты"
-
-#: ../install_steps_interactive.pm_.c:1057
-msgid "It is necessary to restart installation with the new parameters"
-msgstr "Необходимо перезапустить установку с новыми параметрами"
-
-#: ../install_steps_interactive.pm_.c:1061
-#, c-format
-msgid ""
-"Failed to create an HTP boot floppy.\n"
-"You may have to restart installation and give ``%s'' at the prompt"
-msgstr ""
-"Не удалось создать загр. дискету с HTP.\n"
-"Возможно, надо перезапустить установку задав ``%s'' в приглашении"
-
-#: ../install_steps_interactive.pm_.c:1081
+#: ../../install_steps_interactive.pm_.c:1176
#, c-format
msgid "Found %s %s interfaces"
msgstr "Найдены %s %s интерфейсы"
-#: ../install_steps_interactive.pm_.c:1082
+#: ../../install_steps_interactive.pm_.c:1177
msgid "Do you have another one?"
msgstr "Есть ли у вас другой?"
-#: ../install_steps_interactive.pm_.c:1083
+#: ../../install_steps_interactive.pm_.c:1178
#, c-format
-msgid "Do you have any %s interface?"
+msgid "Do you have any %s interfaces?"
msgstr "Есть ли у вас %s интерфейс?"
-#: ../install_steps_interactive.pm_.c:1085 ../interactive.pm_.c:79
-#: ../my_gtk.pm_.c:424 ../printerdrake.pm_.c:176
+#: ../../install_steps_interactive.pm_.c:1180 ../../interactive.pm_.c:79
+#: ../../my_gtk.pm_.c:458 ../../printerdrake.pm_.c:124
msgid "No"
msgstr "Нет"
-#: ../install_steps_interactive.pm_.c:1085 ../interactive.pm_.c:79
-#: ../my_gtk.pm_.c:424
+#: ../../install_steps_interactive.pm_.c:1180 ../../interactive.pm_.c:79
+#: ../../my_gtk.pm_.c:458
msgid "Yes"
msgstr "Да"
-#: ../install_steps_interactive.pm_.c:1086
+#: ../../install_steps_interactive.pm_.c:1181
msgid "See hardware info"
msgstr "См. описание оборудования"
-#: ../install_steps_newt.pm_.c:19
+#: ../../install_steps_interactive.pm_.c:1197
+msgid "Bringing up the network"
+msgstr "Подключение к сети"
+
+#: ../../install_steps_interactive.pm_.c:1202
+#, fuzzy
+msgid "Bringing down the network"
+msgstr "Подключение к сети"
+
+#: ../../install_steps_newt.pm_.c:21
#, c-format
msgid "Linux-Mandrake Installation %s"
msgstr " Установка Linux-Mandrake %s"
-#: ../install_steps_newt.pm_.c:30
+#: ../../install_steps_newt.pm_.c:32
msgid ""
" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen "
msgstr ""
" <Tab>/<Alt-Tab> между элементами | <Space> выбор | <F12> следующий экран"
-#: ../interactive.pm_.c:84 ../interactive.pm_.c:163
-#: ../interactive_newt.pm_.c:50 ../interactive_newt.pm_.c:97
-#: ../interactive_stdio.pm_.c:27 ../my_gtk.pm_.c:193 ../my_gtk.pm_.c:425
-msgid "Cancel"
-msgstr "Отмена"
+#: ../../install_steps_newt.pm_.c:43
+#, c-format
+msgid ""
+"You can now partition your %s hard drive\n"
+"When you are done, don't forget to save using `w'"
+msgstr ""
-#: ../interactive.pm_.c:181
+#: ../../interactive.pm_.c:244
msgid "Please wait"
msgstr "Подождите пожалуйста"
-#: ../interactive_stdio.pm_.c:35
+#: ../../interactive_stdio.pm_.c:35
#, c-format
msgid "Ambiguity (%s), be more precise\n"
msgstr "Неопределенность (%s), будьте поточнее\n"
-#: ../interactive_stdio.pm_.c:36 ../interactive_stdio.pm_.c:51
-#: ../interactive_stdio.pm_.c:70
+#: ../../interactive_stdio.pm_.c:36 ../../interactive_stdio.pm_.c:51
+#: ../../interactive_stdio.pm_.c:70
msgid "Bad choice, try again\n"
msgstr "Плохой выбор, попробуйте еще\n"
-#: ../interactive_stdio.pm_.c:39
+#: ../../interactive_stdio.pm_.c:39
#, c-format
msgid " ? (default %s) "
msgstr " ? (умолчание %s) "
-#: ../interactive_stdio.pm_.c:52
+#: ../../interactive_stdio.pm_.c:52
#, c-format
msgid "Your choice? (default %s) "
msgstr "Ваш выбор? (умолчание %s) "
-#: ../interactive_stdio.pm_.c:71
+#: ../../interactive_stdio.pm_.c:71
#, c-format
msgid "Your choice? (default %s enter `none' for none) "
msgstr "Ваш выбор? (умолчание %s введите 'none' при отсутствии) "
-#: ../keyboard.pm_.c:88
-msgid "Armenian"
+#: ../../keyboard.pm_.c:89 ../../keyboard.pm_.c:116
+msgid "Czech"
+msgstr "Чешский"
+
+#: ../../keyboard.pm_.c:90 ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:117
+msgid "German"
+msgstr "Немецкий"
+
+#: ../../keyboard.pm_.c:91 ../../keyboard.pm_.c:120
+msgid "Dvorak"
+msgstr "Dvorak"
+
+#: ../../keyboard.pm_.c:92 ../../keyboard.pm_.c:122
+msgid "Spanish"
+msgstr "Испанский"
+
+#: ../../keyboard.pm_.c:93 ../../keyboard.pm_.c:123
+msgid "Finnish"
+msgstr "Финский"
+
+#: ../../keyboard.pm_.c:94 ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:124
+msgid "French"
+msgstr "Французский"
+
+#: ../../keyboard.pm_.c:95 ../../keyboard.pm_.c:143
+msgid "Norwegian"
+msgstr "Норвежский"
+
+#: ../../keyboard.pm_.c:96
+msgid "Polish"
+msgstr "Польский"
+
+#: ../../keyboard.pm_.c:97 ../../keyboard.pm_.c:148
+msgid "Russian"
+msgstr "Русский"
+
+#: ../../keyboard.pm_.c:98 ../../keyboard.pm_.c:157
+msgid "UK keyboard"
+msgstr "UK клавиатура"
+
+#: ../../keyboard.pm_.c:99 ../../keyboard.pm_.c:102 ../../keyboard.pm_.c:158
+msgid "US keyboard"
+msgstr "US клавиатура"
+
+#: ../../keyboard.pm_.c:106
+#, fuzzy
+msgid "Armenian (old)"
msgstr "Армянский"
-#: ../keyboard.pm_.c:89
+#: ../../keyboard.pm_.c:107
+#, fuzzy
+msgid "Armenian (typewriter)"
+msgstr "Армянский (фонетический)"
+
+#: ../../keyboard.pm_.c:108
+msgid "Armenian (phonetic)"
+msgstr "Армянский (фонетический)"
+
+#: ../../keyboard.pm_.c:111
msgid "Belgian"
msgstr "Бельгийский"
-#: ../keyboard.pm_.c:90
+#: ../../keyboard.pm_.c:112
msgid "Bulgarian"
msgstr "Болгарский"
-#: ../keyboard.pm_.c:91
-msgid "Brazilian"
+#: ../../keyboard.pm_.c:113
+msgid "Brazilian (ABNT-2)"
msgstr "Бразильский"
-#: ../keyboard.pm_.c:92
-msgid "Swiss (French layout)"
-msgstr "Швейцарский (Французская раскладка)"
-
-#: ../keyboard.pm_.c:93
+#: ../../keyboard.pm_.c:114
msgid "Swiss (German layout)"
msgstr "Швейцарский (Немецкая раскладка)"
-#: ../keyboard.pm_.c:94
-msgid "Czech"
-msgstr "Чешский"
+#: ../../keyboard.pm_.c:115
+msgid "Swiss (French layout)"
+msgstr "Швейцарский (Французская раскладка)"
-#: ../keyboard.pm_.c:95
-msgid "German"
-msgstr "Немецкий"
+#: ../../keyboard.pm_.c:118
+msgid "German (no dead keys)"
+msgstr ""
-#: ../keyboard.pm_.c:96
+#: ../../keyboard.pm_.c:119
msgid "Danish"
msgstr "Датский"
-#: ../keyboard.pm_.c:97
-msgid "Dvorak"
-msgstr "Dvorak"
-
-#: ../keyboard.pm_.c:98
+#: ../../keyboard.pm_.c:121
msgid "Estonian"
msgstr "Эстонский"
-#: ../keyboard.pm_.c:99
-msgid "Spanish"
-msgstr "Испанский"
-
-#: ../keyboard.pm_.c:100
-msgid "Finnish"
-msgstr "Финский"
-
-#: ../keyboard.pm_.c:101
-msgid "French"
-msgstr "Французский"
-
-#: ../keyboard.pm_.c:102
+#: ../../keyboard.pm_.c:125
msgid "Georgian (\"Russian\" layout)"
msgstr "Грузинский (\"Русская\" раскладка)"
-#: ../keyboard.pm_.c:103
+#: ../../keyboard.pm_.c:126
msgid "Georgian (\"Latin\" layout)"
msgstr "Грузинский (\"Латинская\" раскладка)"
-#: ../keyboard.pm_.c:104
+#: ../../keyboard.pm_.c:127
msgid "Greek"
msgstr "Греческий"
-#: ../keyboard.pm_.c:105
+#: ../../keyboard.pm_.c:128
msgid "Hungarian"
msgstr "Венгерский"
-#: ../keyboard.pm_.c:106
+#: ../../keyboard.pm_.c:129
+msgid "Croatian"
+msgstr ""
+
+#: ../../keyboard.pm_.c:130
msgid "Israeli"
msgstr "Иврит"
-#: ../keyboard.pm_.c:107
+#: ../../keyboard.pm_.c:131
msgid "Israeli (Phonetic)"
msgstr "Иврит (фонетический)"
-#: ../keyboard.pm_.c:108
+#: ../../keyboard.pm_.c:134
msgid "Icelandic"
msgstr "Исландский"
-#: ../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:135
msgid "Italian"
msgstr "Итальянский"
-#: ../keyboard.pm_.c:110
+#: ../../keyboard.pm_.c:136
msgid "Latin American"
msgstr "Латино-Американский"
-#: ../keyboard.pm_.c:111
+#: ../../keyboard.pm_.c:137
msgid "Dutch"
msgstr "Голландский"
-#: ../keyboard.pm_.c:112
-msgid "Lithuanian AZERTY"
+#: ../../keyboard.pm_.c:138
+#, fuzzy
+msgid "Lithuanian AZERTY (old)"
+msgstr "Литовский AZERTY"
+
+#: ../../keyboard.pm_.c:140
+#, fuzzy
+msgid "Lithuanian AZERTY (new)"
msgstr "Литовский AZERTY"
-#: ../keyboard.pm_.c:113
+#: ../../keyboard.pm_.c:141
msgid "Lithuanian \"number row\" QWERTY"
msgstr "Литовский \"номер ряда\" QWERTY"
-#: ../keyboard.pm_.c:114
+#: ../../keyboard.pm_.c:142
msgid "Lithuanian \"phonetic\" QWERTY"
msgstr "Литовский \"фонетический\" QWERTY"
-#: ../keyboard.pm_.c:115
-msgid "Norwegian"
-msgstr "Норвежский"
-
-#: ../keyboard.pm_.c:116
+#: ../../keyboard.pm_.c:144
#, fuzzy
msgid "Polish (qwerty layout)"
msgstr "Швейцарский (Немецкая раскладка)"
-#: ../keyboard.pm_.c:117
+#: ../../keyboard.pm_.c:145
#, fuzzy
msgid "Polish (qwertz layout)"
msgstr "Швейцарский (Немецкая раскладка)"
-#: ../keyboard.pm_.c:118
+#: ../../keyboard.pm_.c:146
msgid "Portuguese"
msgstr "Португальский"
-#: ../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:147
msgid "Canadian (Quebec)"
msgstr "Канадский (Квебек)"
-#: ../keyboard.pm_.c:120
-msgid "Russian"
-msgstr "Русский"
-
-#: ../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:149
msgid "Russian (Yawerty)"
-msgstr "Русский (Yawerty)"
+msgstr "Русский (ЯВЕРТИ)"
-#: ../keyboard.pm_.c:122
+#: ../../keyboard.pm_.c:150
msgid "Swedish"
msgstr "Шведский"
-#: ../keyboard.pm_.c:123
+#: ../../keyboard.pm_.c:151
msgid "Slovenian"
msgstr "Словенский"
-#: ../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:152
msgid "Slovakian"
msgstr "Словацкий"
-#: ../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:153
msgid "Thai keyboard"
msgstr "Тайская клавиатура"
-#: ../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:154
msgid "Turkish (traditional \"F\" model)"
msgstr "Турецкий традиционная \"F\" модель)"
-#: ../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:155
msgid "Turkish (modern \"Q\" model)"
msgstr "Турецкий (современная \"Q\" модель)"
-#: ../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:156
msgid "Ukrainian"
msgstr "Украинский"
-#: ../keyboard.pm_.c:129
-msgid "UK keyboard"
-msgstr "UK клавиатура"
-
-#: ../keyboard.pm_.c:130
-msgid "US keyboard"
-msgstr "US клавиатура"
-
-#: ../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:159
msgid "US keyboard (international)"
msgstr "US клавиатура (интернациональная)"
-#: ../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:160
msgid "Yugoslavian (latin layout)"
msgstr "Югославский"
@@ -3245,7 +3744,7 @@ msgstr "Югославский"
# transliteration be used; or maybe the english text be used; as it is best
# When possible cp437 accentuated letters can be used too.
#
-#: ../lilo.pm_.c:145
+#: ../../lilo.pm_.c:176
#, c-format
msgid ""
"Welcome to LILO the operating system chooser!\n"
@@ -3263,131 +3762,213 @@ msgstr ""
"ili zhdite %d sekund zagruzki po umolchaniyu.\n"
"\n"
-#: ../mouse.pm_.c:20
-msgid "No Mouse"
-msgstr "Нет мыши"
+# NOTE: this message will be displayed by grub at boot time; that is
+# using the BIOS font; that means cp437 charset on 99.99% of PC computers
+# out there. It is the nsuggested that for non latin languages an ascii
+# transliteration be used; or maybe the english text be used; as it is best
+#
+# The lines must fit on screen, aka length < 80
+# and only one line per string for the GRUB messages
+#
+#: ../../lilo.pm_.c:431
+msgid "Welcome to GRUB the operating system chooser!"
+msgstr ""
-#: ../mouse.pm_.c:21
-msgid "Microsoft Rev 2.1A or higher (serial)"
-msgstr "Microsoft Rev 2.1A или выше (последовательная))"
+#: ../../lilo.pm_.c:432
+#, c-format
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr ""
-#: ../mouse.pm_.c:22
-msgid "Logitech CC Series (serial)"
-msgstr "Logitech CC Series (последовательная)"
+#: ../../lilo.pm_.c:433
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr ""
-#: ../mouse.pm_.c:23
-msgid "Logitech MouseMan+/FirstMouse+ (serial)"
-msgstr "Logitech MouseMan+/FirstMouse+ (последовательная)"
+#: ../../lilo.pm_.c:434
+msgid "commands before booting, or 'c' for a command-line."
+msgstr ""
-#: ../mouse.pm_.c:24
-msgid "ASCII MieMouse (serial)"
-msgstr "ASCII MieMouse (последовательная)"
+#: ../../lilo.pm_.c:435
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr ""
-#: ../mouse.pm_.c:25
-msgid "Genius NetMouse (serial)"
-msgstr "Genius NetMouse (последовательная)"
+#: ../../lilo.pm_.c:439
+msgid "not enough room in /boot"
+msgstr ""
-#: ../mouse.pm_.c:26
-msgid "Microsoft IntelliMouse (serial)"
-msgstr "Microsoft IntelliMouse (последовательная)"
+#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
+#: ../../lilo.pm_.c:518
+msgid "Desktop"
+msgstr ""
-#: ../mouse.pm_.c:27
-msgid "MM Series (serial)"
-msgstr "MM Series (последовательная)"
+#: ../../lilo.pm_.c:518
+msgid "Start Menu"
+msgstr ""
-#: ../mouse.pm_.c:28
-msgid "MM HitTablet (serial)"
-msgstr "MM HitTablet (последовательная)"
+#: ../../mouse.pm_.c:21
+#, fuzzy
+msgid "Sun - Mouse"
+msgstr "USB Мышь"
-#: ../mouse.pm_.c:29
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech Mouse (последовательная, старый тип C7)"
+#: ../../mouse.pm_.c:23
+#, fuzzy
+msgid "Apple ADB Mouse"
+msgstr "ATI Bus Mouse"
-#: ../mouse.pm_.c:30
-msgid "Logitech MouseMan/FirstMouse (serial)"
-msgstr "Logitech MouseMan/FirstMouse (последовательная)"
+#: ../../mouse.pm_.c:24
+#, fuzzy
+msgid "Apple ADB Mouse (2 Buttons)"
+msgstr "USB Мышь (3 кнопки или более)"
-#: ../mouse.pm_.c:31
-msgid "Generic Mouse (serial)"
-msgstr "Generic Mouse (последовательная)"
+#: ../../mouse.pm_.c:25
+#, fuzzy
+msgid "Apple ADB Mouse (3+ Buttons)"
+msgstr "USB Мышь (3 кнопки или более)"
-#: ../mouse.pm_.c:32
-msgid "Microsoft compatible (serial)"
-msgstr "Microsoft compatible (последовательная)"
+#: ../../mouse.pm_.c:26
+#, fuzzy
+msgid "Apple USB Mouse"
+msgstr "USB Мышь"
-#: ../mouse.pm_.c:33
-msgid "Generic 3 Button Mouse (serial)"
-msgstr "Generic 3 Button Mouse (последовательная)"
+#: ../../mouse.pm_.c:27
+#, fuzzy
+msgid "Apple USB Mouse (2 Buttons)"
+msgstr "USB Мышь (3 кнопки или более)"
-#: ../mouse.pm_.c:34
-msgid "Mouse Systems (serial)"
-msgstr "Mouse Systems (последовательная)"
+#: ../../mouse.pm_.c:28
+#, fuzzy
+msgid "Apple USB Mouse (3+ Buttons)"
+msgstr "USB Мышь (3 кнопки или более)"
-#: ../mouse.pm_.c:35
+#: ../../mouse.pm_.c:30
msgid "Generic Mouse (PS/2)"
msgstr "Generic Mouse (PS/2)"
-#: ../mouse.pm_.c:36
+#: ../../mouse.pm_.c:31
msgid "Logitech MouseMan/FirstMouse (ps/2)"
msgstr "Logitech MouseMan/FirstMouse (ps/2)"
-#: ../mouse.pm_.c:37
+#: ../../mouse.pm_.c:32
msgid "Generic 3 Button Mouse (PS/2)"
msgstr "Generic 3 Button Mouse (PS/2)"
-#: ../mouse.pm_.c:38
+#: ../../mouse.pm_.c:33
msgid "ALPS GlidePoint (PS/2)"
msgstr "ALPS GlidePoint (PS/2)"
-#: ../mouse.pm_.c:39
+#: ../../mouse.pm_.c:34
msgid "Logitech MouseMan+/FirstMouse+ (PS/2)"
msgstr "Logitech MouseMan+/FirstMouse+ (PS/2)"
-#: ../mouse.pm_.c:40
+#: ../../mouse.pm_.c:35
msgid "Kensington Thinking Mouse (PS/2)"
msgstr "Kensington Thinking Mouse (PS/2)"
-#: ../mouse.pm_.c:41
+#: ../../mouse.pm_.c:36
msgid "ASCII MieMouse (PS/2)"
msgstr "ASCII MieMouse (PS/2)"
-#: ../mouse.pm_.c:42
+#: ../../mouse.pm_.c:37
msgid "Genius NetMouse (PS/2)"
msgstr "Genius NetMouse (PS/2)"
-#: ../mouse.pm_.c:43
+#: ../../mouse.pm_.c:38
msgid "Genius NetMouse Pro (PS/2)"
msgstr "Genius NetMouse Pro (PS/2)"
-#: ../mouse.pm_.c:44
+#: ../../mouse.pm_.c:39
msgid "Genius NetScroll (PS/2)"
msgstr "Genius NetScroll (PS/2)"
-#: ../mouse.pm_.c:45
+#: ../../mouse.pm_.c:40
msgid "Microsoft IntelliMouse (PS/2)"
msgstr "Microsoft IntelliMouse (PS/2)"
-#: ../mouse.pm_.c:46
+#: ../../mouse.pm_.c:41
msgid "ATI Bus Mouse"
msgstr "ATI Bus Mouse"
-#: ../mouse.pm_.c:47
+#: ../../mouse.pm_.c:42
msgid "Microsoft Bus Mouse"
msgstr "Microsoft Bus Mouse"
-#: ../mouse.pm_.c:48
+#: ../../mouse.pm_.c:43
msgid "Logitech Bus Mouse"
msgstr "Logitech Bus Mouse"
-#: ../mouse.pm_.c:49
+#: ../../mouse.pm_.c:44
msgid "USB Mouse"
msgstr "USB Мышь"
-#: ../mouse.pm_.c:50
+#: ../../mouse.pm_.c:45
msgid "USB Mouse (3 buttons or more)"
msgstr "USB Мышь (3 кнопки или более)"
-#: ../partition_table.pm_.c:486
+#: ../../mouse.pm_.c:47
+msgid "No Mouse"
+msgstr "Нет мыши"
+
+#: ../../mouse.pm_.c:48
+msgid "Microsoft Rev 2.1A or higher (serial)"
+msgstr "Microsoft Rev 2.1A или выше (последовательная))"
+
+#: ../../mouse.pm_.c:49
+msgid "Logitech CC Series (serial)"
+msgstr "Logitech CC Series (последовательная)"
+
+#: ../../mouse.pm_.c:50
+msgid "Logitech MouseMan+/FirstMouse+ (serial)"
+msgstr "Logitech MouseMan+/FirstMouse+ (последовательная)"
+
+#: ../../mouse.pm_.c:51
+msgid "ASCII MieMouse (serial)"
+msgstr "ASCII MieMouse (последовательная)"
+
+#: ../../mouse.pm_.c:52
+msgid "Genius NetMouse (serial)"
+msgstr "Genius NetMouse (последовательная)"
+
+#: ../../mouse.pm_.c:53
+msgid "Microsoft IntelliMouse (serial)"
+msgstr "Microsoft IntelliMouse (последовательная)"
+
+#: ../../mouse.pm_.c:54
+msgid "MM Series (serial)"
+msgstr "MM Series (последовательная)"
+
+#: ../../mouse.pm_.c:55
+msgid "MM HitTablet (serial)"
+msgstr "MM HitTablet (последовательная)"
+
+#: ../../mouse.pm_.c:56
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech Mouse (последовательная, старый тип C7)"
+
+#: ../../mouse.pm_.c:57
+msgid "Logitech MouseMan/FirstMouse (serial)"
+msgstr "Logitech MouseMan/FirstMouse (последовательная)"
+
+#: ../../mouse.pm_.c:58
+msgid "Generic Mouse (serial)"
+msgstr "Generic Mouse (последовательная)"
+
+#: ../../mouse.pm_.c:59
+msgid "Microsoft compatible (serial)"
+msgstr "Microsoft compatible (последовательная)"
+
+#: ../../mouse.pm_.c:60
+msgid "Generic 3 Button Mouse (serial)"
+msgstr "Generic 3 Button Mouse (последовательная)"
+
+#: ../../mouse.pm_.c:61
+msgid "Mouse Systems (serial)"
+msgstr "Mouse Systems (последовательная)"
+
+#: ../../my_gtk.pm_.c:459
+msgid "Is this correct?"
+msgstr "Это верно?"
+
+#: ../../partition_table.pm_.c:533
msgid ""
"You have a hole in your partition table but I can't use it.\n"
"The only solution is to move your primary partitions to have the hole next "
@@ -3397,113 +3978,129 @@ msgstr ""
"Единственный выход состоит в том, чтобы передвинуть первичные разделы "
"так,чтобы дыра шла сразу за расширенным (extended) разделом"
-#: ../partition_table.pm_.c:572
+#: ../../partition_table.pm_.c:621
#, c-format
msgid "Error reading file %s"
msgstr "Ошибка чтения файла %s"
-#: ../partition_table.pm_.c:579
+#: ../../partition_table.pm_.c:628
#, c-format
msgid "Restoring from file %s failed: %s"
msgstr "Восстановление из файла %s: провалилось %s"
-#: ../partition_table.pm_.c:581
+#: ../../partition_table.pm_.c:630
msgid "Bad backup file"
msgstr "Плохой файл с резервной копией"
-#: ../partition_table.pm_.c:602
+#: ../../partition_table.pm_.c:651
#, c-format
msgid "Error writing to file %s"
msgstr "Ошибка записи в файл %s"
-#: ../placeholder.pm_.c:5
+#: ../../pkgs.pm_.c:20
+msgid "mandatory"
+msgstr ""
+
+#: ../../pkgs.pm_.c:21
+msgid "must have"
+msgstr ""
+
+#: ../../pkgs.pm_.c:22
+msgid "important"
+msgstr ""
+
+#: ../../pkgs.pm_.c:24
+msgid "very nice"
+msgstr ""
+
+#: ../../pkgs.pm_.c:25
+#, fuzzy
+msgid "nice"
+msgstr "устройство:"
+
+#: ../../pkgs.pm_.c:26 ../../pkgs.pm_.c:27
+#, fuzzy
+msgid "interesting"
+msgstr "изменение размера"
+
+#: ../../pkgs.pm_.c:28 ../../pkgs.pm_.c:29 ../../pkgs.pm_.c:30
+#: ../../pkgs.pm_.c:31
+#, fuzzy
+msgid "maybe"
+msgstr "Образ"
+
+#: ../../pkgs.pm_.c:33
+msgid "i18n (important)"
+msgstr ""
+
+#: ../../pkgs.pm_.c:34
+msgid "i18n (very nice)"
+msgstr ""
+
+#: ../../pkgs.pm_.c:35
+msgid "i18n (nice)"
+msgstr ""
+
+#: ../../placeholder.pm_.c:5
msgid "Show less"
msgstr "Показать меньше"
-#: ../placeholder.pm_.c:6
+#: ../../placeholder.pm_.c:6
msgid "Show more"
msgstr "Показать больше"
-#: ../printer.pm_.c:244
+#: ../../printer.pm_.c:244
msgid "Local printer"
msgstr "Локальный принтер"
-#: ../printer.pm_.c:245
+#: ../../printer.pm_.c:245
msgid "Remote lpd"
msgstr "Удаленный lpd"
-#: ../printer.pm_.c:246
+#: ../../printer.pm_.c:246
msgid "SMB/Windows 95/98/NT"
msgstr "SMB/Windows 95/98/NT"
-#: ../printer.pm_.c:247
+#: ../../printer.pm_.c:247
msgid "NetWare"
msgstr "NetWare"
-#: ../printerdrake.pm_.c:75
-msgid "Local Printer Options"
-msgstr "Опции локального принтера"
-
-#: ../printerdrake.pm_.c:76
-msgid ""
-"Every print queue (which print jobs are directed to) needs a\n"
-"name (often lp) and a spool directory associated with it. What\n"
-"name and directory should be used for this queue?"
-msgstr ""
-"Каждая очередь печати, в которую помещаются задания для печати, требует "
-"указания имени (обычно lp) и связанного с ней каталога спулинга. Укажите имя "
-"и каталог для очереди."
-
-#: ../printerdrake.pm_.c:79
-msgid "Name of queue:"
-msgstr "Имя очереди:"
-
-#: ../printerdrake.pm_.c:79
-msgid "Spool directory:"
-msgstr "Директория спулинга:"
-
-#: ../printerdrake.pm_.c:90
-msgid "Select Printer Connection"
-msgstr "Выбор типа подключения принтера"
-
-#: ../printerdrake.pm_.c:91
-msgid "How is the printer connected?"
-msgstr "Выберите тип соединения:"
-
-#: ../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:19
msgid "Detecting devices..."
msgstr "Определение устройств..."
-#: ../printerdrake.pm_.c:99
+#: ../../printerdrake.pm_.c:19
msgid "Test ports"
msgstr "Проверка портов"
-#: ../printerdrake.pm_.c:112
+#: ../../printerdrake.pm_.c:35
#, c-format
msgid "A printer, model \"%s\", has been detected on "
msgstr "Принтер модели \"%s\" обнаружен на "
-#: ../printerdrake.pm_.c:119
+#: ../../printerdrake.pm_.c:44
msgid "Local Printer Device"
msgstr "Локальный принтер"
-#: ../printerdrake.pm_.c:120
+#: ../../printerdrake.pm_.c:45
+#, fuzzy
msgid ""
-"What device is your printer connected to \n"
+"What device is your printer connected to \n"
"(note that /dev/lp0 is equivalent to LPT1:)?\n"
msgstr ""
"К какому устройству подключен ваш принтер \n"
"(/dev/lp0 эквивалентен LPT1:)?\n"
-#: ../printerdrake.pm_.c:121
-msgid "Printer Device:"
+#: ../../printerdrake.pm_.c:47
+#, fuzzy
+msgid "Printer Device"
msgstr "Принтер:"
-#: ../printerdrake.pm_.c:125
+#: ../../printerdrake.pm_.c:62
msgid "Remote lpd Printer Options"
msgstr "Опции удаленного принтера lpd"
-#: ../printerdrake.pm_.c:126
+#: ../../printerdrake.pm_.c:63
msgid ""
"To use a remote lpd print queue, you need to supply\n"
"the hostname of the printer server and the queue name\n"
@@ -3513,19 +4110,20 @@ msgstr ""
"сервера и имя очереди печати, в которую удаленный сервер будет помещать "
"задания."
-#: ../printerdrake.pm_.c:129
-msgid "Remote hostname:"
+#: ../../printerdrake.pm_.c:66
+#, fuzzy
+msgid "Remote hostname"
msgstr "Удаленный сервер:"
-#: ../printerdrake.pm_.c:129
+#: ../../printerdrake.pm_.c:67
msgid "Remote queue"
msgstr "Удаленная очередь"
-#: ../printerdrake.pm_.c:134
+#: ../../printerdrake.pm_.c:75
msgid "SMB (Windows 9x/NT) Printer Options"
msgstr "Опции принтера SMB (Windows 9x/NT)"
-#: ../printerdrake.pm_.c:135
+#: ../../printerdrake.pm_.c:76
msgid ""
"To print to a SMB printer, you need to provide the\n"
"SMB host name (Note! It may be different from its\n"
@@ -3538,35 +4136,27 @@ msgstr ""
"ресурса, связанное с выбранным принтером, имя пользователя, пароль и "
"информацию о рабочей группе."
-#: ../printerdrake.pm_.c:140
-msgid "SMB server IP:"
-msgstr "IP сервера SMB:"
-
-#: ../printerdrake.pm_.c:140
-msgid "SMB server host:"
-msgstr "Имя сервера SMB:"
-
-#: ../printerdrake.pm_.c:141 ../printerdrake.pm_.c:163
-msgid "Password:"
-msgstr "Пароль:"
+#: ../../printerdrake.pm_.c:81
+msgid "SMB server host"
+msgstr "Имя сервера SMB"
-#: ../printerdrake.pm_.c:141
-msgid "Share name:"
-msgstr "Имя ресурса:"
+#: ../../printerdrake.pm_.c:82
+msgid "SMB server IP"
+msgstr "IP сервера SMB"
-#: ../printerdrake.pm_.c:141 ../printerdrake.pm_.c:163
-msgid "User name:"
-msgstr "Имя пользователя:"
+#: ../../printerdrake.pm_.c:83
+msgid "Share name"
+msgstr "Имя ресурса"
-#: ../printerdrake.pm_.c:142
-msgid "Workgroup:"
-msgstr "Рабочая группа:"
+#: ../../printerdrake.pm_.c:86
+msgid "Workgroup"
+msgstr "Рабочая группа"
-#: ../printerdrake.pm_.c:157
+#: ../../printerdrake.pm_.c:102
msgid "NetWare Printer Options"
msgstr "Опции принтера NetWare"
-#: ../printerdrake.pm_.c:158
+#: ../../printerdrake.pm_.c:103
msgid ""
"To print to a NetWare printer, you need to provide the\n"
"NetWare print server name (Note! it may be different from its\n"
@@ -3577,67 +4167,96 @@ msgstr ""
"NetWare (не всегда совпадает с именем в сети TCP/IP) и имя очереди, "
"соответствующей выбранному принтеру, а также имя пользователя и пароль."
-#: ../printerdrake.pm_.c:162
-msgid "Print Queue Name:"
-msgstr "Имя очереди:"
+#: ../../printerdrake.pm_.c:107
+msgid "Printer Server"
+msgstr "Сервер печати"
-#: ../printerdrake.pm_.c:162
-msgid "Printer Server:"
-msgstr "Сервер печати:"
+#: ../../printerdrake.pm_.c:108
+msgid "Print Queue Name"
+msgstr "Имя очереди"
-#: ../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:121
msgid "Yes, print ASCII test page"
msgstr "Да, напечать страницу текста ASCII"
-#: ../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:122
msgid "Yes, print PostScript test page"
msgstr "Да, напечать страницу текста PostScript"
-#: ../printerdrake.pm_.c:175
+#: ../../printerdrake.pm_.c:123
msgid "Yes, print both test pages"
msgstr "Да, напечатать обе страницы текста"
-#: ../printerdrake.pm_.c:183
+#: ../../printerdrake.pm_.c:130
msgid "Configure Printer"
msgstr "Настройка принтера"
-#: ../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:131
msgid "What type of printer do you have?"
msgstr "Выберите тип принтера:"
-#: ../printerdrake.pm_.c:204
+#: ../../printerdrake.pm_.c:163
msgid "Printer options"
msgstr "Опции принтера"
-#: ../printerdrake.pm_.c:205
+#: ../../printerdrake.pm_.c:164
msgid "Paper Size"
msgstr "Размер бумаги"
-#: ../printerdrake.pm_.c:206
+#: ../../printerdrake.pm_.c:165
msgid "Eject page after job?"
msgstr "Удалять бумагу после печати?"
-#: ../printerdrake.pm_.c:209
-msgid "Fix stair-stepping text?"
-msgstr "Исправлять \"ступенчатую печать\"?"
-
-#: ../printerdrake.pm_.c:212
+#: ../../printerdrake.pm_.c:170
msgid "Uniprint driver options"
msgstr "Параметры драйвера Uniprint"
-#: ../printerdrake.pm_.c:213
+#: ../../printerdrake.pm_.c:171
msgid "Color depth options"
msgstr "Параметры глубины цвета"
-#: ../printerdrake.pm_.c:223
+#: ../../printerdrake.pm_.c:173
+msgid "Print text as PostScript?"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:174
+msgid "Reverse page order"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:176
+msgid "Fix stair-stepping text?"
+msgstr "Исправлять \"ступенчатую печать\"?"
+
+#: ../../printerdrake.pm_.c:179
+msgid "Number of pages per output pages"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:180
+msgid "Right/Left margins in points (1/72 of inch)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:181
+msgid "Top/Bottom margins in points (1/72 of inch)"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:184
+msgid "Extra GhostScript options"
+msgstr ""
+
+#: ../../printerdrake.pm_.c:187
+#, fuzzy
+msgid "Extra Text options"
+msgstr "Параметры глубины цвета"
+
+#: ../../printerdrake.pm_.c:198
msgid "Do you want to test printing?"
msgstr "Хотите протестировать печать?"
-#: ../printerdrake.pm_.c:234
+#: ../../printerdrake.pm_.c:210
msgid "Printing test page(s)..."
msgstr "Печать тестовых страниц"
-#: ../printerdrake.pm_.c:252
+#: ../../printerdrake.pm_.c:218
#, c-format
msgid ""
"Test page(s) have been sent to the printer daemon.\n"
@@ -3647,38 +4266,301 @@ msgid ""
"\n"
"Does it work properly?"
msgstr ""
-"Тестовые страницы отправлены демону печати.\n"
-"Прежде чем принтер заработает может пройти некоторое время.\n"
-"Статус печати:\n"
-"%s\n"
-"\n"
-"Он работает нормально?"
-#: ../printerdrake.pm_.c:256
+#: ../../printerdrake.pm_.c:222
msgid ""
"Test page(s) have been sent to the printer daemon.\n"
"This may take a little time before printer start.\n"
"Does it work properly?"
msgstr ""
-"Тестовые страницы отправлены демону печати.\n"
-"Прежде чем принтер заработает может пройти некоторое время.\n"
-"Он работает нормально?"
-#: ../raid.pm_.c:36
+#: ../../printerdrake.pm_.c:238
+msgid "Printer"
+msgstr "Принтер"
+
+#: ../../printerdrake.pm_.c:239
+msgid "Would you like to configure a printer?"
+msgstr "Хотите настроить принтер?"
+
+#: ../../printerdrake.pm_.c:243
+#, fuzzy
+msgid ""
+"Here are the following print queues.\n"
+"You can add some more or change the existing ones."
+msgstr ""
+"В LILO есть следующие пункты.\n"
+"Вы можете добавить еще, или изменить существующие."
+
+#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
+msgid "Select Printer Connection"
+msgstr "Выбор типа подключения принтера"
+
+#: ../../printerdrake.pm_.c:267
+msgid "How is the printer connected?"
+msgstr "Выберите тип соединения:"
+
+#: ../../printerdrake.pm_.c:272
+#, fuzzy
+msgid "Remove queue"
+msgstr "Удаленная очередь"
+
+#: ../../printerdrake.pm_.c:273
+#, fuzzy
+msgid ""
+"Every print queue (which print jobs are directed to) needs a\n"
+"name (often lp) and a spool directory associated with it. What\n"
+"name and directory should be used for this queue and how is the printer "
+"connected?"
+msgstr ""
+"Каждая очередь печати, в которую помещаются задания для печати, требует "
+"указания имени (обычно lp) и связанного с ней каталога спулинга. Укажите имя "
+"и каталог для очереди."
+
+#: ../../printerdrake.pm_.c:276
+#, fuzzy
+msgid "Name of queue"
+msgstr "Имя очереди:"
+
+#: ../../printerdrake.pm_.c:277
+#, fuzzy
+msgid "Spool directory"
+msgstr "Директория спулинга:"
+
+#: ../../printerdrake.pm_.c:278
+#, fuzzy
+msgid "Printer Connection"
+msgstr "Выбор типа подключения принтера"
+
+#: ../../raid.pm_.c:36
#, c-format
msgid "Can't add a partition to _formatted_ RAID md%d"
msgstr "Не могу добавить раздел на _отформатированный_ RAID md%d"
-#: ../raid.pm_.c:106
+#: ../../raid.pm_.c:106
msgid "Can't write file $file"
msgstr "Не могу писать файл $file"
-#: ../raid.pm_.c:146
+#: ../../raid.pm_.c:131
+msgid "mkraid failed"
+msgstr ""
+
+#: ../../raid.pm_.c:131
+msgid "mkraid failed (maybe raidtools are missing?)"
+msgstr ""
+
+#: ../../raid.pm_.c:147
#, c-format
msgid "Not enough partitions for RAID level %d\n"
msgstr "Недостаточно разделов для RAID уровня %d\n"
-#: ../standalone/draksec_.c:28
+#: ../../services.pm_.c:14
+msgid "Anacron a periodic command scheduler."
+msgstr ""
+
+#: ../../services.pm_.c:15
+msgid ""
+"apmd is used for monitoring batery status and logging it via syslog.\n"
+"It can also be used for shutting down the machine when the battery is low."
+msgstr ""
+
+#: ../../services.pm_.c:17
+msgid ""
+"Runs commands scheduled by the at command at the time specified when\n"
+"at was run, and runs batch commands when the load average is low enough."
+msgstr ""
+
+#: ../../services.pm_.c:19
+msgid ""
+"cron is a standard UNIX program that runs user-specified programs\n"
+"at periodic scheduled times. vixie cron adds a number of features to the "
+"basic\n"
+"UNIX cron, including better security and more powerful configuration options."
+msgstr ""
+
+#: ../../services.pm_.c:22
+msgid ""
+"GPM adds mouse support to text-based Linux applications such the\n"
+"Midnight Commander. It also allows mouse-based console cut-and-paste "
+"operations,\n"
+"and includes support for pop-up menus on the console."
+msgstr ""
+
+#: ../../services.pm_.c:25
+msgid ""
+"Apache is a World Wide Web server. It is used to serve HTML files\n"
+"and CGI."
+msgstr ""
+
+#: ../../services.pm_.c:27
+msgid ""
+"The internet superserver daemon (commonly called inetd) starts a\n"
+"variety of other internet services as needed. It is responsible for "
+"starting\n"
+"many services, including telnet, ftp, rsh, and rlogin. Disabling inetd "
+"disables\n"
+"all of the services it is responsible for."
+msgstr ""
+
+#: ../../services.pm_.c:31
+msgid ""
+"This package loads the selected keyboard map as set in\n"
+"/etc/sysconfig/keyboard. This can be selected using the kbdconfig utility.\n"
+"You should leave this enabled for most machines."
+msgstr ""
+
+#: ../../services.pm_.c:34
+msgid ""
+"lpd is the print daemon required for lpr to work properly. It is\n"
+"basically a server that arbitrates print jobs to printer(s)."
+msgstr ""
+
+#: ../../services.pm_.c:36
+msgid ""
+"named (BIND) is a Domain Name Server (DNS) that is used to resolve\n"
+"host names to IP addresses."
+msgstr ""
+
+#: ../../services.pm_.c:38
+msgid ""
+"Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
+"Manager/Windows), and NCP (NetWare) mount points."
+msgstr ""
+
+#: ../../services.pm_.c:40
+msgid ""
+"Activates/Deactivates all network interfaces configured to start\n"
+"at boot time."
+msgstr ""
+
+#: ../../services.pm_.c:42
+msgid ""
+"NFS is a popular protocol for file sharing across TCP/IP networks.\n"
+"This service provides NFS server functionality, which is configured via the\n"
+"/etc/exports file."
+msgstr ""
+
+#: ../../services.pm_.c:45
+msgid ""
+"NFS is a popular protocol for file sharing across TCP/IP\n"
+"networks. This service provides NFS file locking functionality."
+msgstr ""
+
+#: ../../services.pm_.c:47
+msgid ""
+"PCMCIA support is usually to support things like ethernet and\n"
+"modems in laptops. It won't get started unless configured so it is safe to "
+"have\n"
+"it installed on machines that don't need it."
+msgstr ""
+
+#: ../../services.pm_.c:50
+msgid ""
+"The portmapper manages RPC connections, which are used by\n"
+"protocols such as NFS and NIS. The portmap server must be running on "
+"machines\n"
+"which act as servers for protocols which make use of the RPC mechanism."
+msgstr ""
+
+#: ../../services.pm_.c:53
+msgid ""
+"Postfix is a Mail Transport Agent, which is the program that\n"
+"moves mail from one machine to another."
+msgstr ""
+
+#: ../../services.pm_.c:55
+msgid ""
+"Saves and restores system entropy pool for higher quality random\n"
+"number generation."
+msgstr ""
+
+#: ../../services.pm_.c:57
+msgid ""
+"The routed daemon allows for automatic IP router table updated via\n"
+"the RIP protocol. While RIP is widely used on small networks, more complex\n"
+"routing protocols are needed for complex networks."
+msgstr ""
+
+#: ../../services.pm_.c:60
+msgid ""
+"The rstat protocol allows users on a network to retrieve\n"
+"performance metrics for any machine on that network."
+msgstr ""
+
+#: ../../services.pm_.c:62
+msgid ""
+"The rusers protocol allows users on a network to identify who is\n"
+"logged in on other responding machines."
+msgstr ""
+
+#: ../../services.pm_.c:64
+msgid ""
+"The rwho protocol lets remote users get a list of all of the users\n"
+"logged into a machine running the rwho daemon (similiar to finger)."
+msgstr ""
+
+#: ../../services.pm_.c:66
+msgid ""
+"Syslog is the facility by which many daemons use to log messages\n"
+"to various system log files. It is a good idea to always run syslog."
+msgstr ""
+
+#: ../../services.pm_.c:68
+msgid "This startup script try to load your modules for your usb mouse."
+msgstr ""
+
+#: ../../services.pm_.c:69
+msgid "Starts and stops the X Font Server at boot time and shutdown."
+msgstr ""
+
+#: ../../services.pm_.c:92
+msgid "Choose which services should be automatically started at boot time"
+msgstr "Выберите, какие сервисы запускать автоматически при загрузке"
+
+# NOTE: this message will be displayed by lilo at boot time; that is
+# using the BIOS font; that means cp437 charset on 99.99% of PC computers
+# out there. It is then suggested that for non latin languages an ascii
+# transliteration be used; or maybe the english text be used; as it is best
+# When possible cp437 accentuated letters can be used too.
+#
+#: ../../silo.pm_.c:116
+#, c-format
+msgid ""
+"Welcome to SILO the operating system chooser!\n"
+"\n"
+"To list the possible choices, press <TAB>.\n"
+"\n"
+"To load one of them, write its name and press <ENTER> or\n"
+"wait %d seconds for default boot.\n"
+"\n"
+msgstr ""
+"Dobro pozhalovat' v dispetcher vybora operacionnoj sistemy SILO!\n"
+"Chtoby vyvesti spisok vozmozhnyh variantov, nazhmite <TAB>\n"
+"\n"
+"Chtoby odnu iz nih, napishite ee nazvanie i nazhmite <ENTER>\n"
+"ili zhdite %d sekund zagruzki po umolchaniyu.\n"
+"\n"
+
+#: ../../standalone/drakboot_.c:23
+#, fuzzy
+msgid "Configure LILO/GRUB"
+msgstr "Настройка X Window"
+
+#: ../../standalone/drakboot_.c:24
+#, fuzzy
+msgid "Create a boot floppy"
+msgstr "Создать загруз. диск"
+
+#: ../../standalone/drakboot_.c:25
+#, fuzzy
+msgid "Format floppy"
+msgstr "Форматировать все"
+
+#: ../../standalone/drakboot_.c:36
+#, fuzzy
+msgid "Choice"
+msgstr "устройство:"
+
+#: ../../standalone/draksec_.c:28
msgid ""
"This level is to be used with care. It makes your system more easy to use,\n"
"but very sensitive: it must not be used for a machine connected to others\n"
@@ -3688,7 +4570,7 @@ msgstr ""
"проще в использовании, но более чувствительной: не следует использовать\n"
"на машинах, подключенным к сети или к Internet. Вход не защищен паролем."
-#: ../standalone/draksec_.c:31
+#: ../../standalone/draksec_.c:31
msgid ""
"Password are now enabled, but use as a networked computer is still not "
"recommended."
@@ -3696,7 +4578,7 @@ msgstr ""
"Пароль теперь включен, но использование компьютера в качестве сетевого\n"
"по-прежнему не рекомендуется."
-#: ../standalone/draksec_.c:32
+#: ../../standalone/draksec_.c:32
msgid ""
"Few improvements for this security level, the main one is that there are\n"
"more security warnings and checks."
@@ -3704,7 +4586,7 @@ msgstr ""
"На этом уровне безопасности есть ряд улучшений, в первую очередь\n"
"увеличилось количество проверок и предупреждений."
-#: ../standalone/draksec_.c:34
+#: ../../standalone/draksec_.c:34
msgid ""
"This is the standard security recommended for a computer that will be used\n"
"to connect to the Internet as a client. There are now security checks. "
@@ -3713,7 +4595,7 @@ msgstr ""
"подсоединенного к Internet в качестве клиента. Добавлены новые проверки\n"
"на безопасность."
-#: ../standalone/draksec_.c:36
+#: ../../standalone/draksec_.c:36
msgid ""
"With this security level, the use of this system as a server becomes "
"possible.\n"
@@ -3724,7 +4606,7 @@ msgstr ""
"в качестве сервера. Безопасность теперь достаточно высока для работы\n"
"сервера, допускающего соединения со многими клиентами."
-#: ../standalone/draksec_.c:39
+#: ../../standalone/draksec_.c:39
msgid ""
"We take level 4 features, but now the system is entirely closed.\n"
"Security features are at their maximum."
@@ -3732,177 +4614,177 @@ msgstr ""
"Принимаются свойства 4 уровня, но теперь система полностью закрыта.\n"
"Параметры безопасности установлены на максимум."
-#: ../standalone/draksec_.c:49
+#: ../../standalone/draksec_.c:49
msgid "Setting security level"
msgstr "Уровень безопасности"
-#: ../standalone/drakxconf_.c:21
+#: ../../standalone/drakxconf_.c:21
msgid "Choose the tool you want to use"
msgstr "Выберите инструмент"
-#: ../standalone/drakxservices_.c:21
-msgid "Choose which services should be automatically started at boot time"
-msgstr "Выберите, какие сервисы запускать автоматически при загрузке"
+#: ../../standalone/keyboarddrake_.c:23
+msgid "What is your keyboard layout?"
+msgstr "Укажите тип клавиатуры"
-#: ../standalone/mousedrake_.c:30
+#: ../../standalone/mousedrake_.c:25
+msgid "What is the type of your mouse?"
+msgstr "Укажите тип вашей мыши"
+
+#: ../../standalone/mousedrake_.c:30
msgid "no serial_usb found\n"
msgstr "serial_usb не найден\n"
-#: ../standalone/mousedrake_.c:35
+#: ../../standalone/mousedrake_.c:35
msgid "Emulate third button?"
msgstr "Эмулировать третью кнопку?"
-#: ../standalone/rpmdrake_.c:25
+#: ../../standalone/mousedrake_.c:39
+msgid "Which serial port is your mouse connected to?"
+msgstr "К какому последовательному порту подключена ваша мышь?"
+
+#: ../../standalone/rpmdrake_.c:25
msgid "reading configuration"
msgstr "чтение настройки"
-#: ../standalone/rpmdrake_.c:45 ../standalone/rpmdrake_.c:50
-#: ../standalone/rpmdrake_.c:253
+#: ../../standalone/rpmdrake_.c:45 ../../standalone/rpmdrake_.c:50
+#: ../../standalone/rpmdrake_.c:253
msgid "File"
msgstr "Файл"
-#: ../standalone/rpmdrake_.c:48 ../standalone/rpmdrake_.c:229
-#: ../standalone/rpmdrake_.c:253 ../standalone/rpmdrake_.c:269
+#: ../../standalone/rpmdrake_.c:48 ../../standalone/rpmdrake_.c:229
+#: ../../standalone/rpmdrake_.c:253 ../../standalone/rpmdrake_.c:269
msgid "Search"
msgstr "Поиск"
-#: ../standalone/rpmdrake_.c:49 ../standalone/rpmdrake_.c:56
+#: ../../standalone/rpmdrake_.c:49 ../../standalone/rpmdrake_.c:56
msgid "Package"
msgstr "Пакет"
-#: ../standalone/rpmdrake_.c:51
+#: ../../standalone/rpmdrake_.c:51
msgid "Text"
msgstr "Текст"
-#: ../standalone/rpmdrake_.c:53
+#: ../../standalone/rpmdrake_.c:53
msgid "Tree"
msgstr "Дерево"
-#: ../standalone/rpmdrake_.c:54
+#: ../../standalone/rpmdrake_.c:54
msgid "Sort by"
msgstr "Сортировать по"
-#: ../standalone/rpmdrake_.c:55
+#: ../../standalone/rpmdrake_.c:55
msgid "Category"
msgstr "Категория"
-#: ../standalone/rpmdrake_.c:58
+#: ../../standalone/rpmdrake_.c:58
msgid "See"
msgstr "См."
-#: ../standalone/rpmdrake_.c:59 ../standalone/rpmdrake_.c:163
+#: ../../standalone/rpmdrake_.c:59 ../../standalone/rpmdrake_.c:163
msgid "Installed packages"
msgstr "Установленные пакеты"
-#: ../standalone/rpmdrake_.c:60
+#: ../../standalone/rpmdrake_.c:60
msgid "Available packages"
msgstr "Доступные пакеты"
-#: ../standalone/rpmdrake_.c:62
+#: ../../standalone/rpmdrake_.c:62
msgid "Show only leaves"
msgstr "Показать все листья"
-#: ../standalone/rpmdrake_.c:67
+#: ../../standalone/rpmdrake_.c:67
msgid "Expand all"
msgstr "Раскрыть все"
-#: ../standalone/rpmdrake_.c:68
+#: ../../standalone/rpmdrake_.c:68
msgid "Collapse all"
msgstr "Свернуть все"
-#: ../standalone/rpmdrake_.c:70
+#: ../../standalone/rpmdrake_.c:70
msgid "Configuration"
msgstr "Настройка"
-#: ../standalone/rpmdrake_.c:71
+#: ../../standalone/rpmdrake_.c:71
msgid "Add location of packages"
msgstr "Добавить источник пакетов"
-#: ../standalone/rpmdrake_.c:75
+#: ../../standalone/rpmdrake_.c:75
msgid "Update location"
msgstr "Изменить источник"
-#: ../standalone/rpmdrake_.c:79 ../standalone/rpmdrake_.c:328
+#: ../../standalone/rpmdrake_.c:79 ../../standalone/rpmdrake_.c:328
msgid "Remove"
msgstr "Удалить"
-#: ../standalone/rpmdrake_.c:100
+#: ../../standalone/rpmdrake_.c:100
msgid "Configuration: Add Location"
msgstr "Настройка: Добавить источник"
-#: ../standalone/rpmdrake_.c:101
-msgid "Expand Tree"
-msgstr "Развернуть дерево"
-
-#: ../standalone/rpmdrake_.c:102
-msgid "Collapse Tree"
-msgstr "Свернуть дерево"
-
-#: ../standalone/rpmdrake_.c:103
+#: ../../standalone/rpmdrake_.c:103
msgid "Find Package"
msgstr "Поиск пакетов"
-#: ../standalone/rpmdrake_.c:104
+#: ../../standalone/rpmdrake_.c:104
msgid "Find Package containing file"
msgstr "Найти пакет, содержащий файл"
-#: ../standalone/rpmdrake_.c:105
+#: ../../standalone/rpmdrake_.c:105
msgid "Toggle between Installed and Available"
msgstr "Переключить Установлено/Доступно"
-#: ../standalone/rpmdrake_.c:139
+#: ../../standalone/rpmdrake_.c:139
msgid "Files:\n"
msgstr "Файлы:\n"
-#: ../standalone/rpmdrake_.c:161 ../standalone/rpmdrake_.c:209
+#: ../../standalone/rpmdrake_.c:161 ../../standalone/rpmdrake_.c:209
msgid "Uninstall"
msgstr "Удалить из системы"
-#: ../standalone/rpmdrake_.c:163
+#: ../../standalone/rpmdrake_.c:163
msgid "Choose package to install"
msgstr "Выбор пакетов для установки"
-#: ../standalone/rpmdrake_.c:190
+#: ../../standalone/rpmdrake_.c:190
msgid "Checking dependencies"
msgstr "Проверка завистимостей"
-#: ../standalone/rpmdrake_.c:190 ../standalone/rpmdrake_.c:409
+#: ../../standalone/rpmdrake_.c:190 ../../standalone/rpmdrake_.c:409
msgid "Wait"
msgstr "Ждите"
-#: ../standalone/rpmdrake_.c:209
+#: ../../standalone/rpmdrake_.c:209
msgid "The following packages are going to be uninstalled"
msgstr "Намечены к удалению из системы следующие пакеты"
-#: ../standalone/rpmdrake_.c:210
+#: ../../standalone/rpmdrake_.c:210
msgid "Uninstalling the RPMs"
msgstr "Удаление bp cbcntvs RPM"
-#: ../standalone/rpmdrake_.c:229 ../standalone/rpmdrake_.c:269
+#: ../../standalone/rpmdrake_.c:229 ../../standalone/rpmdrake_.c:269
msgid "Regexp"
msgstr "Regexp"
-#: ../standalone/rpmdrake_.c:229
+#: ../../standalone/rpmdrake_.c:229
msgid "Which package are looking for"
msgstr "Какие пакеты ищем"
-#: ../standalone/rpmdrake_.c:238 ../standalone/rpmdrake_.c:262
-#: ../standalone/rpmdrake_.c:278
+#: ../../standalone/rpmdrake_.c:238 ../../standalone/rpmdrake_.c:262
+#: ../../standalone/rpmdrake_.c:278
#, c-format
msgid "%s not found"
msgstr "Не нашли %s"
-#: ../standalone/rpmdrake_.c:238 ../standalone/rpmdrake_.c:262
-#: ../standalone/rpmdrake_.c:278
+#: ../../standalone/rpmdrake_.c:238 ../../standalone/rpmdrake_.c:262
+#: ../../standalone/rpmdrake_.c:278
msgid "No match"
msgstr "Нет подходящего"
-#: ../standalone/rpmdrake_.c:238 ../standalone/rpmdrake_.c:262
-#: ../standalone/rpmdrake_.c:278
+#: ../../standalone/rpmdrake_.c:238 ../../standalone/rpmdrake_.c:262
+#: ../../standalone/rpmdrake_.c:278
msgid "No more match"
msgstr "Больше нет подходящего"
-#: ../standalone/rpmdrake_.c:246
+#: ../../standalone/rpmdrake_.c:246
msgid ""
"rpmdrake is currently in ``low memory'' mode.\n"
"I'm going to relaunch rpmdrake to allow searching files"
@@ -3910,31 +4792,31 @@ msgstr ""
"rpmdrake сейчас в режиме ``low memory''.\n"
"Собираюсь перезапустить rpmdrake для обеспечения поиска файлов"
-#: ../standalone/rpmdrake_.c:253
-msgid "Which file are you looking for"
-msgstr "Какой файл вы ищете"
+#: ../../standalone/rpmdrake_.c:253
+msgid "Which file are you looking for?"
+msgstr "Какой файл вы ищете?"
-#: ../standalone/rpmdrake_.c:269
-msgid "What are looking for"
-msgstr "Что вы ищете"
+#: ../../standalone/rpmdrake_.c:269
+msgid "What are looking for?"
+msgstr "Что вы ищете?"
-#: ../standalone/rpmdrake_.c:289
+#: ../../standalone/rpmdrake_.c:289
msgid "Give a name (eg: `extra', `commercial')"
msgstr "Дайте имя (напр.: `extra', `commercial')"
-#: ../standalone/rpmdrake_.c:291
+#: ../../standalone/rpmdrake_.c:291
msgid "Directory"
msgstr "Каталог"
-#: ../standalone/rpmdrake_.c:294
+#: ../../standalone/rpmdrake_.c:294
msgid "No cdrom available (nothing in /mnt/cdrom)"
msgstr "cdrom недоступен (ничего нет в /mnt/cdrom)"
-#: ../standalone/rpmdrake_.c:298
+#: ../../standalone/rpmdrake_.c:298
msgid "URL of the directory containing the RPMs"
msgstr "URL каталога, содержащего RPM"
-#: ../standalone/rpmdrake_.c:299
+#: ../../standalone/rpmdrake_.c:299
msgid ""
"For FTP and HTTP, you need to give the location for hdlist\n"
"It must be relative to the URL above"
@@ -3942,39 +4824,236 @@ msgstr ""
"Для FTP и HTTP, вы должны задать расположение hdlist\n"
"Задавайте относительно URL указанного выше"
-#: ../standalone/rpmdrake_.c:302
+#: ../../standalone/rpmdrake_.c:302
msgid "Please submit the following information"
msgstr "Предоставьте следующую информацию"
-#: ../standalone/rpmdrake_.c:304
+#: ../../standalone/rpmdrake_.c:304
#, c-format
msgid "%s is already in use"
msgstr "%s уже используется"
-#: ../standalone/rpmdrake_.c:315 ../standalone/rpmdrake_.c:321
-#: ../standalone/rpmdrake_.c:329
+#: ../../standalone/rpmdrake_.c:315 ../../standalone/rpmdrake_.c:321
+#: ../../standalone/rpmdrake_.c:329
msgid "Updating the RPMs base"
msgstr "Обновляем базу RPM"
-#: ../standalone/rpmdrake_.c:328
+#: ../../standalone/rpmdrake_.c:328
#, c-format
msgid "Going to remove entry %s"
msgstr "Будем удалять пункт %s"
-#: ../standalone/rpmdrake_.c:360
+#: ../../standalone/rpmdrake_.c:360
msgid "Finding leaves"
msgstr "Поиск листьев"
-#: ../standalone/rpmdrake_.c:360
+#: ../../standalone/rpmdrake_.c:360
msgid "Finding leaves takes some time"
msgstr "Поиск листьев требует времени"
-#~ msgid "Polish"
-#~ msgstr "Польский"
+#~ msgid "Recommended"
+#~ msgstr "Рекомендуется"
+
+#~ msgid ""
+#~ "Choose \"Install\" if there are no previous versions of Linux\n"
+#~ "installed, or if you wish to use multiple distributions or versions.\n"
+#~ "\n"
+#~ "\n"
+#~ "Choose \"Upgrade\" if you wish to update a previous version of Mandrake "
+#~ "Linux:\n"
+#~ "5.1 (Venice), 5.2 (Leloo), 5.3 (Festen), 6.0 (Venus), 6.1 (Helios), Gold "
+#~ "2000\n"
+#~ "or 7.0 (Air)."
+#~ msgstr ""
+#~ "Выберите \"Установка\", если нет установленных предшествующих версий Linux,\n"
+#~ "или если хотите использовать несколько дистрибутивов или версий.\n"
+#~ "\n"
+#~ "\n"
+#~ "Выберите \"Обновить\" если вы надеетесь обновить предыдущую версию\n"
+#~ "Mandrake Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus),\n"
+#~ "6.1 (Helios), Gold 2000 или 7.0 (Air)."
+
+#~ msgid "Do you want to use LILO?"
+#~ msgstr "Вы хотите использовать LILO?"
+
+#~ msgid ""
+#~ "You may now select the packages you wish to install.\n"
+#~ "\n"
+#~ "\n"
+#~ "First you can select group of package to install or upgrade. After that\n"
+#~ "you can select more packages according to the total size you wish to\n"
+#~ "select.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you are in expert mode, you can select packages individually.\n"
+#~ "Please note that some packages require the installation of others.\n"
+#~ "These are referred to as package dependencies. The packages you select,\n"
+#~ "and the packages they require will be automatically selected for\n"
+#~ "install. It is impossible to install a package without installing all\n"
+#~ "of its dependencies."
+#~ msgstr ""
+#~ "Теперь можно выбрать пакеты, которые вы хотите установить.\n"
+#~ "\n"
+#~ "\n"
+#~ "Если вы в режиме эксперта, то пакеты можно выбирать индивидуально.\n"
+#~ "Имейте в виду, что некоторые пакеты требуют установки других пакетов.\n"
+#~ "Это называется зависимостью пакетов. Пакеты, выбранные вами, и пакеты,\n"
+#~ "от которых они зависят будут автоматически выбраны для установки.\n"
+#~ "Невозможно установить пакет до установки всех пакетов, от которых\n"
+#~ "он зависит."
+
+#~ msgid ""
+#~ "LILO (the LInux LOader) can boot Linux and other operating systems.\n"
+#~ "Normally they are correctly detected during installation. If you don't\n"
+#~ "see yours detected, you can add one or more now.\n"
+#~ "\n"
+#~ "\n"
+#~ "If you don't want that everybody could access at one of them, you can "
+#~ "remove\n"
+#~ "it now (a boot disk will be needed to boot it)."
+#~ msgstr ""
+#~ "LILO (LInux LOader) может загрузить Linux и другие операционные системы.\n"
+#~ "Обычно они корректно определяются при установке. Если ваша не определится,\n"
+#~ "вы можете добавить сейчас одну или несколько.\n"
+#~ "\n"
+#~ "\n"
+#~ "Если не хотите, чтобы все имели доступ к одной из них, удалите ее сейчас\n"
+#~ "(для ее загрузки потребуется загрузочный диск)."
+
+#, fuzzy
+#~ msgid "Choose other CD to install"
+#~ msgstr "Выбор пакетов для установки"
+
+#~ msgid ""
+#~ "Select:\n"
+#~ "\n"
+#~ " - Recommended: If you have never installed Linux before.\n"
+#~ "\n"
+#~ "\n"
+#~ " - Customized: If you are familiar with Linux, you will be able to \n"
+#~ "select the usage for the installed system between normal, development or\n"
+#~ "server. Choose \"Normal\" for a general purpose installation of your\n"
+#~ "computer. You may choose \"Development\" if you will be using the computer\n"
+#~ "primarily for software development, or choose \"Server\" if you wish to\n"
+#~ "install a general purpose server (for mail, printing...).\n"
+#~ "\n"
+#~ "\n"
+#~ " - Expert: If you are fluent with GNU/Linux and want to perform\n"
+#~ "a highly customized installation, this Install Class is for you. You will\n"
+#~ "be able to select the usage of your installed system as for \"Customized\"."
+#~ msgstr ""
+#~ "Выберите:\n"
+#~ "\n"
+#~ " - Рекомендуется: если вы раньше никогда не устанавливали Linux.\n"
+#~ "\n"
+#~ " - С настройкой: Если вы знакомы с Linux, то сможете выбрать из следующих \n"
+#~ "видов использования системы: нормальный, для разработчика, или\n"
+#~ "сервер. Выберите \"нормальный\" для установки системы общего назначения.\n"
+#~ "Можно выбрать \"Разработка\" если вы будете использовать компьютер прежде\n"
+#~ "всего для разработки программ, или выберите \"Сервер\" если хотите "
+#~ "установить\n"
+#~ "сервер общего назначения (для почты, печати...).\n"
+#~ "\n"
+#~ "\n"
+#~ " - Эксперт: Если вы свободно владеете GNU/Linux и хотите выполнить\n"
+#~ "установку с глубокой настройкой, то этот Класс Установки - для вас. Вы \n"
+#~ "сможете выбрать назначение системы, как и при \"С настройкой\"."
+
+#~ msgid "Help"
+#~ msgstr "Помощь"
+
+#~ msgid "Downloading cryptographic packages"
+#~ msgstr "Загрузка крипторафических пакетов"
+
+#~ msgid "Setup SCSI"
+#~ msgstr "Настройка SCSI"
+
+#~ msgid "Which language do you want?"
+#~ msgstr "Выберите язык"
+
+#~ msgid "Which packages do you want to install"
+#~ msgstr "Выбор пакетов для установки"
+
+#~ msgid "Local LAN"
+#~ msgstr "Локальная сеть"
+
+#~ msgid "Dialup with modem"
+#~ msgstr "Dialup через модем"
+
+#~ msgid "Local Printer Options"
+#~ msgstr "Опции локального принтера"
+
+#~ msgid "server"
+#~ msgstr "сервер"
+
+#~ msgid "expert"
+#~ msgstr "эксперт"
+
+#~ msgid "developer"
+#~ msgstr "разработчик"
+
+#~ msgid "beginner"
+#~ msgstr "начинающий"
+
+#~ msgid "Linear (needed for some SCSI drives)"
+#~ msgstr "Линейно (необходимо для некоторых адаптеров SCSI)"
+
+#~ msgid "linear"
+#~ msgstr "линейно"
+
+#~ msgid "After %s partition %s,"
+#~ msgstr "После %s разбейте %s,"
+
+#~ msgid "changing type of"
+#~ msgstr "изменение типа"
+
+#~ msgid "formatting"
+#~ msgstr "форматирование"
+
+#~ msgid "resizing"
+#~ msgstr "изменение размера"
+
+#~ msgid "Size: %s MB"
+#~ msgstr "Размер: %s MB"
+
+#~ msgid "Bad kickstart file %s (failed %s)"
+#~ msgstr "Плохой стартовый (kickstart) файл %s (ошибка %s)"
+
+#~ msgid "Too many packages chosen: %dMB doesn't fit in %dMB"
+#~ msgstr "Выбрано слишком много пакетов: %dMB не лезет в %dMB"
#~ msgid "Going to install %d MB. You can choose to install more programs"
#~ msgstr ""
#~ "Будет установлено %d MB. Можете выбрать больше программ для установки"
-#~ msgid "Too many packages chosen: %dMB doesn't fit in %dMB"
-#~ msgstr "Выбрано слишком много пакетов: %dMB не лезет в %dMB"
+#~ msgid "Password:"
+#~ msgstr "Пароль:"
+
+#~ msgid "User name:"
+#~ msgstr "Имя пользователя:"
+
+#~ msgid ""
+#~ "Failed to create an HTP boot floppy.\n"
+#~ "You may have to restart installation and give ``%s'' at the prompt"
+#~ msgstr ""
+#~ "Не удалось создать загр. дискету с HTP.\n"
+#~ "Возможно, надо перезапустить установку задав ``%s'' в приглашении"
+
+#~ msgid "It is necessary to restart installation with the new parameters"
+#~ msgstr "Необходимо перезапустить установку с новыми параметрами"
+
+#~ msgid "It is necessary to restart installation booting on the floppy"
+#~ msgstr "Необходимо перезапустить установку, загрузившись с дискеты"
+
+#~ msgid ""
+#~ "Enter a floppy to create an HTP enabled boot\n"
+#~ "(all data on floppy will be lost)"
+#~ msgstr ""
+#~ "Вставьте дискету для записи загрузчика с HTP\n"
+#~ "(все данные на этой дискете пропадут)"
+
+#~ msgid "Choose install or upgrade"
+#~ msgstr "Установка или обновление"
+
+#~ msgid "What usage do you want?"
+#~ msgstr "Какое применение выбираете?"