Regenerating po files:

- merge_xml
- update_pot
- update_po ro|pt|ru|sv|zh_TW|fi|el|zh_CN|es|ko|hu|vi

1 files changed, 374 insertions, 204 deletions

diff --git a/po/ru/preseed.po b/po/ru/preseed.po
index cc731b0d5..d71b17893 100644
--- a/po/ru/preseed.po
+++ b/po/ru/preseed.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: preseed\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2010-12-29 12:07+0000\n"
+"POT-Creation-Date: 2012-06-26 13:45+0000\n"
 "PO-Revision-Date: 2012-01-26 21:57+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.0\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Tag: title
 #: preseed.xml:16
@@ -36,7 +36,7 @@ msgstr ""
 "&d-i; для автоматизации установки операционной системы."
 
 #. Tag: para
-#: preseed.xml:23 preseed.xml:676
+#: preseed.xml:23 preseed.xml:677
 #, no-c-format
 msgid ""
 "The configuration fragments used in this appendix are also available as an "
@@ -126,7 +126,7 @@ msgid "initrd"
 msgstr "initrd"
 
 #. Tag: entry
-#: preseed.xml:70 preseed.xml:523
+#: preseed.xml:70 preseed.xml:524
 #, no-c-format
 msgid "file"
 msgstr "файловый"
@@ -145,9 +145,8 @@ msgstr "CD/DVD"
 
 #. Tag: entry
 #: preseed.xml:77 preseed.xml:78 preseed.xml:79 preseed.xml:89 preseed.xml:91
-#: preseed.xml:94 preseed.xml:95 preseed.xml:96 preseed.xml:99 preseed.xml:100
-#: preseed.xml:101 preseed.xml:104 preseed.xml:106 preseed.xml:109
-#: preseed.xml:111
+#: preseed.xml:94 preseed.xml:95 preseed.xml:99 preseed.xml:100
+#: preseed.xml:104 preseed.xml:106 preseed.xml:109 preseed.xml:111
 #, no-c-format
 msgid "<entry>yes</entry>"
 msgstr "<entry>да</entry>"
@@ -183,6 +182,12 @@ msgstr ""
 "hd-media <phrase condition=\"bootable-usb\">(включая usb-носители)</phrase>"
 
 #. Tag: entry
+#: preseed.xml:96 preseed.xml:101
+#, no-c-format
+msgid "yes<footnoteref linkend=\"apx-ps-net\"/>"
+msgstr ""
+
+#. Tag: entry
 #: preseed.xml:98
 #, no-c-format
 msgid "floppy based (cd-drivers)"
@@ -426,24 +431,30 @@ msgstr ""
 
 #. Tag: para
 #: preseed.xml:285
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Note that <filename>preseed/url</filename> can be shortened to just "
+#| "<filename>url</filename> and <filename>preseed/file</filename> to just "
+#| "<filename>file</filename> when they are passed as boot parameters."
 msgid ""
 "Note that <filename>preseed/url</filename> can be shortened to just "
-"<filename>url</filename> and <filename>preseed/file</filename> to just "
-"<filename>file</filename> when they are passed as boot parameters."
+"<filename>url</filename>, <filename>preseed/file</filename> to just "
+"<filename>file</filename> and <filename>preseed/file/checksum</filename> to "
+"just <filename>preseed-md5</filename> when they are passed as boot "
+"parameters."
 msgstr ""
 "Заметим, что <filename>preseed/url</filename> можно укоротить до "
 "<filename>url</filename>, а <filename>preseed/file</filename> до "
 "<filename>file</filename>, если они передаются в параметрах загрузки."
 
 #. Tag: title
-#: preseed.xml:295
+#: preseed.xml:296
 #, no-c-format
 msgid "Using boot parameters to preseed questions"
 msgstr "Использование параметров загрузки для автоматизации"
 
 #. Tag: para
-#: preseed.xml:296
+#: preseed.xml:297
 #, no-c-format
 msgid ""
 "If a preconfiguration file cannot be used to preseed some steps, the install "
@@ -455,7 +466,7 @@ msgstr ""
 "нужные значения ответов в командной строке запуска программы установки."
 
 #. Tag: para
-#: preseed.xml:302
+#: preseed.xml:303
 #, no-c-format
 msgid ""
 "Boot parameters can also be used if you do not really want to use "
@@ -468,7 +479,7 @@ msgstr ""
 "руководства."
 
 #. Tag: para
-#: preseed.xml:308
+#: preseed.xml:309
 #, no-c-format
 msgid ""
 "To set a value to be used inside &d-i;, just pass "
@@ -506,7 +517,7 @@ msgstr ""
 "настройки соответствующего пакета."
 
 #. Tag: para
-#: preseed.xml:331
+#: preseed.xml:332
 #, no-c-format
 msgid ""
 "Normally, preseeding a question in this way will mean that the question will "
@@ -520,7 +531,7 @@ msgstr ""
 "<quote>=</quote>. Смотрите также <xref linkend=\"preseed-seenflag\"/>."
 
 #. Tag: para
-#: preseed.xml:338
+#: preseed.xml:339
 #, no-c-format
 msgid ""
 "Note that some variables that are frequently set at the boot prompt have a "
@@ -538,7 +549,7 @@ msgstr ""
 "раскрывается в <literal>tasksel:tasksel/first</literal>."
 
 #. Tag: para
-#: preseed.xml:347
+#: preseed.xml:348
 #, no-c-format
 msgid ""
 "A <quote>--</quote> in the boot options has special meaning. Kernel "
@@ -555,7 +566,7 @@ msgstr ""
 "которые распознаёт."
 
 #. Tag: para
-#: preseed.xml:356
+#: preseed.xml:357
 #, no-c-format
 msgid ""
 "Current linux kernels (2.6.9 and later) accept a maximum of 32 command line "
@@ -570,7 +581,7 @@ msgstr ""
 "(Для ранних версий ядер эти значения меньше.)"
 
 #. Tag: para
-#: preseed.xml:364
+#: preseed.xml:365
 #, no-c-format
 msgid ""
 "For most installations some of the default options in your bootloader "
@@ -582,7 +593,7 @@ msgstr ""
 "удалить, что может позволить вам добавить больше параметров автоматизации."
 
 #. Tag: para
-#: preseed.xml:371
+#: preseed.xml:372
 #, no-c-format
 msgid ""
 "It may not always be possible to specify values with spaces for boot "
@@ -592,13 +603,13 @@ msgstr ""
 "если заключить их в кавычки."
 
 #. Tag: title
-#: preseed.xml:380
+#: preseed.xml:381
 #, no-c-format
 msgid "Auto mode"
 msgstr "Автоматический режим"
 
 #. Tag: para
-#: preseed.xml:381
+#: preseed.xml:382
 #, no-c-format
 msgid ""
 "There are several features of &debian; Installer that combine to allow "
@@ -628,7 +639,7 @@ msgstr ""
 "&releasename;/./preseed.cfg</literal>."
 
 #. Tag: para
-#: preseed.xml:398
+#: preseed.xml:399
 #, no-c-format
 msgid ""
 "The last part of that url (<literal>d-i/&releasename;/./preseed.cfg</"
@@ -666,7 +677,7 @@ msgstr ""
 "d-i/&releasename;/./scripts/late_command.sh</literal>."
 
 #. Tag: para
-#: preseed.xml:418
+#: preseed.xml:419
 #, no-c-format
 msgid ""
 "If there is no local DHCP or DNS infrastructure, or if you do not want to "
@@ -690,13 +701,13 @@ msgstr ""
 "</screen></informalexample> Это работает так:"
 
 #. Tag: para
-#: preseed.xml:431
+#: preseed.xml:432
 #, no-c-format
 msgid "if the URL is missing a protocol, http is assumed,"
 msgstr "если в URL не указан протокол, то используется http,"
 
 #. Tag: para
-#: preseed.xml:434
+#: preseed.xml:435
 #, no-c-format
 msgid ""
 "if the hostname section contains no periods, it has the domain derived from "
@@ -705,7 +716,7 @@ msgstr ""
 "если в имени машины нет точек, то будет добавлен домен, полученный по DHCP, и"
 
 #. Tag: para
-#: preseed.xml:438
+#: preseed.xml:439
 #, no-c-format
 msgid ""
 "if there's no <literal>/</literal>'s after the hostname, then the default "
@@ -715,7 +726,7 @@ msgstr ""
 "умолчанию."
 
 #. Tag: para
-#: preseed.xml:444
+#: preseed.xml:445
 #, no-c-format
 msgid ""
 "In addition to specifying the url, you can also specify settings that do not "
@@ -741,7 +752,7 @@ msgstr ""
 "устанавливаемой системы или используемую локализацию."
 
 #. Tag: para
-#: preseed.xml:458
+#: preseed.xml:459
 #, no-c-format
 msgid ""
 "It is of course possible to extend this concept, and if you do, it is "
@@ -761,7 +772,7 @@ msgstr ""
 "параметров."
 
 #. Tag: para
-#: preseed.xml:468
+#: preseed.xml:469
 #, no-c-format
 msgid ""
 "The <literal>auto</literal> boot label is not yet defined everywhere. The "
@@ -786,7 +797,7 @@ msgstr ""
 "вопросы с меньшим уровнем важности."
 
 #. Tag: para
-#: preseed.xml:482
+#: preseed.xml:483
 #, no-c-format
 msgid ""
 "Additional options that may be of interest while attempting to automate an "
@@ -800,7 +811,7 @@ msgstr ""
 "будет ожидаться больше чем обычно."
 
 #. Tag: para
-#: preseed.xml:491
+#: preseed.xml:492
 #, no-c-format
 msgid ""
 "An extensive example of how to use this framework, including example scripts "
@@ -816,13 +827,13 @@ msgstr ""
 "к процессу автоматизации."
 
 #. Tag: title
-#: preseed.xml:502
+#: preseed.xml:503
 #, no-c-format
 msgid "Aliases useful with preseeding"
 msgstr "Полезные в автоматизации псевдонимы"
 
 #. Tag: para
-#: preseed.xml:503
+#: preseed.xml:504
 #, no-c-format
 msgid ""
 "The following aliases can be useful when using (auto mode) preseeding. Note "
@@ -836,176 +847,176 @@ msgstr ""
 "literal> или <literal>interface=eth0</literal>."
 
 #. Tag: entry
-#: preseed.xml:516
+#: preseed.xml:517
 #, no-c-format
 msgid "auto"
 msgstr "auto"
 
 #. Tag: entry
-#: preseed.xml:516
+#: preseed.xml:517
 #, no-c-format
 msgid "auto-install/enable"
 msgstr "auto-install/enable"
 
 #. Tag: entry
-#: preseed.xml:517
+#: preseed.xml:518
 #, no-c-format
 msgid "classes"
 msgstr "classes"
 
 #. Tag: entry
-#: preseed.xml:517
+#: preseed.xml:518
 #, no-c-format
 msgid "auto-install/classes"
 msgstr "auto-install/classes"
 
 #. Tag: entry
-#: preseed.xml:518
+#: preseed.xml:519
 #, no-c-format
 msgid "<entry>fb</entry>"
 msgstr "<entry>fb</entry>"
 
 #. Tag: entry
-#: preseed.xml:518
+#: preseed.xml:519
 #, no-c-format
 msgid "debian-installer/framebuffer"
 msgstr "debian-installer/framebuffer"
 
 #. Tag: entry
-#: preseed.xml:519
+#: preseed.xml:520
 #, no-c-format
 msgid "language"
 msgstr "language"
 
 #. Tag: entry
-#: preseed.xml:519
+#: preseed.xml:520
 #, no-c-format
 msgid "debian-installer/language"
 msgstr "debian-installer/language"
 
 #. Tag: entry
-#: preseed.xml:520
+#: preseed.xml:521
 #, no-c-format
 msgid "country"
 msgstr "country"
 
 #. Tag: entry
-#: preseed.xml:520
+#: preseed.xml:521
 #, no-c-format
 msgid "debian-installer/country"
 msgstr "debian-installer/country"
 
 #. Tag: entry
-#: preseed.xml:521
+#: preseed.xml:522
 #, no-c-format
 msgid "locale"
 msgstr "locale"
 
 #. Tag: entry
-#: preseed.xml:521
+#: preseed.xml:522
 #, no-c-format
 msgid "debian-installer/locale"
 msgstr "debian-installer/locale"
 
 #. Tag: entry
-#: preseed.xml:522
+#: preseed.xml:523
 #, no-c-format
 msgid "priority"
 msgstr "priority"
 
 #. Tag: entry
-#: preseed.xml:522
+#: preseed.xml:523
 #, no-c-format
 msgid "debconf/priority"
 msgstr "debconf/priority"
 
 #. Tag: entry
-#: preseed.xml:523
+#: preseed.xml:524
 #, no-c-format
 msgid "preseed/file"
 msgstr "preseed/file"
 
 #. Tag: entry
-#: preseed.xml:524
+#: preseed.xml:525
 #, no-c-format
 msgid "<entry>url</entry>"
 msgstr "<entry>url</entry>"
 
 #. Tag: entry
-#: preseed.xml:524
+#: preseed.xml:525
 #, no-c-format
 msgid "preseed/url"
 msgstr "preseed/url"
 
 #. Tag: entry
-#: preseed.xml:525
+#: preseed.xml:526
 #, no-c-format
 msgid "interface"
 msgstr "interface"
 
 #. Tag: entry
-#: preseed.xml:525
+#: preseed.xml:526
 #, no-c-format
 msgid "netcfg/choose_interface"
 msgstr "netcfg/choose_interface"
 
 #. Tag: entry
-#: preseed.xml:526
+#: preseed.xml:527
 #, no-c-format
 msgid "hostname&nbsp;&nbsp;&nbsp;"
 msgstr "hostname&nbsp;&nbsp;&nbsp;"
 
 #. Tag: entry
-#: preseed.xml:526
+#: preseed.xml:527
 #, no-c-format
 msgid "netcfg/get_hostname"
 msgstr "netcfg/get_hostname"
 
 #. Tag: entry
-#: preseed.xml:527
+#: preseed.xml:528
 #, no-c-format
 msgid "domain"
 msgstr "domain"
 
 #. Tag: entry
-#: preseed.xml:527
+#: preseed.xml:528
 #, no-c-format
 msgid "netcfg/get_domain"
 msgstr "netcfg/get_domain"
 
 #. Tag: entry
-#: preseed.xml:528
+#: preseed.xml:529
 #, no-c-format
 msgid "protocol"
 msgstr "protocol"
 
 #. Tag: entry
-#: preseed.xml:528
+#: preseed.xml:529
 #, no-c-format
 msgid "mirror/protocol"
 msgstr "mirror/protocol"
 
 #. Tag: entry
-#: preseed.xml:529
+#: preseed.xml:530
 #, no-c-format
 msgid "suite"
 msgstr "suite"
 
 #. Tag: entry
-#: preseed.xml:529
+#: preseed.xml:530
 #, no-c-format
 msgid "mirror/suite"
 msgstr "mirror/suite"
 
 #. Tag: title
-#: preseed.xml:536
+#: preseed.xml:537
 #, no-c-format
 msgid "Using a DHCP server to specify preconfiguration files"
 msgstr ""
 "Использование сервера DHCP для указания файлов автоматической конфигурации"
 
 #. Tag: para
-#: preseed.xml:537
+#: preseed.xml:538
 #, no-c-format
 msgid ""
 "It's also possible to use DHCP to specify a preconfiguration file to "
@@ -1025,7 +1036,7 @@ msgstr ""
 "conf для третьей версии сервера ISC DHCP  (&debian; пакет dhcp3-server)."
 
 #. Tag: screen
-#: preseed.xml:548
+#: preseed.xml:549
 #, no-c-format
 msgid ""
 "if substring (option vendor-class-identifier, 0, 3) = \"d-i\" {\n"
@@ -1037,7 +1048,7 @@ msgstr ""
 "}"
 
 #. Tag: para
-#: preseed.xml:550
+#: preseed.xml:551
 #, no-c-format
 msgid ""
 "Note that the above example limits this filename to DHCP clients that "
@@ -1052,7 +1063,7 @@ msgstr ""
 "установок в сети."
 
 #. Tag: para
-#: preseed.xml:557
+#: preseed.xml:558
 #, no-c-format
 msgid ""
 "A good way to use the DHCP preseeding is to only preseed values specific to "
@@ -1069,13 +1080,13 @@ msgstr ""
 "большой осторожностью."
 
 #. Tag: title
-#: preseed.xml:571
+#: preseed.xml:572
 #, no-c-format
 msgid "Creating a preconfiguration file"
 msgstr "Создание файла ответов"
 
 #. Tag: para
-#: preseed.xml:572
+#: preseed.xml:573
 #, no-c-format
 msgid ""
 "The preconfiguration file is in the format used by the <command>debconf-set-"
@@ -1086,14 +1097,14 @@ msgstr ""
 "<command>debconf-set-selections</command>. Общая форма строки файла ответов:"
 
 #. Tag: screen
-#: preseed.xml:578
+#: preseed.xml:579
 #, no-c-format
 msgid "&lt;owner&gt; &lt;question name&gt; &lt;question type&gt; &lt;value&gt;"
 msgstr ""
 "&lt;владелец&gt; &lt;имя вопроса&gt; &lt;тип вопроса&gt; &lt;значение&gt;"
 
 #. Tag: para
-#: preseed.xml:580
+#: preseed.xml:581
 #, no-c-format
 msgid ""
 "There are a few rules to keep in mind when writing a preconfiguration file."
@@ -1101,7 +1112,7 @@ msgstr ""
 "При написании файла ответов есть несколько правил, которые нужно помнить."
 
 #. Tag: para
-#: preseed.xml:587
+#: preseed.xml:588
 #, no-c-format
 msgid ""
 "Put only a single space or tab between type and value: any additional "
@@ -1111,7 +1122,7 @@ msgstr ""
 "дополнительный пробельный символ будет включён в значение."
 
 #. Tag: para
-#: preseed.xml:591
+#: preseed.xml:592
 #, no-c-format
 msgid ""
 "A line can be split into multiple lines by appending a backslash "
@@ -1127,11 +1138,18 @@ msgstr ""
 "символы будут сжаты в один."
 
 #. Tag: para
-#: preseed.xml:598
-#, no-c-format
+#: preseed.xml:599
+#, fuzzy, no-c-format
+#| msgid ""
+#| "For debconf variables (templates) used in the installer itself, the owner "
+#| "should be set to <quote>d-i</quote>; to preseed variables used in the "
+#| "installed system, the name of the package that contains the corresponding "
+#| "debconf template should be used. Only variables that have their owner set "
+#| "to something other than <quote>d-i</quote> will be propagated to the "
+#| "debconf database for the installed system."
 msgid ""
-"For debconf variables (templates) used in the installer itself, the owner "
-"should be set to <quote>d-i</quote>; to preseed variables used in the "
+"For debconf variables (templates) used only in the installer itself, the "
+"owner should be set to <quote>d-i</quote>; to preseed variables used in the "
 "installed system, the name of the package that contains the corresponding "
 "debconf template should be used. Only variables that have their owner set to "
 "something other than <quote>d-i</quote> will be propagated to the debconf "
@@ -1145,7 +1163,7 @@ msgstr ""
 "установлено нечто, отличное от <quote>d-i</quote>."
 
 #. Tag: para
-#: preseed.xml:606
+#: preseed.xml:607
 #, no-c-format
 msgid ""
 "Most questions need to be preseeded using the values valid in English and "
@@ -1157,7 +1175,7 @@ msgstr ""
 "classname>), где нужно использовать ответы на родном языке."
 
 #. Tag: para
-#: preseed.xml:612
+#: preseed.xml:613
 #, no-c-format
 msgid ""
 "Some questions take a code as value instead of the English text that is "
@@ -1167,7 +1185,7 @@ msgstr ""
 "который показывается во время установки."
 
 #. Tag: para
-#: preseed.xml:618
+#: preseed.xml:619
 #, no-c-format
 msgid ""
 "The easiest way to create a preconfiguration file is to use the example file "
@@ -1177,7 +1195,7 @@ msgstr ""
 "<xref linkend=\"preseed-contents\"/> в качестве основы и изменить его."
 
 #. Tag: para
-#: preseed.xml:623
+#: preseed.xml:624
 #, no-c-format
 msgid ""
 "An alternative method is to do a manual installation and then, after "
@@ -1191,7 +1209,7 @@ msgstr ""
 "debconf и базу данных программы установки cdebconf в один файл:"
 
 #. Tag: screen
-#: preseed.xml:630
+#: preseed.xml:631
 #, no-c-format
 msgid ""
 "$ debconf-get-selections --installer &gt; <replaceable>file</replaceable>\n"
@@ -1201,7 +1219,7 @@ msgstr ""
 "$ debconf-get-selections &gt;&gt; <replaceable>файл</replaceable>"
 
 #. Tag: para
-#: preseed.xml:632
+#: preseed.xml:633
 #, no-c-format
 msgid ""
 "However, a file generated in this manner will have some items that should "
@@ -1213,7 +1231,7 @@ msgstr ""
 "пользователей лучше использовать файл примера."
 
 #. Tag: para
-#: preseed.xml:640
+#: preseed.xml:641
 #, no-c-format
 msgid ""
 "This method relies on the fact that, at the end of the installation, the "
@@ -1229,7 +1247,7 @@ msgstr ""
 "суперпользователю."
 
 #. Tag: para
-#: preseed.xml:648
+#: preseed.xml:649
 #, no-c-format
 msgid ""
 "The directory <filename>/var/log/installer</filename> and all files in it "
@@ -1241,7 +1259,7 @@ msgstr ""
 "classname>."
 
 #. Tag: para
-#: preseed.xml:656
+#: preseed.xml:657
 #, no-c-format
 msgid ""
 "To check possible values for questions, you can use <command>nano</command> "
@@ -1257,7 +1275,7 @@ msgstr ""
 "filename> &mdash; текущие значения и значения, назначенные переменным."
 
 #. Tag: para
-#: preseed.xml:664
+#: preseed.xml:665
 #, no-c-format
 msgid ""
 "To check if the format of your preconfiguration file is valid before "
@@ -1269,13 +1287,13 @@ msgstr ""
 "cfg</replaceable></command>."
 
 #. Tag: title
-#: preseed.xml:675
+#: preseed.xml:676
 #, no-c-format
 msgid "Contents of the preconfiguration file (for &releasename;)"
 msgstr "Содержимое файла ответов (для &releasename;)"
 
 #. Tag: para
-#: preseed.xml:681
+#: preseed.xml:682
 #, no-c-format
 msgid ""
 "Note that this example is based on an installation for the Intel x86 "
@@ -1291,7 +1309,7 @@ msgstr ""
 "этой архитектуры."
 
 #. Tag: para
-#: preseed.xml:689
+#: preseed.xml:690
 #, no-c-format
 msgid ""
 "Details on how the different Debian Installer components actually work can "
@@ -1301,13 +1319,13 @@ msgstr ""
 "<xref linkend=\"module-details\"/>."
 
 #. Tag: title
-#: preseed.xml:697
+#: preseed.xml:698
 #, no-c-format
 msgid "Localization"
 msgstr "Локализация"
 
 #. Tag: para
-#: preseed.xml:698
+#: preseed.xml:699
 #, no-c-format
 msgid ""
 "Setting localization values will only work if you are using initrd "
@@ -1319,7 +1337,7 @@ msgstr ""
 "заданы."
 
 #. Tag: para
-#: preseed.xml:704
+#: preseed.xml:705
 #, no-c-format
 msgid ""
 "The locale can be used to specify both language and country and can be any "
@@ -1337,7 +1355,7 @@ msgstr ""
 "replaceable></userinput>."
 
 #. Tag: para
-#: preseed.xml:713
+#: preseed.xml:714
 #, no-c-format
 msgid ""
 "Although this method is very easy to use, it does not allow preseeding of "
@@ -1360,8 +1378,18 @@ msgstr ""
 "можно указывать в параметрах запуска."
 
 #. Tag: screen
-#: preseed.xml:728
-#, no-c-format
+#: preseed.xml:729
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# Preseeding only locale sets language, country and locale.\n"
+#| "d-i debian-installer/locale string en_US\n"
+#| "\n"
+#| "# The values can also be preseeded individually for greater flexibility.\n"
+#| "#d-i debian-installer/language string en\n"
+#| "#d-i debian-installer/country string NL\n"
+#| "#d-i debian-installer/locale string en_GB.UTF-8\n"
+#| "# Optionally specify additional locales to be generated.\n"
+#| "#d-i localechooser/supported-locales en_US.UTF-8, nl_NL.UTF-8"
 msgid ""
 "# Preseeding only locale sets language, country and locale.\n"
 "d-i debian-installer/locale string en_US\n"
@@ -1371,7 +1399,7 @@ msgid ""
 "#d-i debian-installer/country string NL\n"
 "#d-i debian-installer/locale string en_GB.UTF-8\n"
 "# Optionally specify additional locales to be generated.\n"
-"#d-i localechooser/supported-locales en_US.UTF-8, nl_NL.UTF-8"
+"#d-i localechooser/supported-locales multiselect en_US.UTF-8, nl_NL.UTF-8"
 msgstr ""
 "# Автоответ для языка и страны на основе локали.\n"
 "d-i debian-installer/locale string en_US\n"
@@ -1384,21 +1412,31 @@ msgstr ""
 "#d-i localechooser/supported-locales en_US.UTF-8, nl_NL.UTF-8"
 
 #. Tag: para
-#: preseed.xml:730
-#, no-c-format
+#: preseed.xml:731
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Keyboard configuration consists of selecting a keyboard architecture and "
+#| "a keymap."
 msgid ""
-"Keyboard configuration consists of selecting a keyboard architecture and a "
+"Keyboard configuration consists of selecting a keymap and (for non-latin "
+"keymaps) a toggle key to switch between the non-latin keymap and the US "
 "keymap."
 msgstr ""
 "При настройке клавиатуры выбирается архитектура клавиатуры и раскладка."
 
 #. Tag: screen
-#: preseed.xml:737
+#: preseed.xml:736
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# Keyboard selection.\n"
+#| "# keymap is an alias for keyboard-configuration/xkb-keymap\n"
+#| "d-i keymap select us\n"
+#| "# d-i keyboard-configuration/toggle select No toggling\n"
 msgid ""
 "# Keyboard selection.\n"
 "# keymap is an alias for keyboard-configuration/xkb-keymap\n"
 "d-i keymap select us\n"
-"# d-i keyboard-configuration/toggle select No toggling\n"
+"# d-i keyboard-configuration/toggle select No toggling"
 msgstr ""
 "# Выбор клавиатуры.\n"
 "# keymap — это псевдоним keyboard-configuration/xkb-keymap\n"
@@ -1406,25 +1444,25 @@ msgstr ""
 "# d-i keyboard-configuration/toggle select No toggling\n"
 
 #. Tag: para
-#: preseed.xml:739
+#: preseed.xml:738
 #, no-c-format
 msgid ""
-"To skip keyboard configuration, preseed <classname>keymap</"
-"classname> with <userinput>skip-config</userinput>. This will result in the "
-"kernel keymap remaining active."
+"To skip keyboard configuration, preseed <classname>keymap</classname> with "
+"<userinput>skip-config</userinput>. This will result in the kernel keymap "
+"remaining active."
 msgstr ""
-"Чтобы не выполнять настройку клавиатуры укажите в <classname>keymap"
-"</classname> значение <userinput>skip-config</userinput>. В результате "
+"Чтобы не выполнять настройку клавиатуры укажите в <classname>keymap</"
+"classname> значение <userinput>skip-config</userinput>. В результате "
 "останется активной клавиатурная раскладка ядра."
 
 #. Tag: title
-#: preseed.xml:758
+#: preseed.xml:750
 #, no-c-format
 msgid "Network configuration"
 msgstr "Настройка сети"
 
 #. Tag: para
-#: preseed.xml:759
+#: preseed.xml:751
 #, no-c-format
 msgid ""
 "Of course, preseeding the network configuration won't work if you're loading "
@@ -1439,7 +1477,7 @@ msgstr ""
 "указать конфигурацию сети через загрузочные параметры ядра."
 
 #. Tag: para
-#: preseed.xml:767
+#: preseed.xml:759
 #, no-c-format
 msgid ""
 "If you need to pick a particular interface when netbooting before loading a "
@@ -1451,7 +1489,7 @@ msgstr ""
 "<userinput>interface=<replaceable>eth1</replaceable></userinput>."
 
 #. Tag: para
-#: preseed.xml:773
+#: preseed.xml:765
 #, no-c-format
 msgid ""
 "Although preseeding the network configuration is normally not possible when "
@@ -1470,20 +1508,74 @@ msgstr ""
 "quote> со следующими строчками:"
 
 #. Tag: screen
-#: preseed.xml:783
+#: preseed.xml:775
 #, no-c-format
 msgid "killall.sh; netcfg"
 msgstr "killall.sh; netcfg"
 
 #. Tag: para
-#: preseed.xml:785
+#: preseed.xml:777
 #, no-c-format
 msgid "The following debconf variables are relevant for network configuration."
 msgstr "Следующие переменные debconf относятся к настройке сети."
 
 #. Tag: screen
-#: preseed.xml:791
-#, no-c-format
+#: preseed.xml:783
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# Disable network configuration entirely. This is useful for cdrom\n"
+#| "# installations on non-networked devices where the network questions,\n"
+#| "# warning and long timeouts are a nuisance.\n"
+#| "#d-i netcfg/enable boolean false\n"
+#| "\n"
+#| "# netcfg will choose an interface that has link if possible. This makes "
+#| "it\n"
+#| "# skip displaying a list if there is more than one interface.\n"
+#| "d-i netcfg/choose_interface select auto\n"
+#| "\n"
+#| "# To pick a particular interface instead:\n"
+#| "#d-i netcfg/choose_interface select eth1\n"
+#| "\n"
+#| "# If you have a slow dhcp server and the installer times out waiting for\n"
+#| "# it, this might be useful.\n"
+#| "#d-i netcfg/dhcp_timeout string 60\n"
+#| "\n"
+#| "# If you prefer to configure the network manually, uncomment this line "
+#| "and\n"
+#| "# the static network configuration below.\n"
+#| "#d-i netcfg/disable_dhcp boolean true\n"
+#| "\n"
+#| "# If you want the preconfiguration file to work on systems both with and\n"
+#| "# without a dhcp server, uncomment these lines and the static network\n"
+#| "# configuration below.\n"
+#| "#d-i netcfg/dhcp_failed note\n"
+#| "#d-i netcfg/dhcp_options select Configure network manually\n"
+#| "\n"
+#| "# Static network configuration.\n"
+#| "#d-i netcfg/get_nameservers string 192.168.1.1\n"
+#| "#d-i netcfg/get_ipaddress string 192.168.1.42\n"
+#| "#d-i netcfg/get_netmask string 255.255.255.0\n"
+#| "#d-i netcfg/get_gateway string 192.168.1.1\n"
+#| "#d-i netcfg/confirm_static boolean true\n"
+#| "\n"
+#| "# Any hostname and domain names assigned from dhcp take precedence over\n"
+#| "# values set here. However, setting the values still prevents the "
+#| "questions\n"
+#| "# from being shown, even if values come from dhcp.\n"
+#| "d-i netcfg/get_hostname string unassigned-hostname\n"
+#| "d-i netcfg/get_domain string unassigned-domain\n"
+#| "\n"
+#| "# Disable that annoying WEP key dialog.\n"
+#| "d-i netcfg/wireless_wep string\n"
+#| "# The wacky dhcp hostname that some ISPs use as a password of sorts.\n"
+#| "#d-i netcfg/dhcp_hostname string radish\n"
+#| "\n"
+#| "# If non-free firmware is needed for the network or other hardware, you "
+#| "can\n"
+#| "# configure the installer to always try to load it, without prompting. "
+#| "Or\n"
+#| "# change to false to disable asking.\n"
+#| "#d-i hw-detect/load_firmware boolean true"
 msgid ""
 "# Disable network configuration entirely. This is useful for cdrom\n"
 "# installations on non-networked devices where the network questions,\n"
@@ -1497,6 +1589,10 @@ msgid ""
 "# To pick a particular interface instead:\n"
 "#d-i netcfg/choose_interface select eth1\n"
 "\n"
+"# To set a different link detection timeout (default is 3 seconds).\n"
+"# Values are interpreted as seconds.\n"
+"#di netcfg/link_detection_timeout string 10\n"
+"\n"
 "# If you have a slow dhcp server and the installer times out waiting for\n"
 "# it, this might be useful.\n"
 "#d-i netcfg/dhcp_timeout string 60\n"
@@ -1586,7 +1682,7 @@ msgstr ""
 "#d-i hw-detect/load_firmware boolean true"
 
 #. Tag: para
-#: preseed.xml:793
+#: preseed.xml:785
 #, no-c-format
 msgid ""
 "Please note that <command>netcfg</command> will automatically determine the "
@@ -1607,13 +1703,13 @@ msgstr ""
 "должен использоваться."
 
 #. Tag: title
-#: preseed.xml:809
+#: preseed.xml:801
 #, no-c-format
 msgid "Network console"
 msgstr "Сетевая консоль"
 
 #. Tag: screen
-#: preseed.xml:811
+#: preseed.xml:803
 #, no-c-format
 msgid ""
 "# Use the following settings if you wish to make use of the network-console\n"
@@ -1632,13 +1728,13 @@ msgstr ""
 "#d-i network-console/password-again password r00tme"
 
 #. Tag: title
-#: preseed.xml:816
+#: preseed.xml:808
 #, no-c-format
 msgid "Mirror settings"
 msgstr "Настройка сервера-зеркала"
 
 #. Tag: para
-#: preseed.xml:817
+#: preseed.xml:809
 #, no-c-format
 msgid ""
 "Depending on the installation method you use, a mirror may be used to "
@@ -1652,7 +1748,7 @@ msgstr ""
 "использовать сервер-зеркало."
 
 #. Tag: para
-#: preseed.xml:824
+#: preseed.xml:816
 #, no-c-format
 msgid ""
 "The parameter <classname>mirror/suite</classname> determines the suite for "
@@ -1662,7 +1758,7 @@ msgstr ""
 "для устанавливаемой системы."
 
 #. Tag: para
-#: preseed.xml:829
+#: preseed.xml:821
 #, no-c-format
 msgid ""
 "The parameter <classname>mirror/udeb/suite</classname> determines the suite "
@@ -1681,7 +1777,7 @@ msgstr ""
 "ненужно."
 
 #. Tag: screen
-#: preseed.xml:840
+#: preseed.xml:832
 #, no-c-format
 msgid ""
 "# If you select ftp, the mirror/country string does not need to be set.\n"
@@ -1709,13 +1805,13 @@ msgstr ""
 "#d-i mirror/udeb/suite string testing"
 
 #. Tag: title
-#: preseed.xml:845
+#: preseed.xml:837
 #, no-c-format
 msgid "Account setup"
 msgstr "Настройка учётной записи"
 
 #. Tag: para
-#: preseed.xml:846
+#: preseed.xml:838
 #, no-c-format
 msgid ""
 "The password for the root account and name and password for a first regular "
@@ -1727,7 +1823,7 @@ msgstr ""
 "виде или в виде <emphasis>хешей</emphasis> MD5."
 
 #. Tag: para
-#: preseed.xml:853
+#: preseed.xml:845
 #, no-c-format
 msgid ""
 "Be aware that preseeding passwords is not completely secure as everyone with "
@@ -1743,7 +1839,7 @@ msgstr ""
 "пароль прямым перебором."
 
 #. Tag: screen
-#: preseed.xml:863
+#: preseed.xml:855
 #, no-c-format
 msgid ""
 "# Skip creation of a root account (normal user account will be able to\n"
@@ -1802,7 +1898,7 @@ msgstr ""
 "#d-i passwd/user-default-groups string audio cdrom video"
 
 #. Tag: para
-#: preseed.xml:865
+#: preseed.xml:857
 #, no-c-format
 msgid ""
 "The <classname>passwd/root-password-crypted</classname> and "
@@ -1823,26 +1919,26 @@ msgstr ""
 "<command>sudo</command>)."
 
 #. Tag: para
-#: preseed.xml:875
+#: preseed.xml:867
 #, no-c-format
 msgid ""
 "The following command can be used to generate an MD5 hash for a password:"
 msgstr "С помощью следующей команды можно сгенерировать MD5 хеш для пароля:"
 
 #. Tag: screen
-#: preseed.xml:879
+#: preseed.xml:871
 #, no-c-format
 msgid "$ printf \"r00tme\" | mkpasswd -s -m md5"
 msgstr "$ printf \"r00tme\" | mkpasswd -s -m md5"
 
 #. Tag: title
-#: preseed.xml:885
+#: preseed.xml:877
 #, no-c-format
 msgid "Clock and time zone setup"
 msgstr "Настройка времени и часового пояса"
 
 #. Tag: screen
-#: preseed.xml:887
+#: preseed.xml:879
 #, no-c-format
 msgid ""
 "# Controls whether or not the hardware clock is set to UTC.\n"
@@ -1871,13 +1967,13 @@ msgstr ""
 "#d-i clock-setup/ntp-server string ntp.example.com"
 
 #. Tag: title
-#: preseed.xml:892
+#: preseed.xml:884
 #, no-c-format
 msgid "Partitioning"
 msgstr "Разметка дисков"
 
 #. Tag: para
-#: preseed.xml:893
+#: preseed.xml:885
 #, no-c-format
 msgid ""
 "Using preseeding to partition the harddisk is limited to what is supported "
@@ -1894,7 +1990,7 @@ msgstr ""
 "файла ответов."
 
 #. Tag: para
-#: preseed.xml:901
+#: preseed.xml:893
 #, no-c-format
 msgid ""
 "Preseeding of advanced partition setups using RAID, LVM and encryption is "
@@ -1906,16 +2002,24 @@ msgstr ""
 "без автоматической установки."
 
 #. Tag: para
-#: preseed.xml:907
-#, no-c-format
+#: preseed.xml:899
+#, fuzzy, no-c-format
+#| msgid ""
+#| "The examples below only provide basic information on the use of recipes. "
+#| "For detailed information see the files <filename>partman-auto-recipe.txt</"
+#| "filename> and <filename>partman-auto-raid-recipe.txt</filename> included "
+#| "in the <classname>debian-installer</classname> package. Both files are "
+#| "also available from the <ulink url=\"&url-d-i-websvn;/trunk/installer/doc/"
+#| "devel/\">&d-i; source repository</ulink>. Note that the supported "
+#| "functionality may change between releases."
 msgid ""
 "The examples below only provide basic information on the use of recipes. For "
 "detailed information see the files <filename>partman-auto-recipe.txt</"
 "filename> and <filename>partman-auto-raid-recipe.txt</filename> included in "
 "the <classname>debian-installer</classname> package. Both files are also "
-"available from the <ulink url=\"&url-d-i-websvn;/trunk/installer/doc/devel/"
-"\">&d-i; source repository</ulink>. Note that the supported functionality "
-"may change between releases."
+"available from the <ulink url=\"&url-d-i-gitweb-doc-devel;\">&d-i; source "
+"repository</ulink>. Note that the supported functionality may change between "
+"releases."
 msgstr ""
 "Представленные далее примеры показывают только основы по использованию "
 "наборов. Подробности смотрите в файлах <filename>partman-auto-recipe.txt</"
@@ -1926,7 +2030,7 @@ msgstr ""
 "между выпусками."
 
 #. Tag: para
-#: preseed.xml:921
+#: preseed.xml:913
 #, no-c-format
 msgid ""
 "The identification of disks is dependent on the order in which their drivers "
@@ -1938,13 +2042,13 @@ msgstr ""
 "как использовать автоматическую установку."
 
 #. Tag: title
-#: preseed.xml:930
+#: preseed.xml:922
 #, no-c-format
 msgid "Partitioning example"
 msgstr "Пример разметки"
 
 #. Tag: screen
-#: preseed.xml:932
+#: preseed.xml:924
 #, no-c-format
 msgid ""
 "# If the system has free space you can choose to only partition that space.\n"
@@ -2094,13 +2198,13 @@ msgstr ""
 "d-i partman/confirm_nooverwrite boolean true"
 
 #. Tag: title
-#: preseed.xml:936
+#: preseed.xml:928
 #, no-c-format
 msgid "Partitioning using RAID"
 msgstr "Разметка с использованием RAID"
 
 #. Tag: para
-#: preseed.xml:937
+#: preseed.xml:929
 #, no-c-format
 msgid ""
 "You can also use preseeding to set up partitions on software RAID arrays. "
@@ -2112,7 +2216,7 @@ msgstr ""
 "(degraded arrays) и можно указать запасные устройства."
 
 #. Tag: para
-#: preseed.xml:943
+#: preseed.xml:935
 #, no-c-format
 msgid ""
 "If you are using RAID 1, you can preseed grub to install to all devices used "
@@ -2122,7 +2226,7 @@ msgstr ""
 "устройства массива, см. <xref linkend=\"preseed-bootloader\"/>."
 
 #. Tag: para
-#: preseed.xml:950
+#: preseed.xml:942
 #, no-c-format
 msgid ""
 "This type of automated partitioning is easy to get wrong. It is also "
@@ -2138,7 +2242,7 @@ msgstr ""
 "<filename>/var/log/syslog</filename>."
 
 #. Tag: screen
-#: preseed.xml:960
+#: preseed.xml:952
 #, no-c-format
 msgid ""
 "# The method should be set to \"raid\".\n"
@@ -2241,13 +2345,13 @@ msgstr ""
 "d-i partman/confirm_nooverwrite boolean true"
 
 #. Tag: title
-#: preseed.xml:965
+#: preseed.xml:957
 #, no-c-format
 msgid "Controlling how partitions are mounted"
 msgstr "Управление монтированием разделов"
 
 #. Tag: para
-#: preseed.xml:966
+#: preseed.xml:958
 #, no-c-format
 msgid ""
 "Normally, filesystems are mounted using a universally unique identifier "
@@ -2267,7 +2371,7 @@ msgstr ""
 "на основе UUID."
 
 #. Tag: para
-#: preseed.xml:975
+#: preseed.xml:967
 #, no-c-format
 msgid ""
 "Devices with stable names, such as LVM logical volumes, will continue to use "
@@ -2278,7 +2382,7 @@ msgstr ""
 "ы."
 
 #. Tag: para
-#: preseed.xml:982
+#: preseed.xml:974
 #, no-c-format
 msgid ""
 "Traditional device names may change based on the order in which the kernel "
@@ -2294,7 +2398,7 @@ msgstr ""
 "ваша система начинает работать непредсказуемым образом."
 
 #. Tag: screen
-#: preseed.xml:992
+#: preseed.xml:984
 #, no-c-format
 msgid ""
 "# The default is to mount by UUID, but you can also choose \"traditional\" "
@@ -2311,13 +2415,13 @@ msgstr ""
 "#d-i partman/mount_style select uuid"
 
 #. Tag: title
-#: preseed.xml:998
+#: preseed.xml:990
 #, no-c-format
 msgid "Base system installation"
 msgstr "Установка базовой системы"
 
 #. Tag: para
-#: preseed.xml:999
+#: preseed.xml:991
 #, no-c-format
 msgid ""
 "There is actually not very much that can be preseeded for this stage of the "
@@ -2328,19 +2432,31 @@ msgstr ""
 "основном они касаются установки ядра."
 
 #. Tag: screen
-#: preseed.xml:1006
-#, no-c-format
+#: preseed.xml:998
+#, fuzzy, no-c-format
+#| msgid ""
+#| "# Configure APT to not install recommended packages by default. Use of "
+#| "this\n"
+#| "# option can result in an incomplete system and should only be used by "
+#| "very\n"
+#| "# experienced users.\n"
+#| "#d-i base-installer/install-recommends boolean false\n"
+#| "\n"
+#| "# Select the initramfs generator used to generate the initrd for 2.6 "
+#| "kernels.\n"
+#| "#d-i base-installer/kernel/linux/initramfs-generators string initramfs-"
+#| "tools\n"
+#| "\n"
+#| "# The kernel image (meta) package to be installed; \"none\" can be used "
+#| "if no\n"
+#| "# kernel is to be installed.\n"
+#| "#d-i base-installer/kernel/image string &kernelpackage;-2.6-486"
 msgid ""
 "# Configure APT to not install recommended packages by default. Use of this\n"
 "# option can result in an incomplete system and should only be used by very\n"
 "# experienced users.\n"
 "#d-i base-installer/install-recommends boolean false\n"
 "\n"
-"# Select the initramfs generator used to generate the initrd for 2.6 "
-"kernels.\n"
-"#d-i base-installer/kernel/linux/initramfs-generators string initramfs-"
-"tools\n"
-"\n"
 "# The kernel image (meta) package to be installed; \"none\" can be used if "
 "no\n"
 "# kernel is to be installed.\n"
@@ -2362,13 +2478,13 @@ msgstr ""
 "#d-i base-installer/kernel/image string &kernelpackage;-2.6-486"
 
 #. Tag: title
-#: preseed.xml:1011
+#: preseed.xml:1003
 #, no-c-format
 msgid "Apt setup"
 msgstr "Настройка Apt"
 
 #. Tag: para
-#: preseed.xml:1012
+#: preseed.xml:1004
 #, no-c-format
 msgid ""
 "Setup of the <filename>/etc/apt/sources.list</filename> and basic "
@@ -2382,7 +2498,7 @@ msgstr ""
 "добавить другие (локальные) репозитории."
 
 #. Tag: screen
-#: preseed.xml:1020
+#: preseed.xml:1012
 #, no-c-format
 msgid ""
 "# You can choose to install non-free and contrib software.\n"
@@ -2442,13 +2558,13 @@ msgstr ""
 "#d-i debian-installer/allow_unauthenticated boolean true"
 
 #. Tag: title
-#: preseed.xml:1025
+#: preseed.xml:1017
 #, no-c-format
 msgid "Package selection"
 msgstr "Выбор пакетов"
 
 #. Tag: para
-#: preseed.xml:1026
+#: preseed.xml:1018
 #, no-c-format
 msgid ""
 "You can choose to install any combination of tasks that are available. "
@@ -2458,73 +2574,73 @@ msgstr ""
 "Доступные задачи:"
 
 #. Tag: userinput
-#: preseed.xml:1035
+#: preseed.xml:1027
 #, no-c-format
 msgid "standard"
 msgstr "standard (стандартная система)"
 
 #. Tag: userinput
-#: preseed.xml:1038
+#: preseed.xml:1030
 #, no-c-format
 msgid "desktop"
 msgstr "desktop (рабочий стол)"
 
 #. Tag: userinput
-#: preseed.xml:1041
+#: preseed.xml:1033
 #, no-c-format
 msgid "gnome-desktop"
 msgstr "gnome-desktop (рабочий стол gnome)"
 
 #. Tag: userinput
-#: preseed.xml:1044
+#: preseed.xml:1036
 #, no-c-format
 msgid "kde-desktop"
 msgstr "kde-desktop (рабочий стол kde)"
 
 #. Tag: userinput
-#: preseed.xml:1047
+#: preseed.xml:1039
 #, no-c-format
 msgid "web-server"
 msgstr "web-server (веб сервер)"
 
 #. Tag: userinput
-#: preseed.xml:1050
+#: preseed.xml:1042
 #, no-c-format
 msgid "print-server"
 msgstr "print-server (сервер печати)"
 
 #. Tag: userinput
-#: preseed.xml:1053
+#: preseed.xml:1045
 #, no-c-format
 msgid "dns-server"
 msgstr "dns-server (DNS-сервер)"
 
 #. Tag: userinput
-#: preseed.xml:1056
+#: preseed.xml:1048
 #, no-c-format
 msgid "file-server"
 msgstr "file-server (файловый сервер)"
 
 #. Tag: userinput
-#: preseed.xml:1059
+#: preseed.xml:1051
 #, no-c-format
 msgid "mail-server"
 msgstr "mail-server (почтовый сервер)"
 
 #. Tag: userinput
-#: preseed.xml:1062
+#: preseed.xml:1054
 #, no-c-format
 msgid "sql-database"
 msgstr "sql-database (база данных SQL)"
 
 #. Tag: userinput
-#: preseed.xml:1065
+#: preseed.xml:1057
 #, no-c-format
 msgid "laptop"
 msgstr "laptop (для ноутбука)"
 
 #. Tag: para
-#: preseed.xml:1069
+#: preseed.xml:1061
 #, no-c-format
 msgid ""
 "You can also choose to install no tasks, and force the installation of a set "
@@ -2536,7 +2652,7 @@ msgstr ""
 "<userinput>standard</userinput>."
 
 #. Tag: para
-#: preseed.xml:1075
+#: preseed.xml:1067
 #, no-c-format
 msgid ""
 "If you want to install some individual packages in addition to packages "
@@ -2552,7 +2668,7 @@ msgstr ""
 "указать в командной строке ядра."
 
 #. Tag: screen
-#: preseed.xml:1085
+#: preseed.xml:1077
 #, no-c-format
 msgid ""
 "#tasksel tasksel/first multiselect standard, web-server\n"
@@ -2590,14 +2706,64 @@ msgstr ""
 "#popularity-contest popularity-contest/participate boolean false"
 
 #. Tag: title
-#: preseed.xml:1090
+#: preseed.xml:1082
 #, no-c-format
 msgid "Boot loader installation"
 msgstr "Установка загрузчика"
 
 #. Tag: screen
-#: preseed.xml:1092
-#, no-c-format
+#: preseed.xml:1084
+#, fuzzy, no-c-format
+#| msgid ""
+#| "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). "
+#| "If you want lilo installed\n"
+#| "# instead, uncomment this:\n"
+#| "#d-i grub-installer/skip boolean true\n"
+#| "# To also skip installing lilo, and install no bootloader, uncomment "
+#| "this\n"
+#| "# too:\n"
+#| "#d-i lilo-installer/skip boolean true</phrase>\n"
+#| "<phrase arch=\"kfreebsd-any;hurd-any\"># To install no bootloader, "
+#| "uncomment this\n"
+#| "#d-i grub-installer/skip boolean true</phrase>\n"
+#| "\n"
+#| "# With a few exceptions for unusual partitioning setups, GRUB 2 is now "
+#| "the\n"
+#| "# default. If you need GRUB Legacy for some particular reason, then\n"
+#| "# uncomment this:\n"
+#| "#d-i grub-installer/grub2_instead_of_grub_legacy boolean false\n"
+#| "\n"
+#| "# This is fairly safe to set, it makes grub install automatically to the "
+#| "MBR\n"
+#| "# if no other operating system is detected on the machine.\n"
+#| "d-i grub-installer/only_debian boolean true\n"
+#| "\n"
+#| "# This one makes grub-installer install to the MBR if it also finds some "
+#| "other\n"
+#| "# OS, which is less safe as it might not be able to boot that other OS.\n"
+#| "d-i grub-installer/with_other_os boolean true\n"
+#| "\n"
+#| "# Alternatively, if you want to install to a location other than the "
+#| "mbr,\n"
+#| "# uncomment and edit these lines:\n"
+#| "#d-i grub-installer/only_debian boolean false\n"
+#| "#d-i grub-installer/with_other_os boolean false\n"
+#| "#d-i grub-installer/bootdev  string (hd0,0)\n"
+#| "# To install grub to multiple disks:\n"
+#| "#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)\n"
+#| "# To install to a particular device:\n"
+#| "#d-i grub-installer/bootdev  string /dev/sda\n"
+#| "\n"
+#| "# Optional password for grub, either in clear text\n"
+#| "#d-i grub-installer/password password r00tme\n"
+#| "#d-i grub-installer/password-again password r00tme\n"
+#| "# or encrypted using an MD5 hash, see grub-md5-crypt(8).\n"
+#| "#d-i grub-installer/password-crypted password [MD5 hash]\n"
+#| "\n"
+#| "# Use the following option to add additional boot parameters for the\n"
+#| "# installed system (if supported by the bootloader installer).\n"
+#| "# Note: options passed to the installer will be added automatically.\n"
+#| "#d-i debian-installer/add-kernel-opts string nousb"
 msgid ""
 "<phrase arch=\"linux-any\"># Grub is the default boot loader (for x86). If "
 "you want lilo installed\n"
@@ -2610,11 +2776,6 @@ msgid ""
 "this\n"
 "#d-i grub-installer/skip boolean true</phrase>\n"
 "\n"
-"# With a few exceptions for unusual partitioning setups, GRUB 2 is now the\n"
-"# default. If you need GRUB Legacy for some particular reason, then\n"
-"# uncomment this:\n"
-"#d-i grub-installer/grub2_instead_of_grub_legacy boolean false\n"
-"\n"
 "# This is fairly safe to set, it makes grub install automatically to the "
 "MBR\n"
 "# if no other operating system is detected on the machine.\n"
@@ -2696,7 +2857,7 @@ msgstr ""
 "#d-i debian-installer/add-kernel-opts string nousb"
 
 #. Tag: para
-#: preseed.xml:1094
+#: preseed.xml:1086
 #, no-c-format
 msgid ""
 "An MD5 hash for a password for <classname>grub</classname> can be generated "
@@ -2708,13 +2869,13 @@ msgstr ""
 "linkend=\"preseed-account\"/>."
 
 #. Tag: title
-#: preseed.xml:1104
+#: preseed.xml:1096
 #, no-c-format
 msgid "Finishing up the installation"
 msgstr "Завершение установки"
 
 #. Tag: screen
-#: preseed.xml:1106
+#: preseed.xml:1098
 #, no-c-format
 msgid ""
 "# During installations from serial console, the regular virtual consoles\n"
@@ -2754,13 +2915,13 @@ msgstr ""
 "#d-i debian-installer/exit/poweroff boolean true"
 
 #. Tag: title
-#: preseed.xml:1111
+#: preseed.xml:1103
 #, no-c-format
 msgid "Preseeding other packages"
 msgstr "Автоматизация других пакетов"
 
 #. Tag: screen
-#: preseed.xml:1113
+#: preseed.xml:1105
 #, no-c-format
 msgid ""
 "# Depending on what software you choose to install, or if things go wrong\n"
@@ -2783,19 +2944,19 @@ msgstr ""
 "#   debconf-get-selections >> файл"
 
 #. Tag: title
-#: preseed.xml:1120
+#: preseed.xml:1112
 #, no-c-format
 msgid "Advanced options"
 msgstr "Дополнительные параметры"
 
 #. Tag: title
-#: preseed.xml:1123
+#: preseed.xml:1115
 #, no-c-format
 msgid "Running custom commands during the installation"
 msgstr "Запуск пользовательских команд во время установки"
 
 #. Tag: para
-#: preseed.xml:1124
+#: preseed.xml:1116
 #, no-c-format
 msgid ""
 "A very powerful and flexible option offered by the preconfiguration tools is "
@@ -2806,7 +2967,7 @@ msgstr ""
 "моменты установки."
 
 #. Tag: screen
-#: preseed.xml:1132
+#: preseed.xml:1124
 #, no-c-format
 msgid ""
 "# d-i preseeding is inherently not secure. Nothing in the installer checks\n"
@@ -2856,14 +3017,14 @@ msgstr ""
 "#d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh"
 
 #. Tag: title
-#: preseed.xml:1137
+#: preseed.xml:1129
 #, no-c-format
 msgid "Using preseeding to change default values"
 msgstr ""
 "Использование автоматической установки для изменения значений по умолчанию"
 
 #. Tag: para
-#: preseed.xml:1138
+#: preseed.xml:1130
 #, no-c-format
 msgid ""
 "It is possible to use preseeding to change the default answer for a "
@@ -2889,7 +3050,7 @@ msgstr ""
 "помочь при отладке или тестировании вашего файла ответов."
 
 #. Tag: para
-#: preseed.xml:1152
+#: preseed.xml:1144
 #, no-c-format
 msgid ""
 "Note that the <quote>d-i</quote> owner should only be used for variables "
@@ -2903,7 +3064,7 @@ msgstr ""
 "этого пакета. См. сноску к <xref linkend=\"preseed-bootparms\"/>."
 
 #. Tag: para
-#: preseed.xml:1159
+#: preseed.xml:1151
 #, no-c-format
 msgid ""
 "If you are preseeding using boot parameters, you can make the installer ask "
@@ -2926,6 +3087,16 @@ msgstr ""
 "относятся к отображаемым во время установки вопросам, но никак не на "
 "<quote>внутренние</quote> параметры."
 
+#. Tag: para
+#: preseed.xml:1161
+#, no-c-format
+msgid ""
+"For more debugging information, use the boot parameter "
+"<classname>DEBCONF_DEBUG=5</classname>. This will cause <classname>debconf</"
+"classname> to print much more detail about the current settings of each "
+"variable and about its progress through each package's installation scripts."
+msgstr ""
+
 #. Tag: title
 #: preseed.xml:1173
 #, no-c-format
@@ -3019,4 +3190,3 @@ msgstr ""
 "разных по сути метода автоматизации, что, например, приведёт к выполнению "
 "команды из preseed/early дважды: один раз из первого метода, второй раз "
 "после включения сети."
-